From fedora-cvs-commits at redhat.com  Thu Jun  1 02:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 31 May 2006 22:54:25 -0400
Subject: rpms/texinfo/FC-5 texinfo.spec,1.34,1.35
Message-ID: <200606010254.k512sP1d011573@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/texinfo/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11476

Modified Files:
	texinfo.spec 
Log Message:
* Thu Jun  1 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-9.2.fc5.1
- Add Provides: texinfo-tex (#178406)



Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/FC-5/texinfo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- texinfo.spec	11 Feb 2006 05:51:24 -0000	1.34
+++ texinfo.spec	1 Jun 2006 02:54:23 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.8
-Release: 9.2
+Release: 9.2.fc5.1
 License: GPL
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -15,6 +15,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel, ncurses-devel
 Requires: tetex
+Provides: texinfo-tex = %{version}-%{release}
 
 
 # Redefine this so "dir" in the info directory isn't compressed
@@ -123,6 +124,9 @@
 %{_mandir}/man5/info.5*
 
 %changelog
+* Thu Jun  1 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-9.2.fc5.1
+- Add Provides: texinfo-tex (#178406)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.8-9.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 03:01:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 31 May 2006 23:01:24 -0400
Subject: rpms/texinfo/FC-4 texinfo.spec,1.27,1.28
Message-ID: <200606010301.k5131Od0013956@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/texinfo/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13882

Modified Files:
	texinfo.spec 
Log Message:
* Thu Jun  1 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8.fc4.2
- Add Provides: texinfo-tex (#178406)



Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/FC-4/texinfo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- texinfo.spec	20 Jan 2006 15:39:00 -0000	1.27
+++ texinfo.spec	1 Jun 2006 03:00:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.8
-Release: 8.fc4.1
+Release: 8.fc4.2
 License: GPL
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -15,6 +15,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel, ncurses-devel
 Requires: tetex
+Provides: texinfo-tex = %{version}-%{release}
 
 
 # Redefine this so "dir" in the info directory isn't compressed
@@ -123,6 +124,9 @@
 %{_mandir}/man5/info.5*
 
 %changelog
+* Thu Jun  1 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8.fc4.2
+- Add Provides: texinfo-tex (#178406)
+
 * Fri Jan 20 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8.fc4.1
 - Build for FC 4
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 03:45:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 31 May 2006 23:45:00 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2239,1.2240
Message-ID: <200606010345.k513j0Ij004366@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4286

Modified Files:
	kernel-2.6.spec 
Log Message:
jcm's weak-update fu.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2239
retrieving revision 1.2240
diff -u -r1.2239 -r1.2240
--- kernel-2.6.spec	31 May 2006 20:12:08 -0000	1.2239
+++ kernel-2.6.spec	1 Jun 2006 03:44:57 -0000	1.2240
@@ -1203,6 +1203,7 @@
     # dirs for additional modules per module-init-tools, kbuild/modules.txt
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
+    mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates
     # first copy everything
     cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build 
     cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
@@ -1575,6 +1576,7 @@
 /lib/modules/%{KVERREL}/source
 /lib/modules/%{KVERREL}/extra
 /lib/modules/%{KVERREL}/updates
+/lib/modules/%{KVERREL}/weak-updates
 
 %files devel
 %defattr(-,root,root)
@@ -1601,6 +1603,7 @@
 /lib/modules/%{KVERREL}PAE/source
 /lib/modules/%{KVERREL}PAE/extra
 /lib/modules/%{KVERREL}PAE/updates
+/lib/modules/%{KVERREL}PAE/weak-updates
 
 %files PAE-devel
 %defattr(-,root,root)
@@ -1622,6 +1625,7 @@
 /lib/modules/%{KVERREL}smp/source
 /lib/modules/%{KVERREL}smp/extra
 /lib/modules/%{KVERREL}smp/updates
+/lib/modules/%{KVERREL}smp/weak-updates
 
 %files smp-devel
 %defattr(-,root,root)
@@ -1647,6 +1651,7 @@
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
 /lib/modules/%{KVERREL}xen0/extra
 /lib/modules/%{KVERREL}xen0/updates
+/lib/modules/%{KVERREL}xen0/weak-updates
 
 %files xen0-devel
 %defattr(-,root,root)
@@ -1667,6 +1672,7 @@
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
 /lib/modules/%{KVERREL}xenU/extra
 /lib/modules/%{KVERREL}xenU/updates
+/lib/modules/%{KVERREL}xenU/weak-updates
 
 %files xenU-devel
 %defattr(-,root,root)
@@ -1691,6 +1697,7 @@
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
 /lib/modules/%{KVERREL}xen0-PAE/extra
 /lib/modules/%{KVERREL}xen0-PAE/updates
+/lib/modules/%{KVERREL}xen0-PAE/weak-updates
 
 %files xen0-PAE-devel
 %defattr(-,root,root)
@@ -1711,6 +1718,7 @@
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
 /lib/modules/%{KVERREL}xenU-PAE/extra
 /lib/modules/%{KVERREL}xenU-PAE/updates
+/lib/modules/%{KVERREL}xenU-PAE/weak-updates
 
 %files xenU-PAE-devel
 %defattr(-,root,root)
@@ -1734,6 +1742,7 @@
 /lib/modules/%{KVERREL}kdump/source
 /lib/modules/%{KVERREL}kdump/extra
 /lib/modules/%{KVERREL}kdump/updates
+/lib/modules/%{KVERREL}kdump/weak-updates
 
 %files kdump-devel
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Jun  1 03:58:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 31 May 2006 23:58:15 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.10,
	1.11
Message-ID: <200606010358.k513wFfc001309@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1296

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Wed May 31 2006 Dan Williams  <dcbw at redhat.com> - 0.10.3-2
- Package gsthalelements plugin so this can be pushed out




Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gstreamer-plugins-good.spec	23 May 2006 04:17:09 -0000	1.10
+++ gstreamer-plugins-good.spec	1 Jun 2006 03:58:12 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.3
-Release:  	1
+Release:  	2
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -46,6 +46,7 @@
 # documentation
 BuildRequires:  gtk-doc
 BuildRequires:  PyXML
+BuildRequires:  hal-devel
 
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
@@ -149,6 +150,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstcairo.so
 %{_libdir}/gstreamer-%{majorminor}/libgstesd.so
 %{_libdir}/gstreamer-%{majorminor}/libgstflac.so
+%{_libdir}/gstreamer-%{majorminor}/libgsthalelements.so
 %{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpng.so
@@ -178,6 +180,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Wed May 31 2006 Dan Williams  <dcbw at redhat.com> - 0.10.3-2
+- Package gsthalelements plugin so this can be pushed out
+
 * Mon May 22 2006 Matthias Clasen  <mclasen at redhat.com> - 0.10.3-1
 - Update to 0.10.3
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 05:32:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 01:32:24 -0400
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.3,
	1.4 gnome-backgrounds.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200606010532.k515WObH001278@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1205

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.14.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 May 2006 19:34:09 -0000	1.3
+++ .cvsignore	1 Jun 2006 05:32:16 -0000	1.4
@@ -1 +1 @@
-gnome-backgrounds-2.14.2.tar.bz2
+gnome-backgrounds-2.14.2.1.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-backgrounds.spec	30 May 2006 19:34:09 -0000	1.4
+++ gnome-backgrounds.spec	1 Jun 2006 05:32:16 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.14.2
+Version: 2.14.2.1
 Release: 2
 License: GPL
 Group: Applications/Multimedia
@@ -49,8 +49,8 @@
 %{_datadir}/backgrounds
 
 %changelog
-* Tue May 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
-- Update to 2.14.2
+* Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-2
+- Update to 2.14.2.1
 
 * Mon Mar 13 2005 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 May 2006 19:34:09 -0000	1.3
+++ sources	1 Jun 2006 05:32:16 -0000	1.4
@@ -1 +1 @@
-d0dfef2dcdde95ab02a04e0c675fe457  gnome-backgrounds-2.14.2.tar.bz2
+10480df7c2e5a08c920c5b0a2ff4f161  gnome-backgrounds-2.14.2.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 05:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 01:44:07 -0400
Subject: rpms/gnome-backgrounds/FC-5 gnome-backgrounds.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200606010544.k515i75m003164@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-backgrounds/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3102

Modified Files:
	gnome-backgrounds.spec sources 
Log Message:
2.14.2.1



Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/FC-5/gnome-backgrounds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-backgrounds.spec	30 May 2006 19:39:13 -0000	1.4
+++ gnome-backgrounds.spec	1 Jun 2006 05:44:05 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.14.2
+Version: 2.14.2.1
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -49,8 +49,8 @@
 %{_datadir}/backgrounds
 
 %changelog
-* Tue May 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
-- Update to 2.14.2
+* Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-1
+- Update to 2.14.2.1
 
 * Mon Mar 13 2005 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 May 2006 19:39:13 -0000	1.3
+++ sources	1 Jun 2006 05:44:05 -0000	1.4
@@ -1 +1 @@
-d0dfef2dcdde95ab02a04e0c675fe457  gnome-backgrounds-2.14.2.tar.bz2
+10480df7c2e5a08c920c5b0a2ff4f161  gnome-backgrounds-2.14.2.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 08:24:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 04:24:43 -0400
Subject: rpms/tcpdump/devel tcpdump.spec,1.51,1.52
Message-ID: <200606010824.k518OhTL010746@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/tcpdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10719

Modified Files:
	tcpdump.spec 
Log Message:
added release to arpwatch package name


Index: tcpdump.spec
===================================================================
RCS file: /cvs/dist/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- tcpdump.spec	31 May 2006 08:56:32 -0000	1.51
+++ tcpdump.spec	1 Jun 2006 08:24:40 -0000	1.52
@@ -2,8 +2,8 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
-%define releaseno        5
-%define arpwatch_release 15
+%define releaseno        6
+%define arpwatch_release 15.%{releaseno}
 %define pcap_release %{releaseno}
 %define tcpdump_release %{releaseno}
 
@@ -341,6 +341,9 @@
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Thu Jun 1 2006 Martin Stransky <stransky at redhat.com> - 14:3.9.4-6
+- added release to arpwatch package name
+
 * Wed May 31 2006 Martin Stransky <stransky at redhat.com> - 14:3.9.4-5
 - removed libpcap-devel dependency from libpcap
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 08:27:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 04:27:53 -0400
Subject: rpms/ethereal/devel ethereal.spec,1.72,1.73
Message-ID: <200606010827.k518Rrcf011808@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11775

Modified Files:
	ethereal.spec 
Log Message:
- add libpcap-devel dependency


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ethereal.spec	29 May 2006 08:53:26 -0000	1.72
+++ ethereal.spec	1 Jun 2006 08:27:50 -0000	1.73
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	1.1.0
-Release: 	0.svn.1
+Release: 	0.svn.2
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -18,7 +18,8 @@
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
 Requires: 	net-snmp >= 5.3
-BuildRequires: 	libpcap >= 0.6
+Requires: 	libpcap >= 0.6
+BuildRequires:	libpcap-devel
 BuildRequires: 	net-snmp-devel >= 5.3
 BuildRequires: 	net-snmp-utils >= 5.3
 BuildRequires: 	zlib-devel, bzip2-devel
@@ -165,6 +166,9 @@
 
 
 %changelog
+* Thu Jun  1 2006 Radek Vokal <rvokal at redhat.com> 1.1.0-0.svn.1
+- add libpcap-devel dependency
+
 * Mon May 29 2006 Radek Vokal <rvokal at redhat.com> 1.1.0-0.svn.1
 - update to latest svn version, 1.1.0 pre-release
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 09:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 05:21:06 -0400
Subject: rpms/neon/devel neon.spec,1.27,1.28
Message-ID: <200606010921.k519L6iC018129@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/neon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18074

Modified Files:
	neon.spec 
Log Message:
* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.25.5-5
- have -devel require pkgconfig (#193355)



Index: neon.spec
===================================================================
RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- neon.spec	24 May 2006 12:40:54 -0000	1.27
+++ neon.spec	1 Jun 2006 09:21:03 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.25.5
-Release: 4
+Release: 5
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
@@ -24,6 +24,7 @@
 Summary: Development libraries and C header files for the neon library.
 Group: Development/Libraries
 Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel
+Requires: pkgconfig
 Conflicts: subversion-devel < 0.22.2-4
 
 %description devel
@@ -64,6 +65,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.25.5-5
+- have -devel require pkgconfig (#193355)
+
 * Wed May 24 2006 Joe Orton <jorton at redhat.com> 0.25.5-4
 - add multilib fixes for neon-config (#192734)
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 09:44:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 05:44:02 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.2-20060601.patch, NONE,
	1.1 binutils-2.17.50.0.2-build-fixes.patch, NONE,
	1.1 binutils-2.17.50.0.2-elfvsb-test.patch, NONE,
	1.1 binutils-2.17.50.0.2-ia64-lib64.patch, NONE,
	1.1 binutils-2.17.50.0.2-install-info.patch, NONE,
	1.1 binutils-2.17.50.0.2-kept-section.patch, NONE,
	1.1 binutils-2.17.50.0.2-ltconfig-multilib.patch, NONE,
	1.1 binutils-2.17.50.0.2-place-orphan.patch, NONE,
	1.1 binutils-2.17.50.0.2-ppc64-pie.patch, NONE,
	1.1 binutils-2.17.50.0.2-standards.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 binutils.spec, 1.80, 1.81 sources, 1.26, 1.27
Message-ID: <200606010944.k519i2ut023216@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23187

Modified Files:
	.cvsignore binutils.spec sources 
Added Files:
	binutils-2.17.50.0.2-20060601.patch 
	binutils-2.17.50.0.2-build-fixes.patch 
	binutils-2.17.50.0.2-elfvsb-test.patch 
	binutils-2.17.50.0.2-ia64-lib64.patch 
	binutils-2.17.50.0.2-install-info.patch 
	binutils-2.17.50.0.2-kept-section.patch 
	binutils-2.17.50.0.2-ltconfig-multilib.patch 
	binutils-2.17.50.0.2-place-orphan.patch 
	binutils-2.17.50.0.2-ppc64-pie.patch 
	binutils-2.17.50.0.2-standards.patch 
Log Message:
2.17.50.0.2-1

binutils-2.17.50.0.2-20060601.patch:
 bfd/aix386-core.c                  |   18 +++--
 bfd/aix5ppc-core.c                 |   27 ++++---
 bfd/aout-adobe.c                   |    8 --
 bfd/aoutf1.h                       |   24 ++++--
 bfd/bfd-in2.h                      |    8 ++
 bfd/bfd.c                          |  127 +++++++++++++++++++++++++++++++++++++
 bfd/binary.c                       |    7 +-
 bfd/cisco-core.c                   |   14 ++--
 bfd/coff-arm.c                     |   17 ++--
 bfd/coff-h8300.c                   |    6 -
 bfd/elf-bfd.h                      |    8 ++
 bfd/elf.c                          |  102 ++++++++++++++++-------------
 bfd/elf32-arm.c                    |    3 
 bfd/elf32-bfin.c                   |   33 ++++-----
 bfd/elf32-m32c.c                   |   13 +--
 bfd/elf32-mips.c                   |    1 
 bfd/elf32-ppc.c                    |    1 
 bfd/elf32-sh.c                     |    3 
 bfd/elf32-sh64.c                   |    3 
 bfd/elf32-sparc.c                  |    1 
 bfd/elf64-alpha.c                  |    1 
 bfd/elf64-ppc.c                    |    1 
 bfd/elf64-sparc.c                  |    1 
 bfd/elf64-x86-64.c                 |    1 
 bfd/elfn32-mips.c                  |    1 
 bfd/elfxx-ia64.c                   |    2 
 bfd/elfxx-target.h                 |    7 +-
 bfd/hppabsd-core.c                 |    7 --
 bfd/hpux-core.c                    |    5 -
 bfd/i386linux.c                    |    3 
 bfd/ieee.c                         |    6 -
 bfd/ihex.c                         |    9 +-
 bfd/irix-core.c                    |    5 -
 bfd/lynx-core.c                    |    5 -
 bfd/m68klinux.c                    |    3 
 bfd/mach-o.c                       |   33 ++++-----
 bfd/netbsd-core.c                  |   10 +-
 bfd/nlmcode.h                      |    5 -
 bfd/opncls.c                       |   10 --
 bfd/osf-core.c                     |    5 -
 bfd/peXXigen.c                     |    5 -
 bfd/ppcboot.c                      |    7 +-
 bfd/ptrace-core.c                  |   17 ++--
 bfd/rs6000-core.c                  |    5 -
 bfd/sco5-core.c                    |    5 -
 bfd/sparclinux.c                   |    3 
 bfd/srec.c                         |    7 +-
 bfd/stabs.c                        |    9 +-
 bfd/sunos.c                        |   41 +++--------
 bfd/targets.c                      |   35 ++++++----
 bfd/trad-core.c                    |   17 ++--
 bfd/xcofflink.c                    |   37 +++++-----
 bfd/xsym.c                         |    6 -
 etc/texi2pod.pl                    |    6 +
 include/elf/internal.h             |   50 +++++++++-----
 ld/emulparams/arcelf.sh            |    2 
 ld/emulparams/armelf_linux.sh      |    4 -
 ld/emulparams/armelf_nbsd.sh       |    2 
 ld/emulparams/armelf_vxworks.sh    |    2 
 ld/emulparams/armnto.sh            |    2 
 ld/emulparams/armsymbian.sh        |    5 -
 ld/emulparams/bfin.sh              |    2 
 ld/emulparams/crislinux.sh         |    2 
 ld/emulparams/elf32_i860.sh        |    2 
 ld/emulparams/elf32_i960.sh        |    2 
 ld/emulparams/elf32_sparc.sh       |    4 -
 ld/emulparams/elf32am33lin.sh      |    2 
 ld/emulparams/elf32bfinfd.sh       |    2 
 ld/emulparams/elf32bmip.sh         |    4 -
 ld/emulparams/elf32bmipn32-defs.sh |    2 
 ld/emulparams/elf32bmipn32.sh      |    2 
 ld/emulparams/elf32btsmipn32.sh    |    2 
 ld/emulparams/elf32frvfd.sh        |    2 
 ld/emulparams/elf32i370.sh         |    2 
 ld/emulparams/elf32lppcnto.sh      |    2 
 ld/emulparams/elf32mcore.sh        |    2 
 ld/emulparams/elf32openrisc.sh     |    2 
 ld/emulparams/elf32ppccommon.sh    |    4 -
 ld/emulparams/elf32ppcnto.sh       |    2 
 ld/emulparams/elf32ppcwindiss.sh   |    2 
 ld/emulparams/elf32vax.sh          |    2 
 ld/emulparams/elf32xc16x.sh        |    2 
 ld/emulparams/elf32xc16xl.sh       |    2 
 ld/emulparams/elf32xc16xs.sh       |    2 
 ld/emulparams/elf64_aix.sh         |    2 
 ld/emulparams/elf64_ia64.sh        |    4 -
 ld/emulparams/elf64_s390.sh        |    4 -
 ld/emulparams/elf64_sparc.sh       |    4 -
 ld/emulparams/elf64alpha.sh        |    4 -
 ld/emulparams/elf64hppa.sh         |    2 
 ld/emulparams/elf64mmix.sh         |    6 -
 ld/emulparams/elf64ppc.sh          |    4 -
 ld/emulparams/elf_i386.sh          |    4 -
 ld/emulparams/elf_i386_be.sh       |    2 
 ld/emulparams/elf_i386_chaos.sh    |    2 
 ld/emulparams/elf_i386_ldso.sh     |    2 
 ld/emulparams/elf_i386_vxworks.sh  |    4 -
 ld/emulparams/elf_s390.sh          |    4 -
 ld/emulparams/elf_x86_64.sh        |    4 -
 ld/emulparams/hppa64linux.sh       |    2 
 ld/emulparams/hppalinux.sh         |    2 
 ld/emulparams/hppaobsd.sh          |    2 
 ld/emulparams/i386lynx.sh          |    2 
 ld/emulparams/i386moss.sh          |    2 
 ld/emulparams/i386nto.sh           |    2 
 ld/emulparams/i386nw.sh            |    2 
 ld/emulparams/m32relf_linux.sh     |    2 
 ld/emulparams/m68kelf.sh           |    2 
 ld/emulparams/m68kpsos.sh          |    2 
 ld/emulparams/or32elf.sh           |    2 
 ld/emulparams/pjelf.sh             |    2 
 ld/emulparams/pjlelf.sh            |    2 
 ld/emulparams/ppclynx.sh           |    2 
 ld/emulparams/ppcnw.sh             |    2 
 ld/emulparams/shelf32_nbsd.sh      |    2 
 ld/emulparams/shelf_nbsd.sh        |    2 
 ld/emulparams/shelf_nto.sh         |    2 
 ld/emulparams/shlelf32_linux.sh    |    4 -
 ld/emulparams/shlelf_linux.sh      |    4 -
 ld/emulparams/shlelf_nto.sh        |    2 
 ld/emulparams/xtensa-config.sh     |    2 
 ld/emultempl/elf32.em              |   18 +++++
 ld/ld.h                            |    6 +
 ld/ld.texinfo                      |    6 +
 ld/ldexp.c                         |   11 +++
 ld/ldgram.y                        |    3 
 ld/ldlex.l                         |    1 
 ld/ldmain.c                        |   10 ++
 ld/testsuite/ld-elf/binutils.exp   |  119 ++++++++++++++++++++++++++++++++++
 ld/testsuite/ld-elf/commonpage1.d  |    9 ++
 ld/testsuite/ld-elf/maxpage1.d     |    9 ++
 ld/testsuite/ld-elf/maxpage1.s     |   13 +++
 ld/testsuite/ld-elf/maxpage2.d     |    9 ++
 ld/testsuite/ld-elf/tbss1.s        |   24 ++++++
 ld/testsuite/ld-elf/tbss2.s        |   16 ++++
 ld/testsuite/ld-elf/tdata1.s       |   24 ++++++
 ld/testsuite/ld-elf/tdata2.s       |   16 ++++
 137 files changed, 858 insertions(+), 399 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-20060601.patch ---
2006-06-01  Alan Modra  <amodra at bigpond.net.au>

	* stabs.c (_bfd_link_section_stabs): Use bfd_make_section*_with_flags
	instead of bfd_make_section*.
	* aix386-core.c: Likewise.
	* aix5ppc-core.c: Likewise.
	* aout-adobe.c: Likewise.
	* aoutf1.h: Likewise.
	* binary.c: Likewise.
	* cisco-core.c: Likewise.
	* coff-arm.c: Likewise.
	* coff-h8300.c: Likewise.
	* elf.c: Likewise.
	* elf32-bfin.c: Likewise.
	* elf32-m32c.c: Likewise.
	* hppabsd-core.c: Likewise.
	* hpux-core.c: Likewise.
	* i386linux.c: Likewise.
	* ieee.c: Likewise.
	* ihex.c: Likewise.
	* irix-core.c: Likewise.
	* lynx-core.c: Likewise.
	* m68klinux.c: Likewise.
	* mach-o.c: Likewise.
	* netbsd-core.c: Likewise.
	* nlmcode.h: Likewise.
	* opncls.c: Likewise.
	* osf-core.c: Likewise.
	* peXXigen.c: Likewise.
	* ppcboot.c: Likewise.
	* ptrace-core.c: Likewise.
	* rs6000-core.c: Likewise.
	* sco5-core.c: Likewise.
	* sparclinux.c: Likewise.
	* srec.c: Likewise.
	* sunos.c: Likewise.
	* trad-core.c: Likewise.
	* xcofflink.c: Likewise.
	* xsym.c: Likewise.

2006-05-31  Daniel Jacobowitz  <dan at codesourcery.com>

	* Makefile.am (INCLUDES): Use @INCINTL at .
	* acinclude.m4: Include new gettext macros.
	* configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS.
	Manually substitute POFILES and GMOFILES.
	* Makefile.in, aclocal.m4, configure, doc/Makefile.in: Regenerated.

2006-05-30  H.J. Lu  <hongjiu.lu at intel.com>

	* bfd.c (bfd_emul_get_maxpagesize): New.
	(bfd_elf_set_pagesize): Likewise.
	(bfd_emul_set_maxpagesize): Likewise.
	(bfd_emul_get_commonpagesize): Likewise.
	(bfd_emul_set_commonpagesize): Likewise.
	* bfd-in2.h: Regenerated.

	* elf-bfd.h (elf_backend_data): Add commonpagesize.
	(xvec_get_elf_backend_data): New.
	(get_elf_backend_data): Use xvec_get_elf_backend_data.

	* elf32-arm.c (elf32_arm_vxworks_bed): Remove const.
	* elfxx-target.h (elfNN_bed): Likewise.

	* elf32-arm.c (ELF_COMMONPAGESIZE): Defined.
	* elf32-mips.c (ELF_COMMONPAGESIZE): Likewise.
	* elf32-ppc.c (ELF_COMMONPAGESIZE): Likewise.
	* elf32-sh.c (ELF_COMMONPAGESIZE): Likewise.
	* elf32-sh64.c (ELF_COMMONPAGESIZE): Likewise.
	* elf32-sparc.c (ELF_COMMONPAGESIZE): Likewise.
	* elf64-alpha.c (ELF_COMMONPAGESIZE): Likewise.
	* elf64-ppc.c (ELF_COMMONPAGESIZE): Likewise.
	* elf64-sparc.c (ELF_COMMONPAGESIZE): Likewise.
	* elf64-x86-64.c (ELF_COMMONPAGESIZE): Likewise.
	* elfn32-mips.c (ELF_COMMONPAGESIZE): Likewise.
	* elfxx-ia64.c (ELF_COMMONPAGESIZE): Likewise.

	* elfxx-target.h (ELF_COMMONPAGESIZE): Define if not defined.
	(elfNN_bed): Initialize commonpagesize with ELF_COMMONPAGESIZE.

	* targets.c (bfd_find_target): Support NULL abfd.

2006-05-27  Alan Modra  <amodra at bigpond.net.au>
	    H.J. Lu  <hongjiu.lu at intel.com>

	* elf.c (assign_file_positions_for_load_sections): Retrieve
	maxpagesize from m->p_align if it is valid.  Set p_vaddr,
	p_paddr and p_align earlier.  Revert 2006-05-19 change to p_align.
	(copy_elf_program_header): Copy p_align.  Set p_align_valid.

etc/
2006-05-31  Daniel Jacobowitz  <dan at codesourcery.com>

	* texi2pod.pl: Correct handling of absolute @include.

include/elf/
2006-05-31  H.J. Lu  <hongjiu.lu at intel.com>

	* internal.h (ELF_SECTION_SIZE): New.
	(ELF_IS_SECTION_IN_SEGMENT): Likewise.
	(ELF_IS_SECTION_IN_SEGMENT_FILE): Updated.
	(ELF_IS_SECTION_IN_SEGMENT_MEMORY): Likewise.

2006-05-27  H.J. Lu  <hongjiu.lu at intel.com>

	* internal.h (struct elf_segment_map): Add p_align and p_align_valid.

ld/
2006-05-30  H.J. Lu  <hongjiu.lu at intel.com>

	* emulparams/arcelf.sh (MAXPAGESIZE): Changed to
	"CONSTANT (MAXPAGESIZE)".
	* emulparams/armelf_nbsd.sh: Likewise.
	* emulparams/armelf_vxworks.sh: Likewise.
	* emulparams/armnto.sh: Likewise.
	* emulparams/armsymbian.sh: Likewise.
	* emulparams/crislinux.sh: Likewise.
	* emulparams/elf32_i860.sh: Likewise.
	* emulparams/elf32_i960.sh: Likewise.
	* emulparams/elf32am33lin.sh: Likewise.
	* emulparams/elf32bfinfd.sh: Likewise.
	* emulparams/elf32bmipn32-defs.sh: Likewise.
	* emulparams/elf32frvfd.sh: Likewise.
	* emulparams/elf32i370.sh: Likewise.
	* emulparams/elf32lppcnto.sh: Likewise.
	* emulparams/elf32mcore.sh: Likewise.
	* emulparams/elf32openrisc.sh: Likewise.
	* emulparams/elf32ppcnto.sh: Likewise.
	* emulparams/elf32ppcwindiss.sh: Likewise.
	* emulparams/elf32vax.sh: Likewise.
	* emulparams/elf32xc16x.sh: Likewise.
	* emulparams/elf32xc16xl.sh: Likewise.
	* emulparams/elf32xc16xs.sh: Likewise.
	* emulparams/elf64_aix.sh: Likewise.
	* emulparams/elf64hppa.sh: Likewise.
	* emulparams/elf64mmix.sh: Likewise.
	* emulparams/elf_i386_be.sh: Likewise.
	* emulparams/elf_i386_chaos.sh: Likewise.
	* emulparams/elf_i386_ldso.sh: Likewise.
	* emulparams/hppa64linux.sh: Likewise.
	* emulparams/hppalinux.sh: Likewise.
	* emulparams/hppaobsd.sh: Likewise.
	* emulparams/i386lynx.sh: Likewise.
	* emulparams/i386moss.sh: Likewise.
	* emulparams/i386nto.sh: Likewise.
	* emulparams/i386nw.sh: Likewise.
	* emulparams/m32relf_linux.sh: Likewise.
	* emulparams/m68kpsos.sh: Likewise.
	* emulparams/or32elf.sh: Likewise.
	* emulparams/pjelf.sh: Likewise.
	* emulparams/pjlelf.sh: Likewise.
	* emulparams/ppclynx.sh: Likewise.
	* emulparams/ppcnw.sh: Likewise.
	* emulparams/shelf32_nbsd.sh : Likewise.
	* emulparams/shelf_nbsd.sh: Likewise.
	* emulparams/shelf_nto.sh: Likewise.
	* emulparams/shlelf_nto.sh: Likewise.
	* emulparams/xtensa-config.sh: Likewise.

	* emulparams/armelf_linux.sh (MAXPAGESIZE): Changed to
	"CONSTANT (MAXPAGESIZE)".
	(COMMONPAGESIZE): Changed to "CONSTANT (COMMONPAGESIZE)".
	* emulparams/elf32_sparc.sh: Likewise.
	* emulparams/elf32bmip.sh: Likewise.
	* emulparams/elf32ppccommon.sh: Likewise.
	* emulparams/elf64_ia64.sh: Likewise.
	* emulparams/elf64_s390.sh: Likewise.
	* emulparams/elf64_sparc.sh: Likewise.
	* emulparams/elf64alpha.sh: Likewise.
	* emulparams/elf64ppc.sh: Likewise.
	* emulparams/elf_i386.sh: Likewise.
	* emulparams/elf_i386_vxworks.sh: Likewise.
	* emulparams/elf_s390.sh: Likewise.
	* emulparams/elf_x86_64.sh: Likewise.
	* emulparams/shlelf32_linux.sh: Likewise.
	* emulparams/shlelf_linux.sh: Likewise.

	* emulparams/elf32bmipn32.sh (COMMONPAGESIZE): Changed to
	"CONSTANT (COMMONPAGESIZE)".
	* emulparams/elf32btsmipn32.sh: Likewise.

	* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Add
	"-z max-page-size=" and "-z common-page-size=".
	(gld${EMULATION_NAME}_list_options): Likewise.

	* ld.h (ld_config_type): Add maxpagesize and commonpagesize.

	* ld.texinfo: Document "-z max-page-size=" and
	"-z common-page-size=".

	* ldexp.c (exp_print_token): Handle CONSTANT.
	(fold_name): Likewise.
	* ldgram.y: Likewise.
	* ldlex.l: Likewise.

	* ldmain.c (main): Initiliaze config.maxpagesize and
	config.commonpagesize. Call bfd_emul_set_maxpagesize if
	config.maxpagesize isn't 0. Call bfd_emul_set_commonpagesize if
	config.commonpagesize config.maxpagesize isn't 0.
[...3230 lines suppressed...]
+	send_log "$got\n"
+	unresolved "$test_name"
+	return
+    }
+
+    send_log "$prog tmpdir/$test\n"
+    catch "exec $prog tmpdir/$test" got
+    if ![string match "" $got] then {
+	send_log "$got\n"
+	fail "$test_name"
+	return
+    }
+
+    send_log "$READELF -l --wide tmpdir/$test > tmpdir/$test.out\n"
+    catch "exec $READELF -l --wide tmpdir/$test > tmpdir/$test.out" got
+    if ![string match "" $got] then {
+	send_log "$got\n"
+	unresolved "$test_name"
+	return
+    }
+
+    if { [catch {exec cmp tmpdir/$test.exp tmpdir/$test.out}] } then {
+	send_log "tmpdir/$test.exp tmpdir/$test.out differ.\n"
+	fail "$test_name"
+	return
+    }
+
+    pass "$test_name"
+}
+
+binutils_test strip "-z max-page-size=0x200000" maxpage1
+binutils_test strip "-z max-page-size=0x200000 -z common-page-size=0x100000" maxpage1
+binutils_test strip "-z max-page-size=0x100000" maxpage1
+binutils_test strip "-z max-page-size=0x100000 -z common-page-size=0x1000" maxpage1
+
+binutils_test strip "" maxpage1
+binutils_test strip "-shared" maxpage1
+binutils_test objcopy "" maxpage1
+binutils_test objcopy "-shared" maxpage1
+
+binutils_test objcopy "" tbss1
+binutils_test objcopy "-shared" tbss1
+binutils_test objcopy "-z max-page-size=0x100000" tbss1
+binutils_test objcopy "-z max-page-size=0x100000 -z common-page-size=0x1000" tbss1
+binutils_test objcopy "" tdata1
+binutils_test objcopy "-shared" tdata1
+binutils_test objcopy "-z max-page-size=0x100000" tdata1
+binutils_test objcopy "-z max-page-size=0x100000 -z common-page-size=0x1000" tdata1
+binutils_test objcopy "" tbss2
+binutils_test objcopy "-shared" tbss2
+binutils_test objcopy "-z max-page-size=0x100000" tbss2
+binutils_test objcopy "-z max-page-size=0x100000 -z common-page-size=0x1000" tbss2
+binutils_test objcopy "-z max-page-size=0x100000" tdata2
+binutils_test objcopy "" tdata2
+binutils_test objcopy "-shared" tdata2
+binutils_test objcopy "-z max-page-size=0x100000 -z common-page-size=0x1000" tdata2
--- ld/testsuite/ld-elf/commonpage1.d	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/commonpage1.d	1 Jun 2006 05:40:24 -0000	1.2
@@ -0,0 +1,9 @@
+#source: maxpage1.s
+#ld: -z max-page-size=0x200000 -z common-page-size=0x100000
+#readelf: -l --wide
+#target: *-*-linux*
+
+#...
+  LOAD+.*0x200000
+  LOAD+.*0x200000
+#pass
--- ld/testsuite/ld-elf/maxpage1.d	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/maxpage1.d	1 Jun 2006 05:40:24 -0000	1.2
@@ -0,0 +1,9 @@
+#source: maxpage1.s
+#ld: -z max-page-size=0x200000
+#readelf: -l --wide
+#target: *-*-linux*
+
+#...
+  LOAD+.*0x200000
+  LOAD+.*0x200000
+#pass
--- ld/testsuite/ld-elf/maxpage1.s	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/maxpage1.s	1 Jun 2006 05:40:24 -0000	1.2
@@ -0,0 +1,13 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.long	0
+
+	.data
+	.long	0
--- ld/testsuite/ld-elf/maxpage2.d	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/maxpage2.d	1 Jun 2006 05:40:24 -0000	1.1
@@ -0,0 +1,9 @@
+#source: maxpage1.s
+#ld: -z max-page-size=0x100000
+#readelf: -l --wide
+#target: *-*-linux*
+
+#...
+  LOAD+.*0x100000
+  LOAD+.*0x100000
+#pass
--- ld/testsuite/ld-elf/tbss1.s	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/tbss1.s	1 Jun 2006 05:40:24 -0000	1.1
@@ -0,0 +1,24 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.byte 0
+	.globl bss
+	.section	.bss,"aw",%nobits
+	.p2align 12
+	.type	bss,%object
+	.size	bss,4096
+bss:
+	.zero	4096
+	.globl tbss
+	.section	.tbss,"awT",%nobits
+	.p2align 12
+	.type	tbss,%object
+	.size	tbss,4096
+tbss:
+	.zero	4096
--- ld/testsuite/ld-elf/tbss2.s	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/tbss2.s	1 Jun 2006 05:40:24 -0000	1.1
@@ -0,0 +1,16 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.byte 0
+	.globl tbss
+	.section	.tbss,"awT",%nobits
+	.type	tbss,%object
+	.size	tbss,1
+tbss:
+	.zero	1
--- ld/testsuite/ld-elf/tdata1.s	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/tdata1.s	1 Jun 2006 05:40:24 -0000	1.1
@@ -0,0 +1,24 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.byte 0
+	.globl data
+	.section	.data,"aw",%progbits
+	.p2align 4
+	.type	data,%object
+	.size	data,4096
+data:
+	.zero	4096
+	.globl tdata
+	.section	.tdata,"awT",%progbits
+	.p2align 4
+	.type	tdata,%object
+	.size	tdata,4096
+tdata:
+	.zero	4096
--- ld/testsuite/ld-elf/tdata2.s	1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/tdata2.s	1 Jun 2006 05:40:24 -0000	1.1
@@ -0,0 +1,16 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.byte 0
+	.globl tdata
+	.section	.tdata,"awT",%progbits
+	.type	tdata,%object
+	.size	tdata,1
+tdata:
+	.byte 0

binutils-2.17.50.0.2-build-fixes.patch:
 ld-elfcomm/common1b.c |    6 +++++-
 ld-shared/main.c      |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.2-build-fixes.patch ---
2006-02-14  Jakub Jelinek  <jakub at redhat.com>

ld/testsuite/
	* ld-shared/main.c (main): Prevent warnings about unused p.
	* ld-elfcomm/common1b.c (dummy1): Add __attribute__((__used__)) for
	GCC 3.3+.

--- ld/testsuite/ld-shared/main.c.jj	2001-07-11 15:48:54.000000000 +0200
+++ ld/testsuite/ld-shared/main.c	2006-02-14 10:07:08.000000000 +0100
@@ -40,6 +40,8 @@ main ()
 {
   int (*p) ();
 
+  p = (void *) 0;
+  (void) p;
   printf ("mainvar == %d\n", mainvar);
   printf ("overriddenvar == %d\n", overriddenvar);
   printf ("shlibvar1 == %d\n", shlibvar1);
--- ld/testsuite/ld-elfcomm/common1b.c.jj	2003-04-15 11:38:10.000000000 +0200
+++ ld/testsuite/ld-elfcomm/common1b.c	2006-02-14 10:11:19.000000000 +0100
@@ -1,3 +1,7 @@
-static char dummy1 = 'X';
+static char dummy1
+#if defined __GNUC__ && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+  __attribute__((__used__))
+#endif
+  = 'X';
 char foo1 [] = "Aligned at odd byte.";
 char foo2 [4];

binutils-2.17.50.0.2-elfvsb-test.patch:
 elfvsb.exp |    8 ++++----
 sh1.c      |    6 ++++++
 sh2.c      |   10 ++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-elfvsb-test.patch ---
2004-08-03  Jakub Jelinek  <jakub at redhat.com>

	* ld-elfvsb/sh1.c (overriddenvar, shlib_overriddencall2): If
	!SHARED, move to...
	* ld-elfvsb/sh2.c: ... here.
	* ld-elfvsb/elfvsb.exp: Add -DSHARED to compiler options when building
	{sh[123],main}.c with $picflag.

--- ld/testsuite/ld-elfvsb/sh1.c.jj	2003-05-05 17:46:50.000000000 -0400
+++ ld/testsuite/ld-elfvsb/sh1.c	2004-08-03 13:15:48.000000000 -0400
@@ -13,7 +13,11 @@ extern int mainvar;
 /* This variable is defined in the shared library, and overridden by
    the main program.  */
 #ifndef XCOFF_TEST
+#ifdef SHARED
 int overriddenvar = -1;
+#else
+extern int overriddenvar;
+#endif
 #endif
 
 /* This variable is defined in the shared library.  */
@@ -76,12 +80,14 @@ shlib_shlibcall2 ()
   return shlib_overriddencall2 ();
 }
 
+#ifdef SHARED
 int
 shlib_overriddencall2 ()
 {
   return 7;
 }
 #endif
+#endif
 
 /* This function calls a function defined by the main program.  */
 
--- ld/testsuite/ld-elfvsb/elfvsb.exp.jj	2004-05-27 14:26:05.000000000 -0400
+++ ld/testsuite/ld-elfvsb/elfvsb.exp	2004-08-03 13:13:40.000000000 -0400
@@ -315,8 +315,8 @@ proc visibility_run {visibility} {
 
 	# Now compile the code using -fpic.
 
-	if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] 
-	    || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
+	if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] 
+	    || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
 	    unresolved "visibility ($visibility)"
 	} else {
 	    if { [ string match $visibility "protected" ]
@@ -337,7 +337,7 @@ proc visibility_run {visibility} {
     }
 
     # Now do the same tests again, but this time compile main.c PIC.
-    if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] {
+    if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] {
 	unresolved "visibility ($visibility) (PIC main, non PIC so)"
 	unresolved "visibility ($visibility) (PIC main)"
     } else {
@@ -446,7 +446,7 @@ if { ![ld_compile "$CC -g $CFLAGS" $srcd
 if { ![ld_compile "$CC -g $CFLAGS" $srcdir/$subdir/test.c tmpdir/test.o] } {
     unresolved "weak hidden symbol"
 } else {
-   if { ![ld_compile "$CC -g $CFLAGS $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } {
+   if { ![ld_compile "$CC -g $CFLAGS -DSHARED $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } {
 	unresolved "weak hidden symbol"
     } else {
 	if ![ld_simple_link $ld tmpdir/sh3.so "-shared tmpdir/sh3.o"] {
--- ld/testsuite/ld-elfvsb/sh2.c.jj	2003-05-05 17:46:50.000000000 -0400
+++ ld/testsuite/ld-elfvsb/sh2.c	2004-08-03 13:14:22.000000000 -0400
@@ -44,3 +44,13 @@ visibility_func_weak ()
   return 2;
 }
 #endif
+
+#if !defined (XCOFF_TEST) && !defined (SHARED)
+int overriddenvar = -1;
+
+int
+shlib_overriddencall2 ()
+{
+  return 7;
+}
+#endif


binutils-2.17.50.0.2-ia64-lib64.patch:
 ld/emulparams/elf64_ia64.sh |   10 ++++++++++
 ltconfig                    |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-ia64-lib64.patch ---
2004-05-14  Jakub Jelinek  <jakub at redhat.com>

	* emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on
	ia64-linux if /lib64 tree is present.

--- ld/emulparams/elf64_ia64.sh.jj	2004-02-18 20:06:03.000000000 +0100
+++ ld/emulparams/elf64_ia64.sh	2004-05-14 10:11:22.992278608 +0200
@@ -37,3 +37,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL
 # .dtors.  They have to be next to .sbss/.sbss2/.sdata/.sdata2.
 SMALL_DATA_CTOR=" "
 SMALL_DATA_DTOR=" "
+
+# Linux modify the default library search path to first include
+# a 64-bit specific directory.
+case "$target" in
+  ia64*-linux*)
+    case "$EMULATION_NAME" in
+      *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;;
+    esac
+    ;;
+esac
--- ltconfig	2003-02-03 16:56:49.000000000 +0900
+++ ltconfig	2003-02-03 16:56:49.000000000 +0900
@@ -1240,10 +1240,10 @@
 
   # Find out which ABI we are using (multilib hack).
   case "$host_cpu" in
-  x86_64*|s390*|sparc*|ppc*|powerpc*)
+  x86_64*|s390*|sparc*|ppc*|powerpc*|ia64)
     echo "$progname:@lineno@: checking multilib ABI type" 1>&5
     touch conftest.$ac_ext
-    if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+    if test -d /lib64 && { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
       case `/usr/bin/file conftest.o` in
       *64-bit*)
 	sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"

binutils-2.17.50.0.2-install-info.patch:
 Makefile.in |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE binutils-2.17.50.0.2-install-info.patch ---
2006-05-26  H.J. Lu  <hongjiu.lu at intel.com>

	PR binutils/2701
	PR gcc/27774
	* Makefile.in (install-info): Put it back.

--- intl/Makefile.in.info	2006-05-24 09:01:37.000000000 -0700
+++ intl/Makefile.in	2006-05-26 10:36:01.000000000 -0700
@@ -116,6 +116,7 @@ DEFS-relocatable.o = -DINSTALLDIR="\"$(l
 all: all- at USE_INCLUDED_LIBINTL@
 all-yes: libintl.a libintl.h config.intl
 all-no: # nothing
+install-info: # nothing
 
 libintl.a: $(OBJECTS)
 	rm -f $@

binutils-2.17.50.0.2-kept-section.patch:
 elf-bfd.h |    5 +++++
 elflink.c |   13 +++++++++++++
 2 files changed, 18 insertions(+)

--- NEW FILE binutils-2.17.50.0.2-kept-section.patch ---
2006-04-24  Michael Matz  <matz at suse.de>
	    H.J. Lu  <hongjiu.lu at intel.com>

	* elf-bfd.h (bfd_elf_section_data): Add kept_section.
	(elf_kept_section): New.

	* elflink.c (_bfd_elf_check_kept_section): Cache the result in
	elf_kept_section.

--- bfd/elf-bfd.h.kept	2006-03-16 12:37:42.000000000 -0800
+++ bfd/elf-bfd.h	2006-04-24 20:11:00.000000000 -0700
@@ -1168,6 +1168,10 @@ struct bfd_elf_section_data
      the linker.  */
   asection *next_in_group;
 
+  /* The pointer to the real kept section. It is computed from the
+     kept_section field in asection due to section group.  */ 
+  asection *kept_section;
+
   /* A pointer used for various section optimizations.  */
   void *sec_info;
 };
@@ -1180,6 +1184,7 @@ struct bfd_elf_section_data
 #define elf_group_id(sec)      (elf_section_data(sec)->group.id)
 #define elf_next_in_group(sec) (elf_section_data(sec)->next_in_group)
 #define elf_sec_group(sec)	(elf_section_data(sec)->sec_group)
+#define elf_kept_section(sec) (elf_section_data(sec)->kept_section)
 
 /* Return TRUE if section has been discarded.  */
 #define elf_discarded_section(sec)				\
--- bfd/elflink.c.kept	2006-04-24 15:36:18.000000000 -0700
+++ bfd/elflink.c	2006-04-24 20:18:03.000000000 -0700
@@ -6798,7 +6799,14 @@ _bfd_elf_check_kept_section (asection *s
 {
   asection *kept;
 
+  kept = elf_kept_section (sec);
+  if (kept)
+    return kept;
+
   kept = sec->kept_section;
+  if (!kept)
+    return kept;
+
   if (kept != NULL)
     {
       if (elf_sec_group (sec) != NULL)
@@ -6806,6 +6814,12 @@ _bfd_elf_check_kept_section (asection *s
       if (kept != NULL && sec->size != kept->size)
 	kept = NULL;
     }
+
+  if (kept)
+    elf_kept_section (sec) = kept;
+  else
+    sec->kept_section = NULL;
+
   return kept;
 }
 

binutils-2.17.50.0.2-ltconfig-multilib.patch:
 ltconfig |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE binutils-2.17.50.0.2-ltconfig-multilib.patch ---
--- ltconfig.jj	2003-02-03 16:56:49.000000000 +0900
+++ ltconfig	2003-02-03 16:56:49.000000000 +0900
@@ -1237,6 +1237,23 @@
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
   dynamic_linker='GNU/Linux ld.so'
+
+  # Find out which ABI we are using (multilib hack).
+  case "$host_cpu" in
+  x86_64*|s390*|sparc*|ppc*|powerpc*)
+    echo "$progname:@lineno@: checking multilib ABI type" 1>&5
+    touch conftest.$ac_ext
+    if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+      case `/usr/bin/file conftest.o` in
+      *64-bit*)
+	sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+	sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
   ;;
 
 netbsd*)

binutils-2.17.50.0.2-place-orphan.patch:
 elf64ppc.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.2-place-orphan.patch ---
2003-08-05  Jakub Jelinek  <jakub at redhat.com>

	* emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd.

--- ld/emulparams/elf64ppc.sh.jj	2003-07-28 10:24:45.000000000 -0400
+++ ld/emulparams/elf64ppc.sh	2003-08-05 08:35:58.000000000 -0400
@@ -28,7 +28,8 @@ else
   .toc		0 : { *(.toc) }"
 fi
 OTHER_GOT_RELOC_SECTIONS="
-  .rela.toc	${RELOCATING-0} : { *(.rela.toc) }"
+  .rela.toc	${RELOCATING-0} : { *(.rela.toc) }
+  .rela.opd	${RELOCATING-0} : { *(.rela.opd) }"
 OTHER_READWRITE_SECTIONS="
   .toc1		${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.toc1) }
   .opd		${RELOCATING-0}${RELOCATING+ALIGN(8)} : { KEEP (*(.opd)) }"

binutils-2.17.50.0.2-ppc64-pie.patch:
 elf64-ppc.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.2-ppc64-pie.patch ---
--- bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
+++ bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
@@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_
 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
 		       && !is_opd
 		       && r_type != R_PPC64_TOC)
-		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		{
+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		  if (h->elf.dynindx == -1
+		      && h->elf.root.type == bfd_link_hash_undefweak)
+		  memset (&outrel, 0, sizeof outrel);
+		}
 	      else
 		{
 		  /* This symbol is local, or marked to become local,

binutils-2.17.50.0.2-standards.patch:
 standards.texi |  493 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 322 insertions(+), 171 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-standards.patch ---
--- etc/standards.texi.jj	2002-02-27 11:32:17.000000000 +0100
+++ etc/standards.texi	2005-08-18 19:05:42.000000000 +0200
@@ -3,16 +3,13 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
- at set lastupdate February 14, 2002
+ at set lastupdate June 8, 2005
 @c %**end of header
 
- at ifnottex
- at format
-START-INFO-DIR-ENTRY
+ at dircategory GNU organization
+ at direntry
 * Standards: (standards).        GNU coding standards.
-END-INFO-DIR-ENTRY
- at end format
- at end ifnottex
+ at end direntry
 
 @c @setchapternewpage odd
 @setchapternewpage off
@@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY
 @set CHAPTER node
 @end ifnottex
 
- at ifnottex
-GNU Coding Standards
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ at copying
+The GNU coding standards, last updated @value{lastupdate}.
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1
@@ -43,32 +42,25 @@ with no Invariant Sections, with no
 Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
- at end ifnottex
+ at end copying
 
 @titlepage
 @title GNU Coding Standards
 @author Richard Stallman, et al.
 @author last updated @value{lastupdate}
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, with no
-Front-Cover Texts, and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+ at insertcopying
 @end titlepage
 
- at ifnottex
+ at contents
+
+ at ifnottex
 @node Top, Preface, (dir), (dir)
 @top Version
 
-Last updated @value{lastupdate}.
- at end ifnottex
+ at insertcopying
+ at end ifnottex
 
 @menu
 * Preface::                     About the GNU Coding Standards
@@ -101,15 +93,10 @@ This release of the GNU Coding Standards
 @cindex where to obtain @code{standards.texi}
 @cindex downloading this manual
 If you did not obtain this file directly from the GNU project and
-recently, please check for a newer version.  You can ftp the GNU
-Coding Standards from any GNU FTP host in the directory
- at file{/pub/gnu/standards/}.  The GNU Coding Standards are available
-there in several different formats: @file{standards.text},
- at file{standards.info}, and @file{standards.dvi}, as well as the
-Texinfo ``source'' which is divided in two files:
- at file{standards.texi} and @file{make-stds.texi}.  The GNU Coding
-Standards are also available on the GNU World Wide Web server:
- at uref{http://www.gnu.org/prep/standards_toc.html}.
+recently, please check for a newer version.  You can get the GNU
+Coding Standards from the GNU web server in many
+different formats, including the Texinfo source, PDF, HTML, DVI, plain
+text, and more, at: @uref{http://www.gnu.org/prep/standards/}.
 
 Corrections or suggestions for this document should be sent to
 @email{bug-standards@@gnu.org}.  If you make a suggestion, please include a
@@ -129,11 +116,15 @@ be self-consistent---try to stick to the
 to document them as much as possible.  That way, your program will be
 more maintainable by others.
 
+The GNU Hello program serves as an example of how to follow the GNU
+coding standards for a trivial program which prints @samp{Hello,
+world!}.  @uref{http://www.gnu.org/software/hello/hello.html}.
+
 @node Legal Issues
 @chapter Keeping Free Software Free
 @cindex legal aspects
 
-This @value{CHAPTER} discusses how you can make sure that GNU software
+This chapter discusses how you can make sure that GNU software
 avoids legal difficulties, and other related issues.
 
 @menu
@@ -211,7 +202,7 @@ You might have to take that code out aga
 You don't need papers for changes of a few lines here or there, since
 they are not significant for copyright purposes.  Also, you don't need
 papers if all you get from the suggestion is some ideas, not actual code
-which you use.  For example, if someone send you one implementation, but
+which you use.  For example, if someone sent you one implementation, but
 you write a different implementation of the same idea, you don't need to
 get papers.
 
@@ -221,7 +212,8 @@ result.
 
 We have more detailed advice for maintainers of programs; if you have
 reached the stage of actually maintaining a program for GNU (whether
-released or not), please ask us for a copy.
+released or not), please ask us for a copy.  It is also available
+online for your perusal: @uref{http://www.gnu.org/prep/maintain/}.
 
 @node Trademarks
 @section Trademarks
@@ -232,24 +224,33 @@ packages or documentation.
 
 Trademark acknowledgements are the statements that such-and-such is a
 trademark of so-and-so.  The GNU Project has no objection to the basic
-idea of trademarks, but these acknowledgements feel like kowtowing, so
-we don't use them.  There is no legal requirement for them.
+idea of trademarks, but these acknowledgements feel like kowtowing, 
+and there is no legal requirement for them, so we don't use them.
 
 What is legally required, as regards other people's trademarks, is to
-avoid using them in ways which a reader might read as naming or labeling
-our own programs or activities.  For example, since ``Objective C'' is
-(or at least was) a trademark, we made sure to say that we provide a
-``compiler for the Objective C language'' rather than an ``Objective C
-compiler''.  The latter is meant to be short for the former, but it does
-not explicitly state the relationship, so it could be misinterpreted as
-using ``Objective C'' as a label for the compiler rather than for the
-language.
+avoid using them in ways which a reader might reasonably understand as
+naming or labeling our own programs or activities.  For example, since
+``Objective C'' is (or at least was) a trademark, we made sure to say
+that we provide a ``compiler for the Objective C language'' rather
+than an ``Objective C compiler''.  The latter would have been meant as
+a shorter way of saying the former, but it does not explicitly state
+the relationship, so it could be misinterpreted as using ``Objective
+C'' as a label for the compiler rather than for the language.
+
+Please don't use ``win'' as an abbreviation for Microsoft Windows in
+GNU software or documentation.  In hacker terminology, calling
+something a ``win'' is a form of praise.  If you wish to praise
+Microsoft Windows when speaking on your own, by all means do so, but
+not in GNU software.  Usually we write the name ``Windows'' in full,
+but when brevity is very important (as in file names and sometimes
+symbol names), we abbreviate it to ``w''.  For instance, the files and
+functions in Emacs that deal with Windows start with @samp{w32}.
 
 @node Design Advice
 @chapter General Program Design
 @cindex program design
 
-This @value{CHAPTER} discusses some of the issues you should take into
+This chapter discusses some of the issues you should take into
 account when designing your program.
 
 @c                         Standard or ANSI C
@@ -263,7 +264,7 @@ account when designing your program.
 @c A major revision of the C Standard appeared in 1999.
 
 @menu
-* Source Language::             Which languges to use.
+* Source Language::             Which languages to use.
 * Compatibility::               Compatibility with other implementations
 * Using Extensions::            Using non-standard features
 * Standard C::                  Using Standard C features
@@ -272,7 +273,7 @@ account when designing your program.
 
 @node Source Language
 @section Which Languages to Use
- at cindex programming languges
+ at cindex programming languages
 
 When you want to use a language that gets compiled and runs at high
 speed, the best language to use is C.  Using another language is like
@@ -476,6 +477,7 @@ For example, please write
     ...
 @end smallexample
 
+ at noindent
 instead of:
 
 @smallexample
@@ -488,11 +490,12 @@ instead of:
 
 A modern compiler such as GCC will generate exactly the same code in
 both cases, and we have been using similar techniques with good success
-in several projects.
+in several projects.  Of course, the former method assumes that
+ at code{HAS_FOO} is defined as either 0 or 1.
 
 While this is not a silver bullet solving all portability problems,
-following this policy would have saved the GCC project alone many person
-hours if not days per year.
+and is not always appropriate, following this policy would have saved
+GCC developers many hours, or even days, per year.
 
 In the case of function-like macros like @code{REVERSIBLE_CC_MODE} in
 GCC which cannot be simply used in @code{if( ...)} statements, there is
@@ -510,7 +513,7 @@ an easy workaround.  Simply introduce an
 @node Program Behavior
 @chapter Program Behavior for All Programs
 
-This @value{CHAPTER} describes conventions for writing robust
+This chapter describes conventions for writing robust
 software.  It also describes general standards for error messages, the
 command line interface, and how libraries should behave.
 
@@ -679,10 +682,12 @@ Error messages from compilers should loo
 @end example
 
 @noindent
-If you want to mention the column number, use this format:
+If you want to mention the column number, use one of these formats:
 
 @example
 @var{source-file-name}:@var{lineno}:@var{column}: @var{message}
+ at var{source-file-name}:@var{lineno}. at var{column}: @var{message}   
+
 @end example
 
 @noindent
@@ -692,6 +697,24 @@ of these conventions are chosen for comp
 numbers assuming that space and all ASCII printing characters have
 equal width, and assuming tab stops every 8 columns.
 
+The error message can also give both the starting and ending positions
+of the erroneous text.  There are several formats so that you can
+avoid redundant information such as a duplicate line number.
+Here are the possible formats:
+
+ at example
+ at var{source-file-name}:@var{lineno-1}. at var{column-1}- at var{lineno-2}. at var{column-2}: @var{message}
+ at var{source-file-name}:@var{lineno-1}. at var{column-1}- at var{column-2}: @var{message}
+ at var{source-file-name}:@var{lineno-1}- at var{lineno-2}: @var{message}
+ at end example
+
+ at noindent
+When an error is spread over several files, you can use this format:
+
+ at example
+ at var{file-1}:@var{lineno-1}. at var{column-1}- at var{file-2}:@var{lineno-2}. at var{column-2}: @var{message}
+ at end example
+
 Error messages from other noninteractive programs should look like this:
 
 @example
@@ -722,8 +745,9 @@ input from a source other than a termina
 would do best to print error messages using the noninteractive style.)
 
 The string @var{message} should not begin with a capital letter when
-it follows a program name and/or file name.  Also, it should not end
-with a period.
+it follows a program name and/or file name, because that isn't the
+beginning of a sentence.  (The sentence conceptually starts at the
+beginning of the line.)  Also, it should not end with a period.
 
 Error messages from interactive programs, and other messages such as
 usage messages, should start with a capital letter.  But they should not
@@ -767,9 +791,9 @@ multi-column format.
 @section Standards for Graphical Interfaces
 @cindex graphical user interface
 
- at cindex gtk
+ at cindex gtk+
 When you write a program that provides a graphical user interface,
-please make it work with X Windows and the GTK toolkit unless the
+please make it work with X Windows and the GTK+ toolkit unless the
 functionality specifically requires some alternative (for example,
 ``displaying jpeg images while in console mode'').
 
@@ -819,8 +843,15 @@ option as another way to specify it.  Th
 among GNU utilities, and fewer idiosyncracies for users to remember.
 
 @cindex standard command-line options
+ at cindex options, standard command-line
+ at cindex CGI programs, standard options for
+ at cindex PATH_INFO, specifying standard options as
 All programs should support two standard options: @samp{--version}
-and @samp{--help}.
+and @samp{--help}.  CGI programs should accept these as command-line
+options, and also if given as the @env{PATH_INFO}; for instance,
+visiting @url{http://example.org/p.cgi/--help} in a browser should
+output the same information as invoking @samp{p.cgi --help} from the
+command line.
 
 @table @code
 @cindex @samp{--version} option
@@ -1461,9 +1492,7 @@ Used in @code{gawk}.
 Used in @code{su}.
 
 @item machine
-No listing of which programs already use this;
-someone should check to
-see if any actually do, and tell @email{gnu@@gnu.org}.
+Used in @code{uname}.
 
 @item macro-name
 @samp{-M} in @code{ptx}.
@@ -1573,6 +1602,9 @@ Used in GDB.
 @item no-sort
 @samp{-p} in @code{nm}.
 
+ at item no-splash
+Don't print a startup splash screen.
+
 @item no-split
 Used in @code{makeinfo}.
 
@@ -1740,7 +1772,7 @@ Specify an HTTP proxy.
 @samp{-q} in Make.
 
 @item quiet
-Used in many programs to inhibit the usual output.  @strong{Note:} every
+Used in many programs to inhibit the usual output.  Every
 program accepting @samp{--quiet} should accept @samp{--silent} as a
 synonym.
 
@@ -1855,7 +1887,7 @@ Used by @code{recode} to chose files or 
 
 @item silent
 Used in many programs to inhibit the usual output.
- at strong{Note:} every program accepting
+Every program accepting
 @samp{--silent} should accept @samp{--quiet} as a synonym.
 
 @item size
@@ -2098,7 +2130,7 @@ directory.
 @node Writing C
 @chapter Making The Best Use of C
 
-This @value{CHAPTER} provides advice on how best to use the C language
+This chapter provides advice on how best to use the C language
 when writing GNU software.
 
 @menu
@@ -2128,13 +2160,12 @@ These tools will not work on code not fo
 It is also important for function definitions to start the name of the
 function in column zero.  This helps people to search for function
 definitions, and may also help certain tools recognize them.  Thus,
-the proper format is this:
+using Standard C syntax, the format is this:
 
 @example
 static char *
-concat (s1, s2)        /* Name starts in column zero here */
-     char *s1, *s2;
-@{                     /* Open brace in column zero here */
+concat (char *s1, char *s2)
+@{
   @dots{}
 @}
 @end example
@@ -2145,8 +2176,9 @@ this:
 
 @example
 static char *
-concat (char *s1, char *s2)
-@{
+concat (s1, s2)        /* Name starts in column zero here */
+     char *s1, *s2;
+@{                     /* Open brace in column zero here */
   @dots{}
 @}
 @end example
@@ -2383,7 +2415,7 @@ functions.
 @cindex temporary variables
 It used to be common practice to use the same local variables (with
 names like @code{tem}) over and over for different values within one
-function.  Instead of doing this, it is better declare a separate local
+function.  Instead of doing this, it is better to declare a separate local
 variable for each distinct purpose, and give it a name which is
 meaningful.  This not only makes programs easier to understand, it also
 facilitates optimization by good compilers.  You can also move the
@@ -2584,11 +2616,20 @@ Avoid using the format of semi-internal 
 when there is a higher-level alternative (@code{readdir}).
 
 @cindex non- at sc{posix} systems, and portability
-As for systems that are not like Unix, such as MSDOS, Windows, the
-Macintosh, VMS, and MVS, supporting them is often a lot of work.  When
-that is the case, it is better to spend your time adding features that
-will be useful on GNU and GNU/Linux, rather than on supporting other
-incompatible systems.
+As for systems that are not like Unix, such as MSDOS, Windows, VMS,
+MVS, and older Macintosh systems, supporting them is often a lot of
+work.  When that is the case, it is better to spend your time adding
+features that will be useful on GNU and GNU/Linux, rather than on
+supporting other incompatible systems.
+
+If you do support Windows, please do not abbreviate it as ``win''.  In
+hacker terminology, calling something a ``win'' is a form of praise.
+You're free to praise Microsoft Windows on your own if you want, but
+please don't do this in GNU packages.  Instead of abbreviating
+``Windows'' to ``un'', you can write it in full or abbreviate it to
+``woe'' or ``w''.  In GNU Emacs, for instance, we use @samp{w32} in
+file names of Windows-specific files, but the macro for Windows
+conditionals is called @code{WINDOWSNT}.
 
 It is a good idea to define the ``feature test macro''
 @code{_GNU_SOURCE} when compiling your C files.  When you compile on GNU
@@ -2644,37 +2685,50 @@ while ((c = getchar()) != EOF)
   write(file_descriptor, &c, 1);
 @end example
 
-When calling functions, you need not worry about the difference between
-pointers of various types, or between pointers and integers.  On most
-machines, there's no difference anyway.  As for the few machines where
-there is a difference, all of them support Standard C prototypes, so you can
-use prototypes (perhaps conditionalized to be active only in Standard C)
-to make the code work on those systems.
-
-In certain cases, it is ok to pass integer and pointer arguments
-indiscriminately to the same function, and use no prototype on any
-system.  For example, many GNU programs have error-reporting functions
-that pass their arguments along to @code{printf} and friends:
-
- at example
-error (s, a1, a2, a3)
-     char *s;
-     char *a1, *a2, *a3;
-@{
-  fprintf (stderr, "error: ");
-  fprintf (stderr, s, a1, a2, a3);
-@}
+It used to be ok to not worry about the difference between pointers
+and integers when passing arguments to functions.  However, on most
+modern 64-bit machines pointers are wider than @code{int}.
+Conversely, integer types like @code{long long int} and @code{off_t}
+are wider than pointers on most modern 32-bit machines.  Hence it's
+often better nowadays to use prototypes to define functions whose
+argument types are not trivial.
+
+In particular, if functions accept varying argument counts or types
+they should be declared using prototypes containing @samp{...} and
+defined using @file{stdarg.h}.  For an example of this, please see the
+ at uref{http://www.gnu.org/software/gnulib/, Gnulib} error module, which
+declares and defines the following function:
+
+ at example
+/* Print a message with `fprintf (stderr, FORMAT, ...)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
+
+void error (int status, int errnum, const char *format, ...);
 @end example
 
- at noindent
-In practice, this works on all machines, since a pointer is generally
-the widest possible kind of argument; it is much simpler than any
-``correct'' alternative.  Be sure @emph{not} to use a prototype for such
-functions.
+A simple way to use the Gnulib error module is to obtain the two
+source files @file{error.c} and @file{error.h} from the Gnulib library
+source code repository at
+ at uref{http://savannah.gnu.org/cgi-bin/viewcvs/gnulib/gnulib/lib/}.
+Here's a sample use:
 
-If you have decided to use Standard C, then you can instead define
- at code{error} using @file{stdarg.h}, and pass the arguments along to
- at code{vfprintf}.
+ at example
+#include "error.h"
+#include <errno.h>
+#include <stdio.h>
+
+char *program_name = "myprogram";
+
+FILE *
+xfopen (char const *name)
+@{
+  FILE *fp = fopen (name, "r");
+  if (! fp)
+    error (1, errno, "cannot read %s", name);
+  return fp;
+@}
+ at end example
 
 @cindex casting pointers to integers
 Avoid casting pointers to integers if you can.  Such casts greatly
@@ -3000,10 +3054,13 @@ together, we can make the whole subject 
 
 The manual which discusses a program should certainly document all of
 the program's command-line options and all of its commands.  It should
-give examples of their use.  But don't organize the manual as a list of
-features.  Instead, organize it logically, by subtopics.  Address the
-questions that a user will ask when thinking about the job that the
-program does.
+give examples of their use.  But don't organize the manual as a list
+of features.  Instead, organize it logically, by subtopics.  Address
+the questions that a user will ask when thinking about the job that
+the program does.  Don't just tell the reader what each feature can
+do---say what jobs it is good for, and show how to use it for those
+jobs.  Explain what is recommended usage, and what kinds of usage
+users should avoid.
 
 In general, a GNU manual should serve both as tutorial and reference.
 It should be set up for convenient access to each topic through Info,
@@ -3030,9 +3087,9 @@ functions, variables, options, and impor
 the program.  One combined Index should do for a short manual, but
 sometimes for a complex package it is better to use multiple indices.
 The Texinfo manual includes advice on preparing good index entries, see
- at ref{Index Entries, , Making Index Entries, texinfo, The GNU Texinfo
-Manual}, and see @ref{Indexing Commands, , Defining the Entries of an
-Index, texinfo, The GNU Texinfo manual}.
+ at ref{Index Entries, , Making Index Entries, texinfo, GNU Texinfo}, and
+see @ref{Indexing Commands, , Defining the Entries of an
+Index, texinfo, GNU Texinfo}.
 
 Don't use Unix man pages as a model for how to write GNU documentation;
 most of them are terse, badly structured, and give inadequate
@@ -3041,15 +3098,15 @@ exceptions.)  Also, Unix man pages use a
 different from what we use in GNU manuals.
 
 Please include an email address in the manual for where to report
-bugs @emph{in the manual}.
+bugs @emph{in the text of the manual}.
 
 Please do not use the term ``pathname'' that is used in Unix
 documentation; use ``file name'' (two words) instead.  We use the term
 ``path'' only for search paths, which are lists of directory names.
 
-Please do not use the term ``illegal'' to refer to erroneous input to a
-computer program.  Please use ``invalid'' for this, and reserve the term
-``illegal'' for activities punishable by law.
+Please do not use the term ``illegal'' to refer to erroneous input to
+a computer program.  Please use ``invalid'' for this, and reserve the
+term ``illegal'' for activities prohibited by law.
 
 @node Doc Strings and Manuals
 @section Doc Strings and Manuals
@@ -3092,7 +3149,7 @@ Each program documented in the manual sh
 @samp{@var{program} Invocation} or @samp{Invoking @var{program}}.  This
 node (together with its subnodes, if any) should describe the program's
 command line arguments and how to run it (the sort of information people
-would look in a man page for).  Start with an @samp{@@example}
+would look for in a man page).  Start with an @samp{@@example}
 containing a template for all the options and arguments that the program
 uses.
 
@@ -3210,6 +3267,11 @@ code.  For example, ``New function'' is 
 you add a function, because there should be a comment before the
 function definition to explain what it does.
 
+In the past, we recommended not mentioning changes in non-software
+files (manuals, help files, etc.) in change logs.  However, we've been
+advised that it is a good idea to include them, for the sake of
+copyright records.
+
 However, sometimes it is useful to write one line to describe the
 overall purpose of a batch of changes.
 
@@ -3224,9 +3286,9 @@ Then describe the changes you made to th
 @cindex change logs, style
 
 Here are some simple examples of change log entries, starting with the
-header line that says who made the change and when, followed by
-descriptions of specific changes.  (These examples are drawn from Emacs
-and GCC.)
+header line that says who made the change and when it was installed,
+followed by descriptions of specific changes.  (These examples are
+drawn from Emacs and GCC.)
 
 @example
 1998-08-17  Richard Stallman  <rms@@gnu.org>
@@ -3270,6 +3332,27 @@ Break long lists of function names by cl
 (Fexecute_extended_command): Deal with `keymap' property.
 @end example
 
+When you install someone else's changes, put the contributor's name in
+the change log entry rather than in the text of the entry.  In other
+words, write this:
+
+ at example
+2002-07-14  John Doe  <jdoe@@gnu.org>
+
+        * sewing.c: Make it sew.
+ at end example
+
+ at noindent
+rather than this:
+
+ at example
+2002-07-14  Usual Maintainer  <usual@@gnu.org>
+
+        * sewing.c: Make it sew.  Patch by jdoe@@gnu.org.
+ at end example
+
+As for the date, that should be the date you applied the change.
+
 @node Simple Changes
 @subsection Simple Changes
 
@@ -3291,12 +3374,17 @@ When you change just comments or doc str
 entry for the file, without mentioning the functions.  Just ``Doc
 fixes'' is enough for the change log.
 
-There's no need to make change log entries for documentation files.
-This is because documentation is not susceptible to bugs that are hard
-to fix.  Documentation does not consist of parts that must interact in a
-precisely engineered fashion.  To correct an error, you need not know
-the history of the erroneous passage; it is enough to compare what the
-documentation says with the way the program actually works.
+There's no technical need to make change log entries for documentation
+files.  This is because documentation is not susceptible to bugs that
+are hard to fix.  Documentation does not consist of parts that must
+interact in a precisely engineered fashion.  To correct an error, you
+need not know the history of the erroneous passage; it is enough to
+compare what the documentation says with the way the program actually
+works.
+
+However, you should keep change logs for documentation files when the
+project gets copyright assignments from its contributors, so as to
+make the records of authorship more accurate.
 
 @node Conditional Changes
 @subsection Conditional Changes
@@ -3387,6 +3475,25 @@ page explaining that you don't maintain 
 is more authoritative.  The note should say how to access the Texinfo
 documentation.
 
+Be sure that man pages include a copyright statement and free
+license.  The simple all-permissive license is appropriate for simple
+man pages:
+
+ at example
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+ at end example
+
+For long man pages, with enough explanation and documentation that
+they can be considered true manuals, use the GFDL (@pxref{License for
+Manuals}).
+
+Finally, the GNU help2man program
+(@uref{http://www.gnu.org/software/help2man/}) is one way to automate
+generation of a man page, in this case from @option{--help} output.
+This is sufficient in many cases.
+
 @node Reading other Manuals
 @section Reading other Manuals
 
@@ -3486,19 +3593,26 @@ this:
 @var{cpu}- at var{company}- at var{system}
 @end example
 
-For example, a Sun 3 might be @samp{m68k-sun-sunos4.1}.
+For example, an Athlon-based GNU/Linux system might be
+ at samp{i686-pc-linux-gnu}.
 
 The @code{configure} script needs to be able to decode all plausible
-alternatives for how to describe a machine.  Thus, @samp{sun3-sunos4.1}
-would be a valid alias.  For many programs, @samp{vax-dec-ultrix} would
-be an alias for @samp{vax-dec-bsd}, simply because the differences
-between Ultrix and @sc{bsd} are rarely noticeable, but a few programs
-might need to distinguish them.
- at c Real 4.4BSD now runs on some Suns.
-
-There is a shell script called @file{config.sub} that you can use
+alternatives for how to describe a machine.  Thus,
+ at samp{athlon-pc-gnu/linux} would be a valid alias.
+There is a shell script called
+ at uref{ftp://ftp.gnu.org/gnu/config/config.sub, @file{config.sub}}
+that you can use
 as a subroutine to validate system types and canonicalize aliases.
 
+The @code{configure} script should also take the option
+ at option{--build=@var{buildtype}}, which should be equivalent to a
+plain @var{buildtype} argument.  For example, @samp{configure
+--build=i686-pc-linux-gnu} is equivalent to @samp{configure
+i686-pc-linux-gnu}.  When the build type is not specified by an option
+or argument, the @code{configure} script should normally guess it
+using the shell script
+ at uref{ftp://ftp.gnu.org/gnu/config/config.guess, @file{config.guess}}.
+
 @cindex optional features, configure-time
 Other options are permitted to specify in more detail the software
 or hardware present on the machine, and include or exclude optional
@@ -3558,6 +3672,11 @@ The @code{configure} script should norma
 system as both the host and the target, thus producing a program which
 works for the same type of machine that it runs on.
 
+To compile a program to run on a host type that differs from the build
+type, use the configure option @option{--host=@var{hosttype}}, where
+ at var{hosttype} uses the same syntax as @var{buildtype}.  The host type
+normally defaults to the build type.
+
 To configure a cross-compiler, cross-assembler, or what have you, you
 should specify a target different from the host, using the configure
 option @samp{--target=@var{targettype}}.  The syntax for
@@ -3565,22 +3684,14 @@ option @samp{--target=@var{targettype}}.
 look like this:
 
 @example
-./configure @var{hosttype} --target=@var{targettype}
+./configure --host=@var{hosttype} --target=@var{targettype}
 @end example
 
+The target type normally defaults to the host type.
 Programs for which cross-operation is not meaningful need not accept the
 @samp{--target} option, because configuring an entire operating system for
 cross-operation is not a meaningful operation.
 
-Bootstrapping a cross-compiler requires compiling it on a machine other
-than the host it will run on.  Compilation packages accept a
-configuration option @samp{--build=@var{buildtype}} for specifying the
-configuration on which you will compile them, but the configure script
-should normally guess the build machine type (using
- at file{config.guess}), so this option is probably not necessary.  The
-host and target types normally default from the build type, so in
-bootstrapping a cross-compiler you must specify them both explicitly.
-
 Some programs have ways of configuring themselves automatically.  If
 your program is set up to do this, your @code{configure} script can simply
 ignore most of its arguments.
@@ -3596,6 +3707,10 @@ ignore most of its arguments.
 @section Making Releases
 @cindex packaging
 
+You should identify each release with a pair of version numbers, a
+major version and a minor.  We have no objection to using more than
+two numbers, but it is very unlikely that you really need them.
+
 Package the distribution of @code{Foo version 69.96} up in a gzipped tar
 file with the name @file{foo-69.96.tar.gz}.  It should unpack into a
 subdirectory named @file{foo-69.96}.
@@ -3644,13 +3759,6 @@ able to extract all the files even if th
 
 Make sure that all the files in the distribution are world-readable.
 
-Make sure that no file name in the distribution is more than 14
-characters long.  Likewise, no file created by building the program
-should have a name longer than 14 characters.  The reason for this is
-that some systems adhere to a foolish interpretation of the @sc{posix}
-standard, and refuse to open a longer name, rather than truncating as
-they did in the past.
-
 Don't include any symbolic links in the distribution itself.  If the tar
 file contains symbolic links, then people cannot even unpack it on
 systems that don't support symbolic links.  Also, don't use multiple
@@ -3682,16 +3790,27 @@ other files to get.
 
 A GNU program should not recommend use of any non-free program.  We
 can't stop some people from writing proprietary programs, or stop
-other people from using them, but we can and should avoid helping to
+other people from using them, but we can and should refuse to
 advertise them to new potential customers.  Proprietary software is a
 social and ethical problem, and the point of GNU is to solve that
 problem.
 
+The GNU definition of free software is found on the GNU web site at
+ at url{http://www.gnu.org/philosophy/free-sw.html}.  A list of
+important licenses and whether they qualify as free is in
+ at url{http://www.gnu.org/licenses/license-list.html}.  The terms
+``free'' and ``non-free'', used in this document, refer to that
+definition.  If it is not clear whether a license qualifies as free
+under this definition, please ask the GNU Project by writing to
+ at email{licensing@@gnu.org}.  We will answer, and if the license is an
+important one, we will add it to the list.
+
 When a non-free program or system is well known, you can mention it in
 passing---that is harmless, since users who might want to use it
 probably already know about it.  For instance, it is fine to explain
-how to build your package on top of some non-free operating system, or
-how to use it together with some widely used non-free program.
+how to build your package on top of some widely used non-free
+operating system, or how to use it together with some widely used
+non-free program.
 
 However, you should give only the necessary information to help those
 who already use the non-free program to use your program with
@@ -3700,8 +3819,8 @@ proprietary program, and don't imply tha
 enhances your program, or that its existence is in any way a good
 thing.  The goal should be that people already using the proprietary
 program will get the advice they need about how to use your free
-program, while people who don't already use the proprietary program
-will not see anything to lead them to take an interest in it.
+program with it, while people who don't already use the proprietary
+program will not see anything to lead them to take an interest in it.
 
 If a non-free program or system is obscure in your program's domain,
 your program should not mention or support it at all, since doing so
@@ -3709,13 +3828,46 @@ would tend to popularize the non-free pr
 your program.  (You cannot hope to find many additional users among
 the users of Foobar if the users of Foobar are few.)
 
+Sometimes a program is free software in itself but depends on a
+non-free platform in order to run.  For instance, many Java programs
+depend on Sun's Java implementation, and won't run on the GNU Java
+Compiler (which does not yet have all the features) or won't run with
+the GNU Java libraries.  To recommend that program is inherently to
+recommend the non-free platform as well; if you should not do the
+latter, then don't do the former.
+
 A GNU package should not refer the user to any non-free documentation
 for free software.  Free documentation that can be included in free
-operating systems is essential for completing the GNU system, so it is
-a major focus of the GNU Project; to recommend use of documentation
-that we are not allowed to use in GNU would undermine the efforts to
-get documentation that we can include.  So GNU packages should never
-recommend non-free documentation.
+operating systems is essential for completing the GNU system, or any
+free operating system, so it is a major focus of the GNU Project; to
+recommend use of documentation that we are not allowed to use in GNU
+would weaken the impetus for the community to produce documentation
+that we can include.  So GNU packages should never recommend non-free
+documentation.
+
+By contrast, it is ok to refer to journal articles and textbooks in
+the comments of a program for explanation of how it functions, even
+though they be non-free.  This is because we don't include such things
+in the GNU system even if we are allowed to--they are outside the
+scope of an operating system project.
+
+Referring to a web site that describes or recommends a non-free
+program is in effect promoting that software, so please do not make
+links (or mention by name) web sites that contain such material.  This
+policy is relevant particularly for the web pages for a GNU package.
+
+Following links from nearly any web site can lead to non-free
+software; this is an inescapable aspect of the nature of the web, and
+in itself is no objection to linking to a site.  As long as the site
+does not itself recommend a non-free program, there is no need be
+concerned about the sites it links to for other reasons.
+
+Thus, for example, you should not make a link to AT&T's web site,
+because that recommends AT&T's non-free software packages; you should
+not make a link to a site that links to AT&T's site saying it is a
+place to get a non-free program; but if a site you want to link to
+refers to AT&T's web site in some other context (such as long-distance
+telephone service), that is not a problem.
 
 @node Copying This Manual
 @appendix Copying This Manual
@@ -3730,13 +3882,12 @@ recommend non-free documentation.
 @unnumbered Index
 @printindex cp
 
- at contents
-
 @bye
- at c Local variables:
- at c eval: (add-hook 'write-file-hooks 'time-stamp)
- at c time-stamp-start: "@set lastupdate "
- at c time-stamp-end: "$"
- at c time-stamp-format: "%:b %:d, %:y"
- at c compile-command: "make just-standards"
- at c End:
+
+Local variables:
+eval: (add-hook 'write-file-hooks 'time-stamp)
+time-stamp-start: "@set lastupdate "
+time-stamp-end: "$"
+time-stamp-format: "%:b %:d, %:y"
+compile-command: "make just-standards"
+End:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	9 May 2006 13:14:46 -0000	1.25
+++ .cvsignore	1 Jun 2006 09:43:59 -0000	1.26
@@ -1 +1 @@
-binutils-2.17.50.0.1.tar.bz2
+binutils-2.17.50.0.2.tar.bz2


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- binutils.spec	9 May 2006 13:14:46 -0000	1.80
+++ binutils.spec	1 Jun 2006 09:43:59 -0000	1.81
@@ -1,18 +1,21 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
-Version: 2.17.50.0.1
+Version: 2.17.50.0.2
 Release: 1
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
 Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-Patch1: binutils-2.17.50.0.1-ltconfig-multilib.patch
-Patch2: binutils-2.17.50.0.1-ppc64-pie.patch
-Patch3: binutils-2.17.50.0.1-place-orphan.patch
-Patch4: binutils-2.17.50.0.1-ia64-lib64.patch
-Patch5: binutils-2.17.50.0.1-elfvsb-test.patch
-Patch6: binutils-2.17.50.0.1-standards.patch
-Patch7: binutils-2.17.50.0.1-build-fixes.patch
+Patch0: binutils-2.17.50.0.2-20060601.patch
+Patch1: binutils-2.17.50.0.2-ltconfig-multilib.patch
+Patch2: binutils-2.17.50.0.2-ppc64-pie.patch
+Patch3: binutils-2.17.50.0.2-place-orphan.patch
+Patch4: binutils-2.17.50.0.2-ia64-lib64.patch
+Patch5: binutils-2.17.50.0.2-elfvsb-test.patch
+Patch6: binutils-2.17.50.0.2-standards.patch
+Patch7: binutils-2.17.50.0.2-build-fixes.patch
+Patch8: binutils-2.17.50.0.2-install-info.patch
+Patch9: binutils-2.17.50.0.2-kept-section.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -38,6 +41,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .20060601~
 %patch1 -p0 -b .ltconfig-multilib~
 %patch2 -p0 -b .ppc64-pie~
 %patch3 -p0 -b .place-orphan~
@@ -49,6 +53,8 @@
 %patch5 -p0 -b .elfvsb-test~
 %patch6 -p0 -b .standards~
 %patch7 -p0 -b .build-fixes~
+%patch8 -p0 -b .install-info~
+%patch9 -p0 -b .kept-section~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -159,6 +165,11 @@
 %{_infodir}/*info*
 
 %changelog
+* Thu Jun  1 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-1
+- update to 2.17.50.0.2
+- update from CVS to 20060601
+- speed up the ELF linker by caching the result of kept section check
+
 * Tue May  9 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.1-1
 - update to 2.17.50.0.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	9 May 2006 13:14:46 -0000	1.26
+++ sources	1 Jun 2006 09:43:59 -0000	1.27
@@ -1 +1 @@
-cfecfb29e260225fa192654f3763c2f8  binutils-2.17.50.0.1.tar.bz2
+af337e084c3a4c019fd297a622889d40  binutils-2.17.50.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 09:55:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 05:55:23 -0400
Subject: rpms/pwlib/FC-5 pwlib.spec,1.32,1.33 sources,1.13,1.14
Message-ID: <200606010955.k519tNHU009379@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/pwlib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9188

Modified Files:
	pwlib.spec sources 
Log Message:
Doing a rebuild of new version for FC5, daniel



Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/FC-5/pwlib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pwlib.spec	12 Mar 2006 23:05:16 -0000	1.32
+++ pwlib.spec	1 Jun 2006 09:55:20 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.10.0
-Release:        1
+Version:	1.10.1
+Release:        1.FC5
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 #We still need this for ppc64 it was not updated in 1.8.4
@@ -90,6 +90,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Wed May 31 2006 Daniel Veillard <veillard at redhat.com> - 1.10.1-1
+- update for ekiga 2.0.2 release
+
 * Mon Mar 13 2006 Daniel Veillard <veillard at redhat.com> - 1.10.0-1
 - final version for ekiga 2.0.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pwlib/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Mar 2006 23:05:16 -0000	1.13
+++ sources	1 Jun 2006 09:55:20 -0000	1.14
@@ -1 +1 @@
-97da19588bdc25cd8b48afb135eded1d  pwlib-1.10.0.tar.gz
+51414920d7b21125df2bf6870c0fc2e4  pwlib-1.10.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:04:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:04:34 -0400
Subject: rpms/alsa-lib/FC-5 alsa-lib-1.0.10-ainit-3.patch, NONE,
	1.1 alsa-lib.spec, 1.43, 1.44 alsa-lib-1.0.10-ainit-2.patch,
	1.1, NONE
Message-ID: <200606011004.k51A4Ypt011568@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11543

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.10-ainit-3.patch 
Removed Files:
	alsa-lib-1.0.10-ainit-2.patch 
Log Message:
fixed releasing shared semaphore

alsa-lib-1.0.10-ainit-3.patch:
 pcm_direct.c |   17 ++++++-----
 pcm_direct.h |    7 +++-
 pcm_dmix.c   |   87 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 pcm_dshare.c |   78 +++++++++++++++++++++++++++++++++++++++++++++-------
 pcm_dsnoop.c |   74 ++++++++++++++++++++++++++++++++++++++++++++------
 5 files changed, 220 insertions(+), 43 deletions(-)

--- NEW FILE alsa-lib-1.0.10-ainit-3.patch ---
--- alsa-lib-1.0.10/src/pcm/pcm_direct.h.ainit	2005-09-01 19:31:52.000000000 +0200
+++ alsa-lib-1.0.10/src/pcm/pcm_direct.h	2005-11-24 15:36:53.000000000 +0100
@@ -79,7 +79,10 @@
 
 struct snd_pcm_direct {
 	snd_pcm_type_t type;		/* type (dmix, dsnoop, dshare) */
-	key_t ipc_key;			/* IPC key for semaphore and memory */
+	key_t ipc_mem_direct;		/* IPC key for first memory - for pcm_direct.c */
+	key_t ipc_mem_plug;		/* IPC key for second memory - for dmix/dsnoop/... */
+	key_t ipc_sem;			/* IPC key for semaphore */
+	int share_ipc_key;              /* old ipc_key style */
 	mode_t ipc_perm;		/* IPC socket permissions */
 	int ipc_gid;			/* IPC socket gid */
 	int semid;			/* IPC global semaphore identification */
@@ -135,7 +138,7 @@
 static inline int snd_pcm_direct_semaphore_discard(snd_pcm_direct_t *dmix)
 {
 	if (dmix->semid >= 0) {
-		if (semctl(dmix->semid, 0, IPC_RMID, NULL) < 0)
+		if (dmix->share_ipc_key && semctl(dmix->semid, 0, IPC_RMID, NULL) < 0)
 			return -errno;
 		dmix->semid = -1;
 	}
--- alsa-lib-1.0.10/src/pcm/pcm_dmix.c.ainit	2005-09-19 14:37:08.000000000 +0200
+++ alsa-lib-1.0.10/src/pcm/pcm_dmix.c	2005-11-24 15:00:05.000000000 +0100
@@ -74,12 +74,12 @@
 	       dmix->shmptr->s.buffer_size *
 	       sizeof(signed int);	
 retryshm:
-	dmix->u.dmix.shmid_sum = shmget(dmix->ipc_key + 1, size,
-					IPC_CREAT | dmix->ipc_perm);
+	dmix->u.dmix.shmid_sum = shmget(dmix->ipc_mem_plug, size, 
+                                        IPC_CREAT | dmix->ipc_perm);
 	err = -errno;
 	if (dmix->u.dmix.shmid_sum < 0) {
 		if (errno == EINVAL)
-		if ((tmpid = shmget(dmix->ipc_key + 1, 0, dmix->ipc_perm)) != -1)
+		if ((tmpid = shmget(dmix->ipc_mem_plug, 0, dmix->ipc_perm)) != -1)
 		if (!shmctl(tmpid, IPC_STAT, &buf))
 	    	if (!buf.shm_nattch) 
 		/* no users so destroy the segment */
@@ -119,8 +119,10 @@
 	if (shmctl(dmix->u.dmix.shmid_sum, IPC_STAT, &buf) < 0)
 		return -errno;
 	if (buf.shm_nattch == 0) {	/* we're the last user, destroy the segment */
-		if (shmctl(dmix->u.dmix.shmid_sum, IPC_RMID, NULL) < 0)
-			return -errno;
+		if (dmix->share_ipc_key) {
+			if (shmctl(dmix->u.dmix.shmid_sum, IPC_RMID, NULL) < 0)
+				return -errno;
+                }
 		ret = 1;
 	}
 	dmix->u.dmix.shmid_sum = -1;
@@ -744,7 +746,12 @@
  *          changed in future.
  */
 int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
-		      key_t ipc_key, mode_t ipc_perm, int ipc_gid,
+                      key_t ipc_sem,
+                      key_t ipc_mem_direct,
+                      key_t ipc_mem_plug,
+                      int share_ipc_key,
+                      mode_t ipc_perm,
+		      int ipc_gid,
 		      struct slave_params *params,
 		      snd_config_t *bindings,
 		      int slowptr,
@@ -773,9 +780,15 @@
 	if (ret < 0)
 		goto _err_nosem;
 	
-	dmix->ipc_key = ipc_key;
+	dmix->ipc_sem = ipc_sem;
+        dmix->ipc_mem_direct = ipc_mem_direct;
+        dmix->ipc_mem_plug = ipc_mem_plug;
+
 	dmix->ipc_perm = ipc_perm;
 	dmix->ipc_gid = ipc_gid;
+
+        dmix->share_ipc_key = share_ipc_key;
+
 	dmix->semid = -1;
 	dmix->shmid = -1;
 
@@ -1049,7 +1062,10 @@
 	snd_config_t *slave = NULL, *bindings = NULL, *sconf;
 	struct slave_params params;
 	int bsize, psize, ipc_key_add_uid = 0, slowptr = 0;
-	key_t ipc_key = 0;
+	key_t ipc_sem = 0;
+	key_t ipc_mem_direct = 0;
+	key_t ipc_mem_plug = 0;
+	int share_ipc_key = 0;
 	mode_t ipc_perm = 0600;
 	int ipc_gid = -1;
 	int err;
@@ -1068,7 +1084,40 @@
 
 				return err;
 			}
-			ipc_key = key;
+			ipc_sem = key;
+			ipc_mem_direct = key;
+		        ipc_mem_plug = key+1;
+                        share_ipc_key = 1;
+			continue;
+		}
+		if (strcmp(id, "ipc_sem") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key_mem must be an integer type");
+				return err;
+			}
+			ipc_sem = key;
+			continue;
+		}
+		if (strcmp(id, "ipc_mem_direct") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key_mem must be an integer type");
+				return err;
+			}
+			ipc_mem_direct = key;
+			continue;
+		}
+		if (strcmp(id, "ipc_mem_plug") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key_mem must be an integer type");
+				return err;
+			}
+			ipc_mem_plug = key;
 			continue;
 		}
 		if (strcmp(id, "ipc_perm") == 0) {
@@ -1140,12 +1189,19 @@
 		SNDERR("slave is not defined");
 		return -EINVAL;
 	}
-	if (ipc_key_add_uid)
-		ipc_key += getuid();
-	if (!ipc_key) {
-		SNDERR("Unique IPC key is not defined");
+	if (share_ipc_key && ipc_key_add_uid) {
+		ipc_sem += getuid();
+		ipc_mem_direct += getuid();
+		ipc_mem_plug += getuid();
+        }
+	if (!ipc_sem || !ipc_mem_direct || !ipc_mem_plug) {
+		SNDERR("Unique IPC keys are not defined");
 		return -EINVAL;
 	}
+        if(share_ipc_key && ipc_sem != ipc_mem_direct && ipc_sem != ipc_mem_plug) {
+                SNDERR("New and old IPC keys can't be mixed");
+                return -EINVAL;
+        }
 	/* the default settings, it might be invalid for some hardware */
 	params.format = SND_PCM_FORMAT_S16;
 	params.rate = 48000;
@@ -1181,7 +1237,10 @@
 	params.period_size = psize;
 	params.buffer_size = bsize;
 
-	err = snd_pcm_dmix_open(pcmp, name, ipc_key, ipc_perm, ipc_gid, &params, bindings, slowptr, root, sconf, stream, mode);
+	err = snd_pcm_dmix_open(pcmp, name,
+                                ipc_sem, ipc_mem_direct, ipc_mem_plug, share_ipc_key, 
+                                ipc_perm, ipc_gid, 
+                                &params, bindings, slowptr, root, sconf, stream, mode);
 	if (err < 0)
 		snd_config_delete(sconf);
 	return err;
--- alsa-lib-1.0.10/src/pcm/pcm_dshare.c.ainit	2005-11-01 14:35:52.000000000 +0100
+++ alsa-lib-1.0.10/src/pcm/pcm_dshare.c	2005-11-24 15:00:05.000000000 +0100
@@ -589,7 +589,12 @@
  *          changed in future.
  */
 int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
-			key_t ipc_key, mode_t ipc_perm, int ipc_gid,
+                        key_t ipc_sem,
+                        key_t ipc_mem_direct,
+                        key_t ipc_mem_plug,
+                        int share_ipc_key,
+                        mode_t ipc_perm, 
+                        int ipc_gid,
 			struct slave_params *params,
 			snd_config_t *bindings,
 			int slowptr,
@@ -624,10 +629,16 @@
 		ret = -EINVAL;
 		goto _err_nosem;
 	}
+
+        dshare->ipc_sem = ipc_sem;
+        dshare->ipc_mem_direct = ipc_mem_direct;
+        dshare->ipc_mem_plug = ipc_mem_plug;
 	
-	dshare->ipc_key = ipc_key;
 	dshare->ipc_perm = ipc_perm;
 	dshare->ipc_gid = ipc_gid;
+
+        dshare->share_ipc_key = share_ipc_key;
+
 	dshare->semid = -1;
 	dshare->shmid = -1;
 
@@ -833,8 +844,11 @@
 	snd_config_t *slave = NULL, *bindings = NULL, *sconf;
 	struct slave_params params;
 	int bsize, psize, ipc_key_add_uid = 0, slowptr = 0;
-	key_t ipc_key = 0;
+        key_t ipc_sem = 0;
+        key_t ipc_mem_direct = 0;
+        key_t ipc_mem_plug = 0;
 	mode_t ipc_perm = 0600;
+        int share_ipc_key = 0;
 	int ipc_gid = -1;
 	
 	int err;
@@ -852,7 +866,40 @@
 				SNDERR("The field ipc_key must be an integer type");
 				return err;
 			}
-			ipc_key = key;
+			ipc_sem = key;
+			ipc_mem_direct = key;
+			ipc_mem_plug = key+1;
+			share_ipc_key = 1;
+			continue;
+		}
+		if (strcmp(id, "ipc_sem") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key must be an integer type");
+				return err;
+			}
+			ipc_sem = key;
+			continue;
+		}
+		if (strcmp(id, "ipc_mem_direct") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key must be an integer type");
+				return err;
+			}
+			ipc_mem_direct = key;
+			continue;
+		}
+		if (strcmp(id, "ipc_mem_plug") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key must be an integer type");
+				return err;
+			}
+			ipc_mem_plug = key;
 			continue;
 		}
 		if (strcmp(id, "ipc_perm") == 0) {
@@ -927,12 +974,19 @@
 		SNDERR("slave is not defined");
 		return -EINVAL;
 	}
-	if (ipc_key_add_uid)
-		ipc_key += getuid();
-	if (!ipc_key) {
-		SNDERR("Unique IPC key is not defined");
-		return -EINVAL;
-	}
+	if (ipc_key_add_uid) {
+                ipc_sem += getuid();
+                ipc_mem_direct += getuid();
+                ipc_mem_plug += getuid();				
+	}
+        if (!ipc_sem || !ipc_mem_direct || !ipc_mem_plug) {
+                SNDERR("Unique IPC keys are not defined");
+                return -EINVAL;
+        }
+        if(share_ipc_key && ipc_sem != ipc_mem_direct && ipc_sem != ipc_mem_plug) {
+                SNDERR("New and old IPC keys can't be mixed");
+                return -EINVAL;
+        }
 	/* the default settings, it might be invalid for some hardware */
 	params.format = SND_PCM_FORMAT_S16;
 	params.rate = 48000;
@@ -959,7 +1013,9 @@
 
 	params.period_size = psize;
 	params.buffer_size = bsize;
-	err = snd_pcm_dshare_open(pcmp, name, ipc_key, ipc_perm, ipc_gid, &params, bindings, slowptr, root, sconf, stream, mode);
+	err = snd_pcm_dshare_open(pcmp, name, 
+                                  ipc_sem, ipc_mem_direct, ipc_mem_plug, share_ipc_key, 
+                                  ipc_perm, ipc_gid, &params, bindings, slowptr, root, sconf, stream, mode);
 	if (err < 0)
 		snd_config_delete(sconf);
 	return err;
--- alsa-lib-1.0.10/src/pcm/pcm_direct.c.ainit	2005-09-19 14:37:08.000000000 +0200
+++ alsa-lib-1.0.10/src/pcm/pcm_direct.c	2005-11-24 15:00:05.000000000 +0100
@@ -60,8 +60,9 @@
 	struct semid_ds buf;
 	int i;
 
-	dmix->semid = semget(dmix->ipc_key, DIRECT_IPC_SEMS,
-			     IPC_CREAT | dmix->ipc_perm);
+        dmix->semid = semget(dmix->ipc_sem, DIRECT_IPC_SEMS,
+                             IPC_CREAT | dmix->ipc_perm);
+
 	if (dmix->semid < 0)
 		return -errno;
 	if (dmix->ipc_gid < 0)
@@ -90,12 +91,12 @@
 	int tmpid, err;
 	
 retryget:
-	dmix->shmid = shmget(dmix->ipc_key, sizeof(snd_pcm_direct_share_t),
-			     IPC_CREAT | dmix->ipc_perm);
+	dmix->shmid = shmget(dmix->ipc_mem_direct, sizeof(snd_pcm_direct_share_t), 
+                             IPC_CREAT | dmix->ipc_perm);
 	err = -errno;
 	if (dmix->shmid < 0){
 		if (errno == EINVAL)
-		if ((tmpid = shmget(dmix->ipc_key, 0, dmix->ipc_perm)) != -1)
+		if ((tmpid = shmget(dmix->ipc_mem_direct, 0, dmix->ipc_perm)) != -1)
 		if (!shmctl(tmpid, IPC_STAT, &buf))
 		if (!buf.shm_nattch)
 	    	/* no users so destroy the segment */
@@ -144,8 +145,10 @@
 	if (shmctl(dmix->shmid, IPC_STAT, &buf) < 0)
 		return -errno;
 	if (buf.shm_nattch == 0) {	/* we're the last user, destroy the segment */
-		if (shmctl(dmix->shmid, IPC_RMID, NULL) < 0)
-			return -errno;
+                if(dmix->share_ipc_key) {
+                   if (shmctl(dmix->shmid, IPC_RMID, NULL) < 0)
+                      return -errno;
+                }
 		ret = 1;
 	}
 	dmix->shmid = -1;
--- alsa-lib-1.0.10/src/pcm/pcm_dsnoop.c.ainit	2005-11-01 14:35:52.000000000 +0100
+++ alsa-lib-1.0.10/src/pcm/pcm_dsnoop.c	2005-11-24 15:00:05.000000000 +0100
@@ -485,7 +485,12 @@
  *          changed in future.
  */
 int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
-			key_t ipc_key, mode_t ipc_perm, int ipc_gid,
+                        key_t ipc_sem,
+                        key_t ipc_mem_direct,
+                        key_t ipc_mem_plug,
+                        int share_ipc_key,
+                        mode_t ipc_perm, 
+                        int ipc_gid,
 			struct slave_params *params,
 			snd_config_t *bindings,
 			int slowptr,
@@ -513,9 +518,15 @@
 	if (ret < 0)
 		goto _err_nosem;
 	
-	dsnoop->ipc_key = ipc_key;
+        dsnoop->ipc_sem = ipc_sem;
+        dsnoop->ipc_mem_direct = ipc_mem_direct;
+        dsnoop->ipc_mem_plug = ipc_mem_plug;
+
 	dsnoop->ipc_perm = ipc_perm;
 	dsnoop->ipc_gid = ipc_gid;
+
+        dsnoop->share_ipc_key = share_ipc_key;
+
 	dsnoop->semid = -1;
 	dsnoop->shmid = -1;
 
@@ -711,7 +722,10 @@
 	snd_config_t *slave = NULL, *bindings = NULL, *sconf;
 	struct slave_params params;
 	int bsize, psize, ipc_key_add_uid = 0, slowptr = 0;
-	key_t ipc_key = 0;
+	key_t ipc_sem = 0;
+	key_t ipc_mem_direct = 0;
+	key_t ipc_mem_plug = 0;
+	int share_ipc_key = 0;
 	mode_t ipc_perm = 0600;
 	int ipc_gid = -1;
 	int err;
@@ -730,9 +744,42 @@
 				SNDERR("The field ipc_key must be an integer type");
 				return err;
 			}
-			ipc_key = key;
+			ipc_sem = key;
+			ipc_mem_direct = key;
+		        ipc_mem_plug = key+1;
+			share_ipc_key = 1;
 			continue;
 		}
+                if (strcmp(id, "ipc_sem") == 0) {
+                        long key;
+                        err = snd_config_get_integer(n, &key);
+                        if (err < 0) {
+                                SNDERR("The field ipc_key must be an integer type");
+                                return err;
+                        }
+                        ipc_sem = key;
+                        continue;
+                }	
+		if (strcmp(id, "ipc_mem_direct") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key_mem must be an integer type");
+				return err;
+			}
+			ipc_mem_direct = key;
+			continue;
+		}
+		if (strcmp(id, "ipc_mem_plug") == 0) {
+			long key;
+			err = snd_config_get_integer(n, &key);
+			if (err < 0) {
+				SNDERR("The field ipc_key_mem must be an integer type");
+				return err;
+			}
+			ipc_mem_plug = key;
+			continue;
+		}	
 		if (strcmp(id, "ipc_perm") == 0) {
 			char *perm;
 			char *endp;
@@ -805,12 +852,19 @@
 		SNDERR("slave is not defined");
 		return -EINVAL;
 	}
-	if (ipc_key_add_uid)
-		ipc_key += getuid();
-	if (!ipc_key) {
-		SNDERR("Unique IPC key is not defined");
+	if (share_ipc_key && ipc_key_add_uid) {
+                ipc_sem += getuid();
+                ipc_mem_direct += getuid();
+                ipc_mem_plug += getuid();
+	}
+	if (!ipc_sem || !ipc_mem_direct || !ipc_mem_plug) {
+		SNDERR("Unique IPC keys are not defined");
 		return -EINVAL;
 	}
+        if(share_ipc_key && ipc_sem != ipc_mem_direct && ipc_sem != ipc_mem_plug) {
+                SNDERR("New and old IPC keys can't be mixed");
+                return -EINVAL;
+        }
 	/* the default settings, it might be invalid for some hardware */
 	params.format = SND_PCM_FORMAT_S16;
 	params.rate = 48000;
@@ -837,7 +891,9 @@
 
 	params.period_size = psize;
 	params.buffer_size = bsize;
-	err = snd_pcm_dsnoop_open(pcmp, name, ipc_key, ipc_perm, ipc_gid, &params, bindings, slowptr, root, sconf, stream, mode);
+	err = snd_pcm_dsnoop_open(pcmp, name, 
+                                  ipc_sem, ipc_mem_direct, ipc_mem_plug, share_ipc_key,
+                                  ipc_perm, ipc_gid, &params, bindings, slowptr, root, sconf, stream, mode);
 	if (err < 0)
 		snd_config_delete(sconf);
 	return err;


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/FC-5/alsa-lib.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- alsa-lib.spec	11 Feb 2006 01:33:41 -0000	1.43
+++ alsa-lib.spec	1 Jun 2006 10:04:32 -0000	1.44
@@ -5,12 +5,12 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3.rc2.2
+Release: 4.rc2
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
 Source1: ainit-%{version_ainit}.tar.gz
-Patch0:  alsa-lib-1.0.10-ainit-2.patch
+Patch0:  alsa-lib-1.0.10-ainit-3.patch
 Patch1:  alsa-lib-1.0.11-group.patch
 Patch2:  alsa-lib-1.0.11-ainit-start.patch
 URL:     http://www.alsa-project.org/
@@ -149,6 +149,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Thu Jun 1 2006 Martin Stransky <stransky at redhat.com> 1.0.11-4.rc2
+- fixed releasing shared semaphore
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-3.rc2.2
 - bump again for double-long bug on ppc(64)
 


--- alsa-lib-1.0.10-ainit-2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:26:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:26:03 -0400
Subject: rpms/opal/FC-5 opal.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200606011026.k51AQ3hd031354@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/opal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31212

Modified Files:
	opal.spec sources 
Log Message:
Pushing an update for ekiga-2.0.2, Daniel



Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/FC-5/opal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- opal.spec	14 Mar 2006 12:56:22 -0000	1.8
+++ opal.spec	1 Jun 2006 10:26:00 -0000	1.9
@@ -1,14 +1,15 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.1
-Release: 1
+Version: 2.2.2
+Release: 1.FC5
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.10.0
-BuildRequires: pwlib-devel >= 1.10.0
+Requires: pwlib >= 1.10.1
+BuildRequires: pwlib-devel >= 1.10.1
 BuildRequires: openldap-devel
+BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
 
@@ -20,7 +21,7 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.0
+Requires: pwlib-devel >= 1.10.1
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
@@ -38,6 +39,8 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm -f $RPM_BUILD_ROOT/%{_datadir}/opal/opal_inc.mak
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,6 +59,10 @@
 %{_datadir}/opal
 
 %changelog
+* Wed May 31 2006 Daniel Veillard <veillard at redhat.com> - 2.2.2-1
+- new release for ekiga-2.0.2
+- try to fix #192740 mutilib problem
+
 * Tue Mar 14 2006 Daniel Veillard <veillard at redhat.com> - 2.2.1-1
 - last minute break fix and new release
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/opal/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2006 12:56:22 -0000	1.4
+++ sources	1 Jun 2006 10:26:00 -0000	1.5
@@ -1 +1 @@
-bc6079100e831cf117597bb99b266a0c  opal-2.2.1.tar.gz
+899e38f5586e3b03d07cc1c55680a56f  opal-2.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:26:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:26:08 -0400
Subject: rpms/libidn/devel libidn.spec,1.30,1.31
Message-ID: <200606011026.k51AQ8BY031414@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/libidn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31385

Modified Files:
	libidn.spec 
Log Message:
* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.2-3
- remove the libidn.la (#172639)



Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libidn.spec	11 May 2006 11:08:29 -0000	1.30
+++ libidn.spec	1 Jun 2006 10:26:06 -0000	1.31
@@ -52,6 +52,8 @@
 # Make multilib safe:
 sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %find_lang %{name}
 
 %post
@@ -75,7 +77,6 @@
 %{_mandir}/man1/idn.1*
 %{_datadir}/emacs/site-lisp
 %{_libdir}/libidn.so.*
-%{_libdir}/libidn.la
 %{_infodir}/%{name}.info.gz
 
 %files devel
@@ -88,6 +89,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.2-3
+- remove the libidn.la (#172639)
+
 * Thu May 11 2006 Joe Orton <jorton at redhat.com> 0.6.2-3
 - make idn-int.h multilib-safe
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:27:21 -0400
Subject: rpms/libidn/devel libidn.spec,1.31,1.32
Message-ID: <200606011027.k51ARLjl031962@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/libidn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31875

Modified Files:
	libidn.spec 
Log Message:
- bump the release



Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libidn.spec	1 Jun 2006 10:26:06 -0000	1.31
+++ libidn.spec	1 Jun 2006 10:27:19 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 0.6.2
-Release: 3
+Release: 4
 URL: http://www.gnu.org/software/libidn
 License: LGPL
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
@@ -89,7 +89,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.2-3
+* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.2-4
 - remove the libidn.la (#172639)
 
 * Thu May 11 2006 Joe Orton <jorton at redhat.com> 0.6.2-3



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:38:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:38:53 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.26,
	1.27
Message-ID: <200606011038.k51AcrRb001221@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1184

Modified Files:
	system-config-printer.spec 
Log Message:
* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-2
- Moved the gtk_html2pango module to the libs package (needed by
  foomatic.py).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- system-config-printer.spec	31 May 2006 15:06:23 -0000	1.26
+++ system-config-printer.spec	1 Jun 2006 10:38:50 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.11
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -86,6 +86,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/foomatic.py*
 %{_datadir}/%{name}/cupshelpers.py*
+%{_datadir}/%{name}/gtk_html2pango.py*
 
 %files
 %defattr(-,root,root)
@@ -99,13 +100,16 @@
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
-%{_datadir}/%{name}/gtk_html2pango.py*
 %{_datadir}/%{name}/*.glade
 %{_datadir}/applications/redhat-system-config-printer.desktop
 %{_sysconfdir}/pam.d/%{name}
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-2
+- Moved the gtk_html2pango module to the libs package (needed by
+  foomatic.py).
+
 * Wed May 31 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-1
 - Split out system-config-printer-libs.
 - Updated to system-config-printer-0.7.11.



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:49:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:49:41 -0400
Subject: rpms/procps/FC-5 procps-3.2.6-watch-timing.patch, NONE,
	1.1 procps.spec, 1.48, 1.49
Message-ID: <200606011049.k51AnfN1018867@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procps/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18835

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.6-watch-timing.patch 
Log Message:
fix watch

procps-3.2.6-watch-timing.patch:
 watch.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE procps-3.2.6-watch-timing.patch ---
--- procps-3.2.6/watch.c.timing	2006-06-01 12:07:18.000000000 +0200
+++ procps-3.2.6/watch.c	2006-06-01 12:17:05.000000000 +0200
@@ -29,6 +29,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <sys/select.h>
+#include <sys/time.h>
+
 #ifdef FORCE_8BIT
 #undef isprint
 #define isprint(x) ( (x>=' '&&x<='~') || (x>=0xa0) )
@@ -148,6 +151,7 @@
 	float interval = 2;
 	char *command;
 	int command_length = 0;	/* not including final \0 */
+	struct timeval tv;
 
 	setlocale(LC_ALL, "");
 	progname = argv[0];
@@ -325,7 +329,10 @@
 
 		first_screen = 0;
 		refresh();
-		usleep(interval * 1000000);
+
+        	tv.tv_sec = (long) interval;
+	        tv.tv_usec = (interval - (int) interval) * 1000000;
+        	select(0, NULL, NULL, NULL, &tv);
 	}
 
 	endwin();


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- procps.spec	20 Apr 2006 23:27:46 -0000	1.48
+++ procps.spec	1 Jun 2006 10:49:39 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.6
-Release: 3.3
+Release: 3.4
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -33,6 +33,8 @@
 Patch15: procps-3.2.6-top-env-cpuloop.patch
 # 185299 - cpu steal time support
 Patch16: procps-3.2.6-cpu-steal.patch
+# 191493 - watch -n doesn't handle large integers properly
+Patch17: procps-3.2.6-watch-timing.patch
 
 BuildRequires: ncurses-devel
 
@@ -75,6 +77,7 @@
 %patch14 -p1 -b .env-vmsize
 %patch15 -p1 -b .env-cpuloop
 %patch16 -p1 -b .steal
+%patch17 -p1 -b .timing
 
 cp %SOURCE1 .
 
@@ -112,6 +115,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Jun  1 2006 Karel Zak <kzak at redhat.com> 3.2.6-3.4
+- fix #191493 - watch -n doesn't handle large integers properly
+
 * Wed Apr 19 2006 Karel Zak <kzak at redhat.com> - 3.2.6-3.3
 - fix #186017 - top "Cpu0" line never updates on single processor machine
                 (bugfix added to the 'remcpu' patch)



From fedora-cvs-commits at redhat.com  Thu Jun  1 10:59:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 06:59:42 -0400
Subject: rpms/automake15/devel automake15.spec,1.12,1.13
Message-ID: <200606011059.k51Axgqs022738@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake15/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22708

Modified Files:
	automake15.spec 
Log Message:
- buildrequire bison for self tests


Index: automake15.spec
===================================================================
RCS file: /cvs/dist/rpms/automake15/devel/automake15.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake15.spec	19 Dec 2005 10:20:38 -0000	1.12
+++ automake15.spec	1 Jun 2006 10:59:39 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake15
 Version:	1.5
-Release:	14
+Release:	15
 License:	GPL
 Group:		Development/Tools
 URL:		http://sources.redhat.com/automake
@@ -14,7 +14,7 @@
 Patch6:		automake-1.5-ppc-ccnoco-test-91853.patch
 Patch7:		automake-1.5-tailfix.patch
 Requires:	perl
-Buildrequires:	autoconf
+Buildrequires:	autoconf, bison
 BuildArchitectures: noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -79,6 +79,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 1.5-15
+- buildrequire bison for self tests
+
 * Mon Dec 19 2005 Karsten Hopp <karsten at redhat.de> 1.5-14
 - fix insthook test:
   tail needs parameters '-n +NUMLINES' instead of '+NUMLINES' now



From fedora-cvs-commits at redhat.com  Thu Jun  1 11:04:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 07:04:08 -0400
Subject: rpms/automake16/devel automake16.spec,1.7,1.8
Message-ID: <200606011104.k51B4851023118@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake16/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23092

Modified Files:
	automake16.spec 
Log Message:
- buildrequire bison for self tests


Index: automake16.spec
===================================================================
RCS file: /cvs/dist/rpms/automake16/devel/automake16.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- automake16.spec	9 Dec 2005 22:39:43 -0000	1.7
+++ automake16.spec	1 Jun 2006 11:04:05 -0000	1.8
@@ -3,14 +3,14 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake16
 Version:	%{api_version}.3
-Release: 5.1
+Release:    6
 License:	GPL
 Group:		Development/Tools
 Source:		ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 URL:		http://sources.redhat.com/automake
 Conflicts:	automake = 1.6.3
 Requires:	perl
-Buildrequires:	autoconf >= 2.52
+Buildrequires:	autoconf >= 2.52 bison
 BuildArchitectures: noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 Patch1:		automake-pythondir-80994.patch
@@ -65,6 +65,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 1.6.3-6
+- buildrequire bison for self tests
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 11:23:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 07:23:35 -0400
Subject: rpms/procps/FC-4 procps-3.2.5-top-cpu0.patch, NONE, 1.1 procps.spec,
	1.40, 1.41
Message-ID: <200606011123.k51BNZZZ016849@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procps/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16834

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.5-top-cpu0.patch 
Log Message:
fix cpu0 line in top

procps-3.2.5-top-cpu0.patch:
 top.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.5-top-cpu0.patch ---
--- procps-3.2.5/top.c.cpu0	2006-06-01 13:06:46.000000000 +0200
+++ procps-3.2.5/top.c	2006-06-01 13:08:35.000000000 +0200
@@ -946,8 +946,14 @@
 
    // and just in case we're 2.2.xx compiled without SMP support...
    if (Cpu_tot == 1) {
-      cpus[1].id = 0;
-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
    }
 
    // now value each separate cpu's tics


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-4/procps.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- procps.spec	11 Jul 2005 08:06:41 -0000	1.40
+++ procps.spec	1 Jun 2006 11:23:33 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.5
-Release: 6.3
+Release: 6.4
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -24,6 +24,8 @@
 Patch11: procps-3.2.5-top-sigwinch.patch
 # 160796 - vmstat crashes when accessing LVM partition.
 Patch12: procps-3.2.5-vmstat-parg.patch
+# 185994 - Top "Cpu0" line never updates on single processor machine
+Patch13: procps-3.2.5-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -63,6 +65,7 @@
 %patch10 -p1 -b .rc
 %patch11 -p1 -b .sigwinch
 %patch12 -p1 -b .parg
+%patch13 -p1 -b .cpu0
 
 cp %SOURCE1 .
 
@@ -100,6 +103,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Jun  1 2006 Karel Zak <kzak at redhat.com> 3.2.5-6.4
+- fix #185994 - top "Cpu0" line never updates on single processor machine
+
 * Mon Jul 11 2005 Karel Zak <kzak at redhat.com> 3.2.5-6.3
 - imporoved procps-3.2.5-sysctl-writeonly.patch
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 11:24:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 07:24:52 -0400
Subject: rpms/procps/devel procps-3.2.3-slabtop-man.patch, NONE,
	1.1 procps-3.2.6-cpu-steal.patch, NONE,
	1.1 procps-3.2.6-top-env-cpuloop.patch, NONE,
	1.1 procps-3.2.6-top-env-vmsize.patch, NONE,
	1.1 procps-3.2.6-watch-timing.patch, NONE,
	1.1 procps-3.2.5-top-remcpu.patch, 1.1, 1.2 procps.spec, 1.46, 1.47
Message-ID: <200606011124.k51BOqG3016924@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16907

Modified Files:
	procps-3.2.5-top-remcpu.patch procps.spec 
Added Files:
	procps-3.2.3-slabtop-man.patch procps-3.2.6-cpu-steal.patch 
	procps-3.2.6-top-env-cpuloop.patch 
	procps-3.2.6-top-env-vmsize.patch 
	procps-3.2.6-watch-timing.patch 
Log Message:
port fc5 stuff to fc6

procps-3.2.3-slabtop-man.patch:
 slabtop.1 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE procps-3.2.3-slabtop-man.patch ---
--- procps-3.2.3/slabtop.1.slabman	2006-04-18 13:39:21.000000000 +0200
+++ procps-3.2.3/slabtop.1	2006-04-18 14:05:41.000000000 +0200
@@ -109,14 +109,16 @@
 .IR /proc/slabinfo ).
 Kernel 2.2 should be supported in the future.
 
+The slabtop statistic header is tracking how many bytes of slabs are being used
+and it not a measure of physical memory. The 'Slab' field in the /proc/meminfo
+file is tracking information about used slab physical memory.
+
 .SH AUTHORS
 Written by Chris Rivera and Robert Love.
 
 .BR slabtop (1)
 was inspired by Martin Bligh's perl script,
 .BR vmtop .
+The procps package is maintained by Albert Cahalan <albert at users.sf.net>.
 
-The procps package is maintained by Robert Love and was created by Michael
-Johnson.
-
-Send bug reports to <procps-list at redhat.com>.
+Please send bug reports to <procps-feedback at lists.sf.net>.

procps-3.2.6-cpu-steal.patch:
 proc/sysinfo.c |    4 ++--
 proc/sysinfo.h |    2 +-
 top.c          |   27 ++++++++++++++++++---------
 top.h          |   13 ++++++++-----
 vmstat.8       |    1 +
 vmstat.c       |   37 +++++++++++++++++++++----------------
 6 files changed, 51 insertions(+), 33 deletions(-)

--- NEW FILE procps-3.2.6-cpu-steal.patch ---

 CPU steal time is the time during which the virtual cpu had runnable tasks,
 but was not scheduled to run itself.  In effect, time during which the virtual
 cpu was waiting on the physical processor.  This is the CPU equivalent of
 iowait time.

 Note: this is second version of the patch -- it uses better format for "Cpus(s)" 
       line in the top command. The original version has been used in FC5 only.

 06/01/2006 -- Karel Zak <kzak at redhat.com>

--- procps-3.2.6/vmstat.8.steal	2003-08-11 01:27:21.000000000 +0200
+++ procps-3.2.6/vmstat.8	2006-05-30 15:22:59.000000000 +0200
@@ -114,6 +114,7 @@
 sy: Time spent running kernel code. (system time)
 id: Time spent idle. Prior to Linux 2.5.41, this includes IO-wait time.
 wa: Time spent waiting for IO. Prior to Linux 2.5.41, shown as zero.
+st: Time spent the virtual CPU waiting for physical CPU.
 
 .PP
 .SH FIELD DESCRIPTION FOR DISK MODE 
--- procps-3.2.6/top.h.steal	2006-05-30 15:22:59.000000000 +0200
+++ procps-3.2.6/top.h	2006-05-30 15:27:16.000000000 +0200
@@ -216,8 +216,8 @@
 // calculations.  It exists primarily for SMP support but serves
 // all environments.
 typedef struct CPU_t {
-   TIC_t u, n, s, i, w, x, y;                             // as represented in /proc/stat
-   TIC_t u_sav, s_sav, n_sav, i_sav, w_sav, x_sav, y_sav; // in the order of our display
+   TIC_t u, n, s, i, w, x, y, z;                                  // as represented in /proc/stat
+   TIC_t u_sav, s_sav, n_sav, i_sav, w_sav, x_sav, y_sav, z_sav;  // in the order of our display
    unsigned id;  // the CPU ID number
 } CPU_t;
 
@@ -389,11 +389,14 @@
 #define STATES_line1  "Tasks:\03" \
    " %3u \02total,\03 %3u \02running,\03 %3u \02sleeping,\03 %3u \02stopped,\03 %3u \02zombie\03\n"
 #define STATES_line2x4  "%s\03" \
-   " %#5.1f%% \02user,\03 %#5.1f%% \02system,\03 %#5.1f%% \02nice,\03 %#5.1f%% \02idle\03\n"
+   " %#5.1f \02user,\03 %#5.1f \02system,\03 %#5.1f \02nice,\03 %#5.1f \02idle\03\n"
 #define STATES_line2x5  "%s\03" \
-   " %#5.1f%% \02user,\03 %#5.1f%% \02system,\03 %#5.1f%% \02nice,\03 %#5.1f%% \02idle,\03 %#5.1f%% \02IO-wait\03\n"
+   " %#5.1f \02user,\03 %#5.1f \02system,\03 %#5.1f \02nice,\03 %#5.1f \02idle,\03 %#5.1f \02IO-wait\03\n"
 #define STATES_line2x6  "%s\03" \
-   " %#4.1f%% \02us,\03 %#4.1f%% \02sy,\03 %#4.1f%% \02ni,\03 %#4.1f%% \02id,\03 %#4.1f%% \02wa,\03 %#4.1f%% \02hi,\03 %#4.1f%% \02si\03\n"
+   " %#4.1f \02us,\03 %#4.1f \02sy,\03 %#4.1f \02ni,\03 %#4.1f \02id,\03 %#4.1f \02wa,\03 %#4.1f \02hi,\03 %#4.1f \02si\03\n"
+#define STATES_line2x7  "%s\03" \
+   " %#4.1f \02us,\03 %#4.1f \02sy,\03 %#4.1f \02ni,\03 %#4.1f \02id,\03 %#4.1f \02wa,\03 %#4.1f \02hi,\03 %#4.1f \02si,\03 %#4.1f \02st\03\n"
+
 #ifdef CASEUP_SUMMK
 #define MEMORY_line1  "Mem: \03" \
    " %8uK \02total,\03 %8uK \02used,\03 %8uK \02free,\03 %8uK \02buffers\03\n"
--- procps-3.2.6/top.c.steal	2006-05-30 15:22:59.000000000 +0200
+++ procps-3.2.6/top.c	2006-05-30 15:28:27.000000000 +0200
@@ -940,14 +940,16 @@
    if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
    cpus[cpu_max].x = 0;  // FIXME: can't tell by kernel version number
    cpus[cpu_max].y = 0;  // FIXME: can't tell by kernel version number
-   num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
+   cpus[cpu_max].z = 0;	 // FIXME: can't tell by kernel version number
+   num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
       &cpus[cpu_max].u,
       &cpus[cpu_max].n,
       &cpus[cpu_max].s,
       &cpus[cpu_max].i,
       &cpus[cpu_max].w,
       &cpus[cpu_max].x,
-      &cpus[cpu_max].y
+      &cpus[cpu_max].y,
+      &cpus[Cpu_tot].z
    );
    if (num < 4)
          std_err("failed /proc/stat read");
@@ -957,9 +959,10 @@
       if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
       cpus[i].x = 0;  // FIXME: can't tell by kernel version number
       cpus[i].y = 0;  // FIXME: can't tell by kernel version number
-      num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
+      cpus[i].y = 0;  // FIXME: can't tell by kernel version number
+      num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
          &cpus[i].id,
-         &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y
+         &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z
       );
       if (num < 4) {
 	 Cpu_tot = i;
@@ -987,6 +990,7 @@
       cpus[0].w = cpus[1].w;
       cpus[0].x = cpus[1].x;
       cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
    
    return cpus;
@@ -1626,6 +1630,8 @@
       States_fmts = STATES_line2x5;
    if (linux_version_code >= LINUX_VERSION(2, 6, 0))  // grrr... only some 2.6.0-testX :-(
       States_fmts = STATES_line2x6;
+   if (linux_version_code >= LINUX_VERSION(2, 6, 7))
+      States_fmts = STATES_line2x7;
 
       /* get virtual page size -- nearing huge! */
    Page_size = getpagesize();
@@ -2897,7 +2903,7 @@
    // we'll trim to zero if we get negative time ticks,
    // which has happened with some SMP kernels (pre-2.4?)
 #define TRIMz(x)  ((tz = (SIC_t)(x)) < 0 ? 0 : tz)
-   SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, tot_frme, tz;
+   SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, z_frme, tot_frme, tz;
    float scale;
 
    u_frme = cpu->u - cpu->u_sav;
@@ -2907,7 +2913,8 @@
    w_frme = cpu->w - cpu->w_sav;
    x_frme = cpu->x - cpu->x_sav;
    y_frme = cpu->y - cpu->y_sav;
-   tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme;
+   z_frme = cpu->z - cpu->z_sav;
+   tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme + z_frme;
    if (tot_frme < 1) tot_frme = 1;
    scale = 100.0 / (float)tot_frme;
 
@@ -2924,7 +2931,8 @@
          (float)i_frme * scale,
          (float)w_frme * scale,
          (float)x_frme * scale,
-         (float)y_frme * scale
+         (float)y_frme * scale,
+	 (float)z_frme * scale
       )
    );
    Msg_row += 1;
@@ -2937,6 +2945,7 @@
    cpu->w_sav = cpu->w;
    cpu->x_sav = cpu->x;
    cpu->y_sav = cpu->y;
+   cpu->z_sav = cpu->z;
 
 #undef TRIMz
 }
@@ -3023,13 +3032,13 @@
 
       if (CHKw(Curwin, View_CPUSUM)) {
          // display just the 1st /proc/stat line
-         summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
+         summaryhlp(&smpcpu[Cpu_tot], "Cpu(s)%:");
       } else {
          int i;
          char tmp[SMLBUFSIZ];
          // display each cpu's states separately
          for (i = 0; i < Cpu_tot; i++) {
-            snprintf(tmp, sizeof(tmp), "Cpu%-3d:", smpcpu[i].id);
+            snprintf(tmp, sizeof(tmp), "Cpu%-3d%%:", smpcpu[i].id);
             summaryhlp(&smpcpu[i], tmp);
          }
       }
--- procps-3.2.6/proc/sysinfo.c.steal	2005-03-14 05:31:27.000000000 +0100
+++ procps-3.2.6/proc/sysinfo.c	2006-05-30 15:22:59.000000000 +0200
@@ -361,7 +361,7 @@
 
 /***********************************************************************/
 
-void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy,
+void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz,
 	     unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
 	     unsigned *restrict intr, unsigned *restrict ctxt,
 	     unsigned int *restrict running, unsigned int *restrict blocked,
@@ -386,7 +386,7 @@
   *cyyy = 0;  /* not separated out until the 2.6.0-test4 kernel */
 
   b = strstr(buff, "cpu ");
-  if(b) sscanf(b,  "cpu  %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy);
+  if(b) sscanf(b,  "cpu  %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy, czzz);
 
   b = strstr(buff, "page ");
   if(b) sscanf(b,  "page %lu %lu", pin, pout);
--- procps-3.2.6/proc/sysinfo.h.steal	2005-10-30 01:55:38.000000000 +0200
+++ procps-3.2.6/proc/sysinfo.h	2006-05-30 15:22:59.000000000 +0200
@@ -56,7 +56,7 @@
 
 #define BUFFSIZE (64*1024)
 typedef unsigned long long jiff;
-extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy,
+extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz,
 	     unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
 	     unsigned *restrict intr, unsigned *restrict ctxt,
 	     unsigned int *restrict running, unsigned int *restrict blocked,
--- procps-3.2.6/vmstat.c.steal	2005-10-30 06:25:00.000000000 +0100
+++ procps-3.2.6/vmstat.c	2006-05-30 15:22:59.000000000 +0200
@@ -150,15 +150,15 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_header(void){
-  printf("procs -----------memory---------- ---swap-- -----io---- --system-- ----cpu----\n");
+  printf("procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------\n");
   printf(
-    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %5s %2s %2s %2s %2s\n",
+    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %5s %2s %2s %2s %2s %2s\n",
     "r","b",
     "swpd", "free", a_option?"inact":"buff", a_option?"active":"cache",
     "si","so",
     "bi","bo",
     "in","cs",
-    "us","sy","id","wa"
+    "us","sy","id","wa","st"
   );
 }
 
@@ -173,13 +173,13 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_format(void) {
-  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %5u %2u %2u %2u %2u\n";
+  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %5u %2u %2u %2u %2u %2u\n";
   unsigned int tog=0; /* toggle switch for cleaner code */
   unsigned int i;
   unsigned int hz = Hertz;
   unsigned int running,blocked,dummy_1,dummy_2;
-  jiff cpu_use[2], cpu_nic[2], cpu_sys[2], cpu_idl[2], cpu_iow[2], cpu_xxx[2], cpu_yyy[2];
-  jiff duse, dsys, didl, diow, Div, divo2;
+  jiff cpu_use[2], cpu_nic[2], cpu_sys[2], cpu_idl[2], cpu_iow[2], cpu_xxx[2], cpu_yyy[2], cpu_zzz[2];
+  jiff duse, dsys, didl, diow, dstl, Div, divo2;
   unsigned long pgpgin[2], pgpgout[2], pswpin[2], pswpout[2];
   unsigned int intr[2], ctxt[2];
   unsigned int sleep_half; 
@@ -190,7 +190,7 @@
   new_header();
   meminfo();
 
-  getstat(cpu_use,cpu_nic,cpu_sys,cpu_idl,cpu_iow,cpu_xxx,cpu_yyy,
+  getstat(cpu_use,cpu_nic,cpu_sys,cpu_idl,cpu_iow,cpu_xxx,cpu_yyy,cpu_zzz,
 	  pgpgin,pgpgout,pswpin,pswpout,
 	  intr,ctxt,
 	  &running,&blocked,
@@ -200,7 +200,8 @@
   dsys= *cpu_sys + *cpu_xxx + *cpu_yyy;
   didl= *cpu_idl;
   diow= *cpu_iow;
-  Div= duse+dsys+didl+diow;
+  dstl= *cpu_zzz;
+  Div= duse+dsys+didl+diow+dstl;
   divo2= Div/2UL;
   printf(format,
 	 running, blocked,
@@ -216,7 +217,8 @@
 	 (unsigned)( (100*duse                    + divo2) / Div ),
 	 (unsigned)( (100*dsys                    + divo2) / Div ),
 	 (unsigned)( (100*didl                    + divo2) / Div ),
-	 (unsigned)( (100*diow                    + divo2) / Div )
+	 (unsigned)( (100*diow                    + divo2) / Div ),
+	 (unsigned)( (100*dstl                    + divo2) / Div )
   );
 
   for(i=1;i<num_updates;i++) { /* \\\\\\\\\\\\\\\\\\\\ main loop ////////////////// */
@@ -226,7 +228,7 @@
 
     meminfo();
 
-    getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,cpu_iow+tog,cpu_xxx+tog,cpu_yyy+tog,
+    getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,cpu_iow+tog,cpu_xxx+tog,cpu_yyy+tog,cpu_zzz+tog,
 	  pgpgin+tog,pgpgout+tog,pswpin+tog,pswpout+tog,
 	  intr+tog,ctxt+tog,
 	  &running,&blocked,
@@ -236,6 +238,7 @@
     dsys= cpu_sys[tog]-cpu_sys[!tog] + cpu_xxx[tog]-cpu_xxx[!tog] + cpu_yyy[tog]-cpu_yyy[!tog];
     didl= cpu_idl[tog]-cpu_idl[!tog];
     diow= cpu_iow[tog]-cpu_iow[!tog];
+    dstl= cpu_zzz[tog]-cpu_zzz[!tog];
 
     /* idle can run backwards for a moment -- kernel "feature" */
     if(debt){
@@ -247,7 +250,7 @@
       didl = 0;
     }
 
-    Div= duse+dsys+didl+diow;
+    Div= duse+dsys+didl+diow+dstl;
     divo2= Div/2UL;
     printf(format,
            running, blocked,
@@ -263,7 +266,8 @@
 	   (unsigned)( (100*duse+divo2)/Div ), /*us*/
 	   (unsigned)( (100*dsys+divo2)/Div ), /*sy*/
 	   (unsigned)( (100*didl+divo2)/Div ), /*id*/
-	   (unsigned)( (100*diow+divo2)/Div )  /*wa*/
+	   (unsigned)( (100*diow+divo2)/Div ), /*wa*/
+           (unsigned)( (100*dstl+divo2)/Div )  /*st*/
     );
   }
 }
@@ -504,13 +508,13 @@
 
 static void sum_format(void) {
   unsigned int running, blocked, btime, processes;
-  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy;
+  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy, cpu_zzz;
   unsigned long pgpgin, pgpgout, pswpin, pswpout;
   unsigned int intr, ctxt;
 
   meminfo();
 
-  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy,
+  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy, &cpu_zzz,
 	  &pgpgin, &pgpgout, &pswpin, &pswpout,
 	  &intr, &ctxt,
 	  &running, &blocked,
@@ -530,6 +534,7 @@
   printf("%13Lu nice user cpu ticks\n", cpu_nic);
   printf("%13Lu system cpu ticks\n", cpu_sys);
   printf("%13Lu idle cpu ticks\n", cpu_idl);
+  printf("%13Lu steal cpu ticks\n", cpu_zzz);
   printf("%13Lu IO-wait cpu ticks\n", cpu_iow);
   printf("%13Lu IRQ cpu ticks\n", cpu_xxx);
   printf("%13Lu softirq cpu ticks\n", cpu_yyy);
@@ -547,11 +552,11 @@
 
 static void fork_format(void) {
   unsigned int running, blocked, btime, processes;
-  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy;
+  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy, cpu_zzz;
   unsigned long pgpgin, pgpgout, pswpin, pswpout;
   unsigned int intr, ctxt;
 
-  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy,
+  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy, &cpu_zzz,
 	  &pgpgin, &pgpgout, &pswpin, &pswpout,
 	  &intr, &ctxt,
 	  &running, &blocked,

procps-3.2.6-top-env-cpuloop.patch:
 top.1 |    7 +++++++
 top.c |   27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

--- NEW FILE procps-3.2.6-top-env-cpuloop.patch ---
--- procps-3.2.6/top.c.env-cpuloop	2006-04-19 19:42:22.000000000 +0200
+++ procps-3.2.6/top.c	2006-04-19 19:44:07.000000000 +0200
@@ -121,6 +121,7 @@
            Secure_mode = 0;     // set if some functionality restricted
 
 static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+static int CPU_loop = 0;	// wait for reliable CPU data
 
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
@@ -1672,6 +1673,8 @@
    
    if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
 	   VIRT_vmsize = 1;
+   if (( getenv("CPULOOP")) && ( atoi(getenv("CPULOOP")) == 1 )) 
+	   CPU_loop = 1;
 }
 
 
@@ -2949,6 +2952,7 @@
 {
    static proc_t **p_table = NULL;
    static CPU_t  *smpcpu = NULL;
+   static int first = 0;
 
    // whoa first time, gotta' prime the pump...
    if (!p_table) {
@@ -2996,6 +3000,27 @@
 
       smpcpu = cpus_refresh(smpcpu);
 
+      if (first==0 && CPU_loop)
+      {
+	 int i;
+	 CPU_t *cpu;
+	 for (i = 0; i < Cpu_tot; i++) {
+           cpu =  &smpcpu[i];
+	   cpu->u_sav = cpu->u;
+	   cpu->s_sav = cpu->s;
+	   cpu->n_sav = cpu->n;
+	   cpu->i_sav = cpu->i;
+	   cpu->w_sav = cpu->w;
+	   cpu->x_sav = cpu->x;
+	   cpu->y_sav = cpu->y;
+	 }
+         tv.tv_sec = Rc.delay_time;
+         tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000;
+         select(0, NULL, NULL, NULL, &tv);
+
+	 smpcpu = cpus_refresh(smpcpu);
+      }
+
       if (CHKw(Curwin, View_CPUSUM)) {
          // display just the 1st /proc/stat line
          summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
@@ -3021,6 +3046,8 @@
    }
 
    SETw(Curwin, NEWFRAM_cwo);
+
+   first = 1;
    return p_table;
 }
 
--- procps-3.2.6/top.1.env-cpuloop	2006-04-19 19:42:22.000000000 +0200
+++ procps-3.2.6/top.1	2006-04-19 19:42:22.000000000 +0200
@@ -1173,6 +1173,13 @@
 Send bug reports to:
    Albert D\. Cahalan, <albert at users.sf.net>
 
+The top command calculates Cpu(s) by looking at the change in CPU time values
+between samples. When you first run it, it has no previous sample to compare
+to, so these initial values are the percentages since boot. It means you need
+at least two loops or you have to ignore summary output from the first loop.
+This is problem for example for batch mode. There is a possible workaround if
+you define the CPULOOP=1 environment variable. The top command will be run one
+extra hidden loop for CPU data before standard output.
 
 .\" ----------------------------------------------------------------------
 .SH 8. HISTORY Former top

procps-3.2.6-top-env-vmsize.patch:
 top.1 |    3 ++-
 top.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.6-top-env-vmsize.patch ---
--- procps-3.2.6/top.1.env-vmsize	2006-04-19 16:50:37.000000000 +0200
+++ procps-3.2.6/top.1	2006-04-19 16:59:23.000000000 +0200
@@ -395,7 +395,8 @@
 o:\fB VIRT\fR \*(EM Virtual Image (kb)
 The total amount of \*(MV used by the task.
 It includes all code, data and shared libraries plus pages that have been
-swapped out.
+swapped out. (Note: you can define the STATSIZE=1 environment variable and the VIRT
+will be calculated from the /proc/#/state VmSize field.)
 
 VIRT = SWAP + RES.
 
--- procps-3.2.6/top.c.env-vmsize	2006-04-19 16:35:20.000000000 +0200
+++ procps-3.2.6/top.c	2006-04-19 16:50:25.000000000 +0200
@@ -120,6 +120,8 @@
            Loops = -1,          // number of iterations, -1 loops forever
            Secure_mode = 0;     // set if some functionality restricted
 
+static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
 static char  Cap_clr_eol    [CAPBUFSIZ],
@@ -1667,6 +1669,9 @@
       Fieldstab[P_PPD].fmts = pid_fmt;
       Fieldstab[P_PPD].head = "       PPID" + 10 - pid_digits;
    }
+   
+   if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
+	   VIRT_vmsize = 1;
 }
 
 
@@ -2194,6 +2199,7 @@
    }
    if (!Frames_libflags) Frames_libflags = L_DEFAULT;
    if (selection_type=='p') Frames_libflags |= PROC_PID;
+   if (VIRT_vmsize) Frames_libflags |= L_status;
 }
 
 
@@ -3157,7 +3163,10 @@
             MKCOL(p->ruser);
             break;
          case P_VRT:
-            MKCOL(scale_num(PAGES_TO_KB(p->size), w, s));
+ 	    if (VIRT_vmsize) 
+		    MKCOL(scale_num(PAGES_TO_KB(p->vm_size), w, s));
+ 	    else
+		    MKCOL(scale_num(PAGES_TO_KB(p->size), w, s));
             break;
          case P_WCH:
             if (No_ksyms) {

procps-3.2.6-watch-timing.patch:
 watch.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE procps-3.2.6-watch-timing.patch ---
--- procps-3.2.6/watch.c.timing	2006-06-01 12:07:18.000000000 +0200
+++ procps-3.2.6/watch.c	2006-06-01 12:17:05.000000000 +0200
@@ -29,6 +29,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <sys/select.h>
+#include <sys/time.h>
+
 #ifdef FORCE_8BIT
 #undef isprint
 #define isprint(x) ( (x>=' '&&x<='~') || (x>=0xa0) )
@@ -148,6 +151,7 @@
 	float interval = 2;
 	char *command;
 	int command_length = 0;	/* not including final \0 */
+	struct timeval tv;
 
 	setlocale(LC_ALL, "");
 	progname = argv[0];
@@ -325,7 +329,10 @@
 
 		first_screen = 0;
 		refresh();
-		usleep(interval * 1000000);
+
+        	tv.tv_sec = (long) interval;
+	        tv.tv_usec = (interval - (int) interval) * 1000000;
+        	select(0, NULL, NULL, NULL, &tv);
 	}
 
 	endwin();

procps-3.2.5-top-remcpu.patch:
 top.c |   61 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 18 deletions(-)

Index: procps-3.2.5-top-remcpu.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps-3.2.5-top-remcpu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.5-top-remcpu.patch	1 Nov 2005 10:37:33 -0000	1.1
+++ procps-3.2.5-top-remcpu.patch	1 Jun 2006 11:24:50 -0000	1.2
@@ -1,6 +1,6 @@
---- procps-3.2.5/top.c.remcpu	2005-10-12 14:11:22.000000000 +0200
-+++ procps-3.2.5/top.c	2005-10-12 14:49:59.000000000 +0200
-@@ -910,6 +910,7 @@
+--- procps-3.2.3/top.c.remcpu	2006-04-18 12:00:28.000000000 +0200
++++ procps-3.2.3/top.c	2006-04-18 12:20:04.000000000 +0200
+@@ -901,6 +901,7 @@
  static CPU_t *cpus_refresh (CPU_t *cpus)
  {
     static FILE *fp = NULL;
@@ -8,7 +8,7 @@
     int i;
     int num;
     // enough for a /proc/stat CPU line (not the intr line)
-@@ -924,34 +925,33 @@
+@@ -915,34 +916,33 @@
                 can hold tics representing the /proc/stat cpu summary (the first
                 line read) -- that slot supports our View_CPUSUM toggle */
        cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t));
@@ -58,7 +58,7 @@
        if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
        cpus[i].x = 0;  // FIXME: can't tell by kernel version number
        cpus[i].y = 0;  // FIXME: can't tell by kernel version number
-@@ -959,9 +959,28 @@
+@@ -950,9 +950,34 @@
           &cpus[i].id,
           &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y
        );
@@ -82,8 +82,14 @@
 +
 +   // and just in case we're 2.2.xx compiled without SMP support...
 +   if (Cpu_tot == 1) {
-+      cpus[1].id = 0;
-+      memcpy(cpus, &cpus[1], sizeof(CPU_t));
++      cpus[0].id = cpus[1].id = 0;
++      cpus[0].u = cpus[1].u;
++      cpus[0].n = cpus[1].n;
++      cpus[0].s = cpus[1].s;
++      cpus[0].i = cpus[1].i;
++      cpus[0].w = cpus[1].w;
++      cpus[0].x = cpus[1].x;
++      cpus[0].y = cpus[1].y;
 +   }
 +   
     return cpus;


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- procps.spec	11 Feb 2006 05:17:46 -0000	1.46
+++ procps.spec	1 Jun 2006 11:24:50 -0000	1.47
@@ -1,18 +1,18 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.6
-Release: 3.2
+Release: 4
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
 Source1: FAQ
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /bin/rm /sbin/ldconfig
+
 Patch1: procps-3.2.5-selinux.patch
 Patch2: procps-3.1.15-misc.patch
 Patch3: procps-3.2.3-FAQ.patch
 Patch4: procps-3.2.1-selinux-workaround.patch
-Patch5: procps-3.2.1-top-vmsize-env.patch
 Patch6: procps-3.2.3-noproc.patch
 Patch7: procps-3.2.3-pseudo.patch
 Patch8: procps-3.2.4-0x9b.patch
@@ -21,8 +21,20 @@
 # 161449 - "top" ignores user and system toprc
 Patch10: procps-3.2.5-top-rc.patch
 # 161303 - 'top' failed when remove cpus
+# 186017 - Top "Cpu0" line never updates on single processor machine
 Patch11: procps-3.2.5-top-remcpu.patch
+# Selinux
 Patch12: procps-3.2.6-libselinux.patch
+# 168444 - Memory usage conflicts with /proc/meminfo 
+Patch13: procps-3.2.3-slabtop-man.patch
+# 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
+Patch14: procps-3.2.6-top-env-vmsize.patch
+# 174619 - workaround for reliable Cpu(s) data in the first loop
+Patch15: procps-3.2.6-top-env-cpuloop.patch
+# 185299 - cpu steal time support
+Patch16: procps-3.2.6-cpu-steal.patch
+# 191493 - watch -n doesn't handle large integers properly
+Patch17: procps-3.2.6-watch-timing.patch
 
 BuildRequires: ncurses-devel
 
@@ -54,7 +66,6 @@
 %patch2 -p1 -b .misc
 %patch3 -p1 -b .FAQ
 %patch4 -p1 -b .selinux-workaround
-%patch5 -p1 -b .top-vmsize-env
 %patch6 -p1 -b .noproc
 %patch7 -p1 -b .pseudo
 %patch8 -p1 -b .0x9b
@@ -62,6 +73,11 @@
 %patch10 -p1 -b .rc
 %patch11 -p1 -b .remcpu
 %patch12 -p1 -b .libselinux
+%patch13 -p1 -b .slabman
+%patch14 -p1 -b .env-vmsize
+%patch15 -p1 -b .env-cpuloop
+%patch16 -p1 -b .steal
+%patch17 -p1 -b .timing
 
 cp %SOURCE1 .
 
@@ -99,6 +115,14 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Jun  1 2006 Karel Zak <kzak at redhat.com> 3.2.6-4
+- fix #191493 - watch -n doesn't handle large integers properly
+- fix #186017 - top "Cpu0" line never updates on single processor machine
+                (bugfix added to the 'remcpu' patch)
+- fix #168444 - memory usage conflicts with /proc/meminfo
+- fix #174619 - top reports wrong values for CPU(s) in batch mode
+- fix #185299 - cpu steal time support
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 11:28:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 07:28:07 -0400
Subject: rpms/dos2unix/devel dos2unix.spec,1.20,1.21
Message-ID: <200606011128.k51BS77O017033@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/dos2unix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17019

Modified Files:
	dos2unix.spec 
Log Message:
* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 3.1-25
- Build with large file support.



Index: dos2unix.spec
===================================================================
RCS file: /cvs/dist/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dos2unix.spec	11 Feb 2006 02:27:02 -0000	1.20
+++ dos2unix.spec	1 Jun 2006 11:28:05 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 24.2.1
+Release: 25
 Group: Applications/Text
 License: Freely distributable
 Source: %{name}-%{version}.tar.bz2
@@ -33,7 +33,7 @@
 
 %build
 make clean
-make CFLAGS="$RPM_OPT_FLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)"
 make link
 
 %install
@@ -56,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 3.1-25
+- Build with large file support.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1-24.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 11:47:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 07:47:06 -0400
Subject: rpms/ksh/devel .cvsignore, 1.6, 1.7 ksh.spec, 1.25, 1.26 sources,
	1.6, 1.7
Message-ID: <200606011147.k51Bl69b011565@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ksh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11535

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
- new upstream source


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Feb 2006 10:09:53 -0000	1.6
+++ .cvsignore	1 Jun 2006 11:47:03 -0000	1.7
@@ -1,3 +1,3 @@
-ast-base-locale.2006-01-24.tgz
-ast-ksh.2006-01-24.tgz
-INIT.2006-01-24.tgz
+ast-ksh.2006-02-14.tgz
+ast-base-locale.2006-02-14.tgz
+INIT.2006-02-14.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ksh.spec	27 Feb 2006 12:24:02 -0000	1.25
+++ ksh.spec	1 Jun 2006 11:47:03 -0000	1.26
@@ -1,5 +1,5 @@
 #ExclusiveArch:  x86_64
-%define       releasedate   2006-01-24
+%define       releasedate   2006-02-14
 #ExcludeArch:  ia64
 
 Name:         ksh
@@ -7,8 +7,8 @@
 URL:          http://www.kornshell.com/
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
-Version:      20060124
-Release:      3
+Version:      20060214
+Release:      1
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source2:      http://www.research.att.com/~gsf/download/tgz/ast-base-locale.%{releasedate}.tgz
@@ -100,6 +100,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 20060214-1
+- new upstream source
+
 * Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 20060124-3
 - PreReq grep, coreutils (#182835)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Feb 2006 10:09:53 -0000	1.6
+++ sources	1 Jun 2006 11:47:03 -0000	1.7
@@ -1,3 +1,3 @@
-d78f60d5429a64eb522fa95df0cb22c1  ast-base-locale.2006-01-24.tgz
-a2ccd63471e460f141d6461d659306b4  ast-ksh.2006-01-24.tgz
-7cbb9964efece69294fae60bb19f0d68  INIT.2006-01-24.tgz
+76a13bdb10a35b5ff67208cf9042a8bf  ast-ksh.2006-02-14.tgz
+f16ea2de409871633c797d4e4f401177  ast-base-locale.2006-02-14.tgz
+375ede1f75db451f645a140ec41b9216  INIT.2006-02-14.tgz



From fedora-cvs-commits at redhat.com  Thu Jun  1 12:13:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 08:13:27 -0400
Subject: rpms/libidn/devel libidn-0.6.2-configdoth.patch, NONE,
	1.1 libidn-0.6.3.tar.gz.sig, NONE, 1.1 .cvsignore, 1.21,
	1.22 libidn.spec, 1.32, 1.33 sources, 1.22, 1.23 upstream,
	1.12, 1.13 libidn-0.6.2.tar.gz.sig, 1.1, NONE
Message-ID: <200606011213.k51CDRup017691@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/libidn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17664

Modified Files:
	.cvsignore libidn.spec sources upstream 
Added Files:
	libidn-0.6.2-configdoth.patch libidn-0.6.3.tar.gz.sig 
Removed Files:
	libidn-0.6.2.tar.gz.sig 
Log Message:
* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.3-1
- update to 0.6.3
- fix some places where gettext() was not getting used


libidn-0.6.2-configdoth.patch:
 strerror-idna.c       |    4 ++++
 strerror-pr29.c       |    4 ++++
 strerror-punycode.c   |    4 ++++
 strerror-stringprep.c |    4 ++++
 strerror-tld.c        |    4 ++++
 5 files changed, 20 insertions(+)

--- NEW FILE libidn-0.6.2-configdoth.patch ---
--- libidn-0.6.2/lib/strerror-punycode.c.configdoth
+++ libidn-0.6.2/lib/strerror-punycode.c
@@ -19,6 +19,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "punycode.h"
 
 #include "gettext.h"
--- libidn-0.6.2/lib/strerror-idna.c.configdoth
+++ libidn-0.6.2/lib/strerror-idna.c
@@ -19,6 +19,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "idna.h"
 
 #include "gettext.h"
--- libidn-0.6.2/lib/strerror-tld.c.configdoth
+++ libidn-0.6.2/lib/strerror-tld.c
@@ -19,6 +19,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "tld.h"
 
 #include "gettext.h"
--- libidn-0.6.2/lib/strerror-pr29.c.configdoth
+++ libidn-0.6.2/lib/strerror-pr29.c
@@ -19,6 +19,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "pr29.h"
 
 #include "gettext.h"
--- libidn-0.6.2/lib/strerror-stringprep.c.configdoth
+++ libidn-0.6.2/lib/strerror-stringprep.c
@@ -19,6 +19,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "stringprep.h"
 
 #include "gettext.h"


--- NEW FILE libidn-0.6.3.tar.gz.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iOoEAAECADQFAkQO1bEtFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz
QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvEG8E/RupHs1EdsJ49bSnnJjbjJ8nQyqI
V2XN5p8Y1pc44z9MiwLWKMtF9lU3SwIVwhz7XaWf1WNIdhYmJfiPNy1gLAnw0AjY
al51p1t8Iz8LNNmRqZmP5v/ewdH4XjcOj8TvHOmemz/rB0iSerZLBkYQOi0pyLSs
TJv0ZqONNEdweUFMTJfBSrsORnDMBcYN/dMVmabP3RTsMng0Ttc2/5S/2x8=
=TH4u
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	7 Feb 2006 11:16:53 -0000	1.21
+++ .cvsignore	1 Jun 2006 12:13:24 -0000	1.22
@@ -1,2 +1 @@
-libidn-0.6.1.tar.gz
-libidn-0.6.2.tar.gz
+libidn-0.6.3.tar.gz


Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libidn.spec	1 Jun 2006 10:27:19 -0000	1.32
+++ libidn.spec	1 Jun 2006 12:13:25 -0000	1.33
@@ -1,10 +1,11 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
-Version: 0.6.2
-Release: 4
+Version: 0.6.3
+Release: 1
 URL: http://www.gnu.org/software/libidn
 License: LGPL
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
+Patch0: libidn-0.6.2-configdoth.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .configdoth
 
 %build
 %configure --disable-csharp
@@ -89,6 +91,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.3-1
+- update to 0.6.3
+- fix some places where gettext() was not getting used
+
 * Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.6.2-4
 - remove the libidn.la (#172639)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	7 Feb 2006 11:16:53 -0000	1.22
+++ sources	1 Jun 2006 12:13:25 -0000	1.23
@@ -1 +1 @@
-b1a771ed18b1ed4b83478a78057134bb  libidn-0.6.2.tar.gz
+d240631c93c7d3a0e93cdf66f536073f  libidn-0.6.3.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/upstream,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- upstream	4 Dec 2005 15:46:40 -0000	1.12
+++ upstream	1 Jun 2006 12:13:25 -0000	1.13
@@ -1 +1 @@
-libidn-0.6.0.tar.gz
+libidn-0.6.3.tar.gz


--- libidn-0.6.2.tar.gz.sig DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 12:14:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 08:14:00 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.5,
	1.6 glibc-kernheaders.spec, 1.140, 1.141 sources, 1.46, 1.47
Message-ID: <200606011214.k51CE0Pu017871@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17839

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
Update to 2.6.16-1.2240_FC6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 May 2006 08:34:37 -0000	1.5
+++ .cvsignore	1 Jun 2006 12:13:58 -0000	1.6
@@ -1 +1 @@
-glibc-kernheaders-2.6.16-1.2211_FC6.tar.bz2
+glibc-kernheaders-2.6.16-1.2240_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- glibc-kernheaders.spec	24 May 2006 08:34:37 -0000	1.140
+++ glibc-kernheaders.spec	1 Jun 2006 12:13:58 -0000	1.141
@@ -1,12 +1,12 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
 Obsoletes: kernel-headers
-Provides: kernel-headers = 2.6.16
+Provides: kernel-headers = 2.6.16-1.2240_FC6
 Prereq: fileutils initscripts >= 5.83
 BuildRequires: unifdef
 %undefine _enable_debug_packages
@@ -17,7 +17,7 @@
 %define _arch i386
 %endif
 
-Source0: glibc-kernheaders-2.6.16-1.2211_FC6.tar.bz2
+Source0: glibc-kernheaders-2.6.16-1.2240_FC6.tar.bz2
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -119,6 +119,11 @@
 /usr/include/*
 
 %changelog
+* Wed May 24 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-37
+- Update to 2.6.16-1.2240_FC6:
+- Remove <asm-s390/sfp-machine.h> at Martin's request
+- Include <sys/types.h> from <linux/input.h> (#193747)
+
 * Wed May 24 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-36
 - Update to 2.6.16-1.2211_FC6:
 - sync_file_range() flags in <linux/fs.h>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	24 May 2006 08:34:37 -0000	1.46
+++ sources	1 Jun 2006 12:13:58 -0000	1.47
@@ -1 +1 @@
-c384db78fe5932355eb71aab0732eede  glibc-kernheaders-2.6.16-1.2211_FC6.tar.bz2
+a5d942426c802beadacee4adeebbbed6  glibc-kernheaders-2.6.16-1.2240_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 12:59:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 08:59:00 -0400
Subject: rpms/cups/devel cups.init,1.9,1.10 cups.spec,1.206,1.207
Message-ID: <200606011259.k51Cx0Vr027694@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27607

Modified Files:
	cups.init cups.spec 
Log Message:
* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-4
- Fix 'service cups reload' not to give an error message.



Index: cups.init
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cups.init	17 May 2006 11:40:41 -0000	1.9
+++ cups.init	1 Jun 2006 12:58:58 -0000	1.10
@@ -84,7 +84,6 @@
 	;;	
 	reload)
 		echo -n $"Reloading $prog: "
-		config
 		killproc $DAEMON -HUP
 		RETVAL=$?
 		echo


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- cups.spec	25 May 2006 11:04:07 -0000	1.206
+++ cups.spec	1 Jun 2006 12:58:58 -0000	1.207
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -381,6 +381,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-4
+- Fix 'service cups reload' not to give an error message.
+
 * Thu May 25 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-3
 - Fix 'localhost' fallback in httpAddrGetList() (bug #192628, STR #1723).
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 13:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 09:01:52 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.140,1.141
Message-ID: <200606011301.k51D1qRQ028295@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28178

Modified Files:
	kdelibs.spec 
Log Message:
drop --enable-new-ldflags, workaround for ld bug



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kdelibs.spec	31 May 2006 13:32:22 -0000	1.140
+++ kdelibs.spec	1 Jun 2006 13:01:14 -0000	1.141
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 2
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -230,7 +230,9 @@
 fi
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTLIB \
    --enable-libsuffix="$suffix" \
@@ -385,6 +387,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
+- drop --enable-new-ldflags, workaround for ld bug
+
 * Wed May 31 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 13:30:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 09:30:54 -0400
Subject: rpms/am-utils/devel am-utils.spec,1.35,1.36
Message-ID: <200606011330.k51DUrNc015606@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/am-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15529

Modified Files:
	am-utils.spec 
Log Message:
- force to use HAVE_LINUX_NFS_MOUNT_H macro, because linux/nfs_mount.h
  check in configure fails on s390x




Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- am-utils.spec	29 May 2006 11:26:06 -0000	1.35
+++ am-utils.spec	1 Jun 2006 13:30:44 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.5
-Release: 1
+Release: 2
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -11,7 +11,6 @@
 Source2: am-utils.conf
 Source3: am-utils.sysconf
 Source4: am-utils.net.map
-Patch1: am-utils-6.1.1-linuxNfsMountCheck.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: gdbm-devel, hesiod-devel, openldap-devel autoconf automake libtool bison
 Requires: portmap, grep, gawk, findutils
@@ -35,8 +34,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .linuxNfsMountCheck
-autoconf
 
 
 find_requires=%{old_find_requires}
@@ -46,7 +43,7 @@
 %build
 %configure \
 	--enable-shared \
-	--enable-am-cflags="$RPM_OPT_FLAGS" \
+	--enable-am-cflags="$RPM_OPT_FLAGS -DHAVE_LINUX_NFS_MOUNT_H" \
 	--enable-libs="-lnsl -lresolv"
 make %{?_smp_flags}
 
@@ -132,6 +129,10 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Thu Jun 01 2006 Peter Vrabec <pvrabec at redhat.com> 5:6.1.5-2
+- force to use HAVE_LINUX_NFS_MOUNT_H macro, because linux/nfs_mount.h 
+  check in configure fails on s390x
+
 * Mon May 29 2006 Peter Vrabec <pvrabec at redhat.com> 5:6.1.5-1
 - upgrade 
 - add build depency



From fedora-cvs-commits at redhat.com  Thu Jun  1 13:49:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 09:49:04 -0400
Subject: rpms/evolution/FC-5
	evolution-2.5.91-check-only-active-folders.patch, NONE,
	1.1.8.1 evolution.spec, 1.137, 1.137.2.1
Message-ID: <200606011349.k51Dn45d000951@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv899

Modified Files:
      Tag: private-2_6_2-check-only-active-folders-branch
	evolution.spec 
Added Files:
      Tag: private-2_6_2-check-only-active-folders-branch
	evolution-2.5.91-check-only-active-folders.patch 
Log Message:
update fix for gnome bug #336074 to 2.6.2

evolution-2.5.91-check-only-active-folders.patch:
 mail-send-recv.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE evolution-2.5.91-check-only-active-folders.patch ---
--- evolution-2.5.91/mail/mail-send-recv.c~	2006-01-16 11:12:25.000000000 +0000
+++ evolution-2.5.91/mail/mail-send-recv.c	2006-02-27 16:41:46.000000000 +0000
@@ -762,6 +762,8 @@ get_folders(CamelStore *store, GPtrArray
 		   controls this refresh process.
 		   TODO: add virtual camel_store_refresh_info() which does this ... */
 		if (camel_url_get_param(((CamelService *)store)->url, "check_all") != NULL
+		    || (camel_url_get_param(((CamelService *)store)->url, "check_subscribed") != NULL
+			&& info->flags & CAMEL_FOLDER_SUBSCRIBED)
 		    || (strcmp(((CamelService *)store)->url->protocol, "imap") != 0
 			&& strcmp(((CamelService *)store)->url->protocol, "groupwise") != 0
 			&& strcmp(((CamelService *)store)->url->protocol, "scalix") != 0)


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.137
retrieving revision 1.137.2.1
diff -u -r1.137 -r1.137.2.1
--- evolution.spec	30 May 2006 14:30:46 -0000	1.137
+++ evolution.spec	1 Jun 2006 13:49:02 -0000	1.137.2.1
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.1
+Release: 1.fc5.1.dwmw2.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -102,6 +102,8 @@
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch809: evolution-2.6.0-prototypes.patch
 
+Patch1000: evolution-2.5.91-check-only-active-folders.patch
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -247,6 +249,8 @@
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch809 -p1 -b .prototypes
 
+%patch1000 -p1 -b .checksub
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}



From fedora-cvs-commits at redhat.com  Thu Jun  1 13:50:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 09:50:14 -0400
Subject: rpms/evolution-data-server/FC-5
	evolution-data-server-1.2.0-vcrap.patch, NONE,
	1.1.6.1 evolution-data-server-1.5.91-check-only-active-folders.patch,
	NONE, 1.1.6.1 evolution-data-server.spec, 1.91, 1.91.2.1
Message-ID: <200606011350.k51DoEe4001442@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1392

Modified Files:
      Tag: private-1_6_2-check-only-active-folders-branch
	evolution-data-server.spec 
Added Files:
      Tag: private-1_6_2-check-only-active-folders-branch
	evolution-data-server-1.2.0-vcrap.patch 
	evolution-data-server-1.5.91-check-only-active-folders.patch 
Log Message:
update fix for gnome bug #336074 to 1.6.2

evolution-data-server-1.2.0-vcrap.patch:
 camel-imap-provider.c |    6 +++++-
 camel-imap-store.c    |    5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE evolution-data-server-1.2.0-vcrap.patch ---
--- evolution-data-server-1.2.0/camel/providers/imap/camel-imap-provider.c~	2005-03-16 08:44:11.000000000 -0700
+++ evolution-data-server-1.2.0/camel/providers/imap/camel-imap-provider.c	2005-03-16 10:12:13.000000000 -0700
@@ -64,9 +64,13 @@ CamelProviderConfEntry imap_conf_entries
 	  N_("Namespace") },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "display_trash", NULL,
+	  N_("Display Trash folder"), "1" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "display_junk", NULL,
+	  N_("Display Junk folder"), "1" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,
 	  N_("_Apply filters to new messages in INBOX on this server"), "0" },
-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", NULL,
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", "display_junk",
 	  N_("Check new messages for _Junk contents"), "0" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk_inbox", "filter_junk",
 	  N_("Only check for Junk messa_ges in the INBOX folder"), "0" },
--- evolution-data-server-1.2.0/camel/providers/imap/camel-imap-store.c~	2005-03-16 08:44:11.000000000 -0700
+++ evolution-data-server-1.2.0/camel/providers/imap/camel-imap-store.c	2005-03-16 10:06:08.000000000 -0700
@@ -277,6 +277,11 @@ construct (CamelService *service, CamelS
 	if (camel_url_get_param (url, "filter_junk_inbox"))
 		imap_store->parameters |= IMAP_PARAM_FILTER_JUNK_INBOX;
 
+	if (!camel_url_get_param (url, "display_trash"))
+		store->flags &= ~CAMEL_STORE_VTRASH;
+	if (!camel_url_get_param (url, "display_junk"))
+		store->flags &= ~CAMEL_STORE_VJUNK;
+
 	/* setup/load the store summary */
 	tmp = alloca(strlen(imap_store->storage_path)+32);
 	sprintf(tmp, "%s/.ev-store-summary", imap_store->storage_path);

evolution-data-server-1.5.91-check-only-active-folders.patch:
 camel-imap-provider.c |    3 +++
 camel-imap-store.c    |   11 +++++++++++
 camel-imap-store.h    |    3 +++
 3 files changed, 17 insertions(+)

--- NEW FILE evolution-data-server-1.5.91-check-only-active-folders.patch ---
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-provider.c~	2006-02-27 14:05:10.000000000 +0000
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-provider.c	2006-02-27 16:43:47.000000000 +0000
@@ -40,8 +40,11 @@ static gint imap_url_equal (gconstpointe
 CamelProviderConfEntry imap_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
 	  N_("Checking for New Mail") },
+	/* FIXME: Ideally we want a list here: Check for mail in: {No folders / INBOX only / subscribed / all} */
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
 	  N_("C_heck for new messages in all folders"), "1" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_subscribed", NULL,
+	  N_("C_heck for new messages in all active folders"), "0" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 #ifndef G_OS_WIN32
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL,
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.c~	2006-02-27 14:05:10.000000000 +0000
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.c	2006-02-27 16:44:51.000000000 +0000
@@ -287,6 +287,8 @@ construct (CamelService *service, CamelS
 	}
 	if (camel_url_get_param (url, "check_all"))
 		imap_store->parameters |= IMAP_PARAM_CHECK_ALL;
+	if (camel_url_get_param (url, "check_subscribed"))
+		imap_store->parameters |= IMAP_PARAM_CHECK_SUBSCRIBED;
 	if (camel_url_get_param (url, "filter")) {
 		imap_store->parameters |= IMAP_PARAM_FILTER_INBOX;
 		store->flags |= CAMEL_STORE_FILTER_INBOX;
@@ -372,6 +374,12 @@ imap_setv (CamelObject *object, CamelExc
 			store->parameters = flags;
 			/* no need to reconnect for this option to take effect... */
 			break;
+		case CAMEL_IMAP_STORE_CHECK_SUBSCRIBED:
+			flags = args->argv[i].ca_int ? IMAP_PARAM_CHECK_SUBSCRIBED : 0;
+			flags |= (store->parameters & ~IMAP_PARAM_CHECK_SUBSCRIBED);
+			store->parameters = flags;
+			/* no need to reconnect for this option to take effect... */
+			break;
 		case CAMEL_IMAP_STORE_FILTER_INBOX:
 			flags = args->argv[i].ca_int ? IMAP_PARAM_FILTER_INBOX : 0;
 			flags |= (store->parameters & ~IMAP_PARAM_FILTER_INBOX);
@@ -427,6 +435,9 @@ imap_getv (CamelObject *object, CamelExc
 		case CAMEL_IMAP_STORE_CHECK_ALL:
 			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_CHECK_ALL ? TRUE : FALSE;
 			break;
+		case CAMEL_IMAP_STORE_CHECK_SUBSCRIBED:
+			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_CHECK_SUBSCRIBED ? TRUE : FALSE;
+			break;
 		case CAMEL_IMAP_STORE_FILTER_INBOX:
 			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_FILTER_INBOX ? TRUE : FALSE;
 			break;
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.h~	2005-09-02 15:37:44.000000000 +0100
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.h	2006-02-27 16:45:26.000000000 +0000
@@ -64,6 +64,7 @@ enum {
 	CAMEL_IMAP_STORE_ARG_NAMESPACE,
 	CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE,
 	CAMEL_IMAP_STORE_ARG_CHECK_ALL,
+	CAMEL_IMAP_STORE_ARG_CHECK_SUBSCRIBED,
 	CAMEL_IMAP_STORE_ARG_FILTER_INBOX,
 	CAMEL_IMAP_STORE_ARG_FILTER_JUNK,
 	CAMEL_IMAP_STORE_ARG_FILTER_JUNK_INBOX,
@@ -72,6 +73,7 @@ enum {
 #define CAMEL_IMAP_STORE_NAMESPACE           (CAMEL_IMAP_STORE_ARG_NAMESPACE | CAMEL_ARG_STR)
 #define CAMEL_IMAP_STORE_OVERRIDE_NAMESPACE  (CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_CHECK_ALL           (CAMEL_IMAP_STORE_ARG_CHECK_ALL | CAMEL_ARG_INT)
+#define CAMEL_IMAP_STORE_CHECK_SUBSCRIBED    (CAMEL_IMAP_STORE_ARG_CHECK_SUBSCRIBED | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_FILTER_INBOX        (CAMEL_IMAP_STORE_ARG_FILTER_INBOX | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_FILTER_JUNK         (CAMEL_IMAP_STORE_ARG_FILTER_JUNK | CAMEL_ARG_BOO)
 #define CAMEL_IMAP_STORE_FILTER_JUNK_INBOX   (CAMEL_IMAP_STORE_ARG_FILTER_JUNK_INBOX | CAMEL_ARG_BOO)
@@ -104,6 +106,7 @@ typedef enum {
 #define IMAP_PARAM_FILTER_JUNK			(1 << 3)
 #define IMAP_PARAM_FILTER_JUNK_INBOX		(1 << 4)
 #define IMAP_PARAM_SUBSCRIPTIONS		(1 << 5)
+#define IMAP_PARAM_CHECK_SUBSCRIBED		(1 << 6)
 
 struct _CamelImapStore {
 	CamelDiscoStore parent_object;	


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -u -r1.91 -r1.91.2.1
--- evolution-data-server.spec	30 May 2006 14:57:24 -0000	1.91
+++ evolution-data-server.spec	1 Jun 2006 13:50:11 -0000	1.91.2.1
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.6.2
-Release: 1.fc5.1
+Release: 1.fc5.1.dwmw2.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -44,6 +44,9 @@
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+Patch400: evolution-data-server-1.5.91-check-only-active-folders.patch
+Patch401: evolution-data-server-1.2.0-vcrap.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -119,6 +122,9 @@
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
 
+%patch400 -p1 -b .checksub
+%patch401 -p1 -b .vcrap
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}



From fedora-cvs-commits at redhat.com  Thu Jun  1 13:50:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 09:50:49 -0400
Subject: rpms/subversion/FC-5 subversion-1.3.2.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.19, 1.20 sources, 1.21, 1.22 subversion.spec,
	1.74, 1.75 upstream, 1.11, 1.12 upstream-key.gpg, 1.5,
	1.6 subversion-1.3.1.tar.gz.asc, 1.1, NONE
Message-ID: <200606011350.k51Don40001707@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/subversion/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1593

Modified Files:
	.cvsignore sources subversion.spec upstream upstream-key.gpg 
Added Files:
	subversion-1.3.2.tar.gz.asc 
Removed Files:
	subversion-1.3.1.tar.gz.asc 
Log Message:
* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 1.3.2-2.1
- update to 1.3.2



--- NEW FILE subversion-1.3.2.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQBEcmixCbw14+5QZGERAp+wAKDZZ/g5aBEejK/zABLHNqj/GTKYogCgsPzl
TOUmyVzvwXItqgUSkdjoBus=
=FPQ3
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQBEcveO6GFjKbrWIbYRAvH5AJ0bRgBooHBOSHbBNNXSfQpI64iWtwCgt4Ev
4isOeAbMRZvxlHn1BL/X6ps=
=AmkR
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBEc54RyR242pvPzi8RArxYAKCe3LUcLWAtQXF6hR72xVwo/r1o5QCePhCI
1fZDI46GGyshiYiSQ7TBZls=
=60OD
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQBEehNBokEGqRcG/W4RAsV3AJ0V7e5jrg1qeXbeXcmxHq8xGx0n2wCgzOJ1
bFFSRNGSIymwiKHgxQq/xtk=
=T/5z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Apr 2006 09:15:59 -0000	1.19
+++ .cvsignore	1 Jun 2006 13:50:46 -0000	1.20
@@ -1 +1 @@
-subversion-1.3.1.tar.gz
+subversion-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Apr 2006 09:15:59 -0000	1.21
+++ sources	1 Jun 2006 13:50:46 -0000	1.22
@@ -1 +1 @@
-6d650e918255596ef8b74255b3938547  subversion-1.3.1.tar.gz
+f790c49c219b4196e37ebfa71ab797d5  subversion-1.3.2.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/subversion.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- subversion.spec	4 Apr 2006 10:34:23 -0000	1.74
+++ subversion.spec	1 Jun 2006 13:50:46 -0000	1.75
@@ -10,7 +10,7 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.3.1
+Version: 1.3.2
 Release: 2.1
 License: BSD
 Group: Development/Tools
@@ -246,6 +246,9 @@
 %endif
 
 %changelog
+* Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 1.3.2-2.1
+- update to 1.3.2
+
 * Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2.1
 - move libsvn_swig_ruby back to -ruby subpackage
 - build -java subpackage on s390 again


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/upstream,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- upstream	4 Apr 2006 09:09:48 -0000	1.11
+++ upstream	1 Jun 2006 13:50:46 -0000	1.12
@@ -1 +1 @@
-subversion-1.3.1.tar.gz
+subversion-1.3.2.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/upstream-key.gpg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upstream-key.gpg	4 Apr 2006 09:09:48 -0000	1.5
+++ upstream-key.gpg	1 Jun 2006 13:50:46 -0000	1.6
@@ -470,3 +470,38 @@
 ue5s0DtZ1WJgpzQU
 =0Kc2
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+mQGiBEDN0pYRBAClirW6MNfy6lTyV4AvCNoDGr29GVx5Cb1DzxwmZKxWMnoVRj08
+oPUvm/pR3DO6oq+ugHKN1rSwXeuGVugZWJXsVefZc29J0vgfgzdlye+fs4vYJ2xb
+tlcGiae6IcxH01wM9MDEfOqjx07wOT6ektEIAKCbg5UWbwTTref/bNCQYwCg0VaO
+tEaYJhCg50LYGyyval47JjEEAJ7CmFLdqNKXrvL3FBoD9VxXbpj1LVDOqJ+JVGVx
+3EWIK4C9O0+ejAsqYPEZ9enGlvWjnBmxyYUigcGrOHk1kRxeUYD2Rcw+CGqSRwLs
+SNQYKlqc8oSiqCRsU0fCNi36h3MfiHmcw8kSgOiL9hmqABlAUepFmuXR//E92ZAZ
+v+nAA/9NoXf1pul+k4cMju+N45hxEadb3bvwaHQbr0EmqvDzStFIuTl9i3TB/lWd
+1x9fHSYtiD1d6tyPE6FRVBW1yNp091HgmbOok+CbMUpQKtjTLuJuXm5oG0c5pqNH
+t9ZDbtQIQ9JC5Xa9df3SLbk0gEgmAKIAZH2TheE8U9nud6SCNrQnQy4gTWljaGFl
+bCBQaWxhdG8gPGNtcGlsYXRvQGNvbGxhYi5uZXQ+iEYEExECAAYFAkDOE4kACgkQ
+ckGFa2QeNYvgQQCggiR7MN2HLse7QB4avYtufHhiVnMAoNA+PlCEvp5PvvFKMEow
+OBrHCBKciEYEExECAAYFAkDPwtkACgkQ/A+FifiUvhJagACfUm7OpIP0/f7NOC5M
+8CKXHwRctIwAnjnLbe8ZuB0dSoM1yAfvN2olfshAiFwEExECABwFAkDN2hsCGwME
+CwcDAgMVAgMDFgIBAh4BAheAAAoJEKJBBqkXBv1un68AoJPCo9R9FuuHabqRYhPn
+PMZ+Yt03AJ9Fkt2WcnTIFUtfXedUIr9rb4BdV7QpQy4gTWljaGFlbCBQaWxhdG8g
+PGNtcGlsYXRvQHJlZC1iZWFuLmNvbT6IRgQTEQIABgUCQM3WqAAKCRBTSBpo7GtR
+VjITAJkBKZyNYfOyWmphGVOL3r4jKIhTVACfZS5BSUmQpYLESfTkPCbRoAukqlyI
+RgQTEQIABgUCQM4TjQAKCRByQYVrZB41i9lDAJ4lmESaRXdYc89DUUEhEmCHLCuc
+kwCgyu3h9MpDbU+dPOxGMUUr/F//g72IRgQTEQIABgUCQM/C4QAKCRD8D4WJ+JS+
+EpkDAJ43xhQTSHLOfvps8S6nOtuUyoMnZACeO+9MGwCLaNxNst2tex3zhHf4R/eI
+WQQTEQIAGQUCQM3SlgQLBwMCAxUCAwMWAgECHgECF4AACgkQokEGqRcG/W4MOACg
+y82MYf+xZbNQfh62PLyKWe+49usAn2LUGikNwwOjxb6TqOT/R3I2hDLzuQENBEDN
+0pcQBACSx4c/h/ziNpb0sBA+wd/jj/Yrcl/ufYZ0jvwVprQ54p6cOXkjbDqrB9d6
+tRDl6k9jktZ0sx6AeSe9g9i+NA3bhmwpJNu4z50naVEaLeWZ1Ls2wVS4g3k8Cx0J
+ZfBAXtc9s+pBdQZoewsAKJ0/aq+X1LI7JTvq0rwT4wgT2jKVAwADBQP+M1WHFV94
+G1LH23RJZ/bdQPvSWpY6UQey9GHtVkwYJVK+tZ7jTZ/AtWkKiZnmIll9EEMvIlml
+RkWrYVm7+qAcF7wIdqeSMtSee2ZNf2cEqjeUIOJwEy4+7w7NCnP+r3mgiOvd/3Dw
+j/PQ8trXazKDEjwEM4uUm0vz+RdL5Heqna+IRgQYEQIABgUCQM3SlwAKCRCiQQap
+Fwb9bklwAJ9fPk6B3KllPCUu0+OdtQbV1r4fwACgugE763TVoBHycD2DbUzIm/s2
+ZDg=
+=gy9o
+-----END PGP PUBLIC KEY BLOCK-----


--- subversion-1.3.1.tar.gz.asc DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 14:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 10:27:23 -0400
Subject: rpms/arts/FC-5 .cvsignore, 1.24, 1.25 arts.spec, 1.57, 1.58 sources,
	1.27, 1.28
Message-ID: <200606011427.k51ERNMf003270@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/arts/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3248

Modified Files:
	.cvsignore arts.spec sources 
Log Message:
update to 1.5.3 



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	1 Feb 2006 10:31:17 -0000	1.24
+++ .cvsignore	1 Jun 2006 14:27:21 -0000	1.25
@@ -8,3 +8,4 @@
 arts-1.4.92.tar.bz2
 arts-1.5.0.tar.bz2
 arts-1.5.1.tar.bz2
+arts-1.5.3.tar.bz2


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-5/arts.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- arts.spec	29 Mar 2006 19:16:22 -0000	1.57
+++ arts.spec	1 Jun 2006 14:27:21 -0000	1.58
@@ -9,7 +9,7 @@
 %define make_cvs 1
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 1.5.2
+Version: 1.5.3
 Release: 0.1.fc5
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
@@ -154,7 +154,7 @@
 %{_libdir}/mcop/*.mcopclass
 %{_libdir}/mcop/*.mcoptype
 %{_libdir}/*.la
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so*
 %{_bindir}/artscat
 %{_bindir}/artsd
 %{_bindir}/artsdsp
@@ -166,13 +166,16 @@
 %files devel
 %defattr(-,root,root)
 %{_bindir}/mcopidl
-%{_libdir}/lib*.so
 %{_includedir}/kde/arts
 %{_includedir}/kde/artsc
 %{_bindir}/artsc-config
 
 %changelog
-* Wed Mar 29 2006 Than Ngo <than at redhat.com> 0:1.5.2-0.1.fc5
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 8:1.5.3-0.1.fc5
+- update to 1.5.3
+- own /ust/include/kde #193460
+
+* Wed Mar 29 2006 Than Ngo <than at redhat.com> 8:1.5.2-0.1.fc5
 - update to 1.5.2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8:1.5.1-1.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Mar 2006 19:16:22 -0000	1.27
+++ sources	1 Jun 2006 14:27:21 -0000	1.28
@@ -1 +1 @@
-e1eb7969ea16aab2bdd9d1a9736d6af3  arts-1.5.2.tar.bz2
+1707ce44708a70acecd7a50ef05d365e  arts-1.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 14:51:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 10:51:36 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2128,
	1.2129 linux-2.6-crashdump-common.patch, 1.18, 1.19
Message-ID: <200606011451.k51Epah2018456@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18440

Modified Files:
	kernel-2.6.spec linux-2.6-crashdump-common.patch 
Log Message:
reenable xen



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2128
retrieving revision 1.2129
diff -u -r1.2128 -r1.2129
--- kernel-2.6.spec	31 May 2006 01:46:51 -0000	1.2128
+++ kernel-2.6.spec	1 Jun 2006 14:51:33 -0000	1.2129
@@ -6,7 +6,7 @@
 %define buildup 1
 %define buildsmp 1
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -1686,6 +1686,9 @@
 %endif
 
 %changelog
+* Thu Jun  1 2006 Dave Jones <davej at redhat.com>
+- Reenable Xen builds.
+
 * Tue May 30 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.19
 

linux-2.6-crashdump-common.patch:
 linux-2.6.12/Documentation/sysrq.txt         |    8 
 linux-2.6.12/arch/i386/kernel/nmi.c          |    1 
 linux-2.6.12/arch/i386/kernel/traps.c        |    3 
 linux-2.6.12/arch/i386/mm/init.c             |   47 +++++
 linux-2.6.12/arch/ia64/kernel/process.c      |   30 ++-
 linux-2.6.12/arch/ia64/kernel/traps.c        |    6 
 linux-2.6.12/arch/ia64/mm/contig.c           |    3 
 linux-2.6.12/arch/ia64/mm/discontig.c        |    3 
 linux-2.6.12/arch/ia64/mm/init.c             |   90 +++++++++
 linux-2.6.12/arch/powerpc/kernel/process.c   |    1 
 linux-2.6.12/arch/powerpc/kernel/traps.c     |    3 
 linux-2.6.12/arch/powerpc/mm/mem.c           |   29 +++
 linux-2.6.12/arch/s390/kernel/traps.c        |    6 
 linux-2.6.12/arch/x86_64/kernel/process.c    |    2 
 linux-2.6.12/arch/x86_64/kernel/traps.c      |    6 
 linux-2.6.12/arch/x86_64/mm/init.c           |   32 +++
 linux-2.6.12/drivers/char/sysrq.c            |    2 
 linux-2.6.12/include/asm-generic/crashdump.h |   47 +++++
 linux-2.6.12/include/asm-i386/crashdump.h    |  123 +++++++++++++
 linux-2.6.12/include/asm-i386/kmap_types.h   |    4 
 linux-2.6.12/include/asm-ia64/crashdump.h    |   72 +++++++
 linux-2.6.12/include/asm-powerpc/crashdump.h |   61 ++++++
 linux-2.6.12/include/asm-x86_64/crashdump.h  |   86 +++++++++
 linux-2.6.12/include/linux/kernel.h          |   18 +
 linux-2.6.12/kernel/Makefile                 |    2 
 linux-2.6.12/kernel/dump.c                   |  246 +++++++++++++++++++++++++++
 linux-2.6.12/kernel/panic.c                  |    4 
 linux-2.6.12/kernel/printk.c                 |   20 ++
 linux-2.6.12/kernel/sched.c                  |    2 
 linux-2.6.13/arch/x86_64/mm/fault.c          |    1 
 linux-2.6.13/drivers/char/sysrq.c            |    5 
 linux-2.6.16.noarch/arch/i386/mm/pgtable.c   |    2 
 32 files changed, 951 insertions(+), 14 deletions(-)

Index: linux-2.6-crashdump-common.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-crashdump-common.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-crashdump-common.patch	28 May 2006 23:32:24 -0000	1.18
+++ linux-2.6-crashdump-common.patch	1 Jun 2006 14:51:33 -0000	1.19
@@ -889,14 +889,6 @@
   * valid. The argument is a physical page number.
 --- linux-2.6.16.noarch/arch/i386/mm/pgtable.c~	2006-03-24 21:29:33.000000000 -0500
 +++ linux-2.6.16.noarch/arch/i386/mm/pgtable.c	2006-03-24 21:29:42.000000000 -0500
-@@ -13,6 +13,7 @@
- #include <linux/slab.h>
- #include <linux/pagemap.h>
- #include <linux/spinlock.h>
-+#include <linux/module.h>
- 
- #include <asm/system.h>
- #include <asm/pgtable.h>
 @@ -63,6 +64,8 @@
  	printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
  }



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:09:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:09:37 -0400
Subject: rpms/dovecot/FC-5 dovecot-1.0.beta2-sqlite-check.patch, NONE,
	1.1 dovecot-1.0.beta7-default-settings.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 dovecot.spec, 1.48, 1.49 sources,
	1.12, 1.13
Message-ID: <200606011509.k51F9bN9018855@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/dovecot/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18837

Modified Files:
	.cvsignore dovecot.spec sources 
Added Files:
	dovecot-1.0.beta2-sqlite-check.patch 
	dovecot-1.0.beta7-default-settings.patch 
Log Message:
* Thu Jun 01 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.1.fc5
- bring FC-5 branch up to date with the rawhide one (bugfixes only)


dovecot-1.0.beta2-sqlite-check.patch:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dovecot-1.0.beta2-sqlite-check.patch ---
--- dovecot-1.0.beta2/configure.in.sqlite-check	2006-03-06 12:05:24.000000000 +0100
+++ dovecot-1.0.beta2/configure.in	2006-03-06 12:04:35.000000000 +0100
@@ -1462,12 +1462,12 @@
 	for i in /usr /usr/local /usr/local; do
 		for j in include  ""; do
 			if test -r "$i/$j/sqlite3.h"; then
-				MYSQL_INCLUDE=$i/$j
+				SQLITE_INCLUDE=$i/$j
 			fi
 		done
 		for lib in lib64 lib; do for j in $lib $lib/sqlite3 ""; do
 			if test -f "$i/$j/libsqlite3.so" || test -f "$i/$j/libsqlite3.a"; then
-				MYSQL_LIBDIR=$i/$j
+				SQLITE_LIBDIR=$i/$j
 			fi
 		done; done
 	done

dovecot-1.0.beta7-default-settings.patch:
 dovecot-example.conf         |   19 ++++++++-----------
 src/master/master-settings.c |    8 ++++----
 2 files changed, 12 insertions(+), 15 deletions(-)

--- NEW FILE dovecot-1.0.beta7-default-settings.patch ---
--- dovecot-1.0.beta7/src/master/master-settings.c.default-settings	2006-04-12 13:38:42.000000000 +0200
+++ dovecot-1.0.beta7/src/master/master-settings.c	2006-05-04 12:48:08.000000000 +0200
@@ -261,8 +261,8 @@
 	MEMBER(syslog_facility) "mail",
 
 	/* general */
-	MEMBER(protocols) "imap imaps",
-	MEMBER(listen) "*",
+	MEMBER(protocols) "imap imaps pop3 pop3s",
+	MEMBER(listen) "[::]",
 	MEMBER(ssl_listen) NULL,
 
 	MEMBER(ssl_disable) FALSE,
@@ -273,7 +273,7 @@
 	MEMBER(ssl_parameters_regenerate) 168,
 	MEMBER(ssl_cipher_list) NULL,
 	MEMBER(ssl_verify_client_cert) FALSE,
-	MEMBER(disable_plaintext_auth) TRUE,
+	MEMBER(disable_plaintext_auth) FALSE,
 	MEMBER(verbose_ssl) FALSE,
 	MEMBER(shutdown_clients) TRUE,
 
@@ -326,7 +326,7 @@
 	MEMBER(maildir_stat_dirs) FALSE,
 	MEMBER(maildir_copy_with_hardlinks) FALSE,
 	MEMBER(mbox_read_locks) "fcntl",
-	MEMBER(mbox_write_locks) "dotlock fcntl",
+	MEMBER(mbox_write_locks) "fcntl",
 	MEMBER(mbox_lock_timeout) 300,
 	MEMBER(mbox_dotlock_change_timeout) 120,
 	MEMBER(mbox_min_index_size) 0,
--- dovecot-1.0.beta7/dovecot-example.conf.default-settings	2006-04-12 13:37:30.000000000 +0200
+++ dovecot-1.0.beta7/dovecot-example.conf	2006-05-04 12:50:07.000000000 +0200
@@ -7,17 +7,14 @@
 # value inside quotes, eg.: key = "# char and trailing whitespace  "
 
 # Default values are shown after each value, it's not required to uncomment
-# any of the lines. Exception to this are paths, they're just examples
-# with real defaults being based on configure options. The paths listed here
-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-# --with-ssldir=/etc/ssl
+# any of the lines.
 
 # Base directory where to store runtime data.
 #base_dir = /var/run/dovecot/
 
 # Protocols we want to be serving:
 #  imap imaps pop3 pop3s
-#protocols = imap imaps
+#protocols = imap imaps pop3 pop3s
 
 # IP or host address where to listen in for connections. It's not currently
 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
@@ -36,7 +33,7 @@
 #     listen = *:10100
 #     ..
 #   }
-#listen = *
+#listen = [::]
 
 # IP or host address where to listen in for SSL connections. Defaults
 # to above if not specified.
@@ -49,8 +46,8 @@
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root. Included doc/mkcert.sh can be used to easily generate self-signed
 # certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
+#ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem
+#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
 
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter.
@@ -74,7 +71,7 @@
 # SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and
 # IPv6 ::1 addresses are considered secure, this setting has no effect if
 # you connect from those addresses.
-#disable_plaintext_auth = yes
+#disable_plaintext_auth = no
 
 # Should all IMAP and POP3 processes be killed when Dovecot master process
 # shuts down. Setting this to "no" means that Dovecot can be upgraded without
@@ -371,7 +368,7 @@
 # locking methods as well. Some operating systems don't allow using some of
 # them simultaneously.
 #mbox_read_locks = fcntl
-#mbox_write_locks = dotlock fcntl
+#mbox_write_locks = fcntl
 
 # Maximum time in seconds to wait for lock (all of them) before aborting.
 #mbox_lock_timeout = 300
@@ -547,7 +544,7 @@
   # installations. %08Xu%08Xv will be the new default, so use it for new
   # installations.
   #
-  #pop3_uidl_format = 
+  #pop3_uidl_format = %08Xu%08Xv
 
   # POP3 logout format string:
   #  %t - number of TOP commands


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jan 2006 13:44:22 -0000	1.11
+++ .cvsignore	1 Jun 2006 15:09:34 -0000	1.12
@@ -1,2 +1 @@
-dovecot-0.99.14.tar.gz
-dovecot-1.0.beta2.tar.gz
+dovecot-1.0.beta8.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-5/dovecot.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dovecot.spec	8 Mar 2006 19:37:32 -0000	1.48
+++ dovecot.spec	1 Jun 2006 15:09:34 -0000	1.49
@@ -1,15 +1,15 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.beta2.7
+Release: 0.beta8.1
 License: LGPL
 Group: System Environment/Daemons
 
 %define build_postgres 1
 %define build_mysql 1
-%define upstream 1.0.beta2
+%define upstream 1.0.beta8
 
-Source: %{name}-1.0.beta2.tar.gz
+Source: %{name}-%{upstream}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
 Source3: maildir-migration.txt
@@ -17,11 +17,12 @@
 Source5: migrate-users
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
-Patch100: dovecot-1.0.beta2-default-settings.patch
+Patch100: dovecot-1.0.beta7-default-settings.patch
 Patch101: dovecot-1.0.beta2-pam-tty.patch
 Patch102: dovecot-1.0.beta2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch104: dovecot-1.0.beta2-lib64.patch
+#Patch105: dovecot-1.0.beta2-sqlite-check.patch
 
 # XXX this patch needs review and forward porting
 #Patch105: dovecot-auth-log.patch
@@ -34,6 +35,9 @@
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: automake
 # gettext-devel is needed for running autoconf because of the
 # presence of AM_ICONV
 BuildRequires: gettext-devel
@@ -62,18 +66,17 @@
 
 %setup -q -n %{name}-%{upstream}
 
-%patch100 -p2 -b .default-settings
+%patch100 -p1 -b .default-settings
 %patch101 -p2 -b .pam-tty
 %patch102 -p2 -b .pam-setcred
 %patch103 -p1 -b .mkcert-permissions
-%patch104 -p1 -b .lib64
-#%patch105 -p1 -b .auth-log
+#%patch104 -p1 -b .lib64
+#%patch105 -p1 -b .sqlite-check
 
 %build
 rm -f ./configure
-aclocal
-automake -a
-autoconf
+libtoolize -f
+autoreconf
 %configure                           \
     INSTALL_DATA="install -c -p -m644" \
     --with-doc		             \
@@ -209,6 +212,21 @@
 
 
 %changelog
+* Thu Jun 01 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.1.fc5
+- bring FC-5 branch up to date with the rawhide one (bugfixes only)
+
+* Thu May 04 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.1
+- upgrade to latest upstream beta release (beta8)
+- contains a security fix in mbox handling
+
+* Thu May 04 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta7.1
+- upgrade to latest upstream beta release
+- fixed BR 173048
+
+* Fri Mar 17 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta2.8
+- fix sqlite detection in upstream configure checks, second part
+  of #182240
+
 * Wed Mar  8 2006 Bill Nottingham <notting at redhat.com> - 1.0-0.beta2.7
 - fix scriplet noise some more
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Jan 2006 10:33:46 -0000	1.12
+++ sources	1 Jun 2006 15:09:34 -0000	1.13
@@ -1 +1 @@
-a68f623b04876815d6522ac9d7bac869  dovecot-1.0.beta2.tar.gz
+6a87718a86ee1ae2334c75843dd9a7df  dovecot-1.0.beta8.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:10:08 -0400
Subject: rpms/dovecot/FC-5 dovecot.spec,1.49,1.50
Message-ID: <200606011510.k51FA8oI018897@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/dovecot/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18880

Modified Files:
	dovecot.spec 
Log Message:
Actually bump release in the specfile. Oops.



Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-5/dovecot.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- dovecot.spec	1 Jun 2006 15:09:34 -0000	1.49
+++ dovecot.spec	1 Jun 2006 15:10:03 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.beta8.1
+Release: 0.beta8.1.fc5
 License: LGPL
 Group: System Environment/Daemons
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:13:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:13:17 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.27,
	1.28
Message-ID: <200606011513.k51FDHqb029591@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29552

Modified Files:
	system-config-printer.spec 
Log Message:
* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-3
- Fix libs dependency.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- system-config-printer.spec	1 Jun 2006 10:38:50 -0000	1.27
+++ system-config-printer.spec	1 Jun 2006 15:13:15 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.11
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -21,7 +21,7 @@
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
 Requires: pygobject2
 Requires: usermode >= 1.37
-PreReq: system-config-printer-libs = %{epoch}:%{version}-%{release}
+PreReq: system-config-printer-libs = %{version}-%{release}
 
 Obsoletes: system-config-printer-gui <= 0.6.152
 
@@ -106,6 +106,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-3
+- Fix libs dependency.
+
 * Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-2
 - Moved the gtk_html2pango module to the libs package (needed by
   foomatic.py).



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:25:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:25:33 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc5-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.445, 1.446 kernel-2.6.spec, 1.2240,
	1.2241 sources, 1.388, 1.389 upstream, 1.356,
	1.357 patch-2.6.17-rc5-git7.bz2.sign, 1.1, NONE
Message-ID: <200606011525.k51FPXa6015292@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15240

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc5-git8.bz2.sign 
Removed Files:
	patch-2.6.17-rc5-git7.bz2.sign 
Log Message:
git8



--- NEW FILE patch-2.6.17-rc5-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEfpDsyGugalF9Dw4RAgsEAKCTS7vTViydQj4DfAVqgTmuEYgqCACeJHGJ
d/uJ/oXt3g2bGBwYIjq1qfc=
=tLoJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- .cvsignore	31 May 2006 16:35:23 -0000	1.445
+++ .cvsignore	1 Jun 2006 15:25:29 -0000	1.446
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060524.tar.bz2
 patch-2.6.17-rc5.bz2
-patch-2.6.17-rc5-git7.bz2
+patch-2.6.17-rc5-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2240
retrieving revision 1.2241
diff -u -r1.2240 -r1.2241
--- kernel-2.6.spec	1 Jun 2006 03:44:57 -0000	1.2240
+++ kernel-2.6.spec	1 Jun 2006 15:25:31 -0000	1.2241
@@ -236,7 +236,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc5.bz2
-Patch2: patch-2.6.17-rc5-git7.bz2
+Patch2: patch-2.6.17-rc5-git8.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1761,6 +1761,9 @@
 %endif
 
 %changelog
+* Thu Jun  1 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc5-git8
+
 * Wed May 31 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc5-git7
 - Ressurect V4L1, too much still depends on it.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- sources	31 May 2006 16:35:40 -0000	1.388
+++ sources	1 Jun 2006 15:25:31 -0000	1.389
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 876c8ce40a8d5e56ec9fad22746609ac  xen-20060524.tar.bz2
 55623238bcf132c3f3fc8af2e333a80a  patch-2.6.17-rc5.bz2
-fa6cc7b3f530cc72a3f7900fd0abcf2d  patch-2.6.17-rc5-git7.bz2
+d39a0f49e696d791ee416782c30a44f1  patch-2.6.17-rc5-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- upstream	31 May 2006 16:35:40 -0000	1.356
+++ upstream	1 Jun 2006 15:25:31 -0000	1.357
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc5.bz2
-patch-2.6.17-rc5-git7.bz2
+patch-2.6.17-rc5-git8.bz2


--- patch-2.6.17-rc5-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:32:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:32:00 -0400
Subject: rpms/cups/devel cups.spec,1.207,1.208
Message-ID: <200606011532.k51FW0DD017139@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17101

Modified Files:
	cups.spec 
Log Message:
* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-5
- Fixed group ownerships again (bug #192880).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- cups.spec	1 Jun 2006 12:58:58 -0000	1.207
+++ cups.spec	1 Jun 2006 15:31:24 -0000	1.208
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -293,20 +293,20 @@
 
 %files
 %defattr(-,root,root)
-%dir %attr(0755,root,nobody) /etc/cups
+%dir %attr(0755,root,lp) /etc/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
-%config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf
-%attr(0640,root,nobody) /etc/cups/cupsd.conf.default
-%config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
-%config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
-%config(noreplace) %attr(0644,root,nobody) /etc/cups/pdftops.conf
-%config(noreplace) %attr(0644,root,nobody) /etc/cups/snmp.conf
+%config(noreplace) %attr(0640,root,lp) /etc/cups/cupsd.conf
+%attr(0640,root,lp) /etc/cups/cupsd.conf.default
+%config(noreplace) %attr(0644,root,lp) /etc/cups/client.conf
+%config(noreplace) %attr(0600,root,lp) /etc/cups/printers.conf
+%config(noreplace) %attr(0644,root,lp) /etc/cups/pdftops.conf
+%config(noreplace) %attr(0644,root,lp) /etc/cups/snmp.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
-%dir %attr(0755,root,nobody) /etc/cups/ppd
-%dir %attr(0700,root,nobody) /etc/cups/ssl
+%dir %attr(0755,root,lp) /etc/cups/ppd
+%dir %attr(0700,root,lp) /etc/cups/ssl
 /etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %dir %{_docdir}/cups-%{version}
@@ -354,8 +354,8 @@
 %{_datadir}/cups/model
 %{_datadir}/cups/templates
 %{_datadir}/locale/*/*
-%dir %attr(1770,root,nobody) /var/spool/cups/tmp
-%dir %attr(0710,root,nobody) /var/spool/cups
+%dir %attr(1770,root,lp) /var/spool/cups/tmp
+%dir %attr(0710,root,lp) /var/spool/cups
 %dir %attr(0755,lp,sys) /var/log/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %{_datadir}/pixmaps/cupsprinter.png
@@ -381,8 +381,11 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-5
+- Fixed group ownerships again (bug #192880).
+
 * Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-4
-- Fix 'service cups reload' not to give an error message.
+- Fixed 'service cups reload' not to give an error message.
 
 * Thu May 25 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-3
 - Fix 'localhost' fallback in httpAddrGetList() (bug #192628, STR #1723).



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:46:01 -0400
Subject: rpms/cups/FC-5 cups.spec,1.183,1.184
Message-ID: <200606011546.k51Fk1ld022886@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21665

Modified Files:
	cups.spec 
Log Message:
* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com>
- Fixed group ownerships again (bug #192880).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- cups.spec	24 May 2006 16:30:11 -0000	1.183
+++ cups.spec	1 Jun 2006 15:45:58 -0000	1.184
@@ -317,20 +317,20 @@
 
 %files
 %defattr(-,root,root)
-%dir %attr(0755,root,nobody) /etc/cups
+%dir %attr(0755,root,lp) /etc/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
-%config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf
-%attr(0640,root,nobody) /etc/cups/cupsd.conf.default
-%config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
-%config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
-%config(noreplace) %attr(0644,root,nobody) /etc/cups/pdftops.conf
-%config(noreplace) %attr(0644,root,nobody) /etc/cups/snmp.conf
+%config(noreplace) %attr(0640,root,lp) /etc/cups/cupsd.conf
+%attr(0640,root,lp) /etc/cups/cupsd.conf.default
+%config(noreplace) %attr(0644,root,lp) /etc/cups/client.conf
+%config(noreplace) %attr(0600,root,lp) /etc/cups/printers.conf
+%config(noreplace) %attr(0644,root,lp) /etc/cups/pdftops.conf
+%config(noreplace) %attr(0644,root,lp) /etc/cups/snmp.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
-%dir %attr(0755,root,nobody) /etc/cups/ppd
-%dir %attr(0700,root,nobody) /etc/cups/ssl
+%dir %attr(0755,root,lp) /etc/cups/ppd
+%dir %attr(0700,root,lp) /etc/cups/ssl
 /etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %dir %{_docdir}/cups-%{version}
@@ -378,8 +378,8 @@
 %{_datadir}/cups/model
 %{_datadir}/cups/templates
 %{_datadir}/locale/*/*
-%dir %attr(1770,root,nobody) /var/spool/cups/tmp
-%dir %attr(0710,root,nobody) /var/spool/cups
+%dir %attr(1770,root,lp) /var/spool/cups/tmp
+%dir %attr(0710,root,lp) /var/spool/cups
 %dir %attr(0755,lp,sys) /var/log/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %{_datadir}/pixmaps/cupsprinter.png
@@ -405,6 +405,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed group ownerships again (bug #192880).
+
 * Wed May 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.3
 - Fix 'localhost' fallback in httpAddrGetList() (bug #192628, STR #1723).
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:53:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:53:38 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-1-redhat.patch, NONE,
	1.1 kdebase-3.5.3-dbus.patch, NONE,
	1.1 kdebase-3.5.3-kioslave_media_dbus.patch, NONE,
	1.1 .cvsignore, 1.48, 1.49 kdebase.spec, 1.180, 1.181 sources,
	1.67, 1.68 kdebase-3.5.2-1-redhat.patch, 1.2,
	NONE kdebase-3.5.2-dbus.patch, 1.2,
	NONE kdebase-3.5.2-kicker-konsole-bookmarks.patch, 1.1,
	NONE kdebase-3.5.2-kioslave_media_dbus.patch, 1.1,
	NONE kdebase-3.5.2-konsole.patch, 1.1,
	NONE kdebase-3.5.2-kwin.patch, 1.2, NONE
Message-ID: <200606011553.k51Frcx0003615@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3489

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.3-1-redhat.patch kdebase-3.5.3-dbus.patch 
	kdebase-3.5.3-kioslave_media_dbus.patch 
Removed Files:
	kdebase-3.5.2-1-redhat.patch kdebase-3.5.2-dbus.patch 
	kdebase-3.5.2-kicker-konsole-bookmarks.patch 
	kdebase-3.5.2-kioslave_media_dbus.patch 
	kdebase-3.5.2-konsole.patch kdebase-3.5.2-kwin.patch 
Log Message:
- update to 3.5.3
- drop --enable-new-ldflags, workaround for ld bug
- update kioslave_media_dbus patch



kdebase-3.5.3-1-redhat.patch:
 kdebase-3.4.91/kde.pamd |   16 +++++++----
 kdebase-3.5.1/startkde  |   68 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 69 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-3.5.3-1-redhat.patch ---
--- kdebase-3.4.91/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.4.91/kde.pamd	2005-09-27 18:16:15.000000000 +0200
@@ -1,7 +1,11 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_pwdb.so shadow nullok
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_pwdb.so
-password   required	/lib/security/pam_cracklib.so
-password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
-session    required	/lib/security/pam_pwdb.so
+auth       sufficient	pam_timestamp.so
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional	pam_timestamp.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
--- kdebase-3.5.1/startkde.redhat	2006-01-19 18:03:19.000000000 +0100
+++ kdebase-3.5.1/startkde	2006-02-15 18:58:10.000000000 +0100
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.3 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -64,7 +112,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
@@ -135,8 +183,8 @@
     done
 fi
 
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -147,10 +195,11 @@
 # For anything else (that doesn't set env vars, or that needs a window manager),
 # better use the Autostart folder.
 
-exepath=`kde-config --path exe | tr : '\n'`
+exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+  for file in "$prefix"*.sh ; do
     test -r "$file" && . "$file"
   done
 done
@@ -339,7 +388,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-3.5.3-dbus.patch:
 kdebase-3.5.1/kioslave/media/configure.in.in             |   66 -
 kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp |  168 ++++
 kdebase-3.5.1/kioslave/media/mediamanager/connection.h   |   86 ++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp |  244 ++++++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.h   |   95 ++
 kdebase-3.5.1/kioslave/media/mediamanager/message.cpp    |  551 +++++++++++++++
 kdebase-3.5.1/kioslave/media/mediamanager/message.h      |  132 +++
 kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am    |   11 
 kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h   |    2 
 9 files changed, 1286 insertions(+), 69 deletions(-)

--- NEW FILE kdebase-3.5.3-dbus.patch ---
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.cpp kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp	2006-01-26 14:54:40.000000000 +0100
@@ -0,0 +1,168 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* connection.cpp: Qt wrapper for DBusConnection
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "connection.h"
+
+using namespace DBusQt;
+
+#include "integrator.h"
+using Internal::Integrator;
+
+struct Connection::Private
+{
+  Private( Connection *qq );
+  void setConnection( DBusConnection *c );
+  DBusConnection *connection;
+  int connectionSlot;
+  DBusError error;
+  Integrator *integrator;
+  int timeout;
+  Connection *q;
+};
+
+Connection::Private::Private( Connection *qq )
+  : connection( 0 ), connectionSlot( 0 ), integrator( 0 ),
+    timeout( -1 ), q( qq )
+{
+  dbus_error_init( &error );
+}
+
+void Connection::Private::setConnection( DBusConnection *c )
+{
+  if (!c) {
+    qDebug( "error: %s, %s", error.name, error.message );
+    dbus_error_free( &error );
+    return;
+  }
+  connection = c;
+  integrator = new Integrator( c, q );
+  connect( integrator, SIGNAL(readReady()), q, SLOT(dispatchRead()) );
+}
+
+Connection::Connection( QObject *parent )
+  : QObject( parent )
+{
+  d = new Private( this );
+}
+
+Connection::Connection( const QString& host, QObject *parent )
+  : QObject( parent )
+{
+  d = new Private( this );
+
+  if ( !host.isEmpty() )
+    init( host );
+}
+
+Connection::Connection( DBusBusType type, QObject* parent )
+  : QObject( parent )
+{
+  d = new Private( this );
+  d->setConnection( dbus_bus_get(type, &d->error) );
+}
+
+void Connection::init( const QString& host )
+{
+  d->setConnection( dbus_connection_open( host.ascii(), &d->error) );
+  //dbus_connection_allocate_data_slot( &d->connectionSlot );
+  //dbus_connection_set_data( d->connection, d->connectionSlot, 0, 0 );
+}
+
+bool Connection::isConnected() const
+{
+  return dbus_connection_get_is_connected( d->connection );
+}
+
+bool Connection::isAuthenticated() const
+{
+  return dbus_connection_get_is_authenticated( d->connection );
+}
+
+void Connection::open( const QString& host )
+{
+  if ( host.isEmpty() ) return;
+
+  init( host );
+}
+
+void Connection::close()
+{
+  dbus_connection_disconnect( d->connection );
+}
+
+void Connection::flush()
+{
+  dbus_connection_flush( d->connection );
+}
+
+void Connection::dispatchRead()
+{
+  while ( dbus_connection_dispatch( d->connection ) == DBUS_DISPATCH_DATA_REMAINS )
+    ;
+}
+
+DBusConnection* Connection::connection() const
+{
+  return d->connection;
+}
+
+Connection::Connection( DBusConnection *connection, QObject *parent  )
+  : QObject( parent )
+{
+  d = new Private(this);
+  d->setConnection(connection);
+}
+
+void Connection::send( const Message &m )
+{
+    dbus_connection_send(d->connection, m.message(), 0);
+}
+
+void Connection::sendWithReply( const Message& )
+{
+}
+
+Message Connection::sendWithReplyAndBlock( const Message &m )
+{
+  DBusMessage *reply;
+  reply = dbus_connection_send_with_reply_and_block( d->connection, m.message(), d->timeout, &d->error );
+  if (dbus_error_is_set(&d->error)) {
+      qDebug("error: %s, %s", d->error.name, d->error.message);
+      dbus_error_free(&d->error);
+  }
+  return Message( reply );
+}
+
+void* Connection::virtual_hook( int, void*  )
+{
+}
+
+void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
+{
+  d->setConnection( connection );
+}
+
+
+
+/////////////////////////////////////////////////////////
+
+#include "connection.moc"
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.h kdebase-3.5.1/kioslave/media/mediamanager/connection.h
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/connection.h	2006-01-26 14:54:44.000000000 +0100
@@ -0,0 +1,86 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* connection.h: Qt wrapper for DBusConnection
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_CONNECTION_H
+#define DBUS_QT_CONNECTION_H
+
+/* We acknowledge the the dbus API is unstable */
+#define DBUS_API_SUBJECT_TO_CHANGE
+
+#include "message.h"
+
+#include <qobject.h>
+#include <qstring.h>
+
+#include "dbus/dbus.h"
+
+namespace DBusQt {
+  namespace Internal {
+    class Integrator;
+  }
+
+  class Connection : public QObject
+  {
+    Q_OBJECT
+  public:
+    Connection( QObject *parent =0 );
+    Connection( const QString& host,
+                QObject *parent = 0 );
+    Connection( DBusBusType type, QObject* parent = 0 );
+
+    bool isConnected() const;
+    bool isAuthenticated() const;
+
+    Message borrowMessage();
+    Message popMessage();
+    void stealBorrowMessage( const Message& );
+    void dbus_connection_setup_with_qt_main (DBusConnection *connection);
+
+  public slots:
+    void open( const QString& );
+    void close();
+    void flush();
+    void send( const Message& );
+    void sendWithReply( const Message& );
+    Message sendWithReplyAndBlock( const Message& );
+
+  protected slots:
+    void dispatchRead();
+
+  protected:
+    void init( const QString& host );
+    virtual void *virtual_hook( int id, void *data );
+
+  private:
+    friend class Internal::Integrator;
+    DBusConnection *connection() const;
+    Connection( DBusConnection *connection, QObject *parent );
+
+  private:
+    struct Private;
+    Private *d;
+  };
+
+}
+
+
+#endif
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.cpp kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp	2006-01-26 14:54:52.000000000 +0100
@@ -0,0 +1,244 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* integrator.h: integrates D-BUS into Qt event loop
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "integrator.h"
+#include "connection.h"
+
+#include <qtimer.h>
+#include <qsocketnotifier.h>
+#include <qintdict.h>
+#include <qptrlist.h>
+
+namespace DBusQt
+{
+namespace Internal {
+
+struct Watch {
+  Watch(): readSocket( 0 ), writeSocket( 0 ) { }
+
+  DBusWatch *watch;
+  QSocketNotifier *readSocket;
+  QSocketNotifier *writeSocket;
+};
+
+//////////////////////////////////////////////////////////////
+dbus_bool_t dbusAddWatch( DBusWatch *watch, void *data )
+{
+  Integrator *con = static_cast<Integrator*>( data );
+  con->addWatch( watch );
+  return true;
+}
+void dbusRemoveWatch( DBusWatch *watch, void *data )
+{
+  Integrator *con = static_cast<Integrator*>( data );
+  con->removeWatch( watch );
+}
+
+void dbusToggleWatch( DBusWatch *watch, void *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+  if ( dbus_watch_get_enabled( watch ) )
+    itg->addWatch( watch );
+  else
+    itg->removeWatch( watch );
+}
+
+dbus_bool_t dbusAddTimeout( DBusTimeout *timeout, void *data )
+{
+  if ( !dbus_timeout_get_enabled(timeout) )
+    return true;
+
+  Integrator *itg = static_cast<Integrator*>( data );
+  itg->addTimeout( timeout );
+  return true;
+}
+
+void dbusRemoveTimeout( DBusTimeout *timeout, void *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+  itg->removeTimeout( timeout );
+}
+
+void dbusToggleTimeout( DBusTimeout *timeout, void *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+
+  if ( dbus_timeout_get_enabled( timeout ) )
+    itg->addTimeout( timeout );
+  else
+    itg->removeTimeout( timeout );
+}
+
+void dbusWakeupMain( void* )
+{
+}
+
+void dbusNewConnection( DBusServer     *server,
+                        DBusConnection *new_connection,
+                        void           *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+  itg->handleConnection( new_connection );
+}
+/////////////////////////////////////////////////////////////
+
+Timeout::Timeout( QObject *parent, DBusTimeout *t )
+  : QObject( parent ),  m_timeout( t )
+{
+  m_timer = new QTimer( this );
+  connect( m_timer,  SIGNAL(timeout()),
+           SLOT(slotTimeout()) );
+}
+
+void Timeout::slotTimeout()
+{
+  emit timeout( m_timeout );
+}
+
+void Timeout::start()
+{
+  m_timer->start( dbus_timeout_get_interval( m_timeout ) );
+}
+
+Integrator::Integrator( DBusConnection *conn, QObject *parent )
+  : QObject( parent ), m_connection( conn )
+{
+  m_timeouts.setAutoDelete( true );
+
+  dbus_connection_set_watch_functions( m_connection,
+                                       dbusAddWatch,
+                                       dbusRemoveWatch,
+                                       dbusToggleWatch,
+                                       this, 0 );
+  dbus_connection_set_timeout_functions( m_connection,
+                                         dbusAddTimeout,
+                                         dbusRemoveTimeout,
+                                         dbusToggleTimeout,
+                                         this, 0 );
+  dbus_connection_set_wakeup_main_function( m_connection,
+					    dbusWakeupMain,
+					    this, 0 );
+}
+
+Integrator::Integrator( DBusServer *server, QObject *parent )
+  : QObject( parent ), m_server( server )
+{
+  m_connection = reinterpret_cast<DBusConnection*>( m_server );
+  m_timeouts.setAutoDelete( true );
+
+  dbus_server_set_watch_functions( m_server,
+                                   dbusAddWatch,
+                                   dbusRemoveWatch,
+                                   dbusToggleWatch,
+                                   this, 0 );
+  dbus_server_set_timeout_functions( m_server,
+                                     dbusAddTimeout,
+                                     dbusRemoveTimeout,
+                                     dbusToggleTimeout,
+                                     this, 0 );
+  dbus_server_set_new_connection_function( m_server,
+                                           dbusNewConnection,
+                                           this,  0 );
+}
+
+void Integrator::slotRead( int fd )
+{
+  QIntDictIterator<Watch>	it( m_watches );
+  for ( ; it.current(); ++it )
+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE );
+
+  emit readReady();
+}
+
+void Integrator::slotWrite( int fd )
+{
+  QIntDictIterator<Watch>       it( m_watches );
+  for ( ; it.current(); ++it )
+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE );
+}
+
+void Integrator::slotTimeout( DBusTimeout *timeout )
+{
+  dbus_timeout_handle( timeout );
+}
+
+void Integrator::addWatch( DBusWatch *watch )
+{
+  if ( !dbus_watch_get_enabled( watch ) )
+    return;
+
+  Watch *qtwatch = new Watch;
+  qtwatch->watch = watch;
+
+  int flags = dbus_watch_get_flags( watch );
+  int fd = dbus_watch_get_fd( watch );
+
+  if ( flags & DBUS_WATCH_READABLE ) {
+    qtwatch->readSocket = new QSocketNotifier( fd, QSocketNotifier::Read, this );
+    QObject::connect( qtwatch->readSocket, SIGNAL(activated(int)), SLOT(slotRead(int)) );
+  }
+
+  if (flags & DBUS_WATCH_WRITABLE) {
+    qtwatch->writeSocket = new QSocketNotifier( fd, QSocketNotifier::Write, this );
+    QObject::connect( qtwatch->writeSocket, SIGNAL(activated(int)), SLOT(slotWrite(int)) );
+  }
+
+  m_watches.insert( fd, qtwatch );
+}
+
+void Integrator::removeWatch( DBusWatch *watch )
+{
+  int key = dbus_watch_get_fd( watch );
+
+  Watch *qtwatch = m_watches.take( key );
+
+  if ( qtwatch ) {
+    delete qtwatch->readSocket;  qtwatch->readSocket = 0;
+    delete qtwatch->writeSocket; qtwatch->writeSocket = 0;
+    delete qtwatch;
+  }
+}
+
+void Integrator::addTimeout( DBusTimeout *timeout )
+{
+  Timeout *mt = new Timeout( this, timeout );
+  m_timeouts.insert( timeout, mt );
+  connect( mt, SIGNAL(timeout(DBusTimeout*)),
+           SLOT(slotTimeout(DBusTimeout*)) );
+  mt->start();
+}
+
+void Integrator::removeTimeout( DBusTimeout *timeout )
+{
+  m_timeouts.remove( timeout );
+}
+
+void Integrator::handleConnection( DBusConnection *c )
+{
+  Connection *con = new Connection( c, this );
+  emit newConnection( con );
+}
+
+}//end namespace Internal
+}//end namespace DBusQt
+
+#include "integrator.moc"
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.h kdebase-3.5.1/kioslave/media/mediamanager/integrator.h
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/integrator.h	2006-01-26 14:54:50.000000000 +0100
@@ -0,0 +1,95 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* integrator.h: integrates D-BUS into Qt event loop
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_INTEGRATOR_H
+#define DBUS_QT_INTEGRATOR_H
+
+/* We acknowledge the the dbus API is unstable */
+#define DBUS_API_SUBJECT_TO_CHANGE
+
+#include <qobject.h>
+
+#include <qintdict.h>
+#include <qptrdict.h>
+
+#include "dbus/dbus.h"
+
+class QTimer;
+
+namespace DBusQt
+{
+  class Connection;
+
+  namespace Internal
+  {
+    struct Watch;
+
+    class Timeout : public QObject
+    {
+      Q_OBJECT
+    public:
+      Timeout( QObject *parent, DBusTimeout *t );
+    public:
+      void start();
+    signals:
+      void timeout( DBusTimeout* );
+    protected slots:
+      void slotTimeout();
+    private:
+      QTimer *m_timer;
+      DBusTimeout *m_timeout;
+    };
+
+    class Integrator : public QObject
+    {
+      Q_OBJECT
+    public:
+      Integrator( DBusConnection *connection, QObject *parent );
+      Integrator( DBusServer *server, QObject *parent );
+
+    signals:
+      void readReady();
+      void newConnection( Connection* );
+
+    protected slots:
+      void slotRead( int );
+      void slotWrite( int );
+      void slotTimeout( DBusTimeout *timeout );
+
+    public:
+      void addWatch( DBusWatch* );
+      void removeWatch( DBusWatch* );
+
+      void addTimeout( DBusTimeout* );
+      void removeTimeout( DBusTimeout* );
+
+      void handleConnection( DBusConnection* );
+    private:
+      QIntDict<Watch> m_watches;
+      QPtrDict<Timeout> m_timeouts;
+      DBusConnection *m_connection;
+      DBusServer *m_server;
+    };
+  }
+}
+
+#endif
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/message.cpp kdebase-3.5.1/kioslave/media/mediamanager/message.cpp
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/message.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/message.cpp	2006-01-26 14:54:57.000000000 +0100
@@ -0,0 +1,551 @@
+/* -*- mode: C++; c-file-style: "gnu" -*- */
+/* message.cpp: Qt wrapper for DBusMessage
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "message.h"
+
+#include <qmap.h>
+
+#include <cstdlib>
+
+namespace DBusQt {
+
+struct Message::iterator::IteratorData {
+  DBusMessageIter *iter;
+  QVariant         var;
+  bool             end;
+  DBusMessage	  *mesg;
+};
+
+/**
+ * Iterator.
+ */
+Message::iterator::iterator()
+{
+  d = new IteratorData;
+  d->iter = 0; d->end = true;
+}
+
+/**
+ * Constructs iterator for the message.
+ * @param msg message whose fields we want to iterate
+ */
+Message::iterator::iterator( DBusMessage* msg )
+{
+  d = new IteratorData;
+  d->mesg = msg;
+  d->iter = static_cast<DBusMessageIter *>( malloc( sizeof(DBusMessageIter) ) );
+  dbus_message_iter_init( d->mesg, d->iter );
+  if ( !d->iter ) {
+    qDebug("No iterator??");
+  }
+  fillVar();
+  d->end = false;
+}
+
+/**
+ * Copy constructor for the iterator.
+ * @param itr iterator
+ */
+Message::iterator::iterator( const iterator& itr )
+{
+  d = new IteratorData;
+  d->iter = itr.d->iter;
+  d->var  = itr.d->var;
+  d->end  = itr.d->end;
+}
+
+/**
+ * Destructor.
+ */
+Message::iterator::~iterator()
+{
+  free( d->iter );
+  delete d; d=0;
+}
+
+/**
+ * Creates an iterator equal to the @p itr iterator
+ * @param itr other iterator
+ * @return
+ */
+Message::iterator&
+Message::iterator::operator=( const iterator& itr )
+{
+  IteratorData *tmp = new IteratorData;
+  tmp->iter = itr.d->iter;
+  tmp->var  = itr.d->var;
+  tmp->end  = itr.d->end;
+  delete d; d=tmp;
+  return *this;
+}
+
+/**
+ * Returns the constant QVariant held by the iterator.
+ * @return the constant reference to QVariant held by this iterator
+ */
+const QVariant&
+Message::iterator::operator*() const
+{
+  return d->var;
+}
+
+/**
+ * Returns the QVariant held by the iterator.
+ * @return reference to QVariant held by this iterator
+ */
+QVariant&
+Message::iterator::operator*()
+{
+  return d->var;
+}
+
+/**
+ * Moves to the next field and return a reference to itself after
+ * incrementing.
+ * @return reference to self after incrementing
+ */
+Message::iterator&
+Message::iterator::operator++()
+{
+  if ( d->end )
+    return *this;
+
+  if (  dbus_message_iter_next( d->iter ) ) {
+    fillVar();
+  } else {
+    d->end = true;
+    d->var = QVariant();
+  }
+  return *this;
+}
+
+/**
+ * Moves to the next field and returns self before incrementing.
+ * @return self before incrementing
+ */
+Message::iterator
+Message::iterator::operator++(int)
+{
+  iterator itr( *this );
+  operator++();
+  return itr;
+}
+
+/**
+ * Compares this iterator to @p it iterator.
+ * @param it the iterator to which we're comparing this one to
+ * @return true if they're equal, false otherwise
+ */
+bool
+Message::iterator::operator==( const iterator& it )
+{
+  if ( d->end == it.d->end ) {
+    if ( d->end == true ) {
+      return true;
+    } else {
+      return d->var == it.d->var;
+    }
+  } else
+    return false;
+}
+
+/**
+ * Compares two iterators.
+ * @param it The other iterator.
+ * @return true if two iterators are not equal, false
+ *         otherwise
+ */
+bool
+Message::iterator::operator!=( const iterator& it )
+{
+  return !operator==( it );
+}
+
+QVariant Message::iterator::marshallBaseType( DBusMessageIter* i )
+{
+  QVariant ret;
+  switch (dbus_message_iter_get_arg_type(i)) {
+  case DBUS_TYPE_INT32:
+    {
+      dbus_int32_t v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  case DBUS_TYPE_UINT32:
+    {
+      dbus_uint32_t v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  case DBUS_TYPE_DOUBLE:
+    {
+      double v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  case DBUS_TYPE_STRING:
+    {
+      const char *v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  default:
+    ret = QVariant();
+    break;
+  }
+  return ret;
+}
+
+/**
+ * Fills QVariant based on what current DBusMessageIter helds.
+ */
+void
+Message::iterator::fillVar()
+{
+  switch ( dbus_message_iter_get_arg_type( d->iter ) ) {
+  case DBUS_TYPE_INT32:
+  case DBUS_TYPE_UINT32:
+  case DBUS_TYPE_DOUBLE:
+  case DBUS_TYPE_STRING:
+    d->var = marshallBaseType( d->iter );
+    break;
+  case DBUS_TYPE_ARRAY: {
+    switch ( dbus_message_iter_get_element_type( d->iter ) ) {
+    case DBUS_TYPE_STRING: {
+      QStringList tempList;
+      DBusMessageIter sub;
+      dbus_message_iter_recurse (d->iter, &sub);
+      while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID)
+        {
+          const char *v;
+          dbus_message_iter_get_basic (&sub, &v);
+          tempList.append( QString( v ) );
+          dbus_message_iter_next (&sub);
+        }
+      d->var = QVariant( tempList );
+      break;
+    }
+    default:
+      qDebug( "Array of type not implemented" );
+      d->var = QVariant();
+      break;
+    }
+    break;
+  }
+#if 0
+  /* DICT is gone for now, but expected to be reintroduced, or else
+   * reintroduced as a flag on the introspection data that can
+   * apply to array of struct of two fields
+   */
+  case DBUS_TYPE_DICT: {
+    qDebug( "Got a hash!" );
+    QMap<QString, QVariant> tempMap;
+    DBusMessageIter dictIter;
+    dbus_message_iter_init_dict_iterator( d->iter, &dictIter );
+    do {
+      char *key = dbus_message_iter_get_dict_key( &dictIter );
+      tempMap[key] = marshallBaseType( &dictIter );
+      dbus_free( key );
+      dbus_message_iter_next( &dictIter );
+    } while( dbus_message_iter_has_next( &dictIter ) );
+    d->var = QVariant( tempMap );
+    break;
+    qDebug( "Hash/Dict type not implemented" );
+    d->var = QVariant();
+    break;
+  }
+#endif
+  default:
+    qDebug( "not implemented" );
+    d->var = QVariant();
+    break;
+  }
+}
+
+/**
+ * Returns a QVariant help by this iterator.
+ * @return QVariant held by this iterator
+ */
+QVariant
+Message::iterator::var() const
+{
+  return d->var;
+}
+
+struct Message::Private {
+  DBusMessage *msg;
+};
+
+Message::Message( DBusMessage *m )
+{
+  d = new Private;
+  d->msg = m;
+}
+
+/**
+ *
+ */
+Message::Message( int messageType )
+{
+  d = new Private;
+  d->msg = dbus_message_new( messageType );
+}
+
+/**
+ * Constructs a new Message with the given service and name.
+ * @param service service service that the message should be sent to
+ * @param name name of the message
+ */
+Message::Message( const QString& service, const QString& path,
+                  const QString& interface, const QString& method )
+{
+  d = new Private;
+  d->msg = dbus_message_new_method_call( service.latin1(), path.latin1(),
+                                         interface.latin1(), method.latin1() );
+}
+
+/**
+ * Constructs a message that is a reply to some other
+ * message.
+ * @param name the name of the message
+ * @param replayingTo original_message the message which the created
+ * message is a reply to.
+ */
+Message::Message( const Message& replayingTo )
+{
+  d = new Private;
+  d->msg = dbus_message_new_method_return( replayingTo.d->msg );
+}
+
+Message:: Message( const QString& path, const QString& interface,
+                   const QString& name )
+{
+  d = new Private;
+  d->msg = dbus_message_new_signal( path.ascii(), interface.ascii(),
+                                    name.ascii() );
+}
+
+Message::Message( const Message& replayingTo, const QString& errorName,
+                  const QString& errorMessage )
+{
+  d = new Private;
+  d->msg = dbus_message_new_error( replayingTo.d->msg, errorName.utf8(),
+                                   errorMessage.utf8() );
+}
+
+Message Message::operator=( const Message& other )
+{
+  //FIXME: ref the other.d->msg instead of copying it?
+}
+/**
+ * Destructs message.
+ */
+Message::~Message()
+{
+  if ( d->msg ) {
+    dbus_message_unref( d->msg );
+  }
+  delete d; d=0;
+}
+
+int Message::type() const
+{
+  return dbus_message_get_type( d->msg );
+}
+
+void Message::setPath( const QString& path )
+{
+  dbus_message_set_path( d->msg, path.ascii() );
+}
+
+QString Message::path() const
+{
+  return dbus_message_get_path( d->msg );
+}
+
+void Message::setInterface( const QString& iface )
+{
+  dbus_message_set_interface( d->msg, iface.ascii() );
+}
+
+QString Message::interface() const
+{
+  return dbus_message_get_interface( d->msg );
+}
+
+void Message::setMember( const QString& member )
+{
+  dbus_message_set_member( d->msg, member.ascii() );
+}
+
+QString Message::member() const
+{
+  return dbus_message_get_member( d->msg );
+}
+
+QString Message::errorName() const
+{
+  return dbus_message_get_error_name( d->msg );
+}
+
+QString Message::destination() const
+{
+  return dbus_message_get_destination( d->msg );
+}
+
+/**
+ * Sets the message sender.
+ * @param sender the sender
+ * @return false if unsuccessful
+ */
+bool
+Message::setSender( const QString& sender )
+{
+  return dbus_message_set_sender( d->msg, sender.latin1() );
+}
+
+/**
+ * Returns sender of this message.
+ * @return sender
+ */
+QString
+Message::sender() const
+{
+  return dbus_message_get_sender( d->msg );
+}
+
+QString Message::signature() const
+{
+  return dbus_message_get_signature( d->msg );
+}
+
+
+/**
+ * Returns the starting iterator for the fields of this
+ * message.
+ * @return starting iterator
+ */
+Message::iterator
+Message::begin() const
+{
+  return iterator( d->msg );
+}
+
+/**
+ * Returns the ending iterator for the fields of this
+ * message.
+ * @return ending iterator
+ */
+Message::iterator
+Message::end() const
+{
+  return iterator();
+}
+
+/**
+ * Returns the field at position @p i
+ * @param i position of the wanted field
+ * @return QVariant at position @p i or an empty QVariant
+ */
+QVariant
+Message::at( int i )
+{
+  iterator itr( d->msg );
+
+  while ( i-- ) {
+    if ( itr == end() )
+      return QVariant();//nothing there
+    ++itr;
+  }
+  return *itr;
+}
+
+/**
+ * The underlying DBusMessage of this class.
+ * @return DBusMessage pointer.
+ */
+DBusMessage*
+Message::message() const
+{
+  return d->msg;
+}
+
+Message& Message::operator<<( bool b )
+{
+  const dbus_bool_t right_size_bool = b;
+  dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_INT8 byte )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_INT32 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_UINT32 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_INT64 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_UINT64 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( double num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( const QString& str )
+{
+  const char *u = str.utf8();
+  dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( const QVariant& custom )
+{
+  //FIXME: imeplement
+}
+
+}
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/message.h kdebase-3.5.1/kioslave/media/mediamanager/message.h
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/message.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/message.h	2006-01-26 14:55:00.000000000 +0100
@@ -0,0 +1,132 @@
+/* -*- mode: C++; c-file-style: "gnu" -*- */
+/* message.h: Qt wrapper for DBusMessage
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_MESSAGE_H
+#define DBUS_QT_MESSAGE_H
+
+/* We acknowledge the the dbus API is unstable */
+#define DBUS_API_SUBJECT_TO_CHANGE
+
+#include <qvariant.h>
+#include <qstring.h>
+#include <qstringlist.h>
+
+#include "dbus/dbus.h"
+
+namespace DBusQt {
+
+  class Message
+  {
+  public:
+    class iterator {
+    public:
+      iterator();
+      iterator( const iterator& );
+      iterator( DBusMessage* msg );
+      ~iterator();
+
+      iterator& operator=( const iterator& );
+      const QVariant& operator*() const;
+      QVariant& operator*();
+      iterator& operator++();
+      iterator operator++(int);
+      bool operator==( const iterator& it );
+      bool operator!=( const iterator& it );
+
+      QVariant var() const;
+    protected:
+      QVariant marshallBaseType( DBusMessageIter* i );
+      void fillVar();
+      struct IteratorData;
+      IteratorData *d;
+    };
+
+    Message( int messageType );
+    Message( DBusMessage * );//hide this one from the public implementation
+    Message( const QString& service, const QString& path,
+             const QString& interface, const QString& method );
+    Message( const Message& replayingTo );
+    Message( const QString& path, const QString& interface,
+             const QString& name );
+    Message( const Message& replayingTo, const QString& errorName,
+             const QString& errorMessage );
+
+    Message operator=( const Message& other );
+
+    virtual ~Message();
+
+    int type() const;
+
+    void setPath( const QString& );
+    QString path() const;
+
+    void setInterface( const QString& );
+    QString interface() const;
+
+    void setMember( const QString& );
+    QString member() const;
+
+    QString errorName() const;
+
+    QString destination() const;
+
+    bool    setSender( const QString& sender );
+    QString    sender() const;
+
+    QString signature() const;
+
+    iterator begin() const;
+    iterator end() const;
+
+    QVariant at( int i );
+
+
+  public:
+    Message& operator<<( bool );
+    Message& operator<<( Q_INT8 );
+    Message& operator<<( Q_INT32 );
+    Message& operator<<( Q_UINT32 );
+    Message& operator<<( Q_INT64 );
+    Message& operator<<( Q_UINT64 );
+    Message& operator<<( double );
+    Message& operator<<( const QString& );
+    Message& operator<<( const QVariant& );
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+
+  protected:
+    friend class Connection;
+    DBusMessage* message() const;
+
+  private:
+    struct Private;
+    Private *d;
+  };
+
+}
+
+#endif
--- kdebase-3.5.1/kioslave/media/configure.in.in.dbus	2006-01-26 15:45:06.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 15:53:54.000000000 +0100
@@ -106,70 +106,6 @@
 
   AC_SUBST(DBUS_INCS)
   AC_SUBST(DBUS_LIBS)
-
-########### Check for DBus-Qt bindings
-
-  AC_MSG_CHECKING(for DBus-Qt bindings)
-
-  dbusqt_inc=NOTFOUND
-  dbusqt_lib=NOTFOUND
-  dbusqt=NOTFOUND
-
-  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-  AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-
-  if test -r $dbusqt_incdir/dbus/connection.h ; then
-    have_qt_patch=0
-    grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-    > /dev/null 2>&1 && have_qt_patch=1
-    if test $have_qt_patch = 1 ; then
-      DBUSQT_INCS="-I$dbusqt_incdir"
-      dbusqt_inc=FOUND
-    fi
-  fi
-
-  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-  AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-
-  if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-    dbusqt_lib=FOUND
-  fi
-
-  if test $dbusqt_inc != FOUND  || test $dbusqt_lib != FOUND ; then 
-
-    search_incs="`pkg-config --cflags dbus-1  |sed 's/-I//g'`"
-    AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-    if test -r $dbusqt_incdir/dbus/connection.h ; then
-      have_qt_patch=0
-      grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-      > /dev/null 2>&1 && have_qt_patch=1
-      if test $have_qt_patch = 1 ; then
-        DBUSQT_INCS="-I$dbusqt_incdir"
-        dbusqt_inc=FOUND
-      fi
-    fi
-
-    search_libs="`pkg-config --libs dbus-1 --libs-only-L | sed 's/-L//g'`"
-    AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-
-    if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-      DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-      dbusqt_lib=FOUND
-    fi
-
-  fi
-
-
-  if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
-    AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
-    dbusqt=FOUND
-  else
-    AC_MSG_RESULT(searched but not found)
-  fi
-
-  AC_SUBST(DBUSQT_INCS)
-  AC_SUBST(DBUSQT_LIBS)
 fi
 
 ########### Check if media HAL backend sould be compiled
@@ -177,7 +113,7 @@
 AC_MSG_CHECKING(if the HAL backend for media:/ should be compiled)
 
 HALBACKEND=no
-if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
+if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" ; then
   AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
   HALBACKEND=yes
   AC_SUBST(HALBACKEND)
--- kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am.tn	2006-04-03 23:29:27.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am	2006-04-03 23:29:31.000000000 +0200
@@ -1,17 +1,22 @@
 kde_module_LTLIBRARIES = kded_mediamanager.la
 
 if include_media_halbackend
-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
+HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS)
 endif
 
 METASOURCES = AUTO
 INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes)
 
+DBUSQT3BINDING_LIB = libdbusqt3.la
+libdbusqt3_la_SOURCES = connection.cpp integrator.cpp message.cpp
+libdbusqt3_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+libdbusqt3_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS)
+
 if include_media_halbackend
 HALBACKEND_LIB = libhalbackend.la
 libhalbackend_la_SOURCES = halbackend.cpp
 libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
+libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT3BINDING_LIB)
 endif
 
 if include_media_linuxcdpolling
@@ -20,7 +25,7 @@
 liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
 endif
 
-noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
+noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) $(DBUSQT3BINDING_LIB)
 
 kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
 kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
--- kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h.tn	2006-06-01 17:40:51.000000000 +0200
+++ kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h	2006-06-01 17:36:23.000000000 +0200
@@ -40,7 +40,7 @@
 /* We acknowledge the the dbus API is unstable */
 #define DBUS_API_SUBJECT_TO_CHANGE
 /* DBus-Qt bindings */
-#include <dbus/connection.h>
+#include <connection.h>
 /* HAL libraries */
 #include <libhal.h>
 #include <libhal-storage.h>

kdebase-3.5.3-kioslave_media_dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |    7 
 kcmodule/managermodule.cpp                  |    4 
 kcmodule/media.desktop                      |    2 
 kcmodule/notifiermodule.cpp                 |    7 
 kfile-plugin/kfile_media.desktop            |    2 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.cpp                   |    4 
 libmediacommon/medium.h                     |   21 
 mediaimpl.cpp                               |   15 
 mediamanager/halbackend.cpp                 |  664 ++++++++++++++++++++++++++--
 mediamanager/halbackend.h                   |   20 
 mediamanager/mediamanager.cpp               |   81 +++
 mediamanager/mediamanager.h                 |    8 
 medianotifier/medianotifier.cpp             |    9 
 mimetypes/audiocd.desktop                   |    4 
 mimetypes/blankcd.desktop                   |    2 
 mimetypes/blankdvd.desktop                  |    2 
 mimetypes/cdrom_mounted.desktop             |    4 
 mimetypes/cdrom_unmounted.desktop           |    2 
 mimetypes/cdwriter_mounted.desktop          |    2 
 mimetypes/cdwriter_unmounted.desktop        |    2 
 mimetypes/dvdvideo.desktop                  |    4 
 mimetypes/floppy5_mounted.desktop           |    2 
 mimetypes/floppy5_unmounted.desktop         |    2 
 mimetypes/floppy_mounted.desktop            |    2 
 mimetypes/floppy_unmounted.desktop          |    2 
 mimetypes/hdd_mounted.desktop               |    1 
 mimetypes/hdd_unmounted.desktop             |    1 
 mimetypes/nfs_mounted.desktop               |    1 
 mimetypes/nfs_unmounted.desktop             |    1 
 mimetypes/removable_mounted.desktop         |    5 
 mimetypes/removable_unmounted.desktop       |    5 
 mimetypes/smb_mounted.desktop               |    3 
 mimetypes/smb_unmounted.desktop             |    3 
 mimetypes/vcd.desktop                       |    1 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   51 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  217 +++++++++
 propsdlgplugin/propertiespage.h             |   46 +
 propsdlgplugin/propertiespagegui.ui         |  387 ++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 ++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 +
 services/media_eject.desktop                |    2 
 47 files changed, 1695 insertions(+), 104 deletions(-)

--- NEW FILE kdebase-3.5.3-kioslave_media_dbus.patch ---
diff -Nur kdebase-3.5.3/kioslave/media/configure.in.in kdebase-3.5.3.me/kioslave/media/configure.in.in
--- kdebase-3.5.3/kioslave/media/configure.in.in	2005-10-10 17:04:01.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/configure.in.in	2006-06-01 17:13:01.000000000 +0200
@@ -90,6 +90,13 @@
   if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
     KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
   fi
+
+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
+  if test -z "$dbus_bus_var"; then
+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
+  fi
+  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
+
   if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
     AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
     dbus=FOUND
diff -Nur kdebase-3.5.3/kioslave/media/kcmodule/managermodule.cpp kdebase-3.5.3.me/kioslave/media/kcmodule/managermodule.cpp
--- kdebase-3.5.3/kioslave/media/kcmodule/managermodule.cpp	2005-11-20 20:14:21.000000000 +0100
+++ kdebase-3.5.3.me/kioslave/media/kcmodule/managermodule.cpp	2006-06-01 17:13:01.000000000 +0200
@@ -39,15 +39,15 @@
 	QString hal_text = view->kcfg_HalBackendEnabled->text();
 	hal_text += " ("+i18n("No support for HAL on this system")+")";
 	view->kcfg_HalBackendEnabled->setText( hal_text );
-	view->kcfg_HalBackendEnabled->setEnabled( false );
 #endif
+	view->kcfg_HalBackendEnabled->setEnabled( false );
 
 #ifndef COMPILE_LINUXCDPOLLING
 	QString poll_text = view->kcfg_CdPollingEnabled->text();
 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
 	view->kcfg_CdPollingEnabled->setText( poll_text );
-	view->kcfg_CdPollingEnabled->setEnabled( false );
 #endif
+	view->kcfg_CdPollingEnabled->setEnabled( false );
 
 	load();
 }
diff -Nur kdebase-3.5.3/kioslave/media/kcmodule/media.desktop kdebase-3.5.3.me/kioslave/media/kcmodule/media.desktop
--- kdebase-3.5.3/kioslave/media/kcmodule/media.desktop	2006-05-22 20:12:42.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/kcmodule/media.desktop	2006-06-01 17:13:01.000000000 +0200
@@ -83,7 +83,6 @@
 Comment[fi]=Aseta tallennusmedia
 Comment[fr]=Configurer le m??dia de stockage
 Comment[fy]=Opslachmedia ynstelle
-Comment[ga]=Cumraigh Me??in St??r??la
 Comment[gl]=Configurar Medios de Armacenaxe
 Comment[hr]=Konfiguriranje medija za pohranu
 Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa
@@ -130,7 +129,6 @@
 Keywords[fi]=varasto,media,usb,cdrom,laite
 Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique
 Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
-Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as
 Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
 Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ure??aj
 Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z
diff -Nur kdebase-3.5.3/kioslave/media/kcmodule/notifiermodule.cpp kdebase-3.5.3.me/kioslave/media/kcmodule/notifiermodule.cpp
--- kdebase-3.5.3/kioslave/media/kcmodule/notifiermodule.cpp	2006-05-22 20:12:42.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/kcmodule/notifiermodule.cpp	2006-06-01 17:16:21.000000000 +0200
@@ -174,8 +174,8 @@
 	ActionListBoxItem *action_item
 		= static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem());
 	
-	NotifierServiceAction * action;
-	if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) )
+	NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() );
+	if ( action )
 	{
 		ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this);
 		
@@ -195,7 +195,8 @@
 		= static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem());
 	
 	NotifierServiceAction *action;
-	if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) )
+        action = dynamic_cast<NotifierServiceAction*>( action_item->action() );
+	if ( action )
 	{
 		m_settings.deleteAction( action );
 		updateListBox();
diff -Nur kdebase-3.5.3/kioslave/media/kfile-plugin/kfile_media.desktop kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfile_media.desktop
--- kdebase-3.5.3/kioslave/media/kfile-plugin/kfile_media.desktop	2006-05-22 20:12:42.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfile_media.desktop	2006-06-01 17:13:01.000000000 +0200
@@ -61,4 +61,4 @@
 Name[zh_TW]=????????????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_media
-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted
diff -Nur kdebase-3.5.3/kioslave/media/kfile-plugin/kfilemediaplugin.cpp kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
--- kdebase-3.5.3/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2005-11-08 23:36:07.000000000 +0100
+++ kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-06-01 17:13:01.000000000 +0200
@@ -64,12 +64,16 @@
 	addMimeType( "media/floppy_unmounted" );
 	addMimeType( "media/zip_unmounted" );
 	addMimeType( "media/gphoto2camera" );
+	addMimeType( "media/camera_mounted" );
+	addMimeType( "media/camera_unmounted" );	
 }
 
 bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
 {
-	const Medium medium = askMedium(info);
+        const Medium medium = askMedium(info);
 
+	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
+ 
 	if (medium.id().isNull()) return false;
 	
 	QString mount_point = medium.mountPoint();
@@ -161,7 +165,8 @@
 const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
 {
 	DCOPRef mediamanager("kded", "mediamanager");
-	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
+	kdDebug() << "properties " << info.url() << endl;
+	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
 
 	if ( !reply.isValid() )
 	{
diff -Nur kdebase-3.5.3/kioslave/media/libmediacommon/medium.cpp kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.cpp
--- kdebase-3.5.3/kioslave/media/libmediacommon/medium.cpp	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.cpp	2006-06-01 17:13:01.000000000 +0200
@@ -40,6 +40,8 @@
 	m_properties+= QString::null; /* ICON_NAME */
 
 	loadUserLabel();
+
+	m_halmounted = false;
 }
 
 Medium::Medium()
@@ -57,6 +59,8 @@
 	m_properties+= QString::null; /* BASE_URL */
 	m_properties+= QString::null; /* MIME_TYPE */
 	m_properties+= QString::null; /* ICON_NAME */
+	
+	m_halmounted = false;
 }
 
 const Medium Medium::create(const QStringList &properties)
diff -Nur kdebase-3.5.3/kioslave/media/libmediacommon/medium.h kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.h
--- kdebase-3.5.3/kioslave/media/libmediacommon/medium.h	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.h	2006-06-01 17:13:01.000000000 +0200
@@ -22,6 +22,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 #include <kurl.h>
+#include <qmap.h>
 
 class Medium
 {
@@ -78,14 +79,32 @@
 
 	void setMimeType(const QString &mimeType);
 	void setIconName(const QString &iconName);
+	void setHalMounted(bool flag) const { m_halmounted = flag; }
+	bool halMounted() const { return m_halmounted; }
 
 private:
 	Medium();
 	void loadUserLabel();
 
 	QStringList m_properties;
-
+	mutable bool m_halmounted;
+	
 friend class QValueListNode<const Medium>;
 };
 
+namespace MediaManagerUtils {
+  static inline QMap<QString,QString> splitOptions(const QStringList & options) 
+    {
+      QMap<QString,QString> valids;
+
+      for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+	{
+	  QString key = (*it).left((*it).find('='));
+	  QString value = (*it).mid((*it).find('=') + 1);
+	  valids[key] = value;
+	}
+      return valids;
+    }
+}
+
 #endif
diff -Nur kdebase-3.5.3/kioslave/media/Makefile.am kdebase-3.5.3.me/kioslave/media/Makefile.am
--- kdebase-3.5.3/kioslave/media/Makefile.am	2005-09-10 10:25:36.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/Makefile.am	2006-06-01 17:13:01.000000000 +0200
@@ -1,5 +1,5 @@
 SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
-          kfile-plugin kcmodule mimetypes services
+          kfile-plugin kcmodule mimetypes services propsdlgplugin
 
 INCLUDES = -I$(srcdir)/libmediacommon $(all_includes)
 METASOURCES = AUTO
@@ -28,4 +28,5 @@
 	./testmedia
[...2207 lines suppressed...]
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#ifndef PROPERTIESPAGE_H
+#define PROPERTIESPAGE_H
+
+#include "propertiespagegui.h"
+#include <qmap.h>
+
+class QCheckBox;
+class Medium;
+
+class PropertiesPage : public PropertiesPageGUI
+{
+  Q_OBJECT
+
+public:
+  PropertiesPage(QWidget* parent, const QString &_id);
+  virtual ~PropertiesPage();
+  
+  bool save();
+
+protected:
+  
+  QMap<QString,QString> options;
+  QString id;
+
+};
+
+#endif
diff -Nur kdebase-3.5.3/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kdebase-3.5.3.me/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
--- kdebase-3.5.3/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.3.me/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp	2006-06-01 17:13:01.000000000 +0200
@@ -0,0 +1,100 @@
+/*
+  Copyright (c) 2004 Jan Schaefer <j_schaef at informatik.uni-kl.de>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+#include <qstring.h>
+#include <qvbox.h>
+#include <qlayout.h>
+#include <qlabel.h>
+#include <qtimer.h>
+
+#include <kgenericfactory.h>
+#include <kdebug.h>
+#include <kpushbutton.h>
+#include <kfileshare.h>
+#include <kmessagebox.h>
+#include <kprocess.h>
+#include <kstandarddirs.h>
+#include <kdialog.h>
+#include <kglobal.h>
+#include <dcopref.h>
+
+#include "propertiespage.h"
+#include "propsdlgshareplugin.h"
+#include "../libmediacommon/medium.h"
+
+typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory;
+
+K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin,
+                            PropsDlgSharePluginFactory("media_propsdlgplugin") )
+
+class PropsDlgSharePlugin::Private                            
+{
+  public:
+    PropertiesPage* page; 
+};
+                            
+PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
+					  const char *, const QStringList & )
+  : KPropsDlgPlugin(dlg), d(0)
+{
+  if (properties->items().count() != 1)
+    return;
+
+  KFileItem *item = properties->items().first();
+
+  DCOPRef mediamanager("kded", "mediamanager");
+  kdDebug() << "properties " << item->url() << endl;
+  DCOPReply reply = mediamanager.call( "properties", item->url().url() );
+  
+  if ( !reply.isValid() )
+    return;
+  
+  QVBox* vbox = properties->addVBoxPage(i18n("&Mounting"));
+  
+  d = new Private();
+  
+  d->page = new PropertiesPage(vbox, Medium::create(reply).id());
+  connect(d->page, SIGNAL(changed()),
+	  SLOT(slotChanged()));
+
+  //  QTimer::singleShot(100, this, SLOT(slotChanged()));
+  
+}                            
+
+void PropsDlgSharePlugin::slotChanged()
+{
+  kdDebug() << "slotChanged()\n";
+  setDirty(true);
+}
+
+PropsDlgSharePlugin::~PropsDlgSharePlugin()
+{
+  delete d;
+}
+
+void PropsDlgSharePlugin::applyChanges() 
+{
+  kdDebug() << "applychanges\n";
+  if (!d->page->save()) {
+    properties->abortApplying();
+  }
+}
+
+
+#include "propsdlgshareplugin.moc"
+
diff -Nur kdebase-3.5.3/kioslave/media/propsdlgplugin/propsdlgshareplugin.h kdebase-3.5.3.me/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
--- kdebase-3.5.3/kioslave/media/propsdlgplugin/propsdlgshareplugin.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.3.me/kioslave/media/propsdlgplugin/propsdlgshareplugin.h	2006-06-01 17:13:01.000000000 +0200
@@ -0,0 +1,44 @@
+/*
+  Copyright (c) 2004 Jan Schaefer <j_schaef at informatik.uni-kl.de>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#ifndef KONQFILESHAREPLUGIN_H
+#define KONQFILESHAREPLUGIN_H
+
+#include <kpropertiesdialog.h>
+
+class PropsDlgSharePlugin : public KPropsDlgPlugin
+{
+Q_OBJECT
+public:
+  PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & );
+  virtual ~PropsDlgSharePlugin();
+  virtual void applyChanges();
+
+public slots:
+  void slotChanged();
+
+private:
+  class Private;
+  Private *d;
+    
+};
+
+#endif
+
+
diff -Nur kdebase-3.5.3/kioslave/media/services/media_eject.desktop kdebase-3.5.3.me/kioslave/media/services/media_eject.desktop
--- kdebase-3.5.3/kioslave/media/services/media_eject.desktop	2006-05-22 20:12:42.000000000 +0200
+++ kdebase-3.5.3.me/kioslave/media/services/media_eject.desktop	2006-06-01 17:13:01.000000000 +0200
@@ -23,7 +23,7 @@
 Name[eo]=Eligo
 Name[es]=Expulsar
 Name[et]=V??ljastamine
-Name[eu]=Egotzi
+Name[eu]=Kanporatu
 Name[fa]=??????????
 Name[fi]=Poista
 Name[fr]=??jecter


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	26 Mar 2006 11:31:45 -0000	1.48
+++ .cvsignore	1 Jun 2006 15:53:36 -0000	1.49
@@ -22,3 +22,4 @@
 kdebase-3.5.1.tar.bz2
 kde-redhat-config-3.5-fc5-0.2.tar.bz2
 kdebase-3.5.2.tar.bz2
+kdebase-3.5.3.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kdebase.spec	24 May 2006 13:51:35 -0000	1.180
+++ kdebase.spec	1 Jun 2006 15:53:36 -0000	1.181
@@ -7,8 +7,8 @@
 %define include_kappfinder 0
 
 %define qt_version 3.3.6
-%define arts_version 1.5.2
-%define kde_version 3.5.2
+%define arts_version 1.5.3
+%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
@@ -19,8 +19,8 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.2
-Release: 12
+Version: 3.5.3
+Release: 1
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -38,7 +38,7 @@
 Source8: env.sh
 
 Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.2-1-redhat.patch
+Patch1: kdebase-3.5.3-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -49,19 +49,14 @@
 Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
-Patch12: kdebase-3.5.2-kioslave_media_dbus.patch
-Patch13: kdebase-3.5.2-dbus.patch
+Patch12: kdebase-3.5.3-kioslave_media_dbus.patch
+Patch13: kdebase-3.5.3-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
 Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 
-# upstream patches
-Patch100: kdebase-3.5.2-kwin.patch
-Patch101: kdebase-3.5.2-kicker-konsole-bookmarks.patch
-Patch102: kdebase-3.5.2-konsole.patch
-
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -155,11 +150,6 @@
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 
-# upstream patches
-%patch100 -p1 -b .kwin
-%patch101 -p1 -b .kicker-konsole-bookmarks
-%patch102 -p1 -b .konsole
-
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -180,7 +170,9 @@
 %endif
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --with-extra-libs=%{_libdir} \
@@ -524,6 +516,11 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
+- update to 3.5.3
+- drop --enable-new-ldflags, workaround for ld bug
+- update kioslave_media_dbus patch
+
 * Wed May 24 2006 Than Ngo <than at redhat.com> 6:3.5.2-12
 - don't overwrites user preference
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	26 Mar 2006 11:31:45 -0000	1.67
+++ sources	1 Jun 2006 15:53:36 -0000	1.68
@@ -1,2 +1,2 @@
 a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2
-c5685e1be34e033286aa1f37002a0552  kdebase-3.5.2.tar.bz2
+9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2


--- kdebase-3.5.2-1-redhat.patch DELETED ---


--- kdebase-3.5.2-dbus.patch DELETED ---


--- kdebase-3.5.2-kicker-konsole-bookmarks.patch DELETED ---


--- kdebase-3.5.2-kioslave_media_dbus.patch DELETED ---


--- kdebase-3.5.2-konsole.patch DELETED ---


--- kdebase-3.5.2-kwin.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 15:56:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 11:56:06 -0400
Subject: rpms/ant/devel apache-ant-1.6.5-jvm1.5-detect.patch, NONE,
	1.1 ant.spec, 1.71, 1.72
Message-ID: <200606011556.k51Fu6Ef004639@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4280

Modified Files:
	ant.spec 
Added Files:
	apache-ant-1.6.5-jvm1.5-detect.patch 
Log Message:

Added patch to fix jvm version detection



apache-ant-1.6.5-jvm1.5-detect.patch:
 build.xml                                            |    2 +-
 src/main/org/apache/tools/ant/util/JavaEnvUtils.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE apache-ant-1.6.5-jvm1.5-detect.patch ---
--- ./src/main/org/apache/tools/ant/util/JavaEnvUtils.java.sav	2006-05-31 18:18:10.000000000 -0400
+++ ./src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2006-05-31 18:18:18.000000000 -0400
@@ -95,7 +95,7 @@
             Class.forName("java.lang.CharSequence");
             javaVersion = JAVA_1_4;
             javaVersionNumber++;
-            Class.forName("java.lang.Readable");
+            Class.forName("java.net.Proxy");
             javaVersion = JAVA_1_5;
             javaVersionNumber++;
         } catch (Throwable t) {
--- ./build.xml.sav	2006-05-31 18:18:28.000000000 -0400
+++ ./build.xml	2006-05-31 18:18:37.000000000 -0400
@@ -365,7 +365,7 @@
   <target name="check_for_optional_packages">
     <available property="jdk1.3+" classname="java.lang.StrictMath"/>
     <available property="jdk1.4+" classname="java.lang.CharSequence"/>
-    <available property="jdk1.5+" classname="java.lang.Readable"/>
+    <available property="jdk1.5+" classname="java.net.Proxy"/>
     <available property="kaffe" classname="kaffe.util.NotImplemented"/>
     <available property="bsf.present"
                classname="org.apache.bsf.BSFManager"


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ant.spec	6 Mar 2006 22:36:26 -0000	1.71
+++ ant.spec	1 Jun 2006 15:56:04 -0000	1.72
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_7fc
+Release: 	%{jpprelease}_8fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -23,6 +23,7 @@
 Patch2:         apache-ant-1.6.5-javah.patch
 Patch4:         apache-ant-jars.patch
 Patch5:         apache-ant-bz163689.patch
+Patch6:         apache-ant-1.6.5-jvm1.5-detect.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
 Requires:       java-devel
@@ -752,6 +753,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_8fc
+- Added patch to fix jvm version detection
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.6.5-1jpp_7fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 16:18:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 12:18:42 -0400
Subject: rpms/freeradius/devel freeradius-1.1.2-build.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 freeradius.spec, 1.31, 1.32 sources,
	1.11, 1.12
Message-ID: <200606011618.k51GIgFJ022955@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/freeradius/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22864

Modified Files:
	.cvsignore freeradius.spec sources 
Added Files:
	freeradius-1.1.2-build.patch 
Log Message:
[tw]
- new version 1.1.2


freeradius-1.1.2-build.patch:
 doc/Makefile          |    4 ++--
 doc/examples/Makefile |    4 ++--
 doc/rfc/Makefile      |    4 ++--
 src/modules/rules.mak |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE freeradius-1.1.2-build.patch ---
--- freeradius-1.1.2/doc/examples/Makefile.build	2006-02-04 14:45:01.000000000 +0100
+++ freeradius-1.1.2/doc/examples/Makefile	2006-06-01 16:12:49.000000000 +0200
@@ -12,10 +12,10 @@
 	@rm -f *~
 
 install:
-	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius/examples
+	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/examples
 	for file in *[!~]; do \
 		if [ -f $$file -a $$file != Makefile ]; then \
-			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius/examples; \
+			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/examples; \
 		fi; \
 	done
 
--- freeradius-1.1.2/doc/rfc/Makefile.build	2006-02-04 14:38:06.000000000 +0100
+++ freeradius-1.1.2/doc/rfc/Makefile	2006-06-01 16:12:49.000000000 +0200
@@ -22,9 +22,9 @@
 	rm -f refs rfc*.html *~ .rewrite index.html
 
 install:
-	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius/rfc
+	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc
 	for file in `ls -1 *.txt *.html`; do \
-		$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius/rfc; \
+		$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc; \
 	done
 
 .PHONY: all clean install html
--- freeradius-1.1.2/doc/Makefile.build	2006-02-04 14:48:03.000000000 +0100
+++ freeradius-1.1.2/doc/Makefile	2006-06-01 16:12:49.000000000 +0200
@@ -18,10 +18,10 @@
 
 install:
 	$(INSTALL) -d -m 755 $(R)$(datadir)/doc
-	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius
+	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)
 	for file in *[!~]; do \
 		if [ -f $$file -a $$file != Makefile ]; then \
-			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius; \
+			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \
 		fi; \
 	done
 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
--- freeradius-1.1.2/src/modules/rules.mak.build	2006-05-25 18:24:40.000000000 +0200
+++ freeradius-1.1.2/src/modules/rules.mak	2006-06-01 16:12:49.000000000 +0200
@@ -113,8 +113,8 @@
 $(TARGET).la: $(LT_OBJS)
 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
-	-rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
-	$(RLM_LIBS) $(LIBS)
+	-rpath $(libdir) $^ \
+	$(RLM_LIBS) -L$(libdir) $(LIBS)
 
 #######################################################################
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 May 2006 15:10:31 -0000	1.11
+++ .cvsignore	1 Jun 2006 16:18:39 -0000	1.12
@@ -1 +1 @@
-freeradius-1.1.1.tar.gz
+freeradius-1.1.2.tar.gz


Index: freeradius.spec
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- freeradius.spec	31 May 2006 15:49:46 -0000	1.31
+++ freeradius.spec	1 Jun 2006 16:18:39 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
-Version: 1.1.1
+Version: 1.1.2
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -19,7 +19,7 @@
 Patch4: freeradius-0.9.0-com_err.patch
 Patch5: freeradius-1.1.1-pie.patch
 Patch8: freeradius-1.0.0-samba3.patch
-Patch10: freeradius-1.1.1-build.patch
+Patch10: freeradius-1.1.2-build.patch
 
 %description
 The FreeRADIUS Server Project is a high performance and highly configurable 
@@ -201,6 +201,7 @@
 %config (noreplace) /etc/raddb/radiusd.conf
 %config (noreplace) /etc/raddb/realms
 %config (noreplace) /etc/raddb/snmp.conf
+%config (noreplace) /etc/raddb/sqlippool.conf
 %config (noreplace) /etc/raddb/users
 %{_bindir}/*
 %{_libdir}/libeap*.so
@@ -276,6 +277,9 @@
 
 
 %changelog
+* Thu Jun  1 2006 Thomas Woerner <twoerner at redhat.com> 1.1.2-1
+- new version 1.1.2
+
 * Wed May 31 2006 Thomas Woerner <twoerner at redhat.com> 1.1.1-1
 - new version 1.1.1
 - fixed incorrect rlm_sql globbing (#189095)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 May 2006 15:10:31 -0000	1.11
+++ sources	1 Jun 2006 16:18:39 -0000	1.12
@@ -1 +1 @@
-b38b24f6352090fdb571b9e8da52e12e  freeradius-1.1.1.tar.gz
+6649ac5f9666b4a8cd55a837068ca61e  freeradius-1.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 16:19:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 12:19:02 -0400
Subject: rpms/lftp/FC-5 lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch, NONE,
	1.1
Message-ID: <200606011619.k51GJ2A4023138@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23112

Added Files:
	lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch 
Log Message:
workaround gcc bug 193773

lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch ---
--- lftp-3.4.7/configure.ac.s390x_FC5	2006-05-18 01:07:52.000000000 -0400
+++ lftp-3.4.7/configure.ac	2006-06-01 12:06:15.000000000 -0400
@@ -82,7 +82,7 @@
       LFTP_PROG_CXXLINK
    fi
    # save some bytes
-   LFTP_CHECK_CXX_FLAGS([-fno-exceptions -fno-rtti])
+   LFTP_CHECK_CXX_FLAGS([-fno-rtti])
    # check for -fno-implement-inline (doesn't work without -O in gcc 2.95.4; functions are never inlined)
    if test x$with_debug = xno; then
       LFTP_NOIMPLEMENTINLINE



From fedora-cvs-commits at redhat.com  Thu Jun  1 16:19:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 12:19:13 -0400
Subject: rpms/lftp/FC-5 lftp.spec,1.46,1.47
Message-ID: <200606011619.k51GJDmM023232@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23210

Modified Files:
	lftp.spec 
Log Message:
upgrade to upstream version 3.4.7


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/lftp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lftp.spec	31 May 2006 23:29:40 -0000	1.46
+++ lftp.spec	1 Jun 2006 16:19:11 -0000	1.47
@@ -12,6 +12,7 @@
 Patch173276: 	lftp-3.3.5-bz173276.patch
 Patch2:		lftp-3.4.1-dont_core.patch
 Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
+Patch193773:    lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -27,6 +28,10 @@
 #^- now fixed upstream
 #%patch181694 -p1 -b .bz181694
 #^- now fixed upstream
+%ifarch s390x
+%patch193773 -p1 -b .s390x-gcc-4.1.1-no-exceptions
+# workaround gcc bug 193773 on s390x
+%endif
 
 %build
 if pkg-config openssl ; then



From fedora-cvs-commits at redhat.com  Thu Jun  1 16:29:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 12:29:22 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.181,1.182
Message-ID: <200606011629.k51GTMJC027198@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26758

Modified Files:
	kdebase.spec 
Log Message:
fix rpm file list



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kdebase.spec	1 Jun 2006 15:53:36 -0000	1.181
+++ kdebase.spec	1 Jun 2006 16:29:19 -0000	1.182
@@ -403,6 +403,7 @@
 %attr(4755,root,root) %{_bindir}/kcheckpass
 %{_bindir}/kcheckrunning
 %{_bindir}/kcminit
+%{_bindir}/kcminit_startup
 %{_bindir}/kcontrol
 %{_bindir}/kcontroledit
 %{_bindir}/kdcop



From fedora-cvs-commits at redhat.com  Thu Jun  1 16:34:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 12:34:11 -0400
Subject: rpms/kernel/devel
	capabilities-over-netlink-in-permissive-mode.patch, NONE,
	1.1.2.1 fix-oops2-in-fs-audit.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2212.2.7, 1.2212.2.8
Message-ID: <200606011634.k51GYB5j027623@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27589

Modified Files:
      Tag: private-lspp-28-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-28-branch
	capabilities-over-netlink-in-permissive-mode.patch 
	fix-oops2-in-fs-audit.patch 
Log Message:
- lspp.34 add patch to fix 2nd reported oops & netlink capabilities fixup



capabilities-over-netlink-in-permissive-mode.patch:
 hooks.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE capabilities-over-netlink-in-permissive-mode.patch ---
>From dgoeddel at trustedcs.com Wed May 31 13:35:19 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 31 May 2006 13:35:52 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k4VHZqWc010601;
	Wed, 31 May 2006 13:35:52 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VHZp3j005299;
	Wed, 31 May 2006 13:35:51 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZk7i006383;
	Wed, 31 May 2006 13:35:46 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id E809472E6B; Wed, 31 May 2006 13:35:45 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k4VHZgTd027651 for <redhat-lspp at listman.util.phx.redhat.com>;
	Wed, 31 May 2006 13:35:42 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k4VHZfqq005281; Wed, 31 May 2006 13:35:41 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZZb3010500;
	Wed, 31 May 2006 13:35:35 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k4VHZRIl013520;
	Wed, 31 May 2006 13:35:27 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Wed May 31 13:35:21 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B447dd3d90000>; Wed, 31 May 2006 13:35:21 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id D34Q43ZG; Wed, 31 May 2006 13:35:20 -0400
Message-ID: <447DD3D7.4050200 at trustedcs.com>
Date: Wed, 31 May 2006 12:35:19 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Stephen Smalley <sds at epoch.ncsc.mil>,
 James Morris <jmorris at redhat.com>
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.82 
X-loop: redhat-lspp at redhat.com
Cc: redhat-lspp at redhat.com,
 "'SELinux List'" <SELinux at tycho.nsa.gov>
Subject: [redhat-lspp] [PATCH] fix masking of capabilities over netlink in
	permissive mode
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-Length: 5179
X-UID: 66725

I think I ran across the problem described in this thread:

http://www.redhat.com/archives/linux-audit/2006-May/msg00059.html

The process' effective capabilities are always being masked with the
allowed vector of the avc decision (for self against the capability
security class) in netlink's copy of the process capabilities (eff_cap).
The allowed vector takes on a slightly different role when SELinux
is not in enforcing mode - it starts to track used-but-not-normally-
permitted actions in the allowed vector.  That is what is causing
the first attempt to fail (the allowed vector has not been "inflated")
and the following attempts to succeed (the vector has been inflated in
response to its previous use).  Does my reasoning (and patch) seem to
be on track?




This patch removes the masking of capabilities passed over netlink
socket when SELinux is in enforcing mode.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>


diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 21dad41..c7650bb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3599,7 +3599,8 @@ static int selinux_netlink_send(struct s
 	avd.allowed = 0;
 	avc_has_perm_noaudit(tsec->sid, tsec->sid,
 				SECCLASS_CAPABILITY, ~0, &avd);
-	cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
+	if (selinux_enforcing)
+		cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
 
 	if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS)
 		err = selinux_nlmsg_perm(sk, skb);

-- 

Darrel

--
redhat-lspp mailing list
redhat-lspp at redhat.com
https://www.redhat.com/mailman/listinfo/redhat-lspp


fix-oops2-in-fs-audit.patch:
 auditfilter.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE fix-oops2-in-fs-audit.patch ---
>From amy.griffis at hp.com Thu Jun  1 10:50:03 2006
Return-Path: <linux-audit-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 01 Jun 2006 10:50:27 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k51EoRWc019284;
	Thu, 1 Jun 2006 10:50:27 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k51EoQ4R031997;
	Thu, 1 Jun 2006 10:50:26 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k51EoLYR014046;
	Thu, 1 Jun 2006 10:50:21 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 3F38C7363F; Thu,  1 Jun 2006 10:50:21 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k51EoID3007546 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 1 Jun 2006 10:50:18 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k51EoIoX031982
	for <linux-audit at redhat.com>; Thu, 1 Jun 2006 10:50:18 -0400
Received: from ccerelbas04.cce.hp.com (ccerelbas04.cce.hp.com [161.114.21.107])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k51EoGoG001002
	for <linux-audit at redhat.com>; Thu, 1 Jun 2006 10:50:16 -0400
Received: from ccerelint01.cce.cpqcorp.net (ccerelint01.cce.cpqcorp.net
	[16.110.74.103])
	by ccerelbas04.cce.hp.com (Postfix) with ESMTP id 95AB13467E
	for <linux-audit at redhat.com>; Thu,  1 Jun 2006 09:50:03 -0500 (CDT)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by ccerelint01.cce.cpqcorp.net (Postfix) with ESMTP id 6707334003
	for <linux-audit at redhat.com>; Thu,  1 Jun 2006 09:50:03 -0500 (CDT)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 17C3030B86EA; Thu,  1 Jun 2006 10:50:03 -0400 (EDT)
Date: Thu, 1 Jun 2006 10:50:03 -0400
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060601145002.GA1684 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
X-Mailer: Mutt http://www.mutt.org/
X-Editor: Vim http://www.vim.org/
User-Agent: Mutt/1.5.10i
X-RedHat-Spam-Score: -100 
X-loop: linux-audit at redhat.com
Subject: [PATCH git] fix oops in fs audit patch
X-BeenThere: linux-audit at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Linux Audit Discussion <linux-audit.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/linux-audit>,
	<mailto:linux-audit-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/linux-audit>
List-Post: <mailto:linux-audit at redhat.com>
List-Help: <mailto:linux-audit-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/linux-audit>,
	<mailto:linux-audit-request at redhat.com?subject=subscribe>
Sender: linux-audit-bounces at redhat.com
Errors-To: linux-audit-bounces at redhat.com
X-Length: 4306
X-UID: 66909

Fix bad list management in audit_inotify_unregister().

Al, please fold in with latest filesystem auditing patch
46c438b705c31284f31c64a0d18bf3bd6c62cde3.

Signed-off-by: Amy Griffis <amy.griffis at hp.com>

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index f993842..7609694 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -822,9 +822,10 @@ static inline void audit_remove_parent_w
  * Generates an IN_IGNORED event. */
 static void audit_inotify_unregister(struct list_head *in_list)
 {
-	struct audit_parent *p;
+	struct audit_parent *p, *n;
 
-	list_for_each_entry(p, in_list, ilist) {
+	list_for_each_entry_safe(p, n, in_list, ilist) {
+		list_del(&p->ilist);
 		inotify_rm_watch(audit_ih, &p->wdata);
 		/* the put matching the get in audit_do_del_rule() */
 		put_inotify_watch(&p->wdata);

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2212.2.7
retrieving revision 1.2212.2.8
diff -u -r1.2212.2.7 -r1.2212.2.8
--- kernel-2.6.spec	31 May 2006 18:04:49 -0000	1.2212.2.7
+++ kernel-2.6.spec	1 Jun 2006 16:34:07 -0000	1.2212.2.8
@@ -26,7 +26,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  .lspp.33
+%define rhbsys  .lspp.34
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
 %define signmodules 0
 %define xen_version 20060524
@@ -409,7 +409,8 @@
 Patch20102: linux-2.6-audit-pending.patch
 Patch20103: linux-2.6-net-label.patch
 Patch20104: null-dereference-in-fs-audit.patch
-
+Patch20105: fix-oops2-in-fs-audit.patch
+Patch20106: capabilities-over-netlink-in-permissive-mode.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1074,6 +1075,8 @@
 %patch20102 -p1
 #%patch20103 -p1
 %patch20104 -p1
+%patch20105 -p1
+%patch20106 -p1
 
 
 # now run oldconfig over all the config files
@@ -1725,6 +1728,9 @@
 %endif
 
 %changelog
+* Thu Jun  1 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.34 add patch to fix 2nd reported oops & netlink capabilities fixup
+
 * Wed May 30 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.33 - re-add null ptr deref patch
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 17:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 13:21:31 -0400
Subject: rpms/kdeartwork/devel .cvsignore, 1.30, 1.31 kdeartwork.spec, 1.47,
	1.48 sources, 1.31, 1.32
Message-ID: <200606011721.k51HLVuE002203@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2119

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
update to 3.5.3




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	5 Apr 2006 15:12:50 -0000	1.30
+++ .cvsignore	1 Jun 2006 17:21:24 -0000	1.31
@@ -10,3 +10,4 @@
 kdeartwork-3.5.0.tar.bz2
 kdeartwork-3.5.1.tar.bz2
 kdeartwork-3.5.2.tar.bz2
+kdeartwork-3.5.3.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeartwork.spec	5 Apr 2006 15:12:50 -0000	1.47
+++ kdeartwork.spec	1 Jun 2006 17:21:28 -0000	1.48
@@ -4,7 +4,7 @@
 %define make_cvs 1
 
 %define qt_version 3.3.6
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.2
+Version: 3.5.3
 Release: 1
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
@@ -34,14 +34,12 @@
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
-BuildRequires: xscreensaver-base
 
 Prereq: /sbin/ldconfig
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
-Requires: xscreensaver-extras
 
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE
@@ -63,15 +61,17 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
 %if %{disable_gcc_check_and_hidden_visibility}
@@ -92,23 +92,23 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR="%{buildroot}"
 
-mv $RPM_BUILD_ROOT%{_datadir}/icons/Locolor $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
-#fix file conflict with other kde packages
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kig.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/lskat.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktux.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktimemon.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/gvim* \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kbabel.png \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/gear-flowers* \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/fulmine.jpg*
+# fix file conflict with other kde packages
+rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kig.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/lskat.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktux.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktimemon.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/gvim* \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png \
+      %{buildroot}%{_datadir}/wallpapers/gear-flowers* \
+      %{buildroot}%{_datadir}/wallpapers/fulmine.jpg*
 
 %post -p /sbin/ldconfig
 
@@ -131,7 +131,7 @@
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -156,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 3.5.3-1
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-1
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Apr 2006 15:12:50 -0000	1.31
+++ sources	1 Jun 2006 17:21:28 -0000	1.32
@@ -1 +1 @@
-211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2
+e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 17:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 13:25:25 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.83,
	1.84 libselinux.spec, 1.200, 1.201
Message-ID: <200606011725.k51HPPEB003732@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3698

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Jun 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.11-2
- Check for selinux_mnt == NULL


libselinux-rhat.patch:
 canonicalize_context.c |    3 +++
 check_context.c        |    3 +++
 compute_av.c           |    3 +++
 compute_create.c       |    3 +++
 compute_member.c       |    3 +++
 compute_relabel.c      |    3 +++
 compute_user.c         |    3 +++
 disable.c              |    3 +++
 enabled.c              |    3 +++
 getenforce.c           |    3 +++
 load_policy.c          |    3 +++
 policyvers.c           |    3 +++
 setenforce.c           |    3 +++
 13 files changed, 39 insertions(+)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- libselinux-rhat.patch	18 May 2006 16:15:34 -0000	1.83
+++ libselinux-rhat.patch	1 Jun 2006 17:25:22 -0000	1.84
@@ -1,202 +1,169 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-1.30.7/src/init.c
---- nsalibselinux/src/init.c	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.7/src/init.c	2006-05-17 13:57:29.000000000 -0400
-@@ -78,21 +78,17 @@
- }
- hidden_def(set_selinuxmnt)
-  
--static void init_translations(void)
--{
--	init_context_translations();
--}
--
- static void init_lib(void) __attribute__ ((constructor));
- static void init_lib(void)
- {
- 	selinux_page_size = sysconf(_SC_PAGE_SIZE);
- 	init_selinuxmnt();
--	init_translations();
-+	init_context_translations();
- }
- 
- static void fini_lib(void) __attribute__ ((destructor));
- static void fini_lib(void)
- {
- 	fini_selinuxmnt();
-+	fini_context_translations();
- }
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.30.7/src/selinux_config.c
---- nsalibselinux/src/selinux_config.c	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.7/src/selinux_config.c	2006-05-17 14:31:07.000000000 -0400
-@@ -17,6 +17,7 @@
- #define SELINUXTAG "SELINUX="
- #define SETLOCALDEFS "SETLOCALDEFS="
- #define REQUIRESEUSERS "REQUIRESEUSERS="
-+#define CACHETRANSTAG "CACHETRANS="
- 
- /* Indices for file paths arrays. */
- #define BINPOLICY         0
-@@ -175,6 +176,10 @@
- 				      sizeof(REQUIRESEUSERS)-1)) {
- 			  value = buf_p + sizeof(REQUIRESEUSERS)-1;
- 			  intptr = &require_seusers;
-+		  } else if (!strncmp(buf_p, CACHETRANSTAG, 
-+				      sizeof(CACHETRANSTAG)-1)) {
-+			  value = buf_p + sizeof(CACHETRANSTAG)-1;
-+			  intptr = &cache_trans;
- 		  } else {
- 			  continue;
- 		  }
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.30.7/src/selinux_internal.h
---- nsalibselinux/src/selinux_internal.h	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.7/src/selinux_internal.h	2006-05-17 14:05:25.000000000 -0400
-@@ -70,3 +70,4 @@
- extern int load_setlocaldefs hidden;
- extern int require_seusers hidden;
- extern int selinux_page_size hidden;
-+extern int cache_trans hidden;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/setrans_client.c libselinux-1.30.7/src/setrans_client.c
---- nsalibselinux/src/setrans_client.c	2006-05-16 20:43:27.000000000 -0400
-+++ libselinux-1.30.7/src/setrans_client.c	2006-05-17 18:17:41.000000000 -0400
-@@ -16,6 +16,13 @@
- #include "selinux_internal.h"
- #include "setrans_internal.h"
- 
-+// Simple cache
-+static	__thread security_context_t prev_t2r_trans=NULL;
-+static	__thread security_context_t prev_t2r_raw=NULL;
-+static	__thread security_context_t prev_r2t_trans=NULL;
-+static	__thread security_context_t prev_r2t_raw=NULL;
-+
-+int cache_trans hidden = 1;
- 
- /*
-  * setransd_open
-@@ -193,6 +200,17 @@
- }
- 
- 
-+hidden void
-+fini_context_translations(void)
-+{
-+	if (cache_trans) {
-+		free(prev_r2t_trans);
-+		free(prev_r2t_raw);
-+		free(prev_t2r_trans);
-+		free(prev_t2r_raw);
-+	}
-+}
-+
- hidden int
- init_context_translations(void)
- {
-@@ -225,9 +243,24 @@
- 		*rawp = NULL;
- 		return 0;
- 	}
-+	if (cache_trans) {
-+		if (prev_t2r_trans && strcmp(prev_t2r_trans, trans) == 0) {
-+			*rawp=strdup(prev_t2r_raw);
-+		} else {
-+			free(prev_t2r_trans); prev_t2r_trans = NULL;
-+			free(prev_t2r_raw); prev_t2r_raw = NULL;
-+			if (trans_to_raw_context(trans, rawp))
-+				*rawp = strdup(trans);
-+			if (*rawp) {
-+				prev_t2r_trans=strdup(trans);
-+				prev_t2r_raw=strdup(*rawp);
-+			}
-+		}
-+	}
-+	else 
-+		if (trans_to_raw_context(trans, rawp))
-+			*rawp = strdup(trans);
- 
--	if (trans_to_raw_context(trans, rawp))
--		*rawp = strdup(trans);
- 	return *rawp ? 0 : -1;
- }
- hidden_def(selinux_trans_to_raw_context)
-@@ -240,8 +273,23 @@
- 		return 0;
- 	}
- 
--	if (raw_to_trans_context(raw, transp)) 
--		*transp = strdup(raw);
-+	if (cache_trans) {
-+		if (prev_r2t_raw && strcmp(prev_r2t_raw, raw) == 0) {
-+			*transp=strdup(prev_r2t_trans);
-+		} else {
-+			free(prev_r2t_raw); prev_r2t_raw = NULL;
-+			free(prev_r2t_trans); prev_r2t_trans = NULL;
-+			if (raw_to_trans_context(raw, transp)) 
-+				*transp = strdup(raw);
-+			if (*transp) {
-+				prev_r2t_raw=strdup(raw);
-+				prev_r2t_trans=strdup(*transp);
-+			}
-+		}
-+	} 
-+	else 
-+		if (raw_to_trans_context(raw, transp)) 
-+			*transp = strdup(raw);
- 
- 	return *transp ? 0 : -1;
- }
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/setrans_internal.h libselinux-1.30.7/src/setrans_internal.h
---- nsalibselinux/src/setrans_internal.h	2006-05-16 20:43:27.000000000 -0400
-+++ libselinux-1.30.7/src/setrans_internal.h	2006-05-17 14:07:34.000000000 -0400
-@@ -8,3 +8,4 @@
- #define MAX_DATA_BUF			8192
- 
- extern int init_context_translations(void);
-+extern void fini_context_translations(void);
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.30.7/utils/avcstat.c
---- nsalibselinux/utils/avcstat.c	2006-05-15 09:43:20.000000000 -0400
-+++ libselinux-1.30.7/utils/avcstat.c	2006-05-17 06:18:39.000000000 -0400
-@@ -27,12 +27,12 @@
- #define HEADERS		"lookups hits misses allocations reclaims frees"
- 
- struct avc_cache_stats {
--	unsigned int lookups;
--	unsigned int hits;
--	unsigned int misses;
--	unsigned int allocations;
--	unsigned int reclaims;
--	unsigned int frees;
-+	unsigned long long lookups;
-+	unsigned long long hits;
-+	unsigned long long misses;
-+	unsigned long long allocations;
-+	unsigned long long reclaims;
-+	unsigned long long frees;
- };
- 
- static int interval;
-@@ -172,7 +172,7 @@
- 		while ((line = strtok(NULL, "\n"))) {
- 			struct avc_cache_stats tmp;
- 			
--			ret = sscanf(line, "%u %u %u %u %u %u",
-+			ret = sscanf(line, "%Lu %Lu %Lu %Lu %Lu %Lu",
- 				     &tmp.lookups,
- 				     &tmp.hits,
- 				     &tmp.misses,
-@@ -195,7 +195,7 @@
- 			die("unable to parse \'%s\': no data", avcstatfile);
- 
- 		if (cumulative || (!cumulative && !i))
--			printf("%10u %10u %10u %10u %10u %10u\n",
-+			printf("%10Lu %10Lu %10Lu %10Lu %10Lu %10Lu\n",
- 			       tot.lookups, tot.hits, tot.misses,
- 			       tot.allocations, tot.reclaims, tot.frees);
- 		else {
-@@ -205,7 +205,7 @@
- 			rel.allocations = tot.allocations - last.allocations;
- 			rel.reclaims = tot.reclaims - last.reclaims;
- 			rel.frees = tot.frees - last.frees;
--			printf("%10u %10u %10u %10u %10u %10u\n",
-+			printf("%10Lu %10Lu %10Lu %10Lu %10Lu %10Lu\n",
- 			       rel.lookups, rel.hits, rel.misses,
- 			       rel.allocations, rel.reclaims, rel.frees);
- 		}
+diff -Nurp libselinux-1.29.7.orig/src/canonicalize_context.c libselinux-1.29.7/src/canonicalize_context.c
+--- libselinux-1.29.7.orig/src/canonicalize_context.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/canonicalize_context.c	2006-05-31 20:42:47.000000000 +0800
+@@ -18,6 +18,9 @@ int security_canonicalize_context_raw(se
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/check_context.c libselinux-1.29.7/src/check_context.c
+--- libselinux-1.29.7.orig/src/check_context.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/check_context.c	2006-05-31 20:43:24.000000000 +0800
+@@ -14,6 +14,9 @@ int security_check_context_raw(security_
+ 	char path[PATH_MAX];
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/compute_av.c libselinux-1.29.7/src/compute_av.c
+--- libselinux-1.29.7.orig/src/compute_av.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/compute_av.c	2006-05-31 20:44:00.000000000 +0800
+@@ -21,6 +21,9 @@ int security_compute_av_raw(security_con
+ 	size_t len;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+diff -Nurp libselinux-1.29.7.orig/src/compute_create.c libselinux-1.29.7/src/compute_create.c
+--- libselinux-1.29.7.orig/src/compute_create.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/compute_create.c	2006-05-31 20:44:53.000000000 +0800
+@@ -20,6 +20,9 @@ int security_compute_create_raw(security
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/create", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/compute_member.c libselinux-1.29.7/src/compute_member.c
+--- libselinux-1.29.7.orig/src/compute_member.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/compute_member.c	2006-05-31 20:45:36.000000000 +0800
+@@ -20,6 +20,9 @@ int security_compute_member_raw(security
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/member", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/compute_relabel.c libselinux-1.29.7/src/compute_relabel.c
+--- libselinux-1.29.7.orig/src/compute_relabel.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/compute_relabel.c	2006-05-31 20:46:04.000000000 +0800
+@@ -20,6 +20,9 @@ int security_compute_relabel_raw(securit
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/compute_user.c libselinux-1.29.7/src/compute_user.c
+--- libselinux-1.29.7.orig/src/compute_user.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/compute_user.c	2006-05-31 20:46:32.000000000 +0800
+@@ -21,6 +21,9 @@ int security_compute_user_raw(security_c
+ 	int fd, ret;
+ 	unsigned int i, nel;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/user", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/disable.c libselinux-1.29.7/src/disable.c
+--- libselinux-1.29.7.orig/src/disable.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/disable.c	2006-05-31 20:47:27.000000000 +0800
+@@ -15,6 +15,9 @@ int security_disable(void)
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/disable", selinux_mnt);
+ 	fd = open(path, O_WRONLY);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/enabled.c libselinux-1.29.7/src/enabled.c
+--- libselinux-1.29.7.orig/src/enabled.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/enabled.c	2006-05-31 20:48:30.000000000 +0800
+@@ -65,6 +65,9 @@ int is_selinux_mls_enabled(void)
+ 	char buf[20], path[PATH_MAX];
+ 	int fd, ret, enabled = 0;
+ 
++	if (!selinux_mnt)
++		return enabled;
++
+ 	snprintf(path, sizeof path, "%s/mls", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/getenforce.c libselinux-1.29.7/src/getenforce.c
+--- libselinux-1.29.7.orig/src/getenforce.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/getenforce.c	2006-05-31 20:48:56.000000000 +0800
+@@ -15,6 +15,9 @@ int security_getenforce(void)
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0)
+diff -Nurp libselinux-1.29.7.orig/src/load_policy.c libselinux-1.29.7/src/load_policy.c
+--- libselinux-1.29.7.orig/src/load_policy.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/load_policy.c	2006-05-31 20:49:33.000000000 +0800
+@@ -20,6 +20,9 @@ int security_load_policy(void *data, siz
+ 	char path[PATH_MAX];
+ 	int fd, ret;
+ 	
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/load", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+diff -Nurp libselinux-1.29.7.orig/src/policyvers.c libselinux-1.29.7/src/policyvers.c
+--- libselinux-1.29.7.orig/src/policyvers.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/policyvers.c	2006-05-31 20:50:22.000000000 +0800
+@@ -19,6 +19,9 @@ int security_policyvers(void)
+ 	char buf[20];
+ 	unsigned vers = DEFAULT_POLICY_VERSION;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/policyvers", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0) {
+diff -Nurp libselinux-1.29.7.orig/src/setenforce.c libselinux-1.29.7/src/setenforce.c
+--- libselinux-1.29.7.orig/src/setenforce.c	2006-01-20 23:37:52.000000000 +0800
++++ libselinux-1.29.7/src/setenforce.c	2006-05-31 20:50:51.000000000 +0800
+@@ -15,6 +15,9 @@ int security_setenforce(int value)
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- libselinux.spec	31 May 2006 10:36:45 -0000	1.200
+++ libselinux.spec	1 Jun 2006 17:25:22 -0000	1.201
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.11
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -115,6 +117,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Jun 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.11-2
+- Check for selinux_mnt == NULL
+
 * Tue May 30 2006 Dan Walsh <dwalsh at redhat.com> 1.30.11-1
 	* Merged matchmediacon and trans_to_raw_context fixes from 
 	  Serge Hallyn.



From fedora-cvs-commits at redhat.com  Thu Jun  1 17:33:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 13:33:47 -0400
Subject: rpms/kdelibs/FC-5 .cvsignore, 1.34, 1.35 kdelibs.spec, 1.130,
	1.131 sources, 1.46, 1.47 kdelibs-3.5.0-modular-x.patch, 1.1,
	NONE kdelibs-3.5.2-cups-api.patch, 1.1,
	NONE kdelibs-3.5.2-kdeprint.patch, 1.1,
	NONE kdelibs-3.5.2-kio_file.patch, 1.1, NONE
Message-ID: <200606011733.k51HXlQ4005745@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5681

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-3.5.0-modular-x.patch kdelibs-3.5.2-cups-api.patch 
	kdelibs-3.5.2-kdeprint.patch kdelibs-3.5.2-kio_file.patch 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	1 Feb 2006 11:08:03 -0000	1.34
+++ .cvsignore	1 Jun 2006 17:33:09 -0000	1.35
@@ -9,3 +9,4 @@
 kdelibs-3.4.92.tar.bz2
 kdelibs-3.5.0.tar.bz2
 kdelibs-3.5.1.tar.bz2
+kdelibs-3.5.3.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdelibs.spec	23 May 2006 14:15:55 -0000	1.130
+++ kdelibs.spec	1 Jun 2006 17:33:10 -0000	1.131
@@ -8,7 +8,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@@ -23,8 +23,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
-Release: 0.3.fc5
+Version: 3.5.3
+Release: 0.1.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -51,15 +51,9 @@
 Patch33: kdelibs-3.3.2-ppc.patch
 Patch34: kdelibs-3.4.0-qtdoc.patch
 Patch35: kdelibs-3.4.92-inttype.patch
-Patch36: kdelibs-3.5.0-modular-x.patch
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
-# upstream patches
-Patch100: kdelibs-3.5.2-kdeprint.patch 
-Patch101: kdelibs-3.5.2-cups-api.patch
-Patch102: kdelibs-3.5.2-kio_file.patch
-
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -187,15 +181,9 @@
 %patch33 -p1 -b .ppc
 %patch34 -p1 -b .qtdoc
 %patch35 -p1 -b .inttype
-%patch36 -p1 -b .modular-x
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
-# upstream patches
-%patch100 -p1 -b .kdeprint
-%patch101 -p1 -b .cups-api
-%patch102 -p1 -b .kio_file
- 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
    perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
@@ -289,7 +277,8 @@
 %if %{pcre} == 0
    --disable-pcre \
 %endif
-   --disable-rpath
+   --disable-rpath \
+   --with-rgbfile=%{_datadir}/X11/rgb.txt
 
 # ld breaks with -fPIC on ppc, workaround
 # it will be removed when this bug is fixed
@@ -399,7 +388,10 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
-* Tue May 23 2006 Than Ngo <than at redhat.com> 3.5.2-0.3.fc5
+* Wed May 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
+* Tue May 23 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.3.fc5
 - fix #189677, No longer possible to "copy & rename" file in same directory
 - fix #192585, kdeprint writes incorrect cupsd.conf
 - fix #178323, add KDE_IS_PRELINKED/KDE_NO_IPV60


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	29 Mar 2006 19:48:25 -0000	1.46
+++ sources	1 Jun 2006 17:33:12 -0000	1.47
@@ -1 +1 @@
-367738696dc468859cf90d5a6e8f18a9  kdelibs-3.5.2.tar.bz2
+972c2c6855f912179bd7830bf2ed91d8  kdelibs-3.5.3.tar.bz2


--- kdelibs-3.5.0-modular-x.patch DELETED ---


--- kdelibs-3.5.2-cups-api.patch DELETED ---


--- kdelibs-3.5.2-kdeprint.patch DELETED ---


--- kdelibs-3.5.2-kio_file.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 17:40:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 13:40:50 -0400
Subject: rpms/mysql/devel .cvsignore, 1.26, 1.27 mysql.spec, 1.76,
	1.77 sources, 1.26, 1.27
Message-ID: <200606011740.k51HeoVK006157@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6130

Modified Files:
	.cvsignore mysql.spec sources 
Log Message:
Update to MySQL 5.0.22 (fixes CVE-2006-2753)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	2 May 2006 03:37:25 -0000	1.26
+++ .cvsignore	1 Jun 2006 17:40:36 -0000	1.27
@@ -1 +1 @@
-mysql-5.0.21.tar.gz
+mysql-5.0.22.tar.gz


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mysql.spec	3 May 2006 03:36:47 -0000	1.76
+++ mysql.spec	1 Jun 2006 17:40:36 -0000	1.77
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.21
-Release: 2
+Version: 5.0.22
+Release: 1
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -410,6 +410,9 @@
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 
 %changelog
+* Thu Jun  1 2006 Tom Lane <tgl at redhat.com> 5.0.22-1
+- Update to MySQL 5.0.22 (fixes CVE-2006-2753)
+
 * Tue May  2 2006 Tom Lane <tgl at redhat.com> 5.0.21-2
 - Fix bogus perl Requires for mysql-test
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 May 2006 03:37:40 -0000	1.26
+++ sources	1 Jun 2006 17:40:36 -0000	1.27
@@ -1 +1 @@
-c3165204c42e1db6fc3a95a4fd2cd22f  mysql-5.0.21.tar.gz
+b0533dce52a3147234e588f51affbcab  mysql-5.0.22.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 17:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 13:42:53 -0400
Subject: rpms/ltrace/devel ltrace-e_entry.patch, NONE, 1.1 ltrace.spec, 1.33,
	1.34
Message-ID: <200606011742.k51HgrOV006557@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6493

Modified Files:
	ltrace.spec 
Added Files:
	ltrace-e_entry.patch 
Log Message:
- e_entry patch: use elf's e_entry field instead of looking up _start
  symbol, which failed on stripped binaries.


ltrace-e_entry.patch:
 elf.c                           |   33 +++------------------------------
 options.c                       |    2 +-
 sysdeps/linux-gnu/alpha/arch.h  |    3 ---
 sysdeps/linux-gnu/arm/arch.h    |    3 ---
 sysdeps/linux-gnu/i386/arch.h   |    3 ---
 sysdeps/linux-gnu/ia64/arch.h   |    3 ---
 sysdeps/linux-gnu/m68k/arch.h   |    3 ---
 sysdeps/linux-gnu/ppc/arch.h    |    8 --------
 sysdeps/linux-gnu/s390/arch.h   |    3 ---
 sysdeps/linux-gnu/sparc/arch.h  |    3 ---
 sysdeps/linux-gnu/x86_64/arch.h |    3 ---
 11 files changed, 4 insertions(+), 63 deletions(-)

--- NEW FILE ltrace-e_entry.patch ---
diff -Bburp ltrace-0.4/elf.c ltrace-0.4-pm/elf.c
--- ltrace-0.4/elf.c	2006-06-01 13:34:28.000000000 -0400
+++ ltrace-0.4-pm/elf.c	2006-06-01 13:33:34.000000000 -0400
@@ -359,8 +359,6 @@ struct library_symbol *read_elf(struct p
 	size_t i;
 	struct opt_x_t *xptr;
 	struct library_symbol **lib_tail = NULL;
-	struct opt_x_t *main_cheat;
-	int exit_out = 0;
 
 	elf_version(EV_CURRENT);
 
@@ -406,24 +404,7 @@ struct library_symbol *read_elf(struct p
 		}
 	}
 
-	if (proc->need_to_reinitialize_breakpoints) {
-		/* Add "PLTs_initialized_by_here" to opt_x list, if not already there. */
-		main_cheat = (struct opt_x_t *)malloc(sizeof(struct opt_x_t));
-		if (main_cheat == NULL)
-			error(EXIT_FAILURE, 0, "Couldn allocate memory");
-		main_cheat->next = opt_x;
-		main_cheat->name = PLTs_initialized_by_here;
-
-		for (xptr = opt_x; xptr; xptr = xptr->next)
-			if (strcmp(xptr->name, PLTs_initialized_by_here) == 0
-			    && main_cheat) {
-				free(main_cheat);
-				main_cheat = NULL;
-				break;
-			}
-		if (main_cheat)
-			opt_x = main_cheat;
-	}
+	add_library_symbol (elf_opd2addr (lte, (void*)lte->ehdr.e_entry), "_start", lib_tail, 1, 0);
 
 	for (i = 0; i < lte->symtab_count; ++i) {
 		GElf_Sym sym;
@@ -453,17 +434,9 @@ struct library_symbol *read_elf(struct p
 	}
 	for (xptr = opt_x; xptr; xptr = xptr->next)
 		if ( ! xptr->found) {
-			char *badthing = "WARNING";
-			if (E_ENTRY_NAME && strcmp(xptr->name, E_ENTRY_NAME)) {
-				badthing = "ERROR";
-				exit_out = 1;
-			}
 			fprintf (stderr,
-				 "%s: Couldn't find symbol \"%s\" in file \"%s\"\n",
-			badthing, xptr->name, proc->filename);
-		}
-	if (exit_out) {
-		exit (1);
+				 "WARNING: Couldn't find symbol \"%s\" in file \"%s\"\n",
+				 xptr->name, proc->filename);
 	}
 
 	for (i = 0; i < library_num + 1; ++i)
diff -Bburp ltrace-0.4/options.c ltrace-0.4-pm/options.c
--- ltrace-0.4/options.c	2006-06-01 13:34:28.000000000 -0400
+++ ltrace-0.4-pm/options.c	2006-06-01 13:17:15.000000000 -0400
@@ -55,7 +55,7 @@ struct opt_x_t *opt_x = NULL;
 
 /* Set a break on the routine named here in order to re-initialize breakpoints
    after all the PLTs have been initialzed */
-char *PLTs_initialized_by_here = PLTs_INIT_BY_HERE;
+char *PLTs_initialized_by_here = NULL;
 
 static void usage(void)
 {
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/alpha/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/alpha/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/alpha/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/alpha/arch.h	2006-06-01 13:25:05.000000000 -0400
@@ -6,6 +6,3 @@
 #define LT_ELF_MACHINE  EM_ALPHA
 #define LT_ELFCLASS2    ELFCLASS64
 #define LT_ELF_MACHINE2	EM_FAKE_ALPHA
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME      "_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/arm/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/arm/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/arm/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/arm/arch.h	2006-06-01 13:23:43.000000000 -0400
@@ -4,6 +4,3 @@
 
 #define LT_ELFCLASS	ELFCLASS32
 #define LT_ELF_MACHINE	EM_ARM
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME    "_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/i386/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/i386/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/i386/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/i386/arch.h	2006-06-01 13:26:29.000000000 -0400
@@ -4,6 +4,3 @@
 
 #define LT_ELFCLASS	ELFCLASS32
 #define LT_ELF_MACHINE	EM_386
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME    "_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/ia64/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/ia64/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/ia64/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/ia64/arch.h	2006-06-01 13:28:07.000000000 -0400
@@ -7,6 +7,3 @@
 
 #define LT_ELFCLASS   ELFCLASS64
 #define LT_ELF_MACHINE EM_IA_64
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME	"_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/m68k/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/m68k/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/m68k/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/m68k/arch.h	2006-06-01 13:26:00.000000000 -0400
@@ -4,6 +4,3 @@
 
 #define LT_ELFCLASS	ELFCLASS32
 #define LT_ELF_MACHINE	EM_68K
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME    "_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/ppc/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/ppc/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/ppc/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/ppc/arch.h	2006-06-01 13:24:30.000000000 -0400
@@ -1,7 +1,6 @@
 #define BREAKPOINT_VALUE { 0x7f, 0xe0, 0x00, 0x08 }
 #define BREAKPOINT_LENGTH 4
 #define DECR_PC_AFTER_BREAK 0
-#define E_ENTRY_NAME    "_start"
 
 #define LT_ELFCLASS	ELFCLASS32
 #define LT_ELF_MACHINE	EM_PPC
@@ -8,11 +8,4 @@
 #ifdef __powerpc64__
 #define LT_ELFCLASS2	ELFCLASS64
 #define LT_ELF_MACHINE2	EM_PPC64
-
-#define PLTs_INIT_BY_HERE E_ENTRY_NAME
-
-#else
-
-#define PLTs_INIT_BY_HERE NULL
-
 #endif
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/s390/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/s390/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/s390/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/s390/arch.h	2006-06-01 13:27:00.000000000 -0400
@@ -16,6 +16,3 @@
 #define LT_ELFCLASS	ELFCLASS32
 #define LT_ELF_MACHINE	EM_S390
 #endif
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME    "_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/sparc/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/sparc/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/sparc/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/sparc/arch.h	2006-06-01 13:28:39.000000000 -0400
@@ -6,6 +6,3 @@
 #define LT_ELF_MACHINE  EM_SPARC
 #define LT_ELFCLASS2    ELFCLASS32
 #define LT_ELF_MACHINE2	EM_SPARC32PLUS
-
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME    "_start"
diff -Bburp ltrace-0.4/sysdeps/linux-gnu/x86_64/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/x86_64/arch.h
--- ltrace-0.4/sysdeps/linux-gnu/x86_64/arch.h	2006-02-20 16:44:45.000000000 -0500
+++ ltrace-0.4-pm/sysdeps/linux-gnu/x86_64/arch.h	2006-06-01 13:27:37.000000000 -0400
@@ -7,9 +7,6 @@
 #define LT_ELFCLASS2	ELFCLASS32
 #define LT_ELF_MACHINE2	EM_386
 
-#define PLTs_INIT_BY_HERE NULL
-#define E_ENTRY_NAME    "_start"
-
 /* __NR_fork, __NR_clone, __NR_clone2, __NR_vfork and __NR_execve
    from asm-i386/unistd.h.  */
 #define FORK_EXEC_SYSCALLS , { 2, 120, -1, 190, 11 }


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ltrace.spec	3 May 2006 12:21:41 -0000	1.33
+++ ltrace.spec	1 Jun 2006 17:42:51 -0000	1.34
@@ -1,12 +1,13 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1.5
+Release: 1.6
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch0: ltrace-opt_x.patch
 Patch1: ltrace-testsuite.patch
 Patch2: ltrace-opd.patch
 Patch3: ltrace-demangle.patch
+Patch4: ltrace-e_entry.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
@@ -30,6 +31,7 @@
 %patch1 -p0
 %patch2 -p1
 %patch3 -p2
+%patch4 -p1
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
@@ -56,6 +58,10 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Thu Jun  1 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.6
+- e_entry patch: use elf's e_entry field instead of looking up _start
+  symbol, which failed on stripped binaries.
+
 * Tue May  3 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.5
 - Correct a typo that prevented the inclusion of "demangle.h"
 - Adding -Wl,-z,relro



From fedora-cvs-commits at redhat.com  Thu Jun  1 17:44:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 13:44:06 -0400
Subject: rpms/mysql/FC-5 .cvsignore, 1.26, 1.27 mysql.spec, 1.75,
	1.76 sources, 1.26, 1.27
Message-ID: <200606011744.k51Hi61Z007029@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7003

Modified Files:
	.cvsignore mysql.spec sources 
Log Message:
Update to MySQL 5.0.22 (fixes CVE-2006-2753)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	2 May 2006 05:10:22 -0000	1.26
+++ .cvsignore	1 Jun 2006 17:44:04 -0000	1.27
@@ -1 +1 @@
-mysql-5.0.21.tar.gz
+mysql-5.0.22.tar.gz


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-5/mysql.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mysql.spec	12 May 2006 01:32:57 -0000	1.75
+++ mysql.spec	1 Jun 2006 17:44:04 -0000	1.76
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.21
-Release: 2.FC5.1
+Version: 5.0.22
+Release: 1.FC5.1
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -410,6 +410,9 @@
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 
 %changelog
+* Thu Jun  1 2006 Tom Lane <tgl at redhat.com> 5.0.22-1.FC5.1
+- Update to MySQL 5.0.22 (fixes CVE-2006-2753)
+
 * Thu May 11 2006 Tom Lane <tgl at redhat.com> 5.0.21-2.FC5.1
 - Fix bogus perl Requires for mysql-test
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 May 2006 05:10:22 -0000	1.26
+++ sources	1 Jun 2006 17:44:04 -0000	1.27
@@ -1 +1 @@
-c3165204c42e1db6fc3a95a4fd2cd22f  mysql-5.0.21.tar.gz
+b0533dce52a3147234e588f51affbcab  mysql-5.0.22.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 18:44:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 14:44:28 -0400
Subject: rpms/ant/devel ant.spec,1.72,1.73
Message-ID: <200606011844.k51IiSEp000403@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv337

Modified Files:
	ant.spec 
Log Message:

actually apply the patch added in 8fc




Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ant.spec	1 Jun 2006 15:56:04 -0000	1.72
+++ ant.spec	1 Jun 2006 18:44:25 -0000	1.73
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_8fc
+Release: 	%{jpprelease}_9fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -377,6 +377,8 @@
 %patch5 -p1 -b .orig
 %endif
 
+%patch6 -b .sav
+
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -753,6 +755,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_9fc
+- actually apply the patch added in 8fc!
+
 * Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_8fc
 - Added patch to fix jvm version detection
 



From fedora-cvs-commits at redhat.com  Thu Jun  1 19:29:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 15:29:46 -0400
Subject: rpms/mysql/FC-4 .cvsignore, 1.25, 1.26 mysql.spec, 1.59,
	1.60 sources, 1.25, 1.26
Message-ID: <200606011929.k51JTktp010194@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10161

Modified Files:
	.cvsignore mysql.spec sources 
Log Message:
Update to MySQL 4.1.20 (fixes CVE-2006-2753)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 May 2006 03:03:38 -0000	1.25
+++ .cvsignore	1 Jun 2006 19:29:44 -0000	1.26
@@ -1 +1 @@
-mysql-4.1.19.tar.gz
+mysql-4.1.20.tar.gz


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/mysql.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mysql.spec	5 May 2006 03:03:42 -0000	1.59
+++ mysql.spec	1 Jun 2006 19:29:44 -0000	1.60
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 4.1.19
+Version: 4.1.20
 Release: 1.FC4.1
 Summary: MySQL client programs and shared libraries.
 License: GPL
@@ -379,6 +379,9 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Thu Jun  1 2006 Tom Lane <tgl at redhat.com> 4.1.20-1.FC4.1
+- Update to MySQL 4.1.20 (fixes CVE-2006-2753)
+
 * Thu May  4 2006 Tom Lane <tgl at redhat.com> 4.1.19-1.FC4.1
 - Update to MySQL 4.1.19 (fixes bugs #180467, #183277, #190743).
 - Remove broken logrotate script, per bugs #180639, #182025.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	5 May 2006 03:03:45 -0000	1.25
+++ sources	1 Jun 2006 19:29:44 -0000	1.26
@@ -1 +1 @@
-874514ef3cca9e729aaf4e0a894c5cbb  mysql-4.1.19.tar.gz
+a1dc5375f6580db5073d542200a9ad5b  mysql-4.1.20.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 20:12:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 16:12:37 -0400
Subject: rpms/libwpd/devel .cvsignore, 1.11, 1.12 libwpd.spec, 1.23,
	1.24 sources, 1.11, 1.12
Message-ID: <200606012012.k51KCbUN001634@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1610

Modified Files:
	.cvsignore libwpd.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Dec 2005 10:42:44 -0000	1.11
+++ .cvsignore	1 Jun 2006 20:12:27 -0000	1.12
@@ -4,3 +4,4 @@
 libwpd-0.8.2.tar.gz
 libwpd-0.8.3.tar.gz
 libwpd-0.8.4.tar.gz
+libwpd-0.8.5.tar.gz


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libwpd.spec	21 Mar 2006 08:29:04 -0000	1.23
+++ libwpd.spec	1 Jun 2006 20:12:27 -0000	1.24
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
-Version: 0.8.4
-Release: 2
+Version: 0.8.5
+Release: 1
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -66,6 +66,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Thu Jun 01 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-1
+- next version
+
 * Tue Mar 21 2006  Caolan McNamara <caolanm at redhat.com> 0.8.4-2
 - rebuild for libgsf
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Dec 2005 10:42:44 -0000	1.11
+++ sources	1 Jun 2006 20:12:27 -0000	1.12
@@ -1 +1 @@
-0461d4bf2da534b4bed041b67d7f7064  libwpd-0.8.4.tar.gz
+6b679e205a2805c3d23f41c65b35e266  libwpd-0.8.5.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 21:06:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 17:06:25 -0400
Subject: rpms/arts/FC-4 .cvsignore, 1.21, 1.22 arts.spec, 1.44, 1.45 sources,
	1.24, 1.25
Message-ID: <200606012106.k51L6PZe012197@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/arts/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12158

Modified Files:
	.cvsignore arts.spec sources 
Log Message:
1.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	27 Jan 2006 12:48:00 -0000	1.21
+++ .cvsignore	1 Jun 2006 21:06:22 -0000	1.22
@@ -5,3 +5,4 @@
 arts-1.4.1.tar.bz2
 arts-1.5.0.tar.bz2
 arts-1.5.1.tar.bz2
+arts-1.5.3.tar.bz2


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-4/arts.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- arts.spec	6 Apr 2006 13:04:59 -0000	1.44
+++ arts.spec	1 Jun 2006 21:06:22 -0000	1.45
@@ -9,7 +9,7 @@
 
 %define make_cvs 1
 
-Version: 1.5.2
+Version: 1.5.3
 Release: 0.1.fc4
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
@@ -152,7 +152,7 @@
 %{_libdir}/mcop/*.mcopclass
 %{_libdir}/mcop/*.mcoptype
 %{_libdir}/*.la
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so*
 %{_bindir}/artscat
 %{_bindir}/artsd
 %{_bindir}/artsdsp
@@ -164,12 +164,15 @@
 %files devel
 %defattr(-,root,root)
 %{_bindir}/mcopidl
-%{_libdir}/lib*.so
+%{_includedir}/kde
 %{_includedir}/kde/arts
 %{_includedir}/kde/artsc
 %{_bindir}/artsc-config
 
 %changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 1.5.3-0.1.fc4
+- update to 1.5.3
+
 * Thu Apr 06 2006 Than Ngo <than at redhat.com> 1.5.2-0.1.fc4
 - update to 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2006 13:05:15 -0000	1.24
+++ sources	1 Jun 2006 21:06:22 -0000	1.25
@@ -1 +1 @@
-e1eb7969ea16aab2bdd9d1a9736d6af3  arts-1.5.2.tar.bz2
+1707ce44708a70acecd7a50ef05d365e  arts-1.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  1 21:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 17:19:26 -0400
Subject: rpms/metacity/devel .cvsignore, 1.42, 1.43 metacity.spec, 1.78,
	1.79 sources, 1.42, 1.43
Message-ID: <200606012119.k51LJQeA029479@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29407

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
* Thu Jun 1 2006 Soren Sandmann <sandmann at redhat.com> 2.15.5-1
- Update metacity to a cvs snapshot, and libcm 0.0.22. (The standalone
  libcm package is being put through the package review process). 




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	18 May 2006 17:21:02 -0000	1.42
+++ .cvsignore	1 Jun 2006 21:19:23 -0000	1.43
@@ -7,3 +7,5 @@
 metacity-2.15.2.tar.bz2
 libcm-0.0.21.tar.gz
 metacity-2.15.3.tar.bz2
+libcm-0.0.22.tar.gz
+metacity-2.15.5-jun1-2006.tar.gz


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- metacity.spec	30 May 2006 18:38:29 -0000	1.78
+++ metacity.spec	1 Jun 2006 21:19:23 -0000	1.79
@@ -1,17 +1,17 @@
 %define gettext_package metacity
 
-%define libcm_version 0.0.21
-%define metacity_version 2.15.3
+%define libcm_version 0.0.22
+%define metacity_version 2.15.5
 
-%define metacity_filename metacity-%{metacity_version}
+%define metacity_filename metacity-%{metacity_version}-jun1-2006
 #-apr13-2005
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 4
+Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: %{metacity_filename}.tar.bz2
+Source0: %{metacity_filename}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
 License: GPL
 Group: User Interface/Desktops
@@ -141,6 +141,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jun 1 2006 Soren Sandmann <sandmann at redhat.com> 2.15.5-1
+- Update metacity to a cvs snapshot, and libcm 0.0.22. (The standalone
+  libcm package is being put through the package review process). 
+
 * Tue May 30 2006 Kristian H??gsberg <krh at redhat.com> 2.15.3-4
 - Bump for rawhide build.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	18 May 2006 17:21:03 -0000	1.42
+++ sources	1 Jun 2006 21:19:23 -0000	1.43
@@ -1,2 +1,4 @@
 5f8a3a3a738e5d9cd10a76b70b18013e  libcm-0.0.21.tar.gz
 2fd9f4418daf0d2e04b5a94b7992c955  metacity-2.15.3.tar.bz2
+9675b782627ef9fdbbaaec30ee9f1b77  libcm-0.0.22.tar.gz
+8a25c3c78b5efa09ff2fe9d95456fae9  metacity-2.15.5-jun1-2006.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 21:28:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 17:28:50 -0400
Subject: rpms/gnbd-kernel/devel .cvsignore, 1.16, 1.17 gnbd-kernel.spec,
	1.154, 1.155 sources, 1.19, 1.20
Message-ID: <200606012128.k51LSoX4008518@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8501

Modified Files:
	.cvsignore gnbd-kernel.spec sources 
Log Message:
Updated Sources (automated).


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Feb 2006 17:37:52 -0000	1.16
+++ .cvsignore	1 Jun 2006 21:28:48 -0000	1.17
@@ -1 +1,2 @@
 gnbd-kernel-2.6.15-2.tar.gz
+gnbd-kernel-2.6.16-0.tar.gz


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnbd-kernel.spec	14 Mar 2006 23:06:20 -0000	1.154
+++ gnbd-kernel.spec	1 Jun 2006 21:28:48 -0000	1.155
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 1
 %define kernel_version 2.6.15-1.2054_FC5
-%define subversion 2
+%define subversion 0
 
 %ifnarch i686
 %define buildsmp 0
@@ -24,8 +24,8 @@
 %endif
 
 Name: gnbd-kernel
-Version: 2.6.15
-Release: 5.FC5.23
+Version: 2.6.16
+Release: 0.0
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Feb 2006 17:37:52 -0000	1.19
+++ sources	1 Jun 2006 21:28:48 -0000	1.20
@@ -1 +1 @@
-767a3028d0d3c574db9f4a59616a9650  gnbd-kernel-2.6.15-2.tar.gz
+320bebcb556b2cc3838177f6a82d7577  gnbd-kernel-2.6.16-0.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  1 21:29:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 17:29:29 -0400
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.155,1.156
Message-ID: <200606012129.k51LTTlp008571@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8558

Modified Files:
	gnbd-kernel.spec 
Log Message:
Build for FC6.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnbd-kernel.spec	1 Jun 2006 21:28:48 -0000	1.155
+++ gnbd-kernel.spec	1 Jun 2006 21:29:27 -0000	1.156
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.15-1.2054_FC5
+%define kernel_version 2.6.16-1.2236_FC6
 %define subversion 0
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.16
-Release: 0.0
+Release: 0.1
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Thu Jun  1 21:38:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 17:38:12 -0400
Subject: rpms/kdelibs/FC-4 kdelibs-3.5.2-aspell.patch, NONE,
	1.1 kdelibs-3.5.2-cupsdconf2-group.patch, NONE, 1.1 .cvsignore,
	1.31, 1.32 kdelibs.spec, 1.103, 1.104 sources, 1.43,
	1.44 kdelibs-3.5.2-cups-api.patch, 1.1,
	NONE kdelibs-3.5.2-kdeprint.patch, 1.1, NONE
Message-ID: <200606012138.k51LcCSm008917@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8893

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-3.5.2-aspell.patch 
	kdelibs-3.5.2-cupsdconf2-group.patch 
Removed Files:
	kdelibs-3.5.2-cups-api.patch kdelibs-3.5.2-kdeprint.patch 
Log Message:
3.5.3


kdelibs-3.5.2-aspell.patch:
 ksconfig.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdelibs-3.5.2-aspell.patch ---
--- kdelibs-3.5.2/kdeui/ksconfig.cpp.orig	2006-05-11 10:51:32.000000000 +0200
+++ kdelibs-3.5.2/kdeui/ksconfig.cpp	2006-05-11 10:57:00.000000000 +0200
@@ -508,6 +508,8 @@
   // ASPELL_DATADIR default. 
   QFileInfo dir ( ASPELL_DATADIR );
   if (!dir.exists() || !dir.isDir())
+    dir.setFile ("/usr/lib/aspell");
+  if (!dir.exists() || !dir.isDir())
     dir.setFile ("/usr/lib/aspell-0.60");
   if (!dir.exists() || !dir.isDir())
     dir.setFile ("/usr/local/lib/aspell");

kdelibs-3.5.2-cupsdconf2-group.patch:
 cupsd.conf.template |    4 ++--
 cupsdconf.cpp       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.2-cupsdconf2-group.patch ---
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template.tn	2006-05-22 14:51:46.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template	2006-05-22 15:27:27.000000000 +0200
@@ -275,9 +275,9 @@
 # must be <b>sys</b>, however you can configure things for another
 # group as needed.</p>
 # <p>
-# <i>ex</i>: sys</p>
+# <i>ex</i>: lp</p>
 $$
-#Group sys
+#Group lp
 @@
 
 %%ripcache
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp.tn	2006-05-22 15:26:15.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2006-05-22 15:26:32.000000000 +0200
@@ -115,7 +115,7 @@
 	maxjobsperprinter_ = 0;
 	maxjobsperuser_ = 0;
 	user_ = "lp";
-	group_ = "sys";
+	group_ = "lp";
 	ripcache_ = "8m";
 	filterlimit_ = 0;
 	browsing_ = true;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	27 Jan 2006 13:55:21 -0000	1.31
+++ .cvsignore	1 Jun 2006 21:38:09 -0000	1.32
@@ -7,3 +7,4 @@
 kdelibs-3.4.2.tar.bz2
 kdelibs-3.5.0.tar.bz2
 kdelibs-3.5.1.tar.bz2
+kdelibs-3.5.3.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdelibs.spec	11 May 2006 10:24:43 -0000	1.103
+++ kdelibs.spec	1 Jun 2006 21:38:09 -0000	1.104
@@ -2,27 +2,27 @@
 %define redhatify 1
 
 %define debug 0
-%define final 0
+%define final 1
 
 %define qt_epoch 1
 %define arts_epoch 8
 %define cups_epoch 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
 
-%define make_cvs 1
+%define make_cvs 0
 %define fam 1
 %define dnotify 1
 %define pcre 1
 %define alsa 1
 %define arts 1
 
-Version: 3.5.2
-Release: 0.2.fc4
+Version: 3.5.3
+Release: 0.1.fc4
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -49,10 +49,7 @@
 Patch34: kdelibs-3.4.0-qtdoc.patch
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch36: kdelibs-3.5.2-kdebug-kmail-quiet.patch
-
-# upstream patches
-Patch100: kdelibs-3.5.2-kdeprint.patch
-Patch101: kdelibs-3.5.2-cups-api.patch
+Patch37: kdelibs-3.5.2-cupsdconf2-group.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -113,6 +110,7 @@
 BuildRequires: autoconf automake
 Buildrequires: libacl-devel
 Buildrequires: libattr-devel
+Buildrequires: aspell-devel
 
 Obsoletes: %{name}2
 Obsoletes: kdesupport
@@ -142,6 +140,7 @@
 Requires: libtiff-devel
 Requires: libidn-devel
 Requires: libacl-devel
+Requires: aspell-devel
 
 %if %{fam}
 Requires: fam-devel
@@ -174,10 +173,7 @@
 %patch34 -p1 -b .qtdoc
 %patch35 -p1 -b .inttype
 %patch36 -p1 -b .kdebug-kmail-quiet
-
-# upstream patches
-%patch100 -p1 -b .kdeprint
-%patch101 -p1 -b .cups-api
+%patch37 -p1 -b .cupsdconf2-group
 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
@@ -385,6 +381,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
+- update to 3.5.3 
+
 * Fri Apr 07 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	7 Apr 2006 21:44:00 -0000	1.43
+++ sources	1 Jun 2006 21:38:10 -0000	1.44
@@ -1 +1 @@
-367738696dc468859cf90d5a6e8f18a9  kdelibs-3.5.2.tar.bz2
+972c2c6855f912179bd7830bf2ed91d8  kdelibs-3.5.3.tar.bz2


--- kdelibs-3.5.2-cups-api.patch DELETED ---


--- kdelibs-3.5.2-kdeprint.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  1 21:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 17:54:53 -0400
Subject: rpms/kdelibs/FC-4 kdelibs.spec,1.104,1.105
Message-ID: <200606012154.k51Lsrp4006007@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5661

Modified Files:
	kdelibs.spec 
Log Message:
add correct path to look for aspell dict



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdelibs.spec	1 Jun 2006 21:38:09 -0000	1.104
+++ kdelibs.spec	1 Jun 2006 21:54:51 -0000	1.105
@@ -49,7 +49,8 @@
 Patch34: kdelibs-3.4.0-qtdoc.patch
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch36: kdelibs-3.5.2-kdebug-kmail-quiet.patch
-Patch37: kdelibs-3.5.2-cupsdconf2-group.patch
+Patch37: kdelibs-3.5.2-aspell.patch
+Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -173,7 +174,8 @@
 %patch34 -p1 -b .qtdoc
 %patch35 -p1 -b .inttype
 %patch36 -p1 -b .kdebug-kmail-quiet
-%patch37 -p1 -b .cupsdconf2-group
+%patch37 -p1 -b .aspell
+%patch38 -p1 -b .cupsdconf2-group
 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}



From fedora-cvs-commits at redhat.com  Thu Jun  1 23:35:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 19:35:34 -0400
Subject: rpms/jsch/devel .cvsignore, 1.3, 1.4 jsch.spec, 1.13, 1.14 sources,
	1.3, 1.4
Message-ID: <200606012335.k51NZYJZ008964@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/jsch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8935

Modified Files:
	.cvsignore jsch.spec sources 
Log Message:
update sources to 0.1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Apr 2005 18:35:54 -0000	1.3
+++ .cvsignore	1 Jun 2006 23:34:58 -0000	1.4
@@ -1 +1 @@
-jsch-0.1.18.zip
+jsch-0.1.28.zip


Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jsch.spec	6 Mar 2006 22:02:20 -0000	1.13
+++ jsch.spec	1 Jun 2006 23:34:58 -0000	1.14
@@ -2,8 +2,8 @@
 %define gcj_support 	1
 
 Name:           jsch
-Version:        0.1.18
-Release:        1jpp_7fc
+Version:        0.1.28
+Release:        1jpp_1fc
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Thu Jun  1 2006 Ben Konrath <bkonrath at redhat.com> - 0:0.1.28-1jpp_1fc
+- 0.1.28
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.1.18-1jpp_7fc
 - stop scriptlet spew
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Apr 2005 18:35:54 -0000	1.3
+++ sources	1 Jun 2006 23:34:58 -0000	1.4
@@ -1 +1 @@
-12ea010f539aee2347b43ad378f6c8df  jsch-0.1.18.zip
+d87d764d9a33b0251ff88fed5cd9e5e9  jsch-0.1.28.zip



From fedora-cvs-commits at redhat.com  Fri Jun  2 01:23:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 21:23:07 -0400
Subject: rpms/jsch/devel jsch.spec,1.14,1.15
Message-ID: <200606020123.k521N66l012544@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/jsch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12514

Modified Files:
	jsch.spec 
Log Message:
Add BuildRequires ant.


Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jsch.spec	1 Jun 2006 23:34:58 -0000	1.14
+++ jsch.spec	2 Jun 2006 01:23:01 -0000	1.15
@@ -15,6 +15,7 @@
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires:  jzlib >= 0:1.0.5
+BuildRequires:  ant
 %if %{gcj_support}
 BuildRequires:  java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -115,6 +116,7 @@
 %changelog
 * Thu Jun  1 2006 Ben Konrath <bkonrath at redhat.com> - 0:0.1.28-1jpp_1fc
 - 0.1.28
+- Add BuildRequires ant.
 
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.1.18-1jpp_7fc
 - stop scriptlet spew



From fedora-cvs-commits at redhat.com  Fri Jun  2 03:15:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 23:15:42 -0400
Subject: rpms/glib2/devel glib2.spec,1.97,1.98
Message-ID: <200606020315.k523Fgr7030255@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30144

Modified Files:
	glib2.spec 
Log Message:
Rebuild



Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- glib2.spec	25 May 2006 19:13:00 -0000	1.97
+++ glib2.spec	2 Jun 2006 03:15:39 -0000	1.98
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.11.1
-Release: 5
+Release: 6
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.1-6
+- Rebuild
+
 * Thu May 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.1-5
 - Fix some fallout
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 03:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 23:26:38 -0400
Subject: rpms/pkgconfig/devel pkgconfig.spec,1.30,1.31
Message-ID: <200606020326.k523Qce2012242@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pkgconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12229

Modified Files:
	pkgconfig.spec 
Log Message:
fix build reqs



Index: pkgconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pkgconfig.spec	11 Feb 2006 05:10:16 -0000	1.30
+++ pkgconfig.spec	2 Jun 2006 03:26:36 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.20
-Release: 2.2.1
+Release: 3
 Epoch: 1
 License: GPL
 Group: Development/Tools
@@ -9,6 +9,8 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=2661 
 Patch5:  pkgconfig-0.15.0-reqprov.patch
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: automake17
+BuildRequires: autoconf
 
 %description
 The pkgconfig tool determines compilation options. For each required
@@ -45,6 +47,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 1:0.20-3
+- Add missing BuildRequires
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.20-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 03:36:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 23:36:21 -0400
Subject: rpms/atk/devel atk.spec,1.32,1.33
Message-ID: <200606020336.k523aLbX012380@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/atk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12366

Modified Files:
	atk.spec 
Log Message:
Rebuild



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- atk.spec	4 Apr 2006 14:50:49 -0000	1.32
+++ atk.spec	2 Jun 2006 03:36:18 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.11.4
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -34,7 +34,6 @@
 %setup -q
 
 %build
-
 %configure --disable-gtk-doc
 make
 
@@ -68,6 +67,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-3
+- Rebuild
+
 * Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-2
 - Update to 1.11.4
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 03:58:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 1 Jun 2006 23:58:18 -0400
Subject: rpms/glade2/devel glade2.spec,1.21,1.22
Message-ID: <200606020358.k523wIDn011347@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11269

Modified Files:
	glade2.spec 
Log Message:
Rebuild



Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- glade2.spec	11 Feb 2006 16:54:40 -0000	1.21
+++ glade2.spec	2 Jun 2006 03:58:16 -0000	1.22
@@ -16,7 +16,7 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 	2
+Release: 	3
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-3
+- Rebuild
+
 * Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-2
 - Remove requires for gail-devel that has been unnecessary
   since 2002



From fedora-cvs-commits at redhat.com  Fri Jun  2 04:04:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 00:04:45 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.141,1.142
Message-ID: <200606020404.k5244j7X012703@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12658

Modified Files:
	gtk2.spec 
Log Message:
rebuild



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gtk2.spec	17 May 2006 02:12:51 -0000	1.141
+++ gtk2.spec	2 Jun 2006 04:04:26 -0000	1.142
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -267,6 +267,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
+- Rebuild
+
 * Tue May 16 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-1
 - Update to 2.9.1
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 04:17:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 00:17:18 -0400
Subject: rpms/gucharmap/devel gucharmap.spec,1.1,1.2
Message-ID: <200606020417.k524HIlU016651@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gucharmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16219

Modified Files:
	gucharmap.spec 
Log Message:
rebuild



Index: gucharmap.spec
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gucharmap.spec	18 Apr 2006 15:25:09 -0000	1.1
+++ gucharmap.spec	2 Jun 2006 04:17:14 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           gucharmap
 Version:        1.6.0
-Release:        6
+Release:        7
 Summary:        Unicode character picker and font browser
 
 Group:          Applications/System
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> 1.6.0-7
+- Rebuild
+
 * Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 1.6.0-6
 - Make -devel require the exact n-v-r
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 04:35:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 00:35:41 -0400
Subject: rpms/perl/devel perl-5.8.8-U27116.patch, NONE,
	1.1 perl-5.8.8-U27391.patch, NONE, 1.1 perl-5.8.8-U27426.patch,
	NONE, 1.1 perl-5.8.8-U27509.patch, NONE,
	1.1 perl-5.8.8-U27512.patch, NONE, 1.1 perl-5.8.8-U27604.patch,
	NONE, 1.1 perl-5.8.8-U27605.patch, NONE,
	1.1 perl-5.8.8-U27914.patch, NONE, 1.1 perl-5.8.8-U27329.patch,
	NONE, 1.1 perl-5.8.8-R-switch.patch, NONE, 1.1
Message-ID: <200606020435.k524ZfFd031356@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31326

Added Files:
	perl-5.8.8-U27116.patch perl-5.8.8-U27391.patch 
	perl-5.8.8-U27426.patch perl-5.8.8-U27509.patch 
	perl-5.8.8-U27512.patch perl-5.8.8-U27604.patch 
	perl-5.8.8-U27605.patch perl-5.8.8-U27914.patch 
	perl-5.8.8-U27329.patch perl-5.8.8-R-switch.patch 
Log Message:


perl-5.8.8-U27116.patch:
 pp.c         |    6 +++++-
 t/op/index.t |   14 +++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-U27116.patch ---
--- perl-5.8.8/t/op/index.t.U27116	2005-10-31 09:11:17.000000000 -0500
+++ perl-5.8.8/t/op/index.t	2006-06-01 18:20:53.000000000 -0400
@@ -7,7 +7,7 @@
 
 use strict;
 require './test.pl';
-plan( tests => 58 );
+plan( tests => 66 );
 
 my $foo = 'Now is the time for all good men to come to the aid of their country.';
 
@@ -121,3 +121,15 @@
     is (index($text, $search_octets), -1);
     is (rindex($text, $search_octets), -1);
 }
+
+foreach my $utf8 ('', ', utf-8') {
+    foreach my $arraybase (0, 1, -1, -2) {
+	my $expect_pos = 2 + $arraybase;
+
+	my $prog = "\$[ = $arraybase; \$big = \"N\\xabN\\xab\"; ";
+	$prog .= '$big .= chr 256; chop $big; ' if $utf8;
+	$prog .= 'print rindex $big, "N", 2 + $[';
+
+	fresh_perl_is($prog, $expect_pos, {}, "\$[ = $arraybase$utf8");
+    }
+}
--- perl-5.8.8/pp.c.U27116	2006-06-01 17:04:25.000000000 -0400
+++ perl-5.8.8/pp.c	2006-06-01 18:19:16.000000000 -0400
@@ -3258,9 +3258,13 @@
     if (MAXARG < 3)
 	offset = blen;
     else {
+	/* arybase is in characters, like offset, so combine prior to the
+	   UTF-8 to bytes calculation.  */
+	offset -= arybase;
 	if (offset > 0 && big_utf8)
 	    sv_pos_u2b(big, &offset, 0);
-	offset = offset - arybase + llen;
+	/* llen is in bytes.  */
+	offset += llen;
     }
     if (offset < 0)
 	offset = 0;

perl-5.8.8-U27391.patch:
 doop.c     |    8 +--
 embed.fnc  |    6 +-
 embed.h    |    8 +--
 global.sym |    2 
 pp.c       |   26 +++++++---
 proto.h    |    6 +-
 sv.c       |   43 +++++++++++++----
 sv.h       |   14 +++++
 t/op/bop.t |  148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 9 files changed, 228 insertions(+), 33 deletions(-)

--- NEW FILE perl-5.8.8-U27391.patch ---
--- perl-5.8.8/t/op/bop.t.U27391	2006-01-06 17:44:14.000000000 -0500
+++ perl-5.8.8/t/op/bop.t	2006-06-01 18:43:20.000000000 -0400
@@ -15,7 +15,7 @@
 # If you find tests are failing, please try adding names to tests to track
 # down where the failure is, and supply your new names as a patch.
 # (Just-in-time test naming)
-plan tests => 49;
+plan tests => 148;
 
 # numerics
 ok ((0xdead & 0xbeef) == 0x9ead);
@@ -197,3 +197,149 @@
     $b &= "b";
     ok($b =~ /b+$/, 'Unicode "b" is NUL-terminated');
 }
+
+require "./test.pl";
+curr_test(50);
+
+# double magic tests
+
+sub TIESCALAR { bless { value => $_[1], orig => $_[1] } }
+sub STORE { $_[0]{store}++; $_[0]{value} = $_[1] }
+sub FETCH { $_[0]{fetch}++; $_[0]{value} }
+sub stores { tied($_[0])->{value} = tied($_[0])->{orig};
+             delete(tied($_[0])->{store}) || 0 }
+sub fetches { delete(tied($_[0])->{fetch}) || 0 }
+
+# numeric double magic tests
+
+tie $x, "main", 1;
+tie $y, "main", 3;
+
+is(($x | $y), 3);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x & $y), 1);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x ^ $y), 2);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x |= $y), 3);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x &= $y), 1);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x ^= $y), 2);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(~~$y, 3);
+is(fetches($y), 1);
+is(stores($y), 0);
+
+{ use integer;
+
+is(($x | $y), 3);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x & $y), 1);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x ^ $y), 2);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x |= $y), 3);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x &= $y), 1);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x ^= $y), 2);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(~$y, -4);
+is(fetches($y), 1);
+is(stores($y), 0);
+
+} # end of use integer;
+
+# stringwise double magic tests
+
+tie $x, "main", "a";
+tie $y, "main", "c";
+
+is(($x | $y), ("a" | "c"));
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x & $y), ("a" & "c"));
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x ^ $y), ("a" ^ "c"));
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x |= $y), ("a" | "c"));
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x &= $y), ("a" & "c"));
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x ^= $y), ("a" ^ "c"));
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(~~$y, "c");
+is(fetches($y), 1);
+is(stores($y), 0);
--- perl-5.8.8/pp.c.U27391	2006-06-01 18:19:16.000000000 -0400
+++ perl-5.8.8/pp.c	2006-06-01 18:43:19.000000000 -0400
@@ -2229,13 +2229,15 @@
     dSP; dATARGET; tryAMAGICbin(band,opASSIGN);
     {
       dPOPTOPssrl;
+      if (SvGMAGICAL(left)) mg_get(left);
+      if (SvGMAGICAL(right)) mg_get(right);
       if (SvNIOKp(left) || SvNIOKp(right)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = SvIV(left) & SvIV(right);
+	  const IV i = SvIV_nomg(left) & SvIV_nomg(right);
 	  SETi(i);
 	}
 	else {
-	  const UV u = SvUV(left) & SvUV(right);
+	  const UV u = SvUV_nomg(left) & SvUV_nomg(right);
 	  SETu(u);
 	}
       }
@@ -2252,13 +2254,15 @@
     dSP; dATARGET; tryAMAGICbin(bxor,opASSIGN);
     {
       dPOPTOPssrl;
+      if (SvGMAGICAL(left)) mg_get(left);
+      if (SvGMAGICAL(right)) mg_get(right);
       if (SvNIOKp(left) || SvNIOKp(right)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = (USE_LEFT(left) ? SvIV(left) : 0) ^ SvIV(right);
+	  const IV i = (USE_LEFT(left) ? SvIV_nomg(left) : 0) ^ SvIV_nomg(right);
 	  SETi(i);
 	}
 	else {
-	  const UV u = (USE_LEFT(left) ? SvUV(left) : 0) ^ SvUV(right);
+	  const UV u = (USE_LEFT(left) ? SvUV_nomg(left) : 0) ^ SvUV_nomg(right);
 	  SETu(u);
 	}
       }
@@ -2275,13 +2279,15 @@
     dSP; dATARGET; tryAMAGICbin(bor,opASSIGN);
     {
       dPOPTOPssrl;
+      if (SvGMAGICAL(left)) mg_get(left);
+      if (SvGMAGICAL(right)) mg_get(right);
       if (SvNIOKp(left) || SvNIOKp(right)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = (USE_LEFT(left) ? SvIV(left) : 0) | SvIV(right);
+	  const IV i = (USE_LEFT(left) ? SvIV_nomg(left) : 0) | SvIV_nomg(right);
 	  SETi(i);
 	}
 	else {
-	  const UV u = (USE_LEFT(left) ? SvUV(left) : 0) | SvUV(right);
+	  const UV u = (USE_LEFT(left) ? SvUV_nomg(left) : 0) | SvUV_nomg(right);
 	  SETu(u);
 	}
       }
@@ -2376,13 +2382,15 @@
     dSP; dTARGET; tryAMAGICun(compl);
     {
       dTOPss;
+      if (SvGMAGICAL(sv))
+	  mg_get(sv);
       if (SvNIOKp(sv)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = ~SvIV(sv);
+	  const IV i = ~SvIV_nomg(sv);
 	  SETi(i);
 	}
 	else {
-	  const UV u = ~SvUV(sv);
+	  const UV u = ~SvUV_nomg(sv);
 	  SETu(u);
 	}
       }
@@ -2392,7 +2400,7 @@
 	STRLEN len;
 
 	(void)SvPV_nomg_const(sv,len); /* force check for uninit var */
-	SvSetSV(TARG, sv);
+	sv_setsv_nomg(TARG, sv);
 	tmps = (U8*)SvPV_force(TARG, len);
 	anum = len;
 	if (SvUTF8(TARG)) {
--- perl-5.8.8/global.sym.U27391	2006-01-31 10:50:34.000000000 -0500
+++ perl-5.8.8/global.sym	2006-06-01 18:43:19.000000000 -0400
@@ -432,6 +432,7 @@
 Perl_sv_2cv
 Perl_sv_2io
 Perl_sv_2iv
+Perl_sv_2iv_flags
 Perl_sv_2mortal
 Perl_sv_2nv
 Perl_sv_2pv
@@ -439,6 +440,7 @@
 Perl_sv_2pvbyte
 Perl_sv_pvn_nomg
 Perl_sv_2uv
+Perl_sv_2uv_flags
 Perl_sv_iv
 Perl_sv_uv
 Perl_sv_nv
--- perl-5.8.8/proto.h.U27391	2006-01-31 10:50:34.000000000 -0500
+++ perl-5.8.8/proto.h	2006-06-01 18:43:19.000000000 -0400
@@ -1139,14 +1139,16 @@
 PERL_CALLCONV bool	Perl_sv_2bool(pTHX_ SV* sv);
 PERL_CALLCONV CV*	Perl_sv_2cv(pTHX_ SV* sv, HV** st, GV** gvp, I32 lref);
 PERL_CALLCONV IO*	Perl_sv_2io(pTHX_ SV* sv);
-PERL_CALLCONV IV	Perl_sv_2iv(pTHX_ SV* sv);
+/* PERL_CALLCONV IV	sv_2iv(pTHX_ SV* sv); */
+PERL_CALLCONV IV	Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags);
 PERL_CALLCONV SV*	Perl_sv_2mortal(pTHX_ SV* sv);
 PERL_CALLCONV NV	Perl_sv_2nv(pTHX_ SV* sv);
 /* PERL_CALLCONV char*	sv_2pv(pTHX_ SV* sv, STRLEN* lp); */
 PERL_CALLCONV char*	Perl_sv_2pvutf8(pTHX_ SV* sv, STRLEN* lp);
 PERL_CALLCONV char*	Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp);
 PERL_CALLCONV char*	Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp);
-PERL_CALLCONV UV	Perl_sv_2uv(pTHX_ SV* sv);
+/* PERL_CALLCONV UV	sv_2uv(pTHX_ SV* sv); */
+PERL_CALLCONV UV	Perl_sv_2uv_flags(pTHX_ SV* sv, I32 flags);
 PERL_CALLCONV IV	Perl_sv_iv(pTHX_ SV* sv);
 PERL_CALLCONV UV	Perl_sv_uv(pTHX_ SV* sv);
 PERL_CALLCONV NV	Perl_sv_nv(pTHX_ SV* sv);
--- perl-5.8.8/embed.fnc.U27391	2006-01-31 09:40:27.000000000 -0500
+++ perl-5.8.8/embed.fnc	2006-06-01 18:43:19.000000000 -0400
@@ -727,14 +727,16 @@
 Apd	|bool	|sv_2bool	|NN SV* sv
 Apd	|CV*	|sv_2cv		|NULLOK SV* sv|NN HV** st|NN GV** gvp|I32 lref
 Apd	|IO*	|sv_2io		|NN SV* sv
-Apd	|IV	|sv_2iv		|NN SV* sv
+Amb	|IV	|sv_2iv		|NN SV* sv
+Apd	|IV	|sv_2iv_flags	|NN SV* sv|I32 flags
 Apd	|SV*	|sv_2mortal	|NULLOK SV* sv
 Apd	|NV	|sv_2nv		|NN SV* sv
 Amb	|char*	|sv_2pv		|NN SV* sv|NULLOK STRLEN* lp
 Apd	|char*	|sv_2pvutf8	|NN SV* sv|NULLOK STRLEN* lp
 Apd	|char*	|sv_2pvbyte	|NN SV* sv|NULLOK STRLEN* lp
 Ap	|char*	|sv_pvn_nomg	|NN SV* sv|NULLOK STRLEN* lp
-Apd	|UV	|sv_2uv		|NN SV* sv
+Amb	|UV	|sv_2uv		|NN SV* sv
+Apd	|UV	|sv_2uv_flags	|NN SV* sv|I32 flags
 Apd	|IV	|sv_iv		|NN SV* sv
 Apd	|UV	|sv_uv		|NN SV* sv
 Apd	|NV	|sv_nv		|NN SV* sv
--- perl-5.8.8/embed.h.U27391	2006-01-31 10:50:34.000000000 -0500
+++ perl-5.8.8/embed.h	2006-06-01 18:43:19.000000000 -0400
@@ -780,13 +780,13 @@
 #define sv_2bool		Perl_sv_2bool
 #define sv_2cv			Perl_sv_2cv
 #define sv_2io			Perl_sv_2io
-#define sv_2iv			Perl_sv_2iv
+#define sv_2iv_flags		Perl_sv_2iv_flags
 #define sv_2mortal		Perl_sv_2mortal
 #define sv_2nv			Perl_sv_2nv
 #define sv_2pvutf8		Perl_sv_2pvutf8
 #define sv_2pvbyte		Perl_sv_2pvbyte
 #define sv_pvn_nomg		Perl_sv_pvn_nomg
-#define sv_2uv			Perl_sv_2uv
+#define sv_2uv_flags		Perl_sv_2uv_flags
 #define sv_iv			Perl_sv_iv
 #define sv_uv			Perl_sv_uv
 #define sv_nv			Perl_sv_nv
@@ -2831,13 +2831,13 @@
 #define sv_2bool(a)		Perl_sv_2bool(aTHX_ a)
 #define sv_2cv(a,b,c,d)		Perl_sv_2cv(aTHX_ a,b,c,d)
 #define sv_2io(a)		Perl_sv_2io(aTHX_ a)
-#define sv_2iv(a)		Perl_sv_2iv(aTHX_ a)
+#define sv_2iv_flags(a,b)	Perl_sv_2iv_flags(aTHX_ a,b)
 #define sv_2mortal(a)		Perl_sv_2mortal(aTHX_ a)
 #define sv_2nv(a)		Perl_sv_2nv(aTHX_ a)
 #define sv_2pvutf8(a,b)		Perl_sv_2pvutf8(aTHX_ a,b)
 #define sv_2pvbyte(a,b)		Perl_sv_2pvbyte(aTHX_ a,b)
 #define sv_pvn_nomg(a,b)	Perl_sv_pvn_nomg(aTHX_ a,b)
-#define sv_2uv(a)		Perl_sv_2uv(aTHX_ a)
+#define sv_2uv_flags(a,b)	Perl_sv_2uv_flags(aTHX_ a,b)
 #define sv_iv(a)		Perl_sv_iv(aTHX_ a)
 #define sv_uv(a)		Perl_sv_uv(aTHX_ a)
 #define sv_nv(a)		Perl_sv_nv(aTHX_ a)
--- perl-5.8.8/sv.h.U27391	2006-01-02 09:51:46.000000000 -0500
+++ perl-5.8.8/sv.h	2006-06-01 18:43:20.000000000 -0400
@@ -953,6 +953,9 @@
 =for apidoc Am|char*|SvPVx|SV* sv|STRLEN len
 A version of C<SvPV> which guarantees to evaluate sv only once.
 
+=for apidoc Am|char*|SvPV_nomg|SV* sv|STRLEN len
+Like C<SvPV> but doesn't process magic.
+
 =for apidoc Am|char*|SvPV_nolen|SV* sv
 Returns a pointer to the string in the SV, or a stringified form of
 the SV if the SV does not contain a string.  The SV may cache the
@@ -962,6 +965,9 @@
 Coerces the given SV to an integer and returns it. See  C<SvIVx> for a
 version which guarantees to evaluate sv only once.
 
+=for apidoc Am|IV|SvIV_nomg|SV* sv
+Like C<SvIV> but doesn't process magic.
+
 =for apidoc Am|IV|SvIVx|SV* sv
 Coerces the given SV to an integer and returns it. Guarantees to evaluate
 sv only once. Use the more efficient C<SvIV> otherwise.
@@ -978,6 +984,9 @@
 Coerces the given SV to an unsigned integer and returns it.  See C<SvUVx>
 for a version which guarantees to evaluate sv only once.
 
+=for apidoc Am|UV|SvUV_nomg|SV* sv
+Like C<SvUV> but doesn't process magic.
+
 =for apidoc Am|UV|SvUVx|SV* sv
 Coerces the given SV to an unsigned integer and returns it. Guarantees to
 evaluate sv only once. Use the more efficient C<SvUV> otherwise.
@@ -1050,6 +1059,9 @@
 #define SvUV(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv(sv))
 #define SvNV(sv) (SvNOK(sv) ? SvNVX(sv) : sv_2nv(sv))
 
+#define SvIV_nomg(sv) (SvIOK(sv) ? SvIVX(sv) : sv_2iv_flags(sv, 0))
+#define SvUV_nomg(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv_flags(sv, 0))
+
 /* ----*/
 
 #define SvPV(sv, lp) SvPV_flags(sv, lp, SV_GMAGIC)
@@ -1251,6 +1263,8 @@
 #define sv_2pv_nomg(sv, lp) sv_2pv_flags(sv, lp, 0)
 #define sv_pvn_force(sv, lp) sv_pvn_force_flags(sv, lp, SV_GMAGIC)
 #define sv_utf8_upgrade(sv) sv_utf8_upgrade_flags(sv, SV_GMAGIC)
+#define sv_2iv(sv) sv_2iv_flags(sv, SV_GMAGIC)
+#define sv_2uv(sv) sv_2uv_flags(sv, SV_GMAGIC)
 
 /* Should be named SvCatPVN_utf8_upgrade? */
 #define sv_catpvn_utf8_upgrade(dsv, sstr, slen, nsv)	\
--- perl-5.8.8/sv.c.U27391	2006-01-16 07:22:21.000000000 -0500
+++ perl-5.8.8/sv.c	2006-06-01 18:43:19.000000000 -0400
@@ -2062,22 +2062,34 @@
 }
 #endif /* !NV_PRESERVES_UV*/
 
+/* sv_2iv() is now a macro using Perl_sv_2iv_flags();
+ * this function provided for binary compatibility only
+ */
+
+IV
+Perl_sv_2iv(pTHX_ register SV *sv)
+{
+    return sv_2iv_flags(sv, SV_GMAGIC);
+}
+
 /*
-=for apidoc sv_2iv
+=for apidoc sv_2iv_flags
 
-Return the integer value of an SV, doing any necessary string conversion,
-magic etc. Normally used via the C<SvIV(sv)> and C<SvIVx(sv)> macros.
+Return the integer value of an SV, doing any necessary string
+conversion.  If flags includes SV_GMAGIC, does an mg_get() first.
+Normally used via the C<SvIV(sv)> and C<SvIVx(sv)> macros.
 
 =cut
 */
 
 IV
-Perl_sv_2iv(pTHX_ register SV *sv)
+Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags)
 {
     if (!sv)
 	return 0;
     if (SvGMAGICAL(sv)) {
-	mg_get(sv);
+	if (flags & SV_GMAGIC)
+	    mg_get(sv);
 	if (SvIOKp(sv))
 	    return SvIVX(sv);
 	if (SvNOKp(sv)) {
@@ -2361,23 +2373,34 @@
     return SvIsUV(sv) ? (IV)SvUVX(sv) : SvIVX(sv);
 }
 
+/* sv_2uv() is now a macro using Perl_sv_2uv_flags();
+ * this function provided for binary compatibility only
+ */
+
+UV
+Perl_sv_2uv(pTHX_ register SV *sv)
+{
+    return sv_2uv_flags(sv, SV_GMAGIC);
+}
+
 /*
-=for apidoc sv_2uv
+=for apidoc sv_2uv_flags
 
 Return the unsigned integer value of an SV, doing any necessary string
-conversion, magic etc. Normally used via the C<SvUV(sv)> and C<SvUVx(sv)>
-macros.
+conversion.  If flags includes SV_GMAGIC, does an mg_get() first.
+Normally used via the C<SvUV(sv)> and C<SvUVx(sv)> macros.
 
 =cut
 */
 
 UV
-Perl_sv_2uv(pTHX_ register SV *sv)
+Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags)
 {
     if (!sv)
 	return 0;
     if (SvGMAGICAL(sv)) {
-	mg_get(sv);
+	if (flags & SV_GMAGIC)
+	    mg_get(sv);
 	if (SvIOKp(sv))
 	    return SvUVX(sv);
 	if (SvNOKp(sv))
--- perl-5.8.8/doop.c.U27391	2006-01-08 15:58:53.000000000 -0500
+++ perl-5.8.8/doop.c	2006-06-01 18:43:19.000000000 -0400
@@ -1171,8 +1171,8 @@
 
     if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv)))
 	sv_setpvn(sv, "", 0);	/* avoid undef warning on |= and ^= */
-    lsave = lc = SvPV_const(left, leftlen);
-    rsave = rc = SvPV_const(right, rightlen);
+    lsave = lc = SvPV_nomg_const(left, leftlen);
+    rsave = rc = SvPV_nomg_const(right, rightlen);
     len = leftlen < rightlen ? leftlen : rightlen;
     lensave = len;
     if ((left_utf || right_utf) && (sv == left || sv == right)) {
@@ -1180,9 +1180,7 @@
 	Newxz(dc, needlen + 1, char);
     }
     else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
-	/* Fix this to nong when change 22613 is integrated.
-	   (Which in turn awaits merging sv_2iv and sv_2uv)  */
-	dc = SvPV_force_nolen(sv);
+	dc = SvPV_force_nomg_nolen(sv);
 	if (SvLEN(sv) < (STRLEN)(len + 1)) {
 	    dc = SvGROW(sv, (STRLEN)(len + 1));
 	    (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);

perl-5.8.8-U27426.patch:
 perl.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-U27426.patch ---
--- perl-5.8.8/perl.c.U27426	2006-06-01 17:04:25.000000000 -0400
+++ perl-5.8.8/perl.c	2006-06-01 19:00:57.000000000 -0400
@@ -3076,8 +3076,7 @@
 	PL_minus_F = TRUE;
 	PL_splitstr = ++s;
 	while (*s && !isSPACE(*s)) ++s;
-	*s = '\0';
-	PL_splitstr = savepv(PL_splitstr);
+	PL_splitstr = savepvn(PL_splitstr, s - PL_splitstr);
 	return s;
     case 'a':
 	PL_minus_a = TRUE;

perl-5.8.8-U27509.patch:
 overload.t |  626 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 346 insertions(+), 280 deletions(-)

--- NEW FILE perl-5.8.8-U27509.patch ---
--- perl-5.8.8/lib/overload.t.U27509	2005-04-22 10:56:23.000000000 -0400
+++ perl-5.8.8/lib/overload.t	2006-06-01 19:13:32.000000000 -0400
@@ -46,92 +46,64 @@
 
 package main;
 
-our $test = 0;
 $| = 1;
-print "1..",&last,"\n";
+use Test::More tests => 508;
 
-sub test {
-  $test++; 
-  if (@_ > 1) {
-    my $comment = "";
-    $comment = " # " . $_ [2] if @_ > 2;
-    if ($_[0] eq $_[1]) {
-      print "ok $test$comment\n";
-      return 1;
-    } else {
-      $comment .= ": '$_[0]' ne '$_[1]'";
-      print "not ok $test$comment\n";
-      return 0;
-    }
-  } else {
-    if (shift) {
-      print "ok $test\n";
-      return 1;
-    } else {
-      print "not ok $test\n";
-      return 0;
-    }
-  }
-}
 
 $a = new Oscalar "087";
 $b= "$a";
 
-# All test numbers in comments are off by 1.
-# So much for hard-wiring them in :-) To fix this:
-test(1);			# 1
-
-test ($b eq $a);		# 2
-test ($b eq "087");		# 3
-test (ref $a eq "Oscalar");	# 4
-test ($a eq $a);		# 5
-test ($a eq "087");		# 6
+is($b, $a);
+is($b, "087");
+is(ref $a, "Oscalar");
+is($a, $a);
+is($a, "087");
 
 $c = $a + 7;
 
-test (ref $c eq "Oscalar");	# 7
-test (!($c eq $a));		# 8
-test ($c eq "94");		# 9
+is(ref $c, "Oscalar");
+isnt($c, $a);
+is($c, "94");
 
 $b=$a;
 
-test (ref $a eq "Oscalar");	# 10
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 11
-test ( $a eq "087");		# 12
-test ( $b eq "88");		# 13
-test (ref $a eq "Oscalar");	# 14
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 $c=$b;
 $c-=$a;
 
-test (ref $c eq "Oscalar");	# 15
-test ( $a eq "087");		# 16
-test ( $c eq "1");		# 17
-test (ref $a eq "Oscalar");	# 18
+is(ref $c, "Oscalar");
+is($a, "087");
+is($c, "1");
+is(ref $a, "Oscalar");
 
 $b=1;
 $b+=$a;
 
-test (ref $b eq "Oscalar");	# 19
-test ( $a eq "087");		# 20
-test ( $b eq "88");		# 21
-test (ref $a eq "Oscalar");	# 22
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 eval q[ package Oscalar; use overload ('++' => sub { $ {$_[0]}++;$_[0] } ) ];
 
 $b=$a;
 
-test (ref $a eq "Oscalar");	# 23
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 24
-test ( $a eq "087");		# 25
-test ( $b eq "88");		# 26
-test (ref $a eq "Oscalar");	# 27
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 package Oscalar;
 $dummy=bless \$dummy;		# Now cache of method should be reloaded
@@ -140,10 +112,10 @@
 $b=$a;
 $b++;				
 
-test (ref $b eq "Oscalar");	# 28
-test ( $a eq "087");		# 29
-test ( $b eq "88");		# 30
-test (ref $a eq "Oscalar");	# 31
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 undef $b;			# Destroying updates tables too...
 
@@ -151,14 +123,14 @@
 
 $b=$a;
 
-test (ref $a eq "Oscalar");	# 32
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 33
-test ( $a eq "087");		# 34
-test ( $b eq "88");		# 35
-test (ref $a eq "Oscalar");	# 36
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 package Oscalar;
 $dummy=bless \$dummy;		# Now cache of method should be reloaded
@@ -166,21 +138,21 @@
 
 $b++;				
 
-test (ref $b eq "Oscalar");	# 37
-test ( $a eq "087");		# 38
-test ( $b eq "90");		# 39
-test (ref $a eq "Oscalar");	# 40
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "90");
+is(ref $a, "Oscalar");
 
 $b=$a;
 $b++;
 
-test (ref $b eq "Oscalar");	# 41
-test ( $a eq "087");		# 42
-test ( $b eq "89");		# 43
-test (ref $a eq "Oscalar");	# 44
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "89");
+is(ref $a, "Oscalar");
 
 
-test ($b? 1:0);			# 45
+ok($b? 1:0);
 
 eval q[ package Oscalar; use overload ('=' => sub {$main::copies++; 
 						   package Oscalar;
@@ -189,44 +161,44 @@
 
 $b=new Oscalar "$a";
 
-test (ref $b eq "Oscalar");	# 46
-test ( $a eq "087");		# 47
-test ( $b eq "087");		# 48
-test (ref $a eq "Oscalar");	# 49
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "087");
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 50
-test ( $a eq "087");		# 51
-test ( $b eq "89");		# 52
-test (ref $a eq "Oscalar");	# 53
-test ($copies == 0);		# 54
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "89");
+is(ref $a, "Oscalar");
+is($copies, undef);
 
 $b+=1;
 
-test (ref $b eq "Oscalar");	# 55
-test ( $a eq "087");		# 56
-test ( $b eq "90");		# 57
-test (ref $a eq "Oscalar");	# 58
-test ($copies == 0);		# 59
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "90");
+is(ref $a, "Oscalar");
+is($copies, undef);
 
 $b=$a;
 $b+=1;
 
-test (ref $b eq "Oscalar");	# 60
-test ( $a eq "087");		# 61
-test ( $b eq "88");		# 62
-test (ref $a eq "Oscalar");	# 63
-test ($copies == 0);		# 64
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
+is($copies, undef);
 
 $b=$a;
 $b++;
 
-test (ref $b eq "Oscalar") || print ref $b,"=ref(b)\n";	# 65
-test ( $a eq "087");		# 66
-test ( $b eq "89");		# 67
-test (ref $a eq "Oscalar");	# 68
-test ($copies == 1);		# 69
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "89");
+is(ref $a, "Oscalar");
+is($copies, 1);
 
 eval q[package Oscalar; use overload ('+=' => sub {$ {$_[0]} += 3*$_[1];
 						   $_[0] } ) ];
@@ -235,34 +207,34 @@
 $b=$a;
 $b+=1;
 
-test (ref $b eq "Oscalar");	# 70
-test ( $a eq "087");		# 71
-test ( $b eq "90");		# 72
-test (ref $a eq "Oscalar");	# 73
-test ($copies == 2);		# 74
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "90");
+is(ref $a, "Oscalar");
+is($copies, 2);
 
 $b+=$b;
 
-test (ref $b eq "Oscalar");	# 75
-test ( $b eq "360");		# 76
-test ($copies == 2);		# 77
+is(ref $b, "Oscalar");
+is($b, "360");
+is($copies, 2);
 $b=-$b;
 
-test (ref $b eq "Oscalar");	# 78
-test ( $b eq "-360");		# 79
-test ($copies == 2);		# 80
+is(ref $b, "Oscalar");
+is($b, "-360");
+is($copies, 2);
 
 $b=abs($b);
 
-test (ref $b eq "Oscalar");	# 81
-test ( $b eq "360");		# 82
-test ($copies == 2);		# 83
+is(ref $b, "Oscalar");
+is($b, "360");
+is($copies, 2);
 
 $b=abs($b);
 
-test (ref $b eq "Oscalar");	# 84
-test ( $b eq "360");		# 85
-test ($copies == 2);		# 86
+is(ref $b, "Oscalar");
+is($b, "360");
+is($copies, 2);
 
 eval q[package Oscalar; 
        use overload ('x' => sub {new Oscalar ( $_[2] ? "_.$_[1]._" x $ {$_[0]}
@@ -270,7 +242,7 @@
 
 $a=new Oscalar "yy";
 $a x= 3;
-test ($a eq "_.yy.__.yy.__.yy._"); # 87
+is($a, "_.yy.__.yy.__.yy._");
 
 eval q[package Oscalar; 
        use overload ('.' => sub {new Oscalar ( $_[2] ? 
@@ -279,7 +251,7 @@
 
 $a=new Oscalar "xx";
 
-test ("b${a}c" eq "_._.b.__.xx._.__.c._"); # 88
+is("b${a}c", "_._.b.__.xx._.__.c._");
 
 # Check inheritance of overloading;
 {
@@ -288,26 +260,26 @@
 }
 
 $aI = new OscalarI "$a";
-test (ref $aI eq "OscalarI");	# 89
-test ("$aI" eq "xx");		# 90
-test ($aI eq "xx");		# 91
-test ("b${aI}c" eq "_._.b.__.xx._.__.c._");		# 92
+is(ref $aI, "OscalarI");
+is("$aI", "xx");
+is($aI, "xx");
+is("b${aI}c", "_._.b.__.xx._.__.c._");
 
 # Here we test blessing to a package updates hash
 
 eval "package Oscalar; no overload '.'";
 
-test ("b${a}" eq "_.b.__.xx._"); # 93
+is("b${a}", "_.b.__.xx._");
 $x="1";
 bless \$x, Oscalar;
-test ("b${a}c" eq "bxxc");	# 94
+is("b${a}c", "bxxc");
 new Oscalar 1;
-test ("b${a}c" eq "bxxc");	# 95
+is("b${a}c", "bxxc");
 
 # Negative overloading:
 
 $na = eval { ~$a };
-test($@ =~ /no method found/);	# 96
+like($@, qr/no method found/);
 
 # Check AUTOLOADING:
 
@@ -318,32 +290,32 @@
 eval "package Oscalar; sub comple; use overload '~' => 'comple'";
 
 $na = eval { ~$a };		# Hash was not updated
-test($@ =~ /no method found/);	# 97
+like($@, qr/no method found/);
 
 bless \$x, Oscalar;
 
 $na = eval { ~$a };		# Hash updated
 warn "`$na', $@" if $@;
-test !$@;			# 98
-test($na eq '_!_xx_!_');	# 99
+ok !$@;
+is($na, '_!_xx_!_');
 
 $na = 0;
 
 $na = eval { ~$aI };		# Hash was not updated
-test($@ =~ /no method found/);	# 100
+like($@, qr/no method found/);
 
 bless \$x, OscalarI;
 
 $na = eval { ~$aI };
 print $@;
 
-test !$@;			# 101
-test($na eq '_!_xx_!_');	# 102
+ok(!$@);
+is($na, '_!_xx_!_');
 
 eval "package Oscalar; sub rshft; use overload '>>' => 'rshft'";
 
 $na = eval { $aI >> 1 };	# Hash was not updated
-test($@ =~ /no method found/);	# 103
+like($@, qr/no method found/);
 
 bless \$x, OscalarI;
 
@@ -352,20 +324,20 @@
 $na = eval { $aI >> 1 };
 print $@;
 
-test !$@;			# 104
-test($na eq '_!_xx_!_');	# 105
+ok(!$@);
+is($na, '_!_xx_!_');
 
 # warn overload::Method($a, '0+'), "\n";
-test (overload::Method($a, '0+') eq \&Oscalar::numify); # 106
-test (overload::Method($aI,'0+') eq \&Oscalar::numify); # 107
-test (overload::Overloaded($aI)); # 108
-test (!overload::Overloaded('overload')); # 109
+is(overload::Method($a, '0+'), \&Oscalar::numify);
+is(overload::Method($aI,'0+'), \&Oscalar::numify);
+ok(overload::Overloaded($aI));
+ok(!overload::Overloaded('overload'));
 
-test (! defined overload::Method($aI, '<<')); # 110
-test (! defined overload::Method($a, '<')); # 111
+ok(! defined overload::Method($aI, '<<'));
+ok(! defined overload::Method($a, '<'));
 
-test (overload::StrVal($aI) =~ /^OscalarI=SCALAR\(0x[\da-fA-F]+\)$/); # 112
-test (overload::StrVal(\$aI) eq "@{[\$aI]}"); # 113
+like (overload::StrVal($aI), qr/^OscalarI=SCALAR\(0x[\da-fA-F]+\)$/);
+is(overload::StrVal(\$aI), "@{[\$aI]}");
 
 # Check overloading by methods (specified deep in the ISA tree).
 {
@@ -379,16 +351,16 @@
 $aII = \$aaII;
 bless $aII, 'OscalarII';
 bless \$fake, 'OscalarI';		# update the hash
-test(($aI | 3) eq '_<<_xx_<<_');	# 114
+is(($aI | 3), '_<<_xx_<<_');
 # warn $aII << 3;
-test(($aII << 3) eq '_<<_087_<<_');	# 115
+is(($aII << 3), '_<<_087_<<_');
 
 {
   BEGIN { $int = 7; overload::constant 'integer' => sub {$int++; shift}; }
   $out = 2**10;
 }
-test($int, 9);		# 116
-test($out, 1024);		# 117
+is($int, 9);
+is($out, 1024);
 
 $foo = 'foo';
 $foo1 = 'f\'o\\o';
@@ -402,15 +374,15 @@
   /b\b$foo.\./;
 }
 
-test($out, 'foo');		# 118
-test($out, $foo);		# 119
-test($out1, 'f\'o\\o');		# 120
-test($out1, $foo1);		# 121
-test($out2, "a\afoo,\,");	# 122
-test("@q", "foo q f'o\\\\o q a\\a qq ,\\, qq");	# 123
-test($q, 11);			# 124
-test("@qr", "b\\b qq .\\. qq");	# 125
-test($qr, 9);			# 126
+is($out, 'foo');
+is($out, $foo);
+is($out1, 'f\'o\\o');
+is($out1, $foo1);
+is($out2, "a\afoo,\,");
+is("@q", "foo q f'o\\\\o q a\\a qq ,\\, qq");
+is($q, 11);
+is("@qr", "b\\b qq .\\. qq");
+is($qr, 9);
 
 {
   $_ = '!<b>!foo!<-.>!';
@@ -433,19 +405,19 @@
   tr/A-Z/a-z/;
 }
 
-test($out, '_<foo>_');		# 117
-test($out1, '_<f\'o\\o>_');		# 128
-test($out2, "_<a\a>_foo_<,\,>_");	# 129
-test("@q1", "foo q f'o\\\\o q a\\a qq ,\\, qq oups
+is($out, '_<foo>_');
+is($out1, '_<f\'o\\o>_');
+is($out2, "_<a\a>_foo_<,\,>_");
+is("@q1", "foo q f'o\\\\o q a\\a qq ,\\, qq oups
  qq oups1
- q second part q tail here s A-Z tr a-z tr");	# 130
-test("@qr1", "b\\b qq .\\. qq try it q first part q yet another qq");	# 131
-test($res, 1);			# 132
-test($a, "_<oups
->_");	# 133
-test($b, "_<oups1
->_");	# 134
-test($c, "bareword");	# 135
+ q second part q tail here s A-Z tr a-z tr");
+is("@qr1", "b\\b qq .\\. qq try it q first part q yet another qq");
+is($res, 1);
+is($a, "_<oups
+>_");
+is($b, "_<oups1
+>_");
+is($c, "bareword");
 
 {
   package symbolic;		# Primitive symbolic calculator
@@ -513,24 +485,24 @@
 {
   my $foo = new symbolic 11;
   my $baz = $foo++;
-  test( (sprintf "%d", $foo), '12');
-  test( (sprintf "%d", $baz), '11');
+  is((sprintf "%d", $foo), '12');
+  is((sprintf "%d", $baz), '11');
   my $bar = $foo;
   $baz = ++$foo;
-  test( (sprintf "%d", $foo), '13');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '13');
+  is((sprintf "%d", $foo), '13');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '13');
   my $ban = $foo;
   $baz = ($foo += 1);
-  test( (sprintf "%d", $foo), '14');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '14');
-  test( (sprintf "%d", $ban), '13');
+  is((sprintf "%d", $foo), '14');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '14');
+  is((sprintf "%d", $ban), '13');
   $baz = 0;
   $baz = $foo++;
-  test( (sprintf "%d", $foo), '15');
-  test( (sprintf "%d", $baz), '14');
-  test( "$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
+  is((sprintf "%d", $foo), '15');
+  is((sprintf "%d", $baz), '14');
+  is("$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
 }
 
 {
@@ -543,8 +515,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -556,8 +528,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -565,9 +537,9 @@
   symbolic->vars($a, $b);
   my $c = sqrt($a**2 + $b**2);
   $a = 3; $b = 4;
-  test( (sprintf "%d", $c), '5');
+  is((sprintf "%d", $c), '5');
   $a = 12; $b = 5;
-  test( (sprintf "%d", $c), '13');
+  is((sprintf "%d", $c), '13');
 }
 
 {
@@ -634,24 +606,24 @@
 {
   my $foo = new symbolic1 11;
   my $baz = $foo++;
-  test( (sprintf "%d", $foo), '12');
-  test( (sprintf "%d", $baz), '11');
+  is((sprintf "%d", $foo), '12');
+  is((sprintf "%d", $baz), '11');
   my $bar = $foo;
   $baz = ++$foo;
-  test( (sprintf "%d", $foo), '13');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '13');
+  is((sprintf "%d", $foo), '13');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '13');
   my $ban = $foo;
   $baz = ($foo += 1);
-  test( (sprintf "%d", $foo), '14');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '14');
-  test( (sprintf "%d", $ban), '13');
+  is((sprintf "%d", $foo), '14');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '14');
+  is((sprintf "%d", $ban), '13');
   $baz = 0;
   $baz = $foo++;
-  test( (sprintf "%d", $foo), '15');
-  test( (sprintf "%d", $baz), '14');
-  test( "$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
+  is((sprintf "%d", $foo), '15');
+  is((sprintf "%d", $baz), '14');
+  is("$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
 }
 
 {
@@ -664,8 +636,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -677,8 +649,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -686,9 +658,9 @@
   symbolic1->vars($a, $b);
   my $c = sqrt($a**2 + $b**2);
   $a = 3; $b = 4;
-  test( (sprintf "%d", $c), '5');
+  is((sprintf "%d", $c), '5');
   $a = 12; $b = 5;
-  test( (sprintf "%d", $c), '13');
+  is((sprintf "%d", $c), '13');
 }
 
 {
@@ -702,9 +674,9 @@
 
 {
   my $seven = new two_face ("vii", 7);
-  test( (sprintf "seven=$seven, seven=%d, eight=%d", $seven, $seven+1),
+  is((sprintf "seven=$seven, seven=%d, eight=%d", $seven, $seven+1),
 	'seven=vii, seven=7, eight=8');
-  test( scalar ($seven =~ /i/), '1')
+  is(scalar ($seven =~ /i/), '1');
 }
 
 {
@@ -717,7 +689,7 @@
   my @arr = map sorting->new($_), 0..12;
   my @sorted1 = sort @arr;
   my @sorted2 = map $$_, @sorted1;
-  test "@sorted2", '0 10 7 4 1 11 8 5 12 2 9 6 3';
+  is("@sorted2", '0 10 7 4 1 11 8 5 12 2 9 6 3');
 }
 {
   package iterator;
@@ -728,21 +700,21 @@
 
 # XXX iterator overload not intended to work with CORE::GLOBAL?
 if (defined &CORE::GLOBAL::glob) {
-  test '1', '1';	# 175
-  test '1', '1';	# 176
-  test '1', '1';	# 177
+  is('1', '1');
+  is('1', '1');
+  is('1', '1');
 }
 else {
   my $iter = iterator->new(5);
   my $acc = '';
   my $out;
   $acc .= " $out" while $out = <${iter}>;
-  test $acc, ' 5 4 3 2 1 0';	# 175
+  is($acc, ' 5 4 3 2 1 0');
   $iter = iterator->new(5);
-  test scalar <${iter}>, '5';	# 176
+  is(scalar <${iter}>, '5');
   $acc = '';
   $acc .= " $out" while $out = <$iter>;
-  test $acc, ' 4 3 2 1 0';	# 177
+  is($acc, ' 4 3 2 1 0');
 }
 {
   package deref;
@@ -773,53 +745,53 @@
   # Hash:
   my @cont = sort %$deref;
   if ("\t" eq "\011") { # ascii
-      test "@cont", '23 5 fake foo';	# 178
+      is("@cont", '23 5 fake foo');
   } 
   else {                # ebcdic alpha-numeric sort order
-      test "@cont", 'fake foo 23 5';	# 178
+      is("@cont", 'fake foo 23 5');
   }
   my @keys = sort keys %$deref;
-  test "@keys", 'fake foo';	# 179
+  is("@keys", 'fake foo');
   my @val = sort values %$deref;
-  test "@val", '23 5';		# 180
-  test $deref->{foo}, 5;	# 181
-  test defined $deref->{bar}, ''; # 182
+  is("@val", '23 5');
+  is($deref->{foo}, 5);
+  is(defined $deref->{bar}, '');
   my $key;
   @keys = ();
   push @keys, $key while $key = each %$deref;
   @keys = sort @keys;
-  test "@keys", 'fake foo';	# 183  
-  test exists $deref->{bar}, ''; # 184
-  test exists $deref->{foo}, 1; # 185
+  is("@keys", 'fake foo');
+  is(exists $deref->{bar}, '');
+  is(exists $deref->{foo}, 1);
   # Code:
-  test $deref->(5), 39;		# 186
-  test &$deref(6), 40;		# 187
+  is($deref->(5), 39);
+  is(&$deref(6), 40);
   sub xxx_goto { goto &$deref }
-  test xxx_goto(7), 41;		# 188
+  is(xxx_goto(7), 41);
   my $srt = bless { c => sub {$b <=> $a}
 		  }, 'deref';
   *srt = \&$srt;
   my @sorted = sort srt 11, 2, 5, 1, 22;
-  test "@sorted", '22 11 5 2 1'; # 189
+  is("@sorted", '22 11 5 2 1');
   # Scalar
-  test $$deref, 123;		# 190
+  is($$deref, 123);
   # Code
   @sorted = sort $srt 11, 2, 5, 1, 22;
-  test "@sorted", '22 11 5 2 1'; # 191
+  is("@sorted", '22 11 5 2 1');
   # Array
-  test "@$deref", '11 12 13';	# 192
-  test $#$deref, '2';		# 193
+  is("@$deref", '11 12 13');
+  is($#$deref, '2');
   my $l = @$deref;
-  test $l, 3;			# 194
-  test $deref->[2], '13';		# 195
+  is($l, 3);
+  is($deref->[2], '13');
   $l = pop @$deref;
-  test $l, 13;			# 196
+  is($l, 13);
   $l = 1;
-  test $deref->[$l], '12';	# 197
+  is($deref->[$l], '12');
   # Repeated dereference
   my $double = bless { h => $deref,
 		     }, 'deref';
-  test $double->{foo}, 5;	# 198
+  is($double->{foo}, 5);
 }
 
 {
@@ -856,9 +828,9 @@
 
 my $bar = new two_refs 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 199
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 200
+is($bar->[3], 13);
 
 {
   package two_refs_o;
@@ -867,9 +839,9 @@
 
 $bar = new two_refs_o 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 201
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 202
+is($bar->[3], 13);
 
 {
   package two_refs1;
@@ -909,9 +881,9 @@
 
 $bar = new two_refs_o 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 203
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 204
+is($bar->[3], 13);
 
 {
   package two_refs1_o;
@@ -920,9 +892,9 @@
 
 $bar = new two_refs1_o 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 205
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 206
+is($bar->[3], 13);
 
 {
   package B;
@@ -932,12 +904,12 @@
 my $aaa;
 { my $bbbb = 0; $aaa = bless \$bbbb, B }
 
-test !$aaa, 1;			# 207
+is !$aaa, 1;
 
 unless ($aaa) {
-  test 'ok', 'ok';		# 208
+  pass();
 } else {
-  test 'is not', 'ok';		# 208
+  fail();
 }
 
 # check that overload isn't done twice by join
@@ -945,7 +917,7 @@
   package Join;
   use overload '""' => sub { $c++ };
   my $x = join '', bless([]), 'pq', bless([]);
-  main::test $x, '0pq1';		# 209
+  main::is $x, '0pq1';
 };
 
 # Test module-specific warning
@@ -954,10 +926,10 @@
     my $a = "" ;
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     $x = eval ' overload::constant "integer" ; ' ;
-    test($a eq "") ; # 210
+    is($a, "");
     use warnings 'overload' ;
     $x = eval ' overload::constant "integer" ; ' ;
-    test($a =~ /^Odd number of arguments for overload::constant at/) ; # 211
+    like($a, qr/^Odd number of arguments for overload::constant at/);
 }
 
 {
@@ -965,10 +937,10 @@
     my $a = "" ;
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     $x = eval ' overload::constant "fred" => sub {} ; ' ;
-    test($a eq "") ; # 212
+    is($a, "");
     use warnings 'overload' ;
     $x = eval ' overload::constant "fred" => sub {} ; ' ;
-    test($a =~ /^`fred' is not an overloadable type at/); # 213
+    like($a, qr/^`fred' is not an overloadable type at/);
 }
 
 {
@@ -976,10 +948,10 @@
     my $a = "" ;
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     $x = eval ' overload::constant "integer" => 1; ' ;
-    test($a eq "") ; # 214
+    is($a, "");
     use warnings 'overload' ;
     $x = eval ' overload::constant "integer" => 1; ' ;
-    test($a =~ /^`1' is not a code reference at/); # 215
+    like($a, qr/^`1' is not a code reference at/);
 }
 
 {
@@ -1005,13 +977,13 @@
 
   my $x = new noov_int 11;
   my $int_x = int $x;
-  main::test("$int_x" eq 20);			# 216
+  main::is("$int_x", 20);
   $x = new ov_int1 31;
   $int_x = int $x;
-  main::test("$int_x" eq 131);			# 217
+  main::is("$int_x", 131);
   $x = new ov_int2 51;
   $int_x = int $x;
-  main::test("$int_x" eq 1054);			# 218
+  main::is("$int_x", 1054);
 }
 
 # make sure that we don't inifinitely recurse
@@ -1023,9 +995,10 @@
                'bool'  => sub { shift },
                fallback => 1;
   my $x = bless([]);
-  main::test("$x" =~ /Recurse=ARRAY/);		# 219
-  main::test($x);                               # 220
-  main::test($x+0 =~ /Recurse=ARRAY/);		# 221
+  # For some reason beyond me these have to be oks rather than likes.
+  main::ok("$x" =~ /Recurse=ARRAY/);
+  main::ok($x);
+  main::ok($x+0 =~ qr/Recurse=ARRAY/);
 }
 
 # BugID 20010422.003
@@ -1056,7 +1029,7 @@
 my $r = Foo->new(8);
 $r = Foo->new(0);
 
-test(($r || 0) == 0); # 222
+is(($r || 0), 0);
 
 package utf8_o;
 
@@ -1076,8 +1049,8 @@
 
 
 my $utfvar = new utf8_o 200.2.1;
-test("$utfvar" eq 200.2.1); # 223 - stringify
-test("a$utfvar" eq "a".200.2.1); # 224 - overload via sv_2pv_flags
+is("$utfvar", 200.2.1); # 223 - stringify
+is("a$utfvar", "a".200.2.1); # 224 - overload via sv_2pv_flags
 
 # 225..227 -- more %{} tests.  Hangs in 5.6.0, okay in later releases.
 # Basically this example implements strong encapsulation: if Hderef::import()
@@ -1093,9 +1066,9 @@
 package main;
 my $a = Foo->new;
 $a->xet('b', 42);
-test ($a->xet('b'), 42);
-test (!defined eval { $a->{b} });
-test ($@ =~ /zap/);
+is ($a->xet('b'), 42);
+ok (!defined eval { $a->{b} });
+like ($@, qr/zap/);
 
 {
    package t229;
@@ -1110,7 +1083,7 @@
       my $y = $x;
       eval { $y++ };
    }
-   main::test (!$warn);
+   main::ok (!$warn);
 }
 
 {
@@ -1120,9 +1093,9 @@
         $out1 = 0;
         $out2 = 1;
     }
-    test($int,  2,  "#24313");	# 230
-    test($out1, 17, "#24313");	# 231
-    test($out2, 17, "#24313");	# 232
+    is($int,  2,  "#24313");	# 230
+    is($out1, 17, "#24313");	# 231
+    is($out2, 17, "#24313");	# 232
 }
 
 {
@@ -1146,16 +1119,16 @@
     my $o  = bless [], 'perl31793';
     my $of = bless [], 'perl31793_fb';
     my $no = bless [], 'no_overload';
-    test (overload::StrVal(\"scalar") =~ /^SCALAR\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal([])        =~ /^ARRAY\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal({})        =~ /^HASH\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(sub{1})    =~ /^CODE\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(\*GLOB)    =~ /^GLOB\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(\$o)       =~ /^REF\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(qr/a/)     =~ /^Regexp=SCALAR\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal($o)        =~ /^perl31793=ARRAY\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal($of)       =~ /^perl31793_fb=ARRAY\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal($no)       =~ /^no_overload=ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(\"scalar"), qr/^SCALAR\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal([]),        qr/^ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal({}),        qr/^HASH\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(sub{1}),    qr/^CODE\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(\*GLOB),    qr/^GLOB\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(\$o),       qr/^REF\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(qr/a/),     qr/^Regexp=SCALAR\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal($o),        qr/^perl31793=ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal($of),       qr/^perl31793_fb=ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal($no),       qr/^no_overload=ARRAY\(0x[0-9a-f]+\)$/);
 }
 
 # These are all check that overloaded values rather than reference addressess
@@ -1174,9 +1147,102 @@
 	    die if $@;
 	    my $expect = eval $rcode;
 	    die if $@;
-	    test ($got, $expect, $ocode) or print "# $rcode\n";
+	    is ($got, $expect, $ocode) or print "# $rcode\n";
 	}
     }
 }
-# Last test is:
-sub last {493}
+{
+    # check that overloading works in regexes
+    {
+	package Foo493;
+	use overload
+	    '""' => sub { "^$_[0][0]\$" },
+	    '.'  => sub { 
+		    bless [
+			     $_[2]
+			    ? (ref $_[1] ? $_[1][0] : $_[1]) . ':' .$_[0][0] 
+			    : $_[0][0] . ':' . (ref $_[1] ? $_[1][0] : $_[1])
+		    ], 'Foo493'
+			};
+    }
+
+    my $a = bless [ "a" ], 'Foo493';
+    like('a', qr/$a/);
+    like('x:a', qr/x$a/);
+    like('x:a:=', qr/x$a=$/);
+    like('x:a:a:=', qr/x$a$a=$/);
+
+}
+
+{
+    package Sklorsh;
+    use overload
+	bool     => sub { shift->is_cool };
+
+    sub is_cool {
+	$_[0]->{name} eq 'cool';
+    }
+
+    sub delete {
+	undef %{$_[0]};
+	bless $_[0], 'Brap';
+	return 1;
+    }
+
+    sub delete_with_self {
+	my $self = shift;
+	undef %$self;
+	bless $self, 'Brap';
+	return 1;
+    }
+
+    package Brap;
+
+    1;
+
+    package main;
+
+    my $obj;
+    $obj = bless {name => 'cool'}, 'Sklorsh';
+    $obj->delete;
+    ok(eval {if ($obj) {1}; 1}, $@ || 'reblessed into nonexist namespace');
+
+    $obj = bless {name => 'cool'}, 'Sklorsh';
+    $obj->delete_with_self;
+    ok (eval {if ($obj) {1}; 1}, $@);
+    
+    my $a = $b = {name => 'hot'};
+    bless $b, 'Sklorsh';
+    is(ref $a, 'Sklorsh');
+    is(ref $b, 'Sklorsh');
+    ok(!$b, "Expect overloaded boolean");
+    ok(!$a, "Expect overloaded boolean");
+}
+{
+    use Scalar::Util 'weaken';
+
+    package Shklitza;
+    use overload '""' => sub {"CLiK KLAK"};
+
+    package Ksshfwoom;
+
+    package main;
+
+    my ($obj, $ref);
+    $obj = bless do {my $a; \$a}, 'Shklitza';
+    $ref = $obj;
+
+    is ($obj, "CLiK KLAK");
+    is ($ref, "CLiK KLAK");
+
+    weaken $ref;
+    is ($ref, "CLiK KLAK");
+
+    bless $obj, 'Ksshfwoom';
+
+    like ($obj, qr/^Ksshfwoom=/);
+    like ($ref, qr/^Ksshfwoom=/);
+
+    undef $obj;
+    is ($ref, undef);
+}

perl-5.8.8-U27512.patch:
 embed.fnc      |    1 
 embed.h        |    2 +
 lib/overload.t |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 proto.h        |    1 
 sv.c           |   61 +++++++++++++++++++++++++++++++++++++++++++---
 5 files changed, 135 insertions(+), 5 deletions(-)

--- NEW FILE perl-5.8.8-U27512.patch ---
--- perl-5.8.8/sv.c.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/sv.c	2006-06-01 19:13:32.000000000 -0400
@@ -7993,6 +7993,52 @@
     return rv;
 }
 
+/* This is a hack to cope with reblessing from class with overloading magic to
+   one without (or the other way).  Search for every reference pointing to the
+   object.  Can't use S_visit() because we would need to pass a parameter to
+   our function.  */
+static void
+S_reset_amagic(pTHX_ SV *rv, const bool on) {
+    /* It is assumed that you've already turned magic on/off on rv  */
+    SV* sva;
+    SV *const target = SvRV(rv);
+    /* Less 1 for the reference we've already dealt with.  */
+    U32 how_many = SvREFCNT(target) - 1;
+    MAGIC *mg;
+
+    if (SvMAGICAL(target) && (mg = mg_find(target, PERL_MAGIC_backref))) {
+	/* Back referneces also need to be found, but aren't part of the
+	   target's reference count.  */
+	how_many += 1 + av_len((AV*)mg->mg_obj);
+    }
+
+    if (!how_many) {
+	/* There was only 1 reference to this object.  */
+	return;
+    }
+
+    for (sva = PL_sv_arenaroot; sva; sva = (SV*)SvANY(sva)) {
+	register const SV * const svend = &sva[SvREFCNT(sva)];
+	register SV* sv;
+	for (sv = sva + 1; sv < svend; ++sv) {
+	    if (SvTYPE(sv) != SVTYPEMASK
+		&& (sv->sv_flags & SVf_ROK) == SVf_ROK
+		&& SvREFCNT(sv)
+		&& SvRV(sv) == target
+		&& sv != rv) {
+		if (on)
+		    SvAMAGIC_on(sv);
+		else
+		    SvAMAGIC_off(sv);
+		if (--how_many == 0) {
+		    /* We have found them all.  */
+		    return;
+		}
+	    }
+	}
+    }
+}
+
 /*
 =for apidoc sv_bless
 
@@ -8025,10 +8071,17 @@
     (void)SvUPGRADE(tmpRef, SVt_PVMG);
     SvSTASH_set(tmpRef, (HV*)SvREFCNT_inc(stash));
 
-    if (Gv_AMG(stash))
-	SvAMAGIC_on(sv);
-    else
-	SvAMAGIC_off(sv);
+    if (Gv_AMG(stash)) {
+	if (!SvAMAGIC(sv)) {
+	    SvAMAGIC_on(sv);
+	    S_reset_amagic(aTHX_ sv, TRUE);
+	}
+    } else {
+	if (SvAMAGIC(sv)) {
+	    SvAMAGIC_off(sv);
+	    S_reset_amagic(aTHX_ sv, FALSE);
+	}
+    }
 
     if(SvSMAGICAL(tmpRef))
         if(mg_find(tmpRef, PERL_MAGIC_ext) || mg_find(tmpRef, PERL_MAGIC_uvar))
--- perl-5.8.8/proto.h.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/proto.h	2006-06-01 19:13:32.000000000 -0400
@@ -1875,6 +1875,7 @@
 #
 STATIC bool	S_utf8_mg_pos(pTHX_ SV *sv, MAGIC **mgp, STRLEN **cachep, I32 i, I32 *offsetp, I32 uoff, const U8 **sp, const U8 *start, const U8 *send);
 STATIC bool	S_utf8_mg_pos_init(pTHX_ SV *sv, MAGIC **mgp, STRLEN **cachep, I32 i, I32 offsetp, const U8 *s, const U8 *start);
+STATIC void	S_reset_amagic(pTHX_ SV *rv, const bool on);
 #endif
 
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
--- perl-5.8.8/embed.h.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/embed.h	2006-06-01 19:13:32.000000000 -0400
@@ -1348,6 +1348,7 @@
 #ifdef PERL_CORE
 #define utf8_mg_pos		S_utf8_mg_pos
 #define utf8_mg_pos_init	S_utf8_mg_pos_init
+#define reset_amagic		S_reset_amagic
 #endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
@@ -3390,6 +3391,7 @@
 #ifdef PERL_CORE
 #define utf8_mg_pos(a,b,c,d,e,f,g,h,i)	S_utf8_mg_pos(aTHX_ a,b,c,d,e,f,g,h,i)
 #define utf8_mg_pos_init(a,b,c,d,e,f,g)	S_utf8_mg_pos_init(aTHX_ a,b,c,d,e,f,g)
+#define reset_amagic(a,b)	S_reset_amagic(aTHX_ a,b)
 #endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
--- perl-5.8.8/embed.fnc.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/embed.fnc	2006-06-01 19:13:32.000000000 -0400
@@ -1276,6 +1276,7 @@
 s	|bool	|utf8_mg_pos_init	|NN SV *sv|NN MAGIC **mgp \
 				|NN STRLEN **cachep|I32 i|I32 offsetp \
 				|NN const U8 *s|NN const U8 *start
+s	|void	|reset_amagic	|NN SV *rv|const bool on
 #endif
 
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
--- perl-5.8.8/lib/overload.t.U27512	2006-06-01 19:13:06.000000000 -0400
+++ perl-5.8.8/lib/overload.t	2006-06-01 19:13:32.000000000 -0400
@@ -47,7 +47,7 @@
 package main;
 
 $| = 1;
-use Test::More tests=>496;
+use Test::More tests => 508;
 
 
 $a = new Oscalar "087";
@@ -1173,3 +1173,76 @@
     like('x:a:a:=', qr/x$a$a=$/);
 
 }
+
+{
+    package Sklorsh;
+    use overload
+	bool     => sub { shift->is_cool };
+
+    sub is_cool {
+	$_[0]->{name} eq 'cool';
+    }
+
+    sub delete {
+	undef %{$_[0]};
+	bless $_[0], 'Brap';
+	return 1;
+    }
+
+    sub delete_with_self {
+	my $self = shift;
+	undef %$self;
+	bless $self, 'Brap';
+	return 1;
+    }
+
+    package Brap;
+
+    1;
+
+    package main;
+
+    my $obj;
+    $obj = bless {name => 'cool'}, 'Sklorsh';
+    $obj->delete;
+    ok(eval {if ($obj) {1}; 1}, $@ || 'reblessed into nonexist namespace');
+
+    $obj = bless {name => 'cool'}, 'Sklorsh';
+    $obj->delete_with_self;
+    ok (eval {if ($obj) {1}; 1}, $@);
+    
+    my $a = $b = {name => 'hot'};
+    bless $b, 'Sklorsh';
+    is(ref $a, 'Sklorsh');
+    is(ref $b, 'Sklorsh');
+    ok(!$b, "Expect overloaded boolean");
+    ok(!$a, "Expect overloaded boolean");
+}
+{
+    use Scalar::Util 'weaken';
+
+    package Shklitza;
+    use overload '""' => sub {"CLiK KLAK"};
+
+    package Ksshfwoom;
+
+    package main;
+
+    my ($obj, $ref);
+    $obj = bless do {my $a; \$a}, 'Shklitza';
+    $ref = $obj;
+
+    is ($obj, "CLiK KLAK");
+    is ($ref, "CLiK KLAK");
+
+    weaken $ref;
+    is ($ref, "CLiK KLAK");
+
+    bless $obj, 'Ksshfwoom';
+
+    like ($obj, qr/^Ksshfwoom=/);
+    like ($ref, qr/^Ksshfwoom=/);
+
+    undef $obj;
+    is ($ref, undef);
+}

perl-5.8.8-U27604.patch:
 MANIFEST         |    1 +
 regexec.c        |   18 ++++++++++--------
 t/op/regexp.t    |    3 ++-
 t/op/regexp_qr.t |   10 ++++++++++
 4 files changed, 23 insertions(+), 9 deletions(-)

--- NEW FILE perl-5.8.8-U27604.patch ---
--- /dev/null	2006-06-01 12:59:27.771303750 -0400
+++ perl-5.8.8/t/op/regexp_qr.t	2006-06-01 19:24:53.000000000 -0400
@@ -0,0 +1,10 @@
+#!./perl
+
+$qr = 1;
+for $file ('./op/regexp.t', './t/op/regexp.t', ':op:regexp.t') {
+    if (-r $file) {
+	do $file;
+	exit;
+    }
+}
+die "Cannot find ./op/regexp.t or ./t/op/regexp.t\n";
--- perl-5.8.8/t/op/regexp.t.U27604	2001-10-27 14:09:24.000000000 -0400
+++ perl-5.8.8/t/op/regexp.t	2006-06-01 19:24:53.000000000 -0400
@@ -49,6 +49,7 @@
 $bang = sprintf "\\%03o", ord "!"; # \41 would not be portable.
 $ffff  = chr(0xff) x 2;
 $nulnul = "\0" x 2;
+$OP = $qr ? 'qr' : 'm';
 
 $| = 1;
 print "1..$numtests\n# $iters iterations\n";
@@ -73,7 +74,7 @@
     $result =~ s/B//i unless $skip;
     for $study ('', 'study \$subject') {
  	$c = $iters;
- 	eval "$study; \$match = (\$subject =~ m$pat) while \$c--; \$got = \"$repl\";";
+ 	eval "$study; \$match = (\$subject =~ $OP$pat) while \$c--; \$got = \"$repl\";";
 	chomp( $err = $@ );
 	if ($result eq 'c') {
 	    if ($err !~ m!^\Q$expect!) { print "not ok $. (compile) $input => `$err'\n"; next TEST }
--- perl-5.8.8/regexec.c.U27604	2006-01-08 15:59:30.000000000 -0500
+++ perl-5.8.8/regexec.c	2006-06-01 19:24:53.000000000 -0400
@@ -412,6 +412,7 @@
     I32 ml_anch;
     register char *other_last = Nullch;	/* other substr checked before this */
     char *check_at = Nullch;		/* check substr found at this pos */
+    const I32 multiline = PL_multiline | (prog->reganch & PMf_MULTILINE);
 #ifdef DEBUGGING
     const char * const i_strpos = strpos;
     SV * const dsv = PERL_DEBUG_PAD_ZERO(0);
@@ -473,7 +474,7 @@
     if (prog->reganch & ROPT_ANCH) {	/* Match at beg-of-str or after \n */
 	ml_anch = !( (prog->reganch & ROPT_ANCH_SINGLE)
 		     || ( (prog->reganch & ROPT_ANCH_BOL)
-			  && !PL_multiline ) );	/* Check after \n? */
+			  && !multiline ) );	/* Check after \n? */
 
 	if (!ml_anch) {
 	  if ( !(prog->reganch & (ROPT_ANCH_GPOS /* Checked by the caller */
@@ -568,11 +569,11 @@
     else if (prog->reganch & ROPT_CANY_SEEN)
 	s = fbm_instr((U8*)(s + start_shift),
 		      (U8*)(strend - end_shift),
-		      check, PL_multiline ? FBMrf_MULTILINE : 0);
+		      check, multiline ? FBMrf_MULTILINE : 0);
     else
 	s = fbm_instr(HOP3(s, start_shift, strend),
 		      HOP3(strend, -end_shift, strbeg),
-		      check, PL_multiline ? FBMrf_MULTILINE : 0);
+		      check, multiline ? FBMrf_MULTILINE : 0);
 
     /* Update the count-of-usability, remove useless subpatterns,
 	unshift s.  */
@@ -643,7 +644,7 @@
 			HOP3(HOP3(last1, prog->anchored_offset, strend)
 				+ SvCUR(must), -(SvTAIL(must)!=0), strbeg),
 			must,
-			PL_multiline ? FBMrf_MULTILINE : 0
+			multiline ? FBMrf_MULTILINE : 0
 		    );
 		DEBUG_r(PerlIO_printf(Perl_debug_log,
 			"%s anchored substr \"%s%.*s%s\"%s",
@@ -704,7 +705,7 @@
 		s = fbm_instr((unsigned char*)s,
 			      (unsigned char*)last + SvCUR(must)
 				  - (SvTAIL(must)!=0),
-			      must, PL_multiline ? FBMrf_MULTILINE : 0);
+			      must, multiline ? FBMrf_MULTILINE : 0);
 	    /* FIXME - DEBUG_EXECUTE_r if that is merged to maint  */
 	    DEBUG_r(PerlIO_printf(Perl_debug_log, "%s floating substr \"%s%.*s%s\"%s",
 		    (s ? "Found" : "Contradicts"),
@@ -1639,6 +1640,7 @@
     char *scream_olds;
     SV* oreplsv = GvSV(PL_replgv);
     const bool do_utf8 = DO_UTF8(sv);
+    const I32 multiline = PL_multiline | (prog->reganch & PMf_MULTILINE);
 #ifdef DEBUGGING
     SV *dsv0 = PERL_DEBUG_PAD_ZERO(0);
     SV *dsv1 = PERL_DEBUG_PAD_ZERO(1);
@@ -1756,7 +1758,7 @@
     if (prog->reganch & (ROPT_ANCH & ~ROPT_ANCH_GPOS)) {
 	if (s == startpos && regtry(prog, startpos))
 	    goto got_it;
-	else if (PL_multiline || (prog->reganch & ROPT_IMPLICIT)
+	else if (multiline || (prog->reganch & ROPT_IMPLICIT)
 		 || (prog->reganch & ROPT_ANCH_MBOL)) /* XXXX SBOL? */
 	{
 	    char *end;
@@ -1889,7 +1891,7 @@
 				    end_shift, &scream_pos, 0))
 		 : (s = fbm_instr((unsigned char*)HOP3(s, back_min, strend),
 				  (unsigned char*)strend, must,
-				  PL_multiline ? FBMrf_MULTILINE : 0))) ) {
+				  multiline ? FBMrf_MULTILINE : 0))) ) {
 	    /* we may be pointing at the wrong string */
 	    if ((flags & REXEC_SCREAM) && RX_MATCH_COPIED(prog))
 		s = strbeg + (s - SvPVX_const(sv));
@@ -1990,7 +1992,7 @@
 		if (SvTAIL(float_real)) {
 		    if (memEQ(strend - len + 1, little, len - 1))
 			last = strend - len + 1;
-		    else if (!PL_multiline)
+		    else if (!multiline)
 			last = memEQ(strend - len, little, len)
 			    ? strend - len : Nullch;
 		    else
--- perl-5.8.8/MANIFEST.U27604	2006-01-31 18:27:53.000000000 -0500
+++ perl-5.8.8/MANIFEST	2006-06-01 19:24:52.000000000 -0400
@@ -2802,6 +2802,7 @@
 t/op/ref.t			See if refs and objects work
 t/op/regexp_noamp.t		See if regular expressions work with optimizations
 t/op/regexp.t			See if regular expressions work
+t/op/regexp_qr.t		See if regular expressions work as qr//
 t/op/regmesg.t			See if one can get regular expression errors
 t/op/repeat.t			See if x operator works
 t/op/re_tests			Regular expressions for regexp.t

perl-5.8.8-U27605.patch:
 mg.c   |   13 +++++++------
 perl.c |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE perl-5.8.8-U27605.patch ---
--- perl-5.8.8/mg.c.U27605	2006-01-27 15:23:21.000000000 -0500
+++ perl-5.8.8/mg.c	2006-06-01 19:37:17.000000000 -0400
@@ -2520,10 +2520,10 @@
 #endif
 	/* PL_origalen is set in perl_parse(). */
 	s = SvPV_force(sv,len);
-	if (len >= (STRLEN)PL_origalen) {
-	    /* Longer than original, will be truncated. */
-	    Copy(s, PL_origargv[0], PL_origalen, char);
-	    PL_origargv[0][PL_origalen - 1] = 0;
+	if (len >= (STRLEN)PL_origalen-1) {
+	    /* Longer than original, will be truncated. We assume that
+             * PL_origalen bytes are available. */
+	    Copy(s, PL_origargv[0], PL_origalen-1, char);
 	}
 	else {
 	    /* Shorter than original, will be padded. */
@@ -2536,9 +2536,10 @@
 		    * --jhi */
 		   (int)' ',
 		   PL_origalen - len - 1);
-	    for (i = 1; i < PL_origargc; i++)
-		 PL_origargv[i] = 0;
 	}
+	PL_origargv[0][PL_origalen-1] = 0;
+	for (i = 1; i < PL_origargc; i++)
+	    PL_origargv[i] = 0;
 	UNLOCK_DOLLARZERO_MUTEX;
 	break;
 #endif
--- perl-5.8.8/perl.c.U27605	2006-06-01 19:00:57.000000000 -0400
+++ perl-5.8.8/perl.c	2006-06-01 19:37:17.000000000 -0400
@@ -1561,7 +1561,7 @@
 		   }
 	      }
 	 }
-	 PL_origalen = s - PL_origargv[0];
+	 PL_origalen = s - PL_origargv[0] + 1;
     }
 
     if (PL_do_undump) {

perl-5.8.8-U27914.patch:
 scope.c      |   12 +++++++++++-
 t/op/local.t |   18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-U27914.patch ---
--- perl-5.8.8/t/op/local.t.U27914	2006-01-03 10:11:35.000000000 -0500
+++ perl-5.8.8/t/op/local.t	2006-06-01 19:49:54.000000000 -0400
@@ -4,7 +4,7 @@
     chdir 't' if -d 't';
     require './test.pl';
 }
-plan tests => 81;
+plan tests => 85;
 
 my $list_assignment_supported = 1;
 
@@ -313,3 +313,19 @@
     { local @x{c,d,e}; }
     ok(! exists $x{c});
 }
+
+# local() and readonly magic variables
+
+eval { local $1 = 1 };
+like($@, qr/Modification of a read-only value attempted/);
+
+eval { for ($1) { local $_ = 1 } };
+like($@, qr/Modification of a read-only value attempted/);
+
+# make sure $1 is still read-only
+eval { for ($1) { local $_ = 1 } };
+is($@, "");
+
+# The s/// adds 'g' magic to $_, but it should remain non-readonly
+eval { for("a") { for $x (1,2) { local $_="b"; s/(.*)/+$1/ } } };
+is($@, "");
--- perl-5.8.8/scope.c.U27914	2005-09-30 09:56:51.000000000 -0400
+++ perl-5.8.8/scope.c	2006-06-01 19:49:54.000000000 -0400
@@ -205,9 +205,9 @@
     register SV * const sv = *sptr = NEWSV(0,0);
 
     if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) {
+	MAGIC *mg;
 	sv_upgrade(sv, SvTYPE(osv));
 	if (SvGMAGICAL(osv)) {
-	    MAGIC* mg;
 	    const bool oldtainted = PL_tainted;
 	    mg_get(osv);		/* note, can croak! */
 	    if (PL_tainting && PL_tainted &&
@@ -220,6 +220,16 @@
 	    PL_tainted = oldtainted;
 	}
 	SvMAGIC_set(sv, SvMAGIC(osv));
+	/* if it's a special scalar or if it has no 'set' magic,
+	 * propagate the SvREADONLY flag. --rgs 20030922 */
+	for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+	    if (mg->mg_type == '\0'
+		    || !(mg->mg_virtual && mg->mg_virtual->svt_set))
+	    {
+		SvFLAGS(sv) |= SvREADONLY(osv);
+		break;
+	    }
+	}
 	SvFLAGS(sv) |= SvMAGICAL(osv);
 	/* XXX SvMAGIC() is *shared* between osv and sv.  This can
 	 * lead to coredumps when both SVs are destroyed without one

perl-5.8.8-U27329.patch:
 pp.c      |   18 ++++++++++++------
 t/op/lc.t |   37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 7 deletions(-)

--- NEW FILE perl-5.8.8-U27329.patch ---
--- perl-5.8.8/t/op/lc.t.U27329	2005-11-07 09:22:36.000000000 -0500
+++ perl-5.8.8/t/op/lc.t	2006-06-01 22:02:13.000000000 -0400
@@ -6,7 +6,7 @@
     require './test.pl';
 }
 
-plan tests => 59;
+plan tests => 77;
 
 $a = "HELLO.* world";
 $b = "hello.* WORLD";
@@ -163,3 +163,38 @@
 	is($a, v10, "[perl #18857]");
     } 
 }
+
+
+# [perl #38619] Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)
+
+for ("a\x{100}", "xyz\x{100}") {
+    is(substr(uc($_), 0), uc($_), "[perl #38619] uc");
+}
+for ("A\x{100}", "XYZ\x{100}") {
+    is(substr(lc($_), 0), lc($_), "[perl #38619] lc");
+}
+for ("a\x{100}", "??yz\x{100}") { # ?? to Ss (different length)
+    is(substr(ucfirst($_), 0), ucfirst($_), "[perl #38619] ucfirst");
+}
+
+# Related to [perl #38619]
+# the original report concerns PERL_MAGIC_utf8.
+# these cases concern PERL_MAGIC_regex_global.
+
+for (map { $_ } "a\x{100}", "abc\x{100}", "\x{100}") {
+    chop; # get ("a", "abc", "") in utf8
+    my $return =  uc($_) =~ /\G(.?)/g;
+    my $result = $return ? $1 : "not";
+    my $expect = (uc($_) =~ /(.?)/g)[0];
+    is($return, 1,       "[perl #38619]");
+    is($result, $expect, "[perl #38619]");
+}
+
+for (map { $_ } "A\x{100}", "ABC\x{100}", "\x{100}") {
+    chop; # get ("A", "ABC", "") in utf8
+    my $return =  lc($_) =~ /\G(.?)/g;
+    my $result = $return ? $1 : "not";
+    my $expect = (lc($_) =~ /(.?)/g)[0];
+    is($return, 1,       "[perl #38619]");
+    is($result, $expect, "[perl #38619]");
+}
--- perl-5.8.8/pp.c.U27329	2006-06-01 21:30:14.000000000 -0400
+++ perl-5.8.8/pp.c	2006-06-01 21:53:37.000000000 -0400
@@ -3447,7 +3447,8 @@
 	    if (slen > ulen)
 	        sv_catpvn(TARG, (char*)(s + ulen), slen - ulen);
 	    SvUTF8_on(TARG);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    s = (U8*)SvPV_force_nomg(sv, slen);
@@ -3502,7 +3503,8 @@
 	    if (slen > ulen)
 	        sv_catpvn(TARG, (char*)(s + ulen), slen - ulen);
 	    SvUTF8_on(TARG);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    s = (U8*)SvPV_force_nomg(sv, slen);
@@ -3552,7 +3554,8 @@
 	if (!len) {
 	    SvUTF8_off(TARG);				/* decontaminate */
 	    sv_setpvn(TARG, "", 0);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    STRLEN min = len + 1;
@@ -3585,7 +3588,8 @@
 	    *d = '\0';
 	    SvUTF8_on(TARG);
 	    SvCUR_set(TARG, d - (U8*)SvPVX_const(TARG));
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
     }
     else {
@@ -3636,7 +3640,8 @@
 	if (!len) {
 	    SvUTF8_off(TARG);				/* decontaminate */
 	    sv_setpvn(TARG, "", 0);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    STRLEN min = len + 1;
@@ -3688,7 +3693,8 @@
 	    *d = '\0';
 	    SvUTF8_on(TARG);
 	    SvCUR_set(TARG, d - (U8*)SvPVX_const(TARG));
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
     }
     else {

perl-5.8.8-R-switch.patch:
 embed.fnc       |    2 +-
 embed.h         |    2 +-
 perl.c          |   17 ++++++++++++-----
 pod/perlrun.pod |   21 +++++++++++++++++++++
 proto.h         |    2 +-
 5 files changed, 36 insertions(+), 8 deletions(-)

--- NEW FILE perl-5.8.8-R-switch.patch ---
--- perl-5.8.8/pod/perlrun.pod.-R-switch	2006-01-13 11:29:17.000000000 -0500
+++ perl-5.8.8/pod/perlrun.pod	2006-06-02 00:29:17.000000000 -0400
@@ -11,6 +11,7 @@
 	S<[ B<-I>I<dir> ] [ B<-m>[B<->]I<module> ] [ B<-M>[B<->]I<'module...'> ] [ B<-f> ]>
 	S<[ B<-C [I<number/list>] >]>
 	S<[ B<-P> ]>
+	S<[ B<-R> ]>
 	S<[ B<-S> ]>
 	S<[ B<-x>[I<dir>] ]>
 	S<[ B<-i>[I<extension>] ]>
@@ -813,6 +814,26 @@
 before being searched for on the PATH.  On Unix platforms, the
 program will be searched for strictly on the PATH.
 
+=item B<-R>
+X<-R>
+
+Disables the Red Hat module compatibility default search path.
+
+By default, the Red Hat perl distribution will prepend to the default
+search path (@INC) the -V:archname subdirectory of each member of 
+the -V:inc_version_list under the perl vendor and site installation 
+directories. 
+i.e. in shell notation:
+ {-V:vendorlib_stem,-V:sitelib_stem}/{-V:inc_version_list}/-V:archname
+where inc_version_list includes every previous perl version shipped 
+by Red Hat, to provide compatibility for binary modules installed under 
+previous perl versions. This can be quite a long list of directories
+to search, which can slow down module loading. You can disable searching
+these previous perl version architecture specific directories by specifying
+the -R switch - then the default search path will be as for the default
+upstream perl release.
+
+
 =item B<-t>
 X<-t>
 
--- perl-5.8.8/proto.h.-R-switch	2006-06-01 19:13:32.000000000 -0400
+++ perl-5.8.8/proto.h	2006-06-01 23:15:04.000000000 -0400
@@ -1620,7 +1620,7 @@
 STATIC void	S_init_ids(pTHX);
 STATIC void	S_init_lexer(pTHX);
 STATIC void	S_init_main_stash(pTHX);
-STATIC void	S_init_perllib(pTHX);
+STATIC void	S_init_perllib(pTHX,bool rhi);
 STATIC void	S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env);
 STATIC void	S_init_predump_symbols(pTHX);
 STATIC void	S_my_exit_jump(pTHX)
--- perl-5.8.8/embed.fnc.-R-switch	2006-06-01 19:13:32.000000000 -0400
+++ perl-5.8.8/embed.fnc	2006-06-01 23:21:25.000000000 -0400
@@ -1080,7 +1080,7 @@
 s	|void	|init_ids
 s	|void	|init_lexer
 s	|void	|init_main_stash
-s	|void	|init_perllib
+s	|void	|init_perllib   |bool redhat_incpush
 s	|void	|init_postdump_symbols|int argc|NN char **argv|NULLOK char **env
 s	|void	|init_predump_symbols
 rs	|void	|my_exit_jump
--- perl-5.8.8/embed.h.-R-switch	2006-06-01 19:13:32.000000000 -0400
+++ perl-5.8.8/embed.h	2006-06-01 23:13:11.000000000 -0400
@@ -3170,7 +3170,7 @@
 #define init_ids()		S_init_ids(aTHX)
 #define init_lexer()		S_init_lexer(aTHX)
 #define init_main_stash()	S_init_main_stash(aTHX)
-#define init_perllib()		S_init_perllib(aTHX)
+#define init_perllib(rhi)		S_init_perllib(aTHX,rhi)
 #define init_postdump_symbols(a,b,c)	S_init_postdump_symbols(aTHX_ a,b,c)
 #define init_predump_symbols()	S_init_predump_symbols(aTHX)
 #define my_exit_jump()		S_my_exit_jump(aTHX)
--- perl-5.8.8/perl.c.-R-switch	2006-06-01 23:08:08.000000000 -0400
+++ perl-5.8.8/perl.c	2006-06-02 00:00:23.000000000 -0400
@@ -1649,6 +1649,7 @@
 #ifdef USE_SITECUSTOMIZE
     bool minus_f = FALSE;
 #endif
+    bool redhat_incpush = TRUE;
 
     PL_fdscript = -1;
     PL_suidscript = -1;
@@ -1770,11 +1771,15 @@
 	    PL_preprocess = TRUE;
 	    s++;
 	    goto reswitch;
+	case 'R':
+	    redhat_incpush = FALSE;
+	    s++;
+	    goto reswitch;	
 	case 'S':
 	    forbid_setid("-S");
 	    dosearch = TRUE;
 	    s++;
-	    goto reswitch;
+	    goto reswitch;	
 	case 'V':
 	    {
 		SV *opts_prog;
@@ -2062,7 +2067,7 @@
 	scriptname = "-";
     }
 
-    init_perllib();
+    init_perllib(redhat_incpush);
 
     open_script(scriptname,dosearch,sv);
 
@@ -4736,7 +4741,7 @@
 }
 
 STATIC void
-S_init_perllib(pTHX)
+S_init_perllib(pTHX, bool redhat_incpush)
 {
     char *s;
     if (!PL_tainting) {
@@ -4803,7 +4808,8 @@
      * DLL-based path intuition to work correctly */
 #  if !defined(WIN32)
     incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
-    incpush_oldversion(aTHX_ SITEARCH_EXP);
+    if ( redhat_incpush )
+      incpush_oldversion(aTHX_ SITEARCH_EXP);
 #  endif
 #endif
 
@@ -4825,7 +4831,8 @@
      * DLL-based path intuition to work correctly */
 #  if !defined(WIN32)
     incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
-    incpush_oldversion(aTHX_ PERL_VENDORARCH_EXP);
+    if ( redhat_incpush )
+      incpush_oldversion(aTHX_ PERL_VENDORARCH_EXP);
 #  endif
 #endif
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 04:50:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 00:50:16 -0400
Subject: rpms/perl/devel perl-5.8.8-U27512.patch, 1.1, 1.2 perl.spec, 1.89,
	1.90
Message-ID: <200606020450.k524oGm4016125@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16086

Modified Files:
	perl-5.8.8-U27512.patch perl.spec 
Log Message:
fix upstream bugs since 5.8.8 was released

perl-5.8.8-U27512.patch:
 embed.fnc |    1 +
 embed.h   |    2 ++
 proto.h   |    1 +
 sv.c      |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 61 insertions(+), 4 deletions(-)

Index: perl-5.8.8-U27512.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl-5.8.8-U27512.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-5.8.8-U27512.patch	2 Jun 2006 04:35:38 -0000	1.1
+++ perl-5.8.8-U27512.patch	2 Jun 2006 04:50:12 -0000	1.2
@@ -113,91 +113,3 @@
  #endif
  
  #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
---- perl-5.8.8/lib/overload.t.U27512	2006-06-01 19:13:06.000000000 -0400
-+++ perl-5.8.8/lib/overload.t	2006-06-01 19:13:32.000000000 -0400
-@@ -47,7 +47,7 @@
- package main;
- 
- $| = 1;
--use Test::More tests=>496;
-+use Test::More tests => 508;
- 
- 
- $a = new Oscalar "087";
-@@ -1173,3 +1173,76 @@
-     like('x:a:a:=', qr/x$a$a=$/);
- 
- }
-+
-+{
-+    package Sklorsh;
-+    use overload
-+	bool     => sub { shift->is_cool };
-+
-+    sub is_cool {
-+	$_[0]->{name} eq 'cool';
-+    }
-+
-+    sub delete {
-+	undef %{$_[0]};
-+	bless $_[0], 'Brap';
-+	return 1;
-+    }
-+
-+    sub delete_with_self {
-+	my $self = shift;
-+	undef %$self;
-+	bless $self, 'Brap';
-+	return 1;
-+    }
-+
-+    package Brap;
-+
-+    1;
-+
-+    package main;
-+
-+    my $obj;
-+    $obj = bless {name => 'cool'}, 'Sklorsh';
-+    $obj->delete;
-+    ok(eval {if ($obj) {1}; 1}, $@ || 'reblessed into nonexist namespace');
-+
-+    $obj = bless {name => 'cool'}, 'Sklorsh';
-+    $obj->delete_with_self;
-+    ok (eval {if ($obj) {1}; 1}, $@);
-+    
-+    my $a = $b = {name => 'hot'};
-+    bless $b, 'Sklorsh';
-+    is(ref $a, 'Sklorsh');
-+    is(ref $b, 'Sklorsh');
-+    ok(!$b, "Expect overloaded boolean");
-+    ok(!$a, "Expect overloaded boolean");
-+}
-+{
-+    use Scalar::Util 'weaken';
-+
-+    package Shklitza;
-+    use overload '""' => sub {"CLiK KLAK"};
-+
-+    package Ksshfwoom;
-+
-+    package main;
-+
-+    my ($obj, $ref);
-+    $obj = bless do {my $a; \$a}, 'Shklitza';
-+    $ref = $obj;
-+
-+    is ($obj, "CLiK KLAK");
-+    is ($ref, "CLiK KLAK");
-+
-+    weaken $ref;
-+    is ($ref, "CLiK KLAK");
-+
-+    bless $obj, 'Ksshfwoom';
-+
-+    like ($obj, qr/^Ksshfwoom=/);
-+    like ($ref, qr/^Ksshfwoom=/);
-+
-+    undef $obj;
-+    is ($ref, undef);
-+}


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- perl.spec	11 May 2006 19:43:23 -0000	1.89
+++ perl.spec	2 Jun 2006 04:50:12 -0000	1.90
@@ -159,6 +159,17 @@
 #
 Patch191416:	perl-5.8.8-bz191416.patch
 
+Patch27116:	perl-5.8.8-U27116.patch
+Patch27391:     perl-5.8.8-U27391.patch
+Patch27426:	perl-5.8.8-U27426.patch
+Patch27509:     perl-5.8.8-U27509.patch
+Patch27512:     perl-5.8.8-U27512.patch
+Patch27604:     perl-5.8.8-U27604.patch
+Patch27605:     perl-5.8.8-U27605.patch
+Patch27914:     perl-5.8.8-U27914.patch
+Patch27329:     perl-5.8.8-U27329.patch
+Patch36:	perl-5.8.8-R-switch.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel
@@ -342,6 +353,26 @@
 
 %patch191416 -p1
 
+%patch27116 -p1
+
+%patch27391 -p1
+
+%patch27426 -p1
+
+%patch27509 -p1
+
+%patch27512 -p1
+
+%patch27604 -p1
+
+%patch27605 -p1
+
+%patch27914 -p1
+
+%patch27329 -p1
+
+%patch36    -p1
+
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
 recode()
@@ -546,6 +577,29 @@
 %endif
 
 %changelog
+* Thu Jun 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
+- Fix upstream perl bug 38454:
+  'rindex corrects for $[ on bytes rather than UTF-8'
+  apply upstream patch #27116
+- Fix upstream perl bug 24816:
+  'Magic vars seem unsure if they are purely numeric' 
+  ( perl -wle 'print $? = $? ^ "3"' -> 'Argument "^C" isn't numeric' )
+  apply upstream patch #27391
+- Avoid writing over the input string in the case 'F' in moreswitches.
+  apply upstream patch #27426
+- Fix upstream perl bug 38925 - 'overload and rebless' -
+  apply upstream patches #27509, #27512
+- Fix upstream perl bug 3038 - '$qr = qr/^a$/m; $x =~ $qr; fails'
+  apply upstream patch #27604
+- apply upstream patch #27605 - 'Fix off-by-one in $0 set magic.'
+- Fix upstream perl bug 23141 - '($_) = () fails to set $_ to undef'
+  apply upstream patch #27914
+- Fix upstream perl bug 38619 - 
+  'Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)'
+  apply upstream patch #27329
+- Give users the '-R' option to disable the Red Hat
+  module compatibility default search path extension (incpush.patch).
+
 * Thu May 11 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
 - Fix bug 191416: make h2ph generate correct code for cpp statements
   like: '#if defined A || defined B'



From fedora-cvs-commits at redhat.com  Fri Jun  2 06:07:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 02:07:51 -0400
Subject: rpms/anthy/devel .cvsignore, 1.15, 1.16 anthy.spec, 1.23,
	1.24 sources, 1.15, 1.16
Message-ID: <200606020607.k5267pxs032220@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32181

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Fri Jun  2 2006 Akira TAGOH <tagoh at redhat.com> - 7802-1
- New upstream snapshot release.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 May 2006 09:22:23 -0000	1.15
+++ .cvsignore	2 Jun 2006 06:07:18 -0000	1.16
@@ -18,3 +18,4 @@
 anthy-7710.tar.gz
 anthy-7714.tar.gz
 anthy-7716.tar.gz
+anthy-7802.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- anthy.spec	17 May 2006 09:22:23 -0000	1.23
+++ anthy.spec	2 Jun 2006 06:07:18 -0000	1.24
@@ -1,4 +1,4 @@
-%define	version		7716
+%define	version		7802
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
@@ -119,6 +119,9 @@
 %endif
 
 %changelog
+* Fri Jun  2 2006 Akira TAGOH <tagoh at redhat.com> - 7802-1
+- New upstream snapshot release.
+
 * Wed May 17 2006 Akira TAGOH <tagoh at redhat.com> - 7716-1
 - New upstream snapshot release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 May 2006 09:22:23 -0000	1.15
+++ sources	2 Jun 2006 06:07:24 -0000	1.16
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-32a8448686798b3d763b945af2855f01  anthy-7716.tar.gz
+e882a4f15892e473a24c770c89562cb6  anthy-7802.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  2 08:36:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 04:36:17 -0400
Subject: rpms/autofs/devel .cvsignore, 1.9, 1.10 autofs.spec, 1.93,
	1.94 sources, 1.9, 1.10
Message-ID: <200606020836.k528aHMe025249@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25174

Modified Files:
	.cvsignore autofs.spec sources 
Log Message:
* Fri Jun 2 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-1
- update to beta4.
- should address at least bzs 193798, 193770, 193831 and
  possibly 193832.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 May 2006 14:12:57 -0000	1.9
+++ .cvsignore	2 Jun 2006 08:36:01 -0000	1.10
@@ -1 +1 @@
-autofs-5.0.0_beta3.tar.bz2
+autofs-5.0.0_beta4.tar.bz2


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- autofs.spec	29 May 2006 09:09:09 -0000	1.93
+++ autofs.spec	2 Jun 2006 08:36:01 -0000	1.94
@@ -3,26 +3,14 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
-%define version 5.0.0_beta3
-%define release 6
+%define version 5.0.0_beta4
+%define release 1
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-Patch1: autofs-5.0.0_beta3-remove-extra-debug-print.patch
-Patch2: autofs-5.0.0_beta3-underscore-to-dot.patch
-Patch3: autofs-5.0.0_beta3-dont-probe-nfs4.patch
-Patch4: autofs-5.0.0_beta3-pgrp-pid.patch
-Patch5: autofs-5.0.0_beta3-replicated-white-space.patch
-Patch6: autofs-5.0.0_beta3-dont-strip-debug.patch
-Patch7: autofs-5.0.0_beta3-sanity-check-remove.patch
-Patch8: autofs-5.0.0_beta3-e2fsck-error-check.patch
-Patch9: autofs-5.0.0_beta3-fix-map-perms.patch
-Patch10: autofs-5.0.0_beta3-hesiod-update.patch
-Patch11: autofs-5.0.0_beta3-autofs-mount-fail.patch
-Patch12: autofs-5.0.0_beta3-lookup_program-add-check.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
@@ -62,23 +50,12 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
 %configure --disable-mount-locking --enable-ignore-busy
-make initdir=/etc/rc.d/init.d
+# OK I need to fix the spelling error.
+make initdir=/etc/rc.d/init.d DONTSCRIP=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -129,6 +106,11 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Jun 2 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-1
+- update to beta4.
+- should address at least bzs 193798, 193770, 193831 and
+  possibly 193832.
+
 * Mon May 29 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta3-6
 - add back test for nested mount in program map lookup.
   - I must have commented this out for a reason. I guess we'll


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 May 2006 14:12:57 -0000	1.9
+++ sources	2 Jun 2006 08:36:01 -0000	1.10
@@ -1 +1 @@
-786adad28150a09b5c4b1f5da9651267  autofs-5.0.0_beta3.tar.bz2
+26c381cd0cf38f1949ee618d8070a118  autofs-5.0.0_beta4.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  2 08:48:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 04:48:50 -0400
Subject: rpms/subversion/devel .cvsignore, 1.18, 1.19 psvn.el, 1.6,
	1.7 sources, 1.21, 1.22 subversion.spec, 1.74, 1.75
Message-ID: <200606020848.k528mo4V009647@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/subversion/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9560

Modified Files:
	.cvsignore psvn.el sources subversion.spec 
Log Message:
* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 1.3.2-2
- update to 1.3.2
- fix Ruby sitelibdir (Garrick Staples, #191611)
- own /etc/subversion (#189071)
- update to psvn.el r19857



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	4 Jan 2006 13:07:01 -0000	1.18
+++ .cvsignore	2 Jun 2006 08:48:47 -0000	1.19
@@ -1,2 +1,5 @@
-subversion-1.3.0.tar.gz
-subversion-1.2.3-3.src.rpm subversion-1.2.3-5.src.rpm
+*.src.rpm
+*.tar.gz
+x86_64
+subversion-1.3.2
+clog


Index: psvn.el
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/psvn.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- psvn.el	4 Apr 2006 09:21:08 -0000	1.6
+++ psvn.el	2 Jun 2006 08:48:47 -0000	1.7
@@ -28,7 +28,10 @@
 ;; (see http://subversion.tigris.org)
 ;; psvn.el provides a similar interface for subversion as pcl-cvs for cvs.
 ;; At the moment the following commands are implemented:
+;;
 ;; M-x svn-status: run 'svn -status -v'
+;; M-x svn-examine (like pcl-cvs cvs-examine) is alias for svn-status
+;;
 ;; and show the result in the svn-status-buffer-name buffer (normally: *svn-status*).
 ;; If svn-status-verbose is set to nil, only "svn status" without "-v"
 ;; is run. Currently you have to toggle this variable manually.
@@ -143,7 +146,8 @@
 ;; * help (?, h)
 ;; * import
 ;; * info                      implemented
-;; * list (ls)
+;; * list (ls)                 implemented
+;; * lock
 ;; * log                       implemented
 ;; * merge
 ;; * mkdir                     implemented
@@ -157,6 +161,7 @@
 ;; * revert                    implemented
 ;; * status (stat, st)         implemented
 ;; * switch (sw)
+;; * unlock
 ;; * update (up)               implemented
 
 ;; For the not yet implemented commands you should use the command line
@@ -191,6 +196,9 @@
       (require 'diff-mode))
   (error nil))
 
+(defconst svn-psvn-revision "$Id$"
+  "The revision number of psvn.")
+
 ;;; user setable variables
 (defcustom svn-status-verbose t
   "*Add '-v' to svn status call."
@@ -467,7 +475,7 @@
 (defvar svn-process-cmd nil)
 (defvar svn-status-info nil)
 (defvar svn-status-filename-to-buffer-position-cache (make-hash-table :test 'equal :weakness t))
-(defvar svn-status-base-info nil)
+(defvar svn-status-base-info nil "The parsed result from the svn info command.")
 (defvar svn-status-initial-window-configuration nil)
 (defvar svn-status-default-column 23)
 (defvar svn-status-default-revision-width 4)
@@ -522,6 +530,8 @@
 ;; already implied by "-function" suffix
 (defvar svn-status-get-specific-revision-file-info)
 (defvar svn-status-last-output-buffer-name)
+(defvar svn-status-pre-run-svn-buffer nil)
+(defvar svn-status-update-list nil)
 (defvar svn-transient-buffers)
 (defvar svn-ediff-windows)
 (defvar svn-ediff-result)
@@ -729,8 +739,9 @@
   (define-key svn-global-keymap (kbd "l") 'svn-status-show-svn-log)
   (define-key svn-global-keymap (kbd "u") 'svn-status-update-cmd)
   (define-key svn-global-keymap (kbd "=") 'svn-status-show-svn-diff)
+  (define-key svn-global-keymap (kbd "b") 'svn-status-blame)
   (define-key svn-global-keymap (kbd "c") 'svn-status-commit)
-  (define-key svn-global-keymap (kbd "b") 'svn-status-switch-to-status-buffer)
+  (define-key svn-global-keymap (kbd "S") 'svn-status-switch-to-status-buffer)
   (define-key svn-global-keymap (kbd "o") 'svn-status-pop-to-status-buffer))
 
 (defvar svn-status-diff-mode-map ()
@@ -787,53 +798,80 @@
         if (listp item) nconc (svn-status-flatten-list item)
         else collect item))
 
-(defvar svn-status-display-new-status-buffer nil)
+
+
+;;;###autoload (defalias 'svn-examine 'svn-status)
+(defalias 'svn-examine 'svn-status)
+
 ;;;###autoload
 (defun svn-status (dir &optional arg)
   "Examine the status of Subversion working copy in directory DIR.
 If ARG is -, allow editing of the parameters. One could add -N to
 run svn status non recursively to make it faster.
-For every other non nil ARG pass the -u argument to `svn status'."
+For every other non nil ARG pass the -u argument to `svn status'.
+
+If there is no .svn directory, examine if there is SVN and run
+`cvs-examine'. Otherwise ask if to run `dired'."
   (interactive (list (svn-read-directory-name "SVN status directory: "
                                               nil default-directory nil)
                      current-prefix-arg))
-  (setq arg (svn-status-possibly-negate-meaning-of-arg arg 'svn-status))
+  (let ((svn-dir (format "%s%s"
+                         (file-name-as-directory dir)
+                         (svn-wc-adm-dir-name)))
+        (cvs-dir (format "%sCVS" (file-name-as-directory dir))))
+    (cond
+     ((file-directory-p svn-dir)
+      (setq arg (svn-status-possibly-negate-meaning-of-arg arg 'svn-status))
+      (svn-status-1 dir arg))
+     ((and (file-directory-p cvs-dir)
+           (fboundp 'cvs-examine))
+      (cvs-examine dir nil))
+     (t
+      (when (y-or-n-p
+             (format
+              (concat
+               "%s "
+               "is not Subversion controlled (missing %s "
+               "directory). "
+               "Run dired instead? ")
+              dir
+              (svn-wc-adm-dir-name)))
+        (dired dir))))))
+
+(defvar svn-status-display-new-status-buffer nil)
+(defun svn-status-1 (dir &optional arg)
+  "Examine DIR. See `svn-status' for more information."
   (unless (file-directory-p dir)
     (error "%s is not a directory" dir))
-  (if (not (file-exists-p (concat dir "/" (svn-wc-adm-dir-name) "/")))
-      (when (y-or-n-p
-             (concat dir
-                     " does not seem to be a Subversion working copy (no "
-                     (svn-wc-adm-dir-name) " directory).  "
-                     "Run dired instead? "))
-        (dired dir))
-    (setq dir (file-name-as-directory dir))
-    (when svn-status-load-state-before-svn-status
-      (unless (string= dir (car svn-status-directory-history))
-        (svn-status-load-state t)))
-    (setq svn-status-directory-history (delete dir svn-status-directory-history))
-    (add-to-list 'svn-status-directory-history dir)
-    (if (string= (buffer-name) svn-status-buffer-name)
-        (setq svn-status-display-new-status-buffer nil)
-      (setq svn-status-display-new-status-buffer t)
-      ;;(message "psvn: Saving initial window configuration")
-      (setq svn-status-initial-window-configuration (current-window-configuration)))
-    (let* ((status-buf (get-buffer-create svn-status-buffer-name))
-           (proc-buf (get-buffer-create "*svn-process*"))
-           (want-edit (eq arg '-))
-           (status-option (if want-edit
-                              (if svn-status-verbose "-v" "")
-                            (if svn-status-verbose
-                                (if arg "-uv" "-v")
-                              (if arg "-u" ""))))
-           (svn-status-edit-svn-command (or want-edit svn-status-edit-svn-command)))
-      (save-excursion
-        (set-buffer status-buf)
-        (setq default-directory dir)
-        (set-buffer proc-buf)
-        (setq default-directory dir
-              svn-status-remote (when arg t))
-        (svn-run t t 'status "status" status-option)))))
+  (setq dir (file-name-as-directory dir))
+  (when svn-status-load-state-before-svn-status
+    (unless (string= dir (car svn-status-directory-history))
+      (svn-status-load-state t)))
+  (setq svn-status-directory-history (delete dir svn-status-directory-history))
+  (add-to-list 'svn-status-directory-history dir)
+  (if (string= (buffer-name) svn-status-buffer-name)
+      (setq svn-status-display-new-status-buffer nil)
+    (setq svn-status-display-new-status-buffer t)
+    ;;(message "psvn: Saving initial window configuration")
+    (setq svn-status-initial-window-configuration
+          (current-window-configuration)))
+  (let* ((status-buf (get-buffer-create svn-status-buffer-name))
+         (proc-buf (get-buffer-create "*svn-process*"))
+         (want-edit (eq arg '-))
+         (status-option (if want-edit
+                            (if svn-status-verbose "-v" "")
+                          (if svn-status-verbose
+                              (if arg "-uv" "-v")
+                            (if arg "-u" ""))))
+         (svn-status-edit-svn-command
+          (or want-edit svn-status-edit-svn-command)))
+    (save-excursion
+      (set-buffer status-buf)
+      (setq default-directory dir)
+      (set-buffer proc-buf)
+      (setq default-directory dir
+            svn-status-remote (when arg t))
+      (svn-run t t 'status "status" status-option))))
 
 (defun svn-status-this-directory (arg)
   "Run `svn-status' for the `default-directory'"
@@ -945,11 +983,12 @@
                 ;; never opens a pseudoterminal.
                 (apply 'call-process svn-exe nil proc-buf nil arglist))
               (setq svn-status-mode-line-process-status "")
-              (svn-status-update-mode-line)))))
+              (svn-status-update-mode-line)))
+          (setq svn-status-pre-run-svn-buffer (current-buffer))))
     (error "You can only run one svn process at once!")))
 
 (defun svn-process-sentinel-fixup-path-seperators ()
-	"Convert all path separators to UNIX style.
+    "Convert all path separators to UNIX style.
 \(This is a no-op unless `system-type' is windows-nt\)"
   (when (eq system-type 'windows-nt)
       (save-excursion
@@ -978,6 +1017,11 @@
                     (insert svn-status-update-previous-process-output)
                     (goto-char (point-min))
                     (setq svn-status-update-previous-process-output nil))
+                  (when svn-status-update-list
+                    ;; (message "Using svn-status-update-list: %S" svn-status-update-list)
+                    (save-excursion
+                      (svn-status-update-with-command-list svn-status-update-list))
+                    (setq svn-status-update-list nil))
                   (when svn-status-display-new-status-buffer
                     (set-window-configuration svn-status-initial-window-configuration)
                     (if (svn-had-user-input-since-asynch-run)
@@ -993,10 +1037,17 @@
                  ((eq svn-process-cmd 'info)
                   (svn-status-show-process-output 'info t)
                   (message "svn info finished"))
+                 ((eq svn-process-cmd 'ls)
+                  (svn-status-show-process-output 'info t)
+                  (message "svn ls finished"))
                  ((eq svn-process-cmd 'parse-info)
                   (svn-status-parse-info-result))
                  ((eq svn-process-cmd 'blame)
                   (svn-status-show-process-output 'blame t)
+                  (when svn-status-pre-run-svn-buffer
+                    (with-current-buffer svn-status-pre-run-svn-buffer
+                      (unless (eq major-mode 'svn-status-mode)
+                        (goto-line (line-number-at-pos) (get-buffer svn-status-last-output-buffer-name)))))
                   (message "svn blame finished"))
                  ((eq svn-process-cmd 'commit)
                   (svn-process-sentinel-fixup-path-seperators)
@@ -1010,6 +1061,7 @@
                   (message "svn commit finished"))
                  ((eq svn-process-cmd 'update)
                   (svn-status-show-process-output 'update t)
+                  (setq svn-status-update-list (svn-status-parse-update-output))
                   (svn-status-update)
                   (message "svn update finished"))
                  ((eq svn-process-cmd 'add)
@@ -1041,7 +1093,9 @@
                   (svn-status-property-parse-property-names))
                  ((eq svn-process-cmd 'propset)
                   (svn-status-remove-temp-file-maybe)
-                  (svn-status-update))
+                  (if (member svn-status-propedit-property-name '("svn:keywords"))
+                      (svn-status-update-with-command-list (svn-status-parse-property-output))
+                    (svn-status-update)))
                  ((eq svn-process-cmd 'propdel)
                   (svn-status-update))))
           ((string= event "killed\n")
@@ -1810,7 +1864,7 @@
           ;;(message "found: %S" found)
           (unless found (setq st-info (cdr st-info))))
         (unless found
-          (message "continue to search for %s" (caar cmd-list))
+          (svn-status-message 3 "psvn: continue to search for %s" (caar cmd-list))
           (setq st-info svn-status-info)
           (while (and (not found) st-info)
             (setq found (string= (caar cmd-list) (svn-status-line-info->filename (car st-info))))
@@ -1821,7 +1875,7 @@
               (setq action (cadar cmd-list))
               ;;(message "found %s, action: %S" (caar cmd-list) action)
               (svn-status-annotate-status-buffer-entry action (car st-info)))
-          (message "did not find %s" (caar cmd-list)))
+          (svn-status-message 3 "psvn: did not find %s" (caar cmd-list)))
         (setq cmd-list (cdr cmd-list)))
       (if fname
           (progn
@@ -1845,6 +1899,11 @@
            (setq tag-string " <deleted>"))
           ((equal action 'replaced)
            (setq tag-string " <replaced>"))
+          ((equal action 'updated)
+           (setq tag-string " <updated>"))
+          ((equal action 'propset)
+           ;;(setq tag-string " <propset>")
+           (svn-status-line-info->set-propmark line-info svn-status-file-modified-after-save-flag))
           ((equal action 'added-wc)
            (svn-status-line-info->set-filemark line-info ?A)
            (svn-status-line-info->set-localrev line-info 0))
@@ -1941,9 +2000,63 @@
           (setq skip nil))
         (forward-line 1))
       result)))
-;;(svn-status-parse-ar-output)
+;; (svn-status-parse-ar-output)
 ;; (svn-status-update-with-command-list (svn-status-parse-ar-output))
 
+(defun svn-status-parse-update-output ()
+  "Parse the output of svn update.
+Return a list that is suitable for `svn-status-update-with-command-list'"
+  (save-excursion
+    (set-buffer "*svn-process*")
+    (let ((action)
+          (name)
+          (skip)
+          (result))
+      (goto-char (point-min))
+      (while (< (point) (point-max))
+        (cond ((= (svn-point-at-eol) (svn-point-at-bol)) ;skip blank lines
+               (setq skip t))
+              ((looking-at "Updated to")
+               (setq skip t))
+              ((looking-at "At revision")
+               (setq skip t))
+              ((looking-at "U")
+               (setq action 'updated))
+              ((looking-at "A")
+               (setq action 'added))
+              ((looking-at "D")
+               (setq skip t))
+               ;;(setq action 'deleted)) ;;deleted files are not displayed in the svn status output.
+              (t ;; this should never be needed(?)
+               (setq action 'unknown)))
+        (unless skip ;found an interesting line
+          (forward-char 3)
+          (setq name (buffer-substring-no-properties (point) (svn-point-at-eol)))
+          (setq result (cons (list name action)
+                             result))
+          (setq skip nil))
+        (forward-line 1))
+      result)))
+;; (svn-status-parse-update-output)
+;; (svn-status-update-with-command-list (svn-status-parse-update-output))
+
+(defun svn-status-parse-property-output ()
+  "Parse the output of svn propset.
+Return a list that is suitable for `svn-status-update-with-command-list'"
+  (save-excursion
+    (set-buffer "*svn-process*")
+    (let ((result))
+      (dolist (line (split-string (buffer-substring-no-properties (point-min) (point-max)) "\n"))
+        (message "%s" line)
+        (when (string-match "property '\\(.+\\)' set on '\\(.+\\)'" line)
+          ;;(message "property %s - file %s" (match-string 1 line) (match-string 2 line))
+          (setq result (cons (list (match-string 2 line) 'propset) result))))
+      result)))
+
+;; (svn-status-parse-property-output)
+;; (svn-status-update-with-command-list (svn-status-parse-property-output))
+
+
 (defun svn-status-line-info->symlink-p (line-info)
   "Return non-nil if LINE-INFO refers to a symlink, nil otherwise.
 The value is the name of the file to which it is linked. \(See
@@ -2062,6 +2175,7 @@
         (custom-hide-count 0)   ;how many files are hidden via svn-status-custom-hide-function
         (marked-count 0)        ;how many files are elided
         (user-elide-count 0)
+        (first-line t)
         (fname (svn-status-line-info->filename (svn-status-get-line-information)))
         (fname-pos (point))
         (header-line-string)
@@ -2071,9 +2185,10 @@
     ;; Insert all files and directories
     (while st-info
       (setq start-pos (point))
-      (cond ((svn-status-line-info->has-usermark (car st-info))
-             ;; Show a marked file always
-             (svn-insert-line-in-status-buffer (car st-info)))
+      (cond ((or (svn-status-line-info->has-usermark (car st-info)) first-line)
+             ;; Show a marked file and the "." always
+             (svn-insert-line-in-status-buffer (car st-info))
+             (setq first-line nil))
             ((svn-status-line-info->update-available (car st-info))
              (svn-insert-line-in-status-buffer (car st-info)))
             ((and svn-status-custom-hide-function
@@ -2151,21 +2266,51 @@
     (svn-status-update-buffer)))
 
 (defun svn-status-parse-info-result ()
-  (let ((url))
+  "Parse the result from the svn info command.
+Put the found values in `svn-status-base-info'."
+  (let ((url)
+        (repository-root))
     (save-excursion
       (set-buffer "*svn-process*")
       (goto-char (point-min))
       (let ((case-fold-search t))
-        (search-forward "url: "))
-      (setq url (buffer-substring-no-properties (point) (svn-point-at-eol))))
-    (setq svn-status-base-info `((url ,url)))))
+        (search-forward "url: ")
+        (setq url (buffer-substring-no-properties (point) (svn-point-at-eol)))
+        (search-forward "repository root: ")
+        (setq repository-root (buffer-substring-no-properties (point) (svn-point-at-eol)))))
+    (setq svn-status-base-info `((url ,url) (repository-root ,repository-root)))))
 
 (defun svn-status-base-info->url ()
+  "Extract the url part from `svn-status-base-info'."
   (if svn-status-base-info
       (cadr (assoc 'url svn-status-base-info))
     ""))
 
+(defun svn-status-base-info->repository-root ()
+  "Extract the repository-root part from `svn-status-base-info'."
+  (if svn-status-base-info
+      (cadr (assoc 'repository-root svn-status-base-info))
+    ""))
+
+(defun svn-status-ls (path)
+  "Run svn ls PATH."
+  (interactive "sPath for svn ls: ")
+  (svn-run t t 'ls "ls" path))
+
+(defun svn-status-ls-branches ()
+  "Show, which branches exist for the actual working copy.
+Note: this command assumes the proposed standard svn repository layout."
+  (interactive)
+  (svn-status-parse-info t)
+  (svn-status-ls (concat (svn-status-base-info->repository-root) "/branches")))
+
 (defun svn-status-toggle-edit-cmd-flag (&optional reset)
+  "Allow the user to edit the parameters for the next svn command.
+This command toggles between
+* editing the next command parameters (EditCmd)
+* editing all all command parameters (EditCmd#)
+* don't edit the command parameters ()
+The string in parentheses is shown in the status line to show the state."
   (interactive)
   (cond ((or reset (eq svn-status-edit-svn-command 'sticky))
          (setq svn-status-edit-svn-command nil))
@@ -2257,8 +2402,19 @@
 (defun svn-status-get-file-list-names (use-marked-files)
   (mapcar 'svn-status-line-info->filename (svn-status-get-file-list use-marked-files)))
 
+(defun svn-status-get-file-information ()
+  "Find out about the file under point.
+The result may be parsed with the various `svn-status-line-info->...' functions.
+When called from a *svn-status* buffer, do the same as `svn-status-get-file-information'.
+When called from a file buffer provide a structure that contains the filename."
+  (cond ((eq major-mode 'svn-status-mode)
+         (svn-status-get-file-information))
+        (t
+         ;; a fake strukture that contains the buffername for the current buffer
+         (list '(nil nil) 32 nil (buffer-file-name (current-buffer)) 0 0 "" nil nil nil nil))))
+
 (defun svn-status-select-line ()
-	"Return information about the file under point.
+    "Return information about the file under point.
 \(Only used for debugging\)"
   (interactive)
   (let ((info (svn-status-get-line-information)))
@@ -2268,7 +2424,7 @@
       (message "No file on this line"))))
 
 (defun svn-status-ensure-cursor-on-file ()
-	"Raise an error unless point is on a valid file."
+    "Raise an error unless point is on a valid file."
   (unless (svn-status-get-line-information)
     (error "No file on the current line")))
 
@@ -2354,10 +2510,12 @@
                                        (file-name-as-directory file-name))))
          (newcursorpos-fname)
          (i-fname)
+         (first-line t)
          (current-line svn-start-of-file-list-line-number))
     (while st-info
-      (when (svn-status-line-info->is-visiblep (car st-info))
-        (setq current-line (1+ current-line)))
+      (when (or (svn-status-line-info->is-visiblep (car st-info)) first-line)
+        (setq current-line (1+ current-line))
+        (setq first-line nil))
       (setq i-fname (svn-status-line-info->filename (car st-info)))
       (when (or (string= file-name i-fname)
                 (string-match sub-file-regexp i-fname))
@@ -2557,6 +2715,7 @@
   (when (string= (buffer-name) svn-status-buffer-name)
     (delete-other-windows))
   (pop-to-buffer "*svn-process*")
+  (svn-process-mode)
   (when svn-status-wash-control-M-in-process-buffers
     (svn-status-remove-control-M))
   (when scroll-to-top
@@ -2588,6 +2747,8 @@
               (insert-buffer-substring "*svn-process*")
               (when scroll-to-top
                 (goto-char (point-min))))
+            (when (eq window-mode t) ;; *svn-info* buffer
+              (svn-info-mode))
             (other-window 1))
         (svn-status-show-process-buffer-internal scroll-to-top)))))
 
@@ -2619,12 +2780,15 @@
   (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-marked-files) "")
   (svn-run t t 'info "info" "--targets" svn-status-temp-arg-file))
 
-;; Todo: add possiblity to specify the revision
-(defun svn-status-blame ()
-  "Run `svn blame' on the current file."
-  (interactive)
-  ;;(svn-run t t 'blame "blame" "-r" "BASE" (svn-status-line-info->filename (svn-status-get-line-information))))
-  (svn-run t t 'blame "blame" (svn-status-line-info->filename (svn-status-get-line-information))))
+(defun svn-status-blame (revision)
+  "Run `svn blame' on the current file.
+When called with a prefix argument, ask the user for the REVISION to use.
+When called from a file buffer, go to the current line in the resulting blame output."
+  (interactive "P")
+  (when current-prefix-arg
+    (setq revision (svn-status-read-revision-string "Blame for version: " "BASE")))
+  (unless revision (setq revision "BASE"))
+  (svn-run t t 'blame "blame" "-r" revision (svn-status-line-info->filename (svn-status-get-file-information))))
 
 (defun svn-status-show-svn-diff (arg)
   "Run `svn diff' on the current file.
@@ -2707,11 +2871,12 @@
 (defun svn-status-activate-diff-mode ()
   "Show the *svn-process* buffer, using the diff-mode."
   (svn-status-show-process-output 'diff t)
-  (save-excursion
-    (set-buffer svn-status-last-output-buffer-name)
-    (svn-status-diff-mode)
-    (setq buffer-read-only t)))
-
+  (let ((working-directory default-directory))
+    (save-excursion
+      (set-buffer svn-status-last-output-buffer-name)
+      (setq default-directory working-directory)
+      (svn-status-diff-mode)
+      (setq buffer-read-only t))))
 
 (define-derived-mode svn-status-diff-mode fundamental-mode "svn-diff"
   "Major mode to display svn diffs. Derives from `diff-mode'.
@@ -2875,12 +3040,14 @@
           (svn-run t t 'rm "rm" "--force" "--targets" svn-status-temp-arg-file)
         (svn-run t t 'rm "rm" "--targets" svn-status-temp-arg-file)))))
 
-(defun svn-status-update-cmd ()
-  "Run svn update."
-  (interactive)
-  (message "Running svn-update for %s" default-directory)
-  ;TODO: use file names also
-  (svn-run t t 'update "update"))
+(defun svn-status-update-cmd (arg)
+  "Run svn update.
+When called with a prefix argument, ask the user for the revision to update to."
+  (interactive "P")
+  (let ((rev (when arg (svn-status-read-revision-string (format "Directory: %s: Run svn update -r " default-directory)))))
+    (message "Running svn-update for %s" default-directory)
+    ;;TODO: use file names also??
+    (svn-run t t 'update "update" (when rev (list "-r" rev)))))
 
 (defun svn-status-commit ()
   "Commit selected files.
@@ -3016,7 +3183,7 @@
                         (delete-region (svn-point-at-bol) (svn-point-at-eol))
                         (svn-insert-line-in-status-buffer (car st-info))
                         (delete-char 1))
-                    (message "psvn: file %s not found, updating %s buffer content..."
+                    (svn-status-message 3 "psvn: file %s not found, updating %s buffer content..."
                              i-fname svn-status-buffer-name)
                     (svn-status-update-buffer))))))
           (setq st-info (cdr st-info))))))
@@ -3776,6 +3943,42 @@
     (setq svn-log-edit-update-log-entry rev)))
 
 ;; --------------------------------------------------------------------------------
+;; svn-info-mode
+;; --------------------------------------------------------------------------------
+(defvar svn-info-mode-map () "Keymap used in `svn-info-mode' buffers.")
+(put 'svn-info-mode-map 'risky-local-variable t) ;for Emacs 20.7
+
+(when (not svn-info-mode-map)
+  (setq svn-info-mode-map (make-sparse-keymap))
+  (define-key svn-info-mode-map [?q] 'bury-buffer))
+
+(defun svn-info-mode ()
+  "Major Mode to view informative output from svn."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map svn-info-mode-map)
+  (setq major-mode 'svn-info-mode)
+  (setq mode-name "svn-info"))
+
+;; --------------------------------------------------------------------------------
+;; svn-process-mode
+;; --------------------------------------------------------------------------------
+(defvar svn-process-mode-map () "Keymap used in `svn-process-mode' buffers.")
+(put 'svn-process-mode-map 'risky-local-variable t) ;for Emacs 20.7
+
+(when (not svn-process-mode-map)
+  (setq svn-process-mode-map (make-sparse-keymap))
+  (define-key svn-process-mode-map [?q] 'bury-buffer))
+
+(defun svn-process-mode ()
+  "Major Mode to view process output from svn."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map svn-process-mode-map)
+  (setq major-mode 'svn-process-mode)
+  (setq mode-name "svn-process"))
+
+;; --------------------------------------------------------------------------------
 ;; svn status persistent options
 ;; --------------------------------------------------------------------------------
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Apr 2006 09:21:08 -0000	1.21
+++ sources	2 Jun 2006 08:48:47 -0000	1.22
@@ -1 +1 @@
-6d650e918255596ef8b74255b3938547  subversion-1.3.1.tar.gz
+f790c49c219b4196e37ebfa71ab797d5  subversion-1.3.2.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- subversion.spec	6 Apr 2006 12:17:01 -0000	1.74
+++ subversion.spec	2 Jun 2006 08:48:47 -0000	1.75
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 1
+%define make_check 0
 
 %define with_java 1
 
@@ -7,11 +7,12 @@
 %define jdk_path /usr/lib/jvm/java
 
 %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+%define ruby_sitelibdir %(%{_bindir}/ruby -rrbconfig -e 'print Config::CONFIG.fetch(%q(sitelibdir))')
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.3.1
-Release: 4
+Version: 1.3.2
+Release: 2
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -137,6 +138,7 @@
 
 make pure_vendor_install -C subversion/bindings/swig/perl/native \
         PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/subversion
 
 # Add subversion.conf configuration file into httpd/conf.d directory.
 install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d
@@ -159,7 +161,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a}
 
 # Remove unnecessary ruby libraries
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/site_ruby/*/*/svn/ext/*.*a
+rm -f ${RPM_BUILD_ROOT}%{ruby_sitelibdir}/*/svn/ext/*.*a
 
 # Trim what goes in docdir
 rm -rf tools/*/*.in tools/test-scripts
@@ -205,6 +207,7 @@
 %{pydir}/libsvn
 %{_datadir}/emacs/site-lisp
 %{_datadir}/xemacs/site-packages/lisp
+%dir %{_sysconfdir}/subversion
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
 %exclude %{_mandir}/man*/*::*
@@ -235,8 +238,8 @@
 %files ruby
 %defattr(-,root,root,-)
 %{_libdir}/libsvn_swig_ruby*
-%{_libdir}/site_ruby/*/svn
-%{_libdir}/site_ruby/*/*-linux/svn
+%{ruby_sitelibdir}/svn
+%{ruby_sitelibdir}/*-linux/svn
 
 %if %{with_java}
 %files javahl
@@ -246,6 +249,12 @@
 %endif
 
 %changelog
+* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 1.3.2-2
+- update to 1.3.2
+- fix Ruby sitelibdir (Garrick Staples, #191611)
+- own /etc/subversion (#189071)
+- update to psvn.el r19857
+
 * Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.3.1-4
 - move libsvn_swig_ruby* back to subversion-ruby
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 09:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 05:20:49 -0400
Subject: rpms/cdrtools/devel cdrtools-2.01-xconfig.patch, 1.3,
	1.4 cdrtools.spec, 1.45, 1.46
Message-ID: <200606020920.k529Kn4a032254@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32194

Modified Files:
	cdrtools-2.01-xconfig.patch cdrtools.spec 
Log Message:
- corrected multilib patch (bug #193796)


cdrtools-2.01-xconfig.patch:
 xconfig.h.in |   68 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 24 deletions(-)

Index: cdrtools-2.01-xconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01-xconfig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdrtools-2.01-xconfig.patch	29 May 2006 13:43:22 -0000	1.3
+++ cdrtools-2.01-xconfig.patch	2 Jun 2006 09:20:47 -0000	1.4
@@ -1,15 +1,19 @@
 --- cdrtools-2.01.01/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
-+++ cdrtools-2.01.01/conf/xconfig.h.in	2006-05-16 13:06:50.000000000 +0200
-@@ -5,6 +5,8 @@
-  *	Copyright (c) 1998-2003 J. Schilling
++++ cdrtools-2.01.01/conf/xconfig.h.in	2006-06-02 11:19:00.000000000 +0200
+@@ -418,28 +418,48 @@
+  * Byteorder/Bitorder
   */
+ #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
+-#undef WORDS_BIGENDIAN		/* If using network byte order             */
++#if defined(__BIG_ENDIAN__)
++#define WORDS_BIGENDIAN	1	/* If using network byte order             */
++#endif
+ #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
+-#undef BITFIELDS_HTOL		/* If high bits come first in structures   */
++#if defined(__BIG_ENDIAN__)
++#define BITFIELDS_HTOL	1	/* If high bits come first in structures   */
++#endif
  
-+#include <sys/types.h>
-+
- /*
-  * Header Files
-  */
-@@ -425,20 +427,20 @@
  /*
   * Types/Keywords
   */
@@ -25,25 +29,43 @@
 -#undef SIZEOF_UNSIGNED_LONG_INT
 -#undef SIZEOF_UNSIGNED_LONG_LONG
 -#undef SIZEOF_UNSIGNED_CHAR_P
+ 
+-#undef HAVE_LONGLONG		/* Compiler defines long long type */
+-#undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
++#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__s390x__)
++#define SIZEOF_LONG_INT 8
++#define SIZEOF_CHAR_P 8
++#define SIZEOF_UNSIGNED_LONG_INT 8
++#define SIZEOF_UNSIGNED_CHAR_P 8
++#elif defined(__i386__) || defined(__ppc__) || defined(__s390__)
++#define SIZEOF_LONG_INT 4
++#define SIZEOF_CHAR_P 4
++#define SIZEOF_UNSIGNED_LONG_INT 4
++#define SIZEOF_UNSIGNED_CHAR_P 4
++#else
++#error Architecture not defined here!
++#endif
++
 +#define SIZEOF_CHAR 1
 +#define SIZEOF_SHORT_INT 2
 +#define SIZEOF_INT 4
-+#define SIZEOF_LONG_INT (__WORDSIZE/8)
 +#define SIZEOF_LONG_LONG 8
-+#define SIZEOF_CHAR_P (__WORDSIZE/8)
 +#define SIZEOF_UNSIGNED_CHAR 1
 +#define SIZEOF_UNSIGNED_SHORT_INT 2
 +#define SIZEOF_UNSIGNED_INT 4
-+#define SIZEOF_UNSIGNED_LONG_INT (__WORDSIZE/8)
 +#define SIZEOF_UNSIGNED_LONG_LONG 8
-+#define SIZEOF_UNSIGNED_CHAR_P (__WORDSIZE/8)
- 
--#undef HAVE_LONGLONG		/* Compiler defines long long type */
-+#define HAVE_LONGLONG __GLIBC_HAVE_LONG_LONG	/* Compiler defines long long type */
- #undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
++
++#if defined(__LONG_LONG_MAX__)
++#define HAVE_LONGLONG 1         /* Compiler defines long long type */
++#endif
++
++#if defined(__CHAR_UNSIGNED__)
++#define CHAR_IS_UNSIGNED 1	/* Compiler defines char to be unsigned */
++#endif
  
  #undef const			/* Define to empty if const doesn't work */
-@@ -479,7 +481,7 @@
+ #undef uid_t			/* To be used if uid_t is not present  */
+@@ -479,7 +499,7 @@
  
  /*#undef HAVE_SIZE_T*/
  /*#undef NO_SIZE_T*/
@@ -52,16 +74,18 @@
  #undef GETGROUPS_T
  #define GID_T		GETGROUPS_T
  
-@@ -498,7 +500,7 @@
+@@ -498,8 +518,8 @@
  #ifdef	HAVE_LARGEFILES		/* If we have working largefiles at all	   */
  				/* This is not defined with glibc-2.1.3	   */
  
 -#undef _FILE_OFFSET_BITS	/* # of bits in off_t if settable	   */
-+/*#undef _FILE_OFFSET_BITS*/	/* # of bits in off_t if settable	   */
- #undef _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
+-#undef _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
++#define _FILE_OFFSET_BITS 64	/* # of bits in off_t if settable	   */
++#define _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
  #undef _LARGE_FILES		/* Large file defined on AIX-style hosts.  */
  #undef _XOPEN_SOURCE		/* To make ftello() visible (glibc 2.1.3). */
-@@ -586,11 +588,11 @@
+ 				/* XXX We don't use this because glibc2.1.3*/
+@@ -586,11 +606,11 @@
  /*
   * Strings that help to maintain OS/platform id's in C-programs
   */


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cdrtools.spec	29 May 2006 14:04:58 -0000	1.45
+++ cdrtools.spec	2 Jun 2006 09:20:47 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a09
-Release: 1
+Release: 2
 %define tarversion 2.01.01a09
 License: CDDL
 Group: Applications/System
@@ -240,6 +240,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-2
+- corrected multilib patch (bug #193796)
+
 * Mon May 29 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-1
 - version 2.01.01a09
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 10:53:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 06:53:54 -0400
Subject: rpms/star/devel sources,1.15,1.16 star.spec,1.26,1.27
Message-ID: <200606021053.k52Arsrs017301@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/star/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17253

Modified Files:
	sources star.spec 
Log Message:
update tarball



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/star/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Apr 2006 10:04:51 -0000	1.15
+++ sources	2 Jun 2006 10:53:52 -0000	1.16
@@ -1 +1 @@
-c6310fe00d90db74af8652a22cc2ec70  star-1.5a74.tar.bz2
+da1a088602d92abd3b8bc7207edbf6c3  star-1.5a74.tar.bz2


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- star.spec	24 Apr 2006 10:04:51 -0000	1.26
+++ star.spec	2 Jun 2006 10:53:52 -0000	1.27
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5a74
-Release: 1
+Release: 2
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
@@ -97,6 +97,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Fri Jun 02 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a74-2
+- update tarball
+
 * Mon Apr 24 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a74-1
 - upgrade
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 11:03:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 07:03:11 -0400
Subject: rpms/php/devel php-5.1.4-warnings.patch, 1.1, 1.2 php.spec, 1.111,
	1.112
Message-ID: <200606021103.k52B3B4S020065@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20032

Modified Files:
	php-5.1.4-warnings.patch php.spec 
Log Message:
* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 5.1.4-6
- split out php-cli, php-common subpackages (#177821)


php-5.1.4-warnings.patch:
 bz2/bz2_filter.c              |    6 +++---
 dba/libinifile/inifile.c      |    6 +++---
 pdo_sqlite/sqlite_statement.c |    2 +-
 standard/filters.c            |    2 +-
 zlib/zlib_filter.c            |    6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

Index: php-5.1.4-warnings.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.1.4-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.1.4-warnings.patch	18 May 2006 13:37:01 -0000	1.1
+++ php-5.1.4-warnings.patch	2 Jun 2006 11:02:53 -0000	1.2
@@ -5,7 +5,7 @@
  	data = pecalloc(1, sizeof(php_bz2_filter_data), persistent);
  	if (!data) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", sizeof(php_bz2_filter_data));
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_bz2_filter_data));
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", sizeof(php_bz2_filter_data));
  		return NULL;
  	}
  
@@ -14,7 +14,7 @@
  	data->strm.next_in = data->inbuf = (char *) pemalloc(data->inbuf_len, persistent);
  	if (!data->inbuf) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->inbuf_len);
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->inbuf_len);
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", data->inbuf_len);
  		pefree(data, persistent);
  		return NULL;
  	}
@@ -22,10 +22,61 @@
  	data->strm.next_out = data->outbuf = (char *) pemalloc(data->outbuf_len, persistent);
  	if (!data->outbuf) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->outbuf_len);
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->outbuf_len);
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", data->outbuf_len);
  		pefree(data->inbuf, persistent);
  		pefree(data, persistent);
  		return NULL;
+--- php-5.1.4/ext/standard/filters.c.warnings
++++ php-5.1.4/ext/standard/filters.c
+@@ -1882,7 +1882,7 @@
+ 	/* Create this filter */
+ 	data = pecalloc(1, sizeof(php_consumed_filter_data), persistent);
+ 	if (!data) {
+-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", sizeof(php_consumed_filter_data));
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", sizeof(php_consumed_filter_data));
+ 		return NULL;
+ 	}
+ 	data->persistent = persistent;
+--- php-5.1.4/ext/pdo_sqlite/sqlite_statement.c.warnings
++++ php-5.1.4/ext/pdo_sqlite/sqlite_statement.c
+@@ -234,7 +234,7 @@
+ 			if (*len) {
+ 				/* sqlite3.h says "the NUL terminator is included in the byte count
+ 				 * for TEXT values" */
+-				*len--;
++				(*len)--;
+ 			}
+ 			return 1;
+ 		
+--- php-5.1.4/ext/dba/libinifile/inifile.c.warnings
++++ php-5.1.4/ext/dba/libinifile/inifile.c
+@@ -404,7 +404,7 @@
+ 	}
+ 	php_stream_seek(dba->fp, pos_start, SEEK_SET);
+ 	if (!php_stream_copy_to_stream(dba->fp, fp, pos_end - pos_start)) {
+-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy group [%d - %d] to temporary stream", pos_start, pos_end);
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy group [%zu - %zu] to temporary stream", pos_start, pos_end);
+ 		return FAILURE;
+ 	} 
+ 	return SUCCESS;
+@@ -429,7 +429,7 @@
+ 			if (pos_start != pos_next) {
+ 				php_stream_seek(from->fp, pos_start, SEEK_SET);
+ 				if (!php_stream_copy_to_stream(from->fp, dba->fp, pos_next - pos_start)) {
+-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%d - %d] from temporary stream", pos_next, pos_start);
++					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%zu - %zu] from temporary stream", pos_next, pos_start);
+ 					ret = FAILURE;
+ 				}
+ 				php_stream_seek(from->fp, pos_curr, SEEK_SET);
+@@ -448,7 +448,7 @@
+ 	if (pos_start != pos_next) {
+ 		php_stream_seek(from->fp, pos_start, SEEK_SET);
+ 		if (!php_stream_copy_to_stream(from->fp, dba->fp, pos_next - pos_start)) {
+-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%d - %d] from temporary stream", pos_next, pos_start);
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%zu - %zu] from temporary stream", pos_next, pos_start);
+ 			ret = FAILURE;
+ 		}
+ 	}
 --- php-5.1.4/ext/zlib/zlib_filter.c.warnings
 +++ php-5.1.4/ext/zlib/zlib_filter.c
 @@ -275,7 +275,7 @@
@@ -33,7 +84,7 @@
  	data = pecalloc(1, sizeof(php_zlib_filter_data), persistent);
  	if (!data) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", sizeof(php_zlib_filter_data));
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_zlib_filter_data));
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", sizeof(php_zlib_filter_data));
  		return NULL;
  	}
  
@@ -42,7 +93,7 @@
  	data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent);
  	if (!data->inbuf) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->inbuf_len);
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->inbuf_len);
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", data->inbuf_len);
  		pefree(data, persistent);
  		return NULL;
  	}
@@ -50,7 +101,7 @@
  	data->strm.next_out = data->outbuf = (Bytef *) pemalloc(data->outbuf_len, persistent);
  	if (!data->outbuf) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->outbuf_len);
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->outbuf_len);
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", data->outbuf_len);
  		pefree(data->inbuf, persistent);
  		pefree(data, persistent);
  		return NULL;


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- php.spec	24 May 2006 12:29:03 -0000	1.111
+++ php.spec	2 Jun 2006 11:02:55 -0000	1.112
@@ -4,7 +4,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.4
-Release: 5.1
+Release: 6
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -44,9 +44,36 @@
 # Enforce Apache module ABI compatibility
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 Requires: file >= 4.0
-Provides: php-api = %{apiver}
 Provides: mod_php = %{version}-%{release}
+Requires: php-common = %{version}-%{release}
+# For backwards-compatibility, require php-cli for the time being:
+Requires: php-cli = %{version}-%{release}
+
+%description
+PHP is an HTML-embedded scripting language. PHP attempts to make it
+easy for developers to write dynamically generated webpages. PHP also
+offers built-in database integration for several commercial and
+non-commercial database management systems, so writing a
+database-enabled webpage with PHP is fairly simple. The most common
+use of PHP coding is probably as a replacement for CGI scripts. 
+
+The php package contains the module which adds support for the PHP
+language to Apache HTTP Server.
+
+%package cli
+Group: Development/Languages
+Summary: Command-line interface for PHP
 Provides: php-cli = %{version}-%{release}
+Requires: php-common = %{version}-%{release}
+
+%description cli
+The php-cli package contains the command-line interface 
+executing PHP scripts, /usr/bin/php, and the CGI interface.
+
+%package common
+Group: Development/Languages
+Summary: Common files for PHP
+Provides: php-api = %{apiver}
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
@@ -55,15 +82,9 @@
 Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
 Provides: php-wddx, php-zlib
 
-%description
-PHP is an HTML-embedded scripting language. PHP attempts to make it
-easy for developers to write dynamically generated webpages. PHP also
-offers built-in database integration for several commercial and
-non-commercial database management systems, so writing a
-database-enabled webpage with PHP is fairly simple. The most common
-use of PHP coding is probably as a replacement for CGI scripts. The
-mod_php module enables the Apache Web server to understand and process
-the embedded PHP language in Web pages.
+%description common
+The php-common package contains files used by both the php
+package and the php-cli package.
 
 %package devel
 Group: Development/Libraries
@@ -77,7 +98,7 @@
 need to install this package.
 
 %package imap
-Summary: An Apache module for PHP applications that use IMAP.
+Summary: A module for PHP applications that use IMAP.
 Group: Development/Languages
 Requires: php = %{version}-%{release}
 Obsoletes: mod_php3-imap, stronghold-php-imap
@@ -525,21 +546,25 @@
 
 %files
 %defattr(-,root,root)
+%{_libdir}/httpd/modules/libphp5.so
+%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
+%config %{_sysconfdir}/httpd/conf.d/php.conf
+%{contentdir}/icons/php.gif
+
+%files common
 %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
 %doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
 %config %{_sysconfdir}/php.ini
-%{_bindir}/php
-%{_bindir}/php-cgi
-%{_mandir}/man?/*
+%dir %{_sysconfdir}/php.d
 %dir %{_libdir}/php
 %dir %{_libdir}/php/modules
-%dir %{_libdir}/php/pear
 %dir %{_localstatedir}/lib/php
-%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
-%{_libdir}/httpd/modules/libphp5.so
-%config %{_sysconfdir}/httpd/conf.d/php.conf
-%dir %{_sysconfdir}/php.d
-%{contentdir}/icons/php.gif
+%dir %{_libdir}/php/pear
+
+%files cli
+%{_bindir}/php
+%{_bindir}/php-cgi
+%{_mandir}/man?/*
 
 %files devel
 %defattr(-,root,root)
@@ -565,6 +590,9 @@
 %files pdo -f files.pdo
 
 %changelog
+* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 5.1.4-6
+- split out php-cli, php-common subpackages (#177821)
+
 * Wed May 24 2006 Radek Vokal <rvokal at redhat.com> 5.1.4-5.1
 - rebuilt for new libnetsnmp
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 11:07:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 07:07:44 -0400
Subject: rpms/php/devel php.spec,1.112,1.113
Message-ID: <200606021107.k52B7i9Q020684@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20660

Modified Files:
	php.spec 
Log Message:
- add php-pdo-abi version export (#193202)


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- php.spec	2 Jun 2006 11:02:55 -0000	1.112
+++ php.spec	2 Jun 2006 11:07:41 -0000	1.113
@@ -1,5 +1,6 @@
 %define contentdir /var/www
 %define apiver 20041225
+%define pdover 20060409
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
@@ -133,6 +134,7 @@
 Group: Development/Languages
 Requires: php = %{version}-%{release}
 Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
+Provides: php-pdo-abi = %{pdoabi}
 
 %description pdo
 The php-pdo package contains a dynamic shared object that will add
@@ -174,7 +176,7 @@
 
 %package odbc
 Group: Development/Languages
-Requires: php = %{version}-%{release}
+Requires: php = %{version}-%{release}, php-pdo
 Summary: A module for PHP applications that use ODBC databases.
 Provides: php_database
 Obsoletes: stronghold-php-odbc
@@ -324,6 +326,14 @@
    exit 1
 fi
 
+# Safety check for PDO ABI version change
+vpdo=`sed -n '/#define PDO_DRIVER_API/{s/.*[ 	]//;p}' ext/pdo/php_pdo_driver.h`
+if test "x${vpdo}" != "x%{pdover}"; then
+   : Error: Upstream PDO ABI version is now ${vpdo}, expecting %{pdover}.
+   : Update the pdover macro and rebuild.
+   exit 1
+fi
+
 %build
 # Force use of system libtool:
 libtoolize --force --copy
@@ -592,6 +602,7 @@
 %changelog
 * Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 5.1.4-6
 - split out php-cli, php-common subpackages (#177821)
+- add php-pdo-abi version export (#193202)
 
 * Wed May 24 2006 Radek Vokal <rvokal at redhat.com> 5.1.4-5.1
 - rebuilt for new libnetsnmp



From fedora-cvs-commits at redhat.com  Fri Jun  2 11:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 07:35:46 -0400
Subject: rpms/cdrtools/devel cdrtools.spec,1.46,1.47
Message-ID: <200606021135.k52BZkdS010032@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9991

Modified Files:
	cdrtools.spec 
Log Message:
rel inc


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cdrtools.spec	2 Jun 2006 09:20:47 -0000	1.46
+++ cdrtools.spec	2 Jun 2006 11:35:43 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a09
-Release: 2
+Release: 4
 %define tarversion 2.01.01a09
 License: CDDL
 Group: Applications/System
@@ -240,7 +240,7 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
-* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-2
+* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-4
 - corrected multilib patch (bug #193796)
 
 * Mon May 29 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-1



From fedora-cvs-commits at redhat.com  Fri Jun  2 11:40:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 07:40:55 -0400
Subject: rpms/cdrtools/devel cdrtools-2.01-xconfig.patch,1.4,1.5
Message-ID: <200606021140.k52BetmF010819@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10766

Modified Files:
	cdrtools-2.01-xconfig.patch 
Log Message:
fix for powerpc

cdrtools-2.01-xconfig.patch:
 xconfig.h.in |   68 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 24 deletions(-)

Index: cdrtools-2.01-xconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01-xconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrtools-2.01-xconfig.patch	2 Jun 2006 09:20:47 -0000	1.4
+++ cdrtools-2.01-xconfig.patch	2 Jun 2006 11:40:52 -0000	1.5
@@ -32,12 +32,12 @@
  
 -#undef HAVE_LONGLONG		/* Compiler defines long long type */
 -#undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
-+#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__s390x__)
++#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__)
 +#define SIZEOF_LONG_INT 8
 +#define SIZEOF_CHAR_P 8
 +#define SIZEOF_UNSIGNED_LONG_INT 8
 +#define SIZEOF_UNSIGNED_CHAR_P 8
-+#elif defined(__i386__) || defined(__ppc__) || defined(__s390__)
++#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__)
 +#define SIZEOF_LONG_INT 4
 +#define SIZEOF_CHAR_P 4
 +#define SIZEOF_UNSIGNED_LONG_INT 4



From fedora-cvs-commits at redhat.com  Fri Jun  2 11:42:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 07:42:56 -0400
Subject: rpms/net-snmp/devel .cvsignore, 1.18, 1.19 net-snmp.spec, 1.75,
	1.76 sources, 1.18, 1.19
Message-ID: <200606021142.k52BguQK011415@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11383

Modified Files:
	.cvsignore net-snmp.spec sources 
Log Message:
- update to another prerelease (fixes perl agents)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	23 May 2006 09:04:55 -0000	1.18
+++ .cvsignore	2 Jun 2006 11:42:53 -0000	1.19
@@ -1 +1 @@
-net-snmp-5.3.1.pre2.tar.gz
+net-snmp-5.3.1.pre3.tar.gz


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- net-snmp.spec	26 May 2006 11:47:39 -0000	1.75
+++ net-snmp.spec	2 Jun 2006 11:42:53 -0000	1.76
@@ -5,8 +5,8 @@
 
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
-Version: 5.3.1.pre2
-Release: 4
+Version: 5.3.1.pre3
+Release: 1
 
 License: BSDish
 Group: System Environment/Daemons
@@ -37,8 +37,6 @@
 Patch25: net-snmp-5.3-ipv6_retrans_ms.patch
 Patch26: net-snmp-5.3_vendorperl.patch
 Patch27: net-snmp-5.3.1-multilib.patch
-# config fix, lib is 5.3.1.pre2
-Patch28: net-snmp-5.3.1.pre2-config.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -145,7 +143,6 @@
 %patch25 -p1 -b .retrans_ms
 %patch26 -p0
 %patch27 -p1 -b .multilib
-%patch28 -p1 -b .config
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -346,6 +343,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Jun  2 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.pre3-1
+- update to another prerelease (fixes perl agents)
+
 * Fri May 26 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.pre2-4
 - fix lib version 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 May 2006 09:04:56 -0000	1.18
+++ sources	2 Jun 2006 11:42:53 -0000	1.19
@@ -1 +1 @@
-0930ce05346508de725613d4abbf8b04  net-snmp-5.3.1.pre2.tar.gz
+0e593e2fad7f2a0432a7c9548c898f35  net-snmp-5.3.1.pre3.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  2 12:07:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 08:07:59 -0400
Subject: rpms/m17n-db/devel m17n-db-indic-0.4.2.tar.gz, NONE, 1.1 .cvsignore,
	1.12, 1.13 m17n-db.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200606021207.k52C7x9k000613@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv522

Modified Files:
	.cvsignore m17n-db.spec sources 
Added Files:
	m17n-db-indic-0.4.2.tar.gz 
Log Message:
Added modified as-phonetic.mim file as per RH bz #193849



--- NEW FILE m17n-db-indic-0.4.2.tar.gz ---
??(?Dm17n-db-indic-0.4.2.tar
?
,?`co??????????]?kY????e????}?>????????{???{???}???N?'D??p???????l)@)W??Qg
"??_*8?\]?ow????pusq????.t??????Js??])???eK ?"`?`#??^????COO?g?
99AL??-??0??2?(O???$PwM????d?.h?C?P
???P2,A??d??d/?F(???R )8?$u?|??.Jg?8H??? ?H&D????O8$z??????$??B?\?N??@12!?p%"?\???#,?:CL>??jJ?h?M.????;?PH???Xw????%?A??R<5H*?8?????p$l???%?]?9M??0$???l	p:q?BH'#RT?pd(?6
????E??@?????2?<?B(,H????RpP,?%l>%??.?pa????c?Rx?9?0?J??+P??g??H?	?8/??`?0Dw???an?f*????l?	$c-@??`H????|=??F????}???p?? ??p????P??eE??B??D(????M3tL
N?	W?@?G?gp[??????M???a???X??c#bb???h?	E1?c??????PT\tTdL?3??p?S????????@f2??????D0?R?E~2?c??`??0>??L??G???+??"a*~?x?3???l?:B?L T??
?b]?C/?? {k+kh??nN?vkI1A#p?D?=
?%?I????&??^?zY??R??????$7P??>?
Q??????'??9)??`
mzOl
?? m??=:}Yv??dO? ?'+?t??	 ?S???p?ZZH?Md?ZL?M?
S"Y???Z7?,?edQL??Y;F?e??D????*3??l2Y??%???d??$?l???!GDR???'??d??$?)d?D=R???E??<??!?3???W??K2??e)???????'??$E?S?{?=b?u??O???^??$rh?A?z??????????
?
????V?V??8km?2>???^?z?~??
?vq>????'?&?????b???????f0?6*???
|t?)?WS??}?g1{D?????V36}{?}{u?z5j??????$gcb?S?sc6?AKZd????????????Y??[?????e?\?rPtA??q?v
???0????QU?
????
?U??Xy????Mb?}f?<7'??gw?j?f???hy????r??Zul*???h??3?at?5??L???Fu??Kn9??W??W?V9,?<??h???l??2O??Q??{1>}x???^???.????]`????l?f?????U??????6
?F/????#????Wo?7????????|;??"'?d[??'??????|a??!?S?Q[????y??mNUx??;???y???Z1WUX?h????G)?y??V?h????1;????,?h??*???<???p??y?L?8????e?0???]B?]-????l??d.???????c??&?v~?h??A?????g$n3'HZ??d??????lLN?agi~?'????w?P???rv??
??Mj????N??????t?????W2nf?t
??Uv??n?Ro???_?9??y?C1???#K{??????Q???ymx?W3)?|G5??\5?g?S?M|?(s??????Y??W?N?x?(?)?y???n5<?/?m?K????9,6?:6T??????????(??vL???????_M????X???l??????5????)?b?:???[???e`0?q??????G?Q??????YZ???_?1???????6?Y????E[???????'<t9?i8?h?B????????g??H?k??S??:?????????;}?????dS???;??+???z??)i??iF???D???????????MK?`?riR? ??F??????9??#ax"?E;???EV??_?n?}?K????8???J??
?N=?z???
???z????;?Q??1???4????S?.?i????U8?t?c????s???f;]????D?.0<`d??tM??
W~t:v%?c?8???;???_I?S?R??f??N??<mzaG?0%?%H???z???7Kkm??r??????z?????VE??ZI?.??sw??r?
	??g??7?
6?u? ?8?l???Y?/?(???ip@?????????X"?`?9F??7??.t<??J???t???pw??????i?5????????s????=rn?%??Sn????????{??????.???=|?~I?~?~????=??P???????.T:?g???????l???9z?????????????c????h??h?>?
e???>???????A?n?%f???k?3F?m??i??9/.gR3?!?1vX	9E????j?>???a?K???Z??????k?8w?d?O????Q?`??b?z??pz?7?!o*\?~?)?
SGy+?????N???t?F???4Ff?T?B???????e9|??l??]??R?fk\?l????e?e?y?u??K???Y?S?L?}????>???w?<X?|?Z?9?d?????Z?1??&+??????l?????_VT?$??????m?To
]?e???=)??e??????M??t???:C?[Z/?????&/"?2J(???Q??M????r?n??/?????
??Uc5?"??????NQc??/??+??$???u??????IeV?<?z?Z??J???>?H?&U??9\?@?M????F?\s???y??F	???N{zO??I??????J??M??W??Sg???5Kr??Zh?W??q??S???<??#?q????o???'
???g>???B*??h?l???H4??ZS??3?????????l?^?<e??[???~?*[??1??`C?G?W4???O???&+???e?<???p??7??<Vd?
???|?u???&#??{?U]1U?Nr?4kt?=2IG8???z?'V???W??8?(????????'?????:???_?_??+?:???????IE?NE?>?{w?????/#??_?h?Sx?^?w??I??wl^qc??G??MC????S?7D??9?_gc1?o5I^?/??????U?UC?"?????!???=????j?Q`Z?y??Y?tQ*?mj??3???6?O?a?Zt??CM??????????v??????j???
??r?dF??L?mzJ???+?f?????&z?-??#???V7?q/?-s?0??b????:??
?4???s?mK?b`???}??????9????}?>a??	Cu\nH??)??o????7D???]R?t???????*??se?????~?qO????e?Bwz????-???W!??*???[??~??`?}???Sk?????mfV??{???????g???????U\???????88??G?S?5?/j???[5l???I?-t???s/}h?H?'}???(????\?x????????_?2?:???O??????qz)k??*???;?	,??????71??V??1V2?v?Oy?a?u?O??l?3?U???r?1??Dz?I????????m?6f?-u'w2??????`;??_??V????y4U{??q2G????L??????
2U?L!???2???*c???1O???LM????N%4?h0?~j?????????}z??[,}?^????l_????f?;?i?????|?X?????P6N?w?g''?=2??h?^??????7&n?|??n.?cN??x??{I??]??+Ki???????????H8W?+{?{"?kfy?Fa0?&yo?????????D??????????"?J?????xf??h?q
^??#?}??-8s???}??I?gth`2??8????????????????????/??~??~u???_;o;??#
?oO???.r?"G?p????	????|???S3??L?L%??L?L%gp&Cp&?
p&?b??M2,6???$/ ????????~?~jU?h?t?C??	???1??Q"?cr?c??c??1
???v?F
;&?
?c4?1???v??
;FS????Y???t`?h-?c??cr4?c4?19?1z?19?1?m
??v?
;F????Q?c
?0
Ca?L?Q?L????x@?Tr?2??\%
p???7??
???????T????dE??????)_??%G???ZA|!?^????h#????wd^km??_????s????????`??!n
9???e???#??$????]5??8?4?y[?i?<ysi?h]??o?????);{???k?ua??????59??c?*?*~?????jr??,?{?9C?????6?bBS??>l?^?O?w??????z??8????e?????Tc??IIn??K}?v??x???5?7?X3?+?&?J7LNOq??????eJ???2?>??N??z????<?3?y???z?M?=T?z?V%?I?b????s?z????zw?n|6????????s???.{??v?$?	?? ???{???mu????????????P?.?O???(?(^/???i
?.?&????N?p???y
???????W9?(?UQ?<?q?V??4??s?
Z{???R?hVZ???2??
??z??u7?:??dX??D?7VKeu?R??9.?r?8S<#9?z?&??r??X-???P????~;?w???b????n???K??S???z??n?????{m?eMu$????)N?uJv??>?Y??z??????m}?:??4^g?h???[?????&?W?U???,????]??P?t????????<????5??=?F??0P???UE?,???EUy??z??rF?{?{x???T???*w?!o?r+?}u,$?q???!?w??????v37f???k??S??????P-)?K??x??Gq???v_z?B
z\?K?JNRz?~??!c???e]??+?t??????q??N??? 
??3???3???~;?~??!/??B?T?[W??u???T??<K=W? ?v????>?|???N/?1M	!C?^???>?@??U+j?+?Z?O?h?p???F??;6Jh?}h?+???i?JR?9?i%?????y?p?k2W(&ut?u??z?:??*b????a?????????t`&,????G?dM????F?=????????tfN+???[?p??'?????_?4????f/??-?-?g$?q?f??X?1b?n?igAG??+Q?w?u?e?D?{??]??????I????J8?????>??????????i???Z4?Es??2??????[?
Af3??P?vB??ZdM????O?PHEk???
????;?d?|~&Ag?\?!=z at O3???	??_????W???g

T???K3?=G ??AW<
??w?????wq??k,?G????8?o???-???`???I??+?????t?????epb?l.?`??.?5`?1??wa???v??U?w"Qb\?H
??%?OY6S?B?CX?Ft,2?????????IY??|????6?????????U???t{;N?O?j?0z??????Y??E?*??#????p??s??????\????;E?i?%??Y?dh?y??23?<????<Gh???FWF?N?B?mbTM??2U?)]?#???Lo.|\??q???s{b?(??9?x?0???????L?s7dhN`,?J???????x?????xj????`K????>?U2Uh)+!???Y??????????x@??G?u?-????????k????????1???q???h?
)??j:YQ?2?j7??Th	&oYM???1??1?yfi???{tFY^MDc???????Ux&J???'??j???
?V?r??E??g??e????XG????L????w.C|J??,??t??????f?%7V{?@????n?????;?? ~??(U=3??L`?????j???_n???v??Q??h???K??.>??k?{o?LJ{????o???????u??T?????hzzf7y+?b????????.r?suX???<?a?J????<mG??(??}??]?A?
????Snv?,L??u-ik/???3j.???????}?b???w????V????-hs-y??A?;v??G?_\o[??qsVA??J?^????$??s?b????i?V????9TJ?yhf??K	?~?1so??)?n<>^????uK??z??C/??L?J???4??m?????yLk??i???/?$???????
!?r?w?n?"??m?S9?:W?e?????O?l??*--?_p
??<,{g/?????=#??_?S?#={??^?[??
;??dM???'K[B????_ oW7?????(i~??i?+????iP?Pk&r??h	}+?_??a?j?V????py6a?????h???=????5+8V??^?0+??:?i??7+?b?F???Yu??Yu?,I%???4?W?3?-??\??m:
M?K4G?????Z5L:?
????j|??????e???Eb?????71??\&??dO?>-+????K???Q??+W??^???N"6"?????]??V?6????m:??????????X??[??3??
????k?Y?F'2???????}A-N~????9>???"U??H???5??/QV?<r?9T3?????????g??t??Mce????Y???q]???)Z??F??=1?Z?I??u?d?#O:???nm
k????)X?????*???Iaa??Q?0?????5!???~??:?U??/????????4???e-e??v,??/????y~????J?2zT?<F??h??9?>2v?S?-??E7??k??e?zj??)?,VZ?5xb??j??>????'g?><%?&?v?3?9?b?????wa)!?Ij?u??.=??M<?g????E?7%?~?0j???2|??6???`/1z12??????p???M?????q??????????~>??S~~u???s??	???????>????????'?Ol>I??$-@???{OTcTcTc?jLZ@?I??D?=?{?`??@;&????'	???=?{"??$????'	???=?{"??D`??????'{O???=?{"???{"??D`?????{O??$?{"??$????'{O??$?{"??D`??3F`??@3F?#??D`???????D`???????I???"???8?(???i???S??D`??????'?O*r	?2?O*Rh??'?Of??>?}"??O???
???I???}"???b~?AFF?Oc_t?H???/?O????>????G????
?????????U??q??K?k?{?i???%??-9??E??)K???C-C???u???I?w????i*0?Iz????is[/2R?X,I/??ml-W^f?N_~?X????
??s?o?.?l?????=?_u??C?????'??P?????o??d~?Y?_?(I?C????
6???Z6?4?FT????*??I??3????X!E(?dM!???4%?????6#}zy??Wmj??)?p??w?(????f?.??S????k??????h)????T?<N??8?2??#?Sb????:s??j???4/?????V???x1>d??????Y/????:u?WP???p??`d??/??????????M?mp?s?F???*?,?8???2???7mH5?z\C??L?iI???Iy???L4m???=????x???????????K	kdJd???"?,?Xf?0?$KD?X?;?m
?"?[?D???k'???~?????{????>z??x???q??9g???<?y?^??????3W?G)I_?????#B4?s???J?x9???^?????LB??m?
+	Ill???idp?{7o???QAwT)?~w????	E,???t?xTt$^!1?Rv??v:F??S??m??1?N??????????b?????'???EWfz
?P?	??5Wb5>?????????yP????M????&a*it"?~??{Le???J?z"\??Yv?X???;???
%ao?}????k????T?K?d???l?(f?g?j?4???l8q?2??s??}???rai??iN?[?fN(?b\F~??Y?wbW??	??yN?????????.?0???T?HK?7`>R~%Sj?oCq???????!`?*\?<??
?}????????*???V&???a*Y?`????????'?NT???e??|?>?k(3??`??[L??&??QH??????5???????U?????s'????]1???n?(?n???+b????N{?[?#?t??n?y?????B-??q0?d?Pk??????????????=sF?f?Z1?V\Yl?J??2?%????'0?l:??;?????AL?:?j\?Y??;sK?{???lq??1t?5???o?(??? ?????z??KZ?q?4J:??J?????YJ??f?+	??????\??Z5?=????*?????????6??9{?yX"FxSS?
T?}m$?gW???????z_?_?/0???vD?0?0}???]??=?w?W????<h??~F?\<kz?Z@?????u?;?p?s???<?VA???*?>?}COQ?|???k?Fj??????G??X????41??3?r??m?/?E?Zc9?%b?????
?af1????EZ/??<KWF??E?V??H?$??$}????M????yLs?Q??x?5
Oj?B ??-?c??#A?Xq???O?|???7r????A]?9????
???X???????q??????N????W??GN??????(?G?????????????~?W??????(o???M??????N~???????4????_??W???R?E?S??jy??
?????G3??{c8????wn=d??J?0????hF??y?"F??????????"??fQ=??4*E???i=r?????0??G=???i???GwH?BM?-?|???w??*B???9Su^??u??????i??n
??
?.??4???,C~???6i??0I??>?<m#??h?M??n?h`?<?m??%?lf?????
7A?jD?^?2?te?/~??4@#????G???????????e?EbC??3d1)?|'Oj??HY??j<?pJS
??0m<?~??"v?	{?R
fC?`?
x?j?YI?S?k
????l|???@?9??
&??F?????????????|#?????C?	??"?C??J?|?R?????si~?n?j???R?G[^?7)?'????%??N(??q?????~V?k:~????}ok??Wb????2?????sQ????4?rx??\?
??=??T????????????&???e6?`Au????~?0?@v?S??h?.?!2Ns??,?????5????V???u?T\?8^L!;h?j???q;??T?:w?q??6J(?f
?D+n6????*W=??l?[5$T'?`7??<?Vg????Z?_???????_?????????????????x?? @?????~??
?G?????-???????'?s???3E??k??0??oP2h@?`7&???vc?7?1???P?
(4?X???
?@J
(P4?h@??
?@J
(P4?h@!??B?
?@
?
(P4?X?!?C?
??1
P2(@!P??A

??
P?(@!P??A

?(
P???!?C?
??B?B?
??n???.????j?Wr.?S+?a???bc??z?Uk?>i?4G?UYjP??+????o`2T?
K??W&&?)??j9?B?XC???????????L?-h???5???
??a??l?&wee?i?????????w{????,zR??%?<]???????{yB?%_????Jq?U????????8??;???????>hW?Zx??/??0??#yt??}?!?????jO???;???R????????l?????r??tDmR?D?HM%??F?v^??v??</??c???E??5????
?<?{{???????????
??????>?????????~ ?Q?????????Gg>:?????r??z?_???????4???????????w??o
?~r?
?f??@r???D3*
???N??/r
??E????l at O???d???%??????FP9=@??1??M/6?
???h?????(}H?=?_]
??????>07Z
?F?auH| "???l
?!?~??07Z
?F?????y?O?_??;???K?????????????d?????iV??1?????c??V??8?0??2???=????%.MEGp?R??L`?`NX?hcny?)??MV%b??
?UO??fx?? ??????K"$4?,{?????????Y???????1??L|?A?M?S?+jMqNtFIyfF9I[?1g&f?"]\|3??7??l?????	8?????)?9?u???#m????h??Hr????E_?{???J???X?$?9?????5????\??. ???%F{?Q??u????Z?D??PH?\N?????)??%-9?K?G????????L?Wt@?K??L?????9i?.?/??y;??t
??;?a%?]'??K,?
?L<)Xq?+X
A?@???????J??(&??3?%??|,???????`6!???????LvR??B??v+?~?????T????????0"u???????*A/??????m?}????Z? t_???\??hS??3IjQ
E???7f?Wd?:m??w??w?E?>.?:?qb??e?????2?W??y?Sl?3??P)??gL??xk??:?Em2w?{'q??B?pF???H1
'$?}S?lu5:??{?d???w????!???2?c];E??%??G???
??X7jo???lc^X??R?1;?]??Y??NZ?DR???Cy????c??F?]x?????*??X6????=?m??~i??}?I????kg??8?J??.?W|?vMI?~????:l?????}????o?g
??9?W?oEV?]???V?O9t&~????pU??S???k??	9??5?-?E,y?wBb?????C???`????4.2b??r
y?co?Y??????"??d-6??41]??Q&?_??(xuu_n@?yV????=??b????K?(t???o??-yM?/??'?m?QO?2?lW?? G&p?~?&??l??ex? ?4j-??d'!??D?(??DX??i?tED?Ef????+!tL??_???SU????w????ME at s4e?N????	@*L???>??y?H?A??e??@}}
h??Z?H??l
r?M?w??;U??*?Nz???7????/?????W????(+??T?\??J??#???yB?i????)????s?ol??FW
???h??i>???n?wR<?m?.?]d?????????
Ts?';~.??.7(?????|??J????iq??q??????9V?n?~0???? ,E|??9x!b;?A1??I?r?Of?R5U+M??D?????????Ql?I??L-?,s????m??O?$?W??|X?D??^?m?q??J?dF!??????????;t??<?reX?y|?vw?a????5?g(?b!aO????8??"???%?<??V?$??*#[????T???????^2<*?qhV???zq???"??I'Vq??K?p??????m@??.=?Uk?q?????????@M?E????m?g?l1j?f?[?G1?????'?5!??N?o`??L"?+L[????s	??6?????k??j19??"S???U??gV??6]v???*????t3?C??????*???i?6?	?_??eW?X{????|SRB???????D?O??E?[???"?????u????.??????~fL
6*????????h????????WN??/?`?L?t?Z??[?v???]?0F?
?E??L?????Z??
x??eP???{??~.?y[??Wq????L????w??W?x??6?`??;Y??????(??&?zAdA?s/?3????g??I??%<3???,?vN?w???;Y$[>?0}?????bL?rN
]??<??A??w?d???IU ??%?w?m??R????,R??+?`}??Sn?`J??a?
?!???Z?l?\u???b?????ua~Q????????;?T+0wD;(?????G??]rZ?%?g???h?V??@0??>#???g?4?{????L????$7?4\;?????9d???4
?'l?????z6???X??h`?y??????z?????t?o????lfz???u??ad?|??_????????????\?_Y?~??A??ywS???????"(wA?????<????Na??y???|??7&????a?^gni9pOi??{"m<1? O4R?w?,?3P??????,?:q????????^?_???>7?|?KdI?_??h?3?(:7??G?'|9??C??9?
M???4?)???????????M'
MOM??fiZf?@?????)?????)?????????:?0???M_??;?a???A?D?4?64?*n E????t?a?y????????????(M5
M]M?M?M?O
?[???{{??%lZ?????v???(2T@???Q???$?ta???9/?'?b???? ?T>ci?t??x?a???????b~'P?:???=?	?????M
C8Bd????y??	??~~?==y>??2<?3?????"?~??b???3V6?%nn?????^?|M%S??????V?????i?O?
?l?%+???????IFV??-Hd\?????=,??b??W?????????^??g?????y???????????????????Y?
????M???3>?k?m????G=???1f????;?????~$?GD???.x?R??W3+?b????P;$)???Y??7G??`??me}'??Z??;K??`??6??z?2?_]*?BQi????hsa?Yg?v?2b????"????~?5??]??????G??E?JKF?E???/H?????T?u.]?J?>?Av??4?t??????$?B???z52?B?^?Gi?j?]?	??3?8??C???????n??W????p????a?gV?n??a???'??j??,??[?$?????ig??
????????
???????
??g???4
?@??l>?p??????_????i???
C
?*T
?0Pa(??P@??
?3???!?!0g?9C?B`?s??3???!?!0g?9C?B`?s?0g?9C
?3?@???9C,????!??P@????!?))?A`?s??3???!?!0g??3???!??b?^????$J!`<??@!??OI??&??
e??0!??M??	!0L?aBB lR??R??
n
?*`F?????o??????????????D????>?]???????(??]???m?????'?"K8-l????`?1d?
??*m
	U?i???;?"+o,?????b?Dg?<+I??,??^+?cE????9???-m?Eq???:u??}??_?N?????$x?9?MC?X?$??C??tp5????????S???[?8l?t?????{*??Cy?OM?<??x0?????&???1?y<?3?$1??h?J,g???????
??h?4???w?`?FR??X???.????t???rO_*???MR??[?
3?9?{??v???h??T???z?eq???O???u_?'??v?]?a?A%D?t??duF?69?4?8?.??D?????c~q???-q?J??r?V??'G]?p?SN????/??k?
v?????R?????W???du?>??G?????B????IAjj??kU??????]cC?????????k??w???G1.?????cG?R? .????&g??a?|???^M#??,??"F?????r=??^?????^?I??]??;?6	d????K??~D|??
??M=??IO?????b?e5??M??????Xo???z???VH??<Z??N?x????fa??????0????R???4????/0x$4c????dN????V??I1
????0?I????cH'????Nu?G???^??f?k
?D??''????x)G??N???????P;??Qg"???G??K???u?????[?f?d}?J??K??i9?k;????*??????kAxT???Nm?\?"?
??_
?
2????????????f?G????
??@?????	???K?oa_:?}??N??	????j'??>6??#?G?? ????
?????sD?/???m??l?w?W?h???T???U?Xj??au?:?"?|N??@?G???1???z?3i??U??`~Tk???F???h-D??h?>???? >????&]?,??P??Q??,T?
|?????????????ep?w??9r??t7+^?!?r??.?R??rb?X?????H?????F1????Wb&????3P;-????*9`%(?A?(^?9???1!?}??+&Q?c$k?
=?Z?Se?qIir?l?????:Im}?d?5\??^Ah??K?-??zd?j?{?ek???J????Z?j???N?^?D?K}???Z?=cx???Uc??]Ek??h
?l??*?w
???sV?????????"??w?p?D?|l??[qrg?L)?y?m??O\i?_b=^m???????|???!|)?g????OiA???????.7W$?????N?m?c?S???$?g??)?q?0tUa????$??5?~??????[/?Ecnt?_?!Jh????<?W?<QZ?
??????\c???n?e??????[????q}F0??q?[tL!x??cqy?zW??"??????a?c?\??xv????G9?F???4??j/??0R???=n?,}?????X?F?m$?z??A???????
????-~????P2???<????{?B??
???H??}??>?
????"ZZ?s?-Q-?????????o?x?K{???m:?A????J?ze2y??[{<?$?Z???C?j???!?D???u????J?L?j?I9?????????????K6hf????m*m;,??w;=?(???
)???}?,??????Z?FtY?0"?cY?Po?v?s[j???FM?P????xT?4O?\?	Q???8>"??????????b?M???p
??q28???S??????????Q
???i?Ld??
;?yH]????????1???p}ND?=</i
?/?????;%?M?V????
?ma???\L?@?G?i#???i?????B?N?????9?q????Ds???"Q??)????? [???	??{?&?H?????!&?q?o?*???l??D_?D?????U??NF69?DbM]??eL????y*<?8??5?[48LR?
?7g)?9TI?G?u?#??7?v??
????????2????sH/?xM?????;??????l7/??o??u?????6z??m^p
??J2???Xsl??????????gj?=????H?Q??t????6???z??S[M??H~X?P????2?????`????:?	?#_?/???6n?+?r???????!?zdI???????y???Y?t?/?X?f???(@PD?+????'??,???{X?y?????$??NK???!?z???il????5fF??rjFR?C????)?z?I,???)B$9.?????|>?7????{]{?=??????^?|??57??|?so???4cr???=G???
t?3??i?????????<??]?Ze????m?.?LB??<?i?????"???v*?????}B???w?l??-uA????4?????9+??l?Q???Y?}??V???-~??@7?mfQQ??\?Q?\m?o?r???g????m???{??t??0??F?????v???????????g:?L??6D?n@?5*,??6)????????/???=S4Mwu??/?????s%?,e???M?;(7?????q??.\??????Je??&?%???oWzv??F
??Z?????y?^]<?=l?Q????~.??g????O?|?B?N???-U-???j?5o?8?}?nb?????G:?Ry?T???;?b??/~4N???-???q????????WV??K=+??}??C?_???k7????o???6=-?r???????jo???DG_3???????=vu?J????RD??
??e=V?? W???7p???vFI?0U?????z?????
3V\jq?)??????%?K??`VF??'&|?5??Y???$?UH?Oa???~??0??E|P?ck?+]??K?oZ??&F??
?m?}?"?Y?N???th? l???:?W?3s|beIt?????????Q??r?.?ts??N??????.	??0?g?cD??K??cG???????????????????|?^??/_vYQ????p`Ne???????Tn1?<;??????i+??g??~Typ?	??v+??v??2t?????C}N7W<?????4?g????b?x?]y}.?"?N?W???n????F??*o[^Ru????;.
?=??vf????=??\???&?7??????i????*??????]??
?6%????D1C??5w?r?p?A????y>??6d??Q???u?q????{*?(???C????<??_X?>'???E???u??????=H4R	{?On4imu???o?-????????????????F)?'g????t9?`QY??[n,8|6??|???#;??^?&?8h?)???K?<??n??c???"??????<?n??_??????~?K???Z??????v?\??=??am??R??+????b}8????c?/Y???^~-)9??p?????/?3?????????@?????k?J???K??????s??????????
3????:?9????$???7???=?3?!?u?4?4?=??]S??+g?????-?????2zf?M?Zr?)Kn2???LYr?)Kn2e?M?Zr?)Kn2??L'q#?b ????Y?4??GK?a??E??A?Xb?g?g????????h??P?]???D???R-???%w?j??,???%w????R-??t$1?f???,??Z?8<>?I??H??H?i????M???t9???`?z{I?&?,?L
-?hZ?|4??x4?Dn=?F??Ir?<I????e???,?XZ?<I??'?Y?$?b??????????n??j?'??9u????'???????v>??Y?????????v???????????A??A?$??????*?Y???_???m??m6j????
.E??5??S??H?qZ?????]?SW7?z???x???!?????????=?X?|=????9??eU?????dEN????|;??)??S?U?p????????r?t?x?????/
???o????6o?Hn?k??S?&??:????
????????5??f[[?Ba?{7f?o?
?3?lX????v3?%?-?f?,H6?,??????_T+?????][^??w??W???k?l????/??MS????>???d1Yw=???:>
??aH??????J?x??Zo??7????"????????+???]???a?#??Qc??=T7~m??E??}a?m[??E??=?%?|?????On??@??\?a???dw?????&3?????@??????gmJ???$9=2O{?????y???6N7?/??{????u.??t????W??M^i?7?,??5??6?????????????<//????59????={l8?s??3???8d??PXz?????????
?t5???f?c[??R?8,y??????#?;?M??4|??/??????-???Q?'???b?_???[?|???	K???^ ;c4??z??
]sK?t??????t???.o?4????W5????I????2u?}i???)?5?^p'y?x???????<:????0??*???=?????1?kP?o4?j???)Esz?M?6?V?Pj???????l????7}9?2???Z?8o???-K?(*?lr?@d????p??w????!??i???	,???[V???G??B??6V-?;j??????4??t???g?<=?????iu6[?x??o6^s?????nE3?`????????yF'c?imn??*????@;??|Qt??G????????3?l?z?????n???T???0? ????YD`??I?
a?^???????{E??3?6?????i?Y???
??s??4?0
W7?n??+?P???.?y?4?>n?l???w???x5m?z????O]?<?5-?g??'?????=xl??|?C?a?\SYX??t??_Vo?lf?6~???'???^?|p?K??????g?=yZr;???????_UN,???}mpfT??2??qU?
??sO??SF%E??7&?eZc|0!???????9_T?.~gX????zU??w]t??'jc~?:???&??????'???7N?^VP??2???<???&?t?}i,4??????xM????????????1??=???|?Z0?b??5???]????O???_??????b_????v?,?:???y??????:w??M`??q???????G??14?>???????????ll??io3????????????q???????ko???0yk???gM??p??????????5?c?

?9I?
??9??
??9I???+9????
!9??IN?????~[U??JR????M???T?Q???@??-?9?	?uu???o?S"??
??P?Q? A;_%
??u???%AI_9H
D?R??*??????z?tE%UQIUT??TE%UQIWTR?TE%]QIUT??TE%]QIUT?e
u????rx_?%??????$?q?]?
?T at j?????$
?p??t?+M.
??
?C
?|?JT j$h*?D?AA?p???0?$(*?AA?h?BJ\%TZQ\????(?*???b????(?*???b????(?+???b????(?+???b?b???-\E?|7?C_q???O?D???<??@?(H??CD?D???<\)apIP?C???<??0?J????$?????m??/??p????&)??#0?*???Rs?????&	??#4???]ibpix}???b8B???_H?????u?????oB???n?
??)???P?0_???	???(??hP? \?+%.	J??AbP? Z??W??[?Qf]?c??TH?5?&*e-Q-e?????D??Y?h???UTf?J?TfME?%???ZH?UQ\VCnP??fp|J? : ??P?Q? A;??	?	?)\)apIPR!?AA?h
!%?*?
?Uf?-???,?,?O?D??????@?(H?,XD?D????])apIP1X??????0?J?QZ?bC????W?r?"??HAt(@?,B@?
D???"D?H at 4(H?,???#? 1(H?,BH	????!u??Ua??>!???\?>%R
6P?Q? A?%
4q???%A?9H
4R??*?bP??*1?6? }?=\? >%R
6P?Q? A? %
4r???%A? 9H
4R??*?bX??*?1?6?0}?}\?0>%R
6P?Q? A?0%
4s???%A?09H
4R??*?bdds#r?Z??b6?,?O?D???"??@?(H?,RD?D???"])apIP1R???"??0?J??^{??????]_q/???O?D??????@?(H??]D?D????])apIP?]??????0??X???lW??!??z?+fq?<??HAt(@??S@?
D???<E?H at 4(H?????=? 1(H??SH	?????:?A??0?.U??????O?od?@?M????????ED?oa$Hx??J	?K??9?????VEH	??????vS????.< K_1?k????"??
?????q?1
C?fV??'?xcA???GR G`?{??O=R
?9B???s?z$
?p???0??>????????O???}r?w?s?z??rc?g???\V/??0???????S"??
??Q"
?? A8/WJ\?????? A4/!%?*?????*?_?y???l?e?"??
???????\???7Pw?SG???????6
?#n>???????,??ccC}???????????m?&7{?W>???H??????{?7}??>a??????Z????c???;??-?c??w???e?LZ?s[5m??p?Ov???.??/&z6??r?9?????_8??r??????r&???Se?????F?-?y??)????uC3?????J??2??;Q?????S?????G?|?}\Dj	??????QU	E?x?????}????L?DmUwlM?mm%bk?j?U[l}?6??j??i????????}??????9N?xN?????R???|?I5?Inj??8=????7??O
W]????Ig^?|vSA?*5?i????:F??z????Ma/?>?????Q?W?|~e?????Y!uw?/??v??????]|GkM?z=?^??}???O|?Y?+??????????????8??k5?F???m*?>????
?s7U=?2$?????o?'?????*?MR*mZ?;????o???9??\Y????.n?-?????e!??,?w??????[5?
F6????T_??_???XQ]Zs????G??9????o???g?sh??'B?D???.?4???s??={?y????Z????;?4???o?'????>???-?????
s~^???q???#???>q???w????jx????	?????Lupkl???{e^{??ok???????#v
?2??s~GNIA??O?????V?id??%?V??lm??????h??????G??=S?f???/?m?;????6#??a?>?fr?V?zi????.??
????2??i???y????g??zf?????/o?[???????4z ?zibT???Y1????u???????C????????"?z????????n|???????K??{???P[;?T??3]KJ?????H??mOL????1+MJ?????@?sn??k{!gXt??eG?F?????|a???v????1???u?<=?b????v?0ea?B??s??c?
;]??wR??g?x??g???:?dE.?W|3???wfd?uLh???j????????a?(2p???j?mCG,??[?V??i?st?x???W??sr?_?WVd?r'[sv???o?????X??R???????)?jz??35gM??{??=???????E??}??^dYgX?8??i?\??`c???????I5n?;?o????dYo6h?~???3??Z??????V?Z?o??<???????|+?T?e_?2?????E????U??d?kU???o(-~????z?????????S?????a?????????3?H?????O?Z:?;???o?^9??7r?v??~?~??vMw
?S???????(}?N??&?????Eo??~?h?^?~P?????y???&?!???>??\??g?-?vw?d????-????<??jO????v?m1??+
????sK&=#?|d???3?ffnO?
?9??m???7?w-?????zXv??e??'???????Q?????&;6?%??????|???K??bf?N?>X??w????M6l~???4?{??F?I?Y?o?8u??i??????????`??H??????jxRK?????Q??:??}V~????]C?m?|????_N??=?=???u?\??Z??j?^2??)?p??h??Mr???+?3k??M??W???#????7&?MN+?ps??W|[F_?Q2`{??????.?vYz??}?4;??w~?????z???K?x?:????;?.????+?sOw????!U??6y???U???!
 ?????w?<???????????;???????????)??/???p?#??/????W??????????????'???????xa???m??Z?Qj???+??y??76qb???6
???????
???&^l??B'?]??GU[?7?+??GddF??D??x`?.?????
??Q?N{??4???
?I??i?F\C??Lzq
eWF&Q3???[?;0???~??????L??nL????Lx?b
P??*??M?X~a?W~????5?lQ?????? ?%S~??S???+?C?????At\??)S?g$y|??
,??3?NA?????
?t?t?]??A?56?5????8?k??~??A?T????2??j?%;?????fR??Z6>5F<j????9(?S8(]?;(??w??s???3?E??J]??\t?ds?E??E???c]T?6??lvQ?U?????E??d??R\?	?tQ???????E???:q.J\.???.???(aLp=??tP????P???T^?*?y????????.,b??j7y??m?R?X?????K??d/?S?T???R???????K???*,q^
?^???T???R?????	??WC'?I:?Uj?DR??3???N??:?h??%VCg&
??*}?4T`?j?????bi??J??*??4T^?h??e?P?(NC??Jr
?h?5?'h???1e?IZ??Vj?BU??K??.??Z???h??(VK7&-?)?????i??n?R:YK?^0R+??H-?-}Z?z???3j?????BK
??:L?Zj<$h???	????$=?+?t3?????MO7?v=??Y?t
?>7?i=n*??Tr?sS%J?????M??x7U???F\
r?70?????n?UN?
'???NjY?;?????7?????J???Oj(??U??N?mj???????????X5???t?fV???LM7GV5??$??$EMw
?j?????7???;mTS8NM?A??
?r5?^????KP?q{N???$I?=?D?PI?=?DG?v??-??Jt?i????,???L??/?D?K????HtV)???O???G???Q?v?D?M?DmX?D??x?J?	??????$?}_F???|???}
???`?????O???~??5???????E??n??~?'K??i??;?H?????t???-??O??8??h~j'?????Sk4??o4??>?M???$^?
u????B????P????P??yM*?p??
e\,/K?J???R??3??T??d?5J:+/N??.?w?BaC7????
?P??x?*Tx| ??"?/'?P??	???z
?q^??

?xZ?N???*??@UJ:???+??R
??/??c?M?_q?X?p??c=?O=R?c'4??rDO(y????G^@"(??????m$?#QJI?J~B7???@$???w??Bh*yU??PX??2O??????	?K?_b*????DU(3y????i?R3Y????f?LB??+?@t???7???
}'/<?S.??g ?B???Oe?
		????!O*??!6v?!f?x9???1B:??3
~x???p?y????`?y??t???j?w??????W???/zy??9?{y???????????????????????w????W????7??????!?????(?????/?????6^????=??w??D??W??K&???W????b?7?$??g&E?s!9N:?????s`s?????\8?<N:??<.????t/J:T???3??C5?pA
9?=9?????3??Cm?py?9?:??W???3??C??p??:?	??`g?f??????v?Kwh????|g?????&?x?yh?q?.?b??z?y?th?i]?Q?'?(??%r`?????L^?t????????????kp?9X
2??
2L
2
?2?
2?
?2L
2?"2?
&2??)2L
-2?02?
42??72L
;2?>2? 
Bb?(?0?$?C?Cap???+?8???671????C?Olq??O???!?!v?sL
??aZ
??ah
??av
??a?
?a?
(?a?
D?a?
`?a?
|?a?
??a?
??a?
??a?
??a?a$?a@?a,\?a:x?aH??V9?Z??-0[b
????^??!?wB?8??.&'1????C??
??x?X?C?92?d?q2?d??2`e??2?e?3 at f?Q3?f??3 g??3?g??3
?
`+0?,?????
?
?1*?d???zz?LX???????I???sx???uZ???7?????d^b?A-v?rWQ4I[?i??ee?s??'.??uZQ????c?t<?X??|??~#&?7yC??7???|uo???s?'??	?}0=??zU?=\?^?????Vo??iz?{???o??(??_??????????AWf?EWK{?????Y??Z??r??)??u?~9v??#?|=yj?????+z?Z???K??'????h??????m????????.cK?M3?F[o????_]??????Q?u???t?q??k{\Cbz????????????lT???[#?,5J?>y9yd????n??o?w?l?~?'}????d???,?[?w??z?>(?y?l?????k????,????????>?????????&y?!????q??5????}~???v?[t???;.Fl;7??????K'?????j*??
6?*??B?E?+=A??t???????*E??\?."??r?I??e????sw?<????Kf	??g?;???I?!?????X
??z|??L{I?1??#?
o?	?k?????q?????c?@???Cz'y6?T
H?8?I?T.=~??????Wd?W???\i?S??
??xI!RVda?)??????_3uO??#L1?I?OX9??????<8???{}>???Z??'?zfE_^?B??+'~I[J%h?????v?g4'*?{?????-G??%??????D9?:?'3?.?|?V?=c???S?j)?????Ue???K???9??
???~?????V?SH?P?W?????Lu????y
?,?25?_????

~8??v?NQFl??? ??J?e?G?dK??H?5:?2?GErc?Q???
???K/?m?c??I?\???u?%?J?U#?ub??Po????,??w????M?
f?G5n???"??K.n????????N????j|??1??,?(?|3?5v"??????
;?T?????-??/?????'?L!????????7cy?l????E1?i2$??? ??9??bmVQ???Bt_`I??A??fj????a??3?}	$V?{?T?4?vH
8??????1???i?'?a}??|eU?S?DLF6!?<?M?.??R????(K!???FI???????|??#??
??????V?P???~??u??????O??s?
??`?
????G???E?{????3???6??6???1S???????4N1gs?R???FJ???Y???\?I?]?9K=p??'????S?R?)?`??#?p?%UvQ?,???\4i3?l?,??~%????;g??^jp?[>
?8e;x?[?dA.p?H??Z@??bP!?????.?P!????b??
???/???Z?p+?`???Z
}V?7|?????m??????#>p???T???i#????)???H?$OV?z?J`????K??@??i?a?83????G?V?|!q??=??bPA@?\>???{jJA?bQ?Ud??G??????
??2z?????d???n?????s9"?;????T??????f?/:!k}?N?m(???
???>?iI?U?!??b???????x???y}?T?O?&???/?tF?*J?5`IM+h<??C??????,s?8????:???ZWJs?p???C???u?Y?x";???%u?I??A
1Z??3o???=Bf?????R?x?P?????6?E?&?{M?%?????K@??U?????>m??y?????|??Gb??/????J?	h2??L???F^R?C
8??<?<O?f?
?2v???wQN?.]??Nib|?r??lGA??????
??c?7N?vlIC|?????2!????????=S?(p nBE'O??C?R?|??i???`???c???A????k???.W?Qc1????bF%???\????????E?5?nvw?B??E,a)s?o????$??vL?"~}_?PE?m?????]?,shj?Jt<?No??O?0?w\?<4<?'f?K:?????"???3?
?Q???B??
??????F8a?Q??
"1?????|?(????t?O%??.?~s?.?S$??x??[;S?+?Tv??}r%-
!??U?o?<J?8p???8p???8p????/??k???

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 May 2006 12:57:16 -0000	1.12
+++ .cvsignore	2 Jun 2006 12:07:56 -0000	1.13
@@ -1,3 +1,4 @@
 m17n-db-1.3.3.tar.gz
 m17n-db-indic-0.4.0.tar.gz
 m17n-db-indic-0.4.1.tar.gz
+m17n-db-indic-0.4.2.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- m17n-db.spec	29 May 2006 12:57:16 -0000	1.16
+++ m17n-db.spec	2 Jun 2006 12:07:56 -0000	1.17
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.1
+%define indic_ver 0.4.2
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -695,6 +695,9 @@
 
 
 %changelog
+* Fri June 2, 2006 Mayank Jain <majain at redhat.com>
+- Added modified as-phonetic.mim keymap, modified by runab at redhat.com for RH bz #193849
+
 * Mon May 29 2006 Mayank Jain <majain at redhat.com>
 - Added icon for marathi inscript - thanks to aalam at redhat.com
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	29 May 2006 13:12:09 -0000	1.14
+++ sources	2 Jun 2006 12:07:56 -0000	1.15
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-1ce99673e29949867ffcef7f4ce6a2e3  m17n-db-indic-0.4.1.tar.gz
+aabdc0b99c1f5ea63c1ebf3ce27c3266  m17n-db-indic-0.4.2.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  2 12:10:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 08:10:23 -0400
Subject: rpms/m17n-db/devel m17n-db.spec,1.17,1.18
Message-ID: <200606021210.k52CANdc000987@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv875

Modified Files:
	m17n-db.spec 
Log Message:
added modified as-phonetic.mim keymap as per RH bz #193849



Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- m17n-db.spec	2 Jun 2006 12:07:56 -0000	1.17
+++ m17n-db.spec	2 Jun 2006 12:10:21 -0000	1.18
@@ -695,11 +695,11 @@
 
 
 %changelog
-* Fri June 2, 2006 Mayank Jain <majain at redhat.com>
-- Added modified as-phonetic.mim keymap, modified by runab at redhat.com for RH bz #193849
+* Fri June 2 2006 Mayank Jain <majain at redhat.com>
+- Added modified as-phonetic.mim keymap, modified by <runab at redhat.com> for RH bz #193849
 
 * Mon May 29 2006 Mayank Jain <majain at redhat.com>
-- Added icon for marathi inscript - thanks to aalam at redhat.com
+- Added icon for marathi inscript - thanks to <aalam at redhat.com>
 
 * Wed May 17 2006 Mayank Jain <majain at redhat.com>
 - Added following keymaps



From fedora-cvs-commits at redhat.com  Fri Jun  2 12:12:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 08:12:01 -0400
Subject: rpms/m17n-db/devel m17n-db.spec,1.18,1.19
Message-ID: <200606021212.k52CC1m3001256@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1151

Modified Files:
	m17n-db.spec 
Log Message:
Added modified as-phonetic keymap as per RH bz #193849



Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- m17n-db.spec	2 Jun 2006 12:10:21 -0000	1.18
+++ m17n-db.spec	2 Jun 2006 12:11:59 -0000	1.19
@@ -695,7 +695,7 @@
 
 
 %changelog
-* Fri June 2 2006 Mayank Jain <majain at redhat.com>
+* Fri Jun 2 2006 Mayank Jain <majain at redhat.com>
 - Added modified as-phonetic.mim keymap, modified by <runab at redhat.com> for RH bz #193849
 
 * Mon May 29 2006 Mayank Jain <majain at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Jun  2 12:26:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 08:26:13 -0400
Subject: rpms/cdrtools/FC-5 cdrtools-2.01-xconfig.patch, 1.1,
	1.2 cdrtools.spec, 1.43, 1.44
Message-ID: <200606021226.k52CQD77020496@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20463

Modified Files:
	cdrtools-2.01-xconfig.patch cdrtools.spec 
Log Message:
- corrected multilib patch (bug #193796)

cdrtools-2.01-xconfig.patch:
 xconfig.h.in |   68 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 24 deletions(-)

Index: cdrtools-2.01-xconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools-2.01-xconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdrtools-2.01-xconfig.patch	31 May 2006 08:07:55 -0000	1.1
+++ cdrtools-2.01-xconfig.patch	2 Jun 2006 12:26:11 -0000	1.2
@@ -1,15 +1,19 @@
 --- cdrtools-2.01.01/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
-+++ cdrtools-2.01.01/conf/xconfig.h.in	2006-05-16 13:06:50.000000000 +0200
-@@ -5,6 +5,8 @@
-  *	Copyright (c) 1998-2003 J. Schilling
++++ cdrtools-2.01.01/conf/xconfig.h.in	2006-06-02 11:19:00.000000000 +0200
+@@ -418,28 +418,48 @@
+  * Byteorder/Bitorder
   */
+ #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
+-#undef WORDS_BIGENDIAN		/* If using network byte order             */
++#if defined(__BIG_ENDIAN__)
++#define WORDS_BIGENDIAN	1	/* If using network byte order             */
++#endif
+ #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
+-#undef BITFIELDS_HTOL		/* If high bits come first in structures   */
++#if defined(__BIG_ENDIAN__)
++#define BITFIELDS_HTOL	1	/* If high bits come first in structures   */
++#endif
  
-+#include <sys/types.h>
-+
- /*
-  * Header Files
-  */
-@@ -425,20 +427,20 @@
  /*
   * Types/Keywords
   */
@@ -25,25 +29,43 @@
 -#undef SIZEOF_UNSIGNED_LONG_INT
 -#undef SIZEOF_UNSIGNED_LONG_LONG
 -#undef SIZEOF_UNSIGNED_CHAR_P
+ 
+-#undef HAVE_LONGLONG		/* Compiler defines long long type */
+-#undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
++#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__)
++#define SIZEOF_LONG_INT 8
++#define SIZEOF_CHAR_P 8
++#define SIZEOF_UNSIGNED_LONG_INT 8
++#define SIZEOF_UNSIGNED_CHAR_P 8
++#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_LONG_INT 4
++#define SIZEOF_CHAR_P 4
++#define SIZEOF_UNSIGNED_LONG_INT 4
++#define SIZEOF_UNSIGNED_CHAR_P 4
++#else
++#error Architecture not defined here!
++#endif
++
 +#define SIZEOF_CHAR 1
 +#define SIZEOF_SHORT_INT 2
 +#define SIZEOF_INT 4
-+#define SIZEOF_LONG_INT (__WORDSIZE/8)
 +#define SIZEOF_LONG_LONG 8
-+#define SIZEOF_CHAR_P (__WORDSIZE/8)
 +#define SIZEOF_UNSIGNED_CHAR 1
 +#define SIZEOF_UNSIGNED_SHORT_INT 2
 +#define SIZEOF_UNSIGNED_INT 4
-+#define SIZEOF_UNSIGNED_LONG_INT (__WORDSIZE/8)
 +#define SIZEOF_UNSIGNED_LONG_LONG 8
-+#define SIZEOF_UNSIGNED_CHAR_P (__WORDSIZE/8)
- 
--#undef HAVE_LONGLONG		/* Compiler defines long long type */
-+#define HAVE_LONGLONG __GLIBC_HAVE_LONG_LONG	/* Compiler defines long long type */
- #undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
++
++#if defined(__LONG_LONG_MAX__)
++#define HAVE_LONGLONG 1         /* Compiler defines long long type */
++#endif
++
++#if defined(__CHAR_UNSIGNED__)
++#define CHAR_IS_UNSIGNED 1	/* Compiler defines char to be unsigned */
++#endif
  
  #undef const			/* Define to empty if const doesn't work */
-@@ -479,7 +481,7 @@
+ #undef uid_t			/* To be used if uid_t is not present  */
+@@ -479,7 +499,7 @@
  
  /*#undef HAVE_SIZE_T*/
  /*#undef NO_SIZE_T*/
@@ -52,16 +74,18 @@
  #undef GETGROUPS_T
  #define GID_T		GETGROUPS_T
  
-@@ -498,7 +500,7 @@
+@@ -498,8 +518,8 @@
  #ifdef	HAVE_LARGEFILES		/* If we have working largefiles at all	   */
  				/* This is not defined with glibc-2.1.3	   */
  
 -#undef _FILE_OFFSET_BITS	/* # of bits in off_t if settable	   */
-+/*#undef _FILE_OFFSET_BITS*/	/* # of bits in off_t if settable	   */
- #undef _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
+-#undef _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
++#define _FILE_OFFSET_BITS 64	/* # of bits in off_t if settable	   */
++#define _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
  #undef _LARGE_FILES		/* Large file defined on AIX-style hosts.  */
  #undef _XOPEN_SOURCE		/* To make ftello() visible (glibc 2.1.3). */
-@@ -586,11 +588,11 @@
+ 				/* XXX We don't use this because glibc2.1.3*/
+@@ -586,11 +606,11 @@
  /*
   * Strings that help to maintain OS/platform id's in C-programs
   */


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cdrtools.spec	31 May 2006 08:07:55 -0000	1.43
+++ cdrtools.spec	2 Jun 2006 12:26:11 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a09
-Release: 0.FC5.1
+Release: 0.FC5.2
 %define tarversion 2.01.01a09
 License: CDDL
 Group: Applications/System
@@ -240,6 +240,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-0.FC5.2
+- corrected multilib patch (bug #193796)
+
 * Wed May 31 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-0.FC5.1
 - version 2.01.01a09 for FC5
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 12:38:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 08:38:10 -0400
Subject: rpms/pciutils/devel pciutils.spec,1.38,1.39
Message-ID: <200606021238.k52CcA70023022@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/pciutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22984

Modified Files:
	pciutils.spec 
Log Message:
- corrected multilib patch



Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pciutils.spec	23 May 2006 12:33:57 -0000	1.38
+++ pciutils.spec	2 Jun 2006 12:37:57 -0000	1.39
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.3
-Release: 	1
+Release: 	2
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -72,6 +72,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 2.2.3-2
+- corrected multilib patch
+
 * Tue May 23 2006 Harald Hoyer <harald at redhat.com> 2.2.3-1
 - version 2.2.3
 - multilib patch (bug #192743)



From fedora-cvs-commits at redhat.com  Fri Jun  2 13:00:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 09:00:26 -0400
Subject: rpms/m17n-db/devel m17n-db-indic-0.4.3.tar.gz, NONE, 1.1 .cvsignore,
	1.13, 1.14 m17n-db.spec, 1.19, 1.20 sources, 1.15, 1.16
Message-ID: <200606021300.k52D0QZQ016140@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16109

Modified Files:
	.cvsignore m17n-db.spec sources 
Added Files:
	m17n-db-indic-0.4.3.tar.gz 
Log Message:
Added oriya inscript keymap for RH bz #177379



--- NEW FILE m17n-db-indic-0.4.3.tar.gz ---
??6?Dm17n-db-indic-0.4.3.tar
?
,?`co??????????]?kY????e????}?>????????{???{???}??DNI\'D??????.???@O?HPg!"??_*8\]\?o7????pqe?PhT??????J??\?t&?R>??*C9R?938?????????????pCNN??L??2BD?T?(_?%??PwMH???SQ]?>????dD
??y?Je@??"(?I?2???2G(H?s?|(
?)???7)????/?D$F!	G?b???FV
??
???`?? Y*???0/?+?H??.???i??!?8M?H??y??AR8	??R????k?G?4Z,???IH?+K?G?_??BY?U?c?PXn
?E??#?"S???"<X$?u?!?$X???,W?7????
 ?9("y at 0?K?4X*??i?b?????#&?=?nA
?%XK?o9???'B??&??????p_|??i:?C?289U??P??aG??@>?	P?OT?OxL?9??`
@pL?B?
<???rD?\??0?(4??

?I???
DDA>P?OTL+6?'
???????w??h?~???_}??????L?Q"?7?
9]?C/?? {k+kh??nN?vkI1A#p?D?=
	????%@???
?u???$?-%D???E???}??Ox?n???&?????2?????"(?!???M???W????Y%?)??D?!ndC??2???^b?$<{?f?
?%?I????&??^?zY??R??????$7P??>?
Q??????'??9)??`
mzOl
?? m??=:}Yv??dO? ?#+?t???'?S???p?ZZH?Md?ZL?M?
SY???Z7?,?S??0????v? ?h19:?$+z	YUf???d???K??S?"??Sp?R6???????????;?;$??k 9?H!?_6Y????3?W? ??^
K/?J???J?b??????
O??	?G???????H?$W{E???a9?????"?j>D?6???=1?Oav9??%>\??'??"?n#?WBr ?ItI??9???c!?xrl??????:??}???????*??IeR?x??J????I??l?1???R8???????????l
??_?@_ ???
????
??H?	2
E??S??/
??Aa?????Y?W?????@??Q?X(?E(?%?9????&??"?O?U?h??O?N?:??8?x????????y?Gu*?Z?????o???????l??]???n??	???ag-????n8c?c?f?F??`?	7?OFJ-?Z?L??7[?n??0p??>???us?z??-??6g?q???=???Q}?F??n=???j???O?,??(?S???j??o??o??T?FM???]?S??lL??c?}n??F9hIK?<^{??6??&??q-iVe??,Be??gY*??_?lh?]C???.?~??hT????c??GGs7V?4l5}?P?y??6??????]?Zu???cw.Z^?$a?\w:?V???b7*Z??iy??6?U???N?x?-?Qq??Y?oE???3)?	??f?(??8????????X??l??8????w?????????????Wx?fi??{??>l<<?^2?IcG???????o????I/?{?vBGENV????O??^??|a??!?S?Q[????y??uNUX??;???y???Y????`???5?R??ybjh??]?BF??n??@??"????$5?????=???????!?<??v)e?v????[~t?mr???v???VDh?io?8????m?Y?C?????? ms0H[?
/?N[??1)y????Mo?FM????E??b?
??bf?u???!=&?|??{??d????p??6??_?^???	??\s|??j?bf??G???i??_7n???M????U3)?xG5??\9?o?S?Mr?(sU?????Yq^W?N?x?(?)?y???n5<?/?m?K????9,6?:6T??????????(??vL???????_M????X???l????????]??K	e??V/?????40?8??}yy?s??a??(?pYB?	?,-??	?/?????w{????,enj???>?s?m?	G<??[h\??v????,?)}M_q?:\f?=y!
 ?????u??????!?n???{??y???^??? 9mV:????
?tz?????S????i??Z.M??z?k? mX?^1??S^;?'"]?S?=??o???vj?g0*??'v??,?+?k6\8????s?7<<2???:S??{en??hG???Oa]4?6?9q!?p????/[???Mq?v?N?Q??"[`x??,?????]???t?J ??q??W&s??=?&?4
?.??>Uy?????aJ"-R??W??
m5?,?a???p?Ws??z???G??\{???/??rw??r?
	??g??3?2?u? ?8?l???Y?/+???i??????????D*?b?9F??7?.:??s??hT:??3?\}???/?G?_M????m?????rn???jI???[?5??w???~k???????o???_???????????`?/??F??????J??,??ts????????s???? ??/?;?'??/9?\???}??To?}Z????B??]?5J???5??61f?4??73???'v.^\?3H?h????a%?y????5?P???y/S?U???E??\????&??xJU??????^k??g????Q?~?Pq????M?W|t???oi?F????K?n?<??yAcd?7J5(???????<]?????VY^??/ui??6??l??X?q_??WYW(??<~??e9??d?~;?S???qw??EIg???SLV.????U?_n?rP???_???,><??eE?wb????????J?V?u]6Lo??|?>U?>????(???TVg?}K??Q?L9??E?Yf	????#J??)?Zv^???X?e ?S<T?Q?j??XDv?{5?)jL??#??&???????5?/N*?Z???s???W???B24??l???J'h???4z???n>g?i?C????9^?????ty?4??,?????4X?4?w?i9uf??Z??????????~?\w|?;??
	??Y9?-??6@}??z???
z????+!??H???? ????ACm?5U/?Co?Ln\?o??U?S??1P?N?z?:T?R=?iT*??????|JO?=Yq7????f??U?x?r_?u6`zS?????????KW?Wu?T9;?AR???y$??$??/??XP??_]2????~?O????`???_?L?'?w1g?????wtN?&?:a???????og?p?n~y??N?	z?G???&Q???ymP??ecE?4
A??zO	???????M???$ya?|?b??[?W%W
??h{???{]???l?????F
i???cg9??)>m?P???!????
????/jj????\??????G???X3??Up? ?7'3\?mBo?SZ?_9X4k????5Qoq????????p?[am??????]??q?o?z??U??n[?f??S??????g????	??O??C??L?|????????v??????/?v?Qi??+??d???{*5?n/??????m?7??
h?TQu??r?????x??w??Zc?<Xbn3?*%?sWD???????/?N????I?6????????'?k????x|Q???|??a+.NRl??$t?;x?C?F?>????E1????Y?Y??.??R??wx?"?<??c~|?~WKN{????????w????????S??dD?:,^E[?\?<????????mG<?{V????WE:??k??&??NB???_?o+?1[n?;????ZX?I??
??c??
q??a???????s?92D$??d:f
?$$Eh??2f
??9??Tk??y???dj?%u
u*?
E?!?S?????????????b????????g?z???v?x`??3(?fI]??????,??e??zgyv?q??#????g??;??|c????w
????=????g???t??u[_0?r??????????l????sE???'??f??hsj?????????I?J?}a?k???????*b?dP.????g??????=r?7+??3????w}??{F??&????H?\??7??}????o?Onq?????????????y???
(8??S?~{??t??9????}N@??-??]???h,?f2?f*?$?f2?f*9?3?39?3?dXl?a?I??&y
9&/ ?d ?T4???S??F???
?M
?19?1???v??v?V
;FS??????`?h6?c4
?1?
??
??v?????Q
??`2??d?
!?[?.??8?W???:1???1??NHI?b??1A?BW~+C?????8t?o???????????U??G???g??nu??3Q?????
Df%?Y?(E6????qY.?????j???(s?*?5vCnz?e/N5gMy4fs`?.?}?}l?}Nz??Z^??5J)??.<?X???SR???'s?w??o[??????mp?M???-]J???i\???9???Qx??^?M???L?&+Z????F??O?b?/9*??
?+??B???E??=??#?Zk?????G?e??'-d???O;?
q????,??l??%Q?M???$?a??!????O+???K?G?j^??x??VF?N??;??]??kM?Vx????&h?U	V??0u??f=?P????f???~?????a?j}ZF????V??p????P?????]-?]?~??3?IJrs?_???????H?9?!??Y^?4??P?1`rz?????%-S??w???1Ou*??S/?a????<~??m???2P??????*?N?D??????n????#u??!???L?????????u?s??#%N(??????/?`m?????T??|%?????u?}?vGEyG?z1?Ok?v?5q????t:??????kXW?uN5??
GQ????????j???Q???????????F????E??E??????????
6'?j?$???Z*?S?????q?8\???????1?!???6?.????ji?A??_?M????3?uH??-u??	o_?l?Ro???t?N???k;-k?#?UM?Lq??S?K???J???7x?8???h[??????:?E??????EU?-0?"??<?g??v??
??J??%?\???7???]??1???0?=??zt??*?d????.????????0*?????C6o????W?{
y??[???c!)??????kgm&?F?c??!0?&??\??x??qV??n?jI9\B^?7=?#?x??????jP???]zWr?????9??/?J]1??? Fo??[?tB??Q at G?)???ig?????S?
y)?????R,????????Y???????0??????0?wzi?iJ???L\??q?
??ZQ?^??~bD??L?6?F?????PB??C^???M?W????N+!f????3?S_?????@1?????\????TS?Wl?f?????!???3a??~?=?%k*=?4J?I$??FU,oe???0sZq??jt?+?=????????\'?4{1enAmY<#!???4+t????u?M;:?5^???c???(?$j??70????O????PU??T??????E???????O????????-????-???????*?h??9[?q_????P?}(y?=?>c?(?J?l??v???{~av?!???Q2?!??*?r?7?"shB>??vR?B*Z??nW????%???3	:C????z?)t.O?\????????k???/??_?A?9?G??
???P?A????*?
tZ'(??P)]?R????B?+?v
?.????v??v?Z?1????t!:@2??4?N2?=d`?|?P??A
<
p#????????????rPp???n???s?_c??Z??
???,?|?????? ???5?c`?1u?]-?v???L??G??]???????t?^??+??qj~
V???{o?`?`?7???g-:T)59?U?c??????????ou??)2Ns/?????&C??;V??y8?eU??8B???5?2?tZzo?j????JN?J?vgezs??2W?k,o??? ?0@?x]?9?S??????.?g???!Csc?UR6?7&?????????P?d}e?
j'Tb???F? ?O?K+D?~?M??"??~??R?P?C3u\J??{??{sfH?v???????[??????xUejW?4??ytm?\P]m??cZ? ?PMv6a'?????lnq?#?st{q?@??h?????????R/??
^}g;?Tii	??S??a?;{)N?E>???????????R??T???'?h??_=YB???=<?y????Y?ff?DI?s?M?_??5L?J?Z3??/DK?[9???T{?R???8g???	??Y?wG;??G??????Y??????@x?Y?N?1M+??Y??5
W??*?????+gI*a\.??????la?0f?J&??l?	h
^bX?9"???_??a??m???
V?;N??4=,?t?
?????1??????	?????Fv????`?~????>h?k?d]?iD?.k)?X??c9?wxx??d??????wV?????j?1:E?\?????3?jl?
?(?aN]?</??S{hmN?g????????W?c???5>9????)??0???[5???9?g?o??K	?NR#????p??7m?Q???
?U??p?O???14?j?uwW???M??]?1????
)B?'k
Y,??)??u'l????X0?3?0??hS+??H
?+????E?
?e6?v	??rw?\??t???FK?F?4???qr?????I<??Co???????EV3???y???6O?2?>?????!?'_???z????8???3????????? ?}??]??e??<n?>h????0?0???T?eA??a????4?iC?
???'f?MK*??I????e?i4??????C???;11#?RB?Nv?D??!{(????e?
cI?DD?%?3??P*R?,??[	???_?_?~?}??{???????G?~?q??s??y???w[??M?<s?Ax???U?=x:"Ds=?^[?d???'??%??~_q/P4??$t,??6?	????T??6n^?Fzw?w?V*?%$q[??<?GvW??-?P?JN??GEG??e?l?S`dt????FJ???s??l???~U#?f?=
i??.?2?kX?J?????????V??4???A}?O6?s????????u?1?
?*???p=??f??????j?Lr*???e??o?`Y?]Z??O??_?'+?k?D?0?<3W??Q??e??+?A?.?c?????FM?K??Ls???5sBRc3??????????O??s???/?&??5Y??M??j????
???????R?~??]??]?v~k????U??????fmU1iZ[?tF*??dE??.???"c
:Q??g?%???? ?"?`T"???)??D#Jt"W??????"?????????sT???g??$?z\v??[??b????76??Mo?R?g8??
L???[?uS????}?*????%{?ZS??wh<Pv/%?4?!?3*8??????$?bRV????-?^\?>?qg?am\?Fx?
*`J?!W?"?z-??K???nug???>????]????|G????v^????#]R?6?C??Ry???<;o?b.5r??9?$h?&???r?\k???\B?_??J?G?5?DLt?.x??????f??IM	+P??????^?u??=K??}?w?@?.?>|?a?? ??I?Ww??w3??^q?????q
nx?R?p???5?$??e??bw????n|}?9X?????U?}????????3?W3??
?yJ??/???????czg`??3+?~^??8??"R?K????9?CL???????^My????~,???IuI?+?*?s???0/??1????T.??@??[???F??1b??????.h3o?z?Su?;??
G?J4???2G9P
}??9|?$?;?'?\?s????s???g?)?iQv???]?w???????{???_?????????????w???;??3?I?7??Kp
P"(@?A
?
?lP?A
J(?T?/U?X5????,]0?????^`]3??7X????????DP~A?I?'??DP~A?I?g6(????$????O"(????$?????O"(????$~%????$???K?????U??'??DP~A?I????F?}`v??!?<??g
?D?n?>???a??{??C?y?I????h?M?}n?a???l?|?%?lf?????
{?????E????

???'5?)"???g???D)?<??Ed???I?vC
?
???h ???DX]???+d?bJ???MX??K{a9Rz??hNX;????`?h???JAu?????^??1Aa.Y*?l?-?
/R?8*?}jq?A6???????i=???W??>???VJ??O?i???b???p?[^0k??B?U??{wT"????U?
????????9???
?UR?$&????????KQ???H??h??s?????'km?:u?'z?D?????+c??B???+ /?????G$D????A?e??:?/????s?&??e?
8=-]?C ?*_605?*=L?2??L~qZ?t??uyuJ?X????b??????}hwB???~}>-???K??,????X[W:?<}????9?U?F??4????u?,M?H?
??	1????f???[
T}:?(J?[q^?&?E
?	??????;o?	?h??@?????]?8 at i?)????? ??5?|?o??#?i?}_???
	*k??h"?e??
Y????#???mw\n??????R?N?9??i??h}u?S?|<oh?(??Y?p???BPqy6R~?M?P?????u
?X?????<?
??9Va?C?8Yu??X???t???????Ro??hL??>H????uYH?????V6.?DD??
D<?gi?16d?xQ?????1mg8?\c??z?????a??ke???'7sygj%V???%K?????h`6??Y2??????WYt???hA??)J7??C???hb{;j?C?S?u
?4?)??Q?w?sq??Ck????|?%??*?w?k?<>5uNV???lx?L?]?`????/?????i\O(ANE?'???<b?E?=???Kv??%K?%?4?]Q??M??Ia)+???E??q?F4_SG??{???',$?<?U*EB??b*??rv?3??????EVCI&,????1+1?!K?+????????q?Mbmy?????,????h???3?uw[???i??`?MjL???=?
ss??I/S???},????E??^?sPgF????q?+\3v?|?Sa?
G?T?+
I?<??????cB??a??l'??????]8C?\8?9W?([z?'??H?<X?Kz?]qi?X1?`??^?1??3????R?????yb??(?,C?1????d4???\\?t??o?oP?P??`???[?I??{1?u????????????T?u?v???????1???
?
(P4?h@!??B`=??z
?h?(@I?
P(@!P?B?
P?(@!P?B`;??v?(
P?+

?J?f??7#??8?"C??$}:?>}%X???!PzB?????ok?[B??>???-C???@?	??e'?N?;????????1'????t???"~^?
sB	?????P???????????2?r??????C?/!B???#???K1?????r;??????7?????o?????Wy????????h????PZS?@f[???m???:Y??w2?????????T?V??&?k0??????c?K??i??X?J@?l??:Y?|o??I??????????()?u? ?-???u\Gm}?9?o w0?[??w????[?-???g'???
U?????G???qOz??c??o??????V??jw0????+}?L at qL???????B?z	???????????h?jS?N?S??4???u0S????j#u?
A??3uy7^aytwG?Rz??????"???WK?S?zS7???'?????????z????????^v; ???p?&D?U????1l?Z??W?p$+CW?[?Z;?	??9"??R??|L_?u?u???XX"??`?2!9M?|W??????jULVL??'L?Xd?nA????)?G??R?U??Y?L?2K????-%?x?)????Pe??P??z?'G??%?J?
?sL???^?(x?c?v?+??[qr?

s???)?l5?/:???u?F????s??c?v????????y??/ y???M???(?(?:??\?K?????a?p?[??h??fyY??<c?/???1e[?+??Q?C?e??y?"??????3?x????03?yh??N?'?\[|L????O^Xu???h??_??/?E???"W?????R?w].=?[??"ha?x?`[?k?avfM????(V~t?????HB????+??o?
7???wJ???N?pQ_??Xc????"?,?GRC[?0_??=n???z??d?_?[???dxC??(????a?N??Z8??X"[?RM?????$[?R?c??#?E?,E?-d+?q?i?"Qd?????7C???qo???????z?3f?9:3?????_?=t?F??Z??U?????!??Z2??E??????wl,:/^\?K????V?I?7???p????????????~???????OIN?6??'???????g??????????}Y3??h?Gc??5????.|????
??? ~???@???y??<???A?]
????:?c! ?m
??e?7?????J?dyP,??H???Z????k+??jOZm=??C"I????;{NJ^????*?U?????)z??G?Iv???(	??(GI?^????S???l?r?????VN?L??????O"???{P?i??o?7gZ??B???EWnu-????=?T????bE	?A??h???,x???`???2h?1>??%???Z?????k{??b8Z?(?d?@??e?=N???Z?????${D???u??^??>{yVI??I??#??',?????2nG<?LATq?>?da????v??^A??#)?z?????I?=?2???????x?t??$??_?%]Wg??T$?"?s??9o!<??V??G???n??????9?)5??}xw??C?P]??Vv6s6??????p????k?ci*k3??	<??x!?6????D?X??\c?e?)?H???sb`?~??V??P!?$??????T?{??f?,?*e?P?:?????tO\??}?@???@`]??&g?D?????5??D????Rq???G??4^?????TL???|??q?Z?>%??????d,?has8??,-'WDx?{gZ at zCb???i??Xo?j??????'F?????-?wA0?':??=?.????q??n?{?&1??Q?:3????:???|n?G??X
???2e??Q9O??????49K??????&????%lt????T??	?O???y????K??f???)??3?Z%?????m%?J??????W)?z9??oT????+M????e??Y??i?pK???k??n?Ob9??_];????Sj:?hi????kJ????5???a?_>??M?qRq?x4cP??	?u+?????N?^????1,?*???E?ffTu[S?????????T?1?U???xk??R??U????????C?%????q\f???r
?z??4Y|??Dt???ZG?~{????I?2???3r}7^?I??}?W??P?}??S??m?kzU?<^o#+?T?*?fe*rx{?LrP???FQ?X?7
?M#VB??w??O??0???F???JV??E?Z??????L??q???????EZ?????4C???????
_???????????7?'??????q??oD?O??????na0?YQ?V?gu?-h?5g?????\zFz????V????Erw/I??3???;t"?}b?06??z??????HgTo??????U/t?*8???!???Od\??#??,?0Od
?????????e?z???k?G\s?	???q???g?s???C??`?>*y=???????l=V????xp??NO??/?<?$6&f?JN?6X??	????]).]??????+???	l??????J?f?4?z?6E??????.;Y_M8)ie??k??\g)|,D?*????rVy$ysD`&?n?y7??r9\????]w3?5,??)yBuc??????w??r??2?L?Nx0?;?ph2D:<???Z?iR?)(?cf??.?,?T?#>?el^yB??+y?.e9?????a?N8?????[x;$2xt=?D???fI??|M??L3?????;,'???
????????:???
??x?
?g?m&?-????????8y?3???+???Z???'?J
?
??6&?:;?????
?o???? ????w?<????e]?{?m:?????jq5M???a???k?SzNx???j????E
?S??!?[??????}s????????$?	v?x$y????VR????mqCo
p?????9$+????_jxI??@X???)FQ?G|??C?!?ay?f??-m?*??!?+,??p??@?????V??:?4?<?0?U???????k;6????9[?V??4h?#?????M??1nc??
???LW????-?%%???>?{46p????????Q/?z????=?B????U?7?AL???Y??dt??%????B?5)???3?|&?'??????=??T?QRP????**?*???E???4?	??P???
???.????????
???????t? ???Q?????$o3
?h?EC???Z?g:
8?????+R?J????+???fV(? o???????j????\?W8?g8?mG???jD??a??o?S???B?T?u??:U??????
?w???????OYIQY^e???
???????:W D???{?=?????L<?Zr????w`??	6.fCK-??Xrf!E?Y6DxsG??K??????VL?W???H?????\??r?s4???(?????)$?	???r|?h?????L?W??????,???????x?$#G?????UKU??U,5??
.?m???bd??g?H??ob?a?[-m]?q"&A??J??????5????m??nW:'????D?X??l.?Y??s??9?+C2??????S
????P?n /???V8????d?????L??Y\6?%??W?Y??^??*?l}a?????Q??C3z???KoGy%5?;2?Z?_z`??4??'c?5m???????g=??]8??
??$^t?N?v1z????nz?n?:?8??R?8??&8????l??	?y?)?B??~???????z?q?ZD????0???xkU????%?=M??7??H??b?,\?u??Z???X??\?0v???-???5?V??)???P+a???&????{?V??F?$3?????wK?%}z?,????????)a~?w?0???h??.6??????/?9?8U?-???????]g?9?^?Be???%S?31?3?????<~?'????Rt?v???u??????????????T???+??Ak??3r???????u?h???|?t? ? ?????????3N?
??K?b?k??@??>?y???(??.??>???kx1?|9;??i?F?
??0j?3????????
C?<??
h\?
????A??????xbZ??8i???????/??T?[_d??%??9???}T?
y???#??????!????Z
F?4??&P*????&???D?9????.:_?#?JU??<???E??BUFc?&Uu??}T?1Tm)T$G??B?BU'??G??KP???q?Jb??q?JolAi?qx+??? ?:???H??2'G@@=Pu>???i?????S??H?:?N ???4/u?????*?????k?ju?j??*??a???????????{??q&4?P?????A???|?;?H??d??????????K>3Q??*??

???6?x??\????SQ2n???QI???y?KT??^aN?k?c?'y???Y	Pz1????q?2??3?vv????????B?-?^O????W?6{??????z???v????[??5#?????????/?]?????????$I?????o???
?????t?A????}?c?
????????@??q?O
???k>??@? ????O??V????
????t??a?(
3t????y?C?????T????xx??p?Y:???a?;{?<z??0'^
=D??L?WC?Y?Gz?>HG?J>?I`?6?!?X@???Rbq?zX?.6P?l???A???8?
??
??;8(2???o?i>?|???A??
a?????/?????T6??,!?[??^??@9?h?M?????x?pE??e"?(+?e/Kc/KC8$?6!??(*?@,$??D3$^?A??Cb;R?	???????K??????R?z??v?????c???T?}_??????????teN??8??????p?q?????????h4y9?}`?????G??????z?~_w?O??D??p???6???U?u?0T+?????i???lc?????2?9?{b?4??D	?!C??[?"???Bp
??
?J????xV??^}!????X?O????I?@,?A5???`k?tM?d??5x?i?~)??6P?8#a??$?^?<?=@????Y???0?d?C??[?$????j?E?0qe??t?(b'??=?????(O???~??? ,*??7?0Bh???;???+;??3}vt!?????(???4??d??-????AZXt
!??:??????????? ???!gXt!??	?
???8B?e at Oa&"?b?d?ZSk????
@???/?u?Ak?c?(?B?? &?????????c!pX??q?Xd?b???OM,?D???"?[r??hX???Y???E%??X??\,???8???????T&?A?????7p?????????l`???}4M?y????i??"??D??H??n????_~`???+?????Q??Cvw??????????_??Kt?N??
????i???E8??? q??t.???'C???#??QX?e?QX?e?QX?e?QX?e?QXF.f???v????Aa??3??>#(?3??>#?g?}F??
?????
?????
?????
?????
?????
?????
?????
??0`??a?>#(?e?>#(,?Ga???3??7
?????#	????
?????
?????
????Aa???+>???????c??S`"?????
?????
??????Q0r3F???D??z
4????o?????????????[?%%fv???K????(Np?????y???2M????"?f?h?H(?NuH?%?5Z?j?#sniY?PD$?]k5!,jL$?Nj??c2??????b:S?^???*k???kh????t^S????Mr_???K??v?G?j)?o????b1?}???k-????M
??g?:B.????%9?$?*M:^?'G??-&?????~7?:t??)L???s??E?hi=?????G)mS`?$?N?ZOX??]?&(????=?;	?oy??8?
?(o??j?!?H?9f??'??????
}?T)N??????!?%T?W?????XY4j??=?9k????t??\dSW?s?S??????Y)???bO?????UDy{???v?t/???????:??????9.??m?T???????=?t<??rZ??q????N?-???&???My?'F?6???Zhc?	??F?
??;?4??%?J???Wp??????????#?w?t?L???
????xli???!???BJ??\?f???A???^??mj?????Q???}ju??	
!?R????>z?s???d~????g?\ml[?2F??-??,?i?l?>??s?7`????Vesz?E]?&nN
????b	???N?\?`?+???koP???@U????=Ai?m?
???????[/q1!????????4w??Gg?Ci???9???lu?l???c?Q?????i?e???i
??n?,?~YQ?}.+An????r???*????iQ?9??-L.?aIY???????/???=?????9jW????SU?O>d?e?*????<>??X??C?vg=????f??0?yi???#???[MUB?J3?N.??????NhVm?f??_???`UV????.??:?K???)?B??^q??I?2?+8?????6?=e?????e?}?[?k9???q+??;K???l?b??%Z[?wr?????>vm9E????E
?|I{????Q?(?L)|?\0???Xc?B1?FYd?8?q???I??}"??7?g:m??uE=9??:?U?n???? ??o}+Z(\??m?'q?I???1IY??O4c
U?p????zW?bj?(?;???!??of	Y??Ro??Y??Kj{?2>ck???az?F??1b!F?3?v?1?	y??L>L?{+?ko???"
????Qq	7g???E?M>???y???K?v??o???nK?????}DB"X??]???x??-)^??c?S???l?j?Dm?|?????g????+?q??c??lL?}e	????ho????Z?|?????????????J??????????7?????+?c?H]????????>?m???6??
??q???m???zo?????f????t??.?v?TMl???n????)????o">??]r#???>ba??+?x?.?A?S?=?A?[8b{a??????????)w^???})?2 ?eC?;??/???}??J
????Y???/?F.?}????????Z???D?_x? 5ZCj4D4??
????????w:
?/:_????~????0?????kd???8????????/??????)??s?????G_x?H????g??+[\??1A?????)????)?J?8N?8=??A???DVP?E??OZ?KZ?{?J???ibL?6???W?e???W??fIy?Y???????????%m??'?W?S/?SlDm??0??4??P?F?S\ou?:?f?x?0?g?
Z??????4???????:??(???z
C???L???K??J2?g[TPr???S?|??????y?q?h???????????i?&??f?hg?^???D`y?A????N?G[??Hk?+???ML}??T~?6RQve?@U#??=?o?Q???7E??a[?QG?v???w???P?c???W??v!?co?U?!}GvE?)?k?z???G??LL|???}?(M?O?5?zg?Z????K?tf?P?y????W/Yu at F64K>A??K?2?z???3?Ov????????H??]??B????????(??+??l????
rA?]HK????9??Z#???r?6e?????u??%V????6?????>+?Y?iy????s?
???b????2?j???B?-x?-q?+M???$m?A?????9???/??e?>??S???h????h?n^y?p???j?1?N??'??`?f?b??V?????y?=U?h?:?????e??_?J??Ub????US?%??c"?OP?(*??7??j2?E61?	?????x5????ouJ??S??????|???I?1=:?i????.?K??n??H???????.{??Y?;??;[?<2Ky??V?
???]n???U?.?V??xA?].'??&????ivn ??0??????,???u?p???????p??I??}??Sv???$S?A?C??(???wxd?L5?????M?T?5??????,?*7?????$?u?j???QA?;a	1K?????(N4??f??4?????L???????E?$???sY4?8?Q
??/u?q?25????Fr?]bC^?????GE??iY*G????v-??YY?HZ;;???????#W_?KE_n?????>?Zg??????????)5?"???c?P?????g#)??{<?GW7?wCUZ
f?W?WO"g???6c?C{??'?????k?J????ER](N?z????Cc?
I???k???Y???t????@??z??Go??t$?[\*M\?`?>y????y??6???V??F{q?W6v??????V>A??VE,o.?q?r??O?{{qK^w*?a???kq?J???l??eO\?e
W2??C??????xU2??q?????=R??S?k?$?Y???it?$?T????FO???U?L?]?Q?? ??u=53??'?3U1iyX;+.??}~a	?????N)???*???[e???"2BQ>???)?AQ???'?}$G???M?+??"???????????????)??>????????S????????@??? ?
?G?l>???;??5Bq??'x?g??c??_B,???c??;l?Lkc]u??S?$mb-??????F????2???ji???(8????h???????G????tF????,.???1??gv?????B'?^3??????.^?Y??UO??????k?f?#7??1?e?????@?3???C?&*_???4??ll??D??<?K??
&<?Wl?z??r????ns?/???k?>?j?~?sN????????Nz??{C????Y???R,|???Ig?????4;i??l???r?]8???a?????i}?-c??	???????}?e)??{O??{??Cx??????;?????w[$????s????_?y??5NKYqS???? ????k???u?9-
??&??cR?~??5?K??h????Tf3_???asj????g;
?k!?C?}?????
?\Eu?k??????%??F
g?????????;8?R?m?b??73&]???K???????$??K???(?????/&8?\??????5F???i????????U?&Nf
??{	?/?6enN?'rfh???q??S??}N&m1s????:?>(?sk]b????RZk??2?C[zy?????????.-?41B~~??w????d???ge}?%'sA??{?}I+??_(y??2?Zs?)?|Ik?????S???t8????_??!??<b.??????r?	?f?????7)aA???I?)?{I?Lc]??Tr,??H??w?????-?7??y?x)??
??s??S]??'??8Z)T?<??4o??]???MJ||L?M[??????z??!????K?q????????%.`????zy6??Oo/?9????(l???a????Q?(??/$???ph~?)????|??????4?~?\???s??sO/h?????f??`??r????7r????=?7~?b?E????K'5s?\??W6???g{????u??wYx?x?q?J7|?)???5W?m??2?^?????g ??a?t??~!?k"?,3i?cy?y?>?G???Qy?WGD?8??y#?x\h]fR???x???2oP?oo??'??u???~????E???????{??????j????=????w????????O?|???????:??????I??}????V?O?C????|l????.??&??&????\1m"W?'?g]2??K?$?d?A?LIt??D?LIt?T?.?????Y2?C?????4??MN"w???q??F??Q??D???I????;?n"3~M??????$?D7J5?F)?n?j??R?(%??R?(? ???P?Do'??4??<>I??H?H?Y??KJ???H????=???]??i}'?F?????@Z?????q?"dM?w??????^dM?w????0?D?$'?;?I?N??(?D?#'K??????3?A?D?????!
 ???????????c???t7???????_??}???O??~
x?6zZm???{????	v?fSk??~??<??6??kh?2y?b?E?w???P?Dr??????K?????r?a??F???[U??????g??nk4\???Y??
??V???????#????*J??t?????????Q7??????>?f?!????????UYEtOO?2???,>Z??_?U>)??Sw?0??????
?X??7??Ow?u?s(4s??Q?SS2?F??eo?=\???????????P??G???b?m_?Q????s?|?]????????	????c???O?1c??98???/??????????????y?????????k??????????jBG?&:r?:r??.:r???Otj#F?lt??N???#>?ee?R?~?????
(?????\L?@?P ?G?=1!???#??b *(?????lLxJ?
31
???:????"h??????G??x???"h??c?D????W{?????:??????*??D
?21
(?@;	>%H ??	??????@?$lLxJ5??'??*F?
BDWE?j??D
(?@?8.&| J(?@?8OLx$P1NDh?????T?/?#???Q???U1?j??D
 ?,????
$?,??	?
$?,?	TQA????1!?)?????"?b??Y?tU,???01
(?@?x.&| J(?@?xOLx$P1^Dh?????T???$R}t?????A??
-@??H??>%H???'&<??#??	4?acB?S?????TE???r?*P?8LL@?P
(?@3>%H??	T?????@?8lLxJ5?.Qr/?a?@?TE]?"?[????2@??&2 ?S??????~??C?W<1!????1????;?(????????&??j?	D*??Q?,?i%?oI??t??H??<0pds Q@?D?U? ??,&? ???c????????)k???
??X?y?t?w???0??<~?$^e??\??s?gW}@?r?s??_W???IL???b????:)?	??3S]ybV'`#??;W?d?KROQ1s??)?^?<3???'??*?3? ?L9??S}??XP|2???2?3d??CF
uT?#?
^P|22??	8???!?Lxi@?g??T?g?D???2???O?^??5-S??)??O0??U?:)??:??Kp?$?N
`#????\51??	0??zpi??&?????Ls???0?<.???&??*??Z/_???hs???L???e??:)??:?3Sd)O??
?4???Y?C??ZWZ??v?=3??????4?kv?K????[5?D
???A?O?O&s???????????????+c?]?8=???rs????`5???????????6??_??,H????g?M???????I?w??>???v????gF?;??(??&K^v??>??{????l?????oiZ;UUs?rM~???[??;????????X?h??
??:?7wM~;???q?????f???[wNb????G,<???<{??ZG??*???e??Z?<??{uL????O?????k??=?l?Szt^v??^??????,?????????z#>e???um?M+?4Ih=l}?/?????????[?????????:?v???>Tt.?6{???7DuL?gv?aZU?#?????6;?V??E?7?W?|?;?|??1??pz?y?%????l????????+????(js??';>?R???????????e??????1?????f~????o????o?Mk?5?pb?VaOqUy?Y7?<??Wl?	kW?n3?xc?Wn?~???=??^?nD??>33i21?D????R?q??[?kO:????????uX|???????^?b^???????Z2???Co??u????:?<?`??????T??'MQ???S.????R??[?????Z????]?????????Ey?[??qOp?>???Fm?'??j???q
?n?kWcZ??K8T??[??:?p???2=??}=?,X9????CC?l{?s??;???????^<<)???/?&?<???????C6?L]????Z{??9???/?(z,n???_?an???M??b6??I???Yg[????a??n?E	?U?+?????g???p??&????W??0????k??J?ZR???F,??;?A|?a???7???#????<?vv???????y???)=<j???%??e???oo??sC??Q??WN+r?N??I???=?w???l?0o?????8g??m???-?!
 M]???w???cmlRa?s??i??+?Y?u?q??eO??????o?|?J??????7vN????]-y?/???YY?)^??}1e?^??????????p?????????Q???y???x???Ph??#???_*?sUy???
???/???????????~??S??}???u[?M'???b???=k?SQ1?i1???????w??x????}v?k???~???'?g??V??????u?????T8?v??=K?5;???nU??????
h????K?|???%?n???|???/~_1s???M?5??=}?=?T???Ki_Tt??}]?????????"?????????2??n??QI?{???{7~?x?Y??????{?z??~i?????5??/Mz?i?!~????).V?x????????2?9?iF?K;^?W'?_??b???M/??x????>???a{?-|??i?ot2?;?????}ye????\???tv??]??????????LE??.l[??fC????p){??n????)??Q?N??o???k??G???????p????????>3?????]????&?/?e???g??[wr????g?|?OQ5/?0y??+?_??_????:<????
?????==??W?????????%??<?????????i??S?Q>?????????????I?Gy7?{??????
?[?7??????????t??#wlRdg5(?m2d'?,wo?2+??]?T?a??
??kxeO^??R?LW?b at fdv??????x?L??`?????t7?^??W?N3??????O?F??6T??d??P6?e???bN9?4P???3???o?I???)?n??H???????2???\9`` m9??%gb???%?d?f?=+??W?t???[x??m?9??,?,<~?l??G??????<?Xx?*??A??n????F????,??,??-?l?X8??p???
??PW??;?T\??%(?]??????W(?z?
?S^!???>?k8?????

???yx/I??????r<<?????y???{?Nuzx?R????,O?e{x?+???I	??????H???v'?)??2<??j=?\?z??\>??4?x1Q???0????>?(???v???C??>?v?x.???W???5?|<{???9?\??%?x?)???:
???}<C????5??????3?>N?}?Fa? /?????B?>?[e? /??y9??
?? O?;?<?????&???YA???cn?G??<^??Q?@??~?AaI	r????m?G6R?????B
??OB?wV????.?=?s?)a????t?6?s??a?M???#?I?h3?5*?m:pG%?M?d???B2?r?&?l88???f?d?9?/??9'X??=?
?T2???8???l?N%??n?m?
k?RVd?28?L??33?Y?????*??Q???>?tX??G?:p?????>??2Tz?(-q??u??? G?\P??rA?r??u??6?<G?\PMtA?t??u??R?XGg??	??`?fG?]P??vAMwt????|??G^P'?xA
yt????Ec^P{?y?tt??]/?a?lA?t?.H??:p??qy? Q:??$J?c
??#P?n?J??dAP???AP???AP???AP???AP???AP?BP?(BP ?DBP.?`BP<?|BPJ??BPX??BPf??BPt??BP??CP??$CP??@CP??\?
-?
A!R????n?m??rl&?t??D?:p???ayU:??e?J?c
???P?f?t?3?g?4?i?5Hke6mE7?n%8?p9Hr?9t?:?u?;?w?<Hye={E>?|%??~@H??@??A???B???CH?(??"$!+????qt$???63U:Dg?J??T??<??*t?2S??1?T?cP?V?t?\H?e]?E^??%_??`H??`??a???b???cH?ed?Ee??%f??gH??g??h???i???jH?ek?El??(-?"j?!q?JQ??T??{???V??R?^V*bX??JE'?RO@????""
?	"
"?""")?"0"7?">""E?%"L)"S?,"Z0"a?3"h7"o?:"v>"}?A"??8Q?,RP"?H??Da?S??u~*bX??OE{q???a?.?1?@?OE<E??"L??TPZ??TPh??TPv??TP??UP??(UP??DUP??`UP??|UP???UP???UP???UP???UP?VP?$VP?@VP,?\VP:?xVPH????V-?ZA?-2[*b??KE??y????P/1????"???T?p
/?$???82?dAq2?dA?2beA?2?eA3BfAQ3?fA?3"gA?3?gA?3hA14rhAi4?hA?4RiA?4?iA52jAI5?jA?5kA?5?kA?5?kA)6bl
??H?e????A6#1?^g?"??m?T?????V?2R?	?T??Q?!*b
??0? hf
C?F0? h?
#?0? h?

??0? h?
?
??0? h?
??F0? h?
?? 0
!h???!0!h*cT? 
[??v?S???a*b??#LE+v????a*b?hD??V?Vz?|?;???K?H?Y/Y?OV???Tz?z?[?3?K???^????????????????.?T???[b???=??E???????7??<&&?M???G????O????9??M?<k]5????????q?????oL?
4?_4s??.??????Y??#?})?+fV?VVd?o?o???????l????<?A???3?x ?????c????.??????Sg??	??????a??./????yfD?????Kku??U?1?#G???????8%????????Z^1|??????g5}0????;??t?pH?]
6?z?&R?)"-? 
iIEE??J?'??qQDTTj
????g???^4?????j?k???
?6?P+>?"?????;X?
?<?????'?????N???PX"?G?E????h?	??????n}2???E?b???&??m??u?I?[??G??M??Y?Q??Z?M?3	"r??R~Oz??c4???????+???o?p???X??-B9YK??*2u??N"?>?[r{B??A$???y?X?o??"?3?q6XN?:ul3???/?9?y?`???+1L??C?z9??m?j0PPo?3#??>&r?{v?
?
pO*]? ????]?Z~S????j????8U???4??j>????W~??i2[jn?Yf?-N?X2?I?&??X?m[7?Mu??? ???2E??X??8?E?l????????QE?}??M?G~??!Qr??1(?p??????????~?}??;?=??v???????\??4???N6???len???a?
??\?A??@?????????.??
?Ghj???'???B????#?????????M??1???"2?????@NG?Ci??O(:????8???=Sw?}?a^?A??F?"???????;????C?<c?S>??????E?
??	???{?????????@&??I????TL???Q1=???Qy?xQ???k?LT~?M
?MI???????o?R9=?P?	?U??3@#Yj????u?$G
r?V??????h???i??th??ti??,)P?????3???????"h????????2?U????m
R?a;m?	???pOJ?Z@??"@?????V?@?	???Iq[$?Z?z?j
???-??t-?1????l?d??Z??n
??|-
P
P????5????8/ ?vQ?B??0??j???,???axy?.'4???0R??????
x??(
?`@??s?	?k#M34?x?05???0??F
?@????C?S?%zkDm???
?U?????D?
???os] ?z#Po2?????VJ[??u?-?????/?(???@??????????
????????u????????d?nV??e?_??x????\?D:?U?{??`?????S??p?$y??????I'??]]??|b?yE??????[??_??????? ?O?XE?????s??Y?'?+??u?8??????$??*[??????-???????<u??h,4G~h?????R?[?uXOJ?R?<?[??-?
?-bb5T?9????K?F<?_y)I?e1??????WN??yMNJ?^*@Y????=4?????????#??\*????Hyt?$M?$<8???}qTU?x?Oi???[{???Bb[tG????cp?:%_cM??H????v???????<??*?k?[??0)??]>??:	Vo(X,S[??u?3?+|
z??~u???C^?????/1??/?xZ??4??????p~?????<???=?????li?E5???V?_??J?[ku?M??<??`o?r9??aM??xL???7s>??}?>??82??j???????V?Z^?69<??>??(z?Z??'o??4?6+???U?HD?o?????vX?o??+??M?0??x?g?????\c??????Y?Y^???
??K???#?v;???g???][BI??????_??U?8,r??8W??m)0????H?
C?RT??
????????j??????^l?yN??.?Z??????y?????X?'_?5????????
???:???X2J??}???n?t??l???5?????/???*????3?o??)??=?^$?(?Y?b???,f1?Y?b?????I???9U

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Jun 2006 12:07:56 -0000	1.13
+++ .cvsignore	2 Jun 2006 13:00:24 -0000	1.14
@@ -2,3 +2,4 @@
 m17n-db-indic-0.4.0.tar.gz
 m17n-db-indic-0.4.1.tar.gz
 m17n-db-indic-0.4.2.tar.gz
+m17n-db-indic-0.4.3.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- m17n-db.spec	2 Jun 2006 12:11:59 -0000	1.19
+++ m17n-db.spec	2 Jun 2006 13:00:24 -0000	1.20
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.2
+%define indic_ver 0.4.3
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -437,7 +437,7 @@
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/as-*.mim
-%{_datadir}/m17n/icons/as-*.png
+#%{_datadir}/m17n/icons/as-*.png
 
 
 %files bengali
@@ -607,7 +607,7 @@
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/or-*.mim
-%{_datadir}/m17n/icons/or-*.png
+#%{_datadir}/m17n/icons/or-*.png
 
 
 %files punjabi
@@ -696,6 +696,10 @@
 
 %changelog
 * Fri Jun 2 2006 Mayank Jain <majain at redhat.com>
+- Added or-inscript keymap to the tarball
+- Commented out as-*.png and or-*.png from the directives as respective .png files are missing from tarball.
+
+* Fri Jun 2 2006 Mayank Jain <majain at redhat.com>
 - Added modified as-phonetic.mim keymap, modified by <runab at redhat.com> for RH bz #193849
 
 * Mon May 29 2006 Mayank Jain <majain at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Jun 2006 12:07:56 -0000	1.15
+++ sources	2 Jun 2006 13:00:24 -0000	1.16
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-aabdc0b99c1f5ea63c1ebf3ce27c3266  m17n-db-indic-0.4.2.tar.gz
+aa7bbfbade248c12e0b555b9c9e69630  m17n-db-indic-0.4.3.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  2 13:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 09:57:41 -0400
Subject: rpms/httpd/devel httpd-2.1.10-apxs.patch, 1.1, 1.2 httpd.spec, 1.90,
	1.91
Message-ID: <200606021357.k52DvfCJ003179@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3114

Modified Files:
	httpd-2.1.10-apxs.patch httpd.spec 
Log Message:
* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 2.2.2-4
- make -devel package multilib-safe (#192686)


httpd-2.1.10-apxs.patch:
 apxs.in |   42 +++++++++++-------------------------------
 1 files changed, 11 insertions(+), 31 deletions(-)

Index: httpd-2.1.10-apxs.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd-2.1.10-apxs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.1.10-apxs.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-apxs.patch	2 Jun 2006 13:57:39 -0000	1.2
@@ -1,10 +1,28 @@
 
 - remove unnecessary stuff which runs httpd during build
 - drop unnecessary --libs output from ap?-?-config
+- make multilib-safe
 
---- httpd-2.1.10/support/apxs.in.apxs
-+++ httpd-2.1.10/support/apxs.in
-@@ -184,34 +184,6 @@
+--- httpd-2.2.2/support/apxs.in.apxs
++++ httpd-2.2.2/support/apxs.in
+@@ -25,7 +25,15 @@
+ 
+ my %config_vars = ();
+ 
+-my $installbuilddir = "@exp_installbuilddir@";
++# Awful hack to make apxs libdir-agnostic:
++my $pkg_config = "/usr/bin/pkg-config";
++if (! -x "$pkg_config") {
++    error("$pkg_config not found!");
++    exit(1);
++}
++
++my $installbuilddir = `pkg-config --variable=libdir apr-1` . "httpd/build";
++
+ get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
+ 
+ # read the configuration variables once
+@@ -184,34 +192,6 @@
      }
  }
  
@@ -39,7 +57,7 @@
  sub get_config_vars{
      my ($file, $rh_config) = @_;
  
-@@ -433,9 +405,9 @@
+@@ -433,9 +413,9 @@
  
      if ($opt_p == 1) {
          


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- httpd.spec	11 May 2006 13:44:41 -0000	1.90
+++ httpd.spec	2 Jun 2006 13:57:39 -0000	1.91
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.2
-Release: 3
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -251,9 +251,6 @@
 mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
    $RPM_BUILD_ROOT%{_bindir}
 
-# move builddir to the right place
-#mv $RPM_BUILD_ROOT%{contentdir}/build $RPM_BUILD_ROOT%{_libdir}/httpd/build
-
 # Make the MMN accessible to module packages
 echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
 
@@ -288,7 +285,6 @@
 ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
 ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
 ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
-ln -s ../..%{_libdir}/httpd/build $RPM_BUILD_ROOT/etc/httpd/build
 
 # install SYSV init stuff
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -312,6 +308,10 @@
     -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
   > $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
 
+# Make ap_config_layout.h libdir-agnostic
+sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
+    $RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
+
 # Remove unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp \
       $RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
@@ -472,7 +472,6 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/httpd
-%{_sysconfdir}/httpd/build
 %{_sbindir}/apxs
 %{_mandir}/man8/apxs.8*
 %dir %{_libdir}/httpd/build
@@ -480,6 +479,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 2.2.2-4
+- make -devel package multilib-safe (#192686)
+
 * Thu May 11 2006 Joe Orton <jorton at redhat.com> 2.2.2-3
 - build DSOs using -z relro linker flag
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 14:20:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 10:20:38 -0400
Subject: rpms/cups/FC-5 cups-str1740.patch,NONE,1.1 cups.spec,1.184,1.185
Message-ID: <200606021420.k52EKc1E022417@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22320

Modified Files:
	cups.spec 
Added Files:
	cups-str1740.patch 
Log Message:
* Fri Jun  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.4
- Applied upstream patch to fix STR #1740 (bug #192809).


cups-str1740.patch:
 pstops.c |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE cups-str1740.patch ---
--- cups-1.2.1/filter/pstops.c.str1740	2006-05-22 19:31:23.000000000 +0100
+++ cups-1.2.1/filter/pstops.c	2006-06-02 15:08:26.000000000 +0100
@@ -1305,6 +1305,9 @@
 
   if (first_page)
   {
+    char	*page_setup;		/* PageSetup commands to send */
+
+
     doc_puts(doc, "%%BeginPageSetup\n");
 
     if (pageinfo->num_options > 0)
@@ -1344,20 +1347,28 @@
       */
 
       if (doc_setup)
+      {
 	doc_puts(doc, doc_setup);
+	free(doc_setup);
+      }
 
       if (any_setup)
+      {
 	doc_puts(doc, any_setup);
+	free(any_setup);
+      }
+    }
 
-     /*
-      * Free the command strings...
-      */
+   /*
+    * Output commands for the current page...
+    */
 
-      if (doc_setup)
-	free(doc_setup);
+    page_setup = ppdEmitString(ppd, PPD_ORDER_PAGE, 0);
 
-      if (any_setup)
-	free(any_setup);
+    if (page_setup)
+    {
+      doc_puts(doc, page_setup);
+      free(page_setup);
     }
   }
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- cups.spec	1 Jun 2006 15:45:58 -0000	1.184
+++ cups.spec	2 Jun 2006 14:20:35 -0000	1.185
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.3
+Release: 1.4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -35,6 +35,7 @@
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch14: cups-localhost.patch
+Patch15: cups-str1740.patch
 Patch16: cups-pie.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
@@ -132,6 +133,7 @@
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch14 -p1 -b .localhost
+%patch15 -p1 -b .str1740
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -405,6 +407,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jun  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.4
+- Applied upstream patch to fix STR #1740 (bug #192809).
+
 * Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed group ownerships again (bug #192880).
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 17:08:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 13:08:42 -0400
Subject: rpms/fontconfig/FC-5 fontconfig-2.3.95-ttf-collections.patch, NONE,
	1.1 fontconfig-2.4-cmap-parsing.patch, NONE,
	1.1 fontconfig.spec, 1.72, 1.73
Message-ID: <200606021708.k52H8gOb019038@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18987

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-ttf-collections.patch 
	fontconfig-2.4-cmap-parsing.patch 
Log Message:
fix ttf font collections


fontconfig-2.3.95-ttf-collections.patch:
 ftglue.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fontconfig-2.3.95-ttf-collections.patch ---
--- fontconfig-2.3.95/src/ftglue.c.ttf-collections	2006-06-02 12:31:02.000000000 -0400
+++ fontconfig-2.3.95/src/ftglue.c	2006-06-02 12:31:38.000000000 -0400
@@ -290,7 +290,7 @@
       if ( tag == the_tag )
       {
         LOG(( "TrueType table (start: %ld) (size: %ld)\n", start, size ));
-        error = ftglue_stream_seek( stream, offset+start );
+        error = ftglue_stream_seek( stream, start );
         goto FoundIt;
       }
     }

fontconfig-2.4-cmap-parsing.patch:
 fcfreetype.c |   38 ++++++++------------------------------
 1 files changed, 8 insertions(+), 30 deletions(-)

--- NEW FILE fontconfig-2.4-cmap-parsing.patch ---
--- fontconfig-2.3.95/src/fcfreetype.c.cmap-parsing	2006-04-25 11:31:41.000000000 -0400
+++ fontconfig-2.3.95/src/fcfreetype.c	2006-05-18 08:14:09.000000000 -0400
@@ -2511,31 +2511,12 @@
 	}
 	else
 	{
-	    FT_UInt gindex;
-	  
-	    /*
-	     * Find the first encoded character in the font
-	     */
-	    if (FT_Get_Char_Index (face, 0))
+            page = ~0;
+            leaf = NULL;
+            ucs4 = FT_Get_First_Char (face, &glyph);
+            while (glyph != 0)
 	    {
-		ucs4 = 0;
-		gindex = 1;
-	    }
-	    else
-	    {
-		ucs4 = FT_Get_Next_Char (face, 0, &gindex);
-		if (!ucs4)
-		    gindex = 0;
-	    }
-
-	    while (gindex)
-	    {
-		page = ucs4 >> 8;
-		leaf = 0;
-		while ((ucs4 >> 8) == page)
-		{
-		    glyph = FT_Get_Char_Index (face, ucs4);
-		    if (glyph && FcFreeTypeCheckGlyph (face, ucs4, 
+                if (FcFreeTypeCheckGlyph (face, ucs4,
 						       glyph, blanks, &advance))
 		    {
 			if (advance)
@@ -2558,8 +2539,9 @@
 			    }
 			}
 
-			if (!leaf)
+                    if ((ucs4 >> 8) != page)
 			{
+                        page = (ucs4 >> 8);
 			    leaf = FcCharSetFindLeafCreate (fcs, ucs4);
 			    if (!leaf)
 				goto bail1;
@@ -2571,11 +2553,7 @@
 			    font_max = ucs4;
 #endif
 		    }
-		    ucs4++;
-		}
-		ucs4 = FT_Get_Next_Char (face, ucs4 - 1, &gindex);
-		if (!ucs4)
-		    gindex = 0;
+                ucs4 = FT_Get_Next_Char (face, ucs4, &glyph);
 	    }
 #ifdef CHECK
 	    for (ucs4 = 0; ucs4 < 0x10000; ucs4++)


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/FC-5/fontconfig.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- fontconfig.spec	24 Feb 2006 20:33:50 -0000	1.72
+++ fontconfig.spec	2 Jun 2006 17:08:39 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.94
-Release: 1
+Release: 1.fc5.1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -14,6 +14,8 @@
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
 Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
+Patch3: fontconfig-2.4-cmap-parsing.patch
+Patch4: fontconfig-2.3.95-ttf-collections.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -51,6 +53,8 @@
 
 %patch1 -p1 -b .defaultconfig
 %patch2 -p1 -b .move-user-cache
+%patch3 -p1 -b .cmap-parsing
+%patch4 -p1 -b .ttf-collections
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -135,6 +139,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.94-1.fc5.1
+- Fix the handling of TTF font collections
+- Apply a patch by David Turner to speed up cache generation
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.94-1
 - Update to 2.3.94
 



From fedora-cvs-commits at redhat.com  Fri Jun  2 23:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 2 Jun 2006 19:19:26 -0400
Subject: rpms/perl/FC-5 perl-5.8.8-R-switch.patch, NONE,
	1.1 perl-5.8.8-U27116.patch, NONE, 1.1 perl-5.8.8-U27329.patch,
	NONE, 1.1 perl-5.8.8-U27391.patch, NONE,
	1.1 perl-5.8.8-U27426.patch, NONE, 1.1 perl-5.8.8-U27509.patch,
	NONE, 1.1 perl-5.8.8-U27512.patch, NONE,
	1.1 perl-5.8.8-U27604.patch, NONE, 1.1 perl-5.8.8-U27605.patch,
	NONE, 1.1 perl-5.8.8-U27914.patch, NONE,
	1.1 perl-5.8.8-bz188441.patch, NONE,
	1.1 perl-5.8.8-bz191416.patch, NONE,
	1.1 perl-5.8.8-no_asm_page_h.patch, NONE,
	1.1 perl-5.8.7-172396.patch, 1.1, 1.2 perl.spec, 1.88, 1.89
Message-ID: <200606022319.k52NJQjH010513@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10485

Modified Files:
	perl-5.8.7-172396.patch perl.spec 
Added Files:
	perl-5.8.8-R-switch.patch perl-5.8.8-U27116.patch 
	perl-5.8.8-U27329.patch perl-5.8.8-U27391.patch 
	perl-5.8.8-U27426.patch perl-5.8.8-U27509.patch 
	perl-5.8.8-U27512.patch perl-5.8.8-U27604.patch 
	perl-5.8.8-U27605.patch perl-5.8.8-U27914.patch 
	perl-5.8.8-bz188441.patch perl-5.8.8-bz191416.patch 
	perl-5.8.8-no_asm_page_h.patch 
Log Message:
fix upstream bugs since 5.8.8 was released

perl-5.8.8-R-switch.patch:
 embed.fnc       |    2 +-
 embed.h         |    2 +-
 perl.c          |   17 ++++++++++++-----
 pod/perlrun.pod |   21 +++++++++++++++++++++
 proto.h         |    2 +-
 5 files changed, 36 insertions(+), 8 deletions(-)

--- NEW FILE perl-5.8.8-R-switch.patch ---
--- perl-5.8.8/pod/perlrun.pod.-R-switch	2006-01-13 11:29:17.000000000 -0500
+++ perl-5.8.8/pod/perlrun.pod	2006-06-02 00:29:17.000000000 -0400
@@ -11,6 +11,7 @@
 	S<[ B<-I>I<dir> ] [ B<-m>[B<->]I<module> ] [ B<-M>[B<->]I<'module...'> ] [ B<-f> ]>
 	S<[ B<-C [I<number/list>] >]>
 	S<[ B<-P> ]>
+	S<[ B<-R> ]>
 	S<[ B<-S> ]>
 	S<[ B<-x>[I<dir>] ]>
 	S<[ B<-i>[I<extension>] ]>
@@ -813,6 +814,26 @@
 before being searched for on the PATH.  On Unix platforms, the
 program will be searched for strictly on the PATH.
 
+=item B<-R>
+X<-R>
+
+Disables the Red Hat module compatibility default search path.
+
+By default, the Red Hat perl distribution will prepend to the default
+search path (@INC) the -V:archname subdirectory of each member of 
+the -V:inc_version_list under the perl vendor and site installation 
+directories. 
+i.e. in shell notation:
+ {-V:vendorlib_stem,-V:sitelib_stem}/{-V:inc_version_list}/-V:archname
+where inc_version_list includes every previous perl version shipped 
+by Red Hat, to provide compatibility for binary modules installed under 
+previous perl versions. This can be quite a long list of directories
+to search, which can slow down module loading. You can disable searching
+these previous perl version architecture specific directories by specifying
+the -R switch - then the default search path will be as for the default
+upstream perl release.
+
+
 =item B<-t>
 X<-t>
 
--- perl-5.8.8/proto.h.-R-switch	2006-06-01 19:13:32.000000000 -0400
+++ perl-5.8.8/proto.h	2006-06-01 23:15:04.000000000 -0400
@@ -1620,7 +1620,7 @@
 STATIC void	S_init_ids(pTHX);
 STATIC void	S_init_lexer(pTHX);
 STATIC void	S_init_main_stash(pTHX);
-STATIC void	S_init_perllib(pTHX);
+STATIC void	S_init_perllib(pTHX,bool rhi);
 STATIC void	S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env);
 STATIC void	S_init_predump_symbols(pTHX);
 STATIC void	S_my_exit_jump(pTHX)
--- perl-5.8.8/embed.fnc.-R-switch	2006-06-01 19:13:32.000000000 -0400
+++ perl-5.8.8/embed.fnc	2006-06-01 23:21:25.000000000 -0400
@@ -1080,7 +1080,7 @@
 s	|void	|init_ids
 s	|void	|init_lexer
 s	|void	|init_main_stash
-s	|void	|init_perllib
+s	|void	|init_perllib   |bool redhat_incpush
 s	|void	|init_postdump_symbols|int argc|NN char **argv|NULLOK char **env
 s	|void	|init_predump_symbols
 rs	|void	|my_exit_jump
--- perl-5.8.8/embed.h.-R-switch	2006-06-01 19:13:32.000000000 -0400
+++ perl-5.8.8/embed.h	2006-06-01 23:13:11.000000000 -0400
@@ -3170,7 +3170,7 @@
 #define init_ids()		S_init_ids(aTHX)
 #define init_lexer()		S_init_lexer(aTHX)
 #define init_main_stash()	S_init_main_stash(aTHX)
-#define init_perllib()		S_init_perllib(aTHX)
+#define init_perllib(rhi)		S_init_perllib(aTHX,rhi)
 #define init_postdump_symbols(a,b,c)	S_init_postdump_symbols(aTHX_ a,b,c)
 #define init_predump_symbols()	S_init_predump_symbols(aTHX)
 #define my_exit_jump()		S_my_exit_jump(aTHX)
--- perl-5.8.8/perl.c.-R-switch	2006-06-01 23:08:08.000000000 -0400
+++ perl-5.8.8/perl.c	2006-06-02 00:00:23.000000000 -0400
@@ -1649,6 +1649,7 @@
 #ifdef USE_SITECUSTOMIZE
     bool minus_f = FALSE;
 #endif
+    bool redhat_incpush = TRUE;
 
     PL_fdscript = -1;
     PL_suidscript = -1;
@@ -1770,11 +1771,15 @@
 	    PL_preprocess = TRUE;
 	    s++;
 	    goto reswitch;
+	case 'R':
+	    redhat_incpush = FALSE;
+	    s++;
+	    goto reswitch;	
 	case 'S':
 	    forbid_setid("-S");
 	    dosearch = TRUE;
 	    s++;
-	    goto reswitch;
+	    goto reswitch;	
 	case 'V':
 	    {
 		SV *opts_prog;
@@ -2062,7 +2067,7 @@
 	scriptname = "-";
     }
 
-    init_perllib();
+    init_perllib(redhat_incpush);
 
     open_script(scriptname,dosearch,sv);
 
@@ -4736,7 +4741,7 @@
 }
 
 STATIC void
-S_init_perllib(pTHX)
+S_init_perllib(pTHX, bool redhat_incpush)
 {
     char *s;
     if (!PL_tainting) {
@@ -4803,7 +4808,8 @@
      * DLL-based path intuition to work correctly */
 #  if !defined(WIN32)
     incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
-    incpush_oldversion(aTHX_ SITEARCH_EXP);
+    if ( redhat_incpush )
+      incpush_oldversion(aTHX_ SITEARCH_EXP);
 #  endif
 #endif
 
@@ -4825,7 +4831,8 @@
      * DLL-based path intuition to work correctly */
 #  if !defined(WIN32)
     incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
-    incpush_oldversion(aTHX_ PERL_VENDORARCH_EXP);
+    if ( redhat_incpush )
+      incpush_oldversion(aTHX_ PERL_VENDORARCH_EXP);
 #  endif
 #endif
 

perl-5.8.8-U27116.patch:
 pp.c         |    6 +++++-
 t/op/index.t |   14 +++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-U27116.patch ---
--- perl-5.8.8/t/op/index.t.U27116	2005-10-31 09:11:17.000000000 -0500
+++ perl-5.8.8/t/op/index.t	2006-06-01 18:20:53.000000000 -0400
@@ -7,7 +7,7 @@
 
 use strict;
 require './test.pl';
-plan( tests => 58 );
+plan( tests => 66 );
 
 my $foo = 'Now is the time for all good men to come to the aid of their country.';
 
@@ -121,3 +121,15 @@
     is (index($text, $search_octets), -1);
     is (rindex($text, $search_octets), -1);
 }
+
+foreach my $utf8 ('', ', utf-8') {
+    foreach my $arraybase (0, 1, -1, -2) {
+	my $expect_pos = 2 + $arraybase;
+
+	my $prog = "\$[ = $arraybase; \$big = \"N\\xabN\\xab\"; ";
+	$prog .= '$big .= chr 256; chop $big; ' if $utf8;
+	$prog .= 'print rindex $big, "N", 2 + $[';
+
+	fresh_perl_is($prog, $expect_pos, {}, "\$[ = $arraybase$utf8");
+    }
+}
--- perl-5.8.8/pp.c.U27116	2006-06-01 17:04:25.000000000 -0400
+++ perl-5.8.8/pp.c	2006-06-01 18:19:16.000000000 -0400
@@ -3258,9 +3258,13 @@
     if (MAXARG < 3)
 	offset = blen;
     else {
+	/* arybase is in characters, like offset, so combine prior to the
+	   UTF-8 to bytes calculation.  */
+	offset -= arybase;
 	if (offset > 0 && big_utf8)
 	    sv_pos_u2b(big, &offset, 0);
-	offset = offset - arybase + llen;
+	/* llen is in bytes.  */
+	offset += llen;
     }
     if (offset < 0)
 	offset = 0;

perl-5.8.8-U27329.patch:
 pp.c      |   18 ++++++++++++------
 t/op/lc.t |   37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 7 deletions(-)

--- NEW FILE perl-5.8.8-U27329.patch ---
--- perl-5.8.8/t/op/lc.t.U27329	2005-11-07 09:22:36.000000000 -0500
+++ perl-5.8.8/t/op/lc.t	2006-06-01 22:02:13.000000000 -0400
@@ -6,7 +6,7 @@
     require './test.pl';
 }
 
-plan tests => 59;
+plan tests => 77;
 
 $a = "HELLO.* world";
 $b = "hello.* WORLD";
@@ -163,3 +163,38 @@
 	is($a, v10, "[perl #18857]");
     } 
 }
+
+
+# [perl #38619] Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)
+
+for ("a\x{100}", "xyz\x{100}") {
+    is(substr(uc($_), 0), uc($_), "[perl #38619] uc");
+}
+for ("A\x{100}", "XYZ\x{100}") {
+    is(substr(lc($_), 0), lc($_), "[perl #38619] lc");
+}
+for ("a\x{100}", "??yz\x{100}") { # ?? to Ss (different length)
+    is(substr(ucfirst($_), 0), ucfirst($_), "[perl #38619] ucfirst");
+}
+
+# Related to [perl #38619]
+# the original report concerns PERL_MAGIC_utf8.
+# these cases concern PERL_MAGIC_regex_global.
+
+for (map { $_ } "a\x{100}", "abc\x{100}", "\x{100}") {
+    chop; # get ("a", "abc", "") in utf8
+    my $return =  uc($_) =~ /\G(.?)/g;
+    my $result = $return ? $1 : "not";
+    my $expect = (uc($_) =~ /(.?)/g)[0];
+    is($return, 1,       "[perl #38619]");
+    is($result, $expect, "[perl #38619]");
+}
+
+for (map { $_ } "A\x{100}", "ABC\x{100}", "\x{100}") {
+    chop; # get ("A", "ABC", "") in utf8
+    my $return =  lc($_) =~ /\G(.?)/g;
+    my $result = $return ? $1 : "not";
+    my $expect = (lc($_) =~ /(.?)/g)[0];
+    is($return, 1,       "[perl #38619]");
+    is($result, $expect, "[perl #38619]");
+}
--- perl-5.8.8/pp.c.U27329	2006-06-01 21:30:14.000000000 -0400
+++ perl-5.8.8/pp.c	2006-06-01 21:53:37.000000000 -0400
@@ -3447,7 +3447,8 @@
 	    if (slen > ulen)
 	        sv_catpvn(TARG, (char*)(s + ulen), slen - ulen);
 	    SvUTF8_on(TARG);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    s = (U8*)SvPV_force_nomg(sv, slen);
@@ -3502,7 +3503,8 @@
 	    if (slen > ulen)
 	        sv_catpvn(TARG, (char*)(s + ulen), slen - ulen);
 	    SvUTF8_on(TARG);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    s = (U8*)SvPV_force_nomg(sv, slen);
@@ -3552,7 +3554,8 @@
 	if (!len) {
 	    SvUTF8_off(TARG);				/* decontaminate */
 	    sv_setpvn(TARG, "", 0);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    STRLEN min = len + 1;
@@ -3585,7 +3588,8 @@
 	    *d = '\0';
 	    SvUTF8_on(TARG);
 	    SvCUR_set(TARG, d - (U8*)SvPVX_const(TARG));
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
     }
     else {
@@ -3636,7 +3640,8 @@
 	if (!len) {
 	    SvUTF8_off(TARG);				/* decontaminate */
 	    sv_setpvn(TARG, "", 0);
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
 	else {
 	    STRLEN min = len + 1;
@@ -3688,7 +3693,8 @@
 	    *d = '\0';
 	    SvUTF8_on(TARG);
 	    SvCUR_set(TARG, d - (U8*)SvPVX_const(TARG));
-	    SETs(TARG);
+	    sv = TARG;
+	    SETs(sv);
 	}
     }
     else {

perl-5.8.8-U27391.patch:
 doop.c     |    8 +--
 embed.fnc  |    6 +-
 embed.h    |    8 +--
 global.sym |    2 
 pp.c       |   26 +++++++---
 proto.h    |    6 +-
 sv.c       |   43 +++++++++++++----
 sv.h       |   14 +++++
 t/op/bop.t |  148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 9 files changed, 228 insertions(+), 33 deletions(-)

--- NEW FILE perl-5.8.8-U27391.patch ---
--- perl-5.8.8/t/op/bop.t.U27391	2006-01-06 17:44:14.000000000 -0500
+++ perl-5.8.8/t/op/bop.t	2006-06-01 18:43:20.000000000 -0400
@@ -15,7 +15,7 @@
 # If you find tests are failing, please try adding names to tests to track
 # down where the failure is, and supply your new names as a patch.
 # (Just-in-time test naming)
-plan tests => 49;
+plan tests => 148;
 
 # numerics
 ok ((0xdead & 0xbeef) == 0x9ead);
@@ -197,3 +197,149 @@
     $b &= "b";
     ok($b =~ /b+$/, 'Unicode "b" is NUL-terminated');
 }
+
+require "./test.pl";
+curr_test(50);
+
+# double magic tests
+
+sub TIESCALAR { bless { value => $_[1], orig => $_[1] } }
+sub STORE { $_[0]{store}++; $_[0]{value} = $_[1] }
+sub FETCH { $_[0]{fetch}++; $_[0]{value} }
+sub stores { tied($_[0])->{value} = tied($_[0])->{orig};
+             delete(tied($_[0])->{store}) || 0 }
+sub fetches { delete(tied($_[0])->{fetch}) || 0 }
+
+# numeric double magic tests
+
+tie $x, "main", 1;
+tie $y, "main", 3;
+
+is(($x | $y), 3);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x & $y), 1);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x ^ $y), 2);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x |= $y), 3);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x &= $y), 1);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x ^= $y), 2);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(~~$y, 3);
+is(fetches($y), 1);
+is(stores($y), 0);
+
+{ use integer;
+
+is(($x | $y), 3);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x & $y), 1);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x ^ $y), 2);
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x |= $y), 3);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x &= $y), 1);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x ^= $y), 2);
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(~$y, -4);
+is(fetches($y), 1);
+is(stores($y), 0);
+
+} # end of use integer;
+
+# stringwise double magic tests
+
+tie $x, "main", "a";
+tie $y, "main", "c";
+
+is(($x | $y), ("a" | "c"));
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x & $y), ("a" & "c"));
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x ^ $y), ("a" ^ "c"));
+is(fetches($x), 1);
+is(fetches($y), 1);
+is(stores($x), 0);
+is(stores($y), 0);
+
+is(($x |= $y), ("a" | "c"));
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x &= $y), ("a" & "c"));
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(($x ^= $y), ("a" ^ "c"));
+is(fetches($x), 2);
+is(fetches($y), 1);
+is(stores($x), 1);
+is(stores($y), 0);
+
+is(~~$y, "c");
+is(fetches($y), 1);
+is(stores($y), 0);
--- perl-5.8.8/pp.c.U27391	2006-06-01 18:19:16.000000000 -0400
+++ perl-5.8.8/pp.c	2006-06-01 18:43:19.000000000 -0400
@@ -2229,13 +2229,15 @@
     dSP; dATARGET; tryAMAGICbin(band,opASSIGN);
     {
       dPOPTOPssrl;
+      if (SvGMAGICAL(left)) mg_get(left);
+      if (SvGMAGICAL(right)) mg_get(right);
       if (SvNIOKp(left) || SvNIOKp(right)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = SvIV(left) & SvIV(right);
+	  const IV i = SvIV_nomg(left) & SvIV_nomg(right);
 	  SETi(i);
 	}
 	else {
-	  const UV u = SvUV(left) & SvUV(right);
+	  const UV u = SvUV_nomg(left) & SvUV_nomg(right);
 	  SETu(u);
 	}
       }
@@ -2252,13 +2254,15 @@
     dSP; dATARGET; tryAMAGICbin(bxor,opASSIGN);
     {
       dPOPTOPssrl;
+      if (SvGMAGICAL(left)) mg_get(left);
+      if (SvGMAGICAL(right)) mg_get(right);
       if (SvNIOKp(left) || SvNIOKp(right)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = (USE_LEFT(left) ? SvIV(left) : 0) ^ SvIV(right);
+	  const IV i = (USE_LEFT(left) ? SvIV_nomg(left) : 0) ^ SvIV_nomg(right);
 	  SETi(i);
 	}
 	else {
-	  const UV u = (USE_LEFT(left) ? SvUV(left) : 0) ^ SvUV(right);
+	  const UV u = (USE_LEFT(left) ? SvUV_nomg(left) : 0) ^ SvUV_nomg(right);
 	  SETu(u);
 	}
       }
@@ -2275,13 +2279,15 @@
     dSP; dATARGET; tryAMAGICbin(bor,opASSIGN);
     {
       dPOPTOPssrl;
+      if (SvGMAGICAL(left)) mg_get(left);
+      if (SvGMAGICAL(right)) mg_get(right);
       if (SvNIOKp(left) || SvNIOKp(right)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = (USE_LEFT(left) ? SvIV(left) : 0) | SvIV(right);
+	  const IV i = (USE_LEFT(left) ? SvIV_nomg(left) : 0) | SvIV_nomg(right);
 	  SETi(i);
 	}
 	else {
-	  const UV u = (USE_LEFT(left) ? SvUV(left) : 0) | SvUV(right);
+	  const UV u = (USE_LEFT(left) ? SvUV_nomg(left) : 0) | SvUV_nomg(right);
 	  SETu(u);
 	}
       }
@@ -2376,13 +2382,15 @@
     dSP; dTARGET; tryAMAGICun(compl);
     {
       dTOPss;
+      if (SvGMAGICAL(sv))
+	  mg_get(sv);
       if (SvNIOKp(sv)) {
 	if (PL_op->op_private & HINT_INTEGER) {
-	  const IV i = ~SvIV(sv);
+	  const IV i = ~SvIV_nomg(sv);
 	  SETi(i);
 	}
 	else {
-	  const UV u = ~SvUV(sv);
+	  const UV u = ~SvUV_nomg(sv);
 	  SETu(u);
 	}
       }
@@ -2392,7 +2400,7 @@
 	STRLEN len;
 
 	(void)SvPV_nomg_const(sv,len); /* force check for uninit var */
-	SvSetSV(TARG, sv);
+	sv_setsv_nomg(TARG, sv);
 	tmps = (U8*)SvPV_force(TARG, len);
 	anum = len;
 	if (SvUTF8(TARG)) {
--- perl-5.8.8/global.sym.U27391	2006-01-31 10:50:34.000000000 -0500
+++ perl-5.8.8/global.sym	2006-06-01 18:43:19.000000000 -0400
@@ -432,6 +432,7 @@
 Perl_sv_2cv
 Perl_sv_2io
 Perl_sv_2iv
+Perl_sv_2iv_flags
 Perl_sv_2mortal
 Perl_sv_2nv
 Perl_sv_2pv
@@ -439,6 +440,7 @@
 Perl_sv_2pvbyte
 Perl_sv_pvn_nomg
 Perl_sv_2uv
+Perl_sv_2uv_flags
 Perl_sv_iv
 Perl_sv_uv
 Perl_sv_nv
--- perl-5.8.8/proto.h.U27391	2006-01-31 10:50:34.000000000 -0500
+++ perl-5.8.8/proto.h	2006-06-01 18:43:19.000000000 -0400
@@ -1139,14 +1139,16 @@
 PERL_CALLCONV bool	Perl_sv_2bool(pTHX_ SV* sv);
 PERL_CALLCONV CV*	Perl_sv_2cv(pTHX_ SV* sv, HV** st, GV** gvp, I32 lref);
 PERL_CALLCONV IO*	Perl_sv_2io(pTHX_ SV* sv);
-PERL_CALLCONV IV	Perl_sv_2iv(pTHX_ SV* sv);
+/* PERL_CALLCONV IV	sv_2iv(pTHX_ SV* sv); */
+PERL_CALLCONV IV	Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags);
 PERL_CALLCONV SV*	Perl_sv_2mortal(pTHX_ SV* sv);
 PERL_CALLCONV NV	Perl_sv_2nv(pTHX_ SV* sv);
 /* PERL_CALLCONV char*	sv_2pv(pTHX_ SV* sv, STRLEN* lp); */
 PERL_CALLCONV char*	Perl_sv_2pvutf8(pTHX_ SV* sv, STRLEN* lp);
 PERL_CALLCONV char*	Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp);
 PERL_CALLCONV char*	Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp);
-PERL_CALLCONV UV	Perl_sv_2uv(pTHX_ SV* sv);
+/* PERL_CALLCONV UV	sv_2uv(pTHX_ SV* sv); */
+PERL_CALLCONV UV	Perl_sv_2uv_flags(pTHX_ SV* sv, I32 flags);
 PERL_CALLCONV IV	Perl_sv_iv(pTHX_ SV* sv);
 PERL_CALLCONV UV	Perl_sv_uv(pTHX_ SV* sv);
 PERL_CALLCONV NV	Perl_sv_nv(pTHX_ SV* sv);
--- perl-5.8.8/embed.fnc.U27391	2006-01-31 09:40:27.000000000 -0500
+++ perl-5.8.8/embed.fnc	2006-06-01 18:43:19.000000000 -0400
@@ -727,14 +727,16 @@
 Apd	|bool	|sv_2bool	|NN SV* sv
 Apd	|CV*	|sv_2cv		|NULLOK SV* sv|NN HV** st|NN GV** gvp|I32 lref
 Apd	|IO*	|sv_2io		|NN SV* sv
-Apd	|IV	|sv_2iv		|NN SV* sv
+Amb	|IV	|sv_2iv		|NN SV* sv
+Apd	|IV	|sv_2iv_flags	|NN SV* sv|I32 flags
 Apd	|SV*	|sv_2mortal	|NULLOK SV* sv
 Apd	|NV	|sv_2nv		|NN SV* sv
 Amb	|char*	|sv_2pv		|NN SV* sv|NULLOK STRLEN* lp
 Apd	|char*	|sv_2pvutf8	|NN SV* sv|NULLOK STRLEN* lp
 Apd	|char*	|sv_2pvbyte	|NN SV* sv|NULLOK STRLEN* lp
 Ap	|char*	|sv_pvn_nomg	|NN SV* sv|NULLOK STRLEN* lp
-Apd	|UV	|sv_2uv		|NN SV* sv
+Amb	|UV	|sv_2uv		|NN SV* sv
+Apd	|UV	|sv_2uv_flags	|NN SV* sv|I32 flags
 Apd	|IV	|sv_iv		|NN SV* sv
 Apd	|UV	|sv_uv		|NN SV* sv
 Apd	|NV	|sv_nv		|NN SV* sv
--- perl-5.8.8/embed.h.U27391	2006-01-31 10:50:34.000000000 -0500
+++ perl-5.8.8/embed.h	2006-06-01 18:43:19.000000000 -0400
@@ -780,13 +780,13 @@
 #define sv_2bool		Perl_sv_2bool
 #define sv_2cv			Perl_sv_2cv
 #define sv_2io			Perl_sv_2io
-#define sv_2iv			Perl_sv_2iv
+#define sv_2iv_flags		Perl_sv_2iv_flags
 #define sv_2mortal		Perl_sv_2mortal
 #define sv_2nv			Perl_sv_2nv
 #define sv_2pvutf8		Perl_sv_2pvutf8
 #define sv_2pvbyte		Perl_sv_2pvbyte
 #define sv_pvn_nomg		Perl_sv_pvn_nomg
-#define sv_2uv			Perl_sv_2uv
+#define sv_2uv_flags		Perl_sv_2uv_flags
 #define sv_iv			Perl_sv_iv
 #define sv_uv			Perl_sv_uv
 #define sv_nv			Perl_sv_nv
@@ -2831,13 +2831,13 @@
 #define sv_2bool(a)		Perl_sv_2bool(aTHX_ a)
 #define sv_2cv(a,b,c,d)		Perl_sv_2cv(aTHX_ a,b,c,d)
 #define sv_2io(a)		Perl_sv_2io(aTHX_ a)
-#define sv_2iv(a)		Perl_sv_2iv(aTHX_ a)
+#define sv_2iv_flags(a,b)	Perl_sv_2iv_flags(aTHX_ a,b)
 #define sv_2mortal(a)		Perl_sv_2mortal(aTHX_ a)
 #define sv_2nv(a)		Perl_sv_2nv(aTHX_ a)
 #define sv_2pvutf8(a,b)		Perl_sv_2pvutf8(aTHX_ a,b)
 #define sv_2pvbyte(a,b)		Perl_sv_2pvbyte(aTHX_ a,b)
 #define sv_pvn_nomg(a,b)	Perl_sv_pvn_nomg(aTHX_ a,b)
-#define sv_2uv(a)		Perl_sv_2uv(aTHX_ a)
+#define sv_2uv_flags(a,b)	Perl_sv_2uv_flags(aTHX_ a,b)
 #define sv_iv(a)		Perl_sv_iv(aTHX_ a)
 #define sv_uv(a)		Perl_sv_uv(aTHX_ a)
 #define sv_nv(a)		Perl_sv_nv(aTHX_ a)
--- perl-5.8.8/sv.h.U27391	2006-01-02 09:51:46.000000000 -0500
+++ perl-5.8.8/sv.h	2006-06-01 18:43:20.000000000 -0400
@@ -953,6 +953,9 @@
 =for apidoc Am|char*|SvPVx|SV* sv|STRLEN len
 A version of C<SvPV> which guarantees to evaluate sv only once.
 
+=for apidoc Am|char*|SvPV_nomg|SV* sv|STRLEN len
+Like C<SvPV> but doesn't process magic.
+
 =for apidoc Am|char*|SvPV_nolen|SV* sv
 Returns a pointer to the string in the SV, or a stringified form of
 the SV if the SV does not contain a string.  The SV may cache the
@@ -962,6 +965,9 @@
 Coerces the given SV to an integer and returns it. See  C<SvIVx> for a
 version which guarantees to evaluate sv only once.
 
+=for apidoc Am|IV|SvIV_nomg|SV* sv
+Like C<SvIV> but doesn't process magic.
+
 =for apidoc Am|IV|SvIVx|SV* sv
 Coerces the given SV to an integer and returns it. Guarantees to evaluate
 sv only once. Use the more efficient C<SvIV> otherwise.
@@ -978,6 +984,9 @@
 Coerces the given SV to an unsigned integer and returns it.  See C<SvUVx>
 for a version which guarantees to evaluate sv only once.
 
+=for apidoc Am|UV|SvUV_nomg|SV* sv
+Like C<SvUV> but doesn't process magic.
+
 =for apidoc Am|UV|SvUVx|SV* sv
 Coerces the given SV to an unsigned integer and returns it. Guarantees to
 evaluate sv only once. Use the more efficient C<SvUV> otherwise.
@@ -1050,6 +1059,9 @@
 #define SvUV(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv(sv))
 #define SvNV(sv) (SvNOK(sv) ? SvNVX(sv) : sv_2nv(sv))
 
+#define SvIV_nomg(sv) (SvIOK(sv) ? SvIVX(sv) : sv_2iv_flags(sv, 0))
+#define SvUV_nomg(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv_flags(sv, 0))
+
 /* ----*/
 
 #define SvPV(sv, lp) SvPV_flags(sv, lp, SV_GMAGIC)
@@ -1251,6 +1263,8 @@
 #define sv_2pv_nomg(sv, lp) sv_2pv_flags(sv, lp, 0)
 #define sv_pvn_force(sv, lp) sv_pvn_force_flags(sv, lp, SV_GMAGIC)
 #define sv_utf8_upgrade(sv) sv_utf8_upgrade_flags(sv, SV_GMAGIC)
+#define sv_2iv(sv) sv_2iv_flags(sv, SV_GMAGIC)
+#define sv_2uv(sv) sv_2uv_flags(sv, SV_GMAGIC)
 
 /* Should be named SvCatPVN_utf8_upgrade? */
 #define sv_catpvn_utf8_upgrade(dsv, sstr, slen, nsv)	\
--- perl-5.8.8/sv.c.U27391	2006-01-16 07:22:21.000000000 -0500
+++ perl-5.8.8/sv.c	2006-06-01 18:43:19.000000000 -0400
@@ -2062,22 +2062,34 @@
 }
 #endif /* !NV_PRESERVES_UV*/
 
+/* sv_2iv() is now a macro using Perl_sv_2iv_flags();
+ * this function provided for binary compatibility only
+ */
+
+IV
+Perl_sv_2iv(pTHX_ register SV *sv)
+{
+    return sv_2iv_flags(sv, SV_GMAGIC);
+}
+
 /*
-=for apidoc sv_2iv
+=for apidoc sv_2iv_flags
 
-Return the integer value of an SV, doing any necessary string conversion,
-magic etc. Normally used via the C<SvIV(sv)> and C<SvIVx(sv)> macros.
+Return the integer value of an SV, doing any necessary string
+conversion.  If flags includes SV_GMAGIC, does an mg_get() first.
+Normally used via the C<SvIV(sv)> and C<SvIVx(sv)> macros.
 
 =cut
 */
 
 IV
-Perl_sv_2iv(pTHX_ register SV *sv)
+Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags)
 {
     if (!sv)
 	return 0;
     if (SvGMAGICAL(sv)) {
-	mg_get(sv);
+	if (flags & SV_GMAGIC)
+	    mg_get(sv);
 	if (SvIOKp(sv))
 	    return SvIVX(sv);
 	if (SvNOKp(sv)) {
@@ -2361,23 +2373,34 @@
     return SvIsUV(sv) ? (IV)SvUVX(sv) : SvIVX(sv);
 }
 
+/* sv_2uv() is now a macro using Perl_sv_2uv_flags();
+ * this function provided for binary compatibility only
+ */
+
+UV
+Perl_sv_2uv(pTHX_ register SV *sv)
+{
+    return sv_2uv_flags(sv, SV_GMAGIC);
+}
+
 /*
-=for apidoc sv_2uv
+=for apidoc sv_2uv_flags
 
 Return the unsigned integer value of an SV, doing any necessary string
-conversion, magic etc. Normally used via the C<SvUV(sv)> and C<SvUVx(sv)>
-macros.
+conversion.  If flags includes SV_GMAGIC, does an mg_get() first.
+Normally used via the C<SvUV(sv)> and C<SvUVx(sv)> macros.
 
 =cut
 */
 
 UV
-Perl_sv_2uv(pTHX_ register SV *sv)
+Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags)
 {
     if (!sv)
 	return 0;
     if (SvGMAGICAL(sv)) {
-	mg_get(sv);
+	if (flags & SV_GMAGIC)
+	    mg_get(sv);
 	if (SvIOKp(sv))
 	    return SvUVX(sv);
 	if (SvNOKp(sv))
--- perl-5.8.8/doop.c.U27391	2006-01-08 15:58:53.000000000 -0500
+++ perl-5.8.8/doop.c	2006-06-01 18:43:19.000000000 -0400
@@ -1171,8 +1171,8 @@
 
     if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv)))
 	sv_setpvn(sv, "", 0);	/* avoid undef warning on |= and ^= */
-    lsave = lc = SvPV_const(left, leftlen);
-    rsave = rc = SvPV_const(right, rightlen);
+    lsave = lc = SvPV_nomg_const(left, leftlen);
+    rsave = rc = SvPV_nomg_const(right, rightlen);
     len = leftlen < rightlen ? leftlen : rightlen;
     lensave = len;
     if ((left_utf || right_utf) && (sv == left || sv == right)) {
@@ -1180,9 +1180,7 @@
 	Newxz(dc, needlen + 1, char);
     }
     else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
-	/* Fix this to nong when change 22613 is integrated.
-	   (Which in turn awaits merging sv_2iv and sv_2uv)  */
-	dc = SvPV_force_nolen(sv);
+	dc = SvPV_force_nomg_nolen(sv);
 	if (SvLEN(sv) < (STRLEN)(len + 1)) {
 	    dc = SvGROW(sv, (STRLEN)(len + 1));
 	    (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);

perl-5.8.8-U27426.patch:
 perl.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-U27426.patch ---
--- perl-5.8.8/perl.c.U27426	2006-06-01 17:04:25.000000000 -0400
+++ perl-5.8.8/perl.c	2006-06-01 19:00:57.000000000 -0400
@@ -3076,8 +3076,7 @@
 	PL_minus_F = TRUE;
 	PL_splitstr = ++s;
 	while (*s && !isSPACE(*s)) ++s;
-	*s = '\0';
-	PL_splitstr = savepv(PL_splitstr);
+	PL_splitstr = savepvn(PL_splitstr, s - PL_splitstr);
 	return s;
     case 'a':
 	PL_minus_a = TRUE;

perl-5.8.8-U27509.patch:
 overload.t |  626 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 346 insertions(+), 280 deletions(-)

--- NEW FILE perl-5.8.8-U27509.patch ---
--- perl-5.8.8/lib/overload.t.U27509	2005-04-22 10:56:23.000000000 -0400
+++ perl-5.8.8/lib/overload.t	2006-06-01 19:13:32.000000000 -0400
@@ -46,92 +46,64 @@
 
 package main;
 
-our $test = 0;
 $| = 1;
-print "1..",&last,"\n";
+use Test::More tests => 508;
 
-sub test {
-  $test++; 
-  if (@_ > 1) {
-    my $comment = "";
-    $comment = " # " . $_ [2] if @_ > 2;
-    if ($_[0] eq $_[1]) {
-      print "ok $test$comment\n";
-      return 1;
-    } else {
-      $comment .= ": '$_[0]' ne '$_[1]'";
-      print "not ok $test$comment\n";
-      return 0;
-    }
-  } else {
-    if (shift) {
-      print "ok $test\n";
-      return 1;
-    } else {
-      print "not ok $test\n";
-      return 0;
-    }
-  }
-}
 
 $a = new Oscalar "087";
 $b= "$a";
 
-# All test numbers in comments are off by 1.
-# So much for hard-wiring them in :-) To fix this:
-test(1);			# 1
-
-test ($b eq $a);		# 2
-test ($b eq "087");		# 3
-test (ref $a eq "Oscalar");	# 4
-test ($a eq $a);		# 5
-test ($a eq "087");		# 6
+is($b, $a);
+is($b, "087");
+is(ref $a, "Oscalar");
+is($a, $a);
+is($a, "087");
 
 $c = $a + 7;
 
-test (ref $c eq "Oscalar");	# 7
-test (!($c eq $a));		# 8
-test ($c eq "94");		# 9
+is(ref $c, "Oscalar");
+isnt($c, $a);
+is($c, "94");
 
 $b=$a;
 
-test (ref $a eq "Oscalar");	# 10
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 11
-test ( $a eq "087");		# 12
-test ( $b eq "88");		# 13
-test (ref $a eq "Oscalar");	# 14
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 $c=$b;
 $c-=$a;
 
-test (ref $c eq "Oscalar");	# 15
-test ( $a eq "087");		# 16
-test ( $c eq "1");		# 17
-test (ref $a eq "Oscalar");	# 18
+is(ref $c, "Oscalar");
+is($a, "087");
+is($c, "1");
+is(ref $a, "Oscalar");
 
 $b=1;
 $b+=$a;
 
-test (ref $b eq "Oscalar");	# 19
-test ( $a eq "087");		# 20
-test ( $b eq "88");		# 21
-test (ref $a eq "Oscalar");	# 22
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 eval q[ package Oscalar; use overload ('++' => sub { $ {$_[0]}++;$_[0] } ) ];
 
 $b=$a;
 
-test (ref $a eq "Oscalar");	# 23
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 24
-test ( $a eq "087");		# 25
-test ( $b eq "88");		# 26
-test (ref $a eq "Oscalar");	# 27
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 package Oscalar;
 $dummy=bless \$dummy;		# Now cache of method should be reloaded
@@ -140,10 +112,10 @@
 $b=$a;
 $b++;				
 
-test (ref $b eq "Oscalar");	# 28
-test ( $a eq "087");		# 29
-test ( $b eq "88");		# 30
-test (ref $a eq "Oscalar");	# 31
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 undef $b;			# Destroying updates tables too...
 
@@ -151,14 +123,14 @@
 
 $b=$a;
 
-test (ref $a eq "Oscalar");	# 32
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 33
-test ( $a eq "087");		# 34
-test ( $b eq "88");		# 35
-test (ref $a eq "Oscalar");	# 36
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
 
 package Oscalar;
 $dummy=bless \$dummy;		# Now cache of method should be reloaded
@@ -166,21 +138,21 @@
 
 $b++;				
 
-test (ref $b eq "Oscalar");	# 37
-test ( $a eq "087");		# 38
-test ( $b eq "90");		# 39
-test (ref $a eq "Oscalar");	# 40
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "90");
+is(ref $a, "Oscalar");
 
 $b=$a;
 $b++;
 
-test (ref $b eq "Oscalar");	# 41
-test ( $a eq "087");		# 42
-test ( $b eq "89");		# 43
-test (ref $a eq "Oscalar");	# 44
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "89");
+is(ref $a, "Oscalar");
 
 
-test ($b? 1:0);			# 45
+ok($b? 1:0);
 
 eval q[ package Oscalar; use overload ('=' => sub {$main::copies++; 
 						   package Oscalar;
@@ -189,44 +161,44 @@
 
 $b=new Oscalar "$a";
 
-test (ref $b eq "Oscalar");	# 46
-test ( $a eq "087");		# 47
-test ( $b eq "087");		# 48
-test (ref $a eq "Oscalar");	# 49
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "087");
+is(ref $a, "Oscalar");
 
 $b++;
 
-test (ref $b eq "Oscalar");	# 50
-test ( $a eq "087");		# 51
-test ( $b eq "89");		# 52
-test (ref $a eq "Oscalar");	# 53
-test ($copies == 0);		# 54
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "89");
+is(ref $a, "Oscalar");
+is($copies, undef);
 
 $b+=1;
 
-test (ref $b eq "Oscalar");	# 55
-test ( $a eq "087");		# 56
-test ( $b eq "90");		# 57
-test (ref $a eq "Oscalar");	# 58
-test ($copies == 0);		# 59
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "90");
+is(ref $a, "Oscalar");
+is($copies, undef);
 
 $b=$a;
 $b+=1;
 
-test (ref $b eq "Oscalar");	# 60
-test ( $a eq "087");		# 61
-test ( $b eq "88");		# 62
-test (ref $a eq "Oscalar");	# 63
-test ($copies == 0);		# 64
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "88");
+is(ref $a, "Oscalar");
+is($copies, undef);
 
 $b=$a;
 $b++;
 
-test (ref $b eq "Oscalar") || print ref $b,"=ref(b)\n";	# 65
-test ( $a eq "087");		# 66
-test ( $b eq "89");		# 67
-test (ref $a eq "Oscalar");	# 68
-test ($copies == 1);		# 69
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "89");
+is(ref $a, "Oscalar");
+is($copies, 1);
 
 eval q[package Oscalar; use overload ('+=' => sub {$ {$_[0]} += 3*$_[1];
 						   $_[0] } ) ];
@@ -235,34 +207,34 @@
 $b=$a;
 $b+=1;
 
-test (ref $b eq "Oscalar");	# 70
-test ( $a eq "087");		# 71
-test ( $b eq "90");		# 72
-test (ref $a eq "Oscalar");	# 73
-test ($copies == 2);		# 74
+is(ref $b, "Oscalar");
+is($a, "087");
+is($b, "90");
+is(ref $a, "Oscalar");
+is($copies, 2);
 
 $b+=$b;
 
-test (ref $b eq "Oscalar");	# 75
-test ( $b eq "360");		# 76
-test ($copies == 2);		# 77
+is(ref $b, "Oscalar");
+is($b, "360");
+is($copies, 2);
 $b=-$b;
 
-test (ref $b eq "Oscalar");	# 78
-test ( $b eq "-360");		# 79
-test ($copies == 2);		# 80
+is(ref $b, "Oscalar");
+is($b, "-360");
+is($copies, 2);
 
 $b=abs($b);
 
-test (ref $b eq "Oscalar");	# 81
-test ( $b eq "360");		# 82
-test ($copies == 2);		# 83
+is(ref $b, "Oscalar");
+is($b, "360");
+is($copies, 2);
 
 $b=abs($b);
 
-test (ref $b eq "Oscalar");	# 84
-test ( $b eq "360");		# 85
-test ($copies == 2);		# 86
+is(ref $b, "Oscalar");
+is($b, "360");
+is($copies, 2);
 
 eval q[package Oscalar; 
        use overload ('x' => sub {new Oscalar ( $_[2] ? "_.$_[1]._" x $ {$_[0]}
@@ -270,7 +242,7 @@
 
 $a=new Oscalar "yy";
 $a x= 3;
-test ($a eq "_.yy.__.yy.__.yy._"); # 87
+is($a, "_.yy.__.yy.__.yy._");
 
 eval q[package Oscalar; 
        use overload ('.' => sub {new Oscalar ( $_[2] ? 
@@ -279,7 +251,7 @@
 
 $a=new Oscalar "xx";
 
-test ("b${a}c" eq "_._.b.__.xx._.__.c._"); # 88
+is("b${a}c", "_._.b.__.xx._.__.c._");
 
 # Check inheritance of overloading;
 {
@@ -288,26 +260,26 @@
 }
 
 $aI = new OscalarI "$a";
-test (ref $aI eq "OscalarI");	# 89
-test ("$aI" eq "xx");		# 90
-test ($aI eq "xx");		# 91
-test ("b${aI}c" eq "_._.b.__.xx._.__.c._");		# 92
+is(ref $aI, "OscalarI");
+is("$aI", "xx");
+is($aI, "xx");
+is("b${aI}c", "_._.b.__.xx._.__.c._");
 
 # Here we test blessing to a package updates hash
 
 eval "package Oscalar; no overload '.'";
 
-test ("b${a}" eq "_.b.__.xx._"); # 93
+is("b${a}", "_.b.__.xx._");
 $x="1";
 bless \$x, Oscalar;
-test ("b${a}c" eq "bxxc");	# 94
+is("b${a}c", "bxxc");
 new Oscalar 1;
-test ("b${a}c" eq "bxxc");	# 95
+is("b${a}c", "bxxc");
 
 # Negative overloading:
 
 $na = eval { ~$a };
-test($@ =~ /no method found/);	# 96
+like($@, qr/no method found/);
 
 # Check AUTOLOADING:
 
@@ -318,32 +290,32 @@
 eval "package Oscalar; sub comple; use overload '~' => 'comple'";
 
 $na = eval { ~$a };		# Hash was not updated
-test($@ =~ /no method found/);	# 97
+like($@, qr/no method found/);
 
 bless \$x, Oscalar;
 
 $na = eval { ~$a };		# Hash updated
 warn "`$na', $@" if $@;
-test !$@;			# 98
-test($na eq '_!_xx_!_');	# 99
+ok !$@;
+is($na, '_!_xx_!_');
 
 $na = 0;
 
 $na = eval { ~$aI };		# Hash was not updated
-test($@ =~ /no method found/);	# 100
+like($@, qr/no method found/);
 
 bless \$x, OscalarI;
 
 $na = eval { ~$aI };
 print $@;
 
-test !$@;			# 101
-test($na eq '_!_xx_!_');	# 102
+ok(!$@);
+is($na, '_!_xx_!_');
 
 eval "package Oscalar; sub rshft; use overload '>>' => 'rshft'";
 
 $na = eval { $aI >> 1 };	# Hash was not updated
-test($@ =~ /no method found/);	# 103
+like($@, qr/no method found/);
 
 bless \$x, OscalarI;
 
@@ -352,20 +324,20 @@
 $na = eval { $aI >> 1 };
 print $@;
 
-test !$@;			# 104
-test($na eq '_!_xx_!_');	# 105
+ok(!$@);
+is($na, '_!_xx_!_');
 
 # warn overload::Method($a, '0+'), "\n";
-test (overload::Method($a, '0+') eq \&Oscalar::numify); # 106
-test (overload::Method($aI,'0+') eq \&Oscalar::numify); # 107
-test (overload::Overloaded($aI)); # 108
-test (!overload::Overloaded('overload')); # 109
+is(overload::Method($a, '0+'), \&Oscalar::numify);
+is(overload::Method($aI,'0+'), \&Oscalar::numify);
+ok(overload::Overloaded($aI));
+ok(!overload::Overloaded('overload'));
 
-test (! defined overload::Method($aI, '<<')); # 110
-test (! defined overload::Method($a, '<')); # 111
+ok(! defined overload::Method($aI, '<<'));
+ok(! defined overload::Method($a, '<'));
 
-test (overload::StrVal($aI) =~ /^OscalarI=SCALAR\(0x[\da-fA-F]+\)$/); # 112
-test (overload::StrVal(\$aI) eq "@{[\$aI]}"); # 113
+like (overload::StrVal($aI), qr/^OscalarI=SCALAR\(0x[\da-fA-F]+\)$/);
+is(overload::StrVal(\$aI), "@{[\$aI]}");
 
 # Check overloading by methods (specified deep in the ISA tree).
 {
@@ -379,16 +351,16 @@
 $aII = \$aaII;
 bless $aII, 'OscalarII';
 bless \$fake, 'OscalarI';		# update the hash
-test(($aI | 3) eq '_<<_xx_<<_');	# 114
+is(($aI | 3), '_<<_xx_<<_');
 # warn $aII << 3;
-test(($aII << 3) eq '_<<_087_<<_');	# 115
+is(($aII << 3), '_<<_087_<<_');
 
 {
   BEGIN { $int = 7; overload::constant 'integer' => sub {$int++; shift}; }
   $out = 2**10;
 }
-test($int, 9);		# 116
-test($out, 1024);		# 117
+is($int, 9);
+is($out, 1024);
 
 $foo = 'foo';
 $foo1 = 'f\'o\\o';
@@ -402,15 +374,15 @@
   /b\b$foo.\./;
 }
 
-test($out, 'foo');		# 118
-test($out, $foo);		# 119
-test($out1, 'f\'o\\o');		# 120
-test($out1, $foo1);		# 121
-test($out2, "a\afoo,\,");	# 122
-test("@q", "foo q f'o\\\\o q a\\a qq ,\\, qq");	# 123
-test($q, 11);			# 124
-test("@qr", "b\\b qq .\\. qq");	# 125
-test($qr, 9);			# 126
+is($out, 'foo');
+is($out, $foo);
+is($out1, 'f\'o\\o');
+is($out1, $foo1);
+is($out2, "a\afoo,\,");
+is("@q", "foo q f'o\\\\o q a\\a qq ,\\, qq");
+is($q, 11);
+is("@qr", "b\\b qq .\\. qq");
+is($qr, 9);
 
 {
   $_ = '!<b>!foo!<-.>!';
@@ -433,19 +405,19 @@
   tr/A-Z/a-z/;
 }
 
-test($out, '_<foo>_');		# 117
-test($out1, '_<f\'o\\o>_');		# 128
-test($out2, "_<a\a>_foo_<,\,>_");	# 129
-test("@q1", "foo q f'o\\\\o q a\\a qq ,\\, qq oups
+is($out, '_<foo>_');
+is($out1, '_<f\'o\\o>_');
+is($out2, "_<a\a>_foo_<,\,>_");
+is("@q1", "foo q f'o\\\\o q a\\a qq ,\\, qq oups
  qq oups1
- q second part q tail here s A-Z tr a-z tr");	# 130
-test("@qr1", "b\\b qq .\\. qq try it q first part q yet another qq");	# 131
-test($res, 1);			# 132
-test($a, "_<oups
->_");	# 133
-test($b, "_<oups1
->_");	# 134
-test($c, "bareword");	# 135
+ q second part q tail here s A-Z tr a-z tr");
+is("@qr1", "b\\b qq .\\. qq try it q first part q yet another qq");
+is($res, 1);
+is($a, "_<oups
+>_");
+is($b, "_<oups1
+>_");
+is($c, "bareword");
 
 {
   package symbolic;		# Primitive symbolic calculator
@@ -513,24 +485,24 @@
 {
   my $foo = new symbolic 11;
   my $baz = $foo++;
-  test( (sprintf "%d", $foo), '12');
-  test( (sprintf "%d", $baz), '11');
+  is((sprintf "%d", $foo), '12');
+  is((sprintf "%d", $baz), '11');
   my $bar = $foo;
   $baz = ++$foo;
-  test( (sprintf "%d", $foo), '13');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '13');
+  is((sprintf "%d", $foo), '13');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '13');
   my $ban = $foo;
   $baz = ($foo += 1);
-  test( (sprintf "%d", $foo), '14');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '14');
-  test( (sprintf "%d", $ban), '13');
+  is((sprintf "%d", $foo), '14');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '14');
+  is((sprintf "%d", $ban), '13');
   $baz = 0;
   $baz = $foo++;
-  test( (sprintf "%d", $foo), '15');
-  test( (sprintf "%d", $baz), '14');
-  test( "$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
+  is((sprintf "%d", $foo), '15');
+  is((sprintf "%d", $baz), '14');
+  is("$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
 }
 
 {
@@ -543,8 +515,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -556,8 +528,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -565,9 +537,9 @@
   symbolic->vars($a, $b);
   my $c = sqrt($a**2 + $b**2);
   $a = 3; $b = 4;
-  test( (sprintf "%d", $c), '5');
+  is((sprintf "%d", $c), '5');
   $a = 12; $b = 5;
-  test( (sprintf "%d", $c), '13');
+  is((sprintf "%d", $c), '13');
 }
 
 {
@@ -634,24 +606,24 @@
 {
   my $foo = new symbolic1 11;
   my $baz = $foo++;
-  test( (sprintf "%d", $foo), '12');
-  test( (sprintf "%d", $baz), '11');
+  is((sprintf "%d", $foo), '12');
+  is((sprintf "%d", $baz), '11');
   my $bar = $foo;
   $baz = ++$foo;
-  test( (sprintf "%d", $foo), '13');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '13');
+  is((sprintf "%d", $foo), '13');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '13');
   my $ban = $foo;
   $baz = ($foo += 1);
-  test( (sprintf "%d", $foo), '14');
-  test( (sprintf "%d", $bar), '12');
-  test( (sprintf "%d", $baz), '14');
-  test( (sprintf "%d", $ban), '13');
+  is((sprintf "%d", $foo), '14');
+  is((sprintf "%d", $bar), '12');
+  is((sprintf "%d", $baz), '14');
+  is((sprintf "%d", $ban), '13');
   $baz = 0;
   $baz = $foo++;
-  test( (sprintf "%d", $foo), '15');
-  test( (sprintf "%d", $baz), '14');
-  test( "$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
+  is((sprintf "%d", $foo), '15');
+  is((sprintf "%d", $baz), '14');
+  is("$foo", '[++ [+= [++ [++ [n 11] 1] 1] 1] 1]');
 }
 
 {
@@ -664,8 +636,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -677,8 +649,8 @@
     $side = (sqrt(1 + $side**2) - 1)/$side;
   }
   my $pi = $side*(2**($iter+2));
-  test "$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]';
-  test( (sprintf "%f", $pi), '3.182598');
+  is("$side", '[/ [- [sqrt [+ 1 [** [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]] 2]]] 1] [/ [- [sqrt [+ 1 [** [n 1] 2]]] 1] [n 1]]]');
+  is((sprintf "%f", $pi), '3.182598');
 }
 
 {
@@ -686,9 +658,9 @@
   symbolic1->vars($a, $b);
   my $c = sqrt($a**2 + $b**2);
   $a = 3; $b = 4;
-  test( (sprintf "%d", $c), '5');
+  is((sprintf "%d", $c), '5');
   $a = 12; $b = 5;
-  test( (sprintf "%d", $c), '13');
+  is((sprintf "%d", $c), '13');
 }
 
 {
@@ -702,9 +674,9 @@
 
 {
   my $seven = new two_face ("vii", 7);
-  test( (sprintf "seven=$seven, seven=%d, eight=%d", $seven, $seven+1),
+  is((sprintf "seven=$seven, seven=%d, eight=%d", $seven, $seven+1),
 	'seven=vii, seven=7, eight=8');
-  test( scalar ($seven =~ /i/), '1')
+  is(scalar ($seven =~ /i/), '1');
 }
 
 {
@@ -717,7 +689,7 @@
   my @arr = map sorting->new($_), 0..12;
   my @sorted1 = sort @arr;
   my @sorted2 = map $$_, @sorted1;
-  test "@sorted2", '0 10 7 4 1 11 8 5 12 2 9 6 3';
+  is("@sorted2", '0 10 7 4 1 11 8 5 12 2 9 6 3');
 }
 {
   package iterator;
@@ -728,21 +700,21 @@
 
 # XXX iterator overload not intended to work with CORE::GLOBAL?
 if (defined &CORE::GLOBAL::glob) {
-  test '1', '1';	# 175
-  test '1', '1';	# 176
-  test '1', '1';	# 177
+  is('1', '1');
+  is('1', '1');
+  is('1', '1');
 }
 else {
   my $iter = iterator->new(5);
   my $acc = '';
   my $out;
   $acc .= " $out" while $out = <${iter}>;
-  test $acc, ' 5 4 3 2 1 0';	# 175
+  is($acc, ' 5 4 3 2 1 0');
   $iter = iterator->new(5);
-  test scalar <${iter}>, '5';	# 176
+  is(scalar <${iter}>, '5');
   $acc = '';
   $acc .= " $out" while $out = <$iter>;
-  test $acc, ' 4 3 2 1 0';	# 177
+  is($acc, ' 4 3 2 1 0');
 }
 {
   package deref;
@@ -773,53 +745,53 @@
   # Hash:
   my @cont = sort %$deref;
   if ("\t" eq "\011") { # ascii
-      test "@cont", '23 5 fake foo';	# 178
+      is("@cont", '23 5 fake foo');
   } 
   else {                # ebcdic alpha-numeric sort order
-      test "@cont", 'fake foo 23 5';	# 178
+      is("@cont", 'fake foo 23 5');
   }
   my @keys = sort keys %$deref;
-  test "@keys", 'fake foo';	# 179
+  is("@keys", 'fake foo');
   my @val = sort values %$deref;
-  test "@val", '23 5';		# 180
-  test $deref->{foo}, 5;	# 181
-  test defined $deref->{bar}, ''; # 182
+  is("@val", '23 5');
+  is($deref->{foo}, 5);
+  is(defined $deref->{bar}, '');
   my $key;
   @keys = ();
   push @keys, $key while $key = each %$deref;
   @keys = sort @keys;
-  test "@keys", 'fake foo';	# 183  
-  test exists $deref->{bar}, ''; # 184
-  test exists $deref->{foo}, 1; # 185
+  is("@keys", 'fake foo');
+  is(exists $deref->{bar}, '');
+  is(exists $deref->{foo}, 1);
   # Code:
-  test $deref->(5), 39;		# 186
-  test &$deref(6), 40;		# 187
+  is($deref->(5), 39);
+  is(&$deref(6), 40);
   sub xxx_goto { goto &$deref }
-  test xxx_goto(7), 41;		# 188
+  is(xxx_goto(7), 41);
   my $srt = bless { c => sub {$b <=> $a}
 		  }, 'deref';
   *srt = \&$srt;
   my @sorted = sort srt 11, 2, 5, 1, 22;
-  test "@sorted", '22 11 5 2 1'; # 189
+  is("@sorted", '22 11 5 2 1');
   # Scalar
-  test $$deref, 123;		# 190
+  is($$deref, 123);
   # Code
   @sorted = sort $srt 11, 2, 5, 1, 22;
-  test "@sorted", '22 11 5 2 1'; # 191
+  is("@sorted", '22 11 5 2 1');
   # Array
-  test "@$deref", '11 12 13';	# 192
-  test $#$deref, '2';		# 193
+  is("@$deref", '11 12 13');
+  is($#$deref, '2');
   my $l = @$deref;
-  test $l, 3;			# 194
-  test $deref->[2], '13';		# 195
+  is($l, 3);
+  is($deref->[2], '13');
   $l = pop @$deref;
-  test $l, 13;			# 196
+  is($l, 13);
   $l = 1;
-  test $deref->[$l], '12';	# 197
+  is($deref->[$l], '12');
   # Repeated dereference
   my $double = bless { h => $deref,
 		     }, 'deref';
-  test $double->{foo}, 5;	# 198
+  is($double->{foo}, 5);
 }
 
 {
@@ -856,9 +828,9 @@
 
 my $bar = new two_refs 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 199
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 200
+is($bar->[3], 13);
 
 {
   package two_refs_o;
@@ -867,9 +839,9 @@
 
 $bar = new two_refs_o 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 201
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 202
+is($bar->[3], 13);
 
 {
   package two_refs1;
@@ -909,9 +881,9 @@
 
 $bar = new two_refs_o 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 203
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 204
+is($bar->[3], 13);
 
 {
   package two_refs1_o;
@@ -920,9 +892,9 @@
 
 $bar = new two_refs1_o 3,4,5,6;
 $bar->[2] = 11;
-test $bar->{two}, 11;		# 205
+is($bar->{two}, 11);
 $bar->{three} = 13;
-test $bar->[3], 13;		# 206
+is($bar->[3], 13);
 
 {
   package B;
@@ -932,12 +904,12 @@
 my $aaa;
 { my $bbbb = 0; $aaa = bless \$bbbb, B }
 
-test !$aaa, 1;			# 207
+is !$aaa, 1;
 
 unless ($aaa) {
-  test 'ok', 'ok';		# 208
+  pass();
 } else {
-  test 'is not', 'ok';		# 208
+  fail();
 }
 
 # check that overload isn't done twice by join
@@ -945,7 +917,7 @@
   package Join;
   use overload '""' => sub { $c++ };
   my $x = join '', bless([]), 'pq', bless([]);
-  main::test $x, '0pq1';		# 209
+  main::is $x, '0pq1';
 };
 
 # Test module-specific warning
@@ -954,10 +926,10 @@
     my $a = "" ;
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     $x = eval ' overload::constant "integer" ; ' ;
-    test($a eq "") ; # 210
+    is($a, "");
     use warnings 'overload' ;
     $x = eval ' overload::constant "integer" ; ' ;
-    test($a =~ /^Odd number of arguments for overload::constant at/) ; # 211
+    like($a, qr/^Odd number of arguments for overload::constant at/);
 }
 
 {
@@ -965,10 +937,10 @@
     my $a = "" ;
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     $x = eval ' overload::constant "fred" => sub {} ; ' ;
-    test($a eq "") ; # 212
+    is($a, "");
     use warnings 'overload' ;
     $x = eval ' overload::constant "fred" => sub {} ; ' ;
-    test($a =~ /^`fred' is not an overloadable type at/); # 213
+    like($a, qr/^`fred' is not an overloadable type at/);
 }
 
 {
@@ -976,10 +948,10 @@
     my $a = "" ;
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     $x = eval ' overload::constant "integer" => 1; ' ;
-    test($a eq "") ; # 214
+    is($a, "");
     use warnings 'overload' ;
     $x = eval ' overload::constant "integer" => 1; ' ;
-    test($a =~ /^`1' is not a code reference at/); # 215
+    like($a, qr/^`1' is not a code reference at/);
 }
 
 {
@@ -1005,13 +977,13 @@
 
   my $x = new noov_int 11;
   my $int_x = int $x;
-  main::test("$int_x" eq 20);			# 216
+  main::is("$int_x", 20);
   $x = new ov_int1 31;
   $int_x = int $x;
-  main::test("$int_x" eq 131);			# 217
+  main::is("$int_x", 131);
   $x = new ov_int2 51;
   $int_x = int $x;
-  main::test("$int_x" eq 1054);			# 218
+  main::is("$int_x", 1054);
 }
 
 # make sure that we don't inifinitely recurse
@@ -1023,9 +995,10 @@
                'bool'  => sub { shift },
                fallback => 1;
   my $x = bless([]);
-  main::test("$x" =~ /Recurse=ARRAY/);		# 219
-  main::test($x);                               # 220
-  main::test($x+0 =~ /Recurse=ARRAY/);		# 221
+  # For some reason beyond me these have to be oks rather than likes.
+  main::ok("$x" =~ /Recurse=ARRAY/);
+  main::ok($x);
+  main::ok($x+0 =~ qr/Recurse=ARRAY/);
 }
 
 # BugID 20010422.003
@@ -1056,7 +1029,7 @@
 my $r = Foo->new(8);
 $r = Foo->new(0);
 
-test(($r || 0) == 0); # 222
+is(($r || 0), 0);
 
 package utf8_o;
 
@@ -1076,8 +1049,8 @@
 
 
 my $utfvar = new utf8_o 200.2.1;
-test("$utfvar" eq 200.2.1); # 223 - stringify
-test("a$utfvar" eq "a".200.2.1); # 224 - overload via sv_2pv_flags
+is("$utfvar", 200.2.1); # 223 - stringify
+is("a$utfvar", "a".200.2.1); # 224 - overload via sv_2pv_flags
 
 # 225..227 -- more %{} tests.  Hangs in 5.6.0, okay in later releases.
 # Basically this example implements strong encapsulation: if Hderef::import()
@@ -1093,9 +1066,9 @@
 package main;
 my $a = Foo->new;
 $a->xet('b', 42);
-test ($a->xet('b'), 42);
-test (!defined eval { $a->{b} });
-test ($@ =~ /zap/);
+is ($a->xet('b'), 42);
+ok (!defined eval { $a->{b} });
+like ($@, qr/zap/);
 
 {
    package t229;
@@ -1110,7 +1083,7 @@
       my $y = $x;
       eval { $y++ };
    }
-   main::test (!$warn);
+   main::ok (!$warn);
 }
 
 {
@@ -1120,9 +1093,9 @@
         $out1 = 0;
         $out2 = 1;
     }
-    test($int,  2,  "#24313");	# 230
-    test($out1, 17, "#24313");	# 231
-    test($out2, 17, "#24313");	# 232
+    is($int,  2,  "#24313");	# 230
+    is($out1, 17, "#24313");	# 231
+    is($out2, 17, "#24313");	# 232
 }
 
 {
@@ -1146,16 +1119,16 @@
     my $o  = bless [], 'perl31793';
     my $of = bless [], 'perl31793_fb';
     my $no = bless [], 'no_overload';
-    test (overload::StrVal(\"scalar") =~ /^SCALAR\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal([])        =~ /^ARRAY\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal({})        =~ /^HASH\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(sub{1})    =~ /^CODE\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(\*GLOB)    =~ /^GLOB\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(\$o)       =~ /^REF\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal(qr/a/)     =~ /^Regexp=SCALAR\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal($o)        =~ /^perl31793=ARRAY\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal($of)       =~ /^perl31793_fb=ARRAY\(0x[0-9a-f]+\)$/);
-    test (overload::StrVal($no)       =~ /^no_overload=ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(\"scalar"), qr/^SCALAR\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal([]),        qr/^ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal({}),        qr/^HASH\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(sub{1}),    qr/^CODE\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(\*GLOB),    qr/^GLOB\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(\$o),       qr/^REF\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal(qr/a/),     qr/^Regexp=SCALAR\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal($o),        qr/^perl31793=ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal($of),       qr/^perl31793_fb=ARRAY\(0x[0-9a-f]+\)$/);
+    like(overload::StrVal($no),       qr/^no_overload=ARRAY\(0x[0-9a-f]+\)$/);
 }
 
 # These are all check that overloaded values rather than reference addressess
@@ -1174,9 +1147,102 @@
 	    die if $@;
 	    my $expect = eval $rcode;
 	    die if $@;
-	    test ($got, $expect, $ocode) or print "# $rcode\n";
+	    is ($got, $expect, $ocode) or print "# $rcode\n";
 	}
     }
 }
-# Last test is:
-sub last {493}
+{
+    # check that overloading works in regexes
+    {
+	package Foo493;
+	use overload
+	    '""' => sub { "^$_[0][0]\$" },
+	    '.'  => sub { 
+		    bless [
+			     $_[2]
+			    ? (ref $_[1] ? $_[1][0] : $_[1]) . ':' .$_[0][0] 
+			    : $_[0][0] . ':' . (ref $_[1] ? $_[1][0] : $_[1])
+		    ], 'Foo493'
+			};
+    }
+
+    my $a = bless [ "a" ], 'Foo493';
+    like('a', qr/$a/);
+    like('x:a', qr/x$a/);
+    like('x:a:=', qr/x$a=$/);
+    like('x:a:a:=', qr/x$a$a=$/);
+
+}
+
+{
+    package Sklorsh;
+    use overload
+	bool     => sub { shift->is_cool };
+
+    sub is_cool {
+	$_[0]->{name} eq 'cool';
+    }
+
+    sub delete {
+	undef %{$_[0]};
+	bless $_[0], 'Brap';
+	return 1;
+    }
+
+    sub delete_with_self {
+	my $self = shift;
+	undef %$self;
+	bless $self, 'Brap';
+	return 1;
+    }
+
+    package Brap;
+
+    1;
+
+    package main;
+
+    my $obj;
+    $obj = bless {name => 'cool'}, 'Sklorsh';
+    $obj->delete;
+    ok(eval {if ($obj) {1}; 1}, $@ || 'reblessed into nonexist namespace');
+
+    $obj = bless {name => 'cool'}, 'Sklorsh';
+    $obj->delete_with_self;
+    ok (eval {if ($obj) {1}; 1}, $@);
+    
+    my $a = $b = {name => 'hot'};
+    bless $b, 'Sklorsh';
+    is(ref $a, 'Sklorsh');
+    is(ref $b, 'Sklorsh');
+    ok(!$b, "Expect overloaded boolean");
+    ok(!$a, "Expect overloaded boolean");
+}
+{
+    use Scalar::Util 'weaken';
+
+    package Shklitza;
+    use overload '""' => sub {"CLiK KLAK"};
+
+    package Ksshfwoom;
+
+    package main;
+
+    my ($obj, $ref);
+    $obj = bless do {my $a; \$a}, 'Shklitza';
+    $ref = $obj;
+
+    is ($obj, "CLiK KLAK");
+    is ($ref, "CLiK KLAK");
+
+    weaken $ref;
+    is ($ref, "CLiK KLAK");
+
+    bless $obj, 'Ksshfwoom';
+
+    like ($obj, qr/^Ksshfwoom=/);
+    like ($ref, qr/^Ksshfwoom=/);
+
+    undef $obj;
+    is ($ref, undef);
+}

perl-5.8.8-U27512.patch:
 embed.fnc |    1 +
 embed.h   |    2 ++
 proto.h   |    1 +
 sv.c      |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 61 insertions(+), 4 deletions(-)

--- NEW FILE perl-5.8.8-U27512.patch ---
--- perl-5.8.8/sv.c.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/sv.c	2006-06-01 19:13:32.000000000 -0400
@@ -7993,6 +7993,52 @@
     return rv;
 }
 
+/* This is a hack to cope with reblessing from class with overloading magic to
+   one without (or the other way).  Search for every reference pointing to the
+   object.  Can't use S_visit() because we would need to pass a parameter to
+   our function.  */
+static void
+S_reset_amagic(pTHX_ SV *rv, const bool on) {
+    /* It is assumed that you've already turned magic on/off on rv  */
+    SV* sva;
+    SV *const target = SvRV(rv);
+    /* Less 1 for the reference we've already dealt with.  */
+    U32 how_many = SvREFCNT(target) - 1;
+    MAGIC *mg;
+
+    if (SvMAGICAL(target) && (mg = mg_find(target, PERL_MAGIC_backref))) {
+	/* Back referneces also need to be found, but aren't part of the
+	   target's reference count.  */
+	how_many += 1 + av_len((AV*)mg->mg_obj);
+    }
+
+    if (!how_many) {
+	/* There was only 1 reference to this object.  */
+	return;
+    }
+
+    for (sva = PL_sv_arenaroot; sva; sva = (SV*)SvANY(sva)) {
+	register const SV * const svend = &sva[SvREFCNT(sva)];
+	register SV* sv;
+	for (sv = sva + 1; sv < svend; ++sv) {
+	    if (SvTYPE(sv) != SVTYPEMASK
+		&& (sv->sv_flags & SVf_ROK) == SVf_ROK
+		&& SvREFCNT(sv)
+		&& SvRV(sv) == target
+		&& sv != rv) {
+		if (on)
+		    SvAMAGIC_on(sv);
+		else
+		    SvAMAGIC_off(sv);
+		if (--how_many == 0) {
+		    /* We have found them all.  */
+		    return;
+		}
+	    }
+	}
+    }
+}
+
 /*
 =for apidoc sv_bless
 
@@ -8025,10 +8071,17 @@
     (void)SvUPGRADE(tmpRef, SVt_PVMG);
     SvSTASH_set(tmpRef, (HV*)SvREFCNT_inc(stash));
 
-    if (Gv_AMG(stash))
-	SvAMAGIC_on(sv);
-    else
-	SvAMAGIC_off(sv);
+    if (Gv_AMG(stash)) {
+	if (!SvAMAGIC(sv)) {
+	    SvAMAGIC_on(sv);
+	    S_reset_amagic(aTHX_ sv, TRUE);
+	}
+    } else {
+	if (SvAMAGIC(sv)) {
+	    SvAMAGIC_off(sv);
+	    S_reset_amagic(aTHX_ sv, FALSE);
+	}
+    }
 
     if(SvSMAGICAL(tmpRef))
         if(mg_find(tmpRef, PERL_MAGIC_ext) || mg_find(tmpRef, PERL_MAGIC_uvar))
--- perl-5.8.8/proto.h.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/proto.h	2006-06-01 19:13:32.000000000 -0400
@@ -1875,6 +1875,7 @@
 #
 STATIC bool	S_utf8_mg_pos(pTHX_ SV *sv, MAGIC **mgp, STRLEN **cachep, I32 i, I32 *offsetp, I32 uoff, const U8 **sp, const U8 *start, const U8 *send);
 STATIC bool	S_utf8_mg_pos_init(pTHX_ SV *sv, MAGIC **mgp, STRLEN **cachep, I32 i, I32 offsetp, const U8 *s, const U8 *start);
+STATIC void	S_reset_amagic(pTHX_ SV *rv, const bool on);
 #endif
 
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
--- perl-5.8.8/embed.h.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/embed.h	2006-06-01 19:13:32.000000000 -0400
@@ -1348,6 +1348,7 @@
 #ifdef PERL_CORE
 #define utf8_mg_pos		S_utf8_mg_pos
 #define utf8_mg_pos_init	S_utf8_mg_pos_init
+#define reset_amagic		S_reset_amagic
 #endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
@@ -3390,6 +3391,7 @@
 #ifdef PERL_CORE
 #define utf8_mg_pos(a,b,c,d,e,f,g,h,i)	S_utf8_mg_pos(aTHX_ a,b,c,d,e,f,g,h,i)
 #define utf8_mg_pos_init(a,b,c,d,e,f,g)	S_utf8_mg_pos_init(aTHX_ a,b,c,d,e,f,g)
+#define reset_amagic(a,b)	S_reset_amagic(aTHX_ a,b)
 #endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
--- perl-5.8.8/embed.fnc.U27512	2006-06-01 18:43:19.000000000 -0400
+++ perl-5.8.8/embed.fnc	2006-06-01 19:13:32.000000000 -0400
@@ -1276,6 +1276,7 @@
 s	|bool	|utf8_mg_pos_init	|NN SV *sv|NN MAGIC **mgp \
 				|NN STRLEN **cachep|I32 i|I32 offsetp \
 				|NN const U8 *s|NN const U8 *start
+s	|void	|reset_amagic	|NN SV *rv|const bool on
 #endif
 
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)

perl-5.8.8-U27604.patch:
 MANIFEST         |    1 +
 regexec.c        |   18 ++++++++++--------
 t/op/regexp.t    |    3 ++-
 t/op/regexp_qr.t |   10 ++++++++++
 4 files changed, 23 insertions(+), 9 deletions(-)

--- NEW FILE perl-5.8.8-U27604.patch ---
--- /dev/null	2006-06-01 12:59:27.771303750 -0400
+++ perl-5.8.8/t/op/regexp_qr.t	2006-06-01 19:24:53.000000000 -0400
@@ -0,0 +1,10 @@
+#!./perl
+
+$qr = 1;
+for $file ('./op/regexp.t', './t/op/regexp.t', ':op:regexp.t') {
+    if (-r $file) {
+	do $file;
+	exit;
+    }
+}
+die "Cannot find ./op/regexp.t or ./t/op/regexp.t\n";
--- perl-5.8.8/t/op/regexp.t.U27604	2001-10-27 14:09:24.000000000 -0400
+++ perl-5.8.8/t/op/regexp.t	2006-06-01 19:24:53.000000000 -0400
@@ -49,6 +49,7 @@
 $bang = sprintf "\\%03o", ord "!"; # \41 would not be portable.
 $ffff  = chr(0xff) x 2;
 $nulnul = "\0" x 2;
+$OP = $qr ? 'qr' : 'm';
 
 $| = 1;
 print "1..$numtests\n# $iters iterations\n";
@@ -73,7 +74,7 @@
     $result =~ s/B//i unless $skip;
     for $study ('', 'study \$subject') {
  	$c = $iters;
- 	eval "$study; \$match = (\$subject =~ m$pat) while \$c--; \$got = \"$repl\";";
+ 	eval "$study; \$match = (\$subject =~ $OP$pat) while \$c--; \$got = \"$repl\";";
 	chomp( $err = $@ );
 	if ($result eq 'c') {
 	    if ($err !~ m!^\Q$expect!) { print "not ok $. (compile) $input => `$err'\n"; next TEST }
--- perl-5.8.8/regexec.c.U27604	2006-01-08 15:59:30.000000000 -0500
+++ perl-5.8.8/regexec.c	2006-06-01 19:24:53.000000000 -0400
@@ -412,6 +412,7 @@
     I32 ml_anch;
     register char *other_last = Nullch;	/* other substr checked before this */
     char *check_at = Nullch;		/* check substr found at this pos */
+    const I32 multiline = PL_multiline | (prog->reganch & PMf_MULTILINE);
 #ifdef DEBUGGING
     const char * const i_strpos = strpos;
     SV * const dsv = PERL_DEBUG_PAD_ZERO(0);
@@ -473,7 +474,7 @@
     if (prog->reganch & ROPT_ANCH) {	/* Match at beg-of-str or after \n */
 	ml_anch = !( (prog->reganch & ROPT_ANCH_SINGLE)
 		     || ( (prog->reganch & ROPT_ANCH_BOL)
-			  && !PL_multiline ) );	/* Check after \n? */
+			  && !multiline ) );	/* Check after \n? */
 
 	if (!ml_anch) {
 	  if ( !(prog->reganch & (ROPT_ANCH_GPOS /* Checked by the caller */
@@ -568,11 +569,11 @@
     else if (prog->reganch & ROPT_CANY_SEEN)
 	s = fbm_instr((U8*)(s + start_shift),
 		      (U8*)(strend - end_shift),
-		      check, PL_multiline ? FBMrf_MULTILINE : 0);
+		      check, multiline ? FBMrf_MULTILINE : 0);
     else
 	s = fbm_instr(HOP3(s, start_shift, strend),
 		      HOP3(strend, -end_shift, strbeg),
-		      check, PL_multiline ? FBMrf_MULTILINE : 0);
+		      check, multiline ? FBMrf_MULTILINE : 0);
 
     /* Update the count-of-usability, remove useless subpatterns,
 	unshift s.  */
@@ -643,7 +644,7 @@
 			HOP3(HOP3(last1, prog->anchored_offset, strend)
 				+ SvCUR(must), -(SvTAIL(must)!=0), strbeg),
 			must,
-			PL_multiline ? FBMrf_MULTILINE : 0
+			multiline ? FBMrf_MULTILINE : 0
 		    );
 		DEBUG_r(PerlIO_printf(Perl_debug_log,
 			"%s anchored substr \"%s%.*s%s\"%s",
@@ -704,7 +705,7 @@
 		s = fbm_instr((unsigned char*)s,
 			      (unsigned char*)last + SvCUR(must)
 				  - (SvTAIL(must)!=0),
-			      must, PL_multiline ? FBMrf_MULTILINE : 0);
+			      must, multiline ? FBMrf_MULTILINE : 0);
 	    /* FIXME - DEBUG_EXECUTE_r if that is merged to maint  */
 	    DEBUG_r(PerlIO_printf(Perl_debug_log, "%s floating substr \"%s%.*s%s\"%s",
 		    (s ? "Found" : "Contradicts"),
@@ -1639,6 +1640,7 @@
     char *scream_olds;
     SV* oreplsv = GvSV(PL_replgv);
     const bool do_utf8 = DO_UTF8(sv);
+    const I32 multiline = PL_multiline | (prog->reganch & PMf_MULTILINE);
 #ifdef DEBUGGING
     SV *dsv0 = PERL_DEBUG_PAD_ZERO(0);
     SV *dsv1 = PERL_DEBUG_PAD_ZERO(1);
@@ -1756,7 +1758,7 @@
     if (prog->reganch & (ROPT_ANCH & ~ROPT_ANCH_GPOS)) {
 	if (s == startpos && regtry(prog, startpos))
 	    goto got_it;
-	else if (PL_multiline || (prog->reganch & ROPT_IMPLICIT)
+	else if (multiline || (prog->reganch & ROPT_IMPLICIT)
 		 || (prog->reganch & ROPT_ANCH_MBOL)) /* XXXX SBOL? */
 	{
 	    char *end;
@@ -1889,7 +1891,7 @@
 				    end_shift, &scream_pos, 0))
 		 : (s = fbm_instr((unsigned char*)HOP3(s, back_min, strend),
 				  (unsigned char*)strend, must,
-				  PL_multiline ? FBMrf_MULTILINE : 0))) ) {
+				  multiline ? FBMrf_MULTILINE : 0))) ) {
 	    /* we may be pointing at the wrong string */
 	    if ((flags & REXEC_SCREAM) && RX_MATCH_COPIED(prog))
 		s = strbeg + (s - SvPVX_const(sv));
@@ -1990,7 +1992,7 @@
 		if (SvTAIL(float_real)) {
 		    if (memEQ(strend - len + 1, little, len - 1))
 			last = strend - len + 1;
-		    else if (!PL_multiline)
+		    else if (!multiline)
 			last = memEQ(strend - len, little, len)
 			    ? strend - len : Nullch;
 		    else
--- perl-5.8.8/MANIFEST.U27604	2006-01-31 18:27:53.000000000 -0500
+++ perl-5.8.8/MANIFEST	2006-06-01 19:24:52.000000000 -0400
@@ -2802,6 +2802,7 @@
 t/op/ref.t			See if refs and objects work
 t/op/regexp_noamp.t		See if regular expressions work with optimizations
 t/op/regexp.t			See if regular expressions work
+t/op/regexp_qr.t		See if regular expressions work as qr//
 t/op/regmesg.t			See if one can get regular expression errors
 t/op/repeat.t			See if x operator works
 t/op/re_tests			Regular expressions for regexp.t

perl-5.8.8-U27605.patch:
 mg.c   |   13 +++++++------
 perl.c |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE perl-5.8.8-U27605.patch ---
--- perl-5.8.8/mg.c.U27605	2006-01-27 15:23:21.000000000 -0500
+++ perl-5.8.8/mg.c	2006-06-01 19:37:17.000000000 -0400
@@ -2520,10 +2520,10 @@
 #endif
 	/* PL_origalen is set in perl_parse(). */
 	s = SvPV_force(sv,len);
-	if (len >= (STRLEN)PL_origalen) {
-	    /* Longer than original, will be truncated. */
-	    Copy(s, PL_origargv[0], PL_origalen, char);
-	    PL_origargv[0][PL_origalen - 1] = 0;
+	if (len >= (STRLEN)PL_origalen-1) {
+	    /* Longer than original, will be truncated. We assume that
+             * PL_origalen bytes are available. */
+	    Copy(s, PL_origargv[0], PL_origalen-1, char);
 	}
 	else {
 	    /* Shorter than original, will be padded. */
@@ -2536,9 +2536,10 @@
 		    * --jhi */
 		   (int)' ',
 		   PL_origalen - len - 1);
-	    for (i = 1; i < PL_origargc; i++)
-		 PL_origargv[i] = 0;
 	}
+	PL_origargv[0][PL_origalen-1] = 0;
+	for (i = 1; i < PL_origargc; i++)
+	    PL_origargv[i] = 0;
 	UNLOCK_DOLLARZERO_MUTEX;
 	break;
 #endif
--- perl-5.8.8/perl.c.U27605	2006-06-01 19:00:57.000000000 -0400
+++ perl-5.8.8/perl.c	2006-06-01 19:37:17.000000000 -0400
@@ -1561,7 +1561,7 @@
 		   }
 	      }
 	 }
-	 PL_origalen = s - PL_origargv[0];
+	 PL_origalen = s - PL_origargv[0] + 1;
     }
 
     if (PL_do_undump) {

perl-5.8.8-U27914.patch:
 scope.c      |   12 +++++++++++-
 t/op/local.t |   18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-U27914.patch ---
--- perl-5.8.8/t/op/local.t.U27914	2006-01-03 10:11:35.000000000 -0500
+++ perl-5.8.8/t/op/local.t	2006-06-01 19:49:54.000000000 -0400
@@ -4,7 +4,7 @@
     chdir 't' if -d 't';
     require './test.pl';
 }
-plan tests => 81;
+plan tests => 85;
 
 my $list_assignment_supported = 1;
 
@@ -313,3 +313,19 @@
     { local @x{c,d,e}; }
     ok(! exists $x{c});
 }
+
+# local() and readonly magic variables
+
+eval { local $1 = 1 };
+like($@, qr/Modification of a read-only value attempted/);
+
+eval { for ($1) { local $_ = 1 } };
+like($@, qr/Modification of a read-only value attempted/);
+
+# make sure $1 is still read-only
+eval { for ($1) { local $_ = 1 } };
+is($@, "");
+
+# The s/// adds 'g' magic to $_, but it should remain non-readonly
+eval { for("a") { for $x (1,2) { local $_="b"; s/(.*)/+$1/ } } };
+is($@, "");
--- perl-5.8.8/scope.c.U27914	2005-09-30 09:56:51.000000000 -0400
+++ perl-5.8.8/scope.c	2006-06-01 19:49:54.000000000 -0400
@@ -205,9 +205,9 @@
     register SV * const sv = *sptr = NEWSV(0,0);
 
     if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) {
+	MAGIC *mg;
 	sv_upgrade(sv, SvTYPE(osv));
 	if (SvGMAGICAL(osv)) {
-	    MAGIC* mg;
 	    const bool oldtainted = PL_tainted;
 	    mg_get(osv);		/* note, can croak! */
 	    if (PL_tainting && PL_tainted &&
@@ -220,6 +220,16 @@
 	    PL_tainted = oldtainted;
 	}
 	SvMAGIC_set(sv, SvMAGIC(osv));
+	/* if it's a special scalar or if it has no 'set' magic,
+	 * propagate the SvREADONLY flag. --rgs 20030922 */
+	for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+	    if (mg->mg_type == '\0'
+		    || !(mg->mg_virtual && mg->mg_virtual->svt_set))
+	    {
+		SvFLAGS(sv) |= SvREADONLY(osv);
+		break;
+	    }
+	}
 	SvFLAGS(sv) |= SvMAGICAL(osv);
 	/* XXX SvMAGIC() is *shared* between osv and sv.  This can
 	 * lead to coredumps when both SVs are destroyed without one

perl-5.8.8-bz188441.patch:
 CGI.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-5.8.8-bz188441.patch ---
--- perl-5.8.8/lib/CGI.pm.bz188441	2006-01-08 11:40:30.000000000 -0500
+++ perl-5.8.8/lib/CGI.pm	2006-04-12 18:49:26.000000000 -0400
@@ -2650,7 +2650,7 @@
         return $url if $base;
 	$url .= $uri;
     } elsif ($relative) {
-	($url) = $script_name =~ m!([^/]+)$!;
+	($url) = $uri =~ m!([^/]+)$!;
     } elsif ($absolute) {
 	$url = $uri;
     }

perl-5.8.8-bz191416.patch:
 t/lib/h2ph.pht |   10 +++++-----
 utils/h2ph.PL  |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE perl-5.8.8-bz191416.patch ---
--- perl-5.8.8/t/lib/h2ph.pht.bz191416	2004-12-27 14:55:34.000000000 -0500
+++ perl-5.8.8/t/lib/h2ph.pht	2006-05-11 15:12:10.000000000 -0400
@@ -28,21 +28,21 @@
     	    eval q((($a) < ($b) ? ($a) : ($b)));
 	}' unless defined(&MIN);
     }
-    if(!(defined (defined(&__SOMETHING_MORE_IMPORTANT) ? &__SOMETHING_MORE_IMPORTANT : 0))) {
+    if(!(defined (defined(&__SOMETHING_MORE_IMPORTANT) ? &__SOMETHING_MORE_IMPORTANT : undef))) {
     }
- elsif(!(defined (defined(&__SOMETHING_REALLY_REALLY_IMPORTANT) ? &__SOMETHING_REALLY_REALLY_IMPORTANT : 0))) {
+ elsif(!(defined (defined(&__SOMETHING_REALLY_REALLY_IMPORTANT) ? &__SOMETHING_REALLY_REALLY_IMPORTANT : undef))) {
 	die("Nup, can't go on");
     } else {
 	eval 'sub EVERYTHING_IS_OK () {1;}' unless defined(&EVERYTHING_IS_OK);
     }
     undef(&WHATEVER) if defined(&WHATEVER);
-    if((!((defined (defined(&__SOMETHING_TRIVIAL) ? &__SOMETHING_TRIVIAL : 0)  && defined (defined(&__SOMETHING_LESS_SO) ? &__SOMETHING_LESS_SO : 0))) || defined (defined(&__SOMETHING_OVERPOWERING) ? &__SOMETHING_OVERPOWERING : 0))) {
+    if((!((defined (defined(&__SOMETHING_TRIVIAL) ? &__SOMETHING_TRIVIAL : undef)  && defined (defined(&__SOMETHING_LESS_SO) ? &__SOMETHING_LESS_SO : undef))) || defined (defined(&__SOMETHING_OVERPOWERING) ? &__SOMETHING_OVERPOWERING : undef))) {
 	eval 'sub WHATEVER () {6;}' unless defined(&WHATEVER);
     }
- elsif(!(defined (defined(&__SOMETHING_TRIVIAL) ? &__SOMETHING_TRIVIAL : 0)) ) {
+ elsif(!(defined (defined(&__SOMETHING_TRIVIAL) ? &__SOMETHING_TRIVIAL : undef)) ) {
 	eval 'sub WHATEVER () {7;}' unless defined(&WHATEVER);
     }
- elsif(!(defined (defined(&__SOMETHING_LESS_SO) ? &__SOMETHING_LESS_SO : 0)) ) {
+ elsif(!(defined (defined(&__SOMETHING_LESS_SO) ? &__SOMETHING_LESS_SO : undef)) ) {
 	eval 'sub WHATEVER () {8;}' unless defined(&WHATEVER);
     } else {
 	eval 'sub WHATEVER () {1000;}' unless defined(&WHATEVER);
--- perl-5.8.8/utils/h2ph.PL.bz191416	2006-05-11 15:10:52.000000000 -0400
+++ perl-5.8.8/utils/h2ph.PL	2006-05-11 15:11:49.000000000 -0400
@@ -514,7 +514,7 @@
 		}
 	    } else {
 		if ($inif && $new !~ /defined\s*\($/) {
-		    $new .= '(defined(&' . $id . ') ? &' . $id . ' : 0)';
+		    $new .= '(defined(&' . $id . ') ? &' . $id . ' : undef)';
 		} elsif (/^\[/) {
 		    $new .= " \$$id";
 		} else {

perl-5.8.8-no_asm_page_h.patch:
 SysV.xs |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE perl-5.8.8-no_asm_page_h.patch ---
--- perl-5.8.8/ext/IPC/SysV/SysV.xs.no_asm_page_h	2001-06-30 14:46:07.000000000 -0400
+++ perl-5.8.8/ext/IPC/SysV/SysV.xs	2006-06-02 17:37:22.000000000 -0400
@@ -3,9 +3,6 @@
 #include "XSUB.h"
 
 #include <sys/types.h>
-#ifdef __linux__
-#   include <asm/page.h>
-#endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 #ifndef HAS_SEM
 #   include <sys/ipc.h>

perl-5.8.7-172396.patch:
 Configure   |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 config_h.SH |   13 ++++++++++++-
 reentr.inc  |    4 ++--
 3 files changed, 68 insertions(+), 3 deletions(-)

Index: perl-5.8.7-172396.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/FC-5/perl-5.8.7-172396.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-5.8.7-172396.patch	3 Nov 2005 19:14:29 -0000	1.1
+++ perl-5.8.7-172396.patch	2 Jun 2006 23:19:24 -0000	1.2
@@ -1,21 +1,6 @@
---- perl-5.8.7/reentr.inc.161305	2005-11-03 12:56:58.000000000 -0500
-+++ perl-5.8.7/reentr.inc	2005-11-03 12:58:16.000000000 -0500
-@@ -1368,10 +1368,10 @@
- #ifdef HAS_LOCALTIME_R
- #   undef localtime
- #   if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_S_TS
--#       define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0)
-+#       define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0)
- #   endif
- #   if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_I_TS
--#       define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0)
-+#       define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0)
- #   endif
- #endif /* HAS_LOCALTIME_R */
- 
---- perl-5.8.7/config_h.SH.161305	2005-04-30 10:34:20.000000000 -0400
-+++ perl-5.8.7/config_h.SH	2005-11-03 12:58:16.000000000 -0500
-@@ -1916,7 +1916,18 @@
+--- perl-5.8.8/config_h.SH.bz172396	2005-10-31 13:13:05.000000000 -0500
++++ perl-5.8.8/config_h.SH	2006-05-11 16:20:36.000000000 -0400
+@@ -1912,7 +1912,18 @@
   */
  #$d_localtime_r HAS_LOCALTIME_R	   /**/
  #define LOCALTIME_R_PROTO $localtime_r_proto	   /**/
@@ -35,9 +20,24 @@
  /* HAS_LONG_DOUBLE:
   *	This symbol will be defined if the C compiler supports long
   *	doubles.
---- perl-5.8.7/Configure.161305	2005-11-03 12:56:58.000000000 -0500
-+++ perl-5.8.7/Configure	2005-11-03 13:13:54.000000000 -0500
-@@ -528,6 +528,7 @@
+--- perl-5.8.8/reentr.inc.bz172396	2006-05-11 16:20:36.000000000 -0400
++++ perl-5.8.8/reentr.inc	2006-05-11 16:20:36.000000000 -0400
+@@ -1368,10 +1368,10 @@
+ #ifdef HAS_LOCALTIME_R
+ #   undef localtime
+ #   if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_S_TS
+-#       define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0)
++#       define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0)
+ #   endif
+ #   if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_I_TS
+-#       define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0)
++#       define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0)
+ #   endif
+ #endif /* HAS_LOCALTIME_R */
+ 
+--- perl-5.8.8/Configure.bz172396	2006-05-11 16:20:36.000000000 -0400
++++ perl-5.8.8/Configure	2006-05-11 16:21:47.000000000 -0400
+@@ -542,6 +542,7 @@
  d_libm_lib_version=''
  d_link=''
  d_localtime_r=''
@@ -45,7 +45,7 @@
  localtime_r_proto=''
  d_locconv=''
  d_lockf=''
-@@ -14023,7 +14024,55 @@
+@@ -14261,7 +14262,59 @@
  *)	localtime_r_proto=0
  	;;
  esac
@@ -69,16 +69,17 @@
 +	*tz_e = (char*)malloc(16),
 +	*tz_w = (char*)malloc(16);
 +    struct tm tm_e, tm_w;
-+
++    memset(&tm_e,'\0',sizeof(struct tm));
++    memset(&tm_w,'\0',sizeof(struct tm));
 +    strcpy(tz_e,e_tz);
 +    strcpy(tz_w,w_tz);
-+
+ 
 +    putenv(tz_e);
 +    localtime_r(&t, &tm_e);    
 +    
 +    putenv(tz_w);
 +    localtime_r(&t, &tm_w);    
- 
++
 +    if( memcmp(&tm_e, &tm_w, sizeof(struct tm)) == 0 )
 +	return 1;
 +    return 0;
@@ -97,11 +98,14 @@
 +	fi;
 +	rm -f try.c;
 +     ;;
++  *)
++     d_localtime_r_needs_tzset=undef;
++     ;;
 +esac
  : see if localeconv exists
  set localeconv d_locconv
  eval $inlibc
-@@ -20769,6 +20818,7 @@
+@@ -21220,6 +21273,7 @@
  d_libm_lib_version='$d_libm_lib_version'
  d_link='$d_link'
  d_localtime_r='$d_localtime_r'


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/FC-5/perl.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- perl.spec	8 Mar 2006 22:54:37 -0000	1.88
+++ perl.spec	2 Jun 2006 23:19:24 -0000	1.89
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    4
+%define perlrel    5
 %define perlepoch  4
 
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -154,7 +154,25 @@
 Patch34:	perl-5.8.8-up27284.patch
 # Fix for bug 183553 / upstream bug 38657:
 Patch35:	perl-5.8.8-bz183553_ubz38657.patch
+#
+Patch188841:	perl-5.8.8-bz188441.patch
+#
+Patch191416:	perl-5.8.8-bz191416.patch
 
+Patch27116:	perl-5.8.8-U27116.patch
+Patch27391:     perl-5.8.8-U27391.patch
+Patch27426:	perl-5.8.8-U27426.patch
+Patch27509:     perl-5.8.8-U27509.patch
+Patch27512:     perl-5.8.8-U27512.patch
+Patch27604:     perl-5.8.8-U27604.patch
+Patch27605:     perl-5.8.8-U27605.patch
+Patch27914:     perl-5.8.8-U27914.patch
+Patch27329:     perl-5.8.8-U27329.patch
+Patch36:	perl-5.8.8-R-switch.patch
+Patch37:	perl-5.8.8-no_asm_page_h.patch
+#               ^- stop IPC/SysV.c including <asm/page.h> for getpagesize(), which
+#               is now declared by including <unistd.h> .
+#
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel
@@ -334,6 +352,32 @@
 
 %patch35 -p1
 
+%patch188841 -p1
+
+%patch191416 -p1
+
+%patch27116 -p1
+
+%patch27391 -p1
+
+%patch27426 -p1
+
+%patch27509 -p1
+
+%patch27512 -p1
+
+%patch27604 -p1
+
+%patch27605 -p1
+
+%patch27914 -p1
+
+%patch27329 -p1
+
+%patch36    -p1
+
+%patch37    -p1
+
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
 recode()
@@ -421,10 +465,7 @@
 	-Dinc_version_list='%{perlmodcompat}' \
 	-Dscriptdir='%{_bindir}'
 
-make
-# perl 5.8.6 - some tests fail (see bug #127023 comments #{31,32,34})
-# So ? then we should fix the tests / fix perl!
-# make test || /bin/true
+make %{?_smp_mflags}
 make test
 
 
@@ -505,8 +546,6 @@
 # Core modules removal
 #
 find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
-find $RPM_BUILD_ROOT -name '*DBM_Filter*' | xargs rm -rfv
-
 
 find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} ';'
 
@@ -519,7 +558,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %{_mandir}/man1/*.1*
@@ -536,12 +574,42 @@
 
 %if %{suidperl}
 %files suidperl
-%defattr(-,root,root,-)
 %{_bindir}/suidperl
 %{_bindir}/sperl%{perlver}
 %endif
 
 %changelog
+* Thu Jun 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-5
+- Fix upstream perl bug 38454:
+  'rindex corrects for $[ on bytes rather than UTF-8'
+  apply upstream patch #27116
+- Fix upstream perl bug 24816:
+  'Magic vars seem unsure if they are purely numeric' 
+  ( perl -wle 'print $? = $? ^ "3"' -> 'Argument "^C" isn't numeric' )
+  apply upstream patch #27391
+- Avoid writing over the input string in the case 'F' in moreswitches.
+  apply upstream patch #27426
+- Fix upstream perl bug 34925 - 'overload and rebless' -
+  apply upstream patches #27509, #27512
+- Fix upstream perl bug 3038 - '$qr = qr/^a$/m; $x =~ $qr; fails'
+  apply upstream patch #27604
+- apply upstream patch #27605 - 'Fix off-by-one in $0 set magic.'
+- Fix upstream perl bug 23141 - '($_) = () fails to set $_ to undef'
+  apply upstream patch #27914
+- Fix upstream perl bug 38619 - 
+  'Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)'
+  apply upstream patch #27329
+- Give users the '-R' option to disable the Red Hat
+  module compatibility default search path extension (incpush.patch).
+
+* Thu May 11 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-5
+- Fix bug 191416: make h2ph generate correct code for cpp statements
+  like: '#if defined A || defined B'
+- Fix 172396.patch for non-threaded builds
+
+* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-5
+- Fix bug 188841: make CGI.pm's url(-relative) handle rewrites
+
 * Tue Mar 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-4
 - Fix bug 183553 / upstream bug 38657: fix -d:Foo=bar processing
 - rebuild with new gcc-4.1.0-1, released today



From fedora-cvs-commits at redhat.com  Sun Jun  4 12:06:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 4 Jun 2006 08:06:18 -0400
Subject: rpms/evolution/FC-5 evolution-2.6.2-badalloc-crash.patch, NONE,
	1.1.2.1 evolution.spec, 1.137.2.1, 1.137.2.2
Message-ID: <200606041206.k54C6I0t007682@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7655

Modified Files:
      Tag: private-2_6_2-check-only-active-folders-branch
	evolution.spec 
Added Files:
      Tag: private-2_6_2-check-only-active-folders-branch
	evolution-2.6.2-badalloc-crash.patch 
Log Message:
fix badalloc crash

evolution-2.6.2-badalloc-crash.patch:
 e-cell-tree.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.6.2-badalloc-crash.patch ---
--- evolution-2.6.2/widgets/table/e-cell-tree.c~	2006-05-03 15:02:45.000000000 +0100
+++ evolution-2.6.2/widgets/table/e-cell-tree.c	2006-06-04 12:57:50.000000000 +0100
@@ -510,7 +510,7 @@ ect_event (ECellView *ecell_view, GdkEve
 			GdkRectangle area;
 			gboolean in_expander = event_in_expander (event, offset, height);
 
-			if (tree_view->prelit ^ in_expander) {
+			if (0 && tree_view->prelit ^ in_expander) {
 				gint tmp_row = row;
 				e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
 								&tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.137.2.1
retrieving revision 1.137.2.2
diff -u -r1.137.2.1 -r1.137.2.2
--- evolution.spec	1 Jun 2006 13:49:02 -0000	1.137.2.1
+++ evolution.spec	4 Jun 2006 12:06:05 -0000	1.137.2.2
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.1.dwmw2.1
+Release: 1.fc5.1.dwmw2.2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -103,6 +103,7 @@
 Patch809: evolution-2.6.0-prototypes.patch
 
 Patch1000: evolution-2.5.91-check-only-active-folders.patch
+Patch1001: evolution-2.6.2-badalloc-crash.patch
 
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
@@ -250,6 +251,7 @@
 %patch809 -p1 -b .prototypes
 
 %patch1000 -p1 -b .checksub
+%patch1001 -p1 -b .badalloc
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib



From fedora-cvs-commits at redhat.com  Mon Jun  5 12:55:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 08:55:31 -0400
Subject: rpms/coreutils/FC-5 coreutils-5.96.pl.po, NONE, 1.1 coreutils.spec,
	1.113, 1.114
Message-ID: <200606051255.k55CtV9s017833@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17583

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-5.96.pl.po 
Log Message:
* Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.2
- Fixed Polish translation.



--- NEW FILE coreutils-5.96.pl.po ---
# Polish translation of GNU coreutils messages
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
# Rafa?? Maszkowski <rzm at icm.edu.pl>, 1996-2001, 2003-2005.
# ptx: Pawe?? Krawczyk <kravietz at pipeta.chemia.pk.edu.pl>, 1996.
# sh-utils: Pawe?? Krawczyk <kravietz at ceti.pl>, 1997, 1998, 1999.
# fileutils: Thanks for help to Marta Bartnicka, 1999.
# fileutils: Andrzej Krzysztofowicz <ankry at mif.pg.gda.pl>, 2002.
# Thanks for help and 246+ remarks to Jakub Bogusz, 2003.
# 4 corrections: jurget at infocoig.pl via garski at poczta.onet.pl, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: coreutils 5.96\n"
"Report-Msgid-Bugs-To: bug-coreutils at gnu.org\n"
"POT-Creation-Date: 2006-05-21 19:53+0200\n"
"PO-Revision-Date: 2005-10-29 22:00+0200\n"
"Last-Translator: Rafa?? Maszkowski <rzm at icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"

#: lib/argmatch.c:137
#, c-format
msgid "invalid argument %s for %s"
msgstr "b????dny argument %s opcji %s"

#: lib/argmatch.c:138
#, c-format
msgid "ambiguous argument %s for %s"
msgstr "niejednoznaczny argument %s opcji %s"

#: lib/argmatch.c:157
#, c-format
msgid "Valid arguments are:"
msgstr "Prawid??owe argumenty to:"

#: lib/closeout.c:94 src/cat.c:193 src/cat.c:277 src/cat.c:327 src/cksum.c:255
#: src/expand.c:336 src/expand.c:361 src/head.c:300 src/head.c:350
#: src/head.c:758 src/head.c:799 src/od.c:966 src/paste.c:143 src/tail.c:315
#: src/tail.c:1103 src/tr.c:1561 src/tr.c:1784 src/tr.c:1887
#: src/unexpand.c:435 src/unexpand.c:451
msgid "write error"
msgstr "b????d zapisu"

#: lib/error.c:121
msgid "Unknown system error"
msgstr "Nieznany b????d systemu"

#: lib/file-type.c:43
msgid "regular empty file"
msgstr "pusty zwyk??y plik"

#: lib/file-type.c:43
msgid "regular file"
msgstr "zwyk??y plik"

#: lib/file-type.c:46
msgid "directory"
msgstr "katalog"

#: lib/file-type.c:49
msgid "block special file"
msgstr "blokowy plik specjalny"

#: lib/file-type.c:52
msgid "character special file"
msgstr "znakowy plik specjalny"

#: lib/file-type.c:55
msgid "fifo"
msgstr "potok"

#: lib/file-type.c:58
msgid "symbolic link"
msgstr "dowi??zanie symboliczne"

#: lib/file-type.c:61
msgid "socket"
msgstr "gniazdo"

#: lib/file-type.c:64
msgid "message queue"
msgstr "kolejka komunikat??w"

#: lib/file-type.c:67
msgid "semaphore"
msgstr "semafor"

#: lib/file-type.c:70
msgid "shared memory object"
msgstr "obiekt w pami??ci wsp????dzielonej"

#: lib/file-type.c:73
msgid "typed memory object"
msgstr "obiekt z typem w pami??ci"

#: lib/file-type.c:75
msgid "weird file"
msgstr "dziwny plik"

#: lib/gai_strerror.c:45
msgid "Address family for hostname not supported"
msgstr "Rodzina adres??w nie obs??ugiwana przez ten system"

#: lib/gai_strerror.c:46
msgid "Temporary failure in name resolution"
msgstr "Tymczasowy b????d rozwi??zywania nazw"

#: lib/gai_strerror.c:47
msgid "Bad value for ai_flags"
msgstr "Z??a warto???? ai_flags"

#: lib/gai_strerror.c:48
msgid "Non-recoverable failure in name resolution"
msgstr "Nienaprawialny b????d w rozwi??zywaniu nazw"

#: lib/gai_strerror.c:49
msgid "ai_family not supported"
msgstr "ai_family nie jest obs??ugiwana"

#: lib/gai_strerror.c:50
msgid "Memory allocation failure"
msgstr "B????d przydzia??u pami??ci"

#: lib/gai_strerror.c:51
msgid "No address associated with hostname"
msgstr "Z nazw?? nie jest zwi??zany ??aden adres"

#: lib/gai_strerror.c:52
msgid "Name or service not known"
msgstr "Nieznana nazwa lub us??uga"

#: lib/gai_strerror.c:53
msgid "Servname not supported for ai_socktype"
msgstr "Servname nie obs??ugiwany przez ai_socktype"

#: lib/gai_strerror.c:54
msgid "ai_socktype not supported"
msgstr "ai_socktype nie jest obs??ugiwane"

#: lib/gai_strerror.c:55
msgid "System error"
msgstr "b????d systemu"

#: lib/gai_strerror.c:57
msgid "Processing request in progress"
msgstr "W trakcie przetwarzania ????dania"

#: lib/gai_strerror.c:58
msgid "Request canceled"
msgstr "????danie skasowane"

#: lib/gai_strerror.c:59
msgid "Request not canceled"
msgstr "????dnie nie skasowane"

#: lib/gai_strerror.c:60
msgid "All requests done"
msgstr "Wszystkie ????dania wype??nione"

#: lib/gai_strerror.c:61
msgid "Interrupted by a signal"
msgstr "PRzerwany przez sygna??"

#: lib/gai_strerror.c:62
msgid "Parameter string not correctly encoded"
msgstr "??le zakodowany ??a??cuch parametr??w"

#: lib/gai_strerror.c:74
msgid "Unknown error"
msgstr "Nieznany b????d"

#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: opcja `%s' jest niejednoznaczna\n"

#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: opcja `--%s' nie mo??e mie?? argumentu\n"

#: lib/getopt.c:616 lib/getopt.c:621
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: opcja `%c%s' nie mo??e mie?? argumentu\n"

#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: opcja `%s' wymaga argumentu\n"

#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: nierozpoznana opcja `--%s'\n"
[...8905 lines suppressed...]
"Wy??wietla kto jest zalogowany wed??ug informacji w PLIKU.\n"
"Je??li brak PLIKU, u??ywa %s. Cz??sto podaje si?? te?? %s.\n"
"\n"

#: src/wc.c:131
msgid ""
"Print newline, word, and byte counts for each FILE, and a total line if\n"
"more than one FILE is specified.  With no FILE, or when FILE is -,\n"
"read standard input.\n"
"  -c, --bytes            print the byte counts\n"
"  -m, --chars            print the character counts\n"
"  -l, --lines            print the newline counts\n"
msgstr ""
"Dla ka??dego PLIKU wypisywana jest liczba nak??w nowej linii, s????w i bajt??w\n"
"oraz podsumowanie je??eli podany jest wi??cej ni?? jeden PLIK. Je??eli PLIK nie\n"
"jest podany lub PLIK to -, czytane jest standardowe wej??cie.\n"
"  -c, --bytes            wypisanie liczby bajt??w\n"
"  -m, --chars            wypisanie liczby znak??w\n"
"  -l, --lines            wypisanie liczby znak??w nowej linii\n"

#: src/wc.c:139
msgid ""
"  -L, --max-line-length  print the length of the longest line\n"
"  -w, --words            print the word counts\n"
msgstr ""
"  -L, --max-line-length  wypisanie d??ugo??ci najd??u??szej linii\n"
"  -w, --words            wypisanie liczby s????w\n"

#: src/who.c:216
msgid " old "
msgstr "dawno"

#: src/who.c:441 src/who.c:443
msgid "id="
msgstr "id="

#: src/who.c:456 src/who.c:461
msgid "term="
msgstr "zako??czenie="

#: src/who.c:458 src/who.c:462
msgid "exit="
msgstr "wyj??cie="

#: src/who.c:499
msgid "clock change"
msgstr "zmiana czasu"

#: src/who.c:511 src/who.c:512
msgid "run-level"
msgstr "run-level"

#: src/who.c:515 src/who.c:516
msgid "last="
msgstr "ostatni="

#: src/who.c:547
#, c-format
msgid ""
"\n"
"# users=%lu\n"
msgstr ""
"\n"
"liczba u??ytkownik??w=%lu\n"

#: src/who.c:553
msgid "NAME"
msgstr "U??YTKOWNIK"

#: src/who.c:553
msgid "LINE"
msgstr "TERM"

#: src/who.c:553
msgid "TIME"
msgstr "CZAS"

#: src/who.c:553
msgid "IDLE"
msgstr "BEZCZYNNY"

#: src/who.c:554
msgid "PID"
msgstr "PID"

#: src/who.c:554
msgid "COMMENT"
msgstr "KOMENTARZ"

#: src/who.c:554
msgid "EXIT"
msgstr "WYJ??CIE"

#: src/who.c:635
#, c-format
msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"
msgstr "Sk??adnia: %s [OPCJA]... [ PLIK | ARGUMENT1 ARGUMENT2 ]\n"

#: src/who.c:636
msgid ""
"\n"
"  -a, --all         same as -b -d --login -p -r -t -T -u\n"
"  -b, --boot        time of last system boot\n"
"  -d, --dead        print dead processes\n"
"  -H, --heading     print line of column headings\n"
msgstr ""
"\n"
"  -a, --all         to samo co  -b -d --login -p -r -t -T -u\n"
"  -b, --boot        czas ostatniego uruchomienia systemu\n"
"  -d, --dead        wypisanie martwych proces??w\n"
"  -H, --heading     wypisanie linii nag????wk??w kolumn\n"

#: src/who.c:643
msgid "  -l, --login       print system login processes\n"
msgstr "  -l, --login       wypisanie systemowych proces??w login\n"

#: src/who.c:646
msgid ""
"      --lookup      attempt to canonicalize hostnames via DNS\n"
"  -m                only hostname and user associated with stdin\n"
"  -p, --process     print active processes spawned by init\n"
msgstr ""
"      --lookup      rozwi??zywanie nazw system??w poprzez DNS\n"
"  -m                wy??wietlenie tylko nazwy systemu i u??ytkownika "
"zwi??zanego\n"
"                    ze standardowym wej??ciem\n"
"  -p, --process     aktywne procesy uruchomione przez init\n"

#: src/who.c:651
msgid ""
"  -q, --count       all login names and number of users logged on\n"
"  -r, --runlevel    print current runlevel\n"
"  -s, --short       print only name, line, and time (default)\n"
"  -t, --time        print last system clock change\n"
msgstr ""
"  -q, --count       wszystkie nazwy i liczba zalogowanych u??ytkownik??w\n"
"  -r, --runlevel    bie????cy runlevel\n"
"  -s, --short       wypisanie tylko u??ytkownika, terminala i czasu "
"(domy??lnie)\n"
"  -t, --time        podanie ostatniej zmiany zegara systemowego\n"

#: src/who.c:657
msgid ""
"  -T, -w, --mesg    add user's message status as +, - or ?\n"
"  -u, --users       list users logged in\n"
"      --message     same as -T\n"
"      --writable    same as -T\n"
msgstr ""
"  -T, -w, --mesg    zaznaczenie czy u??ytkownik przyjmuje komunikaty: +, - "
"lub ?\n"
"  -u, --users       wypisanie zalogowanych u??ytkownik??w\n"
"      --message     to samo co  -T\n"
"      --writable    to samo co  -T\n"

#: src/who.c:665
#, c-format
msgid ""
"\n"
"If FILE is not specified, use %s.  %s as FILE is common.\n"
"If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n"
msgstr ""
"\n"
"Je??li nie podano PLIKU, u??ywany jest %s. Cz??sto podaje si?? %s.\n"
"Obecno???? ARG1 ARG2 implikuje -m. Typowe wywo??ania: `am i', `mom likes'.\n"

#: src/who.c:765
msgid "Warning: -i will be removed in a future release;   use -u instead"
msgstr "Uwaga: opcja -i zostanie w przysz??o??ci usuni??ta, u??ywaj -u"

#: src/whoami.c:51
msgid ""
"Print the user name associated with the current effective user ID.\n"
"Same as id -un.\n"
"\n"
msgstr ""
"Wypisanie nazwy u??ytkownika zwi??zanego z aktualnym efektywnym\n"
"idetyfikatorem u??ytkownika. Dzia??a jak id -un.\n"
"\n"

#: src/whoami.c:95
#, c-format
msgid "%s: cannot find name for user ID %lu\n"
msgstr "%s: nie mo??na znale???? nazwy u??ytkownika o ID %lu\n"

#: src/yes.c:46
#, c-format
msgid ""
"Usage: %s [STRING]...\n"
"  or:  %s OPTION\n"
msgstr ""
"Sk??adnia: %s [??A??CUCH]\n"
"    albo: %s OPCJA\n"

#: src/yes.c:52
msgid ""
"Repeatedly output a line with all specified STRING(s), or `y'.\n"
"\n"
msgstr ""
"Powtarzanie na wyj??ciu linii ze wszystkimi podanymi ??A??CUCH(AMI) albo `y'\n"
"\n"


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- coreutils.spec	22 May 2006 14:10:06 -0000	1.113
+++ coreutils.spec	5 Jun 2006 12:55:28 -0000	1.114
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.96
-Release: 1.1
+Release: 1.2
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -9,6 +9,7 @@
 Requires: libselinux >= 1.25.6-1
 
 Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
+Source1: coreutils-5.96.pl.po
 Source101:	DIR_COLORS
 Source102:	DIR_COLORS.xterm
 Source105:  colorls.sh
@@ -69,6 +70,8 @@
 
 %prep
 %setup -q
+rm po/pl.*
+cp %{SOURCE1} po/pl.po
 
 # From upstream
 
@@ -129,6 +132,9 @@
 # XXX docs should say /var/run/[uw]tmp not /etc/[uw]tmp
 perl -pi -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi
 
+pushd po
+make pl.gmo
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -261,6 +267,9 @@
 /sbin/runuser
 
 %changelog
+* Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.2
+- Fixed Polish translation.
+
 * Mon May 22 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.1
 - 5.96.  No longer need proc patch.
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 14:29:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 10:29:22 -0400
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.63,1.64
Message-ID: <200606051429.k55ETM3h025338@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kde-i18n/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25323

Modified Files:
	kde-i18n.spec 
Log Message:
add kde-i18n-ko



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kde-i18n.spec	4 Jun 2006 21:18:56 -0000	1.63
+++ kde-i18n.spec	5 Jun 2006 14:29:20 -0000	1.64
@@ -50,6 +50,7 @@
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
 Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
 Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
+Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
 Requires: kdelibs >= 6:%{version}



From fedora-cvs-commits at redhat.com  Mon Jun  5 14:40:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 10:40:04 -0400
Subject: rpms/python/devel python.spec,1.68,1.69
Message-ID: <200606051440.k55Ee3j7032138@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31790

Modified Files:
	python.spec 
Log Message:
Added dist in the release field


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- python.spec	15 May 2006 13:49:52 -0000	1.68
+++ python.spec	5 Jun 2006 14:40:00 -0000	1.69
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 3
+Release: 4%{?dist}
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -359,6 +359,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun  5 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-4
+- Added dist in the release
+
 * Mon May 15 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-3
 - rebuilt to fix broken libX11 dependency
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 14:42:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 10:42:12 -0400
Subject: rpms/kdenetwork/devel .cvsignore, 1.36, 1.37 kdenetwork.spec, 1.73,
	1.74 sources, 1.41, 1.42
Message-ID: <200606051442.k55EgCpo003770@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3707

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	5 Feb 2006 19:29:54 -0000	1.36
+++ .cvsignore	5 Jun 2006 14:42:08 -0000	1.37
@@ -9,3 +9,4 @@
 kdenetwork-3.4.92.tar.bz2
 kdenetwork-3.5.0.tar.bz2
 kdenetwork-3.5.1.tar.bz2
+kdenetwork-3.5.3.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdenetwork.spec	16 May 2006 13:48:20 -0000	1.73
+++ kdenetwork.spec	5 Jun 2006 14:42:09 -0000	1.74
@@ -15,8 +15,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.2
-Release: 2
+Version: 3.5.3
+Release: 1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -240,6 +240,9 @@
 %endif
 
 %changelog
+* Mon Jun 05 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
+- update to 3.5.3
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 7:3.5.2-2 
 - rebuilt againts new qt to fix multilib problem
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	6 Apr 2006 12:21:02 -0000	1.41
+++ sources	5 Jun 2006 14:42:09 -0000	1.42
@@ -1 +1 @@
-dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2
+119af91a048c34d9a917a1898f215554  kdenetwork-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 14:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 10:45:05 -0400
Subject: rpms/python/FC-5 python-2.4.3-config.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 python.spec, 1.65, 1.66 sources, 1.13,
	1.14 python-2.4.1-config.patch, 1.2, NONE
Message-ID: <200606051445.k55Ej5Mk004676@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4647

Modified Files:
	.cvsignore python.spec sources 
Added Files:
	python-2.4.3-config.patch 
Removed Files:
	python-2.4.1-config.patch 
Log Message:
Upgrading to 2.4.3

python-2.4.3-config.patch:
 Setup.dist |  123 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 61 insertions(+), 62 deletions(-)

--- NEW FILE python-2.4.3-config.patch ---
--- Python-2.4.3/Modules/Setup.dist.rhconfig	2005-12-27 12:37:16.000000000 -0500
+++ Python-2.4.3/Modules/Setup.dist	2006-04-06 12:33:28.000000000 -0400
@@ -149,7 +149,7 @@
 # modules are to be built as shared libraries (see above for more
 # detail; also note that *static* reverses this effect):
 
-#*shared*
+*shared*
 
 # GNU readline.  Unlike previous Python incarnations, GNU readline is
 # now incorporated in an optional module, configured in the Setup file
@@ -159,68 +159,68 @@
 # it, depending on your system -- see the GNU readline instructions.
 # It's okay for this to be a shared library, too.
 
-#readline readline.c -lreadline -ltermcap
+readline readline.c -lreadline -ltermcap
 
 
 # Modules that should always be present (non UNIX dependent):
 
-#array arraymodule.c	# array objects
-#cmath cmathmodule.c # -lm # complex math library functions
-#math mathmodule.c # -lm # math library functions, e.g. sin()
-#struct structmodule.c	# binary structure packing/unpacking
-#time timemodule.c # -lm # time operations and variables
-#operator operator.c	# operator.add() and similar goodies
-#_weakref _weakref.c	# basic weak reference support
-#_testcapi _testcapimodule.c    # Python C API test module
-#_random _randommodule.c	# Random number generator
-#collections collectionsmodule.c # Container types
-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
-#strop stropmodule.c		# String manipulations
+array arraymodule.c	# array objects
+cmath cmathmodule.c # -lm # complex math library functions
+math mathmodule.c # -lm # math library functions, e.g. sin()
+struct structmodule.c	# binary structure packing/unpacking
+time timemodule.c # -lm # time operations and variables
+operator operator.c	# operator.add() and similar goodies
+_weakref _weakref.c	# basic weak reference support
+_testcapi _testcapimodule.c    # Python C API test module
+_random _randommodule.c	# Random number generator
+collections collectionsmodule.c # Container types
+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
+strop stropmodule.c		# String manipulations
 
-#unicodedata unicodedata.c    # static Unicode character database
+unicodedata unicodedata.c    # static Unicode character database
 
 # access to ISO C locale support
-#_locale _localemodule.c  # -lintl
+_locale _localemodule.c  # -lintl
 
 
 # Modules with some UNIX dependencies -- on by default:
 # (If you have a really backward UNIX, select and socket may not be
 # supported...)
 
-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
-#grp grpmodule.c		# grp(3)
-#select selectmodule.c	# select(2); not on ancient System V
+fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
+grp grpmodule.c		# grp(3)
+select selectmodule.c	# select(2); not on ancient System V
 
 # Memory-mapped files (also works on Win32).
-#mmap mmapmodule.c
+mmap mmapmodule.c
 
 # CSV file helper
-#_csv _csv.c
+_csv _csv.c
 
 # Socket module helper for socket(2)
-#_socket socketmodule.c
+_socket socketmodule.c
 
 # Socket module helper for SSL support; you must comment out the other
 # socket line above, and possibly edit the SSL variable:
-#SSL=/usr/local/ssl
-#_ssl _ssl.c \
-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-#	-L$(SSL)/lib -lssl -lcrypto
+SSL=/usr/local/ssl
+_ssl _ssl.c \
+	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+	-L$(SSL)/lib -lssl -lcrypto
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
+crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
 
 
 # Some more UNIX dependent modules -- off by default, since these
 # are not supported by all UNIX systems:
 
-#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
-#termios termios.c	# Steen Lumholt's termios module
-#resource resource.c	# Jeremy Hylton's rlimit interface
+nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
+termios termios.c	# Steen Lumholt's termios module
+resource resource.c	# Jeremy Hylton's rlimit interface
 
 
 # Multimedia modules -- off by default.
@@ -228,21 +228,21 @@
 # #993173 says audioop works on 64-bit platforms, though.
 # These represent audio samples or images as strings:
 
-#audioop audioop.c	# Operations on audio samples
-#imageop imageop.c	# Operations on images
-#rgbimg rgbimgmodule.c	# Read SGI RGB image files (but coded portably)
+audioop audioop.c	# Operations on audio samples
+imageop imageop.c	# Operations on images
+rgbimg rgbimgmodule.c	# Read SGI RGB image files (but coded portably)
 
 
 # The md5 module implements the RSA Data Security, Inc. MD5
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 # md5c.c and md5.h are included here.
 
-#md5 md5module.c md5c.c
+md5 md5module.c md5c.c
 
 
 # The sha module implements the SHA checksum algorithm.
 # (NIST's Secure Hash Algorithm.)
-#sha shamodule.c
+sha shamodule.c
 
 
 # SGI IRIX specific modules -- off by default.
@@ -289,12 +289,12 @@
 # A Linux specific module -- off by default; this may also work on 
 # some *BSDs.
 
-#linuxaudiodev linuxaudiodev.c
+linuxaudiodev linuxaudiodev.c
 
 
 # George Neville-Neil's timing module:
 
-#timing timingmodule.c
+timing timingmodule.c
 
 
 # The _tkinter module.
@@ -309,7 +309,7 @@
 # every system.
 
 # *** Always uncomment this (leave the leading underscore in!):
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
 #	-L/usr/local/lib \
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
@@ -319,7 +319,7 @@
 # *** Or uncomment this for Solaris:
 #	-I/usr/openwin/include \
 # *** Uncomment and edit for Tix extension only:
-#	-DWITH_TIX -ltix8.1.8.2 \
+	-DWITH_TIX -ltix \
 # *** Uncomment and edit for BLT extension only:
 #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
 # *** Uncomment and edit for PIL (TkImaging) extension only:
@@ -328,7 +328,7 @@
 # *** Uncomment and edit for TOGL extension only:
 #	-DWITH_TOGL togl.c \
 # *** Uncomment and edit to reflect your Tcl/Tk versions:
-#	-ltk8.2 -ltcl8.2 \
+	-ltk -ltcl \
 # *** Uncomment and edit to reflect where your X11 libraries are:
 #	-L/usr/X11R6/lib \
 # *** Or uncomment this for Solaris:
@@ -338,7 +338,7 @@
 # *** Uncomment for AIX:
 #	-lld \
 # *** Always uncomment this; X11 libraries to link with:
-#	-lX11
+	-lX11
 
 # Lance Ellinghaus's syslog module
 #syslog syslogmodule.c		# syslog daemon interface
@@ -350,9 +350,9 @@
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#_curses _cursesmodule.c -lcurses -ltermcap
+_curses _cursesmodule.c -lcurses -ltermcap
 # Wrapper for the panel library that's part of ncurses and SYSV curses.
-#_curses_panel _curses_panel.c -lpanel -lncurses 
+_curses_panel _curses_panel.c -lpanel -lncurses 
 
 
 # Generic (SunOS / SVR4) dynamic loading module.
@@ -360,7 +360,7 @@
 # it is a highly experimental and dangerous device for calling
 # *arbitrary* C functions in *arbitrary* shared libraries:
 
-#dl dlmodule.c
+dl dlmodule.c
 
 
 # Modules that provide persistent dictionary-like semantics.  You will
@@ -383,7 +383,7 @@
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
+gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
 
 
 # Sleepycat Berkeley DB interface.
@@ -398,11 +398,10 @@
 #
 # Edit the variables DB and DBLIBVERto point to the db top directory
 # and the subdirectory of PORT where you built it.
-#DB=/usr/local/BerkeleyDB.4.0
-#DBLIBVER=4.0
-#DBINC=$(DB)/include
-#DBLIB=$(DB)/lib
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+DBLIBVER=4.3
+DBINC=/usr/include/db4
+DBLIB=/usr/lib
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
 
 # Historical Berkeley DB 1.85
 #
@@ -417,14 +416,14 @@
 
 
 # Helper module for various ascii-encoders
-#binascii binascii.c
+binascii binascii.c
 
 # Fred Drake's interface to the Python parser
-#parser parsermodule.c
+parser parsermodule.c
 
 # cStringIO and cPickle
-#cStringIO cStringIO.c
-#cPickle cPickle.c
+cStringIO cStringIO.c
+cPickle cPickle.c
 
 
 # Lee Busby's SIGFPE modules.
@@ -447,7 +446,7 @@
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
 # See http://www.gzip.org/zlib/
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 
 # Interface to the Expat XML parser
 #
@@ -467,14 +466,14 @@
 # Hye-Shik Chang's CJKCodecs
 
 # multibytecodec is required for all the other CJK codec modules
-#_multibytecodec cjkcodecs/multibytecodec.c
+_multibytecodec cjkcodecs/multibytecodec.c
 
-#_codecs_cn cjkcodecs/_codecs_cn.c
-#_codecs_hk cjkcodecs/_codecs_hk.c
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
-#_codecs_jp cjkcodecs/_codecs_jp.c
-#_codecs_kr cjkcodecs/_codecs_kr.c
-#_codecs_tw cjkcodecs/_codecs_tw.c
+_codecs_cn cjkcodecs/_codecs_cn.c
+_codecs_hk cjkcodecs/_codecs_hk.c
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
+_codecs_jp cjkcodecs/_codecs_jp.c
+_codecs_kr cjkcodecs/_codecs_kr.c
+_codecs_tw cjkcodecs/_codecs_tw.c
 
 # Example -- included for reference only:
 # xx xxmodule.c


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	15 Nov 2005 22:23:43 -0000	1.13
+++ .cvsignore	5 Jun 2006 14:45:03 -0000	1.14
@@ -1,3 +1,4 @@
 Python-2.4.1.tar.bz2
 JapaneseCodecs-1.4.11.tar.gz
 Python-2.4.2.tar.bz2
+Python-2.4.3.tar.bz2


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-5/python.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- python.spec	11 Feb 2006 05:23:02 -0000	1.65
+++ python.spec	5 Jun 2006 14:45:03 -0000	1.66
@@ -18,8 +18,8 @@
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-Version: %{pybasever}.2
-Release: 3.2.1
+Version: %{pybasever}.3
+Release: 4%{?dist}
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -32,7 +32,7 @@
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 Source7: python-2.3.4-optik.py
 
-Patch0: python-2.4.1-config.patch
+Patch0: python-2.4.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch7: python-2.3.4-lib64-regex.patch
 Patch8: python-2.4.1-lib64.patch
@@ -359,6 +359,18 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun  5 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-4
+- Added dist in the release
+
+* Mon May 15 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-3
+- rebuilt to fix broken libX11 dependency
+
+* Wed Apr 12 2006 Jeremy Katz <katzj at redhat.com> - 2.4.3-2
+- rebuild with new gcc to fix #188649
+
+* Thu Apr  6 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-1
+- Updated to 2.4.3
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-3.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	15 Nov 2005 22:23:43 -0000	1.13
+++ sources	5 Jun 2006 14:45:03 -0000	1.14
@@ -1,2 +1,2 @@
 e4f2ed866f4ce978fb54bb962eab4fdf  JapaneseCodecs-1.4.11.tar.gz
-98db1465629693fc434d4dc52db93838  Python-2.4.2.tar.bz2
+141c683447d5e76be1d2bd4829574f02  Python-2.4.3.tar.bz2


--- python-2.4.1-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 14:47:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 10:47:45 -0400
Subject: rpms/python/FC-5 python.spec,1.66,1.67
Message-ID: <200606051447.k55EljTW020049@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20021

Modified Files:
	python.spec 
Log Message:
Dist doesn't seem to be enabled in core - manually setting it


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-5/python.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- python.spec	5 Jun 2006 14:45:03 -0000	1.66
+++ python.spec	5 Jun 2006 14:47:43 -0000	1.67
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 4%{?dist}
+Release: 4.FC5
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}



From fedora-cvs-commits at redhat.com  Mon Jun  5 14:48:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 10:48:16 -0400
Subject: rpms/python/devel python.spec,1.69,1.70
Message-ID: <200606051448.k55EmGbU020263@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20230

Modified Files:
	python.spec 
Log Message:
Dist doesn't seem to be enabled in core - manually setting it


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- python.spec	5 Jun 2006 14:40:00 -0000	1.69
+++ python.spec	5 Jun 2006 14:48:14 -0000	1.70
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 4%{?dist}
+Release: 4.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:03:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:03:52 -0400
Subject: rpms/kdeutils/devel .cvsignore, 1.32, 1.33 kdeutils.spec, 1.56,
	1.57 sources, 1.33, 1.34
Message-ID: <200606051503.k55F3qq7025050@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25014

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	5 Feb 2006 20:45:17 -0000	1.32
+++ .cvsignore	5 Jun 2006 15:03:46 -0000	1.33
@@ -9,3 +9,4 @@
 kdeutils-3.4.92.tar.bz2
 kdeutils-3.5.0.tar.bz2
 kdeutils-3.5.1.tar.bz2
+kdeutils-3.5.3.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdeutils.spec	16 May 2006 19:31:46 -0000	1.56
+++ kdeutils.spec	5 Jun 2006 15:03:46 -0000	1.57
@@ -12,8 +12,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
-Release: 2
+Version: 3.5.3
+Release: 1
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -250,15 +250,17 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --disable-rpath \
    --with-qt-libraries=$QTDIR/lib \
@@ -280,28 +282,28 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Show only in KDE
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
          irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
-   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
-     echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+     echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -sf ../common $i
 done
 popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -330,6 +332,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 05 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
+- update to 3.5.3
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 6:3.5.2-2
 - fix #192003, Missing BuildRequire on python-devel/libXtst-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Apr 2006 18:57:25 -0000	1.33
+++ sources	5 Jun 2006 15:03:46 -0000	1.34
@@ -1 +1 @@
-08c01d6ceb8fb2173463838e43f986f5  kdeutils-3.5.2.tar.bz2
+b3d792c21e9a72bf8a82c5756fcd742d  kdeutils-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:16:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:16:03 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.74,1.75
Message-ID: <200606051516.k55FG3Iw031166@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29996

Modified Files:
	kdenetwork.spec 
Log Message:
update to 3.5.3



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdenetwork.spec	5 Jun 2006 14:42:09 -0000	1.74
+++ kdenetwork.spec	5 Jun 2006 15:16:01 -0000	1.75
@@ -50,6 +50,8 @@
 BuildRequires: automake
 BuildRequires: autoconf >= 2.53
 BuildRequires: wireless-tools >= 25
+BuildRequires: coreutils
+BuildRequires: libXmu-devel
 %if %{xmms}
 BuildRequires: xmms-devel
 %else
@@ -108,7 +110,9 @@
 export LDFLAGS="$LDFLAGS `krb5-config --libs`"
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --disable-rpath \
 %if %{disable_gcc_check_and_hidden_visibility}



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:27:47 -0400
Subject: rpms/syslinux/devel syslinux.spec,1.29,1.30
Message-ID: <200606051527.k55FRlBf013810@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13761

Modified Files:
	syslinux.spec 
Log Message:
Added missing BR



Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- syslinux.spec	7 Feb 2006 13:55:46 -0000	1.29
+++ syslinux.spec	5 Jun 2006 15:27:44 -0000	1.30
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.10
 %define tarball_version 3.10
-Release: 2.2
+Release: 3
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -11,6 +11,7 @@
 ExclusiveArch: i386 x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: nasm >= 0.98.38-1, perl, netpbm-progs
+BuildRequires: glibc-devel
 Autoreq: 0
 %ifarch i386
 Requires: mtools, libc.so.6
@@ -100,6 +101,9 @@
 %{_prefix}/lib/syslinux/com32
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-3
+- Added missing glibc-devel BuildRequires
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.10-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:29:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:29:12 -0400
Subject: rpms/tcl/FC-5 tcl-8.4.13-autoconf.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 sources, 1.9, 1.10 tcl.spec, 1.19, 1.20
Message-ID: <200606051529.k55FTCoQ014418@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tcl/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14365

Modified Files:
	.cvsignore sources tcl.spec 
Added Files:
	tcl-8.4.13-autoconf.patch 
Log Message:
- Upgraded to Tcl 8.4.13 to avoid using abbreviated sub-commands in
  core scripts (#193853)


tcl-8.4.13-autoconf.patch:
 configure.in |    8 ++++----
 tcl.m4       |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE tcl-8.4.13-autoconf.patch ---
--- tcl8.4.13/unix/configure.in.ac123	2006-04-19 17:39:42.000000000 -0400
+++ tcl8.4.13/unix/configure.in	2006-04-19 17:41:29.000000000 -0400
@@ -211,7 +211,7 @@
 	}], tcl_cv_strstr_unbroken=ok, tcl_cv_strstr_unbroken=broken,
 	    tcl_cv_strstr_unbroken=broken)])
     if test $tcl_cv_strstr_unbroken = broken; then
-        LIBOBJS="$LIBOBJS strstr.o"
+        AC_LIBOBJ(strstr)
     fi
 fi
 
@@ -243,7 +243,7 @@
     fi
 fi
 if test $tcl_ok = 0; then
-    LIBOBJS="$LIBOBJS strtoul.o"
+    AC_LIBOBJ(strtoul)
 fi
 
 #--------------------------------------------------------------------
@@ -273,7 +273,7 @@
     fi
 fi
 if test $tcl_ok = 0; then
-    LIBOBJS="$LIBOBJS strtod.o"
+    AC_LIBOBJ(strtod)
 fi
 
 #--------------------------------------------------------------------
@@ -352,7 +352,7 @@
     AC_CHECK_LIB(inet, strncasecmp, tcl_ok=1, tcl_ok=0)
 fi
 if test "$tcl_ok" = 0; then
-    LIBOBJS="$LIBOBJS strncasecmp.o"
+    AC_LIBOBJ(strncasecmp)
 fi
 
 #--------------------------------------------------------------------
--- tcl8.4.13/unix/tcl.m4.ac123	2006-04-19 17:39:42.000000000 -0400
+++ tcl8.4.13/unix/tcl.m4	2006-04-19 17:40:31.000000000 -0400
@@ -1123,7 +1123,7 @@
 
 	    # AIX v<=4.1 has some different flags than 4.2+
 	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
-		LIBOBJS="$LIBOBJS tclLoadAix.o"
+		AC_LIBOBJ(tclLoadAix)
 		DL_LIBS="-lld"
 	    fi
 
@@ -1365,7 +1365,7 @@
 	    # is kind of overkill but it works.
 	    # Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
-	    if test x"${LIBOBJS}" != x ; then
+	    if test x"${LIB@&t at OBJS}" != x ; then
 	        CFLAGS="$CFLAGS -fno-inline"
 	    fi
 
@@ -2571,7 +2571,7 @@
 		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
 		    tcl_cv_strtod_buggy=buggy)])
 	if test "$tcl_cv_strtod_buggy" = buggy; then
-	    LIBOBJS="$LIBOBJS fixstrtod.o"
+	    AC_LIBOBJ(fixstrtod)
 	    AC_DEFINE(strtod, fixstrtod)
 	fi
     fi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tcl/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Feb 2006 17:02:11 -0000	1.9
+++ .cvsignore	5 Jun 2006 15:29:09 -0000	1.10
@@ -2,3 +2,5 @@
 tcl8.4.11-html.tar.gz
 tcl8.4.12-src.tar.gz
 tk8.4.12-src.tar.gz
+tcl8.4.13-src.tar.gz
+tk8.4.13-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tcl/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Feb 2006 17:02:11 -0000	1.9
+++ sources	5 Jun 2006 15:29:09 -0000	1.10
@@ -1,2 +1,2 @@
-7480432d8730263f267952788eb4839b  tcl8.4.12-src.tar.gz
-316491cb82d898b434842353aed1f0d6  tk8.4.12-src.tar.gz
+f3420b9439bcc769992c1367934a060d  tcl8.4.13-src.tar.gz
+0a16d4d9398e43cbb85784c85fb807a4  tk8.4.13-src.tar.gz


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/FC-5/tcl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tcl.spec	17 Feb 2006 15:48:09 -0000	1.19
+++ tcl.spec	5 Jun 2006 15:29:09 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: Tcl scripting language development environment
 Name: tcl
-Version: %{majorver}.12
-Release: 4
+Version: %{majorver}.13
+Release: 1.1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -15,8 +15,7 @@
 Patch2: tcl-8.4.5-lib-perm.patch
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
 Patch4: tcl-8.4-no_rpath.patch
-Patch5: tcl-8.4-autoconf.patch
-Patch6: tcl-8.4.12-relid.patch
+Patch5: tcl-8.4.13-autoconf.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -67,7 +66,6 @@
 %patch3 -p1 -b .3-pkgpath
 %patch4 -p1 -b .4-rpath
 %patch5 -p1 -b .5-ac213
-%patch6 -p1 -b .6-relid
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix
@@ -150,6 +148,10 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Mon Jun 05 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-1.1
+- Upgraded to Tcl 8.4.13 to avoid using abbreviated sub-commands in
+  core scripts (#193853)
+
 * Fri Feb 17 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-4
 - Enable threads (#181871)
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:46:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:46:56 -0400
Subject: rpms/syslinux/devel syslinux.spec,1.30,1.31
Message-ID: <200606051546.k55FkuJ8030343@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28935

Modified Files:
	syslinux.spec 
Log Message:
Changing BR to glibc32



Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- syslinux.spec	5 Jun 2006 15:27:44 -0000	1.30
+++ syslinux.spec	5 Jun 2006 15:46:53 -0000	1.31
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.10
 %define tarball_version 3.10
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -11,7 +11,7 @@
 ExclusiveArch: i386 x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: nasm >= 0.98.38-1, perl, netpbm-progs
-BuildRequires: glibc-devel
+BuildRequires: glibc32
 Autoreq: 0
 %ifarch i386
 Requires: mtools, libc.so.6
@@ -102,6 +102,9 @@
 
 %changelog
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-3
+- Changed glibc-devel to glibc32 to get the 32bit package in
+
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-3
 - Added missing glibc-devel BuildRequires
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.10-2.2



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:48:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:48:55 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.75,1.76
Message-ID: <200606051548.k55FmtIx000572@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv524

Modified Files:
	kdenetwork.spec 
Log Message:
add BR on libXxf86vm-devel



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdenetwork.spec	5 Jun 2006 15:16:01 -0000	1.75
+++ kdenetwork.spec	5 Jun 2006 15:48:48 -0000	1.76
@@ -52,6 +52,7 @@
 BuildRequires: wireless-tools >= 25
 BuildRequires: coreutils
 BuildRequires: libXmu-devel
+BuildRequires: libXxf86vm-devel
 %if %{xmms}
 BuildRequires: xmms-devel
 %else



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:56:33 -0400
Subject: rpms/syslinux/devel syslinux.spec,1.31,1.32
Message-ID: <200606051556.k55FuXKQ003486@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3389

Modified Files:
	syslinux.spec 
Log Message:
One last try pointing to the file itself for a BuildReq



Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- syslinux.spec	5 Jun 2006 15:46:53 -0000	1.31
+++ syslinux.spec	5 Jun 2006 15:56:30 -0000	1.32
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.10
 %define tarball_version 3.10
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -11,7 +11,7 @@
 ExclusiveArch: i386 x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: nasm >= 0.98.38-1, perl, netpbm-progs
-BuildRequires: glibc32
+BuildRequires: /usr/include/gnu/stubs-32.h
 Autoreq: 0
 %ifarch i386
 Requires: mtools, libc.so.6
@@ -101,7 +101,10 @@
 %{_prefix}/lib/syslinux/com32
 
 %changelog
-* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-3
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-5
+- Use the actual file as a BuildRequire
+
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-4
 - Changed glibc-devel to glibc32 to get the 32bit package in
 
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-3



From fedora-cvs-commits at redhat.com  Mon Jun  5 15:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 11:57:56 -0400
Subject: rpms/parted/devel upstream,1.1,NONE upstream-key.gpg,1.1,NONE
Message-ID: <200606051557.k55Fvu3h004073@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3994

Removed Files:
	upstream upstream-key.gpg 
Log Message:
Removed upstream* files.



--- upstream DELETED ---


--- upstream-key.gpg DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 16:12:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 12:12:42 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.76,1.77
Message-ID: <200606051612.k55GCgTj006096@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6031

Modified Files:
	kdenetwork.spec 
Log Message:
add BR on libXtst-devel



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdenetwork.spec	5 Jun 2006 15:48:48 -0000	1.76
+++ kdenetwork.spec	5 Jun 2006 16:12:39 -0000	1.77
@@ -53,6 +53,7 @@
 BuildRequires: coreutils
 BuildRequires: libXmu-devel
 BuildRequires: libXxf86vm-devel
+BuildRequires: libXtst-devel
 %if %{xmms}
 BuildRequires: xmms-devel
 %else



From fedora-cvs-commits at redhat.com  Mon Jun  5 16:24:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 12:24:41 -0400
Subject: rpms/kdevelop/devel .cvsignore, 1.28, 1.29 kdevelop.spec, 1.46,
	1.47 sources, 1.30, 1.31
Message-ID: <200606051624.k55GOflU023946@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23903

Modified Files:
	.cvsignore kdevelop.spec sources 
Log Message:
3.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	5 Apr 2006 21:01:05 -0000	1.28
+++ .cvsignore	5 Jun 2006 16:24:38 -0000	1.29
@@ -11,3 +11,4 @@
 kdevelop-3.3.0.tar.bz2
 kdevelop-3.3.1.tar.bz2
 kdevelop-3.3.2.tar.bz2
+kdevelop-3.3.3.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdevelop.spec	5 Apr 2006 21:01:07 -0000	1.46
+++ kdevelop.spec	5 Jun 2006 16:24:38 -0000	1.47
@@ -1,7 +1,7 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define qt_version 3.3.6
 %define qt_epoch 1
 %define kdelibs_epoch 6
@@ -12,7 +12,7 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.2
+Version: 3.3.3
 Release: 1
 Epoch: 9
 URL: http://www.kdevelop.org/
@@ -87,7 +87,7 @@
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="$RPM_OPT_FLAGS"
+export FLAGS="%{optflags}"
 
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
@@ -98,7 +98,9 @@
 popd
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
 %if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
@@ -120,20 +122,20 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
-make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
+make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
 
 # remove useless files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
+rm -rf %{buildroot}%{_prefix}/kdevbdb
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -154,6 +156,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Mon Jun 05 2006 Than Ngo <than at redhat.com> 9:3.3.3-1
+- update to 3.3.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 9:3.3.2-1
 - update to 3.3.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Apr 2006 21:01:21 -0000	1.30
+++ sources	5 Jun 2006 16:24:39 -0000	1.31
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2
+89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 16:34:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 12:34:58 -0400
Subject: rpms/kdewebdev/devel .cvsignore, 1.12, 1.13 kdewebdev.spec, 1.29,
	1.30 sources, 1.13, 1.14
Message-ID: <200606051634.k55GYwpg026224@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26155

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Feb 2006 21:34:07 -0000	1.12
+++ .cvsignore	5 Jun 2006 16:34:55 -0000	1.13
@@ -15,3 +15,4 @@
 kdewebdev-3.4.92.tar.bz2
 kdewebdev-3.5.0.tar.bz2
 kdewebdev-3.5.1.tar.bz2
+kdewebdev-3.5.3.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdewebdev.spec	5 Apr 2006 21:46:13 -0000	1.29
+++ kdewebdev.spec	5 Jun 2006 16:34:55 -0000	1.30
@@ -5,13 +5,13 @@
 %define arts 1
 
 %define qt_version 3.3.6
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 1
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
@@ -67,11 +67,13 @@
   make -f admin/Makefile.common cvs
 %endif
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --disable-rpath \
 %if %{disable_gcc_check_and_hidden_visibility}
@@ -92,24 +94,24 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # install docs
 for i in css html javascript ; do
    pushd $i
    ./install.sh <<EOF
-$RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+%{buildroot}%{_datadir}/apps/quanta/doc
 EOF
    popd
    rm -rf $i
 done
 
-cp -R php php.docrc $RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
 
 # fix dangling symlinks
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -123,13 +125,13 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/*.so*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_datadir}/applications/kde/*
@@ -143,10 +145,12 @@
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.so
 %{_includedir}/*
 
 %changelog
+* Mon Jun 05 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 6:3.5.2-1
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Apr 2006 21:46:13 -0000	1.13
+++ sources	5 Jun 2006 16:34:55 -0000	1.14
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2
+0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 16:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 12:43:17 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.47,1.48
Message-ID: <200606051643.k55GhHbY027534@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27489

Modified Files:
	kdevelop.spec 
Log Message:
add BR db4-devel



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdevelop.spec	5 Jun 2006 16:24:38 -0000	1.47
+++ kdevelop.spec	5 Jun 2006 16:43:12 -0000	1.48
@@ -39,6 +39,7 @@
 BuildPrereq: automake
 BuildPrereq: libtool
 BuildPrereq: kdelibs-devel >= %{kde_version}
+Buildprereq: db4-devel
 Obsoletes: kdevelop-c_c++_ref
 
 %description



From fedora-cvs-commits at redhat.com  Mon Jun  5 16:56:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 12:56:36 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2246,
	1.2247 linux-2.6-pci-reverse-pci-config-space-restore-order.patch,
	1.1, 1.2 linux-2.6-debug-pm-pci.patch, 1.2, NONE
Message-ID: <200606051656.k55GuajM012626@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12571

Modified Files:
	kernel-2.6.spec 
	linux-2.6-pci-reverse-pci-config-space-restore-order.patch 
Removed Files:
	linux-2.6-debug-pm-pci.patch 
Log Message:
merge 2 diffs into 1



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2246
retrieving revision 1.2247
diff -u -r1.2246 -r1.2247
--- kernel-2.6.spec	5 Jun 2006 04:21:04 -0000	1.2246
+++ kernel-2.6.spec	5 Jun 2006 16:56:33 -0000	1.2247
@@ -323,7 +323,6 @@
 Patch1031: linux-2.6-debug-periodic-slab-check.patch
 Patch1032: linux-2.6-debug-boot-delay.patch
 Patch1033: linux-2.6-debug-must_check.patch
-Patch1034: linux-2.6-debug-pm-pci.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -927,7 +926,6 @@
 #%patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
-%patch1034 -p1
 
 #
 # Make /dev/mem a need-to-know function

linux-2.6-pci-reverse-pci-config-space-restore-order.patch:
 drivers/pci/pci.c                     |    6 +++++-
 linux-2.6.16.noarch/drivers/pci/pci.c |   12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

Index: linux-2.6-pci-reverse-pci-config-space-restore-order.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-pci-reverse-pci-config-space-restore-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-pci-reverse-pci-config-space-restore-order.patch	5 Jun 2006 04:21:06 -0000	1.1
+++ linux-2.6-pci-reverse-pci-config-space-restore-order.patch	5 Jun 2006 16:56:33 -0000	1.2
@@ -1,3 +1,28 @@
+
+--- linux-2.6.16.noarch/drivers/pci/pci.c~	2006-04-16 17:36:34.000000000 -0500
++++ linux-2.6.16.noarch/drivers/pci/pci.c	2006-04-16 17:37:42.000000000 -0500
+@@ -461,9 +461,17 @@ int 
+ pci_restore_state(struct pci_dev *dev)
+ {
+ 	int i;
++	int val;
+ 
+-	for (i = 0; i < 16; i++)
+-		pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
++	for (i = 0; i < 16; i++) {
++		pci_read_config_dword(dev, i * 4, &val);
++		if (val != dev->saved_config_space[i]) {
++			printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n",
++				pci_name(dev), i,
++				val, (int) dev->saved_config_space[i]);
++			pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
++		}
++	}
+ 	pci_restore_msi_state(dev);
+ 	pci_restore_msix_state(dev);
+ 	return 0;
+
+
 From akpm at osdl.org  Tue Apr 25 14:58:32 2006
 Message-Id: <200604250701.k3P71orx015389 at shell0.pdx.osdl.net>
 Subject: PCI: reverse pci config space restore order


--- linux-2.6-debug-pm-pci.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 17:10:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 13:10:38 -0400
Subject: rpms/kernel/devel sources,1.391,1.392
Message-ID: <200606051710.k55HAcEH015154@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15082

Modified Files:
	sources 
Log Message:
trim



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- sources	4 Jun 2006 18:36:03 -0000	1.391
+++ sources	5 Jun 2006 17:10:34 -0000	1.392
@@ -1,6 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-876c8ce40a8d5e56ec9fad22746609ac  xen-20060524.tar.bz2
 55623238bcf132c3f3fc8af2e333a80a  patch-2.6.17-rc5.bz2
-d39a0f49e696d791ee416782c30a44f1  patch-2.6.17-rc5-git8.bz2
 de03b1f1d050bb6c3bd68723299fa65b  xen-20060602.tar.bz2
 91c393acab909555bc7bb01833227935  patch-2.6.17-rc5-git11.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 17:35:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 13:35:49 -0400
Subject: rpms/mkinitrd/devel mkinitrd-5.0.41-nodm.patch, NONE,
	1.1 mkinitrd.spec, 1.126, 1.127
Message-ID: <200606051735.k55HZnF1012395@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12374

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-5.0.41-nodm.patch 
Log Message:
- fix syntax error in mkinitrd


mkinitrd-5.0.41-nodm.patch:
 mkinitrd |  121 +++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 60 insertions(+), 61 deletions(-)

--- NEW FILE mkinitrd-5.0.41-nodm.patch ---
--- mkinitrd-5.0.41/mkinitrd.nodm	2006-06-05 13:28:27.000000000 -0400
+++ mkinitrd-5.0.41/mkinitrd	2006-06-05 13:28:30.000000000 -0400
@@ -736,69 +736,68 @@
     fi
 
     dmout=$(/sbin/dmsetup ls 2>/dev/null)
-    if [ "$dmout" == "No devices found" -o "$dmout" == "" ]; then
-        break;
-    fi
-
-    findmodule -dm-mod
+    if [ "$dmout" != "No devices found" -a "$dmout" != "" ]; then
 
-    # DM requires all of these to be there in case someone used the
-    # feature.  broken.  (#132001)
-    findmodule -dm-mirror
-    findmodule -dm-zero
-    findmodule -dm-snapshot
+        findmodule -dm-mod
     
-    RAIDS=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks") 
-
-    # I fucking hate shell. 
-    lineno=1
-    PREV=""
-    LINE=""
-    while :; do
-        PREV="$LINE"
-        LINE=$(/sbin/dmsetup table | head -$lineno | tail -1)
-        if [ "$LINE" == "$PREV" ]; then
-            break;
-        fi
-
-        eval $(echo $LINE | \
-            while read NAME START END TYPE TABLE ; do
-                echo NAME=\"$(sed 's/:$//'<<< "$NAME")\"
-                echo START=\"$START\"
-                echo END=\"$END\"
-                echo TYPE=\"$TYPE\"
-                echo TABLE=\"$TABLE\"
-            done)
-
-        case "$TYPE" in
-            multipath|emc)
-                # ugggh.  We could try to fish the module name out, but it
-                # requires real parsing... 
-                # XXX also covered by #132001
-                for mod in $TABLE ; do 
-                    DMMODS="$DMMODS $([[ "$mod" =~ "[[:alpha:]]" ]] && echo "$mod")"
-                done
-                DMDEVS="$DMDEVS $NAME"
-                ;;
-            *)
-                NAME=""
-                for raid in $RAIDS ; do
-                    if [ "$raid" == "$NAME" ]; then
-                        dmname=$(resolve_dm_name $NAME)
-                        DMDEVS="$DMDEVS $dmname"
-                        RAIDS=$(sed 's/ $NAME //' <<< "$RAIDS")
-                        break
-                    fi
-                done
-                ;;
-        esac
-        lineno=$(($lineno + 1))
-    done
-
-    for mod in $(tr ' ' '\n' <<< $DMMODS | sort -u) ; do
-        findmodule -dm-$mod
-    done
-    DMDEVS=$(tr ' ' '\n' <<< $DMDEVS | sort -u)
+        # DM requires all of these to be there in case someone used the
+        # feature.  broken.  (#132001)
+        findmodule -dm-mirror
+        findmodule -dm-zero
+        findmodule -dm-snapshot
+        
+        RAIDS=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks") 
+    
+        # I fucking hate shell. 
+        lineno=1
+        PREV=""
+        LINE=""
+        while :; do
+            PREV="$LINE"
+            LINE=$(/sbin/dmsetup table | head -$lineno | tail -1)
+            if [ "$LINE" == "$PREV" ]; then
+                break;
+            fi
+    
+            eval $(echo $LINE | \
+                while read NAME START END TYPE TABLE ; do
+                    echo NAME=\"$(sed 's/:$//'<<< "$NAME")\"
+                    echo START=\"$START\"
+                    echo END=\"$END\"
+                    echo TYPE=\"$TYPE\"
+                    echo TABLE=\"$TABLE\"
+                done)
+    
+            case "$TYPE" in
+                multipath|emc)
+                    # ugggh.  We could try to fish the module name out, but it
+                    # requires real parsing... 
+                    # XXX also covered by #132001
+                    for mod in $TABLE ; do 
+                        DMMODS="$DMMODS $([[ "$mod" =~ "[[:alpha:]]" ]] && echo "$mod")"
+                    done
+                    DMDEVS="$DMDEVS $NAME"
+                    ;;
+                *)
+                    NAME=""
+                    for raid in $RAIDS ; do
+                        if [ "$raid" == "$NAME" ]; then
+                            dmname=$(resolve_dm_name $NAME)
+                            DMDEVS="$DMDEVS $dmname"
+                            RAIDS=$(sed 's/ $NAME //' <<< "$RAIDS")
+                            break
+                        fi
+                    done
+                    ;;
+            esac
+            lineno=$(($lineno + 1))
+        done
+    
+        for mod in $(tr ' ' '\n' <<< $DMMODS | sort -u) ; do
+            findmodule -dm-$mod
+        done
+        DMDEVS=$(tr ' ' '\n' <<< $DMDEVS | sort -u)
+    fi
 fi
 
 for n in $basicmodules; do


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- mkinitrd.spec	30 May 2006 19:32:31 -0000	1.126
+++ mkinitrd.spec	5 Jun 2006 17:35:43 -0000	1.127
@@ -1,12 +1,13 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.0.41
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: mkinitrd-%{version}.tar.bz2
 Patch0: mkinitrd-5.0.41-sbp2.patch
 Patch1: mkinitrd-5.0.41-stabilized.patch
+Patch2: mkinitrd-5.0.41-nodm.patch
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -42,6 +43,7 @@
 %setup -q
 %patch0 -p1 -b .sbp2
 %patch1 -p1 -b .stabilized
+%patch2 -p1 -b .nodm
 
 %build
 make
@@ -67,6 +69,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Mon Jun  5 2006 Peter Jones <pjones at redhat.com> - 5.0.41-4
+- Fix my bad shell code to detect DMs in use.
+
 * Tue May 30 2006 Peter Jones <pjones at redhat.com> - 5.0.41-3
 - rebuild on all arches
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 17:47:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 13:47:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2247,1.2248
Message-ID: <200606051747.k55HlFX6024128@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22758

Modified Files:
	kernel-2.6.spec 
Log Message:
Make smaps work again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2247
retrieving revision 1.2248
diff -u -r1.2247 -r1.2248
--- kernel-2.6.spec	5 Jun 2006 16:56:33 -0000	1.2247
+++ kernel-2.6.spec	5 Jun 2006 17:47:13 -0000	1.2248
@@ -1001,7 +1001,7 @@
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.
-%patch1720 -p1
+#%patch1720 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # Fix up kmalloc whilst atomic warning during resume.



From fedora-cvs-commits at redhat.com  Mon Jun  5 17:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 13:51:00 -0400
Subject: rpms/iscsi-initiator-utils/devel
	open-iscsi-5.0.5.595-add-iscsi-iname.patch, NONE,
	1.1 open-iscsi-5.0.5.595-fc-version.patch, NONE,
	1.1 open-iscsi-5.0.5.595-rm-reopen-max.patch, NONE,
	1.1 open-iscsi-5.0.5.595-update-initscripts-and-docs.patch,
	NONE, 1.1 .cvsignore, 1.6, 1.7 iscsi-initiator-utils.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200606051751.k55Hp0qL027002@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26976

Modified Files:
	.cvsignore iscsi-initiator-utils.spec sources 
Added Files:
	open-iscsi-5.0.5.595-add-iscsi-iname.patch 
	open-iscsi-5.0.5.595-fc-version.patch 
	open-iscsi-5.0.5.595-rm-reopen-max.patch 
	open-iscsi-5.0.5.595-update-initscripts-and-docs.patch 
Log Message:
update devel tree to r595

open-iscsi-5.0.5.595-add-iscsi-iname.patch:
 Makefile            |    2 
 utils/Makefile      |   12 ++
 utils/iscsi-iname.c |  140 ++++++++++++++++++++++++++++++
 utils/md5.c         |  242 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 utils/md5.h         |   41 ++++++++
 5 files changed, 437 insertions(+)

--- NEW FILE open-iscsi-5.0.5.595-add-iscsi-iname.patch ---
diff -Naurp open-iscsi/Makefile open-iscsi-5.0.5.595/Makefile
--- open-iscsi/Makefile	2006-05-30 01:51:42.000000000 -0500
+++ open-iscsi-5.0.5.595/Makefile	2006-05-30 02:29:46.000000000 -0500
@@ -26,6 +26,7 @@ ETCFILES = etc/iscsid.conf
 all:
 	$(MAKE) -C usr
 	$(MAKE) -C kernel
+	$(MAKE) -C utils
 	@echo
 	@echo "Compilation complete                Output file"
 	@echo "----------------------------------- ----------------"
@@ -38,6 +39,7 @@ all:
 	@echo Read README file for detailed information.
 
 clean:
+	$(MAKE) -C utils clean
 	$(MAKE) -C usr clean
 	$(MAKE) -C kernel clean
 
diff -Naurp open-iscsi/utils/iscsi-iname.c open-iscsi-5.0.5.595/utils/iscsi-iname.c
--- open-iscsi/utils/iscsi-iname.c	1969-12-31 18:00:00.000000000 -0600
+++ open-iscsi-5.0.5.595/utils/iscsi-iname.c	2006-05-30 02:28:34.000000000 -0500
@@ -0,0 +1,140 @@
+/*
+ * iSCSI InitiatorName creation utility
+ * Copyright (C) 2001 Cisco Systems, Inc.
+ * maintained by linux-iscsi-devel at lists.sourceforge.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * See the file COPYING included with this distribution for more details.
+ *
+ * $Id: iscsi-iname.c,v 1.1.2.3 2005/03/15 06:33:44 wysochanski Exp $
+ *
+ * iscsi-iname.c - Compute an iSCSI InitiatorName for this host.
+ * Note that to ensure uniqueness, the system time is
+ * a factor.  This name must be cached and only regenerated
+ * if there is no cached value.
+ */
+
+#include <stdint.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/utsname.h>
+#include <sys/time.h>
+
+#include "md5.h"
+
+#define RANDOM_NUM_GENERATOR	"/dev/urandom"
+
+int
+main(int argc, char *argv[])
+{
+	char iname[256];
+	struct timeval time;
+	struct utsname system_info;
+	long hostid;
+	struct MD5Context context;
+	unsigned char digest[16];
+	unsigned char *bytes = digest;
+	unsigned char entropy[16];
+	int e;
+	int fd;
+	char *prefix;
+
+	/* initialize */
+	memset(iname, 0, sizeof (iname));
+	memset(digest, 0, sizeof (digest));
+	memset(&context, 0, sizeof (context));
+	MD5Init(&context);
+
+	/* take a prefix if given, otherwise use a default. */
+	if (argc > 1 && argv[1]) {
+		prefix = argv[1];
+		if (( strcmp(prefix, "-h") == 0 ) ||
+		    ( strcmp(prefix, "--help") == 0 )) {
+			printf("\nDisplays the iSCSI initiator name\n");
+			exit(0);
+		} else if ( strcmp(prefix, "-p") == 0 ) {
+			prefix = argv[2];
+		} else {
+			printf("\nUsage: iscsi-iname [-h | --help | "
+			       "-p <prefix>]\n");
+			exit(0);
+		}
+	} else {
+		prefix = "iqn.2005-03.com.max:01";
+	}
+
+	/* try to feed some entropy from the pool to MD5 in order to get
+	 * uniqueness properties
+	 */
+
+	if ((fd = open(RANDOM_NUM_GENERATOR, O_RDONLY))) {
+		e = read(fd, &entropy, 16);
+		if (e >= 1)
+			MD5Update(&context, (md5byte *)entropy, e);
+		close(fd);
+	}
+
+	/* time the name is created is a factor in order to get
+	 * uniqueness properties
+	 */
+	if (gettimeofday(&time, NULL) < 0) {
+		perror("error: gettimeofday failed");
+		return 1;
+	}
+	MD5Update(&context, (md5byte *) & time.tv_sec, sizeof (time.tv_sec));
+	MD5Update(&context, (md5byte *) & time.tv_usec, sizeof (time.tv_usec));
+
+	/* hostid */
+	hostid = gethostid();
+	MD5Update(&context, (md5byte *) & hostid, sizeof (hostid));
+
+	/* get the hostname and system name */
+	if (uname(&system_info) < 0) {
+		perror("error: uname failed");
+		return 1;
+	}
+	MD5Update(&context, (md5byte *) system_info.sysname,
+		  sizeof (system_info.sysname));
+	MD5Update(&context, (md5byte *) system_info.nodename,
+		  sizeof (system_info.nodename));
+	MD5Update(&context, (md5byte *) system_info.release,
+		  sizeof (system_info.release));
+	MD5Update(&context, (md5byte *) system_info.version,
+		  sizeof (system_info.version));
+	MD5Update(&context, (md5byte *) system_info.machine,
+		  sizeof (system_info.machine));
+
+	/* compute the md5 hash of all the bits we just collected */
+	MD5Final(digest, &context);
+
+	/* vary which md5 bytes we pick (though we probably don't need to do
+	 * this, since hopefully MD5 produces results such that each byte is as
+	 * good as any other).
+	 */
+
+	if ((fd = open(RANDOM_NUM_GENERATOR, O_RDONLY))) {
+		if (read(fd, entropy, 1) == 1)
+			bytes = &digest[(entropy[0] % (sizeof(digest) - 6))];
+		close(fd);
+	}
+
+	/* print the prefix followed by 6 bytes of the MD5 hash */
+	sprintf(iname, "%s.%x%x%x%x%x%x", prefix,
+		bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5]);
+
+	iname[sizeof (iname) - 1] = '\0';
+	printf("%s\n", iname);
+	return 0;
+}
diff -Naurp open-iscsi/utils/Makefile open-iscsi-5.0.5.595/utils/Makefile
--- open-iscsi/utils/Makefile	1969-12-31 18:00:00.000000000 -0600
+++ open-iscsi-5.0.5.595/utils/Makefile	2006-05-30 02:28:34.000000000 -0500
@@ -0,0 +1,12 @@
+# This Makefile will work only with GNU make.
+
+CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g
+PROGRAMS = iscsi-iname
+
+all: $(PROGRAMS)
+
+iscsi-iname: md5.o iscsi-iname.o
+	$(CC) $^ $(DBM_LIB) -o $@
+
+clean:
+	rm -f *.o $(PROGRAMS)
diff -Naurp open-iscsi/utils/md5.c open-iscsi-5.0.5.595/utils/md5.c
--- open-iscsi/utils/md5.c	1969-12-31 18:00:00.000000000 -0600
+++ open-iscsi-5.0.5.595/utils/md5.c	2006-05-30 02:28:34.000000000 -0500
@@ -0,0 +1,242 @@
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ * Changed so as no longer to depend on Colin Plumb's `usual.h' header
+ * definitions; now uses stuff from dpkg's config.h.
+ *  - Ian Jackson <ijackson at nyx.cs.du.edu>.
+ * Still in the public domain.
+ */
+
+#include <string.h>
+
+#include "md5.h"
+
+#if (__BYTE_ORDER == __BIG_ENDIAN)
+/*
+ * we can compile this away for little endian since
+ * it does not do anything on those archs
+ */
+void
+byteSwap(uint32_t * buf, unsigned words)
+{
+	md5byte *p = (md5byte *) buf;
+
+	do {
+		*buf++ = (uint32_t) ((unsigned) p[3] << 8 | p[2]) << 16 |
+		    ((unsigned) p[1] << 8 | p[0]);
+		p += 4;
+	} while (--words);
+}
+#else
+#define byteSwap(buf,words)
+#endif
+
+/*
+ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void
+MD5Init(struct MD5Context *ctx)
+{
+	ctx->buf[0] = 0x67452301;
+	ctx->buf[1] = 0xefcdab89;
+	ctx->buf[2] = 0x98badcfe;
+	ctx->buf[3] = 0x10325476;
+
+	ctx->bytes[0] = 0;
+	ctx->bytes[1] = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void
+MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len)
+{
+	uint32_t t;
+
+	/* Update byte count */
+
+	t = ctx->bytes[0];
+	if ((ctx->bytes[0] = t + len) < t)
+		ctx->bytes[1]++;	/* Carry from low to high */
+
+	t = 64 - (t & 0x3f);	/* Space available in ctx->in (at least 1) */
+	if (t > len) {
+		memcpy((md5byte *) ctx->in + 64 - t, buf, len);
+		return;
+	}
+	/* First chunk is an odd size */
+	memcpy((md5byte *) ctx->in + 64 - t, buf, t);
+	byteSwap(ctx->in, 16);
+	MD5Transform(ctx->buf, ctx->in);
+	buf += t;
+	len -= t;
+
+	/* Process data in 64-byte chunks */
+	while (len >= 64) {
+		memcpy(ctx->in, buf, 64);
+		byteSwap(ctx->in, 16);
+		MD5Transform(ctx->buf, ctx->in);
+		buf += 64;
+		len -= 64;
+	}
+
+	/* Handle any remaining bytes of data. */
+	memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void
+MD5Final(md5byte digest[16], struct MD5Context *ctx)
+{
+	int count = ctx->bytes[0] & 0x3f;	/* Number of bytes in ctx->in */
+	md5byte *p = (md5byte *) ctx->in + count;
+
+	/* Set the first char of padding to 0x80.  There is always room. */
+	*p++ = 0x80;
+
+	/* Bytes of padding needed to make 56 bytes (-8..55) */
+	count = 56 - 1 - count;
+
+	if (count < 0) {	/* Padding forces an extra block */
+		memset(p, 0, count + 8);
+		byteSwap(ctx->in, 16);
+		MD5Transform(ctx->buf, ctx->in);
+		p = (md5byte *) ctx->in;
+		count = 56;
+	}
+	memset(p, 0, count);
+	byteSwap(ctx->in, 14);
+
+	/* Append length in bits and transform */
+	ctx->in[14] = ctx->bytes[0] << 3;
+	ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
+	MD5Transform(ctx->buf, ctx->in);
+
+	byteSwap(ctx->buf, 4);
+	memcpy(digest, ctx->buf, 16);
+	memset(ctx, 0, sizeof (ctx));	/* In case it's sensitive */
+}
+
+#ifndef ASM_MD5
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f,w,x,y,z,in,s) \
+	 (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+void
+MD5Transform(uint32_t buf[4], uint32_t const in[16])
+{
+	register uint32_t a, b, c, d;
+
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+
+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
+}
+
+#endif
diff -Naurp open-iscsi/utils/md5.h open-iscsi-5.0.5.595/utils/md5.h
--- open-iscsi/utils/md5.h	1969-12-31 18:00:00.000000000 -0600
+++ open-iscsi-5.0.5.595/utils/md5.h	2006-05-30 02:28:34.000000000 -0500
@@ -0,0 +1,41 @@
+/*
+ * This is the header file for the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ * Changed so as no longer to depend on Colin Plumb's `usual.h'
+ * header definitions; now uses stuff from dpkg's config.h
+ *  - Ian Jackson <ijackson at nyx.cs.du.edu>.
+ * Still in the public domain.
+ */
+
+#ifndef MD5_H
+#define MD5_H
+
+#include <stdint.h>
+
+#define md5byte unsigned char
+
+struct MD5Context {
+	uint32_t buf[4];
+	uint32_t bytes[2];
+	uint32_t in[16];
+};
+
+void MD5Init(struct MD5Context *context);
+void MD5Update(struct MD5Context *context, md5byte const *buf, unsigned len);
+void MD5Final(unsigned char digest[16], struct MD5Context *context);
+void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
+
+#endif				/* !MD5_H */

open-iscsi-5.0.5.595-fc-version.patch:
 version.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE open-iscsi-5.0.5.595-fc-version.patch ---
--- open-iscsi/usr/version.h	2006-05-30 01:51:41.000000000 -0500
+++ open-iscsi-5.0.5.595/usr/version.h	2006-05-30 03:01:16.000000000 -0500
@@ -6,6 +6,6 @@
  * This may not be the same value as the kernel versions because
  * some other maintainer could merge a patch without going through us
  */
-#define ISCSI_VERSION_STR	"1.0-595"
+#define ISCSI_VERSION_STR	"1.0-595.0"
 
 #endif

open-iscsi-5.0.5.595-rm-reopen-max.patch:
 config.h    |    4 ++--
 discovery.c |   11 +++++++++--
 idbm.c      |    6 ------
 3 files changed, 11 insertions(+), 10 deletions(-)

--- NEW FILE open-iscsi-5.0.5.595-rm-reopen-max.patch ---
diff -aurp open-iscsi-5.0.5.595/usr/config.h open-iscsi-5.0.5.574/usr/config.h
--- open-iscsi-5.0.5.595/usr/config.h	2006-05-30 02:02:29.000000000 -0500
+++ open-iscsi-5.0.5.574/usr/config.h	2006-05-18 22:50:25.000000000 -0500
@@ -43,7 +43,8 @@
 #define ISCSI_CONN_MAX		16
 
 /* database version control */
-#define IDBM_VERSION		0x05
+/* To maintain backwards compat with earlier DBs we do some tricks */
+#define IDBM_VERSION		0x04
 
 /* the following structures store the options set in the config file.
  * a structure is defined for each logically-related group of options.
@@ -141,7 +142,6 @@ struct iscsi_sendtargets_config {
 	int port;
 	int continuous;
 	int send_async_text;
-	int reopen_max;
 	struct iscsi_auth_config auth;
 	struct iscsi_connection_timeout_config conn_timeo;
 };
diff -aurp open-iscsi-5.0.5.595/usr/discovery.c open-iscsi-5.0.5.574/usr/discovery.c
--- open-iscsi-5.0.5.595/usr/discovery.c	2006-05-30 02:02:29.000000000 -0500
+++ open-iscsi-5.0.5.574/usr/discovery.c	2006-05-18 20:04:12.000000000 -0500
@@ -644,6 +644,13 @@ soonest_msecs(struct timeval *t1, struct
 		return (m2 < m3) ? m2 : m3;
 }
 
+/*
+ * tmp hack: open-iscsi does not support DB updates. Upstream has changed
+ * the DB format, so instead of jerking feodora users around we just set
+ * that configurable value to some safe default
+ */
+#define DISC_REOPEN_MAX 5
+
 static iscsi_session_t *
 init_new_session(struct iscsi_sendtargets_config *config)
 {
@@ -670,7 +677,7 @@ init_new_session(struct iscsi_sendtarget
 	session->conn[0].max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
 	session->conn[0].max_xmit_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
 
-	session->reopen_cnt = config->reopen_max;
+	session->reopen_cnt = DISC_REOPEN_MAX;
 
 	/* OUI and uniqifying number */
 	session->isid[0] = DRIVER_ISID_0;
@@ -1120,7 +1127,7 @@ reconnect:
 
 	if (--session->reopen_cnt < 0) {
 		log_error("connection login retries (reopen_max) %d exceeded",
-			  config->reopen_max);
+			  DISC_REOPEN_MAX);
 		return 1;
 	}
 
diff -aurp open-iscsi-5.0.5.595/usr/idbm.c open-iscsi-5.0.5.574/usr/idbm.c
--- open-iscsi-5.0.5.595/usr/idbm.c	2006-05-30 02:02:29.000000000 -0500
+++ open-iscsi-5.0.5.574/usr/idbm.c	2006-05-18 20:04:12.000000000 -0500
@@ -264,8 +264,6 @@ idbm_update_discovery(discovery_rec_t *r
 	__update_rec_int(rec, newrec,
 		 u.sendtargets.conn_timeo.login_timeout);
 	__update_rec_int(rec, newrec,
-		 u.sendtargets.reopen_max);
-	__update_rec_int(rec, newrec,
 		 u.sendtargets.conn_timeo.auth_timeout);
 	__update_rec_int(rec, newrec,
 		 u.sendtargets.conn_timeo.active_timeout);
@@ -659,9 +657,6 @@ idbm_recinfo_discovery(discovery_rec_t *
 		__recinfo_int("discovery.sendtargets.timeo.login_timeout",ri, r,
 			u.sendtargets.conn_timeo.login_timeout,
 			IDBM_SHOW, num);
-		__recinfo_int("discovery.sendtargets.reopen_max",ri, r,
-			u.sendtargets.reopen_max,
-			IDBM_SHOW, num);
 		__recinfo_int("discovery.sendtargets.timeo.auth_timeout", ri, r,
 			u.sendtargets.conn_timeo.auth_timeout,
 			IDBM_SHOW, num);
@@ -900,7 +895,6 @@ idbm_discovery_setup_defaults(discovery_
 	if (type == DISCOVERY_TYPE_SENDTARGETS) {
 		rec->u.sendtargets.continuous = 0;
 		rec->u.sendtargets.send_async_text = 0;
-		rec->u.sendtargets.reopen_max = 5;
 		rec->u.sendtargets.auth.authmethod = 0;
 		rec->u.sendtargets.auth.password_length = 0;
 		rec->u.sendtargets.auth.password_in_length = 0;

open-iscsi-5.0.5.595-update-initscripts-and-docs.patch:
 README                 |    2 +-
 etc/initd/initd.redhat |    2 +-
 etc/iscsid.conf        |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE open-iscsi-5.0.5.595-update-initscripts-and-docs.patch ---
diff -aurp open-iscsi/etc/initd/initd.redhat open-iscsi.work/etc/initd/initd.redhat
--- open-iscsi/etc/initd/initd.redhat	2006-05-30 01:51:42.000000000 -0500
+++ open-iscsi.work/etc/initd/initd.redhat	2006-05-30 03:57:03.000000000 -0500
@@ -37,7 +37,7 @@ start_iscsid()
 	TARGETS=`$ISCSIADM -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1 at g'`
 	for rec in $TARGETS
 	do
-		STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3`
+		STARTUP=`$ISCSIADM -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
 		if [ $STARTUP = "automatic" ]
 		then
 			$ISCSIADM -m node -r $rec -l
diff -aurp open-iscsi/etc/iscsid.conf open-iscsi.work/etc/iscsid.conf
--- open-iscsi/etc/iscsid.conf	2006-05-30 01:51:42.000000000 -0500
+++ open-iscsi.work/etc/iscsid.conf	2006-05-30 03:57:10.000000000 -0500
@@ -3,7 +3,7 @@
 # Could be located at /etc/iscsid.conf or ~/.iscsid.conf
 #
 node.active_cnx = 1
-node.startup = manual
+node.startup = automatic
 #node.session.auth.username = dima
 #node.session.auth.password = aloha
 node.session.timeo.replacement_timeout = 120
@@ -19,6 +19,7 @@ node.session.iscsi.MaxConnections = 0
 node.conn[0].iscsi.HeaderDigest = None
 node.conn[0].iscsi.DataDigest = None
 node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
+node.conn[0].startup = automatic
 #discovery.sendtargets.auth.authmethod = CHAP
 #discovery.sendtargets.auth.username = dima
 #discovery.sendtargets.auth.password = aloha
diff -aurp open-iscsi/README open-iscsi.work/README
--- open-iscsi/README	2006-05-30 01:51:42.000000000 -0500
+++ open-iscsi.work/README	2006-05-30 03:57:03.000000000 -0500
@@ -353,7 +353,7 @@ node discovered in the discovery above:
 Or to set the "node.conn[0].statup" attribute to "startup" as default for
 all sessions add the following to the /etc/iscsid.conf:
 
-	node.conn[0].startup = automatic
+	node.startup = automatic
 
 To login to all the automated nodes, simply restart the iscsi service
 e.g /etc/init.d/open-iscsi restart


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 19:56:18 -0000	1.6
+++ .cvsignore	5 Jun 2006 17:50:57 -0000	1.7
@@ -1,2 +1,3 @@
 open-iscsi-5.0.4.446.tar.gz
 open-iscsi-5.0.5.476.tar.bz2
+open-iscsi-5.0.5.595.tar.bz2


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iscsi-initiator-utils.spec	11 Feb 2006 03:39:24 -0000	1.8
+++ iscsi-initiator-utils.spec	5 Jun 2006 17:50:57 -0000	1.9
@@ -1,10 +1,13 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 5.0.5.476
-Release: 0.1
+Version: 5.0.5.595
+Release: 0
 Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
-Patch0: open-iscsi-5.0.4.446-initscript.patch
-Patch1: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
+Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
+Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch
+Patch3: open-iscsi-5.0.5.595-fc-version.patch
+
 Group: System Environment/Daemons
 License: GPL
 URL: http://www.open-iscsi.org
@@ -22,8 +25,10 @@
 %prep
 %setup -q -n %{name}-%{version} -c
 cd open-iscsi-%{version}
-%patch0 -p1 -b .initscript
+%patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .add-iscsi-iname
+%patch2 -p1 -b .rm-reopen-max
+%patch3 -p1 -b .fc-version
 
 %build
 cd open-iscsi-%{version}
@@ -38,7 +43,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/
-install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname $RPM_BUILD_ROOT/sbin
+install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
 install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
@@ -48,6 +53,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if [ ! -f /etc/initiatorname.iscsi ]; then
+	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+fi
+
 /sbin/chkconfig --add iscsi
 
 %preun
@@ -55,7 +64,6 @@
     /sbin/chkconfig --del iscsi
 fi
 
-
 %files
 %defattr(-,root,root)
 %config /etc/rc.d/init.d/iscsi
@@ -66,6 +74,26 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue May 30 2006 Mike Christie <mchristi at redhat.com>
+- rebase package to svn rev 595 to fix several bugs
+  NOTE!!!!!!!! This is not compatible with the older open-iscsi modules
+  and tools. You must upgrade.
+
+* Thu May 18 2006 Mike Christie <mchristi at redhat.com>
+- update package to open-iscsi svn rev 571
+  NOTE!!!!!!!! This is not compatible with the older open-iscsi modules
+  and tools. You must upgrade.
+
+* Fri Apr 7 2006 Mike Christie <mchristi at redhat.com>
+- From Andy Henson <andy at zexia.co.uk>:
+  Autogenerate /etc/initiatorname.iscsi during install if not already present
+- Remove code to autogenerate /etc/initiatorname.iscsi from initscript
+- From dan.y.roche at gmail.com:
+  add touch and rm lock code
+- update README
+- update default iscsid.conf. "cnx" was not supported. The correct
+  id was "conn".
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0.5.476-0.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 19:56:18 -0000	1.6
+++ sources	5 Jun 2006 17:50:57 -0000	1.7
@@ -1 +1 @@
-7f2308e910fb953012cdce1373358809  open-iscsi-5.0.5.476.tar.bz2
+0209e5ff0885eee23e3730c6328d8594  open-iscsi-5.0.5.595.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 17:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 13:52:26 -0400
Subject: rpms/sysstat/devel sysstat.spec,1.38,1.39
Message-ID: <200606051752.k55HqQP6027046@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27033

Modified Files:
	sysstat.spec 
Log Message:
Add missing BR gettext


Index: sysstat.spec
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sysstat.spec	11 May 2006 10:17:58 -0000	1.38
+++ sysstat.spec	5 Jun 2006 17:52:24 -0000	1.39
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 6.0.2
-Release: 1
+Release: 2
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -18,7 +18,7 @@
 
 Requires: /sbin/chkconfig
 Prereq: sh-utils textutils grep fileutils /etc/cron.d
-BuildRequires: perl %{_includedir}/linux/if.h
+BuildRequires: perl %{_includedir}/linux/if.h gettext
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
 
 %description
@@ -111,6 +111,9 @@
 /var/log/sa
 
 %changelog
+* Mon Jun  5 2006 Jesse Keating <jkeating at redhat.com> 6.0.2-2
+- Add missing BR of gettext
+
 * Fri May  5 2006 Ivana Varekova <varekova at redhat.com> 6.0.2-1
 - update to 6.0.2
 - remove asm/page.h used sysconf command to get PAGE_SIZE



From fedora-cvs-commits at redhat.com  Mon Jun  5 17:55:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 13:55:46 -0400
Subject: rpms/kernel/devel linux-2.6-powernow-k7-smp.patch, NONE,
	1.1 kernel-2.6.spec, 1.2248, 1.2249
Message-ID: <200606051755.k55HtkU6027182@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27164

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-powernow-k7-smp.patch 
Log Message:
Make Powernow-k7 work again.

linux-2.6-powernow-k7-smp.patch:
 powernow-k7.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-powernow-k7-smp.patch ---
--- linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/powernow-k7.c~	2006-06-05 13:50:27.000000000 -0400
+++ linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/powernow-k7.c	2006-06-05 13:54:32.000000000 -0400
@@ -582,9 +582,7 @@ static int __init powernow_cpu_init (str
 	rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val);
 
 	/* recalibrate cpu_khz */
-	result = recalibrate_cpu_khz();
-	if (result)
-		return result;
+	recalibrate_cpu_khz();
 
 	fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];
 	if (!fsb) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2248
retrieving revision 1.2249
diff -u -r1.2248 -r1.2249
--- kernel-2.6.spec	5 Jun 2006 17:47:13 -0000	1.2248
+++ kernel-2.6.spec	5 Jun 2006 17:55:44 -0000	1.2249
@@ -367,6 +367,7 @@
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
+Patch1780: linux-2.6-powernow-k7-smp.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -1008,6 +1009,8 @@
 %patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
+# Fix up powernow-k7 to work on SMP kernels.
+%patch1780 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1760,6 +1763,7 @@
 %changelog
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com>
 - Do PCI config space restore on resume in reverse.
+- Make Powernow-k7 work again.
 
 * Sun Jun  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc5-git11



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:06:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2249,
	1.2250 linux-2.6-proc-self-maps-fix.patch, 1.2, 1.3
Message-ID: <200606051806.k55I6pK6027363@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27346

Modified Files:
	kernel-2.6.spec linux-2.6-proc-self-maps-fix.patch 
Log Message:
Fix the setuid /proc/self/maps fix (#165351, #190128)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2249
retrieving revision 1.2250
diff -u -r1.2249 -r1.2250
--- kernel-2.6.spec	5 Jun 2006 17:55:44 -0000	1.2249
+++ kernel-2.6.spec	5 Jun 2006 18:06:49 -0000	1.2250
@@ -1002,7 +1002,7 @@
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.
-#%patch1720 -p1
+%patch1720 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # Fix up kmalloc whilst atomic warning during resume.
@@ -1764,6 +1764,7 @@
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com>
 - Do PCI config space restore on resume in reverse.
 - Make Powernow-k7 work again.
+- Fix the setuid /proc/self/maps fix (#165351, #190128)
 
 * Sun Jun  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc5-git11

linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                    |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                |    2 ++
 b/fs/proc/task_mmu.c                |    3 +--
 b/include/linux/proc_fs.h           |    0 
 b/include/linux/ptrace.h            |    1 +
 b/kernel/ptrace.c                   |    4 ++--
 linux-2.6.16.noarch/kernel/ptrace.c |    2 +-
 7 files changed, 27 insertions(+), 5 deletions(-)

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-proc-self-maps-fix.patch	10 Apr 2006 19:37:46 -0000	1.2
+++ linux-2.6-proc-self-maps-fix.patch	5 Jun 2006 18:06:49 -0000	1.3
@@ -18,7 +18,7 @@
 +	task_lock(task);
 +	if (task->mm != mm)
 +		goto out;
-+	if (task->mm != current->mm && !__ptrace_may_attach(task))
++	if (task->mm != current->mm && __ptrace_may_attach(task))
 +		goto out;
 +	task_unlock(task);
 +	return mm;



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:27:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:27:20 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.20.bz2.sign, NONE, 1.1 kernel-2.6.spec,
	1.2129, 1.2130 upstream, 1.313, 1.314 patch-2.6.16.19.bz2.sign,
	1.1, NONE
Message-ID: <200606051827.k55IRKlr025179@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25156

Modified Files:
	kernel-2.6.spec upstream 
Added Files:
	patch-2.6.16.20.bz2.sign 
Removed Files:
	patch-2.6.16.19.bz2.sign 
Log Message:
2.6.16.20


--- NEW FILE patch-2.6.16.20.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEhGkxyGugalF9Dw4RAo4qAJ95228f+a/pEaFyAeZE4Nne52i+CwCglfzd
mZexyPHwev1OZkRbRdZYf4g=
=p1Ge
-----END PGP SIGNATURE-----


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2129
retrieving revision 1.2130
diff -u -r1.2129 -r1.2130
--- kernel-2.6.spec	1 Jun 2006 14:51:33 -0000	1.2129
+++ kernel-2.6.spec	5 Jun 2006 18:27:18 -0000	1.2130
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.19.bz2
+Patch1: patch-2.6.16.20.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1686,6 +1686,9 @@
 %endif
 
 %changelog
+* Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2129_FC5]
+- 2.6.16.20
+
 * Thu Jun  1 2006 Dave Jones <davej at redhat.com>
 - Reenable Xen builds.
 


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- upstream	31 May 2006 01:46:51 -0000	1.313
+++ upstream	5 Jun 2006 18:27:18 -0000	1.314
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.19.bz2
+patch-2.6.16.20.bz2


--- patch-2.6.16.19.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:28:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:28:01 -0400
Subject: rpms/kernel/FC-5 .cvsignore,1.402,1.403 sources,1.343,1.344
Message-ID: <200606051828.k55IS14C025459@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25424

Modified Files:
	.cvsignore sources 
Log Message:
.20



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- .cvsignore	31 May 2006 01:46:51 -0000	1.402
+++ .cvsignore	5 Jun 2006 18:27:59 -0000	1.403
@@ -3,4 +3,4 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 xen-20060510.tar.bz2
-patch-2.6.16.19.bz2
+patch-2.6.16.20.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- sources	31 May 2006 01:46:51 -0000	1.343
+++ sources	5 Jun 2006 18:27:59 -0000	1.344
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 1200119be7ce232efec3636f0b27d051  xen-20060510.tar.bz2
-0b171e99e9d5af5b42a58c5510fd52cb  patch-2.6.16.19.bz2
+391e7410fb03a533d40d1a1620465ad7  patch-2.6.16.20.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:28:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:28:20 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2130,1.2131
Message-ID: <200606051828.k55ISKJ6025614@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25573

Modified Files:
	kernel-2.6.spec 
Log Message:
bump



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2130
retrieving revision 1.2131
diff -u -r1.2130 -r1.2131
--- kernel-2.6.spec	5 Jun 2006 18:27:18 -0000	1.2130
+++ kernel-2.6.spec	5 Jun 2006 18:28:17 -0000	1.2131
@@ -1686,7 +1686,7 @@
 %endif
 
 %changelog
-* Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2129_FC5]
+* Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2131_FC5]
 - 2.6.16.20
 
 * Thu Jun  1 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:28:45 -0400
Subject: rpms/glib2/devel .cvsignore, 1.51, 1.52 glib2.spec, 1.98,
	1.99 sources, 1.51, 1.52
Message-ID: <200606051828.k55ISjgx025855@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25807

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.11.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	15 May 2006 17:54:08 -0000	1.51
+++ .cvsignore	5 Jun 2006 18:28:43 -0000	1.52
@@ -1 +1 @@
-glib-2.11.1.tar.bz2
+glib-2.11.2.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- glib2.spec	2 Jun 2006 03:15:39 -0000	1.98
+++ glib2.spec	5 Jun 2006 18:28:43 -0000	1.99
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.11.1
-Release: 6
+Version: 2.11.2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-1
+- Update to 2.11.2
+
 * Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.1-6
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	15 May 2006 17:54:08 -0000	1.51
+++ sources	5 Jun 2006 18:28:43 -0000	1.52
@@ -1 +1 @@
-3655de1e252f3028fff862347a624808  glib-2.11.1.tar.bz2
+18464b85bfd589f83897623c637a1553  glib-2.11.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:30:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:30:59 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2131,1.2132
Message-ID: <200606051830.k55IUxln026545@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26451

Modified Files:
	kernel-2.6.spec 
Log Message:
remove tag fluff



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2131
retrieving revision 1.2132
diff -u -r1.2131 -r1.2132
--- kernel-2.6.spec	5 Jun 2006 18:28:17 -0000	1.2131
+++ kernel-2.6.spec	5 Jun 2006 18:30:57 -0000	1.2132
@@ -24,8 +24,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -1686,7 +1685,7 @@
 %endif
 
 %changelog
-* Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2131_FC5]
+* Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2132_FC5]
 - 2.6.16.20
 
 * Thu Jun  1 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:33:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:33:54 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.20.bz2.sign, NONE, 1.1 .cvsignore,
	1.191, 1.192 kernel-2.6.spec, 1.1642, 1.1643 sources, 1.175,
	1.176 upstream, 1.116, 1.117 patch-2.6.16.19.bz2.sign, 1.1, NONE
Message-ID: <200606051833.k55IXsdM026798@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26751

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.20.bz2.sign 
Removed Files:
	patch-2.6.16.19.bz2.sign 
Log Message:
.20



--- NEW FILE patch-2.6.16.20.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEhGkxyGugalF9Dw4RAo4qAJ95228f+a/pEaFyAeZE4Nne52i+CwCglfzd
mZexyPHwev1OZkRbRdZYf4g=
=p1Ge
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- .cvsignore	31 May 2006 01:48:45 -0000	1.191
+++ .cvsignore	5 Jun 2006 18:33:49 -0000	1.192
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.19.bz2
+patch-2.6.16.20.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1642
retrieving revision 1.1643
diff -u -r1.1642 -r1.1643
--- kernel-2.6.spec	31 May 2006 01:48:46 -0000	1.1642
+++ kernel-2.6.spec	5 Jun 2006 18:33:49 -0000	1.1643
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.19.bz2
+Patch1: patch-2.6.16.20.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2115_FC4]
+- 2.6.16.20
+
 * Tue May 30 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2114_FC4]
 - 2.6.16.19
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- sources	31 May 2006 01:48:58 -0000	1.175
+++ sources	5 Jun 2006 18:33:51 -0000	1.176
@@ -1,2 +1,2 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-0b171e99e9d5af5b42a58c5510fd52cb  patch-2.6.16.19.bz2
+391e7410fb03a533d40d1a1620465ad7  patch-2.6.16.20.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- upstream	31 May 2006 01:48:58 -0000	1.116
+++ upstream	5 Jun 2006 18:33:51 -0000	1.117
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.19.bz2
+patch-2.6.16.20.bz2


--- patch-2.6.16.19.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:34:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:34:10 -0400
Subject: rpms/tux/devel tux.spec,1.26,1.27
Message-ID: <200606051834.k55IYApR026843@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26815

Modified Files:
	tux.spec 
Log Message:
Bumped for new build system


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tux.spec	15 May 2006 15:29:11 -0000	1.26
+++ tux.spec	5 Jun 2006 18:33:57 -0000	1.27
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 5
+Release: 6
 Summary: User-space component of TUX kernel-based threaded HTTP server
 License: GPL
 Group: System Environment/Daemons
@@ -70,6 +70,9 @@
 %doc tux.README NEWS SUCCESS gettuxconfig checkbindings demo.c demo.tux.so demo2.c demo2.tux.so demo3.c demo3.tux.so demo4.c demo4.tux.so demo5.tux.so samples/sample.log samples/sample.out docs/tux docs/TUXAPI*
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-6
+- Bumped for new build system
+
 * Mon May 15 2006 Phil Knirsch <pknirsch at redhat.com> - 3.2.18-5
 - Added missing coreutils prereq.
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:39:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:39:11 -0400
Subject: rpms/eclipse-pydev/devel
	eclipse-pydev-1.0.8-backport-megapatch.patch, NONE,
	1.1 eclipse-pydev-noretroweaver.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 eclipse-pydev.spec, 1.17, 1.18 sources, 1.5, 1.6
Message-ID: <200606051839.k55IdBiH027577@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27546

Modified Files:
	.cvsignore eclipse-pydev.spec sources 
Added Files:
	eclipse-pydev-1.0.8-backport-megapatch.patch 
	eclipse-pydev-noretroweaver.patch 
Log Message:
* Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-1fc
- Building upstream version 1.0.8 backported to Java 1.4.


eclipse-pydev-1.0.8-backport-megapatch.patch:
 org.python.pydev.core/src/org/python/pydev/core/DeltaSaver.java                                                      |   60 +++---
 org.python.pydev.core/src/org/python/pydev/core/ExtensionHelper.java                                                 |    5 
 org.python.pydev.core/src/org/python/pydev/core/FullRepIterable.java                                                 |   12 -
 org.python.pydev.core/src/org/python/pydev/core/ICallback.java                                                       |    4 
 org.python.pydev.core/src/org/python/pydev/core/ICodeCompletionASTManager.java                                       |    4 
 org.python.pydev.core/src/org/python/pydev/core/IDeltaProcessor.java                                                 |    8 
 org.python.pydev.core/src/org/python/pydev/core/IInterpreterManager.java                                             |    2 
 org.python.pydev.core/src/org/python/pydev/core/IModule.java                                                         |    4 
 org.python.pydev.core/src/org/python/pydev/core/IModulesManager.java                                                 |    4 
 org.python.pydev.core/src/org/python/pydev/core/ISystemModulesManager.java                                           |    4 
 org.python.pydev.core/src/org/python/pydev/core/ModulesKey.java                                                      |    1 
 org.python.pydev.core/src/org/python/pydev/core/ObjectsPool.java                                                     |    1 
 org.python.pydev.core/src/org/python/pydev/core/REF.java                                                             |   27 +--
 org.python.pydev.core/src/org/python/pydev/core/Tuple.java                                                           |   11 -
 org.python.pydev.core/src/org/python/pydev/core/Tuple3.java                                                          |   13 -
 org.python.pydev.core/src/org/python/pydev/core/bundle/ImageCache.java                                               |    2 
 org.python.pydev.core/src/org/python/pydev/core/cache/Cache.java                                                     |    8 
 org.python.pydev.core/src/org/python/pydev/core/cache/DiskCache.java                                                 |   18 +-
 org.python.pydev.core/src/org/python/pydev/core/cache/LRUCache.java                                                  |   18 +-
 org.python.pydev.core/src/org/python/pydev/core/cache/PyPreferencesCache.java                                        |   10 -
 org.python.pydev.core/src/org/python/pydev/core/docutils/PyDocIterator.java                                          |    4 
 org.python.pydev.core/src/org/python/pydev/core/docutils/PySelection.java                                            |   58 +++---
 org.python.pydev.core/src/org/python/pydev/core/docutils/StringUtils.java                                            |    2 
 org.python.pydev.core/tests/org/python/pydev/core/DeltaSaverTest.java                                                |   47 ++---
 org.python.pydev.core/tests/org/python/pydev/core/FullRepIterableTest.java                                           |    8 
 org.python.pydev.core/tests/org/python/pydev/core/TestDependent.template                                             |    5 
 org.python.pydev.core/tests/org/python/pydev/core/cache/LRUCacheTest.java                                            |   22 +-
 org.python.pydev.debug/src/org/python/pydev/debug/model/AbstractDebugTarget.java                                     |   42 +++-
 org.python.pydev.debug/src/org/python/pydev/debug/model/DeferredWorkbenchAdapter.java                                |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/model/PyStackFrame.java                                            |    9 -
 org.python.pydev.debug/src/org/python/pydev/debug/model/XMLUtils.java                                                |   16 -
 org.python.pydev.debug/src/org/python/pydev/debug/model/remote/GetFrameCommand.java                                  |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/MainModuleTab.java                                              |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/BreakpointRulerAction.java                              |    6 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerAction.java                 |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java         |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/PythonBreakpointPropertiesRulerActionDelegate.java      |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/JythonLaunchConfigurationDelegate.java                |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/JythonLaunchShortcut.java                             |    2 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunner.java                                     |    2 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunnerConfig.java                               |   10 -
 org.python.pydev.debug/src/org/python/pydev/debug/ui/propertypages/PythonBreakpointPage.java                         |    1 
 org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java                                                |   56 +++---
 org.python.pydev.jython/src/org/python/pydev/jython/ScriptOutput.java                                                |    1 
 org.python.pydev.jython/src/org/python/pydev/jython/ScriptingExtensionInitializer.java                               |    1 
 org.python.pydev.jython/src/org/python/pydev/jython/ui/JyScriptingPreferencesPage.java                               |    1 
 org.python.pydev.parser/src/org/python/pydev/parser/IParserObserver2.java                                            |    4 
 org.python.pydev.parser/src/org/python/pydev/parser/ParserScheduler.java                                             |    9 -
 org.python.pydev.parser/src/org/python/pydev/parser/ParsingThread.java                                               |    2 
 org.python.pydev.parser/src/org/python/pydev/parser/PyParser.java                                                    |   42 ++--
 org.python.pydev.parser/src/org/python/pydev/parser/jython/PythonGrammar.java                                        |   12 -
 org.python.pydev.parser/src/org/python/pydev/parser/jython/SimpleNode.java                                           |   13 +
 org.python.pydev.parser/src/org/python/pydev/parser/jython/SpecialStr.java                                           |    3 
 org.python.pydev.parser/src/org/python/pydev/parser/jython/TreeBuilder.java                                          |    6 
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/NodeUtils.java                                          |   29 ++-
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/comparator/SimpleNodeComparator.java                    |   12 -
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/DefinitionsASTIteratorVisitor.java                |    4 
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/EasyASTIteratorVisitor.java                       |    2 
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/EasyAstIteratorBase.java                          |   33 +--
 org.python.pydev.parser/tests/org/python/pydev/parser/PyParserPrintTest.java                                         |    2 
 org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTest.java                                              |   67 +++----
 org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java                                          |    6 
 org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java                                      |    6 
 org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java                                    |   14 -
 org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java                                       |   15 +
 org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java                                          |   18 +-
 org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java                                                      |   27 +--
 org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java                                               |   19 +-
 org.python.pydev/src/org/python/pydev/builder/PydevGrouperVisitor.java                                               |   34 ++-
 org.python.pydev/src/org/python/pydev/builder/PydevMarkerUtils.java                                                  |   48 +++--
 org.python.pydev/src/org/python/pydev/builder/pychecker/PyCheckerLauncher.java                                       |    2 
 org.python.pydev/src/org/python/pydev/builder/pychecker/PyCheckerVisitor.java                                        |    2 
 org.python.pydev/src/org/python/pydev/builder/pycremover/PycRemoverBuilderVisitor.java                               |   11 -
 org.python.pydev/src/org/python/pydev/builder/pylint/PyLintPrefInitializer.java                                      |    1 
 org.python.pydev/src/org/python/pydev/builder/pylint/PyLintVisitor.java                                              |   12 -
 org.python.pydev/src/org/python/pydev/editor/PyCodeScanner.java                                                      |   11 -
 org.python.pydev/src/org/python/pydev/editor/PyEdit.java                                                             |   49 +++--
 org.python.pydev/src/org/python/pydev/editor/PyEditConfiguration.java                                                |    2 
 org.python.pydev/src/org/python/pydev/editor/PyPartitionScanner.java                                                 |   12 -
 org.python.pydev/src/org/python/pydev/editor/actions/PyBackspace.java                                                |    6 
 org.python.pydev/src/org/python/pydev/editor/actions/PyGoToDefinition.java                                           |    7 
 org.python.pydev/src/org/python/pydev/editor/actions/PyNextMethod.java                                               |    2 
 org.python.pydev/src/org/python/pydev/editor/actions/PyOrganizeImports.java                                          |   13 -
 org.python.pydev/src/org/python/pydev/editor/actions/PyPreviousMethod.java                                           |    2 
 org.python.pydev/src/org/python/pydev/editor/actions/PyShowBrowser.java                                              |    1 
 org.python.pydev/src/org/python/pydev/editor/actions/PyShowOutline.java                                              |    1 
 org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyRefactorAction.java                               |    3 
 org.python.pydev/src/org/python/pydev/editor/autoedit/PyAutoIndentStrategy.java                                      |   26 +-
 org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletionInitializer.java                         |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonStringCompletionProcessor.java                     |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java                        |   90 +++++-----
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/CompletionState.java                           |   36 ++--
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ModulesManager.java                            |   78 ++++----
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ProjectModulesManager.java                     |   75 +++++---
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/PyCodeCompletionVisitor.java                   |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/PythonPathHelper.java                          |   24 +-
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/SystemModulesManager.java                      |   10 -
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java                    |   12 -
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/CompiledModule.java                    |   38 ++--
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/EmptyModule.java                       |    4 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceModule.java                      |   80 ++++----
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceToken.java                       |    2 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java                  |   22 +-
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/Definition.java                       |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitor.java       |   14 -
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/FindScopeVisitor.java                 |    6 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/Scope.java                            |   16 +
 org.python.pydev/src/org/python/pydev/editor/codecompletion/shell/AbstractShell.java                                 |   50 ++---
 org.python.pydev/src/org/python/pydev/editor/codecompletion/shell/JythonShell.java                                   |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/shell/PythonShell.java                                   |    1 
 org.python.pydev/src/org/python/pydev/editor/codefolding/PySourceViewer.java                                         |   33 ++-
 org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java                         |    9 -
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistAssign.java                           |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistDocString.java                        |   12 -
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistImport.java                           |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistOverride.java                         |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistTry.java                              |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/IAssistProps.java                           |    2 
 org.python.pydev/src/org/python/pydev/editor/hover/PyAnnotationHover.java                                            |    8 
 org.python.pydev/src/org/python/pydev/editor/hover/PyTextHover.java                                                  |   12 +
 org.python.pydev/src/org/python/pydev/editor/model/AbstractNode.java                                                 |    4 
 org.python.pydev/src/org/python/pydev/editor/model/ItemPointer.java                                                  |    3 
 org.python.pydev/src/org/python/pydev/editor/model/Location.java                                                     |    2 
 org.python.pydev/src/org/python/pydev/editor/refactoring/AbstractPyRefactoring.java                                  |    2 
 org.python.pydev/src/org/python/pydev/editor/refactoring/PyRefactoring.java                                          |    8 
 org.python.pydev/src/org/python/pydev/editor/refactoring/RefactoringRequest.java                                     |    6 
 org.python.pydev/src/org/python/pydev/editor/scripting/PyEditScripting.java                                          |   10 -
 org.python.pydev/src/org/python/pydev/editor/simpleassist/ISimpleAssistParticipant.java                              |    2 
 org.python.pydev/src/org/python/pydev/editor/simpleassist/SimpleAssistProcessor.java                                 |    9 -
 org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java                                                        |   60 +++---
 org.python.pydev/src/org/python/pydev/plugin/PydevPrefs.java                                                         |   10 -
 org.python.pydev/src/org/python/pydev/plugin/PydevPrefsInitializer.java                                              |    1 
 org.python.pydev/src/org/python/pydev/plugin/nature/PythonNature.java                                                |   25 +-
 org.python.pydev/src/org/python/pydev/plugin/nature/PythonPathNature.java                                            |    4 
 org.python.pydev/src/org/python/pydev/runners/SimpleJythonRunner.java                                                |   20 +-
 org.python.pydev/src/org/python/pydev/runners/SimplePythonRunner.java                                                |   10 -
 org.python.pydev/src/org/python/pydev/runners/SimpleRunner.java                                                      |   24 +-
 org.python.pydev/src/org/python/pydev/ui/PyProjectProperties.java                                                    |    1 
 org.python.pydev/src/org/python/pydev/ui/PyProjectPythonDetails.java                                                 |    1 
 org.python.pydev/src/org/python/pydev/ui/dialogs/PythonModulePickerDialog.java                                       |    2 
 org.python.pydev/src/org/python/pydev/ui/dialogs/PythonPackageSelectionDialog.java                                   |   21 +-
 org.python.pydev/src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java                                |   80 +++++---
 org.python.pydev/src/org/python/pydev/ui/interpreters/JythonInterpreterManager.java                                  |   21 +-
 org.python.pydev/src/org/python/pydev/ui/interpreters/PythonInterpreterManager.java                                  |   12 -
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterEditor.java                               |    9 -
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterPreferencesPage.java                      |   10 -
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/InterpreterInfo.java                                         |   26 +-
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/JythonInterpreterEditor.java                                 |    1 
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/JythonInterpreterPreferencesPage.java                        |    4 
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java                                 |    1 
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterPreferencesPage.java                        |    3 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/AbstractPythonWizard.java                                     |    1 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonAbstractPathPage.java                                   |   13 +
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonModuleWizard.java                                       |    3 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonPackageWizard.java                                      |    7 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonSourceFolderWizard.java                                 |    4 
 org.python.pydev/src/org/python/pydev/utils/CounterThread.java                                                       |    3 
 org.python.pydev/tests/org/python/pydev/editor/actions/PySelectionTest.java                                          |   26 +-
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/PythonShellTest.java                                   |   13 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/CodeCompletionTestsBase.java                 |   12 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/PythonInterpreterManagerStub.java            |   11 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonCodeCompletionTestsBase.java    |   15 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonInterpreterManagerStub.java     |   12 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitorTest.java            |   34 +--
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitorTest.java |    8 
 org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistAssignTest.java                     |    9 -
 org.python.pydev/tests/org/python/pydev/jythontests/JythonTests.java                                                 |    7 
 org.python.pydev/tests/org/python/pydev/runners/SimpleJythonRunnerTest.java                                          |    2 
 org.python.pydev/tests/org/python/pydev/runners/SimplePythonRunnerTest.java                                          |    2 
 org.python.pydev/tests/org/python/pydev/ui/pythonpathconf/InterpreterInfoTest.java                                   |   14 -
 src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java                                                        |    0 
 src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java                                                           |    0 
 src/org/python/pydev/builder/PyDevBuilder.java                                                                       |    0 
 src/org/python/pydev/builder/PyDevBuilderVisitor.java                                                                |    0 
 src/org/python/pydev/builder/PydevGrouperVisitor.java                                                                |    0 
 src/org/python/pydev/builder/PydevMarkerUtils.java                                                                   |    0 
 src/org/python/pydev/builder/pychecker/PyCheckerLauncher.java                                                        |    0 
 src/org/python/pydev/builder/pychecker/PyCheckerVisitor.java                                                         |    0 
 src/org/python/pydev/builder/pycremover/PycRemoverBuilderVisitor.java                                                |    0 
 src/org/python/pydev/builder/pylint/PyLintPrefInitializer.java                                                       |    0 
 src/org/python/pydev/builder/pylint/PyLintVisitor.java                                                               |    0 
 src/org/python/pydev/core/DeltaSaver.java                                                                            |    0 
 src/org/python/pydev/core/ExtensionHelper.java                                                                       |    0 
 src/org/python/pydev/core/FullRepIterable.java                                                                       |    0 
 src/org/python/pydev/core/ICallback.java                                                                             |    0 
 src/org/python/pydev/core/ICodeCompletionASTManager.java                                                             |    0 
 src/org/python/pydev/core/IDeltaProcessor.java                                                                       |    0 
 src/org/python/pydev/core/IInterpreterManager.java                                                                   |    0 
 src/org/python/pydev/core/IModule.java                                                                               |    0 
 src/org/python/pydev/core/IModulesManager.java                                                                       |    0 
 src/org/python/pydev/core/ISystemModulesManager.java                                                                 |    0 
 src/org/python/pydev/core/ModulesKey.java                                                                            |    0 
 src/org/python/pydev/core/ObjectsPool.java                                                                           |    0 
 src/org/python/pydev/core/REF.java                                                                                   |    0 
 src/org/python/pydev/core/Tuple.java                                                                                 |    0 
 src/org/python/pydev/core/Tuple3.java                                                                                |    0 
 src/org/python/pydev/core/bundle/ImageCache.java                                                                     |    0 
 src/org/python/pydev/core/cache/Cache.java                                                                           |    0 
 src/org/python/pydev/core/cache/DiskCache.java                                                                       |    0 
 src/org/python/pydev/core/cache/LRUCache.java                                                                        |    0 
 src/org/python/pydev/core/cache/PyPreferencesCache.java                                                              |    0 
 src/org/python/pydev/core/docutils/PyDocIterator.java                                                                |    0 
 src/org/python/pydev/core/docutils/PySelection.java                                                                  |    0 
 src/org/python/pydev/core/docutils/StringUtils.java                                                                  |    0 
 src/org/python/pydev/debug/model/AbstractDebugTarget.java                                                            |    0 
 src/org/python/pydev/debug/model/DeferredWorkbenchAdapter.java                                                       |    0 
 src/org/python/pydev/debug/model/PyStackFrame.java                                                                   |    0 
 src/org/python/pydev/debug/model/XMLUtils.java                                                                       |    0 
 src/org/python/pydev/debug/model/remote/GetFrameCommand.java                                                         |    0 
 src/org/python/pydev/debug/ui/MainModuleTab.java                                                                     |    0 
 src/org/python/pydev/debug/ui/actions/BreakpointRulerAction.java                                                     |    0 
 src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerAction.java                                        |    0 
 src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java                                |    0 
 src/org/python/pydev/debug/ui/actions/PythonBreakpointPropertiesRulerActionDelegate.java                             |    0 
 src/org/python/pydev/debug/ui/launching/JythonLaunchConfigurationDelegate.java                                       |    0 
 src/org/python/pydev/debug/ui/launching/JythonLaunchShortcut.java                                                    |    0 
 src/org/python/pydev/debug/ui/launching/PythonRunner.java                                                            |    0 
 src/org/python/pydev/debug/ui/launching/PythonRunnerConfig.java                                                      |    0 
 src/org/python/pydev/debug/ui/propertypages/PythonBreakpointPage.java                                                |    0 
 src/org/python/pydev/editor/PyCodeScanner.java                                                                       |    0 
 src/org/python/pydev/editor/PyEdit.java                                                                              |    0 
 src/org/python/pydev/editor/PyEditConfiguration.java                                                                 |    0 
 src/org/python/pydev/editor/PyPartitionScanner.java                                                                  |    0 
 src/org/python/pydev/editor/actions/PyBackspace.java                                                                 |    0 
 src/org/python/pydev/editor/actions/PyGoToDefinition.java                                                            |    0 
 src/org/python/pydev/editor/actions/PyNextMethod.java                                                                |    0 
 src/org/python/pydev/editor/actions/PyOrganizeImports.java                                                           |    0 
 src/org/python/pydev/editor/actions/PyPreviousMethod.java                                                            |    0 
 src/org/python/pydev/editor/actions/PyShowBrowser.java                                                               |    0 
 src/org/python/pydev/editor/actions/PyShowOutline.java                                                               |    0 
 src/org/python/pydev/editor/actions/refactoring/PyRefactorAction.java                                                |    0 
 src/org/python/pydev/editor/autoedit/PyAutoIndentStrategy.java                                                       |    0 
 src/org/python/pydev/editor/codecompletion/PyCodeCompletionInitializer.java                                          |    0 
 src/org/python/pydev/editor/codecompletion/PythonStringCompletionProcessor.java                                      |    0 
 src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java                                         |    0 
 src/org/python/pydev/editor/codecompletion/revisited/CompletionState.java                                            |    0 
 src/org/python/pydev/editor/codecompletion/revisited/ModulesManager.java                                             |    0 
 src/org/python/pydev/editor/codecompletion/revisited/ProjectModulesManager.java                                      |    0 
 src/org/python/pydev/editor/codecompletion/revisited/PyCodeCompletionVisitor.java                                    |    0 
 src/org/python/pydev/editor/codecompletion/revisited/PythonPathHelper.java                                           |    0 
 src/org/python/pydev/editor/codecompletion/revisited/SystemModulesManager.java                                       |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java                                     |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/CompiledModule.java                                     |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/EmptyModule.java                                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/SourceModule.java                                       |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/SourceToken.java                                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java                                   |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/Definition.java                                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitor.java                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/FindScopeVisitor.java                                  |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/Scope.java                                             |    0 
 src/org/python/pydev/editor/codecompletion/shell/AbstractShell.java                                                  |    0 
 src/org/python/pydev/editor/codecompletion/shell/JythonShell.java                                                    |    0 
 src/org/python/pydev/editor/codecompletion/shell/PythonShell.java                                                    |    0 
 src/org/python/pydev/editor/codefolding/PySourceViewer.java                                                          |    0 
 src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java                                          |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistAssign.java                                            |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistDocString.java                                         |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistImport.java                                            |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistOverride.java                                          |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistTry.java                                               |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/IAssistProps.java                                            |    0 
 src/org/python/pydev/editor/hover/PyAnnotationHover.java                                                             |    0 
 src/org/python/pydev/editor/hover/PyTextHover.java                                                                   |    0 
 src/org/python/pydev/editor/model/AbstractNode.java                                                                  |    0 
 src/org/python/pydev/editor/model/ItemPointer.java                                                                   |    0 
 src/org/python/pydev/editor/model/Location.java                                                                      |    0 
 src/org/python/pydev/editor/refactoring/AbstractPyRefactoring.java                                                   |    0 
 src/org/python/pydev/editor/refactoring/PyRefactoring.java                                                           |    0 
 src/org/python/pydev/editor/refactoring/RefactoringRequest.java                                                      |    0 
 src/org/python/pydev/editor/scripting/PyEditScripting.java                                                           |    0 
 src/org/python/pydev/editor/simpleassist/ISimpleAssistParticipant.java                                               |    0 
 src/org/python/pydev/editor/simpleassist/SimpleAssistProcessor.java                                                  |    0 
 src/org/python/pydev/jython/JythonPlugin.java                                                                        |    0 
 src/org/python/pydev/jython/ScriptOutput.java                                                                        |    0 
 src/org/python/pydev/jython/ScriptingExtensionInitializer.java                                                       |    0 
 src/org/python/pydev/jython/ui/JyScriptingPreferencesPage.java                                                       |    0 
 src/org/python/pydev/parser/IParserObserver2.java                                                                    |    0 
 src/org/python/pydev/parser/ParserScheduler.java                                                                     |    0 
 src/org/python/pydev/parser/ParsingThread.java                                                                       |    0 
 src/org/python/pydev/parser/PyParser.java                                                                            |    0 
 src/org/python/pydev/parser/jython/PythonGrammar.java                                                                |    0 
 src/org/python/pydev/parser/jython/SimpleNode.java                                                                   |    0 
 src/org/python/pydev/parser/jython/SpecialStr.java                                                                   |    0 
 src/org/python/pydev/parser/jython/TreeBuilder.java                                                                  |    0 
 src/org/python/pydev/parser/visitors/NodeUtils.java                                                                  |    0 
 src/org/python/pydev/parser/visitors/comparator/SimpleNodeComparator.java                                            |    0 
 src/org/python/pydev/parser/visitors/scope/DefinitionsASTIteratorVisitor.java                                        |    0 
 src/org/python/pydev/parser/visitors/scope/EasyASTIteratorVisitor.java                                               |    0 
 src/org/python/pydev/parser/visitors/scope/EasyAstIteratorBase.java                                                  |    0 
 src/org/python/pydev/plugin/PydevPlugin.java                                                                         |    0 
 src/org/python/pydev/plugin/PydevPrefs.java                                                                          |    0 
 src/org/python/pydev/plugin/PydevPrefsInitializer.java                                                               |    0 
 src/org/python/pydev/plugin/nature/PythonNature.java                                                                 |    0 
 src/org/python/pydev/plugin/nature/PythonPathNature.java                                                             |    0 
 src/org/python/pydev/runners/SimpleJythonRunner.java                                                                 |    0 
 src/org/python/pydev/runners/SimplePythonRunner.java                                                                 |    0 
 src/org/python/pydev/runners/SimpleRunner.java                                                                       |    0 
 src/org/python/pydev/ui/PyProjectProperties.java                                                                     |    0 
 src/org/python/pydev/ui/PyProjectPythonDetails.java                                                                  |    0 
 src/org/python/pydev/ui/dialogs/PythonModulePickerDialog.java                                                        |    0 
 src/org/python/pydev/ui/dialogs/PythonPackageSelectionDialog.java                                                    |    0 
 src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java                                                 |    0 
 src/org/python/pydev/ui/interpreters/JythonInterpreterManager.java                                                   |    0 
 src/org/python/pydev/ui/interpreters/PythonInterpreterManager.java                                                   |    0 
 src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterEditor.java                                                |    0 
 src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterPreferencesPage.java                                       |    0 
 src/org/python/pydev/ui/pythonpathconf/InterpreterInfo.java                                                          |    0 
 src/org/python/pydev/ui/pythonpathconf/JythonInterpreterEditor.java                                                  |    0 
 src/org/python/pydev/ui/pythonpathconf/JythonInterpreterPreferencesPage.java                                         |    0 
 src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java                                                  |    0 
 src/org/python/pydev/ui/pythonpathconf/PythonInterpreterPreferencesPage.java                                         |    0 
 src/org/python/pydev/ui/wizards/files/AbstractPythonWizard.java                                                      |    0 
 src/org/python/pydev/ui/wizards/files/PythonAbstractPathPage.java                                                    |    0 
 src/org/python/pydev/ui/wizards/files/PythonModuleWizard.java                                                        |    0 
 src/org/python/pydev/ui/wizards/files/PythonPackageWizard.java                                                       |    0 
 src/org/python/pydev/ui/wizards/files/PythonSourceFolderWizard.java                                                  |    0 
 src/org/python/pydev/utils/CounterThread.java                                                                        |    0 
 tests/org/python/pydev/core/DeltaSaverTest.java                                                                      |    0 
 tests/org/python/pydev/core/FullRepIterableTest.java                                                                 |    0 
 tests/org/python/pydev/core/TestDependent.template                                                                   |    0 
 tests/org/python/pydev/core/cache/LRUCacheTest.java                                                                  |    0 
 tests/org/python/pydev/editor/actions/PySelectionTest.java                                                           |    0 
 tests/org/python/pydev/editor/codecompletion/PythonShellTest.java                                                    |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/CodeCompletionTestsBase.java                                  |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/PythonInterpreterManagerStub.java                             |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonCodeCompletionTestsBase.java                     |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonInterpreterManagerStub.java                      |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitorTest.java                             |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitorTest.java                  |    0 
 tests/org/python/pydev/editor/correctionassist/heuristics/AssistAssignTest.java                                      |    0 
 tests/org/python/pydev/jythontests/JythonTests.java                                                                  |    0 
 tests/org/python/pydev/parser/PyParserPrintTest.java                                                                 |    0 
 tests/org/python/pydev/parser/PyParserTest.java                                                                      |    0 
 tests/org/python/pydev/parser/PyParserTestBase.java                                                                  |    0 
 tests/org/python/pydev/parser/profile/ParseBigFile.java                                                              |    0 
 tests/org/python/pydev/parser/visitors/NodeUtilsTest.java                                                            |    0 
 tests/org/python/pydev/runners/SimpleJythonRunnerTest.java                                                           |    0 
 tests/org/python/pydev/runners/SimplePythonRunnerTest.java                                                           |    0 
 tests/org/python/pydev/ui/pythonpathconf/InterpreterInfoTest.java                                                    |    0 
 340 files changed, 1249 insertions(+), 1100 deletions(-)

--- NEW FILE eclipse-pydev-1.0.8-backport-megapatch.patch ---
Index: src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java,v
retrieving revision 1.3
diff -u -r1.3 JavaVmLocationFinder.java
--- org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java	13 Aug 2005 14:36:24 -0000	1.3
+++ org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java	2 Jun 2006 20:41:34 -0000
@@ -89,8 +89,8 @@
     /**
      * @return the default java jars (rt.jar ... )
      */
-    public static List<File> findDefaultJavaJars(){
-        return (List<File>) callbackJavaJars.call(null);
+    public static List findDefaultJavaJars(){
+        return (List) callbackJavaJars.call(null);
     }
     
     /**
@@ -102,10 +102,13 @@
             IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
             LibraryLocation[] libraryLocations = JavaRuntime.getLibraryLocations(defaultVMInstall);
             
-            ArrayList<File> jars = new ArrayList<File>();
-            for (LibraryLocation location : libraryLocations) {
-                jars.add(location.getSystemLibraryPath().toFile());
-            }
+            ArrayList jars = new ArrayList();
+            for (int i = 0; i < libraryLocations.length; i++) {
+				LibraryLocation location = libraryLocations[i];
+				jars.add(location.getSystemLibraryPath().toFile());
+				
+			}
+            
             return jars;
         }
         
Index: src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java,v
retrieving revision 1.5
diff -u -r1.5 PythonPairMatcher.java
--- org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java	16 Mar 2006 00:29:59 -0000	1.5
+++ org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java	2 Jun 2006 20:41:34 -0000
@@ -260,11 +260,11 @@
         try {
             fReader.configureBackwardReader(document, offset, true, true);
             
-            Map<Character, Integer> stack = new HashMap<Character, Integer>();
+            Map stack = new HashMap();
             
             for (int i = 0; i < fPairs.length; i++) {
                 if(i %2 == 0){
-                    stack.put(fPairs[i], 1);
+                    stack.put(new Character(fPairs[i]), new Integer(1));
                 }
             }
             
@@ -272,16 +272,16 @@
             while (c != PythonCodeReader.EOF) {
                 if (c == ')' || c == ']' || c == '}' ){
                     char peer = DocUtils.getPeer((char)c);
-                    Integer iStack = stack.get((char)peer);
-                    iStack++;
-                    stack.put(peer, iStack);
+                    Integer iStack = (Integer) stack.get(new Character((char)peer));
+                    iStack = new Integer(iStack.intValue() + 1);
+                    stack.put(new Character(peer), iStack);
                     
                 }else if (c == '(' || c == '[' || c == '{'){
-                    Integer iStack = stack.get((char)c);
-                    iStack--;
-                    stack.put((char) c, iStack);
+                    Integer iStack = (Integer) stack.get(new Character((char)c));
+                    iStack = new Integer (iStack.intValue() - 1);
+                    stack.put(new Character((char) c), iStack);
                     
-                    if (iStack == 0){
+                    if (iStack.intValue() == 0){
                         return fReader.getOffset();
                     }
                 }
Index: src/org/python/pydev/builder/PyDevBuilder.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java,v
retrieving revision 1.43
diff -u -r1.43 PyDevBuilder.java
--- org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java	18 Mar 2006 13:20:03 -0000	1.43
+++ org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java	2 Jun 2006 20:41:34 -0000
@@ -45,9 +45,8 @@
      * 
      * @return a list of visitors for building the application.
      */
-    @SuppressWarnings("unchecked")
-    public List<PyDevBuilderVisitor> getVisitors() {
-        List<PyDevBuilderVisitor> list = new ArrayList<PyDevBuilderVisitor>();
+    public List getVisitors() {
+        List list = new ArrayList();
         list.add(new PyTodoVisitor());
         list.add(new PyLintVisitor());
         list.add(new PyCodeCompletionVisitor());
@@ -88,7 +87,7 @@
                 PyDevDeltaCounter counterVisitor = new PyDevDeltaCounter();
                 delta.accept(counterVisitor);
                 
-                List<PyDevBuilderVisitor> visitors = getVisitors();
+                List visitors = getVisitors();
                 
                 //sort by priority
                 Collections.sort(visitors); 
@@ -119,9 +118,9 @@
             
             //and the nature...
             if (nature != null){
-                List<IResource> resourcesToParse = new ArrayList<IResource>();
+                List resourcesToParse = new ArrayList();
     
-                List<PyDevBuilderVisitor> visitors = getVisitors();
+                List visitors = getVisitors();
                 notifyVisitingWillStart(visitors, monitor);
     
                 monitor.beginTask("Building...", (visitors.size() * 100) + 30);
@@ -171,14 +170,16 @@
 
     }
 
-    private void notifyVisitingWillStart(List<PyDevBuilderVisitor> visitors, IProgressMonitor monitor) {
-        for (PyDevBuilderVisitor visitor : visitors) {
+    private void notifyVisitingWillStart(List visitors, IProgressMonitor monitor) {
+        for (Iterator iter = visitors.iterator(); iter.hasNext();) {
+            PyDevBuilderVisitor visitor = (PyDevBuilderVisitor) iter.next();
             visitor.visitingWillStart(monitor);
         }
     }
 
-    private void notifyVisitingEnded(List<PyDevBuilderVisitor> visitors, IProgressMonitor monitor) {
-        for (PyDevBuilderVisitor visitor : visitors) {
+    private void notifyVisitingEnded(List visitors, IProgressMonitor monitor) {
+        for (Iterator iter = visitors.iterator(); iter.hasNext();) {
+            PyDevBuilderVisitor visitor = (PyDevBuilderVisitor) iter.next();
             visitor.visitingEnded(monitor);
         }
     }
@@ -191,7 +192,7 @@
      * @param member the resource we are adding
      * @param nature the nature associated to the resource
      */
-    private void addToResourcesToParse(List<IResource> resourcesToParse, IResource member, PythonNature nature) {
+    private void addToResourcesToParse(List resourcesToParse, IResource member, PythonNature nature) {
         //analyze it only if it is a valid source file 
         String fileExtension = member.getFileExtension();
         if (fileExtension != null && PythonPathHelper.isValidSourceFile("."+fileExtension)) {
@@ -229,8 +230,8 @@
             }
             IDocument doc = REF.getDocFromResource(r);
             
-            HashMap<String, Object> memo = new HashMap<String, Object>();
-            memo.put(PyDevBuilderVisitor.IS_FULL_BUILD, true); //mark it as full build
+            HashMap memo = new HashMap();
+            memo.put(PyDevBuilderVisitor.IS_FULL_BUILD, new Boolean(true)); //mark it as full build
             
             if(doc != null){ //might be out of synch
                 for (Iterator it = visitors.iterator(); it.hasNext() && monitor.isCanceled() == false;) {
Index: src/org/python/pydev/builder/PyDevBuilderVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java,v
retrieving revision 1.35
diff -u -r1.35 PyDevBuilderVisitor.java
--- org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java	17 Apr 2006 16:25:02 -0000	1.35
+++ org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java	2 Jun 2006 20:41:34 -0000
@@ -31,7 +31,7 @@
  * 
  * @author Fabio Zadrozny
  */
-public abstract class PyDevBuilderVisitor implements Comparable<PyDevBuilderVisitor>{
+public abstract class PyDevBuilderVisitor implements Comparable{
 
     public static final int MAX_TO_VISIT_INFINITE = -1;
 
@@ -66,9 +66,13 @@
 	 * Compares them by priority (they are ordered before visiting by priority, so, this can
 	 * be useful if some visitor needs to run only after some other visitor was executed).
 	 */
-    public int compareTo(PyDevBuilderVisitor o) {
+    public int compareTo(Object o) {
     	int priority = getPriority();
-    	int otherPriority = o.getPriority();
+        if (! (o instanceof PyDevBuilderVisitor))
+            throw new ClassCastException();
+        
+        PyDevBuilderVisitor v = (PyDevBuilderVisitor) o;
+    	int otherPriority = v.getPriority();
     	if(priority < otherPriority){
     		return -1;
     	}
@@ -95,7 +99,7 @@
      * In this way, we can keep from having to recreate some info (such as the ast) each time over and over
      * for each visitor. 
      */
-    public HashMap<String, Object> memo;
[...8672 lines suppressed...]
                 "";
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser7() {
@@ -287,7 +286,7 @@
         "    False, True = 0, 1\n"+
         "\n"+
         "\n";
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser8() {
@@ -297,7 +296,7 @@
 "\n"+
 "\n"+
 "\n";
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser2() {
@@ -307,25 +306,25 @@
         "for foo in sorted(val for val in td.itervalues() if val[0] == 's'):    \n"+
         "    print foo                                                          \n";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser3() {
         String s = "print (x for x in y)";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
 
     public void testParser4() {
         String s = "print sum(x for x in y)";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser5() {
         String s = "print sum(x.b for x in y)";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser6() {
@@ -336,7 +335,7 @@
         "        if match: return match\n"+
         "\n"+
         "\n";        
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     
@@ -348,7 +347,7 @@
         "\n"+
         "\n"+
         "\n";        
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     /**
@@ -360,10 +359,10 @@
     	String s = "" +
     	"l = [ \"encode\", \"decode\" ] \n"+
     	"\n";        
-    	SimpleNode node = parseLegalDocStr(s);
-    	List<ASTEntry> strs = SequencialASTIteratorVisitor.create(node).getAsList(new Class[]{Str.class});
-    	assertEquals(7, strs.get(0).node.beginColumn);
-    	assertEquals(17, strs.get(1).node.beginColumn);
+    	SimpleNode node = parseLegalDocStr(s, new Object[] {});
+    	List strs = SequencialASTIteratorVisitor.create(node).getAsList(new Class[]{Str.class});
+    	assertEquals(7, ((ASTEntry)strs.get(0)).node.beginColumn);
+    	assertEquals(17, ((ASTEntry)strs.get(1)).node.beginColumn);
     }
     
     
@@ -377,7 +376,7 @@
         "    pass\n"+        
         "\n"+        
         "\n";        
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
 }
Index: tests/org/python/pydev/parser/PyParserTestBase.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java,v
retrieving revision 1.9
diff -u -r1.9 PyParserTestBase.java
--- org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java	6 Apr 2006 16:16:41 -0000	1.9
+++ org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java	2 Jun 2006 20:42:24 -0000
@@ -33,7 +33,7 @@
 	 * @param s
 	 * @return 
 	 */
-	protected static SimpleNode parseLegalDocStr(String s, Object ... additionalErrInfo) {
+	protected static SimpleNode parseLegalDocStr(String s, Object [] additionalErrInfo) {
 	    Document doc = new Document(s);
 	    return parseLegalDoc(doc, additionalErrInfo, new PyParser());
 	}
@@ -43,7 +43,7 @@
     }
 	protected ParseException parseILegalDoc(IDocument doc) {
 	    parser.setDocument(doc, false);
-	    Object[] objects = parser.reparseDocument((IPythonNature)null);
+	    Object[] objects = parser.reparseDocument((IPythonNature)null, new Object[] {});
 	    Object err = objects[1];
 	    if(err == null){
 	        fail("Expected a ParseException and the doc was successfully parsed.");
@@ -60,7 +60,7 @@
 	 */
 	protected static SimpleNode parseLegalDoc(IDocument doc, Object[] additionalErrInfo, PyParser parser) {
 	    parser.setDocument(doc, false);
-	    Object[] objects = parser.reparseDocument((IPythonNature)null);
+	    Object[] objects = parser.reparseDocument((IPythonNature)null, new Object[] {});
 	    Object err = objects[1];
 	    if(err != null){
 	        String s = "";
Index: tests/org/python/pydev/parser/profile/ParseBigFile.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java,v
retrieving revision 1.4
diff -u -r1.4 ParseBigFile.java
--- org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java	28 Apr 2006 13:43:41 -0000	1.4
+++ org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java	2 Jun 2006 20:42:25 -0000
@@ -56,15 +56,15 @@
         String loc = TestDependent.TEST_PYDEV_PARSER_PLUGIN_LOC+"/tests/pysrc/data_string.py";
         String s = REF.getFileContents(new File(loc));
         for (int i = 0; i < 5; i++) {
-        	@SuppressWarnings("unused") long curr = System.currentTimeMillis();
-        	SimpleNode node = parseLegalDocStr(s);
+        	long curr = System.currentTimeMillis();
+        	SimpleNode node = parseLegalDocStr(s, new Object[] {});
         	
         	PyParser.USE_FAST_STREAM = true;
         	//uncomment line below to see the time for parsing
         	//System.out.println(StringUtils.format("Took: %s secs", (System.currentTimeMillis()-curr)/1000.0));
         	SequencialASTIteratorVisitor visitor = SequencialASTIteratorVisitor.create(node);
         	
-        	ASTEntry entry = visitor.getAsList(Str.class).get(0);
+        	ASTEntry entry = (ASTEntry) visitor.getAsList(Str.class).get(0);
         	String s0 = ((Str)entry.node).s;
         	assertEquals(42, entry.node.beginLine);
         	assertEquals(8, entry.node.beginColumn);
Index: tests/org/python/pydev/parser/visitors/NodeUtilsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java,v
retrieving revision 1.1
diff -u -r1.1 NodeUtilsTest.java
--- org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java	26 Oct 2005 14:56:32 -0000	1.1
+++ org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java	2 Jun 2006 20:42:25 -0000
@@ -14,29 +14,29 @@
 
 	public void testFullRep() throws Exception {
         SequencialASTIteratorVisitor visitor = SequencialASTIteratorVisitor.create(parseLegalDocStr(
-        		"print a.b.c().d.__class__"));
+        		"print a.b.c().d.__class__", new Object[] {}));
         
-        Iterator<ASTEntry> iterator = visitor.getIterator();
+        Iterator iterator = visitor.getIterator();
 		iterator.next(); //Module
 		iterator.next(); //Print
-		ASTEntry entry = iterator.next(); //Attribute
+		ASTEntry entry = (ASTEntry) iterator.next(); //Attribute
 		assertEquals("a.b.c", NodeUtils.getFullRepresentationString(entry.node));
 
 
 		visitor = SequencialASTIteratorVisitor.create(parseLegalDocStr(
-			"'r.a.s.b'.join('a')"));
+			"'r.a.s.b'.join('a')", new Object[] {}));
 		iterator = visitor.getIterator();
 		iterator.next(); //Module
 		iterator.next(); //Expr
-		entry = iterator.next(); //Attribute
+		entry = (ASTEntry) iterator.next(); //Attribute
 		assertEquals("str.join", NodeUtils.getFullRepresentationString(entry.node));
 		
 		visitor = SequencialASTIteratorVisitor.create(parseLegalDocStr(
-			"print aa.bbb.cccc[comp.id].hasSimulate"));
+			"print aa.bbb.cccc[comp.id].hasSimulate", new Object[] {}));
 		iterator = visitor.getIterator();
 		iterator.next(); //Module
 		iterator.next(); //Expr
-		entry = iterator.next(); //Attribute
+		entry = (ASTEntry) iterator.next(); //Attribute
 		assertEquals("aa.bbb.cccc", NodeUtils.getFullRepresentationString(entry.node));
 	}
 }

eclipse-pydev-noretroweaver.patch:
 org.python.pydev.ast/META-INF/MANIFEST.MF       |    3 +--
 org.python.pydev.ast/build.properties           |    3 +--
 org.python.pydev.core/META-INF/MANIFEST.MF      |    1 -
 org.python.pydev.core/build.properties          |    1 -
 org.python.pydev.debug/META-INF/MANIFEST.MF     |    3 +--
 org.python.pydev.debug/build.properties         |    3 +--
 org.python.pydev.jython/META-INF/MANIFEST.MF    |    1 -
 org.python.pydev.jython/build.properties        |    1 -
 org.python.pydev.parser/META-INF/MANIFEST.MF    |    3 +--
 org.python.pydev.parser/build.properties        |    3 +--
 org.python.pydev.templates/META-INF/MANIFEST.MF |    1 -
 org.python.pydev.templates/build.properties     |    3 +--
 org.python.pydev/META-INF/MANIFEST.MF           |    3 +--
 org.python.pydev/build.properties               |    1 -
 14 files changed, 8 insertions(+), 22 deletions(-)

--- NEW FILE eclipse-pydev-noretroweaver.patch ---
--- org.python.pydev/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev/META-INF/MANIFEST.MF	2006-05-26 14:03:28.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Pydev - Python Development Environment
 Bundle-SymbolicName: org.python.pydev; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: pydev.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: pydev.jar
 Bundle-Activator: org.python.pydev.plugin.PydevPlugin
 Bundle-Vendor: Fabio Zadrozny / Aleks Totic
 Bundle-Localization: plugin
--- org.python.pydev/build.properties	2006-02-14 10:29:35.000000000 -0500
+++ org.python.pydev/build.properties	2006-05-26 14:04:31.000000000 -0400
@@ -9,7 +9,6 @@
                eclipse32.gif,\
                pydev.gif,\
                Pydev.gif,\
-               retroweaver-rt.jar,\
                shiftone-cache.jar
 jars.compile.order = pydev.jar
 source.pydev.jar = src/
--- org.python.pydev.ast/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.ast/META-INF/MANIFEST.MF	2006-05-26 14:05:18.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Ast Plug-in
 Bundle-SymbolicName: org.python.pydev.ast; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: ast.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: ast.jar
 Bundle-Activator: org.python.pydev.ast.AstPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
--- org.python.pydev.core/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.core/META-INF/MANIFEST.MF	2006-05-26 14:06:27.000000000 -0400
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.python.pydev.core; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-ClassPath: core.jar,
- retroweaver-rt.jar,
  commons-codec.jar
 Bundle-Activator: org.python.pydev.core.CorePlugin
 Bundle-Vendor: Fabio Zadrozny
--- org.python.pydev.core/build.properties	2005-11-17 09:53:44.000000000 -0500
+++ org.python.pydev.core/build.properties	2006-05-26 14:07:16.000000000 -0400
@@ -3,7 +3,6 @@
 bin.includes = plugin.xml,\
                META-INF/,\
                core.jar,\
-               retroweaver-rt.jar,\
                commons-codec.jar
 jars.extra.classpath = commons-codec.jar
 jars.compile.order = core.jar
--- org.python.pydev.debug/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.debug/META-INF/MANIFEST.MF	2006-05-26 14:07:56.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Pydev debug
 Bundle-SymbolicName: org.python.pydev.debug; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: pydev-debug.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: pydev-debug.jar
 Bundle-Activator: org.python.pydev.debug.core.PydevDebugPlugin
 Bundle-Vendor: Fabio Zadrozny / Aleks Totic
 Bundle-Localization: plugin
--- org.python.pydev.debug/build.properties	2005-09-03 11:59:30.000000000 -0400
+++ org.python.pydev.debug/build.properties	2006-05-26 14:08:53.000000000 -0400
@@ -3,8 +3,7 @@
                CVS/,\
                META-INF/,\
                icons/,\
-               pydev-debug.jar,\
-               retroweaver-rt.jar
+               pydev-debug.jar
 jars.compile.order = pydev-debug.jar
 source.pydev-debug.jar = src/
 output.pydev-debug.jar = bin/
--- org.python.pydev.jython/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.jython/META-INF/MANIFEST.MF	2006-05-26 14:09:28.000000000 -0400
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.python.pydev.jython; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-ClassPath: pydev-jython.jar,
- retroweaver-rt.jar,
  jython.jar
 Bundle-Activator: org.python.pydev.jython.JythonPlugin
 Bundle-Vendor: Fabio Zadrozny
--- org.python.pydev.jython/build.properties	2006-04-06 12:12:37.000000000 -0400
+++ org.python.pydev.jython/build.properties	2006-05-26 14:11:20.000000000 -0400
@@ -2,7 +2,6 @@
                pydev-jython.jar,\
                jython.jar,\
                jysrc/,\
-               retroweaver-rt.jar,\
                plugin.xml,\
                Lib/
 jars.compile.order = pydev-jython.jar
--- org.python.pydev.parser/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.parser/META-INF/MANIFEST.MF	2006-05-26 14:12:24.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Parser Plug-in
 Bundle-SymbolicName: org.python.pydev.parser; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: parser.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: parser.jar
 Bundle-Activator: org.python.pydev.parser.ParserPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
--- org.python.pydev.parser/build.properties	2005-09-03 11:59:02.000000000 -0400
+++ org.python.pydev.parser/build.properties	2006-05-26 14:13:05.000000000 -0400
@@ -2,5 +2,4 @@
 output.parser.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               parser.jar,\
-               retroweaver-rt.jar
+               parser.jar
--- org.python.pydev.templates/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.templates/META-INF/MANIFEST.MF	2006-05-26 14:13:47.000000000 -0400
@@ -10,4 +10,3 @@
  org.eclipse.core.runtime,
  org.python.pydev
 Eclipse-AutoStart: true
-Bundle-ClassPath: retroweaver-rt.jar
--- org.python.pydev.templates/build.properties	2005-09-03 14:00:51.000000000 -0400
+++ org.python.pydev.templates/build.properties	2006-05-26 14:14:28.000000000 -0400
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
                plugin.xml,\
-               icons/,\
-               retroweaver-rt.jar
+               icons/
 jars.compile.order = 

--- org.python.pydev.ast/build.properties	2005-09-03 11:59:14.000000000 -0400
+++ org.python.pydev.ast/build.properties	2006-06-02 17:46:41.000000000 -0400
@@ -1,7 +1,6 @@
 bin.includes = plugin.xml,\
                ast.jar,\
-               META-INF/,\
-               retroweaver-rt.jar
+               META-INF/
 jars.compile.order = ast.jar
 source.ast.jar = src/
 output.ast.jar = bin/


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jul 2005 15:06:10 -0000	1.4
+++ .cvsignore	5 Jun 2006 18:38:56 -0000	1.5
@@ -1 +1 @@
-eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+eclipse-pydev-fetched-1.0.8.tar.gz


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- eclipse-pydev.spec	4 Apr 2006 13:46:41 -0000	1.17
+++ eclipse-pydev.spec	5 Jun 2006 18:38:56 -0000	1.18
@@ -4,10 +4,10 @@
 %define pkg_summary		Eclipse Python development plug-in
 %define section			free
 %define eclipse_name 		eclipse
-%define	version_major		0
-%define version_minor		9
+%define	version_major		1
+%define version_minor		0
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	3
+%define version_micro   	8
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -20,13 +20,15 @@
 
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
-Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	15
+Version: 	%{version_majmin}.%{version_micro}
+Release:	1fc
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
 Requires: eclipse-platform
 Requires: python
+Requires:       commons-codec >= 1.3
+Requires:       junit >= 3.8.1
 
 # Note that following the Eclipse Releng process we do not distribute a 
 # real .tar.gz file.  Instead, you must build it by hand.  The way to do 
@@ -37,8 +39,10 @@
 # contents.  See the java command to see how to invoke
 # things in the releng build.xml.
 
-Source0: eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+Source0: eclipse-pydev-fetched-%{version_majmin}.%{version_micro}.tar.gz
 Patch1: %{name}-2.4-default.patch
+Patch2: %{name}-%{version_majmin}.%{version_micro}-backport-megapatch.patch
+Patch3: %{name}-noretroweaver.patch
 
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
@@ -51,9 +55,12 @@
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
+BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  junit >= 3.8.1
+BuildRequires:  commons-codec >= 1.3
 
 %if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc
 %else
 BuildArch:     noarch
 %endif
@@ -65,49 +72,77 @@
 
 %prep
 %setup -q -c 
-%patch1 -p0
+pushd eclipse-pydev-%{version_majmin}.%{version_micro}
+%patch2 -p0
+%patch3 -p0
+
+# Replace all references to 0.9.7.1 with the correct version number
+for f in `grep -rl '0.9.7.1' *` ; do 
+    if [ -f $f ]; then
+        sed --in-place "s/0.9.7.1/%{version_majmin}.%{version_micro}/g" $f
+    fi
+done 
+
+# Remove retroweaver.jar, this is backported to Java 1.4, so we don't use it
+find . -name 'retroweaver-rt.jar' -exec rm {} \;
+
+#list all jars
+
+# Link to system jars
+# TODO link to jython once it's in Extras.
+rm -f org.python.pydev.core/commons-codec.jar
+ln -sf %{_datadir}/java/jakarta-commons-codec.jar org.python.pydev.core/commons-codec.jar
 
-%build
+rm -f org.python.pydev.core/lib/junit.jar
+ln -sf %{_datadir}/java/junit.jar org.python.pydev.core/lib/junit.jar
 
-# See comments in the script to understand this.
+
+%build
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-SDK=$(cd SDK && pwd)
+SDK=$(cd SDK > /dev/null && pwd)
 
+# Eclipse may try to write to the home directory.
 mkdir home
-
 homedir=$(cd home > /dev/null && pwd)
 
-pushd `pwd` 
-cd org.python.pydev.releng
-
-# Call eclipse headless to process pydev releng build scripts
-# need -Dosgi.install.area for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20198
-java -cp  $SDK/startup.jar \
-    -Duser.home=$homedir \
-    -Dosgi.install.area=%{eclipse_base} \
-     org.eclipse.core.launcher.Main \
-    -application org.eclipse.ant.core.antRunner \
-    -DjavacFailOnError=false \
-    -DdontUnzip=true \
-    -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
-    -DdontFetchAnything=true 
-popd
+# build the main pydev feature
+java -cp %{eclipse_base}/startup.jar                   \
+     -Duser.home=$homedir                              \
+     org.eclipse.core.launcher.Main                    \
+     -application org.eclipse.ant.core.antRunner       \
+	 -verbose \
+     -Dtype=feature                                    \
+     -Did=org.python.pydev.feature                     \
+     -DbaseLocation=$SDK                               \
+     -DsourceDirectory=$(pwd)                          \
+     -DbuildDirectory=$(pwd)/build                     \
+     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build_3.1.2/templates/package-build \
+     -f %{eclipse_base}/plugins/org.eclipse.pde.build_3.1.2/scripts/build.xml
+# See comments in the script to understand this.
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf $RPM_BUILD_ROOT
 install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/org.python.pydev.feature.zip
+
 
-# Dump the files from the releng tarball into the build root
-for file in $(pwd)/org.python.pydev.releng/results/I.*/*.tar.gz; do
-  case $file in
-    *org.python.pydev*)
-      # The ".." is needed since the zip files contain "eclipse/foo".
-      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
-      ;;
-  esac
-done
+pushd $RPM_BUILD_ROOT%{_datadir}/%{eclipse_name}
+rm -rf plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/jakarta-commons-codec.jar
+ln -sf %{_datadir}/java/jakarta-commons-codec.jar plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/jakarta-commons-codec.jar
+
+mkdir plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib
+rm -rf plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
+ln -sf %{_datadir}/java/junit.jar plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
+
+## Dump the files from the releng tarball into the build root
+#for file in $(pwd)/org.python.pydev.releng/results/I.*/*.tar.gz; do
+#  case $file in
+#    *org.python.pydev*)
+#      # The ".." is needed since the zip files contain "eclipse/foo".
+#      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
+#      ;;
+#  esac
+#done
 
 %if %{gcj_support}
 aot-compile-rpm
@@ -133,8 +168,8 @@
 %endif
 
 %changelog
-* Tue Apr 04 2006 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-15
-- Add ia64.
+* Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-1fc
+- Building upstream version 1.0.8 backported to Java 1.4.
 
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-14
 - Build against 3.1.2.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Jul 2005 15:06:10 -0000	1.5
+++ sources	5 Jun 2006 18:38:56 -0000	1.6
@@ -1 +1 @@
-82d262473b1c7e789938225e0304f00d  eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+55064b5934b569ef6c9d19dd0037051d  eclipse-pydev-fetched-1.0.8.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:44:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:44:50 -0400
Subject: rpms/kernel/FC-5/configs config-x86-generic,1.40,1.41
Message-ID: <200606051844.k55IioaJ029158@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv29110/configs

Modified Files:
	config-x86-generic 
Log Message:
enable cs4231



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- config-x86-generic	4 Apr 2006 18:42:16 -0000	1.40
+++ config-x86-generic	5 Jun 2006 18:44:48 -0000	1.41
@@ -284,4 +284,4 @@
 CONFIG_EDAC_R82600=m
 
 CONFIG_SND_ES18XX=m
-
+CONFIG_SND_CS4231=m



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:48:32 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.100, 1.101 libsepol.spec, 1.131,
	1.132 sources, 1.101, 1.102
Message-ID: <200606051848.k55ImWPM012432@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12399

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.12.17-1
- Upgrade to latest from NSA
	* Revert 1.12.16.
	* Merged cleaner fix for bool_ids overflow from Karl MacMillan,
	  replacing the prior patch.
	* Merged fixes for several memory leaks in the error paths during
	  policy read from Serge Hallyn.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	30 May 2006 13:09:42 -0000	1.100
+++ .cvsignore	5 Jun 2006 18:48:30 -0000	1.101
@@ -100,3 +100,4 @@
 libsepol-1.12.11.tgz
 libsepol-1.12.12.tgz
 libsepol-1.12.14.tgz
+libsepol-1.12.17.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libsepol.spec	30 May 2006 13:09:42 -0000	1.131
+++ libsepol.spec	5 Jun 2006 18:48:30 -0000	1.132
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.14
+Version: 1.12.17
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -81,6 +81,14 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.12.17-1
+- Upgrade to latest from NSA
+	* Revert 1.12.16.
+	* Merged cleaner fix for bool_ids overflow from Karl MacMillan,
+	  replacing the prior patch.
+	* Merged fixes for several memory leaks in the error paths during
+	  policy read from Serge Hallyn.
+
 * Tue May 30 2006 Dan Walsh <dwalsh at redhat.com> 1.12.14-1
 - Upgrade to latest from NSA
 	* Fixed bool_ids overflow bug in cond_node_find and cond_copy_list,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	30 May 2006 13:09:42 -0000	1.101
+++ sources	5 Jun 2006 18:48:30 -0000	1.102
@@ -1 +1 @@
-a555ec3546b0c0d3b441e2bc3ad3d306  libsepol-1.12.14.tgz
+82e10111a5b6a0c400e52cdfe500e008  libsepol-1.12.17.tgz



From fedora-cvs-commits at redhat.com  Mon Jun  5 18:52:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 14:52:22 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.110, 1.111 libselinux.spec,
	1.201, 1.202 sources, 1.112, 1.113
Message-ID: <200606051852.k55IqMih013935@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13910

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Thu Jun 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-1
- Upgrade to latest from NSA
	* Merged !selinux_mnt checks from Ian Kent.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- .cvsignore	31 May 2006 10:36:44 -0000	1.110
+++ .cvsignore	5 Jun 2006 18:52:19 -0000	1.111
@@ -85,3 +85,4 @@
 libselinux-1.30.8.tgz
 libselinux-1.30.10.tgz
 libselinux-1.30.11.tgz
+libselinux-1.30.12.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- libselinux.spec	1 Jun 2006 17:25:22 -0000	1.201
+++ libselinux.spec	5 Jun 2006 18:52:19 -0000	1.202
@@ -1,12 +1,11 @@
 %define libsepolver 1.12.14-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.11
-Release: 2
+Version: 1.30.12
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -48,7 +47,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -117,6 +115,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Jun 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-1
+- Upgrade to latest from NSA
+	* Merged !selinux_mnt checks from Ian Kent.
+
 * Thu Jun 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.11-2
 - Check for selinux_mnt == NULL
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sources	31 May 2006 10:36:45 -0000	1.112
+++ sources	5 Jun 2006 18:52:19 -0000	1.113
@@ -1 +1 @@
-fe9198fb7be82dd0d3a18098ca353515  libselinux-1.30.11.tgz
+3d3f90d574b9a3dde9d81ad3c13d7a6a  libselinux-1.30.12.tgz



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:27:30 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.24, 1.25 fedora-logos.spec,
	1.26, 1.27 sources, 1.25, 1.26
Message-ID: <200606051927.k55JRUQs005936@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5858

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
1.1.43



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	1 Mar 2006 04:39:00 -0000	1.24
+++ .cvsignore	5 Jun 2006 19:27:28 -0000	1.25
@@ -1,3 +1 @@
-fedora-logos-1.1.40.tar.bz2
-fedora-logos-1.1.41.tar.bz2
-fedora-logos-1.1.42.tar.bz2
+fedora-logos-1.1.43.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fedora-logos.spec	1 Mar 2006 04:39:00 -0000	1.26
+++ fedora-logos.spec	5 Jun 2006 19:27:28 -0000	1.27
@@ -1,12 +1,12 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
-Version: 1.1.42
+Version: 1.1.43
 Release: 1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
-License: Copyright ? 1999-2005 Red Hat, Inc.  All rights reserved.
+License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
 BuildRoot: %{_tmppath}/%{name}-root
-BuildArchitectures: noarch
+BuildArch: noarch
 Obsoletes: redhat-logos
 Provides: redhat-logos
 Provides: system-logos
@@ -60,9 +60,14 @@
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
-for i in gnome-screensaver/themes/* ; do
-  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
+for i in gnome-screensaver/* ; do
+  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
+for i in backgrounds/* ; do
+  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/ksplash/Themes/BlueCurve
@@ -135,6 +140,10 @@
 # end i386 bits
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.1.43-1
+- Add branded desktop background and move the lock dialog
+  background to the right directory
+
 * Tue Feb 28 2006 Matthias Clasen <mclasen at redhat.com> 1.1.42-1
 - New artwork for gdm, kdm Bluecurve from Diana Fong
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	1 Mar 2006 04:39:00 -0000	1.25
+++ sources	5 Jun 2006 19:27:28 -0000	1.26
@@ -1 +1 @@
-d814bc0a885c4b1364187c9902dcaf2f  fedora-logos-1.1.42.tar.bz2
+3bdcd20714adb2368d30faa1793e534f  fedora-logos-1.1.43.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:29:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:29:13 -0400
Subject: rpms/eclipse-pydev/FC-5 eclipse-pydev.spec,1.16,1.17
Message-ID: <200606051929.k55JTDK3006579@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6549

Modified Files:
	eclipse-pydev.spec 
Log Message:
* Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-2fc
- Building upstream version 1.0.8 backported to Java 1.4.



Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/FC-5/eclipse-pydev.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- eclipse-pydev.spec	9 Feb 2006 21:18:30 -0000	1.16
+++ eclipse-pydev.spec	5 Jun 2006 19:29:11 -0000	1.17
@@ -4,10 +4,10 @@
 %define pkg_summary		Eclipse Python development plug-in
 %define section			free
 %define eclipse_name 		eclipse
-%define	version_major		0
-%define version_minor		9
+%define	version_major		1
+%define version_minor		0
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	3
+%define version_micro   	8
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -20,13 +20,15 @@
 
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
-Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	14
+Version: 	%{version_majmin}.%{version_micro}
+Release:	2fc
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
 Requires: eclipse-platform
 Requires: python
+Requires:       commons-codec >= 1.3
+Requires:       junit >= 3.8.1
 
 # Note that following the Eclipse Releng process we do not distribute a 
 # real .tar.gz file.  Instead, you must build it by hand.  The way to do 
@@ -37,8 +39,10 @@
 # contents.  See the java command to see how to invoke
 # things in the releng build.xml.
 
-Source0: eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+Source0: eclipse-pydev-fetched-%{version_majmin}.%{version_micro}.tar.gz
 Patch1: %{name}-2.4-default.patch
+Patch2: %{name}-%{version_majmin}.%{version_micro}-backport-megapatch.patch
+Patch3: %{name}-noretroweaver.patch
 
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
@@ -51,6 +55,9 @@
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
+BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  junit >= 3.8.1
+BuildRequires:  commons-codec >= 1.3
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc
@@ -65,49 +72,77 @@
 
 %prep
 %setup -q -c 
-%patch1 -p0
+pushd eclipse-pydev-%{version_majmin}.%{version_micro}
+%patch2 -p0
+%patch3 -p0
+
+# Replace all references to 0.9.7.1 with the correct version number
+for f in `grep -rl '0.9.7.1' *` ; do 
+    if [ -f $f ]; then
+        sed --in-place "s/0.9.7.1/%{version_majmin}.%{version_micro}/g" $f
+    fi
+done 
+
+# Remove retroweaver.jar, this is backported to Java 1.4, so we don't use it
+find . -name 'retroweaver-rt.jar' -exec rm {} \;
+
+#list all jars
+
+# Link to system jars
+# TODO link to jython once it's in Extras.
+rm -f org.python.pydev.core/commons-codec.jar
+ln -sf %{_datadir}/java/jakarta-commons-codec.jar org.python.pydev.core/commons-codec.jar
 
-%build
+rm -f org.python.pydev.core/lib/junit.jar
+ln -sf %{_datadir}/java/junit.jar org.python.pydev.core/lib/junit.jar
 
-# See comments in the script to understand this.
+
+%build
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-SDK=$(cd SDK && pwd)
+SDK=$(cd SDK > /dev/null && pwd)
 
+# Eclipse may try to write to the home directory.
 mkdir home
-
 homedir=$(cd home > /dev/null && pwd)
 
-pushd `pwd` 
-cd org.python.pydev.releng
-
-# Call eclipse headless to process pydev releng build scripts
-# need -Dosgi.install.area for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20198
-java -cp  $SDK/startup.jar \
-    -Duser.home=$homedir \
-    -Dosgi.install.area=%{eclipse_base} \
-     org.eclipse.core.launcher.Main \
-    -application org.eclipse.ant.core.antRunner \
-    -DjavacFailOnError=false \
-    -DdontUnzip=true \
-    -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
-    -DdontFetchAnything=true 
-popd
+# build the main pydev feature
+java -cp %{eclipse_base}/startup.jar                   \
+     -Duser.home=$homedir                              \
+     org.eclipse.core.launcher.Main                    \
+     -application org.eclipse.ant.core.antRunner       \
+	 -verbose \
+     -Dtype=feature                                    \
+     -Did=org.python.pydev.feature                     \
+     -DbaseLocation=$SDK                               \
+     -DsourceDirectory=$(pwd)                          \
+     -DbuildDirectory=$(pwd)/build                     \
+     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build_3.1.2/templates/package-build \
+     -f %{eclipse_base}/plugins/org.eclipse.pde.build_3.1.2/scripts/build.xml
+# See comments in the script to understand this.
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf $RPM_BUILD_ROOT
 install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/org.python.pydev.feature.zip
 
-# Dump the files from the releng tarball into the build root
-for file in $(pwd)/org.python.pydev.releng/results/I.*/*.tar.gz; do
-  case $file in
-    *org.python.pydev*)
-      # The ".." is needed since the zip files contain "eclipse/foo".
-      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
-      ;;
-  esac
-done
+
+pushd $RPM_BUILD_ROOT%{_datadir}/%{eclipse_name}
+rm -rf plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/jakarta-commons-codec.jar
+ln -sf %{_datadir}/java/jakarta-commons-codec.jar plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/jakarta-commons-codec.jar
+
+mkdir plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib
+rm -rf plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
+ln -sf %{_datadir}/java/junit.jar plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
+
+## Dump the files from the releng tarball into the build root
+#for file in $(pwd)/org.python.pydev.releng/results/I.*/*.tar.gz; do
+#  case $file in
+#    *org.python.pydev*)
+#      # The ".." is needed since the zip files contain "eclipse/foo".
+#      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
+#      ;;
+#  esac
+#done
 
 %if %{gcj_support}
 aot-compile-rpm
@@ -133,6 +168,9 @@
 %endif
 
 %changelog
+* Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-2fc
+- Building upstream version 1.0.8 backported to Java 1.4.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-14
 - Build against 3.1.2.
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:29:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:29:52 -0400
Subject: rpms/eclipse-pydev/FC-5 .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200606051929.k55JTqol006862@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6839

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jul 2005 15:06:10 -0000	1.4
+++ .cvsignore	5 Jun 2006 19:29:50 -0000	1.5
@@ -1 +1 @@
-eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+eclipse-pydev-fetched-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Jul 2005 15:06:10 -0000	1.5
+++ sources	5 Jun 2006 19:29:50 -0000	1.6
@@ -1 +1 @@
-82d262473b1c7e789938225e0304f00d  eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
+55064b5934b569ef6c9d19dd0037051d  eclipse-pydev-fetched-1.0.8.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:31:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:31:46 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.27, 1.28 sources, 1.26,
	1.27
Message-ID: <200606051931.k55JVkG3007167@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7103

Modified Files:
	fedora-logos.spec sources 
Log Message:
fix spec



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fedora-logos.spec	5 Jun 2006 19:27:28 -0000	1.27
+++ fedora-logos.spec	5 Jun 2006 19:31:44 -0000	1.28
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
 Version: 1.1.43
-Release: 1
+Release: 2
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -66,7 +66,7 @@
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
-for i in backgrounds/* ; do
+for i in backgrounds/images/* ; do
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 done
 
@@ -131,7 +131,8 @@
 %{_datadir}/rhgb
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons
-%{_datadir}/gnome-screensaver/themes/*
+%{_datadir}/gnome-screensaver/*
+%{_datadir}/backgrounds/images/*
 
 /usr/lib/anaconda-runtime/boot/*png
 /usr/lib/anaconda-runtime/*.sh


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	5 Jun 2006 19:27:28 -0000	1.26
+++ sources	5 Jun 2006 19:31:44 -0000	1.27
@@ -1 +1 @@
-3bdcd20714adb2368d30faa1793e534f  fedora-logos-1.1.43.tar.bz2
+5305694e311b1dad7f30ca609cc7d7d4  fedora-logos-1.1.43.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:32:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:32:07 -0400
Subject: rpms/xorg-x11-drv-evdev/devel evdev-1.1.2-cvs-20060605.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-evdev.spec, 1.11,
	1.12 evdev-1.1.0-ia64-build-fix.patch, 1.1, NONE
Message-ID: <200606051932.k55JW77S007238@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7201/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Added Files:
	evdev-1.1.2-cvs-20060605.patch 
Removed Files:
	evdev-1.1.0-ia64-build-fix.patch 
Log Message:
auto-import xorg-x11-drv-evdev-1.1.2-1 on branch devel from xorg-x11-drv-evdev-1.1.2-1.src.rpm

evdev-1.1.2-cvs-20060605.patch:
 ChangeLog              |   44 ++++++++++++++++++++++++++++++++++++++++++++
 man/evdev.man          |   13 ++++---------
 src/evdev.c            |    8 +++-----
 src/evdev.h            |   37 +++++++++++++++++++++++--------------
 src/evdev_axes.c       |   20 ++++++--------------
 src/evdev_brain.c      |    6 +++---
 src/evdev_btn.c        |   11 +----------
 src/evdev_key.c        |    9 ++-------
 src/inotify-syscalls.h |    4 ++++
 9 files changed, 90 insertions(+), 62 deletions(-)

--- NEW FILE evdev-1.1.2-cvs-20060605.patch ---
Index: ChangeLog
diff -u ChangeLog:1.26 ChangeLog:1.29
--- ChangeLog:1.26	Sun Apr 30 21:39:08 2006
+++ ChangeLog	Fri Jun  2 19:39:51 2006
@@ -1,3 +1,47 @@
+2006-06-02  Adam Jackson  <ajax at freedesktop.org>
+
+	* src/evdev_axes.c:
+	Fix an obvious bogon to avoid crashing on absolute axis setup.
+
+2006-05-15  Zephaniah E. Hull,,,  <warp at aehallh.com>
+
+	* src/evdev.h:
+	Hopefully fix the bitops stuff to actually _work_.
+
+2006-05-14  Zephaniah E. Hull  <warp at aehallh.com>
+
+	* man/evdev.man:
+	Tweak credits and references.
+	* src/evdev.c: (EvdevParseBits), (EvdevParseBitOption),
+	(EvdevCorePreInit):
+	Change the longs to unsigned longs in the bitfields.
+
+	Cleanup our includes.
+	* src/evdev.h:
+	Stop pulling in asm/types.h and asm/bitops.h.
+
+	Conditionally define the stuff that used to come from
+	the above, including our own test_bit, set_bit and clear_bit.
+
+	Change the longs to unsigned longs in the bitfields.
+	* src/evdev_axes.c: (EvdevAxisAbsNew), (EvdevAxisRelNew):
+	Change the longs to unsigned longs in the bitfields.
+
+	Use the bitop defines in evdev.h properly.
+	* src/evdev_brain.c: (MatchAll), (MatchNot), (MatchAny):
+	Change the longs to unsigned longs in the bitfields.
+	* src/evdev_btn.c: (EvdevBtnNew):
+	Change the longs to unsigned longs in the bitfields.
+
+	Use the bitop defines in evdev.h properly.
+	* src/evdev_key.c: (EvdevKeyNew):
+	Change the longs to unsigned longs in the bitfields.
+
+	Use the bitop defines in evdev.h properly.
+	* src/inotify-syscalls.h:
+	Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto
+	<fabbione at ubuntu.com>)
+
 2006-04-30  Zephaniah E. Hull  <warp at aehallh.com>
 
 	* configure.ac:
Index: man/evdev.man
diff -u man/evdev.man:1.3 man/evdev.man:1.4
--- man/evdev.man:1.3	Thu Mar 16 13:05:04 2006
+++ man/evdev.man	Sun May 14 11:55:50 2006
@@ -312,16 +312,11 @@
 .BI "Option \*qXkbOptions\*q \*q" options \*q
 specifies the XKB keyboard option components.  These can be used to
 enhance the keyboard behaviour.  Default: not set.
-.PP
-Some other XKB-related options are available, but they are incompatible
-with the ones listed above and are not recommended, so they are not
-documented here.
 
-.TP 7
+.PP
 .SH AUTHORS
-Kristian H??gsberg.
-.fi
 Zephaniah E. Hull.
+.fi
+Kristian H??gsberg.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
-README.mouse.
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
Index: src/evdev.c
diff -u src/evdev.c:1.18 src/evdev.c:1.19
--- src/evdev.c:1.18	Sun Apr  9 00:41:42 2006
+++ src/evdev.c	Sun May 14 11:55:50 2006
@@ -61,8 +61,6 @@
 #include <X11/XF86keysym.h>
 #include <X11/extensions/XIproto.h>
 
-#include <string.h>
-
 #include "evdev.h"
 
 #include <xf86.h>
@@ -328,7 +326,7 @@
 }
 
 static void
-EvdevParseBits (char *in, long *out, int len)
+EvdevParseBits (char *in, unsigned long *out, int len)
 {
     unsigned long v[2];
     int n, i, max_bits = len * BITS_PER_LONG;
@@ -351,7 +349,7 @@
 }
 
 static void
-EvdevParseBitOption (char *opt, long *all, long *not, long *any, int len)
+EvdevParseBitOption (char *opt, unsigned long *all, unsigned long *not, unsigned long *any, int len)
 {
     char *cur, *next;
 
@@ -395,7 +393,7 @@
 	EvdevParseBitOption (tmp, pEvdev->all_bits.field,			\
 		pEvdev->not_bits.field,					\
 		pEvdev->any_bits.field,					\
-		sizeof(pEvdev->not_bits.field) / sizeof (long));		\
+		sizeof(pEvdev->not_bits.field) / sizeof (unsigned long));	\
 	free (tmp);								\
     }
     bitoption(ev);
Index: src/evdev.h
diff -u src/evdev.h:1.5 src/evdev.h:1.7
--- src/evdev.h:1.5	Fri Apr 14 07:01:37 2006
+++ src/evdev.h	Mon May 15 22:47:23 2006
@@ -72,20 +72,29 @@
 #include <stdarg.h>
 #include <xf86Xinput.h>
 
-#define BITS_PER_LONG		(sizeof(long) * 8)
+#ifndef BITS_PER_LONG
+#define BITS_PER_LONG		(sizeof(unsigned long) * 8)
+#endif
+
 #define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x) 			((x)%BITS_PER_LONG)
 #define LONG(x)			((x)/BITS_PER_LONG)
-#define BIT(x)			(1UL<<((x)%BITS_PER_LONG))
-#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+#define MASK(x)			(1UL << ((x) & (BITS_PER_LONG - 1)))
+
+#ifndef test_bit
+#define test_bit(bit, array)	(!!(array[LONG(bit)] & MASK(bit)))
+#endif
+#ifndef set_bit
+#define set_bit(bit, array)	(array[LONG(bit)] |= MASK(bit))
+#endif
+#ifndef clear_bit
+#define clear_bit(bit, array)	(array[LONG(bit)] &= ~MASK(bit))
+#endif
 
 /* 2.4 compatibility */
 #ifndef EVIOCGSW
 
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <asm/types.h>
-#include <asm/bitops.h>
 
 #define EVIOCGSW(len)		_IOC(_IOC_READ, 'E', 0x1b, len)		/* get all switch states */
 
@@ -128,14 +137,14 @@
 #define EVDEV_MAXBUTTONS	96
 
 typedef struct {
-    long	ev[NBITS(EV_MAX)];
-    long	key[NBITS(KEY_MAX)];
-    long	rel[NBITS(REL_MAX)];
-    long	abs[NBITS(ABS_MAX)];
-    long	msc[NBITS(MSC_MAX)];
-    long	led[NBITS(LED_MAX)];
-    long	snd[NBITS(SND_MAX)];
-    long	ff[NBITS(FF_MAX)];
+    unsigned long	ev[NBITS(EV_MAX)];
+    unsigned long	key[NBITS(KEY_MAX)];
+    unsigned long	rel[NBITS(REL_MAX)];
+    unsigned long	abs[NBITS(ABS_MAX)];
+    unsigned long	msc[NBITS(MSC_MAX)];
+    unsigned long	led[NBITS(LED_MAX)];
+    unsigned long	snd[NBITS(SND_MAX)];
+    unsigned long	ff[NBITS(FF_MAX)];
 } evdevBitsRec, *evdevBitsPtr;
 
 typedef struct {
Index: src/evdev_axes.c
diff -u src/evdev_axes.c:1.3 src/evdev_axes.c:1.5
--- src/evdev_axes.c:1.3	Fri Apr 14 07:01:37 2006
+++ src/evdev_axes.c	Fri Jun  2 19:39:52 2006
@@ -49,14 +49,6 @@
 
 #include <xf86_OSproc.h>
 
-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
-
-#define BITS_PER_LONG (sizeof(long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x)  ((x)%BITS_PER_LONG)
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define TestBit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
-
 static char *rel_axis_names[] = {
     "X",
     "Y",
@@ -328,7 +320,7 @@
 
     real_axes = 0;
     for (i = 0; i < ABS_MAX; i++)
-	if (TestBit (i, pEvdev->bits.abs))
+	if (test_bit (i, pEvdev->bits.abs))
 	    real_axes++;
 
     if (!real_axes)
@@ -344,7 +336,7 @@
     pInfo->conversion_proc = EvdevConvert;
 
     for (i = 0, j = 0; i < ABS_MAX; i++) {
-	if (!TestBit (i, pEvdev->bits.abs))
+	if (!test_bit (i, pEvdev->bits.abs))
 	    continue;
 
 	snprintf(option, sizeof(option), "%sAbsoluteAxisMap", abs_axis_names[i]);
@@ -389,11 +381,11 @@
 	xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s);
     }
 
-    if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs))
+    if (test_bit (ABS_X, pEvdev->bits.abs) && test_bit (ABS_Y, pEvdev->bits.abs))
 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
     else
 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
-    if (k < screenInfo.numScreens) {
+    if (k < screenInfo.numScreens && k >= 0) {
 	state->abs->screen = k;
 	xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k);
     } else {
@@ -417,7 +409,7 @@
 
     real_axes = 0;
     for (i = 0; i < REL_MAX; i++)
-	if (TestBit (i, pEvdev->bits.rel))
+	if (test_bit (i, pEvdev->bits.rel))
 	    real_axes++;
 
     if (!real_axes && (!state->abs || state->abs->axes < 2))
@@ -434,7 +426,7 @@
     pInfo->conversion_proc = EvdevConvert;
 
     for (i = 0, j = 0; i < REL_MAX; i++) {
-	if (!TestBit (i, pEvdev->bits.rel))
+	if (!test_bit (i, pEvdev->bits.rel))
 	    continue;
 
 	snprintf(option, sizeof(option), "%sRelativeAxisMap", rel_axis_names[i]);
Index: src/evdev_brain.c
diff -u src/evdev_brain.c:1.8 src/evdev_brain.c:1.9
--- src/evdev_brain.c:1.8	Sun Apr 30 21:39:08 2006
+++ src/evdev_brain.c	Sun May 14 11:55:50 2006
@@ -86,7 +86,7 @@
 } evdevDevInfoRec, *evdevDevInfoPtr;
 
 static Bool
-MatchAll (long *dev, long *match, int len)
+MatchAll (unsigned long *dev, unsigned long *match, int len)
 {
     int i;
 
@@ -98,7 +98,7 @@
 }
 
 static Bool
-MatchNot (long *dev, long *match, int len)
+MatchNot (unsigned long *dev, unsigned long *match, int len)
 {
     int i;
 
@@ -110,7 +110,7 @@
 }
 
 static Bool
-MatchAny (long *dev, long *match, int len)
+MatchAny (unsigned long *dev, unsigned long *match, int len)
 {
     int i, found = 0;
 
Index: src/evdev_btn.c
diff -u src/evdev_btn.c:1.7 src/evdev_btn.c:1.8
--- src/evdev_btn.c:1.7	Fri Apr 14 07:01:37 2006
+++ src/evdev_btn.c	Sun May 14 11:55:50 2006
@@ -51,15 +51,6 @@
 
 #include <xf86Module.h>
 
-
-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
-
-#define BITS_PER_LONG (sizeof(long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x)  ((x)%BITS_PER_LONG)
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define TestBit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
-
 void
 EvdevBtnPostFakeClicks(InputInfoPtr pInfo, int button, int count)
 {
@@ -186,7 +177,7 @@
     state->btn = Xcalloc (sizeof (evdevBtnRec));
 
     for (i = BTN_MISC; i < (KEY_OK - 1); i++)
-	if (TestBit (i, pEvdev->bits.key)) {
+	if (test_bit (i, pEvdev->bits.key)) {
 	    bit = i;
 	    if ((bit >= BTN_MOUSE) && (bit < BTN_JOYSTICK)) {
 		bit -= BTN_MOUSE - BTN_MISC;
Index: src/evdev_key.c
diff -u src/evdev_key.c:1.8 src/evdev_key.c:1.9
--- src/evdev_key.c:1.8	Sat Apr  8 17:23:06 2006
+++ src/evdev_key.c	Sun May 14 11:55:50 2006
@@ -81,11 +81,6 @@
 
 
 #define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
-#define BITS_PER_LONG (sizeof(long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x)  ((x)%BITS_PER_LONG)
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define TestBit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
 
 #define MIN_KEYCODE 8
 #define GLYPHS_PER_KEY 2
@@ -356,13 +351,13 @@
     int i, keys = 0;
 
     for (i = 0; i <= KEY_UNKNOWN; i++)
-	if (TestBit (i, pEvdev->bits.key)) {
+	if (test_bit (i, pEvdev->bits.key)) {
 	    keys = 1;
 	    break;
 	}
     if (!keys)
 	for (i = KEY_OK; i <= KEY_MAX; i++)
-	    if (TestBit (i, pEvdev->bits.key)) {
+	    if (test_bit (i, pEvdev->bits.key)) {
 		keys = 1;
 		break;
 	    }
Index: src/inotify-syscalls.h
diff -u src/inotify-syscalls.h:1.1 src/inotify-syscalls.h:1.2
--- src/inotify-syscalls.h:1.1	Sat Apr  8 21:55:17 2006
+++ src/inotify-syscalls.h	Sun May 14 11:55:50 2006
@@ -39,6 +39,10 @@
 # define __NR_inotify_init	290
 # define __NR_inotify_add_watch	291
 # define __NR_inotify_rm_watch	292
+#elif defined (__hppa__) || defined (__hppa64__)
+# define __NR_inotify_init	269
+# define __NR_inotify_add_watch	270
+# define __NR_inotify_rm_watch	271
 #else
 # error "Unsupported architecture!"
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:16:52 -0000	1.7
+++ .cvsignore	5 Jun 2006 19:32:04 -0000	1.8
@@ -1 +1 @@
-xf86-input-evdev-1.1.0.tar.bz2
+xf86-input-evdev-1.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:16:52 -0000	1.7
+++ sources	5 Jun 2006 19:32:04 -0000	1.8
@@ -1 +1 @@
-227cf66bcfea90982ee0b947d2475d1d  xf86-input-evdev-1.1.0.tar.bz2
+2932a39f080bae68bbcdc11fc125d990  xf86-input-evdev-1.1.2.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-evdev.spec	10 Apr 2006 18:02:16 -0000	1.11
+++ xorg-x11-drv-evdev.spec	5 Jun 2006 19:32:04 -0000	1.12
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
-Version: 1.1.0
-Release: 3
+Version: 1.1.2
+Release: 1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -17,18 +17,18 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.1.0
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+Requires:  xorg-x11-server-Xorg >= 1.1.0
 
-Patch0: evdev-1.1.0-ia64-build-fix.patch
+Patch0: evdev-1.1.2-cvs-20060605.patch
 
 %description 
 X.Org X11 evdev input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p0 -b .ia64-build-fix
+%patch0 -p0 -b .cvs-20060605
 
 %build
 %configure --disable-static
@@ -55,6 +55,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Mon Jun 05 2006 Adam Jackson <ajackson at redhat.com> 1.1.2-1
+- Update to 1.1.2 + CVS fixes.
+
 * Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
 - Work around header pollution on ia64, re-add to arch list.
 


--- evdev-1.1.0-ia64-build-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:35:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:35:30 -0400
Subject: rpms/eclipse-pydev/FC-5
	eclipse-pydev-1.0.8-backport-megapatch.patch, NONE,
	1.1 eclipse-pydev-noretroweaver.patch, NONE, 1.1
Message-ID: <200606051935.k55JZUAR007585@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7557

Added Files:
	eclipse-pydev-1.0.8-backport-megapatch.patch 
	eclipse-pydev-noretroweaver.patch 
Log Message:
Adding 2 patches.

eclipse-pydev-1.0.8-backport-megapatch.patch:
 org.python.pydev.core/src/org/python/pydev/core/DeltaSaver.java                                                      |   60 +++---
 org.python.pydev.core/src/org/python/pydev/core/ExtensionHelper.java                                                 |    5 
 org.python.pydev.core/src/org/python/pydev/core/FullRepIterable.java                                                 |   12 -
 org.python.pydev.core/src/org/python/pydev/core/ICallback.java                                                       |    4 
 org.python.pydev.core/src/org/python/pydev/core/ICodeCompletionASTManager.java                                       |    4 
 org.python.pydev.core/src/org/python/pydev/core/IDeltaProcessor.java                                                 |    8 
 org.python.pydev.core/src/org/python/pydev/core/IInterpreterManager.java                                             |    2 
 org.python.pydev.core/src/org/python/pydev/core/IModule.java                                                         |    4 
 org.python.pydev.core/src/org/python/pydev/core/IModulesManager.java                                                 |    4 
 org.python.pydev.core/src/org/python/pydev/core/ISystemModulesManager.java                                           |    4 
 org.python.pydev.core/src/org/python/pydev/core/ModulesKey.java                                                      |    1 
 org.python.pydev.core/src/org/python/pydev/core/ObjectsPool.java                                                     |    1 
 org.python.pydev.core/src/org/python/pydev/core/REF.java                                                             |   27 +--
 org.python.pydev.core/src/org/python/pydev/core/Tuple.java                                                           |   11 -
 org.python.pydev.core/src/org/python/pydev/core/Tuple3.java                                                          |   13 -
 org.python.pydev.core/src/org/python/pydev/core/bundle/ImageCache.java                                               |    2 
 org.python.pydev.core/src/org/python/pydev/core/cache/Cache.java                                                     |    8 
 org.python.pydev.core/src/org/python/pydev/core/cache/DiskCache.java                                                 |   18 +-
 org.python.pydev.core/src/org/python/pydev/core/cache/LRUCache.java                                                  |   18 +-
 org.python.pydev.core/src/org/python/pydev/core/cache/PyPreferencesCache.java                                        |   10 -
 org.python.pydev.core/src/org/python/pydev/core/docutils/PyDocIterator.java                                          |    4 
 org.python.pydev.core/src/org/python/pydev/core/docutils/PySelection.java                                            |   58 +++---
 org.python.pydev.core/src/org/python/pydev/core/docutils/StringUtils.java                                            |    2 
 org.python.pydev.core/tests/org/python/pydev/core/DeltaSaverTest.java                                                |   47 ++---
 org.python.pydev.core/tests/org/python/pydev/core/FullRepIterableTest.java                                           |    8 
 org.python.pydev.core/tests/org/python/pydev/core/TestDependent.template                                             |    5 
 org.python.pydev.core/tests/org/python/pydev/core/cache/LRUCacheTest.java                                            |   22 +-
 org.python.pydev.debug/src/org/python/pydev/debug/model/AbstractDebugTarget.java                                     |   42 +++-
 org.python.pydev.debug/src/org/python/pydev/debug/model/DeferredWorkbenchAdapter.java                                |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/model/PyStackFrame.java                                            |    9 -
 org.python.pydev.debug/src/org/python/pydev/debug/model/XMLUtils.java                                                |   16 -
 org.python.pydev.debug/src/org/python/pydev/debug/model/remote/GetFrameCommand.java                                  |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/MainModuleTab.java                                              |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/BreakpointRulerAction.java                              |    6 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerAction.java                 |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java         |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/actions/PythonBreakpointPropertiesRulerActionDelegate.java      |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/JythonLaunchConfigurationDelegate.java                |    1 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/JythonLaunchShortcut.java                             |    2 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunner.java                                     |    2 
 org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunnerConfig.java                               |   10 -
 org.python.pydev.debug/src/org/python/pydev/debug/ui/propertypages/PythonBreakpointPage.java                         |    1 
 org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java                                                |   56 +++---
 org.python.pydev.jython/src/org/python/pydev/jython/ScriptOutput.java                                                |    1 
 org.python.pydev.jython/src/org/python/pydev/jython/ScriptingExtensionInitializer.java                               |    1 
 org.python.pydev.jython/src/org/python/pydev/jython/ui/JyScriptingPreferencesPage.java                               |    1 
 org.python.pydev.parser/src/org/python/pydev/parser/IParserObserver2.java                                            |    4 
 org.python.pydev.parser/src/org/python/pydev/parser/ParserScheduler.java                                             |    9 -
 org.python.pydev.parser/src/org/python/pydev/parser/ParsingThread.java                                               |    2 
 org.python.pydev.parser/src/org/python/pydev/parser/PyParser.java                                                    |   42 ++--
 org.python.pydev.parser/src/org/python/pydev/parser/jython/PythonGrammar.java                                        |   12 -
 org.python.pydev.parser/src/org/python/pydev/parser/jython/SimpleNode.java                                           |   13 +
 org.python.pydev.parser/src/org/python/pydev/parser/jython/SpecialStr.java                                           |    3 
 org.python.pydev.parser/src/org/python/pydev/parser/jython/TreeBuilder.java                                          |    6 
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/NodeUtils.java                                          |   29 ++-
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/comparator/SimpleNodeComparator.java                    |   12 -
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/DefinitionsASTIteratorVisitor.java                |    4 
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/EasyASTIteratorVisitor.java                       |    2 
 org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/EasyAstIteratorBase.java                          |   33 +--
 org.python.pydev.parser/tests/org/python/pydev/parser/PyParserPrintTest.java                                         |    2 
 org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTest.java                                              |   67 +++----
 org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java                                          |    6 
 org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java                                      |    6 
 org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java                                    |   14 -
 org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java                                       |   15 +
 org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java                                          |   18 +-
 org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java                                                      |   27 +--
 org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java                                               |   19 +-
 org.python.pydev/src/org/python/pydev/builder/PydevGrouperVisitor.java                                               |   34 ++-
 org.python.pydev/src/org/python/pydev/builder/PydevMarkerUtils.java                                                  |   48 +++--
 org.python.pydev/src/org/python/pydev/builder/pychecker/PyCheckerLauncher.java                                       |    2 
 org.python.pydev/src/org/python/pydev/builder/pychecker/PyCheckerVisitor.java                                        |    2 
 org.python.pydev/src/org/python/pydev/builder/pycremover/PycRemoverBuilderVisitor.java                               |   11 -
 org.python.pydev/src/org/python/pydev/builder/pylint/PyLintPrefInitializer.java                                      |    1 
 org.python.pydev/src/org/python/pydev/builder/pylint/PyLintVisitor.java                                              |   12 -
 org.python.pydev/src/org/python/pydev/editor/PyCodeScanner.java                                                      |   11 -
 org.python.pydev/src/org/python/pydev/editor/PyEdit.java                                                             |   49 +++--
 org.python.pydev/src/org/python/pydev/editor/PyEditConfiguration.java                                                |    2 
 org.python.pydev/src/org/python/pydev/editor/PyPartitionScanner.java                                                 |   12 -
 org.python.pydev/src/org/python/pydev/editor/actions/PyBackspace.java                                                |    6 
 org.python.pydev/src/org/python/pydev/editor/actions/PyGoToDefinition.java                                           |    7 
 org.python.pydev/src/org/python/pydev/editor/actions/PyNextMethod.java                                               |    2 
 org.python.pydev/src/org/python/pydev/editor/actions/PyOrganizeImports.java                                          |   13 -
 org.python.pydev/src/org/python/pydev/editor/actions/PyPreviousMethod.java                                           |    2 
 org.python.pydev/src/org/python/pydev/editor/actions/PyShowBrowser.java                                              |    1 
 org.python.pydev/src/org/python/pydev/editor/actions/PyShowOutline.java                                              |    1 
 org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyRefactorAction.java                               |    3 
 org.python.pydev/src/org/python/pydev/editor/autoedit/PyAutoIndentStrategy.java                                      |   26 +-
 org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletionInitializer.java                         |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonStringCompletionProcessor.java                     |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java                        |   90 +++++-----
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/CompletionState.java                           |   36 ++--
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ModulesManager.java                            |   78 ++++----
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ProjectModulesManager.java                     |   75 +++++---
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/PyCodeCompletionVisitor.java                   |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/PythonPathHelper.java                          |   24 +-
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/SystemModulesManager.java                      |   10 -
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java                    |   12 -
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/CompiledModule.java                    |   38 ++--
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/EmptyModule.java                       |    4 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceModule.java                      |   80 ++++----
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceToken.java                       |    2 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java                  |   22 +-
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/Definition.java                       |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitor.java       |   14 -
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/FindScopeVisitor.java                 |    6 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/Scope.java                            |   16 +
 org.python.pydev/src/org/python/pydev/editor/codecompletion/shell/AbstractShell.java                                 |   50 ++---
 org.python.pydev/src/org/python/pydev/editor/codecompletion/shell/JythonShell.java                                   |    1 
 org.python.pydev/src/org/python/pydev/editor/codecompletion/shell/PythonShell.java                                   |    1 
 org.python.pydev/src/org/python/pydev/editor/codefolding/PySourceViewer.java                                         |   33 ++-
 org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java                         |    9 -
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistAssign.java                           |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistDocString.java                        |   12 -
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistImport.java                           |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistOverride.java                         |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistTry.java                              |    4 
 org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/IAssistProps.java                           |    2 
 org.python.pydev/src/org/python/pydev/editor/hover/PyAnnotationHover.java                                            |    8 
 org.python.pydev/src/org/python/pydev/editor/hover/PyTextHover.java                                                  |   12 +
 org.python.pydev/src/org/python/pydev/editor/model/AbstractNode.java                                                 |    4 
 org.python.pydev/src/org/python/pydev/editor/model/ItemPointer.java                                                  |    3 
 org.python.pydev/src/org/python/pydev/editor/model/Location.java                                                     |    2 
 org.python.pydev/src/org/python/pydev/editor/refactoring/AbstractPyRefactoring.java                                  |    2 
 org.python.pydev/src/org/python/pydev/editor/refactoring/PyRefactoring.java                                          |    8 
 org.python.pydev/src/org/python/pydev/editor/refactoring/RefactoringRequest.java                                     |    6 
 org.python.pydev/src/org/python/pydev/editor/scripting/PyEditScripting.java                                          |   10 -
 org.python.pydev/src/org/python/pydev/editor/simpleassist/ISimpleAssistParticipant.java                              |    2 
 org.python.pydev/src/org/python/pydev/editor/simpleassist/SimpleAssistProcessor.java                                 |    9 -
 org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java                                                        |   60 +++---
 org.python.pydev/src/org/python/pydev/plugin/PydevPrefs.java                                                         |   10 -
 org.python.pydev/src/org/python/pydev/plugin/PydevPrefsInitializer.java                                              |    1 
 org.python.pydev/src/org/python/pydev/plugin/nature/PythonNature.java                                                |   25 +-
 org.python.pydev/src/org/python/pydev/plugin/nature/PythonPathNature.java                                            |    4 
 org.python.pydev/src/org/python/pydev/runners/SimpleJythonRunner.java                                                |   20 +-
 org.python.pydev/src/org/python/pydev/runners/SimplePythonRunner.java                                                |   10 -
 org.python.pydev/src/org/python/pydev/runners/SimpleRunner.java                                                      |   24 +-
 org.python.pydev/src/org/python/pydev/ui/PyProjectProperties.java                                                    |    1 
 org.python.pydev/src/org/python/pydev/ui/PyProjectPythonDetails.java                                                 |    1 
 org.python.pydev/src/org/python/pydev/ui/dialogs/PythonModulePickerDialog.java                                       |    2 
 org.python.pydev/src/org/python/pydev/ui/dialogs/PythonPackageSelectionDialog.java                                   |   21 +-
 org.python.pydev/src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java                                |   80 +++++---
 org.python.pydev/src/org/python/pydev/ui/interpreters/JythonInterpreterManager.java                                  |   21 +-
 org.python.pydev/src/org/python/pydev/ui/interpreters/PythonInterpreterManager.java                                  |   12 -
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterEditor.java                               |    9 -
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterPreferencesPage.java                      |   10 -
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/InterpreterInfo.java                                         |   26 +-
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/JythonInterpreterEditor.java                                 |    1 
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/JythonInterpreterPreferencesPage.java                        |    4 
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java                                 |    1 
 org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterPreferencesPage.java                        |    3 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/AbstractPythonWizard.java                                     |    1 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonAbstractPathPage.java                                   |   13 +
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonModuleWizard.java                                       |    3 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonPackageWizard.java                                      |    7 
 org.python.pydev/src/org/python/pydev/ui/wizards/files/PythonSourceFolderWizard.java                                 |    4 
 org.python.pydev/src/org/python/pydev/utils/CounterThread.java                                                       |    3 
 org.python.pydev/tests/org/python/pydev/editor/actions/PySelectionTest.java                                          |   26 +-
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/PythonShellTest.java                                   |   13 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/CodeCompletionTestsBase.java                 |   12 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/PythonInterpreterManagerStub.java            |   11 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonCodeCompletionTestsBase.java    |   15 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonInterpreterManagerStub.java     |   12 -
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitorTest.java            |   34 +--
 org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitorTest.java |    8 
 org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistAssignTest.java                     |    9 -
 org.python.pydev/tests/org/python/pydev/jythontests/JythonTests.java                                                 |    7 
 org.python.pydev/tests/org/python/pydev/runners/SimpleJythonRunnerTest.java                                          |    2 
 org.python.pydev/tests/org/python/pydev/runners/SimplePythonRunnerTest.java                                          |    2 
 org.python.pydev/tests/org/python/pydev/ui/pythonpathconf/InterpreterInfoTest.java                                   |   14 -
 src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java                                                        |    0 
 src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java                                                           |    0 
 src/org/python/pydev/builder/PyDevBuilder.java                                                                       |    0 
 src/org/python/pydev/builder/PyDevBuilderVisitor.java                                                                |    0 
 src/org/python/pydev/builder/PydevGrouperVisitor.java                                                                |    0 
 src/org/python/pydev/builder/PydevMarkerUtils.java                                                                   |    0 
 src/org/python/pydev/builder/pychecker/PyCheckerLauncher.java                                                        |    0 
 src/org/python/pydev/builder/pychecker/PyCheckerVisitor.java                                                         |    0 
 src/org/python/pydev/builder/pycremover/PycRemoverBuilderVisitor.java                                                |    0 
 src/org/python/pydev/builder/pylint/PyLintPrefInitializer.java                                                       |    0 
 src/org/python/pydev/builder/pylint/PyLintVisitor.java                                                               |    0 
 src/org/python/pydev/core/DeltaSaver.java                                                                            |    0 
 src/org/python/pydev/core/ExtensionHelper.java                                                                       |    0 
 src/org/python/pydev/core/FullRepIterable.java                                                                       |    0 
 src/org/python/pydev/core/ICallback.java                                                                             |    0 
 src/org/python/pydev/core/ICodeCompletionASTManager.java                                                             |    0 
 src/org/python/pydev/core/IDeltaProcessor.java                                                                       |    0 
 src/org/python/pydev/core/IInterpreterManager.java                                                                   |    0 
 src/org/python/pydev/core/IModule.java                                                                               |    0 
 src/org/python/pydev/core/IModulesManager.java                                                                       |    0 
 src/org/python/pydev/core/ISystemModulesManager.java                                                                 |    0 
 src/org/python/pydev/core/ModulesKey.java                                                                            |    0 
 src/org/python/pydev/core/ObjectsPool.java                                                                           |    0 
 src/org/python/pydev/core/REF.java                                                                                   |    0 
 src/org/python/pydev/core/Tuple.java                                                                                 |    0 
 src/org/python/pydev/core/Tuple3.java                                                                                |    0 
 src/org/python/pydev/core/bundle/ImageCache.java                                                                     |    0 
 src/org/python/pydev/core/cache/Cache.java                                                                           |    0 
 src/org/python/pydev/core/cache/DiskCache.java                                                                       |    0 
 src/org/python/pydev/core/cache/LRUCache.java                                                                        |    0 
 src/org/python/pydev/core/cache/PyPreferencesCache.java                                                              |    0 
 src/org/python/pydev/core/docutils/PyDocIterator.java                                                                |    0 
 src/org/python/pydev/core/docutils/PySelection.java                                                                  |    0 
 src/org/python/pydev/core/docutils/StringUtils.java                                                                  |    0 
 src/org/python/pydev/debug/model/AbstractDebugTarget.java                                                            |    0 
 src/org/python/pydev/debug/model/DeferredWorkbenchAdapter.java                                                       |    0 
 src/org/python/pydev/debug/model/PyStackFrame.java                                                                   |    0 
 src/org/python/pydev/debug/model/XMLUtils.java                                                                       |    0 
 src/org/python/pydev/debug/model/remote/GetFrameCommand.java                                                         |    0 
 src/org/python/pydev/debug/ui/MainModuleTab.java                                                                     |    0 
 src/org/python/pydev/debug/ui/actions/BreakpointRulerAction.java                                                     |    0 
 src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerAction.java                                        |    0 
 src/org/python/pydev/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java                                |    0 
 src/org/python/pydev/debug/ui/actions/PythonBreakpointPropertiesRulerActionDelegate.java                             |    0 
 src/org/python/pydev/debug/ui/launching/JythonLaunchConfigurationDelegate.java                                       |    0 
 src/org/python/pydev/debug/ui/launching/JythonLaunchShortcut.java                                                    |    0 
 src/org/python/pydev/debug/ui/launching/PythonRunner.java                                                            |    0 
 src/org/python/pydev/debug/ui/launching/PythonRunnerConfig.java                                                      |    0 
 src/org/python/pydev/debug/ui/propertypages/PythonBreakpointPage.java                                                |    0 
 src/org/python/pydev/editor/PyCodeScanner.java                                                                       |    0 
 src/org/python/pydev/editor/PyEdit.java                                                                              |    0 
 src/org/python/pydev/editor/PyEditConfiguration.java                                                                 |    0 
 src/org/python/pydev/editor/PyPartitionScanner.java                                                                  |    0 
 src/org/python/pydev/editor/actions/PyBackspace.java                                                                 |    0 
 src/org/python/pydev/editor/actions/PyGoToDefinition.java                                                            |    0 
 src/org/python/pydev/editor/actions/PyNextMethod.java                                                                |    0 
 src/org/python/pydev/editor/actions/PyOrganizeImports.java                                                           |    0 
 src/org/python/pydev/editor/actions/PyPreviousMethod.java                                                            |    0 
 src/org/python/pydev/editor/actions/PyShowBrowser.java                                                               |    0 
 src/org/python/pydev/editor/actions/PyShowOutline.java                                                               |    0 
 src/org/python/pydev/editor/actions/refactoring/PyRefactorAction.java                                                |    0 
 src/org/python/pydev/editor/autoedit/PyAutoIndentStrategy.java                                                       |    0 
 src/org/python/pydev/editor/codecompletion/PyCodeCompletionInitializer.java                                          |    0 
 src/org/python/pydev/editor/codecompletion/PythonStringCompletionProcessor.java                                      |    0 
 src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java                                         |    0 
 src/org/python/pydev/editor/codecompletion/revisited/CompletionState.java                                            |    0 
 src/org/python/pydev/editor/codecompletion/revisited/ModulesManager.java                                             |    0 
 src/org/python/pydev/editor/codecompletion/revisited/ProjectModulesManager.java                                      |    0 
 src/org/python/pydev/editor/codecompletion/revisited/PyCodeCompletionVisitor.java                                    |    0 
 src/org/python/pydev/editor/codecompletion/revisited/PythonPathHelper.java                                           |    0 
 src/org/python/pydev/editor/codecompletion/revisited/SystemModulesManager.java                                       |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java                                     |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/CompiledModule.java                                     |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/EmptyModule.java                                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/SourceModule.java                                       |    0 
 src/org/python/pydev/editor/codecompletion/revisited/modules/SourceToken.java                                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java                                   |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/Definition.java                                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitor.java                        |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/FindScopeVisitor.java                                  |    0 
 src/org/python/pydev/editor/codecompletion/revisited/visitors/Scope.java                                             |    0 
 src/org/python/pydev/editor/codecompletion/shell/AbstractShell.java                                                  |    0 
 src/org/python/pydev/editor/codecompletion/shell/JythonShell.java                                                    |    0 
 src/org/python/pydev/editor/codecompletion/shell/PythonShell.java                                                    |    0 
 src/org/python/pydev/editor/codefolding/PySourceViewer.java                                                          |    0 
 src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java                                          |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistAssign.java                                            |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistDocString.java                                         |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistImport.java                                            |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistOverride.java                                          |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/AssistTry.java                                               |    0 
 src/org/python/pydev/editor/correctionassist/heuristics/IAssistProps.java                                            |    0 
 src/org/python/pydev/editor/hover/PyAnnotationHover.java                                                             |    0 
 src/org/python/pydev/editor/hover/PyTextHover.java                                                                   |    0 
 src/org/python/pydev/editor/model/AbstractNode.java                                                                  |    0 
 src/org/python/pydev/editor/model/ItemPointer.java                                                                   |    0 
 src/org/python/pydev/editor/model/Location.java                                                                      |    0 
 src/org/python/pydev/editor/refactoring/AbstractPyRefactoring.java                                                   |    0 
 src/org/python/pydev/editor/refactoring/PyRefactoring.java                                                           |    0 
 src/org/python/pydev/editor/refactoring/RefactoringRequest.java                                                      |    0 
 src/org/python/pydev/editor/scripting/PyEditScripting.java                                                           |    0 
 src/org/python/pydev/editor/simpleassist/ISimpleAssistParticipant.java                                               |    0 
 src/org/python/pydev/editor/simpleassist/SimpleAssistProcessor.java                                                  |    0 
 src/org/python/pydev/jython/JythonPlugin.java                                                                        |    0 
 src/org/python/pydev/jython/ScriptOutput.java                                                                        |    0 
 src/org/python/pydev/jython/ScriptingExtensionInitializer.java                                                       |    0 
 src/org/python/pydev/jython/ui/JyScriptingPreferencesPage.java                                                       |    0 
 src/org/python/pydev/parser/IParserObserver2.java                                                                    |    0 
 src/org/python/pydev/parser/ParserScheduler.java                                                                     |    0 
 src/org/python/pydev/parser/ParsingThread.java                                                                       |    0 
 src/org/python/pydev/parser/PyParser.java                                                                            |    0 
 src/org/python/pydev/parser/jython/PythonGrammar.java                                                                |    0 
 src/org/python/pydev/parser/jython/SimpleNode.java                                                                   |    0 
 src/org/python/pydev/parser/jython/SpecialStr.java                                                                   |    0 
 src/org/python/pydev/parser/jython/TreeBuilder.java                                                                  |    0 
 src/org/python/pydev/parser/visitors/NodeUtils.java                                                                  |    0 
 src/org/python/pydev/parser/visitors/comparator/SimpleNodeComparator.java                                            |    0 
 src/org/python/pydev/parser/visitors/scope/DefinitionsASTIteratorVisitor.java                                        |    0 
 src/org/python/pydev/parser/visitors/scope/EasyASTIteratorVisitor.java                                               |    0 
 src/org/python/pydev/parser/visitors/scope/EasyAstIteratorBase.java                                                  |    0 
 src/org/python/pydev/plugin/PydevPlugin.java                                                                         |    0 
 src/org/python/pydev/plugin/PydevPrefs.java                                                                          |    0 
 src/org/python/pydev/plugin/PydevPrefsInitializer.java                                                               |    0 
 src/org/python/pydev/plugin/nature/PythonNature.java                                                                 |    0 
 src/org/python/pydev/plugin/nature/PythonPathNature.java                                                             |    0 
 src/org/python/pydev/runners/SimpleJythonRunner.java                                                                 |    0 
 src/org/python/pydev/runners/SimplePythonRunner.java                                                                 |    0 
 src/org/python/pydev/runners/SimpleRunner.java                                                                       |    0 
 src/org/python/pydev/ui/PyProjectProperties.java                                                                     |    0 
 src/org/python/pydev/ui/PyProjectPythonDetails.java                                                                  |    0 
 src/org/python/pydev/ui/dialogs/PythonModulePickerDialog.java                                                        |    0 
 src/org/python/pydev/ui/dialogs/PythonPackageSelectionDialog.java                                                    |    0 
 src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java                                                 |    0 
 src/org/python/pydev/ui/interpreters/JythonInterpreterManager.java                                                   |    0 
 src/org/python/pydev/ui/interpreters/PythonInterpreterManager.java                                                   |    0 
 src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterEditor.java                                                |    0 
 src/org/python/pydev/ui/pythonpathconf/AbstractInterpreterPreferencesPage.java                                       |    0 
 src/org/python/pydev/ui/pythonpathconf/InterpreterInfo.java                                                          |    0 
 src/org/python/pydev/ui/pythonpathconf/JythonInterpreterEditor.java                                                  |    0 
 src/org/python/pydev/ui/pythonpathconf/JythonInterpreterPreferencesPage.java                                         |    0 
 src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java                                                  |    0 
 src/org/python/pydev/ui/pythonpathconf/PythonInterpreterPreferencesPage.java                                         |    0 
 src/org/python/pydev/ui/wizards/files/AbstractPythonWizard.java                                                      |    0 
 src/org/python/pydev/ui/wizards/files/PythonAbstractPathPage.java                                                    |    0 
 src/org/python/pydev/ui/wizards/files/PythonModuleWizard.java                                                        |    0 
 src/org/python/pydev/ui/wizards/files/PythonPackageWizard.java                                                       |    0 
 src/org/python/pydev/ui/wizards/files/PythonSourceFolderWizard.java                                                  |    0 
 src/org/python/pydev/utils/CounterThread.java                                                                        |    0 
 tests/org/python/pydev/core/DeltaSaverTest.java                                                                      |    0 
 tests/org/python/pydev/core/FullRepIterableTest.java                                                                 |    0 
 tests/org/python/pydev/core/TestDependent.template                                                                   |    0 
 tests/org/python/pydev/core/cache/LRUCacheTest.java                                                                  |    0 
 tests/org/python/pydev/editor/actions/PySelectionTest.java                                                           |    0 
 tests/org/python/pydev/editor/codecompletion/PythonShellTest.java                                                    |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/CodeCompletionTestsBase.java                                  |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/PythonInterpreterManagerStub.java                             |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonCodeCompletionTestsBase.java                     |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/jython/JythonInterpreterManagerStub.java                      |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitorTest.java                             |    0 
 tests/org/python/pydev/editor/codecompletion/revisited/visitors/FindDefinitionModelVisitorTest.java                  |    0 
 tests/org/python/pydev/editor/correctionassist/heuristics/AssistAssignTest.java                                      |    0 
 tests/org/python/pydev/jythontests/JythonTests.java                                                                  |    0 
 tests/org/python/pydev/parser/PyParserPrintTest.java                                                                 |    0 
 tests/org/python/pydev/parser/PyParserTest.java                                                                      |    0 
 tests/org/python/pydev/parser/PyParserTestBase.java                                                                  |    0 
 tests/org/python/pydev/parser/profile/ParseBigFile.java                                                              |    0 
 tests/org/python/pydev/parser/visitors/NodeUtilsTest.java                                                            |    0 
 tests/org/python/pydev/runners/SimpleJythonRunnerTest.java                                                           |    0 
 tests/org/python/pydev/runners/SimplePythonRunnerTest.java                                                           |    0 
 tests/org/python/pydev/ui/pythonpathconf/InterpreterInfoTest.java                                                    |    0 
 340 files changed, 1249 insertions(+), 1100 deletions(-)

--- NEW FILE eclipse-pydev-1.0.8-backport-megapatch.patch ---
Index: src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java,v
retrieving revision 1.3
diff -u -r1.3 JavaVmLocationFinder.java
--- org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java	13 Aug 2005 14:36:24 -0000	1.3
+++ org.python.pydev/src/org/python/copiedfromeclipsesrc/JavaVmLocationFinder.java	2 Jun 2006 20:41:34 -0000
@@ -89,8 +89,8 @@
     /**
      * @return the default java jars (rt.jar ... )
      */
-    public static List<File> findDefaultJavaJars(){
-        return (List<File>) callbackJavaJars.call(null);
+    public static List findDefaultJavaJars(){
+        return (List) callbackJavaJars.call(null);
     }
     
     /**
@@ -102,10 +102,13 @@
             IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
             LibraryLocation[] libraryLocations = JavaRuntime.getLibraryLocations(defaultVMInstall);
             
-            ArrayList<File> jars = new ArrayList<File>();
-            for (LibraryLocation location : libraryLocations) {
-                jars.add(location.getSystemLibraryPath().toFile());
-            }
+            ArrayList jars = new ArrayList();
+            for (int i = 0; i < libraryLocations.length; i++) {
+				LibraryLocation location = libraryLocations[i];
+				jars.add(location.getSystemLibraryPath().toFile());
+				
+			}
+            
             return jars;
         }
         
Index: src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java,v
retrieving revision 1.5
diff -u -r1.5 PythonPairMatcher.java
--- org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java	16 Mar 2006 00:29:59 -0000	1.5
+++ org.python.pydev/src/org/python/copiedfromeclipsesrc/PythonPairMatcher.java	2 Jun 2006 20:41:34 -0000
@@ -260,11 +260,11 @@
         try {
             fReader.configureBackwardReader(document, offset, true, true);
             
-            Map<Character, Integer> stack = new HashMap<Character, Integer>();
+            Map stack = new HashMap();
             
             for (int i = 0; i < fPairs.length; i++) {
                 if(i %2 == 0){
-                    stack.put(fPairs[i], 1);
+                    stack.put(new Character(fPairs[i]), new Integer(1));
                 }
             }
             
@@ -272,16 +272,16 @@
             while (c != PythonCodeReader.EOF) {
                 if (c == ')' || c == ']' || c == '}' ){
                     char peer = DocUtils.getPeer((char)c);
-                    Integer iStack = stack.get((char)peer);
-                    iStack++;
-                    stack.put(peer, iStack);
+                    Integer iStack = (Integer) stack.get(new Character((char)peer));
+                    iStack = new Integer(iStack.intValue() + 1);
+                    stack.put(new Character(peer), iStack);
                     
                 }else if (c == '(' || c == '[' || c == '{'){
-                    Integer iStack = stack.get((char)c);
-                    iStack--;
-                    stack.put((char) c, iStack);
+                    Integer iStack = (Integer) stack.get(new Character((char)c));
+                    iStack = new Integer (iStack.intValue() - 1);
+                    stack.put(new Character((char) c), iStack);
                     
-                    if (iStack == 0){
+                    if (iStack.intValue() == 0){
                         return fReader.getOffset();
                     }
                 }
Index: src/org/python/pydev/builder/PyDevBuilder.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java,v
retrieving revision 1.43
diff -u -r1.43 PyDevBuilder.java
--- org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java	18 Mar 2006 13:20:03 -0000	1.43
+++ org.python.pydev/src/org/python/pydev/builder/PyDevBuilder.java	2 Jun 2006 20:41:34 -0000
@@ -45,9 +45,8 @@
      * 
      * @return a list of visitors for building the application.
      */
-    @SuppressWarnings("unchecked")
-    public List<PyDevBuilderVisitor> getVisitors() {
-        List<PyDevBuilderVisitor> list = new ArrayList<PyDevBuilderVisitor>();
+    public List getVisitors() {
+        List list = new ArrayList();
         list.add(new PyTodoVisitor());
         list.add(new PyLintVisitor());
         list.add(new PyCodeCompletionVisitor());
@@ -88,7 +87,7 @@
                 PyDevDeltaCounter counterVisitor = new PyDevDeltaCounter();
                 delta.accept(counterVisitor);
                 
-                List<PyDevBuilderVisitor> visitors = getVisitors();
+                List visitors = getVisitors();
                 
                 //sort by priority
                 Collections.sort(visitors); 
@@ -119,9 +118,9 @@
             
             //and the nature...
             if (nature != null){
-                List<IResource> resourcesToParse = new ArrayList<IResource>();
+                List resourcesToParse = new ArrayList();
     
-                List<PyDevBuilderVisitor> visitors = getVisitors();
+                List visitors = getVisitors();
                 notifyVisitingWillStart(visitors, monitor);
     
                 monitor.beginTask("Building...", (visitors.size() * 100) + 30);
@@ -171,14 +170,16 @@
 
     }
 
-    private void notifyVisitingWillStart(List<PyDevBuilderVisitor> visitors, IProgressMonitor monitor) {
-        for (PyDevBuilderVisitor visitor : visitors) {
+    private void notifyVisitingWillStart(List visitors, IProgressMonitor monitor) {
+        for (Iterator iter = visitors.iterator(); iter.hasNext();) {
+            PyDevBuilderVisitor visitor = (PyDevBuilderVisitor) iter.next();
             visitor.visitingWillStart(monitor);
         }
     }
 
-    private void notifyVisitingEnded(List<PyDevBuilderVisitor> visitors, IProgressMonitor monitor) {
-        for (PyDevBuilderVisitor visitor : visitors) {
+    private void notifyVisitingEnded(List visitors, IProgressMonitor monitor) {
+        for (Iterator iter = visitors.iterator(); iter.hasNext();) {
+            PyDevBuilderVisitor visitor = (PyDevBuilderVisitor) iter.next();
             visitor.visitingEnded(monitor);
         }
     }
@@ -191,7 +192,7 @@
      * @param member the resource we are adding
      * @param nature the nature associated to the resource
      */
-    private void addToResourcesToParse(List<IResource> resourcesToParse, IResource member, PythonNature nature) {
+    private void addToResourcesToParse(List resourcesToParse, IResource member, PythonNature nature) {
         //analyze it only if it is a valid source file 
         String fileExtension = member.getFileExtension();
         if (fileExtension != null && PythonPathHelper.isValidSourceFile("."+fileExtension)) {
@@ -229,8 +230,8 @@
             }
             IDocument doc = REF.getDocFromResource(r);
             
-            HashMap<String, Object> memo = new HashMap<String, Object>();
-            memo.put(PyDevBuilderVisitor.IS_FULL_BUILD, true); //mark it as full build
+            HashMap memo = new HashMap();
+            memo.put(PyDevBuilderVisitor.IS_FULL_BUILD, new Boolean(true)); //mark it as full build
             
             if(doc != null){ //might be out of synch
                 for (Iterator it = visitors.iterator(); it.hasNext() && monitor.isCanceled() == false;) {
Index: src/org/python/pydev/builder/PyDevBuilderVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java,v
retrieving revision 1.35
diff -u -r1.35 PyDevBuilderVisitor.java
--- org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java	17 Apr 2006 16:25:02 -0000	1.35
+++ org.python.pydev/src/org/python/pydev/builder/PyDevBuilderVisitor.java	2 Jun 2006 20:41:34 -0000
@@ -31,7 +31,7 @@
  * 
  * @author Fabio Zadrozny
  */
-public abstract class PyDevBuilderVisitor implements Comparable<PyDevBuilderVisitor>{
+public abstract class PyDevBuilderVisitor implements Comparable{
 
     public static final int MAX_TO_VISIT_INFINITE = -1;
 
@@ -66,9 +66,13 @@
 	 * Compares them by priority (they are ordered before visiting by priority, so, this can
 	 * be useful if some visitor needs to run only after some other visitor was executed).
 	 */
-    public int compareTo(PyDevBuilderVisitor o) {
+    public int compareTo(Object o) {
     	int priority = getPriority();
-    	int otherPriority = o.getPriority();
+        if (! (o instanceof PyDevBuilderVisitor))
+            throw new ClassCastException();
+        
+        PyDevBuilderVisitor v = (PyDevBuilderVisitor) o;
+    	int otherPriority = v.getPriority();
     	if(priority < otherPriority){
     		return -1;
     	}
@@ -95,7 +99,7 @@
      * In this way, we can keep from having to recreate some info (such as the ast) each time over and over
      * for each visitor. 
      */
-    public HashMap<String, Object> memo;
[...8672 lines suppressed...]
                 "";
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser7() {
@@ -287,7 +286,7 @@
         "    False, True = 0, 1\n"+
         "\n"+
         "\n";
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser8() {
@@ -297,7 +296,7 @@
 "\n"+
 "\n"+
 "\n";
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser2() {
@@ -307,25 +306,25 @@
         "for foo in sorted(val for val in td.itervalues() if val[0] == 's'):    \n"+
         "    print foo                                                          \n";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser3() {
         String s = "print (x for x in y)";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
 
     public void testParser4() {
         String s = "print sum(x for x in y)";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser5() {
         String s = "print sum(x.b for x in y)";
         
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     public void testParser6() {
@@ -336,7 +335,7 @@
         "        if match: return match\n"+
         "\n"+
         "\n";        
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     
@@ -348,7 +347,7 @@
         "\n"+
         "\n"+
         "\n";        
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
     /**
@@ -360,10 +359,10 @@
     	String s = "" +
     	"l = [ \"encode\", \"decode\" ] \n"+
     	"\n";        
-    	SimpleNode node = parseLegalDocStr(s);
-    	List<ASTEntry> strs = SequencialASTIteratorVisitor.create(node).getAsList(new Class[]{Str.class});
-    	assertEquals(7, strs.get(0).node.beginColumn);
-    	assertEquals(17, strs.get(1).node.beginColumn);
+    	SimpleNode node = parseLegalDocStr(s, new Object[] {});
+    	List strs = SequencialASTIteratorVisitor.create(node).getAsList(new Class[]{Str.class});
+    	assertEquals(7, ((ASTEntry)strs.get(0)).node.beginColumn);
+    	assertEquals(17, ((ASTEntry)strs.get(1)).node.beginColumn);
     }
     
     
@@ -377,7 +376,7 @@
         "    pass\n"+        
         "\n"+        
         "\n";        
-        parseLegalDocStr(s);
+        parseLegalDocStr(s, new Object[] {});
     }
     
 }
Index: tests/org/python/pydev/parser/PyParserTestBase.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java,v
retrieving revision 1.9
diff -u -r1.9 PyParserTestBase.java
--- org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java	6 Apr 2006 16:16:41 -0000	1.9
+++ org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTestBase.java	2 Jun 2006 20:42:24 -0000
@@ -33,7 +33,7 @@
 	 * @param s
 	 * @return 
 	 */
-	protected static SimpleNode parseLegalDocStr(String s, Object ... additionalErrInfo) {
+	protected static SimpleNode parseLegalDocStr(String s, Object [] additionalErrInfo) {
 	    Document doc = new Document(s);
 	    return parseLegalDoc(doc, additionalErrInfo, new PyParser());
 	}
@@ -43,7 +43,7 @@
     }
 	protected ParseException parseILegalDoc(IDocument doc) {
 	    parser.setDocument(doc, false);
-	    Object[] objects = parser.reparseDocument((IPythonNature)null);
+	    Object[] objects = parser.reparseDocument((IPythonNature)null, new Object[] {});
 	    Object err = objects[1];
 	    if(err == null){
 	        fail("Expected a ParseException and the doc was successfully parsed.");
@@ -60,7 +60,7 @@
 	 */
 	protected static SimpleNode parseLegalDoc(IDocument doc, Object[] additionalErrInfo, PyParser parser) {
 	    parser.setDocument(doc, false);
-	    Object[] objects = parser.reparseDocument((IPythonNature)null);
+	    Object[] objects = parser.reparseDocument((IPythonNature)null, new Object[] {});
 	    Object err = objects[1];
 	    if(err != null){
 	        String s = "";
Index: tests/org/python/pydev/parser/profile/ParseBigFile.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java,v
retrieving revision 1.4
diff -u -r1.4 ParseBigFile.java
--- org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java	28 Apr 2006 13:43:41 -0000	1.4
+++ org.python.pydev.parser/tests/org/python/pydev/parser/profile/ParseBigFile.java	2 Jun 2006 20:42:25 -0000
@@ -56,15 +56,15 @@
         String loc = TestDependent.TEST_PYDEV_PARSER_PLUGIN_LOC+"/tests/pysrc/data_string.py";
         String s = REF.getFileContents(new File(loc));
         for (int i = 0; i < 5; i++) {
-        	@SuppressWarnings("unused") long curr = System.currentTimeMillis();
-        	SimpleNode node = parseLegalDocStr(s);
+        	long curr = System.currentTimeMillis();
+        	SimpleNode node = parseLegalDocStr(s, new Object[] {});
         	
         	PyParser.USE_FAST_STREAM = true;
         	//uncomment line below to see the time for parsing
         	//System.out.println(StringUtils.format("Took: %s secs", (System.currentTimeMillis()-curr)/1000.0));
         	SequencialASTIteratorVisitor visitor = SequencialASTIteratorVisitor.create(node);
         	
-        	ASTEntry entry = visitor.getAsList(Str.class).get(0);
+        	ASTEntry entry = (ASTEntry) visitor.getAsList(Str.class).get(0);
         	String s0 = ((Str)entry.node).s;
         	assertEquals(42, entry.node.beginLine);
         	assertEquals(8, entry.node.beginColumn);
Index: tests/org/python/pydev/parser/visitors/NodeUtilsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java,v
retrieving revision 1.1
diff -u -r1.1 NodeUtilsTest.java
--- org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java	26 Oct 2005 14:56:32 -0000	1.1
+++ org.python.pydev.parser/tests/org/python/pydev/parser/visitors/NodeUtilsTest.java	2 Jun 2006 20:42:25 -0000
@@ -14,29 +14,29 @@
 
 	public void testFullRep() throws Exception {
         SequencialASTIteratorVisitor visitor = SequencialASTIteratorVisitor.create(parseLegalDocStr(
-        		"print a.b.c().d.__class__"));
+        		"print a.b.c().d.__class__", new Object[] {}));
         
-        Iterator<ASTEntry> iterator = visitor.getIterator();
+        Iterator iterator = visitor.getIterator();
 		iterator.next(); //Module
 		iterator.next(); //Print
-		ASTEntry entry = iterator.next(); //Attribute
+		ASTEntry entry = (ASTEntry) iterator.next(); //Attribute
 		assertEquals("a.b.c", NodeUtils.getFullRepresentationString(entry.node));
 
 
 		visitor = SequencialASTIteratorVisitor.create(parseLegalDocStr(
-			"'r.a.s.b'.join('a')"));
+			"'r.a.s.b'.join('a')", new Object[] {}));
 		iterator = visitor.getIterator();
 		iterator.next(); //Module
 		iterator.next(); //Expr
-		entry = iterator.next(); //Attribute
+		entry = (ASTEntry) iterator.next(); //Attribute
 		assertEquals("str.join", NodeUtils.getFullRepresentationString(entry.node));
 		
 		visitor = SequencialASTIteratorVisitor.create(parseLegalDocStr(
-			"print aa.bbb.cccc[comp.id].hasSimulate"));
+			"print aa.bbb.cccc[comp.id].hasSimulate", new Object[] {}));
 		iterator = visitor.getIterator();
 		iterator.next(); //Module
 		iterator.next(); //Expr
-		entry = iterator.next(); //Attribute
+		entry = (ASTEntry) iterator.next(); //Attribute
 		assertEquals("aa.bbb.cccc", NodeUtils.getFullRepresentationString(entry.node));
 	}
 }

eclipse-pydev-noretroweaver.patch:
 org.python.pydev.ast/META-INF/MANIFEST.MF       |    3 +--
 org.python.pydev.ast/build.properties           |    3 +--
 org.python.pydev.core/META-INF/MANIFEST.MF      |    1 -
 org.python.pydev.core/build.properties          |    1 -
 org.python.pydev.debug/META-INF/MANIFEST.MF     |    3 +--
 org.python.pydev.debug/build.properties         |    3 +--
 org.python.pydev.jython/META-INF/MANIFEST.MF    |    1 -
 org.python.pydev.jython/build.properties        |    1 -
 org.python.pydev.parser/META-INF/MANIFEST.MF    |    3 +--
 org.python.pydev.parser/build.properties        |    3 +--
 org.python.pydev.templates/META-INF/MANIFEST.MF |    1 -
 org.python.pydev.templates/build.properties     |    3 +--
 org.python.pydev/META-INF/MANIFEST.MF           |    3 +--
 org.python.pydev/build.properties               |    1 -
 14 files changed, 8 insertions(+), 22 deletions(-)

--- NEW FILE eclipse-pydev-noretroweaver.patch ---
--- org.python.pydev/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev/META-INF/MANIFEST.MF	2006-05-26 14:03:28.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Pydev - Python Development Environment
 Bundle-SymbolicName: org.python.pydev; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: pydev.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: pydev.jar
 Bundle-Activator: org.python.pydev.plugin.PydevPlugin
 Bundle-Vendor: Fabio Zadrozny / Aleks Totic
 Bundle-Localization: plugin
--- org.python.pydev/build.properties	2006-02-14 10:29:35.000000000 -0500
+++ org.python.pydev/build.properties	2006-05-26 14:04:31.000000000 -0400
@@ -9,7 +9,6 @@
                eclipse32.gif,\
                pydev.gif,\
                Pydev.gif,\
-               retroweaver-rt.jar,\
                shiftone-cache.jar
 jars.compile.order = pydev.jar
 source.pydev.jar = src/
--- org.python.pydev.ast/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.ast/META-INF/MANIFEST.MF	2006-05-26 14:05:18.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Ast Plug-in
 Bundle-SymbolicName: org.python.pydev.ast; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: ast.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: ast.jar
 Bundle-Activator: org.python.pydev.ast.AstPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
--- org.python.pydev.core/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.core/META-INF/MANIFEST.MF	2006-05-26 14:06:27.000000000 -0400
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.python.pydev.core; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-ClassPath: core.jar,
- retroweaver-rt.jar,
  commons-codec.jar
 Bundle-Activator: org.python.pydev.core.CorePlugin
 Bundle-Vendor: Fabio Zadrozny
--- org.python.pydev.core/build.properties	2005-11-17 09:53:44.000000000 -0500
+++ org.python.pydev.core/build.properties	2006-05-26 14:07:16.000000000 -0400
@@ -3,7 +3,6 @@
 bin.includes = plugin.xml,\
                META-INF/,\
                core.jar,\
-               retroweaver-rt.jar,\
                commons-codec.jar
 jars.extra.classpath = commons-codec.jar
 jars.compile.order = core.jar
--- org.python.pydev.debug/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.debug/META-INF/MANIFEST.MF	2006-05-26 14:07:56.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Pydev debug
 Bundle-SymbolicName: org.python.pydev.debug; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: pydev-debug.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: pydev-debug.jar
 Bundle-Activator: org.python.pydev.debug.core.PydevDebugPlugin
 Bundle-Vendor: Fabio Zadrozny / Aleks Totic
 Bundle-Localization: plugin
--- org.python.pydev.debug/build.properties	2005-09-03 11:59:30.000000000 -0400
+++ org.python.pydev.debug/build.properties	2006-05-26 14:08:53.000000000 -0400
@@ -3,8 +3,7 @@
                CVS/,\
                META-INF/,\
                icons/,\
-               pydev-debug.jar,\
-               retroweaver-rt.jar
+               pydev-debug.jar
 jars.compile.order = pydev-debug.jar
 source.pydev-debug.jar = src/
 output.pydev-debug.jar = bin/
--- org.python.pydev.jython/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.jython/META-INF/MANIFEST.MF	2006-05-26 14:09:28.000000000 -0400
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.python.pydev.jython; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-ClassPath: pydev-jython.jar,
- retroweaver-rt.jar,
  jython.jar
 Bundle-Activator: org.python.pydev.jython.JythonPlugin
 Bundle-Vendor: Fabio Zadrozny
--- org.python.pydev.jython/build.properties	2006-04-06 12:12:37.000000000 -0400
+++ org.python.pydev.jython/build.properties	2006-05-26 14:11:20.000000000 -0400
@@ -2,7 +2,6 @@
                pydev-jython.jar,\
                jython.jar,\
                jysrc/,\
-               retroweaver-rt.jar,\
                plugin.xml,\
                Lib/
 jars.compile.order = pydev-jython.jar
--- org.python.pydev.parser/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.parser/META-INF/MANIFEST.MF	2006-05-26 14:12:24.000000000 -0400
@@ -3,8 +3,7 @@
 Bundle-Name: Parser Plug-in
 Bundle-SymbolicName: org.python.pydev.parser; singleton:=true
 Bundle-Version: 0.9.7.1
-Bundle-ClassPath: parser.jar,
- retroweaver-rt.jar
+Bundle-ClassPath: parser.jar
 Bundle-Activator: org.python.pydev.parser.ParserPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
--- org.python.pydev.parser/build.properties	2005-09-03 11:59:02.000000000 -0400
+++ org.python.pydev.parser/build.properties	2006-05-26 14:13:05.000000000 -0400
@@ -2,5 +2,4 @@
 output.parser.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               parser.jar,\
-               retroweaver-rt.jar
+               parser.jar
--- org.python.pydev.templates/META-INF/MANIFEST.MF	2006-05-26 13:49:24.000000000 -0400
+++ org.python.pydev.templates/META-INF/MANIFEST.MF	2006-05-26 14:13:47.000000000 -0400
@@ -10,4 +10,3 @@
  org.eclipse.core.runtime,
  org.python.pydev
 Eclipse-AutoStart: true
-Bundle-ClassPath: retroweaver-rt.jar
--- org.python.pydev.templates/build.properties	2005-09-03 14:00:51.000000000 -0400
+++ org.python.pydev.templates/build.properties	2006-05-26 14:14:28.000000000 -0400
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
                plugin.xml,\
-               icons/,\
-               retroweaver-rt.jar
+               icons/
 jars.compile.order = 

--- org.python.pydev.ast/build.properties	2005-09-03 11:59:14.000000000 -0400
+++ org.python.pydev.ast/build.properties	2006-06-02 17:46:41.000000000 -0400
@@ -1,7 +1,6 @@
 bin.includes = plugin.xml,\
                ast.jar,\
-               META-INF/,\
-               retroweaver-rt.jar
+               META-INF/
 jars.compile.order = ast.jar
 source.ast.jar = src/
 output.ast.jar = bin/



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:36:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:36:11 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.31,1.32
Message-ID: <200606051936.k55JaBQ6007716@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7568

Modified Files:
	desktop-backgrounds.spec 
Log Message:
remove branded images



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- desktop-backgrounds.spec	19 Dec 2005 17:59:54 -0000	1.31
+++ desktop-backgrounds.spec	5 Jun 2006 19:36:06 -0000	1.32
@@ -3,16 +3,14 @@
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 31
+Release: 32
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
 Source2: Propaganda-1.0.0.tar.gz
 Source3: README.Propaganda
-## Source4: beta-placeholder.png
-Source4: default-background.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArchitectures: noarch
+BuildArch: noarch
 
 %description
 The desktop-backgrounds package contains artwork intended 
@@ -51,8 +49,6 @@
 # add propaganda
 (cd tiles && tar zxf %{SOURCE2})
 
-cp -f %{SOURCE4} images/default.png
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,7 +84,6 @@
 %{_datadir}/backgrounds/images/stone_bird.jpg
 %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 %{_datadir}/backgrounds/images/earth_from_space.jpg
-%{_datadir}/backgrounds/images/default.png
 %dir %{_datadir}/gnome-background-properties
 %{_datadir}/gnome-background-properties/desktop-backgrounds-basic.xml
 
@@ -110,6 +105,9 @@
 #exclude %{_datadir}/backgrounds/images/default.png
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redaht.com> 2.0-32
+- Move the default background to fedora-logos
+
 * Mon Dec 19 2005 Ray Strode <rstrode at redhat.com> 2.0-31
 - replace default fedora background with new one
   from Diana Fong



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:40:16 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec, 1.73,
	1.74 sources, 1.23, 1.24
Message-ID: <200606051940.k55JeGja008281@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8241

Modified Files:
	gnome-screensaver.spec sources 
Log Message:
move branded images to fedora-logos



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-screensaver.spec	17 May 2006 18:07:58 -0000	1.73
+++ gnome-screensaver.spec	5 Jun 2006 19:40:14 -0000	1.74
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.2
-Release: 1 
+Release: 3 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -94,7 +94,7 @@
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 # install floaters lock dialog
-cp lock-dialog-fedoralogo-floaters.* $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
+cp lock-dialog-fedoralogo-floaters.{gtkrc,glade} $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
 
 install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
 
@@ -164,6 +164,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-3
+- Move the branded lock dialog background to fedora-logos
+
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 May 2006 18:07:58 -0000	1.23
+++ sources	5 Jun 2006 19:40:14 -0000	1.24
@@ -1,2 +1,2 @@
-22c05640f8c0999cb622d5cacc693c89  lock-dialog-fedoralogo-floaters.tar.gz
 52bb4698f2362ffd0b92f725ae9a890d  gnome-screensaver-2.15.2.tar.bz2
+b8d23b049231d57dec24cad4cfdeee5d  lock-dialog-fedoralogo-floaters.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:46:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:46:59 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.32,1.33
Message-ID: <200606051946.k55JkxHR022957@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21879

Modified Files:
	desktop-backgrounds.spec 
Log Message:
fix file lists



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- desktop-backgrounds.spec	5 Jun 2006 19:36:06 -0000	1.32
+++ desktop-backgrounds.spec	5 Jun 2006 19:46:56 -0000	1.33
@@ -79,6 +79,7 @@
 %dir %{_datadir}/backgrounds/images
 %{_datadir}/backgrounds/tiles/*.png
 %{_datadir}/backgrounds/tiles/*jpg
+%{_datadir}/backgrounds/images/default.png
 %{_datadir}/backgrounds/images/tiny_blast_of_red.jpg
 %{_datadir}/backgrounds/images/ladybugs.jpg
 %{_datadir}/backgrounds/images/stone_bird.jpg



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:52:41 -0400
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.161,1.162
Message-ID: <200606051952.k55JqffY027213@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27191

Modified Files:
	gnbd-kernel.spec 
Log Message:
New kernel.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gnbd-kernel.spec	2 Jun 2006 20:14:01 -0000	1.161
+++ gnbd-kernel.spec	5 Jun 2006 19:52:38 -0000	1.162
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 0
 %define buildxen 1
-%define kernel_version 2.6.16-1.2241_FC6
+%define kernel_version 2.6.16-1.2244_FC6
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.16
-Release: 2.0
+Release: 2.1
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:56:33 -0400
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.162,1.163
Message-ID: <200606051956.k55JuXY3028689@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28660

Modified Files:
	gnbd-kernel.spec 
Log Message:
New kernel.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnbd-kernel.spec	5 Jun 2006 19:52:38 -0000	1.162
+++ gnbd-kernel.spec	5 Jun 2006 19:56:31 -0000	1.163
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 0
 %define buildxen 1
-%define kernel_version 2.6.16-1.2244_FC6
+%define kernel_version 2.6.16-1.2245_FC6
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.16
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Mon Jun  5 19:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 15:58:43 -0400
Subject: rpms/rhgb/devel rhgb.spec,1.51,1.52
Message-ID: <200606051958.k55JwhAD029634@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29557

Modified Files:
	rhgb.spec 
Log Message:
fix requires



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- rhgb.spec	10 May 2006 12:53:13 -0000	1.51
+++ rhgb.spec	5 Jun 2006 19:58:40 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.3
-Release: 2
+Release: 3
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,7 +14,7 @@
 BuildRequires: gettext
 BuildRequires: libxf86config-devel >= 1.0.0-3
 Requires: initscripts >= 7.22-1
-Requires: fedora-logos >= 1.1.40-1
+Requires: system-logos >= 1.1.40-1
 
 Patch0: rhgb-0.16.2-reap-child.patch
 Patch1: rhgb-0.16.2-init-utf8.patch
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-3
+- Require system-logos, not fedora-logos
+
 * Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:03:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:03:55 -0400
Subject: rpms/rhgb/devel rhgb.spec,1.52,1.53
Message-ID: <200606052003.k55K3tiE030415@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30359

Modified Files:
	rhgb.spec 
Log Message:
fix requires



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- rhgb.spec	5 Jun 2006 19:58:40 -0000	1.52
+++ rhgb.spec	5 Jun 2006 20:03:31 -0000	1.53
@@ -14,7 +14,7 @@
 BuildRequires: gettext
 BuildRequires: libxf86config-devel >= 1.0.0-3
 Requires: initscripts >= 7.22-1
-Requires: system-logos >= 1.1.40-1
+Requires: system-logos
 
 Patch0: rhgb-0.16.2-reap-child.patch
 Patch1: rhgb-0.16.2-init-utf8.patch



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:05:24 -0400
Subject: rpms/gdm/devel gdm.spec,1.155,1.156
Message-ID: <200606052005.k55K5OsY030485@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30445

Modified Files:
	gdm.spec 
Log Message:
fix requires



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gdm.spec	23 May 2006 20:03:01 -0000	1.155
+++ gdm.spec	5 Jun 2006 20:05:05 -0000	1.156
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.3
-Release: 3
+Release: 4
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -60,7 +60,7 @@
 Requires: /etc/pam.d/system-auth
 Requires: usermode
 Requires: /sbin/nologin
-Requires: fedora-logos >= 0:1.1.38-1
+Requires: system-logos
 Requires: redhat-artwork >= 0:0.234-1
 Requires: /usr/share/desktop-menu-patches/gnome-gdmsetup.desktop
 Requires: xorg-x11-server-utils
@@ -313,6 +313,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-4
+- Require system-logos, not fedora-logos
+
 * Tue May 23 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.3-3
 - Support xdm -nodaemon option (bug 192461)
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:08:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:08:31 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.74,1.75
Message-ID: <200606052008.k55K8VNu030696@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30627

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix requires



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-screensaver.spec	5 Jun 2006 19:40:14 -0000	1.74
+++ gnome-screensaver.spec	5 Jun 2006 20:08:05 -0000	1.75
@@ -6,14 +6,13 @@
 %define libxml2_version        2.6.0
 %define gconf2_version         2.6.1
 %define redhat_menus_version   5.0.1
-%define system_logos_version   1.1.37
 %define gnome_menus_version    2.11.1
 %define libexif_version        0.6.12
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.2
-Release: 3 
+Release: 4 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -51,7 +50,7 @@
 Requires: libxml2 >= %{libxml2_version}
 Requires: GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
-Requires: fedora-logos >= %{system_logos_version}
+Requires: system-logos
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
@@ -164,8 +163,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
-* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-3
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-4
 - Move the branded lock dialog background to fedora-logos
+- Require system-logos, not fedora-logos
 
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-1
 - Update to 2.15.2



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:11:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:11:51 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.67,1.68
Message-ID: <200606052011.k55KBpg2031092@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31064

Modified Files:
	gnome-session.spec 
Log Message:
fix requires



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-session.spec	10 May 2006 17:52:34 -0000	1.67
+++ gnome-session.spec	5 Jun 2006 20:11:47 -0000	1.68
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.1
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -27,7 +27,7 @@
 BuildRequires: perl-XML-Parser >= 2.31-16
 
 Requires: redhat-artwork >= 0.20
-Requires: fedora-logos >= 1.1.37 
+Requires: system-logos
 # required to get gconf-sanity-check-2 in the right place
 Requires: GConf2 >= %{gconf2_version}
 # Needed for gnome-settings-daemon
@@ -164,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
+- Require system-logos, not fedora-logos
+
 * Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
 - Update to 2.15.1
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:28:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:28:21 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.62,
	1.63 xorg-x11-server-1.0.1-fpic-libxf86config.patch, 1.1, NONE
Message-ID: <200606052028.k55KSLKd018599@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18464

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.0.1-fpic-libxf86config.patch 
Log Message:
- Drop the libxf86config -fPIC patch, just build the whole thing with
  --with-pic instead.  Add void and evdev to the required driver list for
  upcoming autoconfig magic.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-x11-server.spec	25 May 2006 18:42:48 -0000	1.62
+++ xorg-x11-server.spec	5 Jun 2006 20:28:19 -0000	1.63
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   2
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -20,8 +20,6 @@
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=6010
 Patch6:    xserver-1.0.1-randr-sdk.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
-Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -113,19 +111,10 @@
 # by xorg-x11-fonts-base
 Requires: xorg-x11-fonts-base
 # NOTE: Require some basic drivers for minimal configuration. (#173060)
+# We _should_ install every driver, but OLPC wants different (#191781),
+# which is quite lame and wants an better solution.
 Requires: xorg-x11-drv-mouse xorg-x11-drv-keyboard xorg-x11-drv-vesa
-# NOTE: Require the driver meta-package to ensure that all drivers are always
-# installed all of the time.  Why?  To guarantee that the drivers for your
-# video and input devices are always installed all of the time, and ensure
-# that OS installs and upgrades "work" without ending up with "oops, my
-# driver isn't installed".  Drivers have always been "all installed" in
-# every previous OS release, and this one is no different.  Drivers are split
-# up into individual packages to facilitate making easy individual driver
-# updates, NOT for allowing people to uninstall drivers to save $0.01 of
-# hard disk space.  Why?  Because there is no "good" reason not to do so,
-# necause 1Gb of hard disk space costs about $0.75 right now for starters.
-# *** UPDATE ***
-# This is disabled now for OLPC for bug #191781.  <sigh>
+Requires: xorg-x11-drv-void xorg-x11-drv-evdev
 #Requires: xorg-x11-drivers >= 0.99.2-4
 
 # NOTE: We use implementation non-specific "xkbdata" here, to make it easy
@@ -258,11 +247,8 @@
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .init-origins-fix
-#%patch1 -p0 -b .fbmmx-fix-for-non-SSE-cpu
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
-#%patch4 -p0 -b .composite-fastpath-fdo4320
 %patch6 -p1 -b .randrsdk
-%patch7 -p1 -b .xf86configfpic
 
 %patch100 -p0 -b .spiffiffity
 
@@ -280,17 +266,13 @@
 %configure %{xservers} \
 	--disable-xprint \
 	--disable-static \
+	--with-pic \
 	--enable-composite \
 	--enable-xtrap \
 	--enable-xcsecurity \
 	--enable-xevie \
 	--enable-kdrive \
 	--enable-xephyr \
-%if %{with_dri}
-	--enable-dri \
-	--with-mesa-source=%{_datadir}/mesa/source \
-	--with-dri-driver-path=%{drimoduledir} \
-%endif
 	--with-module-dir=%{moduledir} \
 	--with-os-name="Fedora Core 5" \
 	--with-os-vendor="Red Hat, Inc." \
@@ -298,7 +280,12 @@
 	--with-rgb-path=%{_datadir}/X11/rgb \
 	--disable-xorgcfg \
 	--enable-install-libxf86config \
-	--with-fontdir=%(pkg-config --variable=fontdir fontutil)
+	--with-fontdir=%(pkg-config --variable=fontdir fontutil) \
+%if %{with_dri}
+	--enable-dri \
+	--with-mesa-source=%{_datadir}/mesa/source \
+	--with-dri-driver-path=%{drimoduledir} \
+%endif
 
 make %{?_smp_mflags}
 
@@ -569,6 +556,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 05 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
+- Drop the libxf86config -fPIC patch, just build the whole thing with
+  --with-pic instead.  Add void and evdev to the required driver list for
+  upcoming autoconfig magic.
+
 * Thu May 25 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
 - Add "Requires: xorg-x11-proto-devel >= 7.1-1" to sdk for numerous (52) bug
   reports of drivers failing to build with mock.


--- xorg-x11-server-1.0.1-fpic-libxf86config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:31:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:31:55 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.28, 1.29 sources,
	1.35, 1.36 system-config-kickstart.spec, 1.39, 1.40
Message-ID: <200606052031.k55KVtnV019441@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-kickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19383

Modified Files:
	.cvsignore sources system-config-kickstart.spec 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	5 May 2006 19:28:43 -0000	1.28
+++ .cvsignore	5 Jun 2006 20:31:23 -0000	1.29
@@ -21,3 +21,4 @@
 system-config-kickstart-2.6.8.tar.bz2
 system-config-kickstart-2.6.9.tar.bz2
 system-config-kickstart-2.6.10.tar.bz2
+system-config-kickstart-2.6.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	5 May 2006 19:28:43 -0000	1.35
+++ sources	5 Jun 2006 20:31:39 -0000	1.36
@@ -1 +1 @@
-6f182cd0daeaea144c9e5da3171b3b1d  system-config-kickstart-2.6.10.tar.bz2
+567eb8b5de741db55a47cc96cba36a21  system-config-kickstart-2.6.11.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-kickstart.spec	5 May 2006 19:28:43 -0000	1.39
+++ system-config-kickstart.spec	5 Jun 2006 20:31:39 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.10
+Version: 2.6.11
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -78,6 +78,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Mon Jun 05 2006 Chris Lumens <clumens at redhat.com> 2.6.11-1
+- Write out a mount point for swap and raid partitions (#193262).
+- Fix RAID member list printing.
+
 * Fri May 05 2006 Chris Lumens <clumens at redhat.com> 2.6.10-1
 - Fix unencrypted root password traceback (#190487).
 - Try harder to get a base repo enabled (#190508).



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:39:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:39:00 -0400
Subject: rpms/gtk2/devel .cvsignore, 1.53, 1.54 gtk2.spec, 1.142,
	1.143 sources, 1.56, 1.57
Message-ID: <200606052039.k55Kd0MO020009@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19964

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	17 May 2006 02:12:51 -0000	1.53
+++ .cvsignore	5 Jun 2006 20:38:57 -0000	1.54
@@ -36,3 +36,4 @@
 gtk+-2.8.17.tar.bz2
 gtk+-2.9.0.tar.bz2
 gtk+-2.9.1.tar.bz2
+gtk+-2.9.2.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gtk2.spec	2 Jun 2006 04:04:26 -0000	1.142
+++ gtk2.spec	5 Jun 2006 20:38:57 -0000	1.143
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.9.1
+%define base_version 2.9.2
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -267,6 +267,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.2-1
+- Update to 2.9.2
+
 * Fri Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	17 May 2006 02:12:51 -0000	1.56
+++ sources	5 Jun 2006 20:38:57 -0000	1.57
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-1bc1ae050239bab9b525e143c07d1e8f  gtk+-2.9.1.tar.bz2
+c63e7d0cf7c4e983206c3088a0fb8862  gtk+-2.9.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:41:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:41:28 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.55,
	1.56 sources, 1.68, 1.69 system-config-securitylevel.spec,
	1.79, 1.80
Message-ID: <200606052041.k55KfSBn020833@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20768

Modified Files:
	.cvsignore sources system-config-securitylevel.spec 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	2 May 2006 17:06:58 -0000	1.55
+++ .cvsignore	5 Jun 2006 20:41:25 -0000	1.56
@@ -43,3 +43,4 @@
 system-config-securitylevel-1.6.17.tar.bz2
 system-config-securitylevel-1.6.18.tar.bz2
 system-config-securitylevel-1.6.19.tar.bz2
+system-config-securitylevel-1.6.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	11 May 2006 14:52:06 -0000	1.68
+++ sources	5 Jun 2006 20:41:25 -0000	1.69
@@ -1 +1 @@
-1d37c31cb428fed747c72f6982eb4256  system-config-securitylevel-1.6.19.tar.bz2
+8b0db7eea079338b39c20b87c117b3cf  system-config-securitylevel-1.6.20.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- system-config-securitylevel.spec	11 May 2006 14:52:06 -0000	1.79
+++ system-config-securitylevel.spec	5 Jun 2006 20:41:25 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.19
-Release: 2
+Version: 1.6.20
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -99,6 +99,10 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Mon Jun 05 2006 Chris Lumens <clumens at redhat.com> 1.6.20-1
+- Be more careful when determining if something is a range or service with
+  a dash in it (#192933).
+
 * Thu May 11 2006 Chris Lumens <clumens at redhat.com> 1.6.19-2
 - Require iptables-ipv6.
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:52:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:52:05 -0400
Subject: rpms/grub/devel grub.spec,1.41,1.42
Message-ID: <200606052052.k55Kq5M1016353@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16340

Modified Files:
	grub.spec 
Log Message:
Added correct buildrequires



Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- grub.spec	27 May 2006 17:22:08 -0000	1.41
+++ grub.spec	5 Jun 2006 20:52:02 -0000	1.42
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 6
+Release: 7
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -103,7 +103,7 @@
 
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
-BuildRequires: automake
+BuildRequires: automake /usr/lib/crt1.o
 PreReq: /sbin/install-info
 Requires: mktemp
 Requires: /usr/bin/cmp
@@ -227,6 +227,9 @@
 %{_datadir}/grub
 
 %changelog
+* Mon Jun  5 2006 Jesse Keating <jkeating at redhat.com> - 0.97-7
+- Added BuildRequires on a 32bit library
+
 * Sat May 27 2006 Peter Jones <pjones at redhat.com> - 0.97-6
 - Fix mactel keyboard problems, patch from Juergen Keil, forwarded by Linus.
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:53:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:53:21 -0400
Subject: rpms/spamassassin/devel .cvsignore, 1.29, 1.30 sources, 1.28,
	1.29 spamassassin.spec, 1.65, 1.66
Message-ID: <200606052053.k55KrLwk016442@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16426

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
CVE-2006-2447



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	26 May 2006 17:44:21 -0000	1.29
+++ .cvsignore	5 Jun 2006 20:53:18 -0000	1.30
@@ -1 +1 @@
-Mail-SpamAssassin-3.1.2.tar.bz2
+Mail-SpamAssassin-3.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 May 2006 17:44:21 -0000	1.28
+++ sources	5 Jun 2006 20:53:18 -0000	1.29
@@ -1 +1 @@
-e1fb14def1265d6d7351ba27b5940da2  Mail-SpamAssassin-3.1.2.tar.bz2
+5f049f0b9fc63585a85593a3c68409bb  Mail-SpamAssassin-3.1.3.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- spamassassin.spec	26 May 2006 17:44:21 -0000	1.65
+++ spamassassin.spec	5 Jun 2006 20:53:18 -0000	1.66
@@ -5,7 +5,7 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.1.2
+Version: 3.1.3
 Release: 1.fc6
 License: Apache License
 Group: Applications/Internet
@@ -154,6 +154,9 @@
 exit 0
 
 %changelog
+* Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-1
+- CVE-2006-2447
+
 * Fri May 26 2006 Warren Togami <wtogami at redhat.com> - 3.1.2-1
 - 3.1.2 bug fix release
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:56:33 -0400
Subject: rpms/spamassassin/FC-5 .cvsignore, 1.29, 1.30 sources, 1.28,
	1.29 spamassassin.spec, 1.66, 1.67
Message-ID: <200606052056.k55KuXJb016632@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16609

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
CVE-2006-2447



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	26 May 2006 17:49:04 -0000	1.29
+++ .cvsignore	5 Jun 2006 20:56:31 -0000	1.30
@@ -1 +1 @@
-Mail-SpamAssassin-3.1.2.tar.bz2
+Mail-SpamAssassin-3.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 May 2006 17:49:04 -0000	1.28
+++ sources	5 Jun 2006 20:56:31 -0000	1.29
@@ -1 +1 @@
-e1fb14def1265d6d7351ba27b5940da2  Mail-SpamAssassin-3.1.2.tar.bz2
+5f049f0b9fc63585a85593a3c68409bb  Mail-SpamAssassin-3.1.3.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-5/spamassassin.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- spamassassin.spec	26 May 2006 17:49:04 -0000	1.66
+++ spamassassin.spec	5 Jun 2006 20:56:31 -0000	1.67
@@ -5,7 +5,7 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.1.2
+Version: 3.1.3
 Release: 1.fc5
 License: Apache License
 Group: Applications/Internet
@@ -154,6 +154,9 @@
 exit 0
 
 %changelog
+* Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-1
+- CVE-2006-2447
+
 * Fri May 26 2006 Warren Togami <wtogami at redhat.com> - 3.1.2-1
 - 3.1.2 bug fix release
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 20:58:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 16:58:57 -0400
Subject: rpms/spamassassin/FC-4 .cvsignore, 1.24, 1.25 sources, 1.23,
	1.24 spamassassin.spec, 1.52, 1.53
Message-ID: <200606052058.k55KwvRQ016954@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16937

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
CVE-2006-2447



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	30 Nov 2005 18:54:13 -0000	1.24
+++ .cvsignore	5 Jun 2006 20:58:55 -0000	1.25
@@ -1 +1 @@
-Mail-SpamAssassin-3.0.5.tar.bz2
+Mail-SpamAssassin-3.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Nov 2005 18:54:13 -0000	1.23
+++ sources	5 Jun 2006 20:58:55 -0000	1.24
@@ -1 +1 @@
-0d6066561db3e4efff73f00c34584cb8  Mail-SpamAssassin-3.0.5.tar.bz2
+423eb193db9f7757c6d957f5c04550cb  Mail-SpamAssassin-3.0.6.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-4/spamassassin.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- spamassassin.spec	11 May 2006 17:43:07 -0000	1.52
+++ spamassassin.spec	5 Jun 2006 20:58:55 -0000	1.53
@@ -5,8 +5,8 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.0.5
-Release: 4.fc4
+Version: 3.0.6
+Release: 1.fc4
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -158,6 +158,9 @@
 exit 0
 
 %changelog
+* Fri Jun 02 2006 Warren Togami <wtogami at redhat.com> - 3.0.6-1
+- CVE-2006-2447
+
 * Tue May 09 2006 Warren Togami <wtogami at redhat.com> - 3.0.5-4
 - Remove RCVD_IN_RSL (#191033)
 - Preserve timestamp and context of /etc/sysconfig/spamassassin (#178580)



From fedora-cvs-commits at redhat.com  Mon Jun  5 21:29:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 17:29:21 -0400
Subject: rpms/brltty/devel brltty.spec,1.12,1.13
Message-ID: <200606052129.k55LTL4h015926@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15866

Modified Files:
	brltty.spec 
Log Message:
Fixing BuildRequires



Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- brltty.spec	11 Feb 2006 02:12:25 -0000	1.12
+++ brltty.spec	5 Jun 2006 21:29:19 -0000	1.13
@@ -1,13 +1,13 @@
 Name: brltty
 Version: 3.2
-Release: 10.2.1
+Release: 11
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
 Summary: Braille display driver for Linux/Unix.
-Prereq: coreutils
+BuildRequires: byacc
 
 %description
 BRLTTY is a background process (daemon) which provides
@@ -78,6 +78,9 @@
 /etc/brltty
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.2-11
+- Added byacc BuildRequires, removed prereq, coreutils is always there
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2-10.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 21:53:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 17:53:14 -0400
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.37,1.38
Message-ID: <200606052153.k55LrEEo003586@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3498

Modified Files:
	lm_sensors.spec 
Log Message:
Fixed BuildRequires and cleaned up Requires



Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lm_sensors.spec	12 May 2006 14:57:29 -0000	1.37
+++ lm_sensors.spec	5 Jun 2006 21:53:11 -0000	1.38
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.10.0
-Release: 1
+Release: 2
 URL: http://secure.netroedge.com/~lm78/
 Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
@@ -18,8 +18,9 @@
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
 Requires: /usr/sbin/dmidecode
-PreReq: chkconfig
-BuildPrereq: kernel-headers >= 2.2.16, bison, sysfsutils-devel
+Requires(preun): chkconfig
+Requires(post): chkconfig
+BuildRequires: kernel-headers >= 2.2.16, bison, sysfsutils-devel, flex
 ExclusiveArch: alpha %{ix86} x86_64
 
 %description
@@ -106,6 +107,10 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 2.10.0-2
+- Fix BuildRequires, added flex. (#193511)  Changed to Requires(post) and 
+  (postun)
+
 * Fri May 12 2006 Phil Knirsch <pknirsch at redhat.com> 2.10.0-1
 - Update to lm_sensors-2.10.0
 - Added missing buildprereq on sysfsutils-devel (#189196)



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:01:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:01:01 -0400
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.20,1.21
Message-ID: <200606052201.k55M11VA006259@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6161

Modified Files:
	python-pyblock.spec 
Log Message:
Fix missing buildreq



Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-pyblock.spec	23 Feb 2006 03:36:06 -0000	1.20
+++ python-pyblock.spec	5 Jun 2006 22:00:45 -0000	1.21
@@ -5,13 +5,14 @@
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.15
-Release: 1
+Release: 2
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-devel, gettext, device-mapper >= 1.01.05-3
 BuildRequires: dmraid-devel, libselinux-devel, libsepol-devel
+BuildRequires: zlib-devel
 Requires: python >= %{pyver}, device-mapper >= 1.01.04, libselinux
 
 excludearch: s390 s390x
@@ -38,6 +39,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.15-2
+- Add missing BuildRequires of zlib-devel
+
 * Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 0.15-1
 - Fix use of devices in /tmp to avoid duplicates. (fixes console spew during
   install)



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:04:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:04:56 -0400
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.10,1.11
Message-ID: <200606052204.k55M4uT0006512@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6486

Modified Files:
	reiserfs-utils.spec 
Log Message:
* Mon Jun  5 2006 Dave Jones <davej at redhat.com>
- Remove broken asm/unaligned include. (#191889)



Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- reiserfs-utils.spec	7 Feb 2006 13:43:42 -0000	1.10
+++ reiserfs-utils.spec	5 Jun 2006 22:04:54 -0000	1.11
@@ -12,6 +12,7 @@
 # Not big-endian safe as of 2002-12-11 -ECL
 ExclusiveArch: %{ix86} ia64 alpha x86_64
 BuildRequires: e2fsprogs-devel
+Patch1: header-fix.patch
 
 %description
 The reiserfs-utils package contains a number of utilities for
@@ -29,6 +30,7 @@
 %{name} contains reiserfsck (used to repair filesystem
 %prep
 %setup -n reiserfsprogs-%{version}
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -64,6 +66,9 @@
 rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
 
 %changelog
+* Mon Jun  5 2006 Dave Jones <davej at redhat.com>
+- Remove broken asm/unaligned include. (#191889)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:3.6.19-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:06:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:06:07 -0400
Subject: rpms/reiserfs-utils/devel header-fix.patch,NONE,1.1
Message-ID: <200606052206.k55M670N006647@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6635

Added Files:
	header-fix.patch 
Log Message:
add compile fix

header-fix.patch:
 reiserfs_fs.h |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE header-fix.patch ---
--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 18:00:51.000000000 -0400
+++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 18:01:01.000000000 -0400
@@ -38,8 +38,6 @@
 # define extern_inline
 #endif
 
-#include <asm/unaligned.h>
-
 #ifndef get_unaligned
 #if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
     defined(__PPC) || defined(powerpc) || defined(__powerpc__)



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:07:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:07:23 -0400
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.11,1.12
Message-ID: <200606052207.k55M7NF1006860@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6848

Modified Files:
	reiserfs-utils.spec 
Log Message:
bump


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- reiserfs-utils.spec	5 Jun 2006 22:04:54 -0000	1.11
+++ reiserfs-utils.spec	5 Jun 2006 22:07:20 -0000	1.12
@@ -1,6 +1,6 @@
 Name: reiserfs-utils
 Version: 3.6.19
-Release: 2.2
+Release: 2.3
 Summary: Tools for creating, repairing, and debugging ReiserFS filesystems.
 URL: http://www.namesys.com/
 Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:13:57 -0400
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.12,1.13
Message-ID: <200606052213.k55MDvQL008001@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgcrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7948

Modified Files:
	libgcrypt.spec 
Log Message:
Added missing BR



Index: libgcrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgcrypt.spec	16 May 2006 23:26:54 -0000	1.12
+++ libgcrypt.spec	5 Jun 2006 22:13:54 -0000	1.13
@@ -1,6 +1,6 @@
 Name: libgcrypt
 Version: 1.2.2
-Release: 2
+Release: 3
 Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
 Source2: wk at g10code.com
@@ -8,7 +8,7 @@
 License: LGPL
 Summary: A general-purpose cryptography library.
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libgpg-error-devel
+BuildRequires: libgpg-error-devel pkgconfig
 Group: System Environment/Libraries
 
 %package devel
@@ -80,6 +80,9 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.2.2-3
+- Added missing buildreq pkgconfig
+
 * Tue May 16 2006 Nalin Dahyabhai <nalin at redhat.com> 1.2.2-2
 - remove file conflicts in libgcrypt-config by making the 64-bit version
   think the libraries are in /usr/lib (which is wrong, but which it also



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:14:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:14:45 -0400
Subject: rpms/tux/devel tux-3.2.18-compile-fix.patch, NONE, 1.1 tux.spec,
	1.27, 1.28
Message-ID: <200606052214.k55MEjeq008385@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8325

Modified Files:
	tux.spec 
Added Files:
	tux-3.2.18-compile-fix.patch 
Log Message:
fix compile failure.


tux-3.2.18-compile-fix.patch:
 tux.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE tux-3.2.18-compile-fix.patch ---
--- tux-3.2.18/tux.c~	2006-06-05 18:09:03.000000000 -0400
+++ tux-3.2.18/tux.c	2006-06-05 18:11:57.000000000 -0400
@@ -47,8 +47,6 @@ inline int tux(unsigned int action, user
 #warning unsupported architecture, guessing __NR_tux=222 like x86...
 #define __NR_tux 222
 #endif
-
-_syscall2 (int, tux, unsigned int, action, user_req_t *, req)
 #endif
 
 


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tux.spec	5 Jun 2006 18:33:57 -0000	1.27
+++ tux.spec	5 Jun 2006 22:14:42 -0000	1.28
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 6
+Release: 7
 Summary: User-space component of TUX kernel-based threaded HTTP server
 License: GPL
 Group: System Environment/Daemons
@@ -15,6 +15,7 @@
 BuildPrereq: glib2-devel popt docbook-utils
 Patch1: tux-3.2.18-gcc34.patch
 Patch2: tux-3.2.18-strncpy-warning.patch
+Patch3: tux-3.2.18-compile-fix.patch
 
 %description
 TUX is a kernel-based, threaded, extremely high performance HTTP server.
@@ -30,6 +31,7 @@
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make %{?_smp_mflags} CCFLAGS="$RPM_OPT_FLAGS"
@@ -70,6 +72,9 @@
 %doc tux.README NEWS SUCCESS gettuxconfig checkbindings demo.c demo.tux.so demo2.c demo2.tux.so demo3.c demo3.tux.so demo4.c demo4.tux.so demo5.tux.so samples/sample.log samples/sample.out docs/tux docs/TUXAPI*
 
 %changelog
+* Mon Jun  5 2006 Dave Jones <davej at redhat.com>
+- Fix _syscall2 compile failure. (#191828)
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-6
 - Bumped for new build system
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:14:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:14:44 -0400
Subject: rpms/xjavadoc/devel xjavadoc.spec,1.11,1.12
Message-ID: <200606052214.k55MEiUW008390@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/xjavadoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8318

Modified Files:
	xjavadoc.spec 
Log Message:

Added missing BuildRequires for ant-nodeps.




Index: xjavadoc.spec
===================================================================
RCS file: /cvs/dist/rpms/xjavadoc/devel/xjavadoc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xjavadoc.spec	6 Mar 2006 22:26:16 -0000	1.11
+++ xjavadoc.spec	5 Jun 2006 22:14:42 -0000	1.12
@@ -1,6 +1,6 @@
 %define name		xjavadoc
 %define version		1.1
-%define release		1jpp_4fc
+%define release		1jpp_5fc
 %define section		free
 
 Name:		%{name}
@@ -19,6 +19,7 @@
 BuildRequires:	java-devel
 BuildRequires:	junit
 BuildRequires:	ant >= 0:1.5
+BuildRequires:	ant-nodeps >= 0:1.5
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jakarta-commons-collections
 BuildRequires:	xml-commons-apis
@@ -72,8 +73,8 @@
 commons-collections \
 xml-commons-apis \
 jrefactory \
-ant
-
+ant \
+ant/ant-nodeps
 
 #Fix these binary deps
 #BINCLASSPATH=$PWD/lib/ConfigLog4j.jar
@@ -117,6 +118,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1-1jpp_5fc
+- Added missing BuildRequires for ant-nodeps.
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1-1jpp_4fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:18:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:18:32 -0400
Subject: rpms/pydict/devel pydict.spec,1.12,1.13
Message-ID: <200606052218.k55MIWmv024248@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pydict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24192

Modified Files:
	pydict.spec 
Log Message:
Added missing BR



Index: pydict.spec
===================================================================
RCS file: /cvs/dist/rpms/pydict/devel/pydict.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pydict.spec	9 Dec 2005 22:42:52 -0000	1.12
+++ pydict.spec	5 Jun 2006 22:18:29 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: English/Chinese Dictionary written with python/gtk
 Name:      pydict
 Version:   0.3.0
-Release: 8.1
+Release:   9
 Source0:   pydict-%{version}.tar.gz
 Patch: pydict-trans.patch
 Patch1: pydict-0.3.0-python.patch
@@ -11,6 +11,7 @@
 Group: Applications/Text
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires:  pygtk2
+BuildRequires: desktop-file-utils
 BuildArchitectures: noarch
 
 %description
@@ -56,6 +57,9 @@
 /usr/share/icons/dict.xpm
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-9
+- Added missing BuildRequires desktop-file-utils
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:25:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:25:35 -0400
Subject: rpms/stardict/devel stardict.spec,1.19,1.20
Message-ID: <200606052225.k55MPZ9n026911@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26783

Modified Files:
	stardict.spec 
Log Message:
Fix BuildRequires, Requires(post), and Requires(postun)



Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- stardict.spec	15 May 2006 12:40:01 -0000	1.19
+++ stardict.spec	5 Jun 2006 22:25:32 -0000	1.20
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:    2.4.5
-Release:    2.4
+Release:    3
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
@@ -13,7 +13,9 @@
 Requires: libgnomeui >= 2.2.0
 Requires: libbonobo >= 2.2.0
 Requires: bonobo-activation >= 2.2.0
-BuildRequires: libgnomeui-devel >= 2.2.0
+BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper
+Requires(post): GConf2, scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 StarDict is a Cross-Platform and international dictionary written in Gtk2.
@@ -60,6 +62,10 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com>
+- Added missing BuildRequires scrollkeeper
+- Added Requires(post) and (postun) accordingly
+
 * Tue Apr 18 2006 Mayank Jain <majain at redhat.com>
 - Corrected spelling mistakes in the description section, RH bug #161777
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:32:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:32:41 -0400
Subject: rpms/tux/devel tux-3.2.18-compile-fix.patch,1.1,1.2
Message-ID: <200606052232.k55MWfhF028762@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28737

Modified Files:
	tux-3.2.18-compile-fix.patch 
Log Message:
build fix


tux-3.2.18-compile-fix.patch:
 tux.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: tux-3.2.18-compile-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux-3.2.18-compile-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tux-3.2.18-compile-fix.patch	5 Jun 2006 22:14:42 -0000	1.1
+++ tux-3.2.18-compile-fix.patch	5 Jun 2006 22:32:34 -0000	1.2
@@ -1,11 +1,11 @@
---- tux-3.2.18/tux.c~	2006-06-05 18:09:03.000000000 -0400
-+++ tux-3.2.18/tux.c	2006-06-05 18:11:57.000000000 -0400
-@@ -47,8 +47,6 @@ inline int tux(unsigned int action, user
- #warning unsupported architecture, guessing __NR_tux=222 like x86...
+--- tux-3.2.18/tux.c~	2006-06-05 18:30:38.000000000 -0400
++++ tux-3.2.18/tux.c	2006-06-05 18:31:37.000000000 -0400
+@@ -48,7 +48,7 @@ inline int tux(unsigned int action, user
  #define __NR_tux 222
  #endif
--
+ 
 -_syscall2 (int, tux, unsigned int, action, user_req_t *, req)
++#define tux(x, y)	syscall(__NR_tux, x, y)
  #endif
  
  



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:52:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:52:19 -0400
Subject: rpms/bsf/devel bsf.spec,1.9,1.10
Message-ID: <200606052252.k55MqJYf015477@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15422

Modified Files:
	bsf.spec 
Log Message:

Add missing Requires/BuildRequires for tomcat5-jsp-2.0-api and others.




Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bsf.spec	6 Mar 2006 22:02:48 -0000	1.9
+++ bsf.spec	5 Jun 2006 22:52:17 -0000	1.10
@@ -1,6 +1,6 @@
 %define name		bsf
 %define version		2.3.0
-%define release 6jpp_3fc
+%define release 6jpp_4fc
 %define section		free
 
 Name:		%{name}
@@ -13,9 +13,14 @@
 Group:          Development/Libraries/Java
 Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
 Patch1:		bsf-javac.patch
+BuildRequires:	jpackage-utils >= 1.6
 BuildRequires:  ant
 BuildRequires:	servletapi5
 BuildRequires:  xalan-j2
+BuildRequires:	tomcat5-jsp-2.0-api
+Requires:	servletapi5
+Requires:	xalan-j2
+Requires: 	tomcat5-jsp-2.0-api
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -64,10 +69,7 @@
 rmdir $RPM_BUILD_DIR/bsf
 
 %build
-export CLASSPATH=\
-%{_javadir}/xalan-j2.jar:\
-%{_javadir}/servletapi5.jar:\
-%{_javadir}/jspapi.jar
+export CLASSPATH=`build-classpath xalan-j2 servletapi5 jspapi`
 cd src
 ant realclean
 ant compile
@@ -113,6 +115,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.3.0-6jpp_4fc
+- Add missing Requires/BuildRequires for tomcat5-jsp-2.0-api and others.
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.3.0-6jpp_3fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 22:59:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 18:59:31 -0400
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.12,1.13
Message-ID: <200606052259.k55MxVSm018193@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18142

Modified Files:
	reiserfs-utils.spec 
Log Message:
disable ia64 builds.



Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- reiserfs-utils.spec	5 Jun 2006 22:07:20 -0000	1.12
+++ reiserfs-utils.spec	5 Jun 2006 22:59:29 -0000	1.13
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
 # Not big-endian safe as of 2002-12-11 -ECL
-ExclusiveArch: %{ix86} ia64 alpha x86_64
+ExclusiveArch: %{ix86} x86_64
 BuildRequires: e2fsprogs-devel
 Patch1: header-fix.patch
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:05:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:05:16 -0400
Subject: rpms/perl-BSD-Resource/devel .cvsignore, 1.6,
	1.7 perl-BSD-Resource.spec, 1.20, 1.21 sources, 1.6, 1.7
Message-ID: <200606052305.k55N5FGA018693@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-BSD-Resource/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18676

Modified Files:
	.cvsignore perl-BSD-Resource.spec sources 
Log Message:
upgrade to upstream version 1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Mar 2005 22:31:30 -0000	1.6
+++ .cvsignore	5 Jun 2006 23:05:13 -0000	1.7
@@ -1,2 +1,3 @@
 BSD-Resource-1.23.tar.gz
 BSD-Resource-1.24.tar.gz
+BSD-Resource-1.28.tar.gz


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-BSD-Resource.spec	11 Feb 2006 04:58:19 -0000	1.20
+++ perl-BSD-Resource.spec	5 Jun 2006 23:05:13 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
-Version:        1.24
-Release: 	3.2.2
+Version:        1.28
+Release: 	1
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.28-1
+- upgrade to upstream version 1.28
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.24-3.2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2005 22:31:30 -0000	1.6
+++ sources	5 Jun 2006 23:05:13 -0000	1.7
@@ -1 +1 @@
-9589f6bbae6520dd053a8f50fb934e7c  BSD-Resource-1.24.tar.gz
+bf3ecc4127a831f2cd359bf920dde1cb  BSD-Resource-1.28.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:07:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:07:22 -0400
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.21,1.22
Message-ID: <200606052307.k55N7MZ8018810@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-BSD-Resource/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18796

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
upgrade to upstream version 1.28


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-BSD-Resource.spec	5 Jun 2006 23:05:13 -0000	1.21
+++ perl-BSD-Resource.spec	5 Jun 2006 23:07:19 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
 Version:        1.28
-Release: 	1
+Release: 	1.fc6
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:09:40 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.14, 1.15
Message-ID: <200606052309.k55N9eBv018992@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18958

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:

Add missing BuildRequires for tomcat5-jsp-2.0-api.




Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-taglibs-standard.spec	8 Mar 2006 22:49:06 -0000	1.14
+++ jakarta-taglibs-standard.spec	5 Jun 2006 23:09:35 -0000	1.15
@@ -4,7 +4,7 @@
 %define section         free
 %define jversion	1.1.1
 %define version		1.1.1
-%define release 	4jpp_4fc
+%define release 	4jpp_5fc
 
 Name:           %{name}
 Version:        %{version}
@@ -24,7 +24,9 @@
 BuildRequires:  jpackage-utils >= 0:1.5.30
 BuildRequires:  ant
 BuildRequires:  servletapi5 >= 0:5.0.16
+BuildRequires:  tomcat5-jsp-2.0-api >= 0:5.0.16
 Requires:       servletapi5 >= 0:5.0.16
+Requires:       tomcat5-jsp-2.0-api >= 0:5.0.16
 
 # excluded due to eclipse
 ExcludeArch: s390 s390x ppc64
@@ -101,6 +103,9 @@
 
 
 %changelog
+* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.1-4jpp_5fc
+- Add missing BuildRequires for tomcat5-jsp-2.0-api.
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.1.1-4jpp_4fc
 - excluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:14:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:14:10 -0400
Subject: rpms/perl-Devel-Symdump/devel .cvsignore, 1.5,
	1.6 perl-Devel-Symdump.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <200606052314.k55NEAea019691@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Devel-Symdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19656

Modified Files:
	.cvsignore perl-Devel-Symdump.spec sources 
Log Message:
Upgrade to 2.0601


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Feb 2006 19:03:03 -0000	1.5
+++ .cvsignore	5 Jun 2006 23:14:07 -0000	1.6
@@ -1,3 +1,4 @@
 Devel-Symdump-2.03.tar.gz
 Devel-Symdump-2.05.tar.gz
 Devel-Symdump-2.06.tar.gz
+Devel-Symdump-2.0601.tar.gz


Index: perl-Devel-Symdump.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Devel-Symdump.spec	3 Feb 2006 19:03:03 -0000	1.13
+++ perl-Devel-Symdump.spec	5 Jun 2006 23:14:07 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Devel-Symdump
-Version:        2.06
+Version:        2.0601
 Release: 	1
 Summary:        A Perl module for inspecting Perl's symbol table
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 2.0601-1
+- Upgrade to 2.0601
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.06-1
 - Upgrade to 2.0.6
 - rebuild for new perl-5.8.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Feb 2006 19:03:03 -0000	1.5
+++ sources	5 Jun 2006 23:14:07 -0000	1.6
@@ -1 +1 @@
-a6564fdfc737e2f221602c8ed713c417  Devel-Symdump-2.06.tar.gz
+5a4ba4f2a9e877a6f98f365a570ccf24  Devel-Symdump-2.0601.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:26:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:26:51 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.15, 1.16
Message-ID: <200606052326.k55NQpvX006316@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6242

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:

- Added missing BR for xalan.




Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-taglibs-standard.spec	5 Jun 2006 23:09:35 -0000	1.15
+++ jakarta-taglibs-standard.spec	5 Jun 2006 23:26:48 -0000	1.16
@@ -25,8 +25,10 @@
 BuildRequires:  ant
 BuildRequires:  servletapi5 >= 0:5.0.16
 BuildRequires:  tomcat5-jsp-2.0-api >= 0:5.0.16
+BuildRequires:  xalan-j2 >= 2.6.0
 Requires:       servletapi5 >= 0:5.0.16
 Requires:       tomcat5-jsp-2.0-api >= 0:5.0.16
+Requires:       xalan-j2 >= 2.6.0
 
 # excluded due to eclipse
 ExcludeArch: s390 s390x ppc64
@@ -55,6 +57,7 @@
 dist.dir=dist
 servlet24.jar=$(build-classpath servletapi5)
 jsp20.jar=$(build-classpath jspapi)
+jaxp-api.jar=$(build-classpath xalan-j2)
 EOBP
 
 %build
@@ -104,7 +107,7 @@
 
 %changelog
 * Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.1-4jpp_5fc
-- Add missing BuildRequires for tomcat5-jsp-2.0-api.
+- Add missing BuildRequires for tomcat5-jsp-2.0-api and xalan-j2
 
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.1.1-4jpp_4fc
 - excluded s390[x] and ppc64 due to eclipse



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:27:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:27:29 -0400
Subject: rpms/perl-Frontier-RPC/devel perl-Frontier-RPC.spec,1.9,1.10
Message-ID: <200606052327.k55NRTva006611@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Frontier-RPC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6580

Modified Files:
	perl-Frontier-RPC.spec 
Log Message:
upgrade to upstream version 0.07b4


Index: perl-Frontier-RPC.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Frontier-RPC/devel/perl-Frontier-RPC.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Frontier-RPC.spec	3 Feb 2006 19:20:13 -0000	1.9
+++ perl-Frontier-RPC.spec	5 Jun 2006 23:27:27 -0000	1.10
@@ -1,12 +1,12 @@
 Summary:        A Perl interface for making and serving XML-RPC calls
 Name:           perl-Frontier-RPC
-Version:        0.06
-Release: 	39.2
+Version:        0.07b4
+Release: 	1
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 Url:            http://search.cpan.org/dist/Frontier-RPC/
-Source0:        http://history.perl.org/backpan/authors/id/K/KM/KMACLEOD/Frontier-RPC-0.06.tar.gz
+Source0:        ftp://cpan.org/pub/CPAN/authors/id/K/KM/KMACLEOD/Frontier-RPC-%{version}.tar.gz
 Patch0:         perl-frontier-raw-call.patch
 Patch1:         perl-frontier-raw-serve.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,10 +50,14 @@
 %defattr(-,root,root,-)
 %doc COPYING README examples/
 %{perl_vendorlib}/Frontier/
+%{perl_vendorlib}/Apache/XMLRPC.pm
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 0.07b4-1
+- Upgrade to upstream version 0.07b4
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.06-39.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:28:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:28:14 -0400
Subject: rpms/perl-Frontier-RPC/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200606052328.k55NSE5v006948@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Frontier-RPC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6922

Modified Files:
	.cvsignore sources 
Log Message:
upgrade to upstream version 0.07b4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Frontier-RPC/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 10:10:30 -0000	1.2
+++ .cvsignore	5 Jun 2006 23:28:12 -0000	1.3
@@ -1 +1,2 @@
 Frontier-RPC-0.06.tar.gz
+Frontier-RPC-0.07b4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Frontier-RPC/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 10:10:30 -0000	1.2
+++ sources	5 Jun 2006 23:28:12 -0000	1.3
@@ -1 +1 @@
-f0cfc04ac1e279f2966320516167a1db  Frontier-RPC-0.06.tar.gz
+c04582da604f11bdbe60606738f92457  Frontier-RPC-0.07b4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:33:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:33:02 -0400
Subject: rpms/reiserfs-utils/devel header-fix.patch,1.1,1.2
Message-ID: <200606052333.k55NX2gc007797@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7752

Modified Files:
	header-fix.patch 
Log Message:
better fix


header-fix.patch:
 reiserfs_fs.h |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

Index: header-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/header-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header-fix.patch	5 Jun 2006 22:06:02 -0000	1.1
+++ header-fix.patch	5 Jun 2006 23:32:25 -0000	1.2
@@ -1,11 +1,33 @@
---- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 18:00:51.000000000 -0400
-+++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 18:01:01.000000000 -0400
-@@ -38,8 +38,6 @@
+--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 19:29:45.240611000 -0400
++++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 19:30:29.588212000 -0400
+@@ -38,15 +38,22 @@
  # define extern_inline
  #endif
  
 -#include <asm/unaligned.h>
--
- #ifndef get_unaligned
- #if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
-     defined(__PPC) || defined(powerpc) || defined(__powerpc__)
++#define get_unaligned(ptr)                  \
++({                                             \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v;                               \
++})
++
++#define put_unaligned(val, ptr)             \
++do {                                           \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v = (val);                       \
++} while(0)
+ 
+-#ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-#	define get_unaligned(ptr)	(*(ptr))
+-#	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+-#endif
+-#endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
+ #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:35:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:35:21 -0400
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.13,1.14
Message-ID: <200606052335.k55NZLqK007923@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7881

Modified Files:
	reiserfs-utils.spec 
Log Message:
ia64 will probably work now too


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- reiserfs-utils.spec	5 Jun 2006 22:59:29 -0000	1.13
+++ reiserfs-utils.spec	5 Jun 2006 23:34:50 -0000	1.14
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
 # Not big-endian safe as of 2002-12-11 -ECL
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 ia64
 BuildRequires: e2fsprogs-devel
 Patch1: header-fix.patch
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:44:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:44:50 -0400
Subject: rpms/perl-File-MMagic/devel .cvsignore, 1.9,
	1.10 perl-File-MMagic.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <200606052344.k55NiolX009980@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-File-MMagic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9945

Modified Files:
	.cvsignore perl-File-MMagic.spec sources 
Log Message:
upgrade to 1.27


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Feb 2006 19:16:00 -0000	1.9
+++ .cvsignore	5 Jun 2006 23:44:47 -0000	1.10
@@ -2,3 +2,4 @@
 File-MMagic-1.22.tar.gz
 File-MMagic-1.25.tar.gz
 File-MMagic-1.26.tar.gz
+File-MMagic-1.27.tar.gz


Index: perl-File-MMagic.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/perl-File-MMagic.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-File-MMagic.spec	3 Feb 2006 19:16:00 -0000	1.14
+++ perl-File-MMagic.spec	5 Jun 2006 23:44:47 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-File-MMagic
-Version:        1.26
+Version:        1.27
 Release: 	1
 Summary:        A Perl module emulating the file(1) command
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.27-1
+- Upgrade to 1.27
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.26-1
 - Upgrade to 1.26
 - rebuild for new perl-5.8.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Feb 2006 19:16:00 -0000	1.9
+++ sources	5 Jun 2006 23:44:47 -0000	1.10
@@ -1 +1 @@
-d78658177edec26d75f3694c7f079326  File-MMagic-1.26.tar.gz
+4ffb13b6587888e6e455c22988abce5e  File-MMagic-1.27.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:45:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:45:13 -0400
Subject: rpms/pycairo/devel pycairo.spec,1.6,1.7
Message-ID: <200606052345.k55NjDNl010204@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/pycairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10137

Modified Files:
	pycairo.spec 
Log Message:
- Add pkgconfig BR



Index: pycairo.spec
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pycairo.spec	11 Feb 2006 05:20:28 -0000	1.6
+++ pycairo.spec	5 Jun 2006 23:45:10 -0000	1.7
@@ -3,14 +3,16 @@
 Summary: Python bindings for the cairo library
 Name: pycairo
 Version: 1.0.2 
-Release: 1.2.1
+Release: 2
 License: LGPL
 Group: Development/Languages
 URL: http://cairographics.org/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python
-BuildRequires: cairo-devel python-devel
+BuildRequires: cairo-devel 
+BuildRequires: python-devel
+BuildRequires: pkgconfig
 Requires: cairo
 %description
 Python bindings for the cairo library
@@ -56,6 +58,9 @@
 %{_includedir}/pycairo/pycairo.h
 
 %changelog
+* Mon Jun 05 2006 John (J5) Palmieri <johnp at redhat.com> - 1.0.2-2
+- add pkgconfig BR
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:49:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:49:47 -0400
Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.9,
	1.10 perl-HTML-Parser.spec, 1.21, 1.22 sources, 1.10, 1.11
Message-ID: <200606052349.k55Nnlfq001546@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31146

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
upgrade to 3.54


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Mar 2006 21:21:15 -0000	1.9
+++ .cvsignore	5 Jun 2006 23:49:44 -0000	1.10
@@ -4,3 +4,4 @@
 HTML-Parser-3.48.tar.gz
 HTML-Parser-3.50.tar.gz
 HTML-Parser-3.51.tar.gz
+HTML-Parser-3.54.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-HTML-Parser.spec	22 Mar 2006 21:21:57 -0000	1.21
+++ perl-HTML-Parser.spec	5 Jun 2006 23:49:44 -0000	1.22
@@ -4,8 +4,8 @@
 
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
-Version: 3.51
-Release: 1.FC6
+Version: 3.54
+Release: 1.fc6
 License: GPL or Artistic
 Group: System Environment/Libraries
 Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 3.54-1
+- upgrade to 3.54
+
 * Mon Mar 22 2006 Jason Vas Dias <jvdias at redhat.com> - 3.51-1
 - upgrade to 3.51
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Mar 2006 21:21:15 -0000	1.10
+++ sources	5 Jun 2006 23:49:44 -0000	1.11
@@ -1 +1 @@
-4189959d60549afa9a7636f5efafbe20  HTML-Parser-3.51.tar.gz
+c5bcfc6d67a47ba1b7c3e86daf0bbde4  HTML-Parser-3.54.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:52:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:52:23 -0400
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.22,1.23
Message-ID: <200606052352.k55NqN1A004481@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4467

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
upgrade to 3.54


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-HTML-Parser.spec	5 Jun 2006 23:49:44 -0000	1.22
+++ perl-HTML-Parser.spec	5 Jun 2006 23:52:21 -0000	1.23
@@ -7,7 +7,7 @@
 Version: 3.54
 Release: 1.fc6
 License: GPL or Artistic
-Group: System Environment/Libraries
+Group:  Development/Libraries
 Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz
 Url: http://search.cpan.org/dist/HTML-Parser/
 BuildRoot: %{_tmppath}/%{name}-buildroot/



From fedora-cvs-commits at redhat.com  Mon Jun  5 23:52:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:52:45 -0400
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.23,1.24
Message-ID: <200606052352.k55NqjDp004503@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4489

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
upgrade to 3.54





From fedora-cvs-commits at redhat.com  Mon Jun  5 23:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 19:59:40 -0400
Subject: rpms/perl-Net-IP/devel .cvsignore, 1.2, 1.3 perl-Net-IP.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200606052359.k55Nxe8d004626@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-IP/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4611

Modified Files:
	.cvsignore perl-Net-IP.spec sources 
Log Message:
upgrade to 1.25


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Oct 2005 18:19:48 -0000	1.2
+++ .cvsignore	5 Jun 2006 23:59:38 -0000	1.3
@@ -1 +1,2 @@
 Net-IP-1.24.tar.gz
+Net-IP-1.25.tar.gz


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-IP.spec	3 Feb 2006 19:52:34 -0000	1.4
+++ perl-Net-IP.spec	5 Jun 2006 23:59:38 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           perl-Net-IP
-Version:        1.24
-Release: 	2%{?dist}.2
+Version:        1.25
+Release: 	1.fc6
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Net-IP/
-Source:         http://www.cpan.org/modules/by-module/Net/Net-IP-%{version}.tar.gz
+Source:         ftp:/cpan.org/pub/CPAN/authors/id/M/MA/MANU/Net-IP-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.25-1
+- upgrade to 1.25
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.24-2.2
 - rebuild for new perl-5.8.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2005 18:19:48 -0000	1.2
+++ sources	5 Jun 2006 23:59:38 -0000	1.3
@@ -1 +1 @@
-edc91d262460130f583f3f1c42e041b9  Net-IP-1.24.tar.gz
+a49c0b02a9b793ff60191cdafc0c202e  Net-IP-1.25.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:14:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:14:35 -0400
Subject: rpms/perl-XML-SAX/devel .cvsignore, 1.4, 1.5 perl-XML-SAX.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200606060014.k560EZL5016330@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-SAX/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16302

Modified Files:
	.cvsignore perl-XML-SAX.spec sources 
Log Message:
upgrade to 0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-SAX/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 20:04:15 -0000	1.4
+++ .cvsignore	6 Jun 2006 00:14:32 -0000	1.5
@@ -1,2 +1,3 @@
 XML-SAX-0.12.tar.gz
 XML-SAX-0.13.tar.gz
+XML-SAX-0.14.tar.gz


Index: perl-XML-SAX.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-SAX/devel/perl-XML-SAX.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-XML-SAX.spec	3 Feb 2006 21:52:29 -0000	1.9
+++ perl-XML-SAX.spec	6 Jun 2006 00:14:32 -0000	1.10
@@ -3,18 +3,18 @@
 
 Summary: XML-SAX Perl module
 Name: perl-XML-SAX
-Version: 0.13
-Release: 1.1
+Version: 0.14
+Release: 1
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-SAX/
+Source: ftp://cpan.org/pub/CPAN/authors/id/M/MS/MSERGEANT/XML-SAX-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl >= 2:5.8.0
 Requires: %(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }')
 Requires: %(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }')
 Requires: %(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }')
 Requires: perl(:MODULE_COMPAT_%(perl -MConfig -e 'print $Config{version}'))
-Source0: XML-SAX-%{version}.tar.gz
 Source1: filter-requires-xmlsax.sh
 BuildArch: noarch
 BuildRequires: perl-XML-NamespaceSupport
@@ -76,6 +76,9 @@
 %exclude %{perl_vendorlib}/XML/SAX/placeholder.pl
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 0.14-1.1
+- upgrade to 0.14
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.13-1.1
 - rebuild for new perl-5.8.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-SAX/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Dec 2005 20:04:15 -0000	1.4
+++ sources	6 Jun 2006 00:14:32 -0000	1.5
@@ -1,2 +1 @@
-bff58bd077a9693fc8cf32e2b95f571f  XML-SAX-0.12.tar.gz
-e8b1ce0a954888bcd3aa2ed8621774ef  XML-SAX-0.13.tar.gz
+ab13c04a3cf63a0ae63fa73c863cf23e  XML-SAX-0.14.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:22:00 -0400
Subject: rpms/perl-XML-Twig/devel .cvsignore, 1.8, 1.9 perl-XML-Twig.spec,
	1.13, 1.14 sources, 1.8, 1.9
Message-ID: <200606060022.k560M03d000917@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Twig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv894

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
upgrade to 3.25


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 22:19:13 -0000	1.8
+++ .cvsignore	6 Jun 2006 00:21:57 -0000	1.9
@@ -1,3 +1,4 @@
 XML-Twig-3.17.tar.gz
 XML-Twig-3.22.tar.gz
 XML-Twig-3.23.tar.gz
+XML-Twig-3.25.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-XML-Twig.spec	3 Feb 2006 22:54:18 -0000	1.13
+++ perl-XML-Twig.spec	6 Jun 2006 00:21:57 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-XML-Twig
-Version:        3.23
+Version:        3.25
 Release: 	1
 Summary:        A perl module for processing huge XML documents in tree mode
 
@@ -30,7 +30,8 @@
 
 %prep
 %setup -q -n XML-Twig-%{version} 
-%patch0 -p1 -b .tests_no_HTML_TreeBuilder
+#%patch0 -p1 -b .tests_no_HTML_TreeBuilder
+#      ^- now fixed upstream
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
@@ -60,6 +61,9 @@
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 3.25-1
+- Upgrade to 2.25
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.22-1.1
 - Update to 3.23
 - rebuild for new perl-5.8.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 22:19:13 -0000	1.8
+++ sources	6 Jun 2006 00:21:57 -0000	1.9
@@ -1 +1 @@
-5393b96c6dbfcafbc45481e936b97c03  XML-Twig-3.23.tar.gz
+dd153f142487a6ec85afaf7c3dd27df0  XML-Twig-3.25.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:33:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:33:27 -0400
Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.23,1.24
Message-ID: <200606060033.k560XRSt004204@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Compress-Zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4167

Modified Files:
	perl-Compress-Zlib.spec 
Log Message:
fix license tag


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-Compress-Zlib.spec	11 Feb 2006 04:58:29 -0000	1.23
+++ perl-Compress-Zlib.spec	6 Jun 2006 00:32:49 -0000	1.24
@@ -4,14 +4,14 @@
 
 Name: perl-Compress-Zlib
 Version: 1.41
-Release: 1.2.2
+Release: 2
 Summary: A module providing Perl interfaces to the zlib compression library.
-License: distributable
+License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Compress-Zlib/
+Source: ftp://cpan.org/pub/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: perl >= 0:5.00503, zlib-devel
-Source0: Compress-Zlib-%{version}.tar.gz
 
 %description
 The Compress::Zlib module provides a Perl interface to the zlib
@@ -55,6 +55,9 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.41-2
+- fix License: tag
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:41:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:41:37 -0400
Subject: rpms/libXau/devel libXau.spec,1.11,1.12
Message-ID: <200606060041.k560fbMS004950@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4924

Modified Files:
	libXau.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193422)
- Replace "makeinstall" with "make install DESTDIR=..." to fix (#192718)



Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXau.spec	12 May 2006 20:38:23 -0000	1.11
+++ libXau.spec	6 Jun 2006 00:41:35 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -43,7 +44,7 @@
 %install
 
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -84,6 +85,10 @@
 %{_mandir}/man3/XauWriteAuth.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193422)
+- Replace "makeinstall" with "make install DESTDIR=..." to fix (#192718)
+
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Bump to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:42:05 -0400
Subject: rpms/perl-Net-Telnet/devel perl-Net-Telnet.spec,1.7,1.8
Message-ID: <200606060042.k560g5cm005157@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-Telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5092

Modified Files:
	perl-Net-Telnet.spec 
Log Message:
correct License: tag


Index: perl-Net-Telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-Telnet/devel/perl-Net-Telnet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Net-Telnet.spec	15 Feb 2006 18:03:23 -0000	1.7
+++ perl-Net-Telnet.spec	6 Jun 2006 00:42:03 -0000	1.8
@@ -1,10 +1,10 @@
 Name: 		perl-Net-Telnet
 Version: 	3.03
-Release: 	4.3
+Release: 	5
 Summary: 	Net-Telnet Perl module
 
 Group: 	 	Development/Libraries
-License: 	distributable
+License: 	GPL or Artistic
 URL: 		http://search.cpan.org/dist/Net-Telnet/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jun 30 2006 Jason Vas Dias <jvdias at redhat.com> - 3.03-5
+- correct License: tag
+
 * Wed Feb 15 2006 Jason Vas Dias <jvdias at redhat.com> - 3.03-4.3
 - fix bug 180591: correct URL: tag
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:50:51 -0400
Subject: rpms/perl-URI/devel perl-URI.spec,1.14,1.15
Message-ID: <200606060050.k560op0a022863@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-URI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22827

Modified Files:
	perl-URI.spec 
Log Message:
fix License: tag


Index: perl-URI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-URI/devel/perl-URI.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-URI.spec	3 Feb 2006 21:21:13 -0000	1.14
+++ perl-URI.spec	6 Jun 2006 00:50:48 -0000	1.15
@@ -1,10 +1,10 @@
 Name:           perl-URI
 Version:        1.35
-Release: 	2.2
+Release: 	3
 Summary:        A Perl module implementing URI parsing and manipulation
 
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/URI/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/URI-%{version}.tar.gz
 Source1:        filter-requires-perl-URI.sh
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.35-3
+- fix License: tag
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.35-2.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 00:56:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 20:56:34 -0400
Subject: rpms/radvd/devel radvd.spec,1.28,1.29
Message-ID: <200606060056.k560uYbJ025058@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/radvd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25031

Modified Files:
	radvd.spec 
Log Message:
fix BuildRequires for Mock


Index: radvd.spec
===================================================================
RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- radvd.spec	11 Feb 2006 05:27:19 -0000	1.28
+++ radvd.spec	6 Jun 2006 00:56:32 -0000	1.29
@@ -3,12 +3,13 @@
 Summary:   A Router Advertisement daemon
 Name:      radvd
 Version:   0.9.1
-Release:   1.1.1
+Release:   2
 License:   BSD-style
 Group:     System Environment/Daemons
 Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
 PreReq:    chkconfig, /usr/sbin/useradd, /sbin/service, initscripts
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: flex
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -82,6 +83,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 0.9.1-2
+- fix BuildRequires for Mock
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-1.1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:18:19 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.12,1.13
Message-ID: <200606060118.k561IJQj007898@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7713

Modified Files:
	libXaw.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Added "BuildRequires: pkgconfig" for (#193423)
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "BuildRequires: libXt-devel" for (#190169)



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXaw.spec	27 Apr 2006 19:39:22 -0000	1.12
+++ libXaw.spec	6 Jun 2006 01:18:15 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -9,6 +9,7 @@
 
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -28,7 +29,9 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+
 Requires: libXmu-devel
+Requires: libXt-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -51,7 +54,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -96,6 +99,11 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Added "BuildRequires: pkgconfig" for (#193423)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "BuildRequires: libXt-devel" for (#190169)
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:27:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:27:09 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.60,1.61
Message-ID: <200606060127.k561R93u013720@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13628

Modified Files:
	file-roller.spec 
Log Message:
Rebuild



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- file-roller.spec	29 May 2006 19:44:44 -0000	1.60
+++ file-roller.spec	6 Jun 2006 01:27:07 -0000	1.61
@@ -11,7 +11,7 @@
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.14.3
-Release: 	2
+Release: 	3
 
 License:	GPL
 Group:		Applications/Archiving
@@ -118,6 +118,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-3
+- Rebuild
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-2
 - Update to 2.14.3
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:40:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:40:13 -0400
Subject: rpms/system-config-display/devel system-config-display.spec, 1.36,
	1.37
Message-ID: <200606060140.k561eDT0016511@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16484

Modified Files:
	system-config-display.spec 
Log Message:
Add missing BR



Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- system-config-display.spec	9 Mar 2006 16:11:23 -0000	1.36
+++ system-config-display.spec	6 Jun 2006 01:40:09 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
 Version: 1.0.37
-Release: 2
+Release: 3
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -13,7 +13,7 @@
 ExcludeArch: s390 s390x ppc64
 Obsoletes: redhat-config-xfree86
 BuildRequires: desktop-file-utils
-BuildRequires: intltool
+BuildRequires: intltool gettext
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade
 Requires: python2
@@ -83,6 +83,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.0.37-3
+- Added BuildRequires gettext
+
 * Thu Mar 09 2006 Chris Lumens <clumens at redhat.com> 1.0.37-2
 - Add back spec file parts that got lost on last rebuild.
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:47:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:47:44 -0400
Subject: rpms/libSM/devel libSM.spec,1.12,1.13
Message-ID: <200606060147.k561likq029274@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29134

Modified Files:
	libSM.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193421)
- Replace "makeinstall" with "make install DESTDIR=..."



Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libSM.spec	27 Apr 2006 19:35:16 -0000	1.12
+++ libSM.spec	6 Jun 2006 01:47:41 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libICE-devel
@@ -46,7 +47,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -79,6 +80,10 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193421)
+- Replace "makeinstall" with "make install DESTDIR=..."
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:55:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:55:37 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.33,1.34
Message-ID: <200606060155.k561tbh5003099@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3001

Modified Files:
	desktop-backgrounds.spec 
Log Message:
Really remove the default background



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- desktop-backgrounds.spec	5 Jun 2006 19:46:56 -0000	1.33
+++ desktop-backgrounds.spec	6 Jun 2006 01:55:33 -0000	1.34
@@ -68,6 +68,9 @@
 	rm -rf ${bgdir}/${I}
 done
 
+# default background is now in fedora-logos
+rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default.png
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,7 +82,6 @@
 %dir %{_datadir}/backgrounds/images
 %{_datadir}/backgrounds/tiles/*.png
 %{_datadir}/backgrounds/tiles/*jpg
-%{_datadir}/backgrounds/images/default.png
 %{_datadir}/backgrounds/images/tiny_blast_of_red.jpg
 %{_datadir}/backgrounds/images/ladybugs.jpg
 %{_datadir}/backgrounds/images/stone_bird.jpg
@@ -103,9 +105,11 @@
 #exclude %{_datadir}/backgrounds/images/stone_bird.jpg
 #exclude %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
-#exclude %{_datadir}/backgrounds/images/default.png
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redaht.com> 2.0-33
+- Really remove the default background
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redaht.com> 2.0-32
 - Move the default background to fedora-logos
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:57:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:57:04 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.34,1.35
Message-ID: <200606060157.k561v4G8003643@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3482

Modified Files:
	desktop-backgrounds.spec 
Log Message:
really remove default background



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- desktop-backgrounds.spec	6 Jun 2006 01:55:33 -0000	1.34
+++ desktop-backgrounds.spec	6 Jun 2006 01:57:01 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 32
+Release: 33
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun  6 01:59:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 21:59:33 -0400
Subject: rpms/libXevie/devel libXevie.spec,1.11,1.12
Message-ID: <200606060159.k561xXFT004577@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4545

Modified Files:
	libXevie.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Replace "makeinstall" with "make install DESTDIR=..." (#192719)



Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXevie.spec	27 Apr 2006 19:54:17 -0000	1.11
+++ libXevie.spec	6 Jun 2006 01:59:30 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -44,9 +44,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -80,6 +80,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Replace "makeinstall" with "make install DESTDIR=..." (#192719)
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:01:52 -0400
Subject: rpms/system-config-kickstart/devel system-config-kickstart.spec,
	1.40, 1.41
Message-ID: <200606060201.k5621qgB005205@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-kickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5039

Modified Files:
	system-config-kickstart.spec 
Log Message:
Fix up BRs



Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-kickstart.spec	5 Jun 2006 20:31:39 -0000	1.40
+++ system-config-kickstart.spec	6 Jun 2006 02:01:45 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
 Version: 2.6.11
-Release: 1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -12,7 +12,7 @@
 Obsoletes: ksconfig
 Obsoletes: redhat-config-kickstart
 BuildRequires: desktop-file-utils
-BuildRequires: intltool
+BuildRequires: intltool gettext
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade 
 Requires: python >= 2.3.3
@@ -23,7 +23,8 @@
 Requires: yum
 Requires: pirut
 Requires: hicolor-icon-theme
-Prereq: gtk2 >= 2.6
+Requires(post): gtk2 >= 2.6
+Requires(postun): gtk2 >= 2.6
 
 %description
 Kickstart Configurator is a graphical tool for creating kickstart files.  
@@ -78,6 +79,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 2.6.11-2
+- Add gettext as a BR
+- Fix up requires(post) and (postun)
+
 * Mon Jun 05 2006 Chris Lumens <clumens at redhat.com> 2.6.11-1
 - Write out a mount point for swap and raid partitions (#193262).
 - Fix RAID member list printing.



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:05:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:05:09 -0400
Subject: rpms/zenity/devel zenity.spec,1.8,1.9
Message-ID: <200606060205.k562598g005670@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5653

Modified Files:
	zenity.spec 
Log Message:
Rebuild



Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zenity.spec	16 May 2006 18:06:46 -0000	1.8
+++ zenity.spec	6 Jun 2006 02:05:06 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           zenity
 Version:        2.15.2
-Release:        1
+Release:        2
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
 License:        GPL
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-2
+- Rebuild
+
 * Tue May 16 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-1
 - Update to 2.15.2
 - Remove po/LINGUAS fixes



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:14:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:14:39 -0400
Subject: rpms/squirrelmail/devel squirrelmail.spec,1.34,1.35
Message-ID: <200606060214.k562Ed10007300@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7267

Modified Files:
	squirrelmail.spec 
Log Message:
buildreq gettext (194169)



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- squirrelmail.spec	4 Apr 2006 21:53:33 -0000	1.34
+++ squirrelmail.spec	6 Jun 2006 02:14:36 -0000	1.35
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 5.fc6
+Release: 6.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -230,6 +230,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> 1.4.6-6
+- buildreq gettext (194169)
+
 * Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
 - Fix Chinese and Korean too
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:17:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:17:33 -0400
Subject: rpms/eclipse/devel
	customBuildCallbacks.xml-add-pre.gather.bin.parts.patch, NONE, 1.1
	org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch,
	NONE, 1.1 eclipse.spec, 1.266, 1.267
Message-ID: <200606060217.k562HXMU018992@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18690

Modified Files:
	eclipse.spec 
Added Files:
	customBuildCallbacks.xml-add-pre.gather.bin.parts.patch 
	org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch 
Log Message:
add support for ppc64, s390, s390x

customBuildCallbacks.xml-add-pre.gather.bin.parts.patch:
 customBuildCallbacks.xml |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE customBuildCallbacks.xml-add-pre.gather.bin.parts.patch ---
Index: customBuildCallbacks.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.isv/customBuildCallbacks.xml,v
retrieving revision 1.5
diff -u -r1.5 customBuildCallbacks.xml
--- customBuildCallbacks.xml	14 Dec 2005 00:07:22 -0000	1.5
+++ customBuildCallbacks.xml	5 Jun 2006 01:18:34 -0000
@@ -80,6 +80,15 @@
 	</target>
 	
 	<!-- ===================================================================== -->
+        <!-- Steps to do before the target gather.bin.parts                        -->
+        <!-- Available parameters :                                                -->
+        <!--  destination.temp.folder - the directory plugins will be collected to -->
+        <!--  feature.directory - the directory containing the resulting feature   -->
+        <!-- ===================================================================== -->
+        <target name="pre.gather.bin.parts">
+        </target>
+
+	<!-- ===================================================================== -->
 	<!-- Steps to do after the target gather.bin.parts                         -->
 	<!-- Available parameters :                                                -->
 	<!--   base.dir - root of the project                                      -->

org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch:
 platformOptions.txt |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch ---
Index: platformOptions.txt
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.isv/platformOptions.txt,v
retrieving revision 1.128
diff -u -r1.128 platformOptions.txt
--- platformOptions.txt	26 May 2006 18:06:29 -0000	1.128
+++ platformOptions.txt	5 Jun 2006 01:05:43 -0000
@@ -41,7 +41,6 @@
 ;../org.eclipse.ui.views.properties.tabbed/src
 ;../org.eclipse.ui.workbench/Eclipse UI
 ;../org.eclipse.ui.workbench/Eclipse UI Editor Support
-;../org.eclipse.ui.workbench/Eclipse UI Components
 ;../org.eclipse.ui.navigator/src
 ;../org.eclipse.ui.navigator.resources/src
 ;../org.eclipse.ui.workbench.texteditor/src


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- eclipse.spec	5 Jun 2006 03:47:07 -0000	1.266
+++ eclipse.spec	6 Jun 2006 02:17:30 -0000	1.267
@@ -45,7 +45,7 @@
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
-Source11:	%{name}-fedora-splash-3.2rc6.png
+Source11:	%{name}-fedora-splash-3.2rc7.png
 Source16:       %{name}-copy-platform.sh
 Source17:       %{name}-efj-wrapper.sh
 %if %{redhat}
@@ -127,9 +127,14 @@
 # We need to disable junit4 and apt until GCJ can handle Java5 code
 Patch55: 	%{name}-disable-junit4-apt.patch
 
+# these patches should be in 3.2 final
+Patch60:	customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
+Patch61:	org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch
+
+
 
 %if %{gcj_support}
-ExcludeArch: ppc64 s390 s390x
+ExcludeArch: s390 s390x ppc64
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
@@ -368,6 +373,14 @@
 %prep
 %setup -q -c
 
+pushd plugins/org.eclipse.platform.doc.isv
+%patch60 -p0
+%patch61 -p0 
+popd 
+pushd plugins/org.eclipse.platform.doc.user
+%patch60 -p0
+popd
+
 # I hate spaces in paths with patch!
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
@@ -640,11 +653,23 @@
 #  fi
 #done
 
-
 %build
 env
 ORIGCLASSPATH=$CLASSPATH
 
+# nasty hack to get these arches suppport
+%ifarch ppc4 s390 s390x
+  for f in $(find -name \*x86_64\*); do
+    mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
+  done
+  for f in $(find -name \*x86_64\*); do
+    mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
+  done
+  find -type f -exec sed --in-place "s/x86_64/%{_arch}/g" "{}" \;
+%endif 
+
+exit 1
+
 # Bootstrapping is 3 parts:
 # 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
 # 2. Build ecj with gcj-built ecj ("javac")



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:21:06 -0400
Subject: rpms/system-config-boot/devel system-config-boot.spec,1.11,1.12
Message-ID: <200606060221.k562L6hM023329@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-boot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23264

Modified Files:
	system-config-boot.spec 
Log Message:
Added missing BR



Index: system-config-boot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- system-config-boot.spec	7 Feb 2006 13:56:07 -0000	1.11
+++ system-config-boot.spec	6 Jun 2006 02:21:03 -0000	1.12
@@ -2,7 +2,7 @@
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
 Version: 0.2.11
-Release: 1.2
+Release: 3
 URL: http://fedora.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -18,6 +18,7 @@
 Obsoletes: redhat-config-boot
 Provides: redhat-config-boot = %{version}
 BuildRequires: desktop-file-utils 
+BuildRequires: perl(XML::Parser)
 
 %description
 system-config-boot is a graphical user interface that allows 
@@ -63,6 +64,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-boot
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-3
+- Added missing BuildRequire on perl-XML-Parser
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:24:09 -0400
Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.21,1.22
Message-ID: <200606060224.k562O9cr024409@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24317

Modified Files:
	gnome-user-docs.spec 
Log Message:
 fix build reqs



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-user-docs.spec	11 Apr 2006 05:03:30 -0000	1.21
+++ gnome-user-docs.spec	6 Jun 2006 02:24:07 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
 Version:        2.14.2
-Release:	2 
+Release:	3
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
@@ -13,6 +13,7 @@
 PreReq: scrollkeeper >= 0.3.11
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.5.6
+BuildRequires: pkg-config
 
 %description
 This package contains end user documentation for the GNOME desktop 
@@ -40,13 +41,16 @@
 %postun
 scrollkeeper-update
 exit 0
-
+b
 %files
 %defattr(-, root, root,-)
 %{_datadir}/gnome
 %{_datadir}/omf
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-3
+- Fix BuildRequires
+
 * Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-2
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:27:18 -0400
Subject: rpms/system-config-cluster/devel system-config-cluster.spec, 1.9,
	1.10
Message-ID: <200606060227.k562RIB8025517@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-cluster/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25456

Modified Files:
	system-config-cluster.spec 
Log Message:
Added missing BR



Index: system-config-cluster.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-cluster/devel/system-config-cluster.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- system-config-cluster.spec	9 Jan 2006 15:36:46 -0000	1.9
+++ system-config-cluster.spec	6 Jun 2006 02:27:15 -0000	1.10
@@ -2,7 +2,7 @@
 Summary: system-config-cluster is a utility which allows you to manage cluster configuration in a graphical setting.
 Name: system-config-cluster
 Version: 1.0.24
-Release: 1.0
+Release: 2
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,6 +13,7 @@
 Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
+BuildRequires: perl(XML::Parser)
 
 %description
 system-config-cluster is a utility which allows you to manage cluster configuuration in a graphical setting.
@@ -50,6 +51,9 @@
 %config %{_sysconfdir}/security/console.apps/system-config-cluster
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.0.24-2
+- Added missing buildreq for perl-XML-Parser
+
 * Mon Jan 09 2006 Jim Parsons <jparsons at redhat.com> 1.0.24-1
   -  Build for fedora 
 * Tue Dec 20 2005 Jim Parsons <jparsons at redhat.com> 1.0.23-1



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:29:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:29:51 -0400
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.21,1.22
Message-ID: <200606060229.k562To62026535@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-lvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26503

Modified Files:
	system-config-lvm.spec 
Log Message:
Add missing BR


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- system-config-lvm.spec	10 Feb 2006 16:28:30 -0000	1.21
+++ system-config-lvm.spec	6 Jun 2006 02:29:48 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
 Version: 1.0.13
-Release: 1.0
+Release: 2
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,7 @@
 Requires: lvm2 >= 2.00.20
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
+BuildRequires: perl(XML::Parser)
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.
@@ -51,6 +52,9 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.0.13-2
+- Add missing BR of perl-XML-Parser
+
 * Fri Feb 10 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.13-1.0
   - Fix failure to display all unused space
 * Mon Feb 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.12-1.0



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:37:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:37:13 -0400
Subject: rpms/libIDL/devel libIDL.spec,1.19,1.20
Message-ID: <200606060237.k562bDFG027753@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27523

Modified Files:
	libIDL.spec 
Log Message:
fix build reqs



Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libIDL.spec	23 May 2006 18:56:34 -0000	1.19
+++ libIDL.spec	6 Jun 2006 02:37:10 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
 Version: 0.8.6
-Release: 3
+Release: 4
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
@@ -10,6 +10,7 @@
 BuildRequires: pkgconfig >= 0.8
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: automake14 libtool autoconf
+BuildRequires: flex
 
 %description
 libIDL is a library for parsing IDL (Interface Definition Language). 
@@ -75,6 +76,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-4
+- Fix missing BuildRequires
+
 * Tue May 23 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-3
 - Fix multilib conflicts
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:41:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:41:37 -0400
Subject: rpms/system-config-bind/devel system-config-bind.spec,1.50,1.51
Message-ID: <200606060241.k562fbv4028675@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28621

Modified Files:
	system-config-bind.spec 
Log Message:
Adding missing BR



Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-bind.spec	8 Mar 2006 22:06:04 -0000	1.50
+++ system-config-bind.spec	6 Jun 2006 02:41:34 -0000	1.51
@@ -8,7 +8,7 @@
 Source0: 	%{name}-%{version}-%{release}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
-BuildRequires:  python, gettext, make, bind
+BuildRequires:  python, gettext, make, bind, intltool
 Requires: 	python >= 2.2
 Requires: 	pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
 Requires: 	bind, bind-utils



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:46:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:46:38 -0400
Subject: rpms/system-config-services/devel system-config-services.spec, 1.32,
	1.33
Message-ID: <200606060246.k562kcwK003030@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-services/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1485

Modified Files:
	system-config-services.spec 
Log Message:
Added missing (Build)Requires



Index: system-config-services.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-services.spec	3 Mar 2006 15:45:15 -0000	1.32
+++ system-config-services.spec	6 Jun 2006 02:46:35 -0000	1.33
@@ -2,7 +2,7 @@
 Summary: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
 Version: 0.9.0
-Release: 1
+Release: 2
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -16,9 +16,11 @@
 Requires: python >= 2.3.0
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
-BuildRequires: automake
+BuildRequires: automake, perl(XML::Parser)
 Obsoletes: serviceconf
 Obsoletes: redhat-config-services
+Requires(post): gtk2
+Requires(postun): gtk2
 
 %description
 system-config-services is a utility which allows you to configure which services
@@ -73,6 +75,10 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.9.0-2
+- Added BuildRequires perl-XML-Parser (#194179)
+- Added Requires(post) and (postun) gtk2
+
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.0
 - require hicolor-icon-theme (#182878, #182879)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 02:56:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 22:56:39 -0400
Subject: rpms/system-config-soundcard/devel system-config-soundcard.spec,
	1.38, 1.39
Message-ID: <200606060256.k562udop023502@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23489

Modified Files:
	system-config-soundcard.spec 
Log Message:
Fixing missing (Build)Requires


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- system-config-soundcard.spec	27 Mar 2006 13:10:12 -0000	1.38
+++ system-config-soundcard.spec	6 Jun 2006 02:56:36 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 1.2.17
-Release: 5
+Release: 6
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -15,7 +15,7 @@
 Patch3: system-config-soundcard-1.2.17-volume.patch
 Patch4: system-config-soundcard-1.2.17-log.patch
 BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
 Obsoletes: redhat-config-soundcard
 Requires: pygtk2
@@ -27,6 +27,8 @@
 Requires: alsa-utils >= 1.0.11
 Requires: alsa-lib
 PreReq: hicolor-icon-theme
+Requires(post): gtk2
+Requires(postun): gtk2
 
 %description
 system-config-soundcard is a graphical user interface that 
@@ -94,6 +96,10 @@
 %ghost /root/scsound.log
 
 %changelog
+* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.2.17-6
+- Added missing BuildRequires intltool
+- Added Requires(post) and (postun) on gtk2
+
 * Wed Mar 27 2006 Martin Stransky <stransky at redhat.com> 1.2.17-5
 - added a log entry
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:01:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:01:45 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.27,1.28
Message-ID: <200606060301.k5631jDp023658@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23643

Modified Files:
	libgnomeprintui22.spec 
Log Message:
Rebuild



Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libgnomeprintui22.spec	11 Feb 2006 03:59:27 -0000	1.27
+++ libgnomeprintui22.spec	6 Jun 2006 03:01:41 -0000	1.28
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 1.2.1
+Release: 2
 Source0: libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -101,6 +101,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-2
+- Rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:09:40 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.41,
	1.42
Message-ID: <200606060309.k5639eRr023781@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23741

Modified Files:
	gnome-volume-manager.spec 
Log Message:
fix build reqs



Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-volume-manager.spec	22 May 2006 11:25:16 -0000	1.41
+++ gnome-volume-manager.spec	6 Jun 2006 03:09:37 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.15
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5.0
+BuildRequires: perl-XML-Parser
 Requires: gnome-mime-data, hal >= 0.5.0, kernel >= 2.6, control-center >= 2.0
 Requires: dbus >= 0.60
 Requires: gthumb
@@ -82,6 +83,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.5.15-2
+- add missing BuildRequires
+
 * Mon May 22 2006 Radek Vok??l <rvokal at redhat.com> 1.5.15-1.2
 - rebuilt against new libnotify
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:13:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:13:15 -0400
Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.22,1.23
Message-ID: <200606060313.k563DFwt002137@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23800

Modified Files:
	gnome-user-docs.spec 
Log Message:
fix package names



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-user-docs.spec	6 Jun 2006 02:24:07 -0000	1.22
+++ gnome-user-docs.spec	6 Jun 2006 03:13:12 -0000	1.23
@@ -13,7 +13,7 @@
 PreReq: scrollkeeper >= 0.3.11
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.5.6
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
 
 %description
 This package contains end user documentation for the GNOME desktop 
@@ -41,7 +41,7 @@
 %postun
 scrollkeeper-update
 exit 0
-b
+
 %files
 %defattr(-, root, root,-)
 %{_datadir}/gnome



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:21:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:21:52 -0400
Subject: rpms/libgnomecanvas/devel libgnomecanvas.spec,1.30,1.31
Message-ID: <200606060321.k563LqKN018810@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecanvas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18761

Modified Files:
	libgnomecanvas.spec 
Log Message:
Rebuild



Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgnomecanvas.spec	23 May 2006 18:38:29 -0000	1.30
+++ libgnomecanvas.spec	6 Jun 2006 03:21:49 -0000	1.31
@@ -8,7 +8,7 @@
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
 Version: 2.14.0
-Release: 2
+Release: 3
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -86,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
+- Rebuild
+
 * Tue May 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
 - Fix multilib conflicts
 - Don't ship .la files



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:27:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:27:02 -0400
Subject: rpms/libgnomeui/devel libgnomeui.spec,1.46,1.47
Message-ID: <200606060327.k563R2Q4020691@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20605

Modified Files:
	libgnomeui.spec 
Log Message:
fix build reqs



Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libgnomeui.spec	8 May 2006 16:51:03 -0000	1.46
+++ libgnomeui.spec	6 Jun 2006 03:26:59 -0000	1.47
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.15.1
-Release: 4
+Release: 5
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -62,6 +62,7 @@
 BuildRequires: fontconfig
 BuildRequires: gnome-keyring-devel
 BuildRequires: libjpeg-devel
+BuildRequires: perl-XML-Parser
 
 %description
 
@@ -160,6 +161,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-5
+- Fix BuildRequires
+
 * Mon May  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-4
 - Update to 2.15.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:28:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:28:04 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.14,1.15
Message-ID: <200606060328.k563S49i021141@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21116

Modified Files:
	libXfont.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
- Added "Requires: libfontenc-devel" for (#185778)



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXfont.spec	1 Apr 2006 23:12:51 -0000	1.14
+++ libXfont.spec	6 Jun 2006 03:28:02 -0000	1.15
@@ -1,12 +1,12 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.1.0
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -27,6 +27,7 @@
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 # NOTE: libXfont headers include proto headers, so this is needed.
 Requires: xorg-x11-proto-devel
+Requires: libfontenc-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -96,7 +97,10 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
-* Sat Apr  1 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
+- Added "Requires: libfontenc-devel" for (#185778)
+
+* Sat Apr 01 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 for crash fix and new headers
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2



From fedora-cvs-commits at redhat.com  Tue Jun  6 03:51:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 5 Jun 2006 23:51:17 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.38,1.39
Message-ID: <200606060351.k563pHFG008289@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8214

Modified Files:
	libbonobo.spec 
Log Message:
Rebuild



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libbonobo.spec	14 Mar 2006 20:09:58 -0000	1.38
+++ libbonobo.spec	6 Jun 2006 03:51:10 -0000	1.39
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.14.0
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -116,6 +116,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-2
+- Rebuild
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1
 - Update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:06:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:06:45 -0400
Subject: rpms/libgnome/devel libgnome.spec,1.56,1.57
Message-ID: <200606060406.k5646jD0012558@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12492

Modified Files:
	libgnome.spec 
Log Message:
Rebuild



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libgnome.spec	11 Apr 2006 04:25:01 -0000	1.56
+++ libgnome.spec	6 Jun 2006 04:06:32 -0000	1.57
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.14.1
-Release: 2
+Release: 3
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -156,6 +156,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+- Rebuild
+
 * Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:07:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:07:33 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc6.bz2.sign, NONE, 1.1 .cvsignore,
	1.448, 1.449 kernel-2.6.spec, 1.2250, 1.2251 sources, 1.392,
	1.393 upstream, 1.358, 1.359 patch-2.6.17-rc5-git11.bz2.sign,
	1.1, NONE patch-2.6.17-rc5.bz2.sign, 1.1, NONE
Message-ID: <200606060407.k5647Xxi012727@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12699

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc6.bz2.sign 
Removed Files:
	patch-2.6.17-rc5-git11.bz2.sign patch-2.6.17-rc5.bz2.sign 
Log Message:
rc6


--- NEW FILE patch-2.6.17-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEhNo0yGugalF9Dw4RAjSUAJ9r0wI7vt7VHudXZToLunn1diJDDgCgjbSE
u1pUdXTXKBezAeKN2op6Lq0=
=a77Y
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- .cvsignore	4 Jun 2006 18:35:50 -0000	1.448
+++ .cvsignore	6 Jun 2006 04:07:29 -0000	1.449
@@ -2,8 +2,5 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-xen-20060524.tar.bz2
-patch-2.6.17-rc5.bz2
-patch-2.6.17-rc5-git8.bz2
 xen-20060602.tar.bz2
-patch-2.6.17-rc5-git11.bz2
+patch-2.6.17-rc6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2250
retrieving revision 1.2251
diff -u -r1.2250 -r1.2251
--- kernel-2.6.spec	5 Jun 2006 18:06:49 -0000	1.2250
+++ kernel-2.6.spec	6 Jun 2006 04:07:29 -0000	1.2251
@@ -234,8 +234,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-rc5.bz2
-Patch2: patch-2.6.17-rc5-git11.bz2
+Patch1: patch-2.6.17-rc6.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -771,7 +770,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1761,6 +1759,9 @@
 %endif
 
 %changelog
+* Tue Jun  6 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc6. Special 6/6/6 edition, what could go wrong?
+
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com>
 - Do PCI config space restore on resume in reverse.
 - Make Powernow-k7 work again.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- sources	5 Jun 2006 17:10:34 -0000	1.392
+++ sources	6 Jun 2006 04:07:30 -0000	1.393
@@ -1,4 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-55623238bcf132c3f3fc8af2e333a80a  patch-2.6.17-rc5.bz2
+e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
 de03b1f1d050bb6c3bd68723299fa65b  xen-20060602.tar.bz2
-91c393acab909555bc7bb01833227935  patch-2.6.17-rc5-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- upstream	4 Jun 2006 18:36:03 -0000	1.358
+++ upstream	6 Jun 2006 04:07:30 -0000	1.359
@@ -1,3 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.17-rc5.bz2
-patch-2.6.17-rc5-git11.bz2
+patch-2.6.17-rc6.bz2


--- patch-2.6.17-rc5-git11.bz2.sign DELETED ---


--- patch-2.6.17-rc5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:23:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:23:23 -0400
Subject: rpms/libXrandr/devel libXrandr.spec,1.11,1.12
Message-ID: <200606060423.k564NNmh029763@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29714

Modified Files:
	libXrandr.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-2
- Added "BuildRequires: pkgconfig" for (#193428)
- Replace "makeinstall" with "make install DESTDIR=..." for (#192724)
- Remove package ownership of mandir/libdir/etc.



Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXrandr.spec	27 Apr 2006 20:34:44 -0000	1.11
+++ libXrandr.spec	6 Jun 2006 04:23:18 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.1.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 #BuildRequires: randrproto >= 0.99
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -45,9 +46,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,7 +62,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXrandr.so.2
 %{_libdir}/libXrandr.so.2.0.0
 
@@ -76,11 +76,15 @@
 %{_libdir}/libXrandr.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xrandr.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-2
+- Added "BuildRequires: pkgconfig" for (#193428)
+- Replace "makeinstall" with "make install DESTDIR=..." for (#192724)
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
 - Update to 1.1.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:24:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:24:11 -0400
Subject: rpms/libXrandr/devel .cvsignore,1.7,1.8
Message-ID: <200606060424.k564OBJb029972@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29945

Modified Files:
	.cvsignore 
Log Message:
Update .cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Apr 2006 20:34:44 -0000	1.7
+++ .cvsignore	6 Jun 2006 04:24:06 -0000	1.8
@@ -1 +1,3 @@
 libXrandr-1.1.1.tar.bz2
+*.tar.bz2
+*.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:35:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:35:29 -0400
Subject: rpms/kernel/FC-5 linux-2.6-ppc-clear-ipis-on-kdump.patch, NONE,
	1.1 linux-2.6-ppc-eoi-interrupts-for-kdump.patch, NONE,
	1.1 Makefile.config, 1.37, 1.38 kernel-2.6.spec, 1.2132, 1.2133
Message-ID: <200606060435.k564ZTm1031456@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31375

Modified Files:
	Makefile.config kernel-2.6.spec 
Added Files:
	linux-2.6-ppc-clear-ipis-on-kdump.patch 
	linux-2.6-ppc-eoi-interrupts-for-kdump.patch 
Log Message:
Add a PPC64 kdump kernel.


linux-2.6-ppc-clear-ipis-on-kdump.patch:
 xics.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-ppc-clear-ipis-on-kdump.patch ---
--- 2616-git5-k1/arch/powerpc/platforms/pseries/xics.c.orig	2006-04-04 19:27:24.000000000 -0700
+++ 2616-git5-k1/arch/powerpc/platforms/pseries/xics.c	2006-04-04 20:06:19.000000000 -0700
@@ -641,22 +641,27 @@ void xics_teardown_cpu(int secondary)
 	iosync();
 
 	/*
+	 * Clear IPI
+	 */
+	ops->qirr_info(cpu, 0xff);
+	/*
+	 * we need to EOI the IPI if we got here from kexec down IPI
+	 *
+	 * probably need to check all the other interrupts too
+	 * should we be flagging idle loop instead?
+	 * or creating some task to be scheduled?
+	 */
+	ops->xirr_info_set(cpu, XICS_IPI);
+
+	/*
 	 * Some machines need to have at least one cpu in the GIQ,
 	 * so leave the master cpu in the group.
 	 */
-	if (secondary) {
-		/*
-		 * we need to EOI the IPI if we got here from kexec down IPI
-		 *
-		 * probably need to check all the other interrupts too
-		 * should we be flagging idle loop instead?
-		 * or creating some task to be scheduled?
-		 */
-		ops->xirr_info_set(cpu, XICS_IPI);
+	if (secondary) 
 		rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,
 			(1UL << interrupt_server_size) - 1 -
 			default_distrib_server, 0);
-	}
+	
 }
 
 #ifdef CONFIG_HOTPLUG_CPU

linux-2.6-ppc-eoi-interrupts-for-kdump.patch:
 crash.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE linux-2.6-ppc-eoi-interrupts-for-kdump.patch ---
Panicking from an interrupt handler means we fail to EOI the interrupt, and
so the second kernel never gets that interrupt ever again. We also see hangs
on JS20 where we take interrupts in the second kernel early during boot.

This patch fixes both those problems, and although it adds more code to the
crash path I think it is the best solution.

Signed-off-by: Michael Ellerman <<a href="https://ozlabs.org/mailman/listinfo/linuxppc-dev">michael at ellerman.id.au</a>>
---

 arch/powerpc/kernel/crash.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Index: kdump/arch/powerpc/kernel/crash.c
===================================================================
--- kdump.orig/arch/powerpc/kernel/crash.c
+++ kdump/arch/powerpc/kernel/crash.c
@@ -22,6 +22,7 @@
 #include <linux/elf.h>
 #include <linux/elfcore.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/types.h>
 
 #include <asm/processor.h>
@@ -174,6 +175,8 @@ static void crash_kexec_prepare_cpus(voi
 
 void default_machine_crash_shutdown(struct pt_regs *regs)
 {
+	unsigned int irq;
+
 	/*
 	 * This function is only called after the system
 	 * has paniced or is otherwise in a critical state.
@@ -186,6 +189,16 @@ void default_machine_crash_shutdown(stru
 	 */
 	local_irq_disable();
 
+	for_each_irq(irq) {
+		struct irq_desc *desc = irq_descp(irq);
+
+		if (desc->status & IRQ_INPROGRESS)
+			desc->handler->end(irq);
+
+		if (!(desc->status & IRQ_DISABLED))
+			desc->handler->disable(irq);
+	}
+
 	if (ppc_md.kexec_cpu_down)
 		ppc_md.kexec_cpu_down(1, 0);
 


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/Makefile.config,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.config	29 Mar 2006 18:28:28 -0000	1.37
+++ Makefile.config	6 Jun 2006 04:35:22 -0000	1.38
@@ -11,7 +11,7 @@
 	$(CFG)-ppc64iseries.config \
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
-	$(CFG)-ppc64.config $(CFG)-ia64.config \
+	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
 	$(CFG)-i686-xen0-PAE.config $(CFG)-i686-xenU-PAE.config \
 	$(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
@@ -108,6 +108,9 @@
 kernel-$(VERSION)-ppc64iseries.config: configs/config-powerpc64-iseries temp-powerpc64-generic
 	perl scripts/merge.pl $^ powerpc > $@
 
+kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
+	perl scripts/merge.pl $^ powerpc > $@
+
 kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic
 	perl scripts/merge.pl $^ s390 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2132
retrieving revision 1.2133
diff -u -r1.2132 -r1.2133
--- kernel-2.6.spec	5 Jun 2006 18:30:57 -0000	1.2132
+++ kernel-2.6.spec	6 Jun 2006 04:35:22 -0000	1.2133
@@ -49,6 +49,10 @@
 %define buildkdump 0
 %endif
 
+%ifarch ppc64
+%define buildkdump 1
+%endif
+
 # ... and XenPAE only on i686
 %ifnarch i686
 %define buildxenPAE 0
@@ -193,22 +197,23 @@
 Source24: kernel-%{kversion}-x86_64.config
 Source25: kernel-%{kversion}-ppc64.config
 Source26: kernel-%{kversion}-ppc64iseries.config
-Source27: kernel-%{kversion}-s390.config
-Source28: kernel-%{kversion}-s390x.config
-Source29: kernel-%{kversion}-ppc.config
-Source30: kernel-%{kversion}-ppc-smp.config
-Source31: kernel-%{kversion}-ia64.config
-Source32: kernel-%{kversion}-i686-xen0.config
-Source33: kernel-%{kversion}-i686-xenU.config
-Source34: kernel-%{kversion}-i686-kdump.config
-Source35: kernel-%{kversion}-x86_64-kdump.config
-#Source36: kernel-%{kversion}-sparc.config
-#Source37: kernel-%{kversion}-sparc64.config
-#Source38: kernel-%{kversion}-sparc64-smp.config
-Source39: kernel-%{kversion}-i686-xen0-PAE.config
-Source40: kernel-%{kversion}-i686-xenU-PAE.config
-Source41: kernel-%{kversion}-x86_64-xen0.config
-Source42: kernel-%{kversion}-x86_64-xenU.config
+Source27: kernel-%{kversion}-ppc64-kdump.config
+Source28: kernel-%{kversion}-s390.config
+Source29: kernel-%{kversion}-s390x.config
+Source30: kernel-%{kversion}-ppc.config
+Source31: kernel-%{kversion}-ppc-smp.config
+Source32: kernel-%{kversion}-ia64.config
+Source33: kernel-%{kversion}-i686-xen0.config
+Source34: kernel-%{kversion}-i686-xenU.config
+Source35: kernel-%{kversion}-i686-kdump.config
+Source36: kernel-%{kversion}-x86_64-kdump.config
+#Source37: kernel-%{kversion}-sparc.config
+#Source38: kernel-%{kversion}-sparc64.config
+#Source39: kernel-%{kversion}-sparc64-smp.config
+Source40: kernel-%{kversion}-i686-xen0-PAE.config
+Source41: kernel-%{kversion}-i686-xenU-PAE.config
+Source42: kernel-%{kversion}-x86_64-xen0.config
+Source43: kernel-%{kversion}-x86_64-xenU.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -242,6 +247,8 @@
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 Patch318: linux-2.6-ppc32-check-legacy-io.patch
 Patch319: linux-2.6-g5-therm-shutdown.patch
+Patch320: linux-2.6-ppc-clear-ipis-on-kdump.patch
+Patch321: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -785,6 +792,10 @@
 %patch318 -p1
 # Avoid thermal shutdown on some G5 machines
 %patch319 -p1
+#
+%patch320 -p1
+#
+%patch321 -p1
 
 #
 # Xen
@@ -1685,6 +1696,9 @@
 %endif
 
 %changelog
+* Tue Jun  6 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2133_FC5]
+- Add a PPC64 kdump kernel.
+
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2132_FC5]
 - 2.6.16.20
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:35:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:35:29 -0400
Subject: rpms/kernel/FC-5/configs config-powerpc64-kdump, NONE,
	1.1 config-powerpc64, 1.10, 1.11
Message-ID: <200606060435.k564ZTHG031466@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv31375/configs

Modified Files:
	config-powerpc64 
Added Files:
	config-powerpc64-kdump 
Log Message:
Add a PPC64 kdump kernel.



--- NEW FILE config-powerpc64-kdump ---
# CONFIG_NUMA is not set
# CONFIG_EMBEDDED is not set
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_PROC_VMCORE=y


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc64,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-powerpc64	13 Feb 2006 00:33:52 -0000	1.10
+++ config-powerpc64	6 Jun 2006 04:35:26 -0000	1.11
@@ -5,6 +5,7 @@
 CONFIG_PPC_CELL=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
+CONFIG_KEXEC=y
 CONFIG_PPC_PMAC=y
 CONFIG_IBMEBUS=y
 CONFIG_SPU_FS=m



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:35:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:35:53 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-kdump, NONE,
	1.1 config-powerpc64, 1.10, 1.11
Message-ID: <200606060435.k564Zq9h031570@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv31515/configs

Modified Files:
	config-powerpc64 
Added Files:
	config-powerpc64-kdump 
Log Message:
Add a kdump kernel for PPC64 (Don Zickus)


--- NEW FILE config-powerpc64-kdump ---
# CONFIG_NUMA is not set
# CONFIG_EMBEDDED is not set
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_PROC_VMCORE=y


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-powerpc64	13 Feb 2006 00:33:52 -0000	1.10
+++ config-powerpc64	6 Jun 2006 04:35:48 -0000	1.11
@@ -5,6 +5,7 @@
 CONFIG_PPC_CELL=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
+CONFIG_KEXEC=y
 CONFIG_PPC_PMAC=y
 CONFIG_IBMEBUS=y
 CONFIG_SPU_FS=m



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:35:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:35:53 -0400
Subject: rpms/kernel/devel linux-2.6-ppc-clear-ipis-on-kdump.patch, NONE,
	1.1 linux-2.6-ppc-eoi-interrupts-for-kdump.patch, NONE,
	1.1 Makefile.config, 1.37, 1.38 kernel-2.6.spec, 1.2251, 1.2252
Message-ID: <200606060435.k564ZokO031552@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31515

Modified Files:
	Makefile.config kernel-2.6.spec 
Added Files:
	linux-2.6-ppc-clear-ipis-on-kdump.patch 
	linux-2.6-ppc-eoi-interrupts-for-kdump.patch 
Log Message:
Add a kdump kernel for PPC64 (Don Zickus)

linux-2.6-ppc-clear-ipis-on-kdump.patch:
 xics.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-ppc-clear-ipis-on-kdump.patch ---
--- 2616-git5-k1/arch/powerpc/platforms/pseries/xics.c.orig	2006-04-04 19:27:24.000000000 -0700
+++ 2616-git5-k1/arch/powerpc/platforms/pseries/xics.c	2006-04-04 20:06:19.000000000 -0700
@@ -641,22 +641,27 @@ void xics_teardown_cpu(int secondary)
 	iosync();
 
 	/*
+	 * Clear IPI
+	 */
+	ops->qirr_info(cpu, 0xff);
+	/*
+	 * we need to EOI the IPI if we got here from kexec down IPI
+	 *
+	 * probably need to check all the other interrupts too
+	 * should we be flagging idle loop instead?
+	 * or creating some task to be scheduled?
+	 */
+	ops->xirr_info_set(cpu, XICS_IPI);
+
+	/*
 	 * Some machines need to have at least one cpu in the GIQ,
 	 * so leave the master cpu in the group.
 	 */
-	if (secondary) {
-		/*
-		 * we need to EOI the IPI if we got here from kexec down IPI
-		 *
-		 * probably need to check all the other interrupts too
-		 * should we be flagging idle loop instead?
-		 * or creating some task to be scheduled?
-		 */
-		ops->xirr_info_set(cpu, XICS_IPI);
+	if (secondary) 
 		rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,
 			(1UL << interrupt_server_size) - 1 -
 			default_distrib_server, 0);
-	}
+	
 }
 
 #ifdef CONFIG_HOTPLUG_CPU

linux-2.6-ppc-eoi-interrupts-for-kdump.patch:
 crash.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE linux-2.6-ppc-eoi-interrupts-for-kdump.patch ---
Panicking from an interrupt handler means we fail to EOI the interrupt, and
so the second kernel never gets that interrupt ever again. We also see hangs
on JS20 where we take interrupts in the second kernel early during boot.

This patch fixes both those problems, and although it adds more code to the
crash path I think it is the best solution.

Signed-off-by: Michael Ellerman <<a href="https://ozlabs.org/mailman/listinfo/linuxppc-dev">michael at ellerman.id.au</a>>
---

 arch/powerpc/kernel/crash.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Index: kdump/arch/powerpc/kernel/crash.c
===================================================================
--- kdump.orig/arch/powerpc/kernel/crash.c
+++ kdump/arch/powerpc/kernel/crash.c
@@ -22,6 +22,7 @@
 #include <linux/elf.h>
 #include <linux/elfcore.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/types.h>
 
 #include <asm/processor.h>
@@ -174,6 +175,8 @@ static void crash_kexec_prepare_cpus(voi
 
 void default_machine_crash_shutdown(struct pt_regs *regs)
 {
+	unsigned int irq;
+
 	/*
 	 * This function is only called after the system
 	 * has paniced or is otherwise in a critical state.
@@ -186,6 +189,16 @@ void default_machine_crash_shutdown(stru
 	 */
 	local_irq_disable();
 
+	for_each_irq(irq) {
+		struct irq_desc *desc = irq_descp(irq);
+
+		if (desc->status & IRQ_INPROGRESS)
+			desc->handler->end(irq);
+
+		if (!(desc->status & IRQ_DISABLED))
+			desc->handler->disable(irq);
+	}
+
 	if (ppc_md.kexec_cpu_down)
 		ppc_md.kexec_cpu_down(1, 0);
 


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.config	10 Apr 2006 19:14:06 -0000	1.37
+++ Makefile.config	6 Jun 2006 04:35:47 -0000	1.38
@@ -11,7 +11,7 @@
 	$(CFG)-ppc64iseries.config \
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
-	$(CFG)-ppc64.config $(CFG)-ia64.config \
+	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
 	$(CFG)-i686-xen0-PAE.config $(CFG)-i686-xenU-PAE.config \
 	$(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
@@ -105,6 +105,9 @@
 kernel-$(VERSION)-ppc64iseries.config: configs/config-powerpc64-iseries temp-powerpc64-generic
 	perl scripts/merge.pl $^ powerpc > $@
 
+kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
+	perl scripts/merge.pl $^ powerpc > $@
+
 kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic
 	perl scripts/merge.pl $^ s390 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2251
retrieving revision 1.2252
diff -u -r1.2251 -r1.2252
--- kernel-2.6.spec	6 Jun 2006 04:07:29 -0000	1.2251
+++ kernel-2.6.spec	6 Jun 2006 04:35:47 -0000	1.2252
@@ -51,6 +51,10 @@
 %define buildkdump 0
 %endif
 
+%ifarch ppc64
+%define buildkdump 1
+%endif
+
 # ... and XenPAE only on i686
 %ifnarch i686
 %define buildxenPAE 0
@@ -211,25 +215,32 @@
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
 Source22: kernel-%{kversion}-i686-PAE.config
+
 Source23: kernel-%{kversion}-x86_64.config
-Source24: kernel-%{kversion}-ppc64.config
-Source25: kernel-%{kversion}-ppc64iseries.config
-Source26: kernel-%{kversion}-s390.config
-Source27: kernel-%{kversion}-s390x.config
-Source28: kernel-%{kversion}-ppc.config
-Source29: kernel-%{kversion}-ppc-smp.config
-Source30: kernel-%{kversion}-ia64.config
-Source31: kernel-%{kversion}-i686-xen0.config
-Source32: kernel-%{kversion}-i686-xenU.config
-Source33: kernel-%{kversion}-i686-kdump.config
-Source33: kernel-%{kversion}-x86_64-kdump.config
-#Source34: kernel-%{kversion}-sparc.config
-#Source35: kernel-%{kversion}-sparc64.config
-#Source36: kernel-%{kversion}-sparc64-smp.config
-Source37: kernel-%{kversion}-i686-xen0-PAE.config
-Source38: kernel-%{kversion}-i686-xenU-PAE.config
-Source39: kernel-%{kversion}-x86_64-xen0.config
-Source40: kernel-%{kversion}-x86_64-xenU.config
+Source24: kernel-%{kversion}-x86_64-kdump.config
+
+Source25: kernel-%{kversion}-ppc.config
+Source26: kernel-%{kversion}-ppc-smp.config
+Source27: kernel-%{kversion}-ppc64.config
+Source28: kernel-%{kversion}-ppc64iseries.config
+Source29: kernel-%{kversion}-ppc64-kdump.config
+
+Source30: kernel-%{kversion}-s390.config
+Source31: kernel-%{kversion}-s390x.config
+
+Source32: kernel-%{kversion}-ia64.config
+
+Source33: kernel-%{kversion}-i686-xen0.config
+Source34: kernel-%{kversion}-i686-xenU.config
+Source35: kernel-%{kversion}-i686-kdump.config
+Source36: kernel-%{kversion}-i686-xen0-PAE.config
+Source37: kernel-%{kversion}-i686-xenU-PAE.config
+Source38: kernel-%{kversion}-x86_64-xen0.config
+Source39: kernel-%{kversion}-x86_64-xenU.config
+
+#Source66: kernel-%{kversion}-sparc.config
+#Source67: kernel-%{kversion}-sparc64.config
+#Source68: kernel-%{kversion}-sparc64-smp.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -263,6 +274,8 @@
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
+Patch318: linux-2.6-ppc-clear-ipis-on-kdump.patch
+Patch319: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -820,6 +833,8 @@
 %patch314 -p1
 # No input layer on iseries
 %patch317 -p1
+%patch318 -p1
+%patch319 -p1
 
 #
 # Xen
@@ -1761,6 +1776,7 @@
 %changelog
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc6. Special 6/6/6 edition, what could go wrong?
+- Add a kdump kernel for PPC64 (Don Zickus)
 
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com>
 - Do PCI config space restore on resume in reverse.



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:41:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:41:36 -0400
Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.11,1.12
Message-ID: <200606060441.k564fa7V032660@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32619

Modified Files:
	libXxf86dga.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193507)
- Replace "makeinstall" with "make install DESTDIR=..." for (#192728)



Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXxf86dga.spec	27 Apr 2006 20:47:41 -0000	1.11
+++ libXxf86dga.spec	6 Jun 2006 04:41:25 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -43,7 +44,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +60,6 @@
 %defattr(-,root,root,-)
 # FIXME: Some of these files are missing %doc AUTHORS COPYING README INSTALL ChangeLog
 %doc COPYING ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXxf86dga.so.1
 %{_libdir}/libXxf86dga.so.1.0.0
 
@@ -70,11 +71,14 @@
 %{_libdir}/libXxf86dga.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xxf86dga.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193507)
+- Replace "makeinstall" with "make install DESTDIR=..." for (#192728)
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:46:54 -0400
Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.11,1.12
Message-ID: <200606060446.k564ks6u001288@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1015

Modified Files:
	libXxf86misc.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193508)
- Replace "makeinstall" with "make install DESTDIR=..." for (#192729)
- Remove package ownership of mandir/libdir/etc.



Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXxf86misc.spec	27 Apr 2006 21:02:51 -0000	1.11
+++ libXxf86misc.spec	6 Jun 2006 04:46:43 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -43,7 +44,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -69,11 +70,15 @@
 %{_libdir}/libXxf86misc.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xxf86misc.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193508)
+- Replace "makeinstall" with "make install DESTDIR=..." for (#192729)
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:52:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:52:06 -0400
Subject: rpms/libXres/devel libXres.spec,1.11,1.12
Message-ID: <200606060452.k564q6Qc010216@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9898

Modified Files:
	libXres.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193502)
- Replace "makeinstall" with "make install DESTDIR=..." for (#192725)
- Remove package ownership of mandir/libdir/etc.



Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXres.spec	27 Apr 2006 20:42:32 -0000	1.11
+++ libXres.spec	6 Jun 2006 04:51:53 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
@@ -42,9 +43,8 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +58,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXRes.so.1
 %{_libdir}/libXRes.so.1.0.0
 
@@ -73,11 +72,15 @@
 %{_libdir}/libXRes.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xres.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193502)
+- Replace "makeinstall" with "make install DESTDIR=..." for (#192725)
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:56:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:56:54 -0400
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.11,1.12
Message-ID: <200606060456.k564usUj016678@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16629

Modified Files:
	libXfontcache.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Replace "makeinstall" with "make install DESTDIR=..." for (#192720)
- Remove package ownership of mandir/libdir/etc.



Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXfontcache.spec	27 Apr 2006 19:56:16 -0000	1.11
+++ libXfontcache.spec	6 Jun 2006 04:56:45 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -46,9 +46,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,7 +62,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXfontcache.so.1
 %{_libdir}/libXfontcache.so.1.0.0
 
@@ -74,23 +73,21 @@
 %{_libdir}/libXfontcache.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xfontcache.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
-%{_mandir}/man3/Xfontcache.3*
-%{_mandir}/man3/FontCacheChangeCacheSettings.3x*
-%{_mandir}/man3/FontCacheGetCacheSettings.3x*
-%{_mandir}/man3/FontCacheGetCacheStatistics.3x*
-%{_mandir}/man3/FontCacheQueryExtension.3x*
-%{_mandir}/man3/FontCacheQueryVersion.3x*
+#%dir %{_mandir}/man3x
+%{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Replace "makeinstall" with "make install DESTDIR=..." for (#192720)
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Tue Jun  6 04:59:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 00:59:10 -0400
Subject: rpms/libXi/devel libXi.spec,1.11,1.12
Message-ID: <200606060459.k564xAvx017226@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17203

Modified Files:
	libXi.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Replace "makeinstall" with "make install DESTDIR=..." for (#192721)
- Remove package ownership of mandir/libdir/etc.



Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXi.spec	27 Apr 2006 19:59:17 -0000	1.11
+++ libXi.spec	6 Jun 2006 04:59:08 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -45,9 +45,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,7 +61,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXi.so.6
 %{_libdir}/libXi.so.6.0.0
 
@@ -73,11 +72,14 @@
 %{_libdir}/libXi.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xi.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Replace "makeinstall" with "make install DESTDIR=..." for (#192721)
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 05:02:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 01:02:09 -0400
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.14,1.15
Message-ID: <200606060502.k56529sK017781@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17732

Modified Files:
	libxkbfile.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2
- Added "BuildRequires: pkgconfig" for (#193424)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libxkbfile.spec	27 Apr 2006 20:06:08 -0000	1.14
+++ libxkbfile.spec	6 Jun 2006 05:02:02 -0000	1.15
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.3
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 
@@ -44,9 +45,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -60,7 +61,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libxkbfile.so.1
 %{_libdir}/libxkbfile.so.1.0.2
 
@@ -82,6 +82,11 @@
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2
+- Added "BuildRequires: pkgconfig" for (#193424)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
 - Update to 1.0.3
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 05:03:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 01:03:03 -0400
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.32,1.33
Message-ID: <200606060503.k56533Ag017937@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gconf-editor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17805

Modified Files:
	gconf-editor.spec 
Log Message:
Rebuild



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gconf-editor.spec	28 Mar 2006 20:12:34 -0000	1.32
+++ gconf-editor.spec	6 Jun 2006 05:02:57 -0000	1.33
@@ -8,7 +8,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 2.14.0
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -97,6 +97,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
+- Rebuild
+
 * Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
 - Use gconf_value_free instead of g_free (bug 186479)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 05:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 01:08:48 -0400
Subject: rpms/libxkbui/devel libxkbui.spec,1.11,1.12
Message-ID: <200606060508.k5658meq018981@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libxkbui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18957

Modified Files:
	libxkbui.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Added "BuildRequires: pkgconfig" for (#193425)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libxkbui.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/libxkbui.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxkbui.spec	27 Apr 2006 20:08:37 -0000	1.11
+++ libxkbui.spec	6 Jun 2006 05:08:45 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libxkbui runtime library
 Name: libxkbui
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
 BuildRequires: libxkbfile-devel
@@ -43,9 +44,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -59,7 +60,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libxkbui.so.1
 %{_libdir}/libxkbui.so.1.0.0
 
@@ -76,13 +76,18 @@
 %{_libdir}/pkgconfig/xkbui.pc
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Added "BuildRequires: pkgconfig" for (#193425)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Tue Jun  6 05:13:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 01:13:19 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.12,1.13
Message-ID: <200606060513.k565DJQf020496@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20474

Modified Files:
	libXpm.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 3.5.5-2
- Added "BuildRequires: pkgconfig" for (#193427)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXpm.spec	27 Apr 2006 20:33:22 -0000	1.12
+++ libXpm.spec	6 Jun 2006 05:13:15 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.5
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 # FIXME: Although ./configure checks for libXt and libXext, and indicates
@@ -51,7 +52,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -65,7 +67,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXpm.so.4
 %{_libdir}/libXpm.so.4.11.0
 
@@ -82,13 +83,16 @@
 %{_libdir}/libXpm.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xpm.pc
-%dir %{_mandir}
-# FIXME: This should be 'man1x'
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/*.1*
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 3.5.5-2
+- Added "BuildRequires: pkgconfig" for (#193427)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 26 2006 Adam Jackson <ajackson at redhat.com> 3.5.5-1
 - Update to 3.5.5
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 05:17:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 01:17:02 -0400
Subject: rpms/libXrender/devel libXrender.spec,1.12,1.13
Message-ID: <200606060517.k565H29t000598@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32754

Modified Files:
	libXrender.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-2
- Added "BuildRequires: pkgconfig" for (#193429)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXrender.spec	27 Apr 2006 20:37:48 -0000	1.12
+++ libXrender.spec	6 Jun 2006 05:16:59 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 
@@ -45,9 +46,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,7 +62,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXrender.so.1
 %{_libdir}/libXrender.so.1.3.0
 
@@ -74,10 +74,14 @@
 %{_libdir}/libXrender.a
 %endif
 %{_libdir}/libXrender.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-2
+- Added "BuildRequires: pkgconfig" for (#193429)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 0.9.1-1
 - Update to 0.9.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 05:33:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 01:33:01 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.133,1.134
Message-ID: <200606060533.k565X12n008604@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8550

Modified Files:
	gnome-applets.spec 
Log Message:
Rebuild



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-applets.spec	29 May 2006 02:37:59 -0000	1.133
+++ gnome-applets.spec	6 Jun 2006 05:32:45 -0000	1.134
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.14.2
-Release:  	2
+Release:  	3
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -197,6 +197,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
+- Rebuild
+
 * Sun May 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 06:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 02:19:08 -0400
Subject: rpms/pcmciautils/devel .cvsignore, 1.5, 1.6 pcmciautils-fedora.patch,
	1.3, 1.4 pcmciautils.spec, 1.15, 1.16 sources, 1.5, 1.6
Message-ID: <200606060619.k566J8qS022195@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21148

Modified Files:
	.cvsignore pcmciautils-fedora.patch pcmciautils.spec sources 
Log Message:
- more build requires (bug #194144)
- version 014



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Dec 2005 21:05:17 -0000	1.5
+++ .cvsignore	6 Jun 2006 06:19:05 -0000	1.6
@@ -1 +1 @@
-pcmciautils-011.tar.bz2
+pcmciautils-014.tar.bz2

pcmciautils-fedora.patch:
 Makefile |   29 +++++------------------------
 1 files changed, 5 insertions(+), 24 deletions(-)

Index: pcmciautils-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils-fedora.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcmciautils-fedora.patch	13 Dec 2005 21:05:17 -0000	1.3
+++ pcmciautils-fedora.patch	6 Jun 2006 06:19:05 -0000	1.4
@@ -1,19 +1,17 @@
---- pcmciautils-005/Makefile.foo	2005-07-08 22:03:40.000000000 -0400
-+++ pcmciautils-005/Makefile	2005-07-08 22:05:02.000000000 -0400
-@@ -96,8 +96,7 @@
- GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
- 
- # use '-Os' optimization if available, else use -O2
--OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
--		then echo "-Os"; else echo "-O2" ; fi}
-+OPTIMIZATION := $(RPM_OPT_FLAGS)
- 
- # check if compiler option is supported
- cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
-@@ -134,24 +133,12 @@
+--- pcmciautils-014/Makefile.orig	2006-06-06 08:07:32.000000000 +0200
++++ pcmciautils-014/Makefile	2006-06-06 08:10:26.000000000 +0200
+@@ -147,30 +147,11 @@
+ LIB_OBJS = -lc -lsysfs
  LIB_PCI_OBJS = -lc -lpci
- #LDFLAGS =
  
+-ifeq ($(strip $(STATIC)),true)
+-	LIB_OBJS = -lsysfs
+-	LIB_PCI_OBJS = -lpci
+-	LDFLAGS += -static
+-else
+-	LDFLAGS += -Wl,-warn-common
+-endif
+-
 -ifeq ($(strip $(V)),false)
 -	QUIET=@$(PWD)/build/ccdv
 -	HOST_PROGS=build/ccdv
@@ -21,44 +19,20 @@
 -	QUIET=
 -	HOST_PROGS=
 -endif
-+QUIET=
-+HOST_PROGS=
- 
+-
 -# if DEBUG is enabled, then we do not strip or optimize
 -ifeq ($(strip $(DEBUG)),true)
 -	CFLAGS  += -O1 -g -DDEBUG -D_GNU_SOURCE
--	LDFLAGS += -Wl,-warn-common
 -	STRIPCMD = /bin/true -Since_we_are_debugging
 -else
 -	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
--	LDFLAGS += -s -Wl,-warn-common
 -	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 -endif
++LIB_OBJS =  -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
++LIB_PCI_OBJS =  -lpci
 +CFLAGS  += $(OPTIMIZATION) -D_GNU_SOURCE
 +LDFLAGS += -Wl,-warn-common
 +STRIPCMD = /bin/true
  
- # if STARTUP is disabled, we can skip a few things
- ifeq ($(strip $(STARTUP)),false)
-@@ -165,7 +152,7 @@
- endif
- 
- 
--all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
-+all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
- 
- ccdv:
- 	@echo "Building ccdv"
---- pcmciautils-006/Makefile.foo	2005-07-20 17:25:13.000000000 -0400
-+++ pcmciautils-006/Makefile	2005-07-20 17:28:02.000000000 -0400
-@@ -129,8 +129,8 @@
- 
- #LIBC =
- CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
--LIB_OBJS = -lc -lsysfs
--LIB_PCI_OBJS = -lc -lpci
-+LIB_OBJS =  -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
-+LIB_PCI_OBJS =  -lpci
- #LDFLAGS =
- 
- QUIET=
+ # HOTPLUG or UDEV?
+ ifeq ($(strip $(UDEV)),false)


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcmciautils.spec	11 Feb 2006 04:57:29 -0000	1.15
+++ pcmciautils.spec	6 Jun 2006 06:19:05 -0000	1.16
@@ -1,8 +1,8 @@
 Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPL
-Version: 011
-Release: 1.2
+Version: 014
+Release: 1
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: sysfsutils-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
+Requires: /usr/bin/yacc /usr/bin/lex
 Patch1: pcmciautils-fedora.patch
 
 %description
@@ -40,6 +41,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jun 06 2006 Harald Hoyer <harald at redhat.com> - 014-1
+- more build requires (bug #194144)
+- version 014
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 011-1.2
 - bump again for double-long bug on ppc(64)
 
@@ -65,4 +70,4 @@
 - link libsysfs statically
 
 * Fri Jul 08 2005  Bill Nottingham <notting at redhat.com> 005-1
-- initial packaging
\ No newline at end of file
+- initial packaging


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Dec 2005 21:05:17 -0000	1.5
+++ sources	6 Jun 2006 06:19:05 -0000	1.6
@@ -1 +1 @@
-8a7a014ea8177cf4514032722b695a9e  pcmciautils-011.tar.bz2
+3f07c926875f6c5dcb83240f39725177  pcmciautils-014.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun  6 07:04:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 03:04:33 -0400
Subject: rpms/cdrtools/FC-5 cdrtools-2.0-silo.patch, 1.1,
	1.2 cdrtools-2.01-xconfig.patch, 1.2, 1.3 cdrtools.spec, 1.44, 1.45
Message-ID: <200606060704.k5674Xv7007092@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7078

Modified Files:
	cdrtools-2.0-silo.patch cdrtools-2.01-xconfig.patch 
	cdrtools.spec 
Log Message:
- more corrections to multilib patch (bug #193796)
- fixed silo buffer overflow (bug #141313)


cdrtools-2.0-silo.patch:
 Makefile   |    2 
 defaults.h |    4 
 mkisofs.8  |   19 ++++
 mkisofs.c  |   46 ++++++++++-
 mkisofs.h  |   11 ++
 silo.c     |  255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 vms.c      |   10 +-
 write.c    |   47 +++++------
 8 files changed, 365 insertions(+), 29 deletions(-)

Index: cdrtools-2.0-silo.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools-2.0-silo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdrtools-2.0-silo.patch	9 Sep 2004 03:45:40 -0000	1.1
+++ cdrtools-2.0-silo.patch	6 Jun 2006 07:04:18 -0000	1.2
@@ -248,7 +248,7 @@
 +    silo_info.id = 'L';
 +    silo_info.conf_part = 1;
 +    strncpy (silo_info.conf_file, silo_conf_file, 256);
-+    silo_info.conf_file[259] = '\0';
++    silo_info.conf_file[255] = '\0';
 +
 +    last_extent_written += 16;
 +    

cdrtools-2.01-xconfig.patch:
 conf/xconfig.h.in |   41 ----------------------------------
 include/mconfig.h |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 41 deletions(-)

Index: cdrtools-2.01-xconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools-2.01-xconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdrtools-2.01-xconfig.patch	2 Jun 2006 12:26:11 -0000	1.2
+++ cdrtools-2.01-xconfig.patch	6 Jun 2006 07:04:18 -0000	1.3
@@ -1,37 +1,28 @@
---- cdrtools-2.01.01/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
-+++ cdrtools-2.01.01/conf/xconfig.h.in	2006-06-02 11:19:00.000000000 +0200
-@@ -418,28 +418,48 @@
-  * Byteorder/Bitorder
-  */
- #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
--#undef WORDS_BIGENDIAN		/* If using network byte order             */
+--- cdrtools-2.01.01/include/mconfig.h.xc	2004-07-11 00:46:53.000000000 +0200
++++ cdrtools-2.01.01/include/mconfig.h	2006-06-02 17:21:55.000000000 +0200
+@@ -49,6 +49,70 @@
+ extern "C" {
+ #endif
+ 
++
++#define HAVE_BROKEN_SRC_LINUX_EXT2_FS_H	1 /* whether /usr/src/linux/include/linux/ext2_fs.h is broken */
++#undef DEV_MINOR_BITS		/* # if bits needed to hold minor device number */
++/*
++ * Byteorder/Bitorder
++ */
++#define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
 +#if defined(__BIG_ENDIAN__)
 +#define WORDS_BIGENDIAN	1	/* If using network byte order             */
 +#endif
- #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
--#undef BITFIELDS_HTOL		/* If high bits come first in structures   */
++#define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
 +#if defined(__BIG_ENDIAN__)
 +#define BITFIELDS_HTOL	1	/* If high bits come first in structures   */
 +#endif
- 
- /*
-  * Types/Keywords
-  */
--#undef SIZEOF_CHAR
--#undef SIZEOF_SHORT_INT
--#undef SIZEOF_INT
--#undef SIZEOF_LONG_INT
--#undef SIZEOF_LONG_LONG
--#undef SIZEOF_CHAR_P
--#undef SIZEOF_UNSIGNED_CHAR
--#undef SIZEOF_UNSIGNED_SHORT_INT
--#undef SIZEOF_UNSIGNED_INT
--#undef SIZEOF_UNSIGNED_LONG_INT
--#undef SIZEOF_UNSIGNED_LONG_LONG
--#undef SIZEOF_UNSIGNED_CHAR_P
- 
--#undef HAVE_LONGLONG		/* Compiler defines long long type */
--#undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
++
++/*
++ * Types/Keywords
++ */
++
 +#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__)
 +#define SIZEOF_LONG_INT 8
 +#define SIZEOF_CHAR_P 8
@@ -62,43 +53,111 @@
 +#if defined(__CHAR_UNSIGNED__)
 +#define CHAR_IS_UNSIGNED 1	/* Compiler defines char to be unsigned */
 +#endif
++
++#define VA_LIST_IS_ARRAY	1	/* va_list is an array */
++#define _FILE_OFFSET_BITS 64	/* # of bits in off_t if settable	   */
++#define _LARGEFILE_SOURCE 1	/* To make ftello() visible (HP-UX 10.20). */
++
++/*
++ * Strings that help to maintain OS/platform id's in C-programs
++ */
++#define HOST_ALIAS "pc-linux-gnu"		/* Output from config.guess (orig)	*/
++#define HOST_SUB   "pc-linux-gnu"		/* Output from config.sub (modified)	*/
++#define HOST_CPU   "cpu" 		/* CPU part from HOST_SUB		*/
++#define HOST_VENDOR "pc"		/* VENDOR part from HOST_SUB		*/
++#define HOST_OS	"linux-gnu"		/* CPU part from HOST_SUB		*/
++
++
+ /*
+  * The NetBSD people want to bother us.
+  * They removed the definition for 'unix' and are bleating for every test
+--- cdrtools-2.01.01/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
++++ cdrtools-2.01.01/conf/xconfig.h.in	2006-06-02 17:22:06.000000000 +0200
+@@ -105,7 +105,6 @@
+ #undef HAVE_BSD_DEV_SCSIREG_H	/* if we have a NeXT Step compatible sg driver */
+ #undef HAVE_SYS_BSDTTY_H	/* if we have sys/bsdtty.h on HP-UX for TIOCGPGRP */
+ #undef HAVE_OS_H		/* if we have the BeOS kernel definitions in OS.h */
+-#undef HAVE_EXT2FS_EXT2_FS_H	/* if we have the Linux moving target ext2fs/ext2_fs.h */
+ #undef HAVE_ATTR_XATTR_H	/* if we have the Linux Extended File Attr definitions in attr/xattr.h */
+ #undef HAVE_FNMATCH_H		/* if we may include fnmatch.h */
+ 
+@@ -310,7 +309,6 @@
+  * OS madness
+  */
+ #undef HAVE_BROKEN_LINUX_EXT2_FS_H	/* whether <linux/ext2_fs.h> is broken */
+-#undef HAVE_BROKEN_SRC_LINUX_EXT2_FS_H	/* whether /usr/src/linux/include/linux/ext2_fs.h is broken */
+ #undef HAVE_BROKEN_SCSI_SCSI_H		/* whether <scsi/scsi.h> is broken */
+ #undef HAVE_BROKEN_SRC_SCSI_SCSI_H	/* whether /usr/src/linux/include/scsi/scsi.h is broken */
+ #undef HAVE_BROKEN_SCSI_SG_H		/* whether <scsi/sg.h> is broken */
+@@ -408,38 +406,11 @@
+ #undef HAVE_ST_FLAGS		/* if struct stat contains st_flags */
+ #undef STAT_MACROS_BROKEN	/* if the macros S_ISDIR, S_ISREG .. don't work */
+ 
+-#undef DEV_MINOR_BITS		/* # if bits needed to hold minor device number */
+ #undef DEV_MINOR_NONCONTIG	/* if bits in minor device number are noncontiguous */
+ 
+ #undef HAVE_SOCKADDR_STORAGE	/* if socket.h defines struct sockaddr_storage */
+ 
+ 
+-/*
+- * Byteorder/Bitorder
+- */
+-#define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
+-#undef WORDS_BIGENDIAN		/* If using network byte order             */
+-#define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
+-#undef BITFIELDS_HTOL		/* If high bits come first in structures   */
+-
+-/*
+- * Types/Keywords
+- */
+-#undef SIZEOF_CHAR
+-#undef SIZEOF_SHORT_INT
+-#undef SIZEOF_INT
+-#undef SIZEOF_LONG_INT
+-#undef SIZEOF_LONG_LONG
+-#undef SIZEOF_CHAR_P
+-#undef SIZEOF_UNSIGNED_CHAR
+-#undef SIZEOF_UNSIGNED_SHORT_INT
+-#undef SIZEOF_UNSIGNED_INT
+-#undef SIZEOF_UNSIGNED_LONG_INT
+-#undef SIZEOF_UNSIGNED_LONG_LONG
+-#undef SIZEOF_UNSIGNED_CHAR_P
+-
+-#undef HAVE_LONGLONG		/* Compiler defines long long type */
+-#undef CHAR_IS_UNSIGNED		/* Compiler defines char to be unsigned */
  
  #undef const			/* Define to empty if const doesn't work */
  #undef uid_t			/* To be used if uid_t is not present  */
-@@ -479,7 +499,7 @@
+@@ -479,7 +450,6 @@
  
  /*#undef HAVE_SIZE_T*/
  /*#undef NO_SIZE_T*/
 -#undef VA_LIST_IS_ARRAY		/* va_list is an array */
-+#define VA_LIST_IS_ARRAY		/* va_list is an array */
  #undef GETGROUPS_T
  #define GID_T		GETGROUPS_T
  
-@@ -498,8 +518,8 @@
+@@ -498,8 +468,6 @@
  #ifdef	HAVE_LARGEFILES		/* If we have working largefiles at all	   */
  				/* This is not defined with glibc-2.1.3	   */
  
 -#undef _FILE_OFFSET_BITS	/* # of bits in off_t if settable	   */
 -#undef _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
-+#define _FILE_OFFSET_BITS 64	/* # of bits in off_t if settable	   */
-+#define _LARGEFILE_SOURCE	/* To make ftello() visible (HP-UX 10.20). */
  #undef _LARGE_FILES		/* Large file defined on AIX-style hosts.  */
  #undef _XOPEN_SOURCE		/* To make ftello() visible (glibc 2.1.3). */
  				/* XXX We don't use this because glibc2.1.3*/
-@@ -586,11 +606,11 @@
- /*
-  * Strings that help to maintain OS/platform id's in C-programs
-  */
+@@ -583,15 +551,6 @@
+ #undef NO_USER_MALLOC		/* If we cannot define our own malloc()	*/
+ #undef HAVE_DYN_ARRAYS		/* If the compiler allows dynamic sized arrays */
+ 
+-/*
+- * Strings that help to maintain OS/platform id's in C-programs
+- */
 -#undef HOST_ALIAS		/* Output from config.guess (orig)	*/
 -#undef HOST_SUB			/* Output from config.sub (modified)	*/
 -#undef HOST_CPU			/* CPU part from HOST_SUB		*/
 -#undef HOST_VENDOR		/* VENDOR part from HOST_SUB		*/
 -#undef HOST_OS			/* CPU part from HOST_SUB		*/
-+#define HOST_ALIAS "pc-linux-gnu"		/* Output from config.guess (orig)	*/
-+#define HOST_SUB   "pc-linux-gnu"		/* Output from config.sub (modified)	*/
-+#define HOST_CPU   "cpu" 		/* CPU part from HOST_SUB		*/
-+#define HOST_VENDOR "pc"		/* VENDOR part from HOST_SUB		*/
-+#define HOST_OS	"linux-gnu"		/* CPU part from HOST_SUB		*/
- 
+-
  
  /*
+  * Begin restricted code for quality assurance.


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cdrtools.spec	2 Jun 2006 12:26:11 -0000	1.44
+++ cdrtools.spec	6 Jun 2006 07:04:18 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a09
-Release: 0.FC5.2
+Release: 0.FC5.3
 %define tarversion 2.01.01a09
 License: CDDL
 Group: Applications/System
@@ -240,13 +240,17 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
-* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-0.FC5.2
+* Tue Jun  6 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a09-0.FC5.3
+- more corrections to multilib patch (bug #193796)
+- fixed silo buffer overflow (bug #141313)
+
+* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a09-0.FC5.2
 - corrected multilib patch (bug #193796)
 
-* Wed May 31 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-0.FC5.1
+* Wed May 31 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a09-0.FC5.1
 - version 2.01.01a09 for FC5
 
-* Wed Feb 15 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a03-3
+* Wed Feb 15 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a03-3
 - rebuilt
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8:2.01.01.0.a03-2.2



From fedora-cvs-commits at redhat.com  Tue Jun  6 07:21:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 03:21:26 -0400
Subject: rpms/ltrace/devel ltrace-e_entry.patch,1.1,1.2
Message-ID: <200606060721.k567LQkX001876@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1726

Modified Files:
	ltrace-e_entry.patch 
Log Message:
Adding the reduced version of patch into devel branch.


ltrace-e_entry.patch:
 elf.c |   33 +++------------------------------
 1 files changed, 3 insertions(+), 30 deletions(-)

Index: ltrace-e_entry.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-e_entry.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltrace-e_entry.patch	1 Jun 2006 17:42:51 -0000	1.1
+++ ltrace-e_entry.patch	6 Jun 2006 07:21:23 -0000	1.2
@@ -56,121 +56,3 @@
  	}
  
  	for (i = 0; i < library_num + 1; ++i)
-diff -Bburp ltrace-0.4/options.c ltrace-0.4-pm/options.c
---- ltrace-0.4/options.c	2006-06-01 13:34:28.000000000 -0400
-+++ ltrace-0.4-pm/options.c	2006-06-01 13:17:15.000000000 -0400
-@@ -55,7 +55,7 @@ struct opt_x_t *opt_x = NULL;
- 
- /* Set a break on the routine named here in order to re-initialize breakpoints
-    after all the PLTs have been initialzed */
--char *PLTs_initialized_by_here = PLTs_INIT_BY_HERE;
-+char *PLTs_initialized_by_here = NULL;
- 
- static void usage(void)
- {
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/alpha/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/alpha/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/alpha/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/alpha/arch.h	2006-06-01 13:25:05.000000000 -0400
-@@ -6,6 +6,3 @@
- #define LT_ELF_MACHINE  EM_ALPHA
- #define LT_ELFCLASS2    ELFCLASS64
- #define LT_ELF_MACHINE2	EM_FAKE_ALPHA
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME      "_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/arm/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/arm/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/arm/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/arm/arch.h	2006-06-01 13:23:43.000000000 -0400
-@@ -4,6 +4,3 @@
- 
- #define LT_ELFCLASS	ELFCLASS32
- #define LT_ELF_MACHINE	EM_ARM
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME    "_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/i386/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/i386/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/i386/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/i386/arch.h	2006-06-01 13:26:29.000000000 -0400
-@@ -4,6 +4,3 @@
- 
- #define LT_ELFCLASS	ELFCLASS32
- #define LT_ELF_MACHINE	EM_386
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME    "_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/ia64/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/ia64/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/ia64/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/ia64/arch.h	2006-06-01 13:28:07.000000000 -0400
-@@ -7,6 +7,3 @@
- 
- #define LT_ELFCLASS   ELFCLASS64
- #define LT_ELF_MACHINE EM_IA_64
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME	"_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/m68k/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/m68k/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/m68k/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/m68k/arch.h	2006-06-01 13:26:00.000000000 -0400
-@@ -4,6 +4,3 @@
- 
- #define LT_ELFCLASS	ELFCLASS32
- #define LT_ELF_MACHINE	EM_68K
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME    "_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/ppc/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/ppc/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/ppc/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/ppc/arch.h	2006-06-01 13:24:30.000000000 -0400
-@@ -1,7 +1,6 @@
- #define BREAKPOINT_VALUE { 0x7f, 0xe0, 0x00, 0x08 }
- #define BREAKPOINT_LENGTH 4
- #define DECR_PC_AFTER_BREAK 0
--#define E_ENTRY_NAME    "_start"
- 
- #define LT_ELFCLASS	ELFCLASS32
- #define LT_ELF_MACHINE	EM_PPC
-@@ -8,11 +8,4 @@
- #ifdef __powerpc64__
- #define LT_ELFCLASS2	ELFCLASS64
- #define LT_ELF_MACHINE2	EM_PPC64
--
--#define PLTs_INIT_BY_HERE E_ENTRY_NAME
--
--#else
--
--#define PLTs_INIT_BY_HERE NULL
--
- #endif
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/s390/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/s390/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/s390/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/s390/arch.h	2006-06-01 13:27:00.000000000 -0400
-@@ -16,6 +16,3 @@
- #define LT_ELFCLASS	ELFCLASS32
- #define LT_ELF_MACHINE	EM_S390
- #endif
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME    "_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/sparc/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/sparc/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/sparc/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/sparc/arch.h	2006-06-01 13:28:39.000000000 -0400
-@@ -6,6 +6,3 @@
- #define LT_ELF_MACHINE  EM_SPARC
- #define LT_ELFCLASS2    ELFCLASS32
- #define LT_ELF_MACHINE2	EM_SPARC32PLUS
--
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME    "_start"
-diff -Bburp ltrace-0.4/sysdeps/linux-gnu/x86_64/arch.h ltrace-0.4-pm/sysdeps/linux-gnu/x86_64/arch.h
---- ltrace-0.4/sysdeps/linux-gnu/x86_64/arch.h	2006-02-20 16:44:45.000000000 -0500
-+++ ltrace-0.4-pm/sysdeps/linux-gnu/x86_64/arch.h	2006-06-01 13:27:37.000000000 -0400
-@@ -7,9 +7,6 @@
- #define LT_ELFCLASS2	ELFCLASS32
- #define LT_ELF_MACHINE2	EM_386
- 
--#define PLTs_INIT_BY_HERE NULL
--#define E_ENTRY_NAME    "_start"
--
- /* __NR_fork, __NR_clone, __NR_clone2, __NR_vfork and __NR_execve
-    from asm-i386/unistd.h.  */
- #define FORK_EXEC_SYSCALLS , { 2, 120, -1, 190, 11 }



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:15:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:15:28 -0400
Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.16,1.17
Message-ID: <200606060815.k568FSss029631@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXScrnSaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29595

Modified Files:
	libXScrnSaver.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
- Added "BuildRequires: pkgconfig" for (#193424)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXScrnSaver.spec	13 May 2006 00:11:56 -0000	1.16
+++ libXScrnSaver.spec	6 Jun 2006 08:15:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 1.1.0
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -50,7 +50,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -64,7 +65,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXss.so.1
 %{_libdir}/libXss.so.1.0.0
 
@@ -76,11 +76,15 @@
 %{_libdir}/libXss.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xscrnsaver.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
+- Added "BuildRequires: pkgconfig" for (#193424)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0, new Suspend request.
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:25:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:25:20 -0400
Subject: rpms/libXt/devel libXt.spec,1.16,1.17
Message-ID: <200606060825.k568PKnh014210@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14168

Modified Files:
	libXt.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193503)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXt.spec	27 Apr 2006 20:45:27 -0000	1.16
+++ libXt.spec	6 Jun 2006 08:25:05 -0000	1.17
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libSM-devel
@@ -22,6 +23,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+
 Requires: libX11-devel
 Requires: libSM-devel
 
@@ -58,7 +60,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -72,7 +75,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXt.so.6
 %{_libdir}/libXt.so.6.0.0
 
@@ -122,13 +124,17 @@
 %{_libdir}/libXt.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xt.pc
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/makestrs.1x*
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193503)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:31:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:31:50 -0400
Subject: rpms/libXtst/devel libXtst.spec,1.10,1.11
Message-ID: <200606060831.k568VoNI016011@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15974

Modified Files:
	libXtst.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: pkgconfig" for (#193504)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXtst.spec	11 Feb 2006 04:22:59 -0000	1.10
+++ libXtst.spec	6 Jun 2006 08:31:44 -0000	1.11
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -43,9 +44,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -59,7 +60,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXtst.so.6
 %{_libdir}/libXtst.so.6.1.0
 
@@ -69,14 +69,18 @@
 %{_libdir}/libXtst.a
 %endif
 %{_libdir}/libXtst.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xtst.pc
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193504)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:36:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:36:08 -0400
Subject: rpms/libXv/devel libXv.spec,1.12,1.13
Message-ID: <200606060836.k568a7kI016924@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16892

Modified Files:
	libXv.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "BuildRequires: pkgconfig" for (#193505)
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXv.spec	26 May 2006 15:43:09 -0000	1.12
+++ libXv.spec	6 Jun 2006 08:36:02 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXv runtime library
-Name: libXv
+Name:    libXv
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -48,7 +49,7 @@
 %install
 
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,7 +63,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXv.so.1
 %{_libdir}/libXv.so.1.0.0
 
@@ -75,13 +75,16 @@
 %{_libdir}/libXv.a
 %endif
 %{_libdir}/libXv.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xv.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "BuildRequires: pkgconfig" for (#193505)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "Requires: libXext-devel" to libXv-devel subpackage, to avoid all
   packages that depend on libXv-devel from having to manually specify that



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:39:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:39:28 -0400
Subject: rpms/automake16/devel automake16.spec,1.8,1.9
Message-ID: <200606060839.k568dSZq017559@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake16/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17526

Modified Files:
	automake16.spec 
Log Message:
buildrequire flex


Index: automake16.spec
===================================================================
RCS file: /cvs/dist/rpms/automake16/devel/automake16.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- automake16.spec	1 Jun 2006 11:04:05 -0000	1.8
+++ automake16.spec	6 Jun 2006 08:39:24 -0000	1.9
@@ -3,14 +3,14 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake16
 Version:	%{api_version}.3
-Release:    6
+Release:    7
 License:	GPL
 Group:		Development/Tools
 Source:		ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 URL:		http://sources.redhat.com/automake
 Conflicts:	automake = 1.6.3
 Requires:	perl
-Buildrequires:	autoconf >= 2.52 bison
+Buildrequires:	autoconf >= 2.52 bison flex
 BuildArchitectures: noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 Patch1:		automake-pythondir-80994.patch
@@ -65,6 +65,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Jun 06 2006 Karsten Hopp <karsten at redhat.de> 1.6.3-7
+- buildrequire flex for self tests
+
 * Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 1.6.3-6
 - buildrequire bison for self tests
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:42:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:42:04 -0400
Subject: rpms/SDL/devel SDL.spec,1.41,1.42
Message-ID: <200606060842.k568g4bM018152@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18094

Modified Files:
	SDL.spec 
Log Message:
[tw]
- added missing (build) requires for GL and GLU




Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- SDL.spec	22 May 2006 13:38:26 -0000	1.41
+++ SDL.spec	6 Jun 2006 08:41:48 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 1
+Release: 2
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -14,6 +14,7 @@
 BuildRequires: nasm arts-devel audiofile-devel
 BuildRequires: esound-devel alsa-lib-devel
 BuildRequires: libXext-devel libX11-devel
+BuildRequires: mesa-libGL-devel, mesa-libGLU-devel
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -26,6 +27,8 @@
 Requires: SDL = %{version}-%{release} alsa-lib-devel
 Requires: libX11-devel
 Requires: libXext-devel
+Requires: mesa-libGL-devel
+Requires: mesa-libGLU-devel
 
 %description devel
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -96,6 +99,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-2
+- added missing (build) requires for GL and GLU
+
 * Mon May 22 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-1
 - new version 1.2.10
 - dropped the following patches because they are not needed anymore:



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:52:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:52:00 -0400
Subject: rpms/libXvMC/devel libXvMC.spec,1.13,1.14
Message-ID: <200606060852.k568q0op002331@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2291

Modified Files:
	libXvMC.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Added "BuildRequires: pkgconfig" for (#193506)
- Replace "makeinstall" with "make install DESTDIR=..."
- Touch XvMCConfig during install phase, and add to file manifest as a ghost
  file, so that it is owned by the package if the user creates it. (#192254)



Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXvMC.spec	27 Apr 2006 20:58:01 -0000	1.13
+++ libXvMC.spec	6 Jun 2006 08:51:56 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,14 +9,12 @@
 
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXv-devel
 
-# FIXME: Remove when unneeded
-BuildRequires: autoconf, automake17
-
 Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
@@ -50,9 +48,15 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Touch XvMCConfig for rpm to package the ghost file. (#192254)
+{
+    mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11
+    touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
+}
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -70,6 +74,7 @@
 %{_libdir}/libXvMC.so.1.0.0
 %{_libdir}/libXvMCW.so.1
 %{_libdir}/libXvMCW.so.1.0.0
+%ghost %config(missingok,noreplace) %verify (not md5 size mtime) %{_sysconfdir}/X11/XvMCConfig
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,6 +90,12 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Added "BuildRequires: pkgconfig" for (#193506)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Touch XvMCConfig during install phase, and add to file manifest as a ghost
+  file, so that it is owned by the package if the user creates it. (#192254)
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2.  Drop #180902 patch, already fixed upstream.
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 08:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 04:56:37 -0400
Subject: rpms/scim-chewing/devel scim-chewing.spec,1.13,1.14
Message-ID: <200606060856.k568ubqu003523@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2500

Modified Files:
	scim-chewing.spec 
Log Message:
Modified BuildRequires to include gettext



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-chewing.spec	23 May 2006 09:08:36 -0000	1.13
+++ scim-chewing.spec	6 Jun 2006 08:56:26 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.3.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -10,7 +10,7 @@
 Group:		System Environment/Libraries
 Source:		http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}
-BuildRequires:	scim-devel, libchewing-devel >= 0.3.0
+BuildRequires:	scim-devel, libchewing-devel >= 0.3.0, gettext
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -63,6 +63,10 @@
 
 
 %changelog
+* Tue Jun 06 2006 Darshan Santani <dsantani at redhat.com>
+- Changed the BuildRequires to include gettext
+- Rebuild
+
 * Tue May 23 2006 Darshan Santani <dsantani at redhat.com>
 - Revised the version number
 - Rebuild



From fedora-cvs-commits at redhat.com  Tue Jun  6 09:26:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 05:26:05 -0400
Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.12,1.13
Message-ID: <200606060926.k569Q50l023865@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-twm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23837

Modified Files:
	xorg-x11-twm.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Added "BuildRequires: pkgconfig" for (#194186)



Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-twm.spec	1 Mar 2006 06:39:37 -0000	1.12
+++ xorg-x11-twm.spec	6 Jun 2006 09:25:59 -0000	1.13
@@ -5,14 +5,15 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{pkgname}-%{version}.tar.bz2
 #Source0: %{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 # checking TWM_LIBS... -lXmu -lXt -lSM -lICE -lXext -lX11 -ldl
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -72,8 +73,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 cd %{pkgname}-%{version}
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Upstream sources do not create the system wide twm config dir, nor
 # install the default config file currently.  We'll work around it here for now.
@@ -95,6 +97,9 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#194186)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 09:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 05:48:20 -0400
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.17,
	1.18
Message-ID: <200606060948.k569mK58008976@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8660

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
- Clean up Source lines in spec file, and other minor cleanups.



Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-server-utils.spec	17 May 2006 21:27:24 -0000	1.17
+++ xorg-x11-server-utils.spec	6 Jun 2006 09:48:15 -0000	1.18
@@ -3,31 +3,31 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 5
+Release: 6
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/iceauth-1.0.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rgb-1.0.0.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/sessreg-1.0.0.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcmsdb-1.0.1.tar.bz2
-Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xgamma-1.0.1.tar.bz2
+Source0:  http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.0.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.0.tar.bz2
+Source4:  http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.1.tar.bz2
+Source5:  http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.1.tar.bz2
 Source6:  http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.1.tar.bz2
 Source7:  http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.1.tar.bz2
 Source8:  http://xorg.freedesktop.org/releases/individual/app/xrandr-1.0.2.tar.bz2
 Source9:  http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.2.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrefresh-1.0.1.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.1.tar.bz2
 Source11: http://xorg.freedesktop.org/releases/individual/app/xset-1.0.2.tar.bz2
-Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetmode-1.0.0.tar.bz2
-Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetpointer-1.0.0.tar.bz2
-Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetroot-1.0.1.tar.bz2
-Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xstdcmap-1.0.1.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xtrap-1.0.1.tar.bz2
-Source17: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xvidtune-1.0.1.tar.bz2
-
+Source12: http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2
+Source13: http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.0.tar.bz2
+Source14: http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.1.tar.bz2
+Source15: http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.1.tar.bz2
+Source16: http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.1.tar.bz2
+Source17: http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.1.tar.bz2
 # NOTE: Each upstream tarball has its own "PatchN" section, taken from
-# multiplying the "SourceN" line times 1000.  Please keep them in this
+# multiplying the "SourceN" line times 100.  Please keep them in this
 # order.  Also, please keep each patch specific to a single upstream tarball,
 # so that they don't have to be split in half when submitting upstream.
 #
@@ -41,8 +41,6 @@
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: pkgconfig
 # xsetroot requires xbitmaps-devel
 BuildRequires: xbitmaps-devel
@@ -52,7 +50,6 @@
 BuildRequires: libXmu-devel
 # xtrap requires libXTrap-devel
 BuildRequires: libXTrap-devel
-
 # NOTE: All of the following were added for bug #191987
 BuildRequires: xorg-x11-xtrans-devel libXext-devel liblbxutil-devel
 BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
@@ -61,7 +58,6 @@
 BuildRequires: libXp-devel zlib-devel
 # ENDNOTE
 
-
 # FIXME: check if still needed for X11R7
 Requires(pre): filesystem >= 2.3.7-1
 
@@ -204,6 +200,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
+- Clean up Source lines in spec file, and other minor cleanups.
+
 * Wed May 17 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-5
 - Added a whackload of BuildRequires for bug (#191987)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 10:02:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 06:02:44 -0400
Subject: rpms/bc/devel bc.spec,1.17,1.18
Message-ID: <200606061002.k56A2iKS013908@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/bc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13849

Modified Files:
	bc.spec 
Log Message:
[tw]
- added missing flex build require




Index: bc.spec
===================================================================
RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bc.spec	11 Feb 2006 02:05:44 -0000	1.17
+++ bc.spec	6 Jun 2006 10:02:35 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Name: bc
 Version: 1.06
-Release: 19.2.1
+Release: 20
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
@@ -11,7 +11,7 @@
 Patch3: bc-1.06-info_exp_bessel.patch
 Prereq: /sbin/install-info grep
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: readline-devel
+BuildRequires: readline-devel, flex
 
 %description
 The bc package includes bc and dc. Bc is an arbitrary precision
@@ -69,6 +69,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 1.06-20
+- added missing flex build require
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.06-19.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 10:26:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 06:26:44 -0400
Subject: rpms/hal-cups-utils/devel .cvsignore, 1.8, 1.9 hal-cups-utils.spec,
	1.25, 1.26 sources, 1.8, 1.9
Message-ID: <200606061026.k56AQhnQ007839@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7808

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
[ffesti] New implementation of the hal-egg-cups interface, 
         dropped cups-config-daemon



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Jan 2006 20:35:50 -0000	1.8
+++ .cvsignore	6 Jun 2006 10:26:38 -0000	1.9
@@ -1,4 +1 @@
-hal-cups-utils-0.5.2.tar.bz2
-hal-cups-utils-0.5.3.tar.bz2
-hal-cups-utils-0.5.4.tar.gz
-hal-cups-utils-0.5.5.tar.gz
+hal-cups-utils-0.6.0.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hal-cups-utils.spec	28 Mar 2006 17:16:52 -0000	1.25
+++ hal-cups-utils.spec	6 Jun 2006 10:26:39 -0000	1.26
@@ -1,28 +1,25 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.5.5
-Release: 2 
+Version: 0.6.0
+Release: 1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
-Source1: hal_lpadmin.fdi 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: dbus-devel >= 0.31
 BuildRequires: cups-devel
-BuildRequires: system-config-printer
 Requires: hal >= 0.5.0
 Requires: dbus >= 0.60
 Requires: cups
-Requires: system-config-printer
+Requires: system-config-printer-libs
 
 %description
 Halified utilities for CUPS:
 	- hal_lpadmin
 	- hal CUPS backend
-	- cups config daemon
 
 %prep
 rm -rf $RPM_BUILD_ROOT
@@ -31,7 +28,7 @@
 
 %build
 
-%configure --enable-printconf 
+%configure
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,34 +44,17 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add cups-config-daemon 
-
-/sbin/service cups-config-daemon condrestart > /dev/null 2>&1
-
-%preun
-if [ $1 = 0 ]; then
-    service cups-config-daemon stop > /dev/null 2>&1
-    /sbin/chkconfig --del cups-config-daemon 
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
-  service cups-config-daemon condrestart > /dev/null 2>&1
-fi
-
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/cups-config-daemon
 %{_sbindir}/hal_lpadmin
 /usr/lib/cups/backend/hal
 %{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
-%{_sysconfdir}/dbus-1/system.d/cups-config-daemon-dbus.conf
-%{_sysconfdir}/rc.d/init.d/cups-config-daemon
 
 %changelog
+* Fri Jun 06 2006 Florian Festi <ffesti at redhat.com> - 0.6.0-1
+- new implementation which obsoletes the cups-config-daemon
+
 * Tue Mar 28 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.5-2
 - Make sure backends install into /usr/lib and not /usr/lib64 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Jan 2006 20:35:50 -0000	1.8
+++ sources	6 Jun 2006 10:26:39 -0000	1.9
@@ -1 +1 @@
-681d6e7caa0db4874e06b30a87f2d5b4  hal-cups-utils-0.5.5.tar.gz
+309124c62a0e0de4578c3b74f609e2dd  hal-cups-utils-0.6.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 10:33:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 06:33:02 -0400
Subject: rpms/desktop-printing/devel desktop-printing-0.19-hal_lpadmin.patch,
	NONE, 1.1 desktop-printing.spec, 1.55, 1.56
Message-ID: <200606061033.k56AX2uY007905@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7886

Modified Files:
	desktop-printing.spec 
Added Files:
	desktop-printing-0.19-hal_lpadmin.patch 
Log Message:
[ffesti] Adjusted dbus interface for new hal-cups-utils


desktop-printing-0.19-hal_lpadmin.patch:
 ec-driver-prompt-dialog.c |   89 ++++------------------------------------------
 ec-driver-prompt-dialog.h |   10 +----
 ec-driver-prompt.c        |   12 +-----
 3 files changed, 14 insertions(+), 97 deletions(-)

--- NEW FILE desktop-printing-0.19-hal_lpadmin.patch ---
diff -ru desktop-printing-0.19.orig/eggcups-0.19/ec-driver-prompt.c desktop-printing-0.19/eggcups-0.19/ec-driver-prompt.c
--- desktop-printing-0.19.orig/eggcups-0.19/ec-driver-prompt.c	2006-05-19 10:47:34.000000000 +0200
+++ desktop-printing-0.19/eggcups-0.19/ec-driver-prompt.c	2006-05-30 14:38:01.000000000 +0200
@@ -435,15 +435,9 @@
 		rb_debug ("Printer configuration found.  Configuring printer.");
 		dbus_set_printer_driver	(return_make, return_model, udi, printer_name, NULL);
 	} else {
-		gchar *driver;
- 
-		if (!dbus_match_printer_driver (make, model, &driver)) {
-			ECDriverPromptDialog *dlg;	
-			dlg = ec_driver_prompt_create_dialog (self);
-			ec_driver_prompt_dialog_set_and_show (dlg, make, model, udi, printer_name);
-		}
-
-		g_free (driver);
+		ECDriverPromptDialog *dlg;	
+		dlg = ec_driver_prompt_create_dialog (self);
+		ec_driver_prompt_dialog_set_and_show (dlg, make, model, udi, printer_name);
         }
 
 	libhal_free_string (make);
diff -ru desktop-printing-0.19.orig/eggcups-0.19/ec-driver-prompt-dialog.c desktop-printing-0.19/eggcups-0.19/ec-driver-prompt-dialog.c
--- desktop-printing-0.19.orig/eggcups-0.19/ec-driver-prompt-dialog.c	2006-05-19 10:47:34.000000000 +0200
+++ desktop-printing-0.19/eggcups-0.19/ec-driver-prompt-dialog.c	2006-05-30 14:43:54.000000000 +0200
@@ -882,76 +882,6 @@
 	g_object_unref (gconf_client);
 }
 
-/* FIXME: This function needs to propagate errors
- */
-gboolean
-dbus_match_printer_driver (const gchar  *make, 
-			   const gchar  *model, 
-			   gchar       **driver)
-{
-	DBusConnection *connection;
-	DBusMessage *message = NULL;
-	DBusMessage *reply = NULL;
-	DBusMessageIter iter;
-	DBusError error;
-        const gchar *value;
-	gboolean driver_matches = FALSE;
-
-        if (driver)
-		*driver = NULL;
-
-	if (make == NULL || model == NULL)
-		return FALSE;
-
-	connection = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
-	if (connection == NULL) 
-		return TRUE;
-                                                                                
-	message = dbus_message_new_method_call (CUPS_DRIVER_CONFIG_NAMESPACE,
-        	                                CUPS_DRIVER_CONFIG_PATH,
-                                                CUPS_DRIVER_CONFIG_NAMESPACE,
-                	                        CUPS_DRIVER_CONFIG_MATCH_DRIVER_METHOD);
-	if (!message) {
-		driver_matches = TRUE;
-		goto out;
-	}
-                                                                                
-	dbus_message_iter_init_append (message, &iter);
-	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &make);
-	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &model);
-
-	dbus_error_init (&error);
-	reply = dbus_connection_send_with_reply_and_block (connection, message, 10000, &error);
-	if (dbus_error_is_set (&error)) {
-	      if (dbus_error_has_name (&error, CUPS_DRIVER_CONFIG_DRIVER_NOT_FOUND_ERROR)) {
-		    driver_matches = FALSE;
-	      } else {
-		    driver_matches = TRUE;
-	      }
-	      goto out;
-	}
-	
-	if (!dbus_message_get_args (reply, &error,
-                                    DBUS_TYPE_STRING, &value,
-                                    DBUS_TYPE_INVALID)) {
-		dbus_error_free (&error);
-		driver_matches = TRUE;
-	} else if (driver) {
-		*driver = g_strdup (value);
-		driver_matches = TRUE;
-	}
-	
- out:
-	dbus_connection_flush (connection);
-	if (message)
-		dbus_message_unref (message);
-	if (reply)
-		dbus_message_unref (reply);
-	dbus_connection_unref (connection);
-	
-	return driver_matches;
-}
-
 gboolean
 dbus_set_printer_driver (const gchar *make,
                          const gchar *model,
@@ -962,22 +892,19 @@
 	DBusConnection *connection;
 	DBusMessage *message;
 	DBusMessageIter iter;
-                                                                                
+
 	connection = dbus_bus_get (DBUS_BUS_SYSTEM, error);
 	if (connection == NULL) 
 		return FALSE;
-                                                                                
-	message = dbus_message_new_method_call (CUPS_DRIVER_CONFIG_NAMESPACE,
-        	                                CUPS_DRIVER_CONFIG_PATH,
-                                                CUPS_DRIVER_CONFIG_NAMESPACE,
-                	                        CUPS_DRIVER_CONFIG_SET_DRIVER_METHOD);
-                                                                                
+
+	message = dbus_message_new_method_call (HAL_NAMESPACE,
+        	                                udi,
+                                                HAL_PRINTER_INTERFACE,
+                	                        HAL_PRINTER_CONFIG_METHOD);
+				
 	dbus_message_iter_init_append (message, &iter);
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &make);
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &model);
-	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &udi);
-	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name);
-
 
 	if (!dbus_connection_send (connection, message, NULL))
 		return FALSE;
@@ -1027,8 +954,8 @@
                                                                GTK_MESSAGE_ERROR,
                                                                GTK_BUTTONS_CLOSE,
                                                                "%s", error.message);
-
 			gtk_dialog_run (GTK_DIALOG (error_dialog));
+
 			dbus_error_free (&error);
 		}
 
diff -ru desktop-printing-0.19.orig/eggcups-0.19/ec-driver-prompt-dialog.h desktop-printing-0.19/eggcups-0.19/ec-driver-prompt-dialog.h
--- desktop-printing-0.19.orig/eggcups-0.19/ec-driver-prompt-dialog.h	2006-05-19 10:47:34.000000000 +0200
+++ desktop-printing-0.19/eggcups-0.19/ec-driver-prompt-dialog.h	2006-05-30 14:40:58.000000000 +0200
@@ -35,9 +35,9 @@
 #define CUPS_DRIVER_CONFIG_PATH      "/org/freedesktop/CupsDriverConfig"
 #define CUPS_DRIVER_CONFIG_NAMESPACE "org.freedesktop.CupsDriverConfig"
 
-#define CUPS_DRIVER_CONFIG_SET_DRIVER_METHOD "SetDriver"
-#define CUPS_DRIVER_CONFIG_MATCH_DRIVER_METHOD "MatchDriver"
-#define CUPS_DRIVER_CONFIG_DRIVER_NOT_FOUND_ERROR "org.freedesktop.CupsDriverConfig.DriverNotFound"
+#define HAL_NAMESPACE         "org.freedesktop.Hal"
+#define HAL_PRINTER_INTERFACE "org.freedesktop.Hal.Device.Printer"
+#define HAL_PRINTER_CONFIG_METHOD "Configure"
 
 #define EC_GCONF_PRINTER_PATH      "/system/printing/user_drivers"
 
@@ -80,10 +80,6 @@
                          				 const gchar *name,
                          				 DBusError *error);
 
-gboolean dbus_match_printer_driver 			(const gchar  *make, 
-			   				 const gchar  *model, 
-			   				 gchar       **driver);
-
 void ec_driver_prompt_dialog_set_and_show 		(ECDriverPromptDialog *dlg,
 				      			const gchar *make,
 				      			const gchar *model,


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- desktop-printing.spec	22 May 2006 10:26:29 -0000	1.55
+++ desktop-printing.spec	6 Jun 2006 10:32:57 -0000	1.56
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 7.2
+Release: 8
 License: GPL
 Group: Applications/File
 # total lie
@@ -13,11 +13,12 @@
 Source1: gnome-default-printer.png
 Patch0: desktop-printing-0.19-dbus-api.patch
 Patch1: eggcups-dbus-send-null-crash.patch
+Patch2: desktop-printing-0.19-hal_lpadmin.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
 Requires: dbus >= %{dbus_version}, dbus-x11
-Requires: hal-cups-utils
+Requires: hal-cups-utils >= 0.6.0
 Requires: cups
 PreReq:   gtk2 >= %{gtk_version}
 
@@ -38,12 +39,13 @@
 pushd eggcups-%{version}
 %patch0 -p1 -b .dbus-api
 %patch1 -p0 -b .dbus-null-crash
+%patch2 -p2 -b .hal-lpadmin
 popd
 
 %build
 pushd eggcups-%{version}
 %configure --with-session-cupsd=no
-find . -type f -print0 \( -name '*.c' -o -name '*.h' -o -name '*.conf' \) | xargs -0 perl -pi -e 's,org/freedesktop/,com/redhat/,g;s,org.freedesktop.,com.redhat.,g'
+#find . -type f -print0 \( -name '*.c' -o -name '*.h' -o -name '*.conf' \) | xargs -0 perl -pi -e 's,org/freedesktop/,com/redhat/,g;s,org.freedesktop.,com.redhat.,g'
 make
 popd
 
@@ -91,6 +93,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Fri Jun 06 2006 Florian Festi <ffesti at redhat.com> - 0.19-8
+- patch for the new hal_lpadmin (hal-cups-utils)
+
 * Mon May 22 2006 Karsten Hopp <karsten at redhat.de> 0.19-7.2
 - add buildrequires openssl-devel
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 10:40:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 06:40:00 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.8,1.9
Message-ID: <200606061040.k56Ae0aG008042@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8030

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Fix all SourceN lines in spec file to not have to update them every time.
- Remove package ownership of mandir/libdir/etc.



Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-resutils.spec	11 Feb 2006 06:25:13 -0000	1.8
+++ xorg-x11-resutils.spec	6 Jun 2006 10:39:55 -0000	1.9
@@ -3,15 +3,15 @@
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 
-Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/appres-1.0.0.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/editres-1.0.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/listres-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/viewres-1.0.1.tar.bz2
+Source0:  http://xorg.freedesktop.org/releases/individual/app/appres-1.0.0.tar.bz2
+Source1:  http://xorg.freedesktop.org/releases/individual/app/editres-1.0.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/app/listres-1.0.1.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.1.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,29 +76,30 @@
 %files
 %defattr(-,root,root,-)
 %doc
-%dir %{_bindir}
 %{_bindir}/appres
 %{_bindir}/editres
 %{_bindir}/listres
 %{_bindir}/viewres
-%dir %{_datadir}
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Editres
 %{_datadir}/X11/app-defaults/Editres-color
 %{_datadir}/X11/app-defaults/Viewres
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/appres.1x*
 %{_mandir}/man1/editres.1x*
 %{_mandir}/man1/listres.1x*
 %{_mandir}/man1/viewres.1x*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Fix all SourceN lines in spec file to not have to update them every time.
+- Remove package ownership of mandir/libdir/etc.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Tue Jun  6 10:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 06:51:35 -0400
Subject: rpms/openssl/devel openssl.spec,1.73,1.74
Message-ID: <200606061051.k56ApZar022627@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22585

Modified Files:
	openssl.spec 
Log Message:
- libica: add path to openssl headers for compilation in mock



Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- openssl.spec	5 Jun 2006 13:55:51 -0000	1.73
+++ openssl.spec	6 Jun 2006 10:51:31 -0000	1.74
@@ -204,6 +204,7 @@
 if [[ $RPM_BUILD_ROOT  ]] ; then
         export INSROOT=$RPM_BUILD_ROOT
 fi
+CPPFLAGS=-I../../include
 %configure
 make
 popd



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:01:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:01:07 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.16-lOption.patch, NONE,
	1.1 shadow-4.0.16-redhat.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 shadow-utils.spec, 1.73, 1.74 sources, 1.11,
	1.12 shadow-4.0.12-lOption.patch, 1.1,
	NONE shadow-4.0.14-symlinks.patch, 1.2,
	NONE shadow-4.0.15-nscdFlushCash.patch, 1.1,
	NONE shadow-4.0.15-redhat.patch, 1.1, NONE
Message-ID: <200606061101.k56B17Ke022763@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22729

Modified Files:
	.cvsignore shadow-utils.spec sources 
Added Files:
	shadow-4.0.16-lOption.patch shadow-4.0.16-redhat.patch 
Removed Files:
	shadow-4.0.12-lOption.patch shadow-4.0.14-symlinks.patch 
	shadow-4.0.15-nscdFlushCash.patch shadow-4.0.15-redhat.patch 
Log Message:
- upgrade
- do not replace login.defs file (#190014)



shadow-4.0.16-lOption.patch:
 man/useradd.8 |    3 +++
 src/useradd.c |   10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE shadow-4.0.16-lOption.patch ---
--- shadow-4.0.16/man/useradd.8.lOption	2006-06-06 10:41:47.000000000 +0200
+++ shadow-4.0.16/man/useradd.8	2006-06-06 10:42:59.000000000 +0200
@@ -96,6 +96,9 @@
 \fB\-m\fR
 option. The default is to not create the directory and to not copy any files.
 .TP 3n
+\fB-l\fR
+Do not add the user to the last login log file. This is an option added by Red Hat.
+.TP 3n
 \fB-n\fR
 A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used.
 .TP 3n
--- shadow-4.0.16/src/useradd.c.lOption	2006-06-06 10:41:47.000000000 +0200
+++ shadow-4.0.16/src/useradd.c	2006-06-06 10:41:47.000000000 +0200
@@ -124,6 +124,7 @@
     Gflg = 0,			/* secondary group set for new account */
     kflg = 0,			/* specify a directory to fill new user directory */
     mflg = 0,			/* create user's home directory if it doesn't exist */
+    lflg = 0;      		/* do not add user to lastlog database file */
     Mflg = 0,                   /* do NOT create user's home directory no matter what */
     nflg = 0,                   /* do NOT create a group having the same name as the user */
     oflg = 0,			/* permit non-unique user ID to be specified with -u */
@@ -630,6 +631,7 @@
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
 			   "  -m, --create-home		create home directory for the new user\n"
 			   "				account\n"
+			   "  -l,                       do not add user to lastlog database file\n"
 			   "  -M,                       do not create user's home directory(overrides /etc/login.defs)\n"
 			   "  -r,                       create system account\n"
 			   "  -o, --non-unique		allow create user with duplicate\n"
@@ -1035,7 +1037,7 @@
 			{NULL, 0, NULL, '\0'}
 		};
 		while ((c =
-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:",
+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:",
 				     long_options, NULL)) != -1) {
 			switch (c) {
 			case 'b':
@@ -1175,6 +1177,9 @@
 			case 'm':
 				mflg++;
 				break;
+			case 'l':
+	                        lflg++;
+                        	break;
 			case 'o':
 				oflg++;
 				break;
@@ -1540,7 +1545,8 @@
 	 */
 	if (!getpwuid (user_id)) {
 		faillog_reset (user_id);
-		lastlog_reset (user_id);
+		if (!lflg)
+			lastlog_reset (user_id);
 	}
 
 	/*

shadow-4.0.16-redhat.patch:
 man/groupadd.8 |    7 +++-
 man/useradd.8  |   18 +++++++++-
 src/groupadd.c |   19 +++++++++--
 src/useradd.c  |   94 ++++++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 100 insertions(+), 38 deletions(-)

--- NEW FILE shadow-4.0.16-redhat.patch ---
--- shadow-4.0.16/man/groupadd.8.redhat	2006-06-06 07:07:24.000000000 +0200
+++ shadow-4.0.16/man/groupadd.8	2006-06-06 10:32:10.000000000 +0200
@@ -14,7 +14,7 @@
 groupadd \- create a new group
 .SH "SYNOPSIS"
 .HP 9
-\fBgroupadd\fR [\-g\ \fIGID\fR\ [\-o]] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
+\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-r] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
 .SH "DESCRIPTION"
 .PP
 The
@@ -32,10 +32,13 @@
 \fB\-g\fR
 is turned off).
 .TP 3n
+\fB-r\fR
+This flag instructs \fBgroupadd\fR to add a system account.  The first available \fIgid\fR lower than 499 will be automatically selected unless the \fB-g\fR option is also given on the command line. This is an option added by Red Hat.
+.TP 3n
 \fB\-g\fR \fIGID\fR
 The numerical value of the group's ID. This value must be unique, unless the
 \fB\-o\fR
-option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 999 and greater than every other group. Values between 0 and 999 are typically reserved for system accounts.
+option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 500 and greater than every other group. Values between 0 and 499 are typically reserved for system accounts.
 .TP 3n
 \fB\-h\fR, \fB\-\-help\fR
 Display help message and exit.
--- shadow-4.0.16/man/useradd.8.redhat	2006-06-06 07:08:57.000000000 +0200
+++ shadow-4.0.16/man/useradd.8	2006-06-06 10:40:29.000000000 +0200
@@ -25,7 +25,7 @@
 \fB\-D\fR
 option, the
 \fBuseradd\fR
-command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files.
+command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files. The version provided with Red Hat Linux will create a group for each user added to the system by default.
 .SH "OPTIONS"
 .PP
 The options which apply to the
@@ -65,7 +65,7 @@
 The number of days after a password expires until the account is permanently disabled. A value of 0 disables the account as soon as the password has expired, and a value of \-1 disables the feature. The default value is \-1.
 .TP 3n
 \fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR
-The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group. The default group number is 1 or whatever is specified in
+The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group.
 \fI/etc/default/useradd\fR.
 .TP 3n
 \fB\-G\fR, \fB\-\-groups\fR \fIGROUP1\fR[\fI,GROUP2,...\fR[\fI,GROUPN\fR]]]
@@ -76,6 +76,9 @@
 \fB\-h\fR, \fB\-\-help\fR
 Display help message and exit.
 .TP 3n
+\fB-M\fR
+The user's home directory will not be created, even if the system wide settings from \fI/etc/login.defs\fR is to create home dirs.
+.TP 3n
 \fB\-m\fR, \fB\-\-create\-home\fR
 The user's home directory will be created if it does not exist. The files contained in
 \fISKEL_DIR\fR
@@ -93,6 +96,9 @@
 \fB\-m\fR
 option. The default is to not create the directory and to not copy any files.
 .TP 3n
+\fB-n\fR
+A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used.
+.TP 3n
 \fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR
 Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and others).
 
@@ -118,6 +124,9 @@
 The encrypted password, as returned by
 \fBcrypt\fR(3). The default is to disable the account.
 .TP 3n
+\fB-r\fR
+This flag is used to create a system account. That is, a user with a UID lower than the value of UID_MIN defined in \fI/etc/login.defs\fR and whose password does not expire. Note that \fBuseradd\fR will not create a home directory for such an user, regardless of the default setting in \fI/etc/login.defs\fR. You have to specify \fB-m\fR option if you want a home directory for a system account to be created. This is an option added by Red Hat
+.TP 3n
 \fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR
 The name of the user's login shell. The default is to leave this field blank, which causes the system to select the default login shell.
 .TP 3n
@@ -161,6 +170,8 @@
 The system administrator is responsible for placing the default user files in the
 \fI/etc/skel/\fR
 directory.
+.br
+This version of useradd was modified by Red Hat to suit Red Hat user/group conventions.
 .SH "CAVEATS"
 .PP
 You may not add a user to a NIS group. This must be performed on the NIS server.
@@ -181,6 +192,9 @@
 \fI/etc/group\fR
 Group account information.
 .TP 3n
+\fI/etc/gshadow\fR
+Secure group account information.
+.TP 3n
 \fI/etc/default/useradd\fR
 Default values for account creation.
 .TP 3n
--- shadow-4.0.16/src/useradd.c.redhat	2006-05-30 20:28:45.000000000 +0200
+++ shadow-4.0.16/src/useradd.c	2006-06-06 10:22:57.000000000 +0200
@@ -81,7 +81,7 @@
 static gid_t def_group = 100;
 static const char *def_gname = "other";
 static const char *def_home = "/home";
-static const char *def_shell = "";
+static const char *def_shell = "/sbin/nologin";
 static const char *def_template = SKEL_DIR;
 static const char *def_create_mail_spool = "no";
 
@@ -93,7 +93,7 @@
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 
 static const char *user_name = "";
-static const char *user_pass = "!";
+static const char *user_pass = "!!";
 static uid_t user_id;
 static gid_t user_gid;
 static const char *user_comment = "";
@@ -124,8 +124,10 @@
     Gflg = 0,			/* secondary group set for new account */
     kflg = 0,			/* specify a directory to fill new user directory */
     mflg = 0,			/* create user's home directory if it doesn't exist */
-    nflg = 0,			/* create a group having the same name as the user */
+    Mflg = 0,                   /* do NOT create user's home directory no matter what */
+    nflg = 0,                   /* do NOT create a group having the same name as the user */
     oflg = 0,			/* permit non-unique user ID to be specified with -u */
+    rflg = 0,                   /* create a system account */
     sflg = 0,			/* shell program for new account */
     uflg = 0;			/* specify user ID for new account */
 
@@ -628,6 +630,8 @@
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
 			   "  -m, --create-home		create home directory for the new user\n"
 			   "				account\n"
+			   "  -M,                       do not create user's home directory(overrides /etc/login.defs)\n"
+			   "  -r,                       create system account\n"
 			   "  -o, --non-unique		allow create user with duplicate\n"
 			   "				(non-unique) UID\n"
 			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
@@ -679,11 +683,20 @@
 	spent->sp_namp = (char *) user_name;
 	spent->sp_pwdp = (char *) user_pass;
 	spent->sp_lstchg = time ((time_t *) 0) / SCALE;
-	spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
-	spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
-	spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
-	spent->sp_inact = scale_age (def_inactive);
-	spent->sp_expire = scale_age (user_expire);
+	if (!rflg) {
+		spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
+		spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
+		spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
+		spent->sp_inact = scale_age (def_inactive);
+		spent->sp_expire = scale_age (user_expire);
+	}
+	else {
+		spent->sp_min = scale_age(-1);
+                spent->sp_max = scale_age(-1);
+                spent->sp_warn = scale_age(-1);
+                spent->sp_inact = scale_age(-1);
+        	spent->sp_expire = scale_age(-1);
+	}
 	spent->sp_flag = -1;
 }
 
@@ -831,8 +844,14 @@
 	const struct passwd *pwd;
 	uid_t uid_min, uid_max;
 
-	uid_min = getdef_unum ("UID_MIN", 1000);
-	uid_max = getdef_unum ("UID_MAX", 60000);
+        if (!rflg) {
+                uid_min = getdef_unum ("UID_MIN", 500);
+                uid_max = getdef_unum ("UID_MAX", 60000);
+        }
+        else {
+                uid_min = 1;
+                uid_max = getdef_unum ("UID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some UID value if the user didn't provide us with
@@ -862,7 +881,7 @@
 #endif
 			exit (E_NAME_IN_USE);
 		}
-		if (uflg && user_id == pwd->pw_uid) {
+		if (!oflg && uflg && user_id == pwd->pw_uid) {
 			fprintf (stderr, _("%s: UID %u is not unique\n"),
 				 Prog, (unsigned int) user_id);
 #ifdef WITH_AUDIT
@@ -1016,7 +1035,7 @@
 			{NULL, 0, NULL, '\0'}
 		};
 		while ((c =
-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:",
 				     long_options, NULL)) != -1) {
 			switch (c) {
 			case 'b':
@@ -1188,6 +1207,15 @@
 				user_id = get_uid (optarg);
 				uflg++;
 				break;
+                        case 'n':
+                                nflg++;
+                                break;
+                        case 'r':
+                                rflg++;
+                                break;
+                        case 'M':
+                                Mflg++;
+                                break;
 			default:
 				usage ();
 			}
@@ -1195,6 +1223,9 @@
 		}
 	}
 
+        if (mflg && Mflg) /* the admin is not decided .. create or not ? */
+               usage();
+
 	/*
 	 * Certain options are only valid in combination with others.
 	 * Check it here so that they can be specified in any order.
@@ -1695,6 +1726,14 @@
 	}
 #endif				/* USE_PAM */
 
+        if (!rflg) /* for system accounts defaults are ignored and we
+                    * do not create a home dir -- gafton */
+        	if (getdef_bool("CREATE_HOME"))
+               		mflg = 1;
+
+        if (Mflg) /* absolutely sure that we do not create home dirs */
+        	mflg = 0;
+
 	/*
 	 * See if we are messing with the defaults file, or creating
 	 * a new user.
@@ -1725,7 +1764,7 @@
 	 * to that group, use useradd -g username username.
 	 * --bero
 	 */
-	if (!gflg) {
+	if ( !(nflg || gflg) ) {
 		if (getgrnam (user_name)) {
 			fprintf (stderr,
 				 _
@@ -1776,25 +1815,18 @@
 				 ("%s: warning: the home directory already exists.\n"
 				  "Not copying any file from skel directory into it.\n"),
 				 Prog);
-
-	} else if (getdef_str ("CREATE_HOME")) {
-		/*
-		 * RedHat added the CREATE_HOME option in login.defs in their
-		 * version of shadow-utils (which makes -m the default, with
-		 * new -M option to turn it off). Unfortunately, this
-		 * changes the way useradd works (it can be run by scripts
-		 * expecting some standard behaviour), compared to other
-		 * Unices and other Linux distributions, and also adds a lot
-		 * of confusion :-(.
-		 * So we now recognize CREATE_HOME and give a warning here
-		 * (better than "configuration error ... notify administrator"
-		 * errors in every program that reads /etc/login.defs). -MM
-		 */
-		fprintf (stderr,
-			 _
-			 ("%s: warning: CREATE_HOME not supported, please use -m instead.\n"),
-			 Prog);
 	}
+        /* Warning removed to protect the innocent. */
+        /*
+         * The whole idea about breaking some stupid scripts by creating a new
+         * variable is crap - I could care less about the scripts. Historically
+         * adduser type programs have always created the home directories and
+         * I don't like the idea of providing a script when we can fix the
+         * binary itself. And if the scripts are using the right options to the
+         * useradd then they will not break. If not, they depend on unspecified
+         * behavior and they will break, but they were broken anyway to begin
+         * with --gafton
+         */
 
 	create_mail ();
 
--- shadow-4.0.16/src/groupadd.c.redhat	2006-01-18 20:55:15.000000000 +0100
+++ shadow-4.0.16/src/groupadd.c	2006-06-06 10:22:57.000000000 +0200
@@ -74,6 +74,7 @@
 static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
 static int gflg = 0;		/* ID value for the new group */
 static int fflg = 0;		/* if group already exists, do nothing and exit(0) */
+static int rflg = 0;            /* for adding system accounts (Red Hat) */
 
 /* local function prototypes */
 static void usage (void);
@@ -99,6 +100,7 @@
 			   "Options:\n"
 			   "  -f, --force		force exit with success status if the specified\n"
 			   "				group already exists\n"
+			   "  -r,			create system account\n"
 			   "  -g, --gid GID		use GID for the new group\n"
 			   "  -h, --help			display this help message and exit\n"
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
@@ -196,8 +198,13 @@
 	const struct group *grp;
 	gid_t gid_min, gid_max;
 
-	gid_min = getdef_unum ("GID_MIN", 1000);
-	gid_max = getdef_unum ("GID_MAX", 60000);
+	if (!rflg) {
+		gid_min = getdef_unum ("GID_MIN", 500);
+                gid_max = getdef_unum ("GID_MAX", 60000);
+        } else {
+                gid_min = 1;
+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some GID value if the user didn't provide us with
@@ -411,7 +418,7 @@
 		};
 
 		while ((c =
-			getopt_long (argc, argv, "fg:hK:o", long_options,
+			getopt_long (argc, argv, "frg:hK:o", long_options,
 				     &option_index)) != -1) {
 			switch (c) {
 			case 'f':
@@ -424,6 +431,12 @@
 				 */
 				fflg++;
 				break;
+	                case 'r':
+	                        /*
+	                         * create a system group
+	                         */
+	                        rflg++;
+	                        break;
 			case 'g':
 				gflg++;
 				if (!isdigit (optarg[0]))


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Apr 2006 12:45:14 -0000	1.11
+++ .cvsignore	6 Jun 2006 11:01:02 -0000	1.12
@@ -1 +1 @@
-shadow-4.0.15.tar.bz2
+shadow-4.0.16.tar.bz2


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- shadow-utils.spec	8 Apr 2006 11:59:38 -0000	1.73
+++ shadow-utils.spec	6 Jun 2006 11:01:03 -0000	1.74
@@ -4,21 +4,19 @@
 
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
-Version: 4.0.15
-Release: 3
+Version: 4.0.16
+Release: 1
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.15-login.defs
 Source2: shadow-970616.useradd
-Patch0: shadow-4.0.15-redhat.patch
+Patch0: shadow-4.0.16-redhat.patch
 Patch1: shadow-4.0.3-noinst.patch
 Patch2: shadow-4.0.11.1-vipw.patch
 Patch3: shadow-4.0.14-goodname.patch
 Patch4: shadow-4.0.13-newgrpPwd.patch
-Patch5: shadow-4.0.12-lOption.patch
-Patch6: shadow-4.0.14-symlinks.patch
-Patch7: shadow-4.0.15-nscdFlushCash.patch
+Patch5: shadow-4.0.16-lOption.patch
 
 License: BSD
 Group: System Environment/Base
@@ -50,8 +48,6 @@
 %patch3 -p1 -b .goodname
 %patch4 -p1 -b .newgrpPwd
 %patch5 -p1 -b .lOption
-%patch6 -p1 -b .symlinks
-%patch7 -p1 -b .nscdFlushCash
 
 rm po/*.gmo
 rm po/stamp-po
@@ -97,12 +93,13 @@
 rm $RPM_BUILD_ROOT/%{_bindir}/login
 rm $RPM_BUILD_ROOT/%{_bindir}/passwd
 rm $RPM_BUILD_ROOT/%{_bindir}/su
+rm $RPM_BUILD_ROOT/etc/login.access
+rm $RPM_BUILD_ROOT/etc/limits
 rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd
 rm $RPM_BUILD_ROOT/%{_sbindir}/vipw
 rm $RPM_BUILD_ROOT/%{_sbindir}/vigr
 rm $RPM_BUILD_ROOT/%{_sbindir}/nologin
 rm $RPM_BUILD_ROOT/%{_sbindir}/chgpasswd
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/id.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/chsh.*
@@ -135,8 +132,8 @@
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/nologin.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vigr.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/sulogin.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man3/pw_auth.*
+rm $RPM_BUILD_ROOT/%{_mandir}/man8/chgpasswd.*
+rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/chgpasswd.*
 
 %find_lang shadow
 
@@ -147,7 +144,7 @@
 %defattr(-,root,root)
 %doc NEWS doc/HOWTO README
 %dir /etc/default
-%attr(0644,root,root)	%config /etc/login.defs
+%attr(0644,root,root)	%config(noreplace) /etc/login.defs
 %attr(0600,root,root)	%config /etc/default/useradd
 %{_bindir}/sg
 %{_bindir}/chage
@@ -205,6 +202,10 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Jun 06 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.16-1
+- upgrade
+- do not replace login.defs file (#190014)
+
 * Sat Apr 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.15-3
 - fix typo in shadow-4.0.15-login.defs (#188263)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Apr 2006 12:45:14 -0000	1.11
+++ sources	6 Jun 2006 11:01:03 -0000	1.12
@@ -1 +1 @@
-a0452fa989f8ba45023cc5a08136568e  shadow-4.0.15.tar.bz2
+1d91f7479143d1d705b94180c0d4874b  shadow-4.0.16.tar.bz2


--- shadow-4.0.12-lOption.patch DELETED ---


--- shadow-4.0.14-symlinks.patch DELETED ---


--- shadow-4.0.15-nscdFlushCash.patch DELETED ---


--- shadow-4.0.15-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:01:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:01:54 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.26,1.27
Message-ID: <200606061101.k56B1sqX022822@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22794

Modified Files:
	hal-cups-utils.spec 
Log Message:
[ffesti] removed hal policy file from spec (is now part of the source tarball)



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hal-cups-utils.spec	6 Jun 2006 10:26:39 -0000	1.26
+++ hal-cups-utils.spec	6 Jun 2006 11:01:49 -0000	1.27
@@ -39,8 +39,6 @@
   mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
 fi
 
-install -p -D %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:05:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:05:29 -0400
Subject: rpms/openmotif/devel openMotif-2.3.0-overrun.patch, NONE,
	1.1 openMotif-2.2.3-text_paste.patch, 1.1, 1.2 openmotif.spec,
	1.43, 1.44
Message-ID: <200606061105.k56B5TGC022889@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22873

Modified Files:
	openMotif-2.2.3-text_paste.patch openmotif.spec 
Added Files:
	openMotif-2.3.0-overrun.patch 
Log Message:
[tw]
- new CVS version 2006-06-06
- new buildprereq for pkgconfig



openMotif-2.3.0-overrun.patch:
 List.c |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

--- NEW FILE openMotif-2.3.0-overrun.patch ---
--- openmotif-2.3.0/lib/Xm/List.c.overrun	2006-06-06 12:10:02.000000000 +0200
+++ openmotif-2.3.0/lib/Xm/List.c	2006-06-06 12:46:57.000000000 +0200
@@ -178,7 +178,8 @@
 		       Dimension old_max_height);
 static void ResetExtents(XmListWidget lw,
 			 Boolean recache_extents);
-static void FixStartEnd(int pos, int count, int *start, int *end);
+static void FixStartEnd(XmListWidget lw,
+			int pos, int count, int *start, int *end);
 static int AddInternalElements(XmListWidget lw,
 			       XmString *items,
 			       int nitems,
@@ -3122,7 +3123,8 @@
  ************************************************************************/
 
 static void
-FixStartEnd(int pos,
+FixStartEnd(XmListWidget lw,
+	    int pos,
 	    int count,
 	    int *start,
 	    int *end)
@@ -3135,6 +3137,11 @@
       *end = save;
     }
 
+  if (*start < 0)
+    *start = 0;
+  if (*end >= lw->list.itemCount)
+    *end = lw->list.itemCount - 1;
+
   /* No overlap, before the deleted range. */
   if (*end < pos)
     return;
@@ -3290,8 +3297,8 @@
 
   /* BEGIN OSF Fix CR 4656 */
   /* Fix selection delimiters. */
-  FixStartEnd(curpos, count, &lw->list.StartItem, &lw->list.EndItem);
-  FixStartEnd(curpos, count, &lw->list.OldStartItem, &lw->list.OldEndItem);
+  FixStartEnd(lw, curpos, count, &lw->list.StartItem, &lw->list.EndItem);
+  FixStartEnd(lw, curpos, count, &lw->list.OldStartItem, &lw->list.OldEndItem);
   /* END OSF Fix CR 4656 */
 
   if (lw->list.itemCount)
@@ -3363,10 +3370,11 @@
 
 	      /* BEGIN OSF Fix CR 4656 */
 	      /* Fix selection delimiters. */
-	      FixStartEnd(item_pos, 1, &lw->list.StartItem, &lw->list.EndItem);
+	      FixStartEnd(lw,
+			  item_pos, 1, &lw->list.StartItem, &lw->list.EndItem);
 
 	      /* Fix old selection delimiters. */
-	      FixStartEnd(item_pos, 1,
+	      FixStartEnd(lw, item_pos, 1,
 			  &lw->list.OldStartItem,
 			  &lw->list.OldEndItem);
 	      /* END OSF Fix CR 4656 */
@@ -3380,9 +3388,9 @@
    */
   if (oldItemCount > lw->list.itemCount)
     {
-      FixStartEnd(lw->list.itemCount, oldItemCount - lw->list.itemCount,
+      FixStartEnd(lw, lw->list.itemCount, oldItemCount - lw->list.itemCount,
 		  &lw->list.StartItem, &lw->list.EndItem);
-      FixStartEnd(lw->list.itemCount, oldItemCount - lw->list.itemCount,
+      FixStartEnd(lw, lw->list.itemCount, oldItemCount - lw->list.itemCount,
 		  &lw->list.OldStartItem, &lw->list.OldEndItem);
     }
 
@@ -5079,9 +5087,10 @@
    *
    ****************/
   i = MIN(lw->list.OldStartItem, lw->list.OldEndItem);
+  i = MAX(i, 0);
   j = MAX(lw->list.OldStartItem, lw->list.OldEndItem);
   if ((i != 0) || (j != 0))
-    for (; i <= j; i++)
+    for (; i <= j && i < lw->list.itemCount; i++)
       lw->list.InternalList[i]->last_selected =
 	lw->list.InternalList[i]->selected;
 
@@ -5227,9 +5236,10 @@
    *
    ****************/
   i = MIN(lw->list.OldStartItem, lw->list.OldEndItem);
+  i = MAX(i, 0);
   j = MAX(lw->list.OldStartItem, lw->list.OldEndItem);
   if ((i != 0) || (j != 0))
-    for (; i <= j; i++)
+    for (; i <= j && i < lw->list.itemCount; i++)
       lw->list.InternalList[i]->last_selected =
 	lw->list.InternalList[i]->selected;
 
@@ -5597,6 +5607,9 @@
   item = lw->list.LastHLItem;
   lw->list.DidSelection = TRUE;
 
+  if (item < 0 || item >= lw->list.itemCount)
+    return;
+
   /* If there's a drag timeout, remove it so we don't see two selections. */
   if (lw->list.DragID)
     {
@@ -7013,8 +7026,8 @@
     {
       item = WhichItem(lw, event->xbutton.y);
       if (item > 0)
-	item -=lw->list.top_position;
-      if ((item < 0) || (item > lw->list.itemCount))
+	item -= lw->list.top_position;
+      if ((item < 0) || (item >= lw->list.itemCount))
 	return;
     }
   else
@@ -8217,7 +8230,7 @@
 
 /************************************************************************
  *									*
- * XmDeletePos - delete the item at the specified position from the	*
+ * XmListDeletePos - delete the item at the specified position from the	*
  *	list.								*
  *									*
  ************************************************************************/
@@ -8240,7 +8253,7 @@
 
 /************************************************************************
  *									*
- * XmDeleteItemsPos - delete the items at the specified position        *
+ * XmListDeleteItemsPos - delete the items at the specified position    *
  * from the list.							*
  *									*
  ************************************************************************/
@@ -8997,7 +9010,7 @@
 
 /************************************************************************
  *									*
- * XmDeselectAllItems - hose the entire selected list			*
+ * XmListDeselectAllItems - hose the entire selected list		*
  *									*
  ************************************************************************/
 

openMotif-2.2.3-text_paste.patch:
 TextF.c    |   14 +++++++++-----
 TextFSel.c |    6 ++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

Index: openMotif-2.2.3-text_paste.patch
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openMotif-2.2.3-text_paste.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openMotif-2.2.3-text_paste.patch	2 Feb 2006 16:57:34 -0000	1.1
+++ openMotif-2.2.3-text_paste.patch	6 Jun 2006 11:05:24 -0000	1.2
@@ -1,6 +1,6 @@
 --- openMotif-2.2.3/lib/Xm/TextFSel.c.text_paste	2002-01-31 15:49:36.000000000 +0100
-+++ openMotif-2.2.3/lib/Xm/TextFSel.c	2006-02-01 16:28:00.000000000 +0100
-@@ -1097,10 +1097,10 @@
++++ openMotif-2.2.3/lib/Xm/TextFSel.c	2006-03-29 17:06:36.000000000 +0200
+@@ -1097,13 +1097,14 @@
  	wchar_t * wc_value;
  	
  	wc_value = (wchar_t*)XtMalloc ((unsigned)
@@ -8,13 +8,25 @@
 +				       ((ds->length + 1) * sizeof(wchar_t)));
  	_XmProcessLock();
  	prim_select->num_chars = mbstowcs(wc_value, (char *) ds->value,
--					  (size_t) ds->length);
-+					  (size_t) ds->length + 1);
+ 					  (size_t) ds->length);
  	if (prim_select->num_chars < 0) 
  	  prim_select->num_chars = 0;
- 	else 
---- openMotif-2.2.3/lib/Xm/TextF.c.text_paste	2006-01-30 17:31:22.000000000 +0100
-+++ openMotif-2.2.3/lib/Xm/TextF.c	2006-02-01 18:01:24.000000000 +0100
+-	else 
++	else {
++	  wc_value[prim_select->num_chars] = 0;
+ 	  replace_res = 
+ 	    _XmTextFieldReplaceText(tf, ds->event, 
+ 				    replace_from,
+@@ -1111,6 +1112,7 @@
+ 				    (char*)wc_value, 
+ 				    prim_select->num_chars,
+ 				    ds->selection == atoms[XmACLIPBOARD]);
++	}
+ 	_XmProcessUnlock();
+ 	XtFree((char*)wc_value);
+       }
+--- openMotif-2.2.3/lib/Xm/TextF.c.text_paste	2006-03-29 17:06:36.000000000 +0200
++++ openMotif-2.2.3/lib/Xm/TextF.c	2006-03-29 17:06:36.000000000 +0200
 @@ -2886,7 +2886,8 @@
    int free_insert = (int)False;
    char *insert_orig;


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- openmotif.spec	11 Feb 2006 04:50:26 -0000	1.43
+++ openmotif.spec	6 Jun 2006 11:05:24 -0000	1.44
@@ -4,42 +4,31 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.3.0
-Release: 0.1.9.2
+Release: 0.2
 License: Open Group Public License
 Group: System Environment/Libraries
 #Source:  %{intern_name}-%{version}.tar.gz
-Source:  openmotif-2.3.0beta1-src.tar.gz
+Source:  openmotif-2.3.0-20060606.tar.gz
 Source1: xmbind
 URL: http://www.motifzone.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: /usr/share/X11/XKeysymDB
 
 BuildPrereq: flex
-BuildPrereq: byacc
+BuildPrereq: byacc, pkgconfig
 BuildRequires: libjpeg-devel libpng-devel
 BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel
 BuildRequires: xorg-x11-xbitmaps
 BuildRequires: perl
 
-Patch0: openmotif-2.3.0-CVS-2006-02-02.patch
 Patch22: openMotif-2.3.0-no_demos.patch
 Patch23: openMotif-2.2.3-uil_lib.patch
-Patch32: openMotif-2.3.0-CAN-2004-0914.patch
-Patch33: openMotif-2.2.3-CAN-2004-0914_autofoo.patch
-Patch34: openMotif-2.2.3-tmpnam.patch
-Patch35: openmotif-2.2.3-CAN-2004-0914_sec8.patch
-Patch36: openMotif-2.2.3-vizcount.patch
-Patch37: openMotif-2.2.3-long64.patch
-Patch38: openMotif-2.3.0-multiscreen.patch
-Patch41: openMotif-2.2.3-CAN-2005-0605.patch
-Patch42: openMotif-2.2.3-mrm.patch
 Patch43: openMotif-2.3.0-rgbtxt.patch
 Patch44: openMotif-2.3.0-xft-config.patch
 Patch45: openMotif-2.3.0-mwmrc_dir.patch
 Patch46: openMotif-2.3.0-bindings.patch
 Patch47: openMotif-2.3.0-no_X11R6.patch
-Patch48: openMotif-2.2.3-CVE-2005-3964.patch
-Patch49: openMotif-2.2.3-overrun.patch
+Patch49: openMotif-2.3.0-overrun.patch
 Patch50: openMotif-2.2.3-text_paste.patch
 
 Conflicts: lesstif <= 0.92.32-6
@@ -65,27 +54,17 @@
 
 %prep
 %setup -q -n %{intern_name}-%{version}
-%patch0 -p1 -b .CVS-2006-02-02
 %patch22 -p1 -b .no_demos
 %patch23 -p1 -b .uil_lib
-#%patch32 -p1 -b .CAN-2004-0914
-#%patch33 -p1 -b .CAN-2004-0914_autofoo
-#%patch34 -p1 -b .tmpnam
-#%patch35 -p1 -b .CAN-2004-0914_sec8
-#%patch36 -p1 -b .vizcount
-#%patch37 -p1 -b .long64
-#%patch38 -p1 -b .multiscreen
-#%patch41 -p1 -b .CAN-2005-0605
-#%patch42 -p1 -b .mrm
 %patch43 -p1 -b .rgbtxt
 %patch44 -p1 -b .xft-config
 %patch45 -p1 -b .mwmrc_dir
 %patch46 -p1 -b .bindings
 %patch47 -p1 -b .no_X11R6
-%patch48 -p1 -b .CVE-2005-3964
 %patch49 -p1 -b .overrun
 %patch50 -p1 -b .text_paste
 
+
 for i in doc/man/man3/{XmColumn,XmDataField}.3; do
 	iconv -f windows-1252 -t utf-8 < "$i" > "${i}_"
 	mv "${i}_" "$i"
@@ -156,6 +135,10 @@
 %{_datadir}/man/man5/*
 
 %changelog
+* Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.2
+- new CVS version 2006-06-06
+- new buildprereq for pkgconfig
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-0.1.9.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:12:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:12:12 -0400
Subject: rpms/openmotif/devel .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <200606061112.k56BCC03000928@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29924

Modified Files:
	.cvsignore sources 
Log Message:
[tw]
- uploaded source tar



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Dec 2005 13:38:25 -0000	1.7
+++ .cvsignore	6 Jun 2006 11:12:07 -0000	1.8
@@ -1 +1 @@
-openmotif-2.3.0beta1-src.tar.gz
+openmotif-2.3.0-20060606.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Dec 2005 13:38:25 -0000	1.8
+++ sources	6 Jun 2006 11:12:07 -0000	1.9
@@ -1 +1 @@
-94ad0db66c354670a7b647979d883016  openmotif-2.3.0beta1-src.tar.gz
+ddc90c0b794ddf28895c73347a395c37  openmotif-2.3.0-20060606.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:23:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:23:03 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.27,1.28
Message-ID: <200606061123.k56BN3iJ017596@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17511

Modified Files:
	hal-cups-utils.spec 
Log Message:
[ffesti] added cups as build requirement



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hal-cups-utils.spec	6 Jun 2006 11:01:49 -0000	1.27
+++ hal-cups-utils.spec	6 Jun 2006 11:22:57 -0000	1.28
@@ -10,6 +10,7 @@
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: dbus-devel >= 0.31
+BuildRequires: cups
 BuildRequires: cups-devel
 Requires: hal >= 0.5.0
 Requires: dbus >= 0.60
@@ -52,6 +53,7 @@
 %changelog
 * Fri Jun 06 2006 Florian Festi <ffesti at redhat.com> - 0.6.0-1
 - new implementation which obsoletes the cups-config-daemon
+- added cups to build requirements to have /usr/lib/cups/backend
 
 * Tue Mar 28 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.5-2
 - Make sure backends install into /usr/lib and not /usr/lib64 



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:31:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:31:15 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.28,1.29
Message-ID: <200606061131.k56BVFax019721@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19554

Modified Files:
	hal-cups-utils.spec 
Log Message:
[ffesti] removed special code for lib64, make install should do 
         "the rigth thing" (tm)



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- hal-cups-utils.spec	6 Jun 2006 11:22:57 -0000	1.28
+++ hal-cups-utils.spec	6 Jun 2006 11:31:10 -0000	1.29
@@ -35,11 +35,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-if [ -n "`echo %{_libdir} | grep lib64`" ] ; then
-  mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend
-  mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
-fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:38:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:38:19 -0400
Subject: rpms/ethereal/devel ethereal-dialog-close.patch, NONE,
	1.1 ethereal.spec, 1.73, 1.74
Message-ID: <200606061138.k56BcJRM020837@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20813

Modified Files:
	ethereal.spec 
Added Files:
	ethereal-dialog-close.patch 
Log Message:
- fix ethereal crash when capture statistics window is closed (#190516)

ethereal-dialog-close.patch:
 capture_info_dlg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE ethereal-dialog-close.patch ---
--- ethereal-1.1.0-SVN-18188/gtk/capture_info_dlg.c.old	2006-05-20 12:38:54.000000000 +0200
+++ ethereal-1.1.0-SVN-18188/gtk/capture_info_dlg.c	2006-06-06 10:47:47.000000000 +0200
@@ -76,9 +76,10 @@
   }
 }
 
-static void
+static gboolean
 capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data _U_) {
   capture_stop(capture_opts);
+  return TRUE;
 }
 
 static gint


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ethereal.spec	1 Jun 2006 08:27:50 -0000	1.73
+++ ethereal.spec	6 Jun 2006 11:38:17 -0000	1.74
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	1.1.0
-Release: 	0.svn.2
+Release: 	0.svn.3
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -14,6 +14,7 @@
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.13-pie.patch
 Patch3:		ethereal-0.10.14-nfsv4-opts.patch
+Patch4:		ethereal-dialog-close.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -55,6 +56,7 @@
 #%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .pie
 %patch3 -p1 
+%patch4 -p1 -b .close
 
 %build
 %ifarch s390 s390x
@@ -166,6 +168,9 @@
 
 
 %changelog
+* Tue Jun  6 2006 Radek Vokal <rvokal at redhat.com> 1.1.0-0.svn.2
+- fix ethereal crash when capture statistics window is closed (#190516)
+
 * Thu Jun  1 2006 Radek Vokal <rvokal at redhat.com> 1.1.0-0.svn.1
 - add libpcap-devel dependency
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:39:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:39:27 -0400
Subject: rpms/libtool/devel libtool-1.5.18-multilib.patch, 1.1,
	1.2 libtool.spec, 1.40, 1.41
Message-ID: <200606061139.k56BdRXZ021118@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21092

Modified Files:
	libtool-1.5.18-multilib.patch libtool.spec 
Log Message:
- don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)

libtool-1.5.18-multilib.patch:
 libtool.m4 |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletion(-)

Index: libtool-1.5.18-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool-1.5.18-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtool-1.5.18-multilib.patch	17 May 2005 04:16:21 -0000	1.1
+++ libtool-1.5.18-multilib.patch	6 Jun 2006 11:39:25 -0000	1.2
@@ -23,7 +23,7 @@
 +
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
    fi


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libtool.spec	26 May 2006 06:36:04 -0000	1.40
+++ libtool.spec	6 Jun 2006 11:39:25 -0000	1.41
@@ -4,7 +4,7 @@
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:    	3
+Release:  	4
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -141,6 +141,9 @@
 
 
 %changelog
+* Tue Jun 06 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-4
+- don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)
+
 * Fri May 26 2006 Jakub Jelinek <jakub at redhat.com> 1.5.22-3
 - rebuilt with GCC 4.1.0
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 11:53:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 07:53:37 -0400
Subject: rpms/iptraf/devel iptraf-3.0.0-compile.fix.patch, 1.1,
	1.2 iptraf.spec, 1.20, 1.21
Message-ID: <200606061153.k56BrbsK006412@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/iptraf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5827

Modified Files:
	iptraf-3.0.0-compile.fix.patch iptraf.spec 
Log Message:
--- ./src/othptab.c.old 2005-09-13 08:42:54.000000000 +0200
+++ ./src/othptab.c     2006-06-06 13:17:03.000000000 +0200
@@ -17,9 +17,9 @@
 ***/

 #include <asm/types.h>
-#include <linux/if_ether.h>
-#include <linux/if_tr.h>
-#include <linux/if_fddi.h>
+#include <netinet/if_ether.h>
+#include <netinet/if_tr.h>
+#include <netinet/if_fddi.h>
 #include <winops.h>
 #include "arphdr.h"
 #include "options.h"
--- ./src/Makefile.old  2006-06-06 13:36:40.000000000 +0200
+++ ./src/Makefile      2006-05-31 07:58:30.000000000 +0200
@@ -18,7 +18,7 @@
 BINDIR         = ../../iptraf-$(VERNUMBER).bin.$(ARCH)

 CC             = gcc
-LIBS           = -L../support -ltextbox -lpanel -lncurses   # in this order!
+LIBS           = -L../support -ltextbox -lpanelw -lncursesw    # in this order!

 # comment this one out to omit debug code when done.

@@ -39,7 +39,7 @@
 # you may want to change this to point to your ncurses include directory
 # if the ncurses include files are not in the default location.

-INCLUDEDIR     = -I/usr/include/ncurses -I../support
+INCLUDEDIR     = -I/usr/include/ncursesw -I../support

 # You can uncomment this one to disable the backspace key in input fields.
 # This means you must use the Del key or Ctrl+H combination to erase the
@@ -162,7 +162,7 @@
 # and the compiled programs for release as a ready-to-run distribution.

 dist-bin: all
-       $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
+       $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a
        rm -rf $(BINDIR)
        mkdir $(BINDIR)
        /bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
@@ -178,7 +178,7 @@
 # Just in case anyone needs to link a static binary
 #
 static: $(OBJS)
-       $(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses
+       $(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw
        $(CC) -static -o rvnamed rvnamed.o getpath.o
        $(CC) -static -o rawtime rawtime.c

--- ./src/tcptable.h.old        2005-09-13 08:42:54.000000000 +0200
+++ ./src/tcptable.h    2006-06-06 13:40:24.000000000 +0200
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <curses.h>
+#include <ncurses.h>
 #include <panel.h>
 #include <netdb.h>
 #include <time.h>
@@ -22,8 +22,8 @@
 #include <asm/types.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
-#include <linux/if_fddi.h>
-#include <linux/if_tr.h>
+#include <netinet/if_fddi.h>
+#include <netinet/if_tr.h>
 #include <net/if.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>



iptraf-3.0.0-compile.fix.patch:
 Makefile   |    8 ++++----
 othptab.c  |    6 +++---
 tcptable.h |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

Index: iptraf-3.0.0-compile.fix.patch
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf-3.0.0-compile.fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptraf-3.0.0-compile.fix.patch	26 May 2006 11:23:51 -0000	1.1
+++ iptraf-3.0.0-compile.fix.patch	6 Jun 2006 11:53:33 -0000	1.2
@@ -1,11 +1,75 @@
---- iptraf-3.0.0/src/Makefile.compile.fix	2006-05-25 13:41:05.000000000 +0200
-+++ iptraf-3.0.0/src/Makefile	2006-05-25 13:42:54.000000000 +0200
-@@ -31,7 +31,7 @@
- # options to be passed to the compiler.  I don't believe they need to be
- # modified (except for -m486 on non-Intel x86 platforms).
- 
--CFLAGS		= -Wall #-O2 #-m486
-+CFLAGS		= -D__KERNEL_STRICT_NAMES -Wall #-O2 #-m486
- DIRS		= -DWORKDIR=\"$(WORKDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" \
- 		  -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
- LDOPTS		= #-static
+--- ./src/othptab.c.old	2005-09-13 08:42:54.000000000 +0200
++++ ./src/othptab.c	2006-06-06 13:17:03.000000000 +0200
+@@ -17,9 +17,9 @@
+ ***/
+ 
+ #include <asm/types.h>
+-#include <linux/if_ether.h>
+-#include <linux/if_tr.h>
+-#include <linux/if_fddi.h>
++#include <netinet/if_ether.h>
++#include <netinet/if_tr.h>
++#include <netinet/if_fddi.h>
+ #include <winops.h>
+ #include "arphdr.h"
+ #include "options.h"
+--- ./src/Makefile.old	2006-06-06 13:36:40.000000000 +0200
++++ ./src/Makefile	2006-05-31 07:58:30.000000000 +0200
+@@ -18,7 +18,7 @@
+ BINDIR		= ../../iptraf-$(VERNUMBER).bin.$(ARCH)
+ 
+ CC		= gcc
+-LIBS		= -L../support -ltextbox -lpanel -lncurses   # in this order!
++LIBS		= -L../support -ltextbox -lpanelw -lncursesw	# in this order!
+ 
+ # comment this one out to omit debug code when done.
+ 
+@@ -39,7 +39,7 @@
+ # you may want to change this to point to your ncurses include directory
+ # if the ncurses include files are not in the default location.
+ 
+-INCLUDEDIR	= -I/usr/include/ncurses -I../support
++INCLUDEDIR	= -I/usr/include/ncursesw -I../support	
+ 
+ # You can uncomment this one to disable the backspace key in input fields.
+ # This means you must use the Del key or Ctrl+H combination to erase the
+@@ -162,7 +162,7 @@
+ # and the compiled programs for release as a ready-to-run distribution.
+ 
+ dist-bin: all
+-	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
++	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a	
+ 	rm -rf $(BINDIR)
+ 	mkdir $(BINDIR)
+ 	/bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
+@@ -178,7 +178,7 @@
+ # Just in case anyone needs to link a static binary
+ #
+ static: $(OBJS)
+-	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses
++	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw
+ 	$(CC) -static -o rvnamed rvnamed.o getpath.o
+ 	$(CC) -static -o rawtime rawtime.c
+ 
+--- ./src/tcptable.h.old	2005-09-13 08:42:54.000000000 +0200
++++ ./src/tcptable.h	2006-06-06 13:40:24.000000000 +0200
+@@ -10,7 +10,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <curses.h>
++#include <ncurses.h>
+ #include <panel.h>
+ #include <netdb.h>
+ #include <time.h>
+@@ -22,8 +22,8 @@
+ #include <asm/types.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_ether.h>
+-#include <linux/if_fddi.h>
+-#include <linux/if_tr.h>
++#include <netinet/if_fddi.h>
++#include <netinet/if_tr.h>
+ #include <net/if.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- iptraf.spec	26 May 2006 11:23:51 -0000	1.20
+++ iptraf.spec	6 Jun 2006 11:53:33 -0000	1.21
@@ -84,8 +84,8 @@
 %dir %attr(700,root,root) /var/lib/iptraf
 
 %changelog
-* Thu May 25 2006 Marcela Maslanova <mmaslano at redhat.com> 3.0.0-3
-- fix compile
+* Thu Jun 06 2006 Marcela Maslanova <mmaslano at redhat.com> 3.0.0-3
+- fix compile (#192510)
 
 * Wed Apr 05 2006 Miroslav Lichvar <mlichvar at redhat.com> 3.0.0-2
 - fix crash when parsing long network interface name (#187937)



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:03:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:03:48 -0400
Subject: rpms/openssl/devel openssl.spec,1.74,1.75
Message-ID: <200606061203.k56C3mbN009476@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9417

Modified Files:
	openssl.spec 
Log Message:
- add export



Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- openssl.spec	6 Jun 2006 10:51:31 -0000	1.74
+++ openssl.spec	6 Jun 2006 12:03:44 -0000	1.75
@@ -205,6 +205,7 @@
         export INSROOT=$RPM_BUILD_ROOT
 fi
 CPPFLAGS=-I../../include
+export CPPFLAGS
 %configure
 make
 popd



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:13:53 -0400
Subject: rpms/indent/devel indent.spec,1.21,1.22
Message-ID: <200606061213.k56CDrBW011203@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11130

Modified Files:
	indent.spec 
Log Message:
- BuildRequires gettext



Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- indent.spec	11 Feb 2006 03:32:31 -0000	1.21
+++ indent.spec	6 Jun 2006 12:13:50 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 12.2
+Release: 12.3
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -13,6 +13,7 @@
 Patch5: indent-2.2.9-lcall.patch
 Patch6: indent-2.2.9-zh_TW.patch
 Prereq: /sbin/install-info
+BuildRequires: gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Tue Jun  6 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-12.3
+- BuildRequires gettext
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:32:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:32:36 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.112,
	1.113 policycoreutils-rhat.patch, 1.197,
	1.198 policycoreutils.spec, 1.277, 1.278 sources, 1.116, 1.117
Message-ID: <200606061232.k56CWaDh030974@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30911

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-1
	* Updated fixfiles script for new setfiles location in /sbin.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- .cvsignore	31 May 2006 23:29:31 -0000	1.112
+++ .cvsignore	6 Jun 2006 12:32:11 -0000	1.113
@@ -104,3 +104,4 @@
 policycoreutils-1.30.9.tgz
 policycoreutils-1.30.10.tgz
 policycoreutils-1.30.11.tgz
+policycoreutils-1.30.12.tgz

policycoreutils-rhat.patch:
 audit2allow/Makefile   |    1 
 po/af.po               |    2 
 po/am.po               |    2 
 po/ar.po               |    2 
 po/be.po               |    2 
 po/bg.po               |    2 
 po/bn.po               |    2 
 po/bn_IN.po            |    2 
 po/ca.po               |    2 
 po/cs.po               |    2 
 po/cy.po               |    2 
 po/de.po               |    2 
 po/el.po               |    2 
 po/en_GB.po            |    2 
 po/es.po               |    2 
 po/eu_ES.po            |    2 
 po/fa.po               |    2 
 po/fi.po               |    2 
 po/gu.po               |    2 
 po/he.po               |    2 
 po/hi.po               |    2 
 po/hr.po               |    2 
 po/hu.po               |    2 
 po/hy.po               |    2 
 po/is.po               |    2 
 po/it.po               |    2 
 po/ja.po               |    2 
 po/ka.po               |    2 
 po/kn.po               |    2 
 po/ko.po               |    2 
 po/ku.po               |    2 
 po/lo.po               |    2 
 po/lt.po               |    2 
 po/lv.po               |    2 
 po/mk.po               |    2 
 po/ml.po               |    2 
 po/mr.po               |    2 
 po/ms.po               |    2 
 po/my.po               |    2 
 po/nb.po               |    2 
 po/nn.po               |    2 
 po/no.po               |    2 
 po/nso.po              |    2 
 po/or.po               |    2 
 po/pa.po               |    2 
 po/pl.po               |    2 
 po/policycoreutils.pot |   26 +-
 po/pt.po               |    2 
 po/pt_BR.po            |  297 +++++++++++++++++------------
 po/ro.po               |    2 
 po/ru.po               |    2 
 po/si.po               |    2 
 po/sk.po               |    2 
 po/sl.po               |    2 
 po/sq.po               |    2 
 po/sr.po               |    2 
 po/sr at Latn.po          |    2 
 po/ta.po               |    2 
 po/te.po               |    2 
 po/th.po               |    2 
 po/tr.po               |    2 
 po/uk.po               |    2 
 po/ur.po               |    2 
 po/vi.po               |    2 
 po/zh_CN.po            |  501 ++++++++++++++++++++++++++++---------------------
 po/zh_TW.po            |    2 
 po/zu.po               |    2 
 scripts/fixfiles       |    3 
 setfiles/Makefile      |    1 
 setfiles/setfiles.c    |   38 +++
 70 files changed, 580 insertions(+), 413 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.197 -r 1.198 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- policycoreutils-rhat.patch	31 May 2006 23:50:52 -0000	1.197
+++ policycoreutils-rhat.patch	6 Jun 2006 12:32:12 -0000	1.198
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.10/audit2allow/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.12/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.10/audit2allow/Makefile	2006-05-26 08:49:21.000000000 -0400
++++ policycoreutils-1.30.12/audit2allow/Makefile	2006-06-06 08:29:04.000000000 -0400
 @@ -1,7 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -9,7294 +9,861 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
  PYLIBVER ?= python2.4
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.10/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.12/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.10/po/af.po	2006-05-23 06:20:03.000000000 -0400
++++ policycoreutils-1.30.12/po/af.po	2006-06-06 08:30:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-05-26 12:51-0400\n"
-+"POT-Creation-Date: 2006-05-10 08:32-0400\n"
++"POT-Creation-Date: 2006-05-26 13:48-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -436,7 +436,7 @@
- #: ../semanage/seobject.py:343 ../semanage/seobject.py:424
- #: ../semanage/seobject.py:493 ../semanage/seobject.py:549
- #: ../semanage/seobject.py:1080 ../semanage/seobject.py:1119
--#: ../semanage/seobject.py:1188 ../semanage/seobject.py:1222
-+#: ../semanage/seobject.py:1193 ../semanage/seobject.py:1227
- #, python-format
- msgid "Could not create a key for %s"
- msgstr ""
-@@ -484,8 +484,8 @@
- #: ../semanage/seobject.py:763 ../semanage/seobject.py:890
- #: ../semanage/seobject.py:931 ../semanage/seobject.py:963
- #: ../semanage/seobject.py:1060 ../semanage/seobject.py:1103
--#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1206
--#: ../semanage/seobject.py:1238
-+#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1211
-+#: ../semanage/seobject.py:1243
- msgid "Could not start semanage transaction"
- msgstr ""
- 
-@@ -889,42 +889,42 @@
- msgid "Could not list file contexts"
- msgstr ""
- 
--#: ../semanage/seobject.py:1184
-+#: ../semanage/seobject.py:1189
- msgid "Requires value"
- msgstr ""
- 
--#: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226
--#: ../semanage/seobject.py:1232
-+#: ../semanage/seobject.py:1197 ../semanage/seobject.py:1231
-+#: ../semanage/seobject.py:1237
- #, python-format
- msgid "Could not check if boolean %s is defined"
- msgstr ""
- 
--#: ../semanage/seobject.py:1194 ../semanage/seobject.py:1228
-+#: ../semanage/seobject.py:1199 ../semanage/seobject.py:1233
- #, python-format
- msgid "Boolean %s is not defined"
- msgstr ""
- 
--#: ../semanage/seobject.py:1198
-+#: ../semanage/seobject.py:1203
- #, python-format
- msgid "Could not query file context %s"
- msgstr ""
- 
--#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1214
-+#: ../semanage/seobject.py:1215 ../semanage/seobject.py:1219
- #, python-format
- msgid "Could not modify boolean %s"
- msgstr ""
- 
--#: ../semanage/seobject.py:1234
-+#: ../semanage/seobject.py:1239
- #, python-format
- msgid "Boolean %s is defined in policy, cannot be deleted"
- msgstr ""
- 
--#: ../semanage/seobject.py:1242 ../semanage/seobject.py:1246
-+#: ../semanage/seobject.py:1247 ../semanage/seobject.py:1251
- #, python-format
- msgid "Could not delete boolean %s"
- msgstr ""
- 
--#: ../semanage/seobject.py:1254
-+#: ../semanage/seobject.py:1259
- msgid "Could not list booleans"
- msgstr ""
- 
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.10/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.12/po/am.po
 --- nsapolicycoreutils/po/am.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.10/po/am.po	2006-05-23 06:20:02.000000000 -0400
++++ policycoreutils-1.30.12/po/am.po	2006-06-06 08:30:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-05-26 12:51-0400\n"
-+"POT-Creation-Date: 2006-05-10 08:32-0400\n"
++"POT-Creation-Date: 2006-05-26 13:48-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -436,7 +436,7 @@
- #: ../semanage/seobject.py:343 ../semanage/seobject.py:424
- #: ../semanage/seobject.py:493 ../semanage/seobject.py:549
- #: ../semanage/seobject.py:1080 ../semanage/seobject.py:1119
--#: ../semanage/seobject.py:1188 ../semanage/seobject.py:1222
-+#: ../semanage/seobject.py:1193 ../semanage/seobject.py:1227
- #, python-format
- msgid "Could not create a key for %s"
- msgstr ""
-@@ -484,8 +484,8 @@
- #: ../semanage/seobject.py:763 ../semanage/seobject.py:890
- #: ../semanage/seobject.py:931 ../semanage/seobject.py:963
- #: ../semanage/seobject.py:1060 ../semanage/seobject.py:1103
--#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1206
--#: ../semanage/seobject.py:1238
-+#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1211
-+#: ../semanage/seobject.py:1243
- msgid "Could not start semanage transaction"
- msgstr ""
- 
-@@ -889,42 +889,42 @@
- msgid "Could not list file contexts"
- msgstr ""
- 
--#: ../semanage/seobject.py:1184
-+#: ../semanage/seobject.py:1189
- msgid "Requires value"
- msgstr ""
- 
--#: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226
--#: ../semanage/seobject.py:1232
-+#: ../semanage/seobject.py:1197 ../semanage/seobject.py:1231
-+#: ../semanage/seobject.py:1237
- #, python-format
- msgid "Could not check if boolean %s is defined"
- msgstr ""
- 
--#: ../semanage/seobject.py:1194 ../semanage/seobject.py:1228
-+#: ../semanage/seobject.py:1199 ../semanage/seobject.py:1233
- #, python-format
- msgid "Boolean %s is not defined"
- msgstr ""
- 
--#: ../semanage/seobject.py:1198
-+#: ../semanage/seobject.py:1203
- #, python-format
- msgid "Could not query file context %s"
- msgstr ""
- 
--#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1214
-+#: ../semanage/seobject.py:1215 ../semanage/seobject.py:1219
- #, python-format
- msgid "Could not modify boolean %s"
- msgstr ""
- 
--#: ../semanage/seobject.py:1234
-+#: ../semanage/seobject.py:1239
- #, python-format
- msgid "Boolean %s is defined in policy, cannot be deleted"
- msgstr ""
- 
--#: ../semanage/seobject.py:1242 ../semanage/seobject.py:1246
-+#: ../semanage/seobject.py:1247 ../semanage/seobject.py:1251
- #, python-format
- msgid "Could not delete boolean %s"
- msgstr ""
- 
--#: ../semanage/seobject.py:1254
-+#: ../semanage/seobject.py:1259
- msgid "Could not list booleans"
- msgstr ""
- 
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.30.10/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.30.12/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.10/po/ar.po	2006-05-23 06:20:03.000000000 -0400
++++ policycoreutils-1.30.12/po/ar.po	2006-06-06 08:30:05.000000000 -0400
[...10216 lines suppressed...]
++#: ../semanage/seobject.py:1107
++#: ../semanage/seobject.py:1111
++#, python-format
+ msgid "Could not modify file context for %s"
+-msgstr "%s!  ????????? %s ??????????????????\n"
++msgstr "????????? %s ?????????????????????"
+ 
+ #: ../semanage/seobject.py:1131
  #, python-format
- msgid "Could not create a key for %s"
- msgstr ""
-@@ -484,8 +484,8 @@
- #: ../semanage/seobject.py:763 ../semanage/seobject.py:890
- #: ../semanage/seobject.py:931 ../semanage/seobject.py:963
- #: ../semanage/seobject.py:1060 ../semanage/seobject.py:1103
--#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1206
--#: ../semanage/seobject.py:1238
-+#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1211
-+#: ../semanage/seobject.py:1243
- msgid "Could not start semanage transaction"
+ msgid "File context for %s is defined in policy, cannot be deleted"
  msgstr ""
  
-@@ -889,42 +889,42 @@
+-#: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143
+-#, fuzzy, python-format
++#: ../semanage/seobject.py:1139
++#: ../semanage/seobject.py:1143
++#, python-format
+ msgid "Could not delete file context for %s"
+-msgstr "%s!  ????????? %s ??????????????????\n"
++msgstr "????????? %s ?????????????????????"
+ 
+ #: ../semanage/seobject.py:1151
+-#, fuzzy
  msgid "Could not list file contexts"
- msgstr ""
+-msgstr "%s!  ????????? %s ??????????????????\n"
++msgstr "???????????????????????????"
  
--#: ../semanage/seobject.py:1184
-+#: ../semanage/seobject.py:1189
+ #: ../semanage/seobject.py:1184
  msgid "Requires value"
  msgstr ""
  
 -#: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226
--#: ../semanage/seobject.py:1232
-+#: ../semanage/seobject.py:1197 ../semanage/seobject.py:1231
-+#: ../semanage/seobject.py:1237
++#: ../semanage/seobject.py:1192
++#: ../semanage/seobject.py:1226
+ #: ../semanage/seobject.py:1232
  #, python-format
  msgid "Could not check if boolean %s is defined"
  msgstr ""
  
 -#: ../semanage/seobject.py:1194 ../semanage/seobject.py:1228
-+#: ../semanage/seobject.py:1199 ../semanage/seobject.py:1233
++#: ../semanage/seobject.py:1194
++#: ../semanage/seobject.py:1228
  #, python-format
  msgid "Boolean %s is not defined"
- msgstr ""
+-msgstr ""
++msgstr "????????? %s ????????????"
  
--#: ../semanage/seobject.py:1198
-+#: ../semanage/seobject.py:1203
- #, python-format
+ #: ../semanage/seobject.py:1198
+-#, fuzzy, python-format
++#, python-format
  msgid "Could not query file context %s"
- msgstr ""
+-msgstr "%s!  ????????? %s ??????????????????\n"
++msgstr "??????????????????????????? %s"
  
 -#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1214
-+#: ../semanage/seobject.py:1215 ../semanage/seobject.py:1219
++#: ../semanage/seobject.py:1210
++#: ../semanage/seobject.py:1214
  #, python-format
  msgid "Could not modify boolean %s"
  msgstr ""
- 
--#: ../semanage/seobject.py:1234
-+#: ../semanage/seobject.py:1239
- #, python-format
+@@ -920,10 +989,11 @@
  msgid "Boolean %s is defined in policy, cannot be deleted"
  msgstr ""
  
 -#: ../semanage/seobject.py:1242 ../semanage/seobject.py:1246
-+#: ../semanage/seobject.py:1247 ../semanage/seobject.py:1251
++#: ../semanage/seobject.py:1242
++#: ../semanage/seobject.py:1246
  #, python-format
  msgid "Could not delete boolean %s"
- msgstr ""
+-msgstr ""
++msgstr "????????????????????? %s"
  
--#: ../semanage/seobject.py:1254
-+#: ../semanage/seobject.py:1259
+ #: ../semanage/seobject.py:1254
  msgid "Could not list booleans"
+@@ -936,13 +1006,15 @@
+ 
+ #: ../audit2allow/audit2allow:184
+ msgid "Compiling policy"
+-msgstr ""
++msgstr "??????????????????"
+ 
+ #: ../audit2allow/audit2allow:195
+ msgid ""
+ "\n"
+ "******************** IMPORTANT ***********************\n"
  msgstr ""
++"\n"
++"********************?????? ***********************\n"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.10/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2006-05-15 09:42:56.000000000 -0400
-+++ policycoreutils-1.30.10/scripts/fixfiles	2006-05-26 08:49:21.000000000 -0400
-@@ -30,7 +30,8 @@
+ #: ../audit2allow/audit2allow:196
+ #, c-format
+@@ -957,4 +1029,5 @@
+ #: ../audit2allow/audit2allow:203
+ #, c-format
+ msgid "Options Error: %s "
+-msgstr ""
++msgstr "??????????????? %s "
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.12/po/zh_TW.po
+--- nsapolicycoreutils/po/zh_TW.po	2006-05-30 09:07:13.000000000 -0400
++++ policycoreutils-1.30.12/po/zh_TW.po	2006-06-06 08:30:05.000000000 -0400
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2006-05-26 12:51-0400\n"
++"POT-Creation-Date: 2006-05-26 13:48-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.30.12/po/zu.po
+--- nsapolicycoreutils/po/zu.po	2006-05-30 09:07:13.000000000 -0400
++++ policycoreutils-1.30.12/po/zu.po	2006-06-06 08:30:05.000000000 -0400
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2006-05-26 12:51-0400\n"
++"POT-Creation-Date: 2006-05-26 13:48-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.12/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2006-06-05 13:20:27.000000000 -0400
++++ policycoreutils-1.30.12/scripts/fixfiles	2006-06-06 08:29:04.000000000 -0400
+@@ -30,6 +30,7 @@
  OUTFILES=""
  LOGFILE=/dev/null
  SYSLOGFLAG="-l"
--SETFILES=/usr/sbin/setfiles
 +LOGGER=/usr/sbin/logger
-+SETFILES=/sbin/setfiles
+ SETFILES=/sbin/setfiles
  RESTORECON=/sbin/restorecon
  FILESYSTEMSRW=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | jfs ).*\(rw/{print $3}';`
- FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | jfs ).*\(ro/{print $3}';`
 @@ -48,8 +49,6 @@
  #
  logit () {
@@ -8738,9 +2633,9 @@
      echo $1 >> $LOGFILE
  fi
  }
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-1.30.10/setfiles/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-1.30.12/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2006-05-30 09:07:14.000000000 -0400
-+++ policycoreutils-1.30.10/setfiles/Makefile	2006-05-26 08:49:21.000000000 -0400
++++ policycoreutils-1.30.12/setfiles/Makefile	2006-06-06 08:29:04.000000000 -0400
 @@ -7,6 +7,7 @@
  CFLAGS = -Werror -Wall -W 
  override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include
@@ -8749,9 +2644,9 @@
  
  all: setfiles
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.10/setfiles/setfiles.c
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.12/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2006-05-15 09:43:12.000000000 -0400
-+++ policycoreutils-1.30.10/setfiles/setfiles.c	2006-05-26 08:49:21.000000000 -0400
++++ policycoreutils-1.30.12/setfiles/setfiles.c	2006-06-06 08:29:04.000000000 -0400
 @@ -75,6 +75,11 @@
  #include <selinux/selinux.h>
  #include <syslog.h> 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- policycoreutils.spec	31 May 2006 23:50:52 -0000	1.277
+++ policycoreutils.spec	6 Jun 2006 12:32:33 -0000	1.278
@@ -4,7 +4,7 @@
 %define libselinuxver 1.30.11-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.11
+Version: 1.30.12
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -110,6 +110,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-1
+	* Updated fixfiles script for new setfiles location in /sbin.
+
 * Tue May 30 2006 Dan Walsh <dwalsh at redhat.com> 1.30.11-1
 - Update to upstream
 	* Merged more translations from Dan Walsh.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- sources	31 May 2006 23:29:31 -0000	1.116
+++ sources	6 Jun 2006 12:32:33 -0000	1.117
@@ -1 +1 @@
-a177ae651d01fea66eee5759fb7fc850  policycoreutils-1.30.11.tgz
+6d30897d6b945f915c4401a96e329141  policycoreutils-1.30.12.tgz



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:37:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:37:04 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.29,1.30
Message-ID: <200606061237.k56Cb426031516@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31466

Modified Files:
	hal-cups-utils.spec 
Log Message:
[ffesti] *??*



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- hal-cups-utils.spec	6 Jun 2006 11:31:10 -0000	1.29
+++ hal-cups-utils.spec	6 Jun 2006 12:37:02 -0000	1.30
@@ -34,6 +34,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+if [ -n "`echo %{_libdir} | grep lib64`" ] ; then
+  mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend
+  mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:56:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:56:19 -0400
Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.21,1.22
Message-ID: <200606061256.k56CuJNx019886@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19825

Modified Files:
	gnome-doc-utils.spec 
Log Message:
fix build reqs



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-doc-utils.spec	11 Apr 2006 15:48:16 -0000	1.21
+++ gnome-doc-utils.spec	6 Jun 2006 12:56:16 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
 Version: 0.6.0
-Release: 2
+Release: 3
 License: LGPL
 Group: Development/Tools
 URL: http://www.gnome.org/
@@ -10,6 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildPrereq: libxml2-devel >= 2.6.12
 BuildPrereq: libxslt-devel >= 1.1.8
+BuildRequires: perl-XML-Parser
 Requires: libxml2 >= 2.6.12
 Requires: libxslt >= 1.1.8
 Requires: libxml2-python
@@ -54,6 +55,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.0-3
+- Add a BuildRequires for perl-XML-Parser
+
 * Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.0-2
 - Add a missing Requires
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:58:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:58:28 -0400
Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.46,1.47
Message-ID: <200606061258.k56CwS1O020798@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20737

Modified Files:
	gnome-icon-theme.spec 
Log Message:
fix build reqs



Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-icon-theme.spec	17 May 2006 03:10:59 -0000	1.46
+++ gnome-icon-theme.spec	6 Jun 2006 12:58:25 -0000	1.47
@@ -1,13 +1,14 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.15.2
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: icon-naming-utils >= 0.7.2
+BuildRequires: perl-XML-Parser
 Requires: hicolor-icon-theme
 Prereq: gtk2 >= 2.6.2
 
@@ -66,6 +67,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-2
+- Add BuildRequires for perl-XML-Parser
+
 * Tue May 16 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 12:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 08:59:45 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.9,1.10
Message-ID: <200606061259.k56CxjnK021346@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21315

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
- Invoke aclocal/autoconf to try to work around a quirk detecting Xaw.


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-resutils.spec	6 Jun 2006 10:39:55 -0000	1.9
+++ xorg-x11-resutils.spec	6 Jun 2006 12:59:42 -0000	1.10
@@ -53,7 +53,10 @@
 {
    for app in * ; do
       pushd $app
+      set -vx
+      aclocal --force ; autoconf
       %configure --disable-xprint
+      set -
       make
       popd
    done
@@ -95,6 +98,7 @@
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Fix all SourceN lines in spec file to not have to update them every time.
 - Remove package ownership of mandir/libdir/etc.
+- Invoke aclocal/autoconf to try to work around a quirk detecting Xaw.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:01:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:01:58 -0400
Subject: rpms/ctags/devel .cvsignore, 1.9, 1.10 ctags.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <200606061301.k56D1whl021715@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/ctags/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21631

Modified Files:
	.cvsignore ctags.spec sources 
Log Message:
update to 5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ctags/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Sep 2004 04:02:21 -0000	1.9
+++ .cvsignore	6 Jun 2006 13:01:21 -0000	1.10
@@ -1 +1,2 @@
 ctags-5.5.4.tar.gz
+ctags-5.6.tar.gz


Index: ctags.spec
===================================================================
RCS file: /cvs/dist/rpms/ctags/devel/ctags.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ctags.spec	11 Feb 2006 02:21:02 -0000	1.18
+++ ctags.spec	6 Jun 2006 13:01:21 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A C programming language indexing and/or cross-reference tool.
 Name: ctags
-Version: 5.5.4
-Release: 4.2.1
+Version: 5.6
+Release: 1
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/ctags/ctags-%{version}.tar.gz
@@ -29,25 +29,28 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-etags
+
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 %makeinstall
-rm -f $RPM_BUILD_ROOT%{_bindir}/etags
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/etags*
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc COPYING EXTENDING.html FAQ INSTALL NEWS README
-%{_bindir}/ctags
-%{_mandir}/man1/ctags*
+%{_bindir}/*
+%{_mandir}/man1/*
 
 %changelog
+* Tue Jun 06 2006 Than Ngo <than at redhat.com> 5.6-1
+- update to 5.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.5.4-4.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ctags/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Sep 2004 04:02:21 -0000	1.9
+++ sources	6 Jun 2006 13:01:22 -0000	1.10
@@ -1 +1 @@
-a84124caadd4103270e0b84596ecfe83  ctags-5.5.4.tar.gz
+9026a6c6950751bc4fd1be37e8a2070f  ctags-5.6.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:03:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:03:11 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.30,1.31
Message-ID: <200606061303.k56D3Bmp021775@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21732

Modified Files:
	hal-cups-utils.spec 
Log Message:
[ffesti] another multiarch fix



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- hal-cups-utils.spec	6 Jun 2006 12:37:02 -0000	1.30
+++ hal-cups-utils.spec	6 Jun 2006 13:02:52 -0000	1.31
@@ -10,7 +10,6 @@
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: dbus-devel >= 0.31
-BuildRequires: cups
 BuildRequires: cups-devel
 Requires: hal >= 0.5.0
 Requires: dbus >= 0.60
@@ -29,6 +28,8 @@
 
 %build
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/cups/backend
+
 %configure
 
 %install
@@ -52,7 +53,6 @@
 %changelog
 * Fri Jun 06 2006 Florian Festi <ffesti at redhat.com> - 0.6.0-1
 - new implementation which obsoletes the cups-config-daemon
-- added cups to build requirements to have /usr/lib/cups/backend
 
 * Tue Mar 28 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.5-2
 - Make sure backends install into /usr/lib and not /usr/lib64 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:07:56 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.29,1.30
Message-ID: <200606061307.k56D7u8b022114@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22066

Modified Files:
	gnome-menus.spec 
Log Message:
fix build reqs



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-menus.spec	17 Apr 2006 16:36:35 -0000	1.29
+++ gnome-menus.spec	6 Jun 2006 13:07:53 -0000	1.30
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.14.0
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -18,6 +18,7 @@
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: %{python}-devel >= 2.3.0
 BuildRequires: gamin-devel
+BuildRequires: perl-XML-Parser
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -89,6 +90,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
+- Add a BuildRequires for perl-XML-Parser
+
 * Mon Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
 - Update to 2.14.0
 - Drop upstreamed patch



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:13:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:13:05 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.278,1.279
Message-ID: <200606061313.k56DD4DD022838@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22802

Modified Files:
	policycoreutils.spec 
Log Message:
* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-2
- Add BuildRequires for gettext



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- policycoreutils.spec	6 Jun 2006 12:32:33 -0000	1.278
+++ policycoreutils.spec	6 Jun 2006 13:13:02 -0000	1.279
@@ -5,13 +5,13 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.12
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
 Patch: policycoreutils-rhat.patch
 
-BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel
+BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
 Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >=  %{libauditver} rhpl
 Requires(post): /sbin/service
@@ -110,6 +110,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-2
+- Add BuildRequires for gettext
+
 * Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-1
 	* Updated fixfiles script for new setfiles location in /sbin.
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:17:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:17:46 -0400
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.17,1.18
Message-ID: <200606061317.k56DHkqj000807@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32713

Modified Files:
	gnome-mime-data.spec 
Log Message:
fix build reqs



Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-mime-data.spec	11 Feb 2006 03:14:50 -0000	1.17
+++ gnome-mime-data.spec	6 Jun 2006 13:17:43 -0000	1.18
@@ -1,12 +1,13 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.4.2
-Release: 1.2.1
+Release: 2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: perl-XML-Parser
 
 ### WE ARE NOT NOARCH, /usr/lib/pkgconfig is not noarch. 
 ### don't change this and don't file a bug. ;-)
@@ -61,6 +62,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.4.2-2
+- Add a BuildRequires for perl-XML-Parser
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:20:56 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.267,1.268
Message-ID: <200606061320.k56DKu0P007031@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6975

Modified Files:
	eclipse.spec 
Log Message:
remove debugging stuff


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- eclipse.spec	6 Jun 2006 02:17:30 -0000	1.267
+++ eclipse.spec	6 Jun 2006 13:20:52 -0000	1.268
@@ -668,8 +668,6 @@
   find -type f -exec sed --in-place "s/x86_64/%{_arch}/g" "{}" \;
 %endif 
 
-exit 1
-
 # Bootstrapping is 3 parts:
 # 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
 # 2. Build ecj with gcj-built ecj ("javac")



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:29:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:29:48 -0400
Subject: rpms/gnome-netstatus/devel gnome-netstatus.spec,1.28,1.29
Message-ID: <200606061329.k56DTm5O010176@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-netstatus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10097

Modified Files:
	gnome-netstatus.spec 
Log Message:
Rebuild



Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-netstatus.spec	11 Feb 2006 03:14:59 -0000	1.28
+++ gnome-netstatus.spec	6 Jun 2006 13:29:46 -0000	1.29
@@ -7,7 +7,7 @@
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.0
-Release: 3.2.1
+Release: 4
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2
 License: GPL
@@ -97,6 +97,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-4
+- Rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:30:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:30:58 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.13,1.14
Message-ID: <200606061330.k56DUwLA010543@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10519

Modified Files:
	libXaw.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
- Added "Requires: xorg-x11-proto-devel" to devel package to try to fix
  indirect bug (#192040)



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXaw.spec	6 Jun 2006 01:18:15 -0000	1.13
+++ libXaw.spec	6 Jun 2006 13:30:56 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
+Requires: xorg-x11-proto-devel
 Requires: libXmu-devel
 Requires: libXt-devel
 
@@ -99,6 +100,10 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
+- Added "Requires: xorg-x11-proto-devel" to devel package to try to fix
+  indirect bug (#192040)
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Added "BuildRequires: pkgconfig" for (#193423)
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:34:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:34:59 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.9,1.10
Message-ID: <200606061334.k56DYx5T011141@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11127

Modified Files:
	gnome-nettool.spec 
Log Message:
fix build reqs



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-nettool.spec	1 Mar 2006 12:03:43 -0000	1.9
+++ gnome-nettool.spec	6 Jun 2006 13:34:56 -0000	1.10
@@ -6,7 +6,7 @@
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
 Version: 2.13.90
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -18,6 +18,7 @@
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils
+BuildRequires: perl-XML-Parser
 
 %description
 GNOME Nettool is a set of front-ends to various networking command-line
@@ -59,6 +60,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-3
+- Add BuildRequires for perl-XML-Parser
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 2.13.90-2
 - BuildRequires: desktop-file-utils for desktop-file-install
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:37:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:37:23 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.10,1.11
Message-ID: <200606061337.k56DbNnP011513@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11473

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
remove temporary debugging junk


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-resutils.spec	6 Jun 2006 12:59:42 -0000	1.10
+++ xorg-x11-resutils.spec	6 Jun 2006 13:37:20 -0000	1.11
@@ -53,10 +53,8 @@
 {
    for app in * ; do
       pushd $app
-      set -vx
-      aclocal --force ; autoconf
+#      aclocal --force ; autoconf
       %configure --disable-xprint
-      set -
       make
       popd
    done
@@ -98,7 +96,6 @@
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Fix all SourceN lines in spec file to not have to update them every time.
 - Remove package ownership of mandir/libdir/etc.
-- Invoke aclocal/autoconf to try to work around a quirk detecting Xaw.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:42:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:42:35 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.68,1.69
Message-ID: <200606061342.k56DgZNv012624@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12575

Modified Files:
	gnome-session.spec 
Log Message:
fix build reqs



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnome-session.spec	5 Jun 2006 20:11:47 -0000	1.68
+++ gnome-session.spec	6 Jun 2006 13:42:33 -0000	1.69
@@ -23,8 +23,7 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 
-# For intltool:
-BuildRequires: perl-XML-Parser >= 2.31-16
+BuildRequires: intltool, autoconf, automake
 
 Requires: redhat-artwork >= 0.20
 Requires: system-logos
@@ -164,6 +163,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen  <mclasen at redhat.com> 2.15.1-3
+- Add BuildRequires: intltool, autoconf, automake 
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
 - Require system-logos, not fedora-logos
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:44:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:44:37 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.69,1.70
Message-ID: <200606061344.k56Dib6j013437@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13376

Modified Files:
	gnome-session.spec 
Log Message:
bump req



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-session.spec	6 Jun 2006 13:42:33 -0000	1.69
+++ gnome-session.spec	6 Jun 2006 13:44:35 -0000	1.70
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.1
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:49:52 -0400
Subject: rpms/dbus/devel dbus.spec,1.80,1.81
Message-ID: <200606061349.k56DnqA5029845@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29795

Modified Files:
	dbus.spec 
Log Message:
Rebuild



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- dbus.spec	17 May 2006 11:22:32 -0000	1.80
+++ dbus.spec	6 Jun 2006 13:49:50 -0000	1.81
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.61
-Release: 5.2
+Release: 6
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -349,6 +349,9 @@
 %endif
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 0.61-6
+- Rebuild
+
 * Wed May 17 2006 Karsten Hopp <karsten at redhat.de> 0.61-5.2 
 - add buildrequires libICE-devel, libSM-devel, libcap-devel
 - change buildrequires form libX11 to libX11-devel



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:57:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:57:54 -0400
Subject: rpms/tsclient/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tsclient.spec, 1.12, 1.13
Message-ID: <200606061357.k56DvsQS009818@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/tsclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9802

Modified Files:
	.cvsignore sources tsclient.spec 
Log Message:
0.148



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Oct 2005 05:05:42 -0000	1.5
+++ .cvsignore	6 Jun 2006 13:57:51 -0000	1.6
@@ -1,2 +1 @@
-tsclient-0.132.tar.gz
-tsclient-0.140.tar.gz
+tsclient-0.148.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2005 05:05:42 -0000	1.5
+++ sources	6 Jun 2006 13:57:51 -0000	1.6
@@ -1 +1 @@
-c10a5a151a1ece653f62e07b11228534  tsclient-0.140.tar.gz
+06a6ff59b7c8ca26d4ea37340ed77423  tsclient-0.148.tar.gz


Index: tsclient.spec
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tsclient.spec	11 Feb 2006 05:53:35 -0000	1.12
+++ tsclient.spec	6 Jun 2006 13:57:51 -0000	1.13
@@ -6,15 +6,14 @@
 
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
-Version: 0.140
-Release: 1.2.1
+Version: 0.148
+Release: 1
 URL: http://www.gnomepro.com/tsclient/
 Source0: http://www.gnomepro.com/tsclient/%{name}-%{version}.tar.gz
 License: GPL
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-root
 Patch0: tsclient-0.132-icon.patch
-Patch1: tsclient-0.140-segfault.patch
 
 ## we require rdesktop OR vncviewer - lets assume most people want
 ## this for rdesktop and require that - see bug #114769
@@ -33,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .icon
-%patch1 -p1 -b .segfault
 
 %build
 
@@ -73,6 +71,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.148-1
+- Update to 0.148
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.140-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 13:58:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 09:58:25 -0400
Subject: rpms/pykickstart/devel pykickstart.spec, 1.31, 1.32 sources, 1.32,
	1.33
Message-ID: <200606061358.k56DwPrw009860@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9847

Modified Files:
	pykickstart.spec sources 
Log Message:
Bump version.



Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pykickstart.spec	25 May 2006 20:12:34 -0000	1.31
+++ pykickstart.spec	6 Jun 2006 13:58:23 -0000	1.32
@@ -3,13 +3,14 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Version: 0.30
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: python-devel
+BuildRequires: gettext
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
 Requires: python-urlgrabber
 
@@ -38,6 +39,10 @@
 /usr/share/locale/*/*/*
 
 %changelog
+* Tue Jun 06 2006 Chris Lumens <clumens at redhat.com> 0.30-2
+- Add BuildRequires to fix building under mock (#194156,  Joost Soeterbroek
+  <fedora AT soeterbroek.com>).
+
 * Thu May 25 2006 Chris Lumens <clumens at redhat.com> 0.30-1
 - Change order of LVM-related writing functions (#193073).
 - Require urlgrabber.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	25 May 2006 20:12:34 -0000	1.32
+++ sources	6 Jun 2006 13:58:23 -0000	1.33
@@ -1 +1 @@
-237c5e6b4c1ac1c2a82cec266f48137f  pykickstart-0.30.tar.gz
+50b19bbc7281e0fe26e48308f3efab5d  pykickstart-0.30.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 14:45:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 10:45:59 -0400
Subject: rpms/xscreensaver/FC-4
	xscreensaver-4.22-dont-run-non-existent-hacks.patch, NONE,
	1.1 xscreensaver.spec, 1.52, 1.53
Message-ID: <200606061445.k56EjxSl006971@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5440

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-4.22-dont-run-non-existent-hacks.patch 
Log Message:
- Don't run non-existent hacks. Patch provided by Vlado Potisk
  (bug 176621).


xscreensaver-4.22-dont-run-non-existent-hacks.patch:
 demo-Gtk.c     |   47 -----------------------------------------------
 exec.c         |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 subprocs.c     |    1 +
 xscreensaver.h |    1 +
 4 files changed, 49 insertions(+), 47 deletions(-)

--- NEW FILE xscreensaver-4.22-dont-run-non-existent-hacks.patch ---
--- xscreensaver-4.21/driver/demo-Gtk.c.OLD	2006-06-05 23:57:57.000000000 +0200
+++ xscreensaver-4.21/driver/demo-Gtk.c	2006-06-06 00:29:41.000000000 +0200
@@ -2348,53 +2348,6 @@
     }
 }
 
-
-static Bool
-on_path_p (const char *program)
-{
-  int result = False;
-  struct stat st;
-  char *cmd = strdup (program);
-  char *token = strchr (cmd, ' ');
-  char *path = 0;
-  int L;
-
-  if (token) *token = 0;
-  token = 0;
-
-  if (strchr (cmd, '/'))
-    {
-      result = (0 == stat (cmd, &st));
-      goto DONE;
-    }
-
-  path = getenv("PATH");
-  if (!path || !*path)
-    goto DONE;
-
-  L = strlen (cmd);
-  path = strdup (path);
-  token = strtok (path, ":");
-
-  while (token)
-    {
-      char *p2 = (char *) malloc (strlen (token) + L + 3);
-      strcpy (p2, token);
-      strcat (p2, "/");
-      strcat (p2, cmd);
-      result = (0 == stat (p2, &st));
-      if (result)
-        goto DONE;
-      token = strtok (0, ":");
-    }
-
- DONE:
-  free (cmd);
-  if (path) free (path);
-  return result;
-}
-
-
 static void
 populate_hack_list (state *s)
 {
--- xscreensaver-4.21/driver/exec.c.OLD	2006-06-06 00:30:26.000000000 +0200
+++ xscreensaver-4.21/driver/exec.c	2006-06-06 00:35:15.000000000 +0200
@@ -58,6 +58,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <sys/stat.h>
 
 #ifndef ESRCH
 # include <errno.h>
@@ -246,3 +247,49 @@
 
 #endif
 }
+
+int
+on_path_p (const char *program)
+{
+  int result = 0;
+  struct stat st;
+  char *cmd = strdup (program);
+  char *token = strchr (cmd, ' ');
+  char *path = 0;
+  int L;
+
+  if (token) *token = 0;
+  token = 0;
+
+  if (strchr (cmd, '/'))
+    {
+      result = (0 == stat (cmd, &st));
+      goto DONE;
+    }
+
+  path = getenv("PATH");
+  if (!path || !*path)
+    goto DONE;
+
+  L = strlen (cmd);
+  path = strdup (path);
+  token = strtok (path, ":");
+
+  while (token)
+    {
+      char *p2 = (char *) malloc (strlen (token) + L + 3);
+      strcpy (p2, token);
+      strcat (p2, "/");
+      strcat (p2, cmd);
+      result = (0 == stat (p2, &st));
+      if (result)
+        goto DONE;
+      token = strtok (0, ":");
+    }
+
+ DONE:
+  free (cmd);
+  if (path) free (path);
+  return result;
+}
+
--- xscreensaver-4.21/driver/subprocs.c.OLD	2006-06-06 00:02:04.000000000 +0200
+++ xscreensaver-4.21/driver/subprocs.c	2006-06-06 00:01:35.000000000 +0200
@@ -806,6 +806,7 @@
         
       if (!force &&
 	  (!hack->enabled_p ||
+	   !on_path_p (hack->command) ||
 	   !select_visual_of_hack (ssi, hack)))
 	{
 	  if (++retry_count > (p->screenhacks_count*4))
--- xscreensaver-4.21/driver/xscreensaver.h.OLD	2006-06-05 23:57:30.000000000 +0200
+++ xscreensaver-4.21/driver/xscreensaver.h	2006-06-05 23:57:42.000000000 +0200
@@ -427,6 +427,7 @@
 extern const char *signal_name (int signal);
 extern void exec_command (const char *shell, const char *command,
                           int nice_level);
+extern int on_path_p (const char *program);
 
 /* =======================================================================
    subprocs diagnostics


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-4/xscreensaver.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xscreensaver.spec	12 Aug 2005 13:44:53 -0000	1.52
+++ xscreensaver.spec	6 Jun 2006 14:45:57 -0000	1.53
@@ -4,7 +4,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release:	6.fc4.1
+Release:	6.fc4.2
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -18,6 +18,7 @@
 Patch4:         xscreensaver-4.21-use-hack-basename.patch
 Patch5:         xscreensaver-4.22-signal-handler-fun.patch
 Patch6:         xscreensaver-4.22-warn-about-extras.patch
+Patch7:         xscreensaver-4.22-dont-run-non-existent-hacks.patch
 Buildroot:	%{_tmppath}/%{name}-root
 
 # find_lang
@@ -78,6 +79,7 @@
 %patch4 -p1 -b .use-hack-basename
 %patch5 -p1 -b .signal-handler-fun
 %patch6 -p1 -b .warn-about-extras
+%patch7 -p1 -b .dont-run-non-existent-hacks
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
@@ -206,6 +208,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Jun  6 2006 Ray Strode <rstrode at redhat.com> 1:4.22-6.fc4.2
+- Don't run non-existent hacks. Patch provided by Vlado Potisk
+  (bug 176621).
+
 * Fri Aug 12 2005 Ray Strode <rstrode at redhat.com> 1:4.22-6.fc4.1
 - Fix warn about extras patch
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 15:12:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 11:12:00 -0400
Subject: rpms/rhgb/FC-5 rhgb.spec,1.50,1.51
Message-ID: <200606061512.k56FC0QK025959@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25889

Modified Files:
	rhgb.spec 
Log Message:
Require system-logos, not fedora-logos



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/FC-5/rhgb.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rhgb.spec	22 Feb 2006 18:09:49 -0000	1.50
+++ rhgb.spec	6 Jun 2006 15:11:57 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.3
-Release: 1
+Release: 1.fc5.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,7 +14,7 @@
 BuildRequires: gettext
 BuildRequires: libxf86config-devel >= 1.0.0-3
 Requires: initscripts >= 7.22-1
-Requires: fedora-logos >= 1.1.40-1
+Requires: system-logos
 
 Patch0: rhgb-0.16.2-reap-child.patch
 Patch1: rhgb-0.16.2-init-utf8.patch
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-1.fc1.1
+- Require system-logos, not fedora-logos
+
 * Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-1
 - don't include the (old, unused) Fedora logo 
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 15:29:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 11:29:48 -0400
Subject: rpms/gdm/FC-5 gdm.spec,1.146,1.147
Message-ID: <200606061529.k56FTmB8014490@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14402

Modified Files:
	gdm.spec 
Log Message:
Require system-logos, not fedora-logos



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gdm.spec	26 Apr 2006 05:27:35 -0000	1.146
+++ gdm.spec	6 Jun 2006 15:29:45 -0000	1.147
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.14.4
-Release: 1.fc5.1
+Release: 1.fc5.2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -59,7 +59,7 @@
 Requires: /etc/pam.d/system-auth
 Requires: usermode
 Requires: /sbin/nologin
-Requires: fedora-logos >= 0:1.1.38-1
+Requires: system-logos
 Requires: redhat-artwork >= 0:0.234-1
 Requires: /usr/share/desktop-menu-patches/gnome-gdmsetup.desktop
 Requires: xorg-x11-server-utils
@@ -318,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-1.fc.2
+- Require system-logos, not fedora-logos
+
 * Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-1.fc5.1
 - Update to 2.14.4
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 16:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 12:19:44 -0400
Subject: rpms/gdm/FC-5 gdm.spec,1.147,1.148
Message-ID: <200606061619.k56GJiM4017500@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17351

Modified Files:
	gdm.spec 
Log Message:
fix build reqs



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gdm.spec	6 Jun 2006 15:29:45 -0000	1.147
+++ gdm.spec	6 Jun 2006 16:19:41 -0000	1.148
@@ -85,6 +85,7 @@
 BuildRequires: gettext 
 BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: audit-libs-devel >= %{libauditver}
+BuildRequires: intltool, autoconf, automake
 Requires: libselinux >= %{libselinuxver}
 Requires: audit-libs >= %{libauditver}
 
@@ -320,6 +321,7 @@
 %changelog
 * Mon Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-1.fc.2
 - Require system-logos, not fedora-logos
+- Add missing BuildRequires
 
 * Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-1.fc5.1
 - Update to 2.14.4



From fedora-cvs-commits at redhat.com  Tue Jun  6 16:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 12:42:38 -0400
Subject: rpms/fedora-logos/FC-5 fedora-logos.spec,1.26,1.27
Message-ID: <200606061642.k56Ggc8K026532@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26453

Modified Files:
	fedora-logos.spec 
Log Message:
add branded desktop background



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/FC-5/fedora-logos.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fedora-logos.spec	1 Mar 2006 04:39:00 -0000	1.26
+++ fedora-logos.spec	6 Jun 2006 16:42:34 -0000	1.27
@@ -1,9 +1,10 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
 Version: 1.1.42
-Release: 1
+Release: 1.fc5.1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
+Source1: default.png
 License: Copyright ? 1999-2005 Red Hat, Inc.  All rights reserved.
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArchitectures: noarch
@@ -65,6 +66,9 @@
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/ksplash/Themes/BlueCurve
 for i in kde-splash/BlueCurve/* ; do
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/apps/ksplash/Themes/BlueCurve
@@ -112,6 +116,7 @@
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,6 +132,7 @@
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons
 %{_datadir}/gnome-screensaver/themes/*
+%{_datadir}/backgrounds/images/*
 
 /usr/lib/anaconda-runtime/boot/*png
 /usr/lib/anaconda-runtime/*.sh
@@ -135,6 +141,9 @@
 # end i386 bits
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 1.1.42-1.fc.1
+- Add the branded desktop background
+
 * Tue Feb 28 2006 Matthias Clasen <mclasen at redhat.com> 1.1.42-1
 - New artwork for gdm, kdm Bluecurve from Diana Fong
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 16:45:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 12:45:11 -0400
Subject: rpms/gdm/FC-5 gdm.spec,1.148,1.149
Message-ID: <200606061645.k56GjAfO027164@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27075

Modified Files:
	gdm.spec 
Log Message:
more build reqs



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- gdm.spec	6 Jun 2006 16:19:41 -0000	1.148
+++ gdm.spec	6 Jun 2006 16:45:08 -0000	1.149
@@ -79,13 +79,13 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gail-devel >= 0:%{gail_version}
 BuildRequires: libgsf-devel
-BuildRequires: libtool automake14 autoconf
 BuildRequires: libcroco-devel
 BuildRequires: libattr-devel
 BuildRequires: gettext 
 BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: audit-libs-devel >= %{libauditver}
-BuildRequires: intltool, autoconf, automake
+BuildRequires: libtool intltool autoconf automake
+BuildRequires: gnome-doc-utils
 Requires: libselinux >= %{libselinuxver}
 Requires: audit-libs >= %{libauditver}
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 16:48:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 12:48:11 -0400
Subject: rpms/desktop-backgrounds/FC-5 desktop-backgrounds.spec,1.31,1.32
Message-ID: <200606061648.k56GmBH6010099@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-backgrounds/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9983

Modified Files:
	desktop-backgrounds.spec 
Log Message:
move branded desktop background to fedora-logos



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/FC-5/desktop-backgrounds.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- desktop-backgrounds.spec	19 Dec 2005 17:59:54 -0000	1.31
+++ desktop-backgrounds.spec	6 Jun 2006 16:48:09 -0000	1.32
@@ -3,16 +3,14 @@
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 31
+Release: 31.fc5.1
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
 Source2: Propaganda-1.0.0.tar.gz
 Source3: README.Propaganda
-## Source4: beta-placeholder.png
-Source4: default-background.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArchitectures: noarch
+BuildArch: noarch
 
 %description
 The desktop-backgrounds package contains artwork intended 
@@ -51,8 +49,6 @@
 # add propaganda
 (cd tiles && tar zxf %{SOURCE2})
 
-cp -f %{SOURCE4} images/default.png
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,7 +84,6 @@
 %{_datadir}/backgrounds/images/stone_bird.jpg
 %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 %{_datadir}/backgrounds/images/earth_from_space.jpg
-%{_datadir}/backgrounds/images/default.png
 %dir %{_datadir}/gnome-background-properties
 %{_datadir}/gnome-background-properties/desktop-backgrounds-basic.xml
 
@@ -107,9 +102,11 @@
 #exclude %{_datadir}/backgrounds/images/stone_bird.jpg
 #exclude %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
-#exclude %{_datadir}/backgrounds/images/default.png
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.0-31.fc5.1
+- Move the branded desktop background to fedora-logos
+
 * Mon Dec 19 2005 Ray Strode <rstrode at redhat.com> 2.0-31
 - replace default fedora background with new one
   from Diana Fong



From fedora-cvs-commits at redhat.com  Tue Jun  6 16:53:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 12:53:06 -0400
Subject: rpms/fedora-logos/FC-5 .cvsignore,1.24,1.25 sources,1.25,1.26
Message-ID: <200606061653.k56Gr6r0011684@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11621

Modified Files:
	.cvsignore sources 
Log Message:
add branded  background



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	1 Mar 2006 04:39:00 -0000	1.24
+++ .cvsignore	6 Jun 2006 16:52:57 -0000	1.25
@@ -1,3 +1,4 @@
 fedora-logos-1.1.40.tar.bz2
 fedora-logos-1.1.41.tar.bz2
 fedora-logos-1.1.42.tar.bz2
+default.png


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	1 Mar 2006 04:39:00 -0000	1.25
+++ sources	6 Jun 2006 16:52:57 -0000	1.26
@@ -1 +1,2 @@
 d814bc0a885c4b1364187c9902dcaf2f  fedora-logos-1.1.42.tar.bz2
+b866aab525c390195ed687ad7ba483f4  default.png



From fedora-cvs-commits at redhat.com  Tue Jun  6 17:01:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 13:01:24 -0400
Subject: rpms/gnome-screensaver/FC-5 gnome-screensaver.spec,1.68,1.69
Message-ID: <200606061701.k56H1OGx014124@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14073

Modified Files:
	gnome-screensaver.spec 
Log Message:
Require system-logos



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/gnome-screensaver.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnome-screensaver.spec	30 May 2006 04:32:19 -0000	1.68
+++ gnome-screensaver.spec	6 Jun 2006 17:01:21 -0000	1.69
@@ -7,14 +7,13 @@
 %define libxml2_version        2.6.0
 %define gconf2_version         2.6.1
 %define redhat_menus_version   5.0.1
-%define system_logos_version   1.1.37
 %define gnome_menus_version    2.11.1
 %define libexif_version        0.6.12
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.14.2
-Release: 1
+Release: 1.fc5.1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -52,7 +51,7 @@
 Requires: libxml2 >= %{libxml2_version}
 Requires: GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
-Requires: fedora-logos >= %{system_logos_version}
+Requires: system-logos
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
@@ -162,6 +161,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1.fc5.2
+- Require system-logos, not fedora-logos
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 17:04:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 13:04:27 -0400
Subject: rpms/desktop-backgrounds/FC-5 desktop-backgrounds.spec,1.32,1.33
Message-ID: <200606061704.k56H4RjL014478@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-backgrounds/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14441

Modified Files:
	desktop-backgrounds.spec 
Log Message:
remove default.png



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/FC-5/desktop-backgrounds.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- desktop-backgrounds.spec	6 Jun 2006 16:48:09 -0000	1.32
+++ desktop-backgrounds.spec	6 Jun 2006 17:04:23 -0000	1.33
@@ -68,6 +68,8 @@
 	rm -rf ${bgdir}/${I}
 done
 
+rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default.png
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 17:09:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 13:09:24 -0400
Subject: rpms/gnome-session/FC-5 gnome-session.spec,1.67,1.68
Message-ID: <200606061709.k56H9OWJ015162@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15105

Modified Files:
	gnome-session.spec 
Log Message:
Require system-logos



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/gnome-session.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-session.spec	30 May 2006 01:40:56 -0000	1.67
+++ gnome-session.spec	6 Jun 2006 17:09:19 -0000	1.68
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.14.2
-Release: 1
+Release: 1.fc5.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -27,7 +27,7 @@
 BuildRequires: perl-XML-Parser >= 2.31-16
 
 Requires: redhat-artwork >= 0.20
-Requires: fedora-logos >= 1.1.37 
+Requires: system-logos
 # required to get gconf-sanity-check-2 in the right place
 Requires: GConf2 >= %{gconf2_version}
 # Needed for gnome-settings-daemon
@@ -164,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
+- Require system-logos, not fedora-logos
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 18:27:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 14:27:49 -0400
Subject: rpms/libsepol/FC-5 .cvsignore, 1.90, 1.91 libsepol.spec, 1.118,
	1.119 sources, 1.91, 1.92
Message-ID: <200606061827.k56IRnu8024072@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24042

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 1.12.17-1.fc5
- Bump for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-5/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	1 May 2006 18:43:13 -0000	1.90
+++ .cvsignore	6 Jun 2006 18:27:46 -0000	1.91
@@ -88,3 +88,4 @@
 libsepol-1.12.1.tgz
 libsepol-1.12.4.tgz
 libsepol-1.12.6.tgz
+libsepol-1.12.17.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-5/libsepol.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- libsepol.spec	11 May 2006 18:23:02 -0000	1.118
+++ libsepol.spec	6 Jun 2006 18:27:47 -0000	1.119
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.6
+Version: 1.12.17
 Release: 1.fc5
 License: GPL
 Group: System Environment/Libraries
@@ -81,9 +81,49 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
-* Thu May 11 2006 Steve Grubb <sgrubb at redhat.com> 1.12.6
+* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 1.12.17-1.fc5
+- Bump for FC5
+
+* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.12.17-1
+- Upgrade to latest from NSA
+	* Revert 1.12.16.
+	* Merged cleaner fix for bool_ids overflow from Karl MacMillan,
+	  replacing the prior patch.
+	* Merged fixes for several memory leaks in the error paths during
+	  policy read from Serge Hallyn.
+
+* Tue May 30 2006 Dan Walsh <dwalsh at redhat.com> 1.12.14-1
+- Upgrade to latest from NSA
+	* Fixed bool_ids overflow bug in cond_node_find and cond_copy_list,
+	  based on bug report and suggested fix by Cedric Roux.
+	* Merged sens_copy_callback, check_role_hierarchy_callback,
+	  and node_from_record fixes from Serge Hallyn.
+
+* Tue May 23 2006 Dan Walsh <dwalsh at redhat.com> 1.12.12-1
+- Upgrade to latest from NSA
+	* Added sepol_policydb_compat_net() interface for testing whether
+	  a policy requires the compatibility support for network checks
+	  to be enabled in the kernel.
+
+* Thu May 15 2006 Dan Walsh <dwalsh at redhat.com> 1.12.11-1
+- Upgrade to latest from NSA
+	* Merged patch to initialize sym_val_to_name arrays from Kevin Carr.
+	  Reworked to use calloc in the first place, and converted some other
+	  malloc/memset pairs to calloc calls.
+
+* Mon May 15 2006 Dan Walsh <dwalsh at redhat.com> 1.12.10-1
+- Upgrade to latest from NSA
+	* Merged patch to revert role/user decl upgrade from Karl MacMillan.
+
+* Thu May 11 2006 Steve Grubb <sgrubb at redhat.com> 1.12.9
 - Couple minor spec file clean ups
 
+* Mon May 8 2006 Dan Walsh <dwalsh at redhat.com> 1.12.9-1
+- Upgrade to latest from NSA
+	* Dropped tests from all Makefile target.
+	* Merged fix warnings patch from Karl MacMillan.
+	* Merged libsepol test framework patch from Karl MacMillan.
+
 * Mon May 1 2006 Dan Walsh <dwalsh at redhat.com> 1.12.6-1.fc5
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-5/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	1 May 2006 18:43:13 -0000	1.91
+++ sources	6 Jun 2006 18:27:47 -0000	1.92
@@ -1 +1 @@
-70e3e9af48266b020177625a14b838e2  libsepol-1.12.6.tgz
+82e10111a5b6a0c400e52cdfe500e008  libsepol-1.12.17.tgz



From fedora-cvs-commits at redhat.com  Tue Jun  6 18:28:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 14:28:28 -0400
Subject: rpms/avahi/FC-5 .cvsignore, 1.11, 1.12 avahi.spec, 1.48,
	1.49 sources, 1.11, 1.12
Message-ID: <200606061828.k56ISSSc024282@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24252

Modified Files:
	.cvsignore avahi.spec sources 
Log Message:
fix bugs 194203, 192080


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Mar 2006 01:09:51 -0000	1.11
+++ .cvsignore	6 Jun 2006 18:28:25 -0000	1.12
@@ -8,3 +8,4 @@
 avahi-0.6.7.tar.gz
 avahi-0.6.8.tar.gz
 avahi-0.6.9.tar.gz
+avahi-0.6.10.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- avahi.spec	2 May 2006 23:06:46 -0000	1.48
+++ avahi.spec	6 Jun 2006 18:28:25 -0000	1.49
@@ -1,10 +1,12 @@
 %{?!WITH_MONO:  %define WITH_MONO 1}
+%{?!WITH_COMPAT_DNSSD:  %define WITH_COMPAT_DNSSD 1}
+%{?!WITH_COMPAT_HOWL:   %define WITH_COMPAT_HOWL  1}
 %ifarch ppc64
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.9
-Release: 	9.FC5
+Version:        0.6.10
+Release: 	1.FC5
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -16,7 +18,7 @@
 %endif
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Requires(post): initscripts, chkconfig, ldconfig
-Obsoletes:	howl, howl-libs
+Obsoletes:	howl
 Source0:        %{name}-%{version}.tar.gz
 Patch1:		avahi-0.5.2-fedora.patch
 Patch2:		avahi-0.5.2-start_after_dbus.patch
@@ -106,15 +108,48 @@
 %endif
 
 %package devel
-Summary: Libraries and header files for avahi development
-Group: Development/Libraries
+Summary:  Libraries and header files for avahi development
+Group:    Development/Libraries
 Requires: %{name} = %{version}
-Obsoletes: howl-devel
 
 %description devel
 The avahi-devel package contains the header files and libraries
 necessary for developing programs using avahi.
 
+%package   compat-howl
+Summary:   Libraries for howl compatibility.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+Obsoletes: howl-libs
+
+%description compat-howl
+Libraries that are compatible with those provided by the howl package. 
+
+%package   compat-howl-devel
+Summary:   Header files for development with the howl compatibility libraries.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+Obsoletes: howl-devel
+
+%description compat-howl-devel
+Header files for development with the howl compatibility libraries.
+
+%package   compat-libdns_sd
+Summary:   Libraries for Apple Bonjour mDNSResponder compatibility.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+
+%description compat-libdns_sd
+Libraries for Apple Bonjour mDNSResponder compatibility.
+
+%package   compat-libdns_sd-devel
+Summary:   Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+
+%description compat-libdns_sd-devel
+Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
+
 %define avahi_user_uid 70
 
 %prep
@@ -146,7 +181,8 @@
 %patch13 -p1 -b .bz185972
 %patch14 -p1 -b .bz189427
 %patch15 -p1 -b .mono-libdir
-%patch16 -p1 -b .sharp-lock
+#%patch16 -p1 -b .sharp-lock
+#^- this patch now upstream
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -155,7 +191,10 @@
 automake-1.9 --add-missing
 autoconf
 
-%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd \
+%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl \
+%if %{WITH_COMPAT_DNSSD}
+	--enable-compat-libdns_sd \
+%endif
 %if ! %{WITH_MONO}
 	--disable-mono \
 %endif
@@ -256,7 +295,7 @@
 %ghost %{_sysconfdir}/avahi/etc/localtime
 %{_sysconfdir}/avahi/hosts
 %dir %{_sysconfdir}/avahi/services
-%attr(0750,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
+%attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
 %config %{_sysconfdir}/avahi/avahi-dnsconfd.action
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
@@ -264,8 +303,6 @@
 %attr(755,root,root) %{_libdir}/libavahi-common.so.*
 %attr(755,root,root) %{_libdir}/libavahi-core.so.*
 %attr(755,root,root) %{_libdir}/libavahi-client.so.*
-%attr(755,root,root) %{_libdir}/libhowl.so.*
-%attr(755,root,root) %{_libdir}/libdns_sd.so.*
 %attr(755,root,root) %{_datadir}/avahi
 %exclude %{_datadir}/avahi/interfaces
 %exclude %{_datadir}/avahi/service-types*
@@ -286,17 +323,11 @@
 %attr(755,root,root) %{_libdir}/libavahi-common.so
 %attr(755,root,root) %{_libdir}/libavahi-core.so
 %attr(755,root,root) %{_libdir}/libavahi-client.so
-%attr(755,root,root) %{_libdir}/libhowl.so
-%attr(755,root,root) %{_libdir}/libdns_sd.so
 %{_includedir}/avahi-client
 %{_includedir}/avahi-common
 %{_includedir}/avahi-core
-%{_includedir}/avahi-compat-howl
-%{_includedir}/avahi-compat-libdns_sd
 %{_libdir}/pkgconfig/avahi-core.pc
 %{_libdir}/pkgconfig/avahi-client.pc
-%{_libdir}/pkgconfig/avahi-compat-howl.pc
-%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 
 %files glib
 %defattr(0755, root, root, 0755)
@@ -326,7 +357,39 @@
 %{_libdir}/pkgconfig/avahi-sharp.pc
 %endif
 
+%if %{WITH_COMPAT_HOWL}
+%files compat-howl
+%defattr(0755, root, root, 0755)
+%{_libdir}/libhowl.so.*
+
+%files compat-howl-devel
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libhowl.so
+%{_includedir}/avahi-compat-howl
+%{_libdir}/pkgconfig/avahi-compat-howl.pc
+%endif
+
+%if %{WITH_COMPAT_DNSSD}
+%files compat-libdns_sd
+%defattr(0755, root, root, 0755)
+%{_libdir}/libdns_sd.so.*
+
+%files compat-libdns_sd-devel
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libdns_sd.so
+%{_includedir}/avahi-compat-libdns_sd
+%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
+%endif
+
 %changelog
+* Tue Jun 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-2.FC6
+- fix bug 194203: fix permissions on /var/run/avahi-daemon
+
+* Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-1.FC6
+- Upgrade to upstream version 0.6.10
+- fix bug 192080: split avahi-compat-libdns_sd into separate package
+                  (same goes for avahi-compat-howl)
+
 * Tue May 02 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
 - fix avahi-sharp issues for banshee - patches from caillon at redhat.com
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2006 01:09:51 -0000	1.11
+++ sources	6 Jun 2006 18:28:25 -0000	1.12
@@ -1 +1 @@
-2652910f0e52c373d7a15b6851750517  avahi-0.6.9.tar.gz
+cfb9e05c138dff4c430a35eee6229e8a  avahi-0.6.10.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun  6 18:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 14:28:32 -0400
Subject: rpms/libselinux/FC-5 libselinux-rhat.patch, 1.75,
	1.76 libselinux.spec, 1.186, 1.187
Message-ID: <200606061828.k56ISWAE024312@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24254

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-2.fc5
- Back port lots of fixes from Rawhide.  No changes to translations.


libselinux-rhat.patch:
 include/selinux/selinux.h  |    3 
 man/man3/getfscreatecon.3  |    4 
 man/man3/matchpathcon.3    |   11 ++
 man/man8/booleans.8        |   24 +----
 src/avc_internal.c         |    1 
 src/booleans.c             |    2 
 src/canonicalize_context.c |    6 -
 src/check_context.c        |    3 
 src/compute_av.c           |    6 -
 src/compute_create.c       |    6 -
 src/compute_member.c       |    6 -
 src/compute_relabel.c      |    6 -
 src/compute_user.c         |    6 -
 src/context.c              |    8 -
 src/disable.c              |    3 
 src/enabled.c              |    6 -
 src/getcon.c               |    3 
 src/getenforce.c           |    3 
 src/getexeccon.c           |    3 
 src/getfscreatecon.c       |    3 
 src/getpidcon.c            |    3 
 src/getprevcon.c           |    3 
 src/init.c                 |    6 -
 src/load_policy.c          |    3 
 src/matchmediacon.c        |    2 
 src/matchpathcon.c         |   27 +++++
 src/policyvers.c           |    3 
 src/selinux_internal.h     |    1 
 src/selinuxswig.i          |   13 ++
 src/selinuxswig_wrap.c     |  206 ++++++++++++++++++++-------------------------
 src/setenforce.c           |    3 
 utils/avcstat.c            |   18 +--
 utils/matchpathcon.c       |    1 
 33 files changed, 227 insertions(+), 175 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux-rhat.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- libselinux-rhat.patch	12 Apr 2006 13:33:17 -0000	1.75
+++ libselinux-rhat.patch	6 Jun 2006 18:28:29 -0000	1.76
@@ -1,7 +1,62 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.1/man/man8/booleans.8
---- nsalibselinux/man/man8/booleans.8	2004-11-02 11:44:38.000000000 -0500
-+++ libselinux-1.30.1/man/man8/booleans.8	2006-04-11 15:01:19.000000000 -0400
-@@ -17,17 +17,10 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.3/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/include/selinux/selinux.h	2006-06-06 13:39:58.000000000 -0400
+@@ -310,6 +310,9 @@
+    regexes that have stems that are prefixes of 'prefix'. */
+ extern int matchpathcon_init_prefix(const char *path, const char *prefix);
+ 
++/* Free the memory allocated by matchpathcon_init. */
++extern void matchpathcon_fini(void);
++
+ /* Match the specified pathname and mode against the file contexts
+    configuration and set *con to refer to the resulting context.
+    'mode' can be 0 to disable mode matching.
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfscreatecon.3 libselinux-1.30.3/man/man3/getfscreatecon.3
+--- nsalibselinux/man/man3/getfscreatecon.3	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man3/getfscreatecon.3	2006-06-06 13:40:32.000000000 -0400
+@@ -32,9 +32,7 @@
+ save, reset, and restore the fscreate context to avoid unexpected behaviors.
+ .SH "RETURN VALUE"
+ On error -1 is returned.
+-
+-On success getfscreatecon returns the length of the context (not including
+-the trailing zero byte).  On success setfscreatecon returns 0.
++On success 0 is returned.
+ 
+ .SH "SEE ALSO"
+ .BR freecon "(3), " getcon "(3), " getexeccon "(3)"
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-1.30.3/man/man3/matchpathcon.3
+--- nsalibselinux/man/man3/matchpathcon.3	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man3/matchpathcon.3	2006-06-06 13:40:32.000000000 -0400
+@@ -7,6 +7,8 @@
+ .sp
+ .BI "int matchpathcon_init(const char *" path ");"
+ .br
++.BI "int matchpathcon_fini(void);"
++.br
+ .BI "int matchpathcon(const char *" path ", mode_t " mode ", security_context_t *" con);
+ .sp
+ .br 
+@@ -40,6 +42,15 @@
+ customizations.
+ .br 
+ .sp
++.B matchpathcon_fini
++frees the memory allocated by a prior call to
++.B matchpathcon_init.
++This function can be used to free and reset the internal state between multiple 
++.B matchpathcon_init 
++calls, or to free memory when finished using 
++.B matchpathcon.
++.br
++.sp
+ .B matchpathcon 
+ matches the specified pathname and mode against the file contexts
+ configuration and sets the security context 
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.3/man/man8/booleans.8
+--- nsalibselinux/man/man8/booleans.8	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man8/booleans.8	2006-06-06 13:40:45.000000000 -0400
+@@ -17,17 +17,13 @@
  value.  
  
  The policy defines a default value for each boolean, typically false.
@@ -13,52 +68,1148 @@
 -defined in the
 -.I /etc/selinux/config
 -file.  The
-+These default values can be overridden.  The
++These default values can be overridden via local settings created via the
++.B setsebool(8)
++utility, using -P to make the setting persistent across reboots.
++The 
  .B system-config-securitylevel
- tool provides an interface for altering
+-tool provides an interface for altering
 -the settings in this file.  The
-+the settings of booleans.  The
++tool provides a graphical interface for altering
++the settings.  The
  .B load_policy(8)
  program will preserve
  current boolean settings upon a policy reload by default, or can
-@@ -41,8 +34,11 @@
+@@ -41,8 +37,9 @@
  .B setsebool(8)
  utility or the
  .B togglesebool
 -utility.  These utilities only change the
-+utility.  These utilities change the
- current boolean value and do not affect the boot-time settings.
-+You can use 
-+.B setsebool -P 
-+to permanantly change the setting of a boolean.
+-current boolean value and do not affect the boot-time settings.
++utility.  By default, these utilities only change the
++current boolean value and do not affect the persistent settings,
++unless the -P option is used to setsebool.
  
  .SH AUTHOR	
  This manual page was written by Dan Walsh <dwalsh at redhat.com>.
-@@ -51,5 +47,3 @@
+@@ -50,6 +47,3 @@
+ 
  .SH "SEE ALSO"
  getsebool(8), setsebool(8), selinux(8), togglesebool(8)
- 
+-
 -.SH FILES
 -/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.1/src/selinuxswig.i
---- nsalibselinux/src/selinuxswig.i	2006-01-04 10:37:35.000000000 -0500
-+++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:55:35.000000000 -0400
-@@ -29,8 +29,9 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/avc_internal.c libselinux-1.30.3/src/avc_internal.c
+--- nsalibselinux/src/avc_internal.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/avc_internal.c	2006-06-06 13:58:11.000000000 -0400
+@@ -16,7 +16,6 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <asm/types.h>
+ #include <linux/netlink.h>
+ #include "selinux_netlink.h"
+ #include "avc_internal.h"
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/booleans.c libselinux-1.30.3/src/booleans.c
+--- nsalibselinux/src/booleans.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/booleans.c	2006-06-06 13:41:21.000000000 -0400
+@@ -309,7 +309,7 @@
+ 		int val;
+ 		char boolname[BUFSIZ];
+ 		char *buffer;
+-		char *inbuf=NULL;
++		inbuf=NULL;
+ 		__fsetlocking(boolf, FSETLOCKING_BYCALLER);
+ 		while ((len=getline(&inbuf, &size, boolf)) > 0) {
+ 			buffer=strdup(inbuf);
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/canonicalize_context.c libselinux-1.30.3/src/canonicalize_context.c
+--- nsalibselinux/src/canonicalize_context.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/canonicalize_context.c	2006-06-06 13:57:26.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -18,12 +17,15 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/check_context.c libselinux-1.30.3/src/check_context.c
+--- nsalibselinux/src/check_context.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/check_context.c	2006-06-06 13:44:45.000000000 -0400
+@@ -14,6 +14,9 @@
+ 	char path[PATH_MAX];
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_av.c libselinux-1.30.3/src/compute_av.c
+--- nsalibselinux/src/compute_av.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_av.c	2006-06-06 13:57:38.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -21,12 +20,15 @@
+ 	size_t len;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+ 		return -1;
+ 
+-	len = PAGE_SIZE;
++	len = selinux_page_size;
+ 	buf = malloc(len);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_create.c libselinux-1.30.3/src/compute_create.c
+--- nsalibselinux/src/compute_create.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_create.c	2006-06-06 13:57:40.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -20,12 +19,15 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/create", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_member.c libselinux-1.30.3/src/compute_member.c
+--- nsalibselinux/src/compute_member.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_member.c	2006-06-06 13:57:44.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -20,12 +19,15 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/member", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_relabel.c libselinux-1.30.3/src/compute_relabel.c
+--- nsalibselinux/src/compute_relabel.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_relabel.c	2006-06-06 13:57:46.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -20,12 +19,15 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_user.c libselinux-1.30.3/src/compute_user.c
+--- nsalibselinux/src/compute_user.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_user.c	2006-06-06 13:57:49.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -21,12 +20,15 @@
+ 	int fd, ret;
+ 	unsigned int i, nel;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/user", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/context.c libselinux-1.30.3/src/context.c
+--- nsalibselinux/src/context.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/context.c	2006-06-06 14:14:18.000000000 -0400
+@@ -137,7 +137,7 @@
+ 
+ /* Returns nonzero iff failed */
+ 
+-static int set_comp(context_private_t* n,int index, const char *str)
++static int set_comp(context_private_t* n,int idx, const char *str)
+ {
+ 	char *t = NULL;
+         const char *p;
+@@ -146,15 +146,15 @@
+ 		if ( !t ) { return 1; }
+ 		for ( p = str; *p; p++ ) {
+ 			if ( *p == '\t' || *p == '\n' || *p == '\r' ||
+-			     ((*p == ':' || *p == ' ') && index != COMP_RANGE) ) {
++			     ((*p == ':' || *p == ' ') && idx != COMP_RANGE) ) {
+ 				free(t);
+ 				return 1;
+ 			}
+ 		}
+ 		strcpy(t,str);
+ 	}
+-        conditional_free(&n->component[index]);
+-        n->component[index] = t;
++        conditional_free(&n->component[idx]);
++        n->component[idx] = t;
+         return 0;
+ }
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/disable.c libselinux-1.30.3/src/disable.c
+--- nsalibselinux/src/disable.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/disable.c	2006-06-06 13:46:48.000000000 -0400
+@@ -15,6 +15,9 @@
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/disable", selinux_mnt);
+ 	fd = open(path, O_WRONLY);
+ 	if (fd < 0)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/enabled.c libselinux-1.30.3/src/enabled.c
+--- nsalibselinux/src/enabled.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/enabled.c	2006-06-06 13:57:51.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <limits.h>
+-#include <asm/page.h>
+ #include <stdio.h>
+ #include "policy.h"
+ 
+@@ -22,7 +21,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		enabled = -1;
+@@ -65,6 +64,9 @@
+ 	char buf[20], path[PATH_MAX];
+ 	int fd, ret, enabled = 0;
+ 
++	if (!selinux_mnt)
++		return enabled;
++
+ 	snprintf(path, sizeof path, "%s/mls", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getcon.c libselinux-1.30.3/src/getcon.c
+--- nsalibselinux/src/getcon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getcon.c	2006-06-06 13:57:53.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include "selinux_internal.h"
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "policy.h"
+ 
+ int getcon_raw(security_context_t *context)
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getenforce.c libselinux-1.30.3/src/getenforce.c
+--- nsalibselinux/src/getenforce.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getenforce.c	2006-06-06 13:47:41.000000000 -0400
+@@ -15,6 +15,9 @@
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getexeccon.c libselinux-1.30.3/src/getexeccon.c
+--- nsalibselinux/src/getexeccon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getexeccon.c	2006-06-06 13:57:55.000000000 -0400
+@@ -3,7 +3,6 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ 
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getfscreatecon.c libselinux-1.30.3/src/getfscreatecon.c
+--- nsalibselinux/src/getfscreatecon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getfscreatecon.c	2006-06-06 13:57:58.000000000 -0400
+@@ -3,7 +3,6 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ 
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getpidcon.c libselinux-1.30.3/src/getpidcon.c
+--- nsalibselinux/src/getpidcon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getpidcon.c	2006-06-06 13:58:00.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ 
+@@ -22,7 +21,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getprevcon.c libselinux-1.30.3/src/getprevcon.c
+--- nsalibselinux/src/getprevcon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getprevcon.c	2006-06-06 13:58:02.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include "selinux_internal.h"
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "policy.h"
+ 
+ int getprevcon_raw(security_context_t *context)
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-1.30.3/src/init.c
+--- nsalibselinux/src/init.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/init.c	2006-06-06 13:58:04.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <ctype.h>
+-#include <asm/page.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
+ 
+@@ -13,6 +12,7 @@
+ #include "selinux_internal.h"
+ 
+ char *selinux_mnt = NULL;
++int selinux_page_size=0;
+ 
+ static void init_selinuxmnt(void)
+ {
+@@ -27,7 +27,8 @@
+ 	if (!fp)
+ 		return;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
++
+ 	buf = malloc(size);
+ 	if (!buf)
+ 		goto out;
+@@ -134,6 +135,7 @@
+ static void init_lib(void) __attribute__ ((constructor));
+ static void init_lib(void)
+ {
++	selinux_page_size = sysconf(_SC_PAGE_SIZE);
+ 	init_selinuxmnt();
+ 	init_translations();
+ }
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/load_policy.c libselinux-1.30.3/src/load_policy.c
+--- nsalibselinux/src/load_policy.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/load_policy.c	2006-06-06 13:48:12.000000000 -0400
+@@ -20,6 +20,9 @@
+ 	char path[PATH_MAX];
+ 	int fd, ret;
+ 	
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/load", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchmediacon.c libselinux-1.30.3/src/matchmediacon.c
+--- nsalibselinux/src/matchmediacon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/matchmediacon.c	2006-06-06 14:16:22.000000000 -0400
+@@ -17,7 +17,7 @@
+ 	const char *path = selinux_media_context_path();
+ 	FILE *infile;
+ 	char *ptr, *ptr2=NULL;
+-	int found=-1;
++	int found=0;
+ 	char current_line[PATH_MAX];
+ 	if ((infile = fopen(path, "r")) == NULL)
+ 		return -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.30.3/src/matchpathcon.c
+--- nsalibselinux/src/matchpathcon.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/matchpathcon.c	2006-06-06 14:18:47.000000000 -0400
+@@ -758,6 +758,33 @@
+ 	return matchpathcon_init_prefix(path, NULL);
+ }
+ 
++void matchpathcon_fini(void)
++{
++	struct spec *spec;
++	struct stem *stem;
++	unsigned int i;
++
++	for (i = 0; i < nspec; i++) {
++		spec = &spec_arr[i];
++		free(spec->regex_str);
++		free(spec->type_str);
++		free(spec->context);
++		regfree(&spec->regex);
++	}
++	free(spec_arr);
++	spec_arr = NULL;
++	nspec = 0;
++	
++	for (i = 0; i < (unsigned int)num_stems; i++) {
++		stem = &stem_arr[i];
++		free(stem->buf);
++	}
++	free(stem_arr);
++	stem_arr = NULL;
++	num_stems = 0;
++	alloc_stems = 0;
++}
++
+ static int matchpathcon_common(const char *name, 
+ 			       mode_t mode)
+ {
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/policyvers.c libselinux-1.30.3/src/policyvers.c
+--- nsalibselinux/src/policyvers.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/policyvers.c	2006-06-06 13:48:37.000000000 -0400
+@@ -19,6 +19,9 @@
+ 	char buf[20];
+ 	unsigned vers = DEFAULT_POLICY_VERSION;
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/policyvers", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0) {
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.30.3/src/selinux_internal.h
+--- nsalibselinux/src/selinux_internal.h	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/selinux_internal.h	2006-06-06 13:56:26.000000000 -0400
+@@ -71,3 +71,4 @@
+ 
+ extern int load_setlocaldefs hidden;
+ extern int require_seusers hidden;
++extern int selinux_page_size hidden;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.3/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/selinuxswig.i	2006-06-06 14:19:57.000000000 -0400
+@@ -28,9 +28,18 @@
+ %typemap(in, numinputs=0) security_context_t *(security_context_t temp) {
  	$1 = &temp;
  }
- %typemap(argout) security_context_t * {
--	$result = t_output_helper($result, PyString_FromString(*$1));
-+	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+-%typemap(argout) security_context_t * {
+-	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
++%typemap(argout) security_context_t * (char *temp) {
++	if (*$1)
++		temp = *$1;
++	else
++		temp = "";
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(temp));
++}
++
++%typemap(in) security_context_t {
++	$1 = (security_context_t)PyString_AsString($input);
  }
-+%typedef unsigned mode_t;
++
+ %typedef unsigned mode_t;
  
  extern int is_selinux_enabled(void);
- extern int is_selinux_mls_enabled(void);
-@@ -114,6 +115,6 @@
- }
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.30.3/src/selinuxswig_wrap.c
+--- nsalibselinux/src/selinuxswig_wrap.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/selinuxswig_wrap.c	2006-06-06 14:20:22.000000000 -0400
+@@ -2832,6 +2832,7 @@
+   security_context_t *arg1 = (security_context_t *) 0 ;
+   int result;
+   security_context_t temp1 ;
++  char *temp10 ;
+   
+   {
+     arg1 = &temp1;
+@@ -2840,7 +2841,11 @@
+   result = (int)getcon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
++    if (*arg1)
++    temp10 = *arg1;
++    else
++    temp10 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
+   }
+   return resultobj;
+ fail:
+@@ -2852,21 +2857,11 @@
+   PyObject *resultobj = 0;
+   security_context_t arg1 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:setcon",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setcon" "', argument " "1"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "setcon" "', argument " "1"" of type '" "security_context_t""'");
+-    } else {
+-      arg1 = *((security_context_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+   result = (int)setcon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+@@ -2884,6 +2879,7 @@
+   int val1 ;
+   int ecode1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -2898,7 +2894,11 @@
+   result = (int)getpidcon(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   return resultobj;
+ fail:
+@@ -2911,6 +2911,7 @@
+   security_context_t *arg1 = (security_context_t *) 0 ;
+   int result;
+   security_context_t temp1 ;
++  char *temp10 ;
+   
+   {
+     arg1 = &temp1;
+@@ -2919,7 +2920,11 @@
+   result = (int)getprevcon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
++    if (*arg1)
++    temp10 = *arg1;
++    else
++    temp10 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
+   }
+   return resultobj;
+ fail:
+@@ -2932,6 +2937,7 @@
+   security_context_t *arg1 = (security_context_t *) 0 ;
+   int result;
+   security_context_t temp1 ;
++  char *temp10 ;
+   
+   {
+     arg1 = &temp1;
+@@ -2940,7 +2946,11 @@
+   result = (int)getexeccon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
++    if (*arg1)
++    temp10 = *arg1;
++    else
++    temp10 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
+   }
+   return resultobj;
+ fail:
+@@ -2952,21 +2962,11 @@
+   PyObject *resultobj = 0;
+   security_context_t arg1 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:setexeccon",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setexeccon" "', argument " "1"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "setexeccon" "', argument " "1"" of type '" "security_context_t""'");
+-    } else {
+-      arg1 = *((security_context_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+   result = (int)setexeccon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+@@ -2981,6 +2981,7 @@
+   security_context_t *arg1 = (security_context_t *) 0 ;
+   int result;
+   security_context_t temp1 ;
++  char *temp10 ;
+   
+   {
+     arg1 = &temp1;
+@@ -2989,7 +2990,11 @@
+   result = (int)getfscreatecon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
++    if (*arg1)
++    temp10 = *arg1;
++    else
++    temp10 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
+   }
+   return resultobj;
+ fail:
+@@ -3001,21 +3006,11 @@
+   PyObject *resultobj = 0;
+   security_context_t arg1 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:setfscreatecon",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setfscreatecon" "', argument " "1"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "setfscreatecon" "', argument " "1"" of type '" "security_context_t""'");
+-    } else {
+-      arg1 = *((security_context_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+   result = (int)setfscreatecon(arg1);
+   resultobj = SWIG_From_int((int)(result));
+@@ -3034,6 +3029,7 @@
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -3048,7 +3044,11 @@
+   result = (int)getfilecon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+@@ -3067,6 +3067,7 @@
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -3081,7 +3082,11 @@
+   result = (int)lgetfilecon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+@@ -3099,6 +3104,7 @@
+   int val1 ;
+   int ecode1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -3113,7 +3119,11 @@
+   result = (int)fgetfilecon(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   return resultobj;
+ fail:
+@@ -3129,8 +3139,6 @@
+   int res1 ;
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+-  void *argp2 ;
+-  int res2 = 0 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   
+@@ -3141,15 +3149,7 @@
+   }
+   arg1 = buf1;
+   {
+-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res2)) {
+-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "setfilecon" "', argument " "2"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp2) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "setfilecon" "', argument " "2"" of type '" "security_context_t""'");
+-    } else {
+-      arg2 = *((security_context_t *)(argp2));
+-    }
++    arg2 = (security_context_t)PyString_AsString(obj1);
+   }
+   result = (int)setfilecon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+@@ -3169,8 +3169,6 @@
+   int res1 ;
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+-  void *argp2 ;
+-  int res2 = 0 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   
+@@ -3181,15 +3179,7 @@
+   }
+   arg1 = buf1;
+   {
+-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res2)) {
+-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "lsetfilecon" "', argument " "2"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp2) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "lsetfilecon" "', argument " "2"" of type '" "security_context_t""'");
+-    } else {
+-      arg2 = *((security_context_t *)(argp2));
+-    }
++    arg2 = (security_context_t)PyString_AsString(obj1);
+   }
+   result = (int)lsetfilecon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+@@ -3208,8 +3198,6 @@
+   int result;
+   int val1 ;
+   int ecode1 = 0 ;
+-  void *argp2 ;
+-  int res2 = 0 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   
+@@ -3220,15 +3208,7 @@
+   } 
+   arg1 = (int)(val1);
+   {
+-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res2)) {
+-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "fsetfilecon" "', argument " "2"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp2) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fsetfilecon" "', argument " "2"" of type '" "security_context_t""'");
+-    } else {
+-      arg2 = *((security_context_t *)(argp2));
+-    }
++    arg2 = (security_context_t)PyString_AsString(obj1);
+   }
+   result = (int)fsetfilecon(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+@@ -3246,6 +3226,7 @@
+   int val1 ;
+   int ecode1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -3260,7 +3241,11 @@
+   result = (int)getpeercon(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   return resultobj;
+ fail:
+@@ -3382,21 +3367,11 @@
+   PyObject *resultobj = 0;
+   security_context_t arg1 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:security_check_context",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "security_check_context" "', argument " "1"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "security_check_context" "', argument " "1"" of type '" "security_context_t""'");
+-    } else {
+-      arg1 = *((security_context_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+   result = (int)security_check_context(arg1);
+   resultobj = SWIG_From_int((int)(result));
+@@ -3411,9 +3386,8 @@
+   security_context_t arg1 ;
+   security_context_t *arg2 = (security_context_t *) 0 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -3421,20 +3395,16 @@
+   }
+   if (!PyArg_ParseTuple(args,(char *)"O:security_canonicalize_context",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "security_canonicalize_context" "', argument " "1"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "security_canonicalize_context" "', argument " "1"" of type '" "security_context_t""'");
+-    } else {
+-      arg1 = *((security_context_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+   result = (int)security_canonicalize_context(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   return resultobj;
+ fail:
+@@ -3677,6 +3647,7 @@
+   unsigned int val2 ;
+   int ecode2 = 0 ;
+   security_context_t temp3 ;
++  char *temp30 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   
+@@ -3697,7 +3668,11 @@
+   result = (int)matchpathcon((char const *)arg1,arg2,arg3);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg3));
++    if (*arg3)
++    temp30 = *arg3;
++    else
++    temp30 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp30));
+   }
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+@@ -3716,6 +3691,7 @@
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -3730,7 +3706,11 @@
+   result = (int)matchmediacon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+@@ -4083,21 +4063,11 @@
+   PyObject *resultobj = 0;
+   security_context_t arg1 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:is_context_customizable",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_security_context_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "is_context_customizable" "', argument " "1"" of type '" "security_context_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "is_context_customizable" "', argument " "1"" of type '" "security_context_t""'");
+-    } else {
+-      arg1 = *((security_context_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+   result = (int)is_context_customizable(arg1);
+   resultobj = SWIG_From_int((int)(result));
+@@ -4116,6 +4086,7 @@
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -4130,7 +4101,11 @@
+   result = (int)selinux_trans_to_raw_context(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+@@ -4149,6 +4124,7 @@
+   char *buf1 = 0 ;
+   int alloc1 = 0 ;
+   security_context_t temp2 ;
++  char *temp20 ;
+   PyObject * obj0 = 0 ;
+   
+   {
+@@ -4163,7 +4139,11 @@
+   result = (int)selinux_raw_to_trans_context(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+-    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg2));
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/setenforce.c libselinux-1.30.3/src/setenforce.c
+--- nsalibselinux/src/setenforce.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/setenforce.c	2006-06-06 13:39:20.000000000 -0400
+@@ -15,6 +15,9 @@
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt)
++		return -1;
++
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.30.3/utils/avcstat.c
+--- nsalibselinux/utils/avcstat.c	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/utils/avcstat.c	2006-06-06 13:38:42.000000000 -0400
+@@ -27,12 +27,12 @@
+ #define HEADERS		"lookups hits misses allocations reclaims frees"
+ 
+ struct avc_cache_stats {
+-	unsigned int lookups;
+-	unsigned int hits;
+-	unsigned int misses;
+-	unsigned int allocations;
+-	unsigned int reclaims;
+-	unsigned int frees;
++	unsigned long long lookups;
++	unsigned long long hits;
++	unsigned long long misses;
++	unsigned long long allocations;
++	unsigned long long reclaims;
++	unsigned long long frees;
+ };
+ 
+ static int interval;
+@@ -172,7 +172,7 @@
+ 		while ((line = strtok(NULL, "\n"))) {
+ 			struct avc_cache_stats tmp;
+ 			
+-			ret = sscanf(line, "%u %u %u %u %u %u",
++			ret = sscanf(line, "%llu %llu %llu %llu %llu %llu",
+ 				     &tmp.lookups,
+ 				     &tmp.hits,
+ 				     &tmp.misses,
+@@ -195,7 +195,7 @@
+ 			die("unable to parse \'%s\': no data", avcstatfile);
+ 
+ 		if (cumulative || (!cumulative && !i))
+-			printf("%10u %10u %10u %10u %10u %10u\n",
++			printf("%10Lu %10Lu %10Lu %10Lu %10Lu %10Lu\n",
+ 			       tot.lookups, tot.hits, tot.misses,
+ 			       tot.allocations, tot.reclaims, tot.frees);
+ 		else {
+@@ -205,7 +205,7 @@
+ 			rel.allocations = tot.allocations - last.allocations;
+ 			rel.reclaims = tot.reclaims - last.reclaims;
+ 			rel.frees = tot.frees - last.frees;
+-			printf("%10u %10u %10u %10u %10u %10u\n",
++			printf("%10Lu %10Lu %10Lu %10Lu %10Lu %10Lu\n",
+ 			       rel.lookups, rel.hits, rel.misses,
+ 			       rel.allocations, rel.reclaims, rel.frees);
+ 		}
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.3/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/utils/matchpathcon.c	2006-06-06 13:38:19.000000000 -0400
+@@ -66,5 +66,6 @@
  
- %typemap(argout) char ** {
--	$result = t_output_helper($result, PyString_FromString(*$1));
-+	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ 		freecon(buf);
+ 	}
++	matchpathcon_fini();
+ 	return 0;
  }
- extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- libselinux.spec	12 Apr 2006 13:37:58 -0000	1.186
+++ libselinux.spec	6 Jun 2006 18:28:29 -0000	1.187
@@ -2,7 +2,7 @@
 %define libsetransver 0.1.20-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.1
+Version: 1.30.3
 Release: 2.fc5
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -12,8 +12,7 @@
 BuildRequires: libsepol-devel >= %{libsepolver}
 Requires: libsepol >= %{libsepolver}
 Requires: libsetrans >= %{libsetransver}
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Security-enhanced Linux is a feature of the Linux?? kernel and a number
@@ -51,38 +50,37 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
 make CFLAGS="-g %{optflags}" all pywrap
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/%{_lib} 
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} 
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir} 
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" BINDIR="${RPM_BUILD_ROOT}%{_sbindir}" install install-pywrap
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_lib} 
+mkdir -p %{buildroot}/%{_libdir} 
+mkdir -p %{buildroot}%{_includedir} 
+mkdir -p %{buildroot}%{_sbindir}
+make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_sbindir}" install install-pywrap
 
 # Nuke the files we don't want to distribute
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/compute_*
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/deftype
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/execcon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getcon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getconlist
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getenforcemode
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getfilecon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getpidcon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/mkdircon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/policyvers
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/setfilecon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/selinuxconfig
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/selinuxdisable
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/sgetseuser
+rm -f %{buildroot}%{_sbindir}/compute_*
+rm -f %{buildroot}%{_sbindir}/deftype
+rm -f %{buildroot}%{_sbindir}/execcon
+rm -f %{buildroot}%{_sbindir}/getcon
+rm -f %{buildroot}%{_sbindir}/getconlist
+rm -f %{buildroot}%{_sbindir}/getenforcemode
+rm -f %{buildroot}%{_sbindir}/getfilecon
+rm -f %{buildroot}%{_sbindir}/getpidcon
+rm -f %{buildroot}%{_sbindir}/mkdircon
+rm -f %{buildroot}%{_sbindir}/policyvers
+rm -f %{buildroot}%{_sbindir}/setfilecon
+rm -f %{buildroot}%{_sbindir}/selinuxconfig
+rm -f %{buildroot}%{_sbindir}/selinuxdisable
+rm -f %{buildroot}%{_sbindir}/getseuser
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -95,14 +93,20 @@
 %defattr(-,root,root,0755)
 /%{_lib}/libselinux.so.*
 %{_libdir}/libselinux.so
-%{_sbindir}/*
+%{_sbindir}/avcstat
+%{_sbindir}/getenforce
+%{_sbindir}/getsebool
+%{_sbindir}/matchpathcon
+%{_sbindir}/selinuxenabled
+%{_sbindir}/setenforce
+%{_sbindir}/togglesebool
 %{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libselinux.a
 %dir %{_includedir}/selinux
-%{_includedir}/selinux/
+%{_includedir}/selinux/*
 %{_mandir}/man3/*
 
 %files python
@@ -111,6 +115,20 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-2.fc5
+- Back port lots of fixes from Rawhide.  No changes to translations.
+
+* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-1.fc5
+- Bump for FC-5
+
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-1
+- Upgrade to latest from NSA
+	* Added distclean target to Makefile.
+	* Regenerated swig files.
+	* Changed matchpathcon_init to verify that the spec file is
+	  a regular file.
+	* Merged python binding t_output_helper removal patch from Dan Walsh.
+
 * Wed Apr 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2.fc5
 - Bump for FC-5
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 18:46:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 14:46:49 -0400
Subject: rpms/libselinux/FC-5 .cvsignore,1.103,1.104 sources,1.105,1.106
Message-ID: <200606061846.k56IknHL029393@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28983

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-2.fc5
- Back port lots of fixes from Rawhide.  No changes to translations.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	12 Apr 2006 13:33:17 -0000	1.103
+++ .cvsignore	6 Jun 2006 18:46:36 -0000	1.104
@@ -77,3 +77,4 @@
 libselinux-1.29.7.tgz
 libselinux-1.30.tgz
 libselinux-1.30.1.tgz
+libselinux-1.30.3.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	12 Apr 2006 13:33:18 -0000	1.105
+++ sources	6 Jun 2006 18:46:36 -0000	1.106
@@ -1 +1 @@
-16536badc245a1dd8d01539f63ced6c2  libselinux-1.30.1.tgz
+70d1525b98d5906a9ac2566aeca7a65e  libselinux-1.30.3.tgz



From fedora-cvs-commits at redhat.com  Tue Jun  6 19:18:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 15:18:14 -0400
Subject: rpms/cdrtools/FC-5 cdrtools-2.01a27-silly-warnings.patch, 1.6,
	1.7 cdrtools.spec, 1.45, 1.46 sources, 1.15, 1.16
Message-ID: <200606061918.k56JIEhX022795@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21567

Modified Files:
	cdrtools-2.01a27-silly-warnings.patch cdrtools.spec sources 
Log Message:
- version 2.01.01.0.a10
- more corrections to multilib patch (bug #193796)
- fixed silo buffer overflow (bug #141313)


cdrtools-2.01a27-silly-warnings.patch:
 cdrecord/cdrecord.c    |    2 +-
 libscg/scsi-linux-sg.c |   17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

Index: cdrtools-2.01a27-silly-warnings.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools-2.01a27-silly-warnings.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cdrtools-2.01a27-silly-warnings.patch	31 May 2006 08:07:55 -0000	1.6
+++ cdrtools-2.01a27-silly-warnings.patch	6 Jun 2006 19:18:11 -0000	1.7
@@ -4,8 +4,8 @@
  	 * prefer a model with many proprietary differing programs
  	 * instead of cooperating with the program authors.
  	 */
--	linuxcheck();	/* For version 1.313 of cdrecord.c */
-+	/* linuxcheck(); */	/* For version 1.313 of cdrecord.c */
+-	linuxcheck();	/* For version 1.315 of cdrecord.c */
++	/* linuxcheck(); */	/* For version 1.315 of cdrecord.c */
  
  	if (flags & F_VERSION)
  		exit(0);


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cdrtools.spec	6 Jun 2006 07:04:18 -0000	1.45
+++ cdrtools.spec	6 Jun 2006 19:18:11 -0000	1.46
@@ -1,8 +1,8 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
-Version: 2.01.01.0.a09
-Release: 0.FC5.3
-%define tarversion 2.01.01a09
+Version: 2.01.01.0.a10
+Release: 0.FC5.1
+%define tarversion 2.01.01a10
 License: CDDL
 Group: Applications/System
 URL: http://cdrecord.berlios.de/old/private/cdrecord.html
@@ -240,7 +240,8 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
-* Tue Jun  6 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a09-0.FC5.3
+* Tue Jun  6 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a10-0.FC5.1
+- version 2.01.01.0.a10
 - more corrections to multilib patch (bug #193796)
 - fixed silo buffer overflow (bug #141313)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 May 2006 08:07:55 -0000	1.15
+++ sources	6 Jun 2006 19:18:12 -0000	1.16
@@ -1 +1 @@
-4527e83c3f805dab5e9e34e75489ac13  cdrtools-2.01.01a09.tar.bz2
+dc189f1e34d484cb73639fe3b1067845  cdrtools-2.01.01a10.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun  6 19:44:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 15:44:12 -0400
Subject: rpms/kdebase/FC-4 kdebase-3.3.1-pam_krb5-bz#191049.patch, NONE,
	1.1 kdebase-3.5.2-kconf_update-klipper.patch, NONE,
	1.1 kdebase-3.5.2-krdb-xresource.patch, NONE,
	1.1 kdebase-3.5.3-startkde.patch, NONE, 1.1 .cvsignore, 1.40,
	1.41 kdebase.spec, 1.119, 1.120 sources, 1.61,
	1.62 kdebase-3.5.2-startkde.patch, 1.1, NONE
Message-ID: <200606061944.k56JiCSk005129@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5050

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.3.1-pam_krb5-bz#191049.patch 
	kdebase-3.5.2-kconf_update-klipper.patch 
	kdebase-3.5.2-krdb-xresource.patch 
	kdebase-3.5.3-startkde.patch 
Removed Files:
	kdebase-3.5.2-startkde.patch 
Log Message:
update to 3.5.3


kdebase-3.3.1-pam_krb5-bz#191049.patch:
 checkpass_pam.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.3.1-pam_krb5-bz#191049.patch ---
--- kdebase-3.3.1/kcheckpass/checkpass_pam.c.orig	2006-05-08 22:25:31.000000000 +0200
+++ kdebase-3.3.1/kcheckpass/checkpass_pam.c	2006-05-08 22:26:39.000000000 +0200
@@ -189,7 +189,7 @@
   /* Refresh credentials (Needed e.g. for AFS (timing out Kerberos tokens)) */
   /* REINIT_CRED and REFRESH_CRED are not clearly defined and thus likely to
    * fail, so we use ESTABLISH_CRED ... */     
-  pam_error = pam_setcred(pamh, PAM_ESTABLISH_CRED);
+  pam_error = pam_setcred(pamh, PAM_REFRESH_CRED);
   if (pam_error != PAM_SUCCESS) {
     pam_end(pamh, pam_error);
     return AuthError;

kdebase-3.5.2-kconf_update-klipper.patch:
 klipper-kde31.sh |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.2-kconf_update-klipper.patch ---
--- kdebase-3.5.2/klipper/klipper-kde31.sh.me	2006-05-24 15:36:19.000000000 +0200
+++ kdebase-3.5.2/klipper/klipper-kde31.sh	2006-05-24 15:36:29.000000000 +0200
@@ -2,7 +2,5 @@
 filename=`kde-config --localprefix`share/autostart/klipper.desktop
 if grep 'Hidden=true' "$filename" > /dev/null 2> /dev/null; then
   echo AutoStart=false
-else
-  echo AutoStart=true
 fi
-rm -f "$filename"
\ No newline at end of file
+rm -f "$filename"

kdebase-3.5.2-krdb-xresource.patch:
 AAAXaw.ad |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE kdebase-3.5.2-krdb-xresource.patch ---
--- kdebase-3.5.2/kcontrol/krdb/ad/AAAXaw.ad.tn	2006-05-12 20:43:13.000000000 +0200
+++ kdebase-3.5.2/kcontrol/krdb/ad/AAAXaw.ad	2006-05-12 20:43:28.000000000 +0200
@@ -34,8 +34,4 @@
 *ShapeStyle: Rectangle
 *SmeBSB*shadowWidth: 3
 *Scrollbar*Cursor: left_ptr
-*Command.translations: \
-	<LeaveWindow>:	reset()\n\
-	<Btn1Down>:	set()\n\
-	<Btn1Up>:	notify() unset()
 

kdebase-3.5.3-startkde.patch:
 startkde |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-3.5.3-startkde.patch ---
diff -Nur kdebase-3.5.2.orig/startkde kdebase-3.5.2/startkde
--- kdebase-3.5.2.orig/startkde	2006-01-19 18:03:19.000000000 +0100
+++ kdebase-3.5.2/startkde	2006-02-17 12:35:01.000000000 +0100
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.3 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -64,7 +112,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
@@ -135,8 +183,8 @@
     done
 fi
 
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh, <prefixes>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -148,9 +196,10 @@
 # better use the Autostart folder.
 
 exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+  for file in "$prefix"*.sh ; do
     test -r "$file" && . "$file"
   done
 done
@@ -339,7 +388,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	17 Feb 2006 11:50:59 -0000	1.40
+++ .cvsignore	6 Jun 2006 19:44:09 -0000	1.41
@@ -15,3 +15,4 @@
 kde-redhat-config-3.4.2-fc4-0.2.tar.bz2
 kdebase-3.5.1.tar.bz2
 kde-redhat-config-3.5-fc5-0.2.tar.bz2
+kdebase-3.5.3.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdebase.spec	11 Apr 2006 09:43:02 -0000	1.119
+++ kdebase.spec	6 Jun 2006 19:44:10 -0000	1.120
@@ -10,8 +10,8 @@
 %define gdmsession KDE
 
 %define qt_version 3.3.4
-%define arts_version 1.5.2
-%define kde_version 3.5.2
+%define arts_version 1.5.3
+%define kde_version 3.5.3
 
 %define make_cvs 1
 %define arts 1
@@ -20,7 +20,7 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Epoch: 6
 Url: http://www.kde.org
@@ -38,7 +38,7 @@
 Source7: mailsettings.cc
 
 Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.2-startkde.patch
+Patch1: kdebase-3.5.3-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -52,6 +52,9 @@
 Patch12: kdebase-3.5.1-pam.patch
 Patch13: kdebase-3.5.1-kdm-readme.patch
 Patch14: kdebase-3.5.1-konsole-fonts.patch
+Patch15: kdebase-3.5.2-krdb-xresource.patch
+Patch16: kdebase-3.3.1-pam_krb5-bz#191049.patch
+Patch17: kdebase-3.5.2-kconf_update-klipper.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
@@ -66,6 +69,7 @@
 Requires(post,postun): desktop-file-utils
 Requires(post): xfs
 Requires: pam >= 0.79-6
+Requires: htdig
 
 %if %{redhatify}
 Requires: desktop-backgrounds-basic
@@ -131,6 +135,9 @@
 %patch12 -p1 -b .pam
 %patch13 -p1 -b .kdm-readme
 %patch14 -p1 -b .konsole-fonts
+%patch15 -p1 -b .krdb-xresource
+%patch16 -p1 -b .pam_krb5-bz#191049
+%patch17 -p1 -b .klipper
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -403,6 +410,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Jun 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	11 Apr 2006 09:43:02 -0000	1.61
+++ sources	6 Jun 2006 19:44:10 -0000	1.62
@@ -1,2 +1,2 @@
 a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2
-c5685e1be34e033286aa1f37002a0552  kdebase-3.5.2.tar.bz2
+9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2


--- kdebase-3.5.2-startkde.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun  6 19:46:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 15:46:11 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.137,1.138
Message-ID: <200606061946.k56JkBjM011407@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9642

Modified Files:
	evolution.spec 
Log Message:
- Rebuild to hopefully fix build deps.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- evolution.spec	30 May 2006 14:30:46 -0000	1.137
+++ evolution.spec	6 Jun 2006 19:46:08 -0000	1.138
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -635,6 +635,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.2
+- Rebuild to hopefully fix build deps.
+
 * Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.1
 - Update to 2.6.2
 - Remove NSS/NSPR chunk from evolution-2.5.2-no-gnome-common.patch



From fedora-cvs-commits at redhat.com  Tue Jun  6 20:58:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 16:58:34 -0400
Subject: rpms/kdepim/FC-4 .cvsignore, 1.26, 1.27 kdepim.spec, 1.59,
	1.60 sources, 1.30, 1.31 kdepim-3.5.2-avscripts-typo.patch,
	1.1, NONE kdepim-3.5.2-crash-bz190491.patch, 1.1,
	NONE kdepim-3.5.2-crash-kde#125723.patch, 1.1,
	NONE kdepim-3.5.2-crash-proko2.patch, 1.1,
	NONE kdepim-3.5.2-crashes.patch, 1.1,
	NONE kdepim-3.5.2-kmail-crash-#126571.patch, 1.1,
	NONE kdepim-3.5.2-kmail-encoding.patch, 1.1, NONE
Message-ID: <200606062058.k56KwYcm005145@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5079

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-3.5.2-avscripts-typo.patch 
	kdepim-3.5.2-crash-bz190491.patch 
	kdepim-3.5.2-crash-kde#125723.patch 
	kdepim-3.5.2-crash-proko2.patch kdepim-3.5.2-crashes.patch 
	kdepim-3.5.2-kmail-crash-#126571.patch 
	kdepim-3.5.2-kmail-encoding.patch 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	1 Feb 2006 14:53:39 -0000	1.26
+++ .cvsignore	6 Jun 2006 20:58:32 -0000	1.27
@@ -5,3 +5,4 @@
 kdepim-3.4.0.tar.bz2
 kdepim-3.4.1.tar.bz2
 kdepim-3.5.1.tar.bz2
+kdepim-3.5.3.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/kdepim.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdepim.spec	8 May 2006 14:13:12 -0000	1.59
+++ kdepim.spec	6 Jun 2006 20:58:32 -0000	1.60
@@ -2,7 +2,7 @@
 %define final 0
 
 %define qt_version 1:3.3.4
-%define arts_version 8:1.5.2
+%define arts_version 8:1.5.3
 
 %define arts 1
 %define make_cvs 1
@@ -10,8 +10,8 @@
 
 %define appdir %{_datadir}/applications/kde
 
-Version: 3.5.2
-Release: 0.2.fc4
+Version: 3.5.3
+Release: 0.1.fc4
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Prefix: %{_prefix}
@@ -30,15 +30,6 @@
 Patch7: kdepim-3.4.0-kandy-icons.patch
 Patch8: kdepim-3.4.92-libz.patch
 
-# upstream patches
-Patch100: kdepim-3.5.2-crash-bz190491.patch
-Patch101: kdepim-3.5.2-crash-proko2.patch
-Patch102: kdepim-3.5.2-crash-kde#125723.patch
-Patch103: kdepim-3.5.2-kmail-encoding.patch
-Patch104: kdepim-3.5.2-kmail-crash-#126571.patch
-Patch105: kdepim-3.5.2-avscripts-typo.patch
-Patch106: kdepim-3.5.2-crashes.patch
-
 Requires: kdebase >= 6:%{version}
 
 BuildRequires: perl
@@ -119,15 +110,6 @@
 %patch7 -p1 -b .kandy-icons
 %patch8 -p1 -b .libz
 
-# upstream patches
-%patch100 -p1 -b .crash-bz#190491
-%patch101 -p1 -b .proko2
-%patch102 -p1 -b .crash-kde#125723
-%patch103 -p1 -b .kmail-encoding
-%patch104 -p1 -b .kmail-crash-#126571
-%patch105 -p1 -b .avscripts-typo
-%patch106 -p1 -b .crashes
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -212,6 +194,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Jun 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Mon May 08 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc4
 - apply upstream patch which fixes several crashes in kdepim
 - fix #190491, korganizer crashes whenever New Event selected


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	11 Apr 2006 20:53:21 -0000	1.30
+++ sources	6 Jun 2006 20:58:32 -0000	1.31
@@ -1 +1 @@
-ac6b3b503e27a65a7b883c1e0a57262e  kdepim-3.5.2.tar.bz2
+2b83885854a5953bca59508d9a7cf5ef  kdepim-3.5.3.tar.bz2


--- kdepim-3.5.2-avscripts-typo.patch DELETED ---


--- kdepim-3.5.2-crash-bz190491.patch DELETED ---


--- kdepim-3.5.2-crash-kde#125723.patch DELETED ---


--- kdepim-3.5.2-crash-proko2.patch DELETED ---


--- kdepim-3.5.2-crashes.patch DELETED ---


--- kdepim-3.5.2-kmail-crash-#126571.patch DELETED ---


--- kdepim-3.5.2-kmail-encoding.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun  6 21:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 17:09:09 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.138,1.139
Message-ID: <200606062109.k56L99Jv013438@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13408

Modified Files:
	evolution.spec 
Log Message:
- ExcludeArch on s390{,x} because it's broken, and it's not shipped in FC5
  on those arches anyway.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- evolution.spec	6 Jun 2006 19:46:08 -0000	1.138
+++ evolution.spec	6 Jun 2006 21:09:06 -0000	1.139
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.2
+Release: 1.fc5.3
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -102,6 +102,10 @@
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch809: evolution-2.6.0-prototypes.patch
 
+# Removed to placate the build system.  Feel free to try to re-add it, but,
+# wash your dog first.
+ExcludeArch: s390 s390x
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -635,6 +639,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.3
+- ExcludeArch on s390{,x} because it's broken, and it's not shipped in FC5
+  on those arches anyway.
+
 * Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.2
 - Rebuild to hopefully fix build deps.
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 21:36:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 17:36:01 -0400
Subject: rpms/selinux-policy/FC-5 modules-targeted.conf, 1.22,
	1.23 policy-20060505.patch, 1.4, 1.5 selinux-policy.spec,
	1.171, 1.172
Message-ID: <200606062136.k56La1sx031773@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31743

Modified Files:
	modules-targeted.conf policy-20060505.patch 
	selinux-policy.spec 
Log Message:
* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-4.fc5
- Bump for fc5



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/modules-targeted.conf,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- modules-targeted.conf	24 May 2006 03:19:52 -0000	1.22
+++ modules-targeted.conf	6 Jun 2006 21:35:57 -0000	1.23
@@ -1078,11 +1078,3 @@
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
 openvpn = base
-
-# Layer: apps
-# Module: unconfined_execmem
-#
-# unconfined_execmem executable
-# 
-unconfined_execmem = base
-

policy-20060505.patch:
 Rules.modular                             |    2 
 config/appconfig-strict-mls/default_type  |    1 
 policy/global_tunables                    |   16 +++++++
 policy/modules/admin/consoletype.te       |    9 +++-
 policy/modules/admin/rpm.if               |   20 +++++++++
 policy/modules/admin/rpm.te               |    9 ++++
 policy/modules/apps/webalizer.te          |    1 
 policy/modules/apps/wine.fc               |    1 
 policy/modules/apps/wine.te               |    5 ++
 policy/modules/kernel/corecommands.fc     |    6 --
 policy/modules/kernel/files.if            |   15 +++++++
 policy/modules/kernel/filesystem.if       |   23 +++++++++++
 policy/modules/kernel/kernel.te           |   10 ++++
 policy/modules/services/amavis.fc         |    2 
 policy/modules/services/amavis.if         |   62 ++++++++++++++++++++++++++++++
 policy/modules/services/amavis.te         |   10 ++++
 policy/modules/services/apache.if         |    1 
 policy/modules/services/bluetooth.te      |    5 ++
 policy/modules/services/clamav.te         |   21 ++++++++++
 policy/modules/services/cups.te           |   10 +++-
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.te           |    1 
 policy/modules/services/dovecot.te        |    1 
 policy/modules/services/ftp.te            |   20 +++++++++
 policy/modules/services/hal.te            |    4 +
 policy/modules/services/ldap.fc           |    1 
 policy/modules/services/mysql.te          |    2 
 policy/modules/services/networkmanager.fc |    1 
 policy/modules/services/nscd.te           |    5 ++
 policy/modules/services/ntp.te            |    4 +
 policy/modules/services/pegasus.if        |   31 +++++++++++++++
 policy/modules/services/pegasus.te        |   15 +++++--
 policy/modules/services/postfix.te        |    7 +--
 policy/modules/services/pyzor.te          |   11 +++++
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.te          |    4 +
 policy/modules/services/spamassassin.fc   |    1 
 policy/modules/services/spamassassin.te   |    8 +++
 policy/modules/services/xfs.te            |    4 +
 policy/modules/services/xserver.if        |   43 ++++++++++++++++++++
 policy/modules/system/hostname.te         |    5 +-
 policy/modules/system/init.te             |    1 
 policy/modules/system/libraries.fc        |   19 ++++++++-
 policy/modules/system/logging.te          |    8 +++
 policy/modules/system/unconfined.fc       |    4 +
 policy/modules/system/unconfined.if       |   28 +++++++++++++
 policy/modules/system/unconfined.te       |   25 +++++++++++-
 policy/modules/system/userdomain.te       |   42 ++++++++++++++++++--
 policy/modules/system/xen.fc              |    1 
 policy/modules/system/xen.if              |    2 
 policy/modules/system/xen.te              |   27 ++++++++++++-
 policy/rolemap                            |    1 
 policy/support/misc_macros.spt            |    2 
 policy/users                              |    6 +-
 54 files changed, 532 insertions(+), 33 deletions(-)

Index: policy-20060505.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060505.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060505.patch	28 May 2006 11:03:47 -0000	1.4
+++ policy-20060505.patch	6 Jun 2006 21:35:58 -0000	1.5
@@ -56,6 +56,33 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.43/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-03-23 14:33:29.000000000 -0500
++++ serefpolicy-2.2.43/policy/modules/admin/rpm.if	2006-06-06 11:10:50.000000000 -0400
+@@ -237,3 +237,23 @@
+ 	dontaudit $1 rpm_var_lib_t:file create_file_perms;
+ 	dontaudit $1 rpm_var_lib_t:lnk_file create_lnk_perms;
+ ')
++
++########################################
++## <summary>
++##	Execute the rpm client in the caller domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rpm_exec',`
++	gen_require(`
++		type rpm_exec_t;
++	')
++
++	corecmd_search_bin($1)
++	can_exec($1,rpm_exec_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.43/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2006-04-19 17:43:32.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/admin/rpm.te	2006-05-26 14:03:15.000000000 -0400
@@ -75,71 +102,6 @@
  ',`
  	optional_policy(`
  		bootloader_domtrans(rpm_script_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/unconfined_execmem.fc serefpolicy-2.2.43/policy/modules/apps/unconfined_execmem.fc
---- nsaserefpolicy/policy/modules/apps/unconfined_execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/apps/unconfined_execmem.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -0,0 +1,3 @@
-+/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/unconfined_execmem.if serefpolicy-2.2.43/policy/modules/apps/unconfined_execmem.if
---- nsaserefpolicy/policy/modules/apps/unconfined_execmem.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/apps/unconfined_execmem.if	2006-05-26 14:03:15.000000000 -0400
-@@ -0,0 +1,29 @@
-+## <summary>Unconfined domain with execmem/execstack privs</summary>
-+
-+########################################
-+## <summary>
-+##	Execute the application that requires dexecmem program in the unconfined_execmem domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`unconfined_execmem_domtrans',`
-+	ifdef(`targeted_policy',`
-+		gen_require(`
-+			type unconfined_execmem_t, unconfined_execmem_exec_t;
-+		')
-+
-+		corecmd_search_bin($1)
-+		domain_auto_trans($1, unconfined_execmem_exec_t, unconfined_execmem_t)
-+
-+		allow $1 unconfined_execmem_t:fd use;
-+		allow unconfined_execmem_t $1:fd use;
-+		allow unconfined_execmem_t $1:fifo_file rw_file_perms;
-+		allow unconfined_execmem_t $1:process sigchld;
-+	',`
-+		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
-+	')
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/unconfined_execmem.te serefpolicy-2.2.43/policy/modules/apps/unconfined_execmem.te
---- nsaserefpolicy/policy/modules/apps/unconfined_execmem.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/apps/unconfined_execmem.te	2006-05-26 14:03:15.000000000 -0400
-@@ -0,0 +1,21 @@
-+
-+policy_module(unconfined_execmem,1.1.2)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type unconfined_execmem_t;
-+type unconfined_execmem_exec_t;
-+init_system_domain(unconfined_execmem_t,unconfined_execmem_exec_t)
-+
-+########################################
-+#
-+# Local policy
-+#
-+
-+ifdef(`targeted_policy',`
-+	allow unconfined_execmem_t self:process { execstack execmem };
-+	unconfined_domain_noaudit(unconfined_execmem_t)
-+')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.43/policy/modules/apps/webalizer.te
 --- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-03-24 11:15:44.000000000 -0500
 +++ serefpolicy-2.2.43/policy/modules/apps/webalizer.te	2006-05-26 14:03:15.000000000 -0400
@@ -157,6 +119,19 @@
 @@ -1 +1,2 @@
  /usr/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/opt/picasa/wine/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.43/policy/modules/apps/wine.te
+--- nsaserefpolicy/policy/modules/apps/wine.te	2006-03-07 10:31:08.000000000 -0500
++++ serefpolicy-2.2.43/policy/modules/apps/wine.te	2006-05-28 07:09:11.000000000 -0400
+@@ -22,4 +22,9 @@
+ 	unconfined_domain_noaudit(wine_t)
+ 	role system_r types wine_t;
+ 	allow wine_t file_type:file execmod;
++
++	optional_policy(`
++		hal_dbus_chat(wine_t)
++	')
++
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.43/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-05-17 10:54:31.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/kernel/corecommands.fc	2006-05-26 14:03:15.000000000 -0400
@@ -182,7 +157,7 @@
  /usr/lib(64)?/netsaint/plugins(/.*)?	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.43/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-05-12 09:22:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/kernel/files.if	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/kernel/files.if	2006-06-06 11:06:54.000000000 -0400
 @@ -1882,6 +1882,21 @@
  ')
  
@@ -244,7 +219,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.43/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/kernel/kernel.te	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/kernel/kernel.te	2006-06-06 15:30:41.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -253,6 +228,22 @@
  ')
  
  #
+@@ -50,6 +51,15 @@
+ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
+ 
+ #
++# Oprofilefs
++#
++
++type oprofilefs_t;
++fs_type(oprofilefs_t)
++allow oprofilefs_t self:filesystem associate;
++genfscon oprofilefs / gen_context(system_u:object_r:oprofilefs_t,s0)
++
++#
+ # Procfs types
+ #
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.fc serefpolicy-2.2.43/policy/modules/services/amavis.fc
 --- nsaserefpolicy/policy/modules/services/amavis.fc	2006-05-19 10:07:51.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/services/amavis.fc	2006-05-26 14:03:15.000000000 -0400
@@ -468,8 +459,16 @@
  files_read_etc_files(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.43/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/cups.te	2006-05-28 06:50:31.000000000 -0400
-@@ -81,7 +81,7 @@
++++ serefpolicy-2.2.43/policy/modules/services/cups.te	2006-05-28 10:28:11.000000000 -0400
+@@ -74,14 +74,14 @@
+ #
+ 
+ # /usr/lib/cups/backend/serial needs sys_admin(?!)
+-allow cupsd_t self:capability { sys_admin dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_tty_config audit_write };
++allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_tty_config audit_write };
+ dontaudit cupsd_t self:capability { sys_tty_config net_admin };
+ allow cupsd_t self:process { setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_file_perms;
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
@@ -577,6 +576,20 @@
  optional_policy(`
  	corecmd_exec_shell(ftpd_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.43/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-05-19 10:07:51.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/services/hal.te	2006-06-06 11:58:26.000000000 -0400
+@@ -144,6 +144,10 @@
+ 
+ sysnet_read_config(hald_t)
+ 
++# needed for nss_ldap
++sysnet_use_ldap(hald_t)
++miscfiles_read_certs(hald_t)
++
+ userdom_dontaudit_use_unpriv_user_fds(hald_t)
+ userdom_dontaudit_search_sysadm_home_dirs(hald_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-2.2.43/policy/modules/services/ldap.fc
 --- nsaserefpolicy/policy/modules/services/ldap.fc	2005-10-06 17:29:17.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/services/ldap.fc	2006-05-26 14:03:15.000000000 -0400
@@ -638,6 +651,111 @@
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.43/policy/modules/services/pegasus.if
+--- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/services/pegasus.if	2006-06-06 10:37:18.000000000 -0400
+@@ -1 +1,32 @@
+ ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run pegasus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed to transition.
++##	</summary>
++## </param>
++#
++interface(`pegasus_domtrans',`
++	gen_require(`
++		type pegasus_t, pegasus_exec_t;
++	')
++
++	ifdef(`targeted_policy',`
++		if(pegasus_disable_trans) {
++			can_exec($1,pegasus_exec_t)
++		} else {
++			domain_auto_trans($1,pegasus_exec_t,pegasus_t)
++		}
++	', `
++		domain_auto_trans($1,pegasus_exec_t,pegasus_t)
++	')
++
++	allow $1 pegasus_t:fd use;
++	allow pegasus_t $1:fd use;
++	allow pegasus_t $1:fifo_file rw_file_perms;
++	allow pegasus_t $1:process sigchld;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.43/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-26 11:23:32.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/services/pegasus.te	2006-06-06 11:11:18.000000000 -0400
+@@ -30,7 +30,7 @@
+ # Local policy
+ #
+ 
+-allow pegasus_t self:capability { dac_override net_bind_service audit_write }; 
++allow pegasus_t self:capability { chown sys_nice setuid setgid dac_override net_bind_service audit_write }; 
+ dontaudit pegasus_t self:capability sys_tty_config;
+ allow pegasus_t self:process signal;
+ allow pegasus_t self:fifo_file rw_file_perms;
+@@ -65,6 +65,7 @@
+ kernel_read_fs_sysctls(pegasus_t)
+ kernel_read_system_state(pegasus_t)
+ kernel_search_vm_sysctl(pegasus_t)
++kernel_read_net_sysctls(pegasus_t)
+ 
+ corenet_tcp_sendrecv_all_if(pegasus_t)
+ corenet_raw_sendrecv_all_if(pegasus_t)
+@@ -82,6 +83,7 @@
+ corecmd_exec_sbin(pegasus_t)
+ corecmd_exec_bin(pegasus_t)
+ corecmd_exec_shell(pegasus_t)
++can_exec(pegasus_t,pegasus_exec_t)
+ 
+ dev_read_sysfs(pegasus_t)
+ dev_read_urand(pegasus_t)
+@@ -94,13 +96,12 @@
+ 
+ auth_use_nsswitch(pegasus_t)
+ auth_domtrans_chk_passwd(pegasus_t)
++auth_read_shadow(pegasus_t)
+ 
+ domain_use_interactive_fds(pegasus_t)
+ domain_read_all_domains_state(pegasus_t)
+ 
+-files_read_etc_files(pegasus_t)
+-files_list_var_lib(pegasus_t)
+-files_read_var_lib_files(pegasus_t)
++files_read_all_files(pegasus_t)
+ files_read_var_lib_symlinks(pegasus_t)
+ 
+ hostname_exec(pegasus_t)
+@@ -108,6 +109,7 @@
+ init_use_fds(pegasus_t)
+ init_use_script_ptys(pegasus_t)
+ init_rw_utmp(pegasus_t)
++init_stream_connect_script(pegasus_t)
+ 
+ libs_use_ld_so(pegasus_t)
+ libs_use_shared_libs(pegasus_t)
+@@ -126,11 +128,16 @@
+ 	unconfined_signull(pegasus_t)
+ ')
+ 
++
+ optional_policy(`
+ 	logging_send_syslog_msg(pegasus_t)
+ ')
+ 
+ optional_policy(`
++	rpm_exec(pegasus_t)
++')
++
++optional_policy(`
+ 	nscd_socket_use(pegasus_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.43/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-05-12 09:22:08.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/services/postfix.te	2006-05-26 14:03:15.000000000 -0400
@@ -864,7 +982,7 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.43/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/libraries.fc	2006-05-28 06:50:17.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/system/libraries.fc	2006-06-06 15:41:44.000000000 -0400
 @@ -34,8 +34,10 @@
  #
  /lib(/.*)?					gen_context(system_u:object_r:lib_t,s0)
@@ -873,12 +991,30 @@
 -/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
 +/lib/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
 +/lib64/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-+/lib(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
-+/lib64(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
++/lib/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
++/lib64/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
  
  ifdef(`distro_gentoo',`
  /lib32(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-@@ -115,6 +117,7 @@
+@@ -43,6 +45,9 @@
+ /lib32/ld-[^/]*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:ld_so_t,s0)
+ ')
+ 
++/lib/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/lib64/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
+ #
+ # /opt
+ #
+@@ -56,6 +61,7 @@
+ /opt/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/(.*/)?jre.*/libawt.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/netbeans(.*/)?jdk.*/linux/.*.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/cisco-vpnclient/lib/libvpnapi.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_gentoo',`
+ /opt/netscape/plugins/libflashplayer.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -115,6 +121,7 @@
  
  /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -886,9 +1022,11 @@
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  ifdef(`distro_redhat',`
-@@ -227,6 +230,12 @@
+@@ -226,7 +233,14 @@
+ /usr/(local/)?Adobe/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?Adobe/.*\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/local/matlab.*/bin/glnx86/libmwlapack.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/lib/acroread/(.*/)?sidecars/* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -899,6 +1037,11 @@
  ') dnl end distro_redhat
  
  #
+@@ -248,3 +262,4 @@
+ /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
+ /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
+ /var/spool/postfix/lib(64)?/devfsd/.*\.so.* --	gen_context(system_u:object_r:shlib_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.43/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-05-17 10:54:31.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/system/logging.te	2006-05-26 14:03:15.000000000 -0400
@@ -929,10 +1072,69 @@
  
  domain_use_interactive_fds(auditd_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.43/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-01-06 17:55:18.000000000 -0500
++++ serefpolicy-2.2.43/policy/modules/system/unconfined.fc	2006-06-06 12:30:30.000000000 -0400
+@@ -3,3 +3,7 @@
+ # /usr/local/bin/appsrv	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
+ # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
+ /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
++
++/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.43/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
++++ serefpolicy-2.2.43/policy/modules/system/unconfined.if	2006-06-06 12:30:13.000000000 -0400
+@@ -449,3 +449,31 @@
+ 
+ 	allow $1 unconfined_t:dbus acquire_svc;
+ ')
++
++########################################
++## <summary>
++##	Execute the application that requires dexecmem program in the unconfined_execmem domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_execmem_domtrans',`
++	ifdef(`targeted_policy',`
++		gen_require(`
++			type unconfined_execmem_t, unconfined_execmem_exec_t;
++		')
++
++		corecmd_search_bin($1)
++		domain_auto_trans($1, unconfined_execmem_exec_t, unconfined_execmem_t)
++
++		allow $1 unconfined_execmem_t:fd use;
++		allow unconfined_execmem_t $1:fd use;
++		allow unconfined_execmem_t $1:fifo_file rw_file_perms;
++		allow unconfined_execmem_t $1:process sigchld;
++	',`
++		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.43/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/unconfined.te	2006-05-26 14:03:15.000000000 -0400
-@@ -107,6 +107,10 @@
++++ serefpolicy-2.2.43/policy/modules/system/unconfined.te	2006-06-06 12:29:22.000000000 -0400
+@@ -13,7 +13,11 @@
+ ')
+ type unconfined_exec_t;
+ init_system_domain(unconfined_t,unconfined_exec_t)
+-role system_r types unconfined_t;
++
++type unconfined_execmem_t;
++type unconfined_execmem_exec_t;
++init_system_domain(unconfined_execmem_t,unconfined_execmem_exec_t)
++
+ 
+ ########################################
+ #
+@@ -107,6 +111,10 @@
  	')
  
  	optional_policy(`
@@ -943,6 +1145,26 @@
  		lpd_domtrans_checkpc(unconfined_t)
  	')
  
+@@ -173,4 +181,19 @@
+ 	optional_policy(`
+ 		xserver_domtrans_xdm_xserver(unconfined_t)
+ 	')
++
++	optional_policy(`
++		pegasus_domtrans(unconfined_t)
++	')
++
++')
++
++########################################
++#
++# Local policy
++#
++
++ifdef(`targeted_policy',`
++	allow unconfined_execmem_t self:process { execstack execmem };
++	unconfined_domain_noaudit(unconfined_execmem_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.43/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-05-17 10:54:31.000000000 -0400
 +++ serefpolicy-2.2.43/policy/modules/system/userdomain.te	2006-05-26 14:03:15.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- selinux-policy.spec	28 May 2006 11:03:47 -0000	1.171
+++ selinux-policy.spec	6 Jun 2006 21:35:58 -0000	1.172
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.43
-Release: 2.fc5
+Release: 4.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -326,6 +326,15 @@
 %endif
 
 %changelog
+* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-4.fc5
+- Bump for fc5
+
+* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-4
+- Add oprofilefs
+
+* Sun May 28 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-3
+- Fix for hplip and Picasus
+
 * Sun May 28 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-2.fc5
 - Bump for fc5
 



From fedora-cvs-commits at redhat.com  Tue Jun  6 23:20:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 19:20:19 -0400
Subject: rpms/avahi/FC-5 avahi.spec,1.49,1.50
Message-ID: <200606062320.k56NKJYZ028475@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28364

Modified Files:
	avahi.spec 
Log Message:
fix bugs 194203, 192080


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- avahi.spec	6 Jun 2006 18:28:25 -0000	1.49
+++ avahi.spec	6 Jun 2006 23:20:16 -0000	1.50
@@ -12,7 +12,7 @@
 License:        LGPL
 URL:            http://avahi.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel pygtk2
+BuildRequires:  autoconf, automake, libtool, doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, libxml2-python, gdbm-devel, pygtk2
 %if %{WITH_MONO}
 BuildRequires: mono-devel >= 1.1.13
 %endif



From fedora-cvs-commits at redhat.com  Wed Jun  7 03:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 23:42:08 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.123,1.124
Message-ID: <200606070342.k573g85I014426@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14275

Modified Files:
	gnome-panel.spec 
Log Message:
Bump eds version



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gnome-panel.spec	30 May 2006 04:13:28 -0000	1.123
+++ gnome-panel.spec	7 Jun 2006 03:42:05 -0000	1.124
@@ -9,7 +9,7 @@
 %define libbonoboui_version 2.3.0
 %define gnome_vfs2_version 2.9.1
 %define gnome_menus_version 2.11.1
-%define evolution_data_server_version 1.1.4
+%define evolution_data_server_version 1.6.1
 %define orbit_version 2.4.0
 %define gtk2_version 2.7.1
 %define dbus_version 0.60
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -216,6 +216,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-2
+- Rebuilt for new evolution-data-server
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 - Drop upstreamed patches



From fedora-cvs-commits at redhat.com  Wed Jun  7 03:44:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 23:44:19 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.124,1.125
Message-ID: <200606070344.k573iJph015308@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15219

Modified Files:
	gnome-panel.spec 
Log Message:
er, change release to be able to tag.



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gnome-panel.spec	7 Jun 2006 03:42:05 -0000	1.124
+++ gnome-panel.spec	7 Jun 2006 03:44:16 -0000	1.125
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 2
+Release: 1.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -216,7 +216,7 @@
 %{_datadir}/gtk-doc
 
 %changelog
-* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-2
+* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-1.1
 - Rebuilt for new evolution-data-server
 
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1



From fedora-cvs-commits at redhat.com  Wed Jun  7 03:45:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 23:45:08 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.139,1.140
Message-ID: <200606070345.k573j8CB015683@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15551

Modified Files:
	evolution.spec 
Log Message:
Actually bump eds version in the spec.  Thats an easy gotcha....



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- evolution.spec	6 Jun 2006 21:09:06 -0000	1.139
+++ evolution.spec	7 Jun 2006 03:45:05 -0000	1.140
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.5.92
+%define eds_version 1.6.1
 %define use_mozilla_nss 1
 %define evo_major 2.6
 %define libbonoboui_version 2.4.2
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.3
+Release: 1.fc5.4
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -639,6 +639,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jun  6 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.4
+- Bump eds version requires
+
 * Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.3
 - ExcludeArch on s390{,x} because it's broken, and it's not shipped in FC5
   on those arches anyway.



From fedora-cvs-commits at redhat.com  Wed Jun  7 03:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 6 Jun 2006 23:48:32 -0400
Subject: rpms/evolution-webcal/FC-5 evolution-webcal.spec,1.22,1.23
Message-ID: <200606070348.k573mWvw031459@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-webcal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31404

Modified Files:
	evolution-webcal.spec 
Log Message:
Bump for new eds



Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/FC-5/evolution-webcal.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- evolution-webcal.spec	11 Feb 2006 02:41:44 -0000	1.22
+++ evolution-webcal.spec	7 Jun 2006 03:48:29 -0000	1.23
@@ -1,12 +1,12 @@
 %define libsoup_version 2.1.8
-%define eds_version 1.1.0
+%define eds_version 1.6.1
 
 %define gettext_package evolution-webcal
 
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.4.1
-Release: 3.2
+Release: 3.3
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.3
+- Rebuild for new evolution-data-server
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 04:12:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 00:12:18 -0400
Subject: rpms/evolution-webcal/FC-5 evolution-webcal.spec,1.23,1.24
Message-ID: <200606070412.k574CIwX004969@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-webcal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4930

Modified Files:
	evolution-webcal.spec 
Log Message:
Er, use the right eds version.



Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/FC-5/evolution-webcal.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- evolution-webcal.spec	7 Jun 2006 03:48:29 -0000	1.23
+++ evolution-webcal.spec	7 Jun 2006 04:12:14 -0000	1.24
@@ -1,12 +1,12 @@
 %define libsoup_version 2.1.8
-%define eds_version 1.6.1
+%define eds_version 1.6.2
 
 %define gettext_package evolution-webcal
 
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.4.1
-Release: 3.3
+Release: 3.4
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -56,7 +56,7 @@
 
 
 %changelog
-* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.3
+* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.4
 - Rebuild for new evolution-data-server
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.2



From fedora-cvs-commits at redhat.com  Wed Jun  7 04:14:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 00:14:30 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.140,1.141
Message-ID: <200606070414.k574EU9S005311@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5270

Modified Files:
	evolution.spec 
Log Message:
Use the right eds version.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- evolution.spec	7 Jun 2006 03:45:05 -0000	1.140
+++ evolution.spec	7 Jun 2006 04:14:25 -0000	1.141
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.6.1
+%define eds_version 1.6.2
 %define use_mozilla_nss 1
 %define evo_major 2.6
 %define libbonoboui_version 2.4.2
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.4
+Release: 1.fc5.5
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -639,7 +639,7 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Tue Jun  6 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.4
+* Tue Jun  6 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.5
 - Bump eds version requires
 
 * Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.3



From fedora-cvs-commits at redhat.com  Wed Jun  7 05:16:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 01:16:22 -0400
Subject: rpms/evolution-sharp/FC-5 evolution-sharp.spec,1.14,1.15
Message-ID: <200606070516.k575GMvF015322@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-sharp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14672

Modified Files:
	evolution-sharp.spec 
Log Message:
bump for new EDS


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/FC-5/evolution-sharp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- evolution-sharp.spec	21 Feb 2006 10:09:19 -0000	1.14
+++ evolution-sharp.spec	7 Jun 2006 05:16:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        9
+Release:        9.1
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.1
+- Rebuild for new EDS
+
 * Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 0.10.2-9
 - BuildRequire gtk-sharp2
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 05:26:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 01:26:18 -0400
Subject: rpms/gnome-vfs2/FC-5 gnome-vfs2.spec,1.105,1.106
Message-ID: <200606070526.k575QIbf000400@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv338

Modified Files:
	gnome-vfs2.spec 
Log Message:
Rebuild



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/FC-5/gnome-vfs2.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-vfs2.spec	30 May 2006 12:49:06 -0000	1.105
+++ gnome-vfs2.spec	7 Jun 2006 05:26:16 -0000	1.106
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.14.2
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -185,6 +185,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+- Rebuild
+
 * Tue May 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 05:54:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 01:54:47 -0400
Subject: rpms/scim/FC-5 scim.spec,1.30,1.31
Message-ID: <200606070554.k575slU8023171@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23019

Modified Files:
	scim.spec 
Log Message:
- obsolete scim-qtimm to avoid KDE apps crashing (#192471)



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- scim.spec	9 May 2006 03:00:02 -0000	1.30
+++ scim.spec	7 Jun 2006 05:54:45 -0000	1.31
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   9.2.fc5
+Release:   9.3.fc5
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -22,6 +22,8 @@
 %endif
 PreReq:    %{_sbindir}/alternatives
 Obsoletes: iiimf-gtk <= 1:12.2, iiimf-gnome-im-switcher <= 1:12.2, iiimf-server <= 1:12.2, iiimf-x <= 1:12.2
+# fc5 scim-qtimm causes kde apps to crash
+Obsoletes: scim-qtimm <= 0.9.4-2.1.1
 Patch1:    scim-add-restart.patch
 Patch2:    gtkimm-clear-preedit-on-reset-174143.patch
 Patch3:    rawcode-unicode-maxlength.patch
@@ -195,6 +197,9 @@
 
 
 %changelog
+* Tue Jun  6 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.3.fc5
+- obsolete scim-qtimm to avoid KDE apps crashing (#192471)
+
 * Tue May  9 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.2.fc5
 - rebuild against new libstdc++so7 to fix ppc deps (#188443)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 10:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 06:20:20 -0400
Subject: rpms/libwpd/FC-5 .cvsignore, 1.11, 1.12 libwpd.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <200606071020.k57AKKd3022070@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21981

Modified Files:
	.cvsignore libwpd.spec sources 
Log Message:
bug fix for FC-5


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwpd/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Dec 2005 10:42:44 -0000	1.11
+++ .cvsignore	7 Jun 2006 10:20:17 -0000	1.12
@@ -4,3 +4,4 @@
 libwpd-0.8.2.tar.gz
 libwpd-0.8.3.tar.gz
 libwpd-0.8.4.tar.gz
+libwpd-0.8.5.tar.gz


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/FC-5/libwpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libwpd.spec	11 Feb 2006 04:16:37 -0000	1.22
+++ libwpd.spec	7 Jun 2006 10:20:17 -0000	1.23
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
-Version: 0.8.4
-Release: 1.2.1
+Version: 0.8.5
+Release: 0.1
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -66,6 +66,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Wed Jun 07 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-0.1
+- bug fixes for FC-5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwpd/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Dec 2005 10:42:44 -0000	1.11
+++ sources	7 Jun 2006 10:20:17 -0000	1.12
@@ -1 +1 @@
-0461d4bf2da534b4bed041b67d7f7064  libwpd-0.8.4.tar.gz
+6b679e205a2805c3d23f41c65b35e266  libwpd-0.8.5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun  7 12:04:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 08:04:27 -0400
Subject: rpms/cups/FC-5 cups-serverbin-compat.patch, NONE, 1.1 cups.spec,
	1.185, 1.186
Message-ID: <200606071204.k57C4QY7031440@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31401

Modified Files:
	cups.spec 
Added Files:
	cups-serverbin-compat.patch 
Log Message:
* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com>
- ServerBin compatibility patch (bug #194005).


cups-serverbin-compat.patch:
 conf.c     |    8 ++++++++
 conf.h     |    4 ++++
 env.c      |    5 +++++
 ipp.c      |    9 +++++++++
 job.c      |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 printers.c |   19 +++++++++++++++++++
 6 files changed, 93 insertions(+), 2 deletions(-)

--- NEW FILE cups-serverbin-compat.patch ---
--- cups-1.2.1/scheduler/ipp.c.serverbin-compat	2006-06-07 11:47:18.000000000 +0100
+++ cups-1.2.1/scheduler/ipp.c	2006-06-07 11:50:06.000000000 +0100
@@ -2209,9 +2209,18 @@
         * Could not find device in list!
 	*/
 
+#ifdef __x86_64__
+       snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat,
+		 method);
+	if (access(srcfile, X_OK))
+	  {
+#endif /* __x86_64__ */
 	send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"!"),
         	        attr->values[0].string.text);
 	return;
+#ifdef __x86_64__
+	  }
+#endif /* __x86_64__ */
       }
     }
 
--- cups-1.2.1/scheduler/printers.c.serverbin-compat	2006-06-07 12:21:59.000000000 +0100
+++ cups-1.2.1/scheduler/printers.c	2006-06-07 12:26:44.000000000 +0100
@@ -902,9 +902,19 @@
 	    * Backend does not exist, stop printer...
 	    */
 
+#ifdef __x86_64__
+	    snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat,
+		     p->device_uri);
+	    if (access(line, F_OK))
+	      {
+#endif /* __x86_64__ */
+
 	    p->state = IPP_PRINTER_STOPPED;
 	    snprintf(p->state_message, sizeof(p->state_message),
 	             "Backend %s does not exist!", line);
+#ifdef __x86_64__
+	      }
+#endif /* __x86_64__ */
 	  }
         }
 
@@ -2838,6 +2848,12 @@
 
     if (access(filename, X_OK))
     {
+#ifdef __x86_64__
+      snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat,
+	       program);
+      if (access(filename, X_OK))
+	{
+#endif /* __x86_64__ */
       snprintf(p->state_message, sizeof(p->state_message),
                "Filter \"%s\" for printer \"%s\" not available: %s",
 	       program, p->name, strerror(errno));
@@ -2846,6 +2862,9 @@
       cupsdAddPrinterHistory(p);
 
       cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);
+#ifdef __x86_64__
+	}
+#endif /* __x86_64__ */
     }
   }
 
--- cups-1.2.1/scheduler/conf.h.serverbin-compat	2006-06-07 11:38:05.000000000 +0100
+++ cups-1.2.1/scheduler/conf.h	2006-06-07 11:39:41.000000000 +0100
@@ -68,6 +68,10 @@
 					/* Root directory for scheduler */
 			*ServerBin		VALUE(NULL),
 					/* Root directory for binaries */
+#ifdef __x86_64__
+			*ServerBin_compat	VALUE(NULL),
+					/* Compat directory for binaries */
+#endif /* __x86_64__ */
 			*StateDir		VALUE(NULL),
 					/* Root directory for state data */
 			*RequestRoot		VALUE(NULL),
--- cups-1.2.1/scheduler/job.c.serverbin-compat	2006-06-07 11:50:31.000000000 +0100
+++ cups-1.2.1/scheduler/job.c	2006-06-07 12:21:48.000000000 +0100
@@ -3117,8 +3117,32 @@
        i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
   {
     if (filter->filter[0] != '/')
-      snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
-               filter->filter);
+      {
+	snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
+		 filter->filter);
+#ifdef __x86_64__
+	if (access(command, F_OK))
+	  {
+	    snprintf(command, sizeof(command), "%s/filter/%s",
+		     ServerBin_compat, filter->filter);
+	    if (!access(command, F_OK))
+	      {
+		/* Not in the correct directory, but found it in the compat
+		 * directory.  Issue a warning. */
+		cupsdLogMessage(CUPSD_LOG_INFO,
+				"Filter '%s' not in %s/filter!",
+				filter->filter, ServerBin);
+	      }
+	    else
+	      {
+		/* Not in the compat directory either; make any error
+		 * messages use the correct directory name then. */
+		snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
+			 filter->filter);
+	      }
+	  }
+      }
+#endif /* __x86_64__ */
     else
       strlcpy(command, filter->filter, sizeof(command));
 
@@ -3259,6 +3283,28 @@
     {
       sscanf(printer->device_uri, "%254[^:]", method);
       snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method);
+#ifdef __x86_64__
+      if (access(command, F_OK))
+	{
+	  snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
+		   method);
+	  if (!access(command, F_OK))
+	    {
+	      /* Not in the correct directory, but we found it in the compat
+	       * directory.  Issue a warning. */
+	      cupsdLogMessage(CUPSD_LOG_INFO,
+			      "Backend '%s' not in %s/backend!", method,
+			      ServerBin);
+	    }
+	  else
+	    {
+	      /* Not in the compat directory either; make any error
+		 messages use the correct directory name then. */
+	      snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
+		       method);
+	    }
+	}
+#endif /* __x86_64__ */
 
      /*
       * See if the backend needs to run as root...
--- cups-1.2.1/scheduler/env.c.serverbin-compat	2006-06-07 11:45:26.000000000 +0100
+++ cups-1.2.1/scheduler/env.c	2006-06-07 11:46:55.000000000 +0100
@@ -95,8 +95,13 @@
   cupsdSetEnv("LD_LIBRARY_PATH", NULL);
   cupsdSetEnv("LD_PRELOAD", NULL);
   cupsdSetEnv("NLSPATH", NULL);
+#ifdef __x86_64__
+  cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
+                       ":/bin:/usr/bin", ServerBin, ServerBin_compat);
+#else /* ! defined(__x86_64__) */
   cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
                        ":/bin:/usr/bin", ServerBin);
+#endif
   cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
   cupsdSetEnv("SHLIB_PATH", NULL);
   cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
--- cups-1.2.1/scheduler/conf.c.serverbin-compat	2006-06-07 11:38:24.000000000 +0100
+++ cups-1.2.1/scheduler/conf.c	2006-06-07 11:42:49.000000000 +0100
@@ -275,6 +275,9 @@
   cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp)));
   cupsdSetStringf(&ServerAdmin, "root@%s", temp);
   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
+#ifdef __x86_64__
+  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
+#endif /* __x86_64__ */
   cupsdSetString(&RequestRoot, CUPS_REQUESTS);
   cupsdSetString(&CacheDir, CUPS_CACHEDIR);
   cupsdSetString(&DataDir, CUPS_DATADIR);
@@ -954,7 +957,12 @@
     * Read the MIME type and conversion database...
     */
 
+#ifdef __x86_64__
+    snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin,
+	     ServerBin_compat);
+#else /* ! defined(__x86_64__) */
     snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
+#endif
 
     MimeDatabase = mimeLoad(ServerRoot, temp);
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- cups.spec	2 Jun 2006 14:20:35 -0000	1.185
+++ cups.spec	7 Jun 2006 12:04:24 -0000	1.186
@@ -37,6 +37,7 @@
 Patch14: cups-localhost.patch
 Patch15: cups-str1740.patch
 Patch16: cups-pie.patch
+Patch17: cups-serverbin-compat.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -137,6 +138,7 @@
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
+%patch17 -p1 -b .serverbin-compat
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -407,6 +409,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com>
+- ServerBin compatibility patch (bug #194005).
+
 * Fri Jun  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.4
 - Applied upstream patch to fix STR #1740 (bug #192809).
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 12:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 08:29:15 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.125,1.126
Message-ID: <200606071229.k57CTFxK031302@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31289

Modified Files:
	gnome-panel.spec 
Log Message:
bump build reqs



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-panel.spec	7 Jun 2006 03:44:16 -0000	1.125
+++ gnome-panel.spec	7 Jun 2006 12:29:13 -0000	1.126
@@ -7,7 +7,7 @@
 %define libwnck_version 2.9.92
 %define libbonobo_version 2.3.0
 %define libbonoboui_version 2.3.0
-%define gnome_vfs2_version 2.9.1
+%define gnome_vfs2_version 2.14.2
 %define gnome_menus_version 2.11.1
 %define evolution_data_server_version 1.6.1
 %define orbit_version 2.4.0
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 1.1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -43,6 +43,7 @@
 Prereq: gtk2 >= %{gtk2_version}
 
 BuildRequires: which
+BuildRequires: automake
 BuildRequires: libxml2-python
 BuildRequires: intltool
 BuildRequires: scrollkeeper
@@ -64,6 +65,7 @@
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
+Requires(post): GConf2
 
 Patch0: gnome-panel-2.12.1-vendor.patch
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -216,6 +218,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+- Add some BuildRequires
+
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-1.1
 - Rebuilt for new evolution-data-server
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 12:32:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 08:32:06 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.126,1.127
Message-ID: <200606071232.k57CW6Zw031425@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31411

Modified Files:
	gnome-panel.spec 
Log Message:
bump revision



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-panel.spec	7 Jun 2006 12:29:13 -0000	1.126
+++ gnome-panel.spec	7 Jun 2006 12:32:04 -0000	1.127
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 2
+Release: 1.fc5.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -218,7 +218,7 @@
 %{_datadir}/gtk-doc
 
 %changelog
-* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
 - Add some BuildRequires
 
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-1.1



From fedora-cvs-commits at redhat.com  Wed Jun  7 12:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 08:55:53 -0400
Subject: rpms/cups/FC-5 cups.spec,1.186,1.187
Message-ID: <200606071255.k57Ctrrw014364@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14337

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-1.5


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- cups.spec	7 Jun 2006 12:04:24 -0000	1.186
+++ cups.spec	7 Jun 2006 12:55:50 -0000	1.187
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.4
+Release: 1.5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -409,7 +409,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.5
 - ServerBin compatibility patch (bug #194005).
 
 * Fri Jun  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.4



From fedora-cvs-commits at redhat.com  Wed Jun  7 13:15:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 09:15:54 -0400
Subject: rpms/gnome-themes/FC-5 gnome-themes.spec,1.55,1.56
Message-ID: <200606071315.k57DFsKN027482@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-themes/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27083

Modified Files:
	gnome-themes.spec 
Log Message:
fix a problem in %post



Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/FC-5/gnome-themes.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-themes.spec	29 May 2006 19:31:31 -0000	1.55
+++ gnome-themes.spec	7 Jun 2006 13:15:51 -0000	1.56
@@ -4,7 +4,7 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
 Version: 2.14.2
-Release: 1
+Release: 1.fc5.1
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
@@ -78,7 +78,7 @@
 for dir in /usr/share/icons/*; do 
   if test -d "$dir"; then 
     if test -f "$dir/index.theme"; then
-      /usr/bin/gtk-update-icon-cache --quiet $dir
+      /usr/bin/gtk-update-icon-cache --quiet "$dir"
     fi
   fi
 done
@@ -90,6 +90,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
+- Fix a problem in %%post (#194323)
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 13:23:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 09:23:44 -0400
Subject: rpms/gnome-icon-theme/FC-5 gnome-icon-theme.spec,1.42,1.43
Message-ID: <200606071323.k57DNi13011381@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11307

Modified Files:
	gnome-icon-theme.spec 
Log Message:
Fix a problem in %post



Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/FC-5/gnome-icon-theme.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-icon-theme.spec	22 Mar 2006 19:04:40 -0000	1.42
+++ gnome-icon-theme.spec	7 Jun 2006 13:23:42 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.14.2
-Release: 1.fc5.1
+Release: 1.fc5.2
 Source0: %{name}-%{version}.tar.bz2
 # missing 24x24 version of epiphany icon
 Source1: web-browser.png
@@ -63,7 +63,7 @@
 for dir in /usr/share/icons/*; do 
   if test -d "$dir"; then
     if test -f "$dir/index.theme"; then
-      /usr/bin/gtk-update-icon-cache --quiet $dir 
+      /usr/bin/gtk-update-icon-cache --quiet "$dir" 
     fi
   fi
 done
@@ -75,6 +75,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1.fc5.2
+- Fix a problem in %%post (#194323)
+
 * Wed Mar 22 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1
 - Update to 2.14.2
 - Add symlinks to make application/xml work



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:04:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:04:15 -0400
Subject: rpms/xen/devel .cvsignore, 1.17, 1.18 sources, 1.32, 1.33 xen.spec,
	1.111, 1.112
Message-ID: <200606071404.k57E4FMX005682@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5654

Modified Files:
	.cvsignore sources xen.spec 
Log Message:
Rebase to xen-unstable cset 10278


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	5 May 2006 19:39:31 -0000	1.17
+++ .cvsignore	7 Jun 2006 14:04:13 -0000	1.18
@@ -1,4 +1,2 @@
 LibVNCServer-0.7.1.tar.gz
-xen-3.0.1-20060301.tar.bz2
-xen-20060425.tar.bz2
-xen-unstable-9925.tar.bz2
+xen-unstable-10278.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	5 May 2006 19:39:31 -0000	1.32
+++ sources	7 Jun 2006 14:04:13 -0000	1.33
@@ -1,2 +1,2 @@
 54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-ace9ba97c6a2687bd947b8a46d114a3e  xen-unstable-9925.tar.bz2
+3a9ceecf483dad0a29364b73b445636c  xen-unstable-10278.tar.bz2


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xen.spec	5 May 2006 19:39:31 -0000	1.111
+++ xen.spec	7 Jun 2006 14:04:13 -0000	1.112
@@ -5,12 +5,12 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 4
+Release: 5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 # xen-unstable cs 9925
-Source0: xen-unstable-9925.tar.bz2
+Source0: xen-unstable-10278.tar.bz2
 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Source2: xenguest-install.py
 Source3: xen-udev.rules
@@ -164,6 +164,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Wed Jun  7 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-5
+- Rebase to xen-unstable cset 10278
+
 * Fri May  5 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-4
 - update to new snapshot (changeset 9925)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:29:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:29:31 -0400
Subject: rpms/openhpi/devel openhpi.spec,1.37,1.38
Message-ID: <200606071429.k57ETV8G028183@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28111

Modified Files:
	openhpi.spec 
Log Message:
- Added missing pkgconfig buildprereq (#191935)



Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- openhpi.spec	7 Jun 2006 12:41:29 -0000	1.37
+++ openhpi.spec	7 Jun 2006 14:29:28 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.4.1
-Release: 3
+Release: 4
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
@@ -13,7 +13,7 @@
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: sysfsutils-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: elfutils-devel, rpm-devel, libtool-ltdl-devel, bzip2-devel
-BuildRequires: OpenIPMI-devel
+BuildRequires: OpenIPMI-devel, pkgconfig
 ExcludeArch: ia64
 
 %description
@@ -95,8 +95,9 @@
 
 
 %changelog
-* Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-3
-- Rebuilt with final memset patch.
+* Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-4
+- Rebuilt with final memset patch
+- Added missing pkgconfig buildprereq (#191935)
 
 * Fri May 26 2006 Radek Vokal <rvokal at redhat.com> - 2.4.1-2
 - rebuilt for new libnetsnmp and net-snmp-config changes



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:37:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:37:13 -0400
Subject: rpms/rdist/devel rdist.spec,1.19,1.20
Message-ID: <200606071437.k57EbDSd028886@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28852

Modified Files:
	rdist.spec 
Log Message:
- Added missing bison buildprereq (#194158)



Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rdist.spec	11 Feb 2006 05:29:19 -0000	1.19
+++ rdist.spec	7 Jun 2006 14:36:43 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 42.2.1
+Release: 43
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -24,7 +24,7 @@
 Patch13: rdist-6.1.5-re_args.patch
 URL: http://www.MagniComp.com/rdist
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPreReq: byacc
+BuildPreReq: byacc bison
 
 %description
 The RDist program maintains identical copies of files on multiple
@@ -87,6 +87,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 1:6.1.5-43
+- Added missing bison buildprereq (#194158)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:6.1.5-42.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:51:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:51:49 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.198,
	1.199 policycoreutils.spec, 1.279, 1.280
Message-ID: <200606071451.k57EpnB2015494@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15457

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-3
- Fix shell selection


policycoreutils-rhat.patch:
 audit2allow/Makefile   |    1 
 po/af.po               |    2 
 po/am.po               |    2 
 po/ar.po               |    2 
 po/be.po               |    2 
 po/bg.po               |    2 
 po/bn.po               |    2 
 po/bn_IN.po            |    2 
 po/ca.po               |    2 
 po/cs.po               |    2 
 po/cy.po               |    2 
 po/de.po               |    2 
 po/el.po               |    2 
 po/en_GB.po            |    2 
 po/es.po               |    2 
 po/eu_ES.po            |    2 
 po/fa.po               |    2 
 po/fi.po               |    2 
 po/gu.po               |    2 
 po/he.po               |    2 
 po/hi.po               |    2 
 po/hr.po               |    2 
 po/hu.po               |    2 
 po/hy.po               |    2 
 po/is.po               |    2 
 po/it.po               |    2 
 po/ja.po               |    2 
 po/ka.po               |    2 
 po/kn.po               |    2 
 po/ko.po               |    2 
 po/ku.po               |    2 
 po/lo.po               |    2 
 po/lt.po               |    2 
 po/lv.po               |    2 
 po/mk.po               |    2 
 po/ml.po               |    2 
 po/mr.po               |    2 
 po/ms.po               |    2 
 po/my.po               |    2 
 po/nb.po               |    2 
 po/nn.po               |    2 
 po/no.po               |    2 
 po/nso.po              |    2 
 po/or.po               |    2 
 po/pa.po               |    2 
 po/pl.po               |    2 
 po/policycoreutils.pot |   26 +-
 po/pt.po               |    2 
 po/pt_BR.po            |  297 +++++++++++++++++------------
 po/ro.po               |    2 
 po/ru.po               |    2 
 po/si.po               |    2 
 po/sk.po               |    2 
 po/sl.po               |    2 
 po/sq.po               |    2 
 po/sr.po               |    2 
 po/sr at Latn.po          |    2 
 po/ta.po               |    2 
 po/te.po               |    2 
 po/th.po               |    2 
 po/tr.po               |    2 
 po/uk.po               |    2 
 po/ur.po               |    2 
 po/vi.po               |    2 
 po/zh_CN.po            |  501 ++++++++++++++++++++++++++++---------------------
 po/zh_TW.po            |    2 
 po/zu.po               |    2 
 scripts/fixfiles       |    3 
 scripts/genhomedircon  |   10 
 setfiles/Makefile      |    1 
 setfiles/setfiles.c    |   38 +++
 71 files changed, 586 insertions(+), 417 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- policycoreutils-rhat.patch	6 Jun 2006 12:32:12 -0000	1.198
+++ policycoreutils-rhat.patch	7 Jun 2006 14:51:47 -0000	1.199
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.12/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.12/audit2allow/Makefile	2006-06-06 08:29:04.000000000 -0400
++++ policycoreutils-1.30.12/audit2allow/Makefile	2006-06-07 10:50:41.000000000 -0400
 @@ -1,7 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -11,7 +11,7 @@
  PYLIBVER ?= python2.4
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.12/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/af.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/af.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -23,7 +23,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.12/po/am.po
 --- nsapolicycoreutils/po/am.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/am.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/am.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -35,7 +35,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.30.12/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ar.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ar.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -47,7 +47,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.30.12/po/be.po
 --- nsapolicycoreutils/po/be.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/be.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/be.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -59,7 +59,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.30.12/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/bg.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/bg.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -71,7 +71,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.30.12/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/bn_IN.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/bn_IN.po	2006-06-07 10:50:41.000000000 -0400
 @@ -35,7 +35,7 @@
  msgstr ""
  "Project-Id-Version: bn_IN\n"
@@ -83,7 +83,7 @@
  "Language-Team: Bangla (INDIA) <redhat-translation at bengalinux.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.30.12/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/bn.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/bn.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -95,7 +95,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.12/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ca.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ca.po	2006-06-07 10:50:41.000000000 -0400
 @@ -21,7 +21,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -107,7 +107,7 @@
  "Language-Team: Catalan <tradgnome at softcatala.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.30.12/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/cs.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/cs.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -119,7 +119,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.30.12/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/cy.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/cy.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -131,7 +131,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.30.12/po/de.po
 --- nsapolicycoreutils/po/de.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/de.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/de.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils 1.28-4\n"
@@ -143,7 +143,7 @@
  "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.30.12/po/el.po
 --- nsapolicycoreutils/po/el.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/el.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/el.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -155,7 +155,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.30.12/po/en_GB.po
 --- nsapolicycoreutils/po/en_GB.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/en_GB.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/en_GB.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -167,7 +167,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.30.12/po/es.po
 --- nsapolicycoreutils/po/es.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/es.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/es.po	2006-06-07 10:50:41.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: \n"
@@ -179,7 +179,7 @@
  "Language-Team:  <es at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/eu_ES.po policycoreutils-1.30.12/po/eu_ES.po
 --- nsapolicycoreutils/po/eu_ES.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/eu_ES.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/eu_ES.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -191,7 +191,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fa.po policycoreutils-1.30.12/po/fa.po
 --- nsapolicycoreutils/po/fa.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/fa.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/fa.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -203,7 +203,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fi.po policycoreutils-1.30.12/po/fi.po
 --- nsapolicycoreutils/po/fi.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/fi.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/fi.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -215,7 +215,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gu.po policycoreutils-1.30.12/po/gu.po
 --- nsapolicycoreutils/po/gu.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/gu.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/gu.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: gu\n"
@@ -227,7 +227,7 @@
  "Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/he.po policycoreutils-1.30.12/po/he.po
 --- nsapolicycoreutils/po/he.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/he.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/he.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -239,7 +239,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.12/po/hi.po
 --- nsapolicycoreutils/po/hi.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/hi.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/hi.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: hi\n"
@@ -251,7 +251,7 @@
  "Language-Team: Hindi <fedora-trans-hi at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hr.po policycoreutils-1.30.12/po/hr.po
 --- nsapolicycoreutils/po/hr.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/hr.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/hr.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -263,7 +263,7 @@
  "Language-Team: Croatian <www.translator-shop.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hu.po policycoreutils-1.30.12/po/hu.po
 --- nsapolicycoreutils/po/hu.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/hu.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/hu.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -275,7 +275,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hy.po policycoreutils-1.30.12/po/hy.po
 --- nsapolicycoreutils/po/hy.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/hy.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/hy.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -287,7 +287,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/is.po policycoreutils-1.30.12/po/is.po
 --- nsapolicycoreutils/po/is.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/is.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/is.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -299,7 +299,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/it.po policycoreutils-1.30.12/po/it.po
 --- nsapolicycoreutils/po/it.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/it.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/it.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: it\n"
@@ -311,7 +311,7 @@
  "Language-Team: Italiano <fedora-trans-it at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ja.po policycoreutils-1.30.12/po/ja.po
 --- nsapolicycoreutils/po/ja.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ja.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ja.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -323,7 +323,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ka.po policycoreutils-1.30.12/po/ka.po
 --- nsapolicycoreutils/po/ka.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ka.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ka.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -335,7 +335,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/kn.po policycoreutils-1.30.12/po/kn.po
 --- nsapolicycoreutils/po/kn.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/kn.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/kn.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -347,7 +347,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ko.po policycoreutils-1.30.12/po/ko.po
 --- nsapolicycoreutils/po/ko.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ko.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ko.po	2006-06-07 10:50:41.000000000 -0400
 @@ -15,7 +15,7 @@
  msgstr ""
  "Project-Id-Version: ko\n"
@@ -359,7 +359,7 @@
  "Language-Team:  <en at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ku.po policycoreutils-1.30.12/po/ku.po
 --- nsapolicycoreutils/po/ku.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ku.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ku.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -371,7 +371,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lo.po policycoreutils-1.30.12/po/lo.po
 --- nsapolicycoreutils/po/lo.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/lo.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/lo.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -383,7 +383,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lt.po policycoreutils-1.30.12/po/lt.po
 --- nsapolicycoreutils/po/lt.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/lt.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/lt.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -395,7 +395,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lv.po policycoreutils-1.30.12/po/lv.po
 --- nsapolicycoreutils/po/lv.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/lv.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/lv.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -407,7 +407,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mk.po policycoreutils-1.30.12/po/mk.po
 --- nsapolicycoreutils/po/mk.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/mk.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/mk.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -419,7 +419,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ml.po policycoreutils-1.30.12/po/ml.po
 --- nsapolicycoreutils/po/ml.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ml.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ml.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: ml\n"
@@ -431,7 +431,7 @@
  "Language-Team: Malayalam\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.30.12/po/mr.po
 --- nsapolicycoreutils/po/mr.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/mr.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/mr.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -443,7 +443,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.12/po/ms.po
 --- nsapolicycoreutils/po/ms.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ms.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ms.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -455,7 +455,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/my.po policycoreutils-1.30.12/po/my.po
 --- nsapolicycoreutils/po/my.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/my.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/my.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -467,7 +467,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nb.po policycoreutils-1.30.12/po/nb.po
 --- nsapolicycoreutils/po/nb.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/nb.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/nb.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -479,7 +479,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nn.po policycoreutils-1.30.12/po/nn.po
 --- nsapolicycoreutils/po/nn.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/nn.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/nn.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -491,7 +491,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/no.po policycoreutils-1.30.12/po/no.po
 --- nsapolicycoreutils/po/no.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/no.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/no.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -503,7 +503,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nso.po policycoreutils-1.30.12/po/nso.po
 --- nsapolicycoreutils/po/nso.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/nso.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/nso.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -515,7 +515,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/or.po policycoreutils-1.30.12/po/or.po
 --- nsapolicycoreutils/po/or.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/or.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/or.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: or\n"
@@ -527,7 +527,7 @@
  "Language-Team: Oriya <oriya-group at lists.sarovar.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pa.po policycoreutils-1.30.12/po/pa.po
 --- nsapolicycoreutils/po/pa.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/pa.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/pa.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -539,7 +539,7 @@
  "Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pl.po policycoreutils-1.30.12/po/pl.po
 --- nsapolicycoreutils/po/pl.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/pl.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/pl.po	2006-06-07 10:50:41.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: pl\n"
@@ -551,7 +551,7 @@
  "Language-Team: Polish <pl at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/policycoreutils.pot policycoreutils-1.30.12/po/policycoreutils.pot
 --- nsapolicycoreutils/po/policycoreutils.pot	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/policycoreutils.pot	2006-06-06 08:29:04.000000000 -0400
++++ policycoreutils-1.30.12/po/policycoreutils.pot	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -635,7 +635,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt_BR.po policycoreutils-1.30.12/po/pt_BR.po
 --- nsapolicycoreutils/po/pt_BR.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/pt_BR.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/pt_BR.po	2006-06-07 10:50:41.000000000 -0400
 @@ -4,17 +4,13 @@
  msgstr ""
  "Project-Id-Version: pt_BR\n"
@@ -1347,7 +1347,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt.po policycoreutils-1.30.12/po/pt.po
 --- nsapolicycoreutils/po/pt.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/pt.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/pt.po	2006-06-07 10:50:41.000000000 -0400
 @@ -2,7 +2,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -1359,7 +1359,7 @@
  "Language-Team: pt <kde-i18n-pt at kde.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ro.po policycoreutils-1.30.12/po/ro.po
 --- nsapolicycoreutils/po/ro.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ro.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ro.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1371,7 +1371,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-1.30.12/po/ru.po
 --- nsapolicycoreutils/po/ru.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ru.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ru.po	2006-06-07 10:50:41.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: ru\n"
@@ -1383,7 +1383,7 @@
  "Language-Team: Russian <fedora-trans-ru at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.30.12/po/si.po
 --- nsapolicycoreutils/po/si.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/si.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/si.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1395,7 +1395,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.30.12/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/sk.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/sk.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1407,7 +1407,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.30.12/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/sl.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/sl.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1419,7 +1419,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.30.12/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/sq.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/sq.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1431,7 +1431,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.30.12/po/sr at Latn.po
 --- nsapolicycoreutils/po/sr at Latn.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/sr at Latn.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/sr at Latn.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -1443,7 +1443,7 @@
  "Language-Team: Serbian (sr) <fedora at prevod.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.30.12/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/sr.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/sr.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -1455,7 +1455,7 @@
  "Language-Team: Serbian (sr) <fedora at prevod.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.30.12/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ta.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ta.po	2006-06-07 10:50:41.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: ta\n"
@@ -1467,7 +1467,7 @@
  "Language-Team: Tamil <ta at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.30.12/po/te.po
 --- nsapolicycoreutils/po/te.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/te.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/te.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1479,7 +1479,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.30.12/po/th.po
 --- nsapolicycoreutils/po/th.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/th.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/th.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1491,7 +1491,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.30.12/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/tr.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/tr.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1503,7 +1503,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.30.12/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/uk.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/uk.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1515,7 +1515,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.30.12/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ur.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/ur.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1527,7 +1527,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.30.12/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/vi.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/vi.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1539,7 +1539,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.30.12/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/zh_CN.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/zh_CN.po	2006-06-07 10:50:41.000000000 -0400
 @@ -1,4 +1,7 @@
  # translation of zh_CN.po to 
 +# translation of zh_CN.po to
@@ -2591,7 +2591,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.12/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/zh_TW.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/zh_TW.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2603,7 +2603,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.30.12/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/zu.po	2006-06-06 08:30:05.000000000 -0400
++++ policycoreutils-1.30.12/po/zu.po	2006-06-07 10:50:41.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2615,7 +2615,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.12/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2006-06-05 13:20:27.000000000 -0400
-+++ policycoreutils-1.30.12/scripts/fixfiles	2006-06-06 08:29:04.000000000 -0400
++++ policycoreutils-1.30.12/scripts/fixfiles	2006-06-07 10:50:41.000000000 -0400
 @@ -30,6 +30,7 @@
  OUTFILES=""
  LOGFILE=/dev/null
@@ -2633,9 +2633,53 @@
      echo $1 >> $LOGFILE
  fi
  }
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.12/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2006-05-23 06:19:30.000000000 -0400
++++ policycoreutils-1.30.12/scripts/genhomedircon	2006-06-07 10:50:46.000000000 -0400
+@@ -30,10 +30,12 @@
+ 
+ try:
+ 	fd = open("/etc/shells", 'r')
+-	VALID_SHELLS = fd.readlines()
++	VALID_SHELLS = fd.read().split("\n")
+ 	fd.close()
+ 	if "/sbin/nologin" in VALID_SHELLS:
+ 		VALID_SHELLS.remove("/sbin/nologin")
++	if "" in VALID_SHELLS:
++		VALID_SHELLS.remove("")
+ except:
+ 	VALID_SHELLS = ['/bin/sh', '/bin/bash', '/bin/ash', '/bin/bsh', '/bin/ksh', '/usr/bin/ksh', '/usr/bin/pdksh', '/bin/tcsh', '/bin/csh', '/bin/zsh']
+ 
+@@ -160,7 +162,7 @@
+ 		for i in  fd.readlines():
+ 			if i.find("HOME_ROOT") == 0:
+ 				i = i.replace("HOME_ROOT", homedir)
+-				ret += i+"\n"
++				ret += i
+ 		fd.close()
+ 		if ret == "":
+ 			errorExit("No Home Root Context Found")
+@@ -254,7 +256,7 @@
+ 				i = i.replace("HOME_DIR", home)
+ 				i = i.replace("ROLE", prefix)
+ 				i = i.replace("system_u", seuser)
+-				ret = ret+i+"\n"
++				ret = ret+i
+ 		fd.close()
+ 		return ret
+ 
+@@ -266,7 +268,7 @@
+ 				i = i.replace("USER", user)
+ 				i = i.replace("ROLE", prefix)
+ 				i = i.replace("system_u", sel_user)
+-				ret = ret+i+"\n"
++				ret = ret+i
+ 		fd.close()
+ 		return ret
+ 
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-1.30.12/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2006-05-30 09:07:14.000000000 -0400
-+++ policycoreutils-1.30.12/setfiles/Makefile	2006-06-06 08:29:04.000000000 -0400
++++ policycoreutils-1.30.12/setfiles/Makefile	2006-06-07 10:50:41.000000000 -0400
 @@ -7,6 +7,7 @@
  CFLAGS = -Werror -Wall -W 
  override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include
@@ -2646,7 +2690,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.12/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2006-05-15 09:43:12.000000000 -0400
-+++ policycoreutils-1.30.12/setfiles/setfiles.c	2006-06-06 08:29:04.000000000 -0400
++++ policycoreutils-1.30.12/setfiles/setfiles.c	2006-06-07 10:50:41.000000000 -0400
 @@ -75,6 +75,11 @@
  #include <selinux/selinux.h>
  #include <syslog.h> 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- policycoreutils.spec	6 Jun 2006 13:13:02 -0000	1.279
+++ policycoreutils.spec	7 Jun 2006 14:51:47 -0000	1.280
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.12
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -110,6 +110,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-3
+- Fix shell selection
+
 * Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-2
 - Add BuildRequires for gettext
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:52:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:52:25 -0400
Subject: rpms/cups/FC-5 cups-str1758.patch,NONE,1.1 cups.spec,1.187,1.188
Message-ID: <200606071452.k57EqPFd015732@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15678

Modified Files:
	cups.spec 
Added Files:
	cups-str1758.patch 
Log Message:
* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.6
- Fix 'Allow from @IF(...)' (STR #1758, bug #187703).


cups-str1758.patch:
 auth.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE cups-str1758.patch ---
--- cups-1.2.1/scheduler/auth.c.iface	2006-06-07 15:34:01.000000000 +0100
+++ cups-1.2.1/scheduler/auth.c	2006-06-07 15:34:56.000000000 +0100
@@ -869,9 +869,12 @@
 	    */
 
 	    for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
-	         iface && !strcmp(masks->mask.name.name, iface->name);
+	         iface;
 		 iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
 	    {
+              if (strcmp(masks->mask.name.name, iface->name))
+                continue;
+
               if (iface->address.addr.sa_family == AF_INET)
 	      {
 	       /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- cups.spec	7 Jun 2006 12:55:50 -0000	1.187
+++ cups.spec	7 Jun 2006 14:52:22 -0000	1.188
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.5
+Release: 1.6
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -39,6 +39,7 @@
 Patch16: cups-pie.patch
 Patch17: cups-serverbin-compat.patch
 Patch18: cups-language.patch
+Patch19: cups-str1758.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
@@ -140,6 +141,7 @@
 %endif
 %patch17 -p1 -b .serverbin-compat
 %patch18 -p1 -b .language
+%patch19 -p1 -b .str1758
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
@@ -409,6 +411,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.6
+- Fix 'Allow from @IF(...)' (STR #1758, bug #187703).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.5
 - ServerBin compatibility patch (bug #194005).
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:52:55 -0400
Subject: rpms/xen/devel xen.spec,1.112,1.113
Message-ID: <200606071452.k57EqtDJ015928@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15855

Modified Files:
	xen.spec 
Log Message:
Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
glibc32 correctly



Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xen.spec	7 Jun 2006 14:04:13 -0000	1.112
+++ xen.spec	7 Jun 2006 14:52:52 -0000	1.113
@@ -5,11 +5,10 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 5
+Release: 6
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-# xen-unstable cs 9925
 Source0: xen-unstable-10278.tar.bz2
 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Source2: xenguest-install.py
@@ -34,6 +33,8 @@
 BuildRequires: perl 
 # so that the makefile knows to install udev rules
 BuildRequires: udev 
+# so that x86_64 builds pick up glibc32 correctly
+BuildRequires: /usr/include/gnu/stubs-32.h
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
@@ -164,6 +165,10 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Wed Jun  7 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-6
+- Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
+  glibc32 correctly
+
 * Wed Jun  7 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-5
 - Rebase to xen-unstable cset 10278
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:56:33 -0400
Subject: rpms/cups/devel cups-str1758.patch,NONE,1.1 cups.spec,1.211,1.212
Message-ID: <200606071456.k57EuXi1017312@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17256

Modified Files:
	cups.spec 
Added Files:
	cups-str1758.patch 
Log Message:
* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-8
- Fix 'Allow from @IF(...)' (STR #1758, bug #187703).


cups-str1758.patch:
 auth.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE cups-str1758.patch ---
--- cups-1.2.1/scheduler/auth.c.iface	2006-06-07 15:34:01.000000000 +0100
+++ cups-1.2.1/scheduler/auth.c	2006-06-07 15:34:56.000000000 +0100
@@ -869,9 +869,12 @@
 	    */
 
 	    for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
-	         iface && !strcmp(masks->mask.name.name, iface->name);
+	         iface;
 		 iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
 	    {
+              if (strcmp(masks->mask.name.name, iface->name))
+                continue;
+
               if (iface->address.addr.sa_family == AF_INET)
 	      {
 	       /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- cups.spec	7 Jun 2006 12:57:42 -0000	1.211
+++ cups.spec	7 Jun 2006 14:56:31 -0000	1.212
@@ -32,6 +32,7 @@
 Patch10: cups-str1740.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
+Patch13: cups-str1758.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -123,6 +124,7 @@
 %patch10 -p1 -b .str1740
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
+%patch13 -p1 -b .str1758
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -385,6 +387,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-8
+- Fix 'Allow from @IF(...)' (STR #1758, bug #187703).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-7
 - ServerBin compatibility patch (bug #194005).
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:57:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:57:01 -0400
Subject: rpms/cups/devel cups.spec,1.212,1.213
Message-ID: <200606071457.k57Ev1xK017554@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17494

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-8


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- cups.spec	7 Jun 2006 14:56:31 -0000	1.212
+++ cups.spec	7 Jun 2006 14:56:59 -0000	1.213
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun  7 14:59:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 10:59:41 -0400
Subject: rpms/libsemanage/FC-5 libsemanage.spec,1.81,1.82
Message-ID: <200606071459.k57ExfRq018656@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18633

Modified Files:
	libsemanage.spec 
Log Message:
* Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.8-1.fc5
- Bump for fc5



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libsemanage.spec	4 Apr 2006 09:17:51 -0000	1.81
+++ libsemanage.spec	7 Jun 2006 14:59:39 -0000	1.82
@@ -1,13 +1,12 @@
-%define libsepolver 1.12.4-1
-%define libselinuxver 1.30-1
+%define libsepolver 1.12.17-1
+%define libselinuxver 1.30.3-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.2
-Release: 2.fc5
+Version: 1.6.8
+Release: 1.fc5
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -40,7 +39,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -74,6 +72,46 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.8-1.fc5
+- Bump for fc5
+
+* Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.8-1
+- Upgrade to latest from NSA
+	* Updated default location for setfiles to /sbin to
+	  match policycoreutils.  This can also be adjusted via 
+	  semanage.conf using the syntax:
+	  [setfiles]
+	  path = /path/to/setfiles
+	  args = -q -c $@ $<
+	  [end]
+
+* Mon May 15 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.7-3
+- Spec file cleanup from n0dalus+redhat at gmail.com
+
+* Mon May 15 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.7-2
+- Add /usr/include/semanage to spec file
+
+* Mon May 8 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.7-1
+- Upgrade to latest from NSA
+	* Merged fix warnings patch from Karl MacMillan.
+
+* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.6-1.fc5
+- Bump for fc5
+
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.6-1
+- Upgrade to latest from NSA
+	* Merged updated file context sorting patch from Christopher
+	  Ashworth, with bug fix for escaped character flag.
+	* Merged file context sorting code from Christopher Ashworth 
+	  (Tresys Technology), based on fc_sort.c code in refpolicy.
+	* Merged python binding t_output_helper removal patch from Dan Walsh.
+	* Regenerated swig files.
+
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.3-1
+- Fix to work with new version of swig
+- Upgrade to latest from NSA
+	* Merged corrected fix for descriptor leak from Dan Walsh.
+
 * Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
 - Bump for fc5
 
@@ -356,7 +394,7 @@
 	* Merged interface parse/print, context_to_string interface change,
 	  move assert_noeof, and order preserving patches from Ivan Gyurdiev.
         * Added src/dso.h in preparation for other changes.
-p	* Merged install seusers, handle/error messages, MLS parsing,
+	* Merged install seusers, handle/error messages, MLS parsing,
 	  and seusers validation patches from Ivan Gyurdiev.
 
 * Mon Oct 31 2005 Dan Walsh <dwalsh at redhat.com> 1.3.39-1



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:00:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:00:43 -0400
Subject: rpms/cups/FC-5 cups-serverbin-compat.patch,1.1,1.2
Message-ID: <200606071500.k57F0heY018907@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18846

Modified Files:
	cups-serverbin-compat.patch 
Log Message:
Fixed serverbin-compat patch.

cups-serverbin-compat.patch:
 conf.c     |    8 ++++++++
 conf.h     |    4 ++++
 env.c      |    5 +++++
 ipp.c      |    9 +++++++++
 job.c      |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 printers.c |   19 +++++++++++++++++++
 6 files changed, 93 insertions(+), 2 deletions(-)

Index: cups-serverbin-compat.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-serverbin-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-serverbin-compat.patch	7 Jun 2006 12:04:24 -0000	1.1
+++ cups-serverbin-compat.patch	7 Jun 2006 15:00:41 -0000	1.2
@@ -109,8 +109,8 @@
 +			 filter->filter);
 +	      }
 +	  }
-+      }
 +#endif /* __x86_64__ */
++      }
      else
        strlcpy(command, filter->filter, sizeof(command));
  



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:02:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:02:48 -0400
Subject: rpms/sg3_utils/devel sg3_utils-1.20-llseek.patch, NONE,
	1.1 sg3_utils.spec, 1.13, 1.14
Message-ID: <200606071502.k57F2mAS019177@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19133

Modified Files:
	sg3_utils.spec 
Added Files:
	sg3_utils-1.20-llseek.patch 
Log Message:
- Fixed rebuild problem on latest toolchain


sg3_utils-1.20-llseek.patch:
 llseek.c |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE sg3_utils-1.20-llseek.patch ---
--- sg3_utils-1.20/llseek.c.llseek	2006-06-07 17:00:41.000000000 +0200
+++ sg3_utils-1.20/llseek.c	2006-06-07 17:00:53.000000000 +0200
@@ -41,14 +41,6 @@
 static int _llseek (unsigned int, unsigned long,
                    unsigned long, llse_loff_t *, unsigned int);
 
-#ifdef __NR__llseek
-
-static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
-                 unsigned long, offset_low,llse_loff_t *,result,
-                 unsigned int, origin)
-
-#else
-
 /* no __NR__llseek on compilation machine - might give it explicitly */
 static int _llseek (unsigned int fd, unsigned long oh,
                     unsigned long ol, llse_loff_t *result,
@@ -57,8 +49,6 @@
         return -1;
 }
 
-#endif
-
 static llse_loff_t my_llseek (unsigned int fd, llse_loff_t offset,
                 unsigned int origin)
 {


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sg3_utils.spec	19 May 2006 09:41:41 -0000	1.13
+++ sg3_utils.spec	7 Jun 2006 15:02:39 -0000	1.14
@@ -1,10 +1,11 @@
 Summary: Utils for Linux's SCSI generic driver devices + raw devices
 Name: sg3_utils
 Version: 1.20
-Release: 1
+Release: 2
 License: GPL
 Group: Utilities/System
 Source: ftp://www.torque.net/sg/p/sg3_utils-%{version}.tgz
+Patch1: sg3_utils-1.20-llseek.patch
 Url: http://www.torque.net/sg/u_index.html
 Provides: sg_utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root/
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .llseek
 
 %build
 make
@@ -76,6 +78,9 @@
 %{_libdir}/*.la
  
 %changelog
+* Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 1.20-2
+- Fixed rebuild problem on latest toolchain
+
 * Fri May 19 2006 Phil Knirsch <pknirsch at redhat.com> - 1.20-1
 - Update to sg3_utils-1.20.
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:06:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:06:22 -0400
Subject: rpms/policycoreutils/FC-5 policycoreutils-rhat.patch, 1.175,
	1.176 policycoreutils.spec, 1.248, 1.249
Message-ID: <200606071506.k57F6MNG019632@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19584

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.10-2.fc5
- Fix genhomedircon to select shells correctly
- Fix seobject.py to not sort the file_context file.


policycoreutils-rhat.patch:
 audit2allow/Makefile  |    1 
 po/kn.po              |  959 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pt.po              |   28 -
 po/pt_BR.po           |  606 ++++++++++++++++++-------------
 po/sr.po              |  610 +++++++++++++++++--------------
 po/sr at Latn.po         |  610 +++++++++++++++++--------------
 po/te.po              |  959 ++++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/genhomedircon |   10 
 semanage/seobject.py  |   29 -
 9 files changed, 2987 insertions(+), 825 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- policycoreutils-rhat.patch	24 May 2006 03:42:14 -0000	1.175
+++ policycoreutils-rhat.patch	7 Jun 2006 15:06:10 -0000	1.176
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.10/audit2allow/Makefile
---- nsapolicycoreutils/audit2allow/Makefile	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.10/audit2allow/Makefile	2006-05-23 06:32:13.000000000 -0400
+--- nsapolicycoreutils/audit2allow/Makefile	2006-05-23 06:20:02.000000000 -0400
++++ policycoreutils-1.30.10/audit2allow/Makefile	2006-06-07 11:02:40.000000000 -0400
 @@ -1,7 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -11,7 +11,7 @@
  PYLIBVER ?= python2.4
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/kn.po policycoreutils-1.30.10/po/kn.po
 --- nsapolicycoreutils/po/kn.po	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.10/po/kn.po	2006-05-23 06:33:17.000000000 -0400
++++ policycoreutils-1.30.10/po/kn.po	2006-06-07 11:02:40.000000000 -0400
 @@ -0,0 +1,959 @@
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -973,8 +973,8 @@
 +msgid "Options Error: %s "
 +msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt_BR.po policycoreutils-1.30.10/po/pt_BR.po
---- nsapolicycoreutils/po/pt_BR.po	2006-05-23 06:19:30.000000000 -0400
-+++ policycoreutils-1.30.10/po/pt_BR.po	2006-05-23 06:33:17.000000000 -0400
+--- nsapolicycoreutils/po/pt_BR.po	2006-05-23 06:20:03.000000000 -0400
++++ policycoreutils-1.30.10/po/pt_BR.po	2006-06-07 11:02:40.000000000 -0400
 @@ -1,230 +1,252 @@
 +# translation of pt_BR.po to  Brazilian Portuguese
 +# Diego B??rigo Zacar??o <diegobz at gmail.com>, 2006.
@@ -2265,8 +2265,8 @@
 +msgstr "Erro de Op????es: %s"
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt.po policycoreutils-1.30.10/po/pt.po
---- nsapolicycoreutils/po/pt.po	2006-05-23 06:19:31.000000000 -0400
-+++ policycoreutils-1.30.10/po/pt.po	2006-05-23 06:33:17.000000000 -0400
+--- nsapolicycoreutils/po/pt.po	2006-05-23 06:20:03.000000000 -0400
++++ policycoreutils-1.30.10/po/pt.po	2006-06-07 11:02:40.000000000 -0400
 @@ -3,7 +3,7 @@
  "Project-Id-Version: policycoreutils\n"
  "Report-Msgid-Bugs-To: \n"
@@ -2332,8 +2332,8 @@
  #: ../semanage/seobject.py:124
  msgid "translations not supported on non-MLS machines"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.30.10/po/sr at Latn.po
---- nsapolicycoreutils/po/sr at Latn.po	2006-05-23 06:19:30.000000000 -0400
-+++ policycoreutils-1.30.10/po/sr at Latn.po	2006-05-23 06:33:17.000000000 -0400
+--- nsapolicycoreutils/po/sr at Latn.po	2006-05-23 06:20:03.000000000 -0400
++++ policycoreutils-1.30.10/po/sr at Latn.po	2006-06-07 11:02:40.000000000 -0400
 @@ -1,947 +1,1019 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -3636,8 +3636,8 @@
 +msgstr "Gre??ka opcija: %s "
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.30.10/po/sr.po
---- nsapolicycoreutils/po/sr.po	2006-05-23 06:19:31.000000000 -0400
-+++ policycoreutils-1.30.10/po/sr.po	2006-05-23 06:33:17.000000000 -0400
+--- nsapolicycoreutils/po/sr.po	2006-05-23 06:20:02.000000000 -0400
++++ policycoreutils-1.30.10/po/sr.po	2006-06-07 11:02:40.000000000 -0400
 @@ -1,947 +1,1019 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4941,7 +4941,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.30.10/po/te.po
 --- nsapolicycoreutils/po/te.po	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.10/po/te.po	2006-05-23 06:33:17.000000000 -0400
++++ policycoreutils-1.30.10/po/te.po	2006-06-07 11:02:40.000000000 -0400
 @@ -0,0 +1,959 @@
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -5902,3 +5902,100 @@
 +#, c-format
 +msgid "Options Error: %s "
 +msgstr ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.10/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2006-05-23 06:20:02.000000000 -0400
++++ policycoreutils-1.30.10/scripts/genhomedircon	2006-06-07 11:02:51.000000000 -0400
+@@ -30,10 +30,12 @@
+ 
+ try:
+ 	fd = open("/etc/shells", 'r')
+-	VALID_SHELLS = fd.readlines()
++	VALID_SHELLS = fd.read().split("\n")
+ 	fd.close()
+ 	if "/sbin/nologin" in VALID_SHELLS:
+ 		VALID_SHELLS.remove("/sbin/nologin")
++	if "" in VALID_SHELLS:
++		VALID_SHELLS.remove("")
+ except:
+ 	VALID_SHELLS = ['/bin/sh', '/bin/bash', '/bin/ash', '/bin/bsh', '/bin/ksh', '/usr/bin/ksh', '/usr/bin/pdksh', '/bin/tcsh', '/bin/csh', '/bin/zsh']
+ 
+@@ -160,7 +162,7 @@
+ 		for i in  fd.readlines():
+ 			if i.find("HOME_ROOT") == 0:
+ 				i = i.replace("HOME_ROOT", homedir)
+-				ret += i+"\n"
++				ret += i
+ 		fd.close()
+ 		if ret == "":
+ 			errorExit("No Home Root Context Found")
+@@ -254,7 +256,7 @@
+ 				i = i.replace("HOME_DIR", home)
+ 				i = i.replace("ROLE", prefix)
+ 				i = i.replace("system_u", seuser)
+-				ret = ret+i+"\n"
++				ret = ret+i
+ 		fd.close()
+ 		return ret
+ 
+@@ -266,7 +268,7 @@
+ 				i = i.replace("USER", user)
+ 				i = i.replace("ROLE", prefix)
+ 				i = i.replace("system_u", sel_user)
+-				ret = ret+i+"\n"
++				ret = ret+i
+ 		fd.close()
+ 		return ret
+ 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.10/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-05-23 06:20:02.000000000 -0400
++++ policycoreutils-1.30.10/semanage/seobject.py	2006-06-07 11:05:20.000000000 -0400
+@@ -1145,7 +1145,7 @@
+ 		semanage_fcontext_key_free(k)		
+ 
+ 	def get_all(self):
+-		ddict = {}
++		l = []
+ 		(rc, self.flist) = semanage_fcontext_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list file contexts"))
+@@ -1156,29 +1156,24 @@
+ 			ftype_str = semanage_fcontext_get_type_str(ftype)
+ 			con = semanage_fcontext_get_con(fcontext)
+ 			if con:
+-				ddict[expr, ftype_str] = (semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con))
++				l.append((expr, ftype_str, semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)))
+ 			else:
+-				ddict[expr, ftype_str] = con
++				l.append((expr, ftype_str, con))
+ 
+-		return ddict
++		return l
+ 			
+ 	def list(self, heading = 1):
+ 		if heading:
+ 			print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context")
+-		ddict = self.get_all()
+-		keys = ddict.keys()
+-		if is_mls_enabled:
+-			for k in keys:
+-				if ddict[k]:
+-					print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], ddict[k][0], ddict[k][1],ddict[k][2], translate(ddict[k][3],False))
+-				else:
+-					print "%-50s %-18s <<None>>" % (k[0], k[1])
+-		else:
+-			for k in keys:
+-				if ddict[k]:
+-					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], ddict[k][0], ddict[k][1],ddict[k][2])
++		fcon_list = self.get_all()
++		for fcon in fcon_list:
++			if len(fcon) > 3:
++				if is_mls_enabled:
++					print "%-50s %-18s %s:%s:%s:%s " % (fcon[0], fcon[1], fcon[2], fcon[3], fcon[4], translate(fcon[5],False))
+ 				else:
+-					print "%-50s %-18s <<None>>" % (k[0], k[1])
++					print "%-50s %-18s %s:%s:%s " % (fcon[0], fcon[1], fcon[2], fcon[3],fcon[4])
++			else:
++				print "%-50s %-18s <<None>>" % (fcon[0], fcon[1])
+ 				
+ class booleanRecords(semanageRecords):
+ 	def __init__(self):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- policycoreutils.spec	24 May 2006 03:36:11 -0000	1.248
+++ policycoreutils.spec	7 Jun 2006 15:06:19 -0000	1.249
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.10
-Release: 1.fc5
+Release: 2.fc5
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -110,6 +110,10 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.10-2.fc5
+- Fix genhomedircon to select shells correctly
+- Fix seobject.py to not sort the file_context file.
+
 * Tue May 24 2006 Dan Walsh <dwalsh at redhat.com> 1.30.10-1.fc5
 - Bump to build in FC5
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:09:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:09:31 -0400
Subject: rpms/sg3_utils/devel sg3_utils.spec,1.14,1.15
Message-ID: <200606071509.k57F9V9V020053@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20016

Modified Files:
	sg3_utils.spec 
Log Message:
- Added missing buildprereqs



Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sg3_utils.spec	7 Jun 2006 15:02:39 -0000	1.14
+++ sg3_utils.spec	7 Jun 2006 15:09:26 -0000	1.15
@@ -8,6 +8,7 @@
 Patch1: sg3_utils-1.20-llseek.patch
 Url: http://www.torque.net/sg/u_index.html
 Provides: sg_utils
+BuildPreReq: libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root/
 
 %description
@@ -80,6 +81,7 @@
 %changelog
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 1.20-2
 - Fixed rebuild problem on latest toolchain
+- Added missing buildprereqs
 
 * Fri May 19 2006 Phil Knirsch <pknirsch at redhat.com> - 1.20-1
 - Update to sg3_utils-1.20.



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:27:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:27:36 -0400
Subject: rpms/oprofile/devel oprofile.spec,1.40,1.41
Message-ID: <200606071527.k57FRao3008521@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8433

Modified Files:
	oprofile.spec 
Log Message:
Bump version and rebuild.




Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- oprofile.spec	13 May 2006 15:58:43 -0000	1.40
+++ oprofile.spec	7 Jun 2006 15:27:33 -0000	1.41
@@ -1,6 +1,6 @@
 %define DATE 200511111
 %define oprofile_version 0.9.1
-%define oprofile_release 9
+%define oprofile_release 10
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
@@ -235,7 +235,10 @@
 
 
 %changelog
-* Sat May 13 2006 Will Cohen <wcohen at redhat.com> - 0.9.1-8.1.1
+* Wed Jun 07 2006 Will Cohen <wcohen at redhat.com> - 0.9.1-10.1.1
+- Bump version and rebuild.
+
+* Sat May 13 2006 Will Cohen <wcohen at redhat.com> - 0.9.1-9.1.1
 - Add xenoprof patch.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-8.1.1



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:37:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:37:58 -0400
Subject: rpms/gdm/FC-5 gdm.spec,1.149,1.150
Message-ID: <200606071537.k57Fbw5P010190@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10102

Modified Files:
	gdm.spec 
Log Message:
- Add BuildRequires on xorg-x11-server-Xorg (bug 194295)



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- gdm.spec	6 Jun 2006 16:45:08 -0000	1.149
+++ gdm.spec	7 Jun 2006 15:37:56 -0000	1.150
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.14.4
-Release: 1.fc5.2
+Release: 1.fc5.3
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -84,8 +84,14 @@
 BuildRequires: gettext 
 BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: audit-libs-devel >= %{libauditver}
+
+%ifnarch s390 s390x ppc64
+BuildRequires: xorg-x11-server-Xorg
+%endif 
+
 BuildRequires: libtool intltool autoconf automake
 BuildRequires: gnome-doc-utils
+
 Requires: libselinux >= %{libselinuxver}
 Requires: audit-libs >= %{libauditver}
 
@@ -319,6 +325,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Jun  7 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.4-1.fc5.3
+- Add BuildRequires on xorg-x11-server-Xorg (bug 194295)
+
 * Mon Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-1.fc.2
 - Require system-logos, not fedora-logos
 - Add missing BuildRequires



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:41:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:41:24 -0400
Subject: rpms/spamassassin/devel spamassassin-3.1.3-serviceorder.patch, NONE,
	1.1 spamassassin.spec, 1.66, 1.67
Message-ID: <200606071541.k57FfO3r011011@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10967

Modified Files:
	spamassassin.spec 
Added Files:
	spamassassin-3.1.3-serviceorder.patch 
Log Message:
- start spamd before sendmail (#193818)
- require perl-Archive-Tar (#193100)


spamassassin-3.1.3-serviceorder.patch:
 redhat-rc-script.sh |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spamassassin-3.1.3-serviceorder.patch ---
diff -urN Mail-SpamAssassin-3.1.3.orig/spamd/redhat-rc-script.sh Mail-SpamAssassin-3.1.3/spamd/redhat-rc-script.sh
--- Mail-SpamAssassin-3.1.3.orig/spamd/redhat-rc-script.sh	2006-06-07 11:28:41.688103000 -0400
+++ Mail-SpamAssassin-3.1.3/spamd/redhat-rc-script.sh	2006-06-07 11:30:27.138546000 -0400
@@ -2,7 +2,7 @@
 #
 # spamassassin This script starts and stops the spamd daemon
 #
-# chkconfig: - 80 30
+# chkconfig: - 78 30
 # processname: spamd
 # description: spamd is a daemon process which uses SpamAssassin to check \
 #              email messages for SPAM.  It is normally called by spamc \


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- spamassassin.spec	5 Jun 2006 20:53:18 -0000	1.66
+++ spamassassin.spec	7 Jun 2006 15:41:21 -0000	1.67
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.3
-Release: 1.fc6
+Release: 2.fc6
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -20,6 +20,7 @@
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
 Patch123: spamassassin-3.1.1-nls-spamd-init.patch
+Patch124: spamassassin-3.1.3-serviceorder.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -35,6 +36,7 @@
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
+Requires: perl(Archive::Tar)
 Requires: procmail
 
 Obsoletes: perl-Mail-SpamAssassin
@@ -62,6 +64,7 @@
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
 %patch123 -p1
+%patch124 -p1
 # end of patches
 
 %build
@@ -154,6 +157,10 @@
 exit 0
 
 %changelog
+* Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-2
+- start spamd before sendmail (#193818)
+- require perl-Archive-Tar (#193100)
+
 * Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-1
 - CVE-2006-2447
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 15:51:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 11:51:41 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.272,1.273
Message-ID: <200606071551.k57FpfK1005680@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5667

Modified Files:
	eclipse.spec 
Log Message:
tweak %files for ppc


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- eclipse.spec	7 Jun 2006 13:02:44 -0000	1.272
+++ eclipse.spec	7 Jun 2006 15:51:38 -0000	1.273
@@ -1395,7 +1395,7 @@
 %{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
-%ifnarch ia64
+%ifarch %{ix86} x86_64
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem.linux*
 %endif
 %{_datadir}/%{name}/plugins/org.eclipse.core.jobs_*
@@ -1470,7 +1470,7 @@
 %{_datadir}/%{name}/buildscripts
 %{_libdir}/%{name}/eclipse
 %{_libdir}/%{name}/libupdate*
-%ifnarch ia64
+%ifarch %{ix86} x86_64
 %{_libdir}/%{name}/liblocalfile*
 %endif
 # This is all from our FileInitializer extraction of .sos



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:01:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:01:12 -0400
Subject: rpms/cups/FC-5 cups-str1736.patch,NONE,1.1 cups.spec,1.188,1.189
Message-ID: <200606071601.k57G1C9J005833@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5794

Modified Files:
	cups.spec 
Added Files:
	cups-str1736.patch 
Log Message:
* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com>
- Prevent 'too many open files' error (STR #1736, bug #194368).


cups-str1736.patch:
 client.c |   27 +++++++++--------
 job.c    |   99 +++++++++++++++++++++------------------------------------------
 2 files changed, 48 insertions(+), 78 deletions(-)

--- NEW FILE cups-str1736.patch ---
--- cups-1.2.1/scheduler/client.c.str1736	2006-06-07 15:58:40.000000000 +0100
+++ cups-1.2.1/scheduler/client.c	2006-06-07 16:59:06.000000000 +0100
@@ -1882,24 +1882,27 @@
 
 
   if (con->filename)
+  {
     fd = open(con->filename, O_RDONLY);
-  else
-    fd = open("/dev/null", O_RDONLY);
 
-  if (fd < 0)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
-                    con->http.fd, con->filename ? con->filename : "/dev/null",
-	            strerror(errno));
-    return (0);
-  }
+    if (fd < 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
+                      con->http.fd, con->filename ? con->filename : "/dev/null",
+	              strerror(errno));
+      return (0);
+    }
 
-  fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+    fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+  }
+  else
+    fd = -1;
 
   con->pipe_pid = pipe_command(con, fd, &(con->file), command, options, root);
 
-  close(fd);
+  if (fd >= 0)
+    close(fd);
 
   cupsdLogMessage(CUPSD_LOG_INFO, "Started \"%s\" (pid=%d)", command,
                   con->pipe_pid);
--- cups-1.2.1/scheduler/job.c.str1736	2006-06-07 15:58:40.000000000 +0100
+++ cups-1.2.1/scheduler/job.c	2006-06-07 16:59:06.000000000 +0100
@@ -3090,28 +3090,6 @@
   job->status = 0;
   memset(job->filters, 0, sizeof(job->filters));
 
-  filterfds[1][0] = open("/dev/null", O_RDONLY);
-
-  if (filterfds[1][0] < 0)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.",
-                    strerror(errno));
-    snprintf(printer->state_message, sizeof(printer->state_message),
-             "Unable to open \"/dev/null\" - %s.", strerror(errno));
-
-    cupsdAddPrinterHistory(printer);
-
-    cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
-                  "Job canceled because the server could not open /dev/null.");
-
-    goto abort_job;
-  }
-
-  fcntl(filterfds[1][0], F_SETFD, fcntl(filterfds[1][0], F_GETFD) | FD_CLOEXEC);
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: filterfds[%d] = [ %d %d ]",
-                  1, filterfds[1][0], filterfds[1][1]);
-
   for (i = 0, slot = 0, filter = (mime_filter_t *)cupsArrayFirst(filters);
        filter;
        i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
@@ -3189,36 +3167,43 @@
 	else
 	{
 	  job->print_pipes[0] = -1;
-	  if (!strncmp(printer->device_uri, "file:/dev/", 10) &&
-	      strcmp(printer->device_uri, "file:/dev/null"))
-	    job->print_pipes[1] = open(printer->device_uri + 5,
-	                               O_WRONLY | O_EXCL);
-	  else if (!strncmp(printer->device_uri, "file:///dev/", 12) &&
-	           strcmp(printer->device_uri, "file:///dev/null"))
-	    job->print_pipes[1] = open(printer->device_uri + 7,
-	                               O_WRONLY | O_EXCL);
+	  if (!strcmp(printer->device_uri, "file:/dev/null") ||
+	      !strcmp(printer->device_uri, "file:///dev/null"))
+	    job->print_pipes[1] = -1;
 	  else
-	    job->print_pipes[1] = open(printer->device_uri + 5,
-	                               O_WRONLY | O_CREAT | O_TRUNC, 0600);
-
-	  if (job->print_pipes[1] < 0)
 	  {
-            cupsdLogMessage(CUPSD_LOG_ERROR,
-	                    "Unable to open output file \"%s\" - %s.",
-	                    printer->device_uri, strerror(errno));
-            snprintf(printer->state_message, sizeof(printer->state_message),
-		     "Unable to open output file \"%s\" - %s.",
-	             printer->device_uri, strerror(errno));
+	    if (!strncmp(printer->device_uri, "file:/dev/", 10))
+	      job->print_pipes[1] = open(printer->device_uri + 5,
+	                        	 O_WRONLY | O_EXCL);
+	    else if (!strncmp(printer->device_uri, "file:///dev/", 12))
+	      job->print_pipes[1] = open(printer->device_uri + 7,
+	                        	 O_WRONLY | O_EXCL);
+	    else if (!strncmp(printer->device_uri, "file:///", 8))
+	      job->print_pipes[1] = open(printer->device_uri + 7,
+	                        	 O_WRONLY | O_CREAT | O_TRUNC, 0600);
+	    else
+	      job->print_pipes[1] = open(printer->device_uri + 5,
+	                        	 O_WRONLY | O_CREAT | O_TRUNC, 0600);
 
-	    cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
-                	  "Job canceled because the server could not open the "
-			  "output file.");
+	    if (job->print_pipes[1] < 0)
+	    {
+              cupsdLogMessage(CUPSD_LOG_ERROR,
+	                      "Unable to open output file \"%s\" - %s.",
+	                      printer->device_uri, strerror(errno));
+              snprintf(printer->state_message, sizeof(printer->state_message),
+		       "Unable to open output file \"%s\" - %s.",
+	               printer->device_uri, strerror(errno));
+
+	      cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
+                	    "Job canceled because the server could not open the "
+			    "output file.");
 
-            goto abort_job;
-	  }
+              goto abort_job;
+	    }
 
-	  fcntl(job->print_pipes[1], F_SETFD,
-        	fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC);
+	    fcntl(job->print_pipes[1], F_SETFD,
+        	  fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC);
+          }
 	}
 
 	cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -3320,25 +3305,7 @@
       argv[0] = sani_uri;
 
       filterfds[slot][0] = -1;
-      filterfds[slot][1] = open("/dev/null", O_WRONLY);
-
-      if (filterfds[slot][1] < 0)
-      {
-	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.",
-	                strerror(errno));
-	snprintf(printer->state_message, sizeof(printer->state_message),
-        	 "Unable to open \"/dev/null\" - %s.", strerror(errno));
-
-	cupsdAddPrinterHistory(printer);
-
-	cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
-                      "Job canceled because the server could not open a file.");
-
-        goto abort_job;
-      }
-
-      fcntl(filterfds[slot][1], F_SETFD,
-            fcntl(filterfds[slot][1], F_GETFD) | FD_CLOEXEC);
+      filterfds[slot][1] = -1;
 
       cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: backend=\"%s\"",
                       command);


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- cups.spec	7 Jun 2006 14:52:22 -0000	1.188
+++ cups.spec	7 Jun 2006 16:01:10 -0000	1.189
@@ -41,6 +41,7 @@
 Patch18: cups-language.patch
 Patch19: cups-str1758.patch
 Patch20: cups-direct-usb.patch
+Patch21: cups-str1736.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -143,6 +144,7 @@
 %patch18 -p1 -b .language
 %patch19 -p1 -b .str1758
 %patch20 -p1 -b .direct-usb
+%patch21 -p1 -b .str1736
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -411,6 +413,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com>
+- Prevent 'too many open files' error (STR #1736, bug #194368).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.6
 - Fix 'Allow from @IF(...)' (STR #1758, bug #187703).
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:02:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:02:29 -0400
Subject: rpms/cups/FC-5 cups.spec,1.189,1.190
Message-ID: <200606071602.k57G2T0s005870@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5859

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-1.7


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- cups.spec	7 Jun 2006 16:01:10 -0000	1.189
+++ cups.spec	7 Jun 2006 16:02:26 -0000	1.190
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.6
+Release: 1.7
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -413,7 +413,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.7
 - Prevent 'too many open files' error (STR #1736, bug #194368).
 
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.6



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:04:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:04:04 -0400
Subject: rpms/cups/devel cups-str1736.patch,NONE,1.1 cups.spec,1.213,1.214
Message-ID: <200606071604.k57G44Wu005940@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5920

Modified Files:
	cups.spec 
Added Files:
	cups-str1736.patch 
Log Message:
* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-9
- Prevent 'too many open files' error (STR #1736, bug #194368).


cups-str1736.patch:
 client.c |   27 +++++++++--------
 job.c    |   99 +++++++++++++++++++++------------------------------------------
 2 files changed, 48 insertions(+), 78 deletions(-)

--- NEW FILE cups-str1736.patch ---
--- cups-1.2.1/scheduler/client.c.str1736	2006-06-07 15:58:40.000000000 +0100
+++ cups-1.2.1/scheduler/client.c	2006-06-07 16:59:06.000000000 +0100
@@ -1882,24 +1882,27 @@
 
 
   if (con->filename)
+  {
     fd = open(con->filename, O_RDONLY);
-  else
-    fd = open("/dev/null", O_RDONLY);
 
-  if (fd < 0)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
-                    con->http.fd, con->filename ? con->filename : "/dev/null",
-	            strerror(errno));
-    return (0);
-  }
+    if (fd < 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
+                      con->http.fd, con->filename ? con->filename : "/dev/null",
+	              strerror(errno));
+      return (0);
+    }
 
-  fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+    fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+  }
+  else
+    fd = -1;
 
   con->pipe_pid = pipe_command(con, fd, &(con->file), command, options, root);
 
-  close(fd);
+  if (fd >= 0)
+    close(fd);
 
   cupsdLogMessage(CUPSD_LOG_INFO, "Started \"%s\" (pid=%d)", command,
                   con->pipe_pid);
--- cups-1.2.1/scheduler/job.c.str1736	2006-06-07 15:58:40.000000000 +0100
+++ cups-1.2.1/scheduler/job.c	2006-06-07 16:59:06.000000000 +0100
@@ -3090,28 +3090,6 @@
   job->status = 0;
   memset(job->filters, 0, sizeof(job->filters));
 
-  filterfds[1][0] = open("/dev/null", O_RDONLY);
-
-  if (filterfds[1][0] < 0)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.",
-                    strerror(errno));
-    snprintf(printer->state_message, sizeof(printer->state_message),
-             "Unable to open \"/dev/null\" - %s.", strerror(errno));
-
-    cupsdAddPrinterHistory(printer);
-
-    cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
-                  "Job canceled because the server could not open /dev/null.");
-
-    goto abort_job;
-  }
-
-  fcntl(filterfds[1][0], F_SETFD, fcntl(filterfds[1][0], F_GETFD) | FD_CLOEXEC);
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: filterfds[%d] = [ %d %d ]",
-                  1, filterfds[1][0], filterfds[1][1]);
-
   for (i = 0, slot = 0, filter = (mime_filter_t *)cupsArrayFirst(filters);
        filter;
        i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
@@ -3189,36 +3167,43 @@
 	else
 	{
 	  job->print_pipes[0] = -1;
-	  if (!strncmp(printer->device_uri, "file:/dev/", 10) &&
-	      strcmp(printer->device_uri, "file:/dev/null"))
-	    job->print_pipes[1] = open(printer->device_uri + 5,
-	                               O_WRONLY | O_EXCL);
-	  else if (!strncmp(printer->device_uri, "file:///dev/", 12) &&
-	           strcmp(printer->device_uri, "file:///dev/null"))
-	    job->print_pipes[1] = open(printer->device_uri + 7,
-	                               O_WRONLY | O_EXCL);
+	  if (!strcmp(printer->device_uri, "file:/dev/null") ||
+	      !strcmp(printer->device_uri, "file:///dev/null"))
+	    job->print_pipes[1] = -1;
 	  else
-	    job->print_pipes[1] = open(printer->device_uri + 5,
-	                               O_WRONLY | O_CREAT | O_TRUNC, 0600);
-
-	  if (job->print_pipes[1] < 0)
 	  {
-            cupsdLogMessage(CUPSD_LOG_ERROR,
-	                    "Unable to open output file \"%s\" - %s.",
-	                    printer->device_uri, strerror(errno));
-            snprintf(printer->state_message, sizeof(printer->state_message),
-		     "Unable to open output file \"%s\" - %s.",
-	             printer->device_uri, strerror(errno));
+	    if (!strncmp(printer->device_uri, "file:/dev/", 10))
+	      job->print_pipes[1] = open(printer->device_uri + 5,
+	                        	 O_WRONLY | O_EXCL);
+	    else if (!strncmp(printer->device_uri, "file:///dev/", 12))
+	      job->print_pipes[1] = open(printer->device_uri + 7,
+	                        	 O_WRONLY | O_EXCL);
+	    else if (!strncmp(printer->device_uri, "file:///", 8))
+	      job->print_pipes[1] = open(printer->device_uri + 7,
+	                        	 O_WRONLY | O_CREAT | O_TRUNC, 0600);
+	    else
+	      job->print_pipes[1] = open(printer->device_uri + 5,
+	                        	 O_WRONLY | O_CREAT | O_TRUNC, 0600);
 
-	    cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
-                	  "Job canceled because the server could not open the "
-			  "output file.");
+	    if (job->print_pipes[1] < 0)
+	    {
+              cupsdLogMessage(CUPSD_LOG_ERROR,
+	                      "Unable to open output file \"%s\" - %s.",
+	                      printer->device_uri, strerror(errno));
+              snprintf(printer->state_message, sizeof(printer->state_message),
+		       "Unable to open output file \"%s\" - %s.",
+	               printer->device_uri, strerror(errno));
+
+	      cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
+                	    "Job canceled because the server could not open the "
+			    "output file.");
 
-            goto abort_job;
-	  }
+              goto abort_job;
+	    }
 
-	  fcntl(job->print_pipes[1], F_SETFD,
-        	fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC);
+	    fcntl(job->print_pipes[1], F_SETFD,
+        	  fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC);
+          }
 	}
 
 	cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -3320,25 +3305,7 @@
       argv[0] = sani_uri;
 
       filterfds[slot][0] = -1;
-      filterfds[slot][1] = open("/dev/null", O_WRONLY);
-
-      if (filterfds[slot][1] < 0)
-      {
-	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.",
-	                strerror(errno));
-	snprintf(printer->state_message, sizeof(printer->state_message),
-        	 "Unable to open \"/dev/null\" - %s.", strerror(errno));
-
-	cupsdAddPrinterHistory(printer);
-
-	cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
-                      "Job canceled because the server could not open a file.");
-
-        goto abort_job;
-      }
-
-      fcntl(filterfds[slot][1], F_SETFD,
-            fcntl(filterfds[slot][1], F_GETFD) | FD_CLOEXEC);
+      filterfds[slot][1] = -1;
 
       cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: backend=\"%s\"",
                       command);


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- cups.spec	7 Jun 2006 14:56:59 -0000	1.213
+++ cups.spec	7 Jun 2006 16:04:02 -0000	1.214
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -33,6 +33,7 @@
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
 Patch13: cups-str1758.patch
+Patch14: cups-str1736.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -125,6 +126,7 @@
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .str1758
+%patch14 -p1 -b .str1736
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -387,6 +389,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-9
+- Prevent 'too many open files' error (STR #1736, bug #194368).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-8
 - Fix 'Allow from @IF(...)' (STR #1758, bug #187703).
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:04:55 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.127,1.128
Message-ID: <200606071604.k57G4tp4006004@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5991

Modified Files:
	gnome-panel.spec 
Log Message:
more build reqs



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gnome-panel.spec	7 Jun 2006 12:32:04 -0000	1.127
+++ gnome-panel.spec	7 Jun 2006 16:04:53 -0000	1.128
@@ -64,6 +64,7 @@
 BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib >= %{dbus_version}
 %endif
 Requires(post): GConf2
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:10:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:10:48 -0400
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.3,1.4
Message-ID: <200606071610.k57GAmfK016674@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/perl-XML-Simple/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16606

Modified Files:
	perl-XML-Simple.spec 
Log Message:
Add Requires



Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-XML-Simple.spec	3 Feb 2006 22:16:01 -0000	1.3
+++ perl-XML-Simple.spec	7 Jun 2006 16:10:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-XML-Simple
 Version:        2.14
-Release:        2%{?dist}.1
+Release:        2%{?dist}.2
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
@@ -14,6 +14,7 @@
 #BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
 BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  perl(XML::Parser)
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
 BuildConflicts: perl(XML::SAX::ExpatXS)
@@ -58,6 +59,9 @@
 
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14-2.2
+- Require perl-XML-Parser (#193985)
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.14-2.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:36:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:36:58 -0400
Subject: rpms/xfig/FC-5 xfig.3.2.4-xaw3d.patch,NONE,1.1 xfig.spec,1.34,1.35
Message-ID: <200606071636.k57Gawsn006113@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6079

Modified Files:
	xfig.spec 
Added Files:
	xfig.3.2.4-xaw3d.patch 
Log Message:

- fix #191816, Xaw3d build problem
- fix #169330, wrong docdir
- fix #194013, #187902, no parameter negotiation for xfig



xfig.3.2.4-xaw3d.patch:
 SimpleMenu.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xfig.3.2.4-xaw3d.patch ---
--- xfig.3.2.4/SimpleMenu.c.tn	2006-05-16 17:52:48.000000000 +0200
+++ xfig.3.2.4/SimpleMenu.c	2006-05-16 17:56:46.000000000 +0200
@@ -39,10 +39,17 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 
+#ifdef XAW3D
 #include <X11/Xaw3d/XawInit.h>
 #include <X11/Xaw3d/SimpleMenP.h>
 #include <X11/Xaw3d/SmeBSB.h>
 #include <X11/Xaw3d/Cardinals.h>
+#else
+#include <X11/Xaw/XawInit.h>
+#include <X11/Xaw/SimpleMenP.h>
+#include <X11/Xaw/SmeBSB.h>
+#include <X11/Xaw/Cardinals.h>
+#endif
 
 #include <X11/Xmu/Initer.h>
 #include <X11/Xmu/CharSet.h>


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/FC-5/xfig.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xfig.spec	11 Feb 2006 06:11:23 -0000	1.34
+++ xfig.spec	7 Jun 2006 16:36:51 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 17.2
+Release: 17.3.fc5
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -19,6 +19,7 @@
 Patch5: xfig.3.2.4-buffer.patch
 Patch6: xfig.3.2.4-xpm.patch
 Patch7: xfig.3.2.4-modularX.patch
+Patch8: xfig.3.2.4-xaw3d.patch
 
 Requires: transfig >= 1:3.2.4-12
 Requires: xpdf
@@ -61,45 +62,37 @@
 %patch5 -p1 -b .buffer
 %patch6 -p1 -b .xpm
 %patch7 -p1 -b .modularX
+%patch9 -p1 -b .xaw3d
 
 %build
 xmkmf
 ln -nfs Doc/xfig.man xfig.man
-make DOCDIR=%{_docdir}
+make XFIGDOCDIR=%{_docdir}/%{name}-%{version}
 
 %install
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} \
-     DOCDIR=%{_docdir} \
+     XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
      XAPPLOADDIR=%{app_defaults_dir} \
      CONFDIR=%{_datadir}/X11 \
      install install.all
 
-mkdir -p %{buildroot}/usr/share/pixmaps \
+mkdir -p %{buildroot}%{_datadir}/pixmaps \
          %{buildroot}%{_datadir}/applications
 
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/net-xfig.desktop
 
-rm -fr $RPM_BUILD_ROOT%{_prefix}/lib*
-
-mv $RPM_BUILD_ROOT%{_bindir}/xfig %{buildroot}%{_bindir}/xfig.bin
-cat > %{buildroot}%{_bindir}/%{name} <<EOF
-#! /bin/sh
-export XAPPLRESDIR=%{app_defaults_dir}
-export LANG=\${LANG%.UTF-8}
-exec %{_bindir}/%{name}.bin
-EOF
+rm -fr %{buildroot}%{_prefix}/lib*
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf {buildroot}
 
 %files
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
-%attr(0755,root,root) %{_bindir}/xfig
-%{_bindir}/xfig.bin
+%doc %{_docdir}/%{name}-%{version}
+%attr(0755,root,root) %{_bindir}/*
 %{_datadir}/%{name}/*
 %{_mandir}/*/*
 %{_datadir}/pixmaps/%{name}.png
@@ -107,6 +100,11 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jun 07 2006 Than Ngo <than at redhat.com> 3.2.4-17.3.fc5
+- fix #191816, Xaw3d build problem
+- fix #169330, wrong docdir
+- fix #194013, #187902, no parameter negotiation for xfig
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-17.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:47:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:47:18 -0400
Subject: rpms/xfig/FC-5 xfig.spec,1.35,1.36
Message-ID: <200606071647.k57GlIdi023978@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23895

Modified Files:
	xfig.spec 
Log Message:
typo



Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/FC-5/xfig.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xfig.spec	7 Jun 2006 16:36:51 -0000	1.35
+++ xfig.spec	7 Jun 2006 16:47:15 -0000	1.36
@@ -62,7 +62,7 @@
 %patch5 -p1 -b .buffer
 %patch6 -p1 -b .xpm
 %patch7 -p1 -b .modularX
-%patch9 -p1 -b .xaw3d
+%patch8 -p1 -b .xaw3d
 
 %build
 xmkmf



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:52:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:52:49 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.128,1.129
Message-ID: <200606071652.k57Gqn9C026275@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26192

Modified Files:
	gnome-panel.spec 
Log Message:
autoconf



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gnome-panel.spec	7 Jun 2006 16:04:53 -0000	1.128
+++ gnome-panel.spec	7 Jun 2006 16:52:46 -0000	1.129
@@ -44,6 +44,7 @@
 
 BuildRequires: which
 BuildRequires: automake
+BuildRequires: autoconf
 BuildRequires: libxml2-python
 BuildRequires: intltool
 BuildRequires: scrollkeeper
@@ -119,6 +120,8 @@
 done
 
 %build
+aclocal-1.9
+autoconf
 automake-1.9
 %configure \
    --disable-gtk-doc \



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:58:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:58:54 -0400
Subject: rpms/planner/FC-5 planner.spec,1.22,1.23
Message-ID: <200606071658.k57Gwskn028768@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/planner/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28741

Modified Files:
	planner.spec 
Log Message:
bump for new EDS


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/FC-5/planner.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- planner.spec	11 Feb 2006 05:10:42 -0000	1.22
+++ planner.spec	7 Jun 2006 16:58:52 -0000	1.23
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release:   4.1
+Release:   4.2
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -213,6 +213,9 @@
 # Changelog
 ##################################
 %changelog
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.2
+- Rebuild for new eds
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 16:59:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 12:59:22 -0400
Subject: rpms/squirrelmail/devel squirrelmail-1.4.6-CVE-2006-2842.patch, NONE,
	1.1 squirrelmail.spec, 1.35, 1.36
Message-ID: <200606071659.k57GxMAA028993@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28957

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.6-CVE-2006-2842.patch 
Log Message:
CVE-2006-2842 File Inclusion Vulnerability


squirrelmail-1.4.6-CVE-2006-2842.patch:
 global.php |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-CVE-2006-2842.patch ---
diff -urN squirrelmail-1.4.6.orig/functions/global.php squirrelmail-1.4.6/functions/global.php
--- squirrelmail-1.4.6.orig/functions/global.php	2006-02-03 17:27:47.000000000 -0500
+++ squirrelmail-1.4.6/functions/global.php	2006-06-07 11:59:19.000000000 -0400
@@ -62,6 +62,47 @@
     sqstripslashes($_POST);
 }
 
+/**
+ * If register_globals are on, unregister globals.
+ * Code requires PHP 4.1.0 or newer.
+ * Second test covers boolean set as string (php_value register_globals off).
+ */
+if ((bool) @ini_get('register_globals') &&
+    strtolower(ini_get('register_globals'))!='off') {
+    /**
+     * Remove all globals from $_GET, $_POST, and $_COOKIE.
+     */
+    foreach ($_REQUEST as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+    /**
+     * Remove globalized $_FILES variables
+     * Before 4.3.0 $_FILES are included in $_REQUEST.
+     * Unglobalize them in separate call in order to remove dependency
+     * on PHP version.
+     */
+    foreach ($_FILES as $key => $value) {
+        unset($GLOBALS[$key]);
+        // there are three undocumented $_FILES globals.
+        unset($GLOBALS[$key.'_type']);
+        unset($GLOBALS[$key.'_name']);
+        unset($GLOBALS[$key.'_size']);
+    }
+    /**
+     * Remove globalized environment variables.
+     */
+    foreach ($_ENV as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+    /**
+     * Remove globalized server variables.
+     */
+    foreach ($_SERVER as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+}
+
+
 /* strip any tags added to the url from PHP_SELF.
    This fixes hand crafted url XXS expoits for any
    page that uses PHP_SELF as the FORM action */
@@ -336,4 +377,4 @@
 }
 
 // vim: et ts=4
-?>
\ No newline at end of file
+?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- squirrelmail.spec	6 Jun 2006 02:14:36 -0000	1.35
+++ squirrelmail.spec	7 Jun 2006 16:59:20 -0000	1.36
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 6.fc6
+Release: 7.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,8 +16,10 @@
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
+Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+BuildRequires: gettext
 Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell
 Requires: /usr/sbin/sendmail
 Prereq: httpd, perl
@@ -35,6 +37,7 @@
 %prep
 #%setup -q
 %setup -q -n squirrelmail-%{version}
+%patch0 -p1
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
@@ -230,6 +233,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-7
+- CVE-2006-2842 File Inclusion Vulnerability
+
 * Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> 1.4.6-6
 - buildreq gettext (194169)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:05:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:05:14 -0400
Subject: rpms/squirrelmail/FC-5 squirrelmail-1.4.6-CVE-2006-2842.patch, NONE,
	1.1 squirrelmail.spec, 1.34, 1.35
Message-ID: <200606071705.k57H5EaC029602@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29562

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.6-CVE-2006-2842.patch 
Log Message:
- CVE-2006-2842 File Inclusion Vulnerability

* Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> 1.4.6-6
- buildreq gettext (194169)


squirrelmail-1.4.6-CVE-2006-2842.patch:
 global.php |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-CVE-2006-2842.patch ---
diff -urN squirrelmail-1.4.6.orig/functions/global.php squirrelmail-1.4.6/functions/global.php
--- squirrelmail-1.4.6.orig/functions/global.php	2006-02-03 17:27:47.000000000 -0500
+++ squirrelmail-1.4.6/functions/global.php	2006-06-07 11:59:19.000000000 -0400
@@ -62,6 +62,47 @@
     sqstripslashes($_POST);
 }
 
+/**
+ * If register_globals are on, unregister globals.
+ * Code requires PHP 4.1.0 or newer.
+ * Second test covers boolean set as string (php_value register_globals off).
+ */
+if ((bool) @ini_get('register_globals') &&
+    strtolower(ini_get('register_globals'))!='off') {
+    /**
+     * Remove all globals from $_GET, $_POST, and $_COOKIE.
+     */
+    foreach ($_REQUEST as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+    /**
+     * Remove globalized $_FILES variables
+     * Before 4.3.0 $_FILES are included in $_REQUEST.
+     * Unglobalize them in separate call in order to remove dependency
+     * on PHP version.
+     */
+    foreach ($_FILES as $key => $value) {
+        unset($GLOBALS[$key]);
+        // there are three undocumented $_FILES globals.
+        unset($GLOBALS[$key.'_type']);
+        unset($GLOBALS[$key.'_name']);
+        unset($GLOBALS[$key.'_size']);
+    }
+    /**
+     * Remove globalized environment variables.
+     */
+    foreach ($_ENV as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+    /**
+     * Remove globalized server variables.
+     */
+    foreach ($_SERVER as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+}
+
+
 /* strip any tags added to the url from PHP_SELF.
    This fixes hand crafted url XXS expoits for any
    page that uses PHP_SELF as the FORM action */
@@ -336,4 +377,4 @@
 }
 
 // vim: et ts=4
-?>
\ No newline at end of file
+?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- squirrelmail.spec	11 Apr 2006 20:52:32 -0000	1.34
+++ squirrelmail.spec	7 Jun 2006 17:04:58 -0000	1.35
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 5.fc5
+Release: 7.fc5
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,8 +16,10 @@
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
+Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+BuildRequires: gettext
 Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell
 Requires: /usr/sbin/sendmail
 Prereq: httpd, perl
@@ -35,6 +37,7 @@
 %prep
 #%setup -q
 %setup -q -n squirrelmail-%{version}
+%patch0 -p1
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
@@ -230,6 +233,12 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-7
+- CVE-2006-2842 File Inclusion Vulnerability
+
+* Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> 1.4.6-6
+- buildreq gettext (194169)
+
 * Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
 - Fix Chinese and Korean too
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:11:30 -0400
Subject: rpms/xfig/FC-5 xfig.spec,1.36,1.37
Message-ID: <200606071711.k57HBRMM030305@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30211

Modified Files:
	xfig.spec 
Log Message:
add BR on libXp-devel




Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/FC-5/xfig.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xfig.spec	7 Jun 2006 16:47:15 -0000	1.36
+++ xfig.spec	7 Jun 2006 17:11:24 -0000	1.37
@@ -39,6 +39,7 @@
 BuildPrereq: libXmu-devel
 BuildPrereq: libXpm-devel
 BuildPrereq: libXt-devel
+BuildPrereq: libXp-devel
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -104,6 +105,7 @@
 - fix #191816, Xaw3d build problem
 - fix #169330, wrong docdir
 - fix #194013, #187902, no parameter negotiation for xfig
+- add BR on libXp-devel
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-17.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:15:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:15:44 -0400
Subject: rpms/squirrelmail/FC-4 squirrelmail-1.4.6-CVE-2006-2842.patch, NONE,
	1.1 squirrelmail.spec, 1.25, 1.26
Message-ID: <200606071715.k57HFimQ000510@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31774

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.6-CVE-2006-2842.patch 
Log Message:
- CVE-2006-2842 File Inclusion Vulnerability
- buildreq gettext (194169)


squirrelmail-1.4.6-CVE-2006-2842.patch:
 global.php |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-CVE-2006-2842.patch ---
diff -urN squirrelmail-1.4.6.orig/functions/global.php squirrelmail-1.4.6/functions/global.php
--- squirrelmail-1.4.6.orig/functions/global.php	2006-02-03 17:27:47.000000000 -0500
+++ squirrelmail-1.4.6/functions/global.php	2006-06-07 11:59:19.000000000 -0400
@@ -62,6 +62,47 @@
     sqstripslashes($_POST);
 }
 
+/**
+ * If register_globals are on, unregister globals.
+ * Code requires PHP 4.1.0 or newer.
+ * Second test covers boolean set as string (php_value register_globals off).
+ */
+if ((bool) @ini_get('register_globals') &&
+    strtolower(ini_get('register_globals'))!='off') {
+    /**
+     * Remove all globals from $_GET, $_POST, and $_COOKIE.
+     */
+    foreach ($_REQUEST as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+    /**
+     * Remove globalized $_FILES variables
+     * Before 4.3.0 $_FILES are included in $_REQUEST.
+     * Unglobalize them in separate call in order to remove dependency
+     * on PHP version.
+     */
+    foreach ($_FILES as $key => $value) {
+        unset($GLOBALS[$key]);
+        // there are three undocumented $_FILES globals.
+        unset($GLOBALS[$key.'_type']);
+        unset($GLOBALS[$key.'_name']);
+        unset($GLOBALS[$key.'_size']);
+    }
+    /**
+     * Remove globalized environment variables.
+     */
+    foreach ($_ENV as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+    /**
+     * Remove globalized server variables.
+     */
+    foreach ($_SERVER as $key => $value) {
+        unset($GLOBALS[$key]);
+    }
+}
+
+
 /* strip any tags added to the url from PHP_SELF.
    This fixes hand crafted url XXS expoits for any
    page that uses PHP_SELF as the FORM action */
@@ -336,4 +377,4 @@
 }
 
 // vim: et ts=4
-?>
\ No newline at end of file
+?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- squirrelmail.spec	11 Apr 2006 20:53:17 -0000	1.25
+++ squirrelmail.spec	7 Jun 2006 17:15:42 -0000	1.26
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 5.fc4
+Release: 7.fc4
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,8 +16,10 @@
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
+Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+BuildRequires: gettext
 Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell
 Requires: /usr/sbin/sendmail
 Prereq: httpd, perl
@@ -35,6 +37,7 @@
 %prep
 #%setup -q
 %setup -q -n squirrelmail-%{version}
+%patch0 -p1
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
@@ -230,6 +233,12 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-7
+- CVE-2006-2842 File Inclusion Vulnerability
+
+* Mon Jun 05 2006 Warren Togami <wtogami at redhat.com> 1.4.6-6
+- buildreq gettext (194169)
+
 * Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
 - Fix Chinese and Korean too
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:17:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:17:24 -0400
Subject: rpms/openldap/devel .cvsignore, 1.23, 1.24 openldap.spec, 1.55,
	1.56 sources, 1.24, 1.25
Message-ID: <200606071717.k57HHObd014711@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12991

Modified Files:
	.cvsignore openldap.spec sources 
Log Message:
2.3.24 is now stable.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	27 Apr 2006 20:28:17 -0000	1.23
+++ .cvsignore	7 Jun 2006 17:17:21 -0000	1.24
@@ -4,4 +4,4 @@
 db-4.4.20.tar.gz
 autoconf-2.13.1.tar.gz
 automake-1.4a.tar.gz
-openldap-2.3.21.tgz
+openldap-2.3.24.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- openldap.spec	27 Apr 2006 20:28:17 -0000	1.55
+++ openldap.spec	7 Jun 2006 17:17:21 -0000	1.56
@@ -2,7 +2,7 @@
 %define db_version 4.4.20
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.21
+%define version_23 2.3.24
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -689,6 +689,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Jun 7 2006 Jay Fenlason <fenlason at redhat.com> 2.3.24-2
+- New upstream version
+
 * Thu Apr 27 2006 Jay Fenlason <fenlason at redhat.com> 2.3.21-2
 - Upgrade to 2.3.21
 - Add two upstream patches for db-4.4.20


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	27 Apr 2006 20:28:17 -0000	1.24
+++ sources	7 Jun 2006 17:17:21 -0000	1.25
@@ -3,4 +3,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 dc80548f76d6aeba2b51b15751e08b21  MigrationTools-46.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
-37ef142fc05abd088a4bb2d30dc4c679  openldap-2.3.21.tgz
+3e58de30abc959ec88730123cecdb6d1  openldap-2.3.24.tgz



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:18:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:18:41 -0400
Subject: rpms/libXau/devel libXau.spec,1.12,1.13
Message-ID: <200606071718.k57HIfhq015282@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15246

Modified Files:
	libXau.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Remove package ownership of mandir/libdir/etc.
- Added "BuildRequires: xorg-x11-proto-devel" needed by xau.pc



Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXau.spec	6 Jun 2006 00:41:35 -0000	1.12
+++ libXau.spec	7 Jun 2006 17:18:39 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -19,8 +19,11 @@
 %package devel
 Summary: X.Org X11 libXau development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel needed by xau.pc
+BuildRequires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -42,8 +45,8 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -58,7 +61,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXau.so.6
 %{_libdir}/libXau.so.6.0.0
 
@@ -70,21 +72,15 @@
 %{_libdir}/libXau.a
 %endif
 %{_libdir}/libXau.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xau.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
-%{_mandir}/man3/Xau.3x*
-%{_mandir}/man3/XauDisposeAuth.3x*
-%{_mandir}/man3/XauFileName.3x*
-%{_mandir}/man3/XauGetAuthByAddr.3x*
-%{_mandir}/man3/XauGetBestAuthByAddr.3x*
-%{_mandir}/man3/XauLockAuth.3x*
-%{_mandir}/man3/XauReadAuth.3x*
-%{_mandir}/man3/XauUnlockAuth.3x*
-%{_mandir}/man3/XauWriteAuth.3x*
+#%dir %{_mandir}/man3x
+%{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Remove package ownership of mandir/libdir/etc.
+- Added "BuildRequires: xorg-x11-proto-devel" needed by xau.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193422)
 - Replace "makeinstall" with "make install DESTDIR=..." to fix (#192718)
@@ -92,10 +88,10 @@
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Bump to 1.0.1
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2
@@ -117,7 +113,6 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-
 * Fri Oct 21 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-1
 - Update to libXau-0.99.1 from X11R7 RC1 release.
 - Added manpages that were absent in X11R7 RC0, and updated the file lists



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:36:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:36:24 -0400
Subject: rpms/struts/devel struts.spec,1.30,1.31
Message-ID: <200606071736.k57HaOmF019865@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19833

Modified Files:
	struts.spec 
Log Message:

- Added missing BR/Req. for tomcat5-jsp-2.0-api.




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- struts.spec	8 Mar 2006 22:14:03 -0000	1.30
+++ struts.spec	7 Jun 2006 17:36:20 -0000	1.31
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.8
-%define release 	2jpp_10fc
+%define release 	2jpp_11fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -28,6 +28,7 @@
 Requires:	jakarta-commons-fileupload >= 0:1.0
 Requires:	jakarta-commons-validator >= 0:1.1.4
 Requires:	oro >= 0:2.0.7
+Requires:       tomcat5-jsp-2.0-api
 BuildRequires:	jpackage-utils >= 1.5
 BuildRequires:	ant >= 1.6.1
 BuildRequires:	antlr >= 2.7.2
@@ -43,6 +44,8 @@
 BuildRequires:  jakarta-commons-logging >= 0:1.0.4
 BuildRequires:  jakarta-commons-validator >= 0:1.1.4
 BuildRequires:  oro >= 0:2.0.7
+BuildRequires:  tomcat5-jsp-2.0-api
+
 Group:		Development/Java
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
 # RHEL4 and FC4
@@ -213,6 +216,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_11fc
+- Added missing BR/Req. for tomcat5-jsp-2.0-api.
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_10fc
 - excluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:39:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:39:19 -0400
Subject: rpms/system-config-bind/devel .cvsignore, 1.25, 1.26 sources, 1.42,
	1.43 system-config-bind.spec, 1.51, 1.52
Message-ID: <200606071739.k57HdJHZ020263@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20244

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
fix bug 194058


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	8 Mar 2006 22:06:04 -0000	1.25
+++ .cvsignore	7 Jun 2006 17:39:14 -0000	1.26
@@ -22,3 +22,4 @@
 system-config-bind-4.0.0-36_FC5.tar.gz
 system-config-bind-4.0.0-38_FC5.tar.gz
 system-config-bind-4.0.0-40_FC5.tar.gz
+system-config-bind-4.0.0-41_FC5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Mar 2006 22:06:04 -0000	1.42
+++ sources	7 Jun 2006 17:39:14 -0000	1.43
@@ -1 +1,2 @@
 10aa4862497593c55d74cbaff1f751d0  system-config-bind-4.0.0-40_FC5.tar.gz
+7a303188ef125e654fc1834642bee75f  system-config-bind-4.0.0-41_FC5.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- system-config-bind.spec	6 Jun 2006 02:41:34 -0000	1.51
+++ system-config-bind.spec	7 Jun 2006 17:39:14 -0000	1.52
@@ -1,14 +1,14 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	40_FC5
+Release: 	41_FC5
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
 Source0: 	%{name}-%{version}-%{release}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
-BuildRequires:  python, gettext, make, bind, intltool
+BuildRequires:  python, gettext, make, intltool
 Requires: 	python >= 2.2
 Requires: 	pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
 Requires: 	bind, bind-utils
@@ -91,6 +91,9 @@
 fi
 
 %changelog
+* Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-41
+- fix bug 194058: freeze / unfreeze dynamic zones when saving
+
 * Wed Mar 08 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-40
 - fix bug 184065: prompts to place slave / DDNS updateable zone
                   files in slaves/ 



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:46:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:46:03 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.15,1.16
Message-ID: <200606071746.k57Hk3W7026543@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26065

Modified Files:
	libXaw.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5
- Remove package ownership of mandir/libdir/etc.



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXaw.spec	6 Jun 2006 20:52:59 -0000	1.15
+++ libXaw.spec	7 Jun 2006 17:46:00 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 4
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +29,8 @@
 %package devel
 Summary: X.Org X11 libXaw development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 Requires: xorg-x11-proto-devel
 Requires: libXmu-devel
@@ -71,7 +71,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXaw.so.6
 %{_libdir}/libXaw.so.7
 %{_libdir}/libXaw6.so.6
@@ -93,15 +92,17 @@
 %endif
 %{_libdir}/libXaw6.so
 %{_libdir}/libXaw7.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xaw6.pc
 %{_libdir}/pkgconfig/xaw7.pc
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5
+- Remove package ownership of mandir/libdir/etc.
+
 * Tue Jun 06 2006 Bill Nottingham <notting at redhat.com> 1.0.2-4
 - Add "BuildRequires: ed" to fix library sonames
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:48:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:48:13 -0400
Subject: rpms/kdeaddons/devel kdeaddons-3.5.3-sdl.patch, NONE,
	1.1 kdeaddons.spec, 1.51, 1.52
Message-ID: <200606071748.k57HmDIo005872@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5534

Modified Files:
	kdeaddons.spec 
Added Files:
	kdeaddons-3.5.3-sdl.patch 
Log Message:
fix SDL build problem


kdeaddons-3.5.3-sdl.patch:
 tippercanoe/main.cpp    |    2 +-
 tippercanoe/sdlwrap.cpp |    2 ++
 tippercanoe/syna.h      |    2 +-
 tyler/main.cpp          |    4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdeaddons-3.5.3-sdl.patch ---
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than	2006-06-07 18:52:09.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp	2006-06-07 18:54:06.000000000 +0200
@@ -183,6 +183,7 @@
 	SDL_UpdateRect(surface, 0, 0, 0, 0);
 }
 
+#if 0
 int SdlScreen::winID(void)
 {
 	SDL_SysWMinfo info;
@@ -195,3 +196,4 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than	2006-06-07 18:54:19.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp	2006-06-07 18:54:27.000000000 +0200
@@ -112,7 +112,7 @@
 {
 	time_t timer = time(NULL);
 
-	printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
+	//printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
 	fflush(stdout);
 
 	int frames = 0;
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than	2006-06-07 18:51:25.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h	2006-06-07 18:51:56.000000000 +0200
@@ -108,7 +108,7 @@
 	int  sizeUpdate();
 	bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit);
 	void show();
-	int winID();
+	//int winID();
 };
 
 // core
--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than	2006-06-07 18:54:38.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp	2006-06-07 18:55:00.000000000 +0200
@@ -52,6 +52,7 @@
 SDL_Surface *screen;
 }
 
+#if 0
 int winID(void)
 {
 	SDL_SysWMinfo info;
@@ -61,6 +62,7 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
 
 int main(int, char **)
 {
@@ -74,7 +76,7 @@
 	access_mutex = SDL_CreateMutex();
 
 	init_renderer1();
-	printf("%u\n", winID());
+	//printf("%u\n", winID());
 	fflush(stdout);
 	init_renderer2();
 	thread = SDL_CreateThread((int (*)(void *))renderer, NULL);


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdeaddons.spec	6 Jun 2006 21:52:16 -0000	1.51
+++ kdeaddons.spec	7 Jun 2006 17:48:10 -0000	1.52
@@ -25,6 +25,7 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
+Patch3: kdeaddons-3.5.3-sdl.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -80,6 +81,7 @@
 %setup -q
 %patch1 -p1 -b .libtool
 %patch2 -p0 -b .rgb.txt-path
+%patch3 -p1 -b .sdl
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:54:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:54:36 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.17,1.18
Message-ID: <200606071754.k57HsaOG008537@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8427

Modified Files:
	libdhcp.spec 
Log Message:
fix bug 194377


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libdhcp.spec	30 May 2006 15:36:48 -0000	1.17
+++ libdhcp.spec	7 Jun 2006 17:54:33 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
 Version: 	1.2
-Release: 	1
+Release: 	2
 License: 	GPL
 Group: 		Development/Libraries
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
@@ -22,6 +22,7 @@
 Summary:	C header files for development with libdhcp.
 Group: 		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libdhcp4client-devel, libdhcp6client-devel, libnl-devel
 
 %description devel
 C header files for development with libdhcp.
@@ -74,6 +75,9 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 1.2-2
+- fix bug 194377: -devel package missing Require:s. 
+
 * Sun May 21 2006 Jason Vas Dias <jvdias at redhat.com> - 1.2-1
 - numerous improvements - stopped using libnl cache at all to
   fix memory leaks.



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:55:49 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.129,1.130
Message-ID: <200606071755.k57Htna2009049@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8996

Modified Files:
	gnome-panel.spec 
Log Message:
grr



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-panel.spec	7 Jun 2006 16:52:46 -0000	1.129
+++ gnome-panel.spec	7 Jun 2006 17:55:46 -0000	1.130
@@ -51,6 +51,7 @@
 BuildRequires: libxslt
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
+BuildRequires: gtk-doc
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel >= %{libglade2_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Wed Jun  7 17:58:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 13:58:17 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.14,1.15
Message-ID: <200606071758.k57HwHvN010015@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9978

Modified Files:
	libXcomposite.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 0.3-5
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel
  subpackage needed by xcomposite.pc
- Remove package ownership of mandir/libdir/etc.



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXcomposite.spec	10 Apr 2006 22:08:40 -0000	1.14
+++ libXcomposite.spec	7 Jun 2006 17:58:15 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3
-Release: 4
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libXcomposite development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+Requires: xorg-x11-proto-devel >= 7.0-10
+Requires: libXfixes-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -47,7 +50,7 @@
 %install
 
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,7 +64,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXcomposite.so.1
 %{_libdir}/libXcomposite.so.1.0.0
 
@@ -74,10 +76,15 @@
 %{_libdir}/libXcomposite.a
 %endif
 %{_libdir}/libXcomposite.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 0.3-5
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel
+  subpackage needed by xcomposite.pc
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 0.3-4
 - Bump for build in fc5-bling.
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 18:00:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 14:00:57 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.18,1.19
Message-ID: <200606071800.k57I0vo1010758@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10730

Modified Files:
	libdhcp.spec 
Log Message:
fix bug 194377


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libdhcp.spec	7 Jun 2006 17:54:33 -0000	1.18
+++ libdhcp.spec	7 Jun 2006 18:00:40 -0000	1.19
@@ -7,7 +7,7 @@
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
 Source0: 	%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  dhcp-devel, libdhcp4client-devel, libdhcp6client-devel, libnl-devel, pkgconfig
+BuildRequires:  dhcp-devel, libdhcp4client-devel, libdhcp6client-devel, libnl-devel, pkgconfig, doxygen
 
 %description
 libdhcp enables programs to invoke and control the



From fedora-cvs-commits at redhat.com  Wed Jun  7 18:04:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 14:04:33 -0400
Subject: rpms/tk/FC-5 tk-8.4.13-autoconf.patch, NONE, 1.1 sources, 1.9,
	1.10 tk.spec, 1.19, 1.20 tk-8.4-autoconf.patch, 1.1, NONE
Message-ID: <200606071804.k57I4X3F010999@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tk/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10973

Modified Files:
	sources tk.spec 
Added Files:
	tk-8.4.13-autoconf.patch 
Removed Files:
	tk-8.4-autoconf.patch 
Log Message:
- Upgraded to Tk 8.4.13 (#193853)


tk-8.4.13-autoconf.patch:
 tcl.m4 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tk-8.4.13-autoconf.patch ---
--- tk8.4.13/unix/tcl.m4.ac123	2006-04-20 14:53:21.000000000 -0400
+++ tk8.4.13/unix/tcl.m4	2006-04-20 14:54:35.000000000 -0400
@@ -1123,7 +1123,7 @@
 
 	    # AIX v<=4.1 has some different flags than 4.2+
 	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
-		LIBOBJS="$LIBOBJS tclLoadAix.o"
+		AC_LIBOBJ(tclLoadAix)
 		DL_LIBS="-lld"
 	    fi
 
@@ -1365,7 +1365,7 @@
 	    # is kind of overkill but it works.
 	    # Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
-	    if test x"${LIBOBJS}" != x ; then
+	    if test x"${LIB@&t at OBJS}" != x ; then
 	        CFLAGS="$CFLAGS -fno-inline"
 	    fi
 
@@ -2571,7 +2571,7 @@
 		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
 		    tcl_cv_strtod_buggy=buggy)])
 	if test "$tcl_cv_strtod_buggy" = buggy; then
-	    LIBOBJS="$LIBOBJS fixstrtod.o"
+	    AC_LIBOBJ(fixstrtod)
 	    AC_DEFINE(strtod, fixstrtod)
 	fi
     fi


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tk/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Feb 2006 18:10:20 -0000	1.9
+++ sources	7 Jun 2006 18:04:31 -0000	1.10
@@ -1 +1 @@
-316491cb82d898b434842353aed1f0d6  tk8.4.12-src.tar.gz
+0a16d4d9398e43cbb85784c85fb807a4  tk8.4.13-src.tar.gz


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/FC-5/tk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tk.spec	11 Feb 2006 05:52:13 -0000	1.19
+++ tk.spec	7 Jun 2006 18:04:31 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
-Version: %{majorver}.12
-Release: 1.2
+Version: %{majorver}.13
+Release: 1.1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -18,8 +18,7 @@
 Patch1: tk-8.3.5-tclm4-soname.patch
 Patch2: tk-8.4.4-lib-perm.patch
 Patch3: tk-8.4-no_rpath.patch
-Patch4: tk-8.4-autoconf.patch
-Patch5: tk-8.4.12-relid.patch
+Patch4: tk-8.4.13-autoconf.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -46,7 +45,6 @@
 %patch2 -p1 -b .2-rolib
 %patch3 -p1 -b .3-rpath
 %patch4 -p1 -b .4-ac213
-%patch5 -p1 -b .5-relid
 
 # patch1 touches tcl.m4
 cd unix
@@ -117,6 +115,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Wed Jun 07 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-1.1
+- Upgraded to Tk 8.4.13 (#193853)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-1.2
 - bump again for double-long bug on ppc(64)
 


--- tk-8.4-autoconf.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun  7 18:17:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 14:17:28 -0400
Subject: rpms/libXcursor/devel libXcursor.spec,1.11,1.12
Message-ID: <200606071817.k57IHSlr028323@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28289

Modified Files:
	libXcursor.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.6-2
- Added "BuildRequires: xorg-x11-proto-devel"
- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xcursor.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXcursor.spec	27 Apr 2006 19:39:37 -0000	1.11
+++ libXcursor.spec	7 Jun 2006 18:17:25 -0000	1.12
@@ -1,16 +1,18 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
 Version: 1.1.6
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 Source1: index.theme
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXrender-devel >= 0.8.2
@@ -23,8 +25,11 @@
 %package devel
 Summary: X.Org X11 libXcursor development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel os needed by xcursor.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,10 +49,11 @@
 	--disable-static
 %endif
 make
-%install
 
+%install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/default
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/icons/default/index.theme
@@ -64,7 +70,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXcursor.so.1
 %{_libdir}/libXcursor.so.1.0.2
 %dir %{_datadir}/icons
@@ -80,20 +85,24 @@
 %{_libdir}/libXcursor.a
 %endif
 %{_libdir}/libXcursor.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xcursor.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.6-2
+- Added "BuildRequires: xorg-x11-proto-devel"
+- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xcursor.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.6-1
 - Update to 1.1.6
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.5.2-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.1.5.2-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.5.2-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.1.5.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.1.5.2-2



From fedora-cvs-commits at redhat.com  Wed Jun  7 18:23:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 14:23:15 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.15,1.16
Message-ID: <200606071823.k57INFX3030582@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30514

Modified Files:
	xdoclet.spec 
Log Message:

- Add missing BR for ant-nodeps
- Other spec file cleanup




Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xdoclet.spec	6 Mar 2006 21:43:48 -0000	1.15
+++ xdoclet.spec	7 Jun 2006 18:23:12 -0000	1.16
@@ -9,7 +9,7 @@
 
 Name:		xdoclet
 Version:	1.2.2
-Release: 	2jpp_5fc
+Release: 	2jpp_6fc
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -26,8 +26,9 @@
 BuildArch:	noarch
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:  java-devel
-BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.5
+BuildRequires:  ant-nodeps >= 0:1.5
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  jrefactory
@@ -107,18 +108,33 @@
 tar xzf %{SOURCE1}
 popd
 
-for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis mockobjects-core; do
-	ln -s $(build-classpath $j) lib/$j.jar
-done
+build-jar-repository lib \
+		xjavadoc-1.1 \
+		jrefactory \
+		javacc \
+		junit \
+		bsf \
+		commons-collections \
+		commons-logging \
+		log4j \
+		velocity \
+		xalan-j2 \
+		xjavadoc \
+		xml-commons-apis \
+		mockobjects-core
 
 %if %{with_demo}
-for j in servletapi4 struts velocity webwork ejb jsf-api jms; do
-	ln -s $(build-classpath $j) samples/lib/$j.jar
-done
-for j in mx4j/mx4j-jmx mx4j/mx4j-tools; do
-        i=$(build-classpath $j)
-	ln -s $i samples/lib/$(basename $i)
-done
+    build-jar-repository samples/lib \
+		servletapi4 \
+		struts \
+		velocity \
+		webwork \
+		ejb \
+		jsf-api \
+		jms \
+		mx4j/mx4j-jmx \
+		mx4j/mx4j-tools
+
 %endif
 
 %patch0 -b .sav
@@ -129,6 +145,7 @@
 %patch5 -b .sav
 
 %build
+export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax"
 ant xjavadoc core modules docs l10n
 
 %if %{with_demo}
@@ -182,6 +199,10 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.2-2jpp_6fc
+- Add missing BR for ant-nodeps
+- Other spec file cleanup
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2.2-2jpp_5fc
 - fix scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 18:24:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 14:24:32 -0400
Subject: rpms/gphoto2/devel 90-gphoto-camera-policy.fdi, 1.3,
	1.4 gphoto2.spec, 1.65, 1.66
Message-ID: <200606071824.k57IOWYJ031164@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31108

Modified Files:
	90-gphoto-camera-policy.fdi gphoto2.spec 
Log Message:
 - fix policy file (#189936)


Index: 90-gphoto-camera-policy.fdi
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/90-gphoto-camera-policy.fdi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 90-gphoto-camera-policy.fdi	13 Nov 2005 18:31:01 -0000	1.3
+++ 90-gphoto-camera-policy.fdi	7 Jun 2006 18:24:30 -0000	1.4
@@ -4,7 +4,7 @@
 
   <device>
     <match key="info.capabilities" contains="camera">
-      <match key="camera.access_method" string="libgphoto2">
+      <match key="camera.access_method" string="proprietary">
         <append key="info.callouts.add" type="strlist">/usr/libexec/gphoto-set-procperm</append>
       </match>
       <match key="camera.access_method" string="ptp">


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gphoto2.spec	29 May 2006 11:39:43 -0000	1.65
+++ gphoto2.spec	7 Jun 2006 18:24:30 -0000	1.66
@@ -8,7 +8,7 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 13
+Release: 14
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -235,6 +235,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Wed Jun  7 2006 Radek Vok??l <rvokal at redhat.com> 2.1.99-14
+- fix policy file (#189936)
+
 * Mon May 29 2006 Radek Vokal <rvokal at redhat.com> 2.1.99-13
 - remove Canon IXUS 700 support (#167347)
 - add new USB ids



From fedora-cvs-commits at redhat.com  Wed Jun  7 19:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:18:23 -0400
Subject: rpms/control-center/devel control-center.spec,1.137,1.138
Message-ID: <200606071918.k57JINtF024163@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24135

Modified Files:
	control-center.spec 
Log Message:
* Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
- Add devel package.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- control-center.spec	30 May 2006 02:57:05 -0000	1.137
+++ control-center.spec	7 Jun 2006 19:18:20 -0000	1.138
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.14.2
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -41,7 +41,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
 
-Obsoletes: gnome control-center-devel fontilus
+Obsoletes: gnome fontilus
 # the background capplets expects its .xml files in 
 # a different place now
 Conflicts: desktop-backgrounds-basic < 2.0-27
@@ -96,6 +96,21 @@
 
 If you install GNOME, you need to install control-center.
 
+%package devel
+Summary: GNOME Control Center development libraries and header files
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+GNOME (the GNU Network Object Model Environment) is an attractive and
+easy-to-use GUI desktop environment. The control-center package
+provides the GNOME Control Center utilities that allow you to setup
+and configure your system's GNOME environment (things like the desktop
+background and theme, the screensaver, system sounds, and mouse
+behavior).
+
+This packages development files for GNOME Control Center.
+
 %prep
 %setup -q
 
@@ -169,10 +184,7 @@
 # fix installed but not packaged
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-/bin/rm -rf $RPM_BUILD_ROOT%{_includedir}/gnome-window-settings-2.0
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnome-window-settings.*a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnome-window-settings.so
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnome-window-settings*
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.a
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
 
@@ -230,10 +242,16 @@
 %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
 %{_libdir}/gnome-vfs-2.0/modules/*.so
 
-# deliberately leaving out pkgconfig files and devel libs for libgnome-window-settings
-# (also its headers)
+%files devel
+%defattr(-,root,root)
+%{_includedir}/gnome-window-settings-2.0
+%{_libdir}/libgnome-window-settings.so
+%{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
+- Add devel package.
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 19:37:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:37:33 -0400
Subject: rpms/system-config-bind/FC-5 .cvsignore, 1.25, 1.26 sources, 1.42,
	1.43 system-config-bind.spec, 1.50, 1.51
Message-ID: <200606071937.k57JbXVI029325@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29303

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
v4.0.0-41_FC5


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	8 Mar 2006 22:06:04 -0000	1.25
+++ .cvsignore	7 Jun 2006 19:37:30 -0000	1.26
@@ -22,3 +22,4 @@
 system-config-bind-4.0.0-36_FC5.tar.gz
 system-config-bind-4.0.0-38_FC5.tar.gz
 system-config-bind-4.0.0-40_FC5.tar.gz
+system-config-bind-4.0.0-41_FC5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Mar 2006 22:06:04 -0000	1.42
+++ sources	7 Jun 2006 19:37:30 -0000	1.43
@@ -1 +1,2 @@
 10aa4862497593c55d74cbaff1f751d0  system-config-bind-4.0.0-40_FC5.tar.gz
+7a303188ef125e654fc1834642bee75f  system-config-bind-4.0.0-41_FC5.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/system-config-bind.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-bind.spec	8 Mar 2006 22:06:04 -0000	1.50
+++ system-config-bind.spec	7 Jun 2006 19:37:30 -0000	1.51
@@ -1,14 +1,14 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	40_FC5
+Release: 	41_FC5
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
 Source0: 	%{name}-%{version}-%{release}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
-BuildRequires:  python, gettext, make, bind
+BuildRequires:  python, gettext, make, intltool
 Requires: 	python >= 2.2
 Requires: 	pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
 Requires: 	bind, bind-utils
@@ -91,6 +91,9 @@
 fi
 
 %changelog
+* Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-41
+- fix bug 194058: freeze / unfreeze dynamic zones when saving
+
 * Wed Mar 08 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-40
 - fix bug 184065: prompts to place slave / DDNS updateable zone
                   files in slaves/ 



From fedora-cvs-commits at redhat.com  Wed Jun  7 19:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:42:11 -0400
Subject: rpms/control-center/devel control-center.spec,1.138,1.139
Message-ID: <200606071942.k57JgAFQ029968@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29939

Modified Files:
	control-center.spec 
Log Message:
* Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
- Add devel package.
- Add build requires for autoconf and automake.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- control-center.spec	7 Jun 2006 19:18:20 -0000	1.138
+++ control-center.spec	7 Jun 2006 19:42:07 -0000	1.139
@@ -55,6 +55,7 @@
 PreReq:   gtk2
 Requires: usermode >= %{usermode_version}
 
+BuildRequires: autoconf automake
 BuildRequires: esound
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -251,6 +252,7 @@
 %changelog
 * Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
 - Add devel package.
+- Add build requires for autoconf and automake.
 
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2



From fedora-cvs-commits at redhat.com  Wed Jun  7 19:42:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:42:10 -0400
Subject: rpms/system-config-bind/devel .cvsignore, 1.26, 1.27 sources, 1.43,
	1.44 system-config-bind.spec, 1.52, 1.53
Message-ID: <200606071942.k57JgAUn029972@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29908

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
FC5->FC6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Jun 2006 17:39:14 -0000	1.26
+++ .cvsignore	7 Jun 2006 19:41:50 -0000	1.27
@@ -23,3 +23,4 @@
 system-config-bind-4.0.0-38_FC5.tar.gz
 system-config-bind-4.0.0-40_FC5.tar.gz
 system-config-bind-4.0.0-41_FC5.tar.gz
+system-config-bind-4.0.0-41_FC6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	7 Jun 2006 17:39:14 -0000	1.43
+++ sources	7 Jun 2006 19:41:51 -0000	1.44
@@ -1,2 +1 @@
-10aa4862497593c55d74cbaff1f751d0  system-config-bind-4.0.0-40_FC5.tar.gz
-7a303188ef125e654fc1834642bee75f  system-config-bind-4.0.0-41_FC5.tar.gz
+6f4d30301bda321454941c79ce2f9a32  system-config-bind-4.0.0-41_FC6.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- system-config-bind.spec	7 Jun 2006 17:39:14 -0000	1.52
+++ system-config-bind.spec	7 Jun 2006 19:41:51 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	41_FC5
+Release: 	41_FC6
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind



From fedora-cvs-commits at redhat.com  Wed Jun  7 19:44:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:44:31 -0400
Subject: rpms/system-config-bind/FC-5 system-config-bind.spec, 1.51,
	1.52 sources, 1.43, 1.44 .cvsignore, 1.26, 1.27
Message-ID: <200606071944.k57JiV95030522@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30505

Modified Files:
	system-config-bind.spec sources .cvsignore 
Log Message:
fix bugs 194058, 194172









From fedora-cvs-commits at redhat.com  Wed Jun  7 19:44:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:44:58 -0400
Subject: rpms/system-config-bind/FC-5 sources,1.44,1.45
Message-ID: <200606071944.k57Jiw59030806@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30775

Modified Files:
	sources 
Log Message:
fix bugs 194058, 194172


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	7 Jun 2006 19:44:27 -0000	1.44
+++ sources	7 Jun 2006 19:44:55 -0000	1.45
@@ -1,2 +1 @@
-10aa4862497593c55d74cbaff1f751d0  system-config-bind-4.0.0-40_FC5.tar.gz
 7a303188ef125e654fc1834642bee75f  system-config-bind-4.0.0-41_FC5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun  7 19:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 15:50:51 -0400
Subject: rpms/system-config-bind/FC-5 .cvsignore, 1.27, 1.28 sources, 1.45,
	1.46 system-config-bind.spec, 1.52, 1.53
Message-ID: <200606071950.k57JopWJ015339@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15315

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
v4.0.0-41.fc5


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	7 Jun 2006 19:44:27 -0000	1.27
+++ .cvsignore	7 Jun 2006 19:50:49 -0000	1.28
@@ -23,3 +23,4 @@
 system-config-bind-4.0.0-38_FC5.tar.gz
 system-config-bind-4.0.0-40_FC5.tar.gz
 system-config-bind-4.0.0-41_FC5.tar.gz
+system-config-bind-4.0.0-41.fc5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	7 Jun 2006 19:44:55 -0000	1.45
+++ sources	7 Jun 2006 19:50:49 -0000	1.46
@@ -1 +1,2 @@
 7a303188ef125e654fc1834642bee75f  system-config-bind-4.0.0-41_FC5.tar.gz
+fe54e3653ee4570666afced79618b67c  system-config-bind-4.0.0-41.fc5.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/system-config-bind.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- system-config-bind.spec	7 Jun 2006 19:44:27 -0000	1.52
+++ system-config-bind.spec	7 Jun 2006 19:50:49 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	41_FC5
+Release: 	41.fc5
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:14:07 -0400
Subject: rpms/bison/devel bison-2.3.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.9,
	1.10 bison.spec, 1.26, 1.27 sources, 1.9, 1.10 upstream, 1.3,
	1.4 bison-2.2.tar.bz2.sig, 1.1, NONE
Message-ID: <200606072014.k57KE7sI021347@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/bison/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21319

Modified Files:
	.cvsignore bison.spec sources upstream 
Added Files:
	bison-2.3.tar.bz2.sig 
Removed Files:
	bison-2.2.tar.bz2.sig 
Log Message:
Update to bison-2.3 release


--- NEW FILE bison-2.3.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 May 2006 08:18:32 -0000	1.9
+++ .cvsignore	7 Jun 2006 20:14:05 -0000	1.10
@@ -1 +1 @@
-bison-2.2.tar.bz2
+bison-2.3.tar.bz2


Index: bison.spec
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bison.spec	22 May 2006 08:25:38 -0000	1.26
+++ bison.spec	7 Jun 2006 20:14:05 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
-Version: 2.2
+Version: 2.3
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -98,6 +98,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jun  7 2006 Roland McGrath <roland at redhat.com> - 2.3-1
+- New upstream version 2.3
+
 * Mon May 22 2006 Roland McGrath <roland at redhat.com> - 2.2-1
 - New upstream version 2.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 May 2006 08:18:32 -0000	1.9
+++ sources	7 Jun 2006 20:14:05 -0000	1.10
@@ -1 +1 @@
-e345a5d021db850f06ce49eba78af027  bison-2.2.tar.bz2
+c18640c6ec31a169d351e3117ecce3ec  bison-2.3.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/upstream,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upstream	22 May 2006 08:18:32 -0000	1.3
+++ upstream	7 Jun 2006 20:14:05 -0000	1.4
@@ -1 +1 @@
-bison-2.2.tar.bz2
+bison-2.3.tar.bz2


--- bison-2.2.tar.bz2.sig DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:18:22 -0400
Subject: rpms/control-center/devel control-center.spec,1.139,1.140
Message-ID: <200606072018.k57KIMQc005188@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5157

Modified Files:
	control-center.spec 
Log Message:
* Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
- Add devel package.
- Add build requires for autoconf, automake, and libtool.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- control-center.spec	7 Jun 2006 19:42:07 -0000	1.139
+++ control-center.spec	7 Jun 2006 20:18:19 -0000	1.140
@@ -55,7 +55,7 @@
 PreReq:   gtk2
 Requires: usermode >= %{usermode_version}
 
-BuildRequires: autoconf automake
+BuildRequires: autoconf automake libtool
 BuildRequires: esound
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -252,7 +252,7 @@
 %changelog
 * Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
 - Add devel package.
-- Add build requires for autoconf and automake.
+- Add build requires for autoconf, automake, and libtool.
 
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:21:06 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec,1.130,1.131
Message-ID: <200606072021.k57KL68U006348@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6289

Modified Files:
	gnome-panel.spec 
Log Message:
grr



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnome-panel.spec	7 Jun 2006 17:55:46 -0000	1.130
+++ gnome-panel.spec	7 Jun 2006 20:21:03 -0000	1.131
@@ -121,7 +121,6 @@
 done
 
 %build
-aclocal-1.9
 autoconf
 automake-1.9
 %configure \



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:21:38 -0400
Subject: rpms/control-center/devel control-center.spec,1.140,1.141
Message-ID: <200606072021.k57KLcBT006588@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6563

Modified Files:
	control-center.spec 
Log Message:
* Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
- Add devel package.
- Add build requires for autoconf, automake, and libtool.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- control-center.spec	7 Jun 2006 20:18:19 -0000	1.140
+++ control-center.spec	7 Jun 2006 20:21:36 -0000	1.141
@@ -100,7 +100,7 @@
 %package devel
 Summary: GNOME Control Center development libraries and header files
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{?epoch}:%{version}-%{release}
 
 %description devel
 GNOME (the GNU Network Object Model Environment) is an attractive and



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:38:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:38:43 -0400
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.4,1.5
Message-ID: <200606072038.k57KcgdZ010295@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Simple/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10270

Modified Files:
	perl-XML-Simple.spec 
Log Message:
+BuildRequires: perl(XML::LibXML) perl(XML::LibXML::Common)


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-Simple.spec	7 Jun 2006 16:10:46 -0000	1.4
+++ perl-XML-Simple.spec	7 Jun 2006 20:38:30 -0000	1.5
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 #BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
-BuildRequires:  perl(XML::Parser), perl(XML::SAX)
+BuildRequires:  perl(XML::LibXML) perl(XML::LibXML::Common) perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(XML::Parser)
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:39:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:39:33 -0400
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.5,1.6
Message-ID: <200606072039.k57KdXr8010501@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Simple/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10475

Modified Files:
	perl-XML-Simple.spec 
Log Message:
+BuildRequires: perl(XML::LibXML) perl(XML::LibXML::Common)


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-XML-Simple.spec	7 Jun 2006 20:38:30 -0000	1.5
+++ perl-XML-Simple.spec	7 Jun 2006 20:39:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-XML-Simple
 Version:        2.14
-Release:        2%{?dist}.2
+Release:        4%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:42:40 -0400
Subject: rpms/libXdamage/devel libXdamage.spec,1.11,1.12
Message-ID: <200606072042.k57Kgecg011623@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11591

Modified Files:
	libXdamage.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2
- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-1" as xcursor.pc indicates
  "damageproto >= 1.0" is required.
- Added "Requires: xorg-x11-proto-devel >= 7.0-1, libXfixes-devel" to devel
  package also, as per xcursor.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXdamage.spec	27 Apr 2006 19:43:54 -0000	1.11
+++ libXdamage.spec	7 Jun 2006 20:42:37 -0000	1.12
@@ -1,15 +1,17 @@
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
 Version: 1.0.3
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
+# NOTE: Needs damageproto >= 1.0
+BuildRequires: xorg-x11-proto-devel >= 7.0-1
 BuildRequires: libXfixes-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -20,8 +22,12 @@
 %package devel
 Summary: X.Org X11 libXdamage development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xdamage.pc Requires: xproto damageproto >= 1.0 xfixes
+Requires: xorg-x11-proto-devel >= 7.0-1
+Requires: libXfixes-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -35,7 +41,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -43,9 +48,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -59,7 +64,6 @@
 %%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXdamage.so.1
 %{_libdir}/libXdamage.so.1.0.0
 
@@ -72,17 +76,24 @@
 %{_libdir}/libXdamage.a
 %endif
 %{_libdir}/libXdamage.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2
+- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-1" as xcursor.pc indicates
+  "damageproto >= 1.0" is required.
+- Added "Requires: xorg-x11-proto-devel >= 7.0-1, libXfixes-devel" to devel
+  package also, as per xcursor.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
 - Update to 1.0.3
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2.2-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.2.2-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2.2-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.2.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.2.2-2



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:43:35 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.165,1.165.18.1
Message-ID: <200606072043.k57KhZTb012000@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv11884/configs

Modified Files:
      Tag: private-linville-netdev-fc5-4-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.165
retrieving revision 1.165.18.1
diff -u -r1.165 -r1.165.18.1
--- config-generic	4 May 2006 00:47:13 -0000	1.165
+++ config-generic	7 Jun 2006 20:43:33 -0000	1.165.18.1
@@ -621,6 +621,8 @@
 
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -642,16 +644,21 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -671,7 +678,7 @@
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
@@ -713,6 +720,8 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
@@ -726,7 +735,7 @@
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
@@ -789,6 +798,7 @@
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -843,6 +853,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NETDEVICES=y
 
 #
@@ -905,6 +916,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -1023,6 +1035,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1051,6 +1064,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1060,8 +1074,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1138,6 +1158,7 @@
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1154,6 +1175,7 @@
 CONFIG_ALI_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
 
 #
 # Bluetooth support
@@ -1367,7 +1389,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=m 
 CONFIG_INPUT_WISTRON_BTNS=m
 
 #



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:52:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:52:19 -0400
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.6,1.7
Message-ID: <200606072052.k57KqJj5029939@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Simple/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29908

Modified Files:
	perl-XML-Simple.spec 
Log Message:
fix bug 191911


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-XML-Simple.spec	7 Jun 2006 20:39:30 -0000	1.6
+++ perl-XML-Simple.spec	7 Jun 2006 20:52:16 -0000	1.7
@@ -59,6 +59,11 @@
 
 
 %changelog
+* Wed Jun  7 2006 Jason Vas Dias <jvdias at redhat.com> - 2.14-4
+- fix bug 191911: make test fails when default Parser is XML::SAX::PurePerl -
+                  succeeds when default Parser is XML::LibXML::SAX -
+	          +BuildRequires: perl(XML::LibXML) perl(XML::LibXML::Common)
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14-2.2
 - Require perl-XML-Parser (#193985)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:53:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:53:18 -0400
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.7,1.8
Message-ID: <200606072053.k57KrIbW030403@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Simple/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30379

Modified Files:
	perl-XML-Simple.spec 
Log Message:
fix bug 191911


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-XML-Simple.spec	7 Jun 2006 20:52:16 -0000	1.7
+++ perl-XML-Simple.spec	7 Jun 2006 20:53:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-XML-Simple
 Version:        2.14
-Release:        4%{?dist}
+Release:        4.fc6
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jun  7 20:58:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 16:58:14 -0400
Subject: rpms/jdom/devel jdom.spec,1.11,1.12
Message-ID: <200606072058.k57KwEGf032368@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jdom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32315

Modified Files:
	jdom.spec 
Log Message:

Build natively.




Index: jdom.spec
===================================================================
RCS file: /cvs/dist/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jdom.spec	6 Mar 2006 22:18:00 -0000	1.11
+++ jdom.spec	7 Jun 2006 20:58:12 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           jdom
 Version:        1.0
-Release: 1jpp_3fc
+Release:        1jpp_4fc
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
@@ -15,7 +15,11 @@
 BuildRequires:  java-javadoc
 BuildRequires:  ant
 BuildRequires:  xalan-j2 >= 0:2.2.0
-BuildArch:      noarch
+
+# libgcj aot-compiled native libraries
+BuildRequires:    java-gcj-compat-devel >= 1.0.35
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -74,19 +78,32 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%post demo
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun demo
+/usr/bin/rebuild-gcj-db %{_libdir}
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
-
 %files
 %defattr(0644,root,root,0755)
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %{_javadir}/%{name}*.jar
 
 %files javadoc
@@ -96,10 +113,15 @@
 
 %files demo
 %defattr(0644,root,root,0755)
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %{_datadir}/%{name}
 
 
 %changelog
+* Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_4fc
+- Build natively
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-1jpp_3fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:04:55 -0400
Subject: rpms/perl-XML-Simple/FC-5 perl-XML-Simple.spec,1.3,1.4
Message-ID: <200606072104.k57L4t49000919@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Simple/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv884

Modified Files:
	perl-XML-Simple.spec 
Log Message:
fix bugs 193985, 191911





From fedora-cvs-commits at redhat.com  Wed Jun  7 21:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:13:20 -0400
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.11,1.12
Message-ID: <200606072113.k57LDKi0002239@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2205

Modified Files:
	libXdmcp.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: xorg-x11-proto-devel"
- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xdmcp.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXdmcp.spec	27 Apr 2006 19:47:28 -0000	1.11
+++ libXdmcp.spec	7 Jun 2006 21:13:18 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 
@@ -19,8 +20,11 @@
 %package devel
 Summary: X.Org X11 libXdmcp development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel is needed by xdmcp.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -34,7 +38,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -42,9 +45,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +61,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXdmcp.so.6
 %{_libdir}/libXdmcp.so.6.0.0
 
@@ -73,6 +75,12 @@
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: xorg-x11-proto-devel"
+- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xdmcp.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:13:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:13:27 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2122.4.1,
	1.2122.4.2 5845-ZyDAS-ZD1211-USB-WLAN-driver.txt, 1.1.2.1, NONE
Message-ID: <200606072113.k57LDRxk002321@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2272

Modified Files:
      Tag: private-linville-netdev-fc5-4-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc5-4-branch
	5845-ZyDAS-ZD1211-USB-WLAN-driver.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2122.4.1
retrieving revision 1.2122.4.2
diff -u -r1.2122.4.1 -r1.2122.4.2
--- kernel-2.6.spec	7 Jun 2006 20:43:31 -0000	1.2122.4.1
+++ kernel-2.6.spec	7 Jun 2006 21:13:24 -0000	1.2122.4.2
@@ -1307,24 +1307,23 @@
 Patch30871: 5840-softmac-complete-shared-key-authentication.txt
 Patch30872: 5841-softmac-Fix-handling-of-authentication-failure.txt
 Patch30873: 5842-softmac-unified-capabilities-computation.txt
-Patch30874: 5845-ZyDAS-ZD1211-USB-WLAN-driver.txt
-Patch30875: 5846-TCP-Avoid-skb_pull-if-possible-when-trimming-head.txt
-Patch30876: 5848-NET-Eliminate-unused-proc-sys-net-ethernet.txt
-Patch30877: 5849-PPPOE-Missing-result-check-in-__pppoe_xmit.txt
-Patch30878: 5850-IRDA-Missing-allocation-result-check-in-irlap_change_speed.txt
-Patch30879: 5870-BRIDGE-fix-locking-and-memory-leak-in-br_add_bridge.txt
-Patch30880: 5871-TCP-TCP-Low-Priority-congestion-control.txt
-Patch30881: 5872-TCP-TCP-Veno-congestion-control.txt
-Patch30882: 5873-TCP-TCP-Compound-congestion-control.txt
-Patch30883: 5874-TCP-TCP-Compound-quad-root-function.txt
-Patch30884: 5875-TCP-Minimum-congestion-window-consolidation.txt
-Patch30885: 5876-TCP-TCP-Probe-congestion-window-tracing.txt
-Patch30886: 5877-TCP-Limited-slow-start-for-Highspeed-TCP.txt
-Patch30887: 5879-TCP-Fix-compile-warning-in-tcp_probe.c.txt
-Patch30888: 5880-IPV4-igmp-Fixup-struct-ip_mc_list-multiaddr-type.txt
-Patch30889: 5881-IPV4-Right-prototype-of-__raw_v4_lookup.txt
-Patch30890: 5882-IPV4-icmp-Kill-local-ip-arg-in-icmp_redirect.txt
-Patch30891: XXXX-tiacx-ia64-enable.txt
+Patch30874: 5846-TCP-Avoid-skb_pull-if-possible-when-trimming-head.txt
+Patch30875: 5848-NET-Eliminate-unused-proc-sys-net-ethernet.txt
+Patch30876: 5849-PPPOE-Missing-result-check-in-__pppoe_xmit.txt
+Patch30877: 5850-IRDA-Missing-allocation-result-check-in-irlap_change_speed.txt
+Patch30878: 5870-BRIDGE-fix-locking-and-memory-leak-in-br_add_bridge.txt
+Patch30879: 5871-TCP-TCP-Low-Priority-congestion-control.txt
+Patch30880: 5872-TCP-TCP-Veno-congestion-control.txt
+Patch30881: 5873-TCP-TCP-Compound-congestion-control.txt
+Patch30882: 5874-TCP-TCP-Compound-quad-root-function.txt
+Patch30883: 5875-TCP-Minimum-congestion-window-consolidation.txt
+Patch30884: 5876-TCP-TCP-Probe-congestion-window-tracing.txt
+Patch30885: 5877-TCP-Limited-slow-start-for-Highspeed-TCP.txt
+Patch30886: 5879-TCP-Fix-compile-warning-in-tcp_probe.c.txt
+Patch30887: 5880-IPV4-igmp-Fixup-struct-ip_mc_list-multiaddr-type.txt
+Patch30888: 5881-IPV4-Right-prototype-of-__raw_v4_lookup.txt
+Patch30889: 5882-IPV4-icmp-Kill-local-ip-arg-in-icmp_redirect.txt
+Patch30890: XXXX-tiacx-ia64-enable.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -3733,42 +3732,40 @@
 %patch30872 -p1
 # softmac: unified capabilities computation
 %patch30873 -p1
-# ZyDAS ZD1211 USB-WLAN driver
-%patch30874 -p1
 # [TCP]: Avoid skb_pull if possible when trimming head
-%patch30875 -p1
+%patch30874 -p1
 # [NET]: Eliminate unused /proc/sys/net/ethernet
-%patch30876 -p1
+%patch30875 -p1
 # [PPPOE]: Missing result check in __pppoe_xmit().
-%patch30877 -p1
+%patch30876 -p1
 # [IRDA]: Missing allocation result check in irlap_change_speed().
-%patch30878 -p1
+%patch30877 -p1
 # [BRIDGE]: fix locking and memory leak in br_add_bridge
-%patch30879 -p1
+%patch30878 -p1
 # [TCP]: TCP Low Priority congestion control
-%patch30880 -p1
+%patch30879 -p1
 # [TCP]: TCP Veno congestion control
-%patch30881 -p1
+%patch30880 -p1
 # [TCP]: TCP Compound congestion control
-%patch30882 -p1
+%patch30881 -p1
 # [TCP]: TCP Compound quad root function
-%patch30883 -p1
+%patch30882 -p1
 # [TCP]: Minimum congestion window consolidation.
-%patch30884 -p1
+%patch30883 -p1
 # [TCP]: TCP Probe congestion window tracing
-%patch30885 -p1
+%patch30884 -p1
 # [TCP]: Limited slow start for Highspeed TCP
-%patch30886 -p1
+%patch30885 -p1
 # [TCP]: Fix compile warning in tcp_probe.c
-%patch30887 -p1
+%patch30886 -p1
 # [IPV4] igmp: Fixup struct ip_mc_list::multiaddr type
-%patch30888 -p1
+%patch30887 -p1
 # [IPV4]: Right prototype of __raw_v4_lookup()
-%patch30889 -p1
+%patch30888 -p1
 # [IPV4] icmp: Kill local 'ip' arg in icmp_redirect().
-%patch30890 -p1
+%patch30889 -p1
 # tiacx: enable build for ia64
-%patch30891 -p1
+%patch30890 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -5244,7 +5241,6 @@
 - softmac: complete shared key authentication
 - softmac: Fix handling of authentication failure
 - softmac: unified capabilities computation
-- ZyDAS ZD1211 USB-WLAN driver
 - [TCP]: Avoid skb_pull if possible when trimming head
 - [NET]: Eliminate unused /proc/sys/net/ethernet
 - [PPPOE]: Missing result check in __pppoe_xmit().


--- 5845-ZyDAS-ZD1211-USB-WLAN-driver.txt DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:18:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:18:18 -0400
Subject: rpms/system-config-netboot/devel system-config-netboot.spec, 1.43,
	1.44
Message-ID: <200606072118.k57LIIN0018835@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-netboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18799

Modified Files:
	system-config-netboot.spec 
Log Message:
fix bug 192537


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- system-config-netboot.spec	19 Apr 2006 23:00:06 -0000	1.43
+++ system-config-netboot.spec	7 Jun 2006 21:18:16 -0000	1.44
@@ -2,7 +2,7 @@
 Summary:   system-config-netboot is an network booting/install configuration utility
 Name: 	   system-config-netboot
 Version:   0.1.40
-Release:   1.FC6
+Release:   2.FC6
 URL: 	   http://www.redhat.com/ 
 Source0:   %{name}-%{version}.tar.gz
 Source1:   pxelinux.0
@@ -12,7 +12,7 @@
 Requires:  gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
 Requires:  tftp-server >= 0.29-3
 Requires(post): hicolor-icon-theme
-BuildRequires: intltool, perl-XML-Parser
+BuildRequires: autoconf, automake, intltool, perl-XML-Parser
 #ExclusiveArch: i386 x86_64
 BuildArch: noarch
 Obsoletes: redhat-config-netboot
@@ -75,6 +75,9 @@
 %config %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.40-2
+- fix bug 192537: BuildRequires for Mock.
+
 * Thu Apr 19 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.40-1
 - fix further issues reported by brian at chpc.utah.edu:
   o should be a way of configuring remote logging from the GUI



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:19:26 -0400
Subject: rpms/libXevie/devel libXevie.spec,1.12,1.13
Message-ID: <200606072119.k57LJQJ2019316@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19283

Modified Files:
	libXevie.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xevie.pc
- Remove package ownership of mandir/libdir/etc.



Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXevie.spec	6 Jun 2006 01:59:30 -0000	1.12
+++ libXevie.spec	7 Jun 2006 21:19:24 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libXevie development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel is needed by xevie.pc
+Requires: libX11-devel, libXext-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -36,7 +40,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -60,7 +63,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXevie.so.1
 %{_libdir}/libXevie.so.1.0.0
 
@@ -73,13 +75,15 @@
 %{_libdir}/libXevie.a
 %endif
 %{_libdir}/libXevie.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xevie.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xevie.pc
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Replace "makeinstall" with "make install DESTDIR=..." (#192719)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:26:53 -0400
Subject: rpms/libXext/devel libXext.spec,1.12,1.13
Message-ID: <200606072126.k57LQrDo022141@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22111

Modified Files:
	libXext.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXext.spec	27 Apr 2006 19:55:57 -0000	1.12
+++ libXext.spec	7 Jun 2006 21:26:50 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,10 +21,11 @@
 %package devel
 Summary: X.Org X11 libXext development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 Requires: libX11-devel
+# xorg-x11-proto-devel is needed by xext.pc
 Requires: xorg-x11-proto-devel >= 7.0-1
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -47,9 +48,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -63,7 +64,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXext.so.6
 %{_libdir}/libXext.so.6.4.0
 
@@ -73,63 +73,15 @@
 %{_libdir}/libXext.a
 %endif
 %{_libdir}/libXext.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xext.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
-# NOTE: manpages listed individually so that rpm detects if any go missing
-%{_mandir}/man3/DBE.3x*
-%{_mandir}/man3/DPMSCapable.3x*
-%{_mandir}/man3/DPMSDisable.3x*
-%{_mandir}/man3/DPMSEnable.3x*
-%{_mandir}/man3/DPMSForceLevel.3x*
-%{_mandir}/man3/DPMSGetTimeouts.3x*
-%{_mandir}/man3/DPMSGetVersion.3x*
-%{_mandir}/man3/DPMSInfo.3x*
-%{_mandir}/man3/DPMSQueryExtension.3x*
-%{_mandir}/man3/DPMSSetTimeouts.3x*
-%{_mandir}/man3/XShape.3x*
-%{_mandir}/man3/XShapeCombineMask.3x*
-%{_mandir}/man3/XShapeCombineRectangles.3x*
-%{_mandir}/man3/XShapeCombineRegion.3x*
-%{_mandir}/man3/XShapeCombineShape.3x*
-%{_mandir}/man3/XShapeGetRectangles.3x*
-%{_mandir}/man3/XShapeInputSelected.3x*
-%{_mandir}/man3/XShapeOffsetShape.3x*
-%{_mandir}/man3/XShapeQueryExtension.3x*
-%{_mandir}/man3/XShapeQueryExtents.3x*
-%{_mandir}/man3/XShapeQueryVersion.3x*
-%{_mandir}/man3/XShapeSelectInput.3x*
-%{_mandir}/man3/XcupGetReservedColormapEntries.3x*
-%{_mandir}/man3/XcupQueryVersion.3x*
-%{_mandir}/man3/XcupStoreColors.3x*
-%{_mandir}/man3/XdbeAllocateBackBufferName.3x*
-%{_mandir}/man3/XdbeBeginIdiom.3x*
-%{_mandir}/man3/XdbeDeallocateBackBufferName.3x*
-%{_mandir}/man3/XdbeEndIdiom.3x*
-%{_mandir}/man3/XdbeFreeVisualInfo.3x*
-%{_mandir}/man3/XdbeGetBackBufferAttributes.3x*
-%{_mandir}/man3/XdbeGetVisualInfo.3x*
-%{_mandir}/man3/XdbeQueryExtension.3x*
-%{_mandir}/man3/XdbeSwapBuffers.3x*
-%{_mandir}/man3/Xevi.3x*
-%{_mandir}/man3/XeviGetVisualInfo.3x*
-%{_mandir}/man3/XeviQueryExtension.3x*
-%{_mandir}/man3/XeviQueryVersion.3x*
-%{_mandir}/man3/Xmbuf.3x*
-%{_mandir}/man3/XmbufChangeBufferAttributes.3x*
-%{_mandir}/man3/XmbufChangeWindowAttributes.3x*
-%{_mandir}/man3/XmbufCreateBuffers.3x*
-%{_mandir}/man3/XmbufCreateStereoWindow.3x*
-%{_mandir}/man3/XmbufDestroyBuffers.3x*
-%{_mandir}/man3/XmbufDisplayBuffers.3x*
-%{_mandir}/man3/XmbufGetBufferAttributes.3x*
-%{_mandir}/man3/XmbufGetScreenInfo.3x*
-%{_mandir}/man3/XmbufGetVersion.3x*
-%{_mandir}/man3/XmbufGetWindowAttributes.3x*
-%{_mandir}/man3/XmbufQueryExtension.3x*
+#%dir %{_mandir}/man3x
+%{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:32:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:32:44 -0400
Subject: rpms/system-config-netboot/devel .cvsignore, 1.28, 1.29 sources,
	1.30, 1.31 system-config-netboot.spec, 1.44, 1.45
Message-ID: <200606072132.k57LWiEg023561@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-netboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23533

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
fix bug 192537


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	19 Apr 2006 23:00:06 -0000	1.28
+++ .cvsignore	7 Jun 2006 21:32:26 -0000	1.29
@@ -14,3 +14,4 @@
 system-config-netboot-0.1.37.tar.gz
 system-config-netboot-0.1.38.tar.gz
 system-config-netboot-0.1.40.tar.gz
+system-config-netboot-0.1.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	19 Apr 2006 23:00:06 -0000	1.30
+++ sources	7 Jun 2006 21:32:26 -0000	1.31
@@ -1 +1 @@
-9877de9c0f7807aeddd30864b1e00a35  system-config-netboot-0.1.40.tar.gz
+2ef0a8fedc814e8af48948518e38d1ed  system-config-netboot-0.1.41.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- system-config-netboot.spec	7 Jun 2006 21:18:16 -0000	1.44
+++ system-config-netboot.spec	7 Jun 2006 21:32:26 -0000	1.45
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary:   system-config-netboot is an network booting/install configuration utility
 Name: 	   system-config-netboot
-Version:   0.1.40
-Release:   2.FC6
+Version:   0.1.41
+Release:   1.FC6
 URL: 	   http://www.redhat.com/ 
 Source0:   %{name}-%{version}.tar.gz
 Source1:   pxelinux.0
@@ -12,7 +12,7 @@
 Requires:  gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
 Requires:  tftp-server >= 0.29-3
 Requires(post): hicolor-icon-theme
-BuildRequires: autoconf, automake, intltool, perl-XML-Parser
+BuildRequires: autoconf, automake, gettext, intltool, python, perl, perl-XML-Parser
 #ExclusiveArch: i386 x86_64
 BuildArch: noarch
 Obsoletes: redhat-config-netboot



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:39:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:39:21 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.141,1.142
Message-ID: <200606072139.k57LdLi3024349@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24294

Modified Files:
	evolution.spec 
Log Message:
Rebuild



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- evolution.spec	7 Jun 2006 04:14:25 -0000	1.141
+++ evolution.spec	7 Jun 2006 21:39:17 -0000	1.142
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.5
+Release: 1.fc5.6
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -639,6 +639,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.2-1.fc5.6
+- Rebuild
+
 * Tue Jun  6 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.5
 - Bump eds version requires
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:52:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:52:37 -0400
Subject: rpms/kdelibs/FC-5 kdelibs.spec,1.131,1.132
Message-ID: <200606072152.k57LqbFf019734@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19719

Modified Files:
	kdelibs.spec 
Log Message:
add  BuildRequires: aspell-devel




Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdelibs.spec	1 Jun 2006 17:33:10 -0000	1.131
+++ kdelibs.spec	7 Jun 2006 21:52:35 -0000	1.132
@@ -113,6 +113,7 @@
 BuildRequires: autoconf automake
 BuildRequires: libacl-devel
 BuildRequires: libattr-devel
+BuildRequires: aspell-devel
 Obsoletes: %{name}2
 Obsoletes: kdesupport
 Obsoletes: kdoc



From fedora-cvs-commits at redhat.com  Wed Jun  7 21:55:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 17:55:57 -0400
Subject: rpms/system-config-netboot/devel system-config-netboot.spec, 1.45,
	1.46
Message-ID: <200606072155.k57LtvLR020055@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-netboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20035

Modified Files:
	system-config-netboot.spec 
Log Message:
fix bug 192537


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- system-config-netboot.spec	7 Jun 2006 21:32:26 -0000	1.45
+++ system-config-netboot.spec	7 Jun 2006 21:55:55 -0000	1.46
@@ -29,9 +29,7 @@
 ln -svf $(ls /usr/share/automake*/install-sh | tail -1) .
 ln -svf $(ls /usr/share/automake*/missing | tail -1) .
 export VERSION=%{version}
-aclocal
 automake
-autoconf
 ./configure --prefix=/usr
 make
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:07:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:07:04 -0400
Subject: rpms/bridge-utils/devel bridge-utils.spec, 1.17,
	1.18 bridge-utils-1.0.4-kernheaders.patch, 1.1, NONE
Message-ID: <200606072207.k57M74OC020767@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bridge-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20745

Modified Files:
	bridge-utils.spec 
Removed Files:
	bridge-utils-1.0.4-kernheaders.patch 
Log Message:
drop devel package, use sane kernel headers


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bridge-utils.spec	11 Feb 2006 02:12:14 -0000	1.17
+++ bridge-utils.spec	7 Jun 2006 22:07:01 -0000	1.18
@@ -1,15 +1,15 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
 Version: 1.0.6
-Release: 1.2
+Release: 2
 License: GPL
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
 Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz
 Patch0: bridge-utils-1.0.4-inc.patch
-Patch1: bridge-utils-1.0.4-kernheaders.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: sysfsutils-devel
+BuildRequires: kernel-headers >= 2.6.16
 
 %description
 This package contains utilities for configuring the linux ethernet
@@ -20,33 +20,17 @@
 
 Install bridge-utils if you want to use the linux ethernet bridge.
 
-%package devel
-Summary: Utilities for configuring the linux ethernet bridge
-Group: Development/Libraries
-
-%description devel
-The bridge-utils-devel package contains the header and object files
-necessary for developing programs which use 'libbridge.a', the
-interface to the linux kernel ethernet bridge. If you are developing
-programs which need to configure the linux ethernet bridge, your
-system needs to have these standard header and object files available
-in order to create the executables.
-
-Install bridge-utils-devel if you are going to develop programs which
-will use the linux ethernet bridge interface library.
-
 %prep
 %setup
 
 %patch0 -p1
-%patch1 -p1
 
 %build
-%configure --with-linux-headers=`pwd`
+%configure
 make
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} SUBDIRS="brctl doc" install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,12 +41,10 @@
 %{_sbindir}/brctl
 %{_mandir}/man8/brctl.8*
 
-%files devel
-%defattr (-,root,root,0755)
-%{_includedir}/libbridge.h
-%{_libdir}/libbridge.a
-
 %changelog
+* Wed Jun 07 2006 David Woodhouse <dwmw2 at redhat.com> 1.0.6-2
+- Use sane kernel headers, drop -devel package
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-1.2
 - bump again for double-long bug on ppc(64)
 


--- bridge-utils-1.0.4-kernheaders.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:15:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:15:54 -0400
Subject: rpms/libuser/devel libuser.spec,1.51,1.52
Message-ID: <200606072215.k57MFsIs003571@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv546

Modified Files:
	libuser.spec 
Log Message:
* Wed Jun  7 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.6-2
- Configure without --enable-gtk-doc to fix multilib conflict (#192715)



Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libuser.spec	1 May 2006 05:28:02 -0000	1.51
+++ libuser.spec	7 Jun 2006 22:15:52 -0000	1.52
@@ -5,13 +5,12 @@
 
 Name: libuser
 Version: 0.54.6
-Release: 1
+Release: 2
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: pam-devel, popt, python-devel
-BuildRequires: glib2-devel, gtk-doc, linuxdoc-tools
+BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt, python-devel
 BuildRequires: cyrus-sasl-devel, openldap-devel
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -40,7 +39,7 @@
 %setup -q
 
 %build
-%configure --enable-gtk-doc \
+%configure \
 %if %{WITH_SELINUX}
 	--with-selinux \
 %endif
@@ -96,6 +95,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jun  7 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.6-2
+- Configure without --enable-gtk-doc to fix multilib conflict (#192715)
+
 * Mon May  1 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.6-1
 - Fix bugs in handling of invalid lines in the files and shadow modules
 - Fix pattern matching in lu_*_enumerate_full in the files and shadow modules



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:16:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:16:11 -0400
Subject: rpms/jdom/devel jdom.spec,1.12,1.13
Message-ID: <200606072216.k57MGBKr005586@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jdom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3646

Modified Files:
	jdom.spec 
Log Message:

Remove spurious xml-commons-api requirement




Index: jdom.spec
===================================================================
RCS file: /cvs/dist/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jdom.spec	7 Jun 2006 20:58:12 -0000	1.12
+++ jdom.spec	7 Jun 2006 22:16:08 -0000	1.13
@@ -56,7 +56,7 @@
 
 
 %build
-export CLASSPATH=$(build-classpath xalan-j2 xml-commons-apis)
+export CLASSPATH=$(build-classpath xalan-j2)
 sed -e 's|<property name="build.compiler".*||' build.xml > tempf; cp tempf build.xml; rm tempf
 ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
 
@@ -121,6 +121,7 @@
 %changelog
 * Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_4fc
 - Build natively
+- Remove spurious xml-commons-api requirement
 
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-1jpp_3fc
 - stop scriptlet spew



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:16:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:16:25 -0400
Subject: rpms/system-config-netboot/devel sources, 1.31,
	1.32 system-config-netboot.spec, 1.46, 1.47
Message-ID: <200606072216.k57MGPO1007586@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-netboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6662

Modified Files:
	sources system-config-netboot.spec 
Log Message:
fix bug 192537


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	7 Jun 2006 21:32:26 -0000	1.31
+++ sources	7 Jun 2006 22:16:22 -0000	1.32
@@ -1 +1 @@
-2ef0a8fedc814e8af48948518e38d1ed  system-config-netboot-0.1.41.tar.gz
+78055b07ab63e7e885994d6c7d858cc2  system-config-netboot-0.1.41.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- system-config-netboot.spec	7 Jun 2006 21:55:55 -0000	1.46
+++ system-config-netboot.spec	7 Jun 2006 22:16:22 -0000	1.47
@@ -29,7 +29,9 @@
 ln -svf $(ls /usr/share/automake*/install-sh | tail -1) .
 ln -svf $(ls /usr/share/automake*/missing | tail -1) .
 export VERSION=%{version}
+aclocal
 automake
+autoconf
 ./configure --prefix=/usr
 make
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:16:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:16:52 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.146,
	1.147
Message-ID: <200606072216.k57MGqkE011317@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10247

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Wed Jun  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
- Fix ppc64 file system corruption workaround.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- java-1.4.2-gcj-compat.spec	4 Mar 2006 02:15:45 -0000	1.146
+++ java-1.4.2-gcj-compat.spec	7 Jun 2006 22:16:50 -0000	1.147
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_83rh
+%define release 	40jpp_84rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 %define bcfullver	1.31
@@ -302,7 +302,7 @@
 mkdir docsbuild
 pushd docsbuild
 # work around ppc64 file system corruption
-  if unzip -tq /usr/share/java/src-4.1.0.zip
+  if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
   then
     fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
     rm -rf gnu
@@ -640,6 +640,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Wed Jun  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
+- Fix ppc64 file system corruption workaround.
+
 * Fri Mar  3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh
 - Make javadoc post scriplet pass unconditionally.
 - Force symlinks in javadoc post scriptlet.



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:26:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:26:46 -0400
Subject: rpms/libXfixes/devel libXfixes.spec,1.11,1.12
Message-ID: <200606072226.k57MQjws019376@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfixes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19349

Modified Files:
	libXfixes.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 4.0.1-2
- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
- Added "Requires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
  to devel package, needed by xfixes.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: libXfixes.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXfixes.spec	12 May 2006 20:37:08 -0000	1.11
+++ libXfixes.spec	7 Jun 2006 22:26:42 -0000	1.12
@@ -1,15 +1,17 @@
 Summary: X.Org X11 libXfixes runtime library
 Name: libXfixes
 Version: 4.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
+BuildRequires: xorg-x11-proto-devel >= 7.0-7
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -19,8 +21,11 @@
 %package devel
 Summary: X.Org X11 libXfixes development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xfixes.pc Requires: xproto fixesproto >= 4.0
+Requires: xorg-x11-proto-devel >= 7.0-7
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -34,7 +39,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -42,9 +46,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +62,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXfixes.so.3
 %{_libdir}/libXfixes.so.3.1.0
 
@@ -71,13 +74,18 @@
 %{_libdir}/libXfixes.a
 %endif
 %{_libdir}/libXfixes.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xfixes.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 4.0.1-2
+- Added "BuildRequires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
+- Added "Requires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
+  to devel package, needed by xfixes.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 4.0.1-1
 - Bump to 4.0.1.
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:30:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:30:04 -0400
Subject: rpms/wordtrans/devel wordtrans.spec,1.24,1.25
Message-ID: <200606072230.k57MU4P1020593@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/wordtrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20524

Modified Files:
	wordtrans.spec 
Log Message:
add BR on gettext-devel #130581



Index: wordtrans.spec
===================================================================
RCS file: /cvs/dist/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wordtrans.spec	11 Feb 2006 06:05:30 -0000	1.24
+++ wordtrans.spec	7 Jun 2006 22:30:00 -0000	1.25
@@ -11,7 +11,7 @@
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1pre13
-Release: 12.2.1
+Release: 13
 License: GPL
 Source: http://wordtrans.sourceforge.net/%{name}_%{version}.tar.gz
 Source1: ger-eng.txt
@@ -53,6 +53,7 @@
 BuildPrereq: openjade
 BuildPrereq: linuxdoc-tools
 BuildPrereq: fribidi-devel
+BuildPrereq: gettext-devel
 
 %description
 Wordtrans is a front-end for several dictionaries. It supports
@@ -303,6 +304,9 @@
 /var/www/wordtrans
 
 %changelog
+* Wed Jun 07 2006 Than Ngo <than at redhat.com> 1.1pre13-13 
+- add BR on gettext-devel #130581
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1pre13-12.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:34:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:34:55 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.273,1.274
Message-ID: <200606072234.k57MYt8o021378@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21291

Modified Files:
	eclipse.spec 
Log Message:
* Wed Jun 07 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.2
- Fix eclipse-ecj.jar symlink to include qualifier.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- eclipse.spec	7 Jun 2006 15:51:38 -0000	1.273
+++ eclipse.spec	7 Jun 2006 22:34:51 -0000	1.274
@@ -38,7 +38,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.1
+Release:        0jpp_0fc.3.2RC7.2
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1071,7 +1071,7 @@
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}*.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
 ln -s %{_datadir}/java/eclipse-ecj.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
@@ -1569,6 +1569,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
 
 %changelog
+* Wed Jun 07 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.2
+- Fix eclipse-ecj.jar symlink to include qualifier.
+
 * Tue Jun 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.1
 - 3.2RC7.
 - Remove com.jcraft.jsch_0.1.28.jar and repackage with classes from the system



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:35:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:35:07 -0400
Subject: rpms/Xaw3d/devel Xaw3d.spec,1.30,1.31
Message-ID: <200606072235.k57MZ25p021433@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/Xaw3d/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21387

Modified Files:
	Xaw3d.spec 
Log Message:
BR on bison ed flex #194184




Index: Xaw3d.spec
===================================================================
RCS file: /cvs/dist/rpms/Xaw3d/devel/Xaw3d.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Xaw3d.spec	7 Jun 2006 22:22:15 -0000	1.30
+++ Xaw3d.spec	7 Jun 2006 22:34:59 -0000	1.31
@@ -29,6 +29,7 @@
 BuildRequires: libXpm-devel
 BuildRequires: imake
 BuildRequires: bison
+BuildRequires: flex
 BuildRequires: ed
 
 %description
@@ -101,7 +102,7 @@
 
 %changelog
 * Wed Jun 07 2006 Than Ngo <than at redhat.com> 1.5E-10 
-- BR on bison ed #194184 
+- BR on bison ed flex #194184 
 
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.5E-9
 - rebuild for -devel deps



From fedora-cvs-commits at redhat.com  Wed Jun  7 22:45:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 18:45:37 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel ecj.sh.in, 1.1,
	1.2 java-1.4.2-gcj-compat.spec, 1.147, 1.148
Message-ID: <200606072245.k57MjaaU023490@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23415

Modified Files:
	ecj.sh.in java-1.4.2-gcj-compat.spec 
Log Message:
- Make ecj.sh.in call gij.




Index: ecj.sh.in
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/ecj.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecj.sh.in	8 Jul 2005 11:10:17 -0000	1.1
+++ ecj.sh.in	7 Jun 2006 22:45:34 -0000	1.2
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 CLASSPATH=@JAVADIR@/eclipse-ecj.jar${CLASSPATH:+:}$CLASSPATH \
-java org.eclipse.jdt.internal.compiler.batch.Main "$@"
+gij org.eclipse.jdt.internal.compiler.batch.Main "$@"


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- java-1.4.2-gcj-compat.spec	7 Jun 2006 22:16:50 -0000	1.147
+++ java-1.4.2-gcj-compat.spec	7 Jun 2006 22:45:34 -0000	1.148
@@ -642,6 +642,7 @@
 %changelog
 * Wed Jun  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
 - Fix ppc64 file system corruption workaround.
+- Make ecj.sh.in call gij.
 
 * Fri Mar  3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh
 - Make javadoc post scriplet pass unconditionally.



From fedora-cvs-commits at redhat.com  Wed Jun  7 23:07:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 19:07:25 -0400
Subject: rpms/bison/devel bison.spec,1.27,1.28
Message-ID: <200606072307.k57N7P5G011239@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/bison/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11211

Modified Files:
	bison.spec 
Log Message:
Add BuildRequires on m4.



Index: bison.spec
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bison.spec	7 Jun 2006 20:14:05 -0000	1.27
+++ bison.spec	7 Jun 2006 23:07:22 -0000	1.28
@@ -1,13 +1,14 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
 Version: 2.3
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
 URL: http://www.gnu.org/software/bison/
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: m4 >= 1.4
 Requires: m4 >= 1.4
 
 %description
@@ -98,6 +99,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jun  7 2006 Roland McGrath <roland at redhat.com> - 2.3-2
+- Add BuildRequires on m4.
+
 * Wed Jun  7 2006 Roland McGrath <roland at redhat.com> - 2.3-1
 - New upstream version 2.3
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 00:35:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 20:35:55 -0400
Subject: rpms/kernel/devel kgdb-8250-fix.patch, NONE, 1.1 kgdb-8250.patch,
	NONE, 1.1 kgdb-cfi_annotations.patch, NONE,
	1.1 kgdb-core-lite-add-reboot-command.patch, NONE,
	1.1 kgdb-core-lite.patch, NONE, 1.1 kgdb-core.patch, NONE,
	1.1 kgdb-eth.patch, NONE, 1.1 kgdb-i386-lite.patch, NONE,
	1.1 kgdb-i386.patch, NONE, 1.1 kgdb-module.patch, NONE,
	1.1 kgdb-netpoll_pass_skb_to_rx_hook.patch, NONE,
	1.1 kgdb-sysrq_bugfix.patch, NONE, 1.1 kernel-2.6.spec, 1.2253,
	1.2254
Message-ID: <200606080035.k580ZtJp014165@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14092

Modified Files:
	kernel-2.6.spec 
Added Files:
	kgdb-8250-fix.patch kgdb-8250.patch kgdb-cfi_annotations.patch 
	kgdb-core-lite-add-reboot-command.patch kgdb-core-lite.patch 
	kgdb-core.patch kgdb-eth.patch kgdb-i386-lite.patch 
	kgdb-i386.patch kgdb-module.patch 
	kgdb-netpoll_pass_skb_to_rx_hook.patch kgdb-sysrq_bugfix.patch 
Log Message:
kgdb experiment.



kgdb-8250-fix.patch:
 8250_kgdb.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kgdb-8250-fix.patch ---

From: Andrew Morton <akpm at osdl.org>

Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 drivers/serial/8250_kgdb.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff -puN drivers/serial/8250_kgdb.c~kgdb-8250-fix drivers/serial/8250_kgdb.c
--- devel/drivers/serial/8250_kgdb.c~kgdb-8250-fix	2006-06-06 17:32:34.000000000 -0700
+++ devel-akpm/drivers/serial/8250_kgdb.c	2006-06-06 17:32:34.000000000 -0700
@@ -24,6 +24,7 @@
 #include <linux/serial_reg.h>
 #include <linux/serialP.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
 
 #include <asm/io.h>
 #include <asm/serial.h>		/* For BASE_BAUD and SERIAL_PORT_DFNS */
@@ -286,7 +287,8 @@ static void __init kgdb8250_late_init(vo
 	/* Try and copy the old_rs_table. */
 	kgdb8250_copy_rs_table();
 
-#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
+#if defined(CONFIG_SERIAL_8250) || \
+		(defined(MODULE) && defined(CONFIG_SERIAL_8250_MODULE))
 	/* Take the port away from the main driver. */
 	serial8250_unregister_by_port(current_port);
 
@@ -401,6 +403,7 @@ void __init kgdb8250_add_port(int i, str
 	if (current_port != &kgdb8250_ports[i])
                 memcpy(&kgdb8250_ports[i], serial_req, sizeof(struct uart_port));
 }
+EXPORT_SYMBOL(kgdb8250_add_port);
 
 /**
  * 	kgdb8250_add_platform_port - Define a serial port for use with KGDB
_

kgdb-8250.patch:
 drivers/serial/8250.c        |   21 +
 drivers/serial/8250_kgdb.c   |  516 +++++++++++++++++++++++++++++++++++++++++++
 drivers/serial/Kconfig       |    2 
 drivers/serial/Makefile      |    1 
 drivers/serial/serial_core.c |   13 +
 include/linux/serial_8250.h  |    1 
 lib/Kconfig.debug            |   58 ++++
 7 files changed, 609 insertions(+), 3 deletions(-)

--- NEW FILE kgdb-8250.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 drivers/serial/8250.c        |   21 +
 drivers/serial/8250_kgdb.c   |  516 +++++++++++++++++++++++++++++++++
 drivers/serial/Kconfig       |    2 
 drivers/serial/Makefile      |    1 
 drivers/serial/serial_core.c |   13 
 include/linux/serial_8250.h  |    1 
 lib/Kconfig.debug            |   58 +++
 7 files changed, 609 insertions(+), 3 deletions(-)

diff -puN drivers/serial/8250.c~kgdb-8250 drivers/serial/8250.c
--- devel/drivers/serial/8250.c~kgdb-8250	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/drivers/serial/8250.c	2006-05-19 16:01:51.000000000 -0700
@@ -2622,6 +2622,27 @@ void serial8250_unregister_port(int line
 }
 EXPORT_SYMBOL(serial8250_unregister_port);
 
+/**
+ *	serial8250_unregister_by_port - remove a 16x50 serial port
+ *	at runtime.
+ *	@port: A &struct uart_port that describes the port to remove.
+ *
+ *	Remove one serial port.  This may not be called from interrupt
+ *	context.  We hand the port back to the our control.
+ */
+void serial8250_unregister_by_port(struct uart_port *port)
+{
+	struct uart_8250_port *uart;
+
+	mutex_lock(&serial_mutex);
+	uart = serial8250_find_match_or_unused(port);
+	mutex_unlock(&serial_mutex);
+
+	if (uart)
+		serial8250_unregister_port(uart->port.line);
+}
+EXPORT_SYMBOL(serial8250_unregister_by_port);
+
 static int __init serial8250_init(void)
 {
 	int ret, i;
diff -puN /dev/null drivers/serial/8250_kgdb.c
--- /dev/null	2006-05-19 15:26:20.261540500 -0700
+++ devel-akpm/drivers/serial/8250_kgdb.c	2006-05-19 16:01:51.000000000 -0700
@@ -0,0 +1,516 @@
+/*
+ * 8250 interface for kgdb.
+ *
+ * This is a merging of many different drivers, and all of the people have
+ * had an impact in some form or another:
+ *
+ * 2004-2005 (c) MontaVista Software, Inc.
+ * 2005-2006 (c) Wind River Systems, Inc.
+ *
+ * Amit Kale <amitkale at emsyssoft.com>, David Grothe <dave at gcom.com>,
+ * Scott Foehner <sfoehner at engr.sgi.com>, George Anzinger <george at mvista.com>,
+ * Robert Walsh <rjwalsh at durables.org>, wangdi <wangdi at clusterfs.com>,
+ * San Mehat, Tom Rini <trini at mvista.com>,
+ * Jason Wessel <jason.wessel at windriver.com>
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/kgdb.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serial_reg.h>
+#include <linux/serialP.h>
+#include <linux/ioport.h>
+
+#include <asm/io.h>
+#include <asm/serial.h>		/* For BASE_BAUD and SERIAL_PORT_DFNS */
+
+#include "8250.h"
+
+#define GDB_BUF_SIZE	512	/* power of 2, please */
+
+MODULE_DESCRIPTION("KGDB driver for the 8250");
+MODULE_LICENSE("GPL");
+/* These will conflict with early_param otherwise. */
+#ifdef CONFIG_KGDB_8250_MODULE
+static char config[256];
+module_param_string(kgdb8250, config, 256, 0);
+MODULE_PARM_DESC(kgdb8250,
+		 " kgdb8250=<io or mmio>,<address>,<baud rate>,<irq>\n");
+static struct kgdb_io local_kgdb_io_ops;
+#endif				/* CONFIG_KGDB_8250_MODULE */
+
+/* Speed of the UART. */
+static int kgdb8250_baud;
+
+/* Flag for if we need to call request_mem_region */
+static int kgdb8250_needs_request_mem_region;
+
+static char kgdb8250_buf[GDB_BUF_SIZE];
+static atomic_t kgdb8250_buf_in_cnt;
+static int kgdb8250_buf_out_inx;
+
+/* Old-style serial definitions, if existant, and a counter. */
+#ifdef CONFIG_KGDB_SIMPLE_SERIAL
+static int __initdata should_copy_rs_table = 1;
+static struct serial_state old_rs_table[] __initdata = {
+#ifdef SERIAL_PORT_DFNS
+	SERIAL_PORT_DFNS
+#endif
+};
+#endif
+
+/* Our internal table of UARTS. */
+#define UART_NR	CONFIG_SERIAL_8250_NR_UARTS
+static struct uart_port kgdb8250_ports[UART_NR];
+
+static struct uart_port *current_port;
+
+/* Base of the UART. */
+static void *kgdb8250_addr;
+
+/* Forward declarations. */
+static int kgdb8250_uart_init(void);
+static int __init kgdb_init_io(void);
+static int __init kgdb8250_opt(char *str);
+
+/* These are much shorter calls to ioread8/iowrite8 that take into
+ * account our shifts, etc. */
+static inline unsigned int kgdb_ioread(u8 mask)
+{
+	return ioread8(kgdb8250_addr + (mask << current_port->regshift));
+}
+
+static inline void kgdb_iowrite(u8 val, u8 mask)
+{
+	iowrite8(val, kgdb8250_addr + (mask << current_port->regshift));
+}
+
+/*
+ * Wait until the interface can accept a char, then write it.
+ */
+static void kgdb_put_debug_char(u8 chr)
+{
+	while (!(kgdb_ioread(UART_LSR) & UART_LSR_THRE)) ;
+
+	kgdb_iowrite(chr, UART_TX);
+}
+
+/*
+ * Get a byte from the hardware data buffer and return it
+ */
+static int read_data_bfr(void)
+{
+	char it = kgdb_ioread(UART_LSR);
+
+	if (it & UART_LSR_DR)
+		return kgdb_ioread(UART_RX);
+
+	/*
+	 * If we have a framing error assume somebody messed with
+	 * our uart.  Reprogram it and send '-' both ways...
+	 */
+	if (it & 0xc) {
+		kgdb8250_uart_init();
+		kgdb_put_debug_char('-');
+		return '-';
+	}
+
+	return -1;
+}
+
+/*
+ * Get a char if available, return -1 if nothing available.
+ * Empty the receive buffer first, then look at the interface hardware.
+ */
+static int kgdb_get_debug_char(void)
+{
+	int retchr;
+
+	/* intr routine has q'd chars */
+	if (atomic_read(&kgdb8250_buf_in_cnt) != 0) {
+		retchr = kgdb8250_buf[kgdb8250_buf_out_inx++];
+		kgdb8250_buf_out_inx &= (GDB_BUF_SIZE - 1);
+		atomic_dec(&kgdb8250_buf_in_cnt);
+		return retchr;
+	}
+
+	do {
+		retchr = read_data_bfr();
+	} while (retchr < 0);
+
+	return retchr;
+}
+
+/*
+ * This is the receiver interrupt routine for the GDB stub.
+ * All that we need to do is verify that the interrupt happened on the
+ * line we're in charge of.  If this is true, schedule a breakpoint and
+ * return.
+ */
+static irqreturn_t
+kgdb8250_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+	if (kgdb_ioread(UART_IIR) & UART_IIR_RDI) {
+		/* Throw away the data if another I/O routine is active. */
+		if (kgdb_io_ops.read_char != kgdb_get_debug_char &&
+				(kgdb_ioread(UART_LSR) & UART_LSR_DR))
+			kgdb_ioread(UART_RX);
+		else
+			breakpoint();
+	}
+
+	return IRQ_HANDLED;
+}
+
+/*
+ *  Initializes the UART.
+ *  Returns:
+ *	0 on success, 1 on failure.
+ */
+static int
+kgdb8250_uart_init (void)
+{
+	unsigned int ier, base_baud = current_port->uartclk ?
+		current_port->uartclk / 16 : BASE_BAUD;
+
+	/* test uart existance */
+	if(kgdb_ioread(UART_LSR) == 0xff)
+		return -1;
+
+	/* disable interrupts */
+	kgdb_iowrite(0, UART_IER);
+
+#if defined(CONFIG_ARCH_OMAP1510)
+	/* Workaround to enable 115200 baud on OMAP1510 internal ports */
+	if (cpu_is_omap1510() && is_omap_port((void *)kgdb8250_addr)) {
+		if (kgdb8250_baud == 115200) {
+			base_baud = 1;
+			kgdb8250_baud = 1;
+			kgdb_iowrite(1, UART_OMAP_OSC_12M_SEL);
+		} else
+			kgdb_iowrite(0, UART_OMAP_OSC_12M_SEL);
+	}
+#endif
+	/* set DLAB */
+	kgdb_iowrite(UART_LCR_DLAB, UART_LCR);
+
+	/* set baud */
+	kgdb_iowrite((base_baud / kgdb8250_baud) & 0xff, UART_DLL);
+	kgdb_iowrite((base_baud / kgdb8250_baud) >> 8, UART_DLM);
+
+	/* reset DLAB, set LCR */
+	kgdb_iowrite(UART_LCR_WLEN8, UART_LCR);
+
+	/* set DTR and RTS */
+	kgdb_iowrite(UART_MCR_OUT2 | UART_MCR_DTR | UART_MCR_RTS, UART_MCR);
+
+	/* setup fifo */
+	kgdb_iowrite(UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR
+		| UART_FCR_CLEAR_XMIT | UART_FCR_TRIGGER_8,
+		UART_FCR);
+
+	/* clear pending interrupts */
+	kgdb_ioread(UART_IIR);
+	kgdb_ioread(UART_RX);
+	kgdb_ioread(UART_LSR);
+	kgdb_ioread(UART_MSR);
+
+	/* turn on RX interrupt only */
+	kgdb_iowrite(UART_IER_RDI, UART_IER);
+
+	/*
+	 * Borrowed from the main 8250 driver.
+	 * Try writing and reading the UART_IER_UUE bit (b6).
+	 * If it works, this is probably one of the Xscale platform's
+	 * internal UARTs.
+	 * We're going to explicitly set the UUE bit to 0 before
+	 * trying to write and read a 1 just to make sure it's not
+	 * already a 1 and maybe locked there before we even start start.
+	 */
+	ier = kgdb_ioread(UART_IER);
+	kgdb_iowrite(ier & ~UART_IER_UUE, UART_IER);
+	if (!(kgdb_ioread(UART_IER) & UART_IER_UUE)) {
+		/*
+		 * OK it's in a known zero state, try writing and reading
+		 * without disturbing the current state of the other bits.
+		 */
+		kgdb_iowrite(ier | UART_IER_UUE, UART_IER);
+		if (kgdb_ioread(UART_IER) & UART_IER_UUE)
+			/*
+			 * It's an Xscale.
+			 */
+			ier |= UART_IER_UUE | UART_IER_RTOIE;
+	}
+	kgdb_iowrite(ier, UART_IER);
+	return 0;
+}
+
+/*
+ * Copy the old serial_state table to our uart_port table if we haven't
+ * had values specifically configured in.  We need to make sure this only
+ * happens once.
+ */
+static void __init kgdb8250_copy_rs_table(void)
+{
+#ifdef CONFIG_KGDB_SIMPLE_SERIAL
+	int i;
+
+	if (!should_copy_rs_table)
+		return;
+
+	for (i = 0; i < ARRAY_SIZE(old_rs_table); i++) {
+		kgdb8250_ports[i].iobase = old_rs_table[i].port;
+		kgdb8250_ports[i].irq = irq_canonicalize(old_rs_table[i].irq);
+		kgdb8250_ports[i].uartclk = old_rs_table[i].baud_base * 16;
+		kgdb8250_ports[i].membase = old_rs_table[i].iomem_base;
+		kgdb8250_ports[i].iotype = old_rs_table[i].io_type;
+		kgdb8250_ports[i].regshift = old_rs_table[i].iomem_reg_shift;
+		kgdb8250_ports[i].line = i;
+	}
+
+	should_copy_rs_table = 0;
+#endif
+}
+
+/*
+ * Hookup our IRQ line now that it is safe to do so, after we grab any
+ * memory regions we might need to.  If we haven't been initialized yet,
+ * go ahead and copy the old_rs_table in.
+ */
+static void __init kgdb8250_late_init(void)
+{
+	/* Try and copy the old_rs_table. */
+	kgdb8250_copy_rs_table();
+
+#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
+	/* Take the port away from the main driver. */
+	serial8250_unregister_by_port(current_port);
+
+	/* Now reinit the port as the above has disabled things. */
+	kgdb8250_uart_init();
+#endif
+	/* We may need to call request_mem_region() first. */
+	if (kgdb8250_needs_request_mem_region)
+		request_mem_region(current_port->mapbase,
+				   8 << current_port->regshift, "kgdb");
+	if (request_irq(current_port->irq, kgdb8250_interrupt, SA_SHIRQ,
+			"GDB-stub", current_port) < 0)
+		printk(KERN_ERR "KGDB failed to request the serial IRQ (%d)\n",
+		       current_port->irq);
+}
+
+static __init int kgdb_init_io(void)
+{
+	/* Give us the basic table of uarts. */
+	kgdb8250_copy_rs_table();
+
+	/* We're either a module and parse a config string, or we have a
+	 * semi-static config. */
+#ifdef CONFIG_KGDB_8250_MODULE
+	if (strlen(config)) {
+		if (kgdb8250_opt(config))
+			return -EINVAL;
+	} else {
+		printk(KERN_ERR "kgdb8250: argument error, usage: "
+		       "kgdb8250=<io or mmio>,<address>,<baud rate>,<irq>\n");
+		return -EINVAL;
+	}
+#elif defined(CONFIG_KGDB_SIMPLE_SERIAL)
+	kgdb8250_baud = CONFIG_KGDB_BAUDRATE;
+
+	/* Setup our pointer to the serial port now. */
+	current_port = &kgdb8250_ports[CONFIG_KGDB_PORT_NUM];
+#else
+	if (kgdb8250_opt(CONFIG_KGDB_8250_CONF_STRING))
+		return -EINVAL;
+#endif
+
+
+	/* Internal driver setup. */
+	switch (current_port->iotype) {
+	case UPIO_MEM:
+		if (current_port->mapbase)
+			kgdb8250_needs_request_mem_region = 1;
+		if (current_port->flags & UPF_IOREMAP) {
+			current_port->membase = ioremap(current_port->mapbase,
+						8 << current_port->regshift);
+			if (!current_port->membase)
+				return -EIO;	/* Failed. */
+		}
+		kgdb8250_addr = current_port->membase;
+		break;
+	case UPIO_PORT:
+	default:
+		kgdb8250_addr = ioport_map(current_port->iobase,
+					   8 << current_port->regshift);
+		if (!kgdb8250_addr)
+			return -EIO;	/* Failed. */
+	}
+
+	if (kgdb8250_uart_init() == -1) {
+		printk(KERN_ERR "kgdb8250: init failed\n");
+		return -EIO;
+	}
+#ifdef CONFIG_KGDB_8250_MODULE
+	/* Attach the kgdb irq. When this is built into the kernel, it
+	 * is called as a part of late_init sequence.
+	 */
+	kgdb8250_late_init();
+	if (kgdb_register_io_module(&local_kgdb_io_ops))
+		return -EINVAL;
+
+	printk(KERN_INFO "kgdb8250: debugging enabled\n");
+#endif				/* CONFIG_KGD_8250_MODULE */
+
+	return 0;
+}
+
+#ifdef CONFIG_KGDB_8250_MODULE
+/* If it is a module the kgdb_io_ops should be a static which
+ * is passed to the KGDB I/O initialization
+ */
+static struct kgdb_io local_kgdb_io_ops = {
+#else				/* ! CONFIG_KGDB_8250_MODULE */
+struct kgdb_io kgdb_io_ops = {
+#endif				/* ! CONFIG_KGD_8250_MODULE */
+	.read_char = kgdb_get_debug_char,
+	.write_char = kgdb_put_debug_char,
+	.init = kgdb_init_io,
+	.late_init = kgdb8250_late_init,
+};
+
+/**
+ * 	kgdb8250_add_port - Define a serial port for use with KGDB
+ * 	@i: The index of the port being added
+ * 	@serial_req: The &struct uart_port describing the port
+ *
+ * 	On platforms where we must register the serial device
+ * 	dynamically, this is the best option if a platform also normally
+ * 	calls early_serial_setup().
+ */
+void __init kgdb8250_add_port(int i, struct uart_port *serial_req)
+{
+	/* Make sure we've got the built-in data before we override. */
+	kgdb8250_copy_rs_table();
+
+	/* Copy the whole thing over. */
+	if (current_port != &kgdb8250_ports[i])
+                memcpy(&kgdb8250_ports[i], serial_req, sizeof(struct uart_port));
+}
+
+/**
+ * 	kgdb8250_add_platform_port - Define a serial port for use with KGDB
+ * 	@i: The index of the port being added
+ * 	@p: The &struct plat_serial8250_port describing the port
+ *
+ * 	On platforms where we must register the serial device
+ * 	dynamically, this is the best option if a platform normally
+ * 	handles uart setup with an array of &struct plat_serial8250_port.
+ */
+void __init kgdb8250_add_platform_port(int i, struct plat_serial8250_port *p)
+{
+	/* Make sure we've got the built-in data before we override. */
+	kgdb8250_copy_rs_table();
+
+	kgdb8250_ports[i].iobase = p->iobase;
+	kgdb8250_ports[i].membase = p->membase;
+	kgdb8250_ports[i].irq = p->irq;
+	kgdb8250_ports[i].uartclk = p->uartclk;
+	kgdb8250_ports[i].regshift = p->regshift;
+	kgdb8250_ports[i].iotype = p->iotype;
+	kgdb8250_ports[i].flags = p->flags;
+	kgdb8250_ports[i].mapbase = p->mapbase;
+}
+
+/*
+ * Syntax for this cmdline option is:
+ * kgdb8250=<io or mmio>,<address>,<baud rate>,<irq>"
+ */
+static int __init kgdb8250_opt(char *str)
+{
+	/* We'll fill out and use the first slot. */
+	current_port = &kgdb8250_ports[0];
+
+	if (!strncmp(str, "io", 2)) {
+		current_port->iotype = UPIO_PORT;
+		str += 2;
+	} else if (!strncmp(str, "mmap", 4)) {
+		current_port->iotype = UPIO_MEM;
+		current_port->flags |= UPF_IOREMAP;
+		str += 4;
+	} else if (!strncmp(str, "mmio", 4)) {
+		current_port->iotype = UPIO_MEM;
+		current_port->flags &= ~UPF_IOREMAP;
+		str += 4;
+	} else
+		goto errout;
+
+	if (*str != ',')
+		goto errout;
+	str++;
+
+	if (current_port->iotype == UPIO_PORT)
+		current_port->iobase = simple_strtoul(str, &str, 16);
+	else {
+		if (current_port->flags & UPF_IOREMAP)
+			current_port->mapbase =
+				(unsigned long) simple_strtoul(str, &str, 16);
+		else
+			current_port->membase =
+				(void *) simple_strtoul(str, &str, 16);
+	}
+
+	if (*str != ',')
+		goto errout;
+	str++;
+
+	kgdb8250_baud = simple_strtoul(str, &str, 10);
+	if (!kgdb8250_baud)
+		goto errout;
+
+	if (*str != ',')
+		goto errout;
+	str++;
+
+	current_port->irq = simple_strtoul(str, &str, 10);
+
+#ifdef CONFIG_KGDB_SIMPLE_SERIAL
+	should_copy_rs_table = 0;
+#endif
+
+	return 0;
+
+      errout:
+	printk(KERN_ERR "Invalid syntax for option kgdb8250=\n");
+	return 1;
+}
+
+#ifdef CONFIG_KGDB_8250_MODULE
+static void cleanup_kgdb8250(void)
+{
+	kgdb_unregister_io_module(&local_kgdb_io_ops);
+
+	/* Clean up the irq and memory */
+	free_irq(current_port->irq, current_port);
+
+	if (kgdb8250_needs_request_mem_region)
+		release_mem_region(current_port->mapbase,
+				   8 << current_port->regshift);
+	/* Hook up the serial port back to what it was previously
+	 * hooked up to.
+	 */
+#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
+	/* Give the port back to the 8250 driver. */
+	serial8250_register_port(current_port);
+#endif
+}
+
+module_init(kgdb_init_io);
+module_exit(cleanup_kgdb8250);
+#else				/* ! CONFIG_KGDB_8250_MODULE */
+early_param("kgdb8250", kgdb8250_opt);
+#endif				/* ! CONFIG_KGDB_8250_MODULE */
diff -puN drivers/serial/Kconfig~kgdb-8250 drivers/serial/Kconfig
--- devel/drivers/serial/Kconfig~kgdb-8250	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/drivers/serial/Kconfig	2006-05-19 16:01:51.000000000 -0700
@@ -106,7 +106,7 @@ config SERIAL_8250_CS
 
 config SERIAL_8250_NR_UARTS
 	int "Maximum number of 8250/16550 serial ports"
-	depends on SERIAL_8250
+	depends on SERIAL_8250 || KGDB_8250
 	default "4"
 	help
 	  Set this to the number of serial ports you want the driver
diff -puN drivers/serial/Makefile~kgdb-8250 drivers/serial/Makefile
--- devel/drivers/serial/Makefile~kgdb-8250	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/drivers/serial/Makefile	2006-05-19 16:01:51.000000000 -0700
@@ -48,6 +48,7 @@ obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_
 obj-$(CONFIG_SERIAL_ICOM) += icom.o
 obj-$(CONFIG_SERIAL_M32R_SIO) += m32r_sio.o
 obj-$(CONFIG_SERIAL_MPSC) += mpsc.o
+obj-$(CONFIG_KGDB_8250) += 8250_kgdb.o
 obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o
 obj-$(CONFIG_SERIAL_JSM) += jsm/
 obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o
diff -puN drivers/serial/serial_core.c~kgdb-8250 drivers/serial/serial_core.c
--- devel/drivers/serial/serial_core.c~kgdb-8250	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/drivers/serial/serial_core.c	2006-05-19 16:01:51.000000000 -0700
@@ -34,6 +34,7 @@
 #include <linux/serial.h> /* for serial_state and serial_icounter_struct */
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/kgdb.h>
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -1666,6 +1667,9 @@ static int uart_line_info(char *buf, str
 			port->iotype == UPIO_MEM ? port->mapbase :
 						(unsigned long) port->iobase,
 			port->irq);
+	if (port->iotype == UPIO_MEM)
+		ret += sprintf(buf+ret, " membase 0x%08lX",
+					   (unsigned long) port->membase);
 
 	if (port->type == PORT_UNKNOWN) {
 		strcat(buf, "\n");
@@ -2029,7 +2033,8 @@ uart_report_port(struct uart_driver *drv
 	case UPIO_MEM32:
 	case UPIO_AU:
 		snprintf(address, sizeof(address),
-			 "MMIO 0x%lx", port->mapbase);
+			"MMIO map 0x%lx mem 0x%lx", port->mapbase,
+			(unsigned long) port->membase);
 		break;
 	default:
 		strlcpy(address, "*unknown*", sizeof(address));
@@ -2274,6 +2279,12 @@ int uart_add_one_port(struct uart_driver
 	 */
 	port->flags &= ~UPF_DEAD;
 
+#if defined(CONFIG_KGDB_8250)
+	/* Add any 8250-like ports we find later. */
+	if (port->type <= PORT_MAX_8250)
+		kgdb8250_add_port(port->line, port);
+#endif
+
  out:
 	mutex_unlock(&state->mutex);
 	mutex_unlock(&port_mutex);
diff -puN include/linux/serial_8250.h~kgdb-8250 include/linux/serial_8250.h
--- devel/include/linux/serial_8250.h~kgdb-8250	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/include/linux/serial_8250.h	2006-05-19 16:01:51.000000000 -0700
@@ -56,6 +56,7 @@ struct uart_port;
 
 int serial8250_register_port(struct uart_port *);
 void serial8250_unregister_port(int line);
+void serial8250_unregister_by_port(struct uart_port *port);
 void serial8250_suspend_port(int line);
 void serial8250_resume_port(int line);
 
diff -puN lib/Kconfig.debug~kgdb-8250 lib/Kconfig.debug
--- devel/lib/Kconfig.debug~kgdb-8250	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/lib/Kconfig.debug	2006-05-19 16:01:51.000000000 -0700
@@ -294,7 +294,7 @@ config KGDB_CONSOLE
 choice
 	prompt "Method for KGDB communication"
 	depends on KGDB
-	default KGDB_ONLY_MODULES
+	default KGDB_8250_NOMODULE
 	help
 	  There are a number of different ways in which you can communicate
 	  with KGDB.  The most common is via serial, with the 8250 driver
@@ -312,4 +312,60 @@ config KGDB_ONLY_MODULES
 	  Use only kernel modules to configure KGDB I/O after the
 	  kernel is booted.
 
+config KGDB_8250_NOMODULE
+	bool "KGDB: On generic serial port (8250)"
+	select KGDB_8250
+	help
+	  Uses generic serial port (8250) to communicate with the host
+	  GDB.  This is independent of the normal (SERIAL_8250) driver
+	  for this chipset.
 endchoice
+
+config KGDB_8250
+	tristate "KGDB: On generic serial port (8250)" if !KGDB_8250_NOMODULE
+	depends on m && KGDB_ONLY_MODULES
+	help
+	  Uses generic serial port (8250) to communicate with the host
+	  GDB.  This is independent of the normal (SERIAL_8250) driver
+	  for this chipset.
+
+config KGDB_SIMPLE_SERIAL
+	bool "Simple selection of KGDB serial port"
+	depends on KGDB_8250_NOMODULE
+	default y
+	help
+	  If you say Y here, you will only have to pick the baud rate
+	  and port number that you wish to use for KGDB.  Note that this
+	  only works on architectures that register known serial ports
+	  early on.  If you say N, you will have to provide, either here
+	  or on the command line, the type (I/O or MMIO), IRQ and
+	  address to use.  If in doubt, say Y.
+
+config KGDB_BAUDRATE
+	int "Debug serial port baud rate"
+	depends on (KGDB_8250 && KGDB_SIMPLE_SERIAL)
+	default "115200"
+	help
+	  gdb and the kernel stub need to agree on the baud rate to be
+	  used.  Standard rates from 9600 to 115200 are allowed, and this
+	  may be overridden via the commandline.
+
+config KGDB_PORT_NUM
+	int "Serial port number for KGDB"
+	range 0 1 if KGDB_MPSC
+	range 0 3
+	depends on (KGDB_8250 && KGDB_SIMPLE_SERIAL) || KGDB_MPSC
+	default "0"
+	help
+	  Pick the port number (0 based) for KGDB to use.
+
+config KGDB_8250_CONF_STRING
+	string "Configuration string for KGDB"
+	depends on KGDB_8250_NOMODULE && !KGDB_SIMPLE_SERIAL
+	default "io,2f8,115200,3" if X86
+	help
+	  The format of this string should be <io or
+	  mmio>,<address>,<baud rate>,<irq>.  For example, to use the
+	  serial port on an i386 box located at 0x2f8 and 115200 baud
+	  on IRQ 3 at use:
+	  io,2f8,115200,3
_

kgdb-cfi_annotations.patch:
 Makefile                    |    6 
 arch/i386/kernel/entry.S    |  111 ++++++
 arch/i386/kernel/head.S     |    5 
 arch/i386/kernel/process.c  |   20 +
 arch/i386/kernel/smpboot.c  |    3 
 include/asm-generic/kgdb.h  |   34 +
 include/asm-i386/kgdb.h     |   59 +--
 include/linux/dwarf2-lang.h |  300 +++++++++++++++++
 include/linux/dwarf2.h      |  775 ++++++++++++++++++++++++++++++++++++++++++++
 scripts/dwarfh.awk          |   19 +
 10 files changed, 1302 insertions(+), 30 deletions(-)

--- NEW FILE kgdb-cfi_annotations.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 Makefile                    |    6 
 arch/i386/kernel/entry.S    |  111 ++++
 arch/i386/kernel/head.S     |    5 
 arch/i386/kernel/process.c  |   20 
 arch/i386/kernel/smpboot.c  |    3 
 include/asm-generic/kgdb.h  |   34 +
 include/asm-i386/kgdb.h     |   59 +-
 include/linux/dwarf2-lang.h |  300 +++++++++++++
 include/linux/dwarf2.h      |  775 ++++++++++++++++++++++++++++++++++
 scripts/dwarfh.awk          |   19 
 10 files changed, 1302 insertions(+), 30 deletions(-)

diff -puN arch/i386/kernel/entry.S~kgdb-cfi_annotations arch/i386/kernel/entry.S
--- devel/arch/i386/kernel/entry.S~kgdb-cfi_annotations	2006-05-29 15:20:12.000000000 -0700
+++ devel-akpm/arch/i386/kernel/entry.S	2006-05-29 15:20:29.000000000 -0700
@@ -123,7 +123,7 @@ VM_MASK		= 0x00020000
 .previous
 
 
-ENTRY(ret_from_fork)
+KPROBE_ENTRY(ret_from_fork)
 	pushl %eax
 	call schedule_tail
 	GET_THREAD_INFO(%ebp)
@@ -480,7 +480,7 @@ ENTRY(simd_coprocessor_error)
 	pushl $do_simd_coprocessor_error
 	jmp error_code
 
-ENTRY(device_not_available)
+KPROBE_ENTRY(device_not_available)
 	pushl $-1			# mark this as an int
 	SAVE_ALL
 	movl %cr0, %eax
@@ -662,7 +662,7 @@ ENTRY(machine_check)
 	jmp error_code
 #endif
 
-ENTRY(spurious_interrupt_bug)
+KPROBE_ENTRY(spurious_interrupt_bug)
 	pushl $0
 	pushl $do_spurious_interrupt_bug
 	jmp error_code
@@ -920,3 +920,108 @@ ENDPROC(arch_unwind_init_running)
 #include "syscall_table.S"
 
 syscall_table_size=(.-sys_call_table)
+
+#	Here we do call frames.  We cheat a bit as we only really need
+#	correct frames at locations we can actually look at from a
+#	debugger.  Since the break instruction trap actually goes thru
+#	some of this code, we don't really need info on those areas, but
+#	only after the fact.  I.e. if we can not step or break in a
+#	location or end up with a return address pointing at the
+#	location, we don't need a correct call frame for it.
+
+#ifdef CONFIG_KGDB
+
+#include <linux/dwarf2-lang.h>
+/*
+ * The register numbers as known by gdb
+ */
+
+#define _EAX 0
+#define _ECX 1
+#define _EDX 2
+#define _EBX 3
+#define _ESP 4
+#define _EBP 5
+#define _ESI 6
+#define _EDI 7
+#define _PC  8
+#define _EIP 8
+#define _PS  9
+#define _EFLAGS  9
+#define _CS 10
+#define _SS 11
+#define _DS 12
+#define _ES 13
+#define _FS 14
+#define _GS 15
+	/*
+	 * This code uses macros defined in linux/dwarf2-lang.h
+	 * They attempt to follow the dwarf2 naming conventions... sort of..
+	 */
+ENTRY(end_of_stack_stop_unwind_function)
+	.long 	end_of_stack_stop_unwind_function+1
+
+	.text
+
+	CFI_preamble(c1,_PC,1,1)
+	CFA_define_reference(_ESP,OLDESP)	/* Stack pointer */
+	CFA_expression(_EIP)
+	   CFA_exp_OP_dup			/* copy old esp */
+ 	   CFA_exp_OP_consts(CS-OLDESP)		/* offset to CS address */
+ 	   CFA_exp_OP_plus			/* should be CS address */
+	   CFA_exp_OP_deref			/* get the CS */
+	   CFA_exp_OP_const4s(VM_MASK|3)	/* prepare to mask it */
+	   CFA_exp_OP_and			/* mask it, zero means kernel */
+	   CFA_exp_OP_bra(eip_user_rtn)		/* branch if user */
+	   CFA_exp_OP_const4s(EIP-OLDESP)	/* offset to return address */
+	   CFA_exp_OP_plus			/* add that in */
+	   CFA_exp_OP_skip(eip_end)		/* done if kernel, skip out */
+eip_user_rtn:
+	   CFA_exp_OP_addr(end_of_stack_stop_unwind_function)/*dummy function */
+eip_end:
+	   CFA_expression_end
+	CFA_define_offset(_EBX,EBX-OLDESP)
+	CFA_define_offset(_ECX,ECX-OLDESP)
+	CFA_define_offset(_EDX,EDX-OLDESP)
+	CFA_define_offset(_ESI,ESI-OLDESP)
+	CFA_define_offset(_EDI,EDI-OLDESP)
+	CFA_define_offset(_EBP,EBP-OLDESP)
+	CFA_define_offset(_EAX,EAX-OLDESP)
+	CFA_define_offset(_EFLAGS,EFLAGS-OLDESP)
+	CFI_postamble()
+
+/*
+ * This provides an uwind for our dummy end of unwind function.
+ * Current convention is to provied an undefined return address.
+ */
+	CFI_preamble(c2,_PC,1,1)
+	CFA_define_reference(_ESP,0)	/* Stack pointer */
+	CFA_undefine_reg(_EIP)
+	CFI_postamble()
+
+	FDE_preamble(c2,end_of_stack_stop_unwind_function,	\
+	                end_of_stack_stop_unwind_function+5)
+	FDE_postamble()
+	/*
+         * This is VERY sloppy.  At this point all we want to do is get
+         * the frame right for back tracing.  It will not be good if
+         * you try to single step.  We use already defined labels.
+         * We want to cover all call outs.
+         * We could also recode this as just one FDE, but this works and
+         * I want to get it out.
+	 */
+	FDE_preamble(c1,ret_from_fork,ret_from_exception)
+	CFA_define_cfa_offset(4)		/* one extra word on stack */
+	FDE_postamble()
+
+	FDE_preamble(c1,ret_from_exception,device_not_available_emulate)
+	FDE_postamble()
+
+		FDE_preamble(c1,device_not_available_emulate,debug)
+	CFA_define_cfa_offset(4)		/* one extra word on stack */
+	FDE_postamble()
+
+	FDE_preamble(c1, debug,spurious_interrupt_bug)
+	FDE_postamble()
+
+#endif
diff -puN arch/i386/kernel/head.S~kgdb-cfi_annotations arch/i386/kernel/head.S
--- devel/arch/i386/kernel/head.S~kgdb-cfi_annotations	2006-05-29 15:20:12.000000000 -0700
+++ devel-akpm/arch/i386/kernel/head.S	2006-05-29 15:20:12.000000000 -0700
@@ -11,6 +11,7 @@
 #include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/linkage.h>
+#include <asm/kgdb.h>
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -332,7 +333,9 @@ is386:	movl $2,%ecx		# set MP
 L6:
 	jmp L6			# main should never return here, but
 				# just in case, we know what happens.
-
+	/* This dwarf code tells gdb that this is the end of the unwind */
+	/* This uses the CFA set up for pc=1 located in entry.S */
+	CFI_END_FRAME(is386)
 /*
  * We depend on ET to be correct. This checks for 287/387.
  */
diff -puN arch/i386/kernel/process.c~kgdb-cfi_annotations arch/i386/kernel/process.c
--- devel/arch/i386/kernel/process.c~kgdb-cfi_annotations	2006-05-29 15:20:12.000000000 -0700
+++ devel-akpm/arch/i386/kernel/process.c	2006-05-29 15:20:12.000000000 -0700
@@ -329,7 +329,27 @@ __asm__(".section .text\n"
 	"call *%ebx\n\t"
 	"pushl %eax\n\t"
 	"call do_exit\n"
+	"kernel_thread_helper_end:\n\t"
 	".previous");
+#ifdef CONFIG_KGDB
+#include <linux/dwarf2-lang.h>
+
+	/* This dwarf code tells gdb that this is the end of the unwind */
+	/* This uses the CFA set up for pc=1 located in entry.S */
+#define _ESP 4
+#define _PC  8
+#define _EIP 8
+__asm__(
+	QUOTE_THIS(
+		CFI_preamble(dwarf_4,_PC,1,1)
+		CFA_define_reference(_ESP,0)	/* Stack pointer */
+		CFA_undefine_reg(_EIP)
+		CFI_postamble()
+
+		FDE_preamble(dwarf_4,kernel_thread_helper,kernel_thread_helper_end)
+		FDE_postamble()
+		));
+#endif
 
 /*
  * Create a kernel thread
diff -puN arch/i386/kernel/smpboot.c~kgdb-cfi_annotations arch/i386/kernel/smpboot.c
--- devel/arch/i386/kernel/smpboot.c~kgdb-cfi_annotations	2006-05-29 15:20:12.000000000 -0700
+++ devel-akpm/arch/i386/kernel/smpboot.c	2006-05-29 15:20:12.000000000 -0700
@@ -585,6 +585,9 @@ void __devinit initialize_secondary(void
 
 	asm volatile(
 		"movl %0,%%esp\n\t"
+#ifdef CONFIG_KGDB
+		"pushl end_of_stack_stop_unwind_function\n\t"
+#endif
 		"jmp *%1"
 		:
 		:"r" (current->thread.esp),"r" (current->thread.eip));
diff -puN /dev/null include/asm-generic/kgdb.h
--- /dev/null	2006-05-29 10:18:53.280907750 -0700
+++ devel-akpm/include/asm-generic/kgdb.h	2006-05-29 15:20:12.000000000 -0700
@@ -0,0 +1,34 @@
+/*
+ * include/asm-generic/kgdb.h
+ *
+ * This provides the assembly level information so that KGDB can provide
+ * a GDB that has been patched with enough information to know to stop
+ * trying to unwind the function.
+ *
+ * Author: Tom Rini <trini at kernel.crashing.org>
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under the terms
+ * of the GNU General Public License version 2. This program is licensed
+ * "as is" without any warranty of any kind, whether express or implied.
+ */
+
+#ifndef __ASM_GENERIC_KGDB_H__
+#define __ASM_GENERIC_KGDB_H__
+
+#include <linux/dwarf2-lang.h>
+#ifdef __ASSEMBLY__
+#ifdef CONFIG_KGDB
+/* This MUST be put at the end of a given assembly function */
+#define __CFI_END_FRAME(pc,sp,func)			\
+CAT3(.Lend_,func,:)					\
+	CFI_preamble(func,pc,0x1,-DATA_ALIGN_FACTOR)	\
+	CFA_define_reference(sp, 0)			\
+	CFA_undefine_reg(pc)				\
+	CFI_postamble()					\
+	FDE_preamble(func,func,CAT3(.Lend,_,func))	\
+	FDE_postamble()
+#else
+#define __CFI_END_FRAME(pc,sp,fn)
+#endif				/* CONFIG_KGDB */
+#endif				/* __ASSEMBLY__ */
+#endif				/* __ASM_GENERIC_KGDB_H__ */
diff -puN include/asm-i386/kgdb.h~kgdb-cfi_annotations include/asm-i386/kgdb.h
--- devel/include/asm-i386/kgdb.h~kgdb-cfi_annotations	2006-05-29 15:20:12.000000000 -0700
+++ devel-akpm/include/asm-i386/kgdb.h	2006-05-29 15:20:12.000000000 -0700
@@ -6,6 +6,39 @@
  * Copyright (C) 2001-2004 Amit S. Kale
  */
 
+#include <asm-generic/kgdb.h>
+
+/*
+ *  Note that this register image is in a different order than
+ *  the register image that Linux produces at interrupt time.
+ *
+ *  Linux's register image is defined by struct pt_regs in ptrace.h.
+ *  Just why GDB uses a different order is a historical mystery.
+ */
+#define _EAX	0
+#define _ECX	1
+#define _EDX	2
+#define _EBX	3
+#define _ESP	4
+#define _EBP	5
+#define _ESI	6
+#define _EDI	7
+#define _PC	8
+#define _EIP	8
+#define _PS	9
+#define _EFLAGS	9
+#define _CS	10
+#define _SS	11
+#define _DS	12
+#define _ES	13
+#define _FS	14
+#define _GS	15
+
+/* So that we can denote the end of a frame for tracing, in the simple
+ * case. */
+#define CFI_END_FRAME(func)	__CFI_END_FRAME(_EIP,_ESP,func)
+
+#ifndef __ASSEMBLY__
 /************************************************************************/
 /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
 /* at least NUMREGBYTES*2 are needed for register packets */
@@ -17,33 +50,9 @@
 /* Number of bytes of registers we need to save for a setjmp/longjmp. */
 #define NUMCRITREGBYTES		24
 
-/*
- *  Note that this register image is in a different order than
- *  the register image that Linux produces at interrupt time.
- *
- *  Linux's register image is defined by struct pt_regs in ptrace.h.
- *  Just why GDB uses a different order is a historical mystery.
- */
-enum regnames { _EAX,		/* 0 */
-	_ECX,			/* 1 */
-	_EDX,			/* 2 */
-	_EBX,			/* 3 */
-	_ESP,			/* 4 */
-	_EBP,			/* 5 */
-	_ESI,			/* 6 */
-	_EDI,			/* 7 */
-	_PC,			/* 8 also known as eip */
-	_PS,			/* 9 also known as eflags */
-	_CS,			/* 10 */
-	_SS,			/* 11 */
-	_DS,			/* 12 */
-	_ES,			/* 13 */
-	_FS,			/* 14 */
-	_GS			/* 15 */
-};
-
 #define BREAKPOINT()		asm("   int $3");
 #define BREAK_INSTR_SIZE	1
 #define CACHE_FLUSH_IS_SAFE	1
+#endif				/* !__ASSEMBLY__ */
 #endif				/* _ASM_KGDB_H_ */
 #endif				/* __KERNEL__ */
diff -puN /dev/null include/linux/dwarf2.h
--- /dev/null	2006-05-29 10:18:53.280907750 -0700
+++ devel-akpm/include/linux/dwarf2.h	2006-05-29 15:20:12.000000000 -0700
@@ -0,0 +1,775 @@
+/* Declarations and definitions of codes relating to the DWARF2 symbolic
+   debugging information format.
+   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+   2003 Free Software Foundation, Inc.
+
+   Written by Gary Funck (gary at intrepid.com) The Ada Joint Program
+   Office (AJPO), Florida State Unviversity and Silicon Graphics Inc.
+   provided support for this effort -- June 21, 1995.
+
+   Derived from the DWARF 1 implementation written by Ron Guilmette
+   (rfg at netcom.com), November 1990.
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 2, or (at your option) any later
+   version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+/* This file is derived from the DWARF specification (a public document)
+   Revision 2.0.0 (July 27, 1993) developed by the UNIX International
+   Programming Languages Special Interest Group (UI/PLSIG) and distributed
+   by UNIX International.  Copies of this specification are available from
+   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
+
+   This file also now contains definitions from the DWARF 3 specification.  */
+
+/* This file is shared between GCC and GDB, and should not contain
+   prototypes.  */
+
+#ifndef _ELF_DWARF2_H
+#define _ELF_DWARF2_H
+
+/* Structure found in the .debug_line section.  */
+typedef struct
+{
+  unsigned char li_length          [4];
+  unsigned char li_version         [2];
+  unsigned char li_prologue_length [4];
+  unsigned char li_min_insn_length [1];
+  unsigned char li_default_is_stmt [1];
+  unsigned char li_line_base       [1];
+  unsigned char li_line_range      [1];
+  unsigned char li_opcode_base     [1];
+}
+DWARF2_External_LineInfo;
+
+typedef struct
+{
+  unsigned long  li_length;
+  unsigned short li_version;
+  unsigned int   li_prologue_length;
+  unsigned char  li_min_insn_length;
+  unsigned char  li_default_is_stmt;
+  int            li_line_base;
+  unsigned char  li_line_range;
+  unsigned char  li_opcode_base;
+}
+DWARF2_Internal_LineInfo;
+
+/* Structure found in .debug_pubnames section.  */
+typedef struct
+{
+  unsigned char pn_length  [4];
+  unsigned char pn_version [2];
+  unsigned char pn_offset  [4];
+  unsigned char pn_size    [4];
+}
+DWARF2_External_PubNames;
+
+typedef struct
+{
+  unsigned long  pn_length;
+  unsigned short pn_version;
+  unsigned long  pn_offset;
+  unsigned long  pn_size;
+}
+DWARF2_Internal_PubNames;
+
+/* Structure found in .debug_info section.  */
+typedef struct
+{
+  unsigned char  cu_length        [4];
+  unsigned char  cu_version       [2];
+  unsigned char  cu_abbrev_offset [4];
+  unsigned char  cu_pointer_size  [1];
+}
+DWARF2_External_CompUnit;
+
+typedef struct
+{
+  unsigned long  cu_length;
+  unsigned short cu_version;
+  unsigned long  cu_abbrev_offset;
+  unsigned char  cu_pointer_size;
+}
+DWARF2_Internal_CompUnit;
+
+typedef struct
+{
+  unsigned char  ar_length       [4];
+  unsigned char  ar_version      [2];
+  unsigned char  ar_info_offset  [4];
+  unsigned char  ar_pointer_size [1];
+  unsigned char  ar_segment_size [1];
+}
+DWARF2_External_ARange;
+
+typedef struct
+{
+  unsigned long  ar_length;
+  unsigned short ar_version;
+  unsigned long  ar_info_offset;
+  unsigned char  ar_pointer_size;
+  unsigned char  ar_segment_size;
+}
+DWARF2_Internal_ARange;
+
+
+/* Tag names and codes.  */
+enum dwarf_tag
+  {
+    DW_TAG_padding = 0x00,
+    DW_TAG_array_type = 0x01,
+    DW_TAG_class_type = 0x02,
+    DW_TAG_entry_point = 0x03,
+    DW_TAG_enumeration_type = 0x04,
+    DW_TAG_formal_parameter = 0x05,
+    DW_TAG_imported_declaration = 0x08,
+    DW_TAG_label = 0x0a,
+    DW_TAG_lexical_block = 0x0b,
+    DW_TAG_member = 0x0d,
+    DW_TAG_pointer_type = 0x0f,
+    DW_TAG_reference_type = 0x10,
+    DW_TAG_compile_unit = 0x11,
+    DW_TAG_string_type = 0x12,
+    DW_TAG_structure_type = 0x13,
+    DW_TAG_subroutine_type = 0x15,
+    DW_TAG_typedef = 0x16,
+    DW_TAG_union_type = 0x17,
+    DW_TAG_unspecified_parameters = 0x18,
+    DW_TAG_variant = 0x19,
+    DW_TAG_common_block = 0x1a,
+    DW_TAG_common_inclusion = 0x1b,
+    DW_TAG_inheritance = 0x1c,
+    DW_TAG_inlined_subroutine = 0x1d,
+    DW_TAG_module = 0x1e,
+    DW_TAG_ptr_to_member_type = 0x1f,
+    DW_TAG_set_type = 0x20,
+    DW_TAG_subrange_type = 0x21,
+    DW_TAG_with_stmt = 0x22,
+    DW_TAG_access_declaration = 0x23,
+    DW_TAG_base_type = 0x24,
+    DW_TAG_catch_block = 0x25,
+    DW_TAG_const_type = 0x26,
+    DW_TAG_constant = 0x27,
+    DW_TAG_enumerator = 0x28,
+    DW_TAG_file_type = 0x29,
+    DW_TAG_friend = 0x2a,
+    DW_TAG_namelist = 0x2b,
+    DW_TAG_namelist_item = 0x2c,
+    DW_TAG_packed_type = 0x2d,
+    DW_TAG_subprogram = 0x2e,
+    DW_TAG_template_type_param = 0x2f,
+    DW_TAG_template_value_param = 0x30,
+    DW_TAG_thrown_type = 0x31,
+    DW_TAG_try_block = 0x32,
+    DW_TAG_variant_part = 0x33,
+    DW_TAG_variable = 0x34,
+    DW_TAG_volatile_type = 0x35,
+    /* DWARF 3.  */
+    DW_TAG_dwarf_procedure = 0x36,
+    DW_TAG_restrict_type = 0x37,
+    DW_TAG_interface_type = 0x38,
+    DW_TAG_namespace = 0x39,
+    DW_TAG_imported_module = 0x3a,
+    DW_TAG_unspecified_type = 0x3b,
+    DW_TAG_partial_unit = 0x3c,
+    DW_TAG_imported_unit = 0x3d,
+    /* SGI/MIPS Extensions.  */
+    DW_TAG_MIPS_loop = 0x4081,
+    /* HP extensions.  See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz .  */
+    DW_TAG_HP_array_descriptor = 0x4090,
+    /* GNU extensions.  */
+    DW_TAG_format_label = 0x4101,	/* For FORTRAN 77 and Fortran 90.  */
+    DW_TAG_function_template = 0x4102,	/* For C++.  */
+    DW_TAG_class_template = 0x4103,	/* For C++.  */
+    DW_TAG_GNU_BINCL = 0x4104,
+    DW_TAG_GNU_EINCL = 0x4105,
+    /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */
+    DW_TAG_upc_shared_type = 0x8765,
+    DW_TAG_upc_strict_type = 0x8766,
+    DW_TAG_upc_relaxed_type = 0x8767,
+    /* PGI (STMicroelectronics) extensions.  No documentation available.  */
+    DW_TAG_PGI_kanji_type      = 0xA000,
+    DW_TAG_PGI_interface_block = 0xA020
+  };
+
+#define DW_TAG_lo_user	0x4080
+#define DW_TAG_hi_user	0xffff
+
+/* Flag that tells whether entry has a child or not.  */
+#define DW_children_no   0
+#define	DW_children_yes  1
+
+/* Form names and codes.  */
+enum dwarf_form
+  {
+    DW_FORM_addr = 0x01,
+    DW_FORM_block2 = 0x03,
+    DW_FORM_block4 = 0x04,
+    DW_FORM_data2 = 0x05,
+    DW_FORM_data4 = 0x06,
+    DW_FORM_data8 = 0x07,
+    DW_FORM_string = 0x08,
+    DW_FORM_block = 0x09,
+    DW_FORM_block1 = 0x0a,
+    DW_FORM_data1 = 0x0b,
+    DW_FORM_flag = 0x0c,
+    DW_FORM_sdata = 0x0d,
+    DW_FORM_strp = 0x0e,
+    DW_FORM_udata = 0x0f,
+    DW_FORM_ref_addr = 0x10,
+    DW_FORM_ref1 = 0x11,
+    DW_FORM_ref2 = 0x12,
+    DW_FORM_ref4 = 0x13,
+    DW_FORM_ref8 = 0x14,
+    DW_FORM_ref_udata = 0x15,
+    DW_FORM_indirect = 0x16
+  };
+
+/* Attribute names and codes.  */
+enum dwarf_attribute
+  {
+    DW_AT_sibling = 0x01,
+    DW_AT_location = 0x02,
+    DW_AT_name = 0x03,
+    DW_AT_ordering = 0x09,
+    DW_AT_subscr_data = 0x0a,
+    DW_AT_byte_size = 0x0b,
+    DW_AT_bit_offset = 0x0c,
+    DW_AT_bit_size = 0x0d,
+    DW_AT_element_list = 0x0f,
+    DW_AT_stmt_list = 0x10,
+    DW_AT_low_pc = 0x11,
+    DW_AT_high_pc = 0x12,
+    DW_AT_language = 0x13,
+    DW_AT_member = 0x14,
+    DW_AT_discr = 0x15,
+    DW_AT_discr_value = 0x16,
+    DW_AT_visibility = 0x17,
+    DW_AT_import = 0x18,
+    DW_AT_string_length = 0x19,
+    DW_AT_common_reference = 0x1a,
+    DW_AT_comp_dir = 0x1b,
+    DW_AT_const_value = 0x1c,
+    DW_AT_containing_type = 0x1d,
+    DW_AT_default_value = 0x1e,
+    DW_AT_inline = 0x20,
+    DW_AT_is_optional = 0x21,
+    DW_AT_lower_bound = 0x22,
+    DW_AT_producer = 0x25,
+    DW_AT_prototyped = 0x27,
+    DW_AT_return_addr = 0x2a,
+    DW_AT_start_scope = 0x2c,
+    DW_AT_stride_size = 0x2e,
+    DW_AT_upper_bound = 0x2f,
+    DW_AT_abstract_origin = 0x31,
+    DW_AT_accessibility = 0x32,
+    DW_AT_address_class = 0x33,
+    DW_AT_artificial = 0x34,
+    DW_AT_base_types = 0x35,
+    DW_AT_calling_convention = 0x36,
+    DW_AT_count = 0x37,
+    DW_AT_data_member_location = 0x38,
+    DW_AT_decl_column = 0x39,
+    DW_AT_decl_file = 0x3a,
+    DW_AT_decl_line = 0x3b,
+    DW_AT_declaration = 0x3c,
+    DW_AT_discr_list = 0x3d,
+    DW_AT_encoding = 0x3e,
+    DW_AT_external = 0x3f,
+    DW_AT_frame_base = 0x40,
+    DW_AT_friend = 0x41,
+    DW_AT_identifier_case = 0x42,
+    DW_AT_macro_info = 0x43,
+    DW_AT_namelist_items = 0x44,
+    DW_AT_priority = 0x45,
+    DW_AT_segment = 0x46,
+    DW_AT_specification = 0x47,
+    DW_AT_static_link = 0x48,
+    DW_AT_type = 0x49,
+    DW_AT_use_location = 0x4a,
+    DW_AT_variable_parameter = 0x4b,
+    DW_AT_virtuality = 0x4c,
+    DW_AT_vtable_elem_location = 0x4d,
+    /* DWARF 3 values.  */
+    DW_AT_allocated     = 0x4e,
+    DW_AT_associated    = 0x4f,
+    DW_AT_data_location = 0x50,
+    DW_AT_stride        = 0x51,
+    DW_AT_entry_pc      = 0x52,
+    DW_AT_use_UTF8      = 0x53,
+    DW_AT_extension     = 0x54,
+    DW_AT_ranges        = 0x55,
+    DW_AT_trampoline    = 0x56,
+    DW_AT_call_column   = 0x57,
+    DW_AT_call_file     = 0x58,
+    DW_AT_call_line     = 0x59,
+    /* SGI/MIPS extensions.  */
+    DW_AT_MIPS_fde = 0x2001,
+    DW_AT_MIPS_loop_begin = 0x2002,
+    DW_AT_MIPS_tail_loop_begin = 0x2003,
+    DW_AT_MIPS_epilog_begin = 0x2004,
+    DW_AT_MIPS_loop_unroll_factor = 0x2005,
+    DW_AT_MIPS_software_pipeline_depth = 0x2006,
+    DW_AT_MIPS_linkage_name = 0x2007,
+    DW_AT_MIPS_stride = 0x2008,
+    DW_AT_MIPS_abstract_name = 0x2009,
+    DW_AT_MIPS_clone_origin = 0x200a,
+    DW_AT_MIPS_has_inlines = 0x200b,
+    /* HP extensions.  */
+    DW_AT_HP_block_index         = 0x2000,
+    DW_AT_HP_unmodifiable        = 0x2001, /* Same as DW_AT_MIPS_fde.  */
+    DW_AT_HP_actuals_stmt_list   = 0x2010,
+    DW_AT_HP_proc_per_section    = 0x2011,
+    DW_AT_HP_raw_data_ptr        = 0x2012,
+    DW_AT_HP_pass_by_reference   = 0x2013,
+    DW_AT_HP_opt_level           = 0x2014,
+    DW_AT_HP_prof_version_id     = 0x2015,
+    DW_AT_HP_opt_flags           = 0x2016,
+    DW_AT_HP_cold_region_low_pc  = 0x2017,
+    DW_AT_HP_cold_region_high_pc = 0x2018,
+    DW_AT_HP_all_variables_modifiable = 0x2019,
+    DW_AT_HP_linkage_name        = 0x201a,
+    DW_AT_HP_prof_flags          = 0x201b,  /* In comp unit of procs_info for -g.  */
+    /* GNU extensions.  */
+    DW_AT_sf_names   = 0x2101,
+    DW_AT_src_info   = 0x2102,
+    DW_AT_mac_info   = 0x2103,
+    DW_AT_src_coords = 0x2104,
+    DW_AT_body_begin = 0x2105,
+    DW_AT_body_end   = 0x2106,
+    DW_AT_GNU_vector = 0x2107,
+    /* VMS extensions.  */
+    DW_AT_VMS_rtnbeg_pd_address = 0x2201,
+    /* UPC extension.  */
+    DW_AT_upc_threads_scaled = 0x3210,
+    /* PGI (STMicroelectronics) extensions.  */
+    DW_AT_PGI_lbase    = 0x3a00,
+    DW_AT_PGI_soffset  = 0x3a01,
+    DW_AT_PGI_lstride  = 0x3a02
+  };
+
+#define DW_AT_lo_user	0x2000	/* Implementation-defined range start.  */
+#define DW_AT_hi_user	0x3ff0	/* Implementation-defined range end.  */
+
+/* Location atom names and codes.  */
+enum dwarf_location_atom
+  {
+    DW_OP_addr = 0x03,
+    DW_OP_deref = 0x06,
+    DW_OP_const1u = 0x08,
+    DW_OP_const1s = 0x09,
+    DW_OP_const2u = 0x0a,
+    DW_OP_const2s = 0x0b,
+    DW_OP_const4u = 0x0c,
+    DW_OP_const4s = 0x0d,
+    DW_OP_const8u = 0x0e,
+    DW_OP_const8s = 0x0f,
+    DW_OP_constu = 0x10,
+    DW_OP_consts = 0x11,
+    DW_OP_dup = 0x12,
+    DW_OP_drop = 0x13,
+    DW_OP_over = 0x14,
+    DW_OP_pick = 0x15,
+    DW_OP_swap = 0x16,
+    DW_OP_rot = 0x17,
+    DW_OP_xderef = 0x18,
+    DW_OP_abs = 0x19,
+    DW_OP_and = 0x1a,
+    DW_OP_div = 0x1b,
+    DW_OP_minus = 0x1c,
+    DW_OP_mod = 0x1d,
+    DW_OP_mul = 0x1e,
+    DW_OP_neg = 0x1f,
+    DW_OP_not = 0x20,
+    DW_OP_or = 0x21,
+    DW_OP_plus = 0x22,
+    DW_OP_plus_uconst = 0x23,
+    DW_OP_shl = 0x24,
+    DW_OP_shr = 0x25,
+    DW_OP_shra = 0x26,
+    DW_OP_xor = 0x27,
+    DW_OP_bra = 0x28,
+    DW_OP_eq = 0x29,
+    DW_OP_ge = 0x2a,
+    DW_OP_gt = 0x2b,
+    DW_OP_le = 0x2c,
+    DW_OP_lt = 0x2d,
+    DW_OP_ne = 0x2e,
+    DW_OP_skip = 0x2f,
+    DW_OP_lit0 = 0x30,
+    DW_OP_lit1 = 0x31,
+    DW_OP_lit2 = 0x32,
+    DW_OP_lit3 = 0x33,
+    DW_OP_lit4 = 0x34,
+    DW_OP_lit5 = 0x35,
+    DW_OP_lit6 = 0x36,
+    DW_OP_lit7 = 0x37,
+    DW_OP_lit8 = 0x38,
+    DW_OP_lit9 = 0x39,
+    DW_OP_lit10 = 0x3a,
+    DW_OP_lit11 = 0x3b,
+    DW_OP_lit12 = 0x3c,
+    DW_OP_lit13 = 0x3d,
+    DW_OP_lit14 = 0x3e,
+    DW_OP_lit15 = 0x3f,
+    DW_OP_lit16 = 0x40,
+    DW_OP_lit17 = 0x41,
+    DW_OP_lit18 = 0x42,
+    DW_OP_lit19 = 0x43,
+    DW_OP_lit20 = 0x44,
+    DW_OP_lit21 = 0x45,
+    DW_OP_lit22 = 0x46,
+    DW_OP_lit23 = 0x47,
+    DW_OP_lit24 = 0x48,
+    DW_OP_lit25 = 0x49,
+    DW_OP_lit26 = 0x4a,
+    DW_OP_lit27 = 0x4b,
+    DW_OP_lit28 = 0x4c,
+    DW_OP_lit29 = 0x4d,
+    DW_OP_lit30 = 0x4e,
+    DW_OP_lit31 = 0x4f,
+    DW_OP_reg0 = 0x50,
+    DW_OP_reg1 = 0x51,
+    DW_OP_reg2 = 0x52,
+    DW_OP_reg3 = 0x53,
+    DW_OP_reg4 = 0x54,
+    DW_OP_reg5 = 0x55,
+    DW_OP_reg6 = 0x56,
+    DW_OP_reg7 = 0x57,
+    DW_OP_reg8 = 0x58,
+    DW_OP_reg9 = 0x59,
+    DW_OP_reg10 = 0x5a,
+    DW_OP_reg11 = 0x5b,
+    DW_OP_reg12 = 0x5c,
+    DW_OP_reg13 = 0x5d,
+    DW_OP_reg14 = 0x5e,
+    DW_OP_reg15 = 0x5f,
+    DW_OP_reg16 = 0x60,
+    DW_OP_reg17 = 0x61,
+    DW_OP_reg18 = 0x62,
+    DW_OP_reg19 = 0x63,
+    DW_OP_reg20 = 0x64,
+    DW_OP_reg21 = 0x65,
+    DW_OP_reg22 = 0x66,
+    DW_OP_reg23 = 0x67,
+    DW_OP_reg24 = 0x68,
+    DW_OP_reg25 = 0x69,
+    DW_OP_reg26 = 0x6a,
+    DW_OP_reg27 = 0x6b,
+    DW_OP_reg28 = 0x6c,
+    DW_OP_reg29 = 0x6d,
+    DW_OP_reg30 = 0x6e,
+    DW_OP_reg31 = 0x6f,
+    DW_OP_breg0 = 0x70,
+    DW_OP_breg1 = 0x71,
+    DW_OP_breg2 = 0x72,
+    DW_OP_breg3 = 0x73,
+    DW_OP_breg4 = 0x74,
+    DW_OP_breg5 = 0x75,
+    DW_OP_breg6 = 0x76,
+    DW_OP_breg7 = 0x77,
+    DW_OP_breg8 = 0x78,
+    DW_OP_breg9 = 0x79,
+    DW_OP_breg10 = 0x7a,
+    DW_OP_breg11 = 0x7b,
+    DW_OP_breg12 = 0x7c,
+    DW_OP_breg13 = 0x7d,
+    DW_OP_breg14 = 0x7e,
+    DW_OP_breg15 = 0x7f,
+    DW_OP_breg16 = 0x80,
+    DW_OP_breg17 = 0x81,
+    DW_OP_breg18 = 0x82,
+    DW_OP_breg19 = 0x83,
+    DW_OP_breg20 = 0x84,
+    DW_OP_breg21 = 0x85,
+    DW_OP_breg22 = 0x86,
+    DW_OP_breg23 = 0x87,
+    DW_OP_breg24 = 0x88,
+    DW_OP_breg25 = 0x89,
+    DW_OP_breg26 = 0x8a,
+    DW_OP_breg27 = 0x8b,
+    DW_OP_breg28 = 0x8c,
+    DW_OP_breg29 = 0x8d,
+    DW_OP_breg30 = 0x8e,
+    DW_OP_breg31 = 0x8f,
+    DW_OP_regx = 0x90,
+    DW_OP_fbreg = 0x91,
+    DW_OP_bregx = 0x92,
+    DW_OP_piece = 0x93,
+    DW_OP_deref_size = 0x94,
+    DW_OP_xderef_size = 0x95,
+    DW_OP_nop = 0x96,
+    /* DWARF 3 extensions.  */
+    DW_OP_push_object_address = 0x97,
+    DW_OP_call2 = 0x98,
+    DW_OP_call4 = 0x99,
+    DW_OP_call_ref = 0x9a,
+    /* GNU extensions.  */
+    DW_OP_GNU_push_tls_address = 0xe0,
+    /* HP extensions.  */
+    DW_OP_HP_unknown     = 0xe0, /* Ouch, the same as GNU_push_tls_address.  */
+    DW_OP_HP_is_value    = 0xe1,
+    DW_OP_HP_fltconst4   = 0xe2,
+    DW_OP_HP_fltconst8   = 0xe3,
+    DW_OP_HP_mod_range   = 0xe4,
+    DW_OP_HP_unmod_range = 0xe5,
+    DW_OP_HP_tls         = 0xe6
+  };
+
+#define DW_OP_lo_user	0xe0	/* Implementation-defined range start.  */
+#define DW_OP_hi_user	0xff	/* Implementation-defined range end.  */
+
+/* Type encodings.  */
+enum dwarf_type
+  {
+    DW_ATE_void = 0x0,
+    DW_ATE_address = 0x1,
+    DW_ATE_boolean = 0x2,
+    DW_ATE_complex_float = 0x3,
+    DW_ATE_float = 0x4,
+    DW_ATE_signed = 0x5,
+    DW_ATE_signed_char = 0x6,
+    DW_ATE_unsigned = 0x7,
+    DW_ATE_unsigned_char = 0x8,
+    /* DWARF 3.  */
+    DW_ATE_imaginary_float = 0x9,
+    /* HP extensions.  */
+    DW_ATE_HP_float80            = 0x80, /* Floating-point (80 bit).  */
+    DW_ATE_HP_complex_float80    = 0x81, /* Complex floating-point (80 bit).  */
+    DW_ATE_HP_float128           = 0x82, /* Floating-point (128 bit).  */
+    DW_ATE_HP_complex_float128   = 0x83, /* Complex floating-point (128 bit).  */
+    DW_ATE_HP_floathpintel       = 0x84, /* Floating-point (82 bit IA64).  */
+    DW_ATE_HP_imaginary_float80  = 0x85,
+    DW_ATE_HP_imaginary_float128 = 0x86
+  };
+
+#define	DW_ATE_lo_user 0x80
+#define	DW_ATE_hi_user 0xff
+
+/* Array ordering names and codes.  */
+enum dwarf_array_dim_ordering
+  {
+    DW_ORD_row_major = 0,
+    DW_ORD_col_major = 1
+  };
+
+/* Access attribute.  */
+enum dwarf_access_attribute
+  {
+    DW_ACCESS_public = 1,
+    DW_ACCESS_protected = 2,
+    DW_ACCESS_private = 3
+  };
+
+/* Visibility.  */
+enum dwarf_visibility_attribute
+  {
+    DW_VIS_local = 1,
+    DW_VIS_exported = 2,
+    DW_VIS_qualified = 3
+  };
+
+/* Virtuality.  */
+enum dwarf_virtuality_attribute
+  {
+    DW_VIRTUALITY_none = 0,
+    DW_VIRTUALITY_virtual = 1,
+    DW_VIRTUALITY_pure_virtual = 2
+  };
+
+/* Case sensitivity.  */
+enum dwarf_id_case
+  {
+    DW_ID_case_sensitive = 0,
+    DW_ID_up_case = 1,
+    DW_ID_down_case = 2,
+    DW_ID_case_insensitive = 3
+  };
+
+/* Calling convention.  */
+enum dwarf_calling_convention
+  {
+    DW_CC_normal = 0x1,
+    DW_CC_program = 0x2,
+    DW_CC_nocall = 0x3
+  };
+
+#define DW_CC_lo_user 0x40
+#define DW_CC_hi_user 0xff
+
+/* Inline attribute.  */
+enum dwarf_inline_attribute
+  {
+    DW_INL_not_inlined = 0,
+    DW_INL_inlined = 1,
+    DW_INL_declared_not_inlined = 2,
+    DW_INL_declared_inlined = 3
+  };
+
+/* Discriminant lists.  */
+enum dwarf_discrim_list
+  {
+    DW_DSC_label = 0,
+    DW_DSC_range = 1
+  };
+
+/* Line number opcodes.  */
+enum dwarf_line_number_ops
+  {
+    DW_LNS_extended_op = 0,
+    DW_LNS_copy = 1,
+    DW_LNS_advance_pc = 2,
+    DW_LNS_advance_line = 3,
+    DW_LNS_set_file = 4,
+    DW_LNS_set_column = 5,
+    DW_LNS_negate_stmt = 6,
+    DW_LNS_set_basic_block = 7,
+    DW_LNS_const_add_pc = 8,
+    DW_LNS_fixed_advance_pc = 9,
+    /* DWARF 3.  */
+    DW_LNS_set_prologue_end = 10,
+    DW_LNS_set_epilogue_begin = 11,
+    DW_LNS_set_isa = 12
+  };
+
+/* Line number extended opcodes.  */
+enum dwarf_line_number_x_ops
+  {
+    DW_LNE_end_sequence = 1,
+    DW_LNE_set_address = 2,
+    DW_LNE_define_file = 3,
+    /* HP extensions.  */
+    DW_LNE_HP_negate_is_UV_update      = 0x11,
+    DW_LNE_HP_push_context             = 0x12,
+    DW_LNE_HP_pop_context              = 0x13,
+    DW_LNE_HP_set_file_line_column     = 0x14,
+    DW_LNE_HP_set_routine_name         = 0x15,
+    DW_LNE_HP_set_sequence             = 0x16,
+    DW_LNE_HP_negate_post_semantics    = 0x17,
+    DW_LNE_HP_negate_function_exit     = 0x18,
+    DW_LNE_HP_negate_front_end_logical = 0x19,
+    DW_LNE_HP_define_proc              = 0x20
+  };
+
+/* Call frame information.  */
+enum dwarf_call_frame_info
+  {
+    DW_CFA_advance_loc = 0x40,
+    DW_CFA_offset = 0x80,
+    DW_CFA_restore = 0xc0,
+    DW_CFA_nop = 0x00,
+    DW_CFA_set_loc = 0x01,
+    DW_CFA_advance_loc1 = 0x02,
+    DW_CFA_advance_loc2 = 0x03,
+    DW_CFA_advance_loc4 = 0x04,
+    DW_CFA_offset_extended = 0x05,
+    DW_CFA_restore_extended = 0x06,
+    DW_CFA_undefined = 0x07,
+    DW_CFA_same_value = 0x08,
+    DW_CFA_register = 0x09,
+    DW_CFA_remember_state = 0x0a,
+    DW_CFA_restore_state = 0x0b,
+    DW_CFA_def_cfa = 0x0c,
+    DW_CFA_def_cfa_register = 0x0d,
+    DW_CFA_def_cfa_offset = 0x0e,
+    /* DWARF 3.  */
+    DW_CFA_def_cfa_expression = 0x0f,
+    DW_CFA_expression = 0x10,
+    DW_CFA_offset_extended_sf = 0x11,
+    DW_CFA_def_cfa_sf = 0x12,
+    DW_CFA_def_cfa_offset_sf = 0x13,
+    /* SGI/MIPS specific.  */
+    DW_CFA_MIPS_advance_loc8 = 0x1d,
+    /* GNU extensions.  */
+    DW_CFA_GNU_window_save = 0x2d,
+    DW_CFA_GNU_args_size = 0x2e,
+    DW_CFA_GNU_negative_offset_extended = 0x2f
+  };
+
+#define DW_CIE_ID	  0xffffffff
+#define DW_CIE_VERSION	  1
+
+#define DW_CFA_extended   0
+#define DW_CFA_lo_user    0x1c
+#define DW_CFA_hi_user    0x3f
+
+#define DW_CHILDREN_no		     0x00
+#define DW_CHILDREN_yes		     0x01
+
+#define DW_ADDR_none		0
+
+/* Source language names and codes.  */
+enum dwarf_source_language
+  {
+    DW_LANG_C89 = 0x0001,
+    DW_LANG_C = 0x0002,
+    DW_LANG_Ada83 = 0x0003,
+    DW_LANG_C_plus_plus = 0x0004,
+    DW_LANG_Cobol74 = 0x0005,
+    DW_LANG_Cobol85 = 0x0006,
+    DW_LANG_Fortran77 = 0x0007,
+    DW_LANG_Fortran90 = 0x0008,
+    DW_LANG_Pascal83 = 0x0009,
+    DW_LANG_Modula2 = 0x000a,
+    DW_LANG_Java = 0x000b,
+    /* DWARF 3.  */
+    DW_LANG_C99 = 0x000c,
+    DW_LANG_Ada95 = 0x000d,
+    DW_LANG_Fortran95 = 0x000e,
+    /* MIPS.  */
+    DW_LANG_Mips_Assembler = 0x8001,
+    /* UPC.  */
+    DW_LANG_Upc = 0x8765
+  };
+
+#define DW_LANG_lo_user 0x8000	/* Implementation-defined range start.  */
+#define DW_LANG_hi_user 0xffff	/* Implementation-defined range start.  */
+
+/* Names and codes for macro information.  */
+enum dwarf_macinfo_record_type
+  {
+    DW_MACINFO_define = 1,
+    DW_MACINFO_undef = 2,
+    DW_MACINFO_start_file = 3,
+    DW_MACINFO_end_file = 4,
+    DW_MACINFO_vendor_ext = 255
+  };
+
+/* @@@ For use with GNU frame unwind information.  */
+
+#define DW_EH_PE_absptr		0x00
+#define DW_EH_PE_omit		0xff
+
+#define DW_EH_PE_uleb128	0x01
+#define DW_EH_PE_udata2		0x02
+#define DW_EH_PE_udata4		0x03
+#define DW_EH_PE_udata8		0x04
+#define DW_EH_PE_sleb128	0x09
+#define DW_EH_PE_sdata2		0x0A
+#define DW_EH_PE_sdata4		0x0B
+#define DW_EH_PE_sdata8		0x0C
+#define DW_EH_PE_signed		0x08
+
+#define DW_EH_PE_pcrel		0x10
+#define DW_EH_PE_textrel	0x20
+#define DW_EH_PE_datarel	0x30
+#define DW_EH_PE_funcrel	0x40
+#define DW_EH_PE_aligned	0x50
+
+#define DW_EH_PE_indirect	0x80
+
+#endif /* _ELF_DWARF2_H */
diff -puN /dev/null include/linux/dwarf2-lang.h
--- /dev/null	2006-05-29 10:18:53.280907750 -0700
+++ devel-akpm/include/linux/dwarf2-lang.h	2006-05-29 15:20:12.000000000 -0700
@@ -0,0 +1,300 @@
+#ifndef DWARF2_LANG
+#define DWARF2_LANG
+
+/*
+ * This is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2, or (at your option) any later
+ * version.
+ */
+/*
+ * This file defines macros that allow generation of DWARF debug records
+ * for asm files.  This file is platform independent.  Register numbers
+ * (which are about the only thing that is platform dependent) are to be
+ * supplied by a platform defined file.
+ */
+/*
+ * We need this to work for both asm and C.  In asm we are using the
+ * old comment trick to concatenate while C uses the new ANSI thing.
+ * Here we have concat macro...  The multi level thing is to allow and
+ * macros used in the names to be resolved prior to the cat (at which
+ * time they are no longer the same string).
+ */
+#define CAT3(a,b,c) _CAT3(a,b,c)
+#define _CAT3(a,b,c) __CAT3(a,b,c)
+#ifndef __STDC__
+#define __CAT3(a,b,c) a/**/b/**/c
+#else
+#define __CAT3(a,b,c) a##b##c
+#endif
+#ifdef __ASSEMBLY__
+#define IFC(a)
+#define IFN_C(a) a
+#define NL ;
+#define QUOTE_THIS(a) a
+#define DWARF_preamble .section .debug_frame,"",%progbits;
+#else
+#define IFC(a) a
+#define IFN_C(a)
+#define NL \n\t
+#define QUOTE_THIS(a) _QUOTE_THIS(a)
+#define _QUOTE_THIS(a) #a
+/* Don't let CPP see the " and , \042=" \054=, */
+#define DWARF_preamble .section .debug_frame \054\042\042\054%progbits
+#endif
+
+#ifdef CONFIG_64BIT
+#define DATA_ALIGN_FACTOR	8
+#define ADDR_LOC		.quad
+#else
+#define DATA_ALIGN_FACTOR	4
+#define ADDR_LOC		.long
+#endif
+
+#include <linux/dwarf2-defs.h>
+/*
+ * This macro starts a debug frame section.  The debug_frame describes
+ * where to find the registers that the enclosing function saved on
+ * entry.
+ *
+ * ORD is use by the label generator and should be the same as what is
+ * passed to CFI_postamble.
+ *
+ * pc,	pc register gdb ordinal.
+ *
+ * code_align this is the factor used to define locations or regions
+ * where the given definitions apply.  If you use labels to define these
+ * this should be 1.
+ *
+ * data_align this is the factor used to define register offsets.  If
+ * you use struct offset, this should be the size of the register in
+ * bytes or the negative of that.  This is how it is used: you will
+ * define a register as the reference register, say the stack pointer,
+ * then you will say where a register is located relative to this
+ * reference registers value, say 40 for register 3 (the gdb register
+ * number).  The <40> will be multiplied by <data_align> to define the
+ * byte offset of the given register (3, in this example).  So if your
+ * <40> is the byte offset and the reference register points at the
+ * begining, you would want 1 for the data_offset.  If <40> was the 40th
+ * 4-byte element in that structure you would want 4.  And if your
+ * reference register points at the end of the structure you would want
+ * a negative data_align value(and you would have to do other math as
+ * well).
+ */
+
+#define CFI_preamble(ORD, pc, code_align, data_align)	\
+         DWARF_preamble	NL				\
+	.align DATA_ALIGN_FACTOR NL			\
+        .globl CAT3(frame,_,ORD) NL			\
+CAT3(frame,_,ORD): NL					\
+	.long 7f-6f NL					\
+6:							\
+	.long	DW_CIE_ID NL				\
+	.byte	DW_CIE_VERSION NL			\
+	.byte 0	 NL					\
+	.uleb128 code_align NL				\
+	.sleb128 data_align NL				\
+	.byte pc NL
+
+/*
+ * After the above macro and prior to the CFI_postamble, you need to
+ * define the initial state.  This starts with defining the reference
+ * register and, usually the pc.  Here are some helper macros:
+ */
+
+#define CFA_define_reference(reg, offset)	\
+	.byte DW_CFA_def_cfa NL			\
+	.uleb128 reg NL				\
+	.uleb128 (offset) NL
+
+#define CFA_define_offset(reg, offset)		\
+	.byte (DW_CFA_offset + reg) NL		\
+	.uleb128 (offset) NL
+
+#define CFA_restore(reg)			\
+        .byte (DW_CFA_restore + reg) NL
+
+#define CFI_postamble()				\
+	.align DATA_ALIGN_FACTOR NL				\
+7: NL						\
+.previous NL
+
+/*
+ * So now your code pushs stuff on the stack, you need a new location
+ * and the rules for what to do.  This starts a running description of
+ * the call frame.  You need to describe what changes with respect to
+ * the call registers as the location of the pc moves through the code.
+ * The following builds an FDE (fram descriptor entry?).  Like the
+ * above, it has a preamble and a postamble.  It also is tied to the CFI
+ * above.
+ * The preamble macro is tied to the CFI thru the first parameter.  The
+ * second is the code start address and then the code end address+1.
+ */
+#define FDE_preamble(ORD, initial_address, end_address)	\
+        DWARF_preamble NL				\
+	.align DATA_ALIGN_FACTOR NL					\
+	.long 9f-8f NL					\
+8:							\
+	.long CAT3(frame,_,ORD) NL			\
+	ADDR_LOC initial_address NL			\
+	ADDR_LOC (end_address - initial_address) NL
+
+#define FDE_postamble()				\
+	.align DATA_ALIGN_FACTOR NL				\
+9:	 NL					\
+.previous NL
+
+/*
+ * That done, you can now add registers, subtract registers, move the
+ * reference and even change the reference.  You can also define a new
+ * area of code the info applies to.  For discontinuous bits you should
+ * start a new FDE.  You may have as many as you like.
+ */
+
+/*
+ * To advance the stack address by <bytes> (0x3f max)
+ */
+
+#define CFA_advance_loc(bytes)			\
+	.byte DW_CFA_advance_loc+bytes NL
+
+/*
+ * This one is good for 0xff or 255
+ */
+#define CFA_advance_loc1(bytes)			\
+	.byte DW_CFA_advance_loc1 NL		\
+        .byte bytes NL
+
+#define CFA_undefine_reg(reg)			\
+        .byte DW_CFA_undefined NL		\
+	.uleb128 reg NL
+/*
+ * With the above you can define all the register locations.  But
+ * suppose the reference register moves... Takes the new offset NOT an
+ * increment.  This is how esp is tracked if it is not saved.
+ */
+
+#define CFA_define_cfa_offset(offset)		\
+	.byte DW_CFA_def_cfa_offset NL		\
+	.uleb128 (offset) NL
+/*
+ * Or suppose you want to use a different reference register...
+ */
+#define CFA_define_cfa_register(reg)		\
+	.byte DW_CFA_def_cfa_register NL	\
+	.uleb128 reg NL
+
+/*
+ * If you want to mess with the stack pointer, here is the expression.
+ * The stack starts empty.
+ */
+#define CFA_def_cfa_expression 			\
+        .byte DW_CFA_def_cfa_expression	NL	\
+	.uleb128 20f-10f NL			\
+10:     NL
+/*
+ * This expression is to be used for other regs.  The stack starts with the
+ * stack address.
+ */
+
+#define CFA_expression(reg)			\
+        .byte DW_CFA_expression	 NL		\
+        .uleb128 reg NL				\
+	.uleb128 20f-10f NL			\
+10:     NL
+/*
+ * Here we do the expression stuff.  You should code the above followed
+ *  by expression OPs followed by CFA_expression_end.
+ */
+
+
+#define CFA_expression_end			\
+20:	 NL
+
+#define CFA_exp_OP_const4s(a)			\
+        .byte DW_OP_const4s NL			\
+        .long a NL
+
+#define  CFA_exp_OP_swap  .byte DW_OP_swap NL
+#define  CFA_exp_OP_dup  .byte DW_OP_dup NL
+#define  CFA_exp_OP_drop  .byte DW_OP_drop NL
+/*
+ * All these work on the top two elements on the stack, replacing them
+ * with the result.  Top comes first where it matters.  True is 1, false 0.
+ */
+#define  CFA_exp_OP_deref .byte DW_OP_deref NL
+#define  CFA_exp_OP_and   .byte DW_OP_and NL
+#define  CFA_exp_OP_div   .byte DW_OP_div NL
+#define  CFA_exp_OP_minus .byte DW_OP_minus NL
+#define  CFA_exp_OP_mod   .byte DW_OP_mod NL
+#define  CFA_exp_OP_neg   .byte DW_OP_neg NL
+#define  CFA_exp_OP_plus  .byte DW_OP_plus NL
+#define  CFA_exp_OP_not   .byte DW_OP_not NL
+#define  CFA_exp_OP_or    .byte DW_OP_or NL
+#define  CFA_exp_OP_xor   .byte DW_OP_xor NL
+#define  CFA_exp_OP_le    .byte DW_OP_le NL
+#define  CFA_exp_OP_ge    .byte DW_OP_ge NL
+#define  CFA_exp_OP_eq    .byte DW_OP_eq NL
+#define  CFA_exp_OP_lt    .byte DW_OP_lt NL
+#define  CFA_exp_OP_gt    .byte DW_OP_gt NL
+#define  CFA_exp_OP_ne    .byte DW_OP_ne NL
+/*
+ * These take a parameter as noted
+ */
+/*
+ * Unconditional skip to loc. loc is a label (loc:)
+ */
+#define CFA_exp_OP_skip(loc)			\
+         .byte DW_OP_skip  NL 			\
+	 .hword  loc-.-2 NL
+/*
+ * Conditional skip to loc (TOS != 0, TOS--) (loc is a label)
+ */
+#define CFA_exp_OP_bra(loc)			\
+         .byte DW_OP_bra NL			\
+	 .hword loc-.-2 NL
+
+/*
+ * TOS += no (an unsigned number)
+ */
+#define CFA_exp_OP_plus_uconst(no)		\
+         .byte DW_OP_plus_uconst NL		\
+         .uleb128 no NL
+
+/*
+ * ++TOS = no (a unsigned number)
+ */
+#define CFA_exp_OP_constu(no)			\
+         .byte DW_OP_constu NL			\
+	 .uleb128 no NL
+/*
+ * ++TOS = no (a signed number)
+ */
+#define CFA_exp_OP_consts(no)			\
+         .byte DW_OP_consts NL			\
+	 .sleb128 no NL
+/*
+ * ++TOS = no (an unsigned byte)
+ */
+#define CFA_exp_OP_const1u(no)			\
+         .byte DW_OP_const1u NL			\
+	 .byte no NL
+
+
+/*
+ * ++TOS = no (a address)
+ */
+#define CFA_exp_OP_addr(no)			\
+         .byte DW_OP_addr NL			\
+	 .long no NL
+
+/*
+ * Push current frames value for "reg" + offset
+ * We take advantage of the opcode assignments to make this a litteral reg
+ * rather than use the DW_OP_bregx opcode.
+ */
+
+#define CFA_exp_OP_breg(reg,offset)		\
+         .byte DW_OP_breg0+reg NL		\
+         .sleb128 offset NL
+#endif
diff -puN Makefile~kgdb-cfi_annotations Makefile
--- Makefile~kgdb-cfi_annotations	2006-05-29 15:20:12.000000000 -0700
+++ devel-akpm/Makefile	2006-05-29 15:20:12.000000000 -0700
@@ -1381,8 +1381,12 @@ clean := -f $(if $(KBUILD_SRC),$(srctree
 endif	# skip-makefile
 
 PHONY += FORCE
-FORCE:
 
+include/linux/dwarf2-defs.h: $(srctree)/include/linux/dwarf2.h $(srctree)/scripts/dwarfh.awk
+	mkdir -p include/linux/
+	awk -f $(srctree)/scripts/dwarfh.awk $(srctree)/include/linux/dwarf2.h > include/linux/dwarf2-defs.h
+
+FORCE: include/linux/dwarf2-defs.h
 
 # Declare the contents of the .PHONY variable as phony.  We keep that
 # information in a variable se we can use it in if_changed and friends.
diff -puN /dev/null scripts/dwarfh.awk
--- /dev/null	2006-05-29 10:18:53.280907750 -0700
+++ devel-akpm/scripts/dwarfh.awk	2006-05-29 15:20:12.000000000 -0700
@@ -0,0 +1,19 @@
+BEGIN {
+	print "#ifndef  _ELF_DWARF_H"
+		print "/* Machine generated from dwarf2.h by scripts/dwarfh.awk */"
+}
+$2 == "=" {
+	gsub(/,/, "", $3)
+	print "#define " $1 "\t " $3
+}
+$1 == "#define" {
+	print $0
+	while( index($0,"\\") == length($0)){
+		getline
+		print $0
+	}
+}
+/.*/ {}
+END {
+	print "#endif"
+}
_

kgdb-core-lite-add-reboot-command.patch:
 kgdb.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE kgdb-core-lite-add-reboot-command.patch ---

From: Andrew Morton <akpm at osdl.org>

Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/kgdb.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff -puN kernel/kgdb.c~kgdb-core-lite-add-reboot-command kernel/kgdb.c
--- devel/kernel/kgdb.c~kgdb-core-lite-add-reboot-command	2006-05-27 23:29:49.000000000 -0700
+++ devel-akpm/kernel/kgdb.c	2006-05-27 23:29:49.000000000 -0700
@@ -1410,6 +1410,19 @@ int kgdb_handle_exception(int ex_vector,
 			}
 			break;
 
+#ifdef CONFIG_X86
+		case 'r':	/* reboot */
+		{
+			static struct {
+				unsigned short size;
+				unsigned long long *base;
+			} no_idt = { 0, NULL };
+			strcpy(remcom_out_buffer, "OK");
+			put_packet(remcom_out_buffer);
+			__asm__ __volatile__("lidt %0"::"m"(no_idt));
+			break;
+		}
+#endif
 			/* Query thread status */
 		case 'T':
 			ptr = &remcom_in_buffer[1];
_

kgdb-core-lite.patch:
 Documentation/DocBook/kgdb.tmpl |  234 ++++
 MAINTAINERS                     |    9 
 include/linux/kgdb.h            |  270 +++++
 kernel/Makefile                 |    1 
 kernel/kgdb.c                   | 1960 ++++++++++++++++++++++++++++++++++++++++
 kernel/pid.c                    |   10 
 kernel/sched.c                  |    4 
 lib/Kconfig.debug               |   54 +
 8 files changed, 2541 insertions(+), 1 deletion(-)

--- NEW FILE kgdb-core-lite.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 Documentation/DocBook/kgdb.tmpl |  234 +++
 MAINTAINERS                     |    9 
 include/linux/kgdb.h            |  270 ++++
 kernel/Makefile                 |    1 
 kernel/kgdb.c                   | 1960 ++++++++++++++++++++++++++++++
 kernel/pid.c                    |   10 
 kernel/sched.c                  |    4 
 lib/Kconfig.debug               |   54 
 8 files changed, 2541 insertions(+), 1 deletion(-)

diff -puN /dev/null Documentation/DocBook/kgdb.tmpl
--- /dev/null	2006-05-29 10:18:53.280907750 -0700
+++ devel-akpm/Documentation/DocBook/kgdb.tmpl	2006-05-29 16:46:09.000000000 -0700
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
+
+<book id="kgdbInternals">
+ <bookinfo>
+  <title>KGDB Internals</title>
+
+  <authorgroup>
+   <author>
+    <firstname>Tom</firstname>
+    <surname>Rini</surname>
+    <affiliation>
+     <address>
+      <email>trini at kernel.crashing.org</email>
+     </address>
+    </affiliation>
+   </author>
+  </authorgroup>
+
+  <authorgroup>
+   <author>
+    <firstname>Amit S.</firstname>
+    <surname>Kale</surname>
+    <affiliation>
+     <address>
+      <email>amitkale at linsyssoft.com</email>
+     </address>
+    </affiliation>
+   </author>
+  </authorgroup>
+
+  <copyright>
+   <year>2004-2005</year>
+   <holder>MontaVista Software, Inc.</holder>
+  </copyright>
+  <copyright>
+   <year>2004</year>
+   <holder>Amit S. Kale</holder>
+  </copyright>
+
+  <legalnotice>
+   <para>
+   This file is licensed under the terms of the GNU General Public License
+   version 2. This program is licensed "as is" without any warranty of any
+   kind, whether express or implied.
+   </para>
+
+  </legalnotice>
+ </bookinfo>
+
+<toc></toc>
+  <chapter id="Introduction">
+    <title>Introduction</title>
+    <para>
+    kgdb is a source level debugger for linux kernel. It is used along
+    with gdb to debug a linux kernel. Kernel developers can debug a kernel
+    similar to application programs with the use of kgdb. It makes it
+    possible to place breakpoints in kernel code, step through the code
+    and observe variables.
+    </para>
+    <para>
+    Two machines are required for using kgdb. One of these machines is a
+    development machine and the other is a test machine. The machines are
+    typically connected through a serial line, a null-modem cable which
+    connects their serial ports.  It is also possible however, to use an
+    ethernet connection between the machines.  The kernel to be debugged
+    runs on the test machine. gdb runs on the development machine. The
+    serial line or ethernet connection is used by gdb to communicate to
+    the kernel being debugged.
+    </para>
+  </chapter>
+  <chapter id="CompilingAKernel">
+    <title>Compiling a kernel</title>
+    <para>
+    To enable <symbol>CONFIG_KGDB</symbol>, look under the "Kernel debugging"
+    and then select "KGDB: kernel debugging with remote gdb".
+    </para>
+    <para>
+    The first choice for I/O is <symbol>CONFIG_KGDB_ONLY_MODULES</symbol>.
+    This means that you will only be able to use KGDB after loading a
+    kernel module that defines how you want to be able to talk with
+    KGDB.  There are two other choices (more on some architectures) that
+    can be enabled as modules later, if not picked here.
+    </para>
+    <para>The first of these is <symbol>CONFIG_KGDB_8250_NOMODULE</symbol>.
+    This has sub-options such as <symbol>CONFIG_KGDB_SIMPLE_SERIAL</symbol>
+    which toggles choosing the serial port by ttyS number or by specifying
+    a port and IRQ number.
+    </para>
+    <para>
+    The second of these choices on most systems for I/O is
+    <symbol>CONFIG_KGDBOE</symbol>. This requires that the machine to be
+    debugged has an ethernet card which supports the netpoll API, such as
+    the cards supported by <symbol>CONFIG_E100</symbol>.  There are no
+    sub-options for this, but a kernel command line option is required.
+    </para>
+  </chapter>
+  <chapter id="BootingTheKernel">
+    <title>Booting the kernel</title>
+    <para>
+    The Kernel command line option <constant>kgdbwait</constant> makes kgdb
+    wait for gdb connection during booting of a kernel.  If the
+    <symbol>CONFIG_KGDB_8250</symbol> driver is used (or if applicable,
+    another serial driver) this breakpoint will happen very early on, before
+    console output.  If you wish to change serial port information and you
+    have enabled both <symbol>CONFIG_KGDB_8250</symbol> and
+    <symbol>CONFIG_KGDB_SIMPLE_SERIAL</symbol> then you must pass the option
+    <constant>kgdb8250=&lt;io or mmio&gt;,&lt;address&gt;,&lt;baud
+    rate&gt;,&lt;irq&gt;</constant> before <constant>kgdbwait</constant>.
+    The values <constant>io</constant> or <constant>mmio</constant> refer to
+    if the address being passed next needs to be memory mapped
+    (<constant>mmio</constant>) or not. The <constant>address</constant> must
+    be passed in hex and is the hardware address and will be remapped if
+    passed as <constant>mmio</constant>. The value
+    <constant>baud rate</constant> and <constant>irq</constant> are base-10.
+    The supported values for <constant>baud rate</constant> are
+    <constant>9600</constant>, <constant>19200</constant>,
+    <constant>38400</constant>, <constant>57600</constant>, and
+    <constant>115200</constant>.
+    </para>
+    <para>
+    To have KGDB stop the kernel and wait, with the compiled values for the
+    serial driver, pass in: <constant>kgdbwait</constant>.
+    </para>
+    <para>
+    To specify the values of the serial port at boot:
+    <constant>kgdb8250=io,3f8,115200,3</constant>.
+    On IA64 this could also be:
+    <constant>kgdb8250=mmio,0xff5e0000,115200,74</constant>
+    And to have KGDB also stop the kernel and wait for GDB to connect, pass in
+    <constant>kgdbwait</constant> after this arguement.
+    </para>
+    <para>
+    To configure the <symbol>CONFIG_KGDBOE</symbol> driver, pass in
+    <constant>kgdboe=[src-port]@&lt;src-ip&gt;/[dev],[tgt-port]@&lt;tgt-ip&gt;/[tgt-macaddr]</constant>
+    where:
+    <itemizedlist>
+      <listitem><para>src-port (optional): source for UDP packets (defaults to <constant>6443</constant>)</para></listitem>
+      <listitem><para>src-ip: source IP to use (interface address)</para></listitem>
+      <listitem><para>dev (optional): network interface (<constant>eth0</constant>)</para></listitem>
+      <listitem><para>tgt-port (optional): port GDB will use (defaults to <constant>6442</constant>)</para></listitem>
+      <listitem><para>tgt-ip: IP address GDB will be connecting from</para></listitem>
+      <listitem><para>tgt-macaddr (optional): ethernet MAC address for logging agent (default is broadcast)</para></listitem>
+    </itemizedlist>
+    </para>
+    <para>
+    The <symbol>CONFIG_KGDBOE</symbol> driver can be reconfigured at run
+    time, if <symbol>CONFIG_SYSFS</symbol> and
+    <symbol>CONFIG_MODULES</symbol> by echo'ing a new config string to
+    <constant>/sys/module/kgdboe/parameter/kgdboe</constant>.  The
+    driver can be unconfigured with the special string
+    <constant>not_configured</constant>.
+    </para>
+  </chapter>
+  <chapter id="ConnectingGDB">
+  <title>Connecting gdb</title>
+    <para>
+    If you have used any of the methods to have KGDB stop and create
+    an initial breakpoint described in the previous chapter, kgdb prints
+    the message "Waiting for connection from remote gdb..." on the console
+    and waits for connection from gdb. At this point you connect gdb to kgdb.
+    </para>
+    <para>
+    Example (serial):
+    </para>
+    <programlisting>
+    % gdb ./vmlinux
+    (gdb) set remotebaud 115200
+    (gdb) target remote /dev/ttyS0
+    </programlisting>
+    <para>
+    Example (ethernet):
+    </para>
+    <programlisting>
+    % gdb ./vmlinux
+    (gdb) target remote udp:192.168.2.2:6443
+    </programlisting>
+    <para>
+    Once connected, you can debug a kernel the way you would debug an
+    application program.
+    </para>
[...2231 lines suppressed...]
+                            unsigned long code, void *x)
+{
+
+	unsigned long flags;
+
+	/* If we're debugging, or KGDB has not connected, don't try
+	 * and print. */
+	if (!kgdb_connected || atomic_read(&debugger_active) != 0)
+		return 0;
+	if ((code == SYS_RESTART) || (code == SYS_HALT) || (code == SYS_POWER_OFF)){
+		local_irq_save(flags);
+		put_packet("X00");
+		local_irq_restore(flags);
+	}
+	return NOTIFY_DONE;
+}
+
+#ifdef CONFIG_KGDB_CONSOLE
+void kgdb_console_write(struct console *co, const char *s, unsigned count)
+{
+	unsigned long flags;
+
+	/* If we're debugging, or KGDB has not connected, don't try
+	 * and print. */
+	if (!kgdb_connected || atomic_read(&debugger_active) != 0)
+		return;
+
+	local_irq_save(flags);
+	kgdb_msg_write(s, count);
+	local_irq_restore(flags);
+}
+
+static struct console kgdbcons = {
+	.name = "kgdb",
+	.write = kgdb_console_write,
+	.flags = CON_PRINTBUFFER | CON_ENABLED,
+};
+static int __init kgdb_console_init(void)
+{
+	register_console(&kgdbcons);
+	return 0;
+}
+
+console_initcall(kgdb_console_init);
+#endif
+
+static int __init opt_kgdb_enter(char *str)
+{
+	/* We've already done this by an explicit breakpoint() call. */
+	if (kgdb_initialized)
+		return 0;
+
+	/* Call breakpoint() which will take care of init. */
+	breakpoint();
+
+	return 0;
+}
+
+early_param("kgdbwait", opt_kgdb_enter);
diff -puN kernel/Makefile~kgdb-core-lite kernel/Makefile
--- devel/kernel/Makefile~kgdb-core-lite	2006-05-29 16:46:09.000000000 -0700
+++ devel-akpm/kernel/Makefile	2006-05-29 16:46:09.000000000 -0700
@@ -42,6 +42,7 @@ obj-$(CONFIG_STOP_MACHINE) += stop_machi
 obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
 obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
 obj-$(CONFIG_KPROBES) += kprobes.o
+obj-$(CONFIG_KGDB) += kgdb.o
 obj-$(CONFIG_SYSFS) += ksysfs.o
 obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
 obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
diff -puN kernel/pid.c~kgdb-core-lite kernel/pid.c
--- devel/kernel/pid.c~kgdb-core-lite	2006-05-29 16:46:09.000000000 -0700
+++ devel-akpm/kernel/pid.c	2006-05-29 16:46:09.000000000 -0700
@@ -299,8 +299,13 @@ struct pid *find_get_pid(pid_t nr)
 /*
  * The pid hash table is scaled according to the amount of memory in the
  * machine.  From a minimum of 16 slots up to 4096 slots at one gigabyte or
- * more.
+ * more.  KGDB needs to know if this function has been called already,
+ * since we might have entered KGDB very early.
  */
+#ifdef CONFIG_KGDB
+int pidhash_init_done;
+#endif
+
 void __init pidhash_init(void)
 {
 	int i, pidhash_size;
@@ -319,6 +324,9 @@ void __init pidhash_init(void)
 		panic("Could not alloc pidhash!\n");
 	for (i = 0; i < pidhash_size; i++)
 		INIT_HLIST_HEAD(&pid_hash[i]);
+#ifdef CONFIG_KGDB
+	pidhash_init_done = 1;
+#endif
 }
 
 void __init pidmap_init(void)
diff -puN kernel/sched.c~kgdb-core-lite kernel/sched.c
--- devel/kernel/sched.c~kgdb-core-lite	2006-05-29 16:46:09.000000000 -0700
+++ devel-akpm/kernel/sched.c	2006-05-29 16:46:09.000000000 -0700
@@ -39,6 +39,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/smp.h>
+#include <linux/kgdb.h>
 #include <linux/threads.h>
 #include <linux/timer.h>
 #include <linux/rcupdate.h>
@@ -6702,6 +6703,9 @@ void __might_sleep(char *file, int line)
 #if defined(in_atomic)
 	static unsigned long prev_jiffy;	/* ratelimiting */
 
+	if (atomic_read(&debugger_active))
+		return;
+
 	if ((in_atomic() || irqs_disabled()) &&
 	    system_state == SYSTEM_RUNNING && !oops_in_progress) {
 		if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
diff -puN lib/Kconfig.debug~kgdb-core-lite lib/Kconfig.debug
--- devel/lib/Kconfig.debug~kgdb-core-lite	2006-05-29 16:46:09.000000000 -0700
+++ devel-akpm/lib/Kconfig.debug	2006-05-29 16:46:09.000000000 -0700
@@ -464,3 +464,57 @@ config RCU_TORTURE_TEST
 	  at boot time (you probably don't).
 	  Say M if you want the RCU torture tests to build as a module.
 	  Say N if you are unsure.
+
+config WANT_EXTRA_DEBUG_INFORMATION
+	bool
+	select DEBUG_INFO
+	select FRAME_POINTER if X86
+	default n
+
+config KGDB
+	bool "KGDB: kernel debugging with remote gdb"
+	select WANT_EXTRA_DEBUG_INFORMATION
+	depends on DEBUG_KERNEL
+	help
+	  If you say Y here, it will be possible to remotely debug the
+	  kernel using gdb. It is strongly suggested that you enable
+	  DEBUG_INFO, and if available on your platform, FRAME_POINTER.
+	  Documentation of kernel debugger available at
+	  http://kgdb.sourceforge.net as well as in DocBook form
+	  in Documentation/DocBook/.  If unsure, say N.
+
+config KGDB_CONSOLE
+	bool "KGDB: Console messages through gdb"
+	depends on KGDB
+	  help
+	    If you say Y here, console messages will appear through gdb.
+	    Other consoles such as tty or ttyS will continue to work as usual.
+	    Note, that if you use this in conjunction with KGDB_ETH, if the
+	    ethernet driver runs into an error condition during use with KGDB
+	    it is possible to hit an infinite recusrion, causing the kernel
+	    to crash, and typically reboot.  For this reason, it is preferable
+	    to use NETCONSOLE in conjunction with KGDB_ETH instead of
+	    KGDB_CONSOLE.
+
+choice
+	prompt "Method for KGDB communication"
+	depends on KGDB
+	default KGDB_ONLY_MODULES
+	help
+	  There are a number of different ways in which you can communicate
+	  with KGDB.  The most common is via serial, with the 8250 driver
+	  (should your hardware have an 8250, or ns1655x style uart).
+	  Another option is to use the NETPOLL framework and UDP, should
+	  your ethernet card support this.  Other options may exist.
+	  You can elect to have one core I/O driver that is built into the
+	  kernel for debugging as the kernel is booting, or using only
+	  kernel modules.
+
+config KGDB_ONLY_MODULES
+	bool "KGDB: Use only kernel modules for I/O"
+	depends on MODULES
+	help
+	  Use only kernel modules to configure KGDB I/O after the
+	  kernel is booted.
+
+endchoice
diff -puN MAINTAINERS~kgdb-core-lite MAINTAINERS
--- MAINTAINERS~kgdb-core-lite	2006-05-29 16:46:09.000000000 -0700
+++ devel-akpm/MAINTAINERS	2006-05-29 16:46:09.000000000 -0700
@@ -1657,6 +1657,15 @@ L:	klibc at zytor.com
 T:	git kernel.org:pub/scm/linux/kernel/git/hpa/linux-2.6-klibc.git
 S:	Maintained
 
+KGDB
+P:	Tom Rini
+P:	Amit S. Kale
+M:	trini at kernel.crashing.org
+M:	amitkale at linsyssoft.com
+W:	http://sourceforge.net/projects/kgdb
+L:	kgdb-bugreport at lists.sourceforge.net
+S:	Maintained
+
 KPROBES
 P:	Prasanna S Panchamukhi
 M:	prasanna at in.ibm.com
_

kgdb-core.patch:
 include/linux/kgdb.h |    1 +
 kernel/kgdb.c        |    4 ++++
 kernel/softlockup.c  |    4 ++++
 kernel/timer.c       |    4 ++++
 4 files changed, 13 insertions(+)

--- NEW FILE kgdb-core.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/kgdb.h |    1 +
 kernel/kgdb.c        |    4 ++++
 kernel/softlockup.c  |    4 ++++
 kernel/timer.c       |    4 ++++
 4 files changed, 13 insertions(+)

diff -puN include/linux/kgdb.h~kgdb-core include/linux/kgdb.h
--- devel/include/linux/kgdb.h~kgdb-core	2006-06-06 17:32:35.000000000 -0700
+++ devel-akpm/include/linux/kgdb.h	2006-06-06 17:32:35.000000000 -0700
@@ -38,6 +38,7 @@ extern struct tasklet_struct kgdb_taskle
 
 extern atomic_t kgdb_setting_breakpoint;
 extern atomic_t cpu_doing_single_step;
+extern atomic_t kgdb_sync_softlockup[NR_CPUS];
 
 extern struct task_struct *kgdb_usethread, *kgdb_contthread;
 
diff -puN kernel/kgdb.c~kgdb-core kernel/kgdb.c
--- devel/kernel/kgdb.c~kgdb-core	2006-06-06 17:32:35.000000000 -0700
+++ devel-akpm/kernel/kgdb.c	2006-06-06 17:32:35.000000000 -0700
@@ -123,6 +123,8 @@ struct debuggerinfo_struct {
 /* to keep track of the CPU which is doing the single stepping*/
 atomic_t cpu_doing_single_step = ATOMIC_INIT(-1);
 
+atomic_t  kgdb_sync_softlockup[NR_CPUS] = {ATOMIC_INIT(0)};
+
 /* reboot notifier block */
 static struct notifier_block kgdb_reboot_notifier = {
 	.notifier_call  = kgdb_notify_reboot,
@@ -1058,6 +1060,8 @@ int kgdb_handle_exception(int ex_vector,
 		goto acquirelock;
 	}
 
+	atomic_set(&kgdb_sync_softlockup[smp_processor_id()], 1);
+
 	/*
 	* Don't enter if we have hit a removed breakpoint.
 	*/
diff -puN kernel/softlockup.c~kgdb-core kernel/softlockup.c
--- devel/kernel/softlockup.c~kgdb-core	2006-06-06 17:32:35.000000000 -0700
+++ devel-akpm/kernel/softlockup.c	2006-06-06 17:32:35.000000000 -0700
@@ -13,6 +13,7 @@
 #include <linux/kthread.h>
 #include <linux/notifier.h>
 #include <linux/module.h>
+#include <linux/kgdb.h>
 
 static DEFINE_SPINLOCK(print_lock);
 
@@ -38,6 +38,9 @@ static struct notifier_block panic_block
 void touch_softlockup_watchdog(void)
 {
 	per_cpu(touch_timestamp, raw_smp_processor_id()) = jiffies;
+#ifdef CONFIG_KGDB
+	atomic_set(&kgdb_sync_softlockup[raw_smp_processor_id()], 0);
+#endif
 }
 EXPORT_SYMBOL(touch_softlockup_watchdog);
 
diff -puN kernel/timer.c~kgdb-core kernel/timer.c
--- devel/kernel/timer.c~kgdb-core	2006-06-06 17:32:35.000000000 -0700
+++ devel-akpm/kernel/timer.c	2006-06-06 17:32:35.000000000 -0700
@@ -33,6 +33,7 @@
 #include <linux/posix-timers.h>
 #include <linux/cpu.h>
 #include <linux/syscalls.h>
+#include <linux/kgdb.h>
 #include <linux/delay.h>
 
 #include <asm/uaccess.h>
@@ -1164,6 +1165,9 @@ static void run_timer_softirq(struct sof
 void run_local_timers(void)
 {
 	raise_softirq(TIMER_SOFTIRQ);
+#ifdef CONFIG_KGDB
+	if(!atomic_read(&kgdb_sync_softlockup[smp_processor_id()]))
+#endif
 	softlockup_tick();
 }
 
_

kgdb-eth.patch:
 drivers/net/Makefile |    1 
 drivers/net/kgdboe.c |  294 +++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/Kconfig.debug    |   24 ++++
 3 files changed, 319 insertions(+)

--- NEW FILE kgdb-eth.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 drivers/net/Makefile |    1 
 drivers/net/kgdboe.c |  294 +++++++++++++++++++++++++++++++++++++++++
 lib/Kconfig.debug    |   24 +++
 3 files changed, 319 insertions(+)

diff -puN /dev/null drivers/net/kgdboe.c
--- /dev/null	2006-05-19 15:26:20.261540500 -0700
+++ devel-akpm/drivers/net/kgdboe.c	2006-05-19 16:01:51.000000000 -0700
@@ -0,0 +1,294 @@
+/*
+ * drivers/net/kgdboe.c
+ *
+ * A network interface for GDB.
+ * Based upon 'gdbserial' by David Grothe <dave at gcom.com>
+ * and Scott Foehner <sfoehner at engr.sgi.com>
+ *
+ * Maintainers: Amit S. Kale <amitkale at linsyssoft.com> and
+ * 		Tom Rini <trini at kernel.crashing.org>
+ *
+ * 2004 (c) Amit S. Kale <amitkale at linsyssoft.com>
+ * 2004-2005 (c) MontaVista Software, Inc.
+ * 2005 (c) Wind River Systems, Inc.
+ *
+ * Contributors at various stages not listed above:
+ * San Mehat <nettwerk at biodome.org>, Robert Walsh <rjwalsh at durables.org>,
+ * wangdi <wangdi at clusterfs.com>, Matt Mackall <mpm at selenic.com>,
+ * Pavel Machek <pavel at suse.cz>, Jason Wessel <jason.wessel at windriver.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/kgdb.h>
+#include <linux/netpoll.h>
+#include <linux/init.h>
+
+#include <asm/atomic.h>
+
+#define IN_BUF_SIZE 512		/* power of 2, please */
+#define NOT_CONFIGURED_STRING "not_configured"
+#define OUT_BUF_SIZE 30		/* We don't want to send too big of a packet. */
+#define MAX_KGDBOE_CONFIG_STR 256
+
+static char in_buf[IN_BUF_SIZE], out_buf[OUT_BUF_SIZE];
+static int in_head, in_tail, out_count;
+static atomic_t in_count;
+/* 0 = unconfigured, 1 = netpoll options parsed, 2 = fully configured. */
+static int configured;
+static struct kgdb_io local_kgdb_io_ops;
+static int use_dynamic_mac;
+
+MODULE_DESCRIPTION("KGDB driver for network interfaces");
+MODULE_LICENSE("GPL");
+static char config[MAX_KGDBOE_CONFIG_STR] = NOT_CONFIGURED_STRING;
+static struct kparam_string kps = {
+	.string = config,
+	.maxlen = MAX_KGDBOE_CONFIG_STR,
+};
+
+static void rx_hook(struct netpoll *np, int port, char *msg, int len,
+		    struct sk_buff *skb)
+{
+	int i;
+
+	np->remote_port = port;
+
+	/* Copy the MAC address if we need to. */
+	if (use_dynamic_mac) {
+		memcpy(np->remote_mac, eth_hdr(skb)->h_source,
+				sizeof(np->remote_mac));
+		use_dynamic_mac = 0;
+	}
+
+	/*
+	 * This could be GDB trying to attach.  But it could also be GDB
+	 * finishing up a session, with kgdb_connected=0 but GDB sending
+	 * an ACK for the final packet.  To make sure we don't try and
+	 * make a breakpoint when GDB is leaving, make sure that if
+	 * !kgdb_connected the only len == 1 packet we allow is ^C.
+	 */
+	if (!kgdb_connected && (len != 1 || msg[0] == 3) &&
+	    !atomic_read(&kgdb_setting_breakpoint)) {
+		tasklet_schedule(&kgdb_tasklet_breakpoint);
+	}
+
+	for (i = 0; i < len; i++) {
+		if (msg[i] == 3)
+			tasklet_schedule(&kgdb_tasklet_breakpoint);
+
+		if (atomic_read(&in_count) >= IN_BUF_SIZE) {
+			/* buffer overflow, clear it */
+			in_head = in_tail = 0;
+			atomic_set(&in_count, 0);
+			break;
+		}
+		in_buf[in_head++] = msg[i];
+		in_head &= (IN_BUF_SIZE - 1);
+		atomic_inc(&in_count);
+	}
+}
+
+static struct netpoll np = {
+	.dev_name = "eth0",
+	.name = "kgdboe",
+	.rx_hook = rx_hook,
+	.local_port = 6443,
+	.remote_port = 6442,
+	.remote_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+};
+
+static void eth_pre_exception_handler(void)
+{
+	/* Increment the module count when the debugger is active */
+	if (!kgdb_connected)
+		try_module_get(THIS_MODULE);
+	netpoll_set_trap(1);
+}
+
+static void eth_post_exception_handler(void)
+{
+	/* decrement the module count when the debugger detaches */
+	if (!kgdb_connected)
+		module_put(THIS_MODULE);
+	netpoll_set_trap(0);
+}
+
+static int eth_get_char(void)
+{
+	int chr;
+
+	while (atomic_read(&in_count) == 0)
+		netpoll_poll(&np);
+
+	chr = in_buf[in_tail++];
+	in_tail &= (IN_BUF_SIZE - 1);
+	atomic_dec(&in_count);
+	return chr;
+}
+
+static void eth_flush_buf(void)
+{
+	if (out_count && np.dev) {
+		netpoll_send_udp(&np, out_buf, out_count);
+		memset(out_buf, 0, sizeof(out_buf));
+		out_count = 0;
+	}
+}
+
+static void eth_put_char(u8 chr)
+{
+	out_buf[out_count++] = chr;
+	if (out_count == OUT_BUF_SIZE)
+		eth_flush_buf();
+}
+
+static int option_setup(char *opt)
+{
+	char opt_scratch[MAX_KGDBOE_CONFIG_STR];
+
+	/* If we're being given a new configuration, copy it in. */
+	if (opt != config)
+		strcpy(config, opt);
+	/* But work on a copy as netpoll_parse_options will eat it. */
+	strcpy(opt_scratch, opt);
+	configured = !netpoll_parse_options(&np, opt_scratch);
+
+	use_dynamic_mac = 1;
+
+	return 0;
+}
+__setup("kgdboe=", option_setup);
+
+/* With our config string set by some means, configure kgdboe. */
+static int configure_kgdboe(void)
+{
+	/* Try out the string. */
+	option_setup(config);
+
+	if (!configured) {
+		printk(KERN_ERR "kgdboe: configuration incorrect - kgdboe not "
+		       "loaded.\n");
+		printk(KERN_ERR "  Usage: kgdboe=[src-port]@[src-ip]/[dev],"
+				"[tgt-port]@<tgt-ip>/<tgt-macaddr>\n");
+		return -EINVAL;
+	}
+
+	/* Bring it up. */
+	if (netpoll_setup(&np)) {
+		printk(KERN_ERR "kgdboe: netpoll_setup failed kgdboe failed\n");
+		return -EINVAL;
+	}
+
+	if (kgdb_register_io_module(&local_kgdb_io_ops)) {
+		netpoll_cleanup(&np);
+		return -EINVAL;
+	}
+
+	configured = 2;
+
+	return 0;
+}
+
+static int init_kgdboe(void)
+{
+	int ret;
+
+	/* Already done? */
+	if (configured == 2)
+		return 0;
+
+	/* OK, go ahead and do it. */
+	ret = configure_kgdboe();
+
+	if (configured == 2)
+		printk(KERN_INFO "kgdboe: debugging over ethernet enabled\n");
+
+	return ret;
+}
+
+static void cleanup_kgdboe(void)
+{
+	netpoll_cleanup(&np);
+	configured = 0;
+	kgdb_unregister_io_module(&local_kgdb_io_ops);
+}
+
+static int param_set_kgdboe_var(const char *kmessage, struct kernel_param *kp)
+{
+	char kmessage_save[MAX_KGDBOE_CONFIG_STR];
+	int msg_len = strlen(kmessage);
+
+	if (msg_len + 1 > MAX_KGDBOE_CONFIG_STR) {
+		printk(KERN_ERR "%s: string doesn't fit in %u chars.\n",
+		       kp->name, MAX_KGDBOE_CONFIG_STR - 1);
+		return -ENOSPC;
+	}
+
+	if (kgdb_connected) {
+		printk(KERN_ERR "kgdboe: Cannot reconfigure while KGDB is "
+				"connected.\n");
+		return 0;
+	}
+
+	/* Start the reconfiguration process by saving the old string */
+	strncpy(kmessage_save, config, sizeof(kmessage_save));
+
+
+	/* Copy in the new param and strip out invalid characters so we
+	 * can optionally specify the MAC.
+	 */
+	strncpy(config, kmessage, sizeof(config));
+	msg_len--;
+	while (msg_len > 0 &&
+			(config[msg_len] < ',' || config[msg_len] > 'f')) {
+		config[msg_len] = '\0';
+		msg_len--;
+	}
+
+	/* Check to see if we are unconfiguring the io module and that it
+	 * was in a fully configured state, as this is the only time that
+	 * netpoll_cleanup should get called
+	 */
+	if (configured == 2 && strcmp(config, NOT_CONFIGURED_STRING) == 0) {
+		printk(KERN_INFO "kgdboe: reverting to unconfigured state\n");
+		cleanup_kgdboe();
+		return 0;
+	} else
+		/* Go and configure with the new params. */
+		configure_kgdboe();
+
+	if (configured == 2)
+		return 0;
+
+	/* If the new string was invalid, revert to the previous state, which
+	 * is at a minimum not_configured. */
+	strncpy(config, kmessage_save, sizeof(config));
+	if (strcmp(kmessage_save, NOT_CONFIGURED_STRING) != 0) {
+		printk(KERN_INFO "kgdboe: reverting to prior configuration\n");
+		/* revert back to the original config */
+		strncpy(config, kmessage_save, sizeof(config));
+		configure_kgdboe();
+	}
+	return 0;
+}
+
+static struct kgdb_io local_kgdb_io_ops = {
+	.read_char = eth_get_char,
+	.write_char = eth_put_char,
+	.init = init_kgdboe,
+	.flush = eth_flush_buf,
+	.pre_exception = eth_pre_exception_handler,
+	.post_exception = eth_post_exception_handler
+};
+
+module_init(init_kgdboe);
+module_exit(cleanup_kgdboe);
+module_param_call(kgdboe, param_set_kgdboe_var, param_get_string, &kps, 0644);
+MODULE_PARM_DESC(kgdboe, " kgdboe=[src-port]@[src-ip]/[dev],"
+		 "[tgt-port]@<tgt-ip>/<tgt-macaddr>\n");
diff -puN drivers/net/Makefile~kgdb-eth drivers/net/Makefile
--- devel/drivers/net/Makefile~kgdb-eth	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/drivers/net/Makefile	2006-05-19 16:01:51.000000000 -0700
@@ -211,6 +211,7 @@ obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
+obj-$(CONFIG_KGDBOE) += kgdboe.o
 
 obj-$(CONFIG_FS_ENET) += fs_enet/
 
diff -puN lib/Kconfig.debug~kgdb-eth lib/Kconfig.debug
--- devel/lib/Kconfig.debug~kgdb-eth	2006-05-19 16:01:51.000000000 -0700
+++ devel-akpm/lib/Kconfig.debug	2006-05-19 16:01:51.000000000 -0700
@@ -319,8 +319,32 @@ config KGDB_8250_NOMODULE
 	  Uses generic serial port (8250) to communicate with the host
 	  GDB.  This is independent of the normal (SERIAL_8250) driver
 	  for this chipset.
+
+config KGDBOE_NOMODULE
+	bool "KGDB: On ethernet - in kernel"
+	select KGDBOE
+	select NETPOLL
+	select NETPOLL_TRAP
+	select NETPOLL_RX
+	help
+	  Uses the NETPOLL API to communicate with the host GDB via UDP.
+	  In order for this to work, the ethernet interface specified must
+	  support the NETPOLL API, and this must be initialized at boot.
+	  See the documentation for syntax.
 endchoice
 
+config KGDBOE
+	tristate "KGDB: On ethernet" if !KGDBOE_NOMODULE
+	depends on m && KGDB
+	select NETPOLL
+	select NETPOLL_TRAP
+	select NETPOLL_RX
+	help
+	  Uses the NETPOLL API to communicate with the host GDB via UDP.
+	  In order for this to work, the ethernet interface specified must
+	  support the NETPOLL API, and this must be initialized at boot.
+	  See the documentation for syntax.
+
 config KGDB_8250
 	tristate "KGDB: On generic serial port (8250)" if !KGDB_8250_NOMODULE
 	depends on m && KGDB_ONLY_MODULES
_

kgdb-i386-lite.patch:
 devel-akpm/arch/i386/kernel/kgdb-jmp.S        |   74 ++++++
 devel-akpm/arch/i386/kernel/kgdb.c            |  313 ++++++++++++++++++++++++++
 devel-akpm/arch/i386/kernel/setup.c           |    3 
 devel-akpm/arch/i386/kernel/traps.c           |   12 
 devel-akpm/arch/i386/mm/fault.c               |    4 
 devel-akpm/include/asm-i386/kdebug.h          |    1 
 devel-akpm/include/asm-i386/kgdb.h            |   49 ++++
 devel-akpm/lib/Kconfig.debug                  |    2 
 linux-2.6.16.noarch/arch/i386/kernel/Makefile |    2 
 9 files changed, 455 insertions(+), 5 deletions(-)

--- NEW FILE kgdb-i386-lite.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/i386/kernel/Makefile   |    1 
 arch/i386/kernel/kgdb-jmp.S |   74 ++++++++
 arch/i386/kernel/kgdb.c     |  313 ++++++++++++++++++++++++++++++++++
 arch/i386/kernel/setup.c    |    3 
 arch/i386/kernel/traps.c    |   12 -
 arch/i386/mm/fault.c        |    4 
 include/asm-i386/kdebug.h   |    1 
 include/asm-i386/kgdb.h     |   49 +++++
 lib/Kconfig.debug           |    2 
 9 files changed, 454 insertions(+), 5 deletions(-)

diff -puN /dev/null arch/i386/kernel/kgdb.c
--- /dev/null	2006-06-03 22:34:36.282200750 -0700
+++ devel-akpm/arch/i386/kernel/kgdb.c	2006-06-06 17:32:34.000000000 -0700
@@ -0,0 +1,313 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
+/*
+ * Copyright (C) 2000-2001 VERITAS Software Corporation.
+ */
+/*
+ *  Contributor:     Lake Stevens Instrument Division$
+ *  Written by:      Glenn Engel $
+ *  Updated by:	     Amit Kale<akale at veritas.com>
+ *  Updated by:	     Tom Rini <trini at kernel.crashing.org>
+ *  Modified for 386 by Jim Kingdon, Cygnus Support.
+ *  Origianl kgdb, compatibility with 2.1.xx kernel by
+ *  David Grothe <dave at gcom.com>
+ *  Additional support from Tigran Aivazian <tigran at sco.com>
+ */
+
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <asm/vm86.h>
+#include <asm/system.h>
+#include <asm/ptrace.h>		/* for linux pt_regs struct */
+#include <linux/kgdb.h>
+#include <linux/init.h>
+#include <asm/apicdef.h>
+#include <asm/desc.h>
+#include <asm/kdebug.h>
+
+#include "mach_ipi.h"
+
+/* Put the error code here just in case the user cares.  */
+int gdb_i386errcode;
+/* Likewise, the vector number here (since GDB only gets the signal
+   number through the usual means, and that's not very specific).  */
+int gdb_i386vector = -1;
+
+extern atomic_t cpu_doing_single_step;
+
+void regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+	gdb_regs[_EAX] = regs->eax;
+	gdb_regs[_EBX] = regs->ebx;
+	gdb_regs[_ECX] = regs->ecx;
+	gdb_regs[_EDX] = regs->edx;
+	gdb_regs[_ESI] = regs->esi;
+	gdb_regs[_EDI] = regs->edi;
+	gdb_regs[_EBP] = regs->ebp;
+	gdb_regs[_DS] = regs->xds;
+	gdb_regs[_ES] = regs->xes;
+	gdb_regs[_PS] = regs->eflags;
+	gdb_regs[_CS] = regs->xcs;
+	gdb_regs[_PC] = regs->eip;
+	gdb_regs[_ESP] = (int)(&regs->esp);
+	gdb_regs[_SS] = __KERNEL_DS;
+	gdb_regs[_FS] = 0xFFFF;
+	gdb_regs[_GS] = 0xFFFF;
+}
+
+/*
+ * Extracts ebp, esp and eip values understandable by gdb from the values
+ * saved by switch_to.
+ * thread.esp points to ebp. flags and ebp are pushed in switch_to hence esp
+ * prior to entering switch_to is 8 greater then the value that is saved.
+ * If switch_to changes, change following code appropriately.
+ */
+void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
+{
+	gdb_regs[_EAX] = 0;
+	gdb_regs[_EBX] = 0;
+	gdb_regs[_ECX] = 0;
+	gdb_regs[_EDX] = 0;
+	gdb_regs[_ESI] = 0;
+	gdb_regs[_EDI] = 0;
+	gdb_regs[_EBP] = *(unsigned long *)p->thread.esp;
+	gdb_regs[_DS] = __KERNEL_DS;
+	gdb_regs[_ES] = __KERNEL_DS;
+	gdb_regs[_PS] = 0;
+	gdb_regs[_CS] = __KERNEL_CS;
+	gdb_regs[_PC] = p->thread.eip;
+	gdb_regs[_ESP] = p->thread.esp;
+	gdb_regs[_SS] = __KERNEL_DS;
+	gdb_regs[_FS] = 0xFFFF;
+	gdb_regs[_GS] = 0xFFFF;
+}
+
+void gdb_regs_to_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+	regs->eax = gdb_regs[_EAX];
+	regs->ebx = gdb_regs[_EBX];
+	regs->ecx = gdb_regs[_ECX];
+	regs->edx = gdb_regs[_EDX];
+	regs->esi = gdb_regs[_ESI];
+	regs->edi = gdb_regs[_EDI];
+	regs->ebp = gdb_regs[_EBP];
+	regs->xds = gdb_regs[_DS];
+	regs->xes = gdb_regs[_ES];
+	regs->eflags = gdb_regs[_PS];
+	regs->xcs = gdb_regs[_CS];
+	regs->eip = gdb_regs[_PC];
+}
+
+static struct hw_breakpoint {
+	unsigned enabled;
+	unsigned type;
+	unsigned len;
+	unsigned addr;
+} breakinfo[4] = {
+	{ .enabled = 0 },
+	{ .enabled = 0 },
+	{ .enabled = 0 },
+	{ .enabled = 0 },
+};
+
+void kgdb_correct_hw_break(void)
+{
+	int breakno;
+	int correctit;
+	int breakbit;
+	unsigned dr7;
+
+	asm volatile ("movl %%db7, %0\n":"=r" (dr7)
+		      :);
+	do {
+		unsigned addr0, addr1, addr2, addr3;
+		asm volatile ("movl %%db0, %0\n"
+			      "movl %%db1, %1\n"
+			      "movl %%db2, %2\n"
+			      "movl %%db3, %3\n":"=r" (addr0), "=r"(addr1),
+			      "=r"(addr2), "=r"(addr3):);
+	} while (0);
+	correctit = 0;
+	for (breakno = 0; breakno < 3; breakno++) {
+		breakbit = 2 << (breakno << 1);
+		if (!(dr7 & breakbit) && breakinfo[breakno].enabled) {
+			correctit = 1;
+			dr7 |= breakbit;
+			dr7 &= ~(0xf0000 << (breakno << 2));
+			dr7 |= (((breakinfo[breakno].len << 2) |
+				 breakinfo[breakno].type) << 16) <<
+			    (breakno << 2);
+			switch (breakno) {
+			case 0:
+				asm volatile ("movl %0, %%dr0\n"::"r"
+					      (breakinfo[breakno].addr));
+				break;
+
+			case 1:
+				asm volatile ("movl %0, %%dr1\n"::"r"
+					      (breakinfo[breakno].addr));
+				break;
+
+			case 2:
+				asm volatile ("movl %0, %%dr2\n"::"r"
+					      (breakinfo[breakno].addr));
+				break;
+
+			case 3:
+				asm volatile ("movl %0, %%dr3\n"::"r"
+					      (breakinfo[breakno].addr));
+				break;
+			}
+		} else if ((dr7 & breakbit) && !breakinfo[breakno].enabled) {
+			correctit = 1;
+			dr7 &= ~breakbit;
+			dr7 &= ~(0xf0000 << (breakno << 2));
+		}
+	}
+	if (correctit)
+		asm volatile ("movl %0, %%db7\n"::"r" (dr7));
+}
+
+void kgdb_disable_hw_debug(struct pt_regs *regs)
+{
+	/* Disable hardware debugging while we are in kgdb */
+	asm volatile ("movl %0,%%db7": /* no output */ :"r" (0));
+}
+
+void kgdb_post_master_code(struct pt_regs *regs, int e_vector, int err_code)
+{
+	/* Master processor is completely in the debugger */
+	gdb_i386vector = e_vector;
+	gdb_i386errcode = err_code;
+}
+
+void kgdb_roundup_cpus(unsigned long flags)
+{
+	send_IPI_allbutself(APIC_DM_NMI);
+}
+
+int kgdb_arch_handle_exception(int e_vector, int signo,
+			       int err_code, char *remcom_in_buffer,
+			       char *remcom_out_buffer,
+			       struct pt_regs *linux_regs)
+{
+	long addr;
+	char *ptr;
+	int newPC, dr6;
+
+	switch (remcom_in_buffer[0]) {
+	case 'c':
+	case 's':
+		/* try to read optional parameter, pc unchanged if no parm */
+		ptr = &remcom_in_buffer[1];
+		if (kgdb_hex2long(&ptr, &addr))
+			linux_regs->eip = addr;
+		newPC = linux_regs->eip;
+
+		/* clear the trace bit */
+		linux_regs->eflags &= ~TF_MASK;
+		atomic_set(&cpu_doing_single_step, -1);
+
+		/* set the trace bit if we're stepping */
+		if (remcom_in_buffer[0] == 's') {
+			linux_regs->eflags |= TF_MASK;
+			debugger_step = 1;
+			atomic_set(&cpu_doing_single_step,smp_processor_id());
+		}
+
+		asm volatile ("movl %%db6, %0\n":"=r" (dr6));
+		if (!(dr6 & 0x4000)) {
+			long breakno;
+			for (breakno = 0; breakno < 4; ++breakno) {
+				if (dr6 & (1 << breakno) &&
+				    breakinfo[breakno].type == 0) {
+					/* Set restore flag */
+					linux_regs->eflags |= X86_EFLAGS_RF;
+					break;
+				}
+			}
+		}
+		kgdb_correct_hw_break();
+		asm volatile ("movl %0, %%db6\n"::"r" (0));
+
+		return (0);
+	}			/* switch */
+	/* this means that we do not want to exit from the handler */
+	return -1;
+}
+
+/* Register KGDB with the i386die_chain so that we hook into all of the right
+ * spots. */
+static int kgdb_notify(struct notifier_block *self, unsigned long cmd,
+		       void *ptr)
+{
+	struct die_args *args = ptr;
+	struct pt_regs *regs = args->regs;
+
+	/* Bad memory access? */
+	if (cmd == DIE_PAGE_FAULT_NO_CONTEXT && atomic_read(&debugger_active)
+			&& kgdb_may_fault) {
+		kgdb_fault_longjmp(kgdb_fault_jmp_regs);
+		return NOTIFY_STOP;
+	} else if (cmd == DIE_PAGE_FAULT)
+		/* A normal page fault, ignore. */
+		return NOTIFY_DONE;
+       else if ((cmd == DIE_NMI || cmd == DIE_NMI_IPI ||
+               cmd == DIE_NMIWATCHDOG) && atomic_read(&debugger_active)) {
+               /* CPU roundup */
+               kgdb_nmihook(smp_processor_id(), regs);
+               return NOTIFY_STOP;
+       } else if (cmd == DIE_NMI_IPI || cmd == DIE_NMI || user_mode(regs) ||
+                       (cmd == DIE_DEBUG && atomic_read(&debugger_active)))
+               /* Normal watchdog event or userspace debugging, or spurious
+                * debug exception, ignore. */
+               return NOTIFY_DONE;
+
+	kgdb_handle_exception(args->trapnr, args->signr, args->err, regs);
+
+	return NOTIFY_STOP;
+}
+
+static struct notifier_block kgdb_notifier = {
+	.notifier_call = kgdb_notify,
+};
+
+int kgdb_arch_init(void)
+{
+	atomic_notifier_chain_register(&i386die_chain, &kgdb_notifier);
+	return 0;
+}
+
+/*
+ * Skip an int3 exception when it occurs after a breakpoint has been
+ * removed. Backtrack eip by 1 since the int3 would have caused it to
+ * increment by 1.
+ */
+
+int kgdb_skipexception(int exception, struct pt_regs *regs)
+{
+	if (exception == 3 && kgdb_isremovedbreak(regs->eip - 1)) {
+		regs->eip -= 1;
+		return 1;
+	}
+	return 0;
+}
+
+struct kgdb_arch arch_kgdb_ops = {
+	.gdb_bpt_instr = {0xcc},
diff -puN /dev/null arch/i386/kernel/kgdb-jmp.S
--- /dev/null	2006-06-03 22:34:36.282200750 -0700
+++ devel-akpm/arch/i386/kernel/kgdb-jmp.S	2006-06-06 17:32:34.000000000 -0700
@@ -0,0 +1,74 @@
+/*
+ * arch/i386/kernel/kgdb-jmp.S
+ *
+ * Save and restore system registers so that within a limited frame we
+ * may have a fault and "jump back" to a known safe location.
+ *
+ * Author: George Anzinger <george at mvista.com>
+ *
+ * Cribbed from glibc, which carries the following:
+ * Copyright (C) 1996, 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+ * Copyright (C) 2005 by MontaVista Software.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program as licensed "as is" without any warranty of
+ * any kind, whether express or implied.
+ */
+
+#include <linux/linkage.h>
+
+#define PCOFF		0
+#define LINKAGE		4		/* just the return address */
+#define PTR_SIZE	4
+#define PARMS		LINKAGE		/* no space for saved regs */
+#define JMPBUF		PARMS
+#define VAL		JMPBUF+PTR_SIZE
+
+#define JB_BX		0
+#define JB_SI		1
+#define JB_DI		2
+#define JB_BP		3
+#define JB_SP		4
+#define JB_PC		5
+
+/* This must be called prior to kgdb_fault_longjmp and
+ * kgdb_fault_longjmp must not be called outside of the context of the
+ * last call to kgdb_fault_setjmp.
+ * kgdb_fault_setjmp(int *jmp_buf[6])
+ */
+ENTRY(kgdb_fault_setjmp)
+	movl JMPBUF(%esp), %eax
+
+	/* Save registers.  */
+	movl	%ebx, (JB_BX*4)(%eax)
+	movl	%esi, (JB_SI*4)(%eax)
+	movl	%edi, (JB_DI*4)(%eax)
+	/* Save SP as it will be after we return.  */
+	leal	JMPBUF(%esp), %ecx
+	movl	%ecx, (JB_SP*4)(%eax)
+	movl	PCOFF(%esp), %ecx	/* Save PC we are returning to now.  */
+	movl	%ecx, (JB_PC*4)(%eax)
+	movl	%ebp, (JB_BP*4)(%eax)	/* Save caller's frame pointer.  */
+
+	/* Restore state so we can now try the access. */
+	movl	JMPBUF(%esp), %ecx	/* User's jmp_buf in %ecx.  */
+	/* Save the return address now.  */
+	movl	(JB_PC*4)(%ecx), %edx
+	/* Restore registers.  */
+	movl	$0, %eax
+	movl	(JB_SP*4)(%ecx), %esp
+	jmp	*%edx		/* Jump to saved PC. */
+
+/* kgdb_fault_longjmp(int *jmp_buf[6]) */
+ENTRY(kgdb_fault_longjmp)
+	movl	JMPBUF(%esp), %ecx	/* User's jmp_buf in %ecx.  */
+	/* Save the return address now.  */
+	movl	(JB_PC*4)(%ecx), %edx
+	/* Restore registers.  */
+	movl	(JB_BX*4)(%ecx), %ebx
+	movl	(JB_SI*4)(%ecx), %esi
+	movl	(JB_DI*4)(%ecx), %edi
+	movl	(JB_BP*4)(%ecx), %ebp
+	movl	$1, %eax
+	movl	(JB_SP*4)(%ecx), %esp
+	jmp	*%edx		/* Jump to saved PC. */
--- linux-2.6.16.noarch/arch/i386/kernel/Makefile~	2006-06-07 19:36:45.000000000 -0400
+++ linux-2.6.16.noarch/arch/i386/kernel/Makefile	2006-06-07 19:36:58.000000000 -0400
@@ -38,6 +38,8 @@ obj-$(CONFIG_DOUBLEFAULT) 	+= doublefaul
 obj-$(CONFIG_VM86)		+= vm86.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 
+obj-$(CONFIG_KGDB)		+= kgdb.o kgdb-jmp.o
+
 EXTRA_AFLAGS   := -traditional
 
 obj-$(CONFIG_SCx200)		+= scx200.o
diff -puN arch/i386/kernel/setup.c~kgdb-i386-lite arch/i386/kernel/setup.c
--- devel/arch/i386/kernel/setup.c~kgdb-i386-lite	2006-06-06 17:32:34.000000000 -0700
+++ devel-akpm/arch/i386/kernel/setup.c	2006-06-06 17:32:34.000000000 -0700
@@ -150,6 +150,7 @@ EXPORT_SYMBOL(ist_info);
 struct e820map e820;
 
 extern void early_cpu_init(void);
+extern void early_trap_init(void);
 extern void generic_apic_probe(char *);
 
 unsigned long saved_videomode;
@@ -1555,6 +1556,7 @@ void __init setup_arch(char **cmdline_p)
 	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
 	pre_setup_arch_hook();
 	early_cpu_init();
+	early_trap_init();
 
 	/*
 	 * FIXME: This isn't an official loader_type right
@@ -1604,6 +1606,7 @@ void __init setup_arch(char **cmdline_p)
 	data_resource.end = virt_to_phys(_edata)-1;
 
 	parse_cmdline_early(cmdline_p);
+	parse_early_param();
 
 #ifdef CONFIG_EARLY_PRINTK
 	{
diff -puN arch/i386/kernel/traps.c~kgdb-i386-lite arch/i386/kernel/traps.c
--- devel/arch/i386/kernel/traps.c~kgdb-i386-lite	2006-06-06 17:32:34.000000000 -0700
+++ devel-akpm/arch/i386/kernel/traps.c	2006-06-06 17:32:34.000000000 -0700
@@ -830,6 +830,7 @@ fastcall void __kprobes do_debug(struct 
 	 */
 clear_dr7:
 	set_debugreg(0, 7);
+	notify_die(DIE_DEBUG, "debug2", regs, condition, error_code, SIGTRAP);
 	return;
 
 debug_vm86:
@@ -1134,6 +1135,12 @@ static void __init set_task_gate(unsigne
 	_set_gate(idt_table+n,5,0,0,(gdt_entry<<3));
 }
 
+/* Some traps need to be set early. */
+void __init early_trap_init(void) {
+	set_intr_gate(1,&debug);
+	set_system_intr_gate(3, &int3); /* int3 can be called from all */
+	set_intr_gate(14,&page_fault);
+}
 
 void __init trap_init(void)
 {
@@ -1150,10 +1157,8 @@ void __init trap_init(void)
 #endif
 
 	set_trap_gate(0,&divide_error);
-	set_intr_gate(1,&debug);
 	set_intr_gate(2,&nmi);
-	set_system_intr_gate(3, &int3); /* int3/4 can be called from all */
-	set_system_gate(4,&overflow);
+	set_system_gate(4,&overflow); /* int4/5 can be called from all */
 	set_trap_gate(5,&bounds);
 	set_trap_gate(6,&invalid_op);
 	set_trap_gate(7,&device_not_available);
@@ -1163,7 +1168,6 @@ void __init trap_init(void)
 	set_trap_gate(11,&segment_not_present);
 	set_trap_gate(12,&stack_segment);
 	set_trap_gate(13,&general_protection);
-	set_intr_gate(14,&page_fault);
 	set_trap_gate(15,&spurious_interrupt_bug);
 	set_trap_gate(16,&coprocessor_error);
 	set_trap_gate(17,&alignment_check);
diff -puN arch/i386/mm/fault.c~kgdb-i386-lite arch/i386/mm/fault.c
--- devel/arch/i386/mm/fault.c~kgdb-i386-lite	2006-06-06 17:32:34.000000000 -0700
+++ devel-akpm/arch/i386/mm/fault.c	2006-06-06 17:32:34.000000000 -0700
@@ -539,6 +539,10 @@ no_context:
  	if (is_prefetch(regs, address, error_code))
  		return;
 
+	if (notify_die(DIE_PAGE_FAULT_NO_CONTEXT, "no context", regs,
+				error_code, 14, SIGSEGV) == NOTIFY_STOP)
+		return;
+
 /*
  * Oops. The kernel tried to access some bad page. We'll have to
  * terminate things with extreme prejudice.
diff -puN include/asm-i386/kdebug.h~kgdb-i386-lite include/asm-i386/kdebug.h
--- devel/include/asm-i386/kdebug.h~kgdb-i386-lite	2006-06-06 17:32:34.000000000 -0700
+++ devel-akpm/include/asm-i386/kdebug.h	2006-06-06 17:32:34.000000000 -0700
@@ -39,6 +39,7 @@ enum die_val {
 	DIE_CALL,
 	DIE_NMI_IPI,
 	DIE_PAGE_FAULT,
+	DIE_PAGE_FAULT_NO_CONTEXT,
 };
 
 static inline int notify_die(enum die_val val, const char *str,
diff -puN /dev/null include/asm-i386/kgdb.h
--- /dev/null	2006-06-03 22:34:36.282200750 -0700
+++ devel-akpm/include/asm-i386/kgdb.h	2006-06-06 17:32:34.000000000 -0700
@@ -0,0 +1,49 @@
+#ifdef __KERNEL__
+#ifndef _ASM_KGDB_H_
+#define _ASM_KGDB_H_
+
+/*
+ * Copyright (C) 2001-2004 Amit S. Kale
+ */
+
+/************************************************************************/
+/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
+/* at least NUMREGBYTES*2 are needed for register packets */
+/* Longer buffer is needed to list all threads */
+#define BUFMAX			1024
+
+/* Number of bytes of registers.  */
+#define NUMREGBYTES		64
+/* Number of bytes of registers we need to save for a setjmp/longjmp. */
+#define NUMCRITREGBYTES		24
+
+/*
+ *  Note that this register image is in a different order than
+ *  the register image that Linux produces at interrupt time.
+ *
+ *  Linux's register image is defined by struct pt_regs in ptrace.h.
+ *  Just why GDB uses a different order is a historical mystery.
+ */
+enum regnames { _EAX,		/* 0 */
+	_ECX,			/* 1 */
+	_EDX,			/* 2 */
+	_EBX,			/* 3 */
+	_ESP,			/* 4 */
+	_EBP,			/* 5 */
+	_ESI,			/* 6 */
+	_EDI,			/* 7 */
+	_PC,			/* 8 also known as eip */
+	_PS,			/* 9 also known as eflags */
+	_CS,			/* 10 */
+	_SS,			/* 11 */
+	_DS,			/* 12 */
+	_ES,			/* 13 */
+	_FS,			/* 14 */
+	_GS			/* 15 */
+};
+
+#define BREAKPOINT()		asm("   int $3");
+#define BREAK_INSTR_SIZE	1
+#define CACHE_FLUSH_IS_SAFE	1
+#endif				/* _ASM_KGDB_H_ */
+#endif				/* __KERNEL__ */
diff -puN lib/Kconfig.debug~kgdb-i386-lite lib/Kconfig.debug
--- devel/lib/Kconfig.debug~kgdb-i386-lite	2006-06-06 17:32:34.000000000 -0700
+++ devel-akpm/lib/Kconfig.debug	2006-06-06 17:32:34.000000000 -0700
@@ -525,7 +525,7 @@ config WANT_EXTRA_DEBUG_INFORMATION
 config KGDB
 	bool "KGDB: kernel debugging with remote gdb"
 	select WANT_EXTRA_DEBUG_INFORMATION
-	depends on DEBUG_KERNEL
+	depends on DEBUG_KERNEL && X86_32
 	help
 	  If you say Y here, it will be possible to remotely debug the
 	  kernel using gdb. It is strongly suggested that you enable
_

kgdb-i386.patch:
 kgdb.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+)

--- NEW FILE kgdb-i386.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/i386/kernel/kgdb.c |   51 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+)

diff -puN arch/i386/kernel/kgdb.c~kgdb-i386 arch/i386/kernel/kgdb.c
--- devel/arch/i386/kernel/kgdb.c~kgdb-i386	2006-03-31 00:33:13.000000000 -0800
+++ devel-akpm/arch/i386/kernel/kgdb.c	2006-03-31 00:33:13.000000000 -0800
@@ -184,6 +184,54 @@ void kgdb_correct_hw_break(void)
 		asm volatile ("movl %0, %%db7\n"::"r" (dr7));
 }
 
+int kgdb_remove_hw_break(unsigned long addr)
+{
+	int i, idx = -1;
+	for (i = 0; i < 4; i++) {
+		if (breakinfo[i].addr == addr && breakinfo[i].enabled) {
+			idx = i;
+			break;
+		}
+	}
+	if (idx == -1)
+		return -1;
+
+	breakinfo[idx].enabled = 0;
+	return 0;
+}
+
+void kgdb_remove_all_hw_break(void)
+{
+	int i;
+
+	for (i = 0; i < 4; i++) {
+		if (breakinfo[i].enabled) {
+			/* Do what? */
+			;
+		}
+		memset(&breakinfo[i], 0, sizeof(struct hw_breakpoint));
+	}
+}
+
+int kgdb_set_hw_break(unsigned long addr)
+{
+	int i, idx = -1;
+	for (i = 0; i < 4; i++) {
+		if (!breakinfo[i].enabled) {
+			idx = i;
+			break;
+		}
+	}
+	if (idx == -1)
+		return -1;
+
+	breakinfo[idx].enabled = 1;
+	breakinfo[idx].type = 1;
+	breakinfo[idx].len = 1;
+	breakinfo[idx].addr = addr;
+	return 0;
+}
+
 void kgdb_disable_hw_debug(struct pt_regs *regs)
 {
 	/* Disable hardware debugging while we are in kgdb */
@@ -311,3 +359,6 @@ int kgdb_skipexception(int exception, st
 
 struct kgdb_arch arch_kgdb_ops = {
 	.gdb_bpt_instr = {0xcc},
+	.flags = KGDB_HW_BREAKPOINT,
+};
+
_

kgdb-module.patch:
 include/linux/module.h |   16 +++++++++++++++
 kernel/module.c        |   50 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

--- NEW FILE kgdb-module.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/module.h |   16 ++++++++++++
 kernel/module.c        |   50 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff -puN include/linux/module.h~kgdb-module include/linux/module.h
--- devel/include/linux/module.h~kgdb-module	2006-05-27 23:29:50.000000000 -0700
+++ devel-akpm/include/linux/module.h	2006-05-27 23:29:50.000000000 -0700
@@ -224,8 +224,17 @@ enum module_state
 	MODULE_STATE_LIVE,
 	MODULE_STATE_COMING,
 	MODULE_STATE_GOING,
+ 	MODULE_STATE_GONE,
 };
 
+#ifdef CONFIG_KGDB
+#define MAX_SECTNAME 31
+struct mod_section {
+       void *address;
+       char name[MAX_SECTNAME + 1];
+};
+#endif
+
 /* Similar stuff for section attributes. */
 #define MODULE_SECT_NAME_LEN 32
 struct module_sect_attr
@@ -253,6 +262,13 @@ struct module
 	/* Unique handle for this module */
 	char name[MODULE_NAME_LEN];
 
+#ifdef CONFIG_KGDB
+	/* keep kgdb info at the begining so that gdb doesn't have a chance to
+	 * miss out any fields */
+	unsigned long num_sections;
+	struct mod_section *mod_sections;
+#endif
+
 	/* Sysfs stuff. */
 	struct module_kobject mkobj;
 	struct module_param_attrs *param_attrs;
diff -puN kernel/module.c~kgdb-module kernel/module.c
--- devel/kernel/module.c~kgdb-module	2006-05-27 23:29:50.000000000 -0700
+++ devel-akpm/kernel/module.c	2006-05-27 23:29:50.000000000 -0700
@@ -721,6 +721,10 @@ sys_delete_module(const char __user *nam
 	if (ret != 0)
 		goto out;
 
+	blocking_notifier_call_chain(&module_notify_list, MODULE_STATE_GOING,
+        			mod);
+
+
 	/* Never wait if forced. */
 	if (!forced && module_refcount(mod) != 0)
 		wait_for_zero_refcount(mod);
@@ -733,6 +737,9 @@ sys_delete_module(const char __user *nam
 	}
 	free_module(mod);
 
+	blocking_notifier_call_chain(&module_notify_list, MODULE_STATE_GONE,
+			NULL);
+
  out:
 	mutex_unlock(&module_mutex);
 	return ret;
@@ -1133,6 +1140,11 @@ static void free_module(struct module *m
 	/* Arch-specific cleanup. */
 	module_arch_cleanup(mod);
 
+#ifdef CONFIG_KGDB
+	/* kgdb info */
+	vfree(mod->mod_sections);
+#endif
+
 	/* Module unload stuff */
 	module_unload_free(mod);
 
@@ -1393,6 +1405,31 @@ static void setup_modinfo(struct module 
 	}
 }
 
+#ifdef CONFIG_KGDB
+int add_modsects (struct module *mod, Elf_Ehdr *hdr, Elf_Shdr *sechdrs, const
+                char *secstrings)
+{
+        int i;
+
+        mod->num_sections = hdr->e_shnum - 1;
+        mod->mod_sections = vmalloc((hdr->e_shnum - 1)*
+		sizeof (struct mod_section));
+
+        if (mod->mod_sections == NULL) {
+                return -ENOMEM;
+        }
+
+        for (i = 1; i < hdr->e_shnum; i++) {
+                mod->mod_sections[i - 1].address = (void *)sechdrs[i].sh_addr;
+                strncpy(mod->mod_sections[i - 1].name, secstrings +
+                                sechdrs[i].sh_name, MAX_SECTNAME);
+                mod->mod_sections[i - 1].name[MAX_SECTNAME] = '\0';
+	}
+
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_KALLSYMS
 int is_exported(const char *name, const struct module *mod)
 {
@@ -1807,6 +1844,12 @@ static struct module *load_module(void _
 
 	add_kallsyms(mod, sechdrs, symindex, strindex, secstrings);
 
+#ifdef CONFIG_KGDB
+        if ((err = add_modsects(mod, hdr, sechdrs, secstrings)) < 0) {
+                goto nomodsectinfo;
+        }
+#endif
+
 	err = module_finalize(hdr, sechdrs, mod);
 	if (err < 0)
 		goto cleanup;
@@ -1867,6 +1910,11 @@ static struct module *load_module(void _
  arch_cleanup:
 	module_arch_cleanup(mod);
  cleanup:
+
+#ifdef CONFIG_KGDB
+nomodsectinfo:
+       vfree(mod->mod_sections);
+#endif
 	module_unload_free(mod);
 	module_free(mod, mod->module_init);
  free_core:
@@ -1938,6 +1986,8 @@ sys_init_module(void __user *umod,
 		/* Init routine failed: abort.  Try to protect us from
                    buggy refcounters. */
 		mod->state = MODULE_STATE_GOING;
+		blocking_notifier_call_chain(&module_notify_list,
+				MODULE_STATE_GOING, mod);
 		synchronize_sched();
 		if (mod->unsafe)
 			printk(KERN_ERR "%s: module is now stuck!\n",
_

kgdb-netpoll_pass_skb_to_rx_hook.patch:
 include/linux/netpoll.h |    2 +-
 net/core/netpoll.c      |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kgdb-netpoll_pass_skb_to_rx_hook.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/netpoll.h |    2 +-
 net/core/netpoll.c      |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff -puN include/linux/netpoll.h~kgdb-netpoll_pass_skb_to_rx_hook include/linux/netpoll.h
--- devel/include/linux/netpoll.h~kgdb-netpoll_pass_skb_to_rx_hook	2006-04-05 21:45:18.000000000 -0700
+++ devel-akpm/include/linux/netpoll.h	2006-04-05 21:45:18.000000000 -0700
@@ -17,7 +17,7 @@ struct netpoll;
 struct netpoll {
 	struct net_device *dev;
 	char dev_name[16], *name;
-	void (*rx_hook)(struct netpoll *, int, char *, int);
+	void (*rx_hook)(struct netpoll *, int, char *, int, struct sk_buff *);
 	void (*drop)(struct sk_buff *skb);
 	u32 local_ip, remote_ip;
 	u16 local_port, remote_port;
diff -puN net/core/netpoll.c~kgdb-netpoll_pass_skb_to_rx_hook net/core/netpoll.c
--- devel/net/core/netpoll.c~kgdb-netpoll_pass_skb_to_rx_hook	2006-04-05 21:45:18.000000000 -0700
+++ devel-akpm/net/core/netpoll.c	2006-04-05 21:45:18.000000000 -0700
@@ -505,7 +505,8 @@ int __netpoll_rx(struct sk_buff *skb)
 
 	np->rx_hook(np, ntohs(uh->source),
 		    (char *)(uh+1),
-		    ulen - sizeof(struct udphdr));
+		    ulen - sizeof(struct udphdr),
+		    skb);
 
 	kfree_skb(skb);
 	return 1;
_

kgdb-sysrq_bugfix.patch:
 keyboard.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kgdb-sysrq_bugfix.patch ---
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 drivers/char/keyboard.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/char/keyboard.c~kgdb-sysrq_bugfix drivers/char/keyboard.c
--- devel/drivers/char/keyboard.c~kgdb-sysrq_bugfix	2006-06-06 17:32:35.000000000 -0700
+++ devel-akpm/drivers/char/keyboard.c	2006-06-06 17:32:35.000000000 -0700
@@ -1176,6 +1176,7 @@ static void kbd_keycode(unsigned int key
 		sysrq_down = 0;
 	if (sysrq_down && down && !rep) {
 		handle_sysrq(kbd_sysrq_xlate[keycode], regs, tty);
+		sysrq_down = 0;		/* In case we miss the 'up' event. */
 		return;
 	}
 #endif
_


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2253
retrieving revision 1.2254
diff -u -r1.2253 -r1.2254
--- kernel-2.6.spec	6 Jun 2006 21:15:47 -0000	1.2253
+++ kernel-2.6.spec	8 Jun 2006 00:35:42 -0000	1.2254
@@ -412,6 +412,20 @@
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 Patch2302: linux-2.6-cpufreq-acpi-sticky.patch
 
+# KGDB
+Patch9000: kgdb-core-lite.patch
+Patch9001: kgdb-core-lite-add-reboot-command.patch
+Patch9002: kgdb-8250.patch
+Patch9003: kgdb-8250-fix.patch
+Patch9004: kgdb-netpoll_pass_skb_to_rx_hook.patch
+Patch9005: kgdb-eth.patch
+Patch9006: kgdb-i386-lite.patch
+Patch9007: kgdb-cfi_annotations.patch
+Patch9008: kgdb-sysrq_bugfix.patch
+Patch9009: kgdb-module.patch
+Patch9010: kgdb-core.patch
+Patch9011: kgdb-i386.patch
+
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -1079,6 +1093,20 @@
 # final stuff
 #
 
+# KGDB
+%patch9000 -p1
+%patch9001 -p1
+%patch9002 -p1
+%patch9003 -p1
+%patch9004 -p1
+%patch9005 -p1
+%patch9006 -p1
+%patch9007 -p1
+%patch9008 -p1
+%patch9009 -p1
+%patch9010 -p1
+%patch9011 -p1
+
 #
 # misc small stuff to make things compile or otherwise improve performance
 #



From fedora-cvs-commits at redhat.com  Thu Jun  8 00:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 20:35:58 -0400
Subject: rpms/kernel/devel/configs config-generic,1.187,1.188
Message-ID: <200606080035.k580ZwWE014235@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv14092/configs

Modified Files:
	config-generic 
Log Message:
kgdb experiment.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- config-generic	6 Jun 2006 21:15:48 -0000	1.187
+++ config-generic	8 Jun 2006 00:35:44 -0000	1.188
@@ -2500,6 +2500,13 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 
+CONFIG_KGDB=y
+# CONFIG_KGDB_CONSOLE is not set
+CONFIG_KGDBOE=m
+CONFIG_KGDB_SIMPLE_SERIAL=y
+CONFIG_KGDB_BAUDRATE=115200
+CONFIG_KGDB_PORT_NUM=0
+
 #
 # Security options
 #



From fedora-cvs-commits at redhat.com  Thu Jun  8 00:40:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 20:40:04 -0400
Subject: rpms/kernel/devel linux-2.6-ac97_unregister_controls_ad18xx.patch,
	NONE, 1.1 kernel-2.6.spec, 1.2254, 1.2255
Message-ID: <200606080040.k580e40v014963@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14916

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ac97_unregister_controls_ad18xx.patch 
Log Message:
- AC97 fix for OLPC.


linux-2.6-ac97_unregister_controls_ad18xx.patch:
 ac97_codec.c |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-ac97_unregister_controls_ad18xx.patch ---
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index d052007..fcb00c2 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1204,6 +1204,20 @@ #define snd_ac97_cmute_new(card, name, r
 
 static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97);
 
+static void snd_ctl_elem_remove(struct snd_card *card,
+				struct snd_kcontrol *kcontrol)
+{
+	struct snd_kcontrol *kct;
+	struct snd_ctl_elem_id id = kcontrol->id;
+
+	down_write(&card->controls_rwsem);
+
+	if ((kct = snd_ctl_find_id(card, &id)))
+		snd_ctl_remove(card, kct);
+
+	up_write(&card->controls_rwsem);
+}
+
 static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
 {
 	struct snd_card *card = ac97->bus->card;
@@ -1347,23 +1361,35 @@ static int snd_ac97_mixer_build(struct s
 			init_val = 0x9f9f;
 		else
 			init_val = 0x9f1f;
-		for (idx = 0; idx < 2; idx++)
-			if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_pcm[idx], ac97))) < 0)
+		for (idx = 0; idx < 2; idx++) {
+			struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_pcm[idx], ac97);
+			snd_ctl_elem_remove(card, kctrl);
+			if ((err = snd_ctl_add(card, kctrl)) < 0)
 				return err;
+			}
 		ac97->spec.ad18xx.pcmreg[0] = init_val;
 		if (ac97->scaps & AC97_SCAP_SURROUND_DAC) {
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_surround[idx], ac97))) < 0)
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_surround[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
+			}
 			ac97->spec.ad18xx.pcmreg[1] = init_val;
 		}
 		if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC) {
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_center[idx], ac97))) < 0)
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_center[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_lfe[idx], ac97))) < 0)
+			}
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_lfe[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
+			}
 			ac97->spec.ad18xx.pcmreg[2] = init_val;
 		}
 		snd_ac97_write_cache(ac97, AC97_PCM, init_val);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2254
retrieving revision 1.2255
diff -u -r1.2254 -r1.2255
--- kernel-2.6.spec	8 Jun 2006 00:35:42 -0000	1.2254
+++ kernel-2.6.spec	8 Jun 2006 00:40:01 -0000	1.2255
@@ -376,6 +376,7 @@
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
+Patch1730: linux-2.6-ac97_unregister_controls_ad18xx.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
@@ -1030,6 +1031,8 @@
 %patch1710 -p1
 # setuid /proc/self/maps fix.
 %patch1720 -p1
+# OLPC ac97 fix.
+%patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # Fix up kmalloc whilst atomic warning during resume.
@@ -1802,6 +1805,10 @@
 %endif
 
 %changelog
+* Wed Jun  7 2006 Dave Jones <davej at redhat.com>
+- Experiment: Add KGDB.
+- AC97 fix for OLPC.
+
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc6. Special 6/6/6 edition, what could go wrong?
 - Add a kdump kernel for PPC64 (Don Zickus)



From fedora-cvs-commits at redhat.com  Thu Jun  8 01:02:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 21:02:11 -0400
Subject: rpms/evolution-sharp/FC-5 evolution-sharp.spec,1.15,1.16
Message-ID: <200606080102.k5812BpI008428@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-sharp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8411

Modified Files:
	evolution-sharp.spec 
Log Message:
Disable s390(x)


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/FC-5/evolution-sharp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- evolution-sharp.spec	7 Jun 2006 05:16:12 -0000	1.15
+++ evolution-sharp.spec	8 Jun 2006 01:02:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        9.1
+Release:        9.2
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@
 BuildRequires:  mono-devel gtk-sharp2-gapi
 BuildRequires:  automake, libtool, gtk-sharp2
 Requires:       evolution-data-server
+ExcludeArch: s390, s390x
 
 
 # Mono only availible on these:
@@ -58,6 +59,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.2
+- Exclude s390(x) because evolution won't build there
+
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.1
 - Rebuild for new EDS
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 01:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 21:06:56 -0400
Subject: rpms/planner/FC-5 planner.spec,1.23,1.24
Message-ID: <200606080106.k5816uWs008496@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/planner/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8483

Modified Files:
	planner.spec 
Log Message:
Bump for EDS, add missing BR, disable on s390(x)


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/FC-5/planner.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- planner.spec	7 Jun 2006 16:58:52 -0000	1.23
+++ planner.spec	8 Jun 2006 01:06:51 -0000	1.24
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release:   4.2
+Release:   4.3
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -28,7 +28,10 @@
 BuildRequires: libgnomeprintui22-devel >= 2.2.0, libxml2-devel >= 2.5.4
 BuildRequires: libxslt-devel >= 1.0.27, intltool, autoconf, automake17
 BuildRequires: libtool, gettext, libgsf-devel, gtk-doc, pygtk2-devel
-BuildRequires: scrollkeeper, glib2-devel, evolution-data-server
+BuildRequires: scrollkeeper, glib2-devel, evolution-data-server-devel, python-devel
+BuildRequires: evolution-devel
+
+ExcludeArch: s390, s390x
 
 
 ##################################
@@ -213,8 +216,10 @@
 # Changelog
 ##################################
 %changelog
-* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.2
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.3
 - Rebuild for new eds
+- Add missing buildrequires
+- Exclude s390(x) as evolution won't build there
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Jun  8 01:14:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 21:14:12 -0400
Subject: rpms/evolution-sharp/FC-5 evolution-sharp.spec,1.16,1.17
Message-ID: <200606080114.k581ECOs020090@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-sharp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20065

Modified Files:
	evolution-sharp.spec 
Log Message:
Disable s390(x) a better way


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/FC-5/evolution-sharp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- evolution-sharp.spec	8 Jun 2006 01:02:07 -0000	1.16
+++ evolution-sharp.spec	8 Jun 2006 01:14:10 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        9.2
+Release:        9.3
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -16,11 +16,11 @@
 BuildRequires:  mono-devel gtk-sharp2-gapi
 BuildRequires:  automake, libtool, gtk-sharp2
 Requires:       evolution-data-server
-ExcludeArch: s390, s390x
-
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+#ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
+# Disable s390(x) because evolution is broken there
 
 %description
 Mono/C# bindings for the Evolution addressbook.
@@ -59,7 +59,7 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
-* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.2
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.3
 - Exclude s390(x) because evolution won't build there
 
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.1



From fedora-cvs-commits at redhat.com  Thu Jun  8 01:17:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 21:17:12 -0400
Subject: rpms/planner/FC-5 planner.spec,1.24,1.25
Message-ID: <200606080117.k581HCRc027150@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/planner/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26601

Modified Files:
	planner.spec 
Log Message:
Disable s390(x) in a beter way


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/FC-5/planner.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- planner.spec	8 Jun 2006 01:06:51 -0000	1.24
+++ planner.spec	8 Jun 2006 01:17:09 -0000	1.25
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release:   4.3
+Release:   4.4
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -31,7 +31,9 @@
 BuildRequires: scrollkeeper, glib2-devel, evolution-data-server-devel, python-devel
 BuildRequires: evolution-devel
 
-ExcludeArch: s390, s390x
+ExcludeArch: s390
+ExcludeArch: s390x
+# Exclude s390(x) due to evolution not building there
 
 
 ##################################
@@ -216,7 +218,7 @@
 # Changelog
 ##################################
 %changelog
-* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.3
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.4
 - Rebuild for new eds
 - Add missing buildrequires
 - Exclude s390(x) as evolution won't build there



From fedora-cvs-commits at redhat.com  Thu Jun  8 02:23:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 22:23:07 -0400
Subject: rpms/ruby/FC-4 ruby-1.8.4-64bit-pack.patch, NONE,
	1.1 ruby-deprecated-search-path.patch, NONE,
	1.1 ruby-deprecated-sitelib-search-path.patch, NONE,
	1.1 ruby-rubyprefix.patch, NONE, 1.1 ruby-multilib.patch, 1.1,
	1.2 ruby.spec, 1.36, 1.37
Message-ID: <200606080223.k582N7PQ017730@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17694

Modified Files:
	ruby-multilib.patch ruby.spec 
Added Files:
	ruby-1.8.4-64bit-pack.patch ruby-deprecated-search-path.patch 
	ruby-deprecated-sitelib-search-path.patch 
	ruby-rubyprefix.patch 
Log Message:
* Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-2.fc4
- backport from devel.
  - correct sitelibdir.
  - ruby-rubyprefix.patch: moved all arch-independent modules under
    /usr/lib/ruby and keep arch-dependent modules under /usr/lib64/ruby
    for 64bit archs. so 'rubylibdir', 'sitelibdir' and 'sitedir' in
    Config::CONFIG points to the kind of /usr/lib/ruby now.
  - ruby-deprecated-search-path.patch: added the deprecated installation paths
    to the search path for the backward compatibility.
  - added a Provides: ruby(abi) to ruby-libs.
  - ruby-1.8.4-64bit-pack.patch: backport patch from upstream to fix unpack("l")
    not working on 64bit archs and integer overflow on template "w". (#189350)
  - updated License tag to be more comfortable, and with a pointer to get more
    details, like Python package does.
  - ruby-deprecated-sitelib-search-path.patch: applied to add more search path
    for backward compatibility.
  - added byacc to BuildReq.

ruby-1.8.4-64bit-pack.patch:
 pack.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ruby-1.8.4-64bit-pack.patch ---
diff -ruN ruby-1.8.4.orig/pack.c ruby-1.8.4/pack.c
--- ruby-1.8.4.orig/pack.c	2005-10-13 23:30:49.000000000 +0900
+++ ruby-1.8.4/pack.c	2006-04-20 13:50:25.000000000 +0900
@@ -347,11 +347,11 @@
     return 0;			/* not reached */
 }
 
-#if SIZEOF_LONG == SIZE32 || SIZEOF_INT == SIZE32
+#if SIZEOF_LONG == SIZE32
 # define EXTEND32(x) 
 #else
 /* invariant in modulo 1<<31 */
-# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31));}} while(0)
+# define EXTEND32(x) do { if (!natint) {(x) = (((1L<<31)-1-(x))^~(~0L<<31));}} while(0)
 #endif
 #if SIZEOF_SHORT == SIZE16
 # define EXTEND16(x) 
@@ -1951,7 +1951,7 @@
 	  case 'w':
 	    {
 		unsigned long ul = 0;
-		unsigned long ulmask = 0xfeL << ((sizeof(unsigned long) - 1) * 8);
+		unsigned long ulmask = 0xfeUL << ((sizeof(unsigned long) - 1UL) * 8UL);
 
 		while (len > 0 && s < send) {
 		    ul <<= 7;

ruby-deprecated-search-path.patch:
 configure.in |    4 ++++
 ruby.c       |    9 +++++++++
 2 files changed, 13 insertions(+)

--- NEW FILE ruby-deprecated-search-path.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-04-20 12:53:38.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-04-20 13:06:07.000000000 +0900
@@ -1472,12 +1472,16 @@
 esac
 RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+RUBY_DEPRECATED_SITE_LIB_PATH="${SITE_DIR2}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
 AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
 AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_LIB, "${RUBY_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB, "${SITE_DIR2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB2, "${RUBY_DEPRECATED_SITE_LIB_PATH}")
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c	2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c	2006-04-20 12:59:50.000000000 +0900
@@ -292,11 +292,17 @@
 #endif
 
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
+#ifdef RUBY_DEPRECATED_SITE_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB2));
+#endif
 #ifdef RUBY_SITE_THIN_ARCHLIB
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
 #endif
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+#ifdef RUBY_DEPRECATED_SITE_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
+#endif
 #ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
 #endif
@@ -308,6 +314,9 @@
 #endif
 
     ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
+#ifdef RUBY_DEPRECATED_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_LIB));
+#endif
 #ifdef RUBY_THIN_ARCHLIB
     ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
 #endif

ruby-deprecated-sitelib-search-path.patch:
 configure.in |    3 +++
 ruby.c       |    9 +++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE ruby-deprecated-sitelib-search-path.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-06-07 13:58:03.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-06-07 15:54:36.000000000 +0900
@@ -1476,6 +1476,8 @@
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
@@ -1506,6 +1508,7 @@
 
 AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_ARCHLIB, "${libdir}/site_ruby/${MAJOR}.${MINOR}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c	2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c	2006-06-07 15:56:14.000000000 +0900
@@ -297,6 +297,15 @@
 #endif
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
+#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
+#endif
 
     ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
 #ifdef RUBY_THIN_ARCHLIB

ruby-rubyprefix.patch:
 configure.in |   27 ++++++++++++++++++++++-----
 mkconfig.rb  |    8 ++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE ruby-rubyprefix.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-04-19 21:54:44.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-04-19 21:59:48.000000000 +0900
@@ -1433,6 +1433,13 @@
     rubyw_install_name="$RUBYW_INSTALL_NAME"
     ;;
 esac
+
+AC_ARG_WITH(ruby-prefix,
+	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
+	,,
+	with_ruby_prefix=no)
+
+if test "x$with_ruby_prefix" = "x"; then
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_LIB_PREFIX="/lib/ruby"
@@ -1441,21 +1448,30 @@
     RUBY_LIB_PREFIX="${prefix}/lib/ruby"
     ;;
 esac
+else
+	RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
+fi
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
 
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
             [sitedir='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR="`eval \"echo ${sitedir}\"`"
+SITE_DIR="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
+_fc_sitedir=${sitedir}
+SITE_DIR2="`eval \"echo ${_fc_sitedir}\"`"
+sitedir="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
     RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+    RUBY_SITE_LIB_PATH="$SITE_DIR";
+    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
 esac
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
@@ -1464,6 +1480,7 @@
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(_fc_sitedir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
@@ -1472,7 +1489,7 @@
     arch="fat-${target_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -1487,8 +1504,8 @@
   *) sitearch="${arch}" ;;
 esac
 
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
--- ruby-1.8.4.orig/mkconfig.rb	2005-11-11 08:22:03.000000000 +0900
+++ ruby-1.8.4/mkconfig.rb	2006-04-19 21:55:08.000000000 +0900
@@ -108,10 +108,10 @@
 print v_fast, v_others
 print <<EOS
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
+  CONFIG["sitelibdir"] = "$(prefix)/lib/ruby/site_ruby/$(ruby_version)"
+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}

ruby-multilib.patch:
 mkconfig.rb |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ruby-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-multilib.patch	26 Sep 2005 11:02:56 -0000	1.1
+++ ruby-multilib.patch	8 Jun 2006 02:23:05 -0000	1.2
@@ -10,25 +10,3 @@
  print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
  print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
  print "  CONFIG = {}\n"
-diff -ruN ruby-1.8.3.orig/configure.in ruby-1.8.3/configure.in
---- ruby-1.8.3.orig/configure.in	2005-09-07 08:22:56.000000000 +0900
-+++ ruby-1.8.3/configure.in	2005-09-26 17:46:53.000000000 +0900
-@@ -1424,15 +1424,15 @@
-     RUBY_LIB_PREFIX="/lib/ruby"
-     ;;
-   *)
--    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-+    RUBY_LIB_PREFIX="${libdir}/ruby"
-     ;;
- esac
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
- 
- AC_ARG_WITH(sitedir,
--	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
-+	    [  --with-sitedir=DIR      site libraries in DIR [LIBDIR/ruby/site_ruby]],
-             [sitedir=$withval],
--            [sitedir='${prefix}/lib/ruby/site_ruby'])
-+            [sitedir='${libdir}/ruby/site_ruby'])
- SITE_DIR="`eval \"echo ${sitedir}\"`"
- case "$target_os" in
-   cygwin*|mingw*|*djgpp*|os2-emx*)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ruby.spec	4 Jan 2006 09:13:05 -0000	1.36
+++ ruby.spec	8 Jun 2006 02:23:05 -0000	1.37
@@ -1,14 +1,15 @@
 %define manver		1.4.6
 %define	rubyxver	1.8
-%define	sitedir		%{_libdir}/site_ruby
+%define	sitedir		%{_libdir}/ruby/site_ruby
+%define	sitedir2	%{_prefix}/lib/ruby/site_ruby
 
 Name:		ruby
 Version:	1.8.4
-Release: 1.fc4
-License:	Distributable
+Release:	2.fc4
+License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl tk xorg-x11-devel autoconf gcc unzip openssl-devel db4-devel emacs
+BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl tk xorg-x11-devel autoconf gcc unzip openssl-devel db4-devel emacs byacc
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz
 ##Source1:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
@@ -21,9 +22,13 @@
 Source5:	irb.1
 Source10:	ruby-mode-init.el
 
-Patch1:		ruby-multilib.patch
-Patch3:		ruby-1.8.2-deadcode.patch
-Patch4:		ruby-tcltk-multilib.patch
+Patch1:		ruby-1.8.2-deadcode.patch
+Patch3:		ruby-rubyprefix.patch
+Patch4:		ruby-deprecated-sitelib-search-path.patch
+Patch5:		ruby-deprecated-search-path.patch
+Patch6:		ruby-multilib.patch
+Patch7:		ruby-tcltk-multilib.patch
+Patch8:		ruby-1.8.4-64bit-pack.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -39,6 +44,7 @@
 %package libs
 Summary:	Libraries necessary to run Ruby.
 Group:		Development/Libraries
+Provides:	ruby(abi) = %{rubyxver}
 Provides:	libruby
 Obsoletes:	libruby
 
@@ -124,12 +130,14 @@
 tar fxz %{SOURCE2}
 popd
 pushd %{name}-%{version}
-%ifarch ppc64 s390x sparc64 x86_64
 %patch1 -p1
-%endif
 %patch3 -p1
-%ifarch ppc64 s390x sparc64 x86_64
 %patch4 -p1
+%ifarch ppc64 s390x sparc64 x86_64
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 %endif
 popd
 
@@ -142,9 +150,6 @@
 
 rb_cv_func_strtod=no
 export rb_cv_func_strtod
-%if ia64
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O[1-9]/-O0/g'`
-%endif
 CFLAGS="$RPM_OPT_FLAGS -Wall"
 export CFLAGS
 %configure \
@@ -153,7 +158,8 @@
   --enable-shared \
   --enable-ipv6 \
   --with-lookup-order-hack=INET \
-  --disable-rpath
+  --disable-rpath \
+  --with-ruby-prefix=%{_prefix}/lib
 
 make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
 %ifarch ia64
@@ -259,8 +265,18 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 
-# generate ri doc
 _cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
+%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
+
+%ifarch ppc64 s390x sparc64 x86_64
+# move the arch-specific files to proper location
+mv $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}/* $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/
+rmdir $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}
+%endif
+
+# generate ri doc
 DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
 
 # XXX: installing irb
@@ -315,8 +331,8 @@
 
 # for ruby-libs
 cp /dev/null ruby-libs.files
-(fgrep    '%{_libdir}' ruby-all.files; 
- fgrep -h '%{_libdir}' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
+(fgrep    '%{_prefix}/lib' ruby-all.files; 
+ fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
  sort | uniq -u > ruby-libs.files
 
 # for ruby-mode
@@ -335,7 +351,6 @@
 cat <<__EOF__ >> ruby-libs.files
 %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch
 %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest
-%%dir %%{sitedir}/%%{rubyxver}/$arch
 __EOF__
 
 %clean
@@ -373,13 +388,17 @@
 %doc %{name}-%{version}/ChangeLog
 %doc %{name}-%{version}/LEGAL
 %dir %{_libdir}/ruby
+%dir %{_prefix}/lib/ruby
 %dir %{_libdir}/ruby/%{rubyxver}
-%dir %{_libdir}/ruby/%{rubyxver}/cgi
-%dir %{_libdir}/ruby/%{rubyxver}/net
-%dir %{_libdir}/ruby/%{rubyxver}/shell
-%dir %{_libdir}/ruby/%{rubyxver}/uri
+%dir %{_prefix}/lib/ruby/%{rubyxver}
+%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi
+%dir %{_prefix}/lib/ruby/%{rubyxver}/net
+%dir %{_prefix}/lib/ruby/%{rubyxver}/shell
+%dir %{_prefix}/lib/ruby/%{rubyxver}/uri
 %dir %{sitedir}
 %dir %{sitedir}/%{rubyxver}
+%dir %{sitedir2}
+%dir %{sitedir2}/%{rubyxver}
 
 %files tcltk -f ruby-tcltk.files
 %defattr(-, root, root)
@@ -393,9 +412,9 @@
 %files -n irb -f irb.files
 %defattr(-, root, root)
 %doc tmp-ruby-docs/irb/*
-%dir %{_libdir}/ruby/%{rubyxver}/irb
-%dir %{_libdir}/ruby/%{rubyxver}/irb/lc
-%dir %{_libdir}/ruby/%{rubyxver}/irb/lc/ja
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja
 
 %files -n ri -f ri.files
 %defattr(-, root, root)
@@ -412,6 +431,24 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-2.fc4
+- backport from devel.
+  - correct sitelibdir.
+  - ruby-rubyprefix.patch: moved all arch-independent modules under
+    /usr/lib/ruby and keep arch-dependent modules under /usr/lib64/ruby
+    for 64bit archs. so 'rubylibdir', 'sitelibdir' and 'sitedir' in
+    Config::CONFIG points to the kind of /usr/lib/ruby now.
+  - ruby-deprecated-search-path.patch: added the deprecated installation paths
+    to the search path for the backward compatibility.
+  - added a Provides: ruby(abi) to ruby-libs.
+  - ruby-1.8.4-64bit-pack.patch: backport patch from upstream to fix unpack("l")
+    not working on 64bit archs and integer overflow on template "w". (#189350)
+  - updated License tag to be more comfortable, and with a pointer to get more
+    details, like Python package does.
+  - ruby-deprecated-sitelib-search-path.patch: applied to add more search path
+    for backward compatibility.
+  - added byacc to BuildReq.
+
 * Wed Jan  4 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-1.fc4
 - New upstream release (#176670)
   - Kernel module ri documents are available. (#174923)



From fedora-cvs-commits at redhat.com  Thu Jun  8 02:28:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 22:28:37 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.33,1.34
Message-ID: <200606080228.k582SbMf019859@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpufreq-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19833

Modified Files:
	cpufreq-utils.spec 
Log Message:
make install already does this


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cpufreq-utils.spec	7 Jun 2006 05:46:14 -0000	1.33
+++ cpufreq-utils.spec	8 Jun 2006 02:28:34 -0000	1.34
@@ -53,9 +53,6 @@
 cd ../..
 %endif
 
-mkdir -p %{buildroot}%{_mandir}/man1/
-install man/*.1 %{buildroot}%{_mandir}/man1/
-
 chmod -R a-s %{buildroot}
 
 %clean
@@ -80,8 +77,7 @@
 %ifarch %{ix86} x86_64
 %{_bindir}/powernow-k8-decode
 %endif
-%{_mandir}/man1/cpufreq-info.1
-%{_mandir}/man1/cpufreq-set.1
+%{_mandir}/*/*
 
 
 %changelog



From fedora-cvs-commits at redhat.com  Thu Jun  8 02:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 22:39:26 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.34,1.35
Message-ID: <200606080239.k582dQGX021327@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpufreq-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21298

Modified Files:
	cpufreq-utils.spec 
Log Message:
fix path


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cpufreq-utils.spec	8 Jun 2006 02:28:34 -0000	1.34
+++ cpufreq-utils.spec	8 Jun 2006 02:39:23 -0000	1.35
@@ -37,17 +37,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} mandir=%{_mandir} install
 %find_lang cpufrequtils
 
 %ifarch %{ix86}
 cd debug/i386
 install centrino-decode %{buildroot}%{_bindir}/centrino-decode
 install dump_psb %{buildroot}%{_bindir}/dump_psb
-install powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
 cd ../..
 %endif
-%ifarch x86_64
+%ifarch %{ix86} x86_64
 cd debug/x86_64
 install powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
 cd ../..



From fedora-cvs-commits at redhat.com  Thu Jun  8 02:48:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 22:48:23 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.35,1.36
Message-ID: <200606080248.k582mNq1006824@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpufreq-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6799

Modified Files:
	cpufreq-utils.spec 
Log Message:
klutzfix


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cpufreq-utils.spec	8 Jun 2006 02:39:23 -0000	1.35
+++ cpufreq-utils.spec	8 Jun 2006 02:48:21 -0000	1.36
@@ -44,9 +44,10 @@
 cd debug/i386
 install centrino-decode %{buildroot}%{_bindir}/centrino-decode
 install dump_psb %{buildroot}%{_bindir}/dump_psb
+install powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
 cd ../..
 %endif
-%ifarch %{ix86} x86_64
+%ifarch x86_64
 cd debug/x86_64
 install powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
 cd ../..



From fedora-cvs-commits at redhat.com  Thu Jun  8 03:12:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 23:12:38 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.36,1.37
Message-ID: <200606080312.k583CcFm012487@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpufreq-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12462

Modified Files:
	cpufreq-utils.spec 
Log Message:
fix up 64bit paths


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cpufreq-utils.spec	8 Jun 2006 02:48:21 -0000	1.36
+++ cpufreq-utils.spec	8 Jun 2006 03:12:35 -0000	1.37
@@ -37,7 +37,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=%{buildroot} mandir=%{_mandir} install
+make DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} includedir=%{_includedir} libdir=%{_libdir} install
+
+
+
 %find_lang cpufrequtils
 
 %ifarch %{ix86}



From fedora-cvs-commits at redhat.com  Thu Jun  8 03:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 23:25:11 -0400
Subject: rpms/cpuspeed/devel cpuspeed.init,1.8,1.9 cpuspeed.spec,1.33,1.34
Message-ID: <200606080325.k583PB4r031866@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31825

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
- Remove a bunch of no-longer needed gunk from the initscript.
- Use on-demand governor on centrino/core based systems for now,
  as it seems to have a better effect.




Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cpuspeed.init	24 Feb 2006 03:20:56 -0000	1.8
+++ cpuspeed.init	8 Jun 2006 03:25:09 -0000	1.9
@@ -27,26 +27,33 @@
 			if [ -n "$DRIVER" ]; then
 				/sbin/modprobe "$DRIVER"
 			else
-				# use ACPI as a fallback if its available.
-				if [ -f /proc/acpi/processor/CPU0/throttling ]; then
-					# Check we have throttling states available.
-					thr=`head -n1 -q /proc/acpi/processor/CPU*/throttling | uniq`
-					if [ "$thr" != "<not supported>" ]; then
-						/sbin/modprobe acpi-cpufreq
-					fi
-				fi
+				# use ACPI as a fallback
+				/sbin/modprobe acpi-cpufreq
 			fi
 		done
 
 		# If we get this far with no driver, we must have no ACPI. We're doomed.
 		[ ! -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver ] && return 0
 
-		echo -n $"Starting $prog: "
+		drv=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver)
+
+		case "$drv" in
+		centrino)
+			/sbin/modprobe cpufreq-ondemand
+			for i in /sys/devices/system/cpu/*
+			do
+				echo ondemand > $i/cpufreq/scaling_governor
+			done
+			;;
+
+		*)
+			echo -n $"Starting $prog: "
+			daemon cpuspeed -d $OPTS
+			RETVAL=$?
+			echo
+			[ $RETVAL = 0 ] && touch /var/lock/subsys/cpuspeed
+		esac
 
-		daemon cpuspeed -d $OPTS
-		RETVAL=$?
-		echo
-		[ $RETVAL = 0 ] && touch /var/lock/subsys/cpuspeed
 	else
 		return 0
 	fi
@@ -72,11 +79,11 @@
 	start)
 	    start
 	    ;;
-	
+
 	stop)
 	    stop
 	    ;;
-	
+
 	status)
 	    status cpuspeed
 	    ;;
@@ -90,7 +97,7 @@
 		start
 	    fi
 	    ;;
-	
+
 	*)
 	    echo $"Usage: $0 {start|stop|restart|condrestart|status}"
 	    exit 1


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cpuspeed.spec	24 Feb 2006 03:20:56 -0000	1.33
+++ cpuspeed.spec	8 Jun 2006 03:25:09 -0000	1.34
@@ -72,6 +72,11 @@
 exit 0
 
 %changelog
+* Wed Jun  7 2006 Dave Jones <davej at redhat.com>
+- Remove a bunch of no-longer needed gunk from the initscript.
+- Use on-demand governor on centrino/core based systems for now,
+  as it seems to have a better effect.
+
 * Thu Feb 23 2006 Dave Jones <davej at redhat.com>
 - Fix broken init script. (Alexandre Oliva) [#182691]
   Taking ugly shell script to the next level.



From fedora-cvs-commits at redhat.com  Thu Jun  8 03:39:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 23:39:40 -0400
Subject: rpms/evolution-connector/FC-5 evolution-connector.spec,1.59,1.60
Message-ID: <200606080339.k583dep9015482@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-connector/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13518

Modified Files:
	evolution-connector.spec 
Log Message:
Bump for new eds


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- evolution-connector.spec	30 May 2006 17:40:28 -0000	1.59
+++ evolution-connector.spec	8 Jun 2006 03:39:38 -0000	1.60
@@ -7,7 +7,7 @@
 
 Name: evolution-connector
 Version: 2.6.2
-Release: 1.fc5.2
+Release: 1.fc5.3
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -98,6 +98,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.3
+- Bump for new eds
+
 * Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.2
 - Disown %{_datadir}/gtk-doc/html/ximian-connector
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 03:47:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 7 Jun 2006 23:47:03 -0400
Subject: rpms/evolution-connector/FC-5 evolution-connector.spec,1.60,1.61
Message-ID: <200606080347.k583l3Ah027157@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-connector/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27145

Modified Files:
	evolution-connector.spec 
Log Message:
disable s390(x)


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- evolution-connector.spec	8 Jun 2006 03:39:38 -0000	1.60
+++ evolution-connector.spec	8 Jun 2006 03:47:00 -0000	1.61
@@ -7,7 +7,7 @@
 
 Name: evolution-connector
 Version: 2.6.2
-Release: 1.fc5.3
+Release: 1.fc5.4
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -40,6 +40,8 @@
 Requires: openldap
 Requires: libsoup >= %{libsoup_version}
 Requires: gnutls
+ExcludeArch: s390
+ExcludeArch: s390x
 Summary: Evolution plugin to interact with MS Exchange Server
 
 %description
@@ -98,8 +100,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
-* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.3
+* Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.4
 - Bump for new eds
+- Disable s390(x) due to evolution not building there.
 
 * Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.2
 - Disown %{_datadir}/gtk-doc/html/ximian-connector



From fedora-cvs-commits at redhat.com  Thu Jun  8 04:14:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 00:14:11 -0400
Subject: rpms/jdom/devel jdom.spec,1.13,1.14
Message-ID: <200606080414.k584E9Rs006794@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jdom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6706

Modified Files:
	jdom.spec 
Log Message:

Removing .so ownership from demo package (mistakenly added during last commit).




Index: jdom.spec
===================================================================
RCS file: /cvs/dist/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jdom.spec	7 Jun 2006 22:16:08 -0000	1.13
+++ jdom.spec	8 Jun 2006 04:14:03 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           jdom
 Version:        1.0
-Release:        1jpp_4fc
+Release:        1jpp_5fc
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
@@ -89,12 +89,6 @@
 %postun
 /usr/bin/rebuild-gcj-db %{_libdir}
 
-%post demo
-/usr/bin/rebuild-gcj-db %{_libdir}
-
-%postun demo
-/usr/bin/rebuild-gcj-db %{_libdir}
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -113,12 +107,13 @@
 
 %files demo
 %defattr(0644,root,root,0755)
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %{_datadir}/%{name}
 
 
 %changelog
+* Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_5fc
+- Removing .so ownership from demo package
+
 * Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_4fc
 - Build natively
 - Remove spurious xml-commons-api requirement



From fedora-cvs-commits at redhat.com  Thu Jun  8 06:12:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 02:12:51 -0400
Subject: rpms/ruby/FC-4 ruby-deprecated-search-path.patch, 1.1,
	1.2 ruby-deprecated-sitelib-search-path.patch, 1.1, 1.2
Message-ID: <200606080612.k586CpqW027426@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27390

Modified Files:
	ruby-deprecated-search-path.patch 
	ruby-deprecated-sitelib-search-path.patch 
Log Message:
correct the order of search path.

ruby-deprecated-search-path.patch:
 configure.in |    4 ++++
 ruby.c       |    9 +++++++++
 2 files changed, 13 insertions(+)

Index: ruby-deprecated-search-path.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby-deprecated-search-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-deprecated-search-path.patch	8 Jun 2006 02:23:05 -0000	1.1
+++ ruby-deprecated-search-path.patch	8 Jun 2006 06:12:47 -0000	1.2
@@ -36,8 +36,8 @@
 +#ifdef RUBY_DEPRECATED_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
 +#endif
- #ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
-     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+ #ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
  #endif
 @@ -308,6 +314,9 @@
  #endif

ruby-deprecated-sitelib-search-path.patch:
 configure.in |    3 +++
 ruby.c       |    9 +++++++++
 2 files changed, 12 insertions(+)

Index: ruby-deprecated-sitelib-search-path.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby-deprecated-sitelib-search-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-deprecated-sitelib-search-path.patch	8 Jun 2006 02:23:05 -0000	1.1
+++ ruby-deprecated-sitelib-search-path.patch	8 Jun 2006 06:12:47 -0000	1.2
@@ -25,15 +25,15 @@
  #endif
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
++#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
++    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
++#endif
 +#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
 +#endif
 +#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
 +#endif
-+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
-+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
-+#endif
  
      ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
  #ifdef RUBY_THIN_ARCHLIB



From fedora-cvs-commits at redhat.com  Thu Jun  8 07:28:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 03:28:31 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.16, 1.17 m17n-db.spec, 1.23,
	1.24 sources, 1.18, 1.19
Message-ID: <200606080728.k587SV8Q012502@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12383

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Added hi-typewriter keymap



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Jun 2006 07:44:54 -0000	1.16
+++ .cvsignore	8 Jun 2006 07:28:29 -0000	1.17
@@ -5,3 +5,4 @@
 m17n-db-indic-0.4.3.tar.gz
 m17n-db-indic-0.4.4.tar.gz
 m17n-db-indic-0.4.5.tar.gz
+m17n-db-indic-0.4.6.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- m17n-db.spec	7 Jun 2006 07:44:54 -0000	1.23
+++ m17n-db.spec	8 Jun 2006 07:28:29 -0000	1.24
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.5
+%define indic_ver 0.4.6
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	8%{?dist}
+Release:	9%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -695,6 +695,9 @@
 
 
 %changelog
+* Thu Jun 8 2006 Mayank Jain <majain at redhat.com>
+- Added hi-typewriter keymap.
+
 * Wed Jun 7 2006 Mayank Jain <majain at redhat.com>
 - Added or-*.png icons.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Jun 2006 07:44:54 -0000	1.18
+++ sources	8 Jun 2006 07:28:29 -0000	1.19
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-d072194f92ff3327f86b754688d56aa7  m17n-db-indic-0.4.5.tar.gz
+b76d83dc4c1176e05a1a0add75a71aff  m17n-db-indic-0.4.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  8 07:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 03:48:03 -0400
Subject: rpms/ruby/FC-5 ruby-deprecated-sitelib-search-path.patch, NONE,
	1.1 ruby-deprecated-search-path.patch, 1.1, 1.2 ruby.spec,
	1.56, 1.57
Message-ID: <200606080748.k587m32W031501@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31462

Modified Files:
	ruby-deprecated-search-path.patch ruby.spec 
Added Files:
	ruby-deprecated-sitelib-search-path.patch 
Log Message:
* Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5.fc5
- ruby-deprecated-search-path.patch: applied to add more search path
  for backward compatibility.
- added byacc to BuildReq.

ruby-deprecated-sitelib-search-path.patch:
 configure.in |    3 +++
 ruby.c       |    9 +++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE ruby-deprecated-sitelib-search-path.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-06-07 13:58:03.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-06-07 15:54:36.000000000 +0900
@@ -1476,6 +1476,8 @@
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
@@ -1506,6 +1508,7 @@
 
 AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_ARCHLIB, "${libdir}/site_ruby/${MAJOR}.${MINOR}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c	2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c	2006-06-07 15:56:14.000000000 +0900
@@ -297,6 +297,15 @@
 #endif
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
+#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
+#endif
 
     ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
 #ifdef RUBY_THIN_ARCHLIB

ruby-deprecated-search-path.patch:
 configure.in |    4 ++++
 ruby.c       |    9 +++++++++
 2 files changed, 13 insertions(+)

Index: ruby-deprecated-search-path.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby-deprecated-search-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-deprecated-search-path.patch	22 May 2006 04:05:10 -0000	1.1
+++ ruby-deprecated-search-path.patch	8 Jun 2006 07:48:01 -0000	1.2
@@ -1,8 +1,7 @@
-??????????????????????????????ruby-1.8.4.orig/.ruby.c.swp???ruby-1.8.4/.ruby.c.swp???????????????
 diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
 --- ruby-1.8.4.orig/configure.in	2006-04-20 12:53:38.000000000 +0900
 +++ ruby-1.8.4/configure.in	2006-04-20 13:06:07.000000000 +0900
-@@ -1472,10 +1472,14 @@
+@@ -1472,12 +1472,16 @@
  esac
  RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
  RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
@@ -11,6 +10,8 @@
  AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
  AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
  AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+ AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
+ AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
 +AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_LIB, "${RUBY_LIB_PATH2}")
 +AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB, "${SITE_DIR2}")
 +AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB2, "${RUBY_DEPRECATED_SITE_LIB_PATH}")
@@ -20,7 +21,7 @@
 diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
 --- ruby-1.8.4.orig/ruby.c	2005-12-12 09:36:52.000000000 +0900
 +++ ruby-1.8.4/ruby.c	2006-04-20 12:59:50.000000000 +0900
-@@ -292,13 +292,22 @@
+@@ -292,11 +292,17 @@
  #endif
  
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
@@ -35,6 +36,11 @@
 +#ifdef RUBY_DEPRECATED_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
 +#endif
+ #ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
+ #endif
+@@ -308,6 +314,9 @@
+ #endif
  
      ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
 +#ifdef RUBY_DEPRECATED_LIB


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ruby.spec	22 May 2006 04:05:10 -0000	1.56
+++ ruby.spec	8 Jun 2006 07:48:01 -0000	1.57
@@ -9,7 +9,7 @@
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel emacs
+BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel emacs byacc
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz
 ##Source1:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
@@ -25,10 +25,11 @@
 Patch1:		ruby-1.8.2-deadcode.patch
 Patch2:		ruby-1.8.4-no-eaccess.patch
 Patch3:		ruby-rubyprefix.patch
-Patch4:		ruby-deprecated-search-path.patch
-Patch5:		ruby-multilib.patch
-Patch6:		ruby-tcltk-multilib.patch
-Patch7:		ruby-1.8.4-64bit-pack.patch
+Patch4:		ruby-deprecated-sitelib-search-path.patch
+Patch5:		ruby-deprecated-search-path.patch
+Patch6:		ruby-multilib.patch
+Patch7:		ruby-tcltk-multilib.patch
+Patch8:		ruby-1.8.4-64bit-pack.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -139,11 +140,12 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%ifarch ppc64 s390x sparc64 x86_64
 %patch4 -p1
+%ifarch ppc64 s390x sparc64 x86_64
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %endif
 popd
 
@@ -433,6 +435,11 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5.fc5
+- ruby-deprecated-search-path.patch: applied to add more search path
+  for backward compatibility.
+- added byacc to BuildReq.
+
 * Wed May 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4.fc5
 - correct sitelibdir. (#184198)
 - ruby-rubyprefix.patch: moved all arch-independent modules under /usr/lib/ruby



From fedora-cvs-commits at redhat.com  Thu Jun  8 07:50:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 03:50:28 -0400
Subject: rpms/ruby/FC-5 ruby.spec,1.57,1.58
Message-ID: <200606080750.k587oStm032474@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32437

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ruby.spec	8 Jun 2006 07:48:01 -0000	1.57
+++ ruby.spec	8 Jun 2006 07:50:26 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	4.fc5
+Release:	5.fc5
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root



From fedora-cvs-commits at redhat.com  Thu Jun  8 07:53:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 03:53:40 -0400
Subject: rpms/ruby/devel ruby-deprecated-search-path.patch, 1.2,
	1.3 ruby-deprecated-sitelib-search-path.patch, 1.1,
	1.2 ruby.spec, 1.66, 1.67
Message-ID: <200606080753.k587rewu001305@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1269

Modified Files:
	ruby-deprecated-search-path.patch 
	ruby-deprecated-sitelib-search-path.patch ruby.spec 
Log Message:
* Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-8
- ruby-deprecated-sitelib-search-path.patch: correct the order of search path.

ruby-deprecated-search-path.patch:
 configure.in |    4 ++++
 ruby.c       |    9 +++++++++
 2 files changed, 13 insertions(+)

Index: ruby-deprecated-search-path.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby-deprecated-search-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-deprecated-search-path.patch	7 Jun 2006 07:32:38 -0000	1.2
+++ ruby-deprecated-search-path.patch	8 Jun 2006 07:53:37 -0000	1.3
@@ -36,8 +36,8 @@
 +#ifdef RUBY_DEPRECATED_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
 +#endif
- #ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
-     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+ #ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
  #endif
 @@ -308,6 +314,9 @@
  #endif

ruby-deprecated-sitelib-search-path.patch:
 configure.in |    3 +++
 ruby.c       |    9 +++++++++
 2 files changed, 12 insertions(+)

Index: ruby-deprecated-sitelib-search-path.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby-deprecated-sitelib-search-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-deprecated-sitelib-search-path.patch	7 Jun 2006 07:32:39 -0000	1.1
+++ ruby-deprecated-sitelib-search-path.patch	8 Jun 2006 07:53:37 -0000	1.2
@@ -25,15 +25,15 @@
  #endif
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
++#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
++    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
++#endif
 +#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
 +#endif
 +#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
 +#endif
-+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
-+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
-+#endif
  
      ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
  #ifdef RUBY_THIN_ARCHLIB


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ruby.spec	7 Jun 2006 07:47:23 -0000	1.66
+++ ruby.spec	8 Jun 2006 07:53:37 -0000	1.67
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	7.fc6
+Release:	8.fc6
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -450,6 +450,9 @@
 %endif
 
 %changelog
+* Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-8
+- ruby-deprecated-sitelib-search-path.patch: correct the order of search path.
+
 * Wed Jun  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-7
 - exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided
   and buildsys became much stricker.



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:03:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:03:06 -0400
Subject: rpms/ruby/devel ruby.spec,1.67,1.68
Message-ID: <200606080803.k58836Rd004012@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3958

Modified Files:
	ruby.spec 
Log Message:
fixed a typo.


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ruby.spec	8 Jun 2006 07:53:37 -0000	1.67
+++ ruby.spec	8 Jun 2006 08:02:17 -0000	1.68
@@ -455,7 +455,7 @@
 
 * Wed Jun  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-7
 - exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided
-  and buildsys became much stricker.
+  and buildsys became much stricter.
 - ruby-deprecated-sitelib-search-path.patch: applied to add more search path
   for backward compatiblity.
 - added byacc to BuildReq. (#194161)



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:03:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:03:42 -0400
Subject: rpms/ruby/FC-5 ruby.spec,1.58,1.59
Message-ID: <200606080803.k5883gYi004056@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4000

Modified Files:
	ruby.spec 
Log Message:
exclude ppc64 to make ruby-mode package.


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ruby.spec	8 Jun 2006 07:50:26 -0000	1.58
+++ ruby.spec	8 Jun 2006 08:03:07 -0000	1.59
@@ -9,7 +9,10 @@
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel emacs byacc
+BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
+%ifnarch ppc64
+BuildRequires:	emacs
+%endif
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz
 ##Source1:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
@@ -106,6 +109,7 @@
 Manuals and FAQs for the object-oriented scripting language Ruby.
 
 
+%ifnarch ppc64
 %package mode
 Summary:	Emacs Lisp ruby-mode for the scripting language Ruby
 Group:		Applications/Editors
@@ -113,6 +117,7 @@
 
 %description mode
 Emacs Lisp ruby-mode for the object-oriented scripting language Ruby.
+%endif
 
 
 %package ri
@@ -187,10 +192,12 @@
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+%ifnarch ppc64
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d
+#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode
+#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d
+%endif
 
 # installing documents and exapmles...
 mkdir tmp-ruby-docs
@@ -287,6 +294,7 @@
 # XXX: installing irb
 install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
 
+%ifnarch ppc64
 # installing ruby-mode
 cd %{name}-%{version}
 cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@@ -303,6 +311,7 @@
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
 cd ..
+%endif
 
 # listing all files in ruby-all.files
 (find $RPM_BUILD_ROOT -type f -o -type l) |
@@ -339,9 +348,13 @@
  fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
  sort | uniq -u > ruby-libs.files
 
+%ifnarch ppc64
 # for ruby-mode
 cp /dev/null ruby-mode.files
 fgrep '.el' ruby-all.files >> ruby-mode.files
+%else
+touch ruby-mode.files
+%endif
 
 # for ruby.rpm
 sort ruby-all.files \
@@ -429,16 +442,20 @@
 %doc tmp-ruby-docs/ruby-docs/*
 %doc tmp-ruby-docs/ruby-libs/*
 
+%ifnarch ppc64
 %files mode -f ruby-mode.files 
 %defattr(-, root, root)
 %doc %{name}-%{version}/misc/README
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
+%endif
 
 %changelog
 * Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5.fc5
 - ruby-deprecated-search-path.patch: applied to add more search path
   for backward compatibility.
 - added byacc to BuildReq.
+- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided
+  and buildsys became much stricter.
 
 * Wed May 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4.fc5
 - correct sitelibdir. (#184198)



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:19:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:19:09 -0400
Subject: rpms/xsane/devel xsane.desktop,NONE,1.1 xsane.spec,1.32,1.33
Message-ID: <200606080819.k588J9cO022961@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22866

Modified Files:
	xsane.spec 
Added Files:
	xsane.desktop 
Log Message:
re-add desktop file (#170835)
use %buildroot consistently



--- NEW FILE xsane.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Type=Application
#Name=XSane
Name=Scanner Tool
GenericName=Scanner Tool
Comment=Scan images to view, copy, fax or email them
Exec=xsane
TryExec=xsane
Icon=/usr/share/sane/xsane/xsane-logo.xpm
Terminal=false
Categories=Application;Graphics;2DGraphics;RasterGraphics;GTK;
StartupNotify=true


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xsane.spec	5 Apr 2006 07:11:12 -0000	1.32
+++ xsane.spec	8 Jun 2006 08:19:07 -0000	1.33
@@ -1,9 +1,10 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 4
+Release: 5
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
+Source2: xsane.desktop
 Patch0: xsane-0.90-htmlview.patch
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
@@ -35,7 +36,7 @@
 installed to use this package.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %setup -q
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
@@ -56,20 +57,27 @@
 make LDFLAGS=
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}/etc/X11/applnk/Graphics
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
 
+mkdir %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor net --delete-original     \
+    --dir %{buildroot}%{_datadir}/applications          \
+    --add-category X-Red-Hat-Base                       \
+    --add-category Graphics                             \
+    --add-category Application                          \
+    %{SOURCE2}
+
 %find_lang %{name} XSANE.lang
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f XSANE.lang
 %defattr(-,root,root)
@@ -77,13 +85,15 @@
 %{_bindir}/xsane
 %{_mandir}/man1/*
 %{_datadir}/sane
+%dir %{_datadir}/applications
+%{_datadir}/applications/xsane.desktop
 
 %files gimp
 %defattr(-,root,root)
 %{_bindir}/xsane-gimp
 %{_sbindir}/xsane-install-gimp-plugin
-%%dir %{_datadir}/sane
-%%dir %{_datadir}/sane/xsane
+%dir %{_datadir}/sane
+%dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
 
 %post gimp
@@ -97,6 +107,10 @@
 exit 0
 
 %changelog
+* Thu Jun 08 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-5
+- re-add desktop file (#170835)
+- use %%buildroot consistently
+
 * Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-4
 - use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:26:53 -0400
Subject: rpms/k3b/FC-5 k3b-0.12.8-docsym.patch, NONE, 1.1 k3b.spec, 1.28,
	1.29 sources, 1.12, 1.13
Message-ID: <200606080826.k588QrcR025602@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25565

Modified Files:
	k3b.spec sources 
Added Files:
	k3b-0.12.8-docsym.patch 
Log Message:
version 0.12.15

k3b-0.12.8-docsym.patch:
 admin/am_edit   |    2 +-
 doc/Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE k3b-0.12.8-docsym.patch ---
--- k3b-0.12.8/doc/Makefile.in.docsym	2006-05-31 15:23:22.000000000 +0200
+++ k3b-0.12.8/doc/Makefile.in	2006-05-31 15:24:33.000000000 +0200
@@ -541,7 +541,7 @@
 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/; \
 	fi
 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
+	$(LN_S) ../$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
 
 uninstall-docs:
 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/k3b
--- k3b-0.12.8/admin/am_edit.docsym	2006-05-31 15:26:30.000000000 +0200
+++ k3b-0.12.8/admin/am_edit	2006-05-31 15:26:57.000000000 +0200
@@ -2028,7 +2028,7 @@
       $lines .= "\t\$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
       $lines .= "\tfi\n";
       $lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-      $lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
+      $lines .= "\t\$(LN_S) ../$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
 
       $lines .= "\n";
       $lines .= "uninstall-docs:\n";


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/FC-5/k3b.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- k3b.spec	21 Mar 2006 16:04:45 -0000	1.28
+++ k3b.spec	8 Jun 2006 08:26:50 -0000	1.29
@@ -2,8 +2,8 @@
 %define i18n_version 0.12.10
 
 Name: k3b
-Version: 0.12.14
-Release: 0.FC5.2
+Version: 0.12.15
+Release: 0.FC5.1
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -21,6 +21,8 @@
 Patch7: k3b-0.11.17-dao.patch
 Patch8: k3b-0.12.2-statfs.patch
 Patch9: k3b-0.11.23-proxy.patch
+Patch10: k3b-0.12.14-norootwarning.patch
+Patch11: k3b-0.12.8-docsym.patch
 Patch99: k3b-0.12.2-compile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -59,6 +61,8 @@
 #%patch7 -p1 -b .dao
 %patch8 -p1 -b .statfs
 #%patch9 -p1 -b .httpfix
+%patch10 -p1 -b .norootwarning
+%patch11 -p1 -b .docsym
 %patch99 -p1 -b .docompile
 pushd %{name}-i18n-%{i18n_version}
 %patch99 -p1 -b .docompile
@@ -111,7 +115,13 @@
 
 # GNOME desktop beautification (requires "Icon=name.png" fix in setup section).
 mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/crystalsvg/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png
+ln -s ../icons/hicolor/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png
+
+pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML
+for i in *; do
+	test -d $i && mkdir $i/common 2>/dev/null
+done
+popd
 
 %find_lang %{name}
 %find_lang k3bsetup
@@ -171,6 +181,9 @@
 
 
 %changelog
+* Thu Jun  8 2006 Harald Hoyer <harald at redhat.com> - 0:0.12.15-0.FC5.1
+- version 0.12.15
+
 * Tue Mar 21 2006 Harald Hoyer <harald at redhat.com> 0:0.12.14-0.FC5.2
 - version 0.12.14
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/k3b/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Mar 2006 16:04:45 -0000	1.12
+++ sources	8 Jun 2006 08:26:50 -0000	1.13
@@ -1,2 +1,2 @@
-51ef4fdf98365a285489dc1e11a07a3c  k3b-0.12.14.tar.bz2
-db3bc6d94da5b63f22bd04e981486974  k3b-i18n-0.12.10.tar.bz2
+6cbfd080b3684efae0ed4b4797b5cecb  k3b-i18n-0.12.15.tar.bz2
+246607f9d63b94c7f91ac86c108efdc2  k3b-0.12.15.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:35:43 -0400
Subject: rpms/k3b/devel k3b.spec,1.27,1.28
Message-ID: <200606080835.k588ZgkM027512@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27478

Modified Files:
	k3b.spec 
Log Message:
version 0.12.15


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- k3b.spec	2 May 2006 14:35:30 -0000	1.27
+++ k3b.spec	8 Jun 2006 08:35:39 -0000	1.28
@@ -22,6 +22,7 @@
 Patch8: k3b-0.12.2-statfs.patch
 Patch9: k3b-0.11.23-proxy.patch
 Patch10: k3b-0.12.14-norootwarning.patch
+Patch11: k3b-0.12.8-docsym.patch
 Patch99: k3b-0.12.2-compile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -61,6 +62,7 @@
 %patch8 -p1 -b .statfs
 #%patch9 -p1 -b .httpfix
 %patch10 -p1 -b .norootwarning
+%patch11 -p1 -b .docsym
 %patch99 -p1 -b .docompile
 pushd %{name}-i18n-%{i18n_version}
 %patch99 -p1 -b .docompile



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:48:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:48:16 -0400
Subject: rpms/k3b/devel k3b-0.12.8-docsym.patch,NONE,1.1
Message-ID: <200606080848.k588mGMd012590@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12531

Added Files:
	k3b-0.12.8-docsym.patch 
Log Message:
version 0.12.15

k3b-0.12.8-docsym.patch:
 admin/am_edit   |    2 +-
 doc/Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE k3b-0.12.8-docsym.patch ---
--- k3b-0.12.8/doc/Makefile.in.docsym	2006-05-31 15:23:22.000000000 +0200
+++ k3b-0.12.8/doc/Makefile.in	2006-05-31 15:24:33.000000000 +0200
@@ -541,7 +541,7 @@
 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/; \
 	fi
 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
+	$(LN_S) ../$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
 
 uninstall-docs:
 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/k3b
--- k3b-0.12.8/admin/am_edit.docsym	2006-05-31 15:26:30.000000000 +0200
+++ k3b-0.12.8/admin/am_edit	2006-05-31 15:26:57.000000000 +0200
@@ -2028,7 +2028,7 @@
       $lines .= "\t\$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
       $lines .= "\tfi\n";
       $lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-      $lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
+      $lines .= "\t\$(LN_S) ../$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
 
       $lines .= "\n";
       $lines .= "uninstall-docs:\n";



From fedora-cvs-commits at redhat.com  Thu Jun  8 08:52:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 04:52:49 -0400
Subject: rpms/k3b/devel k3b.spec,1.28,1.29
Message-ID: <200606080852.k588qneU014311@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14272

Modified Files:
	k3b.spec 
Log Message:
version 0.12.15


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- k3b.spec	8 Jun 2006 08:35:39 -0000	1.28
+++ k3b.spec	8 Jun 2006 08:52:47 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name: k3b
 Version: 0.12.15
-Release: 1
+Release: 2
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 09:00:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 05:00:35 -0400
Subject: rpms/k3b/devel k3b.spec,1.29,1.30
Message-ID: <200606080900.k5890ZTT017261@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17229

Modified Files:
	k3b.spec 
Log Message:
version 0.12.15


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- k3b.spec	8 Jun 2006 08:52:47 -0000	1.29
+++ k3b.spec	8 Jun 2006 09:00:33 -0000	1.30
@@ -34,7 +34,7 @@
 BuildRequires: zlib-devel, libpng-devel, libjpeg-devel
 BuildRequires: libvorbis-devel, audiofile-devel, flac-devel
 BuildRequires: desktop-file-utils
-BuildRequires: autoconf, gettext
+BuildRequires: autoconf, gettext, automake, intltool
 BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel
 BuildRequires: libidn-devel
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 09:17:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 05:17:54 -0400
Subject: rpms/k3b/FC-5 k3b.spec,1.29,1.30
Message-ID: <200606080917.k589Hs23002751@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2713

Modified Files:
	k3b.spec 
Log Message:
version 0.12.15


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/FC-5/k3b.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- k3b.spec	8 Jun 2006 08:26:50 -0000	1.29
+++ k3b.spec	8 Jun 2006 09:17:52 -0000	1.30
@@ -34,7 +34,7 @@
 BuildRequires: zlib-devel, libpng-devel, libjpeg-devel
 BuildRequires: libvorbis-devel, audiofile-devel, flac-devel
 BuildRequires: desktop-file-utils
-BuildRequires: autoconf, gettext
+BuildRequires: autoconf, gettext, automake, intltool
 BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel
 BuildRequires: libidn-devel
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 09:19:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 05:19:42 -0400
Subject: rpms/k3b/FC-5 k3b.spec,1.30,1.31
Message-ID: <200606080919.k589JgCO003482@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3455

Modified Files:
	k3b.spec 
Log Message:
version 0.12.15


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/FC-5/k3b.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- k3b.spec	8 Jun 2006 09:17:52 -0000	1.30
+++ k3b.spec	8 Jun 2006 09:19:39 -0000	1.31
@@ -1,5 +1,5 @@
-%define tar_version 0.12.14
-%define i18n_version 0.12.10
+%define tar_version 0.12.15
+%define i18n_version 0.12.15
 
 Name: k3b
 Version: 0.12.15



From fedora-cvs-commits at redhat.com  Thu Jun  8 09:20:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 05:20:52 -0400
Subject: rpms/k3b/FC-5 k3b-0.12.14-norootwarning.patch,NONE,1.1
Message-ID: <200606080920.k589KqYk003983@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3881

Added Files:
	k3b-0.12.14-norootwarning.patch 
Log Message:
version 0.12.15

k3b-0.12.14-norootwarning.patch:
 k3bsystemproblemdialog.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE k3b-0.12.14-norootwarning.patch ---
--- k3b-0.12.14/src/k3bsystemproblemdialog.cpp.noroot	2006-04-18 14:59:57.000000000 +0200
+++ k3b-0.12.14/src/k3bsystemproblemdialog.cpp	2006-04-18 15:03:39.000000000 +0200
@@ -207,6 +207,8 @@
 					   i18n("Use K3bSetup to solve this problem."),
 					   true ) );
     }
+
+#if 0
     else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root
       problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
 					 i18n("%1 will be run without root privileges").arg("cdrecord"),
@@ -220,6 +222,7 @@
 					 i18n("Use K3bSetup to solve this problem."),
 					 true ) );
 #endif
+#endif
   }
 
   if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
@@ -231,6 +234,7 @@
   }
   else {
 #ifdef Q_OS_LINUX
+#if 0
     if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 )
       problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
 					 i18n("%1 will be run without root privileges").arg("cdrdao"),
@@ -240,6 +244,7 @@
 					 i18n("Use K3bSetup to solve this problem."),
 					 true ) );
 #endif
+#endif
   }
 
   if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {



From fedora-cvs-commits at redhat.com  Thu Jun  8 09:22:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 05:22:27 -0400
Subject: rpms/squid/devel squid-2.5.STABLE14-httpReplyDestroy.patch, NONE,
	1.1 squid.spec, 1.63, 1.64
Message-ID: <200606080922.k589MRdo004654@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4615

Modified Files:
	squid.spec 
Added Files:
	squid-2.5.STABLE14-httpReplyDestroy.patch 
Log Message:
upstream fix for  squid BZ#1511 - assertion failed

squid-2.5.STABLE14-httpReplyDestroy.patch:
 client_side.c |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE squid-2.5.STABLE14-httpReplyDestroy.patch ---
---------------------
PatchSet 10612 
Date: 2006/06/02 22:00:34
Author: hno
Branch: SQUID_2_5
Tag: (none) 
Log:
Bug #1606: assertion failed: HttpReply.c:105: "rep"

The patch for Bug #1511 "Some 206 responses logged incorrectly" was slightly
broken and could cause the above assert.

Members: 
	src/client_side.c:1.561.2.96->1.561.2.97 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.561.2.96
retrieving revision 1.561.2.97
diff -u -r1.561.2.96 -r1.561.2.97
--- squid/src/client_side.c	10 Mar 2006 22:58:35 -0000	1.561.2.96
+++ squid/src/client_side.c	2 Jun 2006 22:00:34 -0000	1.561.2.97
@@ -2031,8 +2031,6 @@
 		http->entry = clientCreateStoreEntry(http, http->request->method,
 		    null_request_flags);
 		errorAppendEntry(http->entry, err);
-		httpReplyDestroy(http->reply);
-		http->reply = NULL;
 		memFree(buf, MEM_CLIENT_SOCK_BUF);
 		return;
 	    }
@@ -2067,8 +2065,6 @@
 		    http->entry = clientCreateStoreEntry(http, http->request->method,
 			null_request_flags);
 		    errorAppendEntry(http->entry, err);
-		    httpReplyDestroy(http->reply);
-		    http->reply = NULL;
 		    memFree(buf, MEM_CLIENT_SOCK_BUF);
 		    return;
 		}


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- squid.spec	29 May 2006 23:19:24 -0000	1.63
+++ squid.spec	8 Jun 2006 09:22:25 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE14
-Release: 1
+Release: 2
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,6 +19,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch100: squid-2.5.STABLE14-httpReplyDestroy.patch
 
 # External patches
 Patch150: squid-2.5.STABLE12-follow-xff.patch
@@ -58,6 +59,8 @@
 %prep
 %setup -q
 
+%patch100 -p1 -b .rpl
+
 %patch150 -p1 -b .follow-xff
 
 %patch201 -p1 -b .config
@@ -327,6 +330,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Tue Jun 8 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-2
+- fix for squid BZ#1511 - assertion failed: HttpReply.c:105: "rep"
+
 * Tue May 30 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-1
 - update to new upstream
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 09:41:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 05:41:24 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch, NONE,
	1.1 openoffice.org.spec, 1.736, 1.737
Message-ID: <200606080941.k589fOvv018626@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18611

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch 
Log Message:
rh#193776# openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch

openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch:
 bf_linguistic/source/linguistic_misc.cxx           |    0 
 binfilter/bf_linguistic/source/linguistic_misc.cxx |   22 +++++++++++++++++--
 cppuhelper/source/implbase_ex.cxx                  |    6 +++++
 linguistic/source/misc.cxx                         |   23 +++++++++++++++++---
 source/implbase_ex.cxx                             |    0 
 source/misc.cxx                                    |    0 
 source/ui/uno/dlelstnr.cxx                         |    0 
 sw/source/ui/uno/dlelstnr.cxx                      |   24 +++++++++++++++++----
 8 files changed, 66 insertions(+), 9 deletions(-)

--- NEW FILE openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch ---
Index: source/implbase_ex.cxx
===================================================================
RCS file: /cvs/udk/cppuhelper/source/implbase_ex.cxx,v
retrieving revision 1.12
diff -u -r1.12 implbase_ex.cxx
--- openoffice.org.orig/cppuhelper/source/implbase_ex.cxx	5 Oct 2005 14:28:31 -0000	1.12
+++ openoffice.org/cppuhelper/source/implbase_ex.cxx	8 Jun 2006 08:55:09 -0000
@@ -124,6 +124,12 @@
             for ( sal_Int32 n = cd->m_nTypes; n--; )
             {
                 type_entry * pEntry = &pEntries[ n ];
+                if (!pEntry->m_type.getCppuType)
+                {
+                    throw RuntimeException( rtl::OUString::createFromAscii(
+                       "type \"<Unknown>\" is no interface type!"),
+                      Reference< XInterface >() );
+                }
                 Type const & rType = (*pEntry->m_type.getCppuType)( 0 );
                 OSL_ENSURE( rType.getTypeClass() == TypeClass_INTERFACE, "### wrong helper init: expected interface!" );
                 OSL_ENSURE( ! isXInterface( rType.getTypeLibType()->pTypeName ), "### want to implement XInterface: template argument is XInterface?!?!?!" );
Index: bf_linguistic/source/linguistic_misc.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_linguistic/source/linguistic_misc.cxx,v
retrieving revision 1.7
diff -u -r1.7 linguistic_misc.cxx
--- openoffice.org.orig/binfilter/bf_linguistic/source/linguistic_misc.cxx	7 Apr 2006 13:19:09 -0000	1.7
+++ openoffice.org/binfilter/bf_linguistic/source/linguistic_misc.cxx	8 Jun 2006 09:16:24 -0000
@@ -717,14 +717,32 @@
 void AppExitListener::Activate()
 {
 	if (xDesktop.is())
-		xDesktop->addTerminateListener( this );
+	{
+		try
+		{
+			xDesktop->addTerminateListener( this );
+		}
+		catch (const RuntimeException&)
+		{
+			DBG_ASSERT(!this, "Strange Failure on AppExitListener::Activate");
+		}
+	}
 }
 
 
 void AppExitListener::Deactivate()
 {
 	if (xDesktop.is())
-		xDesktop->removeTerminateListener( this );
+	{
+		try 
+		{
+			xDesktop->removeTerminateListener( this );
+		}
+		catch (const RuntimeException&)
+		{
+			DBG_ASSERT(!this, "Strange Failure on AppExitListener::DeActivate");
+		}
+	}
 }
 
 
Index: source/misc.cxx
===================================================================
RCS file: /cvs/sw/linguistic/source/misc.cxx,v
retrieving revision 1.25
diff -u -r1.25 misc.cxx
--- openoffice.org.orig/linguistic/source/misc.cxx	7 Apr 2006 13:50:38 -0000	1.25
+++ openoffice.org/linguistic/source/misc.cxx	8 Jun 2006 09:02:04 -0000
@@ -854,14 +854,31 @@
 void AppExitListener::Activate()
 {
 	if (xDesktop.is())
-		xDesktop->addTerminateListener( this );
+	{
+		try
+		{
+			xDesktop->addTerminateListener( this );
+		}
+		catch (const RuntimeException&) 
+		{
+			DBG_ASSERT(!this, "Strange Failure on AppExitListener::Activate");
+		}
+	}
 }
 
-
 void AppExitListener::Deactivate()
 {
 	if (xDesktop.is())
-		xDesktop->removeTerminateListener( this );
+	{
+		try
+		{
+			xDesktop->removeTerminateListener( this );
+		}
+		catch (const RuntimeException&) 
+		{
+			DBG_ASSERT(!this, "Strange Failure on AppExitListener::Deactivate");
+		}
+	}
 }
 
 
Index: source/ui/uno/dlelstnr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/uno/dlelstnr.cxx,v
retrieving revision 1.8
diff -u -r1.8 dlelstnr.cxx
--- openoffice.org.orig/sw/source/ui/uno/dlelstnr.cxx	9 Sep 2005 11:18:22 -0000	1.8
+++ openoffice.org/sw/source/ui/uno/dlelstnr.cxx	8 Jun 2006 09:19:43 -0000
@@ -108,8 +108,17 @@
 		xLngSvcMgr = Reference< XLinguServiceManager >(
 				xMgr->createInstance( aSvcName ), UNO_QUERY );
 		if (xLngSvcMgr.is())
-			xLngSvcMgr->addLinguServiceManagerListener( 
-				(XLinguServiceEventListener *) this );
+		{
+			try 
+			{
+				xLngSvcMgr->addLinguServiceManagerListener( 
+					(XLinguServiceEventListener *) this );
+			} 
+			catch (const RuntimeException&)
+			{
+				DBG_ASERT(!this, "addLinguServiceManagerListener");
+			}
+		}
 	}
 }
 /* -----------------------------17.03.00 09:07--------------------------------
@@ -214,9 +223,16 @@
 	{
 		if (xLngSvcMgr.is())
 		{
-			xLngSvcMgr->removeLinguServiceManagerListener( 
+			try
+			{
+				xLngSvcMgr->removeLinguServiceManagerListener( 
 					(XLinguServiceEventListener *) this );
-			xLngSvcMgr = 0;
+				xLngSvcMgr = 0;
+			} 
+			catch (const RuntimeException&)
+			{
+				DBG_ASSERT(!this, "Strange Failure on removeLinguServiceManagerListener");
+			}
 		}
 		xDesktop = NULL;
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- openoffice.org.spec	7 Jun 2006 08:51:24 -0000	1.736
+++ openoffice.org.spec	8 Jun 2006 09:41:21 -0000	1.737
@@ -103,6 +103,7 @@
 Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+Patch40: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -833,6 +834,7 @@
 %patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
+%patch40 -p1 -b .ooo66018.linguistic.vorcrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3311,6 +3313,7 @@
 - rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses
 (thesari?) etc
 - rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+- rh#193776# add openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
 
 * Fri Jun 02 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.2
 - fontcache problem



From fedora-cvs-commits at redhat.com  Thu Jun  8 10:17:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 06:17:11 -0400
Subject: rpms/libtool/devel libtool-1.5.18-multilib.patch,1.2,1.3
Message-ID: <200606081017.k58AHADC026333@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26087

Modified Files:
	libtool-1.5.18-multilib.patch 
Log Message:
- fix multilib patch

libtool-1.5.18-multilib.patch:
 libtool.m4 |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

Index: libtool-1.5.18-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool-1.5.18-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtool-1.5.18-multilib.patch	6 Jun 2006 11:39:25 -0000	1.2
+++ libtool-1.5.18-multilib.patch	8 Jun 2006 10:17:08 -0000	1.3
@@ -1,6 +1,6 @@
---- libtool-1.5.14/libtool.m4.multilib	2005-02-12 12:18:34.000000000 +0000
-+++ libtool-1.5.14/libtool.m4	2005-02-15 08:48:42.189498479 +0000
-@@ -1456,10 +1456,27 @@
+--- libtool-1.5.22/libtool.m4.multilib	2005-12-18 22:53:17.000000000 +0100
++++ libtool-1.5.22/libtool.m4	2006-06-08 11:12:46.000000000 +0200
+@@ -1572,10 +1572,27 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -23,8 +23,9 @@
 +
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
    fi
  



From fedora-cvs-commits at redhat.com  Thu Jun  8 10:26:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 06:26:39 -0400
Subject: rpms/qt/devel qt.spec,1.114,1.115
Message-ID: <200606081026.k58AQds1031316@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31265

Modified Files:
	qt.spec 
Log Message:
fix utf8 issue in changelog




Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- qt.spec	5 Jun 2006 10:50:19 -0000	1.114
+++ qt.spec	8 Jun 2006 10:26:36 -0000	1.115
@@ -86,7 +86,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 6
+Release: 7
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -718,6 +718,9 @@
 
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:3.3.6-7
+- fix utf8 issue in changelog
+
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 1:3.3.6-6
 - qt-devel requires on mesa-libGLU-devel mesa-libGU-devel
 
@@ -743,7 +746,7 @@
 
 
 * Mon Feb 27 2006 Than Ngo <than at redhat.com> 1:3.3.5-13
-- add set of fixes for the immodule patch, thanks to Dirk M?ller
+- add set of fixes for the immodule patch, thanks to Dirk M??ller
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.3.5-12.2
 - bump again for double-long bug on ppc(64)
@@ -1642,7 +1645,7 @@
 * Fri Mar  3 2000 Bill Nottingham <notting at redhat.com>
 - fix %postun script
 
-* Fri Feb 18 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+* Fri Feb 18 2000 Bernhard Rosenkr???zer <bero at redhat.com>
 - beta1
 - get rid of qt-ImageIO, the functionality is now in the main Qt library
 - remove qt-Network, the functionality is now in the main Qt library
@@ -1668,7 +1671,7 @@
 * Thu Jan 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - switch from glxMesa to Mesa for the GL addon
 
-* Wed Jan 5 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+* Wed Jan 5 2000 Bernhard Rosenkr???zer <bero at redhat.com>
 - Fix up dependencies
 - new snapshot
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 10:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 06:43:35 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.143,1.144
Message-ID: <200606081043.k58AhZSm002113@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2014

Modified Files:
	kdelibs.spec 
Log Message:
enable --enable-new-ldflags again since ld bug fixed



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kdelibs.spec	7 Jun 2006 22:36:29 -0000	1.143
+++ kdelibs.spec	8 Jun 2006 10:43:31 -0000	1.144
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 3
+Release: 4
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -230,9 +230,7 @@
 fi
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTLIB \
    --enable-libsuffix="$suffix" \
@@ -390,6 +388,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
+- enable --enable-new-ldflags again since ld bug fixed
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 6:3.5.3-3
 - move .so symlinks to -devel subpackage
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 10:46:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 06:46:58 -0400
Subject: rpms/squid/FC-5 squid-2.5.STABLE14-httpReplyDestroy.patch, NONE,
	1.1 squid.spec, 1.60, 1.61
Message-ID: <200606081046.k58Akwct016341@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15916

Modified Files:
	squid.spec 
Added Files:
	squid-2.5.STABLE14-httpReplyDestroy.patch 
Log Message:
fix for squid BZ#1511 - assertion failed

squid-2.5.STABLE14-httpReplyDestroy.patch:
 client_side.c |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE squid-2.5.STABLE14-httpReplyDestroy.patch ---
---------------------
PatchSet 10612 
Date: 2006/06/02 22:00:34
Author: hno
Branch: SQUID_2_5
Tag: (none) 
Log:
Bug #1606: assertion failed: HttpReply.c:105: "rep"

The patch for Bug #1511 "Some 206 responses logged incorrectly" was slightly
broken and could cause the above assert.

Members: 
	src/client_side.c:1.561.2.96->1.561.2.97 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.561.2.96
retrieving revision 1.561.2.97
diff -u -r1.561.2.96 -r1.561.2.97
--- squid/src/client_side.c	10 Mar 2006 22:58:35 -0000	1.561.2.96
+++ squid/src/client_side.c	2 Jun 2006 22:00:34 -0000	1.561.2.97
@@ -2031,8 +2031,6 @@
 		http->entry = clientCreateStoreEntry(http, http->request->method,
 		    null_request_flags);
 		errorAppendEntry(http->entry, err);
-		httpReplyDestroy(http->reply);
-		http->reply = NULL;
 		memFree(buf, MEM_CLIENT_SOCK_BUF);
 		return;
 	    }
@@ -2067,8 +2065,6 @@
 		    http->entry = clientCreateStoreEntry(http, http->request->method,
 			null_request_flags);
 		    errorAppendEntry(http->entry, err);
-		    httpReplyDestroy(http->reply);
-		    http->reply = NULL;
 		    memFree(buf, MEM_CLIENT_SOCK_BUF);
 		    return;
 		}


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-5/squid.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- squid.spec	29 May 2006 23:23:21 -0000	1.60
+++ squid.spec	8 Jun 2006 10:46:56 -0000	1.61
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE14
-Release: 1.FC5
+Release: 2.FC5
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,6 +19,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch100: squid-2.5.STABLE14-httpReplyDestroy.patch
 
 # External patches
 Patch150: squid-2.5.STABLE12-follow-xff.patch
@@ -58,6 +59,8 @@
 %prep
 %setup -q
 
+%patch100 -p1 -b .rpl
+
 %patch150 -p1 -b .follow-xff
 
 %patch201 -p1 -b .config
@@ -319,6 +322,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Tue Jun 8 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-2.FC5
+- fix for squid BZ#1511 - assertion failed: HttpReply.c:105: "rep"
+
 * Tue May 30 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-1.FC5
 - update to new upstream
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 10:48:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 06:48:33 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-misc-fixes.patch, NONE,
	1.1 autofs.spec, 1.97, 1.98
Message-ID: <200606081048.k58AmXf4018534@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18473

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-misc-fixes.patch 
Log Message:
* Wed Jun 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-5
- misc fixes for things found while investigating map re-read problem.


autofs-5.0.0_beta4-misc-fixes.patch:
 CHANGELOG              |    4 ++++
 daemon/automount.c     |    6 +++---
 lib/rpc_subs.c         |    4 +++-
 modules/lookup_hosts.c |   15 ++++++++++++---
 4 files changed, 22 insertions(+), 7 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-misc-fixes.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 4d9d6e5..6259741 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,10 @@
   fails lookup.
 - correct indirect mount expire broken by the wildcard lookup fix.
 - fix up multi-mount handling when wildcard map entry present.
+- fix mutex not being unlocked on map read.
+- fix rpc routines not logging errors.
+- fix handling of invalid directory for nobrowse hosts map
+  lookup.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index d455a62..52f1ceb 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1031,13 +1031,10 @@ static int do_hup_signal(struct master *
 		status = pthread_cond_wait(&mc.cond, &mc.mutex);
 		if (status)
 			fatal(status);
-		return 0;
 	}
 
 	pthread_cleanup_pop(1);
 
-	debug(master->default_logging, "started master map read"); 
-
 	return 1;
 }
 
@@ -1154,6 +1151,9 @@ static void handle_mounts_cleanup(void *
 
 	ap = (struct autofs_point *) arg;
 
+	/* Make sure alarms are cleared */
+	alarm_delete(ap);
+
 	umount_autofs(ap, 1);
 
 	/* If we have been canceled then we may hold the state mutex. */
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index c681563..bd12dae 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -33,9 +33,11 @@ #include <errno.h>
 #include "mount.h"
 #include "rpc_subs.h"
 
-#define STANDALONE
+/* #define STANDALONE */
 #ifdef STANDALONE
 #define error(logopt, msg, args...)	fprintf(stderr, msg "\n", ##args)
+#else
+#include "log.h"
 #endif
 
 /*
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index cbcdc4f..55e9fd1 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -115,15 +115,24 @@ int lookup_mount(struct autofs_point *ap
 		 * We haven't read the list of hosts into the
 		 * cache so go straight to the lookup.
 		 */
-		if (!ap->ghost)
+		if (!ap->ghost) {
+			/*
+			 * If name contains a '/' we're searching for an
+			 * offset that doesn't exist in the export list
+			 * so it's NOTFOUND otherwise this could be a
+			 * lookup for a new host.
+			 */
+			if (strchr(name, '/'))
+				status = NSS_STATUS_NOTFOUND;
 			goto done;
+		}
 
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		if (*name == '/')
-			error(ap->logopt, MODPREFIX
+			msg(MODPREFIX
 			      "can't find path in hosts map %s", name);
 		else
-			error(ap->logopt, MODPREFIX
+			msg(MODPREFIX
 			      "can't find path in hosts map %s/%s",
 			      ap->path, name);
 		pthread_cleanup_pop(0);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- autofs.spec	7 Jun 2006 06:42:50 -0000	1.97
+++ autofs.spec	8 Jun 2006 10:48:30 -0000	1.98
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -20,6 +20,7 @@
 Patch6: autofs-5.0.0_beta4-expire-base-mount-fix.patch
 Patch7: autofs-5.0.0_beta4-wildcard-handling.patch
 Patch8: autofs-5.0.0_beta4-master_parse-redeclare.patch
+Patch9: autofs-5.0.0_beta4-misc-fixes.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -67,6 +68,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -122,6 +124,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jun 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-5
+- misc fixes for things found while investigating map re-read problem.
+
 * Wed Jun 7 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-4
 - check base of offset mount tree is not a mount before umounting
   its offsets.



From fedora-cvs-commits at redhat.com  Thu Jun  8 12:04:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 08:04:31 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch, 1.1, 1.2
Message-ID: <200606081204.k58C4VTE003912@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3882

Modified Files:
	openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch 
Log Message:
streams closed early during recovery

openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch:
 embeddedobj/source/msole/olepersist.cxx |    9 ++++++++-
 sfx2/source/doc/docfile.cxx             |   20 ++++++++++++--------
 source/msole/olepersist.cxx             |    0 
 3 files changed, 20 insertions(+), 9 deletions(-)

Index: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch	7 Jun 2006 08:51:24 -0000	1.1
+++ openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch	8 Jun 2006 12:04:24 -0000	1.2
@@ -25,3 +25,39 @@
  
  		if ( xNameContainer.is() )
  		{
+Index: source/doc/docfile.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/doc/docfile.cxx,v
+retrieving revision 1.179
+retrieving revision 1.179.30.1
+diff -u -r1.179 -r1.179.30.1
+--- openoffice.org.orig/sfx2/source/doc/docfile.cxx	2 May 2006 16:41:30 -0000	1.179
++++ openoffice.org/sfx2/source/doc/docfile.cxx	8 Jun 2006 11:29:48 -0000	1.179.30.1
+@@ -2640,15 +2640,19 @@
+ 	// The probably exsisting SvStream wrappers should be closed first
+     CloseStreams_Impl();
+ 
+-    try
+-    {
+-        if ( xInToClose.is() )
+-            xInToClose->closeInput();
+-        if ( xOutToClose.is() )
+-            xOutToClose->closeOutput();
+-    }
+-    catch ( uno::Exception& )
++    // in case of salvage mode the storage is based on the streams
++    if ( !pImp->m_bSalvageMode )
+     {
++        try
++        {
++            if ( xInToClose.is() )
++                xInToClose->closeInput();
++            if ( xOutToClose.is() )
++                xOutToClose->closeOutput();
++        }
++        catch ( uno::Exception& )
++        {
++        }
+     }
+ }
+ 



From fedora-cvs-commits at redhat.com  Thu Jun  8 12:09:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 08:09:37 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch, NONE,
	1.1 openoffice.org.spec, 1.666, 1.667
Message-ID: <200606081209.k58C9bX9004372@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4329

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch 
Log Message:
rh#193918# fix for crash on recovery attempt

openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch:
 embeddedobj/source/msole/olepersist.cxx |    9 ++++++++-
 sfx2/source/doc/docfile.cxx             |   20 ++++++++++++--------
 source/msole/olepersist.cxx             |    0 
 3 files changed, 20 insertions(+), 9 deletions(-)

--- NEW FILE openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch ---
Index: source/msole/olepersist.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/msole/olepersist.cxx,v
retrieving revision 1.28
diff -u -r1.28 olepersist.cxx
--- openoffice.org.orig/embeddedobj/source/msole/olepersist.cxx	26 Apr 2006 14:23:04 -0000	1.28
+++ openoffice.org/embeddedobj/source/msole/olepersist.cxx	6 Jun 2006 08:34:33 -0000
@@ -788,11 +791,18 @@
 		uno::Sequence< uno::Any > aArgs( 2 );
 		aArgs[0] <<= xStream;
 		aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
-		uno::Reference< container::XNameContainer > xNameContainer(
+		uno::Reference< container::XNameContainer > xNameContainer;
+		try
+		{
+			xNameContainer = uno::Reference< container::XNameContainer >(
 				m_xFactory->createInstanceWithArguments(
 						::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
 						aArgs ),
 				uno::UNO_QUERY );
+		}
+		catch( uno::Exception& )
+		{}
+
 
 		if ( xNameContainer.is() )
 		{
Index: source/doc/docfile.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/docfile.cxx,v
retrieving revision 1.179
retrieving revision 1.179.30.1
diff -u -r1.179 -r1.179.30.1
--- openoffice.org.orig/sfx2/source/doc/docfile.cxx	2 May 2006 16:41:30 -0000	1.179
+++ openoffice.org/sfx2/source/doc/docfile.cxx	8 Jun 2006 11:29:48 -0000	1.179.30.1
@@ -2640,15 +2640,19 @@
 	// The probably exsisting SvStream wrappers should be closed first
     CloseStreams_Impl();
 
-    try
-    {
-        if ( xInToClose.is() )
-            xInToClose->closeInput();
-        if ( xOutToClose.is() )
-            xOutToClose->closeOutput();
-    }
-    catch ( uno::Exception& )
+    // in case of salvage mode the storage is based on the streams
+    if ( !pImp->m_bSalvageMode )
     {
+        try
+        {
+            if ( xInToClose.is() )
+                xInToClose->closeInput();
+            if ( xOutToClose.is() )
+                xOutToClose->closeOutput();
+        }
+        catch ( uno::Exception& )
+        {
+        }
     }
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -r1.666 -r1.667
--- openoffice.org.spec	23 May 2006 15:05:48 -0000	1.666
+++ openoffice.org.spec	8 Jun 2006 12:09:33 -0000	1.667
@@ -171,6 +171,7 @@
 Patch43: workspace.atkbridge2.patch
 Patch44: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
 Patch45: openoffice.org-2.0.3.ooo65721.crash.vcl.patch
+Patch46: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -825,6 +826,7 @@
 %patch43 -p1 -b .workspace.atkbridge2.patch
 %patch44 -p1 -b .oooXXXXX.atkbroken.vcl.patch
 %patch45 -p1 -b .ooo65721.crash.vcl.patch
+%patch46 -p1 -b .ooo66067.embeddedobj.crash.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3270,6 +3272,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
+- rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+
 * Tue May 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
 - ooo#65721# sneaky bug in a11y
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 12:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 08:27:05 -0400
Subject: rpms/xmlsec1/devel multilib.patch,NONE,1.1 xmlsec1.spec,1.23,1.24
Message-ID: <200606081227.k58CR5IV024868@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24720

Modified Files:
	xmlsec1.spec 
Added Files:
	multilib.patch 
Log Message:
Ugly patch and sed based changes to work around #192756 xmlsec1-config
multilib problem, Daniel


multilib.patch:
 xmlsec-config.in |    8 ++++++!!
 1 files changed, 6 insertions(+), 2 modifications(!)

--- NEW FILE multilib.patch ---
*** xmlsec/xmlsec-config.in.orig	2006-06-08 13:56:20.000000000 +0200
--- xmlsec/xmlsec-config.in	2006-06-08 14:01:10.000000000 +0200
***************
*** 4,9 ****
--- 4,15 ----
  package="@PACKAGE@"
  exec_prefix="@exec_prefix@"
  exec_prefix_set=no
+ if [ "`ldd /bin/sh | grep lib64`" = "" ]
+ then
+     archlib=lib
+ else
+     archlib=lib64
+ fi
  
  usage()
  {
***************
*** 188,194 ****
  # Assemble all the settings together
  #
  the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags"
! the_libs="$the_libs -L${exec_prefix}/lib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
  
  if $cflags; then
      all_flags="$the_flags"
--- 194,200 ----
  # Assemble all the settings together
  #
  the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags"
! the_libs="$the_libs -L${exec_prefix}/$archlib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
  
  if $cflags; then
      all_flags="$the_flags"


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xmlsec1.spec	7 Jun 2006 22:13:24 -0000	1.23
+++ xmlsec1.spec	8 Jun 2006 12:27:02 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 5
+Release: 6
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: separate_nspr_nss.patch
+Patch1: multilib.patch
 
 %description
 XML Security Library is a C library based on LibXML2  and OpenSSL. 
@@ -28,6 +29,7 @@
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl-devel >= 0.9.6
 Requires: zlib-devel 
+Requires: pkgconfig
 
 %description devel
 Libraries, includes, etc. you can use to develop applications with XML Digital 
@@ -135,6 +137,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -145,6 +148,9 @@
 #
 make
 
+# positively ugly but only sane way to get around #192756
+sed 's+/lib64+/$archlib+g' < xmlsec1-config | sed 's+/lib+/$archlib+g' | sed 's+ -DXMLSEC_NO_SIZE_T++' > xmlsec1-config.$$ && mv xmlsec1-config.$$ xmlsec1-config
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -227,6 +233,10 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Thu Jun  8 2006 Daniel Veillard <veillard at redhat.com> - 1.2.9-6
+- Ugly patch and sed based changes to work around #192756 xmlsec1-config
+  multilib problem
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.2.9-5
 - move .so symlinks to -devel subpackage
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 12:47:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 08:47:08 -0400
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.24,1.25
Message-ID: <200606081247.k58Cl8BL019546@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17591

Modified Files:
	xmlsec1.spec 
Log Message:
oops libxmlsec1.la was still there, should fix #171410 and #154142, Daniel



Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xmlsec1.spec	8 Jun 2006 12:27:02 -0000	1.24
+++ xmlsec1.spec	8 Jun 2006 12:47:05 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 6
+Release: 7
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -160,6 +160,7 @@
 
 %makeinstall
 #make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} install
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -fr %{buildroot}
@@ -233,6 +234,9 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Thu Jun  8 2006 Daniel Veillard <veillard at redhat.com> - 1.2.9-7
+- oops libxmlsec1.la was still there, should fix #171410 and #154142
+
 * Thu Jun  8 2006 Daniel Veillard <veillard at redhat.com> - 1.2.9-6
 - Ugly patch and sed based changes to work around #192756 xmlsec1-config
   multilib problem



From fedora-cvs-commits at redhat.com  Thu Jun  8 12:56:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 08:56:30 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.2-kconf_update-klipper.patch, NONE,
	1.1 kdebase-3.5.3-1-redhat.patch, NONE, 1.1 kdebase.spec,
	1.167, 1.168 kdebase-3.5.2-1-redhat.patch, 1.2,
	NONE kdebase-3.5.2-kicker-konsole-bookmarks.patch, 1.1,
	NONE kdebase-3.5.2-konsole.patch, 1.1,
	NONE kdebase-3.5.2-kwin.patch, 1.2, NONE
Message-ID: <200606081256.k58CuU2R019662@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19644

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.2-kconf_update-klipper.patch 
	kdebase-3.5.3-1-redhat.patch 
Removed Files:
	kdebase-3.5.2-1-redhat.patch 
	kdebase-3.5.2-kicker-konsole-bookmarks.patch 
	kdebase-3.5.2-konsole.patch kdebase-3.5.2-kwin.patch 
Log Message:
update to 3.5.3


kdebase-3.5.2-kconf_update-klipper.patch:
 klipper-kde31.sh |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.2-kconf_update-klipper.patch ---
--- kdebase-3.5.2/klipper/klipper-kde31.sh.me	2006-05-24 15:36:19.000000000 +0200
+++ kdebase-3.5.2/klipper/klipper-kde31.sh	2006-05-24 15:36:29.000000000 +0200
@@ -2,7 +2,5 @@
 filename=`kde-config --localprefix`share/autostart/klipper.desktop
 if grep 'Hidden=true' "$filename" > /dev/null 2> /dev/null; then
   echo AutoStart=false
-else
-  echo AutoStart=true
 fi
-rm -f "$filename"
\ No newline at end of file
+rm -f "$filename"

kdebase-3.5.3-1-redhat.patch:
 kdebase-3.4.91/kde.pamd |   16 +++++++----
 kdebase-3.5.1/startkde  |   68 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 69 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-3.5.3-1-redhat.patch ---
--- kdebase-3.4.91/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.4.91/kde.pamd	2005-09-27 18:16:15.000000000 +0200
@@ -1,7 +1,11 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_pwdb.so shadow nullok
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_pwdb.so
-password   required	/lib/security/pam_cracklib.so
-password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
-session    required	/lib/security/pam_pwdb.so
+auth       sufficient	pam_timestamp.so
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional	pam_timestamp.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
--- kdebase-3.5.1/startkde.redhat	2006-01-19 18:03:19.000000000 +0100
+++ kdebase-3.5.1/startkde	2006-02-15 18:58:10.000000000 +0100
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.3 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -64,7 +112,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
@@ -135,8 +183,8 @@
     done
 fi
 
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -147,10 +195,11 @@
 # For anything else (that doesn't set env vars, or that needs a window manager),
 # better use the Autostart folder.
 
-exepath=`kde-config --path exe | tr : '\n'`
+exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+  for file in "$prefix"*.sh ; do
     test -r "$file" && . "$file"
   done
 done
@@ -339,7 +388,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdebase.spec	23 May 2006 17:05:54 -0000	1.167
+++ kdebase.spec	8 Jun 2006 12:56:28 -0000	1.168
@@ -7,8 +7,8 @@
 %define include_kappfinder 0
 
 %define qt_version 3.3.5
-%define arts_version 1.5.2
-%define kde_version 3.5.2
+%define arts_version 1.5.3
+%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
@@ -19,8 +19,8 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.2
-Release: 0.5.fc5
+Version: 3.5.3
+Release: 0.1.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -37,7 +37,7 @@
 Source7: mailsettings.cc
 
 Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.2-1-redhat.patch
+Patch1: kdebase-3.5.3-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -54,11 +54,7 @@
 Patch15: kdebase-3.5.1-konsole-fonts.patch
 Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
-
-# upstream patches
-Patch100: kdebase-3.5.2-kwin.patch
-Patch101: kdebase-3.5.2-kicker-konsole-bookmarks.patch
-Patch102: kdebase-3.5.2-konsole.patch
+Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -104,6 +100,13 @@
 %ifnarch s390 s390x
 BuildPrereq: libraw1394-devel
 %endif
+BuildPrereq: libXdamage-devel
+BuildPrereq: libXcomposite-devel
+BuildPrereq: libXrender-devel
+BuildPrereq: libXfixes-devel
+BuildPrereq: pkgconfig
+BuildPrereq: autoconf
+BuildPrereq: automake
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
@@ -146,11 +149,7 @@
 %patch15 -p1 -b .konsole-fonts
 %patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
-
-# upstream patches
-%patch100 -p1 -b .kwin
-%patch101 -p1 -b .kicker-konsole-bookmarks
-%patch102 -p1 -b .konsole
+%patch18 -p1 -b .klipper
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -514,6 +513,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Fri May 12 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.5.fc5
 - fix 190836, xmTextFieldClass widgets don't work properly
 - fix 186425, KDE Terminal Sessions applet does not display konsole bookmarks


--- kdebase-3.5.2-1-redhat.patch DELETED ---


--- kdebase-3.5.2-kicker-konsole-bookmarks.patch DELETED ---


--- kdebase-3.5.2-konsole.patch DELETED ---


--- kdebase-3.5.2-kwin.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:02:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:02:02 -0400
Subject: rpms/gtk2/devel gtk+-2.9.2.evo-crash.patch, NONE, 1.1 gtk2.spec,
	1.149, 1.150
Message-ID: <200606081302.k58D22W0019826@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19810

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.9.2.evo-crash.patch 
Log Message:
Fix an evo crash


gtk+-2.9.2.evo-crash.patch:
 gtkbutton.c |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletion(-)

--- NEW FILE gtk+-2.9.2.evo-crash.patch ---
--- gtk+-2.9.2/gtk/gtkbutton.c.evo-crash	2006-06-08 09:00:02.000000000 -0400
+++ gtk+-2.9.2/gtk/gtkbutton.c	2006-06-08 09:00:17.000000000 -0400
@@ -1005,10 +1005,39 @@
 }
 
 static void
+gtk_button_update_image_spacing (GtkButton *button)
+{
+  GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+  GtkWidget *child; 
+  gint spacing;
+
+  /* Keep in sync with gtk_button_construct_child,
+   * we only want to update the spacing if the box 
+   * was constructed there.
+   */
+  if (!button->constructed || !priv->image)
+    return;
+
+  child = GTK_BIN (button)->child;
+  if (GTK_IS_ALIGNMENT (child))
+    {
+      child = GTK_BIN (child)->child;
+      if (GTK_IS_BOX (child))
+        {
+          gtk_widget_style_get (GTK_WIDGET (button),
+                                "image-spacing", &spacing,
+                                NULL);
+
+          gtk_box_set_spacing (GTK_BOX (child), spacing);
+        }
+    }   
+}
+
+static void
 gtk_button_style_set (GtkWidget *widget,
 		      GtkStyle  *prev_style)
 {
-  gtk_button_construct_child (GTK_BUTTON (widget));
+  gtk_button_update_image_spacing (GTK_BUTTON (widget));
 }
 
 static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- gtk2.spec	7 Jun 2006 05:41:13 -0000	1.149
+++ gtk2.spec	8 Jun 2006 13:02:00 -0000	1.150
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -28,6 +28,8 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
+# Fixed in 2.9.3
+Patch2: gtk+-2.9.2.evo-crash.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -101,6 +103,7 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
+%patch2 -p1 -b .evo-crash
 
 cp %{SOURCE2} gtk/
 
@@ -272,6 +275,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.2-4
+- Fix a crash in evolution
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.2-3
 - Fix the builtin icon cache
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:05:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:05:51 -0400
Subject: rpms/kdebase/FC-5 .cvsignore,1.47,1.48 sources,1.67,1.68
Message-ID: <200606081305.k58D5pm5019917@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19905

Modified Files:
	.cvsignore sources 
Log Message:
update source



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	15 Feb 2006 18:13:01 -0000	1.47
+++ .cvsignore	8 Jun 2006 13:05:45 -0000	1.48
@@ -21,3 +21,4 @@
 kde-redhat-config-3.5-fc5-0.1.tar.bz2
 kdebase-3.5.1.tar.bz2
 kde-redhat-config-3.5-fc5-0.2.tar.bz2
+kdebase-3.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	30 Mar 2006 13:46:23 -0000	1.67
+++ sources	8 Jun 2006 13:05:45 -0000	1.68
@@ -1,2 +1,2 @@
 a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2
-c5685e1be34e033286aa1f37002a0552  kdebase-3.5.2.tar.bz2
+9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:20:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:20:46 -0400
Subject: rpms/dovecot/FC-5 dovecot-1.0.beta8-default-settings.patch, NONE,
	1.1 dovecot.spec, 1.50, 1.51
Message-ID: <200606081320.k58DKkH9015321@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/dovecot/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15269

Modified Files:
	dovecot.spec 
Added Files:
	dovecot-1.0.beta8-default-settings.patch 
Log Message:
* Thu Jun 08 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.2.fc5
- bring FC-5 branch up to date with the rawhide one (bugfixes only)
- should fix non-working pop3 in default installation


dovecot-1.0.beta8-default-settings.patch:
 dovecot-example.conf         |   19 ++++++++-----------
 src/master/master-settings.c |   10 +++++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

--- NEW FILE dovecot-1.0.beta8-default-settings.patch ---
--- dovecot-1.0.beta8/src/master/master-settings.c.default-settings	2006-04-25 04:00:07.000000000 +0200
+++ dovecot-1.0.beta8/src/master/master-settings.c	2006-06-08 11:56:28.000000000 +0200
@@ -266,8 +266,8 @@
 	MEMBER(syslog_facility) "mail",
 
 	/* general */
-	MEMBER(protocols) "imap imaps",
-	MEMBER(listen) "*",
+	MEMBER(protocols) "imap imaps pop3 pop3s",
+	MEMBER(listen) "[::]",
 	MEMBER(ssl_listen) NULL,
 
 	MEMBER(ssl_disable) FALSE,
@@ -278,7 +278,7 @@
 	MEMBER(ssl_parameters_regenerate) 168,
 	MEMBER(ssl_cipher_list) NULL,
 	MEMBER(ssl_verify_client_cert) FALSE,
-	MEMBER(disable_plaintext_auth) TRUE,
+	MEMBER(disable_plaintext_auth) FALSE,
 	MEMBER(verbose_ssl) FALSE,
 	MEMBER(shutdown_clients) TRUE,
 	MEMBER(nfs_check) TRUE,
@@ -332,7 +332,7 @@
 	MEMBER(maildir_stat_dirs) FALSE,
 	MEMBER(maildir_copy_with_hardlinks) FALSE,
 	MEMBER(mbox_read_locks) "fcntl",
-	MEMBER(mbox_write_locks) "dotlock fcntl",
+	MEMBER(mbox_write_locks) "fcntl",
 	MEMBER(mbox_lock_timeout) 300,
 	MEMBER(mbox_dotlock_change_timeout) 120,
 	MEMBER(mbox_min_index_size) 0,
@@ -361,7 +361,7 @@
 	MEMBER(pop3_enable_last) FALSE,
 	MEMBER(pop3_reuse_xuidl) FALSE,
 	MEMBER(pop3_lock_session) FALSE,
-	MEMBER(pop3_uidl_format) NULL,
+	MEMBER(pop3_uidl_format) "%08Xu%08Xv",
 	MEMBER(pop3_client_workarounds) NULL,
 	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
 
--- dovecot-1.0.beta8/dovecot-example.conf.default-settings	2006-04-21 04:01:27.000000000 +0200
+++ dovecot-1.0.beta8/dovecot-example.conf	2006-06-08 11:54:24.000000000 +0200
@@ -7,17 +7,14 @@
 # value inside quotes, eg.: key = "# char and trailing whitespace  "
 
 # Default values are shown after each value, it's not required to uncomment
-# any of the lines. Exception to this are paths, they're just examples
-# with real defaults being based on configure options. The paths listed here
-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-# --with-ssldir=/etc/ssl
+# any of the lines.
 
 # Base directory where to store runtime data.
 #base_dir = /var/run/dovecot/
 
 # Protocols we want to be serving:
 #  imap imaps pop3 pop3s
-#protocols = imap imaps
+#protocols = imap imaps pop3 pop3s
 
 # IP or host address where to listen in for connections. It's not currently
 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
@@ -36,7 +33,7 @@
 #     listen = *:10100
 #     ..
 #   }
-#listen = *
+#listen = [::]
 
 # IP or host address where to listen in for SSL connections. Defaults
 # to above if not specified.
@@ -49,8 +46,8 @@
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root. Included doc/mkcert.sh can be used to easily generate self-signed
 # certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
+#ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem
+#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
 
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter.
@@ -74,7 +71,7 @@
 # SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and
 # IPv6 ::1 addresses are considered secure, this setting has no effect if
 # you connect from those addresses.
-#disable_plaintext_auth = yes
+#disable_plaintext_auth = no
 
 # Should all IMAP and POP3 processes be killed when Dovecot master process
 # shuts down. Setting this to "no" means that Dovecot can be upgraded without
@@ -371,7 +368,7 @@
 # locking methods as well. Some operating systems don't allow using some of
 # them simultaneously.
 #mbox_read_locks = fcntl
-#mbox_write_locks = dotlock fcntl
+#mbox_write_locks = fcntl
 
 # Maximum time in seconds to wait for lock (all of them) before aborting.
 #mbox_lock_timeout = 300
@@ -547,7 +544,7 @@
   # installations. %08Xu%08Xv will be the new default, so use it for new
   # installations.
   #
-  #pop3_uidl_format = 
+  #pop3_uidl_format = %08Xu%08Xv
 
   # POP3 logout format string:
   #  %t - number of TOP commands


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-5/dovecot.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- dovecot.spec	1 Jun 2006 15:10:03 -0000	1.50
+++ dovecot.spec	8 Jun 2006 13:20:42 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.beta8.1.fc5
+Release: 0.beta8.2.fc5
 License: LGPL
 Group: System Environment/Daemons
 
@@ -17,7 +17,7 @@
 Source5: migrate-users
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
-Patch100: dovecot-1.0.beta7-default-settings.patch
+Patch100: dovecot-1.0.beta8-default-settings.patch
 Patch101: dovecot-1.0.beta2-pam-tty.patch
 Patch102: dovecot-1.0.beta2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
@@ -212,8 +212,14 @@
 
 
 %changelog
-* Thu Jun 01 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.1.fc5
+* Thu Jun 08 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.2.fc5
 - bring FC-5 branch up to date with the rawhide one (bugfixes only)
+- should fix non-working pop3 in default installation
+
+* Thu Jun 08 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.2
+- put back pop3_uidl_format default that got lost
+  in the beta2->beta7 upgrade (would cause pop3 to not work
+  at all in many situations)
 
 * Thu May 04 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.1
 - upgrade to latest upstream beta release (beta8)



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:29:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:29:03 -0400
Subject: rpms/smartmontools/FC-5 smartmontools-5.36-cciss.patch, NONE,
	1.1 smartmontools.sysconf, NONE, 1.1 .cvsignore, 1.3,
	1.4 smartd-conf.py, 1.5, 1.6 smartd.initd, 1.1,
	1.2 smartmontools.spec, 1.15, 1.16 sources, 1.2, 1.3
Message-ID: <200606081329.k58DT3BE018234@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/smartmontools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18190

Modified Files:
	.cvsignore smartd-conf.py smartd.initd smartmontools.spec 
	sources 
Added Files:
	smartmontools-5.36-cciss.patch smartmontools.sysconf 
Log Message:
* Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-fc5.1
- rebuild for FC5 update


smartmontools-5.36-cciss.patch:
 os_linux.c       |  210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 smartctl.8.in    |   10 ++
 smartctl.c       |   54 +++++++++-----
 smartd.8.in      |   12 ++-
 smartd.c         |   85 +++++++++++++++-------
 smartd.conf.5.in |   12 ++-
 utility.h        |    2 
 7 files changed, 334 insertions(+), 51 deletions(-)

--- NEW FILE smartmontools-5.36-cciss.patch ---
Patch for smartmontools >= 5.36, which adds CCISS support (for Compaq and HP Smart Arrays)
to smartctl and smartd.

The initial version was published on 2005-07-22 at the smartmontools-support mailing list
at sourceforge.net: http://article.gmane.org/gmane.linux.utilities.smartmontools/2933

Thanks to all contributors:

 - Praveen Chidambaram <bunchofmails at gmail.com> (original smartctl patch)
 - Guido Guenther <agx at debian.org> (Debian smartmontools package maintainer)
 - Fr?d?ric Boiteux <fboiteux at calistel.com> (fixes and patch applying)
 - Douglas Gilbert <dougg at torque.net> (update to be less intrusive)

How to use smartctl for cciss devices after applying this patch? Well, for example just do:

 $ smartctl -a -d cciss,0 /dev/cciss/c0d0
 $ smartctl -H -d cciss,0 /dev/cciss/c0d0

This patch was merged by Robert Scheck <cciss at robert-scheck.de> and successfully tested on
a Linux 2.6.16 kernel.

Have a lot of fun...

--- smartmontools-5.36/os_linux.c			2006-04-12 19:02:19.000000000 +0200
+++ smartmontools-5.36/os_linux.c.cciss			2006-05-10 15:53:35.000000000 +0200
@@ -64,12 +64,17 @@
 #include "os_linux.h"
 #include "scsicmds.h"
 #include "utility.h"
+#include "extern.h"
+
+#include <linux/cciss_ioctl.h>
+
 
 #ifndef ENOTSUP
 #define ENOTSUP ENOSYS
 #endif
 typedef unsigned long long u8;
 
+
 #define ARGUSED(x) ((void)(x))
 
 static const char *filenameandversion="$Id: os_linux.c,v 1.82 2006/04/12 16:28:56 ballen4705 Exp $";
@@ -83,6 +88,23 @@
 // global variable holding byte count of allocated memory
 extern long long bytes;
 
+/* for passing global control variables */
+extern smartmonctrl *con;
+
+static int cciss_io_interface(int device, int target,
+			      struct scsi_cmnd_io * iop, int report);
+
+typedef struct _ReportLUNdata_struct
+{
+  BYTE LUNListLength[4];
+  DWORD reserved;
+  BYTE LUN[CISS_MAX_LUN][8];
+} ReportLunData_struct;
+
+/* Structure/defines of Report Physical LUNS of drive */
+#define CISS_MAX_LUN        16
+#define CISS_MAX_PHYS_LUN   1024
+#define CISS_REPORT_PHYS    0xc3
 
 
 /* This function will setup and fix device nodes for a 3ware controller. */
@@ -191,8 +213,15 @@
     }
     return open(pathname, O_RDONLY | O_NONBLOCK);
   }
+  // cciss+
+  else if(!strcmp(type, "CCISS"))
+  {
+    // the device is a cciss smart array device.
+    return open(pathname, O_RDWR | O_NONBLOCK);
+  }
   else
     return -1;
+
 }
 
 // equivalent to close(file descriptor)
@@ -609,6 +638,93 @@
   
   return 0; 
 }
+// cciss+
+static int cciss_sendpassthru(unsigned int cmdtype, unsigned char *CDB,
+    			unsigned int CDBlen, char *buff,
+    			unsigned int size, unsigned int LunID,
+    			unsigned char *scsi3addr, int fd)
+{
+    int err ;
+    IOCTL_Command_struct iocommand;
+
+    memset(&iocommand, 0, sizeof(iocommand));
+
+    if (cmdtype == 0) 
+    {
+        // To controller; nothing to do
+    }
+    else if (cmdtype == 1) 
+    {
+        iocommand.LUN_info.LogDev.VolId = LunID;
+        iocommand.LUN_info.LogDev.Mode = 1;
+    }
+    else if (cmdtype == 2) 
+    {
+        memcpy(&iocommand.LUN_info.LunAddrBytes,scsi3addr,8);
+        iocommand.LUN_info.LogDev.Mode = 0;
+    }
+    else 
+    {
+        fprintf(stderr, "cciss_sendpassthru: bad cmdtype\n");
+        return 1;
+    }
+
+    memcpy(&iocommand.Request.CDB[0], CDB, CDBlen);
+    iocommand.Request.CDBLen = CDBlen;
+    iocommand.Request.Type.Type = TYPE_CMD;
+    iocommand.Request.Type.Attribute = ATTR_SIMPLE;
+    iocommand.Request.Type.Direction = XFER_READ;
+    iocommand.Request.Timeout = 0;
+
+    iocommand.buf_size = size;
+    iocommand.buf = (unsigned char *)buff;
+
+    if ((err = ioctl(fd, CCISS_PASSTHRU, &iocommand))) 
+    {
+        fprintf(stderr, "CCISS ioctl error %d\n", err);
+    }
+    return err;
+}
+
+// cciss+
+static int cciss_getlun(int device, int target, unsigned char *physlun)
+{
+    unsigned char CDB[16]= {0};
+    ReportLunData_struct *luns;
+    int reportlunsize = sizeof(*luns) + CISS_MAX_PHYS_LUN * 8;
+    int i;
+    int ret;
+
+    luns = (ReportLunData_struct *)malloc(reportlunsize);
+
+    memset(luns, 0, reportlunsize);
+
+    /* Get Physical LUN Info (for physical device) */
+    CDB[0] = CISS_REPORT_PHYS;
+    CDB[6] = (reportlunsize >> 24) & 0xFF;  /* MSB */
+    CDB[7] = (reportlunsize >> 16) & 0xFF;
+    CDB[8] = (reportlunsize >> 8) & 0xFF;
+    CDB[9] = reportlunsize & 0xFF;
+
+    if ((ret = cciss_sendpassthru(0, CDB, 12, (char *)luns, reportlunsize, 0, NULL, device)))
+    {
+        free(luns);
+        return ret;
+    }
+
+    for (i=0; i<CISS_MAX_LUN+1; i++) 
+    {
+        if (luns->LUN[i][6] == target) 
+        {
+            memcpy(physlun, luns->LUN[i], 8);
+            free(luns);
+            return 0;
+        }
+    }
+
+    free(luns);
+    return ret;
+}
 
 // >>>>>> Start of general SCSI specific linux code
 
@@ -913,7 +1029,8 @@
  * (e.g. CHECK CONDITION). If the SCSI command could not be issued
  * (e.g. device not present or timeout) or some other problem
  * (e.g. timeout) then returns a negative errno value */
-int do_scsi_cmnd_io(int dev_fd, struct scsi_cmnd_io * iop, int report)
+static int do_normal_scsi_cmnd_io(int dev_fd, struct scsi_cmnd_io * iop,
+                                  int report)
 {
     int res;
 
@@ -937,15 +1054,104 @@
     case SG_IO_PRESENT_YES:
 	return sg_io_cmnd_io(dev_fd, iop, report, 0);
     default:
-	pout(">>>> do_scsi_cmnd_io: bad sg_io_state=%d\n", sg_io_state); 
+	pout(">>>> do_normal_scsi_cmnd_io: bad sg_io_state=%d\n",
+             sg_io_state); 
 	sg_io_state = SG_IO_PRESENT_UNKNOWN;
         return -EIO; 	/* report error and reset state */
     }
 }
 
+// Check and call the right interface. May be when the do_generic_scsi_cmd_io interface is better
+// we can take off this crude way of calling the right interface
+
+int do_scsi_cmnd_io(int dev_fd, struct scsi_cmnd_io * iop, int report)
+{
+    switch(con->controller_type)
+    {
+        case CONTROLLER_CCISS:
+            return cciss_io_interface(dev_fd, con->controller_port-1, iop, report);
+            // not reached
+            break;
+        default:
+            return do_normal_scsi_cmnd_io(dev_fd, iop, report);
+            // not reached
+            break;
+    }
+}
+
+
 // >>>>>> End of general SCSI specific linux code
 
 
+// cciss+ >> CCSISS I/O passthrough
+// This is an interface that uses the cciss passthrough to talk to the SMART controller on
+// the HP system. The cciss driver provides a way to send SCSI cmds through the CCISS passthrough
+// essentially the methods above and below pertain to SCSI, except for the SG driver which is not
+// involved. The CCISS driver does not engage the scsi subsystem.
+static int cciss_io_interface(int device, int target, struct scsi_cmnd_io * iop, int report)
+{
+    unsigned char pBuf[512] = {0};
+    unsigned char phylun[1024] = {0};
+    int iBufLen = 512;
+    int status = -1;
+    int len = 0; // used later in the code.
+    report = 0;
+
+    cciss_getlun(device, target, phylun);
+    status = cciss_sendpassthru( 2, iop->cmnd, iop->cmnd_len, (char*) pBuf, iBufLen, 1, phylun, device);
+
+    if (0 == status)
+    {
+        if (report > 0)
+            printf("  status=0\n");
+        if (DXFER_FROM_DEVICE == iop->dxfer_dir)
+        {
+            memcpy(iop->dxferp, pBuf, iop->dxfer_len);
+            if (report > 1)
+            {
+                int trunc = (iop->dxfer_len > 256) ? 1 : 0;
+                printf("  Incoming data, len=%d%s:\n", (int)iop->dxfer_len,
+                     (trunc ? " [only first 256 bytes shown]" : ""));
+                dStrHex((const char*)iop->dxferp, (trunc ? 256 : iop->dxfer_len) , 1);
+            }
+        }
+        return 0;
+    }
+    iop->scsi_status = status & 0x7e; /* bits 0 and 7 used to be for vendors */
+    if (LSCSI_DRIVER_SENSE == ((status >> 24) & 0xf))
+        iop->scsi_status = SCSI_STATUS_CHECK_CONDITION;
+    len = (SEND_IOCTL_RESP_SENSE_LEN < iop->max_sense_len) ?
+               SEND_IOCTL_RESP_SENSE_LEN : iop->max_sense_len;
+    if ((SCSI_STATUS_CHECK_CONDITION == iop->scsi_status) &&
+        iop->sensep && (len > 0))
+    {
+        memcpy(iop->sensep, pBuf, len);
+        iop->resp_sense_len = iBufLen;
+        if (report > 1)
+        {
+            printf("  >>> Sense buffer, len=%d:\n", (int)len);
+            dStrHex((const char *)pBuf, len , 1);
+        }
+    }
+    if (report)
+    {
+        if (SCSI_STATUS_CHECK_CONDITION == iop->scsi_status) {
+            printf("  status=%x: sense_key=%x asc=%x ascq=%x\n", status & 0xff,
+                 pBuf[2] & 0xf, pBuf[12], pBuf[13]);
+        }
+        else
+            printf("  status=0x%x\n", status);
+    }
+    if (iop->scsi_status > 0)
+        return 0;
+    else
+    {
+        if (report > 0)
+            printf("  ioctl status=0x%x but scsi status=0, fail with EIO\n", status);
+        return -EIO;      /* give up, assume no device there */
+    }
+} 
+
 // prototype
 void printwarning(smart_command_set command);
 
--- smartmontools-5.36/smartctl.8.in			2006-04-12 17:45:38.000000000 +0200
+++ smartmontools-5.36/smartctl.8.in.cciss		2006-05-10 15:53:35.000000000 +0200
@@ -177,7 +177,7 @@
 .TP
 .B \-d TYPE, \-\-device=TYPE
 Specifies the type of the device.  The valid arguments to this option
-are \fIata\fP, \fIscsi\fP, \fImarvell\fP, and \fI3ware,N\fP. If this option is not
+are \fIata\fP, \fIscsi\fP, \fImarvell\fP, \fIcciss,N\fP and \fI3ware,N\fP. If this option is not
 used then \fBsmartctl\fP will attempt to guess the device type from
 the device name.
 
@@ -257,6 +257,8 @@
 
 .B 3ware controllers are currently ONLY supported under Linux and FreeBSD.
 
+.B cciss controllers are currently ONLY supported under Linux.
+
 .TP
 .B \-T TYPE, \-\-tolerance=TYPE
 Specifies how tolerant \fBsmartctl\fP should be of ATA and SMART command
@@ -1157,6 +1159,12 @@
 power\-cycled during the read\-scan, resume the scan 45 minutes after power to the
 device is restored.
 .PP
+.nf
+.B smartctl \-a \-d cciss,0 /dev/cciss/c0d0
+.fi
+Examine all SMART data for the first SCSI disk connected to a cciss
+RAID controller card.
+.PP
 .SH RETURN VALUES
 The return values of \fBsmartctl\fP are defined by a bitmask.  If all
 is well with the disk, the return value (exit status) of
--- smartmontools-5.36/smartctl.c			2006-04-12 16:54:28.000000000 +0200
+++ smartmontools-5.36/smartctl.c.cciss			2006-05-10 15:53:35.000000000 +0200
@@ -234,7 +234,7 @@
   case 'q':
     return "errorsonly, silent";
   case 'd':
-    return "ata, scsi, marvell, 3ware,N";
+    return "ata, scsi, marvell, 3ware,N, cciss,N";
   case 'T':
     return "normal, conservative, permissive, verypermissive";
   case 'b':
@@ -384,21 +384,35 @@
           con->dont_print = FALSE;
           pout("No memory for argument of -d. Exiting...\n");
           exit(FAILCMD);
-        } else if (strncmp(s,"3ware,",6)) {
-          badarg = TRUE;
-        } else if (split_report_arg2(s, &i)) {
-          sprintf(extraerror, "Option -d 3ware,N requires N to be a non-negative integer\n");
-          badarg = TRUE;
-        } else if (i<0 || i>15) {
-          sprintf(extraerror, "Option -d 3ware,N (N=%d) must have 0 <= N <= 15\n", i);
-          badarg = TRUE;
-        } else {
-	  // NOTE: controller_port == disk number + 1
-	  con->controller_type = CONTROLLER_3WARE;
-          con->controller_port = i+1;
-        }
-        free(s);
-      }         
+        } else if (!strncmp(s,"3ware,",6)) {
+            if (split_report_arg2(s, &i)) {
+                sprintf(extraerror, "Option -d 3ware,N requires N to be a non-negative integer\n");
+                badarg = TRUE;
+            } else if (i<0 || i>15) {
+                sprintf(extraerror, "Option -d 3ware,N (N=%d) must have 0 <= N <= 15\n", i);
+                badarg = TRUE;
+            } else {
+	        // NOTE: controller_port == disk number + 1
+	        con->controller_type = CONTROLLER_3WARE;
+                con->controller_port = i+1;
+            }
+	    free(s);
+        } else if (!strncmp(s,"cciss,",6)) {
+            if (split_report_arg2(s, &i)) {
+                sprintf(extraerror, "Option -d cciss,N requires N to be a non-negative integer\n");
+                badarg = TRUE;
+            } else if (i<0 || i>15) {
+                sprintf(extraerror, "Option -d cciss,N (N=%d) must have 0 <= N <= 15\n", i);
+                badarg = TRUE;
+            } else {
+              // NOTE: controller_port == drive number
+              con->controller_type = CONTROLLER_CCISS;
+              con->controller_port = i+1;
+            }
+            free(s);
+        } else
+	    badarg=TRUE;
+      }
       break;
     case 'T':
       if (!strcmp(optarg,"normal")) {
@@ -856,6 +870,9 @@
   case CONTROLLER_3WARE_678K_CHAR:
     mode="ATA_3WARE_678K";
     break;
+  case CONTROLLER_CCISS:
+    mode="CCISS";
+    break;
   default:
     mode="ATA";
     break;
@@ -887,6 +904,11 @@
   case CONTROLLER_SCSI:
     retval = scsiPrintMain(fd);
     break;
+  case CONTROLLER_CCISS:
+    // route the cciss command through scsiPrintMain. 
+    // cciss pass-throughs will separeate from the SCSI data-path.
+    retval = scsiPrintMain(fd);
+    break;
   default:
     retval = ataPrintMain(fd);
     break;
--- smartmontools-5.36/smartd.8.in			2006-04-12 15:55:44.000000000 +0200
+++ smartmontools-5.36/smartd.8.in.cciss		2006-05-10 15:53:35.000000000 +0200
@@ -596,8 +596,8 @@
 .B \-d TYPE
 Specifies the type of the device.  This Directive may be used multiple
 times for one device, but the arguments \fIata\fP, \fIscsi\fP,
-\fImarvell\fP, and \fI3ware,N\fP are mutually-exclusive. If more than
-one is given then \fBsmartd\fP will use the last one which appears.
+\fImarvell\fP, \fIcciss,N\fP and \fI3ware,N\fP are mutually-exclusive. If more
+than one is given then \fBsmartd\fP will use the last one which appears.
 
 If none of these three arguments is given, then \fBsmartd\fP will
 first attempt to guess the device type by looking at whether the sixth
@@ -664,8 +664,14 @@
 6/7/8000 series controllers) or /dev/twa0-15 (3ware 9000 series
 controllers).
 
+.I cciss,N
+\- the device consists of one or more SCSI disks connected to a cciss
+RAID controller. The non-negative integer N (in the range from 0 to 15
+inclusive) denotes which disk on the controller is monitored.  In log
+files and email messages this disk will be identified as cciss_disk_XX
+with XX in the range from 00 to 15 inclusive.
 
-.B 3ware controllers are currently ONLY supported under Linux.
+.B 3ware and cciss controllers are currently ONLY supported under Linux.
 
 .I removable
 \- the device or its media is removable.  This indicates to
--- smartmontools-5.36/smartd.c				2006-04-12 18:18:57.000000000 +0200
+++ smartmontools-5.36/smartd.c.cciss			2006-05-10 15:53:35.000000000 +0200
@@ -711,6 +711,18 @@
 	*s=' ';
     }
     break;
+  case CONTROLLER_CCISS:
+    {
+      char *s,devicetype[16];
+      sprintf(devicetype, "cciss,%d", cfg->controller_port-1);
+      exportenv(environ_strings[8], "SMARTD_DEVICETYPE", devicetype);
+      if ((s=strchr(cfg->name, ' ')))
+	*s='\0';
+      exportenv(environ_strings[9], "SMARTD_DEVICE", cfg->name);
+      if (s)
+	*s=' ';
+    }
+    break;
   case CONTROLLER_ATA:
     exportenv(environ_strings[8], "SMARTD_DEVICETYPE", "ata");
     exportenv(environ_strings[9], "SMARTD_DEVICE", cfg->name);
@@ -722,6 +734,7 @@
   case CONTROLLER_SCSI:
     exportenv(environ_strings[8], "SMARTD_DEVICETYPE", "scsi");
     exportenv(environ_strings[9], "SMARTD_DEVICE", cfg->name);
+    break;
   }
 
   snprintf(fullmessage, 1024,
@@ -1074,7 +1087,7 @@
 void Directives() {
   PrintOut(LOG_INFO,
            "Configuration file (%s) Directives (after device name):\n"
-           "  -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N\n"
+           "  -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N, cciss,N\n"
            "  -T TYPE Set the tolerance to one of: normal, permissive\n"
            "  -o VAL  Enable/disable automatic offline tests (on/off)\n"
            "  -S VAL  Enable/disable attribute autosave (on/off)\n"
@@ -1607,11 +1620,15 @@
   // should we try to register this as a SCSI device?
   switch (cfg->controller_type) {
   case CONTROLLER_SCSI:
+  case CONTROLLER_CCISS:
   case CONTROLLER_UNKNOWN:
     break;
   default:
     return 1;
   }
+  // pass user settings on to low-level SCSI commands
+  con->controller_port=cfg->controller_port;
+  con->controller_type=cfg->controller_type;
   
   // open the device
   if ((fd = OpenDevice(device, "SCSI", scanning)) < 0)
@@ -2796,26 +2813,42 @@
         PrintOut(LOG_CRIT,
                  "No memory to copy argument to -d option - exiting\n");
         EXIT(EXIT_NOMEM);
-      } else if (strncmp(s,"3ware,",6)) {
-        badarg=1;
-      } else if (split_report_arg2(s, &i)){
-        PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N requires N integer\n",
-                 configfile, lineno, name);
-        badarg=1;
-      } else if ( i<0 || i>15) {
-        PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N (N=%d) must have 0 <= N <= 15\n",
-                 configfile, lineno, name, i);
-        badarg=1;
-      } else {
-	// determine type of escalade device from name of device
-	cfg->controller_type = guess_device_type(name);
-	if (cfg->controller_type!=CONTROLLER_3WARE_9000_CHAR && cfg->controller_type!=CONTROLLER_3WARE_678K_CHAR)
-	  cfg->controller_type=CONTROLLER_3WARE_678K;
+      } else if (!strncmp(s,"3ware,",6)) {
+          if (split_report_arg2(s, &i)){
+              PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N requires N integer\n",
+               	       configfile, lineno, name);
+              badarg=1;
+          } else if ( i<0 || i>15) {
+              PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N (N=%d) must have 0 <= N <= 15\n",
+                       configfile, lineno, name, i);
+              badarg=1;
+          } else {
+	      // determine type of escalade device from name of device
+	      cfg->controller_type = guess_device_type(name);
+	      if (cfg->controller_type!=CONTROLLER_3WARE_9000_CHAR && cfg->controller_type!=CONTROLLER_3WARE_678K_CHAR)
+	           cfg->controller_type=CONTROLLER_3WARE_678K;
 	    
-        // NOTE: controller_port == disk number + 1
-        cfg->controller_port = i+1;
+              // NOTE: controller_port == disk number + 1
+              cfg->controller_port = i+1;
+          }
+      } else if (!strncmp(s,"cciss,",6)) {
+          if (split_report_arg2(s, &i)){
+              PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d cciss,N requires N integer\n",
+               	       configfile, lineno, name);
+              badarg=1;
+          } else if ( i<0 || i>15) {
+              PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d cciss,N (N=%d) must have 0 <= N <= 15\n",
+                       configfile, lineno, name, i);
+              badarg=1;
+          } else {
+              // NOTE: controller_port == disk number + 1
+              cfg->controller_type = CONTROLLER_CCISS;
+              cfg->controller_port = i+1;
+          }
+      } else {
+          badarg=1;
       }
-      s=CheckFree(s, __LINE__,filenameandversion); 
+      s=CheckFree(s, __LINE__,filenameandversion);
     }
     break;
   case 'F':
@@ -3223,13 +3256,13 @@
     }
   }
   
-  // If we found 3ware controller, then modify device name by adding a SPACE
-  if (cfg->controller_port){
+  // If we found 3ware/cciss controller, then modify device name by adding a SPACE
+  if (cfg->controller_port) {
     int len=17+strlen(cfg->name);
     char *newname;
     
     if (devscan){
-      PrintOut(LOG_CRIT, "smartd: can not scan for 3ware devices (line %d of file %s)\n",
+      PrintOut(LOG_CRIT, "smartd: can not scan for 3ware/cciss devices (line %d of file %s)\n",
                lineno, configfile);
       return -2;
     }
@@ -3240,7 +3273,8 @@
     }
     
     // Make new device name by adding a space then RAID disk number
-    snprintf(newname, len, "%s [3ware_disk_%02d]", cfg->name, cfg->controller_port-1);
+    snprintf(newname, len, "%s [%s_disk_%02d]", cfg->name, (cfg->controller_type == CONTROLLER_CCISS) ? "cciss" : "3ware", 
+		                                cfg->controller_port-1);
     cfg->name=CheckFree(cfg->name, __LINE__,filenameandversion);
     cfg->name=newname;
     bytes+=16;
@@ -3886,7 +3920,7 @@
       continue;
     
     // register ATA devices
-    if (ent->controller_type!=CONTROLLER_SCSI){
+    if (ent->controller_type!=CONTROLLER_SCSI && ent->controller_type!=CONTROLLER_CCISS){
       if (ATADeviceScan(ent, scanning))
         CanNotRegister(ent->name, "ATA", ent->lineno, scanning);
       else {
@@ -3899,7 +3933,8 @@
     }
     
     // then register SCSI devices
-    if (ent->controller_type==CONTROLLER_SCSI || ent->controller_type==CONTROLLER_UNKNOWN){
+    if (ent->controller_type==CONTROLLER_SCSI || ent->controller_type==CONTROLLER_CCISS || 
+        ent->controller_type==CONTROLLER_UNKNOWN){
       int retscsi=0;
 
 #if SCSITIMEOUT
--- smartmontools-5.36/smartd.conf.5.in			2006-04-12 16:03:14.000000000 +0200
+++ smartmontools-5.36/smartd.conf.5.in.cciss		2006-05-10 15:53:35.000000000 +0200
@@ -235,8 +235,8 @@
 .B \-d TYPE
 Specifies the type of the device.  This Directive may be used multiple
 times for one device, but the arguments \fIata\fP, \fIscsi\fP,
-\fImarvell\fP, and \fI3ware,N\fP are mutually-exclusive. If more than
-one is given then \fBsmartd\fP will use the last one which appears.
+\fImarvell\fP, \fIcciss,N\fP and \fI3ware,N\fP are mutually-exclusive. If more
+than one is given then \fBsmartd\fP will use the last one which appears.
 
 If none of these three arguments is given, then \fBsmartd\fP will
 first attempt to guess the device type by looking at whether the sixth
@@ -303,8 +303,14 @@
 6/7/8000 series controllers) or /dev/twa0-15 (3ware 9000 series
 controllers).
 
+.I cciss,N
+\- the device consists of one or more SCSI disks connected to a cciss
+RAID controller. The non-negative integer N (in the range from 0 to 15
+inclusive) denotes which disk on the controller is monitored.  In log
+files and email messages this disk will be identified as cciss_disk_XX
+with XX in the range from 00 to 15 inclusive.
 
-.B 3ware controllers are currently ONLY supported under Linux.
+.B 3ware and cciss controllers are currently ONLY supported under Linux.
 
 .I removable
 \- the device or its media is removable.  This indicates to
--- smartmontools-5.36/utility.h			2006-04-12 16:54:28.000000000 +0200
+++ smartmontools-5.36/utility.h.cciss			2006-05-10 15:53:35.000000000 +0200
@@ -174,6 +174,6 @@
 #define CONTROLLER_3WARE_9000_CHAR      0x05  // set by guess_device_type()
 #define CONTROLLER_3WARE_678K_CHAR      0x06  // set by guess_device_type()
 #define CONTROLLER_MARVELL_SATA         0x07  // SATA drives behind Marvell controllers
-
+#define CONTROLLER_CCISS		0x08  // CCISS controller 
 
 #endif


--- NEW FILE smartmontools.sysconf ---
# command line options for smartd
smartd_opts="-q never"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Oct 2005 09:14:26 -0000	1.3
+++ .cvsignore	8 Jun 2006 13:29:01 -0000	1.4
@@ -1,2 +1 @@
-smartmontools-5.33.tar.gz
-smartmontools-5.33
+smartmontools-5.36.tar.gz


Index: smartd-conf.py
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-5/smartd-conf.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smartd-conf.py	16 Dec 2005 22:17:09 -0000	1.5
+++ smartd-conf.py	8 Jun 2006 13:29:01 -0000	1.6
@@ -2,9 +2,12 @@
 # Copyright 2004 Red Hat, Inc. Distributed under the GPL.
 # Author: Will Woods <wwoods at redhat.com>
 import kudzu
+import os
 drives=kudzu.probe(kudzu.CLASS_HD,kudzu.BUS_IDE|kudzu.BUS_SCSI,kudzu.PROBE_ALL)
 
-print """# /etc/smartd.conf
+print """# *SMARTD*AUTOGENERATED* /etc/smartd.conf
+# Remove the line above if you have edited the file and you do not want
+# it to be overwritten on the next smartd startup.
 
 # Sample configuration file for smartd.  See man 5 smartd.conf.
 # Home page is: http://smartmontools.sourceforge.net
@@ -50,7 +53,12 @@
 	if getfile("/sys/block/%s/device/vendor" % drive.device) == 'ATA':
 	    driver = '-d ata '
 	    if float(getfile("/sys/module/libata/version")) < 1.20:
-		comment = "# not yet supported in this kernel version "
+		comment = "# not yet supported in this kernel version\n# "
+	if not comment:
+	    status = os.system("/usr/sbin/smartctl -i %s/dev/%s 2>&1 >/dev/null" %
+		(driver, drive.device))
+	    if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
+		comment = "# smartctl -i returns error for this drive\n# "
 	print "%s/dev/%s %s-H -m root" % (comment, drive.device, driver)
 
 print """


Index: smartd.initd
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-5/smartd.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smartd.initd	7 Jan 2005 06:02:58 -0000	1.1
+++ smartd.initd	8 Jun 2006 13:29:01 -0000	1.2
@@ -32,8 +32,14 @@
 . /etc/rc.d/init.d/functions
 
 [ -r /etc/sysconfig/smartmontools ] && . /etc/sysconfig/smartmontools
- 
-[ ! -f /etc/smartd.conf ] && smartd-conf.py > /etc/smartd.conf
+
+case "$1" in
+    start | reload | restart)
+GEN_CONF="*SMARTD*AUTOGENERATED*"
+[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
+&& [ $GEN_CONF == "*SMARTD*AUTOGENERATED*" ] && smartd-conf.py >/etc/smartd.conf
+    ;;
+esac
 
     RETVAL=0
     


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-5/smartmontools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smartmontools.spec	11 Feb 2006 05:42:29 -0000	1.15
+++ smartmontools.spec	8 Jun 2006 13:29:01 -0000	1.16
@@ -1,14 +1,18 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.33
-Release: 	4.2
+Version:	5.36
+Release: 	fc5.1
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
 URL:		http://smartmontools.sourceforge.net/
-Source0:	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Source1:	smartd.initd
-Source2:	smartd-conf.py
+Source0:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz.asc
+Source2:	smartd.initd
+Source3:	smartd-conf.py
+Source4:	smartmontools.sysconf
+Patch1:		http://people.fedora.de/rsc/smartmontools-5.36-cciss.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 PreReq:		/sbin/chkconfig /sbin/service
 Requires:	fileutils kudzu
@@ -26,6 +30,7 @@
 
 %prep
 %setup -q
+%patch1 -p 1 -b .cciss
 
 %build
 %configure
@@ -37,8 +42,9 @@
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf
 rm -f examplescripts/Makefile*
-install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd
-install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py
+install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd
+install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py
+install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +59,7 @@
 %{_sysconfdir}/rc.d/init.d/smartd
 %{_mandir}/man?/smart*.*
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/smartd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %preun
 if [ "$1" = "0" ] ; then
@@ -69,6 +76,28 @@
 
 
 %changelog
+* Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-fc5.1
+- rebuild for FC5 update
+
+* Thu May 11 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-1
+- new upstream version
+- included patch with support for cciss controllers (#191288)
+
+* Tue May  2 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.33-8
+- regenerate smartd.conf on every startup if the config file
+  is autogenerated (#190065)
+
+* Fri Mar 24 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.33-7
+- add missing quotes to /etc/sysconfig/smartmontools
+
+* Wed Mar 22 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.33-6
+- test SATA drives correctly
+
+* Wed Mar 22 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.33-5
+- add default /etc/sysconfig/smartmontools file
+- ignore errors on startup (#186130)
+- test drive for SMART support before adding it to smartd.conf
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:5.33-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2005 06:02:58 -0000	1.2
+++ sources	8 Jun 2006 13:29:01 -0000	1.3
@@ -1 +1 @@
-53f6861a916169a88a9edb1848e27dd0  smartmontools-5.33.tar.gz
+2e424f2d35efa38a29ebca419c1dbe3c  smartmontools-5.36.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:33:55 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.134,1.135
Message-ID: <200606081333.k58DXtOU019284@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19229

Modified Files:
	gnome-applets.spec 
Log Message:
Try to catch applets gone missing



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gnome-applets.spec	6 Jun 2006 05:32:45 -0000	1.134
+++ gnome-applets.spec	8 Jun 2006 13:33:52 -0000	1.135
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.14.2
-Release:  	3
+Release:  	4
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -182,7 +182,24 @@
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
 %{_libdir}/libgweather.so*
-%{_libexecdir}/*
+%{_libexecdir}/accessx-status-applet
+%{_libexecdir}/battstat-applet-2
+%{_libexecdir}/charpick_applet2
+%{_libexecdir}/cpufreq-applet
+%{_libexecdir}/drivemount_applet2
+%{_libexecdir}/geyes_applet2
+%{_libexecdir}/gnome-applets
+%{_libexecdir}/gnome-applets/mc-install-default-macros
+%{_libexecdir}/gnome-keyboard-applet
+%{_libexecdir}/gtik2_applet2
+%{_libexecdir}/gweather-applet-2
+%{_libexecdir}/mini_commander_applet
+%{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
+%{_libexecdir}/multiload-applet-2
+%{_libexecdir}/null_applet
+%{_libexecdir}/stickynotes_applet
+%{_libexecdir}/trashapplet
 %{_sbindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/pam.d/*
@@ -197,6 +214,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
+- Explicitly list the applets to be included
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:51:32 -0400
Subject: rpms/xsane/devel xsane.spec,1.33,1.34
Message-ID: <200606081351.k58DpWxq006113@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6063

Modified Files:
	xsane.spec 
Log Message:
add automake, autoconf build requirements



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xsane.spec	8 Jun 2006 08:19:07 -0000	1.33
+++ xsane.spec	8 Jun 2006 13:51:30 -0000	1.34
@@ -13,10 +13,12 @@
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-buildroot
-BuildPrereq: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
+BuildRequires: automake
+BuildRequires: autoconf
 ExcludeArch: s390 s390x
 
 %description
@@ -110,6 +112,7 @@
 * Thu Jun 08 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-5
 - re-add desktop file (#170835)
 - use %%buildroot consistently
+- add automake, autoconf build requirements
 
 * Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-4
 - use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:53:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:53:11 -0400
Subject: rpms/smartmontools/FC-5 smartmontools-5.36.tar.gz.asc,NONE,1.1
Message-ID: <200606081353.k58DrBZt006777@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/smartmontools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6753

Added Files:
	smartmontools-5.36.tar.gz.asc 
Log Message:
* Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-fc5.1
- rebuild for FC5 update



--- NEW FILE smartmontools-5.36.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQBEPTvaIpXYFIQauugRAvZBAJ968y8JxgOnj3GxpCTa7bBi7u3jwwCeM2q9
mGVfsOQ08M0jlcqoaEs/Lhw=
=NsuA
-----END PGP SIGNATURE-----



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:58:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:58:53 -0400
Subject: rpms/python/devel python.spec,1.70,1.71
Message-ID: <200606081358.k58DwrPZ008822@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8793

Modified Files:
	python.spec 
Log Message:
Fix for 193484


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- python.spec	5 Jun 2006 14:48:14 -0000	1.70
+++ python.spec	8 Jun 2006 13:58:50 -0000	1.71
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 4.FC6
+Release: 5.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -31,6 +31,7 @@
 Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 Source7: python-2.3.4-optik.py
+Source8: pydoc
 
 Patch0: python-2.4.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
@@ -294,12 +295,16 @@
 install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
 %endif
 
+# Install pydoc wrapper (bug #193484)
+install -m 0755 %{SOURCE8} %{_bindir}/pydoc
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files -f dynfiles
 %defattr(-, root, root)
 %doc LICENSE README
+%{_bindir}/pydoc
 %{_bindir}/python*
 %{_mandir}/*/*
 %{_libdir}/libpython%{pybasever}.so*
@@ -359,6 +364,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Thu Jun  8 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-5
+- Fixed bug #193484 (added pydoc)
+
 * Mon Jun  5 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-4
 - Added dist in the release
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 13:59:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 09:59:16 -0400
Subject: rpms/python/devel pydoc,NONE,1.1
Message-ID: <200606081359.k58DxGYT009025@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9002

Added Files:
	pydoc 
Log Message:
Added pydoc


--- NEW FILE pydoc ---
#!/usr/bin/env python
#
# Wrapper script around pydoc.cli()

import pydoc

pydoc.cli()



From fedora-cvs-commits at redhat.com  Thu Jun  8 14:02:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 10:02:44 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.135,1.136
Message-ID: <200606081402.k58E2iHG009827@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9803

Modified Files:
	gnome-applets.spec 
Log Message:
Start stocking up on build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gnome-applets.spec	8 Jun 2006 13:33:52 -0000	1.135
+++ gnome-applets.spec	8 Jun 2006 14:02:38 -0000	1.136
@@ -57,6 +57,8 @@
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  which
+BuildRequires:  libtool autoconf gettext
+BuildRequires:  pkgconfig
 
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	libxklavier >= %{libxklavier_version}



From fedora-cvs-commits at redhat.com  Thu Jun  8 14:03:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 10:03:54 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, NONE,
	1.1 modules-targeted.conf, 1.28, 1.29 policy-20060505.patch,
	1.17, 1.18 selinux-policy.spec, 1.202, 1.203
Message-ID: <200606081403.k58E3siV009928@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9904

Modified Files:
	modules-targeted.conf policy-20060505.patch 
	selinux-policy.spec 
Added Files:
	policy-20060608.patch 
Log Message:
* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.44-1
- Update from upstream


policy-20060608.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/consoletype.te      |    7 ++++-
 policy/modules/admin/rpm.te              |    8 ++++-
 policy/modules/apps/webalizer.te         |    1 
 policy/modules/kernel/files.if           |   15 ++++++++++
 policy/modules/kernel/filesystem.te      |    3 +-
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/services/cups.te          |    4 ++
 policy/modules/services/hal.te           |    2 +
 policy/modules/services/mysql.te         |    2 -
 policy/modules/services/ntp.te           |    2 +
 policy/modules/services/pegasus.if       |   31 ++++++++++++++++++++++
 policy/modules/services/pegasus.te       |    5 +--
 policy/modules/services/procmail.te      |    5 +++
 policy/modules/services/pyzor.te         |    4 ++
 policy/modules/services/xfs.te           |    2 +
 policy/modules/system/hostname.te        |    5 ++-
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |    3 ++
 policy/modules/system/logging.fc         |    6 ++--
 policy/modules/system/logging.te         |   10 +++----
 policy/modules/system/unconfined.fc      |    7 ++---
 policy/modules/system/unconfined.if      |   28 ++++++++++++++++++++
 policy/modules/system/unconfined.te      |   13 +++++++--
 policy/modules/system/userdomain.if      |   28 --------------------
 policy/modules/system/userdomain.te      |   43 +++++++++++++++++++++++++++----
 policy/rolemap                           |    1 
 policy/support/misc_macros.spt           |    2 -
 policy/users                             |    6 ++--
 29 files changed, 185 insertions(+), 61 deletions(-)

--- NEW FILE policy-20060608.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.44/config/appconfig-strict-mls/default_type
--- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
+++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 09:43:08.000000000 -0400
@@ -2,3 +2,4 @@
 secadm_r:secadm_t
 staff_r:staff_t
 user_r:user_t
+auditadm_r:auditadm_t
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.44/policy/modules/admin/consoletype.te
--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 09:43:08.000000000 -0400
@@ -8,7 +8,12 @@
 
 type consoletype_t;
 type consoletype_exec_t;
-init_domain(consoletype_t,consoletype_exec_t)
+#dont transition from initrc
+#init_domain(consoletype_t,consoletype_exec_t)
+domain_type(consoletype_t)
+domain_entry_file(consoletype_t,consoletype_exec_t)
+role system_r types consoletype_t;
+
 mls_file_read_up(consoletype_t)
 mls_file_write_down(consoletype_t)
 role system_r types consoletype_t;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.44/policy/modules/admin/rpm.te
--- nsaserefpolicy/policy/modules/admin/rpm.te	2006-06-08 08:45:57.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 09:49:46.000000000 -0400
@@ -341,12 +341,16 @@
 	optional_policy(`
 		mono_domtrans(rpm_script_t)
 	')
-',`
+
 	optional_policy(`
-		bootloader_domtrans(rpm_script_t)
+		unconfined_domtrans(rpm_script_t)
 	')
 ')
 
+optional_policy(`
+	bootloader_domtrans(rpm_script_t)
+')
+
 ifdef(`distro_redhat',`
 	optional_policy(`
 		mta_send_mail(rpm_script_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.44/policy/modules/apps/webalizer.te
--- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-06-08 08:45:57.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 09:43:08.000000000 -0400
@@ -44,6 +44,7 @@
 allow webalizer_t self:unix_dgram_socket sendto;
 allow webalizer_t self:unix_stream_socket connectto;
 allow webalizer_t self:tcp_socket connected_stream_socket_perms;
+allow webalizer_t self:udp_socket { connect connected_socket_perms };
 allow webalizer_t self:netlink_route_socket r_netlink_socket_perms;
 
 allow webalizer_t webalizer_etc_t:file { getattr read };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.44/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-06 22:21:53.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 09:43:08.000000000 -0400
@@ -1913,6 +1913,21 @@
 ')
 
 ########################################
+#
+# files_unlink_boot_flag(domain)
+#
+# /halt, /.autofsck, etc
+#
+interface(`files_unlink_boot_flag',`
+	gen_require(`
+		type root_t;
+	')
+
+	allow $1 root_t:file unlink;
+')
+
+
+########################################
 ## <summary>
 ##	Read files in /etc that are dynamically
 ##	created on boot, such as mtab.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.44/policy/modules/kernel/filesystem.te
--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-08 08:45:57.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 09:43:08.000000000 -0400
@@ -23,7 +23,7 @@
 # Requires that a security xattr handler exist for the filesystem.
 fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
-fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
+fs_use_xattr gfs2 gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0);
 
@@ -174,6 +174,7 @@
 genfscon hfs / gen_context(system_u:object_r:nfs_t,s0)
 genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0)
 genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
+genfscon gfs / gen_context(system_u:object_r:nfs_t,s0)
 
 ########################################
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.44/policy/modules/kernel/kernel.te
--- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-06-06 22:21:53.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 09:43:08.000000000 -0400
@@ -28,6 +28,7 @@
 
 ifdef(`enable_mls',`
 	role secadm_r;
+	role auditadm_r;
 ')
 
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.44/policy/modules/services/cups.te
--- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 09:50:22.000000000 -0400
@@ -655,6 +655,10 @@
 ')
 
 optional_policy(`
+	mount_send_nfs_client_request(hplip_t)
+')
+
+optional_policy(`
 	udev_read_db(hplip_t)
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.44/policy/modules/services/hal.te
--- nsaserefpolicy/policy/modules/services/hal.te	2006-06-06 22:21:54.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 09:47:42.000000000 -0400
@@ -140,6 +140,8 @@
 
 sysnet_read_config(hald_t)
 
+auth_use_nsswitch(hald_t)
+
 userdom_dontaudit_use_unpriv_user_fds(hald_t)
 userdom_dontaudit_search_sysadm_home_dirs(hald_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.44/policy/modules/services/mysql.te
--- nsaserefpolicy/policy/modules/services/mysql.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 09:48:34.000000000 -0400
@@ -101,7 +101,7 @@
 
 miscfiles_read_localization(mysqld_t)
 
-sysnet_use_ldap(mysqld_t)
+auth_use_nsswitch(mysqld_t)
 sysnet_read_config(mysqld_t)
 
 userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.44/policy/modules/services/ntp.te
--- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-06 22:21:55.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 09:48:01.000000000 -0400
@@ -112,6 +112,8 @@
 
 sysnet_read_config(ntpd_t)
 
+auth_use_nsswitch(ntpd_t)
+
 userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
 userdom_list_sysadm_home_dirs(ntpd_t)
 userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.44/policy/modules/services/pegasus.if
--- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 09:43:08.000000000 -0400
@@ -1 +1,32 @@
 ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run pegasus.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed to transition.
+##	</summary>
+## </param>
+#
+interface(`pegasus_domtrans',`
+	gen_require(`
+		type pegasus_t, pegasus_exec_t;
+	')
+
+	ifdef(`targeted_policy',`
+		if(pegasus_disable_trans) {
+			can_exec($1,pegasus_exec_t)
+		} else {
+			domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+		}
+	', `
+		domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+	')
+
+	allow $1 pegasus_t:fd use;
+	allow pegasus_t $1:fd use;
+	allow pegasus_t $1:fifo_file rw_file_perms;
+	allow pegasus_t $1:process sigchld;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.44/policy/modules/services/pegasus.te
--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 09:43:08.000000000 -0400
@@ -100,13 +100,12 @@
 
 auth_use_nsswitch(pegasus_t)
 auth_domtrans_chk_passwd(pegasus_t)
+auth_read_shadow(pegasus_t)
 
 domain_use_interactive_fds(pegasus_t)
 domain_read_all_domains_state(pegasus_t)
 
-files_read_etc_files(pegasus_t)
-files_list_var_lib(pegasus_t)
-files_read_var_lib_files(pegasus_t)
+files_read_all_files(pegasus_t)
 files_read_var_lib_symlinks(pegasus_t)
 
 hostname_exec(pegasus_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.44/policy/modules/services/procmail.te
--- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-06 22:21:55.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 09:43:08.000000000 -0400
@@ -109,3 +109,8 @@
 	spamassassin_exec(procmail_t)
 	spamassassin_exec_client(procmail_t)
 ')
+
+optional_policy(`
+	clamav_domtrans_clamscan(procmail_t)
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.44/policy/modules/services/pyzor.te
--- nsaserefpolicy/policy/modules/services/pyzor.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 09:46:23.000000000 -0400
@@ -126,3 +126,7 @@
 optional_policy(`
 	nscd_socket_use(pyzord_t)
 ')
+
+ifdef(`targeted_policy',`
+	userdom_read_generic_user_home_content_files(pyzord_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.44/policy/modules/services/xfs.te
--- nsaserefpolicy/policy/modules/services/xfs.te	2006-05-19 10:07:51.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 09:47:04.000000000 -0400
@@ -69,6 +69,8 @@
 miscfiles_read_localization(xfs_t)
 miscfiles_read_fonts(xfs_t)
 
+auth_use_nsswitch(xfs_t)
+
 userdom_dontaudit_use_unpriv_user_fds(xfs_t)
 userdom_dontaudit_search_sysadm_home_dirs(xfs_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.44/policy/modules/system/hostname.te
--- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
+++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 09:43:08.000000000 -0400
@@ -8,7 +8,10 @@
 
 type hostname_t;
 type hostname_exec_t;
-init_system_domain(hostname_t,hostname_exec_t)
+
+#dont transition from initrc
+domain_type(hostname_t)
+domain_entry_file(hostname_t,hostname_exec_t)
 role system_r types hostname_t;
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.44/policy/modules/system/init.te
--- nsaserefpolicy/policy/modules/system/init.te	2006-06-06 22:21:56.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 09:43:08.000000000 -0400
@@ -345,6 +345,7 @@
 files_mounton_isid_type_dirs(initrc_t)
 files_list_default(initrc_t)
 files_mounton_default(initrc_t)
+files_unlink_boot_flag(initrc_t)
 
 libs_rw_ld_so_cache(initrc_t)
 libs_use_ld_so(initrc_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.44/policy/modules/system/libraries.fc
--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/libraries.fc	2006-06-08 09:43:08.000000000 -0400
@@ -48,6 +48,9 @@
 /lib32/ld-[^/]*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:ld_so_t,s0)
 ')
 
+/lib/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/lib64/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
 #
 # /opt
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.2.44/policy/modules/system/logging.fc
--- nsaserefpolicy/policy/modules/system/logging.fc	2006-02-02 16:12:27.000000000 -0500
+++ serefpolicy-2.2.44/policy/modules/system/logging.fc	2006-06-08 09:56:16.000000000 -0400
@@ -1,9 +1,6 @@
 
 /dev/log			-s	gen_context(system_u:object_r:devlog_t,s0)
 
-/etc/auditd.conf		--	gen_context(system_u:object_r:auditd_etc_t,s0)
-/etc/audit.rules		--	gen_context(system_u:object_r:auditd_etc_t,s0)
-
 /sbin/auditctl		--	gen_context(system_u:object_r:auditctl_exec_t,s0)
 /sbin/auditd		--	gen_context(system_u:object_r:auditd_exec_t,s0)
 /sbin/klogd		--	gen_context(system_u:object_r:klogd_exec_t,s0)
@@ -39,3 +36,6 @@
 /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
 
 /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
+/etc/audit(/.*)?		gen_context(system_u:object_r:auditd_etc_t,s15:c0.c255)
+
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.44/policy/modules/system/logging.te
--- nsaserefpolicy/policy/modules/system/logging.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 09:58:43.000000000 -0400
@@ -17,7 +17,7 @@
 files_security_file(auditd_etc_t)
 
 type auditd_log_t;
-files_security_file(auditd_log_t)
+fies_security_file(auditd_log_t)
 
 type auditd_t;
 # real declaration moved to mls until
@@ -123,9 +123,8 @@
 files_pid_filetrans(auditd_t,auditd_var_run_t,file)
 
 kernel_read_kernel_sysctls(auditd_t)
-# Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-# Probably want a transition, and a new auditd_helper app
-kernel_read_system_state(auditd_t)
+kernel_list_proc(auditd_t)
+kernel_read_proc_symlinks(auditd_t)
 
 dev_read_sysfs(auditd_t)
 
@@ -134,11 +133,12 @@
 
 term_dontaudit_use_console(auditd_t)
 
+# cjp: why?
 # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
 # Probably want a transition, and a new auditd_helper app
 corecmd_exec_sbin(auditd_t)
 corecmd_exec_bin(auditd_t)
-
+kernel_read_system_state(auditd_t)
 
 domain_use_interactive_fds(auditd_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.44/policy/modules/system/unconfined.fc
--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 09:43:08.000000000 -0400
@@ -4,7 +4,6 @@
 # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
 /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
 
-ifdef(`targeted_policy',`
-/usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-/usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-')
+/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.44/policy/modules/system/unconfined.if
--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 09:43:08.000000000 -0400
@@ -449,3 +449,31 @@
 
 	allow $1 unconfined_t:dbus acquire_svc;
 ')
+
+########################################
+## <summary>
+##	Execute the application that requires dexecmem program in the unconfined_execmem domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`unconfined_execmem_domtrans',`
+	ifdef(`targeted_policy',`
+		gen_require(`
+			type unconfined_execmem_t, unconfined_execmem_exec_t;
+		')
+
+		corecmd_search_bin($1)
+		domain_auto_trans($1, unconfined_execmem_exec_t, unconfined_execmem_t)
+
+		allow $1 unconfined_execmem_t:fd use;
+		allow unconfined_execmem_t $1:fd use;
+		allow unconfined_execmem_t $1:fifo_file rw_file_perms;
+		allow unconfined_execmem_t $1:process sigchld;
+	',`
+		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
+	')
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.44/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 09:43:08.000000000 -0400
@@ -33,8 +33,6 @@
 	allow unconfined_t self:system syslog_read;
 	dontaudit unconfined_t self:capability sys_module;
 
-	domain_auto_trans(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
-
 	files_create_boot_flag(unconfined_t)
 
 	init_domtrans_script(unconfined_t)
@@ -114,6 +112,10 @@
 	')
 
 	optional_policy(`
+		unconfined_execmem_domtrans(unconfined_t)
+	')
+
+	optional_policy(`
 		lpd_domtrans_checkpc(unconfined_t)
 	')
 
@@ -180,11 +182,16 @@
 	optional_policy(`
 		xserver_domtrans_xdm_xserver(unconfined_t)
 	')
+
+	optional_policy(`
+		pegasus_domtrans(unconfined_t)
+	')
+
 ')
 
 ########################################
 #
-# Unconfined Execmem Local policy
+# Local policy
 #
 
 ifdef(`targeted_policy',`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.44/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-06 22:21:56.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/userdomain.if	2006-06-08 10:02:36.000000000 -0400
@@ -474,34 +474,6 @@
 		xserver_create_xdm_tmp_sockets($1_t)
 	')
 
-	ifdef(`TODO',`
-	#
-	# Cups daemon running as user tries to write /etc/printcap
-	#
-	dontaudit $1_t usr_t:file setattr;
-
-	# /initrd is left mounted, various programs try to look at it
-	dontaudit $1_t ramfs_t:dir getattr;
-
-	#
-	# Running ifconfig as a user generates the following
-	#
-	dontaudit $1_t sysctl_net_t:dir search;
-
-	r_dir_file($1_t, usercanread)
-
-	# old browser_domain():
-	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir_file_class_set getattr;
-	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir search;
-	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir read;
-
-	allow $1_t usbtty_device_t:chr_file read;
-
-	ifdef(`xdm.te', `
-		allow $1_t xdm_var_lib_t:file r_file_perms;
-	')
-	') dnl endif TODO
-
 ')
 
 #######################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.44/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 09:43:08.000000000 -0400
@@ -1,11 +1,12 @@
 
-policy_module(userdomain,1.3.27)
+policy_module(userdomain,1.3.26)
 
 gen_require(`
 	role sysadm_r, staff_r, user_r;
 
 	ifdef(`enable_mls',`
 		role secadm_r;
+		role auditadm_r;
 	')
 ')
 
@@ -67,6 +68,7 @@
 	# Define some type aliases to help with compatibility with
 	# macros and domains from the "strict" policy.
 	unconfined_alias_domain(secadm_t)
+	unconfined_alias_domain(auditadm_t)
 	unconfined_alias_domain(sysadm_t)
 
 	# User home directory type.
@@ -82,6 +84,7 @@
 
 	# compatibility for switching from strict
 #	dominance { role secadm_r { role system_r; }}
+#	dominance { role auditadm_r { role system_r; }}
 #	dominance { role sysadm_r { role system_r; }}
 #	dominance { role user_r { role system_r; }}
 #	dominance { role staff_r { role system_r; }}
@@ -105,8 +108,10 @@
 
 	ifdef(`enable_mls',`
 		allow secadm_r system_r;
+		allow auditadm_r system_r;
 		allow secadm_r user_r;
 		allow staff_r secadm_r;
+		allow staff_r auditadm_r;
 	')
 
 	optional_policy(`
@@ -126,9 +131,21 @@
 	role_change(staff, sysadm)
 
 	ifdef(`enable_mls',`
-		admin_user_template(secadm)
+#		admin_user_template(secadm)
+#		admin_user_template(auditadm)
+		unpriv_user_template(secadm)
+		unpriv_user_template(auditadm)
+
+		role_change(staff,auditadm)
 		role_change(staff,secadm)
+
 		role_change(sysadm,secadm)
+		role_change(sysadm,auditadm)
+
+		role_change(auditadm,secadm)
+		role_change(auditadm,sysadm)
+
+		role_change(secadm,auditadm)
 		role_change(secadm,sysadm)
 	')
 
@@ -172,19 +189,33 @@
 	')
 
 	ifdef(`enable_mls',`
+		allow secadm_t self:capability dac_override;
 		corecmd_exec_shell(secadm_t)
 		mls_process_read_up(secadm_t)
+		mls_file_read_up(secadm_t)
 		mls_file_write_down(secadm_t)
 		mls_file_upgrade(secadm_t)
 		mls_file_downgrade(secadm_t)
 		init_exec(secadm_t)
 		logging_read_audit_log(secadm_t)
-		logging_run_auditctl(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
 		userdom_dontaudit_append_staff_home_content_files(secadm_t)
-		files_relabel_all_files(secadm_t)
+	        auth_relabel_all_files_except_shadow(secadm_t)
 		auth_relabel_shadow(secadm_t)
+		domain_obj_id_change_exemption(secadm_t)
+	        logging_read_generic_logs(secadm_t)
+
+		seutil_run_runinit(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t })
+		domain_kill_all_domains(auditadm_t)
+	        seutil_read_bin_policy(auditadm_t)
+		corecmd_exec_shell(auditadm_t)
+	        logging_read_generic_logs(auditadm_t)
+		logging_manage_audit_log(auditadm_t)
+		logging_manage_audit_config(auditadm_t)
+		logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t })
+		logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t })
 	', `
-		logging_read_audit_log(sysadm_t)
+		logging_manage_audit_log(sysadm_t)
+		logging_manage_audit_config(sysadm_t)
 		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
 	')
 
@@ -252,6 +283,7 @@
 
 		ifdef(`enable_mls',`
 			consoletype_exec(secadm_t)
+			consoletype_exec(auditadm_t)
 		')
 	')
 
@@ -270,6 +302,7 @@
 
 		ifdef(`enable_mls',`
 			dmesg_exec(secadm_t)
+			dmesg_exec(auditadm_t)
 		')
 	')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.44/policy/rolemap
--- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
+++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 09:43:08.000000000 -0400
@@ -15,5 +15,6 @@
 
 	ifdef(`enable_mls',`
 		secadm_r secadm secadm_t
+		auditadm_r auditadm auditadm_t
 	')
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.44/policy/support/misc_macros.spt
--- nsaserefpolicy/policy/support/misc_macros.spt	2006-05-19 10:07:51.000000000 -0400
+++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 09:43:08.000000000 -0400
@@ -37,7 +37,7 @@
 #
 # gen_context(context,mls_sensitivity,[mcs_categories])
 #
-define(`gen_context',`$1`'ifdef(`enable_mls',`:$2')`'ifdef(`enable_mcs',`:s0`'ifelse(`$3',,,`:$3')')')dnl
+define(`gen_context',`$1`'ifdef(`enable_mls',`:$2')`'ifdef(`enable_mcs',`:s0`'ifelse(`$3',,,`:$3')')') dnl
 
 ########################################
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.44/policy/users
--- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
+++ serefpolicy-2.2.44/policy/users	2006-06-08 09:43:08.000000000 -0400
@@ -29,7 +29,7 @@
 gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
 ',`
 gen_user(user_u, user, user_r, s0, s0)
-gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
+gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
 gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - s15:c0.c255, c0.c255)
 ')
 
@@ -44,8 +44,8 @@
 	gen_user(root, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
 ',`
 	ifdef(`direct_sysadm_daemon',`
-		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
+		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
 	',`
-		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
+		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
 	')
 ')


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- modules-targeted.conf	6 Jun 2006 21:33:13 -0000	1.28
+++ modules-targeted.conf	8 Jun 2006 14:03:38 -0000	1.29
@@ -1064,6 +1064,20 @@
 # 
 clamav = module
 
+# Layer: services
+# Module: razor
+#
+# A distributed, collaborative, spam detection and filtering network.
+# 
+razor = module
+
+# Layer: services
+# Module: dcc
+#
+# A distributed, collaborative, spam detection and filtering network.
+# 
+dcc = module
+
 # Layer: system
 # Module: setrans
 # Required in base

policy-20060505.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/consoletype.te      |    7 ++++-
 policy/modules/admin/rpm.te              |    8 ++++-
 policy/modules/apps/webalizer.te         |    1 
 policy/modules/kernel/files.if           |   15 ++++++++++
 policy/modules/kernel/filesystem.te      |    3 +-
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/services/cups.te          |    8 ++++-
 policy/modules/services/hal.te           |    2 +
 policy/modules/services/mysql.te         |    2 -
 policy/modules/services/ntp.te           |    2 +
 policy/modules/services/pegasus.if       |   31 ++++++++++++++++++++++
 policy/modules/services/pegasus.te       |    5 +--
 policy/modules/services/procmail.te      |    5 +++
 policy/modules/services/pyzor.te         |    4 ++
 policy/modules/services/xfs.te           |    2 +
 policy/modules/system/hostname.te        |    5 ++-
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |    3 ++
 policy/modules/system/logging.te         |   12 +++++---
 policy/modules/system/unconfined.fc      |    7 ++---
 policy/modules/system/unconfined.if      |   28 ++++++++++++++++++++
 policy/modules/system/unconfined.te      |   13 +++++++--
 policy/modules/system/userdomain.te      |   43 +++++++++++++++++++++++++++----
 policy/rolemap                           |    1 
 policy/support/misc_macros.spt           |    2 -
 policy/users                             |    6 ++--
 27 files changed, 187 insertions(+), 31 deletions(-)

Index: policy-20060505.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060505.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policy-20060505.patch	6 Jun 2006 21:33:13 -0000	1.17
+++ policy-20060505.patch	8 Jun 2006 14:03:38 -0000	1.18
@@ -1,47 +1,14 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.43/config/appconfig-strict-mls/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.44/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.43/config/appconfig-strict-mls/default_type	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 09:43:08.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
  user_r:user_t
 +auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.43/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/global_tunables	2006-05-26 14:03:15.000000000 -0400
-@@ -58,6 +58,22 @@
- 
- ## <desc>
- ## <p>
-+## Allow ftp servers to use nfs
-+## used for public file transfer services.
-+## </p>
-+## </desc>
-+gen_tunable(allow_ftpd_use_nfs,false)
-+
-+## <desc>
-+## <p>
-+## Allow ftp servers to use cifs
-+## used for public file transfer services.
-+## </p>
-+## </desc>
-+gen_tunable(allow_ftpd_use_cifs,false)
-+
-+## <desc>
-+## <p>
- ## Allow gssd to read temp directory.
- ## </p>
- ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.43/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.44/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/admin/consoletype.te	2006-05-26 14:03:15.000000000 -0400
-@@ -1,5 +1,5 @@
- 
--policy_module(consoletype,1.0.1)
-+policy_module(consoletype,1.0.0)
- 
- ########################################
- #
++++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 09:43:08.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -56,109 +23,43 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.43/policy/modules/admin/rpm.if
---- nsaserefpolicy/policy/modules/admin/rpm.if	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/admin/rpm.if	2006-06-06 11:10:50.000000000 -0400
-@@ -237,3 +237,23 @@
- 	dontaudit $1 rpm_var_lib_t:file create_file_perms;
- 	dontaudit $1 rpm_var_lib_t:lnk_file create_lnk_perms;
- ')
-+
-+########################################
-+## <summary>
-+##	Execute the rpm client in the caller domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`rpm_exec',`
-+	gen_require(`
-+		type rpm_exec_t;
-+	')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.44/policy/modules/admin/rpm.te
+--- nsaserefpolicy/policy/modules/admin/rpm.te	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 09:49:46.000000000 -0400
+@@ -341,12 +341,16 @@
+ 	optional_policy(`
+ 		mono_domtrans(rpm_script_t)
+ 	')
+-',`
 +
-+	corecmd_search_bin($1)
-+	can_exec($1,rpm_exec_t)
+ 	optional_policy(`
+-		bootloader_domtrans(rpm_script_t)
++		unconfined_domtrans(rpm_script_t)
+ 	')
+ ')
+ 
++optional_policy(`
++	bootloader_domtrans(rpm_script_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.43/policy/modules/admin/rpm.te
---- nsaserefpolicy/policy/modules/admin/rpm.te	2006-04-19 17:43:32.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/admin/rpm.te	2006-05-26 14:03:15.000000000 -0400
-@@ -334,6 +334,15 @@
- 
- ifdef(`targeted_policy',`
- 	unconfined_domain(rpm_script_t)
-+	optional_policy(`
-+		java_domtrans(rpm_script_t)
-+	')
-+	optional_policy(`
-+		mono_domtrans(rpm_script_t)
-+	')
-+	optional_policy(`
-+		unconfined_execmem_domtrans(rpm_script_t)
-+	')
- ',`
+ ifdef(`distro_redhat',`
  	optional_policy(`
- 		bootloader_domtrans(rpm_script_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.43/policy/modules/apps/webalizer.te
---- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-03-24 11:15:44.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/apps/webalizer.te	2006-05-26 14:03:15.000000000 -0400
-@@ -45,6 +45,7 @@
+ 		mta_send_mail(rpm_script_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.44/policy/modules/apps/webalizer.te
+--- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 09:43:08.000000000 -0400
+@@ -44,6 +44,7 @@
+ allow webalizer_t self:unix_dgram_socket sendto;
  allow webalizer_t self:unix_stream_socket connectto;
  allow webalizer_t self:tcp_socket connected_stream_socket_perms;
- allow webalizer_t self:udp_socket { connect connected_socket_perms };
-+allow webalizer_t self:netlink_route_socket r_netlink_socket_perms;
++allow webalizer_t self:udp_socket { connect connected_socket_perms };
+ allow webalizer_t self:netlink_route_socket r_netlink_socket_perms;
  
  allow webalizer_t webalizer_etc_t:file { getattr read };
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.2.43/policy/modules/apps/wine.fc
---- nsaserefpolicy/policy/modules/apps/wine.fc	2006-01-19 18:02:04.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/apps/wine.fc	2006-05-28 06:42:33.000000000 -0400
-@@ -1 +1,2 @@
- /usr/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
-+/opt/picasa/wine/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.43/policy/modules/apps/wine.te
---- nsaserefpolicy/policy/modules/apps/wine.te	2006-03-07 10:31:08.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/apps/wine.te	2006-05-28 07:09:11.000000000 -0400
-@@ -22,4 +22,9 @@
- 	unconfined_domain_noaudit(wine_t)
- 	role system_r types wine_t;
- 	allow wine_t file_type:file execmod;
-+
-+	optional_policy(`
-+		hal_dbus_chat(wine_t)
-+	')
-+
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.43/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/kernel/corecommands.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -120,11 +120,6 @@
- /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
- /usr/lib/qt.*/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
--# these two lines are separate because of a
--# sorting issue with the java module
--/usr/lib/jvm/java.*/bin -d		gen_context(system_u:object_r:bin_t,s0)
--/usr/lib/jvm/java.*/bin/.*		gen_context(system_u:object_r:bin_t,s0)
--
- /usr/lib(64)?/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/apt/methods.+	--	gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/courier(/.*)?		gen_context(system_u:object_r:bin_t,s0)
-@@ -135,6 +130,7 @@
- /usr/lib(64)?/emacsen-common/.*		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/ipsec/.*		--	gen_context(system_u:object_r:sbin_t,s0)
- /usr/lib(64)?/mailman/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
-+/usr/lib(64)?/mailman/mail(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/misc/sftp-server	--	gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/nagios/plugins(/.*)?	gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/netsaint/plugins(/.*)?	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.43/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-05-12 09:22:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/kernel/files.if	2006-06-06 11:06:54.000000000 -0400
-@@ -1882,6 +1882,21 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.44/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 09:43:08.000000000 -0400
+@@ -1913,6 +1913,21 @@
  ')
  
  ########################################
@@ -180,46 +81,29 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.43/policy/modules/kernel/filesystem.if
---- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-05-12 09:22:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/kernel/filesystem.if	2006-05-26 14:03:15.000000000 -0400
-@@ -434,6 +434,26 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.44/policy/modules/kernel/filesystem.te
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 09:43:08.000000000 -0400
+@@ -23,7 +23,7 @@
+ # Requires that a security xattr handler exist for the filesystem.
+ fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
+-fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
++fs_use_xattr gfs2 gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0);
+ 
+@@ -174,6 +174,7 @@
+ genfscon hfs / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
++genfscon gfs / gen_context(system_u:object_r:nfs_t,s0)
  
  ########################################
- ## <summary>
-+##	Read directories of binary file types.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`fs_getattr_binfmt_misc_dirs',`
-+	gen_require(`
-+		type binfmt_misc_t;
-+	')
-+
-+	allow $1 binfmt_misc_t:dir getattr;
-+
-+')
-+
-+
-+########################################
-+## <summary>
- ##	Mount a CIFS or SMB network filesystem.
- ## </summary>
- ## <param name="domain">
-@@ -3240,3 +3260,6 @@
- 	allow $1 noxattrfs:blk_file { getattr relabelfrom };
- 	allow $1 noxattrfs:chr_file { getattr relabelfrom };
- ')
-+
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.43/policy/modules/kernel/kernel.te
---- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/kernel/kernel.te	2006-06-06 15:30:41.000000000 -0400
+ #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.44/policy/modules/kernel/kernel.te
+--- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 09:43:08.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -228,432 +112,66 @@
  ')
  
  #
-@@ -50,6 +51,15 @@
- genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
- 
- #
-+# Oprofilefs
-+#
-+
-+type oprofilefs_t;
-+fs_type(oprofilefs_t)
-+allow oprofilefs_t self:filesystem associate;
-+genfscon oprofilefs / gen_context(system_u:object_r:oprofilefs_t,s0)
-+
-+#
- # Procfs types
- #
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.fc serefpolicy-2.2.43/policy/modules/services/amavis.fc
---- nsaserefpolicy/policy/modules/services/amavis.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/amavis.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -7,6 +7,6 @@
- /var/amavis(/.*)?			gen_context(system_u:object_r:amavis_var_lib_t,s0)
- /var/lib/amavis(/.*)?			gen_context(system_u:object_r:amavis_var_lib_t,s0)
- /var/log/amavisd\.log		--	gen_context(system_u:object_r:amavis_var_log_t,s0)
--/var/run/amavis(/.*)?			gen_context(system_u:object_r:amavis_var_run_t,s0)
-+/var/run/amavis(d)?(/.*)?		gen_context(system_u:object_r:amavis_var_run_t,s0)
- /var/spool/amavisd(/.*)?		gen_context(system_u:object_r:amavis_spool_t,s0)
- /var/virusmails(/.*)?			gen_context(system_u:object_r:amavis_quarantine_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-2.2.43/policy/modules/services/amavis.if
---- nsaserefpolicy/policy/modules/services/amavis.if	2006-03-07 16:19:28.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/services/amavis.if	2006-05-26 14:03:15.000000000 -0400
-@@ -104,3 +104,65 @@
- 	allow $1 amavis_var_run_t:file setattr;
- 	files_search_pids($1)
- ')
-+
-+########################################
-+## <summary>
-+##	Create socket files under the amavis spool
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+## <param name="socket_type">
-+##	<summary>
-+##	Type for socket file
-+##	</summary>
-+## </param>
-+#
-+interface(`amavis_spool_create_socket',`
-+	gen_require(`
-+		type amavis_spool_t;
-+	')
-+
-+	allow $1 amavis_spool_t:dir rw_dir_perms;
-+	allow $1 $2:sock_file manage_file_perms;
-+	type_transition $1 amavis_spool_t:sock_file $2;
-+')
-+
-+########################################
-+## <summary>
-+##	Read amavis spool files
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`amavis_read_spool_file',`
-+	gen_require(`
-+		type amavis_spool_t;
-+	')
-+
-+	allow $1 amavis_spool_t:file { getattr read };
-+')
-+
-+########################################
-+## <summary>
-+##	Manage amavis spool files
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`amavis_manage_spool_files',`
-+	gen_require(`
-+		type amavis_spool_t;
-+	')
-+	files_search_spool($1)
-+	allow $1 amavis_spool_t:dir create_dir_perms;
-+	allow $1 amavis_spool_t:file create_file_perms;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.2.43/policy/modules/services/amavis.te
---- nsaserefpolicy/policy/modules/services/amavis.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/amavis.te	2006-05-26 14:03:15.000000000 -0400
-@@ -64,6 +64,7 @@
- # Spool Files
- allow amavis_t amavis_spool_t:dir manage_dir_perms;
- allow amavis_t amavis_spool_t:file manage_file_perms;
-+allow amavis_t amavis_spool_t:sock_file create_file_perms;
- files_spool_filetrans(amavis_t,amavis_spool_t,{ dir file })
- 
- # tmp files
-@@ -93,13 +94,21 @@
- kernel_read_kernel_sysctls(amavis_t)
- # amavis tries to access /proc/self/stat, /etc/shadow and /root - perl...
- kernel_dontaudit_list_proc(amavis_t)
-+kernel_dontaudit_read_proc_symlinks(amavis_t)
- kernel_dontaudit_read_system_state(amavis_t)
- 
-+# dontaudit terminal access
-+ifdef(`targeted_policy',`
-+	term_dontaudit_use_generic_ptys(amavis_t)
-+')
-+
- # find perl
- corecmd_exec_bin(amavis_t)
- corecmd_search_sbin(amavis_t)
- 
- corenet_non_ipsec_sendrecv(amavis_t)
-+corenet_tcp_bind_all_nodes(amavis_t)
-+corenet_udp_bind_all_nodes(amavis_t)
- corenet_tcp_sendrecv_all_if(amavis_t)
- corenet_tcp_sendrecv_all_nodes(amavis_t)
- # amavis uses well-defined ports
-@@ -111,6 +120,7 @@
- corenet_tcp_connect_amavisd_send_port(amavis_t)
- # bind to incoming port
- corenet_tcp_bind_amavisd_recv_port(amavis_t)
-+corenet_udp_bind_generic_port(amavis_t)
- 
- dev_read_rand(amavis_t)
- dev_read_urand(amavis_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.43/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2006-05-12 16:31:53.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/apache.if	2006-05-27 08:04:08.000000000 -0400
-@@ -115,6 +115,7 @@
- 	seutil_dontaudit_search_config(httpd_$1_script_t)
- 
- 	tunable_policy(`httpd_enable_cgi && httpd_unified',`
-+		allow httpd_$1_script_t httpdcontent:file entrypoint;
- 		allow httpd_$1_script_t httpdcontent:dir create_dir_perms;
- 		allow httpd_$1_script_t httpdcontent:file create_file_perms;
- 		allow httpd_$1_script_t httpdcontent:lnk_file create_lnk_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.43/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/bluetooth.te	2006-05-26 14:03:15.000000000 -0400
-@@ -129,6 +129,8 @@
- 
- logging_send_syslog_msg(bluetooth_t)
- 
-+locallogin_dontaudit_use_fds(bluetooth_helper_t)
-+
- miscfiles_read_localization(bluetooth_t)
- miscfiles_read_fonts(bluetooth_t)
- 
-@@ -225,6 +227,9 @@
- 		xserver_stream_connect_xdm(bluetooth_helper_t)
- 		xserver_use_xdm_fds(bluetooth_helper_t)
- 		xserver_rw_xdm_pipes(bluetooth_helper_t)
-+		# when started via startx 
-+		xserver_stream_connect(bluetooth_helper_t)
-+		xserver_write_xdm_xserver_tmp_sockets(bluetooth_helper_t)
- 	')
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.2.43/policy/modules/services/clamav.te
---- nsaserefpolicy/policy/modules/services/clamav.te	2006-05-17 16:57:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/clamav.te	2006-05-26 14:03:15.000000000 -0400
-@@ -39,6 +39,10 @@
- type clamscan_exec_t;
- init_daemon_domain(clamscan_t, clamscan_exec_t)
- 
-+# tmp files
-+type clamscan_tmp_t;
-+files_tmp_file(clamscan_tmp_t)
-+
- type freshclam_t;
- type freshclam_exec_t;
- init_daemon_domain(freshclam_t, freshclam_exec_t)
-@@ -63,6 +67,13 @@
- allow clamd_t clamd_etc_t:file r_file_perms;
- allow clamd_t clamd_etc_t:lnk_file { getattr read };
- 
-+# Spool Files
-+files_search_spool(clamd_t)
-+optional_policy(`
-+	amavis_spool_create_socket(clamd_t, clamd_var_run_t)
-+	amavis_read_spool_file(clamd_t)
-+')
-+
- # socket file
- allow clamd_t clamd_sock_t:file manage_file_perms;
- allow clamd_t clamd_sock_t:sock_file manage_file_perms;
-@@ -86,6 +97,7 @@
- allow clamd_t clamd_var_log_t:sock_file create_file_perms;
- allow clamd_t clamd_var_log_t:dir { rw_dir_perms setattr };
- logging_log_filetrans(clamd_t,clamd_var_log_t,file)
-+logging_send_syslog_msg(clamd_t)
- 
- # pid file
- allow clamd_t clamd_var_run_t:file manage_file_perms;
-@@ -94,6 +106,10 @@
- files_pid_filetrans(clamd_t,clamd_var_run_t,file)
- 
- kernel_dontaudit_list_proc(clamd_t)
-+# dontaudit terminal access
-+ifdef(`targeted_policy',`
-+	term_dontaudit_use_generic_ptys(clamd_t)
-+')
- 
- corenet_non_ipsec_sendrecv(clamd_t)
- corenet_tcp_sendrecv_all_if(clamd_t)
-@@ -217,6 +233,11 @@
- allow clamscan_t clamd_var_lib_t:sock_file rw_file_perms;
- allow clamscan_t clamd_var_lib_t:dir r_dir_perms;
- 
-+# tmp files
-+allow clamscan_t clamscan_tmp_t:file create_file_perms;
-+allow clamscan_t clamscan_tmp_t:dir create_dir_perms;
-+files_tmp_filetrans(clamscan_t,clamscan_tmp_t,{ file dir })
-+
- kernel_read_kernel_sysctls(clamscan_t)
- 
- files_read_etc_files(clamscan_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.43/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/cups.te	2006-05-28 10:28:11.000000000 -0400
-@@ -74,14 +74,14 @@
- #
- 
- # /usr/lib/cups/backend/serial needs sys_admin(?!)
--allow cupsd_t self:capability { sys_admin dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_tty_config audit_write };
-+allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_tty_config audit_write };
- dontaudit cupsd_t self:capability { sys_tty_config net_admin };
- allow cupsd_t self:process { setsched signal_perms };
- allow cupsd_t self:fifo_file rw_file_perms;
- allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
- allow cupsd_t self:unix_dgram_socket create_socket_perms;
- allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
--allow cupsd_t self:netlink_route_socket { r_netlink_socket_perms };
-+allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
- allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
- allow cupsd_t self:udp_socket create_socket_perms;
- allow cupsd_t self:appletalk_socket create_socket_perms;
-@@ -565,6 +565,7 @@
- allow hplip_t self:unix_stream_socket create_socket_perms;
- allow hplip_t self:tcp_socket create_stream_socket_perms;
- allow hplip_t self:udp_socket create_socket_perms;
-+allow hplip_t self:netlink_route_socket r_netlink_socket_perms;
- # cjp: raw?
- allow hplip_t self:rawip_socket create_socket_perms;
- 
-@@ -645,6 +646,10 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.44/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 09:43:08.000000000 -0400
+@@ -647,11 +647,15 @@
  ')
  
  optional_policy(`
+-	seutil_sigchld_newrole(hplip_t)
 +	snmp_read_snmp_var_lib_files(hplip_t)
-+')
-+
-+optional_policy(`
- 	mount_send_nfs_client_request(hplip_t)
  ')
  
-@@ -658,6 +663,7 @@
- 
- allow hplip_t devpts_t:dir search;
- allow hplip_t devpts_t:chr_file { getattr ioctl };
-+userdom_dontaudit_search_all_users_home_content(hplip_t)
- 
- ########################################
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.43/policy/modules/services/cvs.te
---- nsaserefpolicy/policy/modules/services/cvs.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/services/cvs.te	2006-05-26 14:03:15.000000000 -0400
-@@ -8,6 +8,7 @@
- 
- type cvs_t;
- type cvs_exec_t;
-+corecmd_executable_file(cvs_exec_t)
- inetd_tcp_service_domain(cvs_t,cvs_exec_t)
- role system_r types cvs_t;
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.43/policy/modules/services/dbus.te
---- nsaserefpolicy/policy/modules/services/dbus.te	2006-04-12 12:59:10.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/dbus.te	2006-05-27 07:39:54.000000000 -0400
-@@ -38,6 +38,7 @@
- allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
- allow system_dbusd_t self:unix_dgram_socket create_socket_perms;
- allow system_dbusd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
-+allow system_dbusd_t self:netlink_route_socket r_netlink_socket_perms;
- # Receive notifications of policy reloads and enforcing status changes.
- allow system_dbusd_t self:netlink_selinux_socket { create bind read };
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.2.43/policy/modules/services/dovecot.te
---- nsaserefpolicy/policy/modules/services/dovecot.te	2006-05-17 16:57:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/dovecot.te	2006-05-27 07:42:52.000000000 -0400
-@@ -42,6 +42,7 @@
- allow dovecot_t self:tcp_socket create_stream_socket_perms;
- allow dovecot_t self:unix_dgram_socket create_socket_perms;
- allow dovecot_t self:unix_stream_socket { create_stream_socket_perms connectto };
-+allow dovecot_t self:netlink_route_socket r_netlink_socket_perms;
- 
- domain_auto_trans(dovecot_t, dovecot_auth_exec_t, dovecot_auth_t)
- allow dovecot_t dovecot_auth_t:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.43/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-05-17 16:57:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/ftp.te	2006-05-26 14:03:15.000000000 -0400
-@@ -162,15 +162,35 @@
- ')
- 
- tunable_policy(`use_nfs_home_dirs && ftp_home_dir',`
-+	fs_manage_nfs_files(ftpd_t)
-+	fs_read_nfs_symlinks(ftpd_t)
-+')
-+
-+tunable_policy(`allow_ftpd_use_cifs',`
- 	fs_read_nfs_files(ftpd_t)
- 	fs_read_nfs_symlinks(ftpd_t)
- ')
- 
-+tunable_policy(`allow_ftpd_use_nfs && allow_ftpd_anon_write',`
-+	fs_manage_nfs_files(ftpd_t)
-+	fs_read_nfs_symlinks(ftpd_t)
-+')
-+
- tunable_policy(`use_samba_home_dirs && ftp_home_dir',`
-+	fs_manage_cifs_files(ftpd_t)
-+	fs_read_cifs_symlinks(ftpd_t)
+ optional_policy(`
+-	snmp_read_snmp_var_lib_files(hplip_t)
++	mount_send_nfs_client_request(hplip_t)
 +')
 +
-+tunable_policy(`allow_ftpd_use_cifs',`
- 	fs_read_cifs_files(ftpd_t)
- 	fs_read_cifs_symlinks(ftpd_t)
++optional_policy(`
++	seutil_sigchld_newrole(hplip_t)
  ')
  
-+tunable_policy(`allow_ftpd_use_cifs && allow_ftpd_anon_write',`
-+	fs_manage_cifs_files(ftpd_t)
-+	fs_read_cifs_symlinks(ftpd_t)
-+')
-+
  optional_policy(`
- 	corecmd_exec_shell(ftpd_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.43/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/hal.te	2006-06-06 11:58:26.000000000 -0400
-@@ -144,6 +144,10 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.44/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-06-06 22:21:54.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 09:47:42.000000000 -0400
+@@ -140,6 +140,8 @@
  
  sysnet_read_config(hald_t)
  
-+# needed for nss_ldap
-+sysnet_use_ldap(hald_t)
-+miscfiles_read_certs(hald_t)
++auth_use_nsswitch(hald_t)
 +
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_sysadm_home_dirs(hald_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-2.2.43/policy/modules/services/ldap.fc
---- nsaserefpolicy/policy/modules/services/ldap.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/ldap.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -8,3 +8,4 @@
- 
- /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
- /var/run/slapd\.pid	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
-+/var/run/openldap(/.*)?		gen_context(system_u:object_r:slapd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.43/policy/modules/services/mysql.te
---- nsaserefpolicy/policy/modules/services/mysql.te	2006-04-12 12:59:10.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/mysql.te	2006-05-26 14:03:15.000000000 -0400
-@@ -33,6 +33,7 @@
- allow mysqld_t self:capability { dac_override setgid setuid sys_resource net_bind_service };
- dontaudit mysqld_t self:capability sys_tty_config;
- allow mysqld_t self:process { setsched getsched setrlimit signal_perms };
-+allow mysqld_t self:process { setsched getsched setrlimit signal_perms rlimitinh };
- allow mysqld_t self:fifo_file { read write };
- allow mysqld_t self:netlink_route_socket r_netlink_socket_perms;
- allow mysqld_t self:unix_stream_socket create_stream_socket_perms;
-@@ -103,6 +104,7 @@
- logging_send_syslog_msg(mysqld_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.44/policy/modules/services/mysql.te
+--- nsaserefpolicy/policy/modules/services/mysql.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 09:48:34.000000000 -0400
+@@ -101,7 +101,7 @@
  
  miscfiles_read_localization(mysqld_t)
-+miscfiles_read_certs(mysqld_t)
  
- sysnet_use_ldap(mysqld_t)
+-sysnet_use_ldap(mysqld_t)
++auth_use_nsswitch(mysqld_t)
  sysnet_read_config(mysqld_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.43/policy/modules/services/networkmanager.fc
---- nsaserefpolicy/policy/modules/services/networkmanager.fc	2006-02-06 17:51:14.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/services/networkmanager.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -2,3 +2,4 @@
- /usr/(s)?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
- /var/run/NetworkManager.pid	--	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
- /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-+/var/run/NetworkManager(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.2.43/policy/modules/services/nscd.te
---- nsaserefpolicy/policy/modules/services/nscd.te	2006-04-12 12:59:10.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/nscd.te	2006-05-26 14:03:15.000000000 -0400
-@@ -133,3 +133,8 @@
- optional_policy(`
- 	udev_read_db(nscd_t)
- ')
-+
-+optional_policy(`
-+	xen_dontaudit_rw_unix_stream_sockets(nscd_t)
-+	xen_append_log(nscd_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.43/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/ntp.te	2006-05-27 07:43:26.000000000 -0400
-@@ -112,6 +112,10 @@
+ 
+ userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.44/policy/modules/services/ntp.te
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-06 22:21:55.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 09:48:01.000000000 -0400
+@@ -112,6 +112,8 @@
  
  sysnet_read_config(ntpd_t)
  
-+# nss_ldap
-+sysnet_use_ldap(ntpd_t)
-+miscfiles_read_certs(ntpd_t)
++auth_use_nsswitch(ntpd_t)
 +
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.43/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.44/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/pegasus.if	2006-06-06 10:37:18.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 09:43:08.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -687,35 +205,10 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.43/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-26 11:23:32.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/pegasus.te	2006-06-06 11:11:18.000000000 -0400
-@@ -30,7 +30,7 @@
- # Local policy
- #
- 
--allow pegasus_t self:capability { dac_override net_bind_service audit_write }; 
-+allow pegasus_t self:capability { chown sys_nice setuid setgid dac_override net_bind_service audit_write }; 
- dontaudit pegasus_t self:capability sys_tty_config;
- allow pegasus_t self:process signal;
- allow pegasus_t self:fifo_file rw_file_perms;
-@@ -65,6 +65,7 @@
- kernel_read_fs_sysctls(pegasus_t)
- kernel_read_system_state(pegasus_t)
- kernel_search_vm_sysctl(pegasus_t)
-+kernel_read_net_sysctls(pegasus_t)
- 
- corenet_tcp_sendrecv_all_if(pegasus_t)
- corenet_raw_sendrecv_all_if(pegasus_t)
-@@ -82,6 +83,7 @@
- corecmd_exec_sbin(pegasus_t)
- corecmd_exec_bin(pegasus_t)
- corecmd_exec_shell(pegasus_t)
-+can_exec(pegasus_t,pegasus_exec_t)
- 
- dev_read_sysfs(pegasus_t)
- dev_read_urand(pegasus_t)
-@@ -94,13 +96,12 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.44/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 09:43:08.000000000 -0400
+@@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
  auth_domtrans_chk_passwd(pegasus_t)
@@ -731,232 +224,44 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-@@ -108,6 +109,7 @@
- init_use_fds(pegasus_t)
- init_use_script_ptys(pegasus_t)
- init_rw_utmp(pegasus_t)
-+init_stream_connect_script(pegasus_t)
- 
- libs_use_ld_so(pegasus_t)
- libs_use_shared_libs(pegasus_t)
-@@ -126,11 +128,16 @@
- 	unconfined_signull(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.44/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-06 22:21:55.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 09:43:08.000000000 -0400
+@@ -109,3 +109,8 @@
+ 	spamassassin_exec(procmail_t)
+ 	spamassassin_exec_client(procmail_t)
  ')
- 
 +
- optional_policy(`
- 	logging_send_syslog_msg(pegasus_t)
- ')
- 
- optional_policy(`
-+	rpm_exec(pegasus_t)
++optional_policy(`
++	clamav_domtrans_clamscan(procmail_t)
 +')
 +
-+optional_policy(`
- 	nscd_socket_use(pegasus_t)
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.43/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-05-12 09:22:08.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/postfix.te	2006-05-26 14:03:15.000000000 -0400
-@@ -289,12 +289,12 @@
- mta_read_config(postfix_local_t)
- 
- optional_policy(`
--#	for postalias
--	mailman_read_data_files(postfix_local_t)
-+	procmail_domtrans(postfix_local_t)
- ')
- 
- optional_policy(`
--	procmail_domtrans(postfix_local_t)
-+#	for postalias
-+	mailman_manage_data_files(postfix_local_t)
- ')
- 
- ########################################
-@@ -603,3 +603,4 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.44/policy/modules/services/pyzor.te
+--- nsaserefpolicy/policy/modules/services/pyzor.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 09:46:23.000000000 -0400
+@@ -126,3 +126,7 @@
  optional_policy(`
- 	sasl_connect(postfix_smtpd_t)
+ 	nscd_socket_use(pyzord_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.43/policy/modules/services/pyzor.te
---- nsaserefpolicy/policy/modules/services/pyzor.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/pyzor.te	2006-05-26 14:03:15.000000000 -0400
-@@ -35,10 +35,20 @@
- allow pyzor_t pyzor_var_lib_t:file r_file_perms;
- files_search_var_lib(pyzor_t)
- 
-+corenet_udp_sendrecv_all_if(pyzor_t)
-+corenet_udp_sendrecv_all_ports(pyzor_t)
-+
- files_read_etc_files(pyzor_t)
- 
- auth_use_nsswitch(pyzor_t)
- 
-+dev_read_urand(pyzor_t)
-+
-+corecmd_list_bin(pyzor_t)
-+corecmd_getattr_bin_files(pyzor_t)
-+kernel_read_kernel_sysctls(pyzor_t)  
-+kernel_read_system_state(pyzor_t)
-+
- libs_use_ld_so(pyzor_t)
- libs_use_shared_libs(pyzor_t)
- 
-@@ -46,6 +56,7 @@
- 
- optional_policy(`
- 	amavis_manage_lib_files(pyzor_t)
-+	amavis_manage_spool_files(pyzor_t)
- ')
- 
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.2.43/policy/modules/services/rsync.te
---- nsaserefpolicy/policy/modules/services/rsync.te	2006-04-28 14:40:40.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/rsync.te	2006-05-26 14:03:15.000000000 -0400
-@@ -8,6 +8,7 @@
- 
- type rsync_t;
- type rsync_exec_t;
-+corecmd_executable_file(rsync_exec_t)
- init_daemon_domain(rsync_t,rsync_exec_t)
- role system_r types rsync_t;
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.43/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/samba.te	2006-05-26 14:03:15.000000000 -0400
-@@ -222,9 +222,13 @@
- 
- allow smbd_t winbind_var_run_t:sock_file { read write getattr };
- 
-+rpc_search_nfs_state_data(smbd_t)
-+fs_getattr_rpc_dirs(smbd_t)
-+
- kernel_getattr_core_if(smbd_t)
- kernel_getattr_message_if(smbd_t)
- kernel_read_network_state(smbd_t)
-+kernel_read_fs_sysctls(smbd_t)
- kernel_read_kernel_sysctls(smbd_t)
- kernel_read_software_raid_state(smbd_t)
- kernel_read_system_state(smbd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.43/policy/modules/services/spamassassin.fc
---- nsaserefpolicy/policy/modules/services/spamassassin.fc	2006-04-19 11:26:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/spamassassin.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -5,6 +5,7 @@
- 
- /usr/sbin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
- /usr/bin/spamassassin	--	gen_context(system_u:object_r:spamassassin_exec_t,s0)
-+/var/spool/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
- 
- ifdef(`strict_policy',`
- HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.43/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-05-05 16:44:48.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/spamassassin.te	2006-05-26 14:03:15.000000000 -0400
-@@ -20,6 +20,9 @@
- type spamd_var_run_t;
- files_pid_file(spamd_var_run_t)
- 
-+type spamd_spool_t;
-+files_type(spamd_spool_t)
-+
- type spamassassin_exec_t;
- corecmd_executable_file(spamassassin_exec_t)
- 
-@@ -57,6 +60,10 @@
- allow spamd_t spamd_var_run_t:dir rw_dir_perms;
- files_pid_filetrans(spamd_t,spamd_var_run_t,file)
- 
-+allow spamd_t spamd_spool_t:file create_file_perms;
-+allow spamd_t spamd_spool_t:dir create_dir_perms;
-+files_spool_filetrans(spamd_t,spamd_spool_t, { file dir })
-+
- kernel_read_all_sysctls(spamd_t)
- kernel_read_system_state(spamd_t)
- kernel_tcp_recvfrom(spamd_t)
-@@ -98,6 +105,7 @@
- files_read_usr_files(spamd_t)
- files_read_etc_files(spamd_t)
- files_read_etc_runtime_files(spamd_t)
-+files_search_var_lib(spamd_t)
- 
- init_use_fds(spamd_t)
- init_use_script_ptys(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.43/policy/modules/services/xfs.te
++ifdef(`targeted_policy',`
++	userdom_read_generic_user_home_content_files(pyzord_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.44/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/xfs.te	2006-05-27 07:43:52.000000000 -0400
-@@ -69,6 +69,10 @@
++++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 09:47:04.000000000 -0400
+@@ -69,6 +69,8 @@
  miscfiles_read_localization(xfs_t)
  miscfiles_read_fonts(xfs_t)
  
-+# nss_ldap
-+sysnet_use_ldap(xfs_t)
-+miscfiles_read_certs(xfs_t)
++auth_use_nsswitch(xfs_t)
 +
  userdom_dontaudit_use_unpriv_user_fds(xfs_t)
  userdom_dontaudit_search_sysadm_home_dirs(xfs_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.43/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/services/xserver.if	2006-05-26 14:03:15.000000000 -0400
-@@ -1073,6 +1073,7 @@
- 	allow $1 xdm_xserver_tmp_t:file { getattr read };
- ')
- 
-+
- ########################################
- ## <summary>
- ##	Kill XDM X servers
-@@ -1109,3 +1110,45 @@
- 
- 	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
- ')
-+
-+
-+########################################
-+## <summary>
-+##	Connect to xdm_xserver over a unix domain
-+##	stream socket.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`xserver_stream_connect',`
-+	gen_require(`
-+		type xdm_xserver_t;
-+	')
-+
-+	allow $1 xdm_xserver_t:unix_stream_socket connectto;
-+')
-+
-+
-+
-+########################################
-+## <summary>
-+##	write xdm temporary socket files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to not audit
-+##	</summary>
-+## </param>
-+#
-+interface(`xserver_write_xdm_xserver_tmp_sockets',`
-+	gen_require(`
-+		type xdm_xserver_tmp_t;
-+	')
-+
-+	allow $1 xdm_xserver_tmp_t:sock_file write;
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.43/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.44/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/system/hostname.te	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 09:43:08.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -969,10 +274,10 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.43/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/init.te	2006-05-26 14:03:15.000000000 -0400
-@@ -348,6 +348,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.44/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 09:43:08.000000000 -0400
+@@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -980,23 +285,10 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.43/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/libraries.fc	2006-06-06 15:41:44.000000000 -0400
-@@ -34,8 +34,10 @@
- #
- /lib(/.*)?					gen_context(system_u:object_r:lib_t,s0)
- /lib64(/.*)?					gen_context(system_u:object_r:lib_t,s0)
--/lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
--/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
-+/lib/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-+/lib64/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-+/lib/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
-+/lib64/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
- 
- ifdef(`distro_gentoo',`
- /lib32(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-@@ -43,6 +45,9 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.44/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/libraries.fc	2006-06-08 09:43:08.000000000 -0400
+@@ -48,6 +48,9 @@
  /lib32/ld-[^/]*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:ld_so_t,s0)
  ')
  
@@ -1006,45 +298,9 @@
  #
  # /opt
  #
-@@ -56,6 +61,7 @@
- /opt/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /opt/(.*/)?jre.*/libawt.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /opt/netbeans(.*/)?jdk.*/linux/.*.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/cisco-vpnclient/lib/libvpnapi.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- ifdef(`distro_gentoo',`
- /opt/netscape/plugins/libflashplayer.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -115,6 +121,7 @@
- 
- /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/xorg/modules/drivers/fglx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- ifdef(`distro_redhat',`
-@@ -226,7 +233,14 @@
- /usr/(local/)?Adobe/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(local/)?acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(local/)?Adobe/.*\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/local/matlab.*/bin/glnx86/libmwlapack.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+
-+/usr/lib/acroread/(.*/)?sidecars/* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/acroread/(.*/)?nppdf\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/acroread/.*\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/acroread/(.*/)?ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- ') dnl end distro_redhat
- 
- #
-@@ -248,3 +262,4 @@
- /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
- /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
- /var/spool/postfix/lib(64)?/devfsd/.*\.so.* --	gen_context(system_u:object_r:shlib_t,s0)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.43/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/logging.te	2006-05-26 14:03:15.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.44/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 09:43:08.000000000 -0400
 @@ -14,10 +14,14 @@
  role system_r types auditctl_t;
  
@@ -1060,32 +316,49 @@
  
  type auditd_t;
  # real declaration moved to mls until
-@@ -134,7 +138,11 @@
+@@ -123,9 +127,8 @@
+ files_pid_filetrans(auditd_t,auditd_var_run_t,file)
+ 
+ kernel_read_kernel_sysctls(auditd_t)
+-# Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
+-# Probably want a transition, and a new auditd_helper app
+-kernel_read_system_state(auditd_t)
++kernel_list_proc(auditd_t)
++kernel_read_proc_symlinks(auditd_t)
+ 
+ dev_read_sysfs(auditd_t)
+ 
+@@ -134,11 +137,12 @@
+ 
  term_dontaudit_use_console(auditd_t)
  
- # cjp: why?
-+# Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-+# Probably want a transition, and a new auditd_helper app
++# cjp: why?
+ # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
+ # Probably want a transition, and a new auditd_helper app
  corecmd_exec_sbin(auditd_t)
-+corecmd_exec_bin(auditd_t)
+ corecmd_exec_bin(auditd_t)
+-
 +kernel_read_system_state(auditd_t)
  
  domain_use_interactive_fds(auditd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.43/policy/modules/system/unconfined.fc
---- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-01-06 17:55:18.000000000 -0500
-+++ serefpolicy-2.2.43/policy/modules/system/unconfined.fc	2006-06-06 12:30:30.000000000 -0400
-@@ -3,3 +3,7 @@
- # /usr/local/bin/appsrv	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.44/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 09:43:08.000000000 -0400
+@@ -4,7 +4,6 @@
  # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
  /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
-+
+ 
+-ifdef(`targeted_policy',`
+-/usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-')
 +/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.43/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.44/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/unconfined.if	2006-06-06 12:30:13.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 09:43:08.000000000 -0400
 @@ -449,3 +449,31 @@
  
  	allow $1 unconfined_t:dbus acquire_svc;
@@ -1118,23 +391,19 @@
 +		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
 +	')
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.43/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/unconfined.te	2006-06-06 12:29:22.000000000 -0400
-@@ -13,7 +13,11 @@
- ')
- type unconfined_exec_t;
- init_system_domain(unconfined_t,unconfined_exec_t)
--role system_r types unconfined_t;
-+
-+type unconfined_execmem_t;
-+type unconfined_execmem_exec_t;
-+init_system_domain(unconfined_execmem_t,unconfined_execmem_exec_t)
-+
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.44/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 09:43:08.000000000 -0400
+@@ -33,8 +33,6 @@
+ 	allow unconfined_t self:system syslog_read;
+ 	dontaudit unconfined_t self:capability sys_module;
  
- ########################################
- #
-@@ -107,6 +111,10 @@
+-	domain_auto_trans(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
+-
+ 	files_create_boot_flag(unconfined_t)
+ 
+ 	init_domtrans_script(unconfined_t)
+@@ -114,6 +112,10 @@
  	')
  
  	optional_policy(`
@@ -1145,7 +414,7 @@
  		lpd_domtrans_checkpc(unconfined_t)
  	')
  
-@@ -173,4 +181,19 @@
+@@ -180,11 +182,16 @@
  	optional_policy(`
  		xserver_domtrans_xdm_xserver(unconfined_t)
  	')
@@ -1154,21 +423,25 @@
 +		pegasus_domtrans(unconfined_t)
 +	')
 +
-+')
-+
-+########################################
-+#
-+# Local policy
-+#
-+
-+ifdef(`targeted_policy',`
-+	allow unconfined_execmem_t self:process { execstack execmem };
-+	unconfined_domain_noaudit(unconfined_execmem_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.43/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/userdomain.te	2006-05-26 14:03:15.000000000 -0400
-@@ -6,6 +6,7 @@
+ 
+ ########################################
+ #
+-# Unconfined Execmem Local policy
++# Local policy
+ #
+ 
+ ifdef(`targeted_policy',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.44/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 09:43:08.000000000 -0400
+@@ -1,11 +1,12 @@
+ 
+-policy_module(userdomain,1.3.27)
++policy_module(userdomain,1.3.26)
+ 
+ gen_require(`
+ 	role sysadm_r, staff_r, user_r;
  
  	ifdef(`enable_mls',`
  		role secadm_r;
@@ -1263,7 +536,7 @@
  		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
  	')
  
-@@ -248,6 +279,7 @@
+@@ -252,6 +283,7 @@
  
  		ifdef(`enable_mls',`
  			consoletype_exec(secadm_t)
@@ -1271,7 +544,7 @@
  		')
  	')
  
-@@ -266,6 +298,7 @@
+@@ -270,6 +302,7 @@
  
  		ifdef(`enable_mls',`
  			dmesg_exec(secadm_t)
@@ -1279,106 +552,9 @@
  		')
  	')
  
-@@ -428,6 +461,7 @@
- 	optional_policy(`
- 		sysnet_run_ifconfig(sysadm_t,sysadm_r,admin_terminal)
- 		sysnet_run_dhcpc(sysadm_t,sysadm_r,admin_terminal)
-+		consoletype_run(sysadm_t,sysadm_r,admin_terminal)
- 	')
- 
- 	optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.2.43/policy/modules/system/xen.fc
---- nsaserefpolicy/policy/modules/system/xen.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/xen.fc	2006-05-26 14:03:15.000000000 -0400
-@@ -16,3 +16,4 @@
- /var/run/xend\.pid	--      gen_context(system_u:object_r:xend_var_run_t,s0)
- /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
- /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
-+/xen(/.*)?			gen_context(system_u:object_r:xen_image_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.43/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-05-03 16:01:26.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/xen.if	2006-05-26 14:03:15.000000000 -0400
-@@ -124,6 +124,6 @@
- 
- 	domain_auto_trans($1,xm_exec_t,xm_t)
- 	allow xm_t $1:fd use;
--	allow xm_t:$1:fifo_file rw_file_perms;
-+	allow xm_t $1:fifo_file rw_file_perms;
- 	allow xm_t $1:process sigchld;
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.43/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/modules/system/xen.te	2006-05-26 14:03:15.000000000 -0400
-@@ -50,6 +50,10 @@
- domain_entry_file(xenconsoled_t,xenconsoled_exec_t)
- role system_r types xenconsoled_t;
- 
-+# Xen Image files
-+type xen_image_t; # customizable
-+files_type(xen_image_t)
-+
- # pid files
- type xenconsoled_var_run_t;
- files_pid_file(xenconsoled_var_run_t)
-@@ -74,6 +78,11 @@
- allow xend_t self:tcp_socket create_stream_socket_perms;
- allow xend_t self:packet_socket create_socket_perms;
- 
-+files_etc_filetrans_etc_runtime(xend_t,file)
-+
-+allow xend_t xen_image_t:dir r_dir_perms;
-+allow xend_t xen_image_t:file r_file_perms;
-+
- # pid file
- allow xend_t xend_var_run_t:file manage_file_perms;
- allow xend_t xend_var_run_t:sock_file manage_file_perms;
-@@ -89,8 +98,9 @@
- # var/lib files for xend
- allow xend_t xend_var_lib_t:file create_file_perms;
- allow xend_t xend_var_lib_t:sock_file create_file_perms;
-+allow xend_t xend_var_lib_t:fifo_file create_file_perms;
- allow xend_t xend_var_lib_t:dir create_dir_perms;
--files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir sock_file })
-+files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir })
- 
- # transition to store
- domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t)
-@@ -113,6 +123,7 @@
- corecmd_exec_bin(xend_t)
- corecmd_exec_shell(xend_t)
- 
-+corenet_tcp_bind_all_nodes(xend_t)
- corenet_tcp_sendrecv_all_if(xend_t)
- corenet_tcp_sendrecv_all_nodes(xend_t)
- corenet_tcp_sendrecv_all_ports(xend_t)
-@@ -242,7 +253,7 @@
- # xm local policy
- #
- 
--allow xm_t self:capability dac_override;
-+allow xm_t self:capability { dac_override ipc_lock };
- # internal communication is often done using fifo and unix sockets.
- allow xm_t self:fifo_file { read write };
- allow xm_t self:unix_stream_socket create_stream_socket_perms;
-@@ -270,3 +281,15 @@
- xen_append_log(xm_t)
- xen_stream_connect(xm_t)
- xen_stream_connect_xenstore(xm_t)
-+
-+files_list_mnt(xm_t)
-+
-+init_rw_script_stream_sockets(xm_t)
-+
-+files_read_etc_runtime_files(xm_t)
-+files_read_usr_files(xm_t)
-+
-+files_search_var_lib(xm_t)
-+allow xm_t xend_var_lib_t:dir rw_dir_perms;
-+allow xm_t xend_var_lib_t:fifo_file create_file_perms;
-+allow xm_t xend_var_lib_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.43/policy/rolemap
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.44/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.43/policy/rolemap	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 09:43:08.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -1386,9 +562,9 @@
 +		auditadm_r auditadm auditadm_t
  	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.43/policy/support/misc_macros.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.44/policy/support/misc_macros.spt
 --- nsaserefpolicy/policy/support/misc_macros.spt	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.43/policy/support/misc_macros.spt	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 09:43:08.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  # gen_context(context,mls_sensitivity,[mcs_categories])
@@ -1398,9 +574,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.43/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.44/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.43/policy/users	2006-05-26 14:03:15.000000000 -0400
++++ serefpolicy-2.2.44/policy/users	2006-06-08 09:43:08.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`
@@ -1421,15 +597,3 @@
 +		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
  	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.43/Rules.modular
---- nsaserefpolicy/Rules.modular	2006-05-26 14:02:26.000000000 -0400
-+++ serefpolicy-2.2.43/Rules.modular	2006-05-26 14:03:15.000000000 -0400
-@@ -31,7 +31,7 @@
- vpath %.if $(ALL_LAYERS)
- vpath %.fc $(ALL_LAYERS)
- 
--.SECONDARY:
-+#.SECONDARY:
- 
- ########################################
- #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- selinux-policy.spec	6 Jun 2006 21:33:13 -0000	1.202
+++ selinux-policy.spec	8 Jun 2006 14:03:38 -0000	1.203
@@ -15,12 +15,12 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.43
-Release: 4
+Version: 2.2.44
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060505.patch
+patch: policy-20060608.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -335,6 +335,9 @@
 %endif
 
 %changelog
+* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.44-1
+- Update from upstream
+
 * Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-4
 - Add oprofilefs
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 14:27:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 10:27:56 -0400
Subject: rpms/pam/devel pam_namespace-10.patch, NONE, 1.1 pam.spec, 1.115,
	1.116 pam_namespace-8.patch, 1.2, NONE pam_namespace-9.patch,
	1.3, NONE pam_namespace-have-unshare.patch, 1.3, NONE
Message-ID: <200606081427.k58ERuMD031799@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31745

Modified Files:
	pam.spec 
Added Files:
	pam_namespace-10.patch 
Removed Files:
	pam_namespace-8.patch pam_namespace-9.patch 
	pam_namespace-have-unshare.patch 
Log Message:
* Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
- updated pam_namespace with latest patch by Janak Desai
- merged pam_namespace patches


pam_namespace-10.patch:
 config.h.in                                |    6 
 configure.in                               |    6 
 modules/Makefile.am                        |    2 
 modules/pam_namespace/Makefile.am          |   37 
 modules/pam_namespace/README               |  122 ++
 modules/pam_namespace/md5.c                |  260 +++++
 modules/pam_namespace/md5.h                |   28 
 modules/pam_namespace/namespace.conf       |   30 
 modules/pam_namespace/namespace.conf.5.xml |  151 +++
 modules/pam_namespace/namespace.init       |    3 
 modules/pam_namespace/pam_namespace.8.xml  |  305 ++++++
 modules/pam_namespace/pam_namespace.c      | 1370 +++++++++++++++++++++++++++++
 12 files changed, 2319 insertions(+), 1 deletion(-)

--- NEW FILE pam_namespace-10.patch ---
--- Linux-PAM-0.99.4.0/config.h.in.namespace	2006-05-04 12:26:49.000000000 +0200
+++ Linux-PAM-0.99.4.0/config.h.in	2006-06-08 16:15:04.000000000 +0200
@@ -194,6 +194,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `unshare' function. */
+#undef HAVE_UNSHARE
+
 /* Define to 1 if you have the <utmpx.h> header file. */
 #undef HAVE_UTMPX_H
 
@@ -257,6 +260,9 @@
 /* Version number of package */
 #undef VERSION
 
+/* Defined if SE Linux support is compiled in */
+#undef WITH_SELINUX
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
--- Linux-PAM-0.99.4.0/modules/pam_namespace/md5.h.namespace	2006-06-08 16:18:00.000000000 +0200
+++ Linux-PAM-0.99.4.0/modules/pam_namespace/md5.h	2006-06-08 16:15:04.000000000 +0200
@@ -0,0 +1,28 @@
+
+#ifndef MD5_H
+#define MD5_H
+
+typedef unsigned int uint32;
+
+struct MD5Context {
+	uint32 buf[4];
+	uint32 bits[2];
+	unsigned char in[64];
+};
+
+#define MD5_DIGEST_LENGTH 16
+
+void MD5Init(struct MD5Context *);
+void MD5Update(struct MD5Context *, unsigned const char *, unsigned);
+void MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], struct MD5Context *);
+void MD5Transform(uint32 buf[4], uint32 const in[MD5_DIGEST_LENGTH]);
+void MD5(unsigned const char *, unsigned, unsigned char digest[MD5_DIGEST_LENGTH]);
+
+
+/*
+ * This is needed to make RSAREF happy on some MS-DOS compilers.
+ */
+
+typedef struct MD5Context MD5_CTX;
+
+#endif				/* MD5_H */
--- /dev/null	2006-06-08 08:11:51.840791000 +0200
+++ Linux-PAM-0.99.4.0/modules/pam_namespace/README	2006-06-08 16:17:10.000000000 +0200
@@ -0,0 +1,122 @@
+
+pam_namespace module:
+Setup a private namespace with polyinstantiated directories.
+
+THEORY OF OPERATION:
+The pam namespace module consults /etc/security/namespace.conf
+configuration file and sets up a private namespace with polyinstantiated
+directories for a session managed by PAM. A skeleton namespace.conf
+installed by default provides example for polyinstantiating /tmp, /var/tmp
+and users' home directory.
+
+If an executable script /etc/security/namespace.init exists, it
+is used to initialize the namespace every time a new instance directory
+is created. The script receives the polyinstantiated directory path
+and the instance directory path as its arguments.
+
+Each line in namespace.conf describes a limit for a user in the form:
+
+<polydir>  <instance_prefix>  <method>  <list_of_uids>
+
+Where:
+<polydir> - is the absolute pathname of the directory to polyinstantiate
+      Special entry $HOME is supported to designate user's home directory.
+      This field cannot be blank.
+
+<instance_prefix> - is the string prefix used to build the pathname for the
+	instantiation of <polydir>. The directory security context, or
+	optionally its md5sum string (32 hex characters), is appended to
+        the prefix to generate the final instance directory path.
+        This directory is created if it did not exist already, and is then
+	bind mounted on the <polydir> to provide an instance of <polydir>
+	based on the <method> column. The special string $HOME is replaced with
+	the user's home directory, and $USER with the username.
+	This field cannot be blank.
+
+<method> - is the method used for polyinstantiation. It can take 3 different
+	values; "user" for polyinstantiation based on user name, "context"
+	for polyinstantiation based on process security context, and "both"
+	for polyinstantiation based on both user name and security context.
+	Methods "context" and "both" are only available with SELinux. This
+	field cannot be blank.
+
+<list_of_uids> - is a comma separated list of user names for whom the
+	polyinstantiation is not performed. If left blank, polyinstantiation
+	will be performed for all users.
+
+EXAMPLE /etc/security/namespace.conf configuration file:
+=======================================================
+# Following three lines will polyinstantiate /tmp, /var/tmp and user's home
+# directories. /tmp and /var/tmp will be polyinstantiated based on both
+# security context as well as user name, whereas home directory will
+# be polyinstantiated based on security context only. Polyinstantiation
+# will not be performed for user root and adm for directories /tmp and
+# /var/tmp, whereas home directories will be polyinstantiated for all
+# users. The user name and/or context is appended to the instance prefix.
+#
+# Note that instance directories do not have to reside inside the
+# polyinstantiated directory. In the examples below, instances of /tmp
+# will be created in /tmp-inst directory, where as instances of /var/tmp
+# and users home directories will reside within the directories that
+# are being polyinstantiated.
+#
+# Instance parent directories must exist for the polyinstantiation
+# mechanism to work. By default, they should be created with the mode
+# of 000. pam_namespace module will enforce this mode unless it
+# is explicitly called with an argument to ignore the mode of the
+# instance parent. System administrators should use this argument with
+# caution, as it will reduce security and isolation achieved by
+# polyinstantiation.
+#
+/tmp     /tmp-inst/       	both      root,adm
+/var/tmp /var/tmp/tmp-inst/   	both      root,adm
+$HOME    $HOME/$USER.inst/inst- context
+
+ARGUMENTS RECOGNIZED:
+    debug
+	Verbose logging by syslog
+
+    unmnt_remnt
+	For programs such as su and newrole, the login session has
+	already setup a polyinstantiated namespace. For these programs,
+	polyinstantiation is performed based on new user id or security
+	context, however the command first needs to undo the
+	polyinstantiation performed by login. This argument instructs
+	the command to first undo previous polyinstantiation before
+	proceeding with new polyinstantiation based on new id/context.
+
+    unmnt_only
+	For trusted programs that want to undo any existing bind mounts
+	and process instance directories on their own, this argument
+	allows them to unmount currently mounted instance directories.
+
+    require_selinux
+	If selinux is not enabled, return failure.
+
+    gen_hash
+	Instead of using the security context string for the instance
+	name, generate and use its md5 hash.
+
+    ignore_config_error
+	If a line in the configuration file corresponding to a
+	polyinstantiated directory contains format error, skip that
+	line process the next line. Without this option, pam will return
+	an error to the calling program resulting in termination
+	of the session.
+
+    ignore_instance_parent_mode
+	Instance parent directories by default are expected to have
+	the restrictive mode of 000. Using this option, an administrator
+	can choose to ignore the mode of the instance parent.
+
+MODULE SERVICES PROVIDED:
+	session            open_session and close_session
+
+USAGE:
+	For the <service>s you need polyinstantiation (login for example)
+	put the following line in /etc/pam.d/<service> as the last line for 
+	session group:
+
+	session  required  pam_namespace.so [arguments]
+
+	This module also depends on pam_selinux.so setting the context.
--- /dev/null	2006-06-08 08:11:51.840791000 +0200
+++ Linux-PAM-0.99.4.0/modules/pam_namespace/namespace.init	2006-06-08 16:15:04.000000000 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+# This is only a boilerplate for the instance initialization script.
+# It receives polydir path as $1 and the instance path as $2.
--- /dev/null	2006-06-08 08:11:51.840791000 +0200
+++ Linux-PAM-0.99.4.0/modules/pam_namespace/pam_namespace.c	2006-06-08 16:17:10.000000000 +0200
@@ -0,0 +1,1370 @@
+/******************************************************************************
+ * A module for Linux-PAM that will set the default namespace after 
+ * establishing a session via PAM.
+ *
+ * (C) Copyright IBM Corporation 2005
+ * (C) Copyright Red Hat 2006
+ * All Rights Reserved.
+ *
+ * Written by: Janak Desai <janak at us.ibm.com>
+ * With Revisions by: Steve Grubb <sgrubb at redhat.com>
+ * Derived from a namespace setup patch by Chad Sellers <cdselle at tycho.nsa.gov>
+ *
[...1996 lines suppressed...]
+		len -= 64;
+	}
+
+	/* Handle any remaining bytes of data. */
+
+	memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void MD5Name(MD5Final)(unsigned char digest[16], struct MD5Context *ctx)
+{
+	unsigned count;
+	unsigned char *p;
+
+	/* Compute number of bytes mod 64 */
+	count = (ctx->bits[0] >> 3) & 0x3F;
+
+	/* Set the first char of padding to 0x80.  This is safe since there is
+	   always at least one byte free */
+	p = ctx->in + count;
+	*p++ = 0x80;
+
+	/* Bytes of padding needed to make 64 bytes */
+	count = 64 - 1 - count;
+
+	/* Pad out to 56 mod 64 */
+	if (count < 8) {
+		/* Two lots of padding:  Pad the first block to 64 bytes */
+		memset(p, 0, count);
+		byteReverse(ctx->in, 16);
+		MD5Name(MD5Transform)(ctx->buf, (uint32 *) ctx->in);
+
+		/* Now fill the next block with 56 bytes */
+		memset(ctx->in, 0, 56);
+	} else {
+		/* Pad block to 56 bytes */
+		memset(p, 0, count - 8);
+	}
+	byteReverse(ctx->in, 14);
+
+	/* Append length in bits and transform */
+	((uint32 *) ctx->in)[14] = ctx->bits[0];
+	((uint32 *) ctx->in)[15] = ctx->bits[1];
+
+	MD5Name(MD5Transform)(ctx->buf, (uint32 *) ctx->in);
+	byteReverse((unsigned char *) ctx->buf, 4);
+	memcpy(digest, ctx->buf, 16);
+	memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+}
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+void MD5Name(MD5Transform)(uint32 buf[4], uint32 const in[16])
+{
+	register uint32 a, b, c, d;
+
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+
+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478U, 7);
+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756U, 12);
+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070dbU, 17);
+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceeeU, 22);
+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0fafU, 7);
+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62aU, 12);
+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613U, 17);
+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501U, 22);
+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8U, 7);
+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7afU, 12);
+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1U, 17);
+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7beU, 22);
+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122U, 7);
+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193U, 12);
+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438eU, 17);
+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821U, 22);
+
+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562U, 5);
+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340U, 9);
+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51U, 14);
+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aaU, 20);
+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105dU, 5);
+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453U, 9);
+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681U, 14);
+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8U, 20);
+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6U, 5);
+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6U, 9);
+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87U, 14);
+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14edU, 20);
+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905U, 5);
+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8U, 9);
+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9U, 14);
+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8aU, 20);
+
+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942U, 4);
+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681U, 11);
+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122U, 16);
+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380cU, 23);
+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44U, 4);
+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9U, 11);
+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60U, 16);
+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70U, 23);
+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6U, 4);
+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127faU, 11);
+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085U, 16);
+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05U, 23);
+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039U, 4);
+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5U, 11);
+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8U, 16);
+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665U, 23);
+
+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244U, 6);
+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97U, 10);
+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7U, 15);
+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039U, 21);
+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3U, 6);
+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92U, 10);
+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47dU, 15);
+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1U, 21);
+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4fU, 6);
+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0U, 10);
+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314U, 15);
+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1U, 21);
+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82U, 6);
+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235U, 10);
+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bbU, 15);
+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391U, 21);
+
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
+}
+
+void MD5Name(MD5)(unsigned const char *buf, unsigned len, unsigned char digest[16])
+{
+	struct MD5Context ctx;
+	MD5Name(MD5Init)(&ctx);
+	MD5Name(MD5Update)(&ctx, buf, len);
+	MD5Name(MD5Final)(digest, &ctx);
+}
--- Linux-PAM-0.99.4.0/modules/Makefile.am.namespace	2006-06-08 16:15:04.000000000 +0200
+++ Linux-PAM-0.99.4.0/modules/Makefile.am	2006-06-08 16:15:04.000000000 +0200
@@ -10,7 +10,7 @@
 	pam_motd pam_nologin pam_permit pam_rhosts pam_rootok \
 	pam_securetty pam_selinux pam_shells pam_stress pam_succeed_if \
 	pam_tally pam_time pam_umask pam_unix pam_userdb pam_warn \
-	pam_wheel pam_xauth pam_exec
+	pam_wheel pam_xauth pam_exec pam_namespace
 
 
 CLEANFILES = *~
--- Linux-PAM-0.99.4.0/configure.in.namespace	2006-06-08 16:15:04.000000000 +0200
+++ Linux-PAM-0.99.4.0/configure.in	2006-06-08 16:15:04.000000000 +0200
@@ -344,6 +344,9 @@
 AC_CHECK_LIB([selinux],[getfilecon], LIBSELINUX="-lselinux", LIBSELINUX="")
 AC_SUBST(LIBSELINUX)
 AM_CONDITIONAL([HAVE_LIBSELINUX], [test ! -z "$LIBSELINUX"])
+if test ! -z "$LIBSELINUX" ; then
+    AC_DEFINE([WITH_SELINUX], 1, [Defined if SE Linux support is compiled in])
+fi
 
 dnl Checks for Libcap
 AC_CHECK_LIB([cap], [cap_get_proc], LIBCAP="-lcap", LIBCAP="" )
@@ -382,6 +385,8 @@
 AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
 AC_CHECK_FUNCS(getgrouplist getline getdelim)
 AC_CHECK_FUNCS(inet_ntop inet_pton)
+AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
+AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
 
 dnl Checks for programs/utilities
 AC_CHECK_PROG(SGML2PS, sgml2ps, yes, no)
@@ -462,6 +467,7 @@
 	modules/pam_limits/Makefile modules/pam_listfile/Makefile \
 	modules/pam_localuser/Makefile modules/pam_mail/Makefile \
 	modules/pam_mkhomedir/Makefile modules/pam_motd/Makefile \
+	modules/pam_namespace/Makefile \
 	modules/pam_nologin/Makefile modules/pam_permit/Makefile \
 	modules/pam_rhosts/Makefile \
 	modules/pam_rootok/Makefile modules/pam_exec/Makefile \


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- pam.spec	24 May 2006 09:05:18 -0000	1.115
+++ pam.spec	8 Jun 2006 14:27:54 -0000	1.116
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.99.4.0
-Release: 4
+Release: 5
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -35,9 +35,7 @@
 Patch83: pam-0.99.4.0-tally-large-uid.patch
 Patch84: pam-0.99.4.0-console-no-var-access.patch
 Patch85: pam-0.99.4.0-timestamp-no-hmactest.patch
-Patch90: pam_namespace-8.patch
-Patch92: pam_namespace-have-unshare.patch
-Patch93: pam_namespace-9.patch
+Patch90: pam_namespace-10.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -99,8 +97,6 @@
 %patch84 -p1 -b .no-var-access
 %patch85 -p1 -b .no-hmactest
 %patch90 -p1 -b .namespace
-%patch92 -p1 -b .have-unshare
-%patch93 -p1 -b .namespacev9
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -365,6 +361,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
+- updated pam_namespace with latest patch by Janak Desai
+- merged pam_namespace patches
+
 * Wed May 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-4
 - actually don't link to libssl as it is not used (#191915)
 


--- pam_namespace-8.patch DELETED ---


--- pam_namespace-9.patch DELETED ---


--- pam_namespace-have-unshare.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  8 14:29:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 10:29:59 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.136,1.137
Message-ID: <200606081429.k58ETxdd032644@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32574

Modified Files:
	gnome-applets.spec 
Log Message:
More build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-applets.spec	8 Jun 2006 14:02:38 -0000	1.136
+++ gnome-applets.spec	8 Jun 2006 14:29:57 -0000	1.137
@@ -12,6 +12,9 @@
 %define libgnome_desktop_version 2.10.2
 %define gnome_utils_version 2.8.1
 %define dbus_version 0.60
+%define gstreamer_version 0.10
+%define hal_version 0.5.3
+%define libnotify_version 0.3.2
 
 %define po_package gnome-applets-2.0
 
@@ -53,6 +56,11 @@
 BuildRequires:  libwnck-devel >= %{libwnck_version}
 BuildRequires:  gnome-desktop-devel >= %{libgnome_desktop_version}
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
+BuildRequires:  gstreamer >= %{gstreamer_version}
+BuildRequires:  gstreamer-plugins-base >= %{gstreamer_version}
+BuildRequires:  hal-devel >= %{hal_version}
+BuildRequires:  libnotify-devel >= %{libnotify_version}
+
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gnome-doc-utils
@@ -107,7 +115,8 @@
 %configure			\
 	--enable-suid=no 	\
 	--disable-scrollkeeper 	\
-	--enable-mini-commander
+	--enable-mini-commander \
+	--with
 make
 
 %install



From fedora-cvs-commits at redhat.com  Thu Jun  8 14:38:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 10:38:53 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.148,
	1.149
Message-ID: <200606081438.k58EcrcJ000992@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv962

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Jun  8 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
- Fix ppc64 file system corruption workaround.
- Make ecj.sh.in call gij.
- Require eclipse-ecj to build.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- java-1.4.2-gcj-compat.spec	7 Jun 2006 22:45:34 -0000	1.148
+++ java-1.4.2-gcj-compat.spec	8 Jun 2006 14:38:50 -0000	1.149
@@ -52,6 +52,9 @@
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires:	gjdoc
 BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
+%if ! %{bootstrap}
+BuildRequires:	eclipse-ecj
+%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.1
@@ -640,9 +643,10 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
-* Wed Jun  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
+* Thu Jun  8 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
 - Fix ppc64 file system corruption workaround.
 - Make ecj.sh.in call gij.
+- Require eclipse-ecj to build.
 
 * Fri Mar  3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh
 - Make javadoc post scriplet pass unconditionally.



From fedora-cvs-commits at redhat.com  Thu Jun  8 14:54:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 10:54:05 -0400
Subject: rpms/NetworkManager/FC-5 .cvsignore, 1.35, 1.36 NetworkManager.spec,
	1.105, 1.106 sources, 1.52, 1.53
Message-ID: <200606081454.k58Es535021098@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21064

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
Update to 0.6.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	30 Mar 2006 18:03:11 -0000	1.35
+++ .cvsignore	8 Jun 2006 14:54:02 -0000	1.36
@@ -3,3 +3,4 @@
 NetworkManager-0.5.1.cvs20060302.tar.gz
 NetworkManager-0.6.0.tar.gz
 NetworkManager-0.6.2.tar.gz
+NetworkManager-0.6.3.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- NetworkManager.spec	29 May 2006 04:16:50 -0000	1.105
+++ NetworkManager.spec	8 Jun 2006 14:54:02 -0000	1.106
@@ -14,12 +14,12 @@
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
-Version: 0.6.2
-Release: 2%{?nm_cvs_version}.fc5
+Version: 0.6.3
+Release: 1%{?nm_cvs_version}.fc5
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
+Source: %{name}-%{version}%{?nm_cvs_version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch0: special-case-madwifi.patch
@@ -213,6 +213,9 @@
 
 
 %changelog
+* Thu Jun  8 2006 Dan Williams <dcbw at redhat.com> - 0.6.3-1
+- Update to 0.6.3 release
+
 * Wed May  3 2006 Dan Williams <dcbw at redhat.com> - 0.6.2-2
 - Update to latest 0.6.2 stable
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	3 May 2006 14:56:58 -0000	1.52
+++ sources	8 Jun 2006 14:54:02 -0000	1.53
@@ -1 +1 @@
-872232e0820350adfce872ea8eda4d15  NetworkManager-0.6.2.tar.gz
+8970eabfb8e8141104ad3e9c7f7cde01  NetworkManager-0.6.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 15:11:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 11:11:45 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.184,1.185
Message-ID: <200606081511.k58FBjxq024405@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24366

Modified Files:
	kdebase.spec 
Log Message:
- move only *.so symlinks to -devel subpackage
- enable --enable-new-ldflags again since ld bug fixed



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- kdebase.spec	8 Jun 2006 00:02:04 -0000	1.184
+++ kdebase.spec	8 Jun 2006 15:11:42 -0000	1.185
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 2
+Release: 3
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -170,9 +170,7 @@
 %endif
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --with-extra-libs=%{_libdir} \
@@ -476,6 +474,7 @@
 %{_bindir}/nspluginviewer
 %{_bindir}/startkde
 %{_libdir}/*.so.*
+%{_libdir}/libkdeinit_*.so
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
@@ -516,8 +515,13 @@
 %dir %{_includedir}/kde/ksplash
 %{_includedir}/kde/ksplash/*
 %{_libdir}/*.so
+%exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-3
+- move only *.so symlinks to -devel subpackage
+- enable --enable-new-ldflags again since ld bug fixed
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 6:3.5.3-2
 - move .so symlinks into -devel subpackage
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 15:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 11:18:50 -0400
Subject: rpms/xsane/devel xsane.spec,1.34,1.35
Message-ID: <200606081518.k58FIor4008836@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8758

Modified Files:
	xsane.spec 
Log Message:
fix desktop file installation



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xsane.spec	8 Jun 2006 13:51:30 -0000	1.34
+++ xsane.spec	8 Jun 2006 15:18:47 -0000	1.35
@@ -1,3 +1,5 @@
+%define desktop_vendor fedora
+
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
@@ -68,9 +70,10 @@
 install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
 
 mkdir %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor net --delete-original     \
+desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
     --add-category X-Red-Hat-Base                       \
+    --add-category X-Fedora                             \
     --add-category Graphics                             \
     --add-category Application                          \
     %{SOURCE2}
@@ -88,7 +91,7 @@
 %{_mandir}/man1/*
 %{_datadir}/sane
 %dir %{_datadir}/applications
-%{_datadir}/applications/xsane.desktop
+%{_datadir}/applications/%{desktop_vendor}-xsane.desktop
 
 %files gimp
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Jun  8 15:33:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 11:33:25 -0400
Subject: rpms/kernel/devel linux-2.6-selinux-deferred-inode-label.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2252, 1.2252.2.1
Message-ID: <200606081533.k58FXP17013749@cvs.devel.redhat.com>

Author: eparis

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13519

Modified Files:
      Tag: private-defered-inode-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-defered-inode-branch
	linux-2.6-selinux-deferred-inode-label.patch 
Log Message:
test rawhide branch for development of rpm.  this kernel should allow rpm to write files with undefined sids


linux-2.6-selinux-deferred-inode-label.patch:
 hooks.c                     |   16 ++-
 include/av_perm_to_string.h |    1 
 include/av_permissions.h    |    1 
 include/objsec.h            |    3 
 include/security.h          |    2 
 selinuxfs.c                 |    4 
 ss/context.h                |   17 +++
 ss/mls.c                    |    9 +
 ss/mls.h                    |    3 
 ss/services.c               |  213 ++++++++++++++++++++++++++++----------------
 ss/sidtab.c                 |    4 
 11 files changed, 188 insertions(+), 85 deletions(-)

--- NEW FILE linux-2.6-selinux-deferred-inode-label.patch ---
--- linux-2.6.16/security/selinux/include/av_permissions.h.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/include/av_permissions.h	2006-06-07 14:04:52.000000000 -0400
@@ -526,6 +526,7 @@
 #define SECURITY__SETBOOL                         0x00000100UL
 #define SECURITY__SETSECPARAM                     0x00000200UL
 #define SECURITY__SETCHECKREQPROT                 0x00000400UL
+#define SECURITY__LABELPRIV                       0x00000800UL
 
 #define SYSTEM__IPC_INFO                          0x00000001UL
 #define SYSTEM__SYSLOG_READ                       0x00000002UL
--- linux-2.6.16/security/selinux/include/av_perm_to_string.h.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/include/av_perm_to_string.h	2006-06-07 14:04:52.000000000 -0400
@@ -87,6 +87,7 @@
    S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool")
    S_(SECCLASS_SECURITY, SECURITY__SETSECPARAM, "setsecparam")
    S_(SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT, "setcheckreqprot")
+   S_(SECCLASS_SECURITY, SECURITY__LABELPRIV, "labelpriv")
    S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info")
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read")
    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod")
--- linux-2.6.16/security/selinux/include/objsec.h.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/include/objsec.h	2006-06-07 14:04:52.000000000 -0400
@@ -101,4 +101,7 @@ struct sk_security_struct {
 
 extern unsigned int selinux_checkreqprot;
 
+extern int task_has_security(struct task_struct *tsk,
+			     u32 perms);
+
 #endif /* _SELINUX_OBJSEC_H_ */
--- linux-2.6.16/security/selinux/include/security.h.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/include/security.h	2006-06-07 14:04:52.000000000 -0400
@@ -68,6 +68,8 @@ int security_context_to_sid(char *sconte
 
 int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *out_sid, u32 def_sid);
 
+int security_context_to_sid_force(char *scontext, u32 scontext_len, u32 *sid);
+
 int security_get_user_sids(u32 callsid, char *username,
 			   u32 **sids, u32 *nel);
 
--- linux-2.6.16/security/selinux/ss/context.h.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/ss/context.h	2006-06-07 14:04:52.000000000 -0400
@@ -28,6 +28,8 @@ struct context {
 	u32 role;
 	u32 type;
 	struct mls_range range;
+	char *str;	/* string representation if context cannot be mapped. */
+	u32 len;        /* length of string in bytes, including NUL byte. */
 };
 
 static inline void mls_context_init(struct context *c)
@@ -83,6 +85,14 @@ static inline void context_init(struct c
 
 static inline int context_cpy(struct context *dst, struct context *src)
 {
+	context_init(dst);
+	if (src->len) {
+		dst->str = kstrdup(src->str, GFP_ATOMIC);
+		if (!dst->str)
+			return -ENOMEM;
+		dst->len = src->len;
+		return 0;
+	}
 	dst->user = src->user;
 	dst->role = src->role;
 	dst->type = src->type;
@@ -91,12 +101,17 @@ static inline int context_cpy(struct con
 
 static inline void context_destroy(struct context *c)
 {
-	c->user = c->role = c->type = 0;
+	kfree(c->str);
 	mls_context_destroy(c);
+	context_init(c);
 }
 
 static inline int context_cmp(struct context *c1, struct context *c2)
 {
+	if (c1->len && c2->len)
+		return (c1->len == c2->len && !memcmp(c1->str, c2->str, c1->len));
+	if (c1->len || c2->len)
+		return 0;
 	return ((c1->user == c2->user) &&
 		(c1->role == c2->role) &&
 		(c1->type == c2->type) &&
--- linux-2.6.16/security/selinux/ss/mls.c.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/ss/mls.c	2006-06-07 14:04:52.000000000 -0400
@@ -249,7 +249,8 @@ static inline int mls_copy_context(struc
  * Policy read-lock must be held for sidtab lookup.
  *
  */
-int mls_context_to_sid(char oldc,
+int mls_context_to_sid(struct policydb *pol,
+		       char oldc,
 		       char **scontext,
 		       struct context *context,
 		       struct sidtab *s,
@@ -296,7 +297,7 @@ int mls_context_to_sid(char oldc,
 		*p++ = 0;
 
 	for (l = 0; l < 2; l++) {
-		levdatum = hashtab_search(policydb.p_levels.table, scontextp);
+		levdatum = hashtab_search(pol->p_levels.table, scontextp);
 		if (!levdatum) {
 			rc = -EINVAL;
 			goto out;
@@ -320,7 +321,7 @@ int mls_context_to_sid(char oldc,
 					*rngptr++ = 0;
 				}
 
-				catdatum = hashtab_search(policydb.p_cats.table,
+				catdatum = hashtab_search(pol->p_cats.table,
 				                          scontextp);
 				if (!catdatum) {
 					rc = -EINVAL;
@@ -336,7 +337,7 @@ int mls_context_to_sid(char oldc,
 				if (rngptr) {
 					int i;
 
-					rngdatum = hashtab_search(policydb.p_cats.table, rngptr);
+					rngdatum = hashtab_search(pol->p_cats.table, rngptr);
 					if (!rngdatum) {
 						rc = -EINVAL;
 						goto out;
--- linux-2.6.16/security/selinux/ss/mls.h.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/ss/mls.h	2006-06-07 14:04:52.000000000 -0400
@@ -21,7 +21,8 @@ int mls_compute_context_len(struct conte
 void mls_sid_to_context(struct context *context, char **scontext);
 int mls_context_isvalid(struct policydb *p, struct context *c);
 
-int mls_context_to_sid(char oldc,
+int mls_context_to_sid(struct policydb *p,
+		       char oldc,
 	               char **scontext,
 		       struct context *context,
 		       struct sidtab *s,
--- linux-2.6.16/security/selinux/ss/services.c.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/ss/services.c	2006-06-07 14:04:52.000000000 -0400
@@ -617,48 +617,31 @@ out:
 
 }
 
-static int security_context_to_sid_core(char *scontext, u32 scontext_len, u32 *sid, u32 def_sid)
+static int string_to_context_struct(struct policydb *pol,
+				    struct sidtab *sidtabp,
+				    char *scontext,
+				    u32 scontext_len,
+				    struct context *ctx,
+				    u32 def_sid)
 {
-	char *scontext2;
-	struct context context;
+	char *scontext2 = NULL;
 	struct role_datum *role;
 	struct type_datum *typdatum;
 	struct user_datum *usrdatum;
 	char *scontextp, *p, oldc;
 	int rc = 0;
 
-	if (!ss_initialized) {
-		int i;
+	context_init(ctx);
 
-		for (i = 1; i < SECINITSID_NUM; i++) {
-			if (!strcmp(initial_sid_to_string[i], scontext)) {
-				*sid = i;
-				goto out;
-			}
-		}
-		*sid = SECINITSID_KERNEL;
-		goto out;
-	}
-	*sid = SECSID_NULL;
-
-	/* Copy the string so that we can modify the copy as we parse it.
-	   The string should already by null terminated, but we append a
-	   null suffix to the copy to avoid problems with the existing
-	   attr package, which doesn't view the null terminator as part
-	   of the attribute value. */
-	scontext2 = kmalloc(scontext_len+1,GFP_KERNEL);
+	/* Copy the string so that we can modify the copy as we parse it. */
+	scontext2 = kmalloc(scontext_len+1, GFP_ATOMIC);
 	if (!scontext2) {
 		rc = -ENOMEM;
-		goto out;
+		goto err;
 	}
 	memcpy(scontext2, scontext, scontext_len);
 	scontext2[scontext_len] = 0;
 
-	context_init(&context);
-	*sid = SECSID_NULL;
-
-	POLICY_RDLOCK;
-
 	/* Parse the security context. */
 
 	rc = -EINVAL;
@@ -670,15 +653,15 @@ static int security_context_to_sid_core(
 		p++;
 
 	if (*p == 0)
-		goto out_unlock;
+		goto err;
 
 	*p++ = 0;
 
-	usrdatum = hashtab_search(policydb.p_users.table, scontextp);
+	usrdatum = hashtab_search(pol->p_users.table, scontextp);
 	if (!usrdatum)
-		goto out_unlock;
+		goto err;
 
-	context.user = usrdatum->value;
+	ctx->user = usrdatum->value;
 
 	/* Extract role. */
 	scontextp = p;
@@ -686,14 +669,14 @@ static int security_context_to_sid_core(
 		p++;
 
 	if (*p == 0)
-		goto out_unlock;
+		goto err;
 
 	*p++ = 0;
 
-	role = hashtab_search(policydb.p_roles.table, scontextp);
+	role = hashtab_search(pol->p_roles.table, scontextp);
 	if (!role)
-		goto out_unlock;
-	context.role = role->value;
+		goto err;
+	ctx->role = role->value;
 
 	/* Extract type. */
 	scontextp = p;
@@ -702,32 +685,74 @@ static int security_context_to_sid_core(
 	oldc = *p;
 	*p++ = 0;
 
-	typdatum = hashtab_search(policydb.p_types.table, scontextp);
+	typdatum = hashtab_search(pol->p_types.table, scontextp);
 	if (!typdatum)
-		goto out_unlock;
+		goto err;
 
-	context.type = typdatum->value;
+	ctx->type = typdatum->value;
 
-	rc = mls_context_to_sid(oldc, &p, &context, &sidtab, def_sid);
+	rc = mls_context_to_sid(pol, oldc, &p, ctx, sidtabp, def_sid);
 	if (rc)
-		goto out_unlock;
+		goto err;
 
-	if ((p - scontext2) < scontext_len) {
-		rc = -EINVAL;
-		goto out_unlock;
-	}
+	rc = -EINVAL;
+	if ((p - scontext2) < scontext_len)
+		goto err;
 
 	/* Check the validity of the new context. */
-	if (!policydb_context_isvalid(&policydb, &context)) {
-		rc = -EINVAL;
-		goto out_unlock;
+	if (!policydb_context_isvalid(pol, ctx))
+		goto err;
+
+	rc = 0;
+out:
+	kfree(scontext2);
+	return rc;
+err:
+	context_destroy(ctx);
+	goto out;
+}
+
+static int security_context_to_sid_core(char *scontext, u32 scontext_len, u32 *sid, u32 def_sid, int force)
+{
+	struct context context;
+	int rc = 0;
+
+	if (!ss_initialized) {
+		int i;
+
+		for (i = 1; i < SECINITSID_NUM; i++) {
+			if (!strcmp(initial_sid_to_string[i], scontext)) {
+				*sid = i;
+				goto out;
+			}
+		}
+		*sid = SECINITSID_KERNEL;
+		goto out;
 	}
-	/* Obtain the new sid. */
+	*sid = SECSID_NULL;
+
+	POLICY_RDLOCK;
+	rc = string_to_context_struct(&policydb, &sidtab,
+				      scontext, scontext_len,
+				      &context, def_sid);
+	if (rc == -EINVAL && force && scontext_len) {
+		context_init(&context);
+		context.len = scontext_len;
+		if (scontext[scontext_len-1])
+			context.len++; /* extend for NUL. */
+		context.str = kmalloc(context.len, GFP_ATOMIC);
+		if (!context.str) {
+			rc = -ENOMEM;
+			goto out_unlock;
+		}
+		memcpy(context.str, scontext, scontext_len);
+		context.str[context.len-1] = 0;
+	} else if (rc)
+		goto out_unlock;
 	rc = sidtab_context_to_sid(&sidtab, &context, sid);
+	context_destroy(&context);
 out_unlock:
 	POLICY_RDUNLOCK;
-	context_destroy(&context);
-	kfree(scontext2);
 out:
 	return rc;
 }
@@ -746,7 +771,7 @@ out:
 int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid)
 {
 	return security_context_to_sid_core(scontext, scontext_len,
-	                                    sid, SECSID_NULL);
+	                                    sid, SECSID_NULL, 0);
 }
 
 /**
@@ -763,13 +788,21 @@ int security_context_to_sid(char *sconte
  * The default SID is passed to the MLS layer to be used to allow
  * kernel labeling of the MLS field if the MLS field is not present
  * (for upgrading to MLS without full relabel).
+ * Adds the string representation if the context cannot be mapped under
+ * current policy.
  * Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient
  * memory is available, or 0 on success.
  */
 int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *sid, u32 def_sid)
 {
 	return security_context_to_sid_core(scontext, scontext_len,
-	                                    sid, def_sid);
+	                                    sid, def_sid, 1);
+}
+
+int security_context_to_sid_force(char *scontext, u32 scontext_len, u32 *sid)
+{
+	return security_context_to_sid_core(scontext, scontext_len,
+	                                    sid, SECSID_NULL, 1);
 }
 
 static int compute_sid_handle_invalid_context(
@@ -1106,9 +1139,10 @@ static inline int convert_context_handle
 		char *s;
 		u32 len;
 
-		context_struct_to_string(context, &s, &len);
-		printk(KERN_ERR "security:  context %s is invalid\n", s);
-		kfree(s);
+		if (!context_struct_to_string(context, &s, &len)) {
+			printk(KERN_WARNING "SELinux:  Context %s would be invalid if enforcing\n", s);
+			kfree(s);
+		}
 	}
 	return rc;
 }
@@ -1140,6 +1174,27 @@ static int convert_context(u32 key,
 
 	args = p;
 
+	if (c->str) {
+		struct context ctx;
+		rc = string_to_context_struct(args->newp, NULL, c->str,
+					      c->len, &ctx, SECSID_NULL);
+		if (!rc) {
+			printk(KERN_INFO "SELinux:  Context %s became valid under new policy.\n", c->str);
+			/* Replace string with mapped representation. */
+			kfree(c->str);
+			memcpy(c, &ctx, sizeof(*c));
+			goto out;
+		} else if (rc == -EINVAL) {
+			/* Retain string representation for later mapping. */
+			rc = 0;
+			goto out;
+		} else {
+			/* Other error condition, e.g. ENOMEM. */
+			printk(KERN_ERR "SELinux:   Failed trying to map context %s (rc %d) under new policy, leaving unmapped.\n", c->str, -rc);
+			goto out;
+		}
+	}
+
 	rc = context_cpy(&oldc, c);
 	if (rc)
 		goto out;
@@ -1149,46 +1204,48 @@ static int convert_context(u32 key,
 	/* Convert the user. */
 	usrdatum = hashtab_search(args->newp->p_users.table,
 	                          args->oldp->p_user_val_to_name[c->user - 1]);
-	if (!usrdatum) {
-		goto bad;
-	}
+	if (!usrdatum)
+		goto map;
 	c->user = usrdatum->value;
 
 	/* Convert the role. */
 	role = hashtab_search(args->newp->p_roles.table,
 	                      args->oldp->p_role_val_to_name[c->role - 1]);
-	if (!role) {
-		goto bad;
-	}
+	if (!role)
+		goto map;
 	c->role = role->value;
 
 	/* Convert the type. */
 	typdatum = hashtab_search(args->newp->p_types.table,
 	                          args->oldp->p_type_val_to_name[c->type - 1]);
-	if (!typdatum) {
-		goto bad;
-	}
+	if (!typdatum)
+		goto map;
 	c->type = typdatum->value;
 
 	rc = mls_convert_context(args->oldp, args->newp, c);
 	if (rc)
-		goto bad;
+		goto map;
 
 	/* Check the validity of the new context. */
 	if (!policydb_context_isvalid(args->newp, c)) {
 		rc = convert_context_handle_invalid_context(&oldc);
 		if (rc)
-			goto bad;
+			goto map;
 	}
 
 	context_destroy(&oldc);
 out:
 	return rc;
-bad:
-	context_struct_to_string(&oldc, &s, &len);
+map:
+	/* Map old representation to string and save it. */
+	if (context_struct_to_string(&oldc, &s, &len))
+		return -ENOMEM;
 	context_destroy(&oldc);
-	printk(KERN_ERR "security:  invalidating context %s\n", s);
-	kfree(s);
+	context_destroy(c);
+	c->str = s;
+	c->len = len;
+	printk(KERN_INFO "SELinux:  Context %s became invalid under new policy.\n", c->str);
+	rc = 0;
 	goto out;
 }
 
@@ -1247,7 +1304,11 @@ int security_load_policy(void *data, siz
 		return -EINVAL;
 	}
 
-	sidtab_init(&newsidtab);
+	if (sidtab_init(&newsidtab)) {
+		LOAD_UNLOCK;
+		policydb_destroy(&newpolicydb);
+		return -ENOMEM;
+	}
 
 	/* Verify that the existing classes did not change. */
 	if (hashtab_map(policydb.p_classes.table, validate_class, &newpolicydb)) {
@@ -1265,10 +1326,12 @@ int security_load_policy(void *data, siz
 	}
 
 	/* Convert the internal representations of contexts
-	   in the new SID table and remove invalid SIDs. */
+	   in the new SID table. */
 	args.oldp = &policydb;
 	args.newp = &newpolicydb;
-	sidtab_map_remove_on_error(&newsidtab, convert_context, &args);
+	rc = sidtab_map(&newsidtab, convert_context, &args);
+	if (rc)
+		goto err;
 
 	/* Save the old policydb and SID table to free later. */
 	memcpy(&oldpolicydb, &policydb, sizeof policydb);
@@ -1518,6 +1581,8 @@ int security_get_user_sids(u32 fromsid,
 
 	POLICY_RDLOCK;
 
+	context_init(&usercon);
+
 	fromcon = sidtab_search(&sidtab, fromsid);
 	if (!fromcon) {
 		rc = -EINVAL;
--- linux-2.6.16/security/selinux/ss/sidtab.c.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/ss/sidtab.c	2006-06-07 14:04:52.000000000 -0400
@@ -100,7 +100,7 @@ struct context *sidtab_search(struct sid
 	while (cur != NULL && sid > cur->sid)
 		cur = cur->next;
 
-	if (cur == NULL || sid != cur->sid) {
+	if (cur == NULL || sid != cur->sid || cur->context.len) {
 		/* Remap invalid SIDs to the unlabeled SID. */
 		sid = SECINITSID_UNLABELED;
 		hvalue = SIDTAB_HASH(sid);
@@ -218,6 +218,8 @@ int sidtab_context_to_sid(struct sidtab 
 			goto unlock_out;
 		}
 		sid = s->next_sid++;
+		if (context->len)
+			printk(KERN_INFO "SELinux:  Context %s is not valid under current policy, adding as unmapped value.\n", context->str);
 		ret = sidtab_insert(s, sid, context);
 		if (ret)
 			s->next_sid--;
--- linux-2.6.16/security/selinux/hooks.c.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/hooks.c	2006-06-07 14:04:52.000000000 -0400
@@ -2133,6 +2133,11 @@ static int selinux_inode_setxattr(struct
 		return rc;
 
 	rc = security_context_to_sid(value, size, &newsid);
+	if (rc == -EINVAL) {
+		if (task_has_security(current, SECURITY__LABELPRIV))
+			return rc;
+		rc = security_context_to_sid_force(value, size, &newsid);
+	}
 	if (rc)
 		return rc;
 
@@ -2166,10 +2171,11 @@ static void selinux_inode_post_setxattr(
 		return;
 	}
 
-	rc = security_context_to_sid(value, size, &newsid);
+	rc = security_context_to_sid_force(value, size, &newsid);
 	if (rc) {
 		printk(KERN_WARNING "%s:  unable to obtain SID for context "
-		       "%s, rc=%d\n", __FUNCTION__, (char*)value, -rc);
+		       "%s on (%s, %lu), rc=%d\n", __FUNCTION__, (char*)value,
+		       inode->i_sb->s_id, inode->i_ino, -rc);
 		return;
 	}
 
@@ -4141,6 +4147,12 @@ static int selinux_setprocattr(struct ta
 			size--;
 		}
 		error = security_context_to_sid(value, size, &sid);
+		if (error == -EINVAL && !strcmp(name, "fscreate")) {
+			if (task_has_security(current, SECURITY__LABELPRIV))
+				return error;
+			error = security_context_to_sid_force(value, size,
+							      &sid);
+		}
 		if (error)
 			return error;
 	}
--- linux-2.6.16/security/selinux/selinuxfs.c.inode.old	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16/security/selinux/selinuxfs.c	2006-06-07 14:04:52.000000000 -0400
@@ -54,8 +54,8 @@ static int *bool_pending_values = NULL;
 extern void selnl_notify_setenforce(int val);
 
 /* Check whether a task is allowed to use a security operation. */
-static int task_has_security(struct task_struct *tsk,
-			     u32 perms)
+int task_has_security(struct task_struct *tsk,
+		      u32 perms)
 {
 	struct task_security_struct *tsec;
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2252
retrieving revision 1.2252.2.1
diff -u -r1.2252 -r1.2252.2.1
--- kernel-2.6.spec	6 Jun 2006 04:35:47 -0000	1.2252
+++ kernel-2.6.spec	8 Jun 2006 15:33:22 -0000	1.2252.2.1
@@ -26,7 +26,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6.deferred.inode.label
 %define signmodules 0
 %define xen_version 20060602
 %define make_target bzImage
@@ -384,6 +384,7 @@
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
+Patch1802: linux-2.6-selinux-deferred-inode-label.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -1029,6 +1030,8 @@
 %patch1800 -p1
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
+# Allow trusted programs (rpm) to create files with undefined SID's
+%patch1802 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1



From fedora-cvs-commits at redhat.com  Thu Jun  8 15:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 11:57:20 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.22,1.23
Message-ID: <200606081557.k58FvKex009357@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9343

Modified Files:
	xmlto.spec 
Log Message:
* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-11
- Rebuilt.



Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xmlto.spec	5 Jun 2006 08:41:29 -0000	1.22
+++ xmlto.spec	8 Jun 2006 15:57:18 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 10
+Release: 11
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
@@ -58,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-11
+- Rebuilt.
+
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-10
 - Rebuilt.
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:10:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:10:25 -0400
Subject: rpms/redhat-menus/devel redhat-menus.spec,1.59,1.60
Message-ID: <200606081610.k58GAPCR009717@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9704

Modified Files:
	redhat-menus.spec 
Log Message:
Fix missing BR


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- redhat-menus.spec	3 Mar 2006 04:22:49 -0000	1.59
+++ redhat-menus.spec	8 Jun 2006 16:10:22 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 6.7.5
-Release: 1
+Release: 2
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -14,6 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: perl(XML::Parser)
 Requires(post): /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
 
@@ -66,6 +67,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 6.7.5-2
+- Add missing BR of perl-XML-Parser
+
 * Thu Mar 2 2006 Bill Nottingham <notting at redhat.com> - 6.7.5-1
 - add locales (#176139)
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:12:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:12:10 -0400
Subject: rpms/xmlto/devel xmlto-debug.patch,NONE,1.1 xmlto.spec,1.23,1.24
Message-ID: <200606081612.k58GCAcS020237@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20190

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-debug.patch 
Log Message:
* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-12
- Debug build.


xmlto-debug.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xmlto-debug.patch ---
--- xmlto-0.0.18/Makefile.in.debug	2006-06-08 17:09:43.000000000 +0100
+++ xmlto-0.0.18/Makefile.in	2006-06-08 17:10:24.000000000 +0100
@@ -820,7 +820,7 @@
 $(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
 	for xml in xmlif.xml xmlto.xml; do \
 	  FORMAT_DIR=$(top_srcdir)/format XSL_DIR=$(top_srcdir)/xsl \
-	   bash ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
+	   strace -feconnect bash ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
 	done || ( RC=$$?; cat $(top_srcdir)/FAQ; exit $$RC )
 
 tag:


Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xmlto.spec	8 Jun 2006 15:57:18 -0000	1.23
+++ xmlto.spec	8 Jun 2006 16:12:08 -0000	1.24
@@ -3,12 +3,13 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 11
+Release: 12
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
 Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 Patch0: xmlto-basename.patch
+Patch1: xmlto-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 BuildRequires: docbook-xsl >= 1.56.0
@@ -37,6 +38,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .basename
+%patch1 -p1 -b .debug
 
 %build
 touch doc/xmlto.xml doc/xmlif.xml
@@ -58,6 +60,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-12
+- Debug build.
+
 * Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-11
 - Rebuilt.
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:16:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:16:00 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.24,1.25
Message-ID: <200606081616.k58GG0Eb021561@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21208

Modified Files:
	xmlto.spec 
Log Message:
Build requires strace for debug.


Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xmlto.spec	8 Jun 2006 16:12:08 -0000	1.24
+++ xmlto.spec	8 Jun 2006 16:15:57 -0000	1.25
@@ -15,6 +15,7 @@
 BuildRequires: docbook-xsl >= 1.56.0
 BuildRequires: libxslt
 BuildRequires: util-linux, flex
+BuildRequires: strace
 
 # We rely heavily on the DocBook XSL stylesheets!
 Requires: docbook-xsl >= 1.56.0



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:20:20 -0400
Subject: rpms/libxklavier/devel libxklavier.spec,1.22,1.23
Message-ID: <200606081620.k58GKKq0004317@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4292

Modified Files:
	libxklavier.spec 
Log Message:
Fixed missing BR


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libxklavier.spec	7 Jun 2006 22:05:40 -0000	1.22
+++ libxklavier.spec	8 Jun 2006 16:20:17 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	2.2
-Release: 2
+Release: 	3
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -9,6 +9,7 @@
 BuildRequires: libxml2-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
+BuildRequires: libxml2-devel
 Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -69,6 +70,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Jun  8 2006 Jesse Keating <jkeating at redhat.com> - 2.2-3
+- Add missing BR libxml2-devel
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 2.2-2
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:25:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:25:29 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.25,1.26 xmlto-debug.patch,1.1,NONE
Message-ID: <200606081625.k58GPTqY006024@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5997

Modified Files:
	xmlto.spec 
Removed Files:
	xmlto-debug.patch 
Log Message:
* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-13
- Removed debugging.



Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xmlto.spec	8 Jun 2006 16:15:57 -0000	1.25
+++ xmlto.spec	8 Jun 2006 16:25:26 -0000	1.26
@@ -9,13 +9,11 @@
 URL: http://cyberelk.net/tim/xmlto/
 Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 Patch0: xmlto-basename.patch
-Patch1: xmlto-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 BuildRequires: docbook-xsl >= 1.56.0
 BuildRequires: libxslt
 BuildRequires: util-linux, flex
-BuildRequires: strace
 
 # We rely heavily on the DocBook XSL stylesheets!
 Requires: docbook-xsl >= 1.56.0
@@ -39,7 +37,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .basename
-%patch1 -p1 -b .debug
 
 %build
 touch doc/xmlto.xml doc/xmlif.xml
@@ -61,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-13
+- Removed debugging.
+
 * Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-12
 - Debug build.
 


--- xmlto-debug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:25:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:25:45 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.26,1.27
Message-ID: <200606081625.k58GPjKp006174@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6143

Modified Files:
	xmlto.spec 
Log Message:
0.0.18-13


Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xmlto.spec	8 Jun 2006 16:25:26 -0000	1.26
+++ xmlto.spec	8 Jun 2006 16:25:43 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 12
+Release: 13
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:32:16 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2255,1.2256
Message-ID: <200606081632.k58GWGwS008060@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8035

Modified Files:
	kernel-2.6.spec 
Log Message:
dist hackery


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2255
retrieving revision 1.2256
diff -u -r1.2255 -r1.2256
--- kernel-2.6.spec	8 Jun 2006 00:40:01 -0000	1.2255
+++ kernel-2.6.spec	8 Jun 2006 16:32:00 -0000	1.2256
@@ -26,7 +26,9 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6
+%define tag %([ -r branch ] && cat branch |sed s/RHEL-5/EL/ | sed s/FC-6/FC6/ || echo FC6)
+%define rel %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}_%tag)
+%define release %(echo %rel | sed -e 's/\ //')
 %define signmodules 0
 %define xen_version 20060602
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:44:32 -0400
Subject: rpms/libselinux/FC-5 libselinux.spec,1.187,1.188
Message-ID: <200606081644.k58GiWp6010524@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10476

Modified Files:
	libselinux.spec 
Log Message:
* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-3.fc5
- Apply patch this time...



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- libselinux.spec	6 Jun 2006 18:28:29 -0000	1.187
+++ libselinux.spec	8 Jun 2006 16:44:30 -0000	1.188
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.3
-Release: 2.fc5
+Release: 3.fc5
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -50,6 +50,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -115,6 +116,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-3.fc5
+- Apply patch this time...
+
 * Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-2.fc5
 - Back port lots of fixes from Rawhide.  No changes to translations.
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:53:13 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.137,1.138
Message-ID: <200606081653.k58GrD1v028353@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28311

Modified Files:
	gnome-applets.spec 
Log Message:
fix spec



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-applets.spec	8 Jun 2006 14:29:57 -0000	1.137
+++ gnome-applets.spec	8 Jun 2006 16:53:11 -0000	1.138
@@ -115,8 +115,7 @@
 %configure			\
 	--enable-suid=no 	\
 	--disable-scrollkeeper 	\
-	--enable-mini-commander \
-	--with
+	--enable-mini-commander 
 make
 
 %install



From fedora-cvs-commits at redhat.com  Thu Jun  8 16:56:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 12:56:04 -0400
Subject: rpms/gmp/devel .cvsignore, 1.8, 1.9 gmp.spec, 1.25, 1.26 sources,
	1.8, 1.9
Message-ID: <200606081656.k58Gu4nD029506@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29446

Modified Files:
	.cvsignore gmp.spec sources 
Log Message:
[tw]
- new version 4.2.1
- mpfr moved out of gmp




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Sep 2004 08:14:20 -0000	1.8
+++ .cvsignore	8 Jun 2006 16:56:02 -0000	1.9
@@ -1,2 +1 @@
-gmp-4.1.3.tar.bz2
-gmp-4.1.4.tar.bz2
+gmp-4.2.1.tar.bz2


Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gmp.spec	11 Feb 2006 03:12:15 -0000	1.25
+++ gmp.spec	8 Jun 2006 16:56:02 -0000	1.26
@@ -7,18 +7,16 @@
 
 Summary: A GNU arbitrary precision library.
 Name: gmp
-Version: 4.1.4
-Release: 6.2.1
+Version: 4.2.1
+Release: 1
 URL: http://www.swox.com/gmp/
 Source: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Patch0: gmp-4.0.1-s390.patch
-Patch1: gmp-4.1.2-ppc64.patch
 Patch2: gmp-4.1.2-autoconf.patch
-Patch3: gmp-4.1.4-fpu.patch
 License: LGPL 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake16 autoconf libtool
+BuildRequires: libtool
 
 %description
 The gmp package contains GNU MP, a library for arbitrary precision
@@ -35,7 +33,7 @@
 %package devel
 Summary: Development tools for the GNU MP arbitrary precision library.
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 PreReq: /sbin/install-info
 
 %description devel
@@ -49,24 +47,17 @@
 %prep
 %setup -q
 %patch0 -p1
-#patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .fpu
-
-libtoolize --force
-aclocal-1.6 -I mpn -I mpfr
-automake-1.6
-autoconf
 
 %build
 if as --help | grep -q execstack; then
   # the object files do not require an executable stack
   export CCAS="gcc -c -Wa,--noexecstack"
 fi
-mkdir base
-cd base
+mkdir build
+cd build
 ln -s ../configure .
-%configure --enable-mpbsd --enable-mpfr --enable-cxx
+%configure --enable-mpbsd --disable-mpfr --enable-cxx
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
@@ -76,7 +67,7 @@
 cd build-sse2
 ln -s ../configure .
 CFLAGS="-O2 -g -march=pentium4"
-%configure --enable-mpbsd --enable-mpfr --enable-cxx pentium4-redhat-linux
+%configure --enable-mpbsd --disable-mpfr --enable-cxx pentium4-redhat-linux
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
@@ -85,7 +76,7 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-cd base
+cd build
 export LD_LIBRARY_PATH=`pwd`/.libs
 %{makeinstall}
 install -m 644 gmp-mparam.h ${RPM_BUILD_ROOT}%{_includedir}
@@ -112,7 +103,7 @@
 
 %check
 %ifnarch ppc
-cd base
+cd build
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags} check
 cd ..
@@ -129,11 +120,11 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gmp.info.gz %{_infodir}/dir
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gmp.info.*
 
 %preun devel
 if [ "$1" = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/gmp.info.gz %{_infodir}/dir
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gmp.info.*
 fi
 
 %clean
@@ -146,7 +137,7 @@
 %{_libdir}/libmp.so.*
 %{_libdir}/libgmpxx.so.*
 %ifarch %{ix86}
-%{_libdir}/sse2/*
+%{_libdir}/sse2/libgmp*
 %endif
 
 %files devel
@@ -157,12 +148,14 @@
 %{_libdir}/libmp.a
 %{_libdir}/libgmp.a
 %{_libdir}/libgmpxx.a
-%{_libdir}/libmpfr.a
 %{_includedir}/*.h
 %{_infodir}/gmp.info*
-%{_infodir}/mpfr.info*
 
 %changelog
+* Thu Jun  8 2006 Thomas Woerner <twoerner at redhat.com> 4.2.1-1
+- new version 4.2.1
+- mpfr moved out of gmp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.4-6.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Sep 2004 08:14:20 -0000	1.8
+++ sources	8 Jun 2006 16:56:02 -0000	1.9
@@ -1 +1 @@
-0aa7d3b3f5b5ec5951e7dddd6f65e891  gmp-4.1.4.tar.bz2
+091c56e0e1cca6b09b17b69d47ef18e3  gmp-4.2.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:08:48 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.3-kioslave_media_dbus.patch, NONE,
	1.1 kdebase.spec, 1.168,
	1.169 kdebase-3.5.2-kioslave_media_dbus.patch, 1.2, NONE
Message-ID: <200606081708.k58H8m2p031912@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31749

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kioslave_media_dbus.patch 
Removed Files:
	kdebase-3.5.2-kioslave_media_dbus.patch 
Log Message:
update kioslave_media_dbus patch


kdebase-3.5.3-kioslave_media_dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |    7 
 kcmodule/managermodule.cpp                  |    4 
 kcmodule/media.desktop                      |    2 
 kfile-plugin/kfile_media.desktop            |    2 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.cpp                   |    4 
 libmediacommon/medium.h                     |   21 
 mediaimpl.cpp                               |   15 
 mediamanager/halbackend.cpp                 |  620 +++++++++++++++++++++++++++-
 mediamanager/halbackend.h                   |   19 
 mediamanager/mediamanager.cpp               |   81 +++
 mediamanager/mediamanager.h                 |    8 
 medianotifier/medianotifier.cpp             |    9 
 mimetypes/audiocd.desktop                   |    4 
 mimetypes/blankcd.desktop                   |    2 
 mimetypes/blankdvd.desktop                  |    2 
 mimetypes/cdrom_mounted.desktop             |    4 
 mimetypes/cdrom_unmounted.desktop           |    2 
 mimetypes/cdwriter_mounted.desktop          |    2 
 mimetypes/cdwriter_unmounted.desktop        |    2 
 mimetypes/dvdvideo.desktop                  |    4 
 mimetypes/floppy5_mounted.desktop           |    2 
 mimetypes/floppy5_unmounted.desktop         |    2 
 mimetypes/floppy_mounted.desktop            |    2 
 mimetypes/floppy_unmounted.desktop          |    2 
 mimetypes/hdd_mounted.desktop               |    1 
 mimetypes/hdd_unmounted.desktop             |    1 
 mimetypes/nfs_mounted.desktop               |    1 
 mimetypes/nfs_unmounted.desktop             |    1 
 mimetypes/removable_mounted.desktop         |    5 
 mimetypes/removable_unmounted.desktop       |    5 
 mimetypes/smb_mounted.desktop               |    3 
 mimetypes/smb_unmounted.desktop             |    3 
 mimetypes/vcd.desktop                       |    1 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   51 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  217 +++++++++
 propsdlgplugin/propertiespage.h             |   46 ++
 propsdlgplugin/propertiespagegui.ui         |  390 +++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 ++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 +
 services/media_eject.desktop                |    2 
 46 files changed, 1654 insertions(+), 96 deletions(-)

--- NEW FILE kdebase-3.5.3-kioslave_media_dbus.patch ---
--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -54,7 +54,10 @@
 {
 	kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
 	          << allowNotification << ")" << endl;
-	
+
+	if ( !allowNotification )
+	  return;
+
 // Update user activity timestamp, otherwise the notification dialog will be shown
 // in the background due to focus stealing prevention. Entering a new media can
 // be seen as a kind of user activity after all. It'd be better to update the timestamp
@@ -95,11 +98,11 @@
 {
 	QString mimetype = medium.mimetype();
 
-	bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" );
+	bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" );
 	bool is_mounted = mimetype.endsWith( "_mounted" );
 	
 	// We autorun only on CD/DVD or removable disks (USB, Firewire)
-	if ( !( is_cdrom && is_mounted )
+	if ( !( is_cdrom || is_mounted )
 	  && mimetype!="media/removable_mounted" )
 	{
 		return false;
--- kdebase-3.5.2/kioslave/media/services/media_eject.desktop.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/services/media_eject.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -23,7 +23,7 @@
 Name[eo]=Eligo
 Name[es]=Expulsar
 Name[et]=V??ljastamine
-Name[eu]=Egotzi
+Name[eu]=Kanporatu
 Name[fa]=??????????
 Name[fi]=Poista
 Name[fr]=??jecter
--- kdebase-3.5.2/kioslave/media/libmediacommon/medium.h.kio	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.h	2006-04-28 18:22:09.000000000 +0200
@@ -22,6 +22,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 #include <kurl.h>
+#include <qmap.h>
 
 class Medium
 {
@@ -78,14 +79,32 @@
 
 	void setMimeType(const QString &mimeType);
 	void setIconName(const QString &iconName);
+	void setHalMounted(bool flag) const { m_halmounted = flag; }
+	bool halMounted() const { return m_halmounted; }
 
 private:
 	Medium();
 	void loadUserLabel();
 
 	QStringList m_properties;
-
+	mutable bool m_halmounted;
+	
 friend class QValueListNode<const Medium>;
 };
 
+namespace MediaManagerUtils {
+  static inline QMap<QString,QString> splitOptions(const QStringList & options) 
+    {
+      QMap<QString,QString> valids;
+
+      for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+	{
+	  QString key = (*it).left((*it).find('='));
+	  QString value = (*it).mid((*it).find('=') + 1);
+	  valids[key] = value;
+	}
+      return valids;
+    }
+}
+
 #endif
--- kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp.kio	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -40,6 +40,8 @@
 	m_properties+= QString::null; /* ICON_NAME */
 
 	loadUserLabel();
+
+	m_halmounted = false;
 }
 
 Medium::Medium()
@@ -57,6 +59,8 @@
 	m_properties+= QString::null; /* BASE_URL */
 	m_properties+= QString::null; /* MIME_TYPE */
 	m_properties+= QString::null; /* ICON_NAME */
+	
+	m_halmounted = false;
 }
 
 const Medium Medium::create(const QStringList &properties)
--- /dev/null	2006-04-05 11:13:39.664052750 +0200
+++ kdebase-3.5.2/kioslave/media/propsdlgplugin/propertiespage.h	2006-04-28 18:22:09.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+  Copyright (c) 2004 Jan Schaefer <j_schaef at informatik.uni-kl.de>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#ifndef PROPERTIESPAGE_H
+#define PROPERTIESPAGE_H
+
+#include "propertiespagegui.h"
+#include <qmap.h>
+
+class QCheckBox;
+class Medium;
+
+class PropertiesPage : public PropertiesPageGUI
+{
+  Q_OBJECT
+
+public:
+  PropertiesPage(QWidget* parent, const QString &_id);
+  virtual ~PropertiesPage();
+  
+  bool save();
+
+protected:
+  
+  QMap<QString,QString> options;
+  QString id;
+
+};
+
+#endif
--- /dev/null	2006-04-05 11:13:39.664052750 +0200
+++ kdebase-3.5.2/kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+Name=Media Properties Page
+Comment=Konqueror properties dialog plugin to configure mount behaviour
+X-KDE-Library=media_propsdlgplugin
+ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
--- /dev/null	2006-04-05 11:13:39.664052750 +0200
+++ kdebase-3.5.2/kioslave/media/propsdlgplugin/propertiespagegui.ui	2006-04-28 18:22:09.000000000 +0200
@@ -0,0 +1,390 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>PropertiesPageGUI</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>PropertiesPageGUI</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>527</width>
+            <height>476</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string>PropertiesPageGUI</string>
+    </property>
+    <hbox>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QLayoutWidget">
+            <property name="name">
+                <cstring>layout17</cstring>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QGroupBox">
+                    <property name="name">
[...2086 lines suppressed...]
 Comment[sl]=Odklopljen odstranljiv medij
--- kdebase-3.5.2/kioslave/media/mimetypes/blankcd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/blankcd.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -12,7 +12,7 @@
 Comment[da]=Blank cd
 Comment[de]=Leere CD
 Comment[el]=???????? CD
-Comment[es]=CD vac??o
+Comment[es]=Borrar CD
 Comment[et]=T??hi CD
 Comment[eu]=CD hutsik
 Comment[fi]=Tyhj?? CD
--- kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -21,7 +21,6 @@
 Comment[fi]=Irrotettu kiintolevyosio
 Comment[fr]=Partition de disque dur non mont??e
 Comment[fy]=Ofkeppele F??steskiif folume
-Comment[ga]=Imleabhar Diosca Crua Gan Fheisti??
 Comment[gl]=Partiz??n do Disco Duro Non Montada
 Comment[he]=?????????? ???????? ???????? ????????????
 Comment[hi]=?????????????????????????????? ??????????????? ??????????????? ?????????????????????
--- kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -52,7 +52,7 @@
 Comment[pt]=Disquete de 5??" montada
 Comment[pt_BR]=Disquete  5??" Montado
 Comment[ro]=Dischet?? 5??" montat??
-Comment[ru]=???????????????????????????? ?????????????? 5??"
+Comment[ru]=???????????????????????????? ???????????????? 5??"
 Comment[rw]=Disikete 5??" Yashyizwemo
 Comment[se]=??atnon 5??-dibmaskearru
 Comment[sk]=Pripojen?? disketa 5??"
--- kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -19,7 +19,7 @@
 Comment[he]=???????????????? ??????
 Comment[hi]=??????????????? ????????????
 Comment[hu]=Hang-CD
-Comment[is]=Hlj????diskur
+Comment[is]=Hlj???? CD
 Comment[it]=CD audio
 Comment[ja]=??????????????? CD
 Comment[km]=???????????????????????????????????????
@@ -33,7 +33,7 @@
 Comment[pt]=CD ??udio
 Comment[pt_BR]=CD de ??udio
 Comment[ro]=CD Audio
-Comment[ru]=?????????? CD
+Comment[ru]=???????????????? CD
 Comment[rw]=CD y'Inyumvo
 Comment[se]=Jietna-CD
 Comment[sl]=Glasbeni CD
--- kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -53,7 +53,7 @@
 Comment[pt]=Gravador de CDs desmontado
 Comment[pt_BR]=Gravador de CD Desmontado
 Comment[ro]=CD Writer nemontat
-Comment[ru]=?????????????????????????????? CD (?? ???????????????????????? ????????????)
+Comment[ru]=?????????????????????????????? CD Writer
 Comment[rw]=Mwandika CD Yakuwemo
 Comment[se]=G??lgajuvvon CD-????lli
 Comment[sk]=Nepripojen?? napa??ovacia mechanika CD
--- kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -21,7 +21,6 @@
 Comment[fi]=Irrotettu NFS-jako
 Comment[fr]=Ressource NFS non mont??e
 Comment[fy]=Oankeppele NFS-boarne
-Comment[ga]=Comhroinn NFS Gan Fheisti??
 Comment[gl]=Compartiz??n NFS non Montada
 Comment[he]=???????? NFS ??????????
 Comment[hi]=?????????????????????????????? ????????????????????? ????????????
--- kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -53,7 +53,7 @@
 Comment[pt]=CD-ROM desmontado
 Comment[pt_BR]=CD-ROM Desmontado
 Comment[ro]=CD-ROM nemontat
-Comment[ru]=?????????????????????????????? CD
+Comment[ru]=?????????????????????????????? CD-ROM
 Comment[rw]=CD-ROM Yakuwemo
 Comment[se]=G??lgajuvvon CD-ROM
 Comment[sk]=Nepripojen?? CD-ROM
--- kdebase-3.5.2/kioslave/media/mediaimpl.cpp.kio	2005-10-10 17:04:01.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/mediaimpl.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -226,6 +226,8 @@
 
 		mp_mounting = &medium;
 		
+		
+		/*
 		KIO::Job* job = KIO::mount(false, 0,
 		                           medium.deviceNode(),
 		                           medium.mountPoint());
@@ -234,6 +236,7 @@
 		         this, SLOT( slotMountResult( KIO::Job * ) ) );
 		connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
 		         this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
+		*/
 		kapp->dcopClient()
 		->connectDCOPSignal("kded", "mediamanager",
 		                    "mediumChanged(QString, bool)",
@@ -241,7 +244,17 @@
 		                    "slotMediumChanged(QString)",
 		                    false);
 
-		qApp->eventLoop()->enterLoop();
+		DCOPRef mediamanager("kded", "mediamanager");
+		DCOPReply reply = mediamanager.call( "mount", medium.id());
+		if (reply.isValid())
+		  reply.get(m_lastErrorMessage);
+		else
+		  m_lastErrorMessage = i18n("Internal Error");
+		if (!m_lastErrorMessage.isEmpty())
+		  m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
+		else {
+		  qApp->eventLoop()->enterLoop();
+		}
 
 		mp_mounting = 0L;
 		
--- kdebase-3.5.2/kioslave/media/kcmodule/media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -79,7 +79,6 @@
 Comment[fi]=Aseta tallennusmedia
 Comment[fr]=Configurer le m??dia de stockage
 Comment[fy]=Opslachmedia ynstelle
-Comment[ga]=Cumraigh Me??in St??r??la
 Comment[gl]=Configurar Medios de Armacenaxe
 Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa
 Comment[is]=Stillingar geymslumi??la
@@ -123,7 +122,6 @@
 Keywords[fi]=varasto,media,usb,cdrom,laite
 Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique
 Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
-Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as
 Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
 Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z
 Keywords[is]=geymsla,mi??ill,usb,cdrom,t??ki
--- kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp.kio	2005-11-20 20:14:21.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -39,15 +39,15 @@
 	QString hal_text = view->kcfg_HalBackendEnabled->text();
 	hal_text += " ("+i18n("No support for HAL on this system")+")";
 	view->kcfg_HalBackendEnabled->setText( hal_text );
-	view->kcfg_HalBackendEnabled->setEnabled( false );
 #endif
+	view->kcfg_HalBackendEnabled->setEnabled( false );
 
 #ifndef COMPILE_LINUXCDPOLLING
 	QString poll_text = view->kcfg_CdPollingEnabled->text();
 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
 	view->kcfg_CdPollingEnabled->setText( poll_text );
-	view->kcfg_CdPollingEnabled->setEnabled( false );
 #endif
+	view->kcfg_CdPollingEnabled->setEnabled( false );
 
 	load();
 }
--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp.kio	2005-11-08 23:36:07.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -64,12 +64,16 @@
 	addMimeType( "media/floppy_unmounted" );
 	addMimeType( "media/zip_unmounted" );
 	addMimeType( "media/gphoto2camera" );
+	addMimeType( "media/camera_mounted" );
+	addMimeType( "media/camera_unmounted" );	
 }
 
 bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
 {
-	const Medium medium = askMedium(info);
+        const Medium medium = askMedium(info);
 
+	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
+ 
 	if (medium.id().isNull()) return false;
 	
 	QString mount_point = medium.mountPoint();
@@ -161,7 +165,8 @@
 const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
 {
 	DCOPRef mediamanager("kded", "mediamanager");
-	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
+	kdDebug() << "properties " << info.url() << endl;
+	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
 
 	if ( !reply.isValid() )
 	{

--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -58,4 +57,4 @@
 Name[zh_TW]=????????????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_media
-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdebase.spec	8 Jun 2006 12:56:28 -0000	1.168
+++ kdebase.spec	8 Jun 2006 17:08:46 -0000	1.169
@@ -48,7 +48,7 @@
 Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
-Patch12: kdebase-3.5.2-kioslave_media_dbus.patch
+Patch12: kdebase-3.5.3-kioslave_media_dbus.patch
 Patch13: kdebase-3.5.2-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
@@ -400,6 +400,7 @@
 %attr(4755,root,root) %{_bindir}/kcheckpass
 %{_bindir}/kcheckrunning
 %{_bindir}/kcminit
+%{_bindir}/kcminit_startup
 %{_bindir}/kcontrol
 %{_bindir}/kcontroledit
 %{_bindir}/kdcop
@@ -471,7 +472,9 @@
 %{_bindir}/nspluginscan
 %{_bindir}/nspluginviewer
 %{_bindir}/startkde
-%{_libdir}/*.??*
+%{_libdir}/*.so.*
+%{_libdir}/libkdeinit_*.so
+%{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
 %{_datadir}/applications/*
@@ -511,6 +514,9 @@
 %{_includedir}/kde/ksgrd/*
 %dir %{_includedir}/kde/ksplash
 %{_includedir}/kde/ksplash/*
+%{_libdir}/*.so
+%exclude %{_libdir}/libkdeinit_*.so
+
 
 %changelog
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5


--- kdebase-3.5.2-kioslave_media_dbus.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:09:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:09:53 -0400
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.23,1.24
Message-ID: <200606081709.k58H9rSL032125@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-webcal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32098

Modified Files:
	evolution-webcal.spec 
Log Message:
Fixed missing BR


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- evolution-webcal.spec	17 May 2006 20:00:31 -0000	1.23
+++ evolution-webcal.spec	8 Jun 2006 17:09:51 -0000	1.24
@@ -6,7 +6,7 @@
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.7.1
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -16,7 +16,7 @@
 Requires: libgnomeui
 BuildRequires: libsoup-devel >= %{libsoup_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
-BuildRequires: libgnomeui-devel
+BuildRequires: libgnomeui-devel perl(XML::Parser)
 
 %description
 evolution-webcal is a small helper application that can be run when webcal URIs are clicked in web browsers.
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 2.7.1-2
+- Add missing BR perl-XML-Parser
+
 * Wed May 17 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.1-1
 - Update to 2.7.1
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:11:47 -0400
Subject: rpms/redhat-menus/devel redhat-menus.spec,1.60,1.61
Message-ID: <200606081711.k58HBlex032513@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32488

Modified Files:
	redhat-menus.spec 
Log Message:
Add missing gettext



Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- redhat-menus.spec	8 Jun 2006 16:10:22 -0000	1.60
+++ redhat-menus.spec	8 Jun 2006 17:11:42 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 6.7.5
-Release: 2
+Release: 3
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: perl(XML::Parser)
+BuildRequires: perl(XML::Parser) gettext
 Requires(post): /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
 
@@ -67,8 +67,8 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
-* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 6.7.5-2
-- Add missing BR of perl-XML-Parser
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 6.7.5-3
+- Add missing BR of perl-XML-Parser, gettext
 
 * Thu Mar 2 2006 Bill Nottingham <notting at redhat.com> - 6.7.5-1
 - add locales (#176139)



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:18:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:18:43 -0400
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.24,1.25
Message-ID: <200606081718.k58HIhEE017132@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-webcal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17100

Modified Files:
	evolution-webcal.spec 
Log Message:
Fixed missing BR


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- evolution-webcal.spec	8 Jun 2006 17:09:51 -0000	1.24
+++ evolution-webcal.spec	8 Jun 2006 17:18:41 -0000	1.25
@@ -6,7 +6,7 @@
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.7.1
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -16,7 +16,7 @@
 Requires: libgnomeui
 BuildRequires: libsoup-devel >= %{libsoup_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
-BuildRequires: libgnomeui-devel perl(XML::Parser)
+BuildRequires: libgnomeui-devel perl(XML::Parser) gettext
 
 %description
 evolution-webcal is a small helper application that can be run when webcal URIs are clicked in web browsers.
@@ -56,8 +56,8 @@
 
 
 %changelog
-* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 2.7.1-2
-- Add missing BR perl-XML-Parser
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 2.7.1-3
+- Add missing BR perl-XML-Parser, gettext
 
 * Wed May 17 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.1-1
 - Update to 2.7.1



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:19:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:19:16 -0400
Subject: rpms/gnome-spell/devel gnome-spell.spec,1.21,1.22
Message-ID: <200606081719.k58HJGD6017405@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-spell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17380

Modified Files:
	gnome-spell.spec 
Log Message:
Add missing BR


Index: gnome-spell.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-spell.spec	16 May 2006 17:18:59 -0000	1.21
+++ gnome-spell.spec	8 Jun 2006 17:19:14 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Bonobo component for spell checking
 Name: gnome-spell
 Version: 1.0.7
-Release: 2
+Release: 3
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2
 # XXX The pspell compatability layer was added three years ago.
 #     Disable it for now (1.0.7-2) and remove it in the next update.
@@ -12,7 +12,7 @@
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgnomeui, libbonoboui, libglade2
-BuildRequires: aspell-devel, intltool >= 0.11
+BuildRequires: aspell-devel, intltool >= 0.11, gettext
 BuildRequires: libgnomeui-devel, libbonoboui-devel, libglade2-devel
 
 # for aspell back patch
@@ -67,6 +67,9 @@
 %{_datadir}/idl/*
 
 %changelog
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 1.0.7-3
+- Add missing br gettext
+
 * Mon May 15 2006 Matthew Barnes <mbarnes at redhat.com> - 1.0.7-2
 - Own the /usr/lib/gnome-spell directory (closes #169278).
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:22:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:22:22 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.39,1.40
Message-ID: <200606081722.k58HMMME018687@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18660

Modified Files:
	gnome-pilot.spec 
Log Message:
Add missing BR


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-pilot.spec	19 Apr 2006 21:48:54 -0000	1.39
+++ gnome-pilot.spec	8 Jun 2006 17:22:20 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 9
+Release: 10
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -37,6 +37,7 @@
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: gob2 >= 2.0.3
 BuildRequires: pilot-link-devel >= %{pilot_link_version}
+BuildRequires: gettext
 ExcludeArch: s390 s390x
 
 %description
@@ -150,6 +151,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-10
+- Add missing BR gettext
+
 * Wed Apr 19 2006 Than Ngo <than at redhat.com> 2.0.13-9 
 - apply patch to fix crash with pilot-link 0.11.8 #189294
   thanks to Matt Dave



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:29:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:29:25 -0400
Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.17,
	1.18
Message-ID: <200606081729.k58HTPUp021562@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot-conduits/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21540

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
Fixed missing BR


Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-pilot-conduits.spec	29 Mar 2006 22:24:10 -0000	1.17
+++ gnome-pilot-conduits.spec	8 Jun 2006 17:29:23 -0000	1.18
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 4
+Release: 5
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}
 Prereq: /sbin/install-info
 Requires: gnome-pilot >= %{gnome_pilot_version}
-BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
+BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} gettext
 
 %description
 gnome-pilot is a collection of programs and daemon for integrating
@@ -63,6 +63,9 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-5
+- Add missing BR gettext
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2.0.13-4 
 - rebuilt against pilot-link-0.11.8
 - don't apply gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:36:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:36:58 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.138,1.139
Message-ID: <200606081736.k58HawnJ022316@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22285

Modified Files:
	gnome-applets.spec 
Log Message:
try again



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnome-applets.spec	8 Jun 2006 16:53:11 -0000	1.138
+++ gnome-applets.spec	8 Jun 2006 17:36:55 -0000	1.139
@@ -7,12 +7,12 @@
 %define gail_version 1.2.0
 %define libbonoboui_version 2.3.0
 %define gstreamer_plugins_version 0.10
+%define gstreamer_version 0.10
 %define libxklavier_version 1.13
 %define libwnck_version 2.9.3
 %define libgnome_desktop_version 2.10.2
 %define gnome_utils_version 2.8.1
 %define dbus_version 0.60
-%define gstreamer_version 0.10
 %define hal_version 0.5.3
 %define libnotify_version 0.3.2
 
@@ -49,6 +49,7 @@
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gail-devel >= %{gail_version}
 BuildRequires:  libxklavier-devel >= %{libxklavier_version}
+BuildRequires:  gstreamer-devel >= %{gstreamer_version}
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
 BuildRequires:  gstreamer-plugins-good-devel >= %{gstreamer_plugins_version}
 BuildRequires:  /usr/bin/automake
@@ -56,8 +57,6 @@
 BuildRequires:  libwnck-devel >= %{libwnck_version}
 BuildRequires:  gnome-desktop-devel >= %{libgnome_desktop_version}
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
-BuildRequires:  gstreamer >= %{gstreamer_version}
-BuildRequires:  gstreamer-plugins-base >= %{gstreamer_version}
 BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:40:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:40:46 -0400
Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.18,
	1.19
Message-ID: <200606081740.k58Hekxl023093@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot-conduits/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23027

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
Fixed missing BR


Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-pilot-conduits.spec	8 Jun 2006 17:29:23 -0000	1.18
+++ gnome-pilot-conduits.spec	8 Jun 2006 17:40:43 -0000	1.19
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 5
+Release: 6
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}
 Prereq: /sbin/install-info
 Requires: gnome-pilot >= %{gnome_pilot_version}
-BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} gettext
+BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} gettext libtool
 
 %description
 gnome-pilot is a collection of programs and daemon for integrating
@@ -63,8 +63,8 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
-* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-5
-- Add missing BR gettext
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-6
+- Add missing BR gettext, libtool
 
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2.0.13-4 
 - rebuilt against pilot-link-0.11.8



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:40:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:40:53 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.185,1.186
Message-ID: <200606081740.k58HerGZ023158@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23062

Modified Files:
	kdebase.spec 
Log Message:
fix rpm file list



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- kdebase.spec	8 Jun 2006 15:11:42 -0000	1.185
+++ kdebase.spec	8 Jun 2006 17:40:50 -0000	1.186
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 3
+Release: 4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -349,10 +349,13 @@
 %endif
 
 # Own Mozilla plugin dir
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
+mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
+
+# exclude fonts.dir
+rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -518,6 +521,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
+- fix rpm file list
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-3
 - move only *.so symlinks to -devel subpackage
 - enable --enable-new-ldflags again since ld bug fixed



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:43:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:43:56 -0400
Subject: rpms/avalon-framework/devel avalon-framework.spec,1.15,1.16
Message-ID: <200606081743.k58Hhuwd024354@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24278

Modified Files:
	avalon-framework.spec 
Log Message:

Updated description for fix to Bug# 170999




Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- avalon-framework.spec	6 Mar 2006 23:07:50 -0000	1.15
+++ avalon-framework.spec	8 Jun 2006 17:43:53 -0000	1.16
@@ -2,7 +2,7 @@
 %define short_Name	Avalon
 %define name		avalon-%{short_name}
 %define version		4.1.4
-%define release		2jpp_8fc
+%define release		2jpp_9fc
 %define section		free
 
 Name:		%{name}
@@ -34,8 +34,7 @@
 generic components.
 What that means is that we define the central interface Component. We
 also define the relationship (contract) a component has with peers,
-ancestors and children. This documentation introduces you to those
-patterns, interfaces and relationships.
+ancestors and children.
 
 %package manual
 Summary:	Manual for %{name}
@@ -99,6 +98,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Jun  8 2006 Deepak Bhole <dbhole at redhat.com> - 0:4.1.4-2jpp_9fc
+- Updated description for fix to Bug# 170999
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:4.1.4-2jpp_8fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:49:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:49:54 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2256,1.2257
Message-ID: <200606081749.k58HnsYi008811@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8742

Modified Files:
	kernel-2.6.spec 
Log Message:
Don's better fix.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2256
retrieving revision 1.2257
diff -u -r1.2256 -r1.2257
--- kernel-2.6.spec	8 Jun 2006 16:32:00 -0000	1.2256
+++ kernel-2.6.spec	8 Jun 2006 17:49:52 -0000	1.2257
@@ -27,8 +27,7 @@
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define tag %([ -r branch ] && cat branch |sed s/RHEL-5/EL/ | sed s/FC-6/FC6/ || echo FC6)
-%define rel %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}_%tag)
-%define release %(echo %rel | sed -e 's/\ //')
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
 %define signmodules 0
 %define xen_version 20060602
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:57:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:57:52 -0400
Subject: rpms/castor/devel castor.spec,1.8,1.9
Message-ID: <200606081757.k58HvqbJ011908@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/castor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11853

Modified Files:
	castor.spec 
Log Message:

- Updated project URL -- fix for Bug #180586




Index: castor.spec
===================================================================
RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- castor.spec	8 Mar 2006 21:59:46 -0000	1.8
+++ castor.spec	8 Jun 2006 17:57:49 -0000	1.9
@@ -1,6 +1,6 @@
 %define name            castor
 %define version         0.9.5
-%define release 1jpp_3fc
+%define release         1jpp_4fc
 %define section         free
 
 Summary:        An open source data binding framework for Java
@@ -10,7 +10,7 @@
 Epoch:          0
 Group:          Development/Libraries/Java
 License:        Exolab Software License
-URL:            http://castor.exolab.org/
+URL:            http://castor.codehaus.org
 Source0:        castor-0.9.5-src-RHCLEAN.tar.bz2
 Patch0:		example-servletapi4.patch
 Patch1:		example-servletapi5.patch
@@ -42,8 +42,7 @@
 %description
 Castor is an open source data binding framework for Java. It's basically
 the shortest path between Java objects, XML documents and SQL tables.
-Castor provides Java to XML binding, Java to SQL persistence, and then
-some more.
+Castor provides Java to XML binding, Java to SQL persistence, and more.
 
 %package demo
 Group:          Development/Java
@@ -175,6 +174,9 @@
 %doc build/doc/*
 
 %changelog
+* Thu Jun  8 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp_4fc
+- Updated project URL -- fix for Bug #180586
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:0.9.5-1jpp_3fc
 - excluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:58:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:58:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2257,1.2258
Message-ID: <200606081758.k58HwC4e012100@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12042

Modified Files:
	kernel-2.6.spec 
Log Message:
resurrect s390



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2257
retrieving revision 1.2258
diff -u -r1.2257 -r1.2258
--- kernel-2.6.spec	8 Jun 2006 17:49:52 -0000	1.2257
+++ kernel-2.6.spec	8 Jun 2006 17:58:09 -0000	1.2258
@@ -173,8 +173,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Thu Jun  8 17:58:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 13:58:25 -0400
Subject: rpms/qt/FC-5 qt-x11-free-3.3.6-qfontdatabase_x11.patch, NONE, 1.1
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch,
	NONE, 1.1
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch,
	NONE, 1.1 .cvsignore, 1.22, 1.23 qt.spec, 1.102, 1.103 sources,
	1.23, 1.24 fix-im-crash-on-exit.diff, 1.2,
	NONE fix-key-release-event-with-imm.diff, 1.2,
	NONE qt-x11-free-3.3.4-qfontdatabase_x11.patch, 1.1,
	NONE qt-x11-immodule-fix-inputcontext-crash.diff, 1.1, NONE
Message-ID: <200606081758.k58HwPtw012206@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12124

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-free-3.3.6-qfontdatabase_x11.patch 
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch 
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch 
Removed Files:
	fix-im-crash-on-exit.diff fix-key-release-event-with-imm.diff 
	qt-x11-free-3.3.4-qfontdatabase_x11.patch 
	qt-x11-immodule-fix-inputcontext-crash.diff 
Log Message:
update to 3.3.6


qt-x11-free-3.3.6-qfontdatabase_x11.patch:
 qfontdatabase_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-x11-free-3.3.6-qfontdatabase_x11.patch ---
--- qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp.mono	2004-08-05 16:42:06.000000000 +0200
+++ qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp	2004-09-28 16:11:54.955374161 +0200
@@ -975,7 +981,7 @@
     };
     const XftDefaultFont defaults[] = {
 	{ "Serif", "serif", FALSE },
-	{ "Sans Serif", "sans-serif", FALSE },
+	{ "Sans", "sans-serif", FALSE },
         { "Monospace", "monospace", TRUE },
 	{ 0, 0, FALSE }
     };

qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch:
 qlineedit.cpp |    5 +----
 qtextedit.cpp |   14 +++++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch ---
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.im	2006-03-22 12:18:30.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp	2006-03-22 12:42:49.000000000 +0100
@@ -1035,7 +1035,7 @@
 
     bool drawCur = hasFocus() || viewport()->hasFocus();
     if (( hasSelectedText() && !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) ) ||
-	isReadOnly() || !cursorVisible )
+	isReadOnly() || !cursorVisible || doc->hasSelection( QTextDocument::IMSelectionText ))
 	drawCur = FALSE;
     QColorGroup g = colorGroup();
     const QColorGroup::ColorRole backRole = QPalette::backgroundRoleFromMode(backgroundMode());
@@ -1661,6 +1661,7 @@
 	}
     }
 
+    updateMicroFocusHint();
     repaintChanged();
 
     // microFocusHint is required to place candidate window for Asian
@@ -2177,6 +2178,7 @@
 	 ( !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) &&
 	   ( d->optimMode ? optimHasSelection() : doc->hasSelection( QTextDocument::Standard, TRUE ))) ||
 	 ( visible && !hasFocus() && !viewport()->hasFocus() && !inDnD ) ||
+	 doc->hasSelection( QTextDocument::IMSelectionText ) ||
 	 isReadOnly() )
 	return;
 
@@ -2907,8 +2909,14 @@
     // Asian input methods. Asian input methods need start point of IM
     // selection text to place candidate window as adjacent to the
     // selection text.
-    if ( d->preeditStart != -1 )
-	c.setIndex( d->preeditStart );
+    if ( d->preeditStart != -1 ) {
+      c.setIndex( d->preeditStart );
+      if(doc->hasSelection(QTextDocument::IMSelectionText)) {
+         int para, index;
+         doc->selectionStart(QTextDocument::IMSelectionText, para, index);
+         c.setIndex(index);
+      }
+    }
 #endif
 
     if ( hasFocus() || viewport()->hasFocus() ) {
--- qt-x11-free-3.3.6/src/widgets/qlineedit.cpp.im	2006-03-22 12:13:27.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qlineedit.cpp	2006-03-22 12:15:30.000000000 +0100
@@ -1840,17 +1840,14 @@
     d->imend = d->imstart + e->text().length();
     d->imselstart = d->imstart + e->cursorPos();
     d->imselend = d->imselstart + e->selectionLength();
-#if 0
-    d->cursor = e->selectionLength() ? d->imend : d->imselend;
-#else
     // Cursor placement code is changed for Asian input method that
     // shows candidate window. This behavior is same as Qt/E 2.3.7
     // which supports Asian input methods. Asian input methods need
     // start point of IM selection text to place candidate window as
     // adjacent to the selection text.
     d->cursor = d->imselstart;
-#endif
     d->updateTextLayout();
+    d->updateMicroFocusHint();
     update();
 }
 

qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch:
 qlineedit.cpp |    3 +--
 qtextedit.cpp |   14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch ---
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.im	2006-03-08 17:47:58.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp	2005-09-02 14:43:14.000000000 +0200
@@ -1028,7 +1028,7 @@
 
     bool drawCur = hasFocus() || viewport()->hasFocus();
     if (( hasSelectedText() && !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) ) ||
-	isReadOnly() || !cursorVisible || doc->hasSelection( QTextDocument::IMSelectionText ))
+	isReadOnly() || !cursorVisible )
 	drawCur = FALSE;
     QColorGroup g = colorGroup();
     const QColorGroup::ColorRole backRole = QPalette::backgroundRoleFromMode(backgroundMode());
@@ -1589,7 +1589,7 @@
     insert( e->text() );
     // insert can trigger an imEnd event as it emits a textChanged signal, so better
     // be careful
-    if(d->preeditStart != -1) {
+    if(d->preeditStart != -1) { 
 	cursor->setIndex( d->preeditStart + d->preeditLength );
 	QTextCursor c = *cursor;
 	cursor->setIndex( d->preeditStart );
@@ -1609,7 +1609,6 @@
 	}
     }
 
-    updateMicroFocusHint();
     repaintChanged();
 }
 
@@ -2120,7 +2119,6 @@
 	 ( !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) &&
 	   ( d->optimMode ? optimHasSelection() : doc->hasSelection( QTextDocument::Standard, TRUE ))) ||
 	 ( visible && !hasFocus() && !viewport()->hasFocus() && !inDnD ) ||
-         doc->hasSelection( QTextDocument::IMSelectionText ) ||
 	 isReadOnly() )
 	return;
 
@@ -2823,14 +2821,8 @@
 void QTextEdit::updateMicroFocusHint()
 {
     QTextCursor c( *cursor );
-    if ( d->preeditStart != -1 ) {
+    if ( d->preeditStart != -1 )
 	c.setIndex( d->preeditStart );
-        if(doc->hasSelection(QTextDocument::IMSelectionText)) {
-            int para, index;
-            doc->selectionStart(QTextDocument::IMSelectionText, para, index);
-            c.setIndex(index);
-        }
-    }
 
     if ( hasFocus() || viewport()->hasFocus() ) {
 	int h = c.paragraph()->lineHeightOfChar( cursor->index() );
--- qt-x11-free-3.3.6/src/widgets/qlineedit.cpp.im	2006-03-08 17:47:59.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qlineedit.cpp	2006-03-20 11:45:08.000000000 +0100
@@ -1794,9 +1794,8 @@
     d->imend = d->imstart + e->text().length();
     d->imselstart = d->imstart + e->cursorPos();
     d->imselend = d->imselstart + e->selectionLength();
-    d->cursor = d->imstart + e->cursorPos();
+    d->cursor = e->selectionLength() ? d->imend : d->imselend;
     d->updateTextLayout();
-    d->updateMicroFocusHint();
     update();
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	24 Oct 2005 08:41:11 -0000	1.22
+++ .cvsignore	8 Jun 2006 17:58:23 -0000	1.23
@@ -5,3 +5,5 @@
 qt-x11-free-3.3.5.tar.bz2
 qt-x11-immodule-unified-qt3.3.5-20051012.diff.bz2
 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
+qt-x11-free-3.3.6.tar.bz2
+qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- qt.spec	27 Feb 2006 18:52:21 -0000	1.102
+++ qt.spec	8 Jun 2006 17:58:23 -0000	1.103
@@ -8,7 +8,7 @@
 
 %define immodule 1
 
-%define ver 3.3.5
+%define ver 3.3.6
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -85,7 +85,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 13
+Release: 0.1.fc5
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -93,7 +93,6 @@
 Url: http://www.troll.no
 Source: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
 Source1: qtrc
-Source2: assistant_de.qm
 
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
@@ -102,7 +101,7 @@
 Patch7: qt-x11-free-3.3.2-quiet.patch
 Patch8: qt-x11-free-3.3.3-qembed.patch
 Patch12: qt-uic-nostdlib.patch
-Patch13: qt-x11-free-3.3.4-qfontdatabase_x11.patch
+Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
 Patch14: qt-x11-free-3.3.3-gl.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
 Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
@@ -110,23 +109,19 @@
 Patch24: qt-x11-free-3.3.5-uic.patch
 
 # immodule patches
-Patch50: qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
-Patch51: fix-key-release-event-with-imm.diff
-Patch52: fix-im-crash-on-exit.diff
-Patch53: qt-x11-immodule-fix-inputcontext-crash.diff
-Patch54: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
+Patch50: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch
+Patch51: qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
+Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
+Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
 Patch101: 0047-fix-kmenu-width.diff
 Patch102: 0048-qclipboard_hack_80072.patch
-Patch103: 0051-qtoolbar_77047.patch
-Patch104: 0056-khotkeys_input_84434.patch
+Patch103: 0056-khotkeys_input_84434.patch
 
 # upstream patches
-Patch200: qt-x11-free-3.3.4-assistant_de.patch
-Patch201: qt-x11-free-3.3.4-fullscreen.patch
-Patch202: qt-x11-free-3.3.5-warning.patch
+Patch200: qt-x11-free-3.3.4-fullscreen.patch
 
 Prefix: %{qtdir}
 
@@ -214,7 +209,8 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: libmng-devel
-
+Requires: mesa-libGL-devel
+Requires: mesa-libGLU-devel
 
 %package Xt
 Summary: An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit.
@@ -351,30 +347,23 @@
 %patch24 -p1 -b .uic
 
 %if %{immodule}
-%patch50 -p1
-%patch51 -p0 -b .key-release-event
-%patch52 -p0 -b .im-crash-on-exit
-%patch53 -p0 -b .inputcontext-crash
-%patch54 -p1 -b .quiet
+%patch50 -p1 -b .pre
+%patch51 -p1
+%patch52 -p1 -b .post
+%patch53 -p1 -b .quiet
 %endif
 
 %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
 %patch101 -p0 -b .0047-fix-kmenu-width
 %patch102 -p0 -b .0048-qclipboard_hack_80072
-%patch103 -p0 -b .0051-qtoolbar_77047
-%patch104 -p0 -b .0056-khotkeys_input_84434
+%patch103 -p0 -b .0056-khotkeys_input_84434
 
-%patch200 -p1 -b .assistant-translation
-%patch201 -p1 -b .fullscreen
-%patch202 -p1 -b .warning
+%patch200 -p1 -b .fullscreen
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
 mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
 
-# de translation
-cp %{SOURCE2} tools/assistant/
-
 %build
 export QTDIR=`/bin/pwd`
 export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
@@ -389,8 +378,6 @@
    sh ./make-symlinks.sh
 %endif
 
-# OPTFLAGS="$(echo $RPM_OPT_FLAGS | sed -e 's,-O2,-O0,')"
-
 # don't use rpath
 perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
 
@@ -744,8 +731,11 @@
 
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.1.fc5
+- update to 3.3.6
+
 * Mon Feb 27 2006 Than Ngo <than at redhat.com> 1:3.3.5-13
-- add set of fixes for the immodule patch, thanks to Dirk M?ller
+- add set of fixes for the immodule patch, thanks to Dirk M??ller
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.3.5-12.2
 - bump again for double-long bug on ppc(64)
@@ -1644,7 +1634,7 @@
 * Fri Mar  3 2000 Bill Nottingham <notting at redhat.com>
 - fix %postun script
 
-* Fri Feb 18 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+* Fri Feb 18 2000 Bernhard Rosenkr???zer <bero at redhat.com>
 - beta1
 - get rid of qt-ImageIO, the functionality is now in the main Qt library
 - remove qt-Network, the functionality is now in the main Qt library
@@ -1670,7 +1660,7 @@
 * Thu Jan 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - switch from glxMesa to Mesa for the GL addon
 
-* Wed Jan 5 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+* Wed Jan 5 2000 Bernhard Rosenkr???zer <bero at redhat.com>
 - Fix up dependencies
 - new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	24 Oct 2005 08:41:11 -0000	1.23
+++ sources	8 Jun 2006 17:58:23 -0000	1.24
@@ -1,2 +1,2 @@
-05d04688c0c0230ed54e89102d689ca4  qt-x11-free-3.3.5.tar.bz2
-2d1a6979301ee81da404f63670211416  qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
+dc1384c03ac08af21f6fefab32d982cf  qt-x11-free-3.3.6.tar.bz2
+0c07b36cd8da9f796437dd398365c204  qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2


--- fix-im-crash-on-exit.diff DELETED ---


--- fix-key-release-event-with-imm.diff DELETED ---


--- qt-x11-free-3.3.4-qfontdatabase_x11.patch DELETED ---


--- qt-x11-immodule-fix-inputcontext-crash.diff DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:03:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:03:23 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2252.2.1,
	1.2252.2.2 linux-2.6-selinux-deferred-inode-label.patch,
	1.1.2.1, 1.1.2.2
Message-ID: <200606081803.k58I3NSM013127@cvs.devel.redhat.com>

Author: eparis

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13054

Modified Files:
      Tag: private-defered-inode-branch
	kernel-2.6.spec linux-2.6-selinux-deferred-inode-label.patch 
Log Message:
update to patch, had some local buildroot problems



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2252.2.1
retrieving revision 1.2252.2.2
diff -u -r1.2252.2.1 -r1.2252.2.2
--- kernel-2.6.spec	8 Jun 2006 15:33:22 -0000	1.2252.2.1
+++ kernel-2.6.spec	8 Jun 2006 18:02:29 -0000	1.2252.2.2
@@ -1777,6 +1777,9 @@
 %endif
 
 %changelog
+* Thu Jun  8 2006 Eric Paris <eparis at redhat.com>
+- Patch to allow undefined SID on fscreate
+
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc6. Special 6/6/6 edition, what could go wrong?
 - Add a kdump kernel for PPC64 (Don Zickus)

linux-2.6-selinux-deferred-inode-label.patch:
 hooks.c                     |   16 ++-
 include/av_perm_to_string.h |    1 
 include/av_permissions.h    |    1 
 include/objsec.h            |    3 
 include/security.h          |    2 
 selinuxfs.c                 |    4 
 ss/context.h                |   17 +++
 ss/mls.c                    |   11 +-
 ss/mls.h                    |    3 
 ss/services.c               |  213 ++++++++++++++++++++++++++++----------------
 ss/sidtab.c                 |    4 
 11 files changed, 189 insertions(+), 86 deletions(-)

Index: linux-2.6-selinux-deferred-inode-label.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-selinux-deferred-inode-label.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-selinux-deferred-inode-label.patch	8 Jun 2006 15:33:22 -0000	1.1.2.1
+++ linux-2.6-selinux-deferred-inode-label.patch	8 Jun 2006 18:02:48 -0000	1.1.2.2
@@ -1,46 +1,107 @@
---- linux-2.6.16/security/selinux/include/av_permissions.h.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/include/av_permissions.h	2006-06-07 14:04:52.000000000 -0400
-@@ -526,6 +526,7 @@
- #define SECURITY__SETBOOL                         0x00000100UL
- #define SECURITY__SETSECPARAM                     0x00000200UL
- #define SECURITY__SETCHECKREQPROT                 0x00000400UL
-+#define SECURITY__LABELPRIV                       0x00000800UL
+--- linux-2.6.16.i686/security/selinux/hooks.c.inode.old	2006-06-08 13:45:30.000000000 -0400
++++ linux-2.6.16.i686/security/selinux/hooks.c	2006-06-08 13:52:47.000000000 -0400
+@@ -2162,6 +2162,11 @@ static int selinux_inode_setxattr(struct
+ 		return rc;
  
- #define SYSTEM__IPC_INFO                          0x00000001UL
- #define SYSTEM__SYSLOG_READ                       0x00000002UL
---- linux-2.6.16/security/selinux/include/av_perm_to_string.h.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/include/av_perm_to_string.h	2006-06-07 14:04:52.000000000 -0400
-@@ -87,6 +87,7 @@
-    S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool")
-    S_(SECCLASS_SECURITY, SECURITY__SETSECPARAM, "setsecparam")
-    S_(SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT, "setcheckreqprot")
-+   S_(SECCLASS_SECURITY, SECURITY__LABELPRIV, "labelpriv")
-    S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info")
-    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read")
-    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod")
---- linux-2.6.16/security/selinux/include/objsec.h.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/include/objsec.h	2006-06-07 14:04:52.000000000 -0400
-@@ -101,4 +101,7 @@ struct sk_security_struct {
+ 	rc = security_context_to_sid(value, size, &newsid);
++	if (rc == -EINVAL) {
++		if (task_has_security(current, SECURITY__LABELPRIV))
++			return rc;
++		rc = security_context_to_sid_force(value, size, &newsid);
++	}
+ 	if (rc)
+ 		return rc;
  
- extern unsigned int selinux_checkreqprot;
+@@ -2195,10 +2200,11 @@ static void selinux_inode_post_setxattr(
+ 		return;
+ 	}
  
-+extern int task_has_security(struct task_struct *tsk,
-+			     u32 perms);
-+
- #endif /* _SELINUX_OBJSEC_H_ */
---- linux-2.6.16/security/selinux/include/security.h.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/include/security.h	2006-06-07 14:04:52.000000000 -0400
-@@ -68,6 +68,8 @@ int security_context_to_sid(char *sconte
+-	rc = security_context_to_sid(value, size, &newsid);
++	rc = security_context_to_sid_force(value, size, &newsid);
+ 	if (rc) {
+ 		printk(KERN_WARNING "%s:  unable to obtain SID for context "
+-		       "%s, rc=%d\n", __FUNCTION__, (char*)value, -rc);
++		       "%s on (%s, %lu), rc=%d\n", __FUNCTION__, (char*)value,
++		       inode->i_sb->s_id, inode->i_ino, -rc);
+ 		return;
+ 	}
  
- int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *out_sid, u32 def_sid);
+@@ -4156,6 +4162,12 @@ static int selinux_setprocattr(struct ta
+ 			size--;
+ 		}
+ 		error = security_context_to_sid(value, size, &sid);
++		if (error == -EINVAL && !strcmp(name, "fscreate")) {
++			if (task_has_security(current, SECURITY__LABELPRIV))
++				return error;
++			error = security_context_to_sid_force(value, size,
++							      &sid);
++		}
+ 		if (error)
+ 			return error;
+ 	}
+--- linux-2.6.16.i686/security/selinux/selinuxfs.c.inode.old	2006-06-08 13:45:22.000000000 -0400
++++ linux-2.6.16.i686/security/selinux/selinuxfs.c	2006-06-08 13:52:47.000000000 -0400
+@@ -56,8 +56,8 @@ static int *bool_pending_values = NULL;
+ extern void selnl_notify_setenforce(int val);
  
-+int security_context_to_sid_force(char *scontext, u32 scontext_len, u32 *sid);
-+
- int security_get_user_sids(u32 callsid, char *username,
- 			   u32 **sids, u32 *nel);
+ /* Check whether a task is allowed to use a security operation. */
+-static int task_has_security(struct task_struct *tsk,
+-			     u32 perms)
++int task_has_security(struct task_struct *tsk,
++		      u32 perms)
+ {
+ 	struct task_security_struct *tsec;
  
---- linux-2.6.16/security/selinux/ss/context.h.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/ss/context.h	2006-06-07 14:04:52.000000000 -0400
+--- linux-2.6.16.i686/security/selinux/ss/mls.c.inode.old	2006-06-08 13:45:22.000000000 -0400
++++ linux-2.6.16.i686/security/selinux/ss/mls.c	2006-06-08 13:52:47.000000000 -0400
+@@ -249,7 +249,8 @@ static inline int mls_copy_context(struc
+  * Policy read-lock must be held for sidtab lookup.
+  *
+  */
+-int mls_context_to_sid(char oldc,
++int mls_context_to_sid(struct policydb *pol,
++		       char oldc,
+ 		       char **scontext,
+ 		       struct context *context,
+ 		       struct sidtab *s,
+@@ -296,7 +297,7 @@ int mls_context_to_sid(char oldc,
+ 		*p++ = 0;
+ 
+ 	for (l = 0; l < 2; l++) {
+-		levdatum = hashtab_search(policydb.p_levels.table, scontextp);
++		levdatum = hashtab_search(pol->p_levels.table, scontextp);
+ 		if (!levdatum) {
+ 			rc = -EINVAL;
+ 			goto out;
+@@ -320,7 +321,7 @@ int mls_context_to_sid(char oldc,
+ 					*rngptr++ = 0;
+ 				}
+ 
+-				catdatum = hashtab_search(policydb.p_cats.table,
++				catdatum = hashtab_search(pol->p_cats.table,
+ 				                          scontextp);
+ 				if (!catdatum) {
+ 					rc = -EINVAL;
+@@ -336,7 +337,7 @@ int mls_context_to_sid(char oldc,
+ 				if (rngptr) {
+ 					int i;
+ 
+-					rngdatum = hashtab_search(policydb.p_cats.table, rngptr);
++					rngdatum = hashtab_search(pol->p_cats.table, rngptr);
+ 					if (!rngdatum) {
+ 						rc = -EINVAL;
+ 						goto out;
+@@ -404,7 +405,7 @@ int mls_from_string(char *str, struct co
+ 	if (!tmpstr) {
+ 		rc = -ENOMEM;
+ 	} else {
+-		rc = mls_context_to_sid(':', &tmpstr, context,
++		rc = mls_context_to_sid(&policydb, ':', &tmpstr, context,
+ 		                        NULL, SECSID_NULL);
+ 		kfree(freestr);
+ 	}
+--- linux-2.6.16.i686/security/selinux/ss/context.h.inode.old	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16.i686/security/selinux/ss/context.h	2006-06-08 13:52:47.000000000 -0400
 @@ -28,6 +28,8 @@ struct context {
  	u32 role;
  	u32 type;
@@ -84,60 +145,29 @@
  	return ((c1->user == c2->user) &&
  		(c1->role == c2->role) &&
  		(c1->type == c2->type) &&
---- linux-2.6.16/security/selinux/ss/mls.c.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/ss/mls.c	2006-06-07 14:04:52.000000000 -0400
-@@ -249,7 +249,8 @@ static inline int mls_copy_context(struc
-  * Policy read-lock must be held for sidtab lookup.
-  *
-  */
--int mls_context_to_sid(char oldc,
-+int mls_context_to_sid(struct policydb *pol,
-+		       char oldc,
- 		       char **scontext,
- 		       struct context *context,
- 		       struct sidtab *s,
-@@ -296,7 +297,7 @@ int mls_context_to_sid(char oldc,
- 		*p++ = 0;
- 
- 	for (l = 0; l < 2; l++) {
--		levdatum = hashtab_search(policydb.p_levels.table, scontextp);
-+		levdatum = hashtab_search(pol->p_levels.table, scontextp);
- 		if (!levdatum) {
- 			rc = -EINVAL;
- 			goto out;
-@@ -320,7 +321,7 @@ int mls_context_to_sid(char oldc,
- 					*rngptr++ = 0;
- 				}
- 
--				catdatum = hashtab_search(policydb.p_cats.table,
-+				catdatum = hashtab_search(pol->p_cats.table,
- 				                          scontextp);
- 				if (!catdatum) {
- 					rc = -EINVAL;
-@@ -336,7 +337,7 @@ int mls_context_to_sid(char oldc,
- 				if (rngptr) {
- 					int i;
- 
--					rngdatum = hashtab_search(policydb.p_cats.table, rngptr);
-+					rngdatum = hashtab_search(pol->p_cats.table, rngptr);
- 					if (!rngdatum) {
- 						rc = -EINVAL;
- 						goto out;
---- linux-2.6.16/security/selinux/ss/mls.h.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/ss/mls.h	2006-06-07 14:04:52.000000000 -0400
-@@ -21,7 +21,8 @@ int mls_compute_context_len(struct conte
- void mls_sid_to_context(struct context *context, char **scontext);
- int mls_context_isvalid(struct policydb *p, struct context *c);
+--- linux-2.6.16.i686/security/selinux/ss/sidtab.c.inode.old	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16.i686/security/selinux/ss/sidtab.c	2006-06-08 13:52:47.000000000 -0400
+@@ -100,7 +100,7 @@ struct context *sidtab_search(struct sid
+ 	while (cur != NULL && sid > cur->sid)
+ 		cur = cur->next;
  
--int mls_context_to_sid(char oldc,
-+int mls_context_to_sid(struct policydb *p,
-+		       char oldc,
- 	               char **scontext,
- 		       struct context *context,
- 		       struct sidtab *s,
---- linux-2.6.16/security/selinux/ss/services.c.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/ss/services.c	2006-06-07 14:04:52.000000000 -0400
-@@ -617,48 +617,31 @@ out:
+-	if (cur == NULL || sid != cur->sid) {
++	if (cur == NULL || sid != cur->sid || cur->context.len) {
+ 		/* Remap invalid SIDs to the unlabeled SID. */
+ 		sid = SECINITSID_UNLABELED;
+ 		hvalue = SIDTAB_HASH(sid);
+@@ -218,6 +218,8 @@ int sidtab_context_to_sid(struct sidtab 
+ 			goto unlock_out;
+ 		}
+ 		sid = s->next_sid++;
++		if (context->len)
++			printk(KERN_INFO "SELinux:  Context %s is not valid under current policy, adding as unmapped value.\n", context->str);
+ 		ret = sidtab_insert(s, sid, context);
+ 		if (ret)
+ 			s->next_sid--;
+--- linux-2.6.16.i686/security/selinux/ss/services.c.inode.old	2006-06-08 13:45:22.000000000 -0400
++++ linux-2.6.16.i686/security/selinux/ss/services.c	2006-06-08 13:52:47.000000000 -0400
+@@ -623,48 +623,31 @@ out:
  
  }
  
@@ -160,8 +190,7 @@
  
 -	if (!ss_initialized) {
 -		int i;
-+	context_init(ctx);
- 
+-
 -		for (i = 1; i < SECINITSID_NUM; i++) {
 -			if (!strcmp(initial_sid_to_string[i], scontext)) {
 -				*sid = i;
@@ -172,7 +201,8 @@
 -		goto out;
 -	}
 -	*sid = SECSID_NULL;
--
++	context_init(ctx);
+ 
 -	/* Copy the string so that we can modify the copy as we parse it.
 -	   The string should already by null terminated, but we append a
 -	   null suffix to the copy to avoid problems with the existing
@@ -197,7 +227,7 @@
  	/* Parse the security context. */
  
  	rc = -EINVAL;
-@@ -670,15 +653,15 @@ static int security_context_to_sid_core(
+@@ -676,15 +659,15 @@ static int security_context_to_sid_core(
  		p++;
  
  	if (*p == 0)
@@ -217,7 +247,7 @@
  
  	/* Extract role. */
  	scontextp = p;
-@@ -686,14 +669,14 @@ static int security_context_to_sid_core(
+@@ -692,14 +675,14 @@ static int security_context_to_sid_core(
  		p++;
  
  	if (*p == 0)
@@ -236,7 +266,7 @@
  
  	/* Extract type. */
  	scontextp = p;
-@@ -702,32 +685,74 @@ static int security_context_to_sid_core(
+@@ -708,32 +691,74 @@ static int security_context_to_sid_core(
  	oldc = *p;
  	*p++ = 0;
  
@@ -326,7 +356,7 @@
  out:
  	return rc;
  }
-@@ -746,7 +771,7 @@ out:
+@@ -752,7 +777,7 @@ out:
  int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid)
  {
  	return security_context_to_sid_core(scontext, scontext_len,
@@ -335,7 +365,7 @@
  }
  
  /**
-@@ -763,13 +788,21 @@ int security_context_to_sid(char *sconte
+@@ -769,13 +794,21 @@ int security_context_to_sid(char *sconte
   * The default SID is passed to the MLS layer to be used to allow
   * kernel labeling of the MLS field if the MLS field is not present
   * (for upgrading to MLS without full relabel).
@@ -358,7 +388,7 @@
  }
  
  static int compute_sid_handle_invalid_context(
-@@ -1106,9 +1139,10 @@ static inline int convert_context_handle
+@@ -1112,9 +1145,10 @@ static inline int convert_context_handle
  		char *s;
  		u32 len;
  
@@ -372,7 +402,7 @@
  	}
  	return rc;
  }
-@@ -1140,6 +1174,27 @@ static int convert_context(u32 key,
+@@ -1146,6 +1180,27 @@ static int convert_context(u32 key,
  
  	args = p;
  
@@ -400,7 +430,7 @@
  	rc = context_cpy(&oldc, c);
  	if (rc)
  		goto out;
-@@ -1149,46 +1204,48 @@ static int convert_context(u32 key,
+@@ -1155,46 +1210,48 @@ static int convert_context(u32 key,
  	/* Convert the user. */
  	usrdatum = hashtab_search(args->newp->p_users.table,
  	                          args->oldp->p_user_val_to_name[c->user - 1]);
@@ -464,7 +494,7 @@
  	goto out;
  }
  
-@@ -1247,7 +1304,11 @@ int security_load_policy(void *data, siz
+@@ -1253,7 +1310,11 @@ int security_load_policy(void *data, siz
  		return -EINVAL;
  	}
  
@@ -477,7 +507,7 @@
  
  	/* Verify that the existing classes did not change. */
  	if (hashtab_map(policydb.p_classes.table, validate_class, &newpolicydb)) {
-@@ -1265,10 +1326,12 @@ int security_load_policy(void *data, siz
+@@ -1271,10 +1332,12 @@ int security_load_policy(void *data, siz
  	}
  
  	/* Convert the internal representations of contexts
@@ -492,7 +522,7 @@
  
  	/* Save the old policydb and SID table to free later. */
  	memcpy(&oldpolicydb, &policydb, sizeof policydb);
-@@ -1518,6 +1581,8 @@ int security_get_user_sids(u32 fromsid,
+@@ -1524,6 +1587,8 @@ int security_get_user_sids(u32 fromsid,
  
  	POLICY_RDLOCK;
  
@@ -501,77 +531,56 @@
  	fromcon = sidtab_search(&sidtab, fromsid);
  	if (!fromcon) {
  		rc = -EINVAL;
---- linux-2.6.16/security/selinux/ss/sidtab.c.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/ss/sidtab.c	2006-06-07 14:04:52.000000000 -0400
-@@ -100,7 +100,7 @@ struct context *sidtab_search(struct sid
- 	while (cur != NULL && sid > cur->sid)
- 		cur = cur->next;
+--- linux-2.6.16.i686/security/selinux/ss/mls.h.inode.old	2006-06-08 13:45:22.000000000 -0400
++++ linux-2.6.16.i686/security/selinux/ss/mls.h	2006-06-08 13:52:47.000000000 -0400
+@@ -21,7 +21,8 @@ int mls_compute_context_len(struct conte
+ void mls_sid_to_context(struct context *context, char **scontext);
+ int mls_context_isvalid(struct policydb *p, struct context *c);
  
--	if (cur == NULL || sid != cur->sid) {
-+	if (cur == NULL || sid != cur->sid || cur->context.len) {
- 		/* Remap invalid SIDs to the unlabeled SID. */
- 		sid = SECINITSID_UNLABELED;
- 		hvalue = SIDTAB_HASH(sid);
-@@ -218,6 +218,8 @@ int sidtab_context_to_sid(struct sidtab 
- 			goto unlock_out;
- 		}
- 		sid = s->next_sid++;
-+		if (context->len)
-+			printk(KERN_INFO "SELinux:  Context %s is not valid under current policy, adding as unmapped value.\n", context->str);
- 		ret = sidtab_insert(s, sid, context);
- 		if (ret)
- 			s->next_sid--;
---- linux-2.6.16/security/selinux/hooks.c.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/hooks.c	2006-06-07 14:04:52.000000000 -0400
-@@ -2133,6 +2133,11 @@ static int selinux_inode_setxattr(struct
- 		return rc;
+-int mls_context_to_sid(char oldc,
++int mls_context_to_sid(struct policydb *p,
++		       char oldc,
+ 	               char **scontext,
+ 		       struct context *context,
+ 		       struct sidtab *s,
+--- linux-2.6.16.i686/security/selinux/include/av_perm_to_string.h.inode.old	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16.i686/security/selinux/include/av_perm_to_string.h	2006-06-08 13:52:47.000000000 -0400
+@@ -87,6 +87,7 @@
+    S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool")
+    S_(SECCLASS_SECURITY, SECURITY__SETSECPARAM, "setsecparam")
+    S_(SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT, "setcheckreqprot")
++   S_(SECCLASS_SECURITY, SECURITY__LABELPRIV, "labelpriv")
+    S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info")
+    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read")
+    S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod")
+--- linux-2.6.16.i686/security/selinux/include/av_permissions.h.inode.old	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16.i686/security/selinux/include/av_permissions.h	2006-06-08 13:52:47.000000000 -0400
+@@ -526,6 +526,7 @@
+ #define SECURITY__SETBOOL                         0x00000100UL
+ #define SECURITY__SETSECPARAM                     0x00000200UL
+ #define SECURITY__SETCHECKREQPROT                 0x00000400UL
++#define SECURITY__LABELPRIV                       0x00000800UL
  
- 	rc = security_context_to_sid(value, size, &newsid);
-+	if (rc == -EINVAL) {
-+		if (task_has_security(current, SECURITY__LABELPRIV))
-+			return rc;
-+		rc = security_context_to_sid_force(value, size, &newsid);
-+	}
- 	if (rc)
- 		return rc;
+ #define SYSTEM__IPC_INFO                          0x00000001UL
+ #define SYSTEM__SYSLOG_READ                       0x00000002UL
+--- linux-2.6.16.i686/security/selinux/include/objsec.h.inode.old	2006-03-20 00:53:29.000000000 -0500
++++ linux-2.6.16.i686/security/selinux/include/objsec.h	2006-06-08 13:52:47.000000000 -0400
+@@ -101,4 +101,7 @@ struct sk_security_struct {
  
-@@ -2166,10 +2171,11 @@ static void selinux_inode_post_setxattr(
- 		return;
- 	}
+ extern unsigned int selinux_checkreqprot;
  
--	rc = security_context_to_sid(value, size, &newsid);
-+	rc = security_context_to_sid_force(value, size, &newsid);
- 	if (rc) {
- 		printk(KERN_WARNING "%s:  unable to obtain SID for context "
--		       "%s, rc=%d\n", __FUNCTION__, (char*)value, -rc);
-+		       "%s on (%s, %lu), rc=%d\n", __FUNCTION__, (char*)value,
-+		       inode->i_sb->s_id, inode->i_ino, -rc);
- 		return;
- 	}
++extern int task_has_security(struct task_struct *tsk,
++			     u32 perms);
++
+ #endif /* _SELINUX_OBJSEC_H_ */
+--- linux-2.6.16.i686/security/selinux/include/security.h.inode.old	2006-06-08 13:45:22.000000000 -0400
++++ linux-2.6.16.i686/security/selinux/include/security.h	2006-06-08 13:52:47.000000000 -0400
+@@ -63,6 +63,8 @@ int security_context_to_sid(char *sconte
  
-@@ -4141,6 +4147,12 @@ static int selinux_setprocattr(struct ta
- 			size--;
- 		}
- 		error = security_context_to_sid(value, size, &sid);
-+		if (error == -EINVAL && !strcmp(name, "fscreate")) {
-+			if (task_has_security(current, SECURITY__LABELPRIV))
-+				return error;
-+			error = security_context_to_sid_force(value, size,
-+							      &sid);
-+		}
- 		if (error)
- 			return error;
- 	}
---- linux-2.6.16/security/selinux/selinuxfs.c.inode.old	2006-03-20 00:53:29.000000000 -0500
-+++ linux-2.6.16/security/selinux/selinuxfs.c	2006-06-07 14:04:52.000000000 -0400
-@@ -54,8 +54,8 @@ static int *bool_pending_values = NULL;
- extern void selnl_notify_setenforce(int val);
+ int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *out_sid, u32 def_sid);
  
- /* Check whether a task is allowed to use a security operation. */
--static int task_has_security(struct task_struct *tsk,
--			     u32 perms)
-+int task_has_security(struct task_struct *tsk,
-+		      u32 perms)
- {
- 	struct task_security_struct *tsec;
++int security_context_to_sid_force(char *scontext, u32 scontext_len, u32 *sid);
++
+ int security_get_user_sids(u32 callsid, char *username,
+ 			   u32 **sids, u32 *nel);
  



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:06:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:06:12 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.131,1.132
Message-ID: <200606081806.k58I6Cdu013283@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13242

Modified Files:
	redhat-artwork.spec 
Log Message:
Fixed missing BR


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- redhat-artwork.spec	5 May 2006 19:47:35 -0000	1.131
+++ redhat-artwork.spec	8 Jun 2006 18:05:44 -0000	1.132
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.243
-Release: 1
+Release: 2
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -35,6 +35,8 @@
 BuildRequires: icon-slicer >= 0.3-6
 # for intltool to work
 BuildRequires: perl-XML-Parser
+# for translations to work
+BuildRequires: gettext
 # for splash screens, and a logo in gdm theme
 Requires: redhat-logos >= 1.1.22
 Prereq: gtk2 >= 2.9.0
@@ -173,6 +175,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Thu Jun  8 2006 Jesse Keating <jkeating at redhat.com> 0.243-2
+- Add missing br gettext
+
 * Fri May  5 2006 Matthias Clasen <mclasen at redhat.com> 0.243-1
 - Rebuild against new GTK+
 - Require GTK+ 2.9.0



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:07:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:07:39 -0400
Subject: rpms/util-linux/devel util-linux-2.13-nfsmount-fsc.patch, NONE,
	1.1.4.1 util-linux.spec, 1.117, 1.117.2.1
Message-ID: <200606081807.k58I7d56013364@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13325

Modified Files:
      Tag: private-util-linux-2-13-0-24-nfsmount_fsc
	util-linux.spec 
Added Files:
      Tag: private-util-linux-2-13-0-24-nfsmount_fsc
	util-linux-2.13-nfsmount-fsc.patch 
Log Message:
Added the Filsystem Caching (-o fsc) option to the nfs/nfs4 mounts


util-linux-2.13-nfsmount-fsc.patch:
 nfs.5        |    8 ++++++++
 nfs4_mount.h |    1 +
 nfs4mount.c  |   28 +++++++++++++++++++++++++---
 nfs_mount4.h |    1 +
 nfsmount.c   |   31 +++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 3 deletions(-)

--- NEW FILE util-linux-2.13-nfsmount-fsc.patch ---
--- util-linux-2.13-pre6/mount/nfs_mount4.h.fsc	2006-05-24 18:41:24.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs_mount4.h	2006-05-24 18:42:54.000000000 -0400
@@ -58,6 +58,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
 #define NFS_MOUNT_NOACL     0x0800  /* 4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_FSCACHE		0x4000
 
 /* security pseudoflavors */
 
--- util-linux-2.13-pre6/mount/nfsmount.c.fsc	2006-05-24 18:41:24.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfsmount.c	2006-05-24 18:43:38.000000000 -0400
@@ -51,6 +51,7 @@
 #include <mntent.h>
 #include <paths.h>
 #include <syslog.h>
+#include <asm/unistd.h>
 
 #include "sundries.h"
 #include "nfsmount.h"
@@ -173,6 +174,15 @@ void mount_errors(char *server, int will
 	} else
 		fprintf(stderr, "%s.\n", errbuf);
 }
+#ifndef KEY_SPEC_THREAD_KEYRING
+#define KEY_SPEC_THREAD_KEYRING -1
+#endif
+int nfs_add_key(char *des, char *payload, size_t plen)
+{
+	return syscall(__NR_add_key, "user", 
+		des, payload, plen, KEY_SPEC_THREAD_KEYRING);
+}
+static char *fsctag = NULL;
 
 /* Define the order in which to probe for UDP/TCP services */
 enum plist {
@@ -883,6 +893,15 @@ parse_options(char *old_opts, struct nfs
 					goto bad_parameter;
  				}
  				strncpy(data->context, context, NFS_MAX_CONTEXT_LEN);
+			 } else if (!strcmp(opt, "fsctag")) {
+ 				char *tmp = opteq + 1;
+ 				
+ 				if (strlen(tmp) > BUFSIZ) {
+ 					printf(_("fsctag parameter exceeds limit of %d\n"),
+ 						 BUFSIZ);
+					goto bad_parameter;
+ 				}
+ 				fsctag = strdup(tmp);
  			} else if (!sloppy)
 				goto bad_parameter;
 			sprintf(cbuf, "%s=%s,", opt, opteq+1);
@@ -900,6 +919,10 @@ parse_options(char *old_opts, struct nfs
 				data->flags &= ~NFS_MOUNT_SOFT;
 				if (val)
 					data->flags |= NFS_MOUNT_SOFT;
+			} else if (!strcmp(opt, "fsc")) {
+				data->flags &= ~NFS_MOUNT_FSCACHE;
+				if (val)
+					data->flags |= NFS_MOUNT_FSCACHE;
 			} else if (!strcmp(opt, "hard")) {
 				data->flags &= ~NFS_MOUNT_SOFT;
 				if (!val)
@@ -1378,6 +1401,14 @@ noauth_flavours:
 				  "excessively long option argument\n"));
 		goto fail;
 	}
+	if (data.flags & NFS_MOUNT_FSCACHE) {
+		char *tmp = fsctag ? fsctag : node;
+
+		val = nfs_add_key("mount:nfs:fsctag", tmp, strlen(tmp)+1);
+		if (val < 0)
+			fprintf(stderr, "mount: Warning: Unable to set fsctag:"
+				"error: %d (%s)\n", errno, strerror(errno));
+	}
 
 	snprintf(cbuf, sizeof(cbuf)-1, "addr=%s", s);
 	strcat(new_opts, cbuf);
--- util-linux-2.13-pre6/mount/nfs4mount.c.fsc	2006-05-24 18:41:24.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-05-24 18:44:32.000000000 -0400
@@ -78,6 +78,9 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
 
 extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
 extern void mount_errors(char *, int, int);
+extern void rpc_strerror(void);
+extern int nfs_add_key(char *des, char *payload, size_t plen);
+static char *fsctag = NULL;
 
 struct {
 	char    *flavour;
@@ -205,10 +208,10 @@ int nfs4mount(const char *spec, const ch
 	char *hostname, *dirname, *old_opts;
 	char new_opts[1024];
 	char *opt, *opteq;
-	char *s;
+	char *s, *tmp;
 	int val;
 	int bg, soft, intr;
-	int nocto, noac;
+	int nocto, noac, fscache;
 	int retry;
 	int retval;
 	time_t timeout, t;
@@ -259,6 +262,7 @@ int nfs4mount(const char *spec, const ch
 	intr = NFS4_MOUNT_INTR;
 	nocto = 0;
 	noac = 0;
+	fscache = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 
 	/*
@@ -315,6 +319,14 @@ int nfs4mount(const char *spec, const ch
 				num_flavour = parse_sec(opteq+1, pseudoflavour);
 				if (!num_flavour)
 					goto fail;
+			 } else if (!strcmp(opt, "fsctag")) {
+ 				tmp = opteq + 1;
+ 				if (strlen(tmp) > BUFSIZ) {
+ 					printf(_("fsctag parameter exceeds limit of %d\n"),
+ 						 BUFSIZ);
+					goto fail;
+ 				}
+ 				fsctag = strdup(tmp);
 			} else if (!strcmp(opt, "addr")) {
 				/* ignore */;
 			} else {
@@ -338,6 +350,8 @@ int nfs4mount(const char *spec, const ch
 				soft = !val;
 			else if (!strcmp(opt, "intr"))
 				intr = val;
+			else if (!strcmp(opt, "fsc"))
+				fscache = val;
 			else if (!strcmp(opt, "cto"))
 				nocto = !val;
 			else if (!strcmp(opt, "ac"))
@@ -355,7 +369,8 @@ int nfs4mount(const char *spec, const ch
 	data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
 		| (intr ? NFS4_MOUNT_INTR : 0)
 		| (nocto ? NFS4_MOUNT_NOCTO : 0)
-		| (noac ? NFS4_MOUNT_NOAC : 0);
+		| (noac ? NFS4_MOUNT_NOAC : 0)
+		| (fscache ? NFS4_MOUNT_FSCACHE : 0);
 
 	/*
 	 * Give a warning if the rpc.idmapd daemon is not running
@@ -445,6 +460,13 @@ int nfs4mount(const char *spec, const ch
 		mount_errors(hostname, 1, bg);
 		continue;
 	}
+	if (data.flags & NFS4_MOUNT_FSCACHE) {
+		tmp = fsctag ? fsctag : (char *)node;
+		val = nfs_add_key("mount:nfs4:fsctag", tmp, strlen(tmp)+1);
+		if (val < 0)
+			fprintf(stderr, "mount: Warning: Unable to set fsctag:"
+				"error: %d (%s)\n", errno, strerror(errno));
+	}
 
 	*mount_opts = (char *) &data;
 	/* clean up */
--- util-linux-2.13-pre6/mount/nfs4_mount.h.fsc	2006-05-24 18:41:21.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs4_mount.h	2006-05-24 18:42:55.000000000 -0400
@@ -65,6 +65,7 @@ struct nfs4_mount_data {
 #define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
 #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
 #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
+#define NFS4_MOUNT_FSCACHE		0x4000	/* 1 */
 #define NFS4_MOUNT_FLAGMASK	0xFFFF
 
 /* pseudoflavors: */
--- util-linux-2.13-pre6/mount/nfs.5.fsc	2006-05-24 18:41:24.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs.5	2006-05-24 18:42:55.000000000 -0400
@@ -272,6 +272,10 @@ default UDP protocol.  Many NFS servers 
 .I udp
 Mount the NFS filesystem using the UDP protocol.  This
 is the default.
+.TP 1.5i
+.I fsc
+Unable the use of persistent caching to the local disk using 
+the FS-Cache facility for the given mount point. 
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be
@@ -428,6 +432,10 @@ This extracts a
 server performance penalty but it allows two different NFS clients
 to get reasonable good results when both clients are actively
 writing to common filesystem on the server.
+.TP 1.5i
+.I fsc
+Unable the use of persistent caching to the local disk using 
+the FS-Cache facility for the given mount point. 
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.117
retrieving revision 1.117.2.1
diff -u -r1.117 -r1.117.2.1
--- util-linux.spec	25 May 2006 19:39:35 -0000	1.117
+++ util-linux.spec	8 Jun 2006 18:07:23 -0000	1.117.2.1
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.24
+Release: 0.24.fsc
 License: distributable
 Group: System Environment/Base
 
@@ -189,6 +189,7 @@
 # Adds syslog logging to background mounts
 Patch232: util-linux-2.13-nfsmount-syslog.patch
 
+Patch400: util-linux-2.13-nfsmount-fsc.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -274,6 +275,8 @@
 %patch231 -p1
 %patch232 -p1
 
+%patch400 -p1
+
 %build
 unset LINGUAS || :
 
@@ -658,6 +661,9 @@
 /sbin/losetup
 
 %changelog
+* Thu Jun  8 2006 Steve Dickson <steved at redhat.com> 2.13-0.24.fsc
+- Added the Filsystem Caching (-o fsc) option to the nfs/nfs4 mounts
+
 * Wed May 24 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.24
 - Remove requirement on restorecon, since we can do the same thing
 - with chcon/matchpathcon, and not add requirement on policycoreutils



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:08:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:08:53 -0400
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.43,1.44
Message-ID: <200606081808.k58I8rh1013553@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13534

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Thu Jun 08 2006 Igor Foox <ifoox at redhat.com> 0.2.2-5
- Rebuild for 3.2.0.


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- eclipse-bugzilla.spec	4 Apr 2006 13:44:38 -0000	1.43
+++ eclipse-bugzilla.spec	8 Jun 2006 18:08:50 -0000	1.44
@@ -22,12 +22,12 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	4
+Release:	5
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
-Requires: eclipse-platform >= 1:3.1.2
-Requires: eclipse-platform < 1:3.1.3
+Requires: eclipse-platform >= 1:3.2.0
+Requires: eclipse-platform < 1:3.2.1
 
 Requires: xmlrpc >= 2.0.1
 
@@ -44,7 +44,7 @@
 # java -cp /usr/share/eclipse/startup.jar  -Duser.home=/tmp/buildhome 
 #     org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner 
 #     -buildfile build.xml -Dbasedir=`pwd` 
-#     -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build_3.1.2/scripts/
+#     -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build_3.2.0/scripts/
 #     -DdontUnzip=true fetch 
 Source0:	eclipse-bugzilla-fetched-%{version_majmin}.%{version_micro}.tar.gz
 
@@ -103,7 +103,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.2.0/scripts \
     -DdontFetchAnything=true 
 popd
 
@@ -156,6 +156,9 @@
 %endif
 
 %changelog
+* Thu Jun 08 2006 Igor Foox <ifoox at redhat.com> 0.2.2-5
+- Rebuild for 3.2.0.
+
 * Tue Apr 04 2006 Andrew Overholt <overholt at redhat.com> 0.2.2-4
 - Add ia64.
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:10:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:10:36 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.169,1.170
Message-ID: <200606081810.k58IAa6W014003@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13896

Modified Files:
	kdebase.spec 
Log Message:
fxi rpm file list



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdebase.spec	8 Jun 2006 17:08:46 -0000	1.169
+++ kdebase.spec	8 Jun 2006 18:10:33 -0000	1.170
@@ -213,25 +213,25 @@
 g++ $FLAGS -o mailsettings %{SOURCE7}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make RUN_KAPPFINDER=no DESTDIR=$RPM_BUILD_ROOT install
+make RUN_KAPPFINDER=no DESTDIR=%{buildroot} install
 
-install -m 755 mailsettings $RPM_BUILD_ROOT%{_bindir}
+install -m 755 mailsettings %{buildroot}%{_bindir}
 
 # Fix up permissions on some things
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/kdesud
+chmod 755 %{buildroot}%{_bindir}/kdesud
 
 # install pam configuration file
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
+mkdir -p %{buildroot}/etc/pam.d
+install -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
+install -m 644 kde.pamd %{buildroot}/etc/pam.d/kdm
+install -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
+install -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
 
 # fix kappfinder script for relocatability and run it through consolehelper
 %if %{include_kappfinder}
-pushd $RPM_BUILD_ROOT%{_bindir}
+pushd %{buildroot}%{_bindir}
 mkdir -p ../sbin
 cp kappfinder kappfinder.temp
 sed -e 's.\$(prefix).\$KDEDIR.g' kappfinder.temp > ../sbin/kappfinder
@@ -240,29 +240,29 @@
 ln -sf consolehelper kappfinder
 popd
 
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kappfinder <<EOF
+mkdir -p %{buildroot}/etc/security/console.apps
+cat >%{buildroot}/etc/security/console.apps/kappfinder <<EOF
 USER=root
 PROGRAM=%{_sbindir}/kappfinder
 SESSION=true
 EOF
 %else
-rm -rf $RPM_BUILD_ROOT%{_bindir}/kappfinder \
-       $RPM_BUILD_ROOT%{_datadir}/applnk/System/kappfinder.desktop \
-       $RPM_BUILD_ROOT%{_datadir}/applications/kde/kappfinder.desktop \
-       $RPM_BUILD_ROOT%{_datadir}/icons/*/*/*/kappfinder.png \
-       $RPM_BUILD_ROOT%{_datadir}/apps/kappfinder
+rm -rf %{buildroot}%{_bindir}/kappfinder \
+       %{buildroot}%{_datadir}/applnk/System/kappfinder.desktop \
+       %{buildroot}%{_datadir}/applications/kde/kappfinder.desktop \
+       %{buildroot}%{_datadir}/icons/*/*/*/kappfinder.png \
+       %{buildroot}%{_datadir}/apps/kappfinder
 %endif
 
 # Nuke man2html - we get it from man
-find $RPM_BUILD_ROOT -name "man2html*" | xargs rm -rf
+find %{buildroot} -name "man2html*" | xargs rm -rf
 
 # install gdm session support
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/
+mkdir -p %{buildroot}%{_datadir}/xsessions
+install -m 755 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
 
 # install config files
-pushd $RPM_BUILD_ROOT
+pushd %{buildroot}
 tar xjf %{SOURCE4}
 mv etc/skel/kde etc/skel/.kde
 find etc/skel/.kde -type f | xargs chmod 0644
@@ -270,15 +270,15 @@
 popd
 
 # install logrotate script
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/kdm
+mkdir -p %{buildroot}/etc/logrotate.d
+install -m 644 %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
 
 # Symlink things to their correct place
-rm -rf  $RPM_BUILD_ROOT%{_datadir}/config/kdm
-ln -sf ../../../etc/kde/kdm $RPM_BUILD_ROOT%{_datadir}/config/kdm
+rm -rf  %{buildroot}%{_datadir}/config/kdm
+ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
 # Replace the kdm default files with symlinks to the shared {kxg}dm ones
-pushd $RPM_BUILD_ROOT/etc/kde/kdm
+pushd %{buildroot}/etc/kde/kdm
 for i in Xaccess Xservers Xwilling kdmrc; do
    ln -sf ../../X11/xdm/$i .
 done
@@ -286,7 +286,7 @@
 ln -fs ../../X11/xinit/Xsession Xsession
 popd
 
-cat >>$RPM_BUILD_ROOT/etc/kderc <<EOF
+cat >>%{buildroot}/etc/kderc <<EOF
 [General]
 activeFont=Sans,10,-1,5,50,0,0,0,0,0
 background=230,230,230
@@ -308,7 +308,7 @@
 EOF
 
 # Make symlinks relative
-cd $RPM_BUILD_ROOT/%{_docdir}/HTML/en
+cd %{buildroot}/%{_docdir}/HTML/en
 for i in */*/*; do
    if [ -d "$i" -a -L "$i"/common ]; then
       rm -f $i/common
@@ -329,9 +329,9 @@
 done
 
 %if %{redhatify}
-   rm -f $RPM_BUILD_ROOT%{_datadir}/locale/l10n/*/flag.png
+   rm -f %{buildroot}%{_datadir}/locale/l10n/*/flag.png
    # mark KDE-Only
-   pushd $RPM_BUILD_ROOT%{_datadir}/applications/kde
+   pushd %{buildroot}%{_datadir}/applications/kde
       for f in *.desktop ; do
          if [ "$f" == "konqbrowser.desktop" ] ; then
             cat $f | grep -v Categories >$f.o
@@ -342,16 +342,19 @@
          fi
       done
    popd
-   for f in $(find $RPM_BUILD_ROOT%{_datadir}/applnk -name "*.desktop") ; do
+   for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
       echo "OnlyShowIn=KDE;" >> $f
    done
 %endif
 
 # Own Mozilla plugin dir
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
+mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
+
+# exclude fonts.dir
+rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -501,7 +504,6 @@
 %{_datadir}/sounds
 %{_datadir}/templates
 %{_datadir}/wallpapers
-%exclude %{_datadir}/fonts/override/fonts.dir
 
 %files devel
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:11:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:11:58 -0400
Subject: rpms/mysql/devel mysql.spec,1.77,1.78
Message-ID: <200606081811.k58IBwkM014380@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14351

Modified Files:
	mysql.spec 
Log Message:
Work around gcc bug #193912.


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mysql.spec	1 Jun 2006 17:40:36 -0000	1.77
+++ mysql.spec	8 Jun 2006 18:11:47 -0000	1.78
@@ -131,6 +131,10 @@
 # -ECL 2002-12-19
 CFLAGS="$CFLAGS -fPIC"
 %endif
+# Temporary workaround for gcc bug (bz #193912)
+%ifarch s390x
+CFLAGS="$CFLAGS -mtune=z900"
+%endif
 CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
 export CFLAGS CXXFLAGS
 
@@ -410,8 +414,9 @@
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 
 %changelog
-* Thu Jun  1 2006 Tom Lane <tgl at redhat.com> 5.0.22-1
+* Thu Jun  8 2006 Tom Lane <tgl at redhat.com> 5.0.22-1
 - Update to MySQL 5.0.22 (fixes CVE-2006-2753)
+- Install temporary workaround for gcc bug on s390x (bz #193912)
 
 * Tue May  2 2006 Tom Lane <tgl at redhat.com> 5.0.21-2
 - Fix bogus perl Requires for mysql-test



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:23:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:23:54 -0400
Subject: rpms/dhcp/devel dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch,
	NONE, 1.1
Message-ID: <200606081823.k58INsTA001300@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1266

Added Files:
	dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch 
Log Message:
fix bug 191461

dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch:
 linux |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch ---
--- dhcp-3.0.4/client/scripts/linux.dhclient-script-ntp-fudge-bz191461	2006-06-07 19:27:04.000000000 -0400
+++ dhcp-3.0.4/client/scripts/linux	2006-06-08 14:09:04.000000000 -0400
@@ -410,13 +410,15 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*server)|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
 	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
 	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
+	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
 	    for s in $new_ntp_servers ${localClocks[@]};
 	      do
 	      echo 'server '$s >> /etc/ntp.conf;
 	    done
+	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -e /etc/ntp/step-tickers ]; then
 		save_previous /etc/ntp/step-tickers
 		echo '' > /etc/ntp/step-tickers



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:24:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:24:18 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.103,1.104
Message-ID: <200606081824.k58IOIt3001555@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1511

Modified Files:
	dhcp.spec 
Log Message:
fix bugs 191461, 193047


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- dhcp.spec	30 May 2006 16:04:58 -0000	1.103
+++ dhcp.spec	8 Jun 2006 18:24:16 -0000	1.104
@@ -4,7 +4,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 12
+Release: 14
 Epoch:   12
 License: distributable
 Group: System Environment/Daemons
@@ -91,6 +91,8 @@
 Patch175: dhcp-3.0.4-bz191470.patch
 Patch176: dhcp-3.0.4-dhclient-R_option.patch
 Patch177: dhcp-3.0.4-dhclient-script-METRIC.patch
+Patch178: dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch
+#
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -237,6 +239,7 @@
 %patch175 -p1 -b .bz191470
 %patch176 -p1 -b .dhclient-R_option
 %patch177 -p1 -b .dhclient-script-METRIC
+%patch178 -p1 -b .dhclient-script-ntp-fudge-bz191461
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcpd
@@ -314,6 +317,12 @@
 cp client/dhclient.conf dhclient.conf.sample
 chmod 755 %{buildroot}/sbin/dhclient-script
 #
+# Create per-package copies of dhcp-options and dhcp-eval common man-pages:
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-options.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcpd-options.5 
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-options.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhclient-options.5 
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-eval.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcpd-eval.5 
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-eval.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhclient-eval.5 
+#
 # Why not ship the doc/ documentation ? Some of it is quite useful.
 # Also generate DHCP options tables for C, perl, python:
 #
@@ -351,6 +360,14 @@
 %post
 /sbin/chkconfig --add dhcpd
 /sbin/chkconfig --add dhcrelay
+if [ "$1" -ge 1 ]; then
+   if [ ! -e %{_mandir}/man5/dhcp-options.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhcpd-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+   fi;
+   if [ ! -e %{_mandir}/man5/dhcp-eval.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhcpd-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+   fi;
+fi;
 
 %preun
 if [ $1 = 0 ]; then	# execute this only if we are NOT doing an upgrade
@@ -364,9 +381,38 @@
 if [ "$1" -ge "1" ]; then
     service dhcpd condrestart >/dev/null 2>&1
     service dhcrelay condrestart >/dev/null 2>&1
+elif [ "$1" -eq 0 ]; then
+    if [ -e %{_mandir}/man5/dhclient-options.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhclient-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+    fi;
+    if [ -e %{_mandir}/man5/dhclient-eval.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhclient-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+    fi;
 fi
 exit 0
 
+%post -n dhclient
+if [ "$1" -ge 1 ]; then
+   if [ ! -e %{_mandir}/man5/dhcp-options.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhclient-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+   fi;
+   if [ ! -e %{_mandir}/man5/dhcp-eval.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhclient-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+   fi;   
+fi
+:;
+
+%postun -n dhclient
+if [ "$1" -eq 0 ]; then
+    if [ -e %{_mandir}/man5/dhcpd-options.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhcpd-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+    fi;
+    if [ -e %{_mandir}/man5/dhcpd-eval.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhcpd-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+    fi;
+fi
+:;   
+
 %post -n libdhcp4client -p /sbin/ldconfig
 
 %postun -n libdhcp4client -p /sbin/ldconfig
@@ -385,11 +431,14 @@
 %{_sbindir}/dhcpd
 %{_sbindir}/dhcrelay
 %{_mandir}/man1/omshell.1*
-%{_mandir}/man5/dhcp-eval.5*
 %{_mandir}/man5/dhcpd.conf.5*
 %{_mandir}/man5/dhcpd.leases.5*
 %{_mandir}/man8/dhcpd.8*
 %{_mandir}/man8/dhcrelay.8*
+%{_mandir}/man5/dhcpd-options.5*
+%{_mandir}/man5/dhcpd-eval.5*
+%ghost %{_mandir}/man5/dhcp-options.5.gz
+%ghost %{_mandir}/man5/dhcp-eval.5.gz
 
 %files -n dhclient
 %defattr(-,root,root)
@@ -401,7 +450,10 @@
 %{_mandir}/man5/dhclient.leases.5*
 %{_mandir}/man8/dhclient.8*
 %{_mandir}/man8/dhclient-script.8*
-%{_mandir}/man5/dhcp-options.5*
+%{_mandir}/man5/dhclient-options.5*
+%{_mandir}/man5/dhclient-eval.5*
+%ghost %{_mandir}/man5/dhcp-options.5.gz
+%ghost %{_mandir}/man5/dhcp-eval.5.gz
 
 %files devel
 %defattr(-,root,root)
@@ -427,6 +479,11 @@
 %endif
 
 %changelog
+* Thu Jun 08 2006 Jason Vas Dias <jvdias at redhat.com> - 12:3.0.4-14
+- fix bug 191461: preserve ntp.conf local clock fudge statements
+- fix bug 193047: both dhcp and dhclient need to ship common
+                  man-pages: dhcp-options(5) dhcp-eval(5)
+
 * Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 12:3.0.4-12
 - Make -R option take effect in per-interface client configs
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:44:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:44:03 -0400
Subject: rpms/pam/devel pam.spec,1.116,1.117
Message-ID: <200606081844.k58Ii3Ob006987@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6649

Modified Files:
	pam.spec 
Log Message:
- added buildrequires libtool
- fixed a few rpmlint warnings



Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- pam.spec	8 Jun 2006 14:27:54 -0000	1.116
+++ pam.spec	8 Jun 2006 18:44:01 -0000	1.117
@@ -8,7 +8,7 @@
 %define db_conflicting_version 4.4.0
 %define pam_redhat_version 0.99.5-1
 
-Summary: A security tool which provides authentication for applications.
+Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.4.0
 Release: 5
@@ -41,19 +41,21 @@
 Requires: cracklib, cracklib-dicts >= 2.8
 Obsoletes: pamconfig
 Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig
-BuildPrereq: autoconf, automake, bison, flex, sed
-BuildPrereq: cracklib, cracklib-dicts >= 2.8
-BuildPrereq: perl, pkgconfig
+BuildRequires: autoconf, automake, libtool
+BuildRequires: bison, flex, sed
+BuildRequires: cracklib, cracklib-dicts >= 2.8
+BuildRequires: perl, pkgconfig
 %if %{WITH_AUDIT}
-BuildPrereq: audit-libs-devel >= 1.0.8
+BuildRequires: audit-libs-devel >= 1.0.8
 Requires: audit-libs >= 1.0.8
 %endif
-BuildPrereq: libselinux-devel >= 1.27.7
+BuildRequires: libselinux-devel >= 1.27.7
 Requires: libselinux >= 1.27.7
-BuildPrereq: glibc >= 2.3.90-37
+BuildRequires: glibc >= 2.3.90-37
 Requires: glibc >= 2.3.90-37
 # Following deps are necessary only to build the pam library documentation.
-BuildPrereq: linuxdoc-tools, w3m, libxslt, docbook-style-xsl, docbook-dtds
+BuildRequires: linuxdoc-tools, w3m, libxslt
+BuildRequires: docbook-style-xsl, docbook-dtds
 
 URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html
 
@@ -69,7 +71,7 @@
 
 %package devel
 Group: Development/Libraries
-Summary: Files needed for developing PAM-aware applications and modules for PAM.
+Summary: Files needed for developing PAM-aware applications and modules for PAM
 Requires: pam = %{version}-%{release}
 
 %description devel
@@ -81,9 +83,9 @@
 
 %prep
 %setup -q -n Linux-PAM-%{version} -a 2 -a 4
-cp $RPM_SOURCE_DIR/other.pamd .
-cp $RPM_SOURCE_DIR/system-auth.pamd .
-cp $RPM_SOURCE_DIR/config-util.pamd .
+cp %{SOURCE5}/other.pamd .
+cp %{SOURCE6}/system-auth.pamd .
+cp %{SOURCE7}/config-util.pamd .
 
 %patch1 -p1 -b .redhat-modules
 %patch21 -p1 -b .unix-hpux-aging
@@ -364,6 +366,8 @@
 * Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
 - updated pam_namespace with latest patch by Janak Desai
 - merged pam_namespace patches
+- added buildrequires libtool
+- fixed a few rpmlint warnings
 
 * Wed May 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-4
 - actually don't link to libssl as it is not used (#191915)



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:36:20 -0400
Subject: rpms/kernel/devel/configs config-generic,1.187,1.187.2.1
Message-ID: <200606081836.k58IZlO4005003@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv4919/configs

Modified Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	config-generic 
Log Message:
Added cachefs bits to kernel-2_6_16-1_2253_FC6_fscache branch



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.187
retrieving revision 1.187.2.1
diff -u -r1.187 -r1.187.2.1
--- config-generic	6 Jun 2006 21:15:48 -0000	1.187
+++ config-generic	8 Jun 2006 18:35:43 -0000	1.187.2.1
@@ -365,6 +365,13 @@
 CONFIG_SCSI_PROC_FS=y
 
 #
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_CACHEFILES=m
+CONFIG_CACHEFILES_DEBUG=y
+
+#
 # SCSI support type (disk, tape, CD-ROM)
 #
 CONFIG_BLK_DEV_SD=m
@@ -2360,6 +2367,7 @@
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_DIRECTIO=y
+CONFIG_NFS_FSCACHE=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -2391,6 +2399,7 @@
 CONFIG_CODA_FS=m
 # CONFIG_CODA_FS_OLD_API is not set
 # CONFIG_AFS_FS is not set
+# CONFIG_AFS_FSCACHE is not set
 # CONFIG_RXRPC is not set
 
 CONFIG_OCFS2_FS=m



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:36:20 -0400
Subject: rpms/kernel/devel linux-2.6.17-afs-fscache.patch, NONE,
	1.1.2.1 linux-2.6.17-cachefiles-misc.patch, NONE,
	1.1.2.1 linux-2.6.17-cachefiles.patch, NONE,
	1.1.2.1 linux-2.6.17-cachefs-fsmisc.patch, NONE,
	1.1.2.1 linux-2.6.17-cachefs-kfile.patch, NONE,
	1.1.2.1 linux-2.6.17-cachefs-mkwrite.patch, NONE,
	1.1.2.1 linux-2.6.17-cachefs-relpage.patch, NONE,
	1.1.2.1 linux-2.6.17-fscache-fedora.patch, NONE,
	1.1.2.1 linux-2.6.17-fscache.patch, NONE,
	1.1.2.1 linux-2.6.17-nfs-fscache.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2253, 1.2253.2.1
Message-ID: <200606081836.k58IZjY1004994@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4919

Modified Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	kernel-2.6.spec 
Added Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	linux-2.6.17-afs-fscache.patch 
	linux-2.6.17-cachefiles-misc.patch 
	linux-2.6.17-cachefiles.patch 
	linux-2.6.17-cachefs-fsmisc.patch 
	linux-2.6.17-cachefs-kfile.patch 
	linux-2.6.17-cachefs-mkwrite.patch 
	linux-2.6.17-cachefs-relpage.patch 
	linux-2.6.17-fscache-fedora.patch linux-2.6.17-fscache.patch 
	linux-2.6.17-nfs-fscache.patch 
Log Message:
Added cachefs bits to kernel-2_6_16-1_2253_FC6_fscache branch


linux-2.6.17-afs-fscache.patch:
 Kconfig         |    7 +
 afs/cell.c      |  109 ++++++++++++++----------
 afs/cell.h      |   16 ---
 afs/cmservice.c |    2 
 afs/dir.c       |   10 +-
 afs/file.c      |  243 ++++++++++++++++++++++++++++++++++++------------------
 afs/fsclient.c  |    4 
 afs/inode.c     |   43 ++++++---
 afs/internal.h  |   24 ++---
 afs/main.c      |   24 ++---
 afs/mntpt.c     |   12 +-
 afs/proc.c      |    1 
 afs/server.c    |    3 
 afs/vlocation.c |  185 +++++++++++++++++++++++++----------------
 afs/vnode.c     |  250 +++++++++++++++++++++++++++++++++++++++++++++-----------
 afs/vnode.h     |   10 +-
 afs/volume.c    |   78 ++++++-----------
 afs/volume.h    |   28 +-----
 18 files changed, 661 insertions(+), 388 deletions(-)

--- NEW FILE linux-2.6.17-afs-fscache.patch ---
--- linux-2.6.16.noarch/fs/afs/cell.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/cell.c	2006-06-07 14:34:54.091672000 -0400
@@ -31,17 +31,21 @@ static DEFINE_RWLOCK(afs_cells_lock);
 static DECLARE_RWSEM(afs_cells_sem); /* add/remove serialisation */
 static struct afs_cell *afs_cell_root;
 
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_cell_cache_match(void *target,
-						const void *entry);
-static void afs_cell_cache_update(void *source, void *entry);
-
-struct cachefs_index_def afs_cache_cell_index_def = {
-	.name			= "cell_ix",
-	.data_size		= sizeof(struct afs_cache_cell),
-	.keys[0]		= { CACHEFS_INDEX_KEYS_ASCIIZ, 64 },
-	.match			= afs_cell_cache_match,
-	.update			= afs_cell_cache_update,
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_cell_cache_get_key(const void *cookie_netfs_data,
+				       void *buffer, uint16_t buflen);
+static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data,
+				       void *buffer, uint16_t buflen);
+static fscache_checkaux_t afs_cell_cache_check_aux(void *cookie_netfs_data,
+						   const void *buffer,
+						   uint16_t buflen);
+
+static struct fscache_cookie_def afs_cell_cache_index_def = {
+	.name		= "AFS cell",
+	.type		= FSCACHE_COOKIE_TYPE_INDEX,
+	.get_key	= afs_cell_cache_get_key,
+	.get_aux	= afs_cell_cache_get_aux,
+	.check_aux	= afs_cell_cache_check_aux,
 };
 #endif
 
@@ -115,12 +119,11 @@ int afs_cell_create(const char *name, ch
 	if (ret < 0)
 		goto error;
 
-#ifdef AFS_CACHING_SUPPORT
-	/* put it up for caching */
-	cachefs_acquire_cookie(afs_cache_netfs.primary_index,
-			       &afs_vlocation_cache_index_def,
-			       cell,
-			       &cell->cache);
+#ifdef CONFIG_AFS_FSCACHE
+	/* put it up for caching (this never returns an error) */
+	cell->cache = fscache_acquire_cookie(afs_cache_netfs.primary_index,
+					     &afs_cell_cache_index_def,
+					     cell);
 #endif
 
 	/* add to the cell lists */
@@ -345,8 +348,8 @@ static void afs_cell_destroy(struct afs_
 	list_del_init(&cell->proc_link);
 	up_write(&afs_proc_cells_sem);
 
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_relinquish_cookie(cell->cache, 0);
+#ifdef CONFIG_AFS_FSCACHE
+	fscache_relinquish_cookie(cell->cache, 0);
 #endif
 
 	up_write(&afs_cells_sem);
@@ -526,44 +529,62 @@ void afs_cell_purge(void)
 
 /*****************************************************************************/
 /*
- * match a cell record obtained from the cache
+ * set the key for the index entry
  */
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_cell_cache_match(void *target,
-						const void *entry)
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_cell_cache_get_key(const void *cookie_netfs_data,
+				       void *buffer, uint16_t bufmax)
 {
-	const struct afs_cache_cell *ccell = entry;
-	struct afs_cell *cell = target;
+	const struct afs_cell *cell = cookie_netfs_data;
+	uint16_t klen;
 
-	_enter("{%s},{%s}", ccell->name, cell->name);
+	_enter("%p,%p,%u", cell, buffer, bufmax);
 
-	if (strncmp(ccell->name, cell->name, sizeof(ccell->name)) == 0) {
-		_leave(" = SUCCESS");
-		return CACHEFS_MATCH_SUCCESS;
-	}
+	klen = strlen(cell->name);
+	if (klen > bufmax)
+		return 0;
+
+	memcpy(buffer, cell->name, klen);
+	return klen;
 
-	_leave(" = FAILED");
-	return CACHEFS_MATCH_FAILED;
-} /* end afs_cell_cache_match() */
+} /* end afs_cell_cache_get_key() */
 #endif
 
 /*****************************************************************************/
 /*
- * update a cell record in the cache
+ * provide new auxilliary cache data
  */
-#ifdef AFS_CACHING_SUPPORT
-static void afs_cell_cache_update(void *source, void *entry)
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data,
+				       void *buffer, uint16_t bufmax)
 {
-	struct afs_cache_cell *ccell = entry;
-	struct afs_cell *cell = source;
+	const struct afs_cell *cell = cookie_netfs_data;
+	uint16_t dlen;
 
-	_enter("%p,%p", source, entry);
+	_enter("%p,%p,%u", cell, buffer, bufmax);
 
-	strncpy(ccell->name, cell->name, sizeof(ccell->name));
+	dlen = cell->vl_naddrs * sizeof(cell->vl_addrs[0]);
+	dlen = min(dlen, bufmax);
+	dlen &= ~(sizeof(cell->vl_addrs[0]) - 1);
 
-	memcpy(ccell->vl_servers,
-	       cell->vl_addrs,
-	       min(sizeof(ccell->vl_servers), sizeof(cell->vl_addrs)));
+	memcpy(buffer, cell->vl_addrs, dlen);
+
+	return dlen;
+
+} /* end afs_cell_cache_get_aux() */
+#endif
+
+/*****************************************************************************/
+/*
+ * check that the auxilliary data indicates that the entry is still valid
+ */
+#ifdef CONFIG_AFS_FSCACHE
+static fscache_checkaux_t afs_cell_cache_check_aux(void *cookie_netfs_data,
+						   const void *buffer,
+						   uint16_t buflen)
+{
+	_leave(" = OKAY");
+	return FSCACHE_CHECKAUX_OKAY;
 
-} /* end afs_cell_cache_update() */
+} /* end afs_cell_cache_check_aux() */
 #endif
--- linux-2.6.16.noarch/fs/afs/cell.h.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/cell.h	2006-06-07 14:34:54.097676000 -0400
@@ -13,7 +13,7 @@
 #define _LINUX_AFS_CELL_H
 
 #include "types.h"
-#include "cache.h"
+#include <linux/fscache.h>
 
 #define AFS_CELL_MAX_ADDRS 15
 
@@ -21,16 +21,6 @@ extern volatile int afs_cells_being_purg
 
 /*****************************************************************************/
 /*
- * entry in the cached cell catalogue
- */
-struct afs_cache_cell
-{
-	char			name[64];	/* cell name (padded with NULs) */
-	struct in_addr		vl_servers[15];	/* cached cell VL servers */
-};
-
-/*****************************************************************************/
-/*
  * AFS cell record
  */
 struct afs_cell
@@ -39,8 +29,8 @@ struct afs_cell
 	struct list_head	link;		/* main cell list link */
 	struct list_head	proc_link;	/* /proc cell list link */
 	struct proc_dir_entry	*proc_dir;	/* /proc dir for this cell */
-#ifdef AFS_CACHING_SUPPORT
-	struct cachefs_cookie	*cache;		/* caching cookie */
+#ifdef CONFIG_AFS_FSCACHE
+	struct fscache_cookie	*cache;		/* caching cookie */
 #endif
 
 	/* server record management */
--- linux-2.6.16.noarch/fs/afs/cmservice.c.fsafs	2006-06-07 14:26:17.201745000 -0400
+++ linux-2.6.16.noarch/fs/afs/cmservice.c	2006-06-07 14:34:54.153673000 -0400
@@ -24,7 +24,7 @@
 #include "internal.h"
 
 static unsigned afscm_usage;		/* AFS cache manager usage count */
-static struct rw_semaphore afscm_sem;	/* AFS cache manager start/stop semaphore */
+static DECLARE_RWSEM(afscm_sem);	/* AFS cache manager start/stop semaphore */
 
 static int afscm_new_call(struct rxrpc_call *call);
 static void afscm_attention(struct rxrpc_call *call);
--- linux-2.6.16.noarch/fs/afs/dir.c.fsafs	2006-06-07 14:27:21.723370000 -0400
+++ linux-2.6.16.noarch/fs/afs/dir.c	2006-06-07 14:34:54.161671000 -0400
@@ -145,7 +145,7 @@ static inline void afs_dir_check_page(st
 	qty /= sizeof(union afs_dir_block);
 
 	/* check them */
-	dbuf = page_address(page);
+	dbuf = kmap_atomic(page, KM_USER0);
 	for (tmp = 0; tmp < qty; tmp++) {
 		if (dbuf->blocks[tmp].pagehdr.magic != AFS_DIR_MAGIC) {
 			printk("kAFS: %s(%lu): bad magic %d/%d is %04hx\n",
@@ -154,10 +154,12 @@ static inline void afs_dir_check_page(st
 			goto error;
 		}
 	}
+	kunmap_atomic(dbuf, KM_USER0);
 
 	return;
 
  error:
+	kunmap_atomic(dbuf, KM_USER0);
 	SetPageError(page);
 
 } /* end afs_dir_check_page() */
@@ -168,7 +170,6 @@ static inline void afs_dir_check_page(st
  */
 static inline void afs_dir_put_page(struct page *page)
 {
-	kunmap(page);
 	page_cache_release(page);
 
 } /* end afs_dir_put_page() */
@@ -188,7 +189,6 @@ static struct page *afs_dir_get_page(str
 			       NULL);
 	if (!IS_ERR(page)) {
 		wait_on_page_locked(page);
-		kmap(page);
 		if (!PageUptodate(page))
 			goto fail;
 		afs_dir_check_page(dir, page);
@@ -356,7 +356,7 @@ static int afs_dir_iterate(struct inode 
 
 		limit = blkoff & ~(PAGE_SIZE - 1);
 
-		dbuf = page_address(page);
+		dbuf = kmap_atomic(page, KM_USER0);
 
 		/* deal with the individual blocks stashed on this page */
 		do {
@@ -365,6 +365,7 @@ static int afs_dir_iterate(struct inode 
 			ret = afs_dir_iterate_block(fpos, dblock, blkoff,
 						    cookie, filldir);
 			if (ret != 1) {
+				kunmap_atomic(dbuf, KM_USER0);
 				afs_dir_put_page(page);
 				goto out;
 			}
@@ -373,6 +374,7 @@ static int afs_dir_iterate(struct inode 
 
 		} while (*fpos < dir->i_size && blkoff < limit);
 
+		kunmap_atomic(dbuf, KM_USER0);
 		afs_dir_put_page(page);
 		ret = 0;
 	}
--- linux-2.6.16.noarch/fs/afs/file.c.fsafs	2006-06-07 14:26:17.221746000 -0400
+++ linux-2.6.16.noarch/fs/afs/file.c	2006-06-07 14:34:54.168672000 -0400
@@ -16,12 +16,15 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/pagevec.h>
 #include <linux/buffer_head.h>
 #include "volume.h"
 #include "vnode.h"
 #include <rxrpc/call.h>
 #include "internal.h"
 
+#define list_to_page(head) (list_entry((head)->prev, struct page, lru))
+
 #if 0
 static int afs_file_open(struct inode *inode, struct file *file);
 static int afs_file_release(struct inode *inode, struct file *file);
@@ -30,34 +33,72 @@ static int afs_file_release(struct inode
 static int afs_file_readpage(struct file *file, struct page *page);
 static void afs_file_invalidatepage(struct page *page, unsigned long offset);
 static int afs_file_releasepage(struct page *page, gfp_t gfp_flags);
+static int afs_file_mmap(struct file * file, struct vm_area_struct * vma);
+
+#ifdef CONFIG_AFS_FSCACHE
+static int afs_file_readpages(struct file *filp, struct address_space *mapping,
+			      struct list_head *pages, unsigned nr_pages);
+static int afs_file_page_mkwrite(struct vm_area_struct *vma, struct page *page);
+#endif
 
 struct inode_operations afs_file_inode_operations = {
 	.getattr	= afs_inode_getattr,
 };
 
+struct file_operations afs_file_file_operations = {
+	.read		= generic_file_read,
+	.mmap		= afs_file_mmap,
+};
+
 struct address_space_operations afs_fs_aops = {
 	.readpage	= afs_file_readpage,
+#ifdef CONFIG_AFS_FSCACHE
+	.readpages	= afs_file_readpages,
+#endif
 	.sync_page	= block_sync_page,
 	.set_page_dirty	= __set_page_dirty_nobuffers,
 	.releasepage	= afs_file_releasepage,
 	.invalidatepage	= afs_file_invalidatepage,
 };
 
+static struct vm_operations_struct afs_fs_vm_operations = {
+	.nopage		= filemap_nopage,
+	.populate	= filemap_populate,
+#ifdef CONFIG_AFS_FSCACHE
+	.page_mkwrite	= afs_file_page_mkwrite,
+#endif
+};
+
+/*****************************************************************************/
+/*
+ * set up a memory mapping on an AFS file
+ * - we set our own VMA ops so that we can catch the page becoming writable for
+ *   userspace for shared-writable mmap
+ */
+static int afs_file_mmap(struct file *file, struct vm_area_struct *vma)
+{
+	_enter("");
+
+	file_accessed(file);
+	vma->vm_ops = &afs_fs_vm_operations;
+	return 0;
+
+} /* end afs_file_mmap() */
+
 /*****************************************************************************/
 /*
  * deal with notification that a page was read from the cache
  */
-#ifdef AFS_CACHING_SUPPORT
-static void afs_file_readpage_read_complete(void *cookie_data,
-					    struct page *page,
+#ifdef CONFIG_AFS_FSCACHE
+static void afs_file_readpage_read_complete(struct page *page,
 					    void *data,
 					    int error)
 {
-	_enter("%p,%p,%p,%d", cookie_data, page, data, error);
+	_enter("%p,%p,%d", page, data, error);
 
-	if (error)
-		SetPageError(page);
-	else
+	/* if the read completes with an error, we just unlock the page and let
+	 * the VM reissue the readpage */
+	if (!error)
 		SetPageUptodate(page);
 	unlock_page(page);
 
@@ -68,15 +109,16 @@ static void afs_file_readpage_read_compl
 /*
  * deal with notification that a page was written to the cache
  */
-#ifdef AFS_CACHING_SUPPORT
-static void afs_file_readpage_write_complete(void *cookie_data,
-					     struct page *page,
+#ifdef CONFIG_AFS_FSCACHE
+static void afs_file_readpage_write_complete(struct page *page,
 					     void *data,
 					     int error)
 {
-	_enter("%p,%p,%p,%d", cookie_data, page, data, error);
+	_enter("%p,%p,%d", page, data, error);
 
-	unlock_page(page);
+	/* note that the page has been written to the cache and can now be
+	 * modified */
+	end_page_fs_misc(page);
 
 } /* end afs_file_readpage_write_complete() */
 #endif
@@ -88,16 +130,13 @@ static void afs_file_readpage_write_comp
 static int afs_file_readpage(struct file *file, struct page *page)
 {
 	struct afs_rxfs_fetch_descriptor desc;
-#ifdef AFS_CACHING_SUPPORT
-	struct cachefs_page *pageio;
-#endif
 	struct afs_vnode *vnode;
 	struct inode *inode;
 	int ret;
 
 	inode = page->mapping->host;
 
-	_enter("{%lu},{%lu}", inode->i_ino, page->index);
+	_enter("{%lu},%p{%lu}", inode->i_ino, page, page->index);
 
 	vnode = AFS_FS_I(inode);
 
@@ -107,13 +146,9 @@ static int afs_file_readpage(struct file
 	if (vnode->flags & AFS_VNODE_DELETED)
 		goto error;
 
-#ifdef AFS_CACHING_SUPPORT
-	ret = cachefs_page_get_private(page, &pageio, GFP_NOIO);
-	if (ret < 0)
-		goto error;
-
+#ifdef CONFIG_AFS_FSCACHE
 	/* is it cached? */
-	ret = cachefs_read_or_alloc_page(vnode->cache,
+	ret = fscache_read_or_alloc_page(vnode->cache,
 					 page,
 					 afs_file_readpage_read_complete,
 					 NULL,
@@ -123,18 +158,20 @@ static int afs_file_readpage(struct file
 #endif
 
 	switch (ret) {
-		/* read BIO submitted and wb-journal entry found */
-	case 1:
-		BUG(); // TODO - handle wb-journal match
-
 		/* read BIO submitted (page in cache) */
 	case 0:
 		break;
 
-		/* no page available in cache */
-	case -ENOBUFS:
+		/* page not yet cached */
 	case -ENODATA:
+		_debug("cache said ENODATA");
+		goto go_on;
+
+		/* page will not be cached */
+	case -ENOBUFS:
+		_debug("cache said ENOBUFS");
 	default:
+	go_on:
 		desc.fid	= vnode->fid;
 		desc.offset	= page->index << PAGE_CACHE_SHIFT;
 		desc.size	= min((size_t) (inode->i_size - desc.offset),
@@ -148,34 +185,40 @@ static int afs_file_readpage(struct file
 		ret = afs_vnode_fetch_data(vnode, &desc);
 		kunmap(page);
 		if (ret < 0) {
-			if (ret==-ENOENT) {
-				_debug("got NOENT from server"
+			if (ret == -ENOENT) {
+				kdebug("got NOENT from server"
 				       " - marking file deleted and stale");
 				vnode->flags |= AFS_VNODE_DELETED;
 				ret = -ESTALE;
 			}
 
-#ifdef AFS_CACHING_SUPPORT
-			cachefs_uncache_page(vnode->cache, page);
+#ifdef CONFIG_AFS_FSCACHE
+			fscache_uncache_page(vnode->cache, page);
+			ClearPagePrivate(page);
 #endif
 			goto error;
 		}
 
 		SetPageUptodate(page);
 
-#ifdef AFS_CACHING_SUPPORT
-		if (cachefs_write_page(vnode->cache,
-				       page,
-				       afs_file_readpage_write_complete,
-				       NULL,
-				       GFP_KERNEL) != 0
-		    ) {
-			cachefs_uncache_page(vnode->cache, page);
-			unlock_page(page);
+		/* send the page to the cache */
+#ifdef CONFIG_AFS_FSCACHE
+		if (PagePrivate(page)) {
+			if (TestSetPageFsMisc(page))
+				BUG();
+			if (fscache_write_page(vnode->cache,
+					       page,
+					       afs_file_readpage_write_complete,
+					       NULL,
+					       GFP_KERNEL) != 0
+			    ) {
+				fscache_uncache_page(vnode->cache, page);
+				ClearPagePrivate(page);
+				end_page_fs_misc(page);
+			}
 		}
-#else
-		unlock_page(page);
 #endif
+		unlock_page(page);
 	}
 
 	_leave(" = 0");
@@ -192,20 +235,63 @@ static int afs_file_readpage(struct file
 
 /*****************************************************************************/
 /*
- * get a page cookie for the specified page
+ * read a set of pages
  */
-#ifdef AFS_CACHING_SUPPORT
-int afs_cache_get_page_cookie(struct page *page,
-			      struct cachefs_page **_page_cookie)
+#ifdef CONFIG_AFS_FSCACHE
+static int afs_file_readpages(struct file *filp, struct address_space *mapping,
+			      struct list_head *pages, unsigned nr_pages)
 {
-	int ret;
+	struct afs_vnode *vnode;
+#if 0
+	struct pagevec lru_pvec;
+	unsigned page_idx;
+#endif
+	int ret = 0;
 
-	_enter("");
-	ret = cachefs_page_get_private(page,_page_cookie, GFP_NOIO);
+	_enter(",{%lu},,%d", mapping->host->i_ino, nr_pages);
 
-	_leave(" = %d", ret);
+	vnode = AFS_FS_I(mapping->host);
+	if (vnode->flags & AFS_VNODE_DELETED) {
+		_leave(" = -ESTALE");
+		return -ESTALE;
+	}
+
+	/* attempt to read as many of the pages as possible */
+	ret = fscache_read_or_alloc_pages(vnode->cache,
+					  mapping,
+					  pages,
+					  &nr_pages,
+					  afs_file_readpage_read_complete,
+					  NULL,
+					  mapping_gfp_mask(mapping));
+
+	switch (ret) {
+		/* all pages are being read from the cache */
+	case 0:
+		BUG_ON(!list_empty(pages));
+		BUG_ON(nr_pages != 0);
+		_leave(" = 0 [reading all]");
+		return 0;
+
+		/* there were pages that couldn't be read from the cache */
+	case -ENODATA:
+	case -ENOBUFS:
+		break;
+
+		/* other error */
+	default:
+		_leave(" = %d", ret);
+		return ret;
+	}
+
+	/* load the missing pages from the network */
+	ret = read_cache_pages(mapping, pages,
+			       (void *) afs_file_readpage, NULL);
+
+	_leave(" = %d [netting]", ret);
 	return ret;
-} /* end afs_cache_get_page_cookie() */
+
+} /* end afs_file_readpages() */
 #endif
 
 /*****************************************************************************/
@@ -214,35 +300,22 @@ int afs_cache_get_page_cookie(struct pag
  */
 static void afs_file_invalidatepage(struct page *page, unsigned long offset)
 {
-	int ret = 1;
-
 	_enter("{%lu},%lu", page->index, offset);
 
 	BUG_ON(!PageLocked(page));
 
 	if (PagePrivate(page)) {
-#ifdef AFS_CACHING_SUPPORT
-		struct afs_vnode *vnode = AFS_FS_I(page->mapping->host);
-		cachefs_uncache_page(vnode->cache,page);
-#endif
-
 		/* We release buffers only if the entire page is being
 		 * invalidated.
 		 * The get_block cached value has been unconditionally
 		 * invalidated, so real IO is not possible anymore.
 		 */
-		if (offset == 0) {
-			BUG_ON(!PageLocked(page));
-
-			ret = 0;
-			if (!PageWriteback(page))
-				ret = page->mapping->a_ops->releasepage(page,
-									0);
-			/* possibly should BUG_ON(!ret); - neilb */
-		}
+		if (offset == 0 && !PageWriteback(page))
+			page->mapping->a_ops->releasepage(page, 0);
 	}
 
-	_leave(" = %d", ret);
+	_leave("");
+
 } /* end afs_file_invalidatepage() */
 
 /*****************************************************************************/
@@ -251,23 +324,29 @@ static void afs_file_invalidatepage(stru
  */
 static int afs_file_releasepage(struct page *page, gfp_t gfp_flags)
 {
-	struct cachefs_page *pageio;
-
 	_enter("{%lu},%x", page->index, gfp_flags);
 
-	if (PagePrivate(page)) {
-#ifdef AFS_CACHING_SUPPORT
-		struct afs_vnode *vnode = AFS_FS_I(page->mapping->host);
-		cachefs_uncache_page(vnode->cache, page);
+#ifdef CONFIG_AFS_FSCACHE
+	wait_on_page_fs_misc(page);
+	fscache_uncache_page(AFS_FS_I(page->mapping->host)->cache, page);
+	ClearPagePrivate(page);
 #endif
 
-		pageio = (struct cachefs_page *) page_private(page);
-		set_page_private(page, 0);
-		ClearPagePrivate(page);
-
-		kfree(pageio);
-	}
-
 	_leave(" = 0");
 	return 0;
+
 } /* end afs_file_releasepage() */
+
+/*****************************************************************************/
+/*
+ * wait for the disc cache to finish writing before permitting modification of
+ * our page in the page cache
+ */
+#ifdef CONFIG_AFS_FSCACHE
+static int afs_file_page_mkwrite(struct vm_area_struct *vma, struct page *page)
+{
+	wait_on_page_fs_misc(page);
+	return 0;
+
+} /* end afs_file_page_mkwrite() */
+#endif
--- linux-2.6.16.noarch/fs/afs/fsclient.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/fsclient.c	2006-06-07 14:34:54.194671000 -0400
@@ -398,6 +398,8 @@ int afs_rxfs_fetch_file_status(struct af
 		bp++; /* spare6 */
 	}
 
+	_debug("Data Version %llx\n", vnode->status.version);
+
 	/* success */
 	ret = 0;
 
@@ -408,7 +410,7 @@ int afs_rxfs_fetch_file_status(struct af
  out_put_conn:
 	afs_server_release_callslot(server, &callslot);
  out:
-	_leave("");
+	_leave(" = %d", ret);
 	return ret;
 
  abort:
--- linux-2.6.16.noarch/fs/afs/inode.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/inode.c	2006-06-07 14:34:54.201673000 -0400
@@ -65,6 +65,11 @@ static int afs_inode_map_status(struct a
 		return -EBADMSG;
 	}
 
+#ifdef CONFIG_AFS_FSCACHE
+	if (vnode->status.size != inode->i_size)
+		fscache_set_i_size(vnode->cache, vnode->status.size);
+#endif
+
 	inode->i_nlink		= vnode->status.nlink;
 	inode->i_uid		= vnode->status.owner;
 	inode->i_gid		= 0;
@@ -101,13 +106,33 @@ static int afs_inode_fetch_status(struct
 	struct afs_vnode *vnode;
 	int ret;
 
+	_enter("");
+
 	vnode = AFS_FS_I(inode);
 
 	ret = afs_vnode_fetch_status(vnode);
 
-	if (ret == 0)
+	if (ret == 0) {
+#ifdef CONFIG_AFS_FSCACHE
+		if (!vnode->cache) {
+			vnode->cache =
+				fscache_acquire_cookie(vnode->volume->cache,
+						       &afs_vnode_cache_index_def,
+						       vnode);
+			if (!vnode->cache)
+				printk("Negative\n");
+		}
+#endif
 		ret = afs_inode_map_status(vnode);
+#ifdef CONFIG_AFS_FSCACHE
+		if (ret < 0) {
+			fscache_relinquish_cookie(vnode->cache, 0);
+			vnode->cache = NULL;
+		}
+#endif
+	}
 
+	_leave(" = %d", ret);
 	return ret;
 
 } /* end afs_inode_fetch_status() */
@@ -122,6 +147,7 @@ static int afs_iget5_test(struct inode *
 
 	return inode->i_ino == data->fid.vnode &&
 		inode->i_version == data->fid.unique;
+
 } /* end afs_iget5_test() */
 
 /*****************************************************************************/
@@ -179,20 +205,11 @@ inline int afs_iget(struct super_block *
 		return ret;
 	}
 
-#ifdef AFS_CACHING_SUPPORT
-	/* set up caching before reading the status, as fetch-status reads the
-	 * first page of symlinks to see if they're really mntpts */
-	cachefs_acquire_cookie(vnode->volume->cache,
-			       NULL,
-			       vnode,
-			       &vnode->cache);
-#endif
-
 	/* okay... it's a new inode */
 	inode->i_flags |= S_NOATIME;
 	vnode->flags |= AFS_VNODE_CHANGED;
 	ret = afs_inode_fetch_status(inode);
-	if (ret<0)
+	if (ret < 0)
 		goto bad_inode;
 
 	/* success */
@@ -278,8 +295,8 @@ void afs_clear_inode(struct inode *inode
 
 	afs_vnode_give_up_callback(vnode);
 
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_relinquish_cookie(vnode->cache, 0);
+#ifdef CONFIG_AFS_FSCACHE
+	fscache_relinquish_cookie(vnode->cache, 0);
 	vnode->cache = NULL;
 #endif
 
--- linux-2.6.16.noarch/fs/afs/internal.h.fsafs	2006-06-07 14:26:17.231745000 -0400
+++ linux-2.6.16.noarch/fs/afs/internal.h	2006-06-07 14:34:54.224675000 -0400
@@ -16,15 +16,17 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/fscache.h>
 
 /*
  * debug tracing
  */
-#define kenter(FMT, a...)	printk("==> %s("FMT")\n",__FUNCTION__ , ## a)
-#define kleave(FMT, a...)	printk("<== %s()"FMT"\n",__FUNCTION__ , ## a)
-#define kdebug(FMT, a...)	printk(FMT"\n" , ## a)
-#define kproto(FMT, a...)	printk("### "FMT"\n" , ## a)
-#define knet(FMT, a...)		printk(FMT"\n" , ## a)
+#define __kdbg(FMT, a...)	printk("[%05d] "FMT"\n", current->pid , ## a)
+#define kenter(FMT, a...)	__kdbg("==> %s("FMT")", __FUNCTION__ , ## a)
+#define kleave(FMT, a...)	__kdbg("<== %s()"FMT, __FUNCTION__ , ## a)
+#define kdebug(FMT, a...)	__kdbg(FMT , ## a)
+#define kproto(FMT, a...)	__kdbg("### "FMT , ## a)
+#define knet(FMT, a...)		__kdbg(FMT , ## a)
 
 #ifdef __KDEBUG
 #define _enter(FMT, a...)	kenter(FMT , ## a)
@@ -56,9 +58,6 @@ static inline void afs_discard_my_signal
  */
 extern struct rw_semaphore afs_proc_cells_sem;
 extern struct list_head afs_proc_cells;
-#ifdef AFS_CACHING_SUPPORT
-extern struct cachefs_index_def afs_cache_cell_index_def;
-#endif
 
 /*
  * dir.c
@@ -72,11 +71,6 @@ extern const struct file_operations afs_
 extern struct address_space_operations afs_fs_aops;
 extern struct inode_operations afs_file_inode_operations;
 
-#ifdef AFS_CACHING_SUPPORT
-extern int afs_cache_get_page_cookie(struct page *page,
-				     struct cachefs_page **_page_cookie);
-#endif
-
 /*
  * inode.c
  */
@@ -97,8 +91,8 @@ extern void afs_key_unregister(void);
 /*
  * main.c
  */
-#ifdef AFS_CACHING_SUPPORT
-extern struct cachefs_netfs afs_cache_netfs;
+#ifdef CONFIG_AFS_FSCACHE
+extern struct fscache_netfs afs_cache_netfs;
 #endif
 
 /*
--- linux-2.6.16.noarch/fs/afs/main.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/main.c	2006-06-07 14:34:54.247676000 -0400
@@ -1,6 +1,6 @@
 /* main.c: AFS client file system
  *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2002,5 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells at redhat.com)
  *
  * This program is free software; you can redistribute it and/or
@@ -14,11 +14,11 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
+#include <linux/fscache.h>
 #include <rxrpc/rxrpc.h>
 #include <rxrpc/transport.h>
 #include <rxrpc/call.h>
 #include <rxrpc/peer.h>
-#include "cache.h"
 #include "cell.h"
 #include "server.h"
 #include "fsclient.h"
@@ -51,12 +51,11 @@ static struct rxrpc_peer_ops afs_peer_op
 struct list_head afs_cb_hash_tbl[AFS_CB_HASH_COUNT];
 DEFINE_SPINLOCK(afs_cb_hash_lock);
 
-#ifdef AFS_CACHING_SUPPORT
-static struct cachefs_netfs_operations afs_cache_ops = {
-	.get_page_cookie	= afs_cache_get_page_cookie,
+#ifdef CONFIG_AFS_FSCACHE
+static struct fscache_netfs_operations afs_cache_ops = {
 };
 
-struct cachefs_netfs afs_cache_netfs = {
+struct fscache_netfs afs_cache_netfs = {
 	.name			= "afs",
 	.version		= 0,
 	.ops			= &afs_cache_ops,
@@ -83,10 +82,9 @@ static int __init afs_init(void)
 	if (ret < 0)
 		return ret;
 
-#ifdef AFS_CACHING_SUPPORT
+#ifdef CONFIG_AFS_FSCACHE
 	/* we want to be able to cache */
-	ret = cachefs_register_netfs(&afs_cache_netfs,
-				     &afs_cache_cell_index_def);
+	ret = fscache_register_netfs(&afs_cache_netfs);
 	if (ret < 0)
 		goto error;
 #endif
@@ -137,8 +135,8 @@ static int __init afs_init(void)
 	afs_key_unregister();
  error_cache:
 #endif
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_unregister_netfs(&afs_cache_netfs);
+#ifdef CONFIG_AFS_FSCACHE
+	fscache_unregister_netfs(&afs_cache_netfs);
  error:
 #endif
 	afs_cell_purge();
@@ -167,8 +165,8 @@ static void __exit afs_exit(void)
 #ifdef CONFIG_KEYS_TURNED_OFF
 	afs_key_unregister();
 #endif
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_unregister_netfs(&afs_cache_netfs);
+#ifdef CONFIG_AFS_FSCACHE
+	fscache_unregister_netfs(&afs_cache_netfs);
 #endif
 	afs_proc_cleanup();
 
--- linux-2.6.16.noarch/fs/afs/mntpt.c.fsafs	2006-06-07 14:26:17.240747000 -0400
+++ linux-2.6.16.noarch/fs/afs/mntpt.c	2006-06-07 14:34:54.270672000 -0400
@@ -82,7 +82,7 @@ int afs_mntpt_check_symlink(struct afs_v
 
 	ret = -EIO;
 	wait_on_page_locked(page);
-	buf = kmap(page);
+	buf = kmap_atomic(page, KM_USER0);
 	if (!PageUptodate(page))
 		goto out_free;
 	if (PageError(page))
@@ -105,7 +105,7 @@ int afs_mntpt_check_symlink(struct afs_v
 	ret = 0;
 
  out_free:
-	kunmap(page);
+	kunmap_atomic(buf, KM_USER0);
 	page_cache_release(page);
  out:
 	_leave(" = %d", ret);
@@ -195,9 +195,9 @@ static struct vfsmount *afs_mntpt_do_aut
 	if (!PageUptodate(page) || PageError(page))
 		goto error;
 
-	buf = kmap(page);
+	buf = kmap_atomic(page, KM_USER0);
 	memcpy(devname, buf, size);
-	kunmap(page);
+	kunmap_atomic(buf, KM_USER0);
 	page_cache_release(page);
 	page = NULL;
 
@@ -276,12 +276,12 @@ static void *afs_mntpt_follow_link(struc
  */
 static void afs_mntpt_expiry_timed_out(struct afs_timer *timer)
 {
-	kenter("");
+//	kenter("");
 
 	mark_mounts_for_expiry(&afs_vfsmounts);
 
 	afs_kafstimod_add_timer(&afs_mntpt_expiry_timer,
 				afs_mntpt_expiry_timeout * HZ);
 
-	kleave("");
+//	kleave("");
 } /* end afs_mntpt_expiry_timed_out() */
--- linux-2.6.16.noarch/fs/afs/proc.c.fsafs	2006-06-07 14:26:17.251748000 -0400
+++ linux-2.6.16.noarch/fs/afs/proc.c	2006-06-07 14:34:54.278672000 -0400
@@ -177,6 +177,7 @@ int afs_proc_init(void)
  */
 void afs_proc_cleanup(void)
 {
+	remove_proc_entry("rootcell", proc_afs);
 	remove_proc_entry("cells", proc_afs);
 
 	remove_proc_entry("fs/afs", NULL);
--- linux-2.6.16.noarch/fs/afs/server.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/server.c	2006-06-07 14:34:54.302673000 -0400
@@ -377,7 +377,6 @@ int afs_server_request_callslot(struct a
 	else if (list_empty(&server->fs_callq)) {
 		/* no one waiting */
 		server->fs_conn_cnt[nconn]++;
-		spin_unlock(&server->fs_lock);
 	}
 	else {
 		/* someone's waiting - dequeue them and wake them up */
@@ -395,9 +394,9 @@ int afs_server_request_callslot(struct a
 		}
 		pcallslot->ready = 1;
 		wake_up_process(pcallslot->task);
-		spin_unlock(&server->fs_lock);
 	}
 
+	spin_unlock(&server->fs_lock);
 	rxrpc_put_connection(callslot->conn);
 	callslot->conn = NULL;
 
--- linux-2.6.16.noarch/fs/afs/vlocation.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/vlocation.c	2006-06-07 14:34:54.325674000 -0400
@@ -59,17 +59,21 @@ static LIST_HEAD(afs_vlocation_update_pe
 static struct afs_vlocation *afs_vlocation_update;	/* VL currently being updated */
 static DEFINE_SPINLOCK(afs_vlocation_update_lock); /* lock guarding update queue */
 
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_vlocation_cache_match(void *target,
-						     const void *entry);
-static void afs_vlocation_cache_update(void *source, void *entry);
-
-struct cachefs_index_def afs_vlocation_cache_index_def = {
-	.name		= "vldb",
-	.data_size	= sizeof(struct afs_cache_vlocation),
-	.keys[0]	= { CACHEFS_INDEX_KEYS_ASCIIZ, 64 },
-	.match		= afs_vlocation_cache_match,
-	.update		= afs_vlocation_cache_update,
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_vlocation_cache_get_key(const void *cookie_netfs_data,
+					    void *buffer, uint16_t buflen);
+static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data,
+					    void *buffer, uint16_t buflen);
+static fscache_checkaux_t afs_vlocation_cache_check_aux(void *cookie_netfs_data,
+							const void *buffer,
+							uint16_t buflen);
+
+static struct fscache_cookie_def afs_vlocation_cache_index_def = {
+	.name		= "AFS.vldb",
+	.type		= FSCACHE_COOKIE_TYPE_INDEX,
+	.get_key	= afs_vlocation_cache_get_key,
+	.get_aux	= afs_vlocation_cache_get_aux,
+	.check_aux	= afs_vlocation_cache_check_aux,
 };
 #endif
 
@@ -300,13 +304,12 @@ int afs_vlocation_lookup(struct afs_cell
 
 	list_add_tail(&vlocation->link, &cell->vl_list);
 
-#ifdef AFS_CACHING_SUPPORT
+#ifdef CONFIG_AFS_FSCACHE
 	/* we want to store it in the cache, plus it might already be
 	 * encached */
-	cachefs_acquire_cookie(cell->cache,
-			       &afs_volume_cache_index_def,
-			       vlocation,
-			       &vlocation->cache);
+	vlocation->cache = fscache_acquire_cookie(cell->cache,
+						  &afs_vlocation_cache_index_def,
+						  vlocation);
 
 	if (vlocation->valid)
 		goto found_in_cache;
@@ -341,7 +344,7 @@ int afs_vlocation_lookup(struct afs_cell
  active:
 	active = 1;
 
-#ifdef AFS_CACHING_SUPPORT
+#ifdef CONFIG_AFS_FSCACHE
  found_in_cache:
 #endif
 	/* try to look up a cached volume in the cell VL databases by ID */
@@ -423,9 +426,9 @@ int afs_vlocation_lookup(struct afs_cell
 
 	afs_kafstimod_add_timer(&vlocation->upd_timer, 10 * HZ);
 
-#ifdef AFS_CACHING_SUPPORT
+#ifdef CONFIG_AFS_FSCACHE
 	/* update volume entry in local cache */
-	cachefs_update_cookie(vlocation->cache);
+	fscache_update_cookie(vlocation->cache);
 #endif
 
 	*_vlocation = vlocation;
@@ -439,8 +442,8 @@ int afs_vlocation_lookup(struct afs_cell
 		}
 		else {
 			list_del(&vlocation->link);
-#ifdef AFS_CACHING_SUPPORT
-			cachefs_relinquish_cookie(vlocation->cache, 0);
+#ifdef CONFIG_AFS_FSCACHE
+			fscache_relinquish_cookie(vlocation->cache, 0);
 #endif
 			afs_put_cell(vlocation->cell);
 			kfree(vlocation);
@@ -538,8 +541,8 @@ void afs_vlocation_do_timeout(struct afs
 	}
 
 	/* we can now destroy it properly */
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_relinquish_cookie(vlocation->cache, 0);
+#ifdef CONFIG_AFS_FSCACHE
+	fscache_relinquish_cookie(vlocation->cache, 0);
 #endif
 	afs_put_cell(cell);
 
@@ -890,65 +893,103 @@ static void afs_vlocation_update_discard
 
 /*****************************************************************************/
 /*
- * match a VLDB record stored in the cache
- * - may also load target from entry
+ * set the key for the index entry
  */
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_vlocation_cache_match(void *target,
-						     const void *entry)
-{
-	const struct afs_cache_vlocation *vldb = entry;
-	struct afs_vlocation *vlocation = target;
-
-	_enter("{%s},{%s}", vlocation->vldb.name, vldb->name);
-
-	if (strncmp(vlocation->vldb.name, vldb->name, sizeof(vldb->name)) == 0
-	    ) {
-		if (!vlocation->valid ||
-		    vlocation->vldb.rtime == vldb->rtime
-		    ) {
-			vlocation->vldb = *vldb;
-			vlocation->valid = 1;
-			_leave(" = SUCCESS [c->m]");
-			return CACHEFS_MATCH_SUCCESS;
-		}
-		/* need to update cache if cached info differs */
-		else if (memcmp(&vlocation->vldb, vldb, sizeof(*vldb)) != 0) {
-			/* delete if VIDs for this name differ */
-			if (memcmp(&vlocation->vldb.vid,
-				   &vldb->vid,
-				   sizeof(vldb->vid)) != 0) {
-				_leave(" = DELETE");
-				return CACHEFS_MATCH_SUCCESS_DELETE;
-			}
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_vlocation_cache_get_key(const void *cookie_netfs_data,
+					    void *buffer, uint16_t bufmax)
+{
+	const struct afs_vlocation *vlocation = cookie_netfs_data;
+	uint16_t klen;
 
-			_leave(" = UPDATE");
-			return CACHEFS_MATCH_SUCCESS_UPDATE;
-		}
-		else {
-			_leave(" = SUCCESS");
-			return CACHEFS_MATCH_SUCCESS;
-		}
-	}
+	_enter("{%s},%p,%u", vlocation->vldb.name, buffer, bufmax);
+
+	klen = strnlen(vlocation->vldb.name, sizeof(vlocation->vldb.name));
+	if (klen > bufmax)
+		return 0;
+
+	memcpy(buffer, vlocation->vldb.name, klen);
+
+	_leave(" = %u", klen);
+	return klen;
 
-	_leave(" = FAILED");
-	return CACHEFS_MATCH_FAILED;
-} /* end afs_vlocation_cache_match() */
+} /* end afs_vlocation_cache_get_key() */
 #endif
 
 /*****************************************************************************/
 /*
- * update a VLDB record stored in the cache
+ * provide new auxilliary cache data
  */
-#ifdef AFS_CACHING_SUPPORT
-static void afs_vlocation_cache_update(void *source, void *entry)
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data,
+					    void *buffer, uint16_t bufmax)
 {
-	struct afs_cache_vlocation *vldb = entry;
-	struct afs_vlocation *vlocation = source;
+	const struct afs_vlocation *vlocation = cookie_netfs_data;
+	uint16_t dlen;
+
+	_enter("{%s},%p,%u", vlocation->vldb.name, buffer, bufmax);
+
+	dlen = sizeof(struct afs_cache_vlocation);
+	dlen -= offsetof(struct afs_cache_vlocation, nservers);
+	if (dlen > bufmax)
+		return 0;
+
+	memcpy(buffer, (uint8_t *)&vlocation->vldb.nservers, dlen);
 
-	_enter("");
+	_leave(" = %u", dlen);
+	return dlen;
+
+} /* end afs_vlocation_cache_get_aux() */
+#endif
+
+/*****************************************************************************/
+/*
+ * check that the auxilliary data indicates that the entry is still valid
+ */
+#ifdef CONFIG_AFS_FSCACHE
+static fscache_checkaux_t afs_vlocation_cache_check_aux(void *cookie_netfs_data,
+							const void *buffer,
+							uint16_t buflen)
+{
+	const struct afs_cache_vlocation *cvldb;
+	struct afs_vlocation *vlocation = cookie_netfs_data;
+	uint16_t dlen;
+
+	_enter("{%s},%p,%u", vlocation->vldb.name, buffer, buflen);
+
+	/* check the size of the data is what we're expecting */
+	dlen = sizeof(struct afs_cache_vlocation);
+	dlen -= offsetof(struct afs_cache_vlocation, nservers);
+	if (dlen != buflen)
+		return FSCACHE_CHECKAUX_OBSOLETE;
+
+	cvldb = container_of(buffer, struct afs_cache_vlocation, nservers);
+
+	/* if what's on disk is more valid than what's in memory, then use the
+	 * VL record from the cache */
+	if (!vlocation->valid || vlocation->vldb.rtime == cvldb->rtime) {
+		memcpy((uint8_t *)&vlocation->vldb.nservers, buffer, dlen);
+		vlocation->valid = 1;
+		_leave(" = SUCCESS [c->m]");
+		return FSCACHE_CHECKAUX_OKAY;
+	}
+
+	/* need to update the cache if the cached info differs */
+	if (memcmp(&vlocation->vldb, buffer, dlen) != 0) {
+		/* delete if the volume IDs for this name differ */
+		if (memcmp(&vlocation->vldb.vid, &cvldb->vid,
+			   sizeof(cvldb->vid)) != 0
+		    ) {
+			_leave(" = OBSOLETE");
+			return FSCACHE_CHECKAUX_OBSOLETE;
+		}
+
+		_leave(" = UPDATE");
+		return FSCACHE_CHECKAUX_NEEDS_UPDATE;
+	}
 
-	*vldb = vlocation->vldb;
+	_leave(" = OKAY");
+	return FSCACHE_CHECKAUX_OKAY;
 
-} /* end afs_vlocation_cache_update() */
+} /* end afs_vlocation_cache_check_aux() */
 #endif
--- linux-2.6.16.noarch/fs/afs/vnode.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/vnode.c	2006-06-07 14:34:54.352673000 -0400
@@ -29,17 +29,30 @@ struct afs_timer_ops afs_vnode_cb_timed_
 	.timed_out	= afs_vnode_cb_timed_out,
 };
 
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_vnode_cache_match(void *target,
-						 const void *entry);
-static void afs_vnode_cache_update(void *source, void *entry);
-
-struct cachefs_index_def afs_vnode_cache_index_def = {
-	.name		= "vnode",
-	.data_size	= sizeof(struct afs_cache_vnode),
-	.keys[0]	= { CACHEFS_INDEX_KEYS_BIN, 4 },
-	.match		= afs_vnode_cache_match,
-	.update		= afs_vnode_cache_update,
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_vnode_cache_get_key(const void *cookie_netfs_data,
+					void *buffer, uint16_t buflen);
+static void afs_vnode_cache_get_attr(const void *cookie_netfs_data,
+				     uint64_t *size);
+static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data,
+					void *buffer, uint16_t buflen);
+static fscache_checkaux_t afs_vnode_cache_check_aux(void *cookie_netfs_data,
+						    const void *buffer,
+						    uint16_t buflen);
+static void afs_vnode_cache_mark_pages_cached(void *cookie_netfs_data,
+					      struct address_space *mapping,
+					      struct pagevec *cached_pvec);
+static void afs_vnode_cache_now_uncached(void *cookie_netfs_data);
+
+struct fscache_cookie_def afs_vnode_cache_index_def = {
+	.name			= "AFS.vnode",
+	.type			= FSCACHE_COOKIE_TYPE_DATAFILE,
+	.get_key		= afs_vnode_cache_get_key,
+	.get_attr		= afs_vnode_cache_get_attr,
+	.get_aux		= afs_vnode_cache_get_aux,
+	.check_aux		= afs_vnode_cache_check_aux,
+	.mark_pages_cached	= afs_vnode_cache_mark_pages_cached,
+	.now_uncached		= afs_vnode_cache_now_uncached,
 };
 #endif
 
@@ -189,6 +202,8 @@ int afs_vnode_fetch_status(struct afs_vn
 
 	if (vnode->update_cnt > 0) {
 		/* someone else started a fetch */
+		_debug("conflict");
+
 		set_current_state(TASK_UNINTERRUPTIBLE);
 		add_wait_queue(&vnode->update_waitq, &myself);
 
@@ -220,6 +235,7 @@ int afs_vnode_fetch_status(struct afs_vn
 		spin_unlock(&vnode->lock);
 		set_current_state(TASK_RUNNING);
 
+		_leave(" [conflicted, %d", !!(vnode->flags & AFS_VNODE_DELETED));
 		return vnode->flags & AFS_VNODE_DELETED ? -ENOENT : 0;
 	}
 
@@ -342,54 +358,198 @@ int afs_vnode_give_up_callback(struct af
 
 /*****************************************************************************/
 /*
- * match a vnode record stored in the cache
+ * set the key for the index entry
  */
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_vnode_cache_match(void *target,
-						 const void *entry)
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_vnode_cache_get_key(const void *cookie_netfs_data,
+					void *buffer, uint16_t bufmax)
 {
-	const struct afs_cache_vnode *cvnode = entry;
-	struct afs_vnode *vnode = target;
+	const struct afs_vnode *vnode = cookie_netfs_data;
+	uint16_t klen;
 
-	_enter("{%x,%x,%Lx},{%x,%x,%Lx}",
-	       vnode->fid.vnode,
-	       vnode->fid.unique,
-	       vnode->status.version,
-	       cvnode->vnode_id,
-	       cvnode->vnode_unique,
-	       cvnode->data_version);
-
-	if (vnode->fid.vnode != cvnode->vnode_id) {
-		_leave(" = FAILED");
-		return CACHEFS_MATCH_FAILED;
-	}
+	_enter("{%x,%x,%Lx},%p,%u",
+	       vnode->fid.vnode, vnode->fid.unique, vnode->status.version,
+	       buffer, bufmax);
+
+	klen = sizeof(vnode->fid.vnode);
+	if (klen > bufmax)
+		return 0;
+
+	memcpy(buffer, &vnode->fid.vnode, sizeof(vnode->fid.vnode));
+
+	_leave(" = %u", klen);
+	return klen;
+
+} /* end afs_vnode_cache_get_key() */
+#endif
+
+/*****************************************************************************/
+/*
+ * provide an updated file attributes
+ */
+#ifdef CONFIG_AFS_FSCACHE
+static void afs_vnode_cache_get_attr(const void *cookie_netfs_data,
+				     uint64_t *size)
+{
+	const struct afs_vnode *vnode = cookie_netfs_data;
+
+	_enter("{%x,%x,%Lx},",
+	       vnode->fid.vnode, vnode->fid.unique, vnode->status.version);
+
+	*size = i_size_read((struct inode *) &vnode->vfs_inode);
+
+} /* end afs_vnode_cache_get_attr() */
+#endif
+
+/*****************************************************************************/
+/*
+ * provide new auxilliary cache data
+ */
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data,
+					void *buffer, uint16_t bufmax)
+{
+	const struct afs_vnode *vnode = cookie_netfs_data;
+	uint16_t dlen;
+
+	_enter("{%x,%x,%Lx},%p,%u",
+	       vnode->fid.vnode, vnode->fid.unique, vnode->status.version,
+	       buffer, bufmax);
 
-	if (vnode->fid.unique != cvnode->vnode_unique ||
-	    vnode->status.version != cvnode->data_version) {
-		_leave(" = DELETE");
-		return CACHEFS_MATCH_SUCCESS_DELETE;
+	dlen = sizeof(vnode->fid.unique) + sizeof(vnode->status.version);
+	if (dlen > bufmax)
+		return 0;
+
+	memcpy(buffer, &vnode->fid.unique, sizeof(vnode->fid.unique));
+	buffer += sizeof(vnode->fid.unique);
+	memcpy(buffer, &vnode->status.version, sizeof(vnode->status.version));
+
+	_leave(" = %u", dlen);
+	return dlen;
+
+} /* end afs_vnode_cache_get_aux() */
+#endif
+
+/*****************************************************************************/
+/*
+ * check that the auxilliary data indicates that the entry is still valid
+ */
+#ifdef CONFIG_AFS_FSCACHE
+static fscache_checkaux_t afs_vnode_cache_check_aux(void *cookie_netfs_data,
+						    const void *buffer,
+						    uint16_t buflen)
+{
+	struct afs_vnode *vnode = cookie_netfs_data;
+	uint16_t dlen;
+
+	_enter("{%x,%x,%Lx},%p,%u",
+	       vnode->fid.vnode, vnode->fid.unique, vnode->status.version,
+	       buffer, buflen);
+
+	/* check the size of the data is what we're expecting */
+	dlen = sizeof(vnode->fid.unique) + sizeof(vnode->status.version);
+	if (dlen != buflen) {
+		_leave(" = OBSOLETE [len %hx != %hx]", dlen, buflen);
+		return FSCACHE_CHECKAUX_OBSOLETE;
+	}
+
+	if (memcmp(buffer,
+		   &vnode->fid.unique,
+		   sizeof(vnode->fid.unique)
+		   ) != 0
+	    ) {
+		unsigned unique;
+
+		memcpy(&unique, buffer, sizeof(unique));
+
+		_leave(" = OBSOLETE [uniq %x != %x]",
+		       unique, vnode->fid.unique);
+		return FSCACHE_CHECKAUX_OBSOLETE;
+	}
+
+	if (memcmp(buffer + sizeof(vnode->fid.unique),
+		   &vnode->status.version,
+		   sizeof(vnode->status.version)
+		   ) != 0
+	    ) {
+		afs_dataversion_t version;
+
+		memcpy(&version, buffer + sizeof(vnode->fid.unique),
+		       sizeof(version));
+
+		_leave(" = OBSOLETE [vers %llx != %llx]",
+		       version, vnode->status.version);
+		return FSCACHE_CHECKAUX_OBSOLETE;
 	}
 
 	_leave(" = SUCCESS");
-	return CACHEFS_MATCH_SUCCESS;
-} /* end afs_vnode_cache_match() */
+	return FSCACHE_CHECKAUX_OKAY;
+
+} /* end afs_vnode_cache_check_aux() */
 #endif
 
 /*****************************************************************************/
 /*
- * update a vnode record stored in the cache
+ * indication of pages that now have cache metadata retained
+ * - this function should mark the specified pages as now being cached
  */
-#ifdef AFS_CACHING_SUPPORT
-static void afs_vnode_cache_update(void *source, void *entry)
+#ifdef CONFIG_AFS_FSCACHE
+static void afs_vnode_cache_mark_pages_cached(void *cookie_netfs_data,
+					      struct address_space *mapping,
+					      struct pagevec *cached_pvec)
 {
-	struct afs_cache_vnode *cvnode = entry;
-	struct afs_vnode *vnode = source;
+	unsigned long loop;
 
-	_enter("");
+	for (loop = 0; loop < cached_pvec->nr; loop++) {
+		struct page *page = cached_pvec->pages[loop];
 
-	cvnode->vnode_id	= vnode->fid.vnode;
-	cvnode->vnode_unique	= vnode->fid.unique;
-	cvnode->data_version	= vnode->status.version;
+		_debug("- mark %p{%lx}", page, page->index);
 
-} /* end afs_vnode_cache_update() */
+		SetPagePrivate(page);
+	}
+
+} /* end afs_vnode_cache_mark_pages_cached() */
 #endif
+
+/*****************************************************************************/
+/*
+ * indication the cookie is no longer uncached
+ * - this function is called when the backing store currently caching a cookie
+ *   is removed
+ * - the netfs should use this to clean up any markers indicating cached pages
+ * - this is mandatory for any object that may have data
+ */
+static void afs_vnode_cache_now_uncached(void *cookie_netfs_data)
+{
+	struct afs_vnode *vnode = cookie_netfs_data;
+	struct pagevec pvec;
+	pgoff_t first;
+	int loop, nr_pages;
+
+	_enter("{%x,%x,%Lx}",
+	       vnode->fid.vnode, vnode->fid.unique, vnode->status.version);
+
+	pagevec_init(&pvec, 0);
+	first = 0;
+
+	for (;;) {
+		/* grab a bunch of pages to clean */
+		nr_pages = pagevec_lookup(&pvec, vnode->vfs_inode.i_mapping,
+					  first,
+					  PAGEVEC_SIZE - pagevec_count(&pvec));
+		if (!nr_pages)
+			break;
+
+		for (loop = 0; loop < nr_pages; loop++)
+			ClearPagePrivate(pvec.pages[loop]);
+
+		first = pvec.pages[nr_pages - 1]->index + 1;
+
+		pvec.nr = nr_pages;
+		pagevec_release(&pvec);
+		cond_resched();
+	}
+
+	_leave("");
+
+} /* end afs_vnode_cache_now_uncached() */
--- linux-2.6.16.noarch/fs/afs/vnode.h.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/vnode.h	2006-06-07 14:34:54.374675000 -0400
@@ -13,9 +13,9 @@
 #define _LINUX_AFS_VNODE_H
 
 #include <linux/fs.h>
+#include <linux/fscache.h>
 #include "server.h"
 #include "kafstimod.h"
-#include "cache.h"
 
 #ifdef __KERNEL__
 
@@ -32,8 +32,8 @@ struct afs_cache_vnode
 	afs_dataversion_t	data_version;	/* data version */
 };
 
-#ifdef AFS_CACHING_SUPPORT
-extern struct cachefs_index_def afs_vnode_cache_index_def;
+#ifdef CONFIG_AFS_FSCACHE
+extern struct fscache_cookie_def afs_vnode_cache_index_def;
 #endif
 
 /*****************************************************************************/
@@ -47,8 +47,8 @@ struct afs_vnode
 	struct afs_volume	*volume;	/* volume on which vnode resides */
 	struct afs_fid		fid;		/* the file identifier for this inode */
 	struct afs_file_status	status;		/* AFS status info for this file */
-#ifdef AFS_CACHING_SUPPORT
-	struct cachefs_cookie	*cache;		/* caching cookie */
+#ifdef CONFIG_AFS_FSCACHE
+	struct fscache_cookie	*cache;		/* caching cookie */
 #endif
 
 	wait_queue_head_t	update_waitq;	/* status fetch waitqueue */
--- linux-2.6.16.noarch/fs/afs/volume.c.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/volume.c	2006-06-07 14:34:54.381677000 -0400
@@ -15,10 +15,10 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/fscache.h>
 #include "volume.h"
 #include "vnode.h"
 #include "cell.h"
-#include "cache.h"
 #include "cmservice.h"
 #include "fsclient.h"
 #include "vlclient.h"
@@ -28,18 +28,14 @@
 static const char *afs_voltypes[] = { "R/W", "R/O", "BAK" };
 #endif
 
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_volume_cache_match(void *target,
-						  const void *entry);
-static void afs_volume_cache_update(void *source, void *entry);
-
-struct cachefs_index_def afs_volume_cache_index_def = {
-	.name		= "volume",
-	.data_size	= sizeof(struct afs_cache_vhash),
-	.keys[0]	= { CACHEFS_INDEX_KEYS_BIN, 1 },
-	.keys[1]	= { CACHEFS_INDEX_KEYS_BIN, 1 },
-	.match		= afs_volume_cache_match,
-	.update		= afs_volume_cache_update,
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_volume_cache_get_key(const void *cookie_netfs_data,
+					 void *buffer, uint16_t buflen);
+
+static struct fscache_cookie_def afs_volume_cache_index_def = {
+	.name		= "AFS.volume",
+	.type		= FSCACHE_COOKIE_TYPE_INDEX,
+	.get_key	= afs_volume_cache_get_key,
 };
 #endif
 
@@ -214,11 +210,10 @@ int afs_volume_lookup(const char *name, 
 	}
 
 	/* attach the cache and volume location */
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_acquire_cookie(vlocation->cache,
-			       &afs_vnode_cache_index_def,
-			       volume,
-			       &volume->cache);
+#ifdef CONFIG_AFS_FSCACHE
+	volume->cache = fscache_acquire_cookie(vlocation->cache,
+					       &afs_volume_cache_index_def,
+					       volume);
 #endif
 
 	afs_get_vlocation(vlocation);
@@ -286,8 +281,8 @@ void afs_put_volume(struct afs_volume *v
 	up_write(&vlocation->cell->vl_sem);
 
 	/* finish cleaning up the volume */
-#ifdef AFS_CACHING_SUPPORT
-	cachefs_relinquish_cookie(volume->cache, 0);
+#ifdef CONFIG_AFS_FSCACHE
+	fscache_relinquish_cookie(volume->cache, 0);
 #endif
 	afs_put_vlocation(vlocation);
 
@@ -481,40 +476,25 @@ int afs_volume_release_fileserver(struct
 
 /*****************************************************************************/
 /*
- * match a volume hash record stored in the cache
+ * set the key for the index entry
  */
-#ifdef AFS_CACHING_SUPPORT
-static cachefs_match_val_t afs_volume_cache_match(void *target,
-						  const void *entry)
+#ifdef CONFIG_AFS_FSCACHE
+static uint16_t afs_volume_cache_get_key(const void *cookie_netfs_data,
+					void *buffer, uint16_t bufmax)
 {
-	const struct afs_cache_vhash *vhash = entry;
-	struct afs_volume *volume = target;
+	const struct afs_volume *volume = cookie_netfs_data;
+	uint16_t klen;
 
-	_enter("{%u},{%u}", volume->type, vhash->vtype);
+	_enter("{%u},%p,%u", volume->type, buffer, bufmax);
 
-	if (volume->type == vhash->vtype) {
-		_leave(" = SUCCESS");
-		return CACHEFS_MATCH_SUCCESS;
-	}
-
-	_leave(" = FAILED");
-	return CACHEFS_MATCH_FAILED;
-} /* end afs_volume_cache_match() */
-#endif
-
-/*****************************************************************************/
-/*
- * update a volume hash record stored in the cache
- */
-#ifdef AFS_CACHING_SUPPORT
-static void afs_volume_cache_update(void *source, void *entry)
-{
-	struct afs_cache_vhash *vhash = entry;
-	struct afs_volume *volume = source;
+	klen = sizeof(volume->type);
+	if (klen > bufmax)
+		return 0;
 
-	_enter("");
+	memcpy(buffer, &volume->type, sizeof(volume->type));
 
-	vhash->vtype = volume->type;
+	_leave(" = %u", klen);
+	return klen;
 
-} /* end afs_volume_cache_update() */
+} /* end afs_volume_cache_get_key() */
 #endif
--- linux-2.6.16.noarch/fs/afs/volume.h.fsafs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/afs/volume.h	2006-06-07 14:34:54.406672000 -0400
@@ -12,11 +12,11 @@
 #ifndef _LINUX_AFS_VOLUME_H
 #define _LINUX_AFS_VOLUME_H
 
+#include <linux/fscache.h>
 #include "types.h"
 #include "fsclient.h"
 #include "kafstimod.h"
 #include "kafsasyncd.h"
-#include "cache.h"
 
 typedef enum {
 	AFS_VLUPD_SLEEP,		/* sleeping waiting for update timer to fire */
@@ -45,24 +45,6 @@ struct afs_cache_vlocation
 	time_t			rtime;		/* last retrieval time */
 };
 
-#ifdef AFS_CACHING_SUPPORT
-extern struct cachefs_index_def afs_vlocation_cache_index_def;
-#endif
-
-/*****************************************************************************/
-/*
- * volume -> vnode hash table entry
- */
-struct afs_cache_vhash
-{
-	afs_voltype_t		vtype;		/* which volume variation */
-	uint8_t			hash_bucket;	/* which hash bucket this represents */
-} __attribute__((packed));
-
-#ifdef AFS_CACHING_SUPPORT
-extern struct cachefs_index_def afs_volume_cache_index_def;
-#endif
-
 /*****************************************************************************/
 /*
  * AFS volume location record
@@ -73,8 +55,8 @@ struct afs_vlocation
 	struct list_head	link;		/* link in cell volume location list */
 	struct afs_timer	timeout;	/* decaching timer */
 	struct afs_cell		*cell;		/* cell to which volume belongs */
-#ifdef AFS_CACHING_SUPPORT
-	struct cachefs_cookie	*cache;		/* caching cookie */
+#ifdef CONFIG_AFS_FSCACHE
+	struct fscache_cookie	*cache;		/* caching cookie */
 #endif
 	struct afs_cache_vlocation vldb;	/* volume information DB record */
 	struct afs_volume	*vols[3];	/* volume access record pointer (index by type) */
@@ -109,8 +91,8 @@ struct afs_volume
 	atomic_t		usage;
 	struct afs_cell		*cell;		/* cell to which belongs (unrefd ptr) */
 	struct afs_vlocation	*vlocation;	/* volume location */
-#ifdef AFS_CACHING_SUPPORT
-	struct cachefs_cookie	*cache;		/* caching cookie */
+#ifdef CONFIG_AFS_FSCACHE
+	struct fscache_cookie	*cache;		/* caching cookie */
 #endif
 	afs_volid_t		vid;		/* volume ID */
 	afs_voltype_t		type;		/* type of volume */
--- linux-2.6.16.noarch/fs/Kconfig.fsafs	2006-06-07 14:27:22.671396000 -0400
+++ linux-2.6.16.noarch/fs/Kconfig	2006-06-07 14:34:54.059673000 -0400
@@ -1908,6 +1908,13 @@ config AFS_FS
 
 	  If unsure, say N.
 
+config AFS_FSCACHE
+	bool "Provide AFS client caching support"
+	depends on AFS_FS && FSCACHE && EXPERIMENTAL
+	help
+	  Say Y here if you want AFS data to be cached locally on through the
+	  generic filesystem cache manager
+
 config RXRPC
 	tristate
 

linux-2.6.17-cachefiles-misc.patch:
 fs/buffer.c             |    2 
 fs/fcntl.c              |    2 
 fs/file_table.c         |    1 
 include/linux/pagemap.h |    6 ++
 mm/filemap.c            |  103 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 114 insertions(+)

--- NEW FILE linux-2.6.17-cachefiles-misc.patch ---
--- linux-2.6.16.noarch/fs/buffer.c.cfmisc	2006-06-07 12:11:04.692145000 -0400
+++ linux-2.6.16.noarch/fs/buffer.c	2006-06-07 13:00:17.200895000 -0400
@@ -185,6 +185,8 @@ int fsync_super(struct super_block *sb)
 	return sync_blockdev(sb->s_bdev);
 }
 
+EXPORT_SYMBOL(fsync_super);
+
 /*
  * Write out and wait upon all dirty data associated with this
  * device.   Filesystem data as well as the underlying block
--- linux-2.6.16.noarch/fs/fcntl.c.cfmisc	2006-06-07 12:12:01.255570000 -0400
+++ linux-2.6.16.noarch/fs/fcntl.c	2006-06-07 13:00:17.229895000 -0400
@@ -531,6 +531,8 @@ int send_sigurg(struct fown_struct *fown
 	return ret;
 }
 
+EXPORT_SYMBOL(send_sigurg);
+
 static DEFINE_RWLOCK(fasync_lock);
 static kmem_cache_t *fasync_cache __read_mostly;
 
--- linux-2.6.16.noarch/fs/file_table.c.cfmisc	2006-06-07 12:12:08.634745000 -0400
+++ linux-2.6.16.noarch/fs/file_table.c	2006-06-07 13:00:17.258896000 -0400
@@ -265,6 +265,7 @@ struct file fastcall *fget_light(unsigne
 	return file;
 }
 
+EXPORT_SYMBOL_GPL(fget_light);
 
 void put_filp(struct file *file)
 {
--- linux-2.6.16.noarch/include/linux/pagemap.h.cfmisc	2006-06-07 12:12:08.520745000 -0400
+++ linux-2.6.16.noarch/include/linux/pagemap.h	2006-06-07 13:00:17.265896000 -0400
@@ -219,6 +219,12 @@ static inline void wait_on_page_fs_misc(
 extern void fastcall end_page_fs_misc(struct page *page);
 
 /*
+ * permit installation of a state change monitor in the queue for a page
+ */
+extern void install_page_waitqueue_monitor(struct page *page,
+					   wait_queue_t *monitor);
+
+/*
  * Fault a userspace page into pagetables.  Return non-zero on a fault.
  *
  * This assumes that two userspace pages are always sufficient.  That's
--- linux-2.6.16.noarch/mm/filemap.c.cfmisc	2006-06-07 12:49:31.325767000 -0400
+++ linux-2.6.16.noarch/mm/filemap.c	2006-06-07 13:00:17.292895000 -0400
@@ -488,6 +488,18 @@ void fastcall wait_on_page_bit(struct pa
 }
 EXPORT_SYMBOL(wait_on_page_bit);
 
+void install_page_waitqueue_monitor(struct page *page, wait_queue_t *monitor)
+{
+	wait_queue_head_t *q = page_waitqueue(page);
+	unsigned long flags;
+
+	spin_lock_irqsave(&q->lock, flags);
+	__add_wait_queue(q, monitor);
+	spin_unlock_irqrestore(&q->lock, flags);
+}
+
+EXPORT_SYMBOL_GPL(install_page_waitqueue_monitor);
+
 /**
  * unlock_page() - unlock a locked page
  *
@@ -2156,6 +2168,97 @@ generic_file_buffered_write(struct kiocb
 }
 EXPORT_SYMBOL(generic_file_buffered_write);
 
+/*
+ * This writes the data from the source page to the specified page offset in
+ * the nominated file
+ * - the source page does not need to have any association with the file or the
+ *   page offset
+ */
+int
+generic_file_buffered_write_one_kernel_page(struct file *file,
+					    pgoff_t index,
+					    struct page *src)
+{
+	struct address_space *mapping = file->f_mapping;
+	struct address_space_operations *a_ops = mapping->a_ops;
+	struct pagevec	lru_pvec;
+	struct page *page, *cached_page = NULL;
+	long status = 0;
+
+	pagevec_init(&lru_pvec, 0);
+
+	page = __grab_cache_page(mapping, index, &cached_page, &lru_pvec);
+	if (!page) {
+		BUG_ON(cached_page);
+		return -ENOMEM;
+	}
+
+	status = a_ops->prepare_write(file, page, 0, PAGE_CACHE_SIZE);
+	if (unlikely(status)) {
+		loff_t isize = i_size_read(mapping->host);
+
+		if (status != AOP_TRUNCATED_PAGE)
+			unlock_page(page);
+		page_cache_release(page);
+		if (status == AOP_TRUNCATED_PAGE)
+			goto sync;
+
+		/* prepare_write() may have instantiated a few blocks outside
+		 * i_size.  Trim these off again.
+		 */
+		if ((1ULL << (index + 1)) > isize)
+			vmtruncate(mapping->host, isize);
+		goto sync;
+	}
+
+	copy_highpage(page, src);
+	flush_dcache_page(page);
+
+	status = a_ops->commit_write(file, page, 0, PAGE_CACHE_SIZE);
+	if (status == AOP_TRUNCATED_PAGE) {
+		page_cache_release(page);
+		goto sync;
+	}
+
+	if (status > 0)
+		status = 0;
+
+	unlock_page(page);
+	mark_page_accessed(page);
+	page_cache_release(page);
+	if (status < 0)
+		return status;
+
+	balance_dirty_pages_ratelimited(mapping);
+	cond_resched();
+
+sync:
+	if (cached_page)
+		page_cache_release(cached_page);
+
+	/*
+	 * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
+	 */
+	if (unlikely((file->f_flags & O_SYNC) || IS_SYNC(mapping->host))) {
+		if (!a_ops->writepage)
+			status = generic_osync_inode(
+				mapping->host, mapping,
+				OSYNC_METADATA | OSYNC_DATA);
+  	}
+
+	/*
+	 * If we get here for O_DIRECT writes then we must have fallen through
+	 * to buffered writes (block instantiation inside i_size).  So we sync
+	 * the file data here, to try to honour O_DIRECT expectations.
+	 */
+	if (unlikely(file->f_flags & O_DIRECT))
+		status = filemap_write_and_wait(mapping);
+
+	pagevec_lru_add(&lru_pvec);
+	return status;
+}
+EXPORT_SYMBOL(generic_file_buffered_write_one_kernel_page);
+
 static ssize_t
 __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
 				unsigned long nr_segs, loff_t *ppos)

linux-2.6.17-cachefiles.patch:
 Documentation/filesystems/caching/cachefiles.txt |  281 ++++
 fs/Kconfig                                       |   20 
 fs/Makefile                                      |    1 
 fs/cachefiles/Makefile                           |   18 
 fs/cachefiles/cf-bind.c                          |  283 ++++
 fs/cachefiles/cf-interface.c                     | 1312 +++++++++++++++++++++++
 fs/cachefiles/cf-key.c                           |  160 ++
 fs/cachefiles/cf-main.c                          |  131 ++
 fs/cachefiles/cf-namei.c                         |  837 ++++++++++++++
 fs/cachefiles/cf-proc.c                          |  510 ++++++++
 fs/cachefiles/cf-sysctl.c                        |   69 +
 fs/cachefiles/cf-xattr.c                         |  299 +++++
 fs/cachefiles/internal.h                         |  308 +++++
 13 files changed, 4229 insertions(+)

--- NEW FILE linux-2.6.17-cachefiles.patch ---
--- /dev/null	2006-06-07 07:14:18.564562589 -0400
+++ linux-2.6.16.noarch/Documentation/filesystems/caching/cachefiles.txt	2006-06-07 12:58:10.508720000 -0400
@@ -0,0 +1,281 @@
+	       ===============================================
+	       CacheFiles: CACHE ON ALREADY MOUNTED FILESYSTEM
+	       ===============================================
+
+Contents:
+
+ (*) Overview.
+
+ (*) Requirements.
+
+ (*) Configuration.
+
+ (*) Starting the cache.
+
+ (*) Things to avoid.
+
+
+========
+OVERVIEW
+========
+
+CacheFiles is a caching backend that's meant to use as a cache a directory on
+an already mounted filesystem of a local type (such as Ext3).
+
+CacheFiles uses a userspace daemon to do some of the cache management - such as
+reaping stale nodes and culling.  This is called cachefilesd and lives in
+/sbin.
+
+The filesystem and data integrity of the cache are only as good as those of the
+filesystem providing the backing services.  Note that CacheFiles does not
+attempt to journal anything since the journalling interfaces of the various
+filesystems are very specific in nature.
+
+CacheFiles creates a proc-file - "/proc/fs/cachefiles" - that is used for
+communication with the daemon.  Only one thing may have this open at once, and
+whilst it is open, a cache is at least partially in existence.  The daemon
+opens this and sends commands down it to control the cache.
+
+CacheFiles is currently limited to a single cache.
+
+CacheFiles attempts to maintain at least a certain percentage of free space on
+the filesystem, shrinking the cache by culling the objects it contains to make
+space if necessary - see the "Cache Culling" section.  This means it can be
+placed on the same medium as a live set of data, and will expand to make use of
+spare space and automatically contract when the set of data requires more
+space.
+
+
+============
+REQUIREMENTS
+============
+
+The use of CacheFiles and its daemon requires the following features to be
+available in the system and in the cache filesystem:
+
+	- dnotify.
+
+	- extended attributes (xattrs).
+
+	- openat() and friends.
+
+	- bmap() support on files in the filesystem (FIBMAP ioctl).
+
+	- The use of bmap() to detect a partial page at the end of the file.
+
+It is strongly recommended that the "dir_index" option is enabled on Ext3
+filesystems being used as a cache.
+
+
+=============
+CONFIGURATION
+=============
+
+The cache is configured by a script in /etc/cachefilesd.conf.  These commands
+set up cache ready for use.  The following script commands are available:
+
+ (*) brun <N>%
+ (*) bcull <N>%
+ (*) bstop <N>%
+
+	Configure the culling limits.  Optional.  See the section on culling
+	The defaults are 7%, 5% and 1% respectively.
+
+ (*) dir <path>
+
+	Specify the directory containing the root of the cache.  Mandatory.
+
+ (*) tag <name>
+
+	Specify a tag to FS-Cache to use in distinguishing multiple caches.
+	Optional.  The default is "CacheFiles".
+
+ (*) debug <mask>
+
+	Specify a numeric bitmask to control debugging in the kernel module.
+	Optional.  The default is zero (all off).  The following values can be
+	OR'd into the mask to collect various information:
+
+		1	Turn on trace of function entry (_enter() macros)
+		2	Turn on trace of function exit (_leave() macros)
+		4	Turn on trace of internal debug points (_debug())
+
+	This mask can also be set through /proc/sys/fs/cachefiles/debug.
+
+
+==================
+STARTING THE CACHE
+==================
+
+The cache is started by running the daemon.  The daemon opens the cache proc
+file, configures the cache and tells it to begin caching.  At that point the
+cache binds to fscache and the cache becomes live.
+
+The daemon is run as follows:
+
+	/sbin/cachefilesd [-d]* [-s] [-n] [-f <configfile>]
+
+The flags are:
+
+ (*) -d
+
+	Increase the debugging level.  This can be specified multiple times and
+	is cumulative with itself.
+
+ (*) -s
+
+	Send messages to stderr instead of syslog.
+
+ (*) -n
+
+	Don't daemonise and go into background.
+
+ (*) -f <configfile>
+
+	Use an alternative configuration file rather than the default one.
+
+
+===============
+THINGS TO AVOID
+===============
+
+Do not mount other things within the cache as this will cause problems.  The
+kernel module contains its own very cut-down path walking facility that ignores
+mountpoints, but the daemon can't avoid them.
+
+Do not create, rename or unlink files and directories in the cache whilst the
+cache is active, as this may cause the state to become uncertain.
+
+Renaming files in the cache might make objects appear to be other objects (the
+filename is part of the lookup key).
+
+Do not change or remove the extended attributes attached to cache files by the
+cache as this will cause the cache state management to get confused.
+
+Do not create files or directories in the cache, lest the cache get confused or
+serve incorrect data.
+
+Do not chmod files in the cache.  The module creates things with minimal
+permissions to prevent random users being able to access them directly.
+
+
+=============
+CACHE CULLING
+=============
+
+The cache may need culling occasionally to make space.  This involves
+discarding objects from the cache that have been used less recently than
+anything else.  Culling is based on the access time of data objects.  Empty
+directories are culled if not in use.
+
+Cache culling is done on the basis of the percentage of blocks available in the
+underlying filesystem.  There are three "limits":
+
+ (*) brun
+
+     If the amount of available space in the cache rises above this limit, then
+     culling is turned off.
+
+ (*) bcull
+
+     If the amount of available space in the cache falls below this limit, then
+     culling is started.
+
+ (*) bstop
+
+     If the amount of available space in the cache falls below this limit, then
+     no further allocation of disk space is permitted until culling has raised
+     the amount above this limit again.
+
+These must be configured thusly:
+
+	0 <= bstop < bcull < brun < 100
+
+Note that these are percentages of available space, and do _not_ appear as 100
+minus the percentage displayed by the "df" program.
+
[...3881 lines suppressed...]
+	fscache_rw_complete_t		end_io_func;
+	void				*context;
+};
+
+/*****************************************************************************/
+/*
+ * backing file write tracking
+ */
+struct cachefiles_one_write {
+	struct page			*netfs_page;	/* netfs page to copy */
+	struct cachefiles_object	*object;
+	struct list_head		obj_link;	/* link in object's lists */
+	fscache_rw_complete_t		end_io_func;
+	void				*context;
+};
+
+/*****************************************************************************/
+/*
+ * auxiliary data xattr buffer
+ */
+struct cachefiles_xattr {
+	uint16_t			len;
+	uint8_t				type;
+	uint8_t				data[];
+};
+
+
+/* cf-bind.c */
+extern int cachefiles_proc_bind(struct cachefiles_cache *cache, char *args);
+extern void cachefiles_proc_unbind(struct cachefiles_cache *cache);
+
+/* cf-interface.c */
+extern void cachefiles_read_copier_work(void *_object);
+extern void cachefiles_write_work(void *_object);
+extern int cachefiles_has_space(struct cachefiles_cache *cache, unsigned nr);
+
+/* cf-key.c */
+extern char *cachefiles_cook_key(const u8 *raw, int keylen, uint8_t type);
+
+/* cf-namei.c */
+extern int cachefiles_delete_object(struct cachefiles_cache *cache,
+				    struct cachefiles_object *object);
+extern int cachefiles_walk_to_object(struct cachefiles_object *parent,
+				     struct cachefiles_object *object,
+				     char *key,
+				     struct cachefiles_xattr *auxdata);
+extern struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
+					       struct dentry *dir,
+					       const char *name);
+
+extern int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir,
+			   char *filename);
+
+/* cf-sysctl.c */
+extern int __init cachefiles_sysctl_init(void);
+extern void __exit cachefiles_sysctl_cleanup(void);
+
+/* cf-xattr.c */
+extern int cachefiles_check_object_type(struct cachefiles_object *object);
+extern int cachefiles_set_object_xattr(struct cachefiles_object *object,
+				       struct cachefiles_xattr *auxdata);
+extern int cachefiles_check_object_xattr(struct cachefiles_object *object,
+					 struct cachefiles_xattr *auxdata);
+extern int cachefiles_remove_object_xattr(struct cachefiles_cache *cache,
+					  struct dentry *dentry);
+
+
+/*****************************************************************************/
+/*
+ * error handling
+ */
+#define kerror(FMT,...) printk(KERN_ERR "CacheFiles: "FMT"\n" ,##__VA_ARGS__);
+
+#define cachefiles_io_error(___cache, FMT, ...)		\
+do {							\
+	kerror("I/O Error: " FMT ,##__VA_ARGS__);	\
+	fscache_io_error(&(___cache)->cache);		\
+	set_bit(CACHEFILES_DEAD, &(___cache)->flags);	\
+} while(0)
+
+#define cachefiles_io_error_obj(object, FMT, ...)			\
+do {									\
+	struct cachefiles_cache *___cache;				\
+									\
+	___cache = container_of((object)->fscache.cache,		\
+				struct cachefiles_cache, cache);	\
+	cachefiles_io_error(___cache, FMT ,##__VA_ARGS__);		\
+} while(0)
+
+
+/*****************************************************************************/
+/*
+ * debug tracing
+ */
+#define dbgprintk(FMT,...) \
+	printk("[%-6.6s] "FMT"\n",current->comm ,##__VA_ARGS__)
+
+/* make sure we maintain the format strings, even when debugging is disabled */
+static inline void _dbprintk(const char *fmt, ...)
+	__attribute__((format(printf,1,2)));
+static inline void _dbprintk(const char *fmt, ...)
+{
+}
+
+#define kenter(FMT,...)	dbgprintk("==> %s("FMT")",__FUNCTION__ ,##__VA_ARGS__)
+#define kleave(FMT,...)	dbgprintk("<== %s()"FMT"",__FUNCTION__ ,##__VA_ARGS__)
+#define kdebug(FMT,...)	dbgprintk(FMT ,##__VA_ARGS__)
+
+
+#if defined(__KDEBUG)
+#define _enter(FMT,...)	kenter(FMT,##__VA_ARGS__)
+#define _leave(FMT,...)	kleave(FMT,##__VA_ARGS__)
+#define _debug(FMT,...)	kdebug(FMT,##__VA_ARGS__)
+
+#elif defined(CONFIG_CACHEFILES_DEBUG)
+#define _enter(FMT,...)					\
+do {							\
+	if (cachefiles_debug & CACHEFILES_DEBUG_KENTER)	\
+		kenter(FMT,##__VA_ARGS__);		\
+} while (0)
+
+#define _leave(FMT,...)					\
+do {							\
+	if (cachefiles_debug & CACHEFILES_DEBUG_KLEAVE)	\
+		kleave(FMT,##__VA_ARGS__);		\
+} while (0)
+
+#define _debug(FMT,...)					\
+do {							\
+	if (cachefiles_debug & CACHEFILES_DEBUG_KDEBUG)	\
+		kdebug(FMT,##__VA_ARGS__);		\
+} while (0)
+
+#else
+#define _enter(FMT,...)	_dbprintk("==> %s("FMT")",__FUNCTION__ ,##__VA_ARGS__)
+#define _leave(FMT,...)	_dbprintk("<== %s()"FMT"",__FUNCTION__ ,##__VA_ARGS__)
+#define _debug(FMT,...)	_dbprintk(FMT ,##__VA_ARGS__)
+#endif
+
+#if 1 // defined(__KDEBUGALL)
+
+#define ASSERT(X)							\
+do {									\
+	if (unlikely(!(X))) {						\
+		printk(KERN_ERR "\n");					\
+		printk(KERN_ERR "CacheFiles: Assertion failed\n");	\
+		BUG();							\
+	}								\
+} while(0)
+
+#define ASSERTCMP(X, OP, Y)						\
+do {									\
+	if (unlikely(!((X) OP (Y)))) {					\
+		printk(KERN_ERR "\n");					\
+		printk(KERN_ERR "CacheFiles: Assertion failed\n");	\
+		printk(KERN_ERR "%lx " #OP " %lx is false\n",		\
+		       (unsigned long)(X), (unsigned long)(Y));		\
+		BUG();							\
+	}								\
+} while(0)
+
+#define ASSERTIF(C, X)							\
+do {									\
+	if (unlikely((C) && !(X))) {					\
+		printk(KERN_ERR "\n");					\
+		printk(KERN_ERR "CacheFiles: Assertion failed\n");	\
+		BUG();							\
+	}								\
+} while(0)
+
+#define ASSERTIFCMP(C, X, OP, Y)					\
+do {									\
+	if (unlikely((C) && !((X) OP (Y)))) {				\
+		printk(KERN_ERR "\n");					\
+		printk(KERN_ERR "CacheFiles: Assertion failed\n");	\
+		printk(KERN_ERR "%lx " #OP " %lx is false\n",		\
+		       (unsigned long)(X), (unsigned long)(Y));		\
+		BUG();							\
+	}								\
+} while(0)
+
+#else
+
+#define ASSERT(X)				\
+do {						\
+} while(0)
+
+#define ASSERTCMP(X, OP, Y)			\
+do {						\
+} while(0)
+
+#define ASSERTIF(C, X)				\
+do {						\
+} while(0)
+
+#define ASSERTIFCMP(C, X, OP, Y)		\
+do {						\
+} while(0)
+
+#endif

linux-2.6.17-cachefs-fsmisc.patch:
 fs/afs/dir.c               |    5 +----
 fs/ext2/dir.c              |    6 +++---
 fs/ext3/inode.c            |   10 +++++-----
 fs/freevxfs/vxfs_subr.c    |    2 +-
 fs/reiserfs/inode.c        |   10 +++++-----
 include/linux/page-flags.h |   15 ++++++++++-----
 include/linux/pagemap.h    |   11 +++++++++++
 mm/filemap.c               |   17 +++++++++++++++++
 mm/migrate.c               |    4 ++--
 mm/page_alloc.c            |    2 +-
 10 files changed, 56 insertions(+), 26 deletions(-)

--- NEW FILE linux-2.6.17-cachefs-fsmisc.patch ---
--- linux-2.6.16.noarch/fs/afs/dir.c.fsmisc	2006-06-02 13:16:11.000000000 -0400
+++ linux-2.6.16.noarch/fs/afs/dir.c	2006-06-02 13:18:39.000000000 -0400
@@ -155,11 +155,9 @@ static inline void afs_dir_check_page(st
 		}
 	}
 
-	SetPageChecked(page);
 	return;
 
  error:
-	SetPageChecked(page);
 	SetPageError(page);
 
 } /* end afs_dir_check_page() */
@@ -193,8 +191,7 @@ static struct page *afs_dir_get_page(str
 		kmap(page);
 		if (!PageUptodate(page))
 			goto fail;
-		if (!PageChecked(page))
-			afs_dir_check_page(dir, page);
+		afs_dir_check_page(dir, page);
 		if (PageError(page))
 			goto fail;
 	}
--- linux-2.6.16.noarch/fs/ext2/dir.c.fsmisc	2006-06-02 13:16:12.000000000 -0400
+++ linux-2.6.16.noarch/fs/ext2/dir.c	2006-06-02 13:18:39.000000000 -0400
@@ -112,7 +112,7 @@ static void ext2_check_page(struct page 
 	if (offs != limit)
 		goto Eend;
 out:
-	SetPageChecked(page);
+	SetPageFsMisc(page);
 	return;
 
 	/* Too bad, we had an error */
@@ -152,7 +152,7 @@ Eend:
 		dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
 		(unsigned long) le32_to_cpu(p->inode));
 fail:
-	SetPageChecked(page);
+	SetPageFsMisc(page);
 	SetPageError(page);
 }
 
@@ -166,7 +166,7 @@ static struct page * ext2_get_page(struc
 		kmap(page);
 		if (!PageUptodate(page))
 			goto fail;
-		if (!PageChecked(page))
+		if (!PageFsMisc(page))
 			ext2_check_page(page);
 		if (PageError(page))
 			goto fail;
--- linux-2.6.16.noarch/fs/ext3/inode.c.fsmisc	2006-06-02 13:16:12.000000000 -0400
+++ linux-2.6.16.noarch/fs/ext3/inode.c	2006-06-02 13:18:39.000000000 -0400
@@ -1528,12 +1528,12 @@ static int ext3_journalled_writepage(str
 		goto no_write;
 	}
 
-	if (!page_has_buffers(page) || PageChecked(page)) {
+	if (!page_has_buffers(page) || PageFsMisc(page)) {
 		/*
 		 * It's mmapped pagecache.  Add buffers and journal it.  There
 		 * doesn't seem much point in redirtying the page here.
 		 */
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 		ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE,
 					ext3_get_block);
 		if (ret != 0) {
@@ -1590,7 +1590,7 @@ static void ext3_invalidatepage(struct p
 	 * If it's a full truncate we just forget about the pending dirtying
 	 */
 	if (offset == 0)
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 
 	journal_invalidatepage(journal, page, offset);
 }
@@ -1599,7 +1599,7 @@ static int ext3_releasepage(struct page 
 {
 	journal_t *journal = EXT3_JOURNAL(page->mapping->host);
 
-	WARN_ON(PageChecked(page));
+	WARN_ON(PageFsMisc(page));
 	if (!page_has_buffers(page))
 		return 0;
 	return journal_try_to_free_buffers(journal, page, wait);
@@ -1695,7 +1695,7 @@ out:
  */
 static int ext3_journalled_set_page_dirty(struct page *page)
 {
-	SetPageChecked(page);
+	SetPageFsMisc(page);
 	return __set_page_dirty_nobuffers(page);
 }
 
--- linux-2.6.16.noarch/fs/freevxfs/vxfs_subr.c.fsmisc	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/freevxfs/vxfs_subr.c	2006-06-02 13:18:39.000000000 -0400
@@ -79,7 +79,7 @@ vxfs_get_page(struct address_space *mapp
 		kmap(pp);
 		if (!PageUptodate(pp))
 			goto fail;
-		/** if (!PageChecked(pp)) **/
+		/** if (!PageFsMisc(pp)) **/
 			/** vxfs_check_page(pp); **/
 		if (PageError(pp))
 			goto fail;
--- linux-2.6.16.noarch/fs/reiserfs/inode.c.fsmisc	2006-06-02 13:16:13.000000000 -0400
+++ linux-2.6.16.noarch/fs/reiserfs/inode.c	2006-06-02 13:18:39.000000000 -0400
@@ -2352,7 +2352,7 @@ static int reiserfs_write_full_page(stru
 	struct buffer_head *head, *bh;
 	int partial = 0;
 	int nr = 0;
-	int checked = PageChecked(page);
+	int checked = PageFsMisc(page);
 	struct reiserfs_transaction_handle th;
 	struct super_block *s = inode->i_sb;
 	int bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize;
@@ -2421,7 +2421,7 @@ static int reiserfs_write_full_page(stru
 	 * blocks we're going to log
 	 */
 	if (checked) {
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 		reiserfs_write_lock(s);
 		error = journal_begin(&th, s, bh_per_page + 1);
 		if (error) {
@@ -2802,7 +2802,7 @@ static void reiserfs_invalidatepage(stru
 	BUG_ON(!PageLocked(page));
 
 	if (offset == 0)
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 
 	if (!page_has_buffers(page))
 		goto out;
@@ -2843,7 +2843,7 @@ static int reiserfs_set_page_dirty(struc
 {
 	struct inode *inode = page->mapping->host;
 	if (reiserfs_file_data_log(inode)) {
-		SetPageChecked(page);
+		SetPageFsMisc(page);
 		return __set_page_dirty_nobuffers(page);
 	}
 	return __set_page_dirty_buffers(page);
@@ -2866,7 +2866,7 @@ static int reiserfs_releasepage(struct p
 	struct buffer_head *bh;
 	int ret = 1;
 
-	WARN_ON(PageChecked(page));
+	WARN_ON(PageFsMisc(page));
 	spin_lock(&j->j_dirty_buffers_lock);
 	head = page_buffers(page);
 	bh = head;
--- linux-2.6.16.noarch/include/linux/page-flags.h.fsmisc	2006-06-02 13:16:17.000000000 -0400
+++ linux-2.6.16.noarch/include/linux/page-flags.h	2006-06-02 13:18:39.000000000 -0400
@@ -73,7 +73,7 @@
 #define PG_active		 6
 #define PG_slab			 7	/* slab debug (Suparna wants this) */
 
-#define PG_checked		 8	/* kill me in 2.5.<early>. */
+#define PG_fs_misc		 8
 #define PG_arch_1		 9
 #define PG_reserved		10
 #define PG_private		11	/* Has something at ->private */
@@ -274,10 +274,6 @@ extern void __mod_page_state_offset(unsi
 #define PageHighMem(page)	0 /* needed to optimize away at compile time */
 #endif
 
-#define PageChecked(page)	test_bit(PG_checked, &(page)->flags)
-#define SetPageChecked(page)	set_bit(PG_checked, &(page)->flags)
-#define ClearPageChecked(page)	clear_bit(PG_checked, &(page)->flags)
-
 #define PageReserved(page)	test_bit(PG_reserved, &(page)->flags)
 #define SetPageReserved(page)	set_bit(PG_reserved, &(page)->flags)
 #define ClearPageReserved(page)	clear_bit(PG_reserved, &(page)->flags)
@@ -376,4 +372,13 @@ static inline void set_page_writeback(st
 	test_set_page_writeback(page);
 }
 
+/*
+ * Filesystem-specific page bit testing
+ */
+#define PageFsMisc(page)		test_bit(PG_fs_misc, &(page)->flags)
+#define SetPageFsMisc(page)		set_bit(PG_fs_misc, &(page)->flags)
+#define TestSetPageFsMisc(page)		test_and_set_bit(PG_fs_misc, &(page)->flags)
+#define ClearPageFsMisc(page)		clear_bit(PG_fs_misc, &(page)->flags)
+#define TestClearPageFsMisc(page)	test_and_clear_bit(PG_fs_misc, &(page)->flags)
+
 #endif	/* PAGE_FLAGS_H */
--- linux-2.6.16.noarch/include/linux/pagemap.h.fsmisc	2006-06-02 13:16:17.000000000 -0400
+++ linux-2.6.16.noarch/include/linux/pagemap.h	2006-06-02 13:18:39.000000000 -0400
@@ -208,6 +208,17 @@ static inline void wait_on_page_writebac
 extern void end_page_writeback(struct page *page);
 
 /*
+ * Wait for filesystem-specific page synchronisation to complete
+ */
+static inline void wait_on_page_fs_misc(struct page *page)
+{
+	if (PageFsMisc(page))
+		wait_on_page_bit(page, PG_fs_misc);
+}
+
+extern void fastcall end_page_fs_misc(struct page *page);
+
+/*
  * Fault a userspace page into pagetables.  Return non-zero on a fault.
  *
  * This assumes that two userspace pages are always sufficient.  That's
--- linux-2.6.16.noarch/mm/filemap.c.fsmisc	2006-06-02 13:16:40.000000000 -0400
+++ linux-2.6.16.noarch/mm/filemap.c	2006-06-02 13:18:39.000000000 -0400
@@ -552,6 +552,23 @@ void fastcall __lock_page(struct page *p
 EXPORT_SYMBOL(__lock_page);
 
 /*
+ * Note completion of filesystem specific page synchronisation
+ *
+ * This is used to allow a page to be written to a filesystem cache in the
+ * background without holding up the completion of readpage
+ */
+void fastcall end_page_fs_misc(struct page *page)
+{
+	smp_mb__before_clear_bit();
+	if (!TestClearPageFsMisc(page))
+		BUG();
+	smp_mb__after_clear_bit();
+	__wake_up_bit(page_waitqueue(page), &page->flags, PG_fs_misc);
+}
+
+EXPORT_SYMBOL(end_page_fs_misc);
+
+/*
  * a rather lightweight function, finding and getting a reference to a
  * hashed page atomically.
  */
--- linux-2.6.16.noarch/mm/migrate.c.fsmisc	2006-06-02 13:16:18.000000000 -0400
+++ linux-2.6.16.noarch/mm/migrate.c	2006-06-02 13:18:39.000000000 -0400
@@ -272,8 +272,8 @@ void migrate_page_copy(struct page *newp
 		SetPageUptodate(newpage);
 	if (PageActive(page))
 		SetPageActive(newpage);
-	if (PageChecked(page))
-		SetPageChecked(newpage);
+	if (PageFsMisc(page))
+		SetPageFsMisc(newpage);
 	if (PageMappedToDisk(page))
 		SetPageMappedToDisk(newpage);
 
--- linux-2.6.16.noarch/mm/page_alloc.c.fsmisc	2006-06-02 13:16:40.000000000 -0400
+++ linux-2.6.16.noarch/mm/page_alloc.c	2006-06-02 13:18:39.000000000 -0400
@@ -546,7 +546,7 @@ static int prep_new_page(struct page *pa
 
 	page->flags &= ~(1 << PG_uptodate | 1 << PG_error |
 			1 << PG_referenced | 1 << PG_arch_1 |
-			1 << PG_checked | 1 << PG_mappedtodisk);
+			1 << PG_fs_misc | 1 << PG_mappedtodisk);
 	set_page_private(page, 0);
 	set_page_refcounted(page);
 	kernel_map_pages(page, 1 << order, 1);

linux-2.6.17-cachefs-kfile.patch:
 Documentation/sysctl/fs.txt |    6 ++++-
 fs/file_table.c             |   48 +++++++++++++++++++++++++++++++++++---------
 fs/open.c                   |   20 ++++++++++++++++++
 include/linux/file.h        |    1 
 include/linux/fs.h          |   10 +++++++++
 include/linux/sysctl.h      |    1 
 kernel/sysctl.c             |   11 ++++++++++
 7 files changed, 86 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6.17-cachefs-kfile.patch ---
--- linux-2.6.16.noarch/Documentation/sysctl/fs.txt.kfile	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/Documentation/sysctl/fs.txt	2006-06-01 10:42:02.000000000 -0400
@@ -71,7 +71,7 @@ you might want to raise the limit.
 
 ==============================================================
 
-file-max & file-nr:
+file-max, file-nr & file-kernel:
 
 The kernel allocates file handles dynamically, but as yet it
 doesn't free them again.
@@ -88,6 +88,10 @@ close to the maximum, but the number of 
 significantly greater than 0, you've encountered a peak in your 
 usage of file handles and you don't need to increase the maximum.
 
+The value in file-kernel denotes the number of internal file handles
+that the kernel has open.  These do not contribute to ENFILE
+accounting.
+
 ==============================================================
 
 inode-max, inode-nr & inode-state:
--- linux-2.6.16.noarch/fs/file_table.c.kfile	2006-06-01 10:38:09.000000000 -0400
+++ linux-2.6.16.noarch/fs/file_table.c	2006-06-01 10:42:02.000000000 -0400
@@ -30,10 +30,13 @@ struct files_stat_struct files_stat = {
 	.max_files = NR_FILE
 };
 
+struct files_kernel_stat_struct files_kernel_stat;
+
 /* public. Not pretty! */
 __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock);
 
 static struct percpu_counter nr_files __cacheline_aligned_in_smp;
+static atomic_t nr_kernel_files;
 
 static inline void file_free_rcu(struct rcu_head *head)
 {
@@ -43,7 +46,10 @@ static inline void file_free_rcu(struct 
 
 static inline void file_free(struct file *f)
 {
-	percpu_counter_dec(&nr_files);
+	if (f->f_kernel_flags & FKFLAGS_NO_ENFILE)
+		atomic_dec(&nr_kernel_files);
+	else
+		percpu_counter_dec(&nr_files);
 	call_rcu(&f->f_u.fu_rcuhead, file_free_rcu);
 }
 
@@ -74,45 +80,64 @@ int proc_nr_files(ctl_table *table, int 
 	files_stat.nr_files = get_nr_files();
 	return proc_dointvec(table, write, filp, buffer, lenp, ppos);
 }
+int proc_files_kernel(ctl_table *table, int write, struct file *filp,
+		      void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	files_kernel_stat.nr_kernel_files = atomic_read(&nr_kernel_files);
+	return proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
 #else
 int proc_nr_files(ctl_table *table, int write, struct file *filp,
                      void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	return -ENOSYS;
 }
+int proc_files_kernel(ctl_table *table, int write, struct file *filp,
+		      void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	return -ENOSYS;
+}
 #endif
 
 /* Find an unused file structure and return a pointer to it.
  * Returns NULL, if there are no more free file structures or
  * we run out of memory.
  */
-struct file *get_empty_filp(void)
+struct file *get_empty_kernel_filp(unsigned short kflags)
 {
 	struct task_struct *tsk;
 	static int old_max;
 	struct file * f;
 
 	/*
-	 * Privileged users can go above max_files
+	 * Privileged users can go above max_files and internal kernel users
+	 * can avoid it completely
 	 */
-	if (get_nr_files() >= files_stat.max_files && !capable(CAP_SYS_ADMIN)) {
+	if (!(kflags & FKFLAGS_NO_ENFILE) &&
+	    get_nr_files() >= files_stat.max_files &&
+	    !capable(CAP_SYS_ADMIN)
+	    ) {
 		/*
-		 * percpu_counters are inaccurate.  Do an expensive check before
-		 * we go and fail.
+		 * percpu_counters are inaccurate.  Do an expensive
+		 * check before we go and fail.
 		 */
 		if (percpu_counter_sum(&nr_files) >= files_stat.max_files)
 			goto over;
 	}
 
-	f = kmem_cache_alloc(filp_cachep, GFP_KERNEL);
+	f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);
 	if (f == NULL)
 		goto fail;
 
-	percpu_counter_inc(&nr_files);
-	memset(f, 0, sizeof(*f));
+	if (kflags & FKFLAGS_NO_ENFILE)
+		atomic_inc(&nr_kernel_files);
+	else
+		percpu_counter_inc(&nr_files);
+
 	if (security_file_alloc(f))
 		goto fail_sec;
 
+	f->f_kernel_flags = kflags;
 	tsk = current;
 	INIT_LIST_HEAD(&f->f_u.fu_list);
 	atomic_set(&f->f_count, 1);
@@ -138,6 +163,11 @@ fail:
 	return NULL;
 }
 
+struct file *get_empty_filp(void)
+{
+	return get_empty_kernel_filp(0);
+}
+
 EXPORT_SYMBOL(get_empty_filp);
 
 void fastcall fput(struct file *file)
--- linux-2.6.16.noarch/fs/open.c.kfile	2006-06-01 10:38:20.000000000 -0400
+++ linux-2.6.16.noarch/fs/open.c	2006-06-01 10:42:02.000000000 -0400
@@ -978,6 +978,26 @@ struct file *dentry_open(struct dentry *
 EXPORT_SYMBOL(dentry_open);
 
 /*
+ * open a specifically in-kernel file
+ */
+struct file *dentry_open_kernel(struct dentry *dentry, struct vfsmount *mnt, int flags)
+{
+	int error;
+	struct file *f;
+
+	error = -ENFILE;
+	f = get_empty_kernel_filp(FKFLAGS_NO_ENFILE);
+	if (f == NULL) {
+		dput(dentry);
+		mntput(mnt);
+		return ERR_PTR(error);
+	}
+
+	return __dentry_open(dentry, mnt, flags, f, NULL);
+}
+EXPORT_SYMBOL_GPL(dentry_open_kernel);
+
+/*
  * Find an empty file descriptor entry, and mark it busy.
  */
 int get_unused_fd(void)
--- linux-2.6.16.noarch/include/linux/file.h.kfile	2006-06-01 10:38:18.000000000 -0400
+++ linux-2.6.16.noarch/include/linux/file.h	2006-06-01 10:42:02.000000000 -0400
@@ -79,7 +79,6 @@ extern void FASTCALL(set_close_on_exec(u
 extern void put_filp(struct file *);
 extern int get_unused_fd(void);
 extern void FASTCALL(put_unused_fd(unsigned int fd));
-struct kmem_cache;
 
 extern struct file ** alloc_fd_array(int);
 extern void free_fd_array(struct file **, int);
--- linux-2.6.16.noarch/include/linux/fs.h.kfile	2006-06-01 10:38:19.000000000 -0400
+++ linux-2.6.16.noarch/include/linux/fs.h	2006-06-01 10:42:02.000000000 -0400
@@ -34,7 +34,11 @@ struct files_stat_struct {
 	int nr_free_files;	/* read only */
 	int max_files;		/* tunable */
 };
+struct files_kernel_stat_struct {
+	int nr_kernel_files;	/* read only */
+};
 extern struct files_stat_struct files_stat;
+extern struct files_kernel_stat_struct files_kernel_stat;
 extern int get_max_files(void);
 
 struct inodes_stat_t {
@@ -70,6 +74,8 @@ extern int dir_notify_enable;
    behavior for cross-node execution/opening_for_writing of files */
 #define FMODE_EXEC	16
 
+#define FKFLAGS_NO_ENFILE	1	/* kernel internal file (ignored for ENFILE accounting) */
+
 #define RW_MASK		1
 #define RWA_MASK	2
 #define READ 0
@@ -644,6 +650,7 @@ struct file {
 	atomic_t		f_count;
 	unsigned int 		f_flags;
 	mode_t			f_mode;
+	unsigned short		f_kernel_flags;
 	loff_t			f_pos;
 	struct fown_struct	f_owner;
 	unsigned int		f_uid, f_gid;
@@ -1381,6 +1388,7 @@ extern long do_sys_open(int fdf, const c
 			int mode);
 extern struct file *filp_open(const char *, int, int);
 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+extern struct file * dentry_open_kernel(struct dentry *, struct vfsmount *, int);
 extern int filp_close(struct file *, fl_owner_t id);
 extern char * getname(const char __user *);
 
@@ -1582,6 +1590,7 @@ static inline void insert_inode_hash(str
 }
 
 extern struct file * get_empty_filp(void);
+extern struct file * get_empty_kernel_filp(unsigned short fkflags);
 extern void file_move(struct file *f, struct list_head *list);
 extern void file_kill(struct file *f);
 struct bio;
@@ -1607,6 +1616,7 @@ extern ssize_t generic_file_direct_write
 		unsigned long *, loff_t, loff_t *, size_t, size_t);
 extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
 		unsigned long, loff_t, loff_t *, size_t, ssize_t);
+extern int generic_file_buffered_write_one_kernel_page(struct file *, pgoff_t, struct page *);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
 extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
 ssize_t generic_file_write_nolock(struct file *file, const struct iovec *iov,
--- linux-2.6.16.noarch/include/linux/sysctl.h.kfile	2006-06-01 10:38:18.000000000 -0400
+++ linux-2.6.16.noarch/include/linux/sysctl.h	2006-06-01 10:42:02.000000000 -0400
@@ -840,6 +840,7 @@ enum
 	FS_AIO_NR=18,	/* current system-wide number of aio requests */
 	FS_AIO_MAX_NR=19,	/* system-wide maximum number of aio requests */
 	FS_INOTIFY=20,	/* inotify submenu */
+	FS_FILE_KERNEL=21,	/* int: number of internal kernel files */
 };
 
 /* /proc/sys/fs/quota/ */
--- linux-2.6.16.noarch/kernel/sysctl.c.kfile	2006-06-01 10:38:17.000000000 -0400
+++ linux-2.6.16.noarch/kernel/sysctl.c	2006-06-01 10:42:02.000000000 -0400
@@ -53,6 +53,9 @@
 extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
                      void __user *buffer, size_t *lenp, loff_t *ppos);
 
+extern int proc_files_kernel(ctl_table *table, int write, struct file *filp,
+                     void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #if defined(CONFIG_SYSCTL)
 
 /* External variables not in a header file. */
@@ -1013,6 +1016,14 @@ static ctl_table fs_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 	{
+		.ctl_name	= FS_FILE_KERNEL,
+		.procname	= "file-kernel",
+		.data		= &files_stat,
+		.maxlen		= 1*sizeof(int),
+		.mode		= 0444,
+		.proc_handler	= &proc_files_kernel,
+	},
+	{
 		.ctl_name	= FS_DENTRY,
 		.procname	= "dentry-state",
 		.data		= &dentry_stat,

linux-2.6.17-cachefs-mkwrite.patch:
 include/linux/mm.h |    4 ++
 mm/memory.c        |   99 ++++++++++++++++++++++++++++++++++++++++-------------
 mm/mmap.c          |   12 +++++-
 mm/mprotect.c      |   11 ++++-
 4 files changed, 98 insertions(+), 28 deletions(-)

--- NEW FILE linux-2.6.17-cachefs-mkwrite.patch ---
--- linux-2.6.16.noarch/include/linux/mm.h.mkwrite	2006-06-01 10:30:48.000000000 -0400
+++ linux-2.6.16.noarch/include/linux/mm.h	2006-06-01 10:33:25.000000000 -0400
@@ -203,6 +203,10 @@ struct vm_operations_struct {
 	void (*close)(struct vm_area_struct * area);
 	struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int *type);
 	int (*populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock);
+
+	/* notification that a previously read-only page is about to become
+	 * writable, if an error is returned it will cause a SIGBUS */
+	int (*page_mkwrite)(struct vm_area_struct *vma, struct page *page);
 #ifdef CONFIG_NUMA
 	int (*set_policy)(struct vm_area_struct *vma, struct mempolicy *new);
 	struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
--- linux-2.6.16.noarch/mm/memory.c.mkwrite	2006-06-01 10:30:46.000000000 -0400
+++ linux-2.6.16.noarch/mm/memory.c	2006-06-01 10:33:25.000000000 -0400
@@ -1564,25 +1564,59 @@ static int do_wp_page(struct mm_struct *
 {
 	struct page *old_page, *new_page;
 	pte_t entry;
-	int ret = VM_FAULT_MINOR;
+	int reuse, ret = VM_FAULT_MINOR;
 
 	old_page = vm_normal_page(vma, address, orig_pte);
 	if (!old_page)
 		goto gotten;
 
-	if (PageAnon(old_page) && !TestSetPageLocked(old_page)) {
-		int reuse = can_share_swap_page(old_page);
-		unlock_page(old_page);
-		if (reuse) {
-			flush_cache_page(vma, address, pte_pfn(orig_pte));
-			entry = pte_mkyoung(orig_pte);
-			entry = maybe_mkwrite(pte_mkdirty(entry), vma);
-			ptep_set_access_flags(vma, address, page_table, entry, 1);
-			update_mmu_cache(vma, address, entry);
-			lazy_mmu_prot_update(entry);
-			ret |= VM_FAULT_WRITE;
-			goto unlock;
+	if (unlikely(vma->vm_flags & VM_SHARED)) {
+		if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
+			/*
+			 * Notify the address space that the page is about to
+			 * become writable so that it can prohibit this or wait
+			 * for the page to get into an appropriate state.
+			 *
+			 * We do this without the lock held, so that it can
+			 * sleep if it needs to.
+			 */
+			page_cache_get(old_page);
+			pte_unmap_unlock(page_table, ptl);
+
+			if (vma->vm_ops->page_mkwrite(vma, old_page) < 0)
+				goto unwritable_page;
+
+			page_cache_release(old_page);
+
+			/*
+			 * Since we dropped the lock we need to revalidate
+			 * the PTE as someone else may have changed it.  If
+			 * they did, we just return, as we can count on the
+			 * MMU to tell us if they didn't also make it writable.
+			 */
+			page_table = pte_offset_map_lock(mm, pmd, address,
+							 &ptl);
+			if (!pte_same(*page_table, orig_pte))
+				goto unlock;
 		}
+
+		reuse = 1;
+	} else if (PageAnon(old_page) && !TestSetPageLocked(old_page)) {
+		reuse = can_share_swap_page(old_page);
+		unlock_page(old_page);
+	} else {
+		reuse = 0;
+	}
+
+	if (reuse) {
+		flush_cache_page(vma, address, pte_pfn(orig_pte));
+		entry = pte_mkyoung(orig_pte);
+		entry = maybe_mkwrite(pte_mkdirty(entry), vma);
+		ptep_set_access_flags(vma, address, page_table, entry, 1);
+		update_mmu_cache(vma, address, entry);
+		lazy_mmu_prot_update(entry);
+		ret |= VM_FAULT_WRITE;
+		goto unlock;
 	}
 
 	/*
@@ -1642,6 +1676,10 @@ oom:
 	if (old_page)
 		page_cache_release(old_page);
 	return VM_FAULT_OOM;
+
+unwritable_page:
+	page_cache_release(old_page);
+	return VM_FAULT_SIGBUS;
 }
 
 /*
@@ -2193,18 +2231,31 @@ retry:
 	/*
 	 * Should we do an early C-O-W break?
 	 */
-	if (write_access && !(vma->vm_flags & VM_SHARED)) {
-		struct page *page;
+	if (write_access) {
+		if (!(vma->vm_flags & VM_SHARED)) {
+			struct page *page;
 
-		if (unlikely(anon_vma_prepare(vma)))
-			goto oom;
-		page = alloc_page_vma(GFP_HIGHUSER, vma, address);
-		if (!page)
-			goto oom;
-		copy_user_highpage(page, new_page, address);
-		page_cache_release(new_page);
-		new_page = page;
-		anon = 1;
+			if (unlikely(anon_vma_prepare(vma)))
+				goto oom;
+			page = alloc_page_vma(GFP_HIGHUSER, vma, address);
+			if (!page)
+				goto oom;
+			copy_user_highpage(page, new_page, address);
+			page_cache_release(new_page);
+			new_page = page;
+			anon = 1;
+
+		} else {
+			/* if the page will be shareable, see if the backing
+			 * address space wants to know that the page is about
+			 * to become writable */
+			if (vma->vm_ops->page_mkwrite &&
+			    vma->vm_ops->page_mkwrite(vma, new_page) < 0
+			    ) {
+				page_cache_release(new_page);
+				return VM_FAULT_SIGBUS;
+			}
+		}
 	}
 
 	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
--- linux-2.6.16.noarch/mm/mmap.c.mkwrite	2006-06-01 10:30:48.000000000 -0400
+++ linux-2.6.16.noarch/mm/mmap.c	2006-06-01 10:33:25.000000000 -0400
@@ -1072,7 +1072,8 @@ munmap_back:
 	vma->vm_start = addr;
 	vma->vm_end = addr + len;
 	vma->vm_flags = vm_flags;
-	vma->vm_page_prot = protection_map[vm_flags & 0x0f];
+	vma->vm_page_prot = protection_map[vm_flags &
+				(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
 	vma->vm_pgoff = pgoff;
 
 	if (file) {
@@ -1096,6 +1097,12 @@ munmap_back:
 			goto free_vma;
 	}
 
+	/* Don't make the VMA automatically writable if it's shared, but the
+	 * backer wishes to know when pages are first written to */
+	if (vma->vm_ops && vma->vm_ops->page_mkwrite)
+		vma->vm_page_prot =
+			protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC)];
+
 	/* We set VM_ACCOUNT in a shared mapping's vm_flags, to inform
 	 * shmem_zero_setup (perhaps called through /dev/zero's ->mmap)
 	 * that memory reservation must be checked; but that reservation
@@ -2009,7 +2016,8 @@ unsigned long do_brk(unsigned long addr,
 	vma->vm_end = addr + len;
 	vma->vm_pgoff = pgoff;
 	vma->vm_flags = flags;
-	vma->vm_page_prot = protection_map[flags & 0x0f];
+	vma->vm_page_prot = protection_map[flags &
+				(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
 	vma_link(mm, vma, prev, rb_link, rb_parent);
 out:
 	mm->total_vm += len >> PAGE_SHIFT;
--- linux-2.6.16.noarch/mm/mprotect.c.mkwrite	2006-06-01 10:30:48.000000000 -0400
+++ linux-2.6.16.noarch/mm/mprotect.c	2006-06-01 10:34:22.000000000 -0400
@@ -107,6 +107,7 @@ mprotect_fixup(struct vm_area_struct *vm
 	unsigned long oldflags = vma->vm_flags;
 	long nrpages = (end - start) >> PAGE_SHIFT;
 	unsigned long charged = 0, old_end = vma->vm_end;
+	unsigned int mask;
 	pgprot_t newprot;
 	pgoff_t pgoff;
 	int error;
@@ -133,8 +134,6 @@ mprotect_fixup(struct vm_area_struct *vm
 		}
 	}
 
-	newprot = protection_map[newflags & 0xf];
-
 	/*
 	 * First try to merge with previous and/or next vma.
 	 */
@@ -161,6 +160,14 @@ mprotect_fixup(struct vm_area_struct *vm
 	}
 
 success:
+	/* Don't make the VMA automatically writable if it's shared, but the
+	 * backer wishes to know when pages are first written to */
+	mask = VM_READ|VM_WRITE|VM_EXEC|VM_SHARED;
+	if (vma->vm_ops && vma->vm_ops->page_mkwrite)
+		mask &= ~VM_SHARED;
+
+	newprot = protection_map[newflags & mask];
+
 	/*
 	 * vm_flags and vm_page_prot are protected by the mmap_sem
 	 * held in write mode.

linux-2.6.17-cachefs-relpage.patch:
 readahead.c |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.17-cachefs-relpage.patch ---
--- linux-2.6.16.noarch/mm/readahead.c.relpage	2006-06-01 10:49:49.000000000 -0400
+++ linux-2.6.16.noarch/mm/readahead.c	2006-06-01 10:52:33.000000000 -0400
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/backing-dev.h>
 #include <linux/pagevec.h>
+#include <linux/buffer_head.h>
 
 void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
 {
@@ -118,6 +119,26 @@ static inline unsigned long get_next_ra_
 
 #define list_to_page(head) (list_entry((head)->prev, struct page, lru))
 
+/*
+ * see if a page needs releasing upon read_cache_pages() failure
+ * - the caller of read_cache_pages() may have set PG_private before calling,
+ *   such as the NFS fs marking pages that are cached locally on disk, thus we
+ *   need to give the fs a chance to clean up in the event of an error
+ */
+static inline void read_cache_pages_release_page(struct address_space *mapping,
+						 struct page *page)
+{
+	if (PagePrivate(page)) {
+		if (TestSetPageLocked(page))
+			BUG();
+		page->mapping = mapping;
+		try_to_release_page(page, GFP_KERNEL);
+		page->mapping = NULL;
+		unlock_page(page);
+	}
+	page_cache_release(page);
+}
+
 /**
  * read_cache_pages - populate an address space with some pages, and
  * 			start reads against them.
@@ -142,7 +163,7 @@ int read_cache_pages(struct address_spac
 		page = list_to_page(pages);
 		list_del(&page->lru);
 		if (add_to_page_cache(page, mapping, page->index, GFP_KERNEL)) {
-			page_cache_release(page);
+			read_cache_pages_release_page(mapping, page);
 			continue;
 		}
 		ret = filler(data, page);
@@ -154,7 +175,7 @@ int read_cache_pages(struct address_spac
 
 				victim = list_to_page(pages);
 				list_del(&victim->lru);
-				page_cache_release(victim);
+				read_cache_pages_release_page(mapping, victim);
 			}
 			break;
 		}

linux-2.6.17-fscache-fedora.patch:
 kernel/auditsc.c |    1 +
 mm/filemap.c     |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE linux-2.6.17-fscache-fedora.patch ---
--- linux-2.6.16.noarch/kernel/auditsc.c.fedora	2006-06-07 12:11:23.607621000 -0400
+++ linux-2.6.16.noarch/kernel/auditsc.c	2006-06-07 12:49:31.314757000 -0400
@@ -1111,6 +1111,7 @@ update_context:
 		audit_inode_context(idx, inode);
 	}
 }
+EXPORT_SYMBOL(__audit_inode_child);
 
 /**
  * auditsc_get_stamp - get local copies of audit_context values
--- linux-2.6.16.noarch/mm/filemap.c.fedora	2006-06-07 12:12:08.531746000 -0400
+++ linux-2.6.16.noarch/mm/filemap.c	2006-06-07 12:49:31.325767000 -0400
@@ -720,6 +720,7 @@ unsigned find_get_pages(struct address_s
 	read_unlock_irq(&mapping->tree_lock);
 	return ret;
 }
+EXPORT_SYMBOL_GPL(find_get_pages);
 
 /**
  * find_get_pages_contig - gang contiguous pagecache lookup

linux-2.6.17-fscache.patch:
 Documentation/filesystems/caching/backend-api.txt |  357 +++++++
 Documentation/filesystems/caching/fscache.txt     |  151 +++
 Documentation/filesystems/caching/netfs-api.txt   |  752 +++++++++++++++
 fs/Kconfig                                        |   15 
 fs/Makefile                                       |    1 
 fs/fscache/Makefile                               |   11 
 fs/fscache/cookie.c                               | 1063 ++++++++++++++++++++++
 fs/fscache/fscache-int.h                          |   93 +
 fs/fscache/fsdef.c                                |  113 ++
 fs/fscache/main.c                                 |  105 ++
 fs/fscache/page.c                                 |  548 +++++++++++
 include/linux/fscache-cache.h                     |  243 +++++
 include/linux/fscache.h                           |  496 ++++++++++
 13 files changed, 3948 insertions(+)

--- NEW FILE linux-2.6.17-fscache.patch ---
--- /dev/null	2006-06-07 07:14:18.564562589 -0400
+++ linux-2.6.16.noarch/Documentation/filesystems/caching/backend-api.txt	2006-06-07 11:38:46.818862000 -0400
@@ -0,0 +1,357 @@
+			  ==========================
+			  FS-CACHE CACHE BACKEND API
+			  ==========================
+
+The FS-Cache system provides an API by which actual caches can be supplied to
+FS-Cache for it to then serve out to network filesystems and other interested
+parties.
+
+This API is declared in <linux/fscache-cache.h>.
+
+
+====================================
+INITIALISING AND REGISTERING A CACHE
+====================================
+
+To start off, a cache definition must be initialised and registered for each
+cache the backend wants to make available.  For instance, CacheFS does this in
+the fill_super() operation on mounting.
+
+The cache definition (struct fscache_cache) should be initialised by calling:
+
+	void fscache_init_cache(struct fscache_cache *cache,
+				struct fscache_cache_ops *ops,
+				const char *idfmt,
+				...)
+
+Where:
+
+ (*) "cache" is a pointer to the cache definition;
+
+ (*) "ops" is a pointer to the table of operations that the backend supports on
+     this cache;
+
+ (*) and a format and printf-style arguments for constructing a label for the
+     cache.
+
+
+The cache should then be registered with FS-Cache by passing a pointer to the
+previously initialised cache definition to:
+
+	int fscache_add_cache(struct fscache_cache *cache,
+			      struct fscache_object *fsdef,
+			      const char *tagname);
+
+Two extra arguments should also be supplied:
+
+ (*) "fsdef" which should point to the object representation for the FS-Cache
+     master index in this cache.  Netfs primary index entries will be created
+     here.
+
+ (*) "tagname" which, if given, should be a text string naming this cache.  If
+     this is NULL, the identifier will be used instead.  For CacheFS, the
+     identifier is set to name the underlying block device and the tag can be
+     supplied by mount.
+
+This function may return -ENOMEM if it ran out of memory or -EEXIST if the tag
+is already in use.  0 will be returned on success.
+
+
+=====================
+UNREGISTERING A CACHE
+=====================
+
+A cache can be withdrawn from the system by calling this function with a
+pointer to the cache definition:
+
+	void fscache_withdraw_cache(struct fscache_cache *cache)
+
+In CacheFS's case, this is called by put_super().
+
+
+==================
+FS-CACHE UTILITIES
+==================
+
+FS-Cache provides some utilities that a cache backend may make use of:
+
+ (*) Find the parent of an object:
+
+	struct fscache_object *
+	fscache_find_parent_object(struct fscache_object *object)
+
+     This allows a backend to find the logical parent of an index or data file
+     in the cache hierarchy.
+
+ (*) Note occurrence of an I/O error in a cache:
+
+	void fscache_io_error(struct fscache_cache *cache)
+
+     This tells FS-Cache that an I/O error occurred in the cache.  After this
+     has been called, only resource dissociation operations (object and page
+     release) will be passed from the netfs to the cache backend for the
+     specified cache.
+
+     This does not actually withdraw the cache.  That must be done separately.
+
+ (*) Get an extra reference to a read or write context:
+
+	void *fscache_get_context(struct fscache_cookie *cookie, void *context)
+
+     and release a reference:
+
+	void *fscache_put_context(struct fscache_cookie *cookie, void *context)
+
+     These should be used to maintain the presence of the read or write context
+     passed to the cache read/write functions.  This context must then be
+     passed to the I/O completion function.
+
+
+========================
+RELEVANT DATA STRUCTURES
+========================
+
+ (*) Index/Data file FS-Cache representation cookie:
+
+	struct fscache_cookie {
+		struct fscache_object_def	*def;
+		struct fscache_netfs		*netfs;
+		void				*netfs_data;
+		...
+	};
+
+     The fields that might be of use to the backend describe the object
+     definition, the netfs definition and the netfs's data for this cookie.
+     The object definition contain functions supplied by the netfs for loading
+     and matching index entries; these are required to provide some of the
+     cache operations.
+
+ (*) In-cache object representation:
+
+	struct fscache_object {
+		struct fscache_cache		*cache;
+		struct fscache_cookie		*cookie;
+		unsigned long			flags;
+	#define FSCACHE_OBJECT_RECYCLING	1
+		...
+	};
+
+     Structures of this type should be allocated by the cache backend and
+     passed to FS-Cache when requested by the appropriate cache operation.  In
+     the case of CacheFS, they're embedded in CacheFS's internal object
+     structures.
+
+     Each object contains a pointer to the cookie that represents the object it
+     is backing.  It also contains a flag that indicates whether the object is
+     being retired when put_object() is called.  This should be initialised by
+     calling fscache_object_init(object).
+
+
+================
+CACHE OPERATIONS
+================
+
+The cache backend provides FS-Cache with a table of operations that can be
+performed on the denizens of the cache.  These are held in a structure of type:
+
+	struct fscache_cache_ops
+
+ (*) Name of cache provider [mandatory]:
+
+	const char *name
+
+     This isn't strictly an operation, but should be pointed at a string naming
+     the backend.
+
+ (*) Object lookup [mandatory]:
+
+	struct fscache_object *(*lookup_object)(struct fscache_cache *cache,
+						struct fscache_object *parent,
+						struct fscache_cookie *cookie)
+
+     This method is used to look up an object in the specified cache, given a
+     pointer to the parent object and the cookie to which the object will be
+     attached.  This should instantiate that object in the cache if it can, or
+     return -ENOBUFS or -ENOMEM if it can't.
+
+ (*) Increment object refcount [mandatory]:
+
+	struct fscache_object *(*grab_object)(struct fscache_object *object)
+
+     This method is called to increment the reference count on an object.  It
+     may fail (for instance if the cache is being withdrawn) by returning NULL.
+     It should return the object pointer if successful.
+
+ (*) Lock/Unlock object [mandatory]:
+
+	void (*lock_object)(struct fscache_object *object)
+	void (*unlock_object)(struct fscache_object *object)
+
+     These methods are used to exclusively lock an object.  It must be possible
+     to schedule with the lock held, so a spinlock isn't sufficient.
+
+ (*) Pin/Unpin object [optional]:
+
+	int (*pin_object)(struct fscache_object *object)
+	void (*unpin_object)(struct fscache_object *object)
[...3600 lines suppressed...]
+		return __fscache_set_i_size(cookie, i_size);
+#endif
+	return -ENOBUFS;
+}
+
+/*****************************************************************************/
+/*
+ * reserve data space for a cached object
+ * - returns -ENOBUFS if the file is not backed
+ * - returns -ENOSPC if there isn't enough space to honour the reservation
+ * - returns 0 if okay
+ */
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+extern int __fscache_reserve_space(struct fscache_cookie *cookie, loff_t size);
+#endif
+
+static inline
+int fscache_reserve_space(struct fscache_cookie *cookie, loff_t size)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		return __fscache_reserve_space(cookie, size);
+#endif
+	return -ENOBUFS;
+}
+
+/*****************************************************************************/
+/*
+ * read a page from the cache or allocate a block in which to store it
+ * - if the page is not backed by a file:
+ *   - -ENOBUFS will be returned and nothing more will be done
+ * - else if the page is backed by a block in the cache:
+ *   - a read will be started which will call end_io_func on completion
+ * - else if the page is unbacked:
+ *   - a block will be allocated
+ *   - -ENODATA will be returned
+ */
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+extern int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+					struct page *page,
+					fscache_rw_complete_t end_io_func,
+					void *context,
+					gfp_t gfp);
+#endif
+
+static inline
+int fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+			       struct page *page,
+			       fscache_rw_complete_t end_io_func,
+			       void *context,
+			       gfp_t gfp)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		return __fscache_read_or_alloc_page(cookie, page, end_io_func,
+						    context, gfp);
+#endif
+	return -ENOBUFS;
+}
+
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+extern int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+					 struct address_space *mapping,
+					 struct list_head *pages,
+					 unsigned *nr_pages,
+					 fscache_rw_complete_t end_io_func,
+					 void *context,
+					 gfp_t gfp);
+#endif
+
+static inline
+int fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+				struct address_space *mapping,
+				struct list_head *pages,
+				unsigned *nr_pages,
+				fscache_rw_complete_t end_io_func,
+				void *context,
+				gfp_t gfp)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		return __fscache_read_or_alloc_pages(cookie, mapping, pages,
+						     nr_pages, end_io_func,
+						     context, gfp);
+#endif
+	return -ENOBUFS;
+}
+
+/*
+ * allocate a block in which to store a page
+ * - if the page is not backed by a file:
+ *   - -ENOBUFS will be returned and nothing more will be done
+ * - else
+ *   - a block will be allocated if there isn't one
+ *   - 0 will be returned
+ */
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+extern int __fscache_alloc_page(struct fscache_cookie *cookie,
+				struct page *page,
+				gfp_t gfp);
+#endif
+
+static inline
+int fscache_alloc_page(struct fscache_cookie *cookie,
+		       struct page *page,
+		       gfp_t gfp)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		return __fscache_alloc_page(cookie, page, gfp);
+#endif
+	return -ENOBUFS;
+}
+
+/*
+ * request a page be stored in the cache
+ * - this request may be ignored if no cache block is currently allocated, in
+ *   which case it:
+ *   - returns -ENOBUFS
+ * - if a cache block was already allocated:
+ *   - a BIO will be dispatched to write the page (end_io_func will be called
+ *     from the completion function)
+ *   - returns 0
+ */
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+extern int __fscache_write_page(struct fscache_cookie *cookie,
+				struct page *page,
+				fscache_rw_complete_t end_io_func,
+				void *context,
+				gfp_t gfp);
+
+extern int __fscache_write_pages(struct fscache_cookie *cookie,
+				 struct pagevec *pagevec,
+				 fscache_rw_complete_t end_io_func,
+				 void *context,
+				 gfp_t gfp);
+#endif
+
+static inline
+int fscache_write_page(struct fscache_cookie *cookie,
+		       struct page *page,
+		       fscache_rw_complete_t end_io_func,
+		       void *context,
+		       gfp_t gfp)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		return __fscache_write_page(cookie, page, end_io_func,
+					    context, gfp);
+#endif
+	return -ENOBUFS;
+}
+
+static inline
+int fscache_write_pages(struct fscache_cookie *cookie,
+			struct pagevec *pagevec,
+			fscache_rw_complete_t end_io_func,
+			void *context,
+			gfp_t gfp)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		return __fscache_write_pages(cookie, pagevec, end_io_func,
+					     context, gfp);
+#endif
+	return -ENOBUFS;
+}
+
+/*
+ * indicate that caching is no longer required on a page
+ * - note: cannot cancel any outstanding BIOs between this page and the cache
+ */
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+extern void __fscache_uncache_page(struct fscache_cookie *cookie,
+				   struct page *page);
+extern void __fscache_uncache_pages(struct fscache_cookie *cookie,
+				    struct pagevec *pagevec);
+#endif
+
+static inline
+void fscache_uncache_page(struct fscache_cookie *cookie,
+			  struct page *page)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		__fscache_uncache_page(cookie, page);
+#endif
+}
+
+static inline
+void fscache_uncache_pagevec(struct fscache_cookie *cookie,
+			     struct pagevec *pagevec)
+{
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+	if (cookie)
+		__fscache_uncache_pages(cookie, pagevec);
+#endif
+}
+
+#endif /* _LINUX_FSCACHE_H */

linux-2.6.17-nfs-fscache.patch:
 fs/Kconfig                 |    7 +
 fs/nfs/Makefile            |    1 
 fs/nfs/file.c              |   31 ++++
 fs/nfs/fscache.c           |  301 +++++++++++++++++++++++++++++++++++++++++++++
 fs/nfs/fscache.h           |  244 ++++++++++++++++++++++++++++++++++++
 fs/nfs/inode.c             |   44 ++++++
 fs/nfs/pagelist.c          |    2 
 fs/nfs/read.c              |  240 +++++++++++++++++++++++++++++++++++
 fs/nfs/sysctl.c            |   43 ++++++
 fs/nfs/write.c             |    4 
 include/linux/nfs4_mount.h |    1 
 include/linux/nfs_fs.h     |    5 
 include/linux/nfs_fs_sb.h  |    9 +
 include/linux/nfs_mount.h  |    1 
 include/linux/nfs_page.h   |   23 +++
 15 files changed, 953 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.17-nfs-fscache.patch ---
--- linux-2.6.16.noarch/fs/nfs/Makefile.fsnfs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/nfs/Makefile	2006-06-07 13:13:18.163396000 -0400
@@ -14,4 +14,5 @@ nfs-$(CONFIG_NFS_V4)	+= nfs4proc.o nfs4x
 			   callback.o callback_xdr.o callback_proc.o
 nfs-$(CONFIG_NFS_DIRECTIO) += direct.o
 nfs-$(CONFIG_SYSCTL) += sysctl.o
+nfs-$(CONFIG_NFS_FSCACHE) += fscache.o
 nfs-objs		:= $(nfs-y)
--- linux-2.6.16.noarch/fs/nfs/file.c.fsnfs	2006-06-07 13:06:22.851020000 -0400
+++ linux-2.6.16.noarch/fs/nfs/file.c	2006-06-07 13:52:16.309796000 -0400
@@ -27,12 +27,14 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
+#include <linux/buffer_head.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
 #include "delegation.h"
 #include "iostat.h"
+#include "fscache.h"
 
 #define NFSDBG_FACILITY		NFSDBG_FILE
 
@@ -253,6 +255,19 @@ nfs_file_sendfile(struct file *filp, lof
 	return res;
 }
 
+#ifdef CONFIG_NFS_FSCACHE
+static int nfs_file_page_mkwrite(struct vm_area_struct *vma, struct page *page)
+{
+	wait_on_page_fs_misc(page);
+	return 0;
+}
+static struct vm_operations_struct nfs_fs_vm_operations = {
+	.nopage			= filemap_nopage,
+	.populate		= filemap_populate,
+	.page_mkwrite   = nfs_file_page_mkwrite,
+};
+#endif
+
 static int
 nfs_file_mmap(struct file * file, struct vm_area_struct * vma)
 {
@@ -266,6 +281,12 @@ nfs_file_mmap(struct file * file, struct
 	status = nfs_revalidate_file(inode, file);
 	if (!status)
 		status = generic_file_mmap(file, vma);
+
+#ifdef CONFIG_NFS_FSCACHE
+	if (NFS_I(inode)->fscache != NULL)
+		vma->vm_ops = &nfs_fs_vm_operations;
+#endif
+
 	return status;
 }
 
@@ -328,6 +349,11 @@ static int nfs_release_page(struct page 
 	return !nfs_wb_page(page->mapping->host, page);
 }
 
+/*
+ * since we use page->private for our own nefarious purposes when using fscache, we have to
+ * override extra address space ops to prevent fs/buffer.c from getting confused, even though we
+ * may not have asked its opinion
+ */
 struct address_space_operations nfs_file_aops = {
 	.readpage = nfs_readpage,
 	.readpages = nfs_readpages,
@@ -341,6 +367,11 @@ struct address_space_operations nfs_file
 #ifdef CONFIG_NFS_DIRECTIO
 	.direct_IO = nfs_direct_IO,
 #endif
+#ifdef CONFIG_NFS_FSCACHE
+	.sync_page	= block_sync_page,
+	.releasepage	= nfs_releasepage,
+	.invalidatepage	= nfs_invalidatepage,
+#endif
 };
 
 /* 
--- linux-2.6.16.noarch/fs/nfs/inode.c.fsnfs	2006-06-07 13:06:22.876021000 -0400
+++ linux-2.6.16.noarch/fs/nfs/inode.c	2006-06-07 13:53:07.298070000 -0400
@@ -44,6 +44,7 @@
 #include "callback.h"
 #include "delegation.h"
 #include "iostat.h"
+#include "fscache.h"
 
 #define NFSDBG_FACILITY		NFSDBG_VFS
 #define NFS_PARANOIA 1
@@ -176,6 +177,8 @@ nfs_clear_inode(struct inode *inode)
 	cred = nfsi->cache_access.cred;
 	if (cred)
 		put_rpccred(cred);
+
+	nfs_clear_fscookie(NFS_SERVER(inode), nfsi);
 	BUG_ON(atomic_read(&nfsi->data_updates) != 0);
 }
 
@@ -529,6 +532,9 @@ nfs_fill_super(struct super_block *sb, s
 			server->namelen = NFS2_MAXNAMLEN;
 	}
 
+	if (server->flags & NFS_MOUNT_FSCACHE)
+		nfs_fill_fscookie(sb);
+
 	sb->s_op = &nfs_sops;
 	return nfs_sb_init(sb, authflavor);
 }
@@ -602,6 +608,7 @@ static void nfs_show_mount_options(struc
 		{ NFS_MOUNT_NOAC, ",noac", "" },
 		{ NFS_MOUNT_NONLM, ",nolock", "" },
 		{ NFS_MOUNT_NOACL, ",noacl", "" },
+		{ NFS_MOUNT_FSCACHE, ",fsc", "" },
 		{ 0, NULL, NULL }
 	};
 	struct proc_nfs_info *nfs_infop;
@@ -770,6 +777,8 @@ void nfs_zap_caches(struct inode *inode)
 	spin_lock(&inode->i_lock);
 	nfs_zap_caches_locked(inode);
 	spin_unlock(&inode->i_lock);
+
+	nfs_zap_fscookie(NFS_SERVER(inode), NFS_I(inode));
 }
 
 static void nfs_zap_acl_cache(struct inode *inode)
@@ -920,6 +929,8 @@ nfs_fhget(struct super_block *sb, struct
 		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
 		nfsi->cache_access.cred = NULL;
 
+		nfs_fhget_fscookie(sb, nfsi);
+
 		unlock_new_inode(inode);
 	} else
 		nfs_refresh_inode(inode, fattr);
@@ -1002,6 +1013,7 @@ void nfs_setattr_update_inode(struct ino
 	if ((attr->ia_valid & ATTR_SIZE) != 0) {
 		nfs_inc_stats(inode, NFSIOS_SETATTRTRUNC);
 		inode->i_size = attr->ia_size;
+		nfs_set_fscsize(NFS_SERVER(inode), NFS_I(inode), inode->i_size);
 		vmtruncate(inode, attr->ia_size);
 	}
 }
@@ -1184,6 +1196,9 @@ int nfs_open(struct inode *inode, struct
 	ctx->mode = filp->f_mode;
 	nfs_file_set_open_context(filp, ctx);
 	put_nfs_open_context(ctx);
+
+	nfs_set_fscache(inode, ((filp->f_flags & O_ACCMODE) == O_RDONLY));
+
 	return 0;
 }
 
@@ -1317,6 +1332,8 @@ void nfs_revalidate_mapping(struct inode
 		}
 		spin_unlock(&inode->i_lock);
 
+		nfs_renew_fscookie(NFS_SERVER(inode), nfsi);
+
 		dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",
 				inode->i_sb->s_id,
 				(long long)NFS_FILEID(inode));
@@ -1563,11 +1580,13 @@ static int nfs_update_inode(struct inode
 			if (data_stable) {
 				inode->i_size = new_isize;
 				invalid |= NFS_INO_INVALID_DATA;
+				nfs_set_fscsize(NFS_SERVER(inode), nfsi, inode->i_size);
 			}
 			invalid |= NFS_INO_INVALID_ATTR;
 		} else if (new_isize > cur_isize) {
 			inode->i_size = new_isize;
 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
+			nfs_set_fscsize(NFS_SERVER(inode), nfsi, inode->i_size);
 		}
 		nfsi->cache_change_attribute = jiffies;
 		dprintk("NFS: isize change on server for file %s/%ld\n",
@@ -1740,6 +1759,15 @@ static struct super_block *nfs_get_sb(st
 		goto out_err;
 	}
 #endif /* CONFIG_NFS_V3 */
+	/* if filesystem caching isn't compiled in, then requesting its use is
+	 * invalid */
+#ifndef CONFIG_NFS_FSCACHE
+	if (data->flags & NFS_MOUNT_FSCACHE) {
+		printk(KERN_WARNING
+			"NFS: kernel not compiled with CONFIG_NFS_FSCACHE\n");
+		return -EINVAL;
+	}
+#endif
 
 	s = ERR_PTR(-ENOMEM);
 	server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);
@@ -1804,6 +1832,8 @@ static void nfs_kill_super(struct super_
 
 	kill_anon_super(s);
 
+	nfs_kill_fscookie(server);
+
 	if (!IS_ERR(server->client))
 		rpc_shutdown_client(server->client);
 	if (!IS_ERR(server->client_sys))
@@ -1987,6 +2017,9 @@ static int nfs4_fill_super(struct super_
 	}
 
 	sb->s_time_gran = 1;
+	
+	if (server->flags & NFS4_MOUNT_FSCACHE)
+		nfs4_fill_fscookie(sb);
 
 	sb->s_op = &nfs4_sops;
 	err = nfs_sb_init(sb, authflavour);
@@ -2130,6 +2163,8 @@ static void nfs4_kill_super(struct super
 
 	nfs4_renewd_prepare_shutdown(server);
 
+	nfs_kill_fscookie(NFS_SB(sb));
+
 	if (server->client != NULL && !IS_ERR(server->client))
 		rpc_shutdown_client(server->client);
 
@@ -2295,6 +2330,11 @@ static int __init init_nfs_fs(void)
 {
 	int err;
 
+	/* we want to be able to cache */
+	err = nfs_register_netfs();
+	if (err < 0)
+		goto out5;
+
 	err = nfs_init_nfspagecache();
 	if (err)
 		goto out4;
@@ -2342,6 +2382,9 @@ out2:
 out3:
 	nfs_destroy_nfspagecache();
 out4:
+	nfs_unregister_netfs();
+out5:
+
 	return err;
 }
 
@@ -2354,6 +2397,7 @@ static void __exit exit_nfs_fs(void)
 	nfs_destroy_readpagecache();
 	nfs_destroy_inodecache();
 	nfs_destroy_nfspagecache();
+	nfs_unregister_netfs();
 #ifdef CONFIG_PROC_FS
 	rpc_proc_unregister("nfs");
 #endif
--- /dev/null	2006-06-07 07:14:18.564562589 -0400
+++ linux-2.6.16.noarch/fs/nfs/fscache.c	2006-06-07 13:52:38.595345000 -0400
@@ -0,0 +1,301 @@
+/* fscache.c: NFS filesystem cache interface
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells at redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/nfs_fs.h>
+#include <linux/nfs_fs_sb.h>
+#include <keys/user-type.h>
+
+#include "fscache.h"
+
+/*
+ * Sysctl variables
+ */
+int nfs_fscache_to_pages;
+int nfs_fscache_from_pages;
+int nfs_fscache_uncache_page;
+int nfs_fscache_from_error;
+int nfs_fscache_to_error;
+
+#define NFSDBG_FACILITY		NFSDBG_FSCACHE
+
+struct nfs_fh_auxdata {
+	struct timespec	i_mtime;
+	struct timespec	i_ctime;
+	loff_t		i_size;
+};
+
+static struct fscache_netfs_operations nfs_cache_ops = {
+};
+
+struct fscache_netfs nfs_cache_netfs = {
+	.name			= "nfs",
+	.version		= 0,
+	.ops			= &nfs_cache_ops,
+};
+
+static const uint8_t nfs_cache_ipv6_wrapper_for_ipv4[12] = {
+	[0 ... 9]	= 0x00,
+	[10 ... 11]	= 0xff
+};
+
+static uint16_t nfs_server_get_key(const void *cookie_netfs_data,
+		void *buffer, uint16_t bufmax)
+{
+	const struct nfs_server *server = cookie_netfs_data;
+	uint16_t len = 0;
+
+	switch (server->addr.sin_family) {
+	case AF_INET:
+		memcpy(buffer + 0, &nfs_cache_ipv6_wrapper_for_ipv4, 12);
+		memcpy(buffer + 12, &server->addr.sin_addr, 4);
+		memcpy(buffer + 16, &server->addr.sin_port, 2);
+		len = 18;
+		break;
+
+	case AF_INET6:
+		memcpy(buffer + 0, &server->addr.sin_addr, 16);
+		memcpy(buffer + 16, &server->addr.sin_port, 2);
+		len = 18;
+		break;
+
+	default:
+		len = 0;
+		printk(KERN_WARNING "NFS: Unknown network family '%d'\n",
+			server->addr.sin_family);
+		break;
+	}
+
+	return len;
+}
+
+/*
+ * the root index for the filesystem is defined by nfsd IP address and ports
+ */
+struct fscache_cookie_def nfs_cache_server_index_def = {
+	.name		= "NFS.servers",
+	.type 		= FSCACHE_COOKIE_TYPE_INDEX,
+	.get_key	= nfs_server_get_key,
+};
+
+static uint16_t nfs_fsctag_get_key(const void *cookie_netfs_data,
+		void *buffer, uint16_t bufmax)
+{
+	const struct nfs_server *server = cookie_netfs_data;
+	uint16_t len = 0;
+
+	len = server->fsctag.size;
+	memcpy(buffer, server->fsctag.buf, len);
+
+	return len;
+}
+
+/*
+ * the root index for the filesystem is defined by nfsd IP address and ports
+ */
+struct fscache_cookie_def nfs_fsctag_index_def = {
+	.name		= "NFS.fsctag",
+	.type 		= FSCACHE_COOKIE_TYPE_INDEX,
+	.get_key	= nfs_fsctag_get_key,
+};
+struct fscache_cookie_def nfs4_fsctag_index_def = {
+	.name		= "NFS4.fsctag",
+	.type 		= FSCACHE_COOKIE_TYPE_INDEX,
+	.get_key	= nfs_fsctag_get_key,
+};
+
+static uint16_t nfs_fh_get_key(const void *cookie_netfs_data,
+		void *buffer, uint16_t bufmax)
+{
+	const struct nfs_inode *nfsi = cookie_netfs_data;
+	uint16_t nsize;
+
+	/* set the file handle */
+	nsize = nfsi->fh.size;
+	memcpy(buffer, nfsi->fh.data, nsize);
+
+	return nsize;
+}
+
+/*
+ * indication of pages that now have cache metadata retained
+ * - this function should mark the specified pages as now being cached
+ */
+static void nfs_fh_mark_pages_cached(void *cookie_netfs_data,
+				     struct address_space *mapping,
+				     struct pagevec *cached_pvec)
+{
+	unsigned long loop;
+
+	dprintk("NFS: nfs_fh_mark_pages_cached: nfsi 0x%p pages %ld\n", 
+		cookie_netfs_data, cached_pvec->nr);
+
+	for (loop = 0; loop < cached_pvec->nr; loop++)
+		SetPagePrivate(cached_pvec->pages[loop]);
+
+	return;
+}
+
+/*
+ * indication the cookie is no longer uncached
+ * - this function is called when the backing store currently caching a cookie
+ *   is removed
+ * - the netfs should use this to clean up any markers indicating cached pages
+ * - this is mandatory for any object that may have data
+ */
+static void nfs_fh_now_uncached(void *cookie_netfs_data)
+{
+	struct nfs_inode *nfsi = cookie_netfs_data;
+	struct pagevec pvec;
+	pgoff_t first;
+	int loop, nr_pages;
+
+	pagevec_init(&pvec, 0);
+	first = 0;
+
+	dprintk("NFS: nfs_fh_now_uncached: nfs_inode 0x%p\n", nfsi);
+
+	for (;;) {
+		/* grab a bunch of pages to clean */
+		nr_pages = find_get_pages(nfsi->vfs_inode.i_mapping, first,
+					  PAGEVEC_SIZE, pvec.pages);
+		if (!nr_pages)
+			break;
+
+		for (loop = 0; loop < nr_pages; loop++)
+			ClearPagePrivate(pvec.pages[loop]);
+
+		first = pvec.pages[nr_pages - 1]->index + 1;
+
+		pvec.nr = nr_pages;
+		pagevec_release(&pvec);
+		cond_resched();
+	}
+}
+
+/*****************************************************************************/
+/*
+ * get certain file attributes from the netfs data
+ * - this function can be absent for an index
+ * - not permitted to return an error
+ * - the netfs data from the cookie being used as the source is
+ *   presented
+ */
+static void nfs_fh_get_attr(const void *cookie_netfs_data, uint64_t *size)
+{
+	const struct nfs_inode *nfsi = cookie_netfs_data;
+
+	*size = nfsi->vfs_inode.i_size;
+}
+
+/*****************************************************************************/
+/*
+ * get the auxilliary data from netfs data
+ * - this function can be absent if the index carries no state data
+ * - should store the auxilliary data in the buffer
+ * - should return the amount of amount stored
+ * - not permitted to return an error
+ * - the netfs data from the cookie being used as the source is
+ *   presented
+ */
+static uint16_t nfs_fh_get_aux(const void *cookie_netfs_data,
+			       void *buffer, uint16_t bufmax)
+{
+	struct nfs_fh_auxdata auxdata;
+	const struct nfs_inode *nfsi = cookie_netfs_data;
+
+	auxdata.i_size = nfsi->vfs_inode.i_size;
+	auxdata.i_mtime = nfsi->vfs_inode.i_mtime;
+	auxdata.i_ctime = nfsi->vfs_inode.i_ctime;
+
+	if (bufmax > sizeof(auxdata))
+		bufmax = sizeof(auxdata);
+
+	memcpy(buffer, &auxdata, bufmax);
+	return bufmax;
+}
+
+/*****************************************************************************/
+/*
+ * consult the netfs about the state of an object
+ * - this function can be absent if the index carries no state data
+ * - the netfs data from the cookie being used as the target is
+ *   presented, as is the auxilliary data
+ */
+static fscache_checkaux_t nfs_fh_check_aux(void *cookie_netfs_data,
+					   const void *data, uint16_t datalen)
+{
+	struct nfs_fh_auxdata auxdata;
+	struct nfs_inode *nfsi = cookie_netfs_data;
+
+	if (datalen > sizeof(auxdata))
+		return FSCACHE_CHECKAUX_OBSOLETE;
+
+	auxdata.i_size = nfsi->vfs_inode.i_size;
+	auxdata.i_mtime = nfsi->vfs_inode.i_mtime;
+	auxdata.i_ctime = nfsi->vfs_inode.i_ctime;
+
+	if (memcmp(data, &auxdata, datalen) != 0)
+		return FSCACHE_CHECKAUX_OBSOLETE;
+
+	return FSCACHE_CHECKAUX_OKAY;
+}
+
+/*
+ * the primary index for each server is simply made up of a series of NFS file
+ * handles
+ */
+struct fscache_cookie_def nfs_cache_fh_index_def = {
+	.name			= "NFS.fh",
+	.type			= FSCACHE_COOKIE_TYPE_DATAFILE,
+	.get_key		= nfs_fh_get_key,
+	.get_attr		= nfs_fh_get_attr,
+	.get_aux		= nfs_fh_get_aux,
+	.check_aux		= nfs_fh_check_aux,
+	.mark_pages_cached	= nfs_fh_mark_pages_cached,
+	.now_uncached		= nfs_fh_now_uncached,
+};
+
+int nfs_load_fsctag(const char *tag, struct nfs_server *server)
+{
+	struct user_key_payload *payload;
+	struct key *key;
+	int plen = 0;
+	char *mntpt = NULL;
+
+	server->fsctag.size = 0;
+	server->fsctag.buf = NULL;
+
+	key = request_key(&key_type_user, tag, NULL);
+	if (IS_ERR(key)) {
+		dprintk("NFS: request_key failed: %ld\n", PTR_ERR(key));
+		return plen;
+	}
+	rcu_read_lock();
+	payload = key->payload.data;
+	if (payload) {
+		plen = payload->datalen;
+		if (plen) {
+			if ((mntpt = kmalloc(plen, GFP_KERNEL)))
+				memcpy(mntpt, payload->data, plen);
+		}
+	}
+	rcu_read_unlock();
+	if (plen && mntpt) {
+		server->fsctag.size = plen;
+		server->fsctag.buf = mntpt;
+	}
+	return plen;
+}
--- linux-2.6.16.noarch/fs/nfs/read.c.fsnfs	2006-06-07 13:06:23.030020000 -0400
+++ linux-2.6.16.noarch/fs/nfs/read.c	2006-06-07 13:53:38.311845000 -0400
@@ -27,11 +27,14 @@
 #include <linux/sunrpc/clnt.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfs_page.h>
+#include <linux/nfs_mount.h>
 #include <linux/smp_lock.h>
 
+
 #include <asm/system.h>
 
 #include "iostat.h"
+#include "fscache.h"
 
 #define NFSDBG_FACILITY		NFSDBG_PAGECACHE
 
@@ -104,6 +107,53 @@ int nfs_return_empty_page(struct page *p
 	return 0;
 }
 
+#ifdef CONFIG_NFS_FSCACHE
+/*
+ * store a newly fetched page in fscache
+ */
+static void
+nfs_readpage_to_fscache_complete(struct page *page, void *data, int error)
+{
+	dfprintk(FSCACHE, 
+		"NFS:     readpage_to_fscache_complete (p:%p(i:%lx f:%lx)/%d)\n", 
+		page, page->index, page->flags, error);
+
+	end_page_fs_misc(page);
+}
+
+static inline void
+nfs_readpage_to_fscache(struct inode *inode, struct page *page, int sync)
+{
+	int ret;
+
+	dfprintk(FSCACHE, "NFS: readpage_to_fscache(fsc:%p/p:%p(i:%lx f:%lx)/%d)\n",
+		NFS_I(inode)->fscache, page, page->index, page->flags, sync);
+
+	if (TestSetPageFsMisc(page))
+		BUG();
+	ret = fscache_write_page(NFS_I(inode)->fscache, page,
+		nfs_readpage_to_fscache_complete, NULL, GFP_KERNEL);
+	dfprintk(FSCACHE, 
+		"NFS:     readpage_to_fscache: p:%p(i:%lu f:%lx) ret %d\n", 
+			page, page->index, page->flags, ret);
+	if (ret != 0) {
+		fscache_uncache_page(NFS_I(inode)->fscache, page);
+		nfs_fscache_uncache_page++;
+		ClearPagePrivate(page);
+		end_page_fs_misc(page);
+		nfs_fscache_to_error = ret;
+	} else
+		nfs_fscache_to_pages++;
+}
+#else
+static inline void
+nfs_readpage_to_fscache(struct inode *inode, struct page *page, int sync)
+{
+	BUG();
+}
+#endif
+
+
 /*
  * Read a page synchronously.
  */
@@ -184,6 +234,14 @@ static int nfs_readpage_sync(struct nfs_
 		ClearPageError(page);
 	result = 0;
 
+#ifdef CONFIG_NFS_FSCACHE
+	if (PagePrivate(page))
+		nfs_readpage_to_fscache(inode, page, 1);
+#endif
+	unlock_page(page);
+
+	return result;
+
 io_error:
 	unlock_page(page);
 	nfs_readdata_free(rdata);
@@ -215,6 +273,12 @@ static int nfs_readpage_async(struct nfs
 
 static void nfs_readpage_release(struct nfs_page *req)
 {
+#ifdef CONFIG_NFS_FSCACHE
+	struct inode *d_inode = req->wb_context->dentry->d_inode;
+
+	if (PagePrivate(req->wb_page) && PageUptodate(req->wb_page))
+		nfs_readpage_to_fscache(d_inode, req->wb_page, 0);
+#endif
 	unlock_page(req->wb_page);
 
 	dprintk("NFS: read done (%s/%Ld %d@%Ld)\n",
@@ -538,6 +602,118 @@ int nfs_readpage_result(struct rpc_task 
 	return 0;
 }
 
+
+/*
+ * Read a page through the on-disc cache if possible
+ */
+#ifdef CONFIG_NFS_FSCACHE
+static void
+nfs_readpage_from_fscache_complete(struct page *page, void *data, int error)
+{
+	dfprintk(FSCACHE, 
+		"NFS: readpage_from_fscache_complete (0x%p/0x%p/%d)\n",
+		page, data, error);
+
+	if (error)
+		SetPageError(page);
+	else
+		SetPageUptodate(page);
+
+	unlock_page(page);
+}
+
+static inline int
+nfs_readpage_from_fscache(struct inode *inode, struct page *page)
+{
+	int ret;
+
+	if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_FSCACHE))
+		return 1;
+
+	dfprintk(FSCACHE, 
+		"NFS: readpage_from_fscache(fsc:%p/p:%p(i:%lx f:%lx)/0x%p)\n",
+		NFS_I(inode)->fscache, page, page->index, page->flags, inode);
+
+	ret = fscache_read_or_alloc_page(NFS_I(inode)->fscache,
+					 page,
+					 nfs_readpage_from_fscache_complete,
+					 NULL,
+					 GFP_KERNEL);
+
+	switch (ret) {
+	case 0: /* read BIO submitted (page in fscache) */
+		dfprintk(FSCACHE, 
+			"NFS:    readpage_from_fscache: BIO submitted\n");
+		nfs_fscache_from_pages++;
+		return ret;
+
+	case -ENOBUFS: /* inode not in cache */
+	case -ENODATA: /* page not in cache */
+		dfprintk(FSCACHE, 
+			"NFS:    readpage_from_fscache error %d\n", ret);
+		return 1;
+
+	default:
+		dfprintk(FSCACHE, "NFS:    readpage_from_fscache %d\n", ret);
+		nfs_fscache_from_error = ret;
+	}
+    return ret;
+}
+
+static inline
+int nfs_getpages_from_fscache(struct inode *inode,
+	struct address_space *mapping,
+	struct list_head *pages,
+	unsigned *nr_pages)
+{
+	int ret, npages = *nr_pages;
+
+	if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_FSCACHE))
+		return 1;
+
+	dfprintk(FSCACHE, 
+		"NFS: nfs_getpages_from_fscache (0x%p/%u/0x%p)\n",
+		NFS_I(inode)->fscache, *nr_pages, inode);
+
+	ret = fscache_read_or_alloc_pages(NFS_I(inode)->fscache,
+	  	mapping, pages, nr_pages, 
+	  	nfs_readpage_from_fscache_complete,
+	  	NULL, mapping_gfp_mask(mapping));
+
+
+	switch (ret) {
+	case 0: /* read BIO submitted (page in fscache) */
+		BUG_ON(!list_empty(pages));
+		BUG_ON(*nr_pages != 0);
+		dfprintk(FSCACHE, 
+			"NFS: nfs_getpages_from_fscache: BIO submitted\n");
+
+		nfs_fscache_from_pages += npages;
+		return ret;
+
+	case -ENOBUFS: /* inode not in cache */
+	case -ENODATA: /* page not in cache */
+		dfprintk(FSCACHE, 
+			"NFS: nfs_getpages_from_fscache: no page: %d\n", ret);
+		return 1;
+
+	default:
+		dfprintk(FSCACHE, 
+			"NFS: nfs_getpages_from_fscache: ret  %d\n", ret);
+		nfs_fscache_from_error = ret;
+	}
+
+	return ret;
+}
+#else
+static inline
+int nfs_getpages_from_fscache(struct inode *inode,
+	struct address_space *mapping,
+	struct list_head *pages,
+	unsigned *nr_pages)
+{ return 1; }
+#endif
+
 /*
  * Read a page over NFS.
  * We read the page synchronously in the following case:
@@ -574,6 +750,15 @@ int nfs_readpage(struct file *file, stru
 		ctx = get_nfs_open_context((struct nfs_open_context *)
 				file->private_data);
 	if (!IS_SYNC(inode)) {
+#ifdef CONFIG_NFS_FSCACHE
+		error = nfs_readpage_from_fscache(inode, page);
+#if 0
+		if (error < 0)
+			goto out_error;
+#endif
+		if (error == 0)
+			goto out;
+#endif
 		error = nfs_readpage_async(ctx, inode, page);
 		goto out;
 	}
@@ -604,6 +789,7 @@ readpage_async_filler(void *data, struct
 	unsigned int len;
 
 	nfs_wb_page(inode, page);
+
 	len = nfs_page_length(inode, page);
 	if (len == 0)
 		return nfs_return_empty_page(page);
@@ -636,6 +822,15 @@ int nfs_readpages(struct file *filp, str
 			nr_pages);
 	nfs_inc_stats(inode, NFSIOS_VFSREADPAGES);
 
+#ifdef CONFIG_NFS_FSCACHE
+	/* attempt to read as many of the pages as possible from the cache
+	 * - this returns -ENOBUFS immediately if the cookie is negative
+	 */
+	ret = nfs_getpages_from_fscache(inode, mapping, pages, &nr_pages);
+	if (ret == 0)
+		return ret; /* all read */
+#endif
+
 	if (filp == NULL) {
 		desc.ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
 		if (desc.ctx == NULL)
@@ -677,3 +872,48 @@ void nfs_destroy_readpagecache(void)
 	if (kmem_cache_destroy(nfs_rdata_cachep))
 		printk(KERN_INFO "nfs_read_data: not all structures were freed\n");
 }
+
+#ifdef CONFIG_NFS_FSCACHE
+void nfs_invalidatepage(struct page *page, unsigned long offset)
+{
+	BUG_ON(!PageLocked(page));
+
+	if (PagePrivate(page)) {
+		struct nfs_inode *nfsi = NFS_I(page->mapping->host);
+
+		//BUG_ON(nfsi->fscache == NULL);
+
+		dfprintk(FSCACHE,
+			"NFS: fscache invalidatepage (0x%p/0x%p/0x%p)\n",
+			 nfsi->fscache, page, nfsi);
+
+		if (offset == 0) {
+			BUG_ON(!PageLocked(page));
+			if (!PageWriteback(page))
+				page->mapping->a_ops->releasepage(page, 0);
+		}
+	}
+
+	return;
+}
+int nfs_releasepage(struct page *page, gfp_t gfp_flags)
+{
+	struct nfs_inode *nfsi = NFS_I(page->mapping->host);
+
+	//BUG_ON(nfsi->fscache == NULL);
+
+	dfprintk(FSCACHE, "NFS: fscache releasepage (0x%p/0x%p/0x%p)\n",
+		 nfsi->fscache, page, nfsi);
+
+	wait_on_page_fs_misc(page);
+	fscache_uncache_page(nfsi->fscache, page);
+	nfs_fscache_uncache_page++;
+	ClearPagePrivate(page);
+	return 0;
+}
+int nfs_mkwrite(struct page *page)
+{
+	wait_on_page_fs_misc(page);
+	return 0;
+}
+#endif
--- linux-2.6.16.noarch/fs/nfs/sysctl.c.fsnfs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/fs/nfs/sysctl.c	2006-06-07 13:53:57.413321000 -0400
@@ -14,6 +14,7 @@
 #include <linux/nfs_idmap.h>
 
 #include "callback.h"
+#include "fscache.h"
 
 static const int nfs_set_port_min = 0;
 static const int nfs_set_port_max = 65535;
@@ -46,6 +47,48 @@ static ctl_table nfs_cb_sysctls[] = {
 		.strategy = &sysctl_jiffies,
 	},
 #endif
+#ifdef CONFIG_NFS_FSCACHE
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_from_error",
+		.data = &nfs_fscache_from_error,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_to_error",
+		.data = &nfs_fscache_to_error,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_uncache_page",
+		.data = &nfs_fscache_uncache_page,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_to_pages",
+		.data = &nfs_fscache_to_pages,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec_minmax,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_from_pages",
+		.data = &nfs_fscache_from_pages,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+#endif
 	{ .ctl_name = 0 }
 };
 
--- linux-2.6.16.noarch/fs/nfs/write.c.fsnfs	2006-06-07 13:06:23.054020000 -0400
+++ linux-2.6.16.noarch/fs/nfs/write.c	2006-06-07 13:13:18.274396000 -0400
@@ -429,7 +429,7 @@ static int nfs_inode_add_request(struct 
 		if (nfs_have_delegation(inode, FMODE_WRITE))
 			nfsi->change_attr++;
 	}
-	SetPagePrivate(req->wb_page);
+	nfs_setwriting(req->wb_page);
 	nfsi->npages++;
 	atomic_inc(&req->wb_count);
 	return 0;
@@ -446,7 +446,7 @@ static void nfs_inode_remove_request(str
 	BUG_ON (!NFS_WBACK_BUSY(req));
 
 	spin_lock(&nfsi->req_lock);
-	ClearPagePrivate(req->wb_page);
+	nfs_clearwriting(req->wb_page);
 	radix_tree_delete(&nfsi->nfs_page_tree, req->wb_index);
 	nfsi->npages--;
 	if (!nfsi->npages) {
--- linux-2.6.16.noarch/fs/nfs/pagelist.c.fsnfs	2006-06-07 13:06:23.000020000 -0400
+++ linux-2.6.16.noarch/fs/nfs/pagelist.c	2006-06-07 13:13:18.299395000 -0400
@@ -85,7 +85,7 @@ nfs_create_request(struct nfs_open_conte
 	atomic_set(&req->wb_complete, 0);
 	req->wb_index	= page->index;
 	page_cache_get(page);
-	BUG_ON(PagePrivate(page));
+	BUG_ON(nfs_writing(page));
 	BUG_ON(!PageLocked(page));
 	BUG_ON(page->mapping->host != inode);
 	req->wb_offset  = offset;
--- /dev/null	2006-06-07 07:14:18.564562589 -0400
+++ linux-2.6.16.noarch/fs/nfs/fscache.h	2006-06-07 13:13:18.640395000 -0400
@@ -0,0 +1,244 @@
+/* nfs_fscache.h: NFS filesystem cache interface definitions
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells at redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _NFS_FSCACHE_H
+#define _NFS_FSCACHE_H
+
+#include <linux/nfs_fs.h>
+#include <linux/nfs_mount.h>
+#include <linux/nfs4_mount.h>
+
+#ifdef CONFIG_NFS_FSCACHE
+#include <linux/fscache.h>
+
+extern struct fscache_netfs nfs_cache_netfs;
+extern struct fscache_cookie_def nfs_cache_server_index_def;
+extern struct fscache_cookie_def nfs_fsctag_index_def;
+extern struct fscache_cookie_def nfs_cache_fh_index_def;
+extern struct fscache_cookie_def nfs4_fsctag_index_def;
+
+extern void nfs_invalidatepage(struct page *, unsigned long);
+extern int nfs_releasepage(struct page *, gfp_t);
+extern int nfs_mkwrite(struct page *);
+extern int nfs_load_fsctag(const char *tag, struct nfs_server *server);
+
+extern int nfs_fscache_to_pages;
+extern int nfs_fscache_from_pages;
+extern int nfs_fscache_uncache_page;
+extern int nfs_fscache_from_error;
+extern int nfs_fscache_to_error;
+
+static inline void
+nfs_set_fscsize(struct nfs_server *server, 
+	struct nfs_inode *nfsi, loff_t i_size)
+{
+	if (!(server->flags & NFS_MOUNT_FSCACHE))
+		return;
+
+	fscache_set_i_size(nfsi->fscache, i_size);
+
+	return;
+}
+static inline void
+nfs_renew_fscookie(struct nfs_server *server, struct nfs_inode *nfsi)
+{
+	struct fscache_cookie *old =  nfsi->fscache;
+
+	if (!(server->flags & NFS_MOUNT_FSCACHE)) {
+		nfsi->fscache = NULL;
+		return;
+	}
+
+	/* retire the current fscache cache and get a new one */
+	fscache_relinquish_cookie(nfsi->fscache, 1);
+	nfsi->fscache = fscache_acquire_cookie(server->fscache, 
+		&nfs_cache_fh_index_def, nfsi);
+	fscache_set_i_size(nfsi->fscache, nfsi->vfs_inode.i_size);
+
+	dfprintk(FSCACHE,
+		"NFS: revalidation new cookie (0x%p/0x%p/0x%p/0x%p)\n",
+		server, nfsi, old, nfsi->fscache);
+
+	return;
+}
+
+static inline void nfs4_fill_fscookie(struct super_block *sb)
+{
+	struct nfs_server *server = NFS_SB(sb);
+
+	if (!(server->flags & NFS4_MOUNT_FSCACHE)) {
+		server->fscache = NULL;
+		return;
+	}
+	server->fscache = NULL;
+	if (nfs_load_fsctag("mount:nfs4:fsctag", server)) {
+		/* create a cache index for looking up filehandles */
+		server->fscache = fscache_acquire_cookie(nfs_cache_netfs.primary_index,
+				&nfs4_fsctag_index_def, server);
+	}
+
+	if (server->fscache == NULL) {
+		printk(KERN_WARNING "NFS4: No Fscache cookie. Turning "
+				"Fscache off!\n");
+	} else {
+		/* reuse the NFS mount option */
+		server->flags |= NFS_MOUNT_FSCACHE;
+	}
+
+	dfprintk(FSCACHE,"NFS: nfs4 cookie (0x%p,0x%p/0x%p)\n",
+		sb, server, server->fscache);
+
+	return;
+}
+
+static inline void nfs_fill_fscookie(struct super_block *sb)
+{
+	struct nfs_server *server = NFS_SB(sb);
+
+	if (!(server->flags & NFS_MOUNT_FSCACHE)) {
+		server->fscache = NULL;
+		return;
+	}
+
+	server->fscache = NULL;
+	if (nfs_load_fsctag("mount:nfs:fsctag", server)) {
+		/* create a cache index for looking up filehandles */
+		server->fscache = fscache_acquire_cookie(nfs_cache_netfs.primary_index,
+				&nfs_fsctag_index_def, server);
+	}
+	if (server->fscache == NULL) {
+		server->flags &= ~NFS_MOUNT_FSCACHE;
+		printk(KERN_WARNING "NFS: No Fscache cookie. Turning "
+			"Fscache off!\n");
+	}
+
+	dfprintk(FSCACHE,"NFS: server cookie (0x%p/0x%p/0x%p)\n",
+		sb, server, server->fscache);
+
+	return;
+}
+
+static inline void
+nfs_fhget_fscookie(struct super_block *sb, struct nfs_inode *nfsi)
+{
+	struct nfs_server *server = NFS_SB(sb);
+
+	if (!(server->flags & NFS_MOUNT_FSCACHE)) {
+		nfsi->fscache = NULL;
+		return;
+	}
+
+	nfsi->fscache = fscache_acquire_cookie(server->fscache, 
+		&nfs_cache_fh_index_def, nfsi);
+	if (server->fscache == NULL)
+		printk(KERN_WARNING "NFS: NULL FScache cookie: "
+				"sb 0x%p nfsi 0x%p\n", sb, nfsi);
+	fscache_set_i_size(nfsi->fscache, nfsi->vfs_inode.i_size);
+
+	dfprintk(FSCACHE, "NFS: fhget new cookie (0x%p/0x%p/0x%p)\n",
+		sb, nfsi, nfsi->fscache);
+
+	return;
+}
+
+static inline void nfs_kill_fscookie(struct nfs_server *server)
+{
+	if (!(server->flags & NFS_MOUNT_FSCACHE))
+		return;
+
+	dfprintk(FSCACHE,"NFS: killing cookie (0x%p/0x%p)\n",
+		server, server->fscache);
+
+	fscache_relinquish_cookie(server->fscache, 0);
+	server->fscache = NULL;
+
+	return;
+}
+
+static inline void nfs_clear_fscookie(
+	struct nfs_server *server, struct nfs_inode *nfsi)
+{
+	if (!(server->flags & NFS_MOUNT_FSCACHE))
+		return;
+
+	dfprintk(FSCACHE, "NFS: clear cookie (0x%p/0x%p)\n",
+			nfsi, nfsi->fscache);
+
+	fscache_relinquish_cookie(nfsi->fscache, 0);
+	nfsi->fscache = NULL;
+
+	return;
+}
+
+static inline void nfs_zap_fscookie(
+	struct nfs_server *server, struct nfs_inode *nfsi)
+{
+	if (!(server->flags & NFS_MOUNT_FSCACHE))
+		return;
+
+	dfprintk(FSCACHE,"NFS: zapping cookie (0x%p/0x%p)\n",
+		nfsi, nfsi->fscache);
+
+	fscache_relinquish_cookie(nfsi->fscache, 1);
+	nfsi->fscache = NULL;
+
+	return;
+}
+
+static inline void nfs_set_fscache(struct inode *inode, int cache_on)
+{
+	if (!cache_on && NFS_I(inode)->fscache) {
+		dfprintk(FSCACHE, 
+			"NFS: nfsi 0x%p turning cache off\n", NFS_I(inode));
+		/*
+		 * Need to invalided any mapped pages that were
+		 * read in before turning off the cache. 
+		 */
+		if (inode->i_mapping && inode->i_mapping->nrpages)
+			invalidate_inode_pages2(inode->i_mapping);
+
+		nfs_zap_fscookie(NFS_SERVER(inode), NFS_I(inode));
+	}
+
+	return;
+}
+
+static inline int nfs_register_netfs(void)
+{
+	int err;
+
+	err = fscache_register_netfs(&nfs_cache_netfs);
+
+	return err;
+}
+
+static inline void nfs_unregister_netfs(void)
+{
+	fscache_unregister_netfs(&nfs_cache_netfs);
+
+	return;
+}
+#else
+static inline void nfs_set_fscsize(struct nfs_server *server, struct nfs_inode *nfsi, loff_t i_size) {}
+static inline void nfs_fill_fscookie(struct super_block *sb) {}
+static inline void nfs_fhget_fscookie(struct super_block *sb, struct nfs_inode *nfsi) {}
+static inline void nfs4_fill_fscookie(struct super_block *sb) {}
+static inline void nfs_kill_fscookie(struct nfs_server *server) {}
+static inline void nfs_clear_fscookie(struct nfs_server *server, struct nfs_inode *nfsi) {}
+static inline void nfs_zap_fscookie(struct nfs_server *server, struct nfs_inode *nfsi) {}
+static inline void nfs_set_fscache(struct inode *inode, int cache_on) {}
+static inline void
+	nfs_renew_fscookie(struct nfs_server *server, struct nfs_inode *nfsi) {}
+static inline int nfs_register_netfs(void) { return 0; }
+static inline void nfs_unregister_netfs(void) {}
+
+#endif
+#endif /* _NFS_FSCACHE_H */
--- linux-2.6.16.noarch/fs/Kconfig.fsnfs	2006-06-07 13:07:25.320570000 -0400
+++ linux-2.6.16.noarch/fs/Kconfig	2006-06-07 13:13:18.315396000 -0400
@@ -1501,6 +1501,13 @@ config NFS_V4
 
 	  If unsure, say N.
 
+config NFS_FSCACHE
+	bool "Provide NFS client caching support (EXPERIMENTAL)"
+	depends on NFS_FS && FSCACHE && EXPERIMENTAL
+	help
+	  Say Y here if you want NFS data to be cached locally on disc through
+	  the general filesystem cache manager
+
 config NFS_DIRECTIO
 	bool "Allow direct I/O on NFS files (EXPERIMENTAL)"
 	depends on NFS_FS && EXPERIMENTAL
--- linux-2.6.16.noarch/include/linux/nfs_fs.h.fsnfs	2006-06-07 13:06:36.917371000 -0400
+++ linux-2.6.16.noarch/include/linux/nfs_fs.h	2006-06-07 13:13:18.451395000 -0400
@@ -29,6 +29,7 @@
 #include <linux/nfs_xdr.h>
 #include <linux/rwsem.h>
 #include <linux/mempool.h>
+#include <linux/fscache.h>
 
 /*
  * Enable debugging support for nfs client.
@@ -179,6 +180,9 @@ struct nfs_inode {
 	int			 delegation_state;
 	struct rw_semaphore	rwsem;
 #endif /* CONFIG_NFS_V4*/
+#ifdef CONFIG_NFS_FSCACHE
+	struct fscache_cookie	*fscache;
+#endif
 	struct inode		vfs_inode;
 };
 
@@ -563,6 +567,7 @@ extern void * nfs_root_data(void);
 #define NFSDBG_FILE		0x0040
 #define NFSDBG_ROOT		0x0080
 #define NFSDBG_CALLBACK		0x0100
+#define NFSDBG_FSCACHE		0x0200
 #define NFSDBG_ALL		0xFFFF
 
 #ifdef __KERNEL__
--- linux-2.6.16.noarch/include/linux/nfs_page.h.fsnfs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/include/linux/nfs_page.h	2006-06-07 13:13:18.695396000 -0400
@@ -32,6 +32,11 @@
 #define PG_NEED_COMMIT		1
 #define PG_NEED_RESCHED		2
 
+/*
+ * Valid bits for page->private
+ */
+#define PG_NFS_WRITING			0
+
 struct nfs_inode;
 struct nfs_page {
 	struct list_head	wb_list,	/* Defines state of page: */
@@ -160,4 +165,22 @@ loff_t req_offset(struct nfs_page *req)
 	return (((loff_t)req->wb_index) << PAGE_CACHE_SHIFT) + req->wb_offset;
 }
 
+static inline int
+nfs_writing(struct page *page)
+{
+	return test_bit(PG_NFS_WRITING, &page->private);
+}
+
+static inline void
+nfs_setwriting(struct page *page)
+{
+	set_bit(PG_NFS_WRITING, &page->private);
+}
+
+static inline void
+nfs_clearwriting(struct page *page)
+{
+	clear_bit(PG_NFS_WRITING, &page->private);
+}
+
 #endif /* _LINUX_NFS_PAGE_H */
--- linux-2.6.16.noarch/include/linux/nfs4_mount.h.fsnfs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/include/linux/nfs4_mount.h	2006-06-07 14:04:11.798645000 -0400
@@ -65,6 +65,7 @@ struct nfs4_mount_data {
 #define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
 #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
 #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
+#define NFS4_MOUNT_FSCACHE		0x4000	/* 1 */
 #define NFS4_MOUNT_FLAGMASK	0xFFFF
 
 #endif
--- linux-2.6.16.noarch/include/linux/nfs_fs_sb.h.fsnfs	2006-06-07 13:06:36.936372000 -0400
+++ linux-2.6.16.noarch/include/linux/nfs_fs_sb.h	2006-06-07 13:13:18.508395000 -0400
@@ -3,6 +3,7 @@
 
 #include <linux/list.h>
 #include <linux/backing-dev.h>
+#include <linux/fscache.h>
 
 struct nfs_iostats;
 
@@ -53,6 +54,14 @@ struct nfs_server {
 						   that are supported on this
 						   filesystem */
 #endif
+
+#ifdef CONFIG_NFS_FSCACHE
+	struct fscache_cookie	*fscache;	/* cache cookie */
+	struct {
+		uint16_t size;
+		void     *buf;
+	} fsctag;
+#endif
 };
 
 /* Server capabilities */
--- linux-2.6.16.noarch/include/linux/nfs_mount.h.fsnfs	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.noarch/include/linux/nfs_mount.h	2006-06-07 13:13:18.579396000 -0400
@@ -61,6 +61,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_NOACL		0x0800	/* 4 */
 #define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_FSCACHE	0x4000
 #define NFS_MOUNT_FLAGMASK	0xFFFF
 
 #endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2253
retrieving revision 1.2253.2.1
diff -u -r1.2253 -r1.2253.2.1
--- kernel-2.6.spec	6 Jun 2006 21:15:47 -0000	1.2253
+++ kernel-2.6.spec	8 Jun 2006 18:35:27 -0000	1.2253.2.1
@@ -26,7 +26,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6.fscache
 %define signmodules 0
 %define xen_version 20060602
 %define make_target bzImage
@@ -412,11 +412,25 @@
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 Patch2302: linux-2.6-cpufreq-acpi-sticky.patch
 
+# Cachefs Bits
+Patch7000: linux-2.6.17-cachefs-fsmisc.patch
+Patch7001: linux-2.6.17-cachefs-mkwrite.patch
+Patch7002: linux-2.6.17-cachefs-kfile.patch
+Patch7003: linux-2.6.17-cachefs-relpage.patch
+Patch7004: linux-2.6.17-fscache.patch
+Patch7005: linux-2.6.17-fscache-fedora.patch
+Patch7006: linux-2.6.17-cachefiles.patch
+Patch7007: linux-2.6.17-cachefiles-misc.patch
+Patch7008: linux-2.6.17-nfs-fscache.patch
+Patch7009: linux-2.6.17-afs-fscache.patch
+
+
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
 # Not patches you're too lazy for to put in the proper place.
 #
+Patch9000: linux-2.6.16-devel-klogger.patch
 
 Patch10000: linux-2.6-compile-fixes.patch
 
@@ -1074,6 +1088,20 @@
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
 #
+# Cachefs bits
+%patch7000 -p1
+%patch7001 -p1
+%patch7002 -p1
+%patch7003 -p1
+%patch7004 -p1
+%patch7005 -p1
+%patch7006 -p1
+%patch7007 -p1
+%patch7008 -p1
+%patch7009 -p1
+
+# klogger
+%patch9000 -p1
 
 #
 # final stuff
@@ -1774,6 +1802,9 @@
 %endif
 
 %changelog
+* Thu Jun  8 2006 Steve Dickson <steved at redhat.com>
+- Added cachefs bits to kernel-2_6_16-1_2253_FC6_fscache branch
+
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc6. Special 6/6/6 edition, what could go wrong?
 - Add a kdump kernel for PPC64 (Don Zickus)



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:47:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:47:36 -0400
Subject: rpms/eclipse/devel eclipse.spec, 1.274,
	1.275 eclipse-s390ands390x.patch, 1.9,
	NONE eclipse-s390ands390x2.patch, 1.3, NONE
Message-ID: <200606081847.k58IlaFc023033@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22825

Modified Files:
	eclipse.spec 
Removed Files:
	eclipse-s390ands390x.patch eclipse-s390ands390x2.patch 
Log Message:
- Enable s390 and s390x.
- Add small snippet to check for jars at the end of prep.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- eclipse.spec	7 Jun 2006 22:34:51 -0000	1.274
+++ eclipse.spec	8 Jun 2006 18:47:33 -0000	1.275
@@ -16,8 +16,6 @@
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
 %define libname         libswt3
-# FIXME do we need this?
-%define build_id        I20051206-0800
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -38,7 +36,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.2
+Release:        0jpp_0fc.3.2RC7.3
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -73,12 +71,6 @@
 Patch2:		%{name}-build.patch
 Patch4:		%{name}-libupdatebuild.patch
 Patch5:		%{name}-libupdatebuild2.patch
-# We can't really commit to doing builds for these arches upstream, but we
-# need at least eclipse-ecj to run on them as it's our bytecode compiler for
-# Fedora.
-Patch13:	%{name}-s390ands390x.patch
-# Stupid spaces in directories ...
-Patch14:	%{name}-s390ands390x2.patch
 # Build swttools.jar
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 Patch18: 	%{name}-swttools.patch
@@ -142,7 +134,6 @@
 
 
 %if %{gcj_support}
-ExcludeArch: s390 s390x ppc64
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
@@ -173,16 +164,20 @@
 BuildRequires:	java-devel >= 1.4.2
 %endif
 
-BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+#BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #BuildRequires: ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.28-1jpp
+#FIXME
+%ifnarch ppc64 s390 s390x
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: mx4j >= 2.1
 BuildRequires: tomcat5 >= 5.5.15
 BuildRequires: tomcat5-jasper >= 5.5.15
 BuildRequires: tomcat5-servlet-2.4-api >= 5.5.15
+%endif
 BuildRequires: lucene
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
@@ -238,15 +233,19 @@
 BuildRequires:    gtk2 >= 2.6
 Requires:         gtk2 >= 2.6
 
-Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+#Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #Requires: ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
+#FIXME
+%ifnarch ppc64 s390 s390x
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 Requires: mx4j >= 2.1
 Requires: tomcat5 >= 5.5.15
 Requires: tomcat5-jasper >= 5.5.15
 Requires: tomcat5-servlet-2.4-api >= 5.5.15
+%endif
 Requires: lucene 
 Requires: regexp
 
@@ -489,8 +488,8 @@
 rm plugins/org.apache.ant/lib/ant-antlrsrc.zip
 rm plugins/org.apache.ant/lib/ant-apache-bcel.jar
 rm plugins/org.apache.ant/lib/ant-apache-bcelsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant/lib/ant-apache-bsfsrc.zip
+#rm plugins/org.apache.ant/lib/ant-apache-bsf.jar
+#rm plugins/org.apache.ant/lib/ant-apache-bsfsrc.zip
 rm plugins/org.apache.ant/lib/ant-apache-log4j.jar
 rm plugins/org.apache.ant/lib/ant-apache-log4jsrc.zip
 rm plugins/org.apache.ant/lib/ant-apache-oro.jar
@@ -544,7 +543,7 @@
 # FIXME use build-jar-repository
 ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar
 ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar
-ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
+#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
 ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant/lib/ant-apache-log4j.jar
 ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-oro.jar
 ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
@@ -580,18 +579,15 @@
 rm plugins/org.apache.lucene/lucene-1.4.3-src.zip
 ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
 # END LUCENE ##
+
+# setup the jsch plugin build
 rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar
+# FIXME remove version number
 pushd baseLocation/plugins
-unzip -qq -d tmp %{_javadir}/jsch.jar
-unzip -qq -o -d tmp com.jcraft.jsch_*.jar -x com\*
+unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
 rm com.jcraft.jsch_*.jar
-pushd tmp
-sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF
-jar -cf ../com.jcraft.jsch_0.1.28.jar *
 popd
-rm -r tmp
-popd
-#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.28.jar
+
 ## BEGIN TOMCAT ##
 #rm plugins/org.eclipse.tomcat/commons-beanutils.jar
 #rm plugins/org.eclipse.tomcat/commons-collections.jar
@@ -644,30 +640,59 @@
 sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
 sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
+exit 1
+# nasty hack to get suppport for pcc64, s390 and s390x
+# we're basically just replacing the arch 
+%ifarch ppc64 s390 s390x
+  # there is only partial support for ppc64 in 3.2 so we have to remove this 
+  # partial support to get the replacemnt hack to work
+#  find -name \*ppc64\* | xargs rm -r
+  
+  # remove remove ppc64 support from features/org.eclipse.platform.source/feature.xml
+  # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
+#  find -name \*.xml -exec sed --in-place "s/rootFileslinux_gtk_ppc64/rootFileslinux_gtk_ppc128/g" "{}" \;
+  # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
+#  sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
+  # replace final occurances with an existing arch
+#  sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
+
+  # remove remove ppc64 support from features/org.eclipse.platform.source/feature.xml
+#  mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig
+#  grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml	
+
+  # finally the replacement hack
+  for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do 
+    mv $f $(echo $f | sed "s/ia64/%{_arch}/")
+  done
+  find -type f -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
+  find -type f -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \;
+  find -type f -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
+%endif 
 
-# FIXME enable
 # make sure there are no jars left
-#for j in $(find -name \*.jar); do
-#  if [ ! -L $j ]; then
-#    echo This jar should be deleted and syslinked to a system jar: $j
-#    exit 1
-#  fi
-#done
+JARS=""
+for j in $(find -name \*.jar); do
+  if [ ! -L $j ]; then
+    JARS="$JARS $j"
+  fi
+done
+if [ ! -z "$JARS" ]; then
+    echo "These jar should be deleted and syslinked to system jars: $JARS"
+   #FIXME anable  exit 1
+fi
 
 %build
 env
 ORIGCLASSPATH=$CLASSPATH
 
-# nasty hack to get these arches suppport
-%ifarch ppc4 s390 s390x
-  for f in $(find -name \*x86_64\*); do
-    mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
-  done
-  for f in $(find -name \*x86_64\*); do
-    mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
-  done
-  find -type f -exec sed --in-place "s/x86_64/%{_arch}/g" "{}" \;
-%endif 
+# finish the jsch plugin build
+#FIXME remove version numbers
+pushd baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
+unzip -qq %{_javadir}/jsch.jar -x META-INF\*
+sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF
+jar -cf ../com.jcraft.jsch_0.1.28.jar *
+popd
+rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
 
 # Bootstrapping is 3 parts:
 # 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
@@ -954,7 +979,7 @@
 ## BEGIN ANT ##
 rm plugins/org.apache.ant_*/lib/ant-antlr.jar
 rm plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
+#rm plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
 rm plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
 rm plugins/org.apache.ant_*/lib/ant-apache-oro.jar
 rm plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
@@ -983,7 +1008,7 @@
 # FIXME use build-jar-repository
 ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.6.5/lib/ant-antlr.jar
 ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bcel.jar
-ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bsf.jar
+#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bsf.jar
 ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-log4j.jar
 ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-oro.jar
 ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-regexp.jar
@@ -1569,6 +1594,10 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
 
 %changelog
+* Wed Jun 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.3
+- Enable s390 and s390x.
+- Add small snippet to check for jars at the end of prep.
+
 * Wed Jun 07 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.2
 - Fix eclipse-ecj.jar symlink to include qualifier.
 


--- eclipse-s390ands390x.patch DELETED ---


--- eclipse-s390ands390x2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:48:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:48:46 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.40,1.41
Message-ID: <200606081848.k58Imkxj013337@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10343

Modified Files:
	gnome-pilot.spec 
Log Message:
Add missing BR


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-pilot.spec	8 Jun 2006 17:22:20 -0000	1.40
+++ gnome-pilot.spec	8 Jun 2006 18:48:44 -0000	1.41
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 10
+Release: 11
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -37,7 +37,7 @@
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: gob2 >= 2.0.3
 BuildRequires: pilot-link-devel >= %{pilot_link_version}
-BuildRequires: gettext
+BuildRequires: gettext autoconf
 ExcludeArch: s390 s390x
 
 %description
@@ -151,8 +151,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-10
-- Add missing BR gettext
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-11
+- Add missing BR gettext, autoconf
 
 * Wed Apr 19 2006 Than Ngo <than at redhat.com> 2.0.13-9 
 - apply patch to fix crash with pilot-link 0.11.8 #189294



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:50:51 -0400
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.9,
	1.10
Message-ID: <200606081850.k58IopZx001463@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1449

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
change version numbers to differentiate between devel/FC6 and FC5


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iscsi-initiator-utils.spec	5 Jun 2006 17:50:57 -0000	1.9
+++ iscsi-initiator-utils.spec	8 Jun 2006 18:50:49 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 5.0.5.595
+Version: 6.0.5.595
 Release: 0
 Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:51:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:51:36 -0400
Subject: rpms/NetworkManager/FC-5 NetworkManager.spec,1.106,1.107
Message-ID: <200606081851.k58Ipaam001556@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1536

Modified Files:
	NetworkManager.spec 
Log Message:
Require gnome-keyring for NM-gnome package


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- NetworkManager.spec	8 Jun 2006 14:54:02 -0000	1.106
+++ NetworkManager.spec	8 Jun 2006 18:51:33 -0000	1.107
@@ -73,6 +73,7 @@
 Requires: hal >= %{hal_version}
 Requires: libnotify >= 0.3
 PreReq:  gtk2 >= %{gtk2_version}
+Requires: gnome-keyring
 
 %description gnome
 This package contains GNOME utilities and applications for use with



From fedora-cvs-commits at redhat.com  Thu Jun  8 18:51:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 14:51:44 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.109,1.110
Message-ID: <200606081851.k58Ipi7p001607@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1593

Modified Files:
	NetworkManager.spec 
Log Message:
Require gnome-keyring for NM-gnome package


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- NetworkManager.spec	29 May 2006 05:03:36 -0000	1.109
+++ NetworkManager.spec	8 Jun 2006 18:51:42 -0000	1.110
@@ -70,6 +70,7 @@
 Requires: hal >= %{hal_version}
 Requires: libnotify >= 0.3
 PreReq:  gtk2 >= %{gtk2_version}
+Requires: gnome-keyring
 
 %description gnome
 This package contains GNOME utilities and applications for use with



From fedora-cvs-commits at redhat.com  Thu Jun  8 19:01:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 15:01:00 -0400
Subject: rpms/iscsi-initiator-utils/devel .cvsignore, 1.7,
	1.8 iscsi-initiator-utils.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200606081901.k58J107U002658@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2624

Modified Files:
	.cvsignore iscsi-initiator-utils.spec sources 
Log Message:
update source for version update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Jun 2006 17:50:57 -0000	1.7
+++ .cvsignore	8 Jun 2006 19:00:44 -0000	1.8
@@ -1,3 +1,4 @@
 open-iscsi-5.0.4.446.tar.gz
 open-iscsi-5.0.5.476.tar.bz2
 open-iscsi-5.0.5.595.tar.bz2
+open-iscsi-6.0.5.595.tar.bz2


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- iscsi-initiator-utils.spec	8 Jun 2006 18:50:49 -0000	1.10
+++ iscsi-initiator-utils.spec	8 Jun 2006 19:00:45 -0000	1.11
@@ -2,7 +2,7 @@
 Name: iscsi-initiator-utils
 Version: 6.0.5.595
 Release: 0
-Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
+Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
 Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
 Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Jun 2006 17:50:57 -0000	1.7
+++ sources	8 Jun 2006 19:00:45 -0000	1.8
@@ -1 +1 @@
-0209e5ff0885eee23e3730c6328d8594  open-iscsi-5.0.5.595.tar.bz2
+2ec82582f551929fe1dfec578079d0bf  open-iscsi-6.0.5.595.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 19:00:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 15:00:58 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.41,1.42
Message-ID: <200606081900.k58J0wrg002653@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2616

Modified Files:
	gnome-pilot.spec 
Log Message:
Add missing BR


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-pilot.spec	8 Jun 2006 18:48:44 -0000	1.41
+++ gnome-pilot.spec	8 Jun 2006 19:00:43 -0000	1.42
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 11
+Release: 12
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -37,7 +37,7 @@
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: gob2 >= 2.0.3
 BuildRequires: pilot-link-devel >= %{pilot_link_version}
-BuildRequires: gettext autoconf
+BuildRequires: gettext autoconf automake
 ExcludeArch: s390 s390x
 
 %description
@@ -151,8 +151,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-11
-- Add missing BR gettext, autoconf
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-12
+- Add missing BR gettext, autoconf, automake
 
 * Wed Apr 19 2006 Than Ngo <than at redhat.com> 2.0.13-9 
 - apply patch to fix crash with pilot-link 0.11.8 #189294



From fedora-cvs-commits at redhat.com  Thu Jun  8 19:01:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 15:01:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2253.2.1,1.2253.2.2
Message-ID: <200606081901.k58J1XKg002737@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2642

Modified Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	kernel-2.6.spec 
Log Message:
Removed Kernel logging code



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2253.2.1
retrieving revision 1.2253.2.2
diff -u -r1.2253.2.1 -r1.2253.2.2
--- kernel-2.6.spec	8 Jun 2006 18:35:27 -0000	1.2253.2.1
+++ kernel-2.6.spec	8 Jun 2006 19:01:26 -0000	1.2253.2.2
@@ -430,8 +430,6 @@
 # amount of drivers they touch. But only these should go here.
 # Not patches you're too lazy for to put in the proper place.
 #
-Patch9000: linux-2.6.16-devel-klogger.patch
-
 Patch10000: linux-2.6-compile-fixes.patch
 
 # Little obvious 1-2 liners that fix silly bugs.
@@ -1100,9 +1098,6 @@
 %patch7008 -p1
 %patch7009 -p1
 
-# klogger
-%patch9000 -p1
-
 #
 # final stuff
 #



From fedora-cvs-commits at redhat.com  Thu Jun  8 19:20:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 15:20:55 -0400
Subject: rpms/memtest86+/devel memtest86+.spec,1.21,1.22
Message-ID: <200606081920.k58JKtkM032431@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/memtest86+/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32408

Modified Files:
	memtest86+.spec 
Log Message:
bump for brew


Index: memtest86+.spec
===================================================================
RCS file: /cvs/dist/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- memtest86+.spec	7 Feb 2006 12:56:33 -0000	1.21
+++ memtest86+.spec	8 Jun 2006 19:20:53 -0000	1.22
@@ -6,7 +6,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 1.65
-Release: 2.2
+Release: 3
 License: GPL
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -60,6 +60,9 @@
 /sbin/new-memtest-pkg --remove %{version}
 
 %changelog
+* Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 1.65-3
+- rebuilt for new buildsystem
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.65-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 19:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 15:45:42 -0400
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec,1.4,1.5
Message-ID: <200606081945.k58Jjger007695@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6808

Modified Files:
	icon-naming-utils.spec 
Log Message:
Rebuild



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icon-naming-utils.spec	10 May 2006 02:55:05 -0000	1.4
+++ icon-naming-utils.spec	8 Jun 2006 19:45:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           icon-naming-utils
 Version:        0.7.2
-Release:        1
+Release:        2
 Summary: 	A script to handle icon names in desktop icon themes
 
 Group:          Development/Tools/Other
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-XML-Simple
+BuildRequires:  automake
 Requires:       perl-XML-Simple
 
 Patch0:		icon-naming-utils-0.6.7-paths.patch
@@ -47,6 +48,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.2-2
+- Rebuild
+
 * Tue May  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.2-1
 - Update to 0.7.2
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:18:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:18:21 -0400
Subject: rpms/switchdesk/devel .cvsignore, 1.18, 1.19 sources, 1.20,
	1.21 switchdesk.spec, 1.30, 1.31
Message-ID: <200606082018.k58KILK9013087@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/switchdesk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13036

Modified Files:
	.cvsignore sources switchdesk.spec 
Log Message:
fix build problem in mock #194170




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/switchdesk/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 May 2006 15:33:45 -0000	1.18
+++ .cvsignore	8 Jun 2006 20:18:19 -0000	1.19
@@ -7,3 +7,4 @@
 switchdesk-4.0.8-3.tar.bz2
 switchdesk-4.0.8-4.tar.bz2
 switchdesk-4.0.8-5.tar.bz2
+switchdesk-4.0.8-6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/switchdesk/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	19 May 2006 16:05:14 -0000	1.20
+++ sources	8 Jun 2006 20:18:19 -0000	1.21
@@ -1 +1 @@
-146ed9753a463ff7dd864d086ac55dff  switchdesk-4.0.8-5.tar.bz2
+020d27b29a5f02875852d99ea83e38f6  switchdesk-4.0.8-6.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/dist/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- switchdesk.spec	19 May 2006 16:05:14 -0000	1.30
+++ switchdesk.spec	8 Jun 2006 20:18:19 -0000	1.31
@@ -3,7 +3,7 @@
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
 Version: 4.0.8
-Release: 5
+Release: 6
 Source: %{name}-%{version}-%{release}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
@@ -42,6 +42,7 @@
 %setup -q -n %{name}-%{version}-%{release}
 
 %build
+make
 
 %install
 rm -rf %{buildroot}
@@ -81,6 +82,9 @@
 %endif
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 4.0.8-6
+- fix build problem in mock #194170
+
 * Fri May 19 2006 Than Ngo <than at redhat.com> 4.0.8-5
 - add French translation, thanks to Alain PORTAL
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:23:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:23:31 -0400
Subject: rpms/nfs-utils/devel .cvsignore, 1.13,
	1.14 nfs-utils-1.0.8-compile.patch, 1.1, 1.2 nfs-utils.spec,
	1.85, 1.86 sources, 1.14, 1.15
Message-ID: <200606082023.k58KNVAL015217@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15158

Modified Files:
	.cvsignore nfs-utils-1.0.8-compile.patch nfs-utils.spec 
	sources 
Log Message:
Upgraded to the upstream 1.0.8.rc4 version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Jan 2006 20:17:59 -0000	1.13
+++ .cvsignore	8 Jun 2006 20:23:27 -0000	1.14
@@ -3,3 +3,4 @@
 libgssapi-0.7.tar.gz
 libnfsidmap-0.12.tar.gz
 nfs.doc.tar.gz
+nfs-utils-1.0.8-rc4.tar.gz

nfs-utils-1.0.8-compile.patch:
 Makefile.am          |    1 -
 aclocal/kerberos5.m4 |    2 ++
 configure.in         |    3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

Index: nfs-utils-1.0.8-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils-1.0.8-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.0.8-compile.patch	9 Jan 2006 20:22:16 -0000	1.1
+++ nfs-utils-1.0.8-compile.patch	8 Jun 2006 20:23:27 -0000	1.2
@@ -1,6 +1,6 @@
---- nfs-utils-1.0.8-rc2/aclocal/kerberos5.m4.orig	2005-12-19 23:12:43.000000000 -0500
-+++ nfs-utils-1.0.8-rc2/aclocal/kerberos5.m4	2006-01-06 14:35:59.523950000 -0500
-@@ -34,6 +34,8 @@ AC_DEFUN([AC_KERBEROS_V5],[
+--- nfs-utils-1.0.8-rc4/aclocal/kerberos5.m4.compile	2006-03-26 18:50:45.000000000 -0500
++++ nfs-utils-1.0.8-rc4/aclocal/kerberos5.m4	2006-06-08 15:56:28.778566000 -0400
+@@ -36,6 +36,8 @@ AC_DEFUN([AC_KERBEROS_V5],[
        AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
        if test -f $dir/include/gssapi/gssapi_krb5.h -a \
                  \( -f $dir/lib/libgssapi_krb5.a -o \
@@ -9,15 +9,18 @@
                     -f $dir/lib/libgssapi_krb5.so \) ; then
           AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
           KRBDIR="$dir"
---- nfs-utils-1.0.8-rc2/Makefile.am.orig	2006-01-06 14:35:35.649376000 -0500
-+++ nfs-utils-1.0.8-rc2/Makefile.am	2006-01-06 14:35:59.529951000 -0500
-@@ -47,4 +47,3 @@ install-data-hook:
- 	mkdir -p $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak
- 	touch $(DESTDIR)/$(statedir)/state
- 	chmod go-rwx $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state
--	chown $(statduser) $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state
---- nfs-utils-1.0.8-rc2/configure.in.orig	2005-12-20 01:04:18.000000000 -0500
-+++ nfs-utils-1.0.8-rc2/configure.in	2006-01-06 14:37:32.827182000 -0500
+--- nfs-utils-1.0.8-rc4/Makefile.am.compile	2006-03-27 19:53:30.000000000 -0500
++++ nfs-utils-1.0.8-rc4/Makefile.am	2006-06-08 15:56:46.168990000 -0400
+@@ -47,7 +47,6 @@ install-data-hook:
+ 	mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+ 	touch $(DESTDIR)$(statedir)/state
+ 	chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+-	chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+ 
+ uninstall-hook:
+ 	rm $(DESTDIR)$(statedir)/xtab
+--- nfs-utils-1.0.8-rc4/configure.in.compile	2006-06-08 15:55:11.716640000 -0400
++++ nfs-utils-1.0.8-rc4/configure.in	2006-06-08 15:56:28.792565000 -0400
 @@ -110,6 +110,9 @@ AC_ARG_ENABLE(rquotad,
  # Check whether user wants TCP wrappers support
  AC_TCP_WRAPPERS


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- nfs-utils.spec	11 Feb 2006 04:45:47 -0000	1.85
+++ nfs-utils.spec	8 Jun 2006 20:23:27 -0000	1.86
@@ -1,12 +1,12 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 1.0.8.rc2
-Release: 4.FC5.2
+Version: 1.0.8.rc4
+Release: 1.FC5
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8-rc2.tar.gz
+Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8-rc4.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
 Source10: nfs.init
@@ -18,12 +18,9 @@
 Patch50: nfs-utils-1.0.5-statdpath.patch
 Patch51: nfs-utils-1.0.6-mountd.patch
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
-Patch53: nfs-utils-1.0.7-rquotad-curblocks.patch
-Patch54: nfs-utils-1.0.7-mountd-stat64.patch
-Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch
-Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch
-Patch57: nfs-utils-1.0.8-rc2-innetgr.patch
-Patch58: nfs-utils-1.0.8-rc2-nfs4_setdebug.patch
+Patch53: nfs-utils-1.0.7-mountd-stat64.patch
+Patch54: nfs-utils-1.0.7-nfsd-ctlbits.patch
+Patch55: nfs-utils-1.0.8-rc2-innetgr.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -61,16 +58,13 @@
 clients which are mounted on that host.
 
 %prep
-%setup -q -n nfs-utils-1.0.8-rc2 -a1
+%setup -q -n nfs-utils-1.0.8-rc4 -a1
 %patch50 -p1 -b .statdpath
 %patch51 -p1 -b .mountd
 %patch52 -p1 -b .conf
-%patch53 -p1 -b .curblocks
-%patch54 -p1 -b .stat64
-%patch55 -p1 -b .ctlbits
-%patch56 -p1 -b .makeam
-%patch57 -p1 -b .innetgr
-%patch58 -p1 -b .setdebug
+%patch53 -p1 -b .stat64
+%patch54 -p1 -b .ctlbits
+%patch55 -p1 -b .innetgr
 
 # Do the magic to get things to compile
 %patch100 -p1 -b .compile
@@ -219,10 +213,15 @@
 /usr/sbin/rpc.idmapd
 /usr/sbin/rpc.gssd
 /usr/sbin/rpc.svcgssd
+/usr/sbin/gss_clnt_send_err
+/usr/sbin/gss_destroy_creds
 %{_mandir}/*/*
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Thu Jun  8 2006 <SteveD at RedHat.com> 1.0.8.rc4-1.FC5
+- Upgraded to the upstream 1.0.8.rc4 version
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8.rc2-4.FC5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2006 20:17:59 -0000	1.14
+++ sources	8 Jun 2006 20:23:27 -0000	1.15
@@ -1,2 +1,2 @@
-d0ce78b60ea88995350c9c3b4e4f9f5f  nfs-utils-1.0.8-rc2.tar.gz
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
+e4e25a41ee2b1ad49d2dd13777301ec5  nfs-utils-1.0.8-rc4.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:25:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:25:20 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.86,1.87
Message-ID: <200606082025.k58KPKsI015951@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15885

Modified Files:
	nfs-utils.spec 
Log Message:
Updated the Version



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- nfs-utils.spec	8 Jun 2006 20:23:27 -0000	1.86
+++ nfs-utils.spec	8 Jun 2006 20:25:18 -0000	1.87
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8.rc4
-Release: 1.FC5
+Release: 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -219,7 +219,7 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
-* Thu Jun  8 2006 <SteveD at RedHat.com> 1.0.8.rc4-1.FC5
+* Thu Jun  8 2006 <SteveD at RedHat.com> 1.0.8.rc4-1
 - Upgraded to the upstream 1.0.8.rc4 version
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8.rc2-4.FC5.2



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:26:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:26:32 -0400
Subject: rpms/switchdesk/devel switchdesk.spec,1.31,1.32
Message-ID: <200606082026.k58KQWkn016433@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/switchdesk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16369

Modified Files:
	switchdesk.spec 
Log Message:
BR gettext



Index: switchdesk.spec
===================================================================
RCS file: /cvs/dist/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- switchdesk.spec	8 Jun 2006 20:18:19 -0000	1.31
+++ switchdesk.spec	8 Jun 2006 20:26:30 -0000	1.32
@@ -10,6 +10,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: intltool
+BuildRequires: gettext
 
 %description
 The Desktop Switcher is a tool which enables users to easily switch



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:33:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:33:06 -0400
Subject: rpms/lrzsz/devel lrzsz.spec,1.16,1.17
Message-ID: <200606082033.k58KX6Nx018020@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/lrzsz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17988

Modified Files:
	lrzsz.spec 
Log Message:
BR on gettext



Index: lrzsz.spec
===================================================================
RCS file: /cvs/dist/rpms/lrzsz/devel/lrzsz.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lrzsz.spec	11 Feb 2006 04:25:22 -0000	1.16
+++ lrzsz.spec	8 Jun 2006 20:32:45 -0000	1.17
@@ -1,14 +1,15 @@
 Summary: The lrz and lsz modem communications programs.
 Name: lrzsz
 Version: 0.12.20
-Release: 21.2.1
+Release: 22
 License: GPL
 Group: Applications/Communications
 Source: http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
 Patch1: lrzsz-0.12.20-glibc21.patch
 Patch2: lrzsz-0.12.20.patch
 Url: http://www.ohse.de/uwe/software/lrzsz.html
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gettext
 
 %description
 Lrzsz (consisting of lrz and lsz) is a cosmetically modified
@@ -29,13 +30,13 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -43,6 +44,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 0.12.20-22
+- add BR on gettext #193513
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.12.20-21.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:35:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:35:39 -0400
Subject: rpms/libgssapi/devel .cvsignore, 1.4, 1.5 libgssapi.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200606082035.k58KZdZb018194@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18164

Modified Files:
	.cvsignore libgssapi.spec sources 
Log Message:
Upgraded to 0.9-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2006 01:24:14 -0000	1.4
+++ .cvsignore	8 Jun 2006 20:35:36 -0000	1.5
@@ -1 +1,2 @@
 libgssapi-0.7.tar.gz
+libgssapi-0.9.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgssapi.spec	13 Feb 2006 01:26:52 -0000	1.8
+++ libgssapi.spec	8 Jun 2006 20:35:36 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
-Version: 0.7
-Release: 3
+Version: 0.9
+Release: 1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
-Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.7.tar.gz
+Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.9.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Thu Jun  8 2006 Steve Dickson <steved at redhat.com>  0.9-1
+- Upgraded to 0.9-1 
+
 * Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
 - remove empty scripts
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2006 01:24:14 -0000	1.4
+++ sources	8 Jun 2006 20:35:36 -0000	1.5
@@ -1 +1 @@
-13979d132daf7dd5d3a591c08cd4979f  libgssapi-0.7.tar.gz
+6a71e2d1d0d865baee12f1a1aace0d6a  libgssapi-0.9.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:38:50 -0400
Subject: rpms/doxygen/devel doxygen.spec,1.40,1.41
Message-ID: <200606082038.k58KcoGN018665@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/doxygen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18612

Modified Files:
	doxygen.spec 
Log Message:
fix build problem in mock #193358



Index: doxygen.spec
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- doxygen.spec	12 May 2006 12:24:38 -0000	1.40
+++ doxygen.spec	8 Jun 2006 20:38:47 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.4.6
-Release: 4
+Release: 5
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -22,6 +22,9 @@
 BuildPrereq: libstdc++-devel
 BuildPrereq: perl
 BuildPrereq: tetex-dvips, tetex-latex, ghostscript
+BuildPrereq: gettext
+BuildPrereq: flex
+BuildPrereq: bison
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -102,6 +105,9 @@
 %endif
 
 %changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:1.4.6-5
+- fix build problem in mock #193358 
+
 * Fri May 12 2006 Than Ngo <than at redhat.com> 1:1.4.6-4
 - apply patch to fix Doxygen crash on empty file #191392 
 - html docs #187177 



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:42:11 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.19,1.20
Message-ID: <200606082042.k58KgBWC019955@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19926

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.0-4
- Add db-root-visual.patch to make root visual double buffered.



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-ati.spec	23 May 2006 19:12:00 -0000	1.19
+++ xorg-x11-drv-ati.spec	8 Jun 2006 20:42:09 -0000	1.20
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.0
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -23,6 +23,7 @@
 Source1:   ati.xinf
 Source2:   r128.xinf
 Source3:   radeon.xinf
+Patch0:    db-root-visual.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
@@ -41,6 +42,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p0 -b .db-root-visual
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -83,6 +86,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.0-4
+- Add db-root-visual.patch to make root visual double buffered.
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 6.6.0-3
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:43:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:43:16 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.20,1.21
Message-ID: <200606082043.k58KhGnY020427@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20402

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-5
- Bump for rawhide build.



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-ati.spec	8 Jun 2006 20:42:09 -0000	1.20
+++ xorg-x11-drv-ati.spec	8 Jun 2006 20:43:13 -0000	1.21
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.0
-Release:   4
+Release:   5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -86,7 +86,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.0-4
+* Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-5
+- Bump for rawhide build.
+
+* Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-4
 - Add db-root-visual.patch to make root visual double buffered.
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 6.6.0-3



From fedora-cvs-commits at redhat.com  Thu Jun  8 20:47:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 16:47:24 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.87,1.88
Message-ID: <200606082047.k58KlOi9004223@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3393

Modified Files:
	nfs-utils.spec 
Log Message:
added BuildRequires: automake



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- nfs-utils.spec	8 Jun 2006 20:25:18 -0000	1.87
+++ nfs-utils.spec	8 Jun 2006 20:47:21 -0000	1.88
@@ -39,6 +39,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
+BuildRequires: automake
 BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:12:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:12:33 -0400
Subject: rpms/gdm/FC-5 .cvsignore, 1.24, 1.25 gdm.spec, 1.150, 1.151 sources,
	1.28, 1.29
Message-ID: <200606082112.k58LCXCo010429@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10366

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
- Update to 2.14.8
- Fixes CVE-2006-2452 (bug 343476).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Mar 2006 23:11:59 -0000	1.24
+++ .cvsignore	8 Jun 2006 21:12:30 -0000	1.25
@@ -1 +1 @@
-gdm-2.14.0.tar.bz2
+gdm-2.14.8.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- gdm.spec	7 Jun 2006 15:37:56 -0000	1.150
+++ gdm.spec	8 Jun 2006 21:12:30 -0000	1.151
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.4
-Release: 1.fc5.3
+Version: 2.14.8
+Release: 1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -325,6 +325,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.8-1
+- Update to 2.14.8
+- Fixes CVE-2006-2452 (bug 343476).
+
 * Wed Jun  7 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.4-1.fc5.3
 - Add BuildRequires on xorg-x11-server-Xorg (bug 194295)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Apr 2006 05:27:35 -0000	1.28
+++ sources	8 Jun 2006 21:12:30 -0000	1.29
@@ -1 +1 @@
-04cbd92e0c264787328e3373da3ebc11  gdm-2.14.4.tar.bz2
+03ecfced7b4331542b35746f3b4b92a4  gdm-2.14.8.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:18:23 -0400
Subject: rpms/pam/devel pam.spec,1.117,1.118
Message-ID: <200606082118.k58LINJG027083@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26909

Modified Files:
	pam.spec 
Log Message:
- a typo 



Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- pam.spec	8 Jun 2006 18:44:01 -0000	1.117
+++ pam.spec	8 Jun 2006 21:18:21 -0000	1.118
@@ -83,9 +83,9 @@
 
 %prep
 %setup -q -n Linux-PAM-%{version} -a 2 -a 4
-cp %{SOURCE5}/other.pamd .
-cp %{SOURCE6}/system-auth.pamd .
-cp %{SOURCE7}/config-util.pamd .
+cp %{SOURCE5} .
+cp %{SOURCE6} .
+cp %{SOURCE7} .
 
 %patch1 -p1 -b .redhat-modules
 %patch21 -p1 -b .unix-hpux-aging



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:19:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:19:28 -0400
Subject: rpms/kernel/devel
	capabilities-over-netlink-in-permissive-mode.patch, NONE,
	1.1.4.1 linux-2.6-audit-git.patch, NONE,
	1.1.28.1 linux-2.6-audit-pending.patch, NONE,
	1.1.16.1 linux-2.6-net-label.patch, NONE,
	1.1.4.1 kernel-2.6.spec, 1.2255, 1.2255.2.1
Message-ID: <200606082119.k58LJSJs027516@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27448

Modified Files:
      Tag: private-lspp-35-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-35-branch
	capabilities-over-netlink-in-permissive-mode.patch 
	linux-2.6-audit-git.patch linux-2.6-audit-pending.patch 
	linux-2.6-net-label.patch 
Log Message:
* Thu Jun  8 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.35



capabilities-over-netlink-in-permissive-mode.patch:
 hooks.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE capabilities-over-netlink-in-permissive-mode.patch ---
>From dgoeddel at trustedcs.com Wed May 31 13:35:19 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 31 May 2006 13:35:52 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k4VHZqWc010601;
	Wed, 31 May 2006 13:35:52 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VHZp3j005299;
	Wed, 31 May 2006 13:35:51 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZk7i006383;
	Wed, 31 May 2006 13:35:46 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id E809472E6B; Wed, 31 May 2006 13:35:45 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k4VHZgTd027651 for <redhat-lspp at listman.util.phx.redhat.com>;
	Wed, 31 May 2006 13:35:42 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k4VHZfqq005281; Wed, 31 May 2006 13:35:41 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZZb3010500;
	Wed, 31 May 2006 13:35:35 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k4VHZRIl013520;
	Wed, 31 May 2006 13:35:27 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Wed May 31 13:35:21 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B447dd3d90000>; Wed, 31 May 2006 13:35:21 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id D34Q43ZG; Wed, 31 May 2006 13:35:20 -0400
Message-ID: <447DD3D7.4050200 at trustedcs.com>
Date: Wed, 31 May 2006 12:35:19 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Stephen Smalley <sds at epoch.ncsc.mil>,
 James Morris <jmorris at redhat.com>
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.82 
X-loop: redhat-lspp at redhat.com
Cc: redhat-lspp at redhat.com,
 "'SELinux List'" <SELinux at tycho.nsa.gov>
Subject: [redhat-lspp] [PATCH] fix masking of capabilities over netlink in
	permissive mode
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-Length: 5179
X-UID: 66725

I think I ran across the problem described in this thread:

http://www.redhat.com/archives/linux-audit/2006-May/msg00059.html

The process' effective capabilities are always being masked with the
allowed vector of the avc decision (for self against the capability
security class) in netlink's copy of the process capabilities (eff_cap).
The allowed vector takes on a slightly different role when SELinux
is not in enforcing mode - it starts to track used-but-not-normally-
permitted actions in the allowed vector.  That is what is causing
the first attempt to fail (the allowed vector has not been "inflated")
and the following attempts to succeed (the vector has been inflated in
response to its previous use).  Does my reasoning (and patch) seem to
be on track?




This patch removes the masking of capabilities passed over netlink
socket when SELinux is in enforcing mode.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>


diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 21dad41..c7650bb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3599,7 +3599,8 @@ static int selinux_netlink_send(struct s
 	avd.allowed = 0;
 	avc_has_perm_noaudit(tsec->sid, tsec->sid,
 				SECCLASS_CAPABILITY, ~0, &avd);
-	cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
+	if (selinux_enforcing)
+		cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
 
 	if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS)
 		err = selinux_nlmsg_perm(sk, skb);

-- 

Darrel

--
redhat-lspp mailing list
redhat-lspp at redhat.com
https://www.redhat.com/mailman/listinfo/redhat-lspp


linux-2.6-audit-git.patch:
 Documentation/filesystems/inotify.txt |  130 ++++
 fs/Kconfig                            |   24 
 fs/Makefile                           |    1 
 fs/exec.c                             |    6 
 fs/inotify.c                          |  991 +++++++++-------------------------
 fs/inotify_user.c                     |  719 ++++++++++++++++++++++++
 fs/proc/base.c                        |    5 
 include/linux/audit.h                 |   84 ++
 include/linux/fsnotify.h              |   29 
 include/linux/inotify.h               |  109 +++
 include/linux/sched.h                 |    2 
 init/Kconfig                          |    3 
 ipc/mqueue.c                          |   22 
 ipc/msg.c                             |    9 
 ipc/sem.c                             |    8 
 ipc/shm.c                             |    2 
 kernel/audit.c                        |  153 +++--
 kernel/audit.h                        |   55 +
 kernel/auditfilter.c                  |  837 ++++++++++++++++++++++++++--
 kernel/auditsc.c                      |  509 ++++++++++++++---
 kernel/signal.c                       |    2 
 kernel/sysctl.c                       |    4 
 kernel/user.c                         |    2 
 security/selinux/ss/services.c        |    2 
 24 files changed, 2746 insertions(+), 962 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/Documentation/filesystems/inotify.txt b/Documentation/filesystems/inotify.txt
index 6d50190..59a919f 100644
--- a/Documentation/filesystems/inotify.txt
+++ b/Documentation/filesystems/inotify.txt
@@ -69,17 +69,135 @@ Prototypes:
 	int inotify_rm_watch (int fd, __u32 mask);
 
 
-(iii) Internal Kernel Implementation
+(iii) Kernel Interface
 
-Each inotify instance is associated with an inotify_device structure.
+Inotify's kernel API consists a set of functions for managing watches and an
+event callback.
+
+To use the kernel API, you must first initialize an inotify instance with a set
+of inotify_operations.  You are given an opaque inotify_handle, which you use
+for any further calls to inotify.
+
+    struct inotify_handle *ih = inotify_init(my_event_handler);
+
+You must provide a function for processing events and a function for destroying
+the inotify watch.
+
+    void handle_event(struct inotify_watch *watch, u32 wd, u32 mask,
+    	              u32 cookie, const char *name, struct inode *inode)
+
+	watch - the pointer to the inotify_watch that triggered this call
+	wd - the watch descriptor
+	mask - describes the event that occurred
+	cookie - an identifier for synchronizing events
+	name - the dentry name for affected files in a directory-based event
+	inode - the affected inode in a directory-based event
+
+    void destroy_watch(struct inotify_watch *watch)
+
+You may add watches by providing a pre-allocated and initialized inotify_watch
+structure and specifying the inode to watch along with an inotify event mask.
+You must pin the inode during the call.  You will likely wish to embed the
+inotify_watch structure in a structure of your own which contains other
+information about the watch.  Once you add an inotify watch, it is immediately
+subject to removal depending on filesystem events.  You must grab a reference if
+you depend on the watch hanging around after the call.
+
+    inotify_init_watch(&my_watch->iwatch);
+    inotify_get_watch(&my_watch->iwatch);	// optional
+    s32 wd = inotify_add_watch(ih, &my_watch->iwatch, inode, mask);
+    inotify_put_watch(&my_watch->iwatch);	// optional
+
+You may use the watch descriptor (wd) or the address of the inotify_watch for
+other inotify operations.  You must not directly read or manipulate data in the
+inotify_watch.  Additionally, you must not call inotify_add_watch() more than
+once for a given inotify_watch structure, unless you have first called either
+inotify_rm_watch() or inotify_rm_wd().
+
+To determine if you have already registered a watch for a given inode, you may
+call inotify_find_watch(), which gives you both the wd and the watch pointer for
+the inotify_watch, or an error if the watch does not exist.
+
+    wd = inotify_find_watch(ih, inode, &watchp);
+
+You may use container_of() on the watch pointer to access your own data
+associated with a given watch.  When an existing watch is found,
+inotify_find_watch() bumps the refcount before releasing its locks.  You must
+put that reference with:
+
+    put_inotify_watch(watchp);
+
+Call inotify_find_update_watch() to update the event mask for an existing watch.
+inotify_find_update_watch() returns the wd of the updated watch, or an error if
+the watch does not exist.
+
+    wd = inotify_find_update_watch(ih, inode, mask);
+
+An existing watch may be removed by calling either inotify_rm_watch() or
+inotify_rm_wd().
+
+    int ret = inotify_rm_watch(ih, &my_watch->iwatch);
+    int ret = inotify_rm_wd(ih, wd);
+
+A watch may be removed while executing your event handler with the following:
+
+    inotify_remove_watch_locked(ih, iwatch);
+
+Call inotify_destroy() to remove all watches from your inotify instance and
+release it.  If there are no outstanding references, inotify_destroy() will call
+your destroy_watch op for each watch.
+
+    inotify_destroy(ih);
+
+When inotify removes a watch, it sends an IN_IGNORED event to your callback.
+You may use this event as an indication to free the watch memory.  Note that
+inotify may remove a watch due to filesystem events, as well as by your request.
+If you use IN_ONESHOT, inotify will remove the watch after the first event, at
+which point you may call the final inotify_put_watch.
+
+(iv) Kernel Interface Prototypes
+
+	struct inotify_handle *inotify_init(struct inotify_operations *ops);
+
+	inotify_init_watch(struct inotify_watch *watch);
+
+	s32 inotify_add_watch(struct inotify_handle *ih,
+		              struct inotify_watch *watch,
+			      struct inode *inode, u32 mask);
+
+	s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode,
+			       struct inotify_watch **watchp);
+
+	s32 inotify_find_update_watch(struct inotify_handle *ih,
+				      struct inode *inode, u32 mask);
+
+	int inotify_rm_wd(struct inotify_handle *ih, u32 wd);
+
+	int inotify_rm_watch(struct inotify_handle *ih,
+			     struct inotify_watch *watch);
+
+	void inotify_remove_watch_locked(struct inotify_handle *ih,
+					 struct inotify_watch *watch);
+
+	void inotify_destroy(struct inotify_handle *ih);
+
+	void get_inotify_watch(struct inotify_watch *watch);
+	void put_inotify_watch(struct inotify_watch *watch);
+
+
+(v) Internal Kernel Implementation
+
+Each inotify instance is represented by an inotify_handle structure.
+Inotify's userspace consumers also have an inotify_device which is
+associated with the inotify_handle, and on which events are queued.
 
 Each watch is associated with an inotify_watch structure.  Watches are chained
-off of each associated device and each associated inode.
+off of each associated inotify_handle and each associated inode.
 
-See fs/inotify.c for the locking and lifetime rules.
+See fs/inotify.c and fs/inotify_user.c for the locking and lifetime rules.
 
 
-(iv) Rationale
+(vi) Rationale
 
 Q: What is the design decision behind not tying the watch to the open fd of
    the watched object?
@@ -145,7 +263,7 @@ A: The poor user-space interface is the 
    file descriptor-based one that allows basic file I/O and poll/select.
    Obtaining the fd and managing the watches could have been done either via a
    device file or a family of new system calls.  We decided to implement a
-   family of system calls because that is the preffered approach for new kernel
+   family of system calls because that is the preferred approach for new kernel
    interfaces.  The only real difference was whether we wanted to use open(2)
    and ioctl(2) or a couple of new system calls.  System calls beat ioctls.
 
diff --git a/fs/Kconfig b/fs/Kconfig
index f9b5842..74f11a2 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -393,18 +393,30 @@ config INOTIFY
 	bool "Inotify file change notification support"
 	default y
 	---help---
-	  Say Y here to enable inotify support and the associated system
-	  calls.  Inotify is a file change notification system and a
-	  replacement for dnotify.  Inotify fixes numerous shortcomings in
-	  dnotify and introduces several new features.  It allows monitoring
-	  of both files and directories via a single open fd.  Other features
-	  include multiple file events, one-shot support, and unmount
+	  Say Y here to enable inotify support.  Inotify is a file change
+	  notification system and a replacement for dnotify.  Inotify fixes
+	  numerous shortcomings in dnotify and introduces several new features
+	  including multiple file events, one-shot support, and unmount
 	  notification.
 
 	  For more information, see Documentation/filesystems/inotify.txt
 
 	  If unsure, say Y.
 
+config INOTIFY_USER
+	bool "Inotify support for userspace"
+	depends on INOTIFY
+	default y
+	---help---
+	  Say Y here to enable inotify support for userspace, including the
+	  associated system calls.  Inotify allows monitoring of both files and
+	  directories via a single open fd.  Events are read from the file
+	  descriptor, which is also select()- and poll()-able.
+
+	  For more information, see Documentation/filesystems/inotify.txt
+
+	  If unsure, say Y.
+
 config QUOTA
 	bool "Quota support"
 	help
diff --git a/fs/Makefile b/fs/Makefile
index 078d3d1..d0ea6bf 100644
--- a/fs/Makefile
+++ b/fs/Makefile
[...4772 lines suppressed...]
+
+	if (!audit_enabled)
+		return 0;
+
+	if (likely(!context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->mqdes = mqdes;
+	ax->mqstat = *mqstat;
+
+	ax->d.type = AUDIT_MQ_GETSETATTR;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+/**
+ * audit_ipc_obj - record audit data for ipc object
+ * @ipcp: ipc permissions
+ *
+ * Returns 0 for success or NULL context or < 0 on error.
+ */
+int __audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{
+	struct audit_aux_data_ipcctl *ax;
+	struct audit_context *context = current->audit_context;
+
+	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
+	if (!ax)
+		return -ENOMEM;
+
 	ax->uid = ipcp->uid;
 	ax->gid = ipcp->gid;
 	ax->mode = ipcp->mode;
@@ -1207,14 +1534,11 @@ int audit_ipc_obj(struct kern_ipc_perm *
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
-int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp)
+int __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
 {
 	struct audit_aux_data_ipcctl *ax;
 	struct audit_context *context = current->audit_context;
 
-	if (likely(!context))
-		return 0;
-
 	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
 	if (!ax)
 		return -ENOMEM;
@@ -1223,7 +1547,6 @@ int audit_ipc_set_perm(unsigned long qby
 	ax->uid = uid;
 	ax->gid = gid;
 	ax->mode = mode;
-	selinux_get_ipc_sid(ipcp, &ax->osid);
 
 	ax->d.type = AUDIT_IPC_SET_PERM;
 	ax->d.next = context->aux;
@@ -1231,6 +1554,39 @@ int audit_ipc_set_perm(unsigned long qby
 	return 0;
 }
 
+int audit_bprm(struct linux_binprm *bprm)
+{
+	struct audit_aux_data_execve *ax;
+	struct audit_context *context = current->audit_context;
+	unsigned long p, next;
+	void *to;
+
+	if (likely(!audit_enabled || !context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
+				GFP_KERNEL);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->argc = bprm->argc;
+	ax->envc = bprm->envc;
+	for (p = bprm->p, to = ax->mem; p < MAX_ARG_PAGES*PAGE_SIZE; p = next) {
+		struct page *page = bprm->page[p / PAGE_SIZE];
+		void *kaddr = kmap(page);
+		next = (p + PAGE_SIZE) & ~(PAGE_SIZE - 1);
+		memcpy(to, kaddr + (p & (PAGE_SIZE - 1)), next - p);
+		to += next - p;
+		kunmap(page);
+	}
+
+	ax->d.type = AUDIT_EXECVE;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+
 /**
  * audit_socketcall - record audit data for sys_socketcall
  * @nargs: number of args
@@ -1325,19 +1681,20 @@ int audit_avc_path(struct dentry *dentry
  * If the audit subsystem is being terminated, record the task (pid)
  * and uid that is doing that.
  */
-void audit_signal_info(int sig, struct task_struct *t)
+void __audit_signal_info(int sig, struct task_struct *t)
 {
 	extern pid_t audit_sig_pid;
 	extern uid_t audit_sig_uid;
-
-	if (unlikely(audit_pid && t->tgid == audit_pid)) {
-		if (sig == SIGTERM || sig == SIGHUP) {
-			struct audit_context *ctx = current->audit_context;
-			audit_sig_pid = current->pid;
-			if (ctx)
-				audit_sig_uid = ctx->loginuid;
-			else
-				audit_sig_uid = current->uid;
-		}
+	extern u32 audit_sig_sid;
+
+	if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1) {
+		struct task_struct *tsk = current;
+		struct audit_context *ctx = tsk->audit_context;
+		audit_sig_pid = tsk->pid;
+		if (ctx)
+			audit_sig_uid = ctx->loginuid;
+		else
+			audit_sig_uid = tsk->uid;
+		selinux_get_task_sid(tsk, &audit_sig_sid);
 	}
 }
diff --git a/kernel/signal.c b/kernel/signal.c
index e5f8aea..1b3c921 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -23,12 +23,12 @@ #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/ptrace.h>
 #include <linux/signal.h>
-#include <linux/audit.h>
 #include <linux/capability.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
+#include "audit.h"	/* audit_signal_info() */
 
 /*
  * SLAB caches for signal bits.
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e82726f..0d656e6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -150,7 +150,7 @@ extern ctl_table random_table[];
 #ifdef CONFIG_UNIX98_PTYS
 extern ctl_table pty_table[];
 #endif
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 extern ctl_table inotify_table[];
 #endif
 
@@ -1028,7 +1028,7 @@ #ifdef CONFIG_MMU
 		.mode		= 0644,
 		.proc_handler	= &proc_doulongvec_minmax,
 	},
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 	{
 		.ctl_name	= FS_INOTIFY,
 		.procname	= "inotify",
diff --git a/kernel/user.c b/kernel/user.c
index 2116642..4b1eb74 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -140,7 +140,7 @@ struct user_struct * alloc_uid(uid_t uid
 		atomic_set(&new->processes, 0);
 		atomic_set(&new->files, 0);
 		atomic_set(&new->sigpending, 0);
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 		atomic_set(&new->inotify_watches, 0);
 		atomic_set(&new->inotify_devs, 0);
 #endif
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index c284dbb..e9548bc 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1980,7 +1980,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 		break;
 	case AUDIT_SE_SEN:
 	case AUDIT_SE_CLR:
-		level = (op == AUDIT_SE_SEN ?
+		level = (field == AUDIT_SE_SEN ?
 		         &ctxt->range.level[0] : &ctxt->range.level[1]);
 		switch (op) {
 		case AUDIT_EQUAL:

linux-2.6-audit-pending.patch:
 audit.h       |    3 ++
 auditfilter.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 auditsc.c     |    9 +++++--
 3 files changed, 68 insertions(+), 14 deletions(-)

--- NEW FILE linux-2.6-audit-pending.patch ---
diff --git a/kernel/audit.h b/kernel/audit.h
index 125aebe..f337845 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -126,6 +126,9 @@ extern void audit_free_parent(struct ino
 extern void audit_handle_ievent(struct inotify_watch *, u32, u32, u32,
 				const char *, struct inode *);
 extern int selinux_audit_rule_update(void);
+extern enum audit_state audit_filter_inodes(struct task_struct *,
+					    struct audit_context *);
+extern void audit_set_auditable(struct audit_context *);
 
 #ifdef CONFIG_AUDITSYSCALL
 extern void __audit_signal_info(int sig, struct task_struct *t);
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index a25cac1..459dcef 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -26,6 +26,7 @@ #include <linux/mutex.h>
 #include <linux/fs.h>
 #include <linux/namei.h>
 #include <linux/netlink.h>
+#include <linux/sched.h>
 #include <linux/inotify.h>
 #include <linux/selinux.h>
 #include "audit.h"
@@ -345,17 +346,31 @@ static struct audit_entry *audit_rule_to
 		f->val = rule->values[i];
 
 		err = -EINVAL;
-		if (f->type & AUDIT_UNUSED_BITS)
-			goto exit_free;
-
 		switch(f->type) {
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
-		case AUDIT_WATCH:
+		default:
 			goto exit_free;
+		case AUDIT_PID:
+		case AUDIT_UID:
+		case AUDIT_EUID:
+		case AUDIT_SUID:
+		case AUDIT_FSUID:
+		case AUDIT_GID:
+		case AUDIT_EGID:
+		case AUDIT_SGID:
+		case AUDIT_FSGID:
+		case AUDIT_LOGINUID:
+		case AUDIT_PERS:
+		case AUDIT_ARCH:
+		case AUDIT_MSGTYPE:
+		case AUDIT_DEVMAJOR:
+		case AUDIT_DEVMINOR:
+		case AUDIT_EXIT:
+		case AUDIT_SUCCESS:
+		case AUDIT_ARG0:
+		case AUDIT_ARG1:
+		case AUDIT_ARG2:
+		case AUDIT_ARG3:
+			break;
 		case AUDIT_INODE:
 			err = audit_to_inode(&entry->rule, f);
 			if (err)
@@ -429,6 +444,29 @@ static struct audit_entry *audit_data_to
 		f->se_str = NULL;
 		f->se_rule = NULL;
 		switch(f->type) {
+		case AUDIT_PID:
+		case AUDIT_UID:
+		case AUDIT_EUID:
+		case AUDIT_SUID:
+		case AUDIT_FSUID:
+		case AUDIT_GID:
+		case AUDIT_EGID:
+		case AUDIT_SGID:
+		case AUDIT_FSGID:
+		case AUDIT_LOGINUID:
+		case AUDIT_PERS:
+		case AUDIT_ARCH:
+		case AUDIT_MSGTYPE:
+		case AUDIT_PPID:
+		case AUDIT_DEVMAJOR:
+		case AUDIT_DEVMINOR:
+		case AUDIT_EXIT:
+		case AUDIT_SUCCESS:
+		case AUDIT_ARG0:
+		case AUDIT_ARG1:
+		case AUDIT_ARG2:
+		case AUDIT_ARG3:
+			break;
 		case AUDIT_SE_USER:
 		case AUDIT_SE_ROLE:
 		case AUDIT_SE_TYPE:
@@ -471,6 +509,8 @@ static struct audit_entry *audit_data_to
 			if (err)
 				goto exit_free;
 			break;
+		default:
+			goto exit_free;
 		}
 	}
 
@@ -736,7 +776,7 @@ static struct audit_entry *audit_dupe_ru
 /* Update inode info in audit rules based on filesystem event. */
 static inline void audit_update_watch(struct audit_parent *parent,
 				      const char *dname, dev_t dev,
-				      unsigned long ino)
+				      unsigned long ino, unsigned invalidating)
 {
 	struct audit_watch *owatch, *nwatch, *nextw;
 	struct audit_krule *r, *nextr;
@@ -748,6 +788,12 @@ static inline void audit_update_watch(st
 		if (audit_compare_dname_path(dname, owatch->path))
 			continue;
 
+		/* If the update involves invalidating rules, do the inode-based
+		 * filtering now, so we don't omit records. */
+		if (invalidating &&
+		    audit_filter_inodes(current, current->audit_context) == AUDIT_RECORD_CONTEXT)
+			audit_set_auditable(current->audit_context);
+
 		nwatch = audit_dupe_watch(owatch);
 		if (unlikely(IS_ERR(nwatch))) {
 			mutex_unlock(&audit_filter_mutex);
@@ -1523,9 +1569,9 @@ void audit_handle_ievent(struct inotify_
 
 	if (mask & (IN_CREATE|IN_MOVED_TO) && inode)
 		audit_update_watch(parent, dname, inode->i_sb->s_dev,
-				   inode->i_ino);
+				   inode->i_ino, 0);
 	else if (mask & (IN_DELETE|IN_MOVED_FROM))
-		audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1);
+		audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1, 1);
 	/* inotify automatically removes the watch and sends IN_IGNORED */
 	else if (mask & (IN_DELETE_SELF|IN_UNMOUNT))
 		audit_remove_parent_watches(parent);
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index f4b09a3..4858bdd 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -417,8 +417,8 @@ static enum audit_state audit_filter_sys
  * buckets applicable to the inode numbers in audit_names[].
  * Regarding audit_state, same rules apply as for audit_filter_syscall().
  */
-static enum audit_state audit_filter_inodes(struct task_struct *tsk,
-					     struct audit_context *ctx)
+enum audit_state audit_filter_inodes(struct task_struct *tsk,
+				     struct audit_context *ctx)
 {
 	int i;
 	struct audit_entry *e;
@@ -450,6 +450,11 @@ static enum audit_state audit_filter_ino
 	return AUDIT_BUILD_CONTEXT;
 }
 
+void audit_set_auditable(struct audit_context *ctx)
+{
+	ctx->auditable = 1;
+}
+
 static inline struct audit_context *audit_get_context(struct task_struct *tsk,
 						      int return_valid,
 						      int return_code)

linux-2.6-net-label.patch:
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   44 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 include/linux/ip.h                                        |    1 
 include/linux/netlink.h                                   |    1 
 include/net/cipso_ipv4.h                                  |  187 +
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  354 +++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/cipso_ipv4.c                                     | 1576 ++++++++++++++
 net/ipv4/ip_options.c                                     |   15 
 net/netlabel/Kconfig                                      |   47 
 net/netlabel/Makefile                                     |   15 
 net/netlabel/netlabel_cipso_v4.c                          |  519 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  185 +
 net/netlabel/netlabel_domainhash.c                        |  629 +++++
 net/netlabel/netlabel_domainhash.h                        |   64 
 net/netlabel/netlabel_kapi.c                              |  385 +++
 net/netlabel/netlabel_mgmt.c                              |  681 ++++++
 net/netlabel/netlabel_mgmt.h                              |  253 ++
 net/netlabel/netlabel_unlabeled.c                         |  286 ++
 net/netlabel/netlabel_unlabeled.h                         |   90 
 net/netlabel/netlabel_user.c                              |  174 +
 net/netlabel/netlabel_user.h                              |   42 
 security/selinux/hooks.c                                  |   80 
 security/selinux/include/av_inherit.h                     |    1 
 security/selinux/include/av_perm_to_string.h              |    2 
 security/selinux/include/av_permissions.h                 |    1 
 security/selinux/include/flask.h                          |    1 
 security/selinux/include/security.h                       |    6 
 security/selinux/nlmsgtab.c                               |  159 -
 security/selinux/ss/ebitmap.c                             |  155 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  160 +
 security/selinux/ss/mls.h                                 |   25 
 security/selinux/ss/services.c                            |  252 ++
 security/selinux/xfrm.c                                   |   22 
 43 files changed, 7230 insertions(+), 89 deletions(-)

--- NEW FILE linux-2.6-net-label.patch ---
>From paul.moore at hp.com Tue Jun  6 14:29:11 2006
Return-Path: <paul.moore at hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 06 Jun 2006 14:29:30 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k56ITTAV006823
	for <sgrubb at boston.redhat.com>; Tue, 6 Jun 2006 14:29:29 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k56ITSSR023922;
	Tue, 6 Jun 2006 14:29:28 -0400
Received: from atlrel7.hp.com (atlrel7.hp.com [156.153.255.213])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k56ITJp8011507;
	Tue, 6 Jun 2006 14:29:19 -0400
Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
	by atlrel7.hp.com (Postfix) with ESMTP id 78FAA34879;
	Tue,  6 Jun 2006 14:29:13 -0400 (EDT)
Received: from [16.116.96.193] (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 59BA91BBCD;
	Tue,  6 Jun 2006 18:29:12 +0000 (UTC)
Message-ID: <4485C977.7030805 at hp.com>
Date: Tue, 06 Jun 2006 14:29:11 -0400
From: Paul Moore <paul.moore at hp.com>
Organization: Hewlett Packard
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: lspp-list <redhat-lspp at redhat.com>
Cc: Steve Grubb <sgrubb at redhat.com>,
 Ted <txtoth at gmail.com>
Subject: [PATCH] Updated NetLabel patch
X-Enigmail-Version: 0.92.0.0
Content-Type: multipart/mixed;
  boundary="------------000007060901000305040301"
X-RedHat-Spam-Score: -98.817 
X-Length: 260994
X-UID: 67490

This is a multi-part message in MIME format.
--------------000007060901000305040301
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Attached is an updated NetLabel as requested on Monday's LSPP conference
call.  While I don't want to discourage anyone from looking over the
code, I should be honest when I say not much has changed since the last
patch.  If you have already looked at the previous patch I would
recommend waiting for the next patch if you are interested in reviewing
the code.  As usual, there is still more work on my todo list.

For the curious, the following changes have been made since the last patch:

 * Bug fixes (duh)
 * Inclusion of comments made by James
 * Minor changes to the NetLabel MGMT ADD[DEF] and VERSION commands
 * Crude capability checks on the NETLINK messages
 * Rework the unlabeled packet handling in SELinux

This morning I briefly tested the follwing, although not necessarily all
of the permutations:

 * x86 SMP
 * x86_64 (AMD) SMP
 * targeted policy, enforcing
 * mls policy, enforcing

This patch should not require policy changes when used in the
default/unlabeled mode.  However, those wishing to configure the
NetLabel subsystem and utilize the CIPSO bits should switch to
permissive mode first as I haven't yet written any policy to support
NetLabel.

Also, due to the changes made to the NetLabel commands a new version of
the NetLabel userspace has been posted.  There is no change to the
syntax or behavior of the tools, just the library and the NETLINK
messages.  The tarball can be found here:

 * http://free.linux.hp.com/~pmoore/projects/linux_cipso

The patch was generated against the lspp.28 kernel and applies against
the lspp.34 kernel sources without problem (there is a one line
adjustment in security/selinux/hooks.c but it is okay).  Now the patch
summary:

 CREDITS                                                   |    7
 Documentation/00-INDEX                                    |    2
 Documentation/netlabel/00-INDEX                           |   10
 Documentation/netlabel/cipso_ipv4.txt                     |   48
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  791 +++++
 Documentation/netlabel/introduction.txt                   |   44
 Documentation/netlabel/lsm_interface.txt                  |   47
 include/linux/ip.h                                        |    1
 include/linux/netlink.h                                   |    1
 include/net/cipso_ipv4.h                                  |  187 +
 include/net/inet_sock.h                                   |    2
 include/net/netlabel.h                                    |  354 ++
 net/Kconfig                                               |    2
 net/Makefile                                              |    1
 net/ipv4/Makefile                                         |    1
 net/ipv4/cipso_ipv4.c                                     | 1576 ++++++
 net/ipv4/ip_options.c                                     |   15
 net/netlabel/Kconfig                                      |   47
 net/netlabel/Makefile                                     |   15
 net/netlabel/netlabel_cipso_v4.c                          |  519 +++
 net/netlabel/netlabel_cipso_v4.h                          |  185 +
 net/netlabel/netlabel_domainhash.c                        |  629 +++
 net/netlabel/netlabel_domainhash.h                        |   64
 net/netlabel/netlabel_kapi.c                              |  385 ++
 net/netlabel/netlabel_mgmt.c                              |  681 ++++
 net/netlabel/netlabel_mgmt.h                              |  253 +
 net/netlabel/netlabel_unlabeled.c                         |  286 +
 net/netlabel/netlabel_unlabeled.h                         |   90
 net/netlabel/netlabel_user.c                              |  174 +
 net/netlabel/netlabel_user.h                              |   42
 security/selinux/hooks.c                                  |   80
 security/selinux/include/av_inherit.h                     |    1
 security/selinux/include/av_perm_to_string.h              |    2
 security/selinux/include/av_permissions.h                 |    1
 security/selinux/include/flask.h                          |    1
 security/selinux/include/security.h                       |    6
 security/selinux/nlmsgtab.c                               |  159 -
 security/selinux/ss/ebitmap.c                             |  155
 security/selinux/ss/ebitmap.h                             |    6
 security/selinux/ss/mls.c                                 |  160 +
 security/selinux/ss/mls.h                                 |   25
 security/selinux/ss/services.c                            |  252 +
 security/selinux/xfrm.c                                   |   22
 43 files changed, 7240 insertions(+), 89 deletions(-)

-- 
paul moore
linux security @ hp

--------------000007060901000305040301
Content-Type: text/x-patch;
 name="netlabel_06062006.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="netlabel_06062006.diff"

diff -purN linux-2.6.16.i686/CREDITS linux-2.6.16.i686-cipso/CREDITS
--- linux-2.6.16.i686/CREDITS	2006-05-25 11:35:41.000000000 -0400
+++ linux-2.6.16.i686-cipso/CREDITS	2006-05-25 11:54:41.000000000 -0400
@@ -2383,6 +2383,13 @@ N: Thomas Molina
 E: tmolina at cablespeed.com
 D: bug fixes, documentation, minor hackery
 
+N: Paul Moore
+E: paul.moore at hp.com
+D: NetLabel author
+S: Hewlett-Packard
+S: 110 Spit Brook Road
+S: Nashua, NH 03062
+
 N: James Morris
 E: jmorris at namei.org
 W: http://namei.org/
diff -purN linux-2.6.16.i686/Documentation/00-INDEX linux-2.6.16.i686-cipso/Documentation/00-INDEX
--- linux-2.6.16.i686/Documentation/00-INDEX	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.i686-cipso/Documentation/00-INDEX	2006-05-25 11:54:41.000000000 -0400
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
diff -purN linux-2.6.16.i686/Documentation/netlabel/00-INDEX linux-2.6.16.i686-cipso/Documentation/netlabel/00-INDEX
--- linux-2.6.16.i686/Documentation/netlabel/00-INDEX	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.16.i686-cipso/Documentation/netlabel/00-INDEX	2006-05-25 11:54:41.000000000 -0400
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
diff -purN linux-2.6.16.i686/Documentation/netlabel/cipso_ipv4.txt linux-2.6.16.i686-cipso/Documentation/netlabel/cipso_ipv4.txt
--- linux-2.6.16.i686/Documentation/netlabel/cipso_ipv4.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.16.i686-cipso/Documentation/netlabel/cipso_ipv4.txt	2006-05-25 11:54:41.000000000 -0400
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
[...7550 lines suppressed...]
+				   secattr->mls_lvl, 
+				   secattr->mls_lvl) != 0)
+			goto netlbl_secattr_to_sid_failure;
+		if (secattr->set_mls_cat) {
+			if (mls_import_cat(&ctx_new,
+					   secattr->mls_cat,
+					   secattr->mls_cat_len,
+					   secattr->mls_cat,
+					   secattr->mls_cat_len) != 0)
+				goto netlbl_secattr_to_sid_failure;
+		}
+
+		ret_val = mls_context_isvalid(&policydb, &ctx_new);
+		if (ret_val != 1)
+			goto netlbl_secattr_to_sid_failure;
+
+		ret_val = sidtab_context_to_sid(&sidtab, &ctx_new, sid);
+	} else
+		*sid = SECINITSID_UNLABELED;
+
+	ret_val = 0;
+
+netlbl_secattr_to_sid_failure:
+	if (ctx_new_destroy)
+		context_destroy(&ctx_new);
+	return ret_val;
+}
+
+/**
+ * security_netlbl_socket_setsid - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sid: the SID to use as the basis for the label
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int security_netlbl_socket_setsid(const struct socket *sock, const u32 sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+	struct context *ctx;
+
+	if (!ss_initialized)
+		return 0;
+
+	ctx = sidtab_search(&sidtab, sid);
+	if (ctx != NULL) {
+		netlbl_secattr_init(&secattr);
+
+		if (security_context_export_type(ctx, 
+						 &secattr.domain,
+						 NULL) == 0)
+			secattr.set_domain = 1;
+		if (mls_export_lvl(ctx, &secattr.mls_lvl, NULL) == 0)
+			secattr.set_mls_lvl = 1;
+		if (mls_export_cat(ctx, 
+				   &secattr.mls_cat,
+				   &secattr.mls_cat_len,
+				   NULL,
+				   NULL) == 0)
+			secattr.set_mls_cat = 1;
+
+		ret_val = netlbl_socket_setattr(sock, &secattr);
+		netlbl_secattr_destroy(&secattr);
+	} else
+		ret_val = -ENOENT;
+
+	return ret_val;
+}
+
+/**
+ * security_netlbl_socket_peeksid - Get the SID of the first queued packet
+ * @sock: the socket to query
+ * @sid: the packet's SID
+ *
+ * Description:
+ * Examine the first incoming packet in the socket's queue and determine the
+ * packet's SELinux SID.  Return zero on success, negative values on failure.
+ *
+ */
+int security_netlbl_socket_peeksid(const struct socket *sock, u32 *sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+
+	if (!ss_initialized)
+		return 0;
+
+	netlbl_secattr_init(&secattr);
+
+	ret_val = netlbl_socket_peekattr(sock, &secattr);
+	if (ret_val == 0)
+		ret_val = security_netlbl_secattr_to_sid(&secattr, sid);
+
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return ret_val;
+}
+
+/**
+ * security_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
+ * @skb: the packet
+ * @sid: the SID
+ *
+ * Description:
+ * Call the NetLabel mechanism to get the security attributes of the given
+ * packet and use those attributes to determine the correct context/SID to
+ * assign to the packet.  Returns zero on success, negative values on failure.
+ *
+ */
+int security_netlbl_skbuff_getsid(const struct sk_buff *skb, u32 *sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+	struct netlbl_cache *cache;
+
+	if (!ss_initialized)
+		return 0;
+
+	netlbl_secattr_init(&secattr);
+
+	ret_val = netlbl_skbuff_getattr(skb, &secattr);
+	if (ret_val == 0) {
+		ret_val = security_netlbl_secattr_to_sid(&secattr, sid);
+		if (secattr.set_cache == 0 && ret_val == 0) {
+			cache = kmalloc(sizeof(struct netlbl_cache),
+					GFP_ATOMIC);
+			if (cache != NULL) {
+				NETLBL_CACHE(cache)->sid = *sid;
+				secattr.cache.free = 
+					security_netlbl_cache_free;
+				secattr.cache.data = (void *)cache;
+				secattr.set_cache = 1;
+				if (netlbl_cache_add(skb, &secattr) != 0)
+					security_netlbl_cache_free(cache);
+			}
+		}
+	}
+
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return ret_val;
+}
+#endif /* CONFIG_NETLABEL */
+
 struct selinux_audit_rule {
 	u32 au_seqno;
 	struct context au_ctxt;
diff -purN linux-2.6.16.i686/security/selinux/xfrm.c linux-2.6.16.i686-cipso/security/selinux/xfrm.c
--- linux-2.6.16.i686/security/selinux/xfrm.c	2006-05-25 11:35:27.000000000 -0400
+++ linux-2.6.16.i686-cipso/security/selinux/xfrm.c	2006-05-25 11:55:00.000000000 -0400
@@ -295,13 +295,13 @@ u32 selinux_socket_getpeer_dgram(struct 
 /*
  * LSM hook that controls access to unlabelled packets.  If
  * a xfrm_state is authorizable (defined by macro) then it was
- * already authorized by the IPSec process.  If not, then
- * we need to check for unlabelled access since this may not have
- * gone thru the IPSec process.
+ * already authorized by the IPsec process.  Return zero when the
+ * packet has been approved by the IPsec process, negative values
+ * otherwise.
  */
 int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
 {
-	int i, rc = 0;
+	int i;
 	struct sec_path *sp;
 
 	sp = skb->sp;
@@ -317,21 +317,11 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_s
 			struct xfrm_state *x = sp->xvec[i];
 
 			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+				return 0;
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
-
-accept:
-	return 0;
-
-drop:
-	return rc;
+	return -ENOMSG;
 }
 
 /*

--------------000007060901000305040301--



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2255
retrieving revision 1.2255.2.1
diff -u -r1.2255 -r1.2255.2.1
--- kernel-2.6.spec	8 Jun 2006 00:40:01 -0000	1.2255
+++ kernel-2.6.spec	8 Jun 2006 21:19:24 -0000	1.2255.2.1
@@ -9,10 +9,10 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 0
 
 # Versions of various parts
@@ -26,7 +26,8 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6
+%define rhbsys  .lspp.35
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
 %define signmodules 0
 %define xen_version 20060602
 %define make_target bzImage
@@ -442,6 +443,12 @@
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
 
+# Audit & lspp patches
+Patch20100: linux-2.6-audit-git.patch
+Patch20101: linux-2.6-audit-pending.patch
+Patch20102: linux-2.6-net-label.patch
+Patch20103: capabilities-over-netlink-in-permissive-mode.patch
+
 
 # END OF PATCH DEFINITIONS
 
@@ -1132,11 +1139,22 @@
 
 cp -f %{all_arch_configs} .
 
+# Audit patches
+%patch20100 -p1
+%patch20101 -p1
+#%patch20102 -p1
+%patch20103 -p1
+
 
 # now run oldconfig over all the config files
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_INOTIFY_USER=y" >> .config
+  echo "CONFIG_NETLABEL=y" >> .config
+  echo "CONFIG_NETLABEL_CIPSOV4=y" >> .config
+  echo "CONFIG_NETLABEL_UNLABELED=y" >> .config
+  echo "CONFIG_NETLABEL_UNLABELED_DEFAULT=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
@@ -1805,6 +1823,9 @@
 %endif
 
 %changelog
+* Thu Jun  8 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.35
+
 * Wed Jun  7 2006 Dave Jones <davej at redhat.com>
 - Experiment: Add KGDB.
 - AC97 fix for OLPC.



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:45:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:45:00 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.264, 1.265 anaconda.spec, 1.387,
	1.388 sources, 1.385, 1.386
Message-ID: <200606082145.k58Lj0db001711@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1667/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.25-1 on branch devel from anaconda-11.1.0.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- .cvsignore	7 Jun 2006 01:55:27 -0000	1.264
+++ .cvsignore	8 Jun 2006 21:44:57 -0000	1.265
@@ -1 +1 @@
-anaconda-11.1.0.24.tar.bz2
+anaconda-11.1.0.25.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- anaconda.spec	7 Jun 2006 01:55:27 -0000	1.387
+++ anaconda.spec	8 Jun 2006 21:44:57 -0000	1.388
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.24
+Version: 11.1.0.25
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -14,11 +14,13 @@
 BuildPreReq: pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
+BuildPreReq: libdhcp-devel, libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
 Requires: kudzu > 1.2.0, yum >= 2.5.1-3, pirut
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
 Requires: device-mapper >= 1.01.05-3
+Requires: dosfstools e2fsprogs
 %ifnarch s390 s390x
 Requires: python-pyblock >= 0.7-1
 %endif
@@ -40,8 +42,8 @@
 AutoReqProv: false
 Requires: libxml2-python, python, rpm-python >= 4.2-0.61, yum >= 2.4.0
 Requires: anaconda = %{version}-%{release}
-Requires: createrepo >= 0.4.3-3.1, squashfs-tools
-Requires: /usr/bin/strip
+Requires: createrepo >= 0.4.3-3.1, squashfs-tools, mkisofs, syslinux
+Requires: /usr/bin/strip, xorg-x11-font-utils, netpbm-tools
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system which 
@@ -82,12 +84,45 @@
 
 %files runtime
 %defattr(-,root,root)
-/usr/lib/anaconda-runtime
+/usr/lib/anaconda-runtime/*md5
+/usr/lib/anaconda-runtime/*.py*
+/usr/lib/anaconda-runtime/*.so*
+/usr/lib/anaconda-runtime/boot/*.msg
+/usr/lib/anaconda-runtime/boot/syslinux.cfg
+/usr/lib/anaconda-runtime/loader/
+/usr/lib/anaconda-runtime/buildinstall
+/usr/lib/anaconda-runtime/filtermoddeps
+/usr/lib/anaconda-runtime/getkeymaps
+/usr/lib/anaconda-runtime/keymaps-override*
+/usr/lib/anaconda-runtime/mapshdr
+/usr/lib/anaconda-runtime/mk-images*
+/usr/lib/anaconda-runtime/mk-rescueimage*
+/usr/lib/anaconda-runtime/moddeps
+/usr/lib/anaconda-runtime/modlist
+/usr/lib/anaconda-runtime/pkgorder
+/usr/lib/anaconda-runtime/readmap
+/usr/lib/anaconda-runtime/screenfont-i386.gz
+/usr/lib/anaconda-runtime/scrubtree
+/usr/lib/anaconda-runtime/trimmodalias
+/usr/lib/anaconda-runtime/trimpciids
+/usr/lib/anaconda-runtime/upd-instroot
+/usr/lib/anaconda-runtime/yumcache
 
 %triggerun -- anaconda < 8.0-1
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 08 2006 Chris Lumens <clumens at redhat.com> 11.1.0.25-1
+- More IPv6 fixes (dcantrell).
+- Add ipv6 kernel module to image (dcantrell).
+- Add noipv6 installer flag (dcantrell).
+- Add dosfstools to requires (katzj).
+- Fix anaconda-runtime spec file segment (#198415, #194237).
+- Better partitioning error messages (#181571).
+- Warn if non-linux filesystems can't be mounted on upgrade (#185086).
+- Simplify IP address widgets for IPv6 support.
+- Use libdhcp instead of pump, fix requires (dcantrell).
+
 * Tue Jun  6 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.24-1
 - Read from right stdin for kickstart scripts (Hannu Martikka, #192067)
 - Fix ip addr getting on 64bit boxes (clumens, #193609)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- sources	7 Jun 2006 01:55:27 -0000	1.385
+++ sources	8 Jun 2006 21:44:57 -0000	1.386
@@ -1 +1 @@
-953bc4a0be2f686f8fdfdb92900cd832  anaconda-11.1.0.24.tar.bz2
+94a3f1cd9c200390da12419aee7f67dd  anaconda-11.1.0.25.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:45:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:45:06 -0400
Subject: rpms/dhcp/FC-5 dhcp-3.0.3-dhclient-script-METRIC.patch,NONE,1.1
Message-ID: <200606082145.k58Lj43J001762@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1728

Added Files:
	dhcp-3.0.3-dhclient-script-METRIC.patch 
Log Message:
fix bug 193047

dhcp-3.0.3-dhclient-script-METRIC.patch:
 linux |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-3.0.3-dhclient-script-METRIC.patch ---
--- dhcp-3.0.4/client/scripts/linux.dhclient-script-METRIC	2006-05-25 21:04:09.000000000 -0400
+++ dhcp-3.0.4/client/scripts/linux	2006-05-26 19:11:33.000000000 -0400
@@ -271,8 +271,8 @@
 		fi;
 	    fi;
 	    if [[  ( ( -z "$GATEWAYDEV" )  || ( "$GATEWAYDEV" = "$interface" ) ) && ( ( -z "$GATEWAY" )  || ( ( -n "$DHCLIENT_IGNORE_GATEWAY" ) && ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ) ) ) ]]; then
-		metric='';
-		let i=0;
+		metric=${METRIC:-''};
+		let i=${METRIC:-0};
 		default_routers=()
 		for router in $new_routers; do
 		    added_router=0



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:45:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:45:53 -0400
Subject: rpms/dhcp/FC-5 dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch,
	NONE, 1.1
Message-ID: <200606082145.k58LjrPu001997@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1982

Added Files:
	dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch 
Log Message:
fix bug 191461

dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch:
 linux |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch ---
--- dhcp-3.0.4/client/scripts/linux.dhclient-script-ntp-fudge-bz191461	2006-06-07 19:27:04.000000000 -0400
+++ dhcp-3.0.4/client/scripts/linux	2006-06-08 14:09:04.000000000 -0400
@@ -410,13 +410,15 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*server)|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
 	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
 	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
+	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
 	    for s in $new_ntp_servers ${localClocks[@]};
 	      do
 	      echo 'server '$s >> /etc/ntp.conf;
 	    done
+	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -e /etc/ntp/step-tickers ]; then
 		save_previous /etc/ntp/step-tickers
 		echo '' > /etc/ntp/step-tickers



From fedora-cvs-commits at redhat.com  Thu Jun  8 21:47:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 17:47:06 -0400
Subject: rpms/dhcp/FC-5 dhcp.spec,1.88,1.89
Message-ID: <200606082147.k58Ll6AG009492@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8153

Modified Files:
	dhcp.spec 
Log Message:
fix bugs 191461, 193047, 193607


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-5/dhcp.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- dhcp.spec	2 Mar 2006 22:55:31 -0000	1.88
+++ dhcp.spec	8 Jun 2006 21:47:04 -0000	1.89
@@ -1,8 +1,9 @@
 %{?!DHCLIENT_EXTENDED_OPTION_ENVIRONMENT:%define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1}
+%{?!NODEBUGINFO: %define NODEBUGINFO 0}
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 26
+Release: 28
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons
@@ -78,6 +79,9 @@
 Patch171: dhcp-3.0.3-bz181482.patch
 Patch172: dhcp-3.0.3-dhclient_ibmzSeries_broadcast.patch
 Patch173: dhcp-3.0.3-dhclient_ibmzSeries_-I_option.patch
+Patch174: dhcp-3.0.3-dhclient-script-METRIC.patch
+Patch175: dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch
+
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -198,6 +202,9 @@
 %patch171 -p1 -b .bz181482
 %patch172 -p1 -b .dhclient_ibmzSeries_broadcast
 %patch173 -p1 -b .dhclient_ibmzSeries_-I_option
+%patch174 -p1 -b .dhclient-script-METRIC
+%patch175 -p1 -b .dhclient-script-ntp-fudge-bz191461
+#
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcpd
@@ -226,6 +233,9 @@
 %else
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
+%if %{NODEBUGINFO}
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g3 -gdwarf-2"
+%endif
 %if %{DHCLIENT_EXTENDED_OPTION_ENVIRONMENT}
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DEXTENDED_NEW_OPTION_INFO"
 %endif
@@ -237,42 +247,61 @@
 #make %{?_smp_mflags} CC="gcc33"
 make %{?_smp_mflags} CC="%{__cc}"
 
+
+%if %{NODEBUGINFO}
 %define debug_package %{nil}
+%endif
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/etc/sysconfig
-
+#
 make install DESTDIR=%{buildroot}
-
+#
 mkdir -p %{buildroot}/etc/rc.d/init.d
 install -m 0755 %SOURCE2 %{buildroot}/etc/rc.d/init.d/dhcpd
-
+#
 touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd.leases
 mkdir -p  %{buildroot}%{_localstatedir}/lib/dhclient/
 cat <<EOF > %{buildroot}/etc/sysconfig/dhcpd
 # Command line options here
 DHCPDARGS=
 EOF
-
+#
 install -m0755 %SOURCE3 %{buildroot}/etc/rc.d/init.d/dhcrelay
-
+#
 cat <<EOF > %{buildroot}/etc/sysconfig/dhcrelay
 # Command line options here
 INTERFACES=""
 DHCPSERVERS=""
 EOF
-
+#
 # Copy sample dhclient.conf file into position
 cp client/dhclient.conf dhclient.conf.sample
 chmod 755 %{buildroot}/sbin/dhclient-script
 # Fix bug 163367: install default (empty) dhcpd.conf:
 cp -fp %SOURCE4 %{buildroot}/etc
-
-touch debugfiles.list
-:;
+#
+# Create per-package copies of dhcp-options and dhcp-eval common man-pages:
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-options.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcpd-options.5 
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-options.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhclient-options.5 
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-eval.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcpd-eval.5 
+cp -fp ${RPM_BUILD_ROOT}%{_mandir}/man5/dhcp-eval.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/dhclient-eval.5 
+#
+#
+%if !%{NODEBUGINFO}
+#
+# Fix debuginfo files list - don't ship links to .c files in the buildroot :-)
+work=work.`./configure --print-sysname`;
+find $work -type l -a -name '*.c' | 
+while read f; do 
+   rm -f $f; 
+   cp -fp ${f#$work/} $f; 
+done
+%else
 /usr/lib/rpm/brp-compress
 exit 0
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -280,6 +309,14 @@
 %post
 /sbin/chkconfig --add dhcpd
 /sbin/chkconfig --add dhcrelay
+if [ "$1" -ge 1 ]; then
+   if [ ! -e %{_mandir}/man5/dhcp-options.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhcpd-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+   fi;
+   if [ ! -e %{_mandir}/man5/dhcp-eval.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhcpd-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+   fi;
+fi;
 
 %preun
 if [ $1 = 0 ]; then	# execute this only if we are NOT doing an upgrade
@@ -293,9 +330,38 @@
 if [ "$1" -ge "1" ]; then
     service dhcpd condrestart >/dev/null 2>&1
     service dhcrelay condrestart >/dev/null 2>&1
+elif [ "$1" -eq 0 ]; then
+    if [ -e %{_mandir}/man5/dhclient-options.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhclient-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+    fi;
+    if [ -e %{_mandir}/man5/dhclient-eval.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhclient-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+    fi;
 fi
 exit 0
 
+%post -n dhclient
+if [ "$1" -ge 1 ]; then
+   if [ ! -e %{_mandir}/man5/dhcp-options.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhclient-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+   fi;
+   if [ ! -e %{_mandir}/man5/dhcp-eval.5.gz ]; then
+	/bin/ln -s %{_mandir}/man5/dhclient-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+   fi;   
+fi
+:;
+
+%postun -n dhclient
+if [ "$1" -eq 0 ]; then
+    if [ -e %{_mandir}/man5/dhcpd-options.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhcpd-options.5.gz %{_mandir}/man5/dhcp-options.5.gz;
+    fi;
+    if [ -e %{_mandir}/man5/dhcpd-eval.5.gz  ]; then
+	/bin/ln -sf %{_mandir}/man5/dhcpd-eval.5.gz %{_mandir}/man5/dhcp-eval.5.gz;
+    fi;
+fi
+:;   
+
 %files
 %defattr(-,root,root)
 %doc README RELNOTES dhcpd.conf.sample
@@ -310,11 +376,14 @@
 %{_sbindir}/dhcpd
 %{_sbindir}/dhcrelay
 %{_mandir}/man1/omshell.1*
-%{_mandir}/man5/dhcp-eval.5*
 %{_mandir}/man5/dhcpd.conf.5*
 %{_mandir}/man5/dhcpd.leases.5*
 %{_mandir}/man8/dhcpd.8*
 %{_mandir}/man8/dhcrelay.8*
+%{_mandir}/man5/dhcpd-options.5*
+%{_mandir}/man5/dhcpd-eval.5*
+%ghost %{_mandir}/man5/dhcp-options.5.gz
+%ghost %{_mandir}/man5/dhcp-eval.5.gz
 
 %files -n dhclient
 %defattr(-,root,root)
@@ -326,7 +395,10 @@
 %{_mandir}/man5/dhclient.leases.5*
 %{_mandir}/man8/dhclient.8*
 %{_mandir}/man8/dhclient-script.8*
-%{_mandir}/man5/dhcp-options.5*
+%{_mandir}/man5/dhclient-options.5*
+%{_mandir}/man5/dhclient-eval.5*
+%ghost %{_mandir}/man5/dhcp-options.5.gz
+%ghost %{_mandir}/man5/dhcp-eval.5.gz
 
 %files devel
 %defattr(-,root,root)
@@ -335,6 +407,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jun 08 2006 Jason Vas Dias <jvdias at redhat.com> - 12:3.0.3-28
+- fix bug 191461: preserve ntp.conf local clock fudge statements
+- fix bug 193607: both dhcp and dhclient need to ship common
+                  man-pages: dhcp-options(5) dhcp-eval(5)
+- fix bug 193047: allow $METRIC to be specified for dhclient routes
+
 * Thu Mar 02 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-26
 - fix bug 181908: enable dhclient to operate on IBM zSeries z/OS linux guests:
   o add -I <dhcp-client-identifier> dhclient command line option



From fedora-cvs-commits at redhat.com  Thu Jun  8 22:04:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 18:04:38 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.79,1.80
Message-ID: <200606082204.k58M4cd1027893@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27880

Modified Files:
	kdenetwork.spec 
Log Message:
- enable --enable-new-ldflags again since ld bug fixed
- move only *.so symlinks to -devel subpacka



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdenetwork.spec	6 Jun 2006 21:28:40 -0000	1.79
+++ kdenetwork.spec	8 Jun 2006 22:04:35 -0000	1.80
@@ -16,7 +16,7 @@
 
 Name: kdenetwork
 Version: 3.5.3
-Release: 1
+Release: 2
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -114,9 +114,7 @@
 export LDFLAGS="$LDFLAGS `krb5-config --libs`"
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --disable-rpath \
 %if %{disable_gcc_check_and_hidden_visibility}
@@ -211,7 +209,8 @@
 %config %{_sysconfdir}/rc.d/init.d/lisa
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %doc %{_docdir}/HTML/en/*
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
+%{_libdir}/libkdeinit_*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
@@ -236,6 +235,8 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/kde/*
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*
 
 %if %{xmms}
 %files nowlistening
@@ -248,6 +249,10 @@
 %endif
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
+- enable --enable-new-ldflags again since ld bug fixed
+- move only *.so symlinks to -devel subpackage
+
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 22:32:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 18:32:48 -0400
Subject: rpms/gdm/devel gdm-2.15.3-CVE-2006-2452.patch, NONE, 1.1 gdm.spec,
	1.160, 1.161
Message-ID: <200606082232.k58MWmvN026863@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26788

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.3-CVE-2006-2452.patch 
Log Message:
- fix CVE-2006-2452


gdm-2.15.3-CVE-2006-2452.patch:
 gdmlogin.c           |    2 ++
 greeter.c            |    6 +++++-
 greeter_item_ulist.c |    6 ++++--
 greeter_system.c     |    5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)

--- NEW FILE gdm-2.15.3-CVE-2006-2452.patch ---
--- gdm2/gui/greeter/greeter.c   2005/11/22 07:51:29     1.95.2.5
+++ gdm2/gui/greeter/greeter.c   2006/05/31 10:26:02     1.95.2.6
@@ -384,7 +384,6 @@
        buf[len-1] = '\0';
        
        greeter_item_pam_set_user (buf);
-       greeter_item_ulist_enable ();
        printf ("%c\n", STX);
        fflush (stdout);
        break;
@@ -541,6 +540,8 @@
        printf ("%c\n", STX);
        fflush (stdout);
        greeter_ignore_buttons (FALSE);
+       greeter_item_ulist_enable ();
+
        break;
 
     case GDM_QUIT:
@@ -1504,6 +1505,9 @@
   gtk_window_move (GTK_WINDOW (window), gdm_wm_screen.x, gdm_wm_screen.y);
   gtk_widget_show_now (window);
 
+  greeter_item_ulist_unset_selected_user ();
+  greeter_item_ulist_enable ();
+
   /* can it ever happen that it'd be NULL here ??? */
   if G_UNLIKELY (window->window != NULL)
     {

--- gdm2/gui/greeter/greeter_item_ulist.c        2006/05/23 00:35:02     1.28
+++ gdm2/gui/greeter/greeter_item_ulist.c        2006/05/31 09:24:08     1.29
@@ -65,6 +65,10 @@
 void
 greeter_item_ulist_unset_selected_user (void)
 {
+       GtkTreeSelection *selection;
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_list));
+       gtk_tree_selection_unselect_all (selection);
+
        if (selected_user != NULL)
                g_free (selected_user);
        selected_user = NULL;
@@ -350,8 +354,6 @@
                        force_no_tree_separators (user_list);
 
                        greeter_generate_userlist (user_list);
-                       if ( ! DOING_GDM_DEVELOPMENT)
-                               greeter_item_ulist_disable ();
 
                        /* Reset size of the widget canvas item so it
                         * is the same size as the userlist.  This

--- gdm2/gui/greeter/greeter_system.c    2005/08/17 22:27:59     1.30.2.1
+++ gdm2/gui/greeter/greeter_system.c    2006/05/31 10:26:02     1.30.2.2
@@ -119,6 +119,11 @@
 static void
 greeter_config_handler (void)
 {
+        greeter_item_ulist_disable ();
+
+        /* Make sure to unselect the user */
+        greeter_item_ulist_unset_selected_user ();
+
        /* we should be now fine for focusing new windows */
        gdm_wm_focus_new_windows (TRUE);
 

--- gdm2/gui/greeter/gdmlogin.c  2005/11/22 20:43:50     1.245.2.8
+++ gdm2/gui/greeter/gdmlogin.c  2006/05/31 10:26:02     1.245.2.9
@@ -798,6 +798,8 @@
 static void
 gdm_run_gdmconfig (GtkWidget *w, gpointer data)
 {
+       gtk_widget_set_sensitive (browser, FALSE);
+
        /* we should be now fine for focusing new windows */
        gdm_wm_focus_new_windows (TRUE);
 



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gdm.spec	7 Jun 2006 19:41:10 -0000	1.160
+++ gdm.spec	8 Jun 2006 22:32:45 -0000	1.161
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.3
-Release: 6
+Release: 7
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -45,6 +45,7 @@
 Patch22: gdm-2.13.0.7-pam_stack.patch
 Patch23: gdm-2.15.3-chown.patch
 Patch24: gdm-2.15.3-support-xdm-nodaemon-option.patch
+Patch25: gdm-2.15.3-CVE-2006-2452.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -317,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> 1:2.15.3-7
+- fix CVE-2006-2452
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1:2.15.3-6
 - buildrequire the server so that we get the path right in the config file
 



From fedora-cvs-commits at redhat.com  Thu Jun  8 22:40:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 18:40:22 -0400
Subject: rpms/kdenetwork/FC-5 .cvsignore, 1.37, 1.38 kdenetwork.spec, 1.73,
	1.74 sources, 1.41,
	1.42 kdenetwork-3.5.2-kopete-avdevice-crash.patch, 1.1, NONE
Message-ID: <200606082240.k58MeMcW027848@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27820

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-3.5.2-kopete-avdevice-crash.patch 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	5 Apr 2006 23:06:05 -0000	1.37
+++ .cvsignore	8 Jun 2006 22:40:17 -0000	1.38
@@ -10,3 +10,4 @@
 kdenetwork-3.5.0.tar.bz2
 kdenetwork-3.5.1.tar.bz2
 kdenetwork-3.5.2.tar.bz2
+kdenetwork-3.5.3.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/kdenetwork.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdenetwork.spec	7 May 2006 11:12:59 -0000	1.73
+++ kdenetwork.spec	8 Jun 2006 22:40:18 -0000	1.74
@@ -15,8 +15,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.2
-Release: 0.2.fc5
+Version: 3.5.3
+Release: 0.1.fc5
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -37,9 +37,6 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
-# upstream patches
-Patch100: kdenetwork-3.5.2-kopete-avdevice-crash.patch
-
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -52,7 +49,13 @@
 BuildRequires: gcc-c++
 BuildRequires: automake
 BuildRequires: autoconf >= 2.53
+%ifnarch s390 s390x
 BuildRequires: wireless-tools >= 25
+%endif
+BuildRequires: coreutils
+BuildRequires: libXmu-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libXtst-devel
 %if %{xmms}
 BuildRequires: xmms-devel
 %else
@@ -91,9 +94,6 @@
 %patch4 -p1 -b .ppp
 %patch5 -p1 -b .libgadu-va_copy
 
-# upstream patches
-%patch100 -p1 -b .kopete-avdevice-crash
-
 find -name CVS | xargs rm -rf 
 
 %if !%{xmms}
@@ -107,7 +107,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS"
+FLAGS="%{optflags}"
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
 export KDEDIR=%{_prefix}
@@ -142,16 +142,16 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kppp
+mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+cp %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/kppp
 
 # Make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -nfs ../common $i
 done
@@ -159,29 +159,29 @@
 
 # Show only in KDE
 for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview kwifimanager kget knewsticker ksirc kdict ; do
-   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Run kppp through consolehelper
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/kppp $RPM_BUILD_ROOT%{_sbindir}
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kppp
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kppp <<EOF
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kppp
+mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
+cat >%{buildroot}%{_sysconfdir}/security/console.apps/kppp <<EOF
 USER=root
 PROGRAM=%{_sbindir}/kppp
 SESSION=true
 EOF
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
+mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
 
 # Add lisa startup script
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lisarc
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/lisa
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
 
 %post
 /sbin/ldconfig
@@ -198,12 +198,12 @@
 exit 0
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%config /etc/security/console.apps/kppp
-%config /etc/pam.d/kppp
+%config %{_sysconfdir}/security/console.apps/kppp
+%config %{_sysconfdir}/pam.d/kppp
 %config %{_sysconfdir}/lisarc
 %config %{_sysconfdir}/rc.d/init.d/lisa
 %config %{_sysconfdir}/xinetd.d/ktalk
@@ -245,6 +245,9 @@
 %endif
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Sun May 07 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.2.fc5
 - fix #189691, kopete crash after selecting Setting->Configure->device
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	5 Apr 2006 23:06:06 -0000	1.41
+++ sources	8 Jun 2006 22:40:18 -0000	1.42
@@ -1 +1 @@
-dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2
+119af91a048c34d9a917a1898f215554  kdenetwork-3.5.3.tar.bz2


--- kdenetwork-3.5.2-kopete-avdevice-crash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 00:17:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 20:17:52 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.12,1.13
Message-ID: <200606090017.k590HqKP015867@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15840

Modified Files:
	libdrm.spec 
Log Message:
* Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 2.0.1-3
- Remove package ownership of mandir/libdir/etc.



Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libdrm.spec	10 Apr 2006 18:57:13 -0000	1.12
+++ libdrm.spec	9 Jun 2006 00:17:49 -0000	1.13
@@ -1,16 +1,13 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
 Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires: xorg-x11-proto-devel
-#BuildRequires: xorg-x11-xtrans-devel
-
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 
@@ -39,8 +36,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: makeinstall doesn't work due to upstream bug
-#%%makeinstall DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -55,14 +50,11 @@
 %files
 %defattr(-,root,root,-)
 %doc README
-#%{_libdir}/libdrm.so.1
-#%{_libdir}/libdrm.so.1.0.0
 %{_libdir}/libdrm.so.2
 %{_libdir}/libdrm.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}
 %dir %{_includedir}/drm
 # NOTE: Headers are listed explicitly, so we can monitor additions/removals.
 %{_includedir}/drm/drm.h
@@ -78,14 +70,15 @@
 %{_includedir}/drm/via_3d_reg.h
 %{_includedir}/drm/via_drm.h
 %{_includedir}/xf86drm.h
-%dir %{_libdir}
 # NOTE: We don't want to ship static libs.
 #%{_libdir}/libdrm.a
 %{_libdir}/libdrm.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 2.0.1-3
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 2.0.1-2
 - Bump for fc5 build.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 00:53:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 20:53:31 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.88,1.89
Message-ID: <200606090053.k590rVTY014886@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14873

Modified Files:
	nfs-utils.spec 
Log Message:
Added libtool to BuildRequires



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- nfs-utils.spec	8 Jun 2006 20:47:21 -0000	1.88
+++ nfs-utils.spec	9 Jun 2006 00:53:28 -0000	1.89
@@ -39,7 +39,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
-BuildRequires: automake
+BuildRequires: automake libtool
 BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2



From fedora-cvs-commits at redhat.com  Fri Jun  9 00:54:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 20:54:15 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-libdhcp6client.patch, 1.4,
	1.5 dhcpv6.spec, 1.33, 1.34
Message-ID: <200606090054.k590sFLB014937@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14922

Modified Files:
	dhcpv6-0.10-libdhcp6client.patch dhcpv6.spec 
Log Message:
retry bind() to linklocal on EADDRNOTAVAIL

dhcpv6-0.10-libdhcp6client.patch:
 client6_addr.c    |   61 +++++--
 common.c          |   39 +++-
 dhc6_alloc.c      |   67 +++++++
 dhc6_alloc.h      |   17 ++
 dhcp6.h           |   17 +-
 dhcp6c.c          |  455 +++++++++++++++++++++++++++++++++++++++++++++++-------
 dhcp6client.h     |   22 ++
 lease.c           |   10 -
 lease.h           |    2 
 lease_token.l     |    3 
 libdhcp_control.h |  104 ++++++++++++
 11 files changed, 711 insertions(+), 86 deletions(-)

Index: dhcpv6-0.10-libdhcp6client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-libdhcp6client.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dhcpv6-0.10-libdhcp6client.patch	26 May 2006 17:14:28 -0000	1.4
+++ dhcpv6-0.10-libdhcp6client.patch	9 Jun 2006 00:54:12 -0000	1.5
@@ -1,135 +1,146 @@
---- /dev/null	2006-05-25 22:22:05.828072250 -0400
-+++ dhcp-0.10/libdhcp6client/dhc6_alloc.h	2006-05-25 23:43:08.000000000 -0400
-@@ -0,0 +1,17 @@
-+
-+extern void *dhc6_alloc( size_t );
-+extern void *dhc6_realloc(void *, size_t);
-+extern void *dhc6_calloc(size_t, size_t);
-+extern char *dhc6_strdup(char *str);
-+extern void dhc6_free( void *);
-+extern void dhc6_free_all_pointers(void);
-+#undef malloc
-+#define malloc( size ) dhc6_alloc( size )
-+#undef realloc
-+#define realloc(ptr, size) dhc6_realloc(ptr, size)
-+#undef calloc
-+#define calloc(n, size) dhc6_calloc(n, size)
-+#undef free
-+#define free( ptr ) dhc6_free( ptr )
-+#undef strdup
-+#define strdup( str ) dhc6_strdup( str )
---- /dev/null	2006-05-25 22:22:05.828072250 -0400
-+++ dhcp-0.10/libdhcp6client/dhc6_alloc.c	2006-05-25 15:16:05.000000000 -0400
-@@ -0,0 +1,67 @@
-+#include <malloc.h>
-+#include <search.h>
-+extern void tdestroy (void *root, void (*free_node)(void *nodep));
-+void *ifp_ptr;
-+
-+static void *ptr_tree=0L;
-+
-+static int ptr_comparator( const void *p1, const void *p2 )
-+{
-+    return
-+	(  (p1 == p2) 
-+	   ? 0
-+	   :( (p1 > p2)
-+	      ? 1
-+	      : -1
-+	    )
-+	);
-+}
-+
-+void *dhc6_alloc( size_t s )
-+{
-+    void *ptr = malloc( s );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+void *dhc6_realloc( void *ptr, size_t s )
-+{
-+    void *ptr2 = realloc(ptr, s);
-+    if ( ptr2 != 0 )
-+    {
-+	if ( ptr != 0 )
-+	    tdelete(ptr,&(ptr_tree), ptr_comparator);
-+	tsearch(ptr2, &(ptr_tree), ptr_comparator);
-+    }
-+    return ptr2;
-+}
-+
-+void *dhc6_calloc( size_t n, size_t s )
-+{
-+    void *ptr = calloc( n, s );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+char *dhc6_strdup( char *str )
-+{
-+    char *ptr = strdup( str );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
+--- dhcp-0.10/libdhcp6client/lease_token.l.libdhcp6client	2004-02-04 18:29:24.000000000 -0500
++++ dhcp-0.10/libdhcp6client/lease_token.l	2006-06-08 20:26:36.000000000 -0400
+@@ -241,6 +241,9 @@
+ 	
+ 	fseek(file, 0, 0);
+ 	yyin = file;
++	yy_init=1;
++	yy_start=0;
++	yy_current_buffer=0;
+ 	yylex(); 
+ 	return;
+ }
+--- dhcp-0.10/libdhcp6client/client6_addr.c.libdhcp6client	2006-06-08 20:26:21.000000000 -0400
++++ dhcp-0.10/libdhcp6client/client6_addr.c	2006-06-08 20:26:36.000000000 -0400
+@@ -56,6 +56,10 @@
+ #include "timer.h"
+ #include "lease.h"
+ 
++#ifdef LIBDHCP
++#include "libdhcp_control.h"
++#endif
 +
-+void dhc6_free( void *ptr )
-+{
-+    free(ptr);
-+    tdelete(ptr, &(ptr_tree), ptr_comparator);
-+}
+ static int dhcp6_update_lease __P((struct dhcp6_addr *, struct dhcp6_lease *));
+ static int dhcp6_add_lease __P((struct dhcp6_addr *));
+ struct dhcp6_lease *dhcp6_find_lease __P((struct dhcp6_iaidaddr *, 
+@@ -217,7 +221,7 @@
+ 	sp->iaidaddr = &client6_iaidaddr;
+ 	time(&sp->start_date);
+ 	sp->state = ACTIVE;
+-	if (write_lease(sp, client6_lease_file) != 0) {
++	if (client6_lease_file && (write_6_lease(sp, client6_lease_file) != 0)) {
+ 		dprintf(LOG_ERR, "%s" "failed to write a new lease address %s to lease file", 
+ 			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
+ 		if (sp->timer)
+@@ -228,14 +232,24 @@
+ 	if (sp->lease_addr.type == IAPD) {
+ 		dprintf(LOG_INFO, "request prefix is %s/%d", 
+ 			in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen);
+-	} else if (client6_ifaddrconf(IFADDRCONF_ADD, addr) != 0) {
+-		dprintf(LOG_ERR, "%s" "adding address failed: %s",
+-		    FNAME, in6addr2str(&addr->addr, 0));
+-		if (sp->timer)
++	} else 
++#ifdef LIBDHCP
++                if (  libdhcp_control
++                   &&(libdhcp_control->capability & DHCP_CONFIGURE_ADDRESSES)
++                   )
++                {
++#endif
++	        if (client6_ifaddrconf(IFADDRCONF_ADD, addr) != 0) {
++		    dprintf(LOG_ERR, "%s" "adding address failed: %s",
++			    FNAME, in6addr2str(&addr->addr, 0));
++		    if (sp->timer)
+ 			dhcp6_remove_timer(sp->timer);
+-		free(sp);
+-		return (-1);
+-	}
++		    free(sp);
++		    return (-1);
++		}
++#ifdef LIBDHCP
++		}
++#endif
+ 	TAILQ_INSERT_TAIL(&client6_iaidaddr.lease_list, sp, link);
+ 	/* for infinite lifetime don't do any timer */
+ 	if (sp->lease_addr.validlifetime == DHCP6_DURATITION_INFINITE || 
+@@ -282,7 +296,12 @@
+ 	dprintf(LOG_DEBUG, "%s" "removing address %s", FNAME,
+ 		in6addr2str(&sp->lease_addr.addr, 0));
+ 	sp->state = INVALID;
+-	if (write_lease(sp, client6_lease_file) != 0) {
++#ifdef LIBDHCP
++	if (  libdhcp_control
++	    &&(libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)
++	   )
++#endif
++	if (write_6_lease(sp, client6_lease_file) != 0) {
+ 		dprintf(LOG_INFO, "%s" 
+ 			"failed to write removed lease address %s to lease file", 
+ 			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
+@@ -294,10 +313,17 @@
+ 			in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen);
+ 		/* XXX: remove from the update prefix list */
+ 
+-	} else if (client6_ifaddrconf(IFADDRCONF_REMOVE, &sp->lease_addr) != 0) {
++	} else
++#ifdef LIBDHCP
++	if (  libdhcp_control
++	    &&(libdhcp_control->capability & DHCP_CONFIGURE_ADDRESSES)
++	   )
++#endif
 +
-+void dhc6_free_all_pointers(void)
-+{
-+    if( ptr_tree != 0L )
-+	tdestroy(ptr_tree, free);
-+    ptr_tree = 0L;
-+}
---- dhcp-0.10/libdhcp6client/lease.c.libdhcp6client	2004-03-03 15:11:16.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/lease.c	2006-05-25 15:16:05.000000000 -0400
-@@ -64,7 +64,7 @@
- static int init_lease_hashes __P((void));
++	    if (client6_ifaddrconf(IFADDRCONF_REMOVE, &sp->lease_addr) != 0) {
+ 			dprintf(LOG_INFO, "%s" "removing address %s failed",
+ 		    		FNAME, in6addr2str(&sp->lease_addr.addr, 0));
+-	}
++	    }
+ 	/* remove expired timer for this lease. */
+ 	if (sp->timer)
+ 		dhcp6_remove_timer(sp->timer);
+@@ -446,7 +472,12 @@
+ 	memcpy(&sp->lease_addr, addr, sizeof(sp->lease_addr));
+ 	sp->state = ACTIVE;
+ 	time(&sp->start_date);
+-	if (write_lease(sp, client6_lease_file) != 0) {
++#ifdef LIBDHCP
++	if (  libdhcp_control
++	    &&(libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)
++	   )
++#endif
++	if (write_6_lease(sp, client6_lease_file) != 0) {
+ 		dprintf(LOG_ERR, "%s" 
+ 			"failed to write an updated lease address %s to lease file", 
+ 			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
+@@ -670,7 +701,7 @@
+ 		return (-1);
+ 	}
  
- int 
--write_lease(const struct dhcp6_lease *lease_ptr,
-+write_6_lease(const struct dhcp6_lease *lease_ptr,
- 	    FILE *file)
+-	dprintf(LOG_DEBUG, "%s" "%s an address %s on %s", FNAME, cmdstr,
++	dprintf(LOG_INFO, "%s" "%s an address %s on %s", FNAME, cmdstr,
+ 	    in6addr2str(&ifaddr->addr, 0), ifp->ifname);
+ 	close(s); 
+ 	return (0);
+@@ -700,7 +731,7 @@
+ create_iaid(struct iaid_table *iaidtab, int num_device)
  {
- 	struct tm brokendown_time;
-@@ -140,7 +140,7 @@
- 		for (i = 0; i < lease_hash_table->hash_size; i++) {
- 			element = lease_hash_table->hash_list[i];
- 			while (element) {
--				if (write_lease((struct dhcp6_lease *)element->data, 
-+				if (write_6_lease((struct dhcp6_lease *)element->data, 
- 							sync_file) < 0) {
- 					dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
- 					return (NULL);
-@@ -152,7 +152,7 @@
- 		struct dhcp6_lease *lv, *lv_next;
- 		for (lv = TAILQ_FIRST(&client6_iaidaddr.lease_list); lv; lv = lv_next) {
- 			lv_next = TAILQ_NEXT(lv, link);
--			if (write_lease(lv, sync_file) < 0)  
-+			if (write_6_lease(lv, sync_file) < 0)  
- 				dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
- 		}
- 	}
-@@ -354,8 +354,8 @@
- get_linklocal(const char *ifname,
- 	      struct in6_addr *linklocal)
- {	
--	struct ifaddrs *ifa, *ifap;
--	struct sockaddr *sd;
-+	struct ifaddrs *ifa=0, *ifap=0;
-+	struct sockaddr *sd=0;
- 	if (getifaddrs(&ifap) < 0) {
- 		dprintf(LOG_ERR, "getifaddrs error");
+ 	struct iaid_table *temp = iaidtab;
+-	struct ifaddrs *ifa=0L, *ifap=0L;
++	struct ifaddrs *ifap=0L,*ifa=0L;
+ 	int i;
+ 	
+ 	if ( getifaddrs( &ifap ) != 0 )
+@@ -709,7 +740,7 @@
  		return -1;
---- dhcp-0.10/libdhcp6client/dhcp6c.c.libdhcp6client	2006-05-25 15:15:21.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-05-25 15:16:05.000000000 -0400
+ 	}
+ 
+-	for (i=0, ifa = ifap; 
++	for (i=0, ifa=ifap; 
+ 	     (ifa != 0L) && ( i < MAX_DEVICE );
+ 	     i++, ifa = ifa->ifa_next
+ 	    )
+--- dhcp-0.10/libdhcp6client/dhcp6c.c.libdhcp6client	2006-06-08 20:26:20.000000000 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-06-08 20:28:42.000000000 -0400
 @@ -73,6 +73,9 @@
  #include "common.h"
  #include "timer.h"
@@ -273,7 +284,7 @@
  }
  
  static void
-@@ -320,7 +392,9 @@
+@@ -320,13 +392,17 @@
  	char *device;
  {
  	struct addrinfo hints, *res;
@@ -283,7 +294,15 @@
  	int error, on = 1;
  	struct dhcp6_if *ifp;
  	int ifidx;
-@@ -345,7 +419,7 @@
+ //	struct ifaddrs *ifa, *ifap;
+ 	char linklocal[64];
+ 	struct in6_addr lladdr;
++	time_t retry, now;
++	int bound;
+ 	
+ 	ifidx = if_nametoindex(device);
+ 	if (ifidx == 0) {
+@@ -345,7 +421,7 @@
  	if (inet_ntop(AF_INET6, &lladdr, linklocal, sizeof(linklocal)) < 0) {
  		exit(1);
  	}
@@ -292,7 +311,7 @@
  	
  	memset(&hints, 0, sizeof(hints));
  	hints.ai_family = PF_INET6;
-@@ -379,9 +453,9 @@
+@@ -379,14 +455,42 @@
  			FNAME, strerror(errno));
  		exit(1);
  	}
@@ -300,11 +319,48 @@
 +#endif	    
  	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
 -	dprintf(LOG_DEBUG, "res addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
+-	if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) {
+-		dprintf(LOG_ERR, "%s" "bind(inbound): %s",
+-			FNAME, strerror(errno));
+-		exit(1);
 +	dprintf(LOG_INFO, "inbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
- 	if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) {
- 		dprintf(LOG_ERR, "%s" "bind(inbound): %s",
- 			FNAME, strerror(errno));
-@@ -410,18 +484,13 @@
++	
++	/*
++         * If the interface has JUST been brought up, the kernel may not
++	 * have enough time to allow the bind to the linklocal address -
++	 * it will then return EADDRNOTAVAIL. The bind will succeed if
++         * we try again:
++	 */
++	retry = now = time(0);
++	bound = 0;
++	do
++	{
++	    if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) 
++	    {
++		bound = -errno;		    
++		retry = time(0);		
++		if( ( bound != -EADDRNOTAVAIL ) || ( (retry - now) > 5 ))
++		    break;
++		struct timespec tv = { 0,  200000000 };
++		nanosleep(&tv,0);
++	    }else
++	    {
++		bound = 1;
++		break;
++	    }
++	}while( (retry - now) < 5 );
++
++	if( bound < 0 )
++	{
++	    dprintf(LOG_ERR, "%s" "bind(inbound): %s",
++		    FNAME, strerror(-bound));		  
++	    exit(bound);
+ 	}
++
+ 	freeaddrinfo(res);
+ 
+ 	hints.ai_flags = 0;
+@@ -410,18 +514,13 @@
  		exit(1);
  	}
  	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
@@ -324,7 +380,7 @@
  	memset(&hints, 0, sizeof(hints));
  	hints.ai_family = PF_INET6;
  	hints.ai_socktype = SOCK_DGRAM;
-@@ -443,7 +512,7 @@
+@@ -443,7 +542,7 @@
  		exit(1);
  	}
  	ifp->outsock = outsock;
@@ -333,7 +389,7 @@
  	if (signal(SIGHUP, client6_signal) == SIG_ERR) {
  		dprintf(LOG_WARNING, "%s" "failed to set signal: %s",
  			FNAME, strerror(errno));
-@@ -459,6 +528,7 @@
+@@ -459,6 +558,7 @@
  			FNAME, strerror(errno));
  		exit(1);
  	}
@@ -341,7 +397,7 @@
  }
  
  static void
-@@ -487,6 +557,10 @@
+@@ -487,6 +587,10 @@
  	memcpy(&client6_iaidaddr.client6_info.iaidinfo, &ifp->iaidinfo, 
  			sizeof(client6_iaidaddr.client6_info.iaidinfo));
  	duidcpy(&client6_iaidaddr.client6_info.clientid, &client_duid);
@@ -352,7 +408,7 @@
  	/* parse the lease file */
  	strcpy(leasename, PATH_CLIENT6_LEASE);
  	sprintf(iaidstr, "%u", ifp->iaidinfo.iaid);
-@@ -502,6 +576,9 @@
+@@ -502,6 +606,9 @@
  		sync_leases(client6_lease_file, leasename, client6_lease_temp);
  	if (client6_lease_file == NULL)
  		exit(1);
@@ -362,7 +418,7 @@
  	if (!TAILQ_EMPTY(&client6_iaidaddr.lease_list)) {
  //		struct dhcp6_lease *cl;
  		struct dhcp6_listval *lv;
-@@ -527,7 +604,7 @@
+@@ -527,7 +634,7 @@
  		dprintf(LOG_INFO, "no ipv6 addresses are leased by client");
  		exit(0);
  	}
@@ -371,7 +427,7 @@
  	ifp->link_flag |= IFF_RUNNING;
  
  	/* get addrconf prefix from kernel */
-@@ -574,6 +651,11 @@
+@@ -574,6 +681,11 @@
  	else {
  		for (sp = TAILQ_FIRST(&client6_iaidaddr.lease_list); sp; sp = sp_next) { 
  			sp_next = TAILQ_NEXT(sp, link);
@@ -383,7 +439,7 @@
  			if (client6_ifaddrconf(IFADDRCONF_REMOVE, &sp->lease_addr) != 0) 
  				dprintf(LOG_INFO, "%s" "deconfiging address %s failed",
  					FNAME, in6addr2str(&sp->lease_addr.addr, 0));
-@@ -585,6 +667,11 @@
+@@ -585,6 +697,11 @@
  		ev_next = TAILQ_NEXT(ev, link);
  		dhcp6_remove_event(ev);
  	}
@@ -395,7 +451,7 @@
  	/* XXX: check the last dhcpv6 client daemon to restore the original file */
  	{
  		/* restore /etc/radv.conf.bak back to /etc/radvd.conf */
-@@ -624,19 +711,72 @@
+@@ -624,19 +741,72 @@
  static void
  client6_mainloop()
  {
@@ -470,14 +526,14 @@
  		switch (ret) {
  		case -1:
  			if (errno != EINTR) {
-@@ -648,8 +788,36 @@
+@@ -648,8 +818,36 @@
  		case 0:	/* timeout */
  			break;	/* dhcp6_check_timer() will treat the case */
  		default: /* received a packet */
 +		        dprintf(LOG_DEBUG,"client_recv");
  			client6_recv();
 +			
-+		}
+ 		}
 +#ifdef LIBDHCP
 +		if ( libdhcp_control )
 +		{
@@ -502,12 +558,12 @@
 +			    );
 +			return;
 +		    }
- 		}
++		}
 +#endif
  	}
  }
  
-@@ -676,6 +844,7 @@
+@@ -676,6 +874,7 @@
  
  	switch(ev->state) {
  	case DHCP6S_INIT:
@@ -515,7 +571,7 @@
  		/* From INIT state client could
  		 * go to CONFIRM state if the client reboots;
  		 * go to RELEASE state if the client issues a release;
-@@ -715,6 +884,7 @@
+@@ -715,6 +914,7 @@
  			ev->state = DHCP6S_SOLICIT;
  		dhcp6_set_timeoparam(ev);
  	case DHCP6S_SOLICIT:
@@ -523,7 +579,7 @@
  		if (ifp->servers) {
  			ifp->current_server = select_server(ifp);
  			if (ifp->current_server == NULL) {
-@@ -725,7 +895,7 @@
+@@ -725,7 +925,7 @@
  			}
  			/* if get the address assginment break */
  			if (!TAILQ_EMPTY(&client6_iaidaddr.lease_list)) {
@@ -532,7 +588,7 @@
  				return (NULL);
  			}
  			ev->timeouts = 0;
-@@ -733,14 +903,21 @@
+@@ -733,14 +933,21 @@
  			dhcp6_set_timeoparam(ev);
  		}
  	case DHCP6S_INFOREQ:
@@ -554,7 +610,7 @@
  		if (!TAILQ_EMPTY(&request_list))
  			client6_send(ev);
  		else {
-@@ -822,9 +999,11 @@
+@@ -822,9 +1029,11 @@
  
  	switch(ev->state) {
  	case DHCP6S_SOLICIT:
@@ -566,7 +622,7 @@
  		if (ifp->current_server == NULL) {
  			dprintf(LOG_ERR, "%s" "assumption failure", FNAME);
  			exit(1); /* XXX */
-@@ -832,6 +1011,7 @@
+@@ -832,6 +1041,7 @@
  		dh6->dh6_msgtype = DH6_REQUEST;
  		break;
  	case DHCP6S_RENEW:
@@ -574,7 +630,7 @@
  		if (ifp->current_server == NULL) {
  			dprintf(LOG_ERR, "%s" "assumption failure", FNAME);
  			exit(1); /* XXX */
-@@ -839,6 +1019,7 @@
+@@ -839,6 +1049,7 @@
  		dh6->dh6_msgtype = DH6_RENEW;
  		break;
  	case DHCP6S_DECLINE:
@@ -582,7 +638,7 @@
  		if (ifp->current_server == NULL) {
  			dprintf(LOG_ERR, "%s" "assumption failure", FNAME);
  			exit(1); /* XXX */
-@@ -846,15 +1027,19 @@
+@@ -846,15 +1057,19 @@
  		dh6->dh6_msgtype = DH6_DECLINE;
  		break;
  	case DHCP6S_INFOREQ:	
@@ -602,7 +658,7 @@
  		dh6->dh6_msgtype = DH6_RELEASE;
  		break;
  	default:
-@@ -990,12 +1175,34 @@
+@@ -990,12 +1205,34 @@
  			/* XXX: allow the other emtpy list ?? */
  		}
  		if (client6_request_flag & CLIENT6_RELEASE_ADDR) {
@@ -637,7 +693,7 @@
  		}
  		break;
  	default:
-@@ -1039,20 +1246,22 @@
+@@ -1039,20 +1276,22 @@
  			memcpy(&dst, res->ai_addr, res->ai_addrlen);
  			break;
  		}
@@ -663,7 +719,7 @@
  		dhcp6msgstr(dh6->dh6_msgtype),
  		addr2str((struct sockaddr *)&dst));
  
-@@ -1076,6 +1285,7 @@
+@@ -1076,6 +1315,7 @@
  	struct cmsghdr *cm;
  	struct in6_pktinfo *pi = NULL;
  
@@ -671,7 +727,7 @@
  	memset(&iov, 0, sizeof(iov));
  	memset(&mhdr, 0, sizeof(mhdr));
  
-@@ -1133,9 +1343,11 @@
+@@ -1133,9 +1373,11 @@
  
  	switch(dh6->dh6_msgtype) {
  	case DH6_ADVERTISE:
@@ -683,7 +739,7 @@
  		(void)client6_recvreply(ifp, dh6, len, &optinfo);
  		break;
  	default:
-@@ -1144,7 +1356,6 @@
+@@ -1144,7 +1386,6 @@
  			addr2str((struct sockaddr *)&from));
  		break;
  	}
@@ -691,7 +747,7 @@
  	dhcp6_clear_options(&optinfo);
  	return;
  }
-@@ -1255,7 +1466,22 @@
+@@ -1255,7 +1496,22 @@
  	/* if the client send preferred addresses reqeust in SOLICIT */
  	/* XXX: client might have some local policy to select the addresses */
  	if (!TAILQ_EMPTY(&optinfo0->addr_list))
@@ -714,7 +770,7 @@
  	return 0;
  }
  
-@@ -1343,6 +1569,7 @@
+@@ -1343,6 +1599,7 @@
  	int addr_status_code = DH6OPT_STCODE_UNSPECFAIL;
  	struct dhcp6_serverinfo *newserver;
  	int newstate = 0;
@@ -722,7 +778,7 @@
  	/* find the corresponding event based on the received xid */
  	dprintf(LOG_DEBUG, "%s" "reply message XID is (%x)",
  		FNAME, ntohl(dh6->dh6_xid) & DH6_XIDMASK);
-@@ -1366,13 +1593,16 @@
+@@ -1366,13 +1623,16 @@
  		dprintf(LOG_INFO, "%s" "no server ID option", FNAME);
  		return -1;
  	}
@@ -740,7 +796,7 @@
  		newserver = allocate_newserver(ifp, optinfo);
  		if (newserver == NULL)
  			return (-1);
-@@ -1395,11 +1625,13 @@
+@@ -1395,11 +1655,13 @@
  		dprintf(LOG_INFO, "%s" "client DUID mismatch", FNAME);
  		return -1;
  	}
@@ -758,7 +814,7 @@
  	/*
  	 * The client MAY choose to report any status code or message from the
  	 * status code option in the Reply message.
-@@ -1426,7 +1658,7 @@
+@@ -1426,7 +1688,7 @@
  	switch (addr_status_code) {
  	case DH6OPT_STCODE_UNSPECFAIL:
  	case DH6OPT_STCODE_USEMULTICAST:
@@ -767,7 +823,7 @@
  			dhcp6_stcodestr(addr_status_code));
  		/* retransmit the message with multicast address */
  		/* how many time allow the retransmission with error status code? */
-@@ -1441,6 +1673,7 @@
+@@ -1441,6 +1703,7 @@
  	 */
  	switch (ev->state) {
  	case DHCP6S_SOLICIT:
@@ -775,7 +831,7 @@
  		if (optinfo->iaidinfo.iaid == 0)
  			break;
  		else if (!optinfo->flags & DHCIFF_RAPID_COMMIT) {
-@@ -1448,6 +1681,7 @@
+@@ -1448,6 +1711,7 @@
  			break;
  		}
  	case DHCP6S_REQUEST:
@@ -783,7 +839,7 @@
  		/* NotOnLink: 1. SOLICIT 
  		 * NoAddrAvail: Information Request */
  		switch(addr_status_code) {
-@@ -1468,32 +1702,57 @@
+@@ -1468,32 +1732,57 @@
  		case DH6OPT_STCODE_SUCCESS:
  		case DH6OPT_STCODE_UNDEFINE:
  		default:
@@ -844,7 +900,7 @@
  			break;
  		case DH6OPT_STCODE_NOADDRAVAIL:
  		case DH6OPT_STCODE_NOPREFIXAVAIL:
-@@ -1504,11 +1763,26 @@
+@@ -1504,11 +1793,26 @@
  		default:
  			dhcp6_update_iaidaddr(optinfo, ADDR_UPDATE);
  			if (optinfo->type == IAPD)
@@ -871,7 +927,7 @@
  		/* NOtOnLink for a Confirm, send SOLICIT message */
  rebind_confirm:	client6_request_flag &= ~CLIENT6_CONFIRM_ADDR;
  	switch(addr_status_code) {
-@@ -1526,6 +1800,7 @@
+@@ -1526,6 +1830,7 @@
  			break;
  		case DH6OPT_STCODE_SUCCESS:
  		case DH6OPT_STCODE_UNDEFINE:
@@ -879,7 +935,7 @@
  			/* XXX: set up renew/rebind timer */
  			dprintf(LOG_DEBUG, "%s" "got an expected reply for confirm", FNAME);
  			ftime(&now);
-@@ -1548,7 +1823,7 @@
+@@ -1548,7 +1853,7 @@
  			if ( offset > client6_iaidaddr.client6_info.iaidinfo.renewtime) 
  				timo.tv_sec = 0;
  			else
@@ -888,7 +944,7 @@
  			timo.tv_usec = 0;
  			dhcp6_set_timer(&timo, client6_iaidaddr.timer);
  			/* check DAD */
-@@ -1564,6 +1839,7 @@
+@@ -1564,6 +1869,7 @@
  		}
  		break;
  	case DHCP6S_DECLINE:
@@ -896,7 +952,7 @@
  		/* send REQUEST message to server with none decline address */
  		dprintf(LOG_DEBUG, "%s" 
  		    "got an expected reply for decline, sending request.", FNAME);
-@@ -1572,6 +1848,7 @@
+@@ -1572,6 +1878,7 @@
  		newstate = DHCP6S_REQUEST;
  		break;
  	case DHCP6S_RELEASE:
@@ -904,7 +960,7 @@
  		dprintf(LOG_INFO, "%s" "got an expected release, exit.", FNAME);
  		dhcp6_remove_event(ev);
  		exit(0);
-@@ -1593,6 +1870,8 @@
+@@ -1593,6 +1900,8 @@
  	int state;
  {
  	struct dhcp6_event *ev;
@@ -913,7 +969,7 @@
  	if ((ev = dhcp6_create_event(ifp, state)) == NULL) {
  		dprintf(LOG_ERR, "%s" "failed to create an event",
  			FNAME);
-@@ -1651,6 +1930,11 @@
+@@ -1651,6 +1960,11 @@
  		/* config the interface for reboot */
  		if (reboot && client6_iaidaddr.client6_info.type != IAPD && 
  		    (client6_request_flag & CLIENT6_CONFIRM_ADDR)) {
@@ -925,7 +981,7 @@
  			if (client6_ifaddrconf(IFADDRCONF_ADD, &cl->lease_addr) != 0) {
  				dprintf(LOG_INFO, "config address failed: %s",
  					in6addr2str(&cl->lease_addr.addr, 0));
-@@ -1661,6 +1945,11 @@
+@@ -1661,6 +1975,11 @@
  	/* update radvd.conf for prefix delegation */
  	if (reboot && client6_iaidaddr.client6_info.type == IAPD &&
  	    (client6_request_flag & CLIENT6_CONFIRM_ADDR))
@@ -937,7 +993,7 @@
  		radvd_parse(&client6_iaidaddr, ADDR_UPDATE);
  	return (0);
  }
-@@ -1752,8 +2041,9 @@
+@@ -1752,8 +2071,9 @@
  	int newstate;
  	dprintf(LOG_DEBUG, "enter checking link ...");
  	strncpy(ifr.ifr_name, dhcp6_if->ifname, IFNAMSIZ);
@@ -948,7 +1004,7 @@
  		goto settimer;
  	}
  	if (ifr.ifr_flags & IFF_RUNNING) {
-@@ -1795,29 +2085,48 @@
+@@ -1795,29 +2115,48 @@
  setup_interface(char *ifname)
  {
  	struct ifreq ifr;
@@ -1014,8 +1070,175 @@
  	}
  	return;
  }
+--- /dev/null	2006-06-08 19:51:50.818060750 -0400
++++ dhcp-0.10/libdhcp6client/libdhcp_control.h	2006-06-08 20:26:36.000000000 -0400
+@@ -0,0 +1,104 @@
++/* libdhcp_control.h
++ *
++ *  DHCP client control API for libdhcp, a minimal interface to the
++ *  ISC dhcp IPv4 client libdhcp4client library,
++ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
++ *
++ *  Each DHCP client library must include this file to be controlled
++ *  by libdhcp.
++ *
++ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation at 
++ *           http://www.fsf.org/licensing/licenses/gpl.txt
++ *  and included in this software distribution as the "LICENSE" file.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ */
++#ifndef LIBDHCP_CONTROL_H
++#define LIBDHCP_CONTROL_H
++
++#include <stdint.h>
++#include <stdarg.h>
++
++#define  LOG_FATAL 8
++
++enum dhcp_state_e;
++struct libdhcp_control_s;
++
++typedef
++int ( *LIBDHCP_Error_Handler )
++    ( struct libdhcp_control_s *ctl,
++      int priority,  /* ala syslog(3): LOG_EMERG=0 - LOG_DEBUG=7 (+ LOG_FATAL=8 : finished -> 1)   */
++      const char *fmt,
++      va_list ap
++    );
++
++typedef 
++int ( *LIBDHCP_Callback ) ( struct libdhcp_control_s *control, enum dhcp_state_e, void* );
++    /* The DHCP clients will call the users' callback on important state change events,
++     * with the second arg set to the client DHCP_State, and the third arg set to
++     * a client specific pointer as described below.
++     */
++
++typedef 
++struct libdhcp_control_s
++{
++    LIBDHCP_Callback    callback;    	/* the DHCP clients' main loop calls this on state changes */
++    uint16_t            capability;     /* LIBDHCP_Capability bits to enable                       */
++    uint8_t             finished;       /* set to one to make clients exit their main loop         */
++    uint8_t             decline;        /* set to one to decline the lease (DHCPv4 only)           */
++    time_t              timeout;        /* (timeout+now) == time after which clients MUST return   */
++    time_t              now;            /* clients set this to time(0) on entering main loop       */
++    void               *arg;            /* user data pointer                                       */
++    LIBDHCP_Error_Handler eh;
++} LIBDHCP_Control;
++
++typedef enum dhcp_state_e
++{
++
++    /* DHCPv4 client states - third callback arg will be a 'struct client_state *'    */
++    DHC4_NBI,         		/* failed: no broadcast interfaces found              */
++    DHC4_PREINIT, 		/* configuration started - bring the interface "UP"   */
++    DHC4_BOUND, 		/* lease obtained                                     */
++    DHC4_RENEW, 		/* lease renewed                                      */
++    DHC4_REBOOT,	        /* have valid lease, but now obtained a different one */
++    DHC4_REBIND, 		/* new, different lease                               */
++    DHC4_STOP,  		/* remove old lease                                   */
++    DHC4_MEDIUM, 		/* media selection begun                              */
++    DHC4_TIMEOUT, 		/* timed out contacting DHCP server                   */
++    DHC4_FAIL, 			/* all attempts to contact server timed out, sleeping */
++    DHC4_EXPIRE, 		/* lease has expired, renewing                        */
++    DHC4_RELEASE, 		/* releasing lease                                    */
++    /* This state raised by both clients: */
++    DHC_TIMEDOUT,               /* libdhcp_control timeout has been exceeded          */
++    /* DHCPv6 client states:    */
++    DHC6_BOUND,                 /* new lease obtained             - arg is optinfo *  */
++    DHC6_REBIND,                /* existing expired lease rebound - arg is optinfo *  */
++    DHC6_RELEASE                /* existing lease expired         - arg is dhcp6_iaidaddr*/
++} DHCP_State;
++
++typedef enum libdhcp_capability_e
++{/* DHCP client "capabilities" */ 
++    DHCP_USE_LEASE_DATABASE   = 1,  	/* use / do not use persistent lease database files */
++    DHCP_USE_PID_FILE         = 2,  	/* use / do not use pid file                        */
++ /*
++  * DHCPv6 supports these capabilities in process, 
++  * while the DHCPv4 client will fork and exec the dhclient-script to implement them if these
++  * bits are set - otherwise, if no bits are set, the callback is called and the script is 
++  * not run.
++  */
++    DHCP_CONFIGURE_INTERFACES = 4,  	/* configure interfaces UP/DOWN as required         */
++    DHCP_CONFIGURE_ADDRESSES  = 8,  	/* configure interface addresses as required        */
++    DHCP_CONFIGURE_ROUTES     =16,  	/* configure routes as required                     */
++    DHCP_CONFIGURE_RESOLVER   =32,  	/* configure resolv.conf as required                */
++    /* DHCPv6 only: */
++    DHCP_CONFIGURE_RADVD      =64,  	/* configure radvd.conf & restart radvd as required */
++} LIBDHCP_Capability;
++
++#endif
+--- /dev/null	2006-06-08 19:51:50.818060750 -0400
++++ dhcp-0.10/libdhcp6client/dhc6_alloc.h	2006-06-08 20:26:36.000000000 -0400
+@@ -0,0 +1,17 @@
++
++extern void *dhc6_alloc( size_t );
++extern void *dhc6_realloc(void *, size_t);
++extern void *dhc6_calloc(size_t, size_t);
++extern char *dhc6_strdup(char *str);
++extern void dhc6_free( void *);
++extern void dhc6_free_all_pointers(void);
++#undef malloc
++#define malloc( size ) dhc6_alloc( size )
++#undef realloc
++#define realloc(ptr, size) dhc6_realloc(ptr, size)
++#undef calloc
++#define calloc(n, size) dhc6_calloc(n, size)
++#undef free
++#define free( ptr ) dhc6_free( ptr )
++#undef strdup
++#define strdup( str ) dhc6_strdup( str )
+--- dhcp-0.10/libdhcp6client/lease.c.libdhcp6client	2004-03-03 15:11:16.000000000 -0500
++++ dhcp-0.10/libdhcp6client/lease.c	2006-06-08 20:26:36.000000000 -0400
+@@ -64,7 +64,7 @@
+ static int init_lease_hashes __P((void));
+ 
+ int 
+-write_lease(const struct dhcp6_lease *lease_ptr,
++write_6_lease(const struct dhcp6_lease *lease_ptr,
+ 	    FILE *file)
+ {
+ 	struct tm brokendown_time;
+@@ -140,7 +140,7 @@
+ 		for (i = 0; i < lease_hash_table->hash_size; i++) {
+ 			element = lease_hash_table->hash_list[i];
+ 			while (element) {
+-				if (write_lease((struct dhcp6_lease *)element->data, 
++				if (write_6_lease((struct dhcp6_lease *)element->data, 
+ 							sync_file) < 0) {
+ 					dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
+ 					return (NULL);
+@@ -152,7 +152,7 @@
+ 		struct dhcp6_lease *lv, *lv_next;
+ 		for (lv = TAILQ_FIRST(&client6_iaidaddr.lease_list); lv; lv = lv_next) {
+ 			lv_next = TAILQ_NEXT(lv, link);
+-			if (write_lease(lv, sync_file) < 0)  
++			if (write_6_lease(lv, sync_file) < 0)  
+ 				dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
+ 		}
+ 	}
+@@ -354,8 +354,8 @@
+ get_linklocal(const char *ifname,
+ 	      struct in6_addr *linklocal)
+ {	
+-	struct ifaddrs *ifa, *ifap;
+-	struct sockaddr *sd;
++	struct ifaddrs *ifa=0, *ifap=0;
++	struct sockaddr *sd=0;
+ 	if (getifaddrs(&ifap) < 0) {
+ 		dprintf(LOG_ERR, "getifaddrs error");
+ 		return -1;
 --- dhcp-0.10/libdhcp6client/lease.h.libdhcp6client	2003-07-01 22:21:25.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/lease.h	2006-05-25 15:16:05.000000000 -0400
++++ dhcp-0.10/libdhcp6client/lease.h	2006-06-08 20:26:36.000000000 -0400
 @@ -101,7 +101,7 @@
  extern FILE *init_leases __P((const char *));
  extern void lease_parse __P((FILE *));
@@ -1025,20 +1248,78 @@
  extern FILE *sync_leases __P((FILE *, const char *, char *));
  extern struct dhcp6_timer *syncfile_timo __P((void *));
  extern unsigned int addr_hash __P((const void *));
---- dhcp-0.10/libdhcp6client/lease_token.l.libdhcp6client	2004-02-04 18:29:24.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/lease_token.l	2006-05-25 15:16:05.000000000 -0400
-@@ -241,6 +241,9 @@
- 	
- 	fseek(file, 0, 0);
- 	yyin = file;
-+	yy_init=1;
-+	yy_start=0;
-+	yy_current_buffer=0;
- 	yylex(); 
- 	return;
- }
---- dhcp-0.10/libdhcp6client/common.c.libdhcp6client	2006-05-25 15:15:22.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/common.c	2006-05-25 15:16:05.000000000 -0400
+--- /dev/null	2006-06-08 19:51:50.818060750 -0400
++++ dhcp-0.10/libdhcp6client/dhc6_alloc.c	2006-06-08 20:26:36.000000000 -0400
+@@ -0,0 +1,67 @@
++#include <malloc.h>
++#include <search.h>
++extern void tdestroy (void *root, void (*free_node)(void *nodep));
++void *ifp_ptr;
++
++static void *ptr_tree=0L;
++
++static int ptr_comparator( const void *p1, const void *p2 )
++{
++    return
++	(  (p1 == p2) 
++	   ? 0
++	   :( (p1 > p2)
++	      ? 1
++	      : -1
++	    )
++	);
++}
++
++void *dhc6_alloc( size_t s )
++{
++    void *ptr = malloc( s );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++void *dhc6_realloc( void *ptr, size_t s )
++{
++    void *ptr2 = realloc(ptr, s);
++    if ( ptr2 != 0 )
++    {
++	if ( ptr != 0 )
++	    tdelete(ptr,&(ptr_tree), ptr_comparator);
++	tsearch(ptr2, &(ptr_tree), ptr_comparator);
++    }
++    return ptr2;
++}
++
++void *dhc6_calloc( size_t n, size_t s )
++{
++    void *ptr = calloc( n, s );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++char *dhc6_strdup( char *str )
++{
++    char *ptr = strdup( str );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++void dhc6_free( void *ptr )
++{
++    free(ptr);
++    tdelete(ptr, &(ptr_tree), ptr_comparator);
++}
++
++void dhc6_free_all_pointers(void)
++{
++    if( ptr_tree != 0L )
++	tdestroy(ptr_tree, free);
++    ptr_tree = 0L;
++}
+--- dhcp-0.10/libdhcp6client/common.c.libdhcp6client	2006-06-08 20:26:21.000000000 -0400
++++ dhcp-0.10/libdhcp6client/common.c	2006-06-08 20:26:36.000000000 -0400
 @@ -79,11 +79,19 @@
  #include "timer.h"
  #include "lease.h"
@@ -1164,162 +1445,8 @@
  
  	if (foreground && debug_thresh >= level) {
  		time_t now;
---- dhcp-0.10/libdhcp6client/client6_addr.c.libdhcp6client	2006-05-25 15:15:22.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/client6_addr.c	2006-05-25 15:16:05.000000000 -0400
-@@ -56,6 +56,10 @@
- #include "timer.h"
- #include "lease.h"
- 
-+#ifdef LIBDHCP
-+#include "libdhcp_control.h"
-+#endif
-+
- static int dhcp6_update_lease __P((struct dhcp6_addr *, struct dhcp6_lease *));
- static int dhcp6_add_lease __P((struct dhcp6_addr *));
- struct dhcp6_lease *dhcp6_find_lease __P((struct dhcp6_iaidaddr *, 
-@@ -217,7 +221,7 @@
- 	sp->iaidaddr = &client6_iaidaddr;
- 	time(&sp->start_date);
- 	sp->state = ACTIVE;
--	if (write_lease(sp, client6_lease_file) != 0) {
-+	if (client6_lease_file && (write_6_lease(sp, client6_lease_file) != 0)) {
- 		dprintf(LOG_ERR, "%s" "failed to write a new lease address %s to lease file", 
- 			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
- 		if (sp->timer)
-@@ -228,14 +232,24 @@
- 	if (sp->lease_addr.type == IAPD) {
- 		dprintf(LOG_INFO, "request prefix is %s/%d", 
- 			in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen);
--	} else if (client6_ifaddrconf(IFADDRCONF_ADD, addr) != 0) {
--		dprintf(LOG_ERR, "%s" "adding address failed: %s",
--		    FNAME, in6addr2str(&addr->addr, 0));
--		if (sp->timer)
-+	} else 
-+#ifdef LIBDHCP
-+                if (  libdhcp_control
-+                   &&(libdhcp_control->capability & DHCP_CONFIGURE_ADDRESSES)
-+                   )
-+                {
-+#endif
-+	        if (client6_ifaddrconf(IFADDRCONF_ADD, addr) != 0) {
-+		    dprintf(LOG_ERR, "%s" "adding address failed: %s",
-+			    FNAME, in6addr2str(&addr->addr, 0));
-+		    if (sp->timer)
- 			dhcp6_remove_timer(sp->timer);
--		free(sp);
--		return (-1);
--	}
-+		    free(sp);
-+		    return (-1);
-+		}
-+#ifdef LIBDHCP
-+		}
-+#endif
- 	TAILQ_INSERT_TAIL(&client6_iaidaddr.lease_list, sp, link);
- 	/* for infinite lifetime don't do any timer */
- 	if (sp->lease_addr.validlifetime == DHCP6_DURATITION_INFINITE || 
-@@ -282,7 +296,12 @@
- 	dprintf(LOG_DEBUG, "%s" "removing address %s", FNAME,
- 		in6addr2str(&sp->lease_addr.addr, 0));
- 	sp->state = INVALID;
--	if (write_lease(sp, client6_lease_file) != 0) {
-+#ifdef LIBDHCP
-+	if (  libdhcp_control
-+	    &&(libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)
-+	   )
-+#endif
-+	if (write_6_lease(sp, client6_lease_file) != 0) {
- 		dprintf(LOG_INFO, "%s" 
- 			"failed to write removed lease address %s to lease file", 
- 			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
-@@ -294,10 +313,17 @@
- 			in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen);
- 		/* XXX: remove from the update prefix list */
- 
--	} else if (client6_ifaddrconf(IFADDRCONF_REMOVE, &sp->lease_addr) != 0) {
-+	} else
-+#ifdef LIBDHCP
-+	if (  libdhcp_control
-+	    &&(libdhcp_control->capability & DHCP_CONFIGURE_ADDRESSES)
-+	   )
-+#endif
-+
-+	    if (client6_ifaddrconf(IFADDRCONF_REMOVE, &sp->lease_addr) != 0) {
- 			dprintf(LOG_INFO, "%s" "removing address %s failed",
- 		    		FNAME, in6addr2str(&sp->lease_addr.addr, 0));
--	}
-+	    }
- 	/* remove expired timer for this lease. */
- 	if (sp->timer)
- 		dhcp6_remove_timer(sp->timer);
-@@ -446,7 +472,12 @@
- 	memcpy(&sp->lease_addr, addr, sizeof(sp->lease_addr));
- 	sp->state = ACTIVE;
- 	time(&sp->start_date);
--	if (write_lease(sp, client6_lease_file) != 0) {
-+#ifdef LIBDHCP
-+	if (  libdhcp_control
-+	    &&(libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)
-+	   )
-+#endif
-+	if (write_6_lease(sp, client6_lease_file) != 0) {
- 		dprintf(LOG_ERR, "%s" 
- 			"failed to write an updated lease address %s to lease file", 
- 			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
-@@ -670,7 +701,7 @@
- 		return (-1);
- 	}
- 
--	dprintf(LOG_DEBUG, "%s" "%s an address %s on %s", FNAME, cmdstr,
-+	dprintf(LOG_INFO, "%s" "%s an address %s on %s", FNAME, cmdstr,
- 	    in6addr2str(&ifaddr->addr, 0), ifp->ifname);
- 	close(s); 
- 	return (0);
-@@ -700,7 +731,7 @@
- create_iaid(struct iaid_table *iaidtab, int num_device)
- {
- 	struct iaid_table *temp = iaidtab;
--	struct ifaddrs *ifa=0L, *ifap=0L;
-+	struct ifaddrs *ifap=0L,*ifa=0L;
- 	int i;
- 	
- 	if ( getifaddrs( &ifap ) != 0 )
-@@ -709,7 +740,7 @@
- 		return -1;
- 	}
- 
--	for (i=0, ifa = ifap; 
-+	for (i=0, ifa=ifap; 
- 	     (ifa != 0L) && ( i < MAX_DEVICE );
- 	     i++, ifa = ifa->ifa_next
- 	    )
---- /dev/null	2006-05-25 22:22:05.828072250 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6client.h	2006-05-25 15:16:05.000000000 -0400
-@@ -0,0 +1,22 @@
-+/* dhcp6client.h
-+ *
-+ *  Interface to the DHCPv6 client libdhcp6client library.
-+ *
-+ *
-+ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at
-+ *           http://www.fsf.org/licensing/licenses/gpl.txt
-+ *  and included in this software distribution as the "LICENSE" file.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ */
-+struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
-+
-+extern int dhcpv6_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
-+/* the DHCPv6 client main() function */
---- dhcp-0.10/libdhcp6client/dhcp6.h.libdhcp6client	2006-05-25 15:15:22.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6.h	2006-05-25 15:16:05.000000000 -0400
+--- dhcp-0.10/libdhcp6client/dhcp6.h.libdhcp6client	2006-06-08 20:26:21.000000000 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6.h	2006-06-08 20:26:36.000000000 -0400
 @@ -116,9 +116,24 @@
  
  typedef enum { IANA, IATA, IAPD} iatype_t;
@@ -1346,23 +1473,19 @@
  /* Internal data structure */
  
  struct duid {
---- /dev/null	2006-05-25 22:22:05.828072250 -0400
-+++ dhcp-0.10/libdhcp6client/libdhcp_control.h	2006-05-25 15:16:05.000000000 -0400
-@@ -0,0 +1,104 @@
-+/* libdhcp_control.h
+--- /dev/null	2006-06-08 19:51:50.818060750 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6client.h	2006-06-08 20:26:36.000000000 -0400
+@@ -0,0 +1,22 @@
++/* dhcp6client.h
 + *
-+ *  DHCP client control API for libdhcp, a minimal interface to the
-+ *  ISC dhcp IPv4 client libdhcp4client library,
-+ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
++ *  Interface to the DHCPv6 client libdhcp6client library.
 + *
-+ *  Each DHCP client library must include this file to be controlled
-+ *  by libdhcp.
 + *
 + *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
 + *
 + *  This program is free software; you can redistribute it and/or modify
 + *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at 
++ *  the Free Software Foundation at
 + *           http://www.fsf.org/licensing/licenses/gpl.txt
 + *  and included in this software distribution as the "LICENSE" file.
 + *
@@ -1371,85 +1494,7 @@
 + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *  GNU General Public License for more details.
 + */
-+#ifndef LIBDHCP_CONTROL_H
-+#define LIBDHCP_CONTROL_H
-+
-+#include <stdint.h>
-+#include <stdarg.h>
-+
-+#define  LOG_FATAL 8
-+
-+enum dhcp_state_e;
-+struct libdhcp_control_s;
-+
-+typedef
-+int ( *LIBDHCP_Error_Handler )
-+    ( struct libdhcp_control_s *ctl,
-+      int priority,  /* ala syslog(3): LOG_EMERG=0 - LOG_DEBUG=7 (+ LOG_FATAL=8 : finished -> 1)   */
-+      const char *fmt,
-+      va_list ap
-+    );
-+
-+typedef 
-+int ( *LIBDHCP_Callback ) ( struct libdhcp_control_s *control, enum dhcp_state_e, void* );
-+    /* The DHCP clients will call the users' callback on important state change events,
-+     * with the second arg set to the client DHCP_State, and the third arg set to
-+     * a client specific pointer as described below.
-+     */
-+
-+typedef 
-+struct libdhcp_control_s
-+{
-+    LIBDHCP_Callback    callback;    	/* the DHCP clients' main loop calls this on state changes */
-+    uint16_t            capability;     /* LIBDHCP_Capability bits to enable                       */
-+    uint8_t             finished;       /* set to one to make clients exit their main loop         */
-+    uint8_t             decline;        /* set to one to decline the lease (DHCPv4 only)           */
-+    time_t              timeout;        /* (timeout+now) == time after which clients MUST return   */
-+    time_t              now;            /* clients set this to time(0) on entering main loop       */
-+    void               *arg;            /* user data pointer                                       */
-+    LIBDHCP_Error_Handler eh;
-+} LIBDHCP_Control;
-+
-+typedef enum dhcp_state_e
-+{
-+
-+    /* DHCPv4 client states - third callback arg will be a 'struct client_state *'    */
-+    DHC4_NBI,         		/* failed: no broadcast interfaces found              */
-+    DHC4_PREINIT, 		/* configuration started - bring the interface "UP"   */
-+    DHC4_BOUND, 		/* lease obtained                                     */
-+    DHC4_RENEW, 		/* lease renewed                                      */
-+    DHC4_REBOOT,	        /* have valid lease, but now obtained a different one */
-+    DHC4_REBIND, 		/* new, different lease                               */
-+    DHC4_STOP,  		/* remove old lease                                   */
-+    DHC4_MEDIUM, 		/* media selection begun                              */
-+    DHC4_TIMEOUT, 		/* timed out contacting DHCP server                   */
-+    DHC4_FAIL, 			/* all attempts to contact server timed out, sleeping */
-+    DHC4_EXPIRE, 		/* lease has expired, renewing                        */
-+    DHC4_RELEASE, 		/* releasing lease                                    */
-+    /* This state raised by both clients: */
-+    DHC_TIMEDOUT,               /* libdhcp_control timeout has been exceeded          */
-+    /* DHCPv6 client states:    */
-+    DHC6_BOUND,                 /* new lease obtained             - arg is optinfo *  */
-+    DHC6_REBIND,                /* existing expired lease rebound - arg is optinfo *  */
-+    DHC6_RELEASE                /* existing lease expired         - arg is dhcp6_iaidaddr*/
-+} DHCP_State;
-+
-+typedef enum libdhcp_capability_e
-+{/* DHCP client "capabilities" */ 
-+    DHCP_USE_LEASE_DATABASE   = 1,  	/* use / do not use persistent lease database files */
-+    DHCP_USE_PID_FILE         = 2,  	/* use / do not use pid file                        */
-+ /*
-+  * DHCPv6 supports these capabilities in process, 
-+  * while the DHCPv4 client will fork and exec the dhclient-script to implement them if these
-+  * bits are set - otherwise, if no bits are set, the callback is called and the script is 
-+  * not run.
-+  */
-+    DHCP_CONFIGURE_INTERFACES = 4,  	/* configure interfaces UP/DOWN as required         */
-+    DHCP_CONFIGURE_ADDRESSES  = 8,  	/* configure interface addresses as required        */
-+    DHCP_CONFIGURE_ROUTES     =16,  	/* configure routes as required                     */
-+    DHCP_CONFIGURE_RESOLVER   =32,  	/* configure resolv.conf as required                */
-+    /* DHCPv6 only: */
-+    DHCP_CONFIGURE_RADVD      =64,  	/* configure radvd.conf & restart radvd as required */
-+} LIBDHCP_Capability;
++struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
 +
-+#endif
++extern int dhcpv6_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
++/* the DHCPv6 client main() function */


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dhcpv6.spec	26 May 2006 17:15:50 -0000	1.33
+++ dhcpv6.spec	9 Jun 2006 00:54:12 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 24.1
+Release: 26
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -187,6 +187,11 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Thu Jun 08 2006 Jason Vas Dias<jvdias at redhat.com> 0.10-26
+- libdhcp6client fix to retry bind() to linklocal address
+  on EADDRNOTAVAIL for up to 5 seconds to give kernel time
+  to create linklocal address.
+
 * Fri May 26 2006 Jason Vas Dias<jvdias at redhat.com> 0.10-24.1
 - misc libdhcp6client fixes
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 01:01:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 21:01:35 -0400
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.34,1.35
Message-ID: <200606090101.k5911Z3E015097@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15059

Modified Files:
	dhcpv6.spec 
Log Message:
retry bind() to linklocal on EADDRNOTAVAIL


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dhcpv6.spec	9 Jun 2006 00:54:12 -0000	1.34
+++ dhcpv6.spec	9 Jun 2006 01:01:31 -0000	1.35
@@ -30,7 +30,7 @@
 Patch17: dhcpv6-0.10-htonl.patch
 Patch18: dhcpv6-0.10-libdhcp6client-Makefile.patch
 Prereq: /sbin/chkconfig, /sbin/service
-BuildRequires: flex, bison, openssl-devel
+BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
 
 %{?!NODEBUGINFO: %define NODEBUGINFO 0}
 %if %{NODEBUGINFO}



From fedora-cvs-commits at redhat.com  Fri Jun  9 01:05:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 21:05:14 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.265, 1.266 anaconda.spec, 1.388,
	1.389 sources, 1.386, 1.387
Message-ID: <200606090105.k5915Alg015190@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15156/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.26-1 on branch devel from anaconda-11.1.0.26-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- .cvsignore	8 Jun 2006 21:44:57 -0000	1.265
+++ .cvsignore	9 Jun 2006 01:04:55 -0000	1.266
@@ -1 +1 @@
-anaconda-11.1.0.25.tar.bz2
+anaconda-11.1.0.26.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- anaconda.spec	8 Jun 2006 21:44:57 -0000	1.388
+++ anaconda.spec	9 Jun 2006 01:04:56 -0000	1.389
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.25
+Version: 11.1.0.26
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -84,40 +84,21 @@
 
 %files runtime
 %defattr(-,root,root)
-/usr/lib/anaconda-runtime/*md5
-/usr/lib/anaconda-runtime/*.py*
-/usr/lib/anaconda-runtime/*.so*
-/usr/lib/anaconda-runtime/boot/*.msg
-/usr/lib/anaconda-runtime/boot/syslinux.cfg
-/usr/lib/anaconda-runtime/loader/
-/usr/lib/anaconda-runtime/buildinstall
-/usr/lib/anaconda-runtime/filtermoddeps
-/usr/lib/anaconda-runtime/getkeymaps
-/usr/lib/anaconda-runtime/keymaps-override*
-/usr/lib/anaconda-runtime/mapshdr
-/usr/lib/anaconda-runtime/mk-images*
-/usr/lib/anaconda-runtime/mk-rescueimage*
-/usr/lib/anaconda-runtime/moddeps
-/usr/lib/anaconda-runtime/modlist
-/usr/lib/anaconda-runtime/pkgorder
-/usr/lib/anaconda-runtime/readmap
-/usr/lib/anaconda-runtime/screenfont-i386.gz
-/usr/lib/anaconda-runtime/scrubtree
-/usr/lib/anaconda-runtime/trimmodalias
-/usr/lib/anaconda-runtime/trimpciids
-/usr/lib/anaconda-runtime/upd-instroot
-/usr/lib/anaconda-runtime/yumcache
+/usr/lib/anaconda-runtime
 
 %triggerun -- anaconda < 8.0-1
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 08 2006 Chris Lumens <clumens at redhat.com> 11.1.0.26-1
+- Revert anaconda-runtime files fix.
+
 * Thu Jun 08 2006 Chris Lumens <clumens at redhat.com> 11.1.0.25-1
 - More IPv6 fixes (dcantrell).
 - Add ipv6 kernel module to image (dcantrell).
 - Add noipv6 installer flag (dcantrell).
 - Add dosfstools to requires (katzj).
-- Fix anaconda-runtime spec file segment (#198415, #194237).
+- Fix anaconda-runtime spec file segment (#189415, #194237).
 - Better partitioning error messages (#181571).
 - Warn if non-linux filesystems can't be mounted on upgrade (#185086).
 - Simplify IP address widgets for IPv6 support.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- sources	8 Jun 2006 21:44:57 -0000	1.386
+++ sources	9 Jun 2006 01:04:56 -0000	1.387
@@ -1 +1 @@
-94a3f1cd9c200390da12419aee7f67dd  anaconda-11.1.0.25.tar.bz2
+b616338b8d3a46bf2d68f45bd35347b8  anaconda-11.1.0.26.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 01:15:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 21:15:31 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.4, 1.5 libdhcp.spec, 1.19,
	1.20 sources, 1.15, 1.16
Message-ID: <200606090115.k591FV5W026941@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26918

Modified Files:
	.cvsignore libdhcp.spec sources 
Log Message:
fix issues found by dcantrel during anaconda testing


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 May 2006 18:46:36 -0000	1.4
+++ .cvsignore	9 Jun 2006 01:15:28 -0000	1.5
@@ -1,3 +1,4 @@
 libdhcp-1.0.tar.gz
 libdhcp-1.1.tar.gz
 libdhcp-1.2.tar.gz
+libdhcp-1.3.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libdhcp.spec	7 Jun 2006 18:00:40 -0000	1.19
+++ libdhcp.spec	9 Jun 2006 01:15:28 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.2
-Release: 	2
+Version: 	1.3
+Release: 	1
 License: 	GPL
 Group: 		Development/Libraries
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
@@ -75,6 +75,10 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Thu Jun 08 2006 Jason Vas Dias <jvdias at redhat.com> - 1.3-1
+- Ensure IPv6 module is loaded before invoking dhcpv6_client 
+- fix segfault on free() of uninitialized 'sdns' in dhcp_nic
+
 * Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 1.2-2
 - fix bug 194377: -devel package missing Require:s. 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Jun 2006 16:51:12 -0000	1.15
+++ sources	9 Jun 2006 01:15:28 -0000	1.16
@@ -1 +1 @@
-e2752a7df51e59282f051d1db2731c4c  libdhcp-1.2.tar.gz
+c3477f65c93fcf1861f9f84a6cdd8443  libdhcp-1.3.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:07:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:07:10 -0400
Subject: rpms/libmng/devel libmng.spec,1.27,1.28
Message-ID: <200606090207.k5927AOW004902@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libmng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4834

Modified Files:
	libmng.spec 
Log Message:
Rebuild



Index: libmng.spec
===================================================================
RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libmng.spec	20 Mar 2006 23:26:39 -0000	1.27
+++ libmng.spec	9 Jun 2006 02:07:07 -0000	1.28
@@ -1,6 +1,6 @@
 Name: libmng
 Version: 1.0.9
-Release: 4
+Release: 5
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 License: BSD-like
@@ -63,6 +63,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.9-5
+- Rebuild
+
 * Mon Mar 20 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.9-4
 - enable lcms support (#184526)
 - no longer build a libmng-static package



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:18:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:18:16 -0400
Subject: rpms/libmng/devel libmng.spec,1.28,1.29
Message-ID: <200606090218.k592IG9k022511@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libmng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22400

Modified Files:
	libmng.spec 
Log Message:
fix build reqs



Index: libmng.spec
===================================================================
RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libmng.spec	9 Jun 2006 02:07:07 -0000	1.28
+++ libmng.spec	9 Jun 2006 02:18:13 -0000	1.29
@@ -10,6 +10,7 @@
 BuildRequires: zlib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lcms-devel
+BuildRequires: libtool
 
 %package devel
 Summary: Development files for the Multiple-image Network Graphics library



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:21:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:21:26 -0400
Subject: rpms/ORBit2/devel ORBit2.spec,1.39,1.40
Message-ID: <200606090221.k592LQIF023758@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23666

Modified Files:
	ORBit2.spec 
Log Message:
fix build reqs



Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ORBit2.spec	24 May 2006 20:45:00 -0000	1.39
+++ ORBit2.spec	9 Jun 2006 02:21:24 -0000	1.40
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
 Version: 2.14.0
-Release: 2
+Release: 3
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -13,6 +13,9 @@
 BuildRequires: libIDL-devel >= %{libidl_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pkgconfig >= 0.14
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gtk-doc
 
 %description
@@ -120,6 +123,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
+- Add missing BuildRequires
+
 * Wed May 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
 - Don't rebuild api docs
 - Fix multilib conflicts



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:25:11 -0400
Subject: rpms/atk/devel atk.spec,1.33,1.34
Message-ID: <200606090225.k592PBR2025213@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/atk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25162

Modified Files:
	atk.spec 
Log Message:
Rebuild



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- atk.spec	2 Jun 2006 03:36:18 -0000	1.33
+++ atk.spec	9 Jun 2006 02:25:08 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.11.4
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-4
+- Rebuild
+
 * Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:30:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:30:40 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.38,1.39
Message-ID: <200606090230.k592Uesq027239@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27214

Modified Files:
	at-spi.spec 
Log Message:
fix build reqs



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- at-spi.spec	22 May 2006 17:38:31 -0000	1.38
+++ at-spi.spec	9 Jun 2006 02:30:25 -0000	1.39
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 7
+Release: 8
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -26,6 +26,7 @@
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: fontconfig
 BuildRequires: autoconf
+BuildRequires: gettext
 BuildRequires: libX11-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXi-devel, libXevie-devel 
@@ -95,6 +96,9 @@
 %{_includedir}/* 
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-8
+- Add a BuildRequires
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-7
 - Make it build in mock
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:39:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:39:16 -0400
Subject: rpms/atk/devel atk.spec,1.34,1.35
Message-ID: <200606090239.k592dGga027987@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/atk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27926

Modified Files:
	atk.spec 
Log Message:
buildrequire gettext



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- atk.spec	9 Jun 2006 02:25:08 -0000	1.34
+++ atk.spec	9 Jun 2006 02:39:06 -0000	1.35
@@ -10,6 +10,7 @@
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/atk-%{PACKAGE_VERSION}-root
 BuildPreReq: glib2-devel >= %{glib2_version}
+BuildRequires: gettext
 
 %description
 The ATK library provides a set of interfaces for adding accessibility



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:48:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:48:43 -0400
Subject: rpms/dasher/devel dasher.spec,1.41,1.42
Message-ID: <200606090248.k592mhER013714@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13531

Modified Files:
	dasher.spec 
Log Message:
fix build reqs



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dasher.spec	18 May 2006 05:19:47 -0000	1.41
+++ dasher.spec	9 Jun 2006 02:48:41 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 4.1.0
-Release: 1
+Release: 2
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -16,6 +16,7 @@
 BuildRequires: scrollkeeper
 BuildRequires: libwnck-devel >= 2.9.92
 BuildRequires: libXtst-devel
+BuildRequires: gettext
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4
@@ -97,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.0-2
+- Add missing BuildRequires
+
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.0-1
 - Update to 4.1.0
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:54:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:54:04 -0400
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.56,1.57
Message-ID: <200606090254.k592s4G0015793@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15735

Modified Files:
	desktop-printing.spec 
Log Message:
fix build reqs



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- desktop-printing.spec	6 Jun 2006 10:32:57 -0000	1.56
+++ desktop-printing.spec	9 Jun 2006 02:54:01 -0000	1.57
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 8
+Release: 9
 License: GPL
 Group: Applications/File
 # total lie
@@ -29,6 +29,7 @@
 BuildRequires: gnome-keyring-devel 
 BuildRequires: libXScrnSaver-devel
 BuildRequires: openssl-devel
+BuildRequires: gettext
 
 %description
 Desktop-printing contains eggcups, a program for user print job
@@ -93,6 +94,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.19-9
+- Add missing BuildRequires
+
 * Fri Jun 06 2006 Florian Festi <ffesti at redhat.com> - 0.19-8
 - patch for the new hal_lpadmin (hal-cups-utils)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:55:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:55:46 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.10,
	1.11 policy-20060505.patch, 1.18, 1.19 policy-20060608.patch,
	1.1, 1.2 selinux-policy.spec, 1.203, 1.204
Message-ID: <200606090255.k592tktl016500@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16459

Modified Files:
	booleans-targeted.conf policy-20060505.patch 
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.44-1
- Update from upstream



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- booleans-targeted.conf	28 May 2006 10:52:17 -0000	1.10
+++ booleans-targeted.conf	9 Jun 2006 02:55:43 -0000	1.11
@@ -10,10 +10,26 @@
 # 
 allow_execstack = false
 
+# Allow ftpd to read cifs directories.
+# 
+allow_ftpd_use_cifs = false
+
+# Allow ftpd to read nfs directories.
+# 
+allow_ftpd_use_nfs = false
+
 # Allow ftp servers to modify public filesused for public file transfer services.
 # 
 allow_ftpd_anon_write = false
 
+# Allow ftpd to read cifs directories.
+# 
+allow_ftpd_use_cifs = false
+
+# Allow ftpd to read nfs directories.
+# 
+allow_ftpd_use_nfs = false
+
 # Allow gssd to read temp directory.
 # 
 allow_gssd_read_tmp = true
@@ -162,10 +178,6 @@
 # 
 allow_user_mysql_connect = false
 
-# Allow system cron jobs to relabel filesystemfor restoring file contexts.
-# 
-cron_can_relabel = false
-
 # Allow pppd to be run for a regular user
 # 
 pppd_for_user = false

policy-20060505.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/consoletype.te      |    7 ++++-
 policy/modules/admin/prelink.fc          |    2 -
 policy/modules/admin/rpm.te              |    8 ++++-
 policy/modules/apps/webalizer.te         |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++
 policy/modules/kernel/filesystem.te      |    3 +-
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/services/automount.te     |    8 +++++
 policy/modules/services/cron.te          |    1 
 policy/modules/services/cups.te          |    4 ++
 policy/modules/services/ftp.te           |    1 
 policy/modules/services/hal.te           |    2 +
 policy/modules/services/mysql.te         |    2 -
 policy/modules/services/ntp.te           |    2 +
 policy/modules/services/pegasus.if       |   31 ++++++++++++++++++++++
 policy/modules/services/pegasus.te       |    5 +--
 policy/modules/services/procmail.te      |    5 +++
 policy/modules/services/pyzor.te         |    4 ++
 policy/modules/services/xfs.te           |    2 +
 policy/modules/system/authlogin.if       |    1 
 policy/modules/system/hostname.te        |    5 ++-
 policy/modules/system/init.te            |    1 
 policy/modules/system/logging.fc         |    6 ++--
 policy/modules/system/logging.te         |   10 ++++---
 policy/modules/system/unconfined.fc      |    8 +++--
 policy/modules/system/unconfined.if      |   28 ++++++++++++++++++++
 policy/modules/system/unconfined.te      |   13 +++++++--
 policy/modules/system/userdomain.if      |   28 --------------------
 policy/modules/system/userdomain.te      |   43 +++++++++++++++++++++++++++----
 policy/rolemap                           |    1 
 policy/support/misc_macros.spt           |    2 -
 policy/users                             |    6 ++--
 33 files changed, 216 insertions(+), 61 deletions(-)

Index: policy-20060505.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060505.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- policy-20060505.patch	8 Jun 2006 14:03:38 -0000	1.18
+++ policy-20060505.patch	9 Jun 2006 02:55:43 -0000	1.19
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.44/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 16:10:33.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
@@ -8,7 +8,7 @@
 +auditadm_r:auditadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.44/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 16:10:33.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -23,9 +23,20 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.44/policy/modules/admin/prelink.fc
+--- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-01-25 12:52:21.000000000 -0500
++++ serefpolicy-2.2.44/policy/modules/admin/prelink.fc	2006-06-08 16:10:33.000000000 -0400
+@@ -3,6 +3,6 @@
+ 
+ /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
+ 
+-/var/lib/misc/prelink\.*		--	gen_context(system_u:object_r:prelink_cache_t,s0)
++/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
+ 
+ /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.44/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 09:49:46.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 16:10:33.000000000 -0400
 @@ -341,12 +341,16 @@
  	optional_policy(`
  		mono_domtrans(rpm_script_t)
@@ -47,7 +58,7 @@
  		mta_send_mail(rpm_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.44/policy/modules/apps/webalizer.te
 --- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 16:10:33.000000000 -0400
 @@ -44,6 +44,7 @@
  allow webalizer_t self:unix_dgram_socket sendto;
  allow webalizer_t self:unix_stream_socket connectto;
@@ -58,7 +69,7 @@
  allow webalizer_t webalizer_etc_t:file { getattr read };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.44/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 20:41:26.000000000 -0400
 @@ -1913,6 +1913,21 @@
  ')
  
@@ -81,9 +92,33 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
+@@ -4360,3 +4375,23 @@
+ 
+ 	typeattribute $1 files_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Mount a filesystem on all files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_mounton_all_files',`
++	gen_require(`
++		attribute file_type, security_file_type;
++	')
++
++	allow $1 { file_type -security_file_type }:dir mounton;
++	allow $1 { file_type -security_file_type }:file mounton;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.44/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 16:10:33.000000000 -0400
 @@ -23,7 +23,7 @@
  # Requires that a security xattr handler exist for the filesystem.
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
@@ -103,7 +138,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.44/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 16:10:33.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -112,30 +147,92 @@
  ')
  
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.44/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/automount.te	2006-06-08 16:10:33.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
+ dontaudit automount_t self:capability sys_tty_config;
+-allow automount_t self:process { signal_perms getpgid setpgid setsched };
++allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
+ allow automount_t self:fifo_file rw_file_perms;
+ allow automount_t self:unix_stream_socket create_socket_perms;
+ allow automount_t self:unix_dgram_socket create_socket_perms;
+@@ -58,9 +58,11 @@
+ files_pid_filetrans(automount_t,automount_var_run_t,file)
+ 
+ kernel_read_kernel_sysctls(automount_t)
++kernel_read_irq_sysctls(automount_t)
+ kernel_read_fs_sysctls(automount_t)
+ kernel_read_proc_symlinks(automount_t)
+ kernel_read_system_state(automount_t)
++kernel_read_network_state(automount_t)
+ kernel_list_proc(automount_t)
+ 
+ files_search_boot(automount_t)
+@@ -92,6 +94,7 @@
+ dev_read_urand(automount_t)
+ 
+ domain_use_interactive_fds(automount_t)
++domain_dontaudit_read_all_domains_state(automount_t)
+ 
+ files_dontaudit_write_var_dirs(automount_t)
+ files_getattr_all_dirs(automount_t)
+@@ -104,11 +107,14 @@
+ files_getattr_default_dirs(automount_t)
+ # because config files can be shell scripts
+ files_exec_etc_files(automount_t)
++files_mounton_mnt(automount_t)
+ 
+ fs_getattr_all_fs(automount_t)
+ fs_getattr_all_dirs(automount_t)
+ fs_search_auto_mountpoints(automount_t)
+ fs_manage_auto_mountpoints(automount_t)
++fs_unmount_autofs(automount_t)
++fs_mount_autofs(automount_t)
+ 
+ term_dontaudit_use_console(automount_t)
+ term_dontaudit_getattr_pty_dirs(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.44/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/cron.te	2006-06-08 16:10:33.000000000 -0400
+@@ -353,6 +353,7 @@
+ 
+ 	tunable_policy(`cron_can_relabel',`
+ 		seutil_domtrans_setfiles(system_crond_t)
++		seutil_domtrans_restorecon(system_crond_t)
+ 	',`
+ 		selinux_get_fs_mount(system_crond_t)
+ 		selinux_validate_context(system_crond_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.44/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 09:43:08.000000000 -0400
-@@ -647,11 +647,15 @@
++++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 16:10:33.000000000 -0400
+@@ -655,6 +655,10 @@
  ')
  
  optional_policy(`
--	seutil_sigchld_newrole(hplip_t)
-+	snmp_read_snmp_var_lib_files(hplip_t)
- ')
- 
- optional_policy(`
--	snmp_read_snmp_var_lib_files(hplip_t)
 +	mount_send_nfs_client_request(hplip_t)
 +')
 +
 +optional_policy(`
-+	seutil_sigchld_newrole(hplip_t)
+ 	udev_read_db(hplip_t)
  ')
  
- optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.44/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/ftp.te	2006-06-08 16:10:33.000000000 -0400
+@@ -59,6 +59,7 @@
+ 
+ allow ftpd_t ftpd_var_run_t:file create_file_perms;
+ allow ftpd_t ftpd_var_run_t:dir rw_dir_perms;
++allow ftpd_t ftpd_var_run_t:sock_file create_file_perms;
+ files_pid_filetrans(ftpd_t,ftpd_var_run_t,file)
+ 
+ # Create and modify /var/log/xferlog.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.44/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 09:47:42.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 16:10:33.000000000 -0400
 @@ -140,6 +140,8 @@
  
  sysnet_read_config(hald_t)
@@ -147,7 +244,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.44/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 09:48:34.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 16:10:33.000000000 -0400
 @@ -101,7 +101,7 @@
  
  miscfiles_read_localization(mysqld_t)
@@ -159,7 +256,7 @@
  userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.44/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 09:48:01.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 16:10:33.000000000 -0400
 @@ -112,6 +112,8 @@
  
  sysnet_read_config(ntpd_t)
@@ -171,7 +268,7 @@
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.44/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 16:10:33.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -207,7 +304,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.44/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 16:10:33.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -226,7 +323,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.44/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 16:10:33.000000000 -0400
 @@ -109,3 +109,8 @@
  	spamassassin_exec(procmail_t)
  	spamassassin_exec_client(procmail_t)
@@ -238,7 +335,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.44/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 09:46:23.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 16:10:33.000000000 -0400
 @@ -126,3 +126,7 @@
  optional_policy(`
  	nscd_socket_use(pyzord_t)
@@ -249,7 +346,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.44/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 09:47:04.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 16:10:33.000000000 -0400
 @@ -69,6 +69,8 @@
  miscfiles_read_localization(xfs_t)
  miscfiles_read_fonts(xfs_t)
@@ -259,9 +356,20 @@
  userdom_dontaudit_use_unpriv_user_fds(xfs_t)
  userdom_dontaudit_search_sysadm_home_dirs(xfs_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.44/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-05-12 09:22:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/authlogin.if	2006-06-08 16:10:33.000000000 -0400
+@@ -1287,6 +1287,7 @@
+ 	allow $1 var_auth_t:dir r_dir_perms;
+ 	allow $1 var_auth_t:file create_file_perms;
+ 	files_list_var_lib($1)
++	allow $1 self:netlink_route_socket r_netlink_socket_perms;
+ 
+ 	sysnet_dns_name_resolve($1)
+ 	sysnet_use_ldap($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.44/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 16:10:33.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -276,7 +384,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.44/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 16:10:33.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -285,38 +393,46 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.44/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/libraries.fc	2006-06-08 09:43:08.000000000 -0400
-@@ -48,6 +48,9 @@
- /lib32/ld-[^/]*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:ld_so_t,s0)
- ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.2.44/policy/modules/system/logging.fc
+--- nsaserefpolicy/policy/modules/system/logging.fc	2006-02-02 16:12:27.000000000 -0500
++++ serefpolicy-2.2.44/policy/modules/system/logging.fc	2006-06-08 16:10:33.000000000 -0400
+@@ -1,9 +1,6 @@
  
-+/lib/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/lib64/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /dev/log			-s	gen_context(system_u:object_r:devlog_t,s0)
+ 
+-/etc/auditd.conf		--	gen_context(system_u:object_r:auditd_etc_t,s0)
+-/etc/audit.rules		--	gen_context(system_u:object_r:auditd_etc_t,s0)
+-
+ /sbin/auditctl		--	gen_context(system_u:object_r:auditctl_exec_t,s0)
+ /sbin/auditd		--	gen_context(system_u:object_r:auditd_exec_t,s0)
+ /sbin/klogd		--	gen_context(system_u:object_r:klogd_exec_t,s0)
+@@ -39,3 +36,6 @@
+ /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
+ 
+ /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
++/etc/audit(/.*)?		gen_context(system_u:object_r:auditd_etc_t,s15:c0.c255)
++
 +
- #
- # /opt
- #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.44/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 09:43:08.000000000 -0400
-@@ -14,10 +14,14 @@
- role system_r types auditctl_t;
- 
- type auditd_etc_t;
-+ifdef(`enable_mls',`', `
- files_security_file(auditd_etc_t)
-+')
++++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 18:04:43.000000000 -0400
+@@ -70,6 +70,7 @@
  
- type auditd_log_t;
-+ifdef(`enable_mls',`', `
- files_security_file(auditd_log_t)
-+')
+ allow auditctl_t etc_t:file { getattr read };
+ 
++allow auditctl_t auditd_etc_t:dir r_dir_perms;
+ allow auditctl_t auditd_etc_t:file r_file_perms;
+ 
+ # Needed for adding watches
+@@ -111,6 +112,7 @@
+ allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
+ allow auditd_t self:fifo_file rw_file_perms;
+ 
++allow auditd_t auditd_etc_t:dir r_dir_perms;
+ allow auditd_t auditd_etc_t:file r_file_perms;
  
- type auditd_t;
- # real declaration moved to mls until
-@@ -123,9 +127,8 @@
+ allow auditd_t auditd_log_t:dir rw_dir_perms;
+@@ -123,9 +125,8 @@
  files_pid_filetrans(auditd_t,auditd_var_run_t,file)
  
  kernel_read_kernel_sysctls(auditd_t)
@@ -328,7 +444,7 @@
  
  dev_read_sysfs(auditd_t)
  
-@@ -134,11 +137,12 @@
+@@ -134,11 +135,12 @@
  
  term_dontaudit_use_console(auditd_t)
  
@@ -344,21 +460,23 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.44/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 09:43:08.000000000 -0400
-@@ -4,7 +4,6 @@
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 20:27:36.000000000 -0400
+@@ -4,7 +4,9 @@
  # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
  /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
  
 -ifdef(`targeted_policy',`
 -/usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -/usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
--')
 +/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++ifdef(`targeted_policy', `
 +/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.44/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 16:10:33.000000000 -0400
 @@ -449,3 +449,31 @@
  
  	allow $1 unconfined_t:dbus acquire_svc;
@@ -393,7 +511,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.44/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 16:10:33.000000000 -0400
 @@ -33,8 +33,6 @@
  	allow unconfined_t self:system syslog_read;
  	dontaudit unconfined_t self:capability sys_module;
@@ -432,9 +550,47 @@
  #
  
  ifdef(`targeted_policy',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.44/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/userdomain.if	2006-06-08 16:10:33.000000000 -0400
+@@ -474,34 +474,6 @@
+ 		xserver_create_xdm_tmp_sockets($1_t)
+ 	')
+ 
+-	ifdef(`TODO',`
+-	#
+-	# Cups daemon running as user tries to write /etc/printcap
+-	#
+-	dontaudit $1_t usr_t:file setattr;
+-
+-	# /initrd is left mounted, various programs try to look at it
+-	dontaudit $1_t ramfs_t:dir getattr;
+-
+-	#
+-	# Running ifconfig as a user generates the following
+-	#
+-	dontaudit $1_t sysctl_net_t:dir search;
+-
+-	r_dir_file($1_t, usercanread)
+-
+-	# old browser_domain():
+-	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir_file_class_set getattr;
+-	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir search;
+-	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir read;
+-
+-	allow $1_t usbtty_device_t:chr_file read;
+-
+-	ifdef(`xdm.te', `
+-		allow $1_t xdm_var_lib_t:file r_file_perms;
+-	')
+-	') dnl endif TODO
+-
+ ')
+ 
+ #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.44/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 16:10:33.000000000 -0400
 @@ -1,11 +1,12 @@
  
 -policy_module(userdomain,1.3.27)
@@ -554,7 +710,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.44/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 16:10:33.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -564,7 +720,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.44/policy/support/misc_macros.spt
 --- nsaserefpolicy/policy/support/misc_macros.spt	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 16:10:33.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  # gen_context(context,mls_sensitivity,[mcs_categories])
@@ -576,7 +732,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.44/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.44/policy/users	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/users	2006-06-08 16:10:33.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`

policy-20060608.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/consoletype.te      |    7 ++++-
 policy/modules/admin/prelink.fc          |    2 -
 policy/modules/admin/rpm.te              |    8 ++++-
 policy/modules/apps/webalizer.te         |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++
 policy/modules/kernel/filesystem.te      |    3 +-
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/services/automount.te     |    8 +++++
 policy/modules/services/cron.te          |    1 
 policy/modules/services/cups.te          |    4 ++
 policy/modules/services/ftp.te           |    1 
 policy/modules/services/hal.te           |    2 +
 policy/modules/services/mysql.te         |    2 -
 policy/modules/services/ntp.te           |    2 +
 policy/modules/services/pegasus.if       |   31 ++++++++++++++++++++++
 policy/modules/services/pegasus.te       |    5 +--
 policy/modules/services/procmail.te      |    5 +++
 policy/modules/services/pyzor.te         |    4 ++
 policy/modules/services/xfs.te           |    2 +
 policy/modules/system/authlogin.if       |    1 
 policy/modules/system/hostname.te        |    5 ++-
 policy/modules/system/init.te            |    1 
 policy/modules/system/logging.fc         |    6 ++--
 policy/modules/system/logging.te         |   10 ++++---
 policy/modules/system/mount.te           |    1 
 policy/modules/system/unconfined.fc      |    8 +++--
 policy/modules/system/unconfined.if      |   28 ++++++++++++++++++++
 policy/modules/system/unconfined.te      |   13 +++++++--
 policy/modules/system/userdomain.if      |   28 --------------------
 policy/modules/system/userdomain.te      |   43 +++++++++++++++++++++++++++----
 policy/rolemap                           |    1 
 policy/support/misc_macros.spt           |    2 -
 policy/users                             |    6 ++--
 34 files changed, 217 insertions(+), 61 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060608.patch	8 Jun 2006 14:03:38 -0000	1.1
+++ policy-20060608.patch	9 Jun 2006 02:55:43 -0000	1.2
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.44/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 16:10:33.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
@@ -8,7 +8,7 @@
 +auditadm_r:auditadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.44/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 16:10:33.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -23,9 +23,20 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.44/policy/modules/admin/prelink.fc
+--- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-01-25 12:52:21.000000000 -0500
++++ serefpolicy-2.2.44/policy/modules/admin/prelink.fc	2006-06-08 16:10:33.000000000 -0400
+@@ -3,6 +3,6 @@
+ 
+ /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
+ 
+-/var/lib/misc/prelink\.*		--	gen_context(system_u:object_r:prelink_cache_t,s0)
++/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
+ 
+ /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.44/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 09:49:46.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 16:10:33.000000000 -0400
 @@ -341,12 +341,16 @@
  	optional_policy(`
  		mono_domtrans(rpm_script_t)
@@ -47,7 +58,7 @@
  		mta_send_mail(rpm_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.44/policy/modules/apps/webalizer.te
 --- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 16:10:33.000000000 -0400
 @@ -44,6 +44,7 @@
  allow webalizer_t self:unix_dgram_socket sendto;
  allow webalizer_t self:unix_stream_socket connectto;
@@ -58,7 +69,7 @@
  allow webalizer_t webalizer_etc_t:file { getattr read };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.44/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 20:41:26.000000000 -0400
 @@ -1913,6 +1913,21 @@
  ')
  
@@ -81,9 +92,33 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
+@@ -4360,3 +4375,23 @@
+ 
+ 	typeattribute $1 files_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Mount a filesystem on all files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_mounton_all_files',`
++	gen_require(`
++		attribute file_type, security_file_type;
++	')
++
++	allow $1 { file_type -security_file_type }:dir mounton;
++	allow $1 { file_type -security_file_type }:file mounton;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.44/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 16:10:33.000000000 -0400
 @@ -23,7 +23,7 @@
  # Requires that a security xattr handler exist for the filesystem.
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
@@ -103,7 +138,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.44/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 16:10:33.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -112,9 +147,67 @@
  ')
  
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.44/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/automount.te	2006-06-08 16:10:33.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
+ dontaudit automount_t self:capability sys_tty_config;
+-allow automount_t self:process { signal_perms getpgid setpgid setsched };
++allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
+ allow automount_t self:fifo_file rw_file_perms;
+ allow automount_t self:unix_stream_socket create_socket_perms;
+ allow automount_t self:unix_dgram_socket create_socket_perms;
+@@ -58,9 +58,11 @@
+ files_pid_filetrans(automount_t,automount_var_run_t,file)
+ 
+ kernel_read_kernel_sysctls(automount_t)
++kernel_read_irq_sysctls(automount_t)
+ kernel_read_fs_sysctls(automount_t)
+ kernel_read_proc_symlinks(automount_t)
+ kernel_read_system_state(automount_t)
++kernel_read_network_state(automount_t)
+ kernel_list_proc(automount_t)
+ 
+ files_search_boot(automount_t)
+@@ -92,6 +94,7 @@
+ dev_read_urand(automount_t)
+ 
+ domain_use_interactive_fds(automount_t)
++domain_dontaudit_read_all_domains_state(automount_t)
+ 
+ files_dontaudit_write_var_dirs(automount_t)
+ files_getattr_all_dirs(automount_t)
+@@ -104,11 +107,14 @@
+ files_getattr_default_dirs(automount_t)
+ # because config files can be shell scripts
+ files_exec_etc_files(automount_t)
++files_mounton_mnt(automount_t)
+ 
+ fs_getattr_all_fs(automount_t)
+ fs_getattr_all_dirs(automount_t)
+ fs_search_auto_mountpoints(automount_t)
+ fs_manage_auto_mountpoints(automount_t)
++fs_unmount_autofs(automount_t)
++fs_mount_autofs(automount_t)
+ 
+ term_dontaudit_use_console(automount_t)
+ term_dontaudit_getattr_pty_dirs(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.44/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/cron.te	2006-06-08 16:10:33.000000000 -0400
+@@ -353,6 +353,7 @@
+ 
+ 	tunable_policy(`cron_can_relabel',`
+ 		seutil_domtrans_setfiles(system_crond_t)
++		seutil_domtrans_restorecon(system_crond_t)
+ 	',`
+ 		selinux_get_fs_mount(system_crond_t)
+ 		selinux_validate_context(system_crond_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.44/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 09:50:22.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 16:10:33.000000000 -0400
 @@ -655,6 +655,10 @@
  ')
  
@@ -126,9 +219,20 @@
  	udev_read_db(hplip_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.44/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/ftp.te	2006-06-08 16:10:33.000000000 -0400
+@@ -59,6 +59,7 @@
+ 
+ allow ftpd_t ftpd_var_run_t:file create_file_perms;
+ allow ftpd_t ftpd_var_run_t:dir rw_dir_perms;
++allow ftpd_t ftpd_var_run_t:sock_file create_file_perms;
+ files_pid_filetrans(ftpd_t,ftpd_var_run_t,file)
+ 
+ # Create and modify /var/log/xferlog.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.44/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 09:47:42.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 16:10:33.000000000 -0400
 @@ -140,6 +140,8 @@
  
  sysnet_read_config(hald_t)
@@ -140,7 +244,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.44/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 09:48:34.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 16:10:33.000000000 -0400
 @@ -101,7 +101,7 @@
  
  miscfiles_read_localization(mysqld_t)
@@ -152,7 +256,7 @@
  userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.44/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 09:48:01.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 16:10:33.000000000 -0400
 @@ -112,6 +112,8 @@
  
  sysnet_read_config(ntpd_t)
@@ -164,7 +268,7 @@
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.44/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 16:10:33.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -200,7 +304,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.44/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 16:10:33.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -219,7 +323,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.44/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 16:10:33.000000000 -0400
 @@ -109,3 +109,8 @@
  	spamassassin_exec(procmail_t)
  	spamassassin_exec_client(procmail_t)
@@ -231,7 +335,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.44/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 09:46:23.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 16:10:33.000000000 -0400
 @@ -126,3 +126,7 @@
  optional_policy(`
  	nscd_socket_use(pyzord_t)
@@ -242,7 +346,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.44/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 09:47:04.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 16:10:33.000000000 -0400
 @@ -69,6 +69,8 @@
  miscfiles_read_localization(xfs_t)
  miscfiles_read_fonts(xfs_t)
@@ -252,9 +356,20 @@
  userdom_dontaudit_use_unpriv_user_fds(xfs_t)
  userdom_dontaudit_search_sysadm_home_dirs(xfs_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.44/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-05-12 09:22:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/authlogin.if	2006-06-08 16:10:33.000000000 -0400
+@@ -1287,6 +1287,7 @@
+ 	allow $1 var_auth_t:dir r_dir_perms;
+ 	allow $1 var_auth_t:file create_file_perms;
+ 	files_list_var_lib($1)
++	allow $1 self:netlink_route_socket r_netlink_socket_perms;
+ 
+ 	sysnet_dns_name_resolve($1)
+ 	sysnet_use_ldap($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.44/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 16:10:33.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -269,7 +384,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.44/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 16:10:33.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -278,22 +393,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.44/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/libraries.fc	2006-06-08 09:43:08.000000000 -0400
-@@ -48,6 +48,9 @@
- /lib32/ld-[^/]*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:ld_so_t,s0)
- ')
- 
-+/lib/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/lib64/security/pam_poldi.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+
- #
- # /opt
- #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.2.44/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-02-02 16:12:27.000000000 -0500
-+++ serefpolicy-2.2.44/policy/modules/system/logging.fc	2006-06-08 09:56:16.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/logging.fc	2006-06-08 16:10:33.000000000 -0400
 @@ -1,9 +1,6 @@
  
  /dev/log			-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -313,17 +415,24 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.44/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 09:58:43.000000000 -0400
-@@ -17,7 +17,7 @@
- files_security_file(auditd_etc_t)
- 
- type auditd_log_t;
--files_security_file(auditd_log_t)
-+fies_security_file(auditd_log_t)
- 
- type auditd_t;
- # real declaration moved to mls until
-@@ -123,9 +123,8 @@
++++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 18:04:43.000000000 -0400
+@@ -70,6 +70,7 @@
+ 
+ allow auditctl_t etc_t:file { getattr read };
+ 
++allow auditctl_t auditd_etc_t:dir r_dir_perms;
+ allow auditctl_t auditd_etc_t:file r_file_perms;
+ 
+ # Needed for adding watches
+@@ -111,6 +112,7 @@
+ allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
+ allow auditd_t self:fifo_file rw_file_perms;
+ 
++allow auditd_t auditd_etc_t:dir r_dir_perms;
+ allow auditd_t auditd_etc_t:file r_file_perms;
+ 
+ allow auditd_t auditd_log_t:dir rw_dir_perms;
+@@ -123,9 +125,8 @@
  files_pid_filetrans(auditd_t,auditd_var_run_t,file)
  
  kernel_read_kernel_sysctls(auditd_t)
@@ -335,7 +444,7 @@
  
  dev_read_sysfs(auditd_t)
  
-@@ -134,11 +133,12 @@
+@@ -134,11 +135,12 @@
  
  term_dontaudit_use_console(auditd_t)
  
@@ -349,23 +458,36 @@
  
  domain_use_interactive_fds(auditd_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.44/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/mount.te	2006-06-08 20:42:32.000000000 -0400
+@@ -111,6 +111,7 @@
+ 	tunable_policy(`allow_mount_anyfile',`
+ 		auth_read_all_dirs_except_shadow(mount_t)
+ 		auth_read_all_files_except_shadow(mount_t)
++		files_mounton_all_files(mount_t)
+ 	')
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.44/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 09:43:08.000000000 -0400
-@@ -4,7 +4,6 @@
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 20:27:36.000000000 -0400
+@@ -4,7 +4,9 @@
  # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
  /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
  
 -ifdef(`targeted_policy',`
 -/usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -/usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
--')
 +/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++ifdef(`targeted_policy', `
 +/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.44/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 16:10:33.000000000 -0400
 @@ -449,3 +449,31 @@
  
  	allow $1 unconfined_t:dbus acquire_svc;
@@ -400,7 +522,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.44/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 16:10:33.000000000 -0400
 @@ -33,8 +33,6 @@
  	allow unconfined_t self:system syslog_read;
  	dontaudit unconfined_t self:capability sys_module;
@@ -441,7 +563,7 @@
  ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.44/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/userdomain.if	2006-06-08 10:02:36.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/userdomain.if	2006-06-08 16:10:33.000000000 -0400
 @@ -474,34 +474,6 @@
  		xserver_create_xdm_tmp_sockets($1_t)
  	')
@@ -479,7 +601,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.44/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 16:10:33.000000000 -0400
 @@ -1,11 +1,12 @@
  
 -policy_module(userdomain,1.3.27)
@@ -599,7 +721,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.44/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 16:10:33.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -609,7 +731,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.44/policy/support/misc_macros.spt
 --- nsaserefpolicy/policy/support/misc_macros.spt	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 16:10:33.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  # gen_context(context,mls_sensitivity,[mcs_categories])
@@ -621,7 +743,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.44/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.44/policy/users	2006-06-08 09:43:08.000000000 -0400
++++ serefpolicy-2.2.44/policy/users	2006-06-08 16:10:33.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- selinux-policy.spec	8 Jun 2006 14:03:38 -0000	1.203
+++ selinux-policy.spec	9 Jun 2006 02:55:43 -0000	1.204
@@ -49,10 +49,11 @@
 %doc %{_usr}/share/doc/%{name}-%{version}
 %dir %{_usr}/share/selinux
 %dir %{_sysconfdir}/selinux
-%dir %{_usr}/share/selinux/devel
-%dir %{_usr}/share/selinux/devel/include
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config
 %ghost %{_sysconfdir}/sysconfig/selinux
+
+%dir %{_usr}/share/selinux/devel
+%dir %{_usr}/share/selinux/devel/include
 %{_usr}/share/selinux/devel/include/*
 %{_usr}/share/selinux/devel/Makefile
 %{_usr}/share/selinux/devel/policygentool



From fedora-cvs-commits at redhat.com  Fri Jun  9 02:56:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 22:56:36 -0400
Subject: rpms/atk/devel atk.spec,1.35,1.36
Message-ID: <200606090256.k592uaf1016857@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/atk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16784

Modified Files:
	atk.spec 
Log Message:
fix build reqs



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- atk.spec	9 Jun 2006 02:39:06 -0000	1.35
+++ atk.spec	9 Jun 2006 02:56:33 -0000	1.36
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/atk-%{PACKAGE_VERSION}-root
 BuildPreReq: glib2-devel >= %{glib2_version}
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 
 %description
 The ATK library provides a set of interfaces for adding accessibility



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:02:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:02:08 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.39,1.40
Message-ID: <200606090302.k59326EW018351@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18282

Modified Files:
	at-spi.spec 
Log Message:
fix build req



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- at-spi.spec	9 Jun 2006 02:30:25 -0000	1.39
+++ at-spi.spec	9 Jun 2006 03:01:31 -0000	1.40
@@ -27,6 +27,7 @@
 BuildRequires: fontconfig
 BuildRequires: autoconf
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 BuildRequires: libX11-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXi-devel, libXevie-devel 



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:03:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:03:54 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.68, 1.69 selinux-policy.spec,
	1.204, 1.205 sources, 1.72, 1.73
Message-ID: <200606090303.k5933s8H018455@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18405

Modified Files:
	.cvsignore selinux-policy.spec sources 
Log Message:
* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-1
- Update from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	28 May 2006 10:56:26 -0000	1.68
+++ .cvsignore	9 Jun 2006 03:03:22 -0000	1.69
@@ -69,3 +69,4 @@
 serefpolicy-2.2.41.tgz
 serefpolicy-2.2.42.tgz
 serefpolicy-2.2.43.tgz
+serefpolicy-2.2.45.tgz


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- selinux-policy.spec	9 Jun 2006 02:55:43 -0000	1.204
+++ selinux-policy.spec	9 Jun 2006 03:03:22 -0000	1.205
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.44
+Version: 2.2.45
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -336,6 +336,9 @@
 %endif
 
 %changelog
+* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-1
+- Update from upstream
+
 * Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.44-1
 - Update from upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	28 May 2006 10:56:26 -0000	1.72
+++ sources	9 Jun 2006 03:03:22 -0000	1.73
@@ -1 +1 @@
-5a7277ea5b4ff2bba68e180a20700d0a  serefpolicy-2.2.43.tgz
+e5a6df9971751f496d9f2fd1f9c74e19  serefpolicy-2.2.45.tgz



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:21:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:21:18 -0400
Subject: rpms/scim-hangul/devel scim-hangul-0.2.2-ascii-mode.patch, 1.1,
	1.2 scim-hangul.spec, 1.15, 1.16
Message-ID: <200606090321.k593LIQN004735@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4694

Modified Files:
	scim-hangul-0.2.2-ascii-mode.patch scim-hangul.spec 
Log Message:
* Fri Jun  9 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-4
- gettextized the input layout string on panel. (#194444)

scim-hangul-0.2.2-ascii-mode.patch:
 scim_hangul_imengine.cpp       |  413 ++++++++++++++++++++++++++++++++++-------
 scim_hangul_imengine.h         |   52 ++++-
 scim_hangul_imengine_setup.cpp |  283 +++++++++++++++++++++++++++-
 scim_hangul_private.h          |   57 +++++
 4 files changed, 722 insertions(+), 83 deletions(-)

Index: scim-hangul-0.2.2-ascii-mode.patch
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul-0.2.2-ascii-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-hangul-0.2.2-ascii-mode.patch	17 May 2006 09:54:14 -0000	1.1
+++ scim-hangul-0.2.2-ascii-mode.patch	9 Jun 2006 03:21:16 -0000	1.2
@@ -313,7 +313,7 @@
 +     */
 +    if (is_on_off_key (key)) {
 +        toggle_on_off_state();
-+	return true;
++        return true;
 +    }
 +
      /* ignore key release. */
@@ -513,7 +513,7 @@
 +					       m_properties.end (),
 +					       SCIM_PROP_INPUT_LAYOUT);
 +	if (it != m_properties.end ()) {
-+		it->set_label (label);
++		it->set_label (_(label));
 +		update_property (*it);
 +	}
 +    }


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-hangul.spec	17 May 2006 09:54:14 -0000	1.15
+++ scim-hangul.spec	9 Jun 2006 03:21:16 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        3.fc6
+Release:        4.fc6
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Fri Jun  9 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-4
+- gettextized the input layout string on panel. (#194444)
+
 * Wed May 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-3
 - scim-hangul-0.2.2-ascii-mode.patch: applied to support the ASCII input mode
   in scim-hangul. (#185506)



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:23:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:23:34 -0400
Subject: rpms/eel2/devel eel2.spec,1.46,1.47
Message-ID: <200606090323.k593NYIt005619@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5509

Modified Files:
	eel2.spec 
Log Message:
fix build reqs



Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- eel2.spec	21 May 2006 04:48:10 -0000	1.46
+++ eel2.spec	9 Jun 2006 03:23:31 -0000	1.47
@@ -16,7 +16,7 @@
 Name:		eel2
 Summary:        Eazel Extensions Library
 Version: 	2.15.1
-Release: 	2
+Release: 	3
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -46,6 +46,8 @@
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: pango
 BuildRequires: libXt-devel
+BuildRequires: libtool
+BuildRequires: gettext
 
 %description
 Eazel Extensions Library is a collection of widgets and functions for
@@ -106,6 +108,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-3
+- More missing BuildRequires
+
 * Sun May 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
 - Add missing BuildRequires (#129292)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:27:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:27:06 -0400
Subject: rpms/evince/devel evince.spec,1.50,1.51
Message-ID: <200606090327.k593R6gl007108@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7009

Modified Files:
	evince.spec 
Log Message:
rebuild



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- evince.spec	30 May 2006 21:11:57 -0000	1.50
+++ evince.spec	9 Jun 2006 03:27:04 -0000	1.51
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.3
-Release:	2
+Release:	3
 Summary:	Document viewer
 
 License: 	GPL
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.3-3
+- Rebuild
+
 * Tue May 30 2006 Kristian H??gsberg <krh at redhat.com> - 0.5.3-2
 - Add gettext build requires.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:33:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:33:34 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.61,1.62
Message-ID: <200606090333.k593XY6S008513@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8469

Modified Files:
	file-roller.spec 
Log Message:
fix build reqs



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- file-roller.spec	6 Jun 2006 01:27:07 -0000	1.61
+++ file-roller.spec	9 Jun 2006 03:33:10 -0000	1.62
@@ -11,7 +11,7 @@
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.14.3
-Release: 	3
+Release: 	4
 
 License:	GPL
 Group:		Applications/Archiving
@@ -118,6 +118,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-4 
+- Add more BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:36:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:36:12 -0400
Subject: rpms/libsilc/devel silc-toolkit-0.9.12-wordsize.patch, NONE,
	1.1 libsilc.spec, 1.9, 1.10
Message-ID: <200606090336.k593aCSH008722@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/libsilc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8688

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-0.9.12-wordsize.patch 
Log Message:
- prevent multilib -devel conflict (#192712)
- remove .a and .la files


silc-toolkit-0.9.12-wordsize.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE silc-toolkit-0.9.12-wordsize.patch ---
Make it identical on all archs, so it doesn't conflict in multilib -devel install.

--- silc-toolkit-0.9.12/lib/silcmath/mpi/configure.orig	2006-06-07 17:59:27.000000000 -0400
+++ silc-toolkit-0.9.12/lib/silcmath/mpi/configure	2006-06-07 18:01:26.000000000 -0400
@@ -25049,11 +25049,11 @@
 s, at LIBTOOL@,$LIBTOOL,;t t
 s, at INCLUDE_DEFINES_INT@,$INCLUDE_DEFINES_INT,;t t
 s, at MPI_SIZEOF_LONG_LONG@,$MPI_SIZEOF_LONG_LONG,;t t
-s, at MPI_SIZEOF_LONG@,$MPI_SIZEOF_LONG,;t t
+s, at MPI_SIZEOF_LONG@,__WORDSIZE,;t t
 s, at MPI_SIZEOF_INT@,$MPI_SIZEOF_INT,;t t
 s, at MPI_SIZEOF_SHORT@,$MPI_SIZEOF_SHORT,;t t
 s, at MPI_SIZEOF_CHAR@,$MPI_SIZEOF_CHAR,;t t
-s, at MPI_SIZEOF_VOID_P@,$MPI_SIZEOF_VOID_P,;t t
+s, at MPI_SIZEOF_VOID_P@,__WORDSIZE,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF


Index: libsilc.spec
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsilc.spec	11 Feb 2006 04:13:13 -0000	1.9
+++ libsilc.spec	9 Jun 2006 03:35:59 -0000	1.10
@@ -9,6 +9,7 @@
 Patch: silc-toolkit-0.9.12-tutorial.patch
 Patch1: silc-toolkit-0.9.12-optflags.patch
 Patch2: silc-toolkit-0.9.12-libs.patch
+Patch3: silc-toolkit-0.9.12-wordsize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Epoch: 0
 # doc subpackage was removed because they are too big and not useful
@@ -30,6 +31,7 @@
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --without-irssi --without-silcd --libdir=%{_libdir} --enable-shared \
@@ -50,6 +52,9 @@
 # remove files we don't want into the package, but are being installed to buildroot
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/silcalgs.conf $RPM_BUILD_ROOT%{_sysconfdir}/silcd.conf \
        $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_mandir}
+# remove .la and .a files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 cat << EOF > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/silc.pc
@@ -89,16 +94,16 @@
 %files devel
 %defattr(0644, root, root, 0755)
 %{_libdir}/libsilc.so
-%{_libdir}/libsilc.a
-%{_libdir}/libsilc.la
 %{_libdir}/libsilcclient.so
-%{_libdir}/libsilcclient.a
-%{_libdir}/libsilcclient.la
 %{_libdir}/pkgconfig/silc.pc
 %dir %_includedir/silc
 %{_includedir}/silc/*.h
 
 %changelog
+* Thu Jun 08 2006 Warren Togami <wtogami at redhat.com> -  0:0.9.12-13
+- prevent multilib -devel conflict (#192712)
+- remove .a and .la files
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.12-12.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:40:01 -0400
Subject: rpms/eel2/devel eel2.spec,1.47,1.48
Message-ID: <200606090340.k593e1YV009436@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9376

Modified Files:
	eel2.spec 
Log Message:
fix build reqs



Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- eel2.spec	9 Jun 2006 03:23:31 -0000	1.47
+++ eel2.spec	9 Jun 2006 03:39:59 -0000	1.48
@@ -48,6 +48,7 @@
 BuildRequires: libXt-devel
 BuildRequires: libtool
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 
 %description
 Eazel Extensions Library is a collection of widgets and functions for



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:47:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:47:57 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.62,1.63
Message-ID: <200606090347.k593lvum003753@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3740

Modified Files:
	file-roller.spec 
Log Message:
more build reqs



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- file-roller.spec	9 Jun 2006 03:33:10 -0000	1.62
+++ file-roller.spec	9 Jun 2006 03:47:54 -0000	1.63
@@ -27,6 +27,8 @@
 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
 BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: gettext
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: scrollkeeper



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:54:25 -0400
Subject: rpms/gail/devel gail.spec,1.42,1.43
Message-ID: <200606090354.k593sPDo003849@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3836

Modified Files:
	gail.spec 
Log Message:
rebuild



Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gail.spec	22 May 2006 15:40:17 -0000	1.42
+++ gail.spec	9 Jun 2006 03:54:22 -0000	1.43
@@ -5,7 +5,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.8.11
-Release: 2
+Release: 3
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -78,6 +78,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.11-3
+- Rebuild
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.11-2
 - Make it build in mock
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 03:58:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 8 Jun 2006 23:58:35 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.13,1.14
Message-ID: <200606090358.k593wZuE003941@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3925

Modified Files:
	gcalctool.spec 
Log Message:
fix build reqs



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcalctool.spec	21 May 2006 04:53:46 -0000	1.13
+++ gcalctool.spec	9 Jun 2006 03:58:33 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcalctool
 Version:        5.8.13
-Release:        2
+Release:        3
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -17,6 +17,7 @@
 BuildRequires: desktop-file-utils >= 0.9
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils
+BuildRequires: gettext
 
 Requires(post): scrollkeeper
 Requires(post): GConf2
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> 5.8.13-3
+- More BuildRequires
+
 * Sun May 21 2006 Matthias Clasen <mclasen at redhat.com> 5.8.13-2
 - Add missing BuildRequires  (#191910)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:08:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:08:39 -0400
Subject: rpms/gail/devel gail.spec,1.43,1.44
Message-ID: <200606090408.k5948cI9015155@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15103

Modified Files:
	gail.spec 
Log Message:
fix build reqs



Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gail.spec	9 Jun 2006 03:54:22 -0000	1.43
+++ gail.spec	9 Jun 2006 04:08:30 -0000	1.44
@@ -16,7 +16,7 @@
 Requires: gtk2 >= %{gtk2_version}
 Requires: libgnomecanvas >= %{libgnomecanvas_version}
 
-BuildRequires: libtool automake autoconf 
+BuildRequires: libtool automake autoconf gettext
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:12:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:12:08 -0400
Subject: rpms/mysql/devel mysql-testing.patch,1.5,1.6
Message-ID: <200606090412.k594C8oE015882@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15855

Modified Files:
	mysql-testing.patch 
Log Message:
Spread mysql test ports around a bit more --- I'm wondering if there
are buildfarm cross-machine dependencies I don't know about.

mysql-testing.patch:
 Makefile.am                  |    4 ++--
 mysql-test/mysql-test-run.sh |   28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql-testing.patch	10 Dec 2005 05:13:43 -0000	1.5
+++ mysql-testing.patch	9 Jun 2006 04:11:59 -0000	1.6
@@ -1,8 +1,8 @@
 This patch is needed to improve the probability that the MySQL tests pass
 in Red Hat's build environment.  The 32-bit and 64-bit variants of a single
 architecture may be built on the same machine at the same time, so we have
-to ensure that the tests use different port numbers on a 64-bit arch than
-on a 32-bit, else they will interfere with each other.
+to ensure that the tests use different port numbers on each arch, else they
+will interfere with each other.
 
 We also have to hack the top-level Makefile to enable the openssl regression
 tests.  (Why doesn't this happen automatically given the configure option??)
@@ -14,10 +14,10 @@
 would need to be changed to use either one.
 
 
-diff -Naur mysql-5.0.16.orig/Makefile.am mysql-5.0.16/Makefile.am
---- mysql-5.0.16.orig/Makefile.am	2005-11-14 19:12:31.000000000 -0500
-+++ mysql-5.0.16/Makefile.am	2005-12-09 18:29:31.000000000 -0500
-@@ -107,8 +107,8 @@
+diff -Naur mysql-5.0.22.orig/Makefile.am mysql-5.0.22/Makefile.am
+--- mysql-5.0.22.orig/Makefile.am	2006-05-25 04:56:41.000000000 -0400
++++ mysql-5.0.22/Makefile.am	2006-06-09 00:03:21.000000000 -0400
+@@ -106,8 +106,8 @@
  
  test:
  	cd mysql-test ; \
@@ -28,23 +28,41 @@
  
  test-force:
  	cd mysql-test; \
-diff -Naur mysql-5.0.16.orig/mysql-test/mysql-test-run.sh mysql-5.0.16/mysql-test/mysql-test-run.sh
---- mysql-5.0.16.orig/mysql-test/mysql-test-run.sh	2005-11-14 19:12:46.000000000 -0500
-+++ mysql-5.0.16/mysql-test/mysql-test-run.sh	2005-12-09 18:34:09.000000000 -0500
-@@ -222,6 +222,16 @@
- # an environment variable can be used to control all ports. A small
- # number is to be used, 0 - 16 or similar.
+diff -Naur mysql-5.0.22.orig/mysql-test/mysql-test-run.sh mysql-5.0.22/mysql-test/mysql-test-run.sh
+--- mysql-5.0.22.orig/mysql-test/mysql-test-run.sh	2006-05-25 04:56:49.000000000 -0400
++++ mysql-5.0.22/mysql-test/mysql-test-run.sh	2006-06-09 00:06:22.000000000 -0400
+@@ -252,6 +252,34 @@
+ # 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
+ # all port numbers might not be used in this version of the script.
  #
 +# hack to allow 32- and 64-bit tests to run concurrently on same build machine
 +case `uname -m` in
-+  ppc64 | s390x | x86_64)
-+    MTR_BUILD_THREAD=7
++  i?86)
++    MTR_BUILD_THREAD=0
++    ;;
++  x86_64)
++    MTR_BUILD_THREAD=1
++    ;;
++  ia64)
++    MTR_BUILD_THREAD=2
++    ;;
++  ppc)
++    MTR_BUILD_THREAD=3
++    ;;
++  ppc64)
++    MTR_BUILD_THREAD=4
++    ;;
++  s390)
++    MTR_BUILD_THREAD=5
++    ;;
++  s390x)
++    MTR_BUILD_THREAD=6
 +    ;;
 +  *)
-+    MTR_BUILD_THREAD=11
++    MTR_BUILD_THREAD=7
 +    ;;
 +esac
 +
  if [ -n "$MTR_BUILD_THREAD" ] ; then
-   MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000`
+   MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 10 + 10000`
    MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:14:49 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.14,1.15
Message-ID: <200606090414.k594EmLp016294@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16262

Modified Files:
	gcalctool.spec 
Log Message:
buildrequire flex



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gcalctool.spec	9 Jun 2006 03:58:33 -0000	1.14
+++ gcalctool.spec	9 Jun 2006 04:14:44 -0000	1.15
@@ -18,6 +18,7 @@
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
+BuildRequires: flex
 
 Requires(post): scrollkeeper
 Requires(post): GConf2



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:24:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:24:10 -0400
Subject: rpms/gucharmap/devel gucharmap.spec,1.2,1.3
Message-ID: <200606090424.k594OArS030789@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gucharmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30098

Modified Files:
	gucharmap.spec 
Log Message:
fix build reqs



Index: gucharmap.spec
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gucharmap.spec	2 Jun 2006 04:17:14 -0000	1.2
+++ gucharmap.spec	9 Jun 2006 04:24:04 -0000	1.3
@@ -20,6 +20,7 @@
 BuildRequires: libgnome-devel >= 2.13.7
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} 
 BuildRequires: scrollkeeper
+BuildRequires: gettext
 
 Requires(post):scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version} 



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:27:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:27:24 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.15,1.16
Message-ID: <200606090427.k594ROaQ032747@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32708

Modified Files:
	gcalctool.spec 
Log Message:
build req bison



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcalctool.spec	9 Jun 2006 04:14:44 -0000	1.15
+++ gcalctool.spec	9 Jun 2006 04:27:12 -0000	1.16
@@ -18,7 +18,7 @@
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
-BuildRequires: flex
+BuildRequires: flex bison
 
 Requires(post): scrollkeeper
 Requires(post): GConf2



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:33:55 -0400
Subject: rpms/zenity/devel zenity.spec,1.9,1.10
Message-ID: <200606090433.k594Xsjh001238@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv779

Modified Files:
	zenity.spec 
Log Message:
fix build reqs



Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zenity.spec	6 Jun 2006 02:05:06 -0000	1.9
+++ zenity.spec	9 Jun 2006 04:33:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           zenity
 Version:        2.15.2
-Release:        2
+Release:        3
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
 License:        GPL
@@ -16,7 +16,7 @@
 BuildRequires: libgnomecanvas-devel
 BuildRequires: scrollkeeper
 BuildRequires: which
-BuildRequires: autoconf
+BuildRequires: gettext
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-3
+- Add missing BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 04:34:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 00:34:46 -0400
Subject: rpms/gucharmap/devel gucharmap.spec,1.3,1.4
Message-ID: <200606090434.k594Ykb4001348@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gucharmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1286

Modified Files:
	gucharmap.spec 
Log Message:
Add missing BuildRequires



Index: gucharmap.spec
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gucharmap.spec	9 Jun 2006 04:24:04 -0000	1.3
+++ gucharmap.spec	9 Jun 2006 04:34:41 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           gucharmap
 Version:        1.6.0
-Release:        7
+Release:        8
 Summary:        Unicode character picker and font browser
 
 Group:          Applications/System
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 1.6.0-8
+- Add missing BuildRequires
+
 * Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> 1.6.0-7
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 05:05:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 01:05:11 -0400
Subject: rpms/vte/devel vte.spec,1.81,1.82
Message-ID: <200606090505.k5955BtV023537@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23463

Modified Files:
	vte.spec 
Log Message:
fix build reqs



Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vte.spec	28 May 2006 14:47:58 -0000	1.81
+++ vte.spec	9 Jun 2006 05:05:03 -0000	1.82
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.13.1
-Release: 3
+Release: 4
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
@@ -9,6 +9,8 @@
 BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel
 BuildRequires: gettext
 BuildRequires: libXt-devel
+BuildRequires: perl-XML-Parser
+
 Requires: bitmap-fonts
 # initscripts creates the utmp group
 Prereq: initscripts 



From fedora-cvs-commits at redhat.com  Fri Jun  9 06:29:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 02:29:06 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-memory-leaks.patch, NONE,
	1.1 autofs-5.0.0_beta4-misc-fixes-2.patch, NONE,
	1.1 autofs-5.0.0_beta4-sources-list-corruption.patch, NONE,
	1.1 autofs.spec, 1.98, 1.99
Message-ID: <200606090629.k596T5t8025843@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25745

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-memory-leaks.patch 
	autofs-5.0.0_beta4-misc-fixes-2.patch 
	autofs-5.0.0_beta4-sources-list-corruption.patch 
Log Message:
* Fri Jun 9 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-6
- add free for working var in get_default_logging.
- add inialisation for kver in autofs_point struct.
- fix sources list corruption in check_update_map_sources.
- fix memory leak in walk_tree.
- fix memory leak in rpc_portmap_getport and rpc_ping_proto.
- fix memory leak in initialisation of lookup modules.


autofs-5.0.0_beta4-memory-leaks.patch:
 CHANGELOG                |    3 +++
 daemon/automount.c       |    4 +++-
 lib/rpc_subs.c           |   40 ++++++++++++++++++++++++++++++++--------
 modules/lookup_file.c    |   18 ++++++++++++++++--
 modules/lookup_ldap.c    |   12 +++++++++---
 modules/lookup_nisplus.c |   15 ++++++++++++---
 modules/lookup_yp.c      |   13 +++++++++++--
 modules/mount_nfs.c      |   16 ++++++++++++----
 modules/parse_sun.c      |    5 ++++-
 9 files changed, 102 insertions(+), 24 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-memory-leaks.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 8f6e13b..f2557bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,9 @@
 - add free for working var in get_default_logging.
 - add inialisation for kver in autofs_point struct.
 - fix sources list corruption in check_update_map_sources.
+- fix memory leak in walk_tree.
+- fix memory leak in rpc_portmap_getport and rpc_ping_proto.
+- fix memory leak in initialisation of lookup modules.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 52f1ceb..827541f 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -385,8 +385,10 @@ static int walk_tree(const char *base, i
 				int ret, size;
 
 				if (strcmp(de[n]->d_name, ".") == 0 ||
-				    strcmp(de[n]->d_name, "..") == 0)
+				    strcmp(de[n]->d_name, "..") == 0) {
+					free(de[n]);
 					continue;
+				}
 
 				size = sizeof(buf);
 				ret = cat_path(buf, size, base, de[n]->d_name);
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index bd12dae..d87362b 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -452,10 +452,22 @@ unsigned short rpc_portmap_getport(struc
 		 * Only play with the close options if we think it
 		 * completed OK
 		 */
-		if (proto == IPPROTO_TCP && stat == RPC_SUCCESS)
-			rpc_destroy_tcp_client(info);
-		else
-			rpc_destroy_udp_client(info);
+		if (proto == IPPROTO_TCP && stat == RPC_SUCCESS) {
+			struct linger lin = { 1, 0 };
+			socklen_t lin_len = sizeof(struct linger);
+			int fd;
+
+			if (!clnt_control(client, CLGET_FD, (char *) &fd))
+				fd = -1;
+
+			switch (info->close_option) {
+			case RPC_CLOSE_NOLINGER:
+				if (fd >= 0)
+					setsockopt(fd, SOL_SOCKET, SO_LINGER, &lin, lin_len);
+				break;
+			}
+		}
+		clnt_destroy(client);
 	}
 
 	if (stat != RPC_SUCCESS)
@@ -496,10 +508,22 @@ int rpc_ping_proto(struct conn_info *inf
 		 * Only play with the close options if we think it
 		 * completed OK
 		 */
-		if (proto == IPPROTO_TCP && stat == RPC_SUCCESS)
-			rpc_destroy_tcp_client(info);
-		else
-			rpc_destroy_udp_client(info);
+		if (proto == IPPROTO_TCP && stat == RPC_SUCCESS) {
+			struct linger lin = { 1, 0 };
+			socklen_t lin_len = sizeof(struct linger);
+			int fd;
+
+			if (!clnt_control(client, CLGET_FD, (char *) &fd))
+				fd = -1;
+
+			switch (info->close_option) {
+			case RPC_CLOSE_NOLINGER:
+				if (fd >= 0)
+					setsockopt(fd, SOL_SOCKET, SO_LINGER, &lin, lin_len);
+				break;
+			}
+		}
+		clnt_destroy(client);
 	}
 
 	if (stat != RPC_SUCCESS)
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index f92e380..b9e7701 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -58,15 +58,17 @@ int lookup_init(const char *mapfmt, int 
 	char buf[MAX_ERR_BUF];
 	struct stat st;
 
-	if (!(*context = ctxt = malloc(sizeof(struct lookup_context)))) {
+	if (!(ctxt = malloc(sizeof(struct lookup_context)))) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+		*context = NULL;
 		return 1;
 	}
 
 	if (argc < 1) {
 		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		free(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
@@ -77,6 +79,7 @@ int lookup_init(const char *mapfmt, int 
 		      MODPREFIX "file map %s is not an absolute pathname",
 		      ctxt->mapname);
 		free(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
@@ -85,6 +88,7 @@ int lookup_init(const char *mapfmt, int 
 		     MODPREFIX "file map %s missing or not readable",
 		     ctxt->mapname);
 		free(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
@@ -92,6 +96,7 @@ int lookup_init(const char *mapfmt, int 
 		crit(LOGOPT_ANY, MODPREFIX "file map %s, could not stat",
 		     ctxt->mapname);
 		free(ctxt);
+		*context = NULL;
 		return 1;
 	}
 		
@@ -100,7 +105,16 @@ int lookup_init(const char *mapfmt, int 
 	if (!mapfmt)
 		mapfmt = MAPFMT_DEFAULT;
 
-	return !(ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1));
+	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+	if (!ctxt->parse) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
+		free(ctxt);
+		*context = NULL;
+		return 1;
+	}
+	*context = ctxt;
+
+	return 0;
 }
 
 static int read_one(FILE *f, char *key, char *mapent)
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 654986c..ad676e7 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -689,17 +689,17 @@ static void free_context(struct lookup_c
  */
 int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
 {
-	struct lookup_context *ctxt = NULL;
+	struct lookup_context *ctxt;
 	char buf[MAX_ERR_BUF];
 	int ret;
 	LDAP *ldap = NULL;
 
 	/* If we can't build a context, bail. */
-	*context = NULL;
 	ctxt = (struct lookup_context *) malloc(sizeof(struct lookup_context));
-	if (ctxt == NULL) {
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+		*context = NULL;
 		return 1;
 	}
 	memset(ctxt, 0, sizeof(struct lookup_context));
@@ -715,6 +715,7 @@ int lookup_init(const char *mapfmt, int 
 	if (!parse_server_string(argv[0], ctxt)) {
 		error(LOGOPT_ANY, MODPREFIX "cannot parse server string");
 		free_context(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
@@ -722,6 +723,7 @@ int lookup_init(const char *mapfmt, int 
 	if (!get_default_schema(ctxt)) {
 		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
 		free_context(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
@@ -734,6 +736,7 @@ #if WITH_SASL
 	if (ret) {
 		error(LOGOPT_ANY, MODPREFIX "cannot initialize auth setup");
 		free_context(ctxt);
+		*context = NULL;
 		return 1;
 	}
 #endif
@@ -742,6 +745,7 @@ #endif
 	if (!ldap) {
 		error(LOGOPT_ANY, MODPREFIX "cannot connect to server");
 		free_context(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
@@ -751,7 +755,9 @@ #endif
 	/* Open the parser, if we can. */
 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
 	if (!ctxt->parse) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free_context(ctxt);
+		*context = NULL;
 		return 1;
 	}
 
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index c9a8b8e..0bf1b02 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -37,9 +37,10 @@ int lookup_init(const char *mapfmt, int 
 	struct lookup_context *ctxt;
 	char buf[MAX_ERR_BUF];
 
-	if (!(*context = ctxt = malloc(sizeof(struct lookup_context)))) {
+	if (!(ctxt = malloc(sizeof(struct lookup_context)))) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "%s", estr);
+		*context = NULL;
 		return 1;
 	}
 
@@ -57,7 +58,7 @@ int lookup_init(const char *mapfmt, int 
 	 */
 	ctxt->domainname = nis_local_directory();
 	if (!ctxt->domainname) {
-		crit(LOGOPT_ANY, "NIS+ domain not set");
+		crit(LOGOPT_ANY, MODPREFIX "NIS+ domain not set");
 		free(ctxt);
 		*context = NULL;
 		return 1;
@@ -66,7 +67,15 @@ int lookup_init(const char *mapfmt, int 
 	if (!mapfmt)
 		mapfmt = MAPFMT_DEFAULT;
 
-	return !(ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1));
+	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+	if (!ctxt->parse) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
+		free(ctxt);
+		*context = NULL;
+		return 1;
+	}
+
+	return 0;
 }
 
 int lookup_read_master(struct master *master, time_t age, void *context)
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 5cc242e..8c3a2ba 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -62,9 +62,10 @@ int lookup_init(const char *mapfmt, int 
 	char buf[MAX_ERR_BUF];
 	int err;
 
-	if (!(*context = ctxt = malloc(sizeof(struct lookup_context)))) {
+	if (!(ctxt = malloc(sizeof(struct lookup_context)))) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "%s", estr);
+		*context = NULL;
 		return 1;
 	}
 
@@ -91,7 +92,15 @@ int lookup_init(const char *mapfmt, int 
 	if (!mapfmt)
 		mapfmt = MAPFMT_DEFAULT;
 
-	return !(ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1));
+	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+	if (!ctxt->parse) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
+		free(ctxt);
+		*context = NULL;
+		return 1;
+	}
+
+	return 0;
 }
 
 int yp_all_master_callback(int status, char *ypkey, int ypkeylen,
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 4efbff9..09f431f 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -41,12 +41,16 @@ #define MODPREFIX "mount(nfs): "
 int mount_version = AUTOFS_MOUNT_VERSION;	/* Required by protocol */
 
 static struct mount_mod *mount_bind = NULL;
+static int init_ctr = 0;
 
 int mount_init(void **context)
 {
 	/* Make sure we have the local mount method available */
-	if (!mount_bind)
-		mount_bind = open_mount("bind", MODPREFIX);
+	if (!mount_bind) {
+		if (mount_bind = open_mount("bind", MODPREFIX));
+			init_ctr++;
+	} else
+		init_ctr++;
 
 	return !mount_bind;
 }
@@ -262,7 +266,11 @@ int mount_mount(struct autofs_point *ap,
 
 int mount_done(void *context)
 {
-	int rv = mount_bind->mount_done(mount_bind->context);
-	mount_bind = NULL;
+	int rv = 0;
+
+	if (--init_ctr == 0) {
+		rv = close_mount(mount_bind);
+		mount_bind = NULL;
+	}
 	return rv;
 }
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 248d661..3859d13 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -344,6 +344,7 @@ int parse_init(int argc, const char *con
 	if (!(ctxt = (struct parse_context *) malloc(sizeof(struct parse_context)))) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+		*context = NULL;
 		return 1;
 	}
 	*context = (void *) ctxt;
@@ -449,6 +450,7 @@ int parse_init(int argc, const char *con
 				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 				kill_context(ctxt);
 				crit(LOGOPT_ANY, MODPREFIX "%s", estr);
+				*context = NULL;
 				return 1;
 			}
 			ctxt->optstr = noptstr;
@@ -460,7 +462,7 @@ int parse_init(int argc, const char *con
 
 	/* We only need this once.  NFS mounts are so common that we cache
 	   this module. */
-	if (!mount_nfs)
+	if (!mount_nfs) {
 		if ((mount_nfs = open_mount("nfs", MODPREFIX))) {
 			init_ctr++;
 			return 0;
@@ -468,6 +470,7 @@ int parse_init(int argc, const char *con
 			kill_context(ctxt);
 			*context = NULL;
 			return 1;
+		}
 	} else {
 		init_ctr++;
 		return 0;

autofs-5.0.0_beta4-misc-fixes-2.patch:
 CHANGELOG      |    2 ++
 lib/defaults.c |    2 ++
 lib/master.c   |    2 ++
 3 files changed, 6 insertions(+)

--- NEW FILE autofs-5.0.0_beta4-misc-fixes-2.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 6259741..beff9de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,8 @@
 - fix rpc routines not logging errors.
 - fix handling of invalid directory for nobrowse hosts map
   lookup.
+- add free for working var in get_default_logging.
+- add inialisation for kver in autofs_point struct.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/lib/defaults.c b/lib/defaults.c
index b5fdae7..3e6ec8a 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -231,6 +231,8 @@ unsigned int defaults_get_logging(void)
 			logging |= LOGOPT_DEBUG;
 	}
 
+	free(res);
+
 	return logging;
 }
 
diff --git a/lib/master.c b/lib/master.c
index 09823f6..becd2e2 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -54,6 +54,8 @@ int master_add_autofs_point(struct maste
 		return 0;
 
 	ap->state = ST_INIT;
+	ap->kver.major = 0;
+	ap->kver.minor = 0;
 
 	ap->state_pipe[0] = -1;
 	ap->state_pipe[1] = -1;

autofs-5.0.0_beta4-sources-list-corruption.patch:
 CHANGELOG    |    1 +
 lib/master.c |    7 +++++++
 2 files changed, 8 insertions(+)

--- NEW FILE autofs-5.0.0_beta4-sources-list-corruption.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index beff9de..8f6e13b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@
   lookup.
 - add free for working var in get_default_logging.
 - add inialisation for kver in autofs_point struct.
+- fix sources list corruption in check_update_map_sources.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/lib/master.c b/lib/master.c
index becd2e2..167054d 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -934,8 +934,14 @@ static void check_update_map_sources(str
 
 		/* Map source has gone away */
 		if (source->age < age) {
+			struct map_source *next;
+			if (last)
+				last->next = source->next;
+			next = source->next;
 			master_free_map_source(source, 1);
+			source = next;
 			map_stale = 1;
+			continue;
 		} else if (source->type) {
 			if (!strcmp(source->type, "null")) {
 /*				entry->ap->mc = cache_init(entry->ap); */
@@ -944,6 +950,7 @@ static void check_update_map_sources(str
 				map_stale = 1;
 			}
 		}
+		last = source;
 		source = source->next;
 	}
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- autofs.spec	8 Jun 2006 10:48:30 -0000	1.98
+++ autofs.spec	9 Jun 2006 06:29:03 -0000	1.99
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -21,6 +21,9 @@
 Patch7: autofs-5.0.0_beta4-wildcard-handling.patch
 Patch8: autofs-5.0.0_beta4-master_parse-redeclare.patch
 Patch9: autofs-5.0.0_beta4-misc-fixes.patch
+Patch10: autofs-5.0.0_beta4-misc-fixes-2.patch
+Patch11: autofs-5.0.0_beta4-sources-list-corruption.patch
+Patch12: autofs-5.0.0_beta4-memory-leaks.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -69,6 +72,9 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -124,6 +130,14 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Jun 9 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-6
+- add free for working var in get_default_logging.
+- add inialisation for kver in autofs_point struct.
+- fix sources list corruption in check_update_map_sources.
+- fix memory leak in walk_tree.
+- fix memory leak in rpc_portmap_getport and rpc_ping_proto.
+- fix memory leak in initialisation of lookup modules.
+
 * Wed Jun 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-5
 - misc fixes for things found while investigating map re-read problem.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 07:19:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 03:19:56 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.68,1.69
Message-ID: <200606090719.k597JutB019283@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19245

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-7
- Change "BuildRequires: freetype-devel >= 2.1.10" to 2.1.9, as Xorg 7.0
  contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
  a newer freetype.
- Janitorial cleanups for spec file changelog consistency.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xorg-x11-server.spec	7 Jun 2006 19:10:44 -0000	1.68
+++ xorg-x11-server.spec	9 Jun 2006 07:19:53 -0000	1.69
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release: 6
+Release:   7
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -90,7 +90,7 @@
 # For Xdmxconfig 
 BuildRequires: libXt-devel libXpm-devel libXaw-devel
 
-BuildRequires: freetype-devel >= 2.1.10
+BuildRequires: freetype-devel >= 2.1.9
 
 # To query fontdir from fontutil.pc
 BuildRequires: xorg-x11-font-utils >= 1.0.0-1
@@ -544,10 +544,16 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.1.0-6
+* Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-7
+- Change "BuildRequires: freetype-devel >= 2.1.10" to 2.1.9, as Xorg 7.0
+  contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
+  a newer freetype.
+- Janitorial cleanups for spec file changelog consistency.
+
+* Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
 - BR automake and autoconf
 
-* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.1.0-5
+* Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-5
 - build on ppc64 so that we have an X server there
 
 * Tue Jun 06 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-4
@@ -574,7 +580,7 @@
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.903-1
 - Update to 7.1RC3, plus experimental fix for fdo bug #6827.
 
-* Mon May  1 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.902-1
+* Mon May 01 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.902-1
 - Update to 7.1RC2 plus fix for CVE 2006-1526.  Disable the fastpathing
   patch for fdo bug #4320 since that should be covered in the generic
   Render code now.
@@ -596,14 +602,14 @@
 * Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-2
 - Bump for fc5 build.
 
-* Sat Apr  8 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-1
+* Sat Apr 08 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-1
 - Update to 7.1 RC1.
 
-* Thu Apr  6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
+* Thu Apr 06 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
 - Remove LBX to match upstream policy.
 - Add Xephyr server.
 
-* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
+* Tue Apr 04 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
 - Update to 1.0.99.2 snapshot and go back to using mesa-source package.
 - Drop xorg-server-1.0.99-composite-visibility.patch.
 - Drop xorg-server-1.0.1-backtrace.patch.
@@ -620,7 +626,7 @@
 * Tue Mar 21 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.1-1
 - Update to 1.0.99.1 snapshot.
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1.0.1-8
+* Mon Mar 06 2006 Jeremy Katz <katzj at redhat.com> 1.0.1-8
 - build libxf86config with -fPIC (#181292)
 - fix sgi 1600sw extra mode (#182430)
 
@@ -635,7 +641,7 @@
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-6.1
 - bump again for double-long bug on ppc(64)
 
-* Wed Feb  8 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
+* Wed Feb 08 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
 - Added xorg-x11-server-1.0.1-Red-Hat-extramodes.patch which is a merger of
   XFree86-4.2.99.2-redhat-custom-modelines.patch and
   xorg-x11-6.8.2-laptop-modes.patch from FC4 for (#180301)
@@ -643,18 +649,18 @@
   of video modes that are built into the X server, so that the "rhpxl" package
   does not have to carry around an out of sync copy for itself. (#180301)
 
-* Tue Feb  7 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-5
+* Tue Feb 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-5
 - Updated "BuildRequires: mesa-source >= 6.4.2-2" to get fix for (#176976)
 
-* Mon Feb  6 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
+* Mon Feb 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
 - Fix brown paper bag error introduced in rpm post script in 1.0.1-4.
 
-* Mon Feb  6 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+* Mon Feb 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch with changes
   suggested by ajax to fix (fdo#4320).
 - Cosmetic cleanups to satiate the banshees.
 
-* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+* Sun Feb 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
 - Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
   SEGV on null interfaces (#174279,178986)
@@ -749,10 +755,10 @@
 * Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-4
 - Added "Requires: xkbcomp" for Xorg server, as it invokes it internally.
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
 - Added "BuildRequires: libXtst-devel" for Xtst examples.
 
-* Mon Nov 7 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
+* Mon Nov 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
 - Added versioning to Xorg virtual Provide, to allow config tools and driver
   packages to have version based requires.
 
@@ -776,11 +782,11 @@
 - Added "BuildRequires: libXres-devel" for Xres examples
 - Added {_libdir}/xserver/SecurityPolicy to Xorg subpackage for XSECURITY
 
-* Mon Oct  3 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.2
+* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.2
 - Fix license tag to be "MIT/X11"
 - Change Xdmx subpackage to Obsolete xorg-x11-Xdmx instead of xorg-x11-Xnest
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.1
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.1
 - Update BuildRequires for new library package naming (libX...)
 - Use Fedora Extras style BuildRoot tag
 - Invoke make with _smp_mflags to take advantage of SMP systems



From fedora-cvs-commits at redhat.com  Fri Jun  9 07:27:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 03:27:28 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.69,1.70
Message-ID: <200606090727.k597RSF0022188@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22153

Modified Files:
	xorg-x11-server.spec 
Log Message:
Call aclocal before automake, otherwise automake >= 1.9.6 is required in order to rebuild the package.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xorg-x11-server.spec	9 Jun 2006 07:19:53 -0000	1.69
+++ xorg-x11-server.spec	9 Jun 2006 07:27:26 -0000	1.70
@@ -266,7 +266,7 @@
 #	--disable-dependency-tracking \
 # also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
 
-automake; autoconf
+aclocal --force; automake ; autoconf
 %configure %{xservers} \
 	--disable-xprint \
 	--disable-static \
@@ -549,6 +549,8 @@
   contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
   a newer freetype.
 - Janitorial cleanups for spec file changelog consistency.
+- Call aclocal before automake, otherwise automake >= 1.9.6 is required in
+  order to rebuild the package.
 
 * Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
 - BR automake and autoconf



From fedora-cvs-commits at redhat.com  Fri Jun  9 07:59:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 03:59:32 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.70,1.71
Message-ID: <200606090759.k597xWr7014033@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13991

Modified Files:
	xorg-x11-server.spec 
Log Message:
Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody fixed them.  It appears automake 1.9 doesn't like things.  Forcing automake 1.7 on the build to see if that makes a difference.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xorg-x11-server.spec	9 Jun 2006 07:27:26 -0000	1.70
+++ xorg-x11-server.spec	9 Jun 2006 07:59:29 -0000	1.71
@@ -54,7 +54,7 @@
 %define with_dri	0
 %endif
 
-BuildRequires: automake
+BuildRequires: automake17
 BuildRequires: autoconf
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 0.99.1
@@ -266,7 +266,7 @@
 #	--disable-dependency-tracking \
 # also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
 
-aclocal --force; automake ; autoconf
+aclocal --force; automake-1.7 ; autoconf
 %configure %{xservers} \
 	--disable-xprint \
 	--disable-static \
@@ -551,6 +551,9 @@
 - Janitorial cleanups for spec file changelog consistency.
 - Call aclocal before automake, otherwise automake >= 1.9.6 is required in
   order to rebuild the package.
+- Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody
+  fixed them.  It appears automake 1.9 doesn't like things.  Forcing
+  automake 1.7 on the build to see if that makes a difference.
 
 * Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
 - BR automake and autoconf



From fedora-cvs-commits at redhat.com  Fri Jun  9 08:15:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 04:15:59 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.21,1.22
Message-ID: <200606090815.k598FxTe020424@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19852

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
Disable db-root-visual.patch, because the file wasn't committed to CVS.


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-ati.spec	8 Jun 2006 20:43:13 -0000	1.21
+++ xorg-x11-drv-ati.spec	9 Jun 2006 08:15:56 -0000	1.22
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.0
-Release:   5
+Release:   6
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -42,7 +42,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch0 -p0 -b .db-root-visual
+#%patch0 -p0 -b .db-root-visual
 
 %build
 %configure --disable-static
@@ -86,6 +86,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Jun  8 2006 Mike A. Harris <mharris@@redhat.com> 6.6.0-6
+- Disable db-root-visual.patch, because the file wasn't committed to CVS.
+
 * Thu Jun  8 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-5
 - Bump for rawhide build.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 08:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 04:26:53 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.71,1.72
Message-ID: <200606090826.k598Qqsq002987@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2952

Modified Files:
	xorg-x11-server.spec 
Log Message:
Invoke aclocal-1.7 to match automake-1.7, also remove the --force option as aclocal-1.7 does not support that


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- xorg-x11-server.spec	9 Jun 2006 07:59:29 -0000	1.71
+++ xorg-x11-server.spec	9 Jun 2006 08:26:48 -0000	1.72
@@ -266,7 +266,7 @@
 #	--disable-dependency-tracking \
 # also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
 
-aclocal --force; automake-1.7 ; autoconf
+aclocal-1.7 ; automake-1.7 ; autoconf
 %configure %{xservers} \
 	--disable-xprint \
 	--disable-static \
@@ -549,11 +549,11 @@
   contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
   a newer freetype.
 - Janitorial cleanups for spec file changelog consistency.
-- Call aclocal before automake, otherwise automake >= 1.9.6 is required in
+- Call aclocal-1.7 before automake, otherwise automake >= 1.9.6 is required in
   order to rebuild the package.
 - Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody
   fixed them.  It appears automake 1.9 doesn't like things.  Forcing
-  automake 1.7 on the build to see if that makes a difference.
+  automake-1.7 on the build to see if that makes a difference.
 
 * Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
 - BR automake and autoconf



From fedora-cvs-commits at redhat.com  Fri Jun  9 08:54:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 04:54:35 -0400
Subject: rpms/gmp/devel gmp.spec,1.26,1.27
Message-ID: <200606090854.k598sZkK024711@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24564

Modified Files:
	gmp.spec 
Log Message:
[tw] fixed wrong name glob for sse2 libs



Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gmp.spec	8 Jun 2006 16:56:02 -0000	1.26
+++ gmp.spec	9 Jun 2006 08:54:32 -0000	1.27
@@ -137,7 +137,7 @@
 %{_libdir}/libmp.so.*
 %{_libdir}/libgmpxx.so.*
 %ifarch %{ix86}
-%{_libdir}/sse2/libgmp*
+%{_libdir}/sse2/lib*
 %endif
 
 %files devel
@@ -152,7 +152,7 @@
 %{_infodir}/gmp.info*
 
 %changelog
-* Thu Jun  8 2006 Thomas Woerner <twoerner at redhat.com> 4.2.1-1
+* Fri Jun  9 2006 Thomas Woerner <twoerner at redhat.com> 4.2.1-1
 - new version 4.2.1
 - mpfr moved out of gmp
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 09:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 05:10:08 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.66,1.67
Message-ID: <200606090910.k599A8aw028191@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28117

Modified Files:
	sane-backends.spec 
Log Message:
split package into sane-backends, -devel, -libs, -programs to work around multilib issues (#135172)



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sane-backends.spec	7 Jun 2006 13:12:42 -0000	1.66
+++ sane-backends.spec	9 Jun 2006 09:10:05 -0000	1.67
@@ -1,10 +1,13 @@
 # Disable gphoto2 backend by using "--without gphoto2"
 %define gphoto2_support 0%{!?_without_gphoto2:1}
 
+# Enable splitting out gphoto2 backends by using "--with gphoto2_split"
+%define gphoto2_split 0%{!?_without_gphoto2:%{?_with_gphoto2_split:1}}
+
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 12
+Release: 13
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -25,27 +28,18 @@
 Requires: pam >= 0.78-2
 Requires: udev
 Requires: libsane-hpaio
+Obsoletes: sane-backends-docs <= 1.0.17-12
+Provides: sane-backends-docs
 ExcludeArch: s390 s390x
 
 %description
 Scanner Access Now Easy (SANE) is a universal scanner interface.  The
 SANE application programming interface (API) provides standardized
 access to any raster image scanner hardware (flatbed scanner,
-hand-held scanner, video and still cameras, frame-grabbers, etc.). If
-they're using SANE, developers can write image-processing applications
-without having to think about the peculiarities of individual devices.
-SANE also makes it possible to write a device driver once, which can
-then be used by any SANE-compliant application. SANE currently
-includes drivers for some Epson SCSI scanners, HP ScanJet SCSI
-scanners, Microtek SCSI scanners, Mustek SCSI flatbed scanners, PINT
-devices, most UMAX SCSI scanners, Connectix QuickCam, and other SANE
-devices via network. Note that this package does not enable network
-scanning by default.  If you wish to enable network scanning, read the
-saned(1) manpage.  If you'd like to develop SANE modules, you should
-also install the sane-backends-devel package.
+hand-held scanner, video and still cameras, frame-grabbers, etc.).
 
 %package devel
-Summary: The SANE (a universal scanner interface) development toolkit.
+Summary: SANE development toolkit
 Group: Development/Libraries
 Requires: sane-backends = %{version}, libusb-devel, libieee1284-devel
 Requires: pkgconfig
@@ -56,16 +50,37 @@
 Provides: sane-devel
 
 %description devel
-Static libraries and header files for writing Scanner Access Now Easy
-(SANE) modules.  SANE is a universal scanner interface which is
-included in the sane-backends package.
-
-%package docs
-Summary: Additional documentation for SANE
-Group: Documentation
+This package contains static libraries and header files for writing Scanner
+Access Now Easy (SANE) modules.
+
+%package libs
+Summary: SANE libraries
+Group: System Environment/Libraries
+Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: sane-backends <= 1.0.17-12
+
+%description libs
+This package contains the SANE libraries which are needed by applications that
+want to access scanners.
+
+%if %{gphoto2_split}
+%package libs-gphoto2
+Summary: SANE libraries for gphoto2
+Group: System Environment/Libraries
+Requires: sane-backends-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libs-gphoto2
+This package contains the SANE libraries which are needed by applications that
+want to access digital cameras.
+%endif
 
-%description docs
-Additional documentation for SANE, a universal scanner interface.
+%package programs
+Summary: SANE programs
+Group: Applications/Multimedia
+
+%description programs
+This package contains SANE Utilities and the SANE daemon needed for scanning
+over a network.
 
 %prep
 %setup -q
@@ -108,6 +123,7 @@
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
 rm -f %{buildroot}%{_bindir}/gamma4scanimage
+rm -f %{buildroot}%{_mandir}/man1/gamma4scanimage.1*
 rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
 mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/
@@ -118,53 +134,62 @@
 
 %find_lang %name
 
+
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %dir /etc/sane.d
 %config(noreplace) /etc/sane.d/*
 %{_sysconfdir}/udev/rules.d/*
-%{_bindir}/sane-find-scanner
-%{_bindir}/scanimage
-%{_sbindir}/*
-%{_libdir}/libsane*.so.*
-%dir %{_libdir}/sane
-%{_libdir}/sane/*.so.*
 %{_mandir}/*/*
+%exclude %{_mandir}/man1/*
+%exclude %{_mandir}/man8/*
 %{_datadir}/pixmaps/sane.png
-%{_docdir}/*
-%exclude %{_docdir}/%{name}-%{version}/sane-backends.html
-%exclude %{_docdir}/%{name}-%{version}/sane-backends-external.html
-%exclude %{_docdir}/%{name}-%{version}/sane-mfgs.html
-%exclude %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
-%exclude %{_docdir}/%{name}-%{version}/sane.dvi
-%exclude %{_docdir}/%{name}-%{version}/sane.ps
+%doc %{_docdir}/*
 
 %files devel
 %defattr(-,root,root)
 %{_bindir}/sane-config
+%{_mandir}/man1/sane-config.1*
 %{_includedir}/sane
 %{_libdir}/libsane*.so
 %{_libdir}/sane/*.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/sane-backends.pc
 
-%files docs
+%files libs
 %defattr(-, root, root)
-%{_docdir}/%{name}-%{version}/sane-backends.html
-%{_docdir}/%{name}-%{version}/sane-backends-external.html
-%{_docdir}/%{name}-%{version}/sane-mfgs.html
-%{_docdir}/%{name}-%{version}/sane-mfgs-external.html
-%{_docdir}/%{name}-%{version}/sane.dvi
-%{_docdir}/%{name}-%{version}/sane.ps
+%{_libdir}/libsane*.so.*
+%dir %{_libdir}/sane
+%{_libdir}/sane/*.so.*
+%if %{gphoto2_split}
+%exclude %{_libdir}/sane/*gphoto2.so.*
+
+%files libs-gphoto2
+%defattr(-, root, root)
+%{_libdir}/sane/*gphoto2.so.*
+%endif
+
+%files programs
+%defattr(-, root, root)
+%{_bindir}/sane-find-scanner
+%{_bindir}/scanimage
+%{_mandir}/man1/sane-find-scanner.1*
+%{_mandir}/man1/scanimage.1*
+%{_sbindir}/*
+%{_mandir}/man8/saned.8*
 
 %changelog
+* Fri Jun 09 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-13
+- split package into sane-backends, -devel, -libs, -programs to work around
+  multilib issues (#135172)
+
 * Wed Jun 07 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-12
 - require libsane-hpaio to work around #165751
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 09:20:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 05:20:54 -0400
Subject: rpms/php/devel php.spec,1.113,1.114
Message-ID: <200606090920.k599KsSS013633@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13590

Modified Files:
	php.spec 
Log Message:
* Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-7
- move Obsoletes for php-openssl to -common (#194501)
- Provide: php-cgi from -cli subpackage



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- php.spec	2 Jun 2006 11:07:41 -0000	1.113
+++ php.spec	9 Jun 2006 09:20:52 -0000	1.114
@@ -5,7 +5,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.4
-Release: 6
+Release: 7
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -41,7 +41,7 @@
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
 BuildRequires: zlib-devel, pcre-devel >= 4.5, smtpdaemon
 BuildRequires: bzip2, fileutils, file >= 4.0, perl, libtool >= 1.4.3, gcc-c++
-Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php, php-openssl
+Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php
 # Enforce Apache module ABI compatibility
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 Requires: file >= 4.0
@@ -64,8 +64,8 @@
 %package cli
 Group: Development/Languages
 Summary: Command-line interface for PHP
-Provides: php-cli = %{version}-%{release}
 Requires: php-common = %{version}-%{release}
+Provides: php-cgi = %{version}-%{release}
 
 %description cli
 The php-cli package contains the command-line interface 
@@ -82,6 +82,7 @@
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
 Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
 Provides: php-wddx, php-zlib
+Obsoletes: php-openssl
 
 %description common
 The php-common package contains files used by both the php
@@ -600,6 +601,10 @@
 %files pdo -f files.pdo
 
 %changelog
+* Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-7
+- move Obsoletes for php-openssl to -common (#194501)
+- Provide: php-cgi from -cli subpackage
+
 * Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 5.1.4-6
 - split out php-cli, php-common subpackages (#177821)
 - add php-pdo-abi version export (#193202)



From fedora-cvs-commits at redhat.com  Fri Jun  9 09:46:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 05:46:58 -0400
Subject: rpms/coreutils/devel coreutils-tempname.patch, NONE,
	1.1 coreutils.spec, 1.119, 1.120
Message-ID: <200606090946.k599kwEU008155@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7125

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-tempname.patch 
Log Message:
* Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com>
- Fix large file support for temporary files.


coreutils-tempname.patch:
 tempname.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE coreutils-tempname.patch ---
--- coreutils-5.96/lib/tempname.c.tempname	2005-09-22 07:05:39.000000000 +0100
+++ coreutils-5.96/lib/tempname.c	2006-06-09 10:38:53.000000000 +0100
@@ -1,7 +1,7 @@
 /* tempname.c - generate the name of a temporary file.
 
    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -66,14 +66,16 @@
 
 #if _LIBC
 # define struct_stat64 struct stat64
+# define small_open __open
+# define large_open __open64
 #else
 # include "stat-macros.h"
 # define struct_stat64 struct stat
+# define small_open open
+# define large_open open
 # define __getpid getpid
 # define __gettimeofday gettimeofday
 # define __mkdir mkdir
-# define __open open
-# define __open64 open
 # define __lxstat64(version, file, buf) lstat (file, buf)
 # define __xstat64(version, file, buf) stat (file, buf)
 #endif
@@ -269,11 +271,11 @@
       switch (kind)
 	{
 	case __GT_FILE:
-	  fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  fd = small_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 	  break;
 
 	case __GT_BIGFILE:
-	  fd = __open64 (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  fd = large_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 	  break;
 
 	case __GT_DIR:


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- coreutils.spec	5 Jun 2006 12:52:14 -0000	1.119
+++ coreutils.spec	9 Jun 2006 09:46:52 -0000	1.120
@@ -19,6 +19,7 @@
 Source201:  runuser.pamd
 
 # From upstream
+Patch1: coreutils-tempname.patch
 
 # Our patches
 Patch100: coreutils-chgrp.patch
@@ -76,6 +77,7 @@
 cp %{SOURCE1} po/pl.po
 
 # From upstream
+%patch1 -p1 -b .tempname
 
 # Our patches
 %patch100 -p1 -b .chgrp
@@ -270,6 +272,9 @@
 /sbin/runuser
 
 %changelog
+* Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com>
+- Fix large file support for temporary files.
+
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 5.96-3
 - Fixed Polish translation.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 09:58:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 05:58:42 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.70, 1.71 sources,
	1.73, 1.74 system-config-printer.spec, 1.28, 1.29
Message-ID: <200606090958.k599wgFM010321@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10305

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 0.7.12-1
- 0.7.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	31 May 2006 15:06:09 -0000	1.70
+++ .cvsignore	9 Jun 2006 09:58:39 -0000	1.71
@@ -50,3 +50,4 @@
 system-config-printer-0.7.9.tar.bz2
 system-config-printer-0.7.10.tar.bz2
 system-config-printer-0.7.11.tar.bz2
+system-config-printer-0.7.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	31 May 2006 15:06:09 -0000	1.73
+++ sources	9 Jun 2006 09:58:39 -0000	1.74
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-fce2e2bac1e406171cc7b0f570b64348  system-config-printer-0.7.11.tar.bz2
+950a4102202b7045b5b80da4fdbaecf0  system-config-printer-0.7.12.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- system-config-printer.spec	1 Jun 2006 15:13:15 -0000	1.28
+++ system-config-printer.spec	9 Jun 2006 09:58:39 -0000	1.29
@@ -2,8 +2,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.11
-Release: 3
+Version: 0.7.12
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -106,6 +106,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 0.7.12-1
+- 0.7.12.
+
 * Thu Jun  1 2006 Tim Waugh <twaugh at redhat.com> 0.7.11-3
 - Fix libs dependency.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 10:04:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 06:04:28 -0400
Subject: rpms/hal-cups-utils/devel cups-config-daemon, NONE, 1.1 .cvsignore,
	1.9, 1.10 hal-cups-utils.spec, 1.34, 1.35 sources, 1.9, 1.10
Message-ID: <200606091004.k59A4SL0010448@cvs.devel.redhat.com>

Author: ffesti

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10433

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Added Files:
	cups-config-daemon 
Log Message:
[ffesti] fixed hal policy file and added dummy init.d file to fix post un of previous version (0.5.5)



--- NEW FILE cups-config-daemon ---
#!/bin/sh
#
# cups-config-daemon:   Cups configuration daemon (obsolete)
#
# chkconfig: - 98 02 
# description: cups-config-daemon is obsolete\
#              This script just avoids that the postun script\
#              of hal-cups-utils < 0.6.0 fails 

echo cups-config-daemon is obsolete
exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Jun 2006 10:26:38 -0000	1.9
+++ .cvsignore	9 Jun 2006 10:04:24 -0000	1.10
@@ -1 +1 @@
-hal-cups-utils-0.6.0.tar.gz
+hal-cups-utils-0.6.1.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- hal-cups-utils.spec	6 Jun 2006 15:27:18 -0000	1.34
+++ hal-cups-utils.spec	9 Jun 2006 10:04:25 -0000	1.35
@@ -1,10 +1,11 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.0
+Version: 0.6.1
 Release: 1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
+Source1: cups-config-daemon
 Patch0: hal-cups-utils-0.6.0-remove-cups-backenddir-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
@@ -42,17 +43,32 @@
   mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
 fi
 
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/cups-config-daemon
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+
+/sbin/service cups-config-daemon stop > /dev/null 2>&1
+/sbin/chkconfig --del cups-config-daemon > /dev/null 2>&1
+exit 0
+
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_sbindir}/hal_lpadmin
 /usr/lib/cups/backend/hal
 %{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
+%{_initrddir}/cups-config-daemon
 
 %changelog
+* Fri Jun 09 2006 Florian Festi <ffesti at redhat.com> - 0.6.1-1
+- bump to 0.6.1 (fixed hal policy file)
+- added dummy init script for cups-config-daemon to fix the postun
+  script of the 0.5.5 version
+
 * Fri Jun 06 2006 Florian Festi <ffesti at redhat.com> - 0.6.0-1
 - new implementation which obsoletes the cups-config-daemon
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Jun 2006 10:26:39 -0000	1.9
+++ sources	9 Jun 2006 10:04:25 -0000	1.10
@@ -1 +1 @@
-309124c62a0e0de4578c3b74f609e2dd  hal-cups-utils-0.6.0.tar.gz
+599d650d60df6f037a9ecf6da8164fd1  hal-cups-utils-0.6.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  9 10:37:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 06:37:05 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.72,1.73
Message-ID: <200606091037.k59Ab5XN010425@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10386

Modified Files:
	xorg-x11-server.spec 
Log Message:
automake-1.9.5-1 works for me in FC4.  automake 1.7 is what upstream has in 'extras', but does not seem to work.  Something appears awry in rawhide though.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- xorg-x11-server.spec	9 Jun 2006 08:26:48 -0000	1.72
+++ xorg-x11-server.spec	9 Jun 2006 10:37:00 -0000	1.73
@@ -266,7 +266,7 @@
 #	--disable-dependency-tracking \
 # also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
 
-aclocal-1.7 ; automake-1.7 ; autoconf
+aclocal ; automake ; autoconf
 %configure %{xservers} \
 	--disable-xprint \
 	--disable-static \



From fedora-cvs-commits at redhat.com  Fri Jun  9 10:39:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 06:39:04 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.73,1.74
Message-ID: <200606091039.k59Ad4H8010677@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10648

Modified Files:
	xorg-x11-server.spec 
Log Message:
revert to default automake, and update changelog


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xorg-x11-server.spec	9 Jun 2006 10:37:00 -0000	1.73
+++ xorg-x11-server.spec	9 Jun 2006 10:39:02 -0000	1.74
@@ -54,7 +54,8 @@
 %define with_dri	0
 %endif
 
-BuildRequires: automake17
+#BuildRequires: automake17
+BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 0.99.1
@@ -549,11 +550,10 @@
   contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
   a newer freetype.
 - Janitorial cleanups for spec file changelog consistency.
-- Call aclocal-1.7 before automake, otherwise automake >= 1.9.6 is required in
+- Call aclocal before automake, otherwise automake >= 1.9.6 is required in
   order to rebuild the package.
 - Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody
-  fixed them.  It appears automake 1.9 doesn't like things.  Forcing
-  automake-1.7 on the build to see if that makes a difference.
+  fixed them.  It appears automake 1.9 breaks the build.
 
 * Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
 - BR automake and autoconf



From fedora-cvs-commits at redhat.com  Fri Jun  9 10:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 06:58:36 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.15,1.16
Message-ID: <200606091058.k59AwamX032000@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31972

Modified Files:
	libXfont.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
- Remove package ownership of mandir/libdir/etc.



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXfont.spec	6 Jun 2006 03:28:02 -0000	1.15
+++ libXfont.spec	9 Jun 2006 10:58:33 -0000	1.16
@@ -1,11 +1,12 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.1.0
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
@@ -23,11 +24,12 @@
 %package devel
 Summary: X.Org X11 libXfont development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+Requires: libfontenc-devel
 # NOTE: libXfont headers include proto headers, so this is needed.
 Requires: xorg-x11-proto-devel
-Requires: libfontenc-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -48,9 +50,9 @@
 make 
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -63,9 +65,9 @@
 
 %files
 %defattr(-,root,root,-)
-# FIXME:  Missing README/INSTALL %doc AUTHORS COPYING README INSTALL ChangeLog
+# FIXME:  Missing README/INSTALL - should file bug upstream.
+#%doc AUTHORS COPYING README INSTALL ChangeLog
 %doc AUTHORS COPYING ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXfont.so.1
 %{_libdir}/libXfont.so.1.4.1
 
@@ -93,10 +95,12 @@
 %{_libdir}/libXfont.a
 %endif
 %{_libdir}/libXfont.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
 - Added "Requires: libfontenc-devel" for (#185778)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:01:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:01:13 -0400
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.12,1.13
Message-ID: <200606091101.k59B1D68000348@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32754

Modified Files:
	libXfontcache.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xfontcache.pc



Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXfontcache.spec	6 Jun 2006 04:56:45 -0000	1.12
+++ libXfontcache.spec	9 Jun 2006 11:01:10 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -23,8 +24,10 @@
 %package devel
 Summary: X.Org X11 libXfontcache development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -38,7 +41,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -77,6 +79,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xfontcache.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192720)
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:10:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:10:35 -0400
Subject: rpms/openoffice.org/FC-4
	openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch, NONE,
	1.1 .cvsignore, 1.59, 1.60 openoffice.org.spec, 1.239,
	1.240 sources, 1.90, 1.91
Message-ID: <200606091110.k59BAZla001268@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1180

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch 
Log Message:
fc4 rebuild

openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch:
 objmisc.cxx |   84 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 39 insertions(+), 45 deletions(-)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch ---
Index: objmisc.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v
retrieving revision 1.78
diff -u -p -r1.78 objmisc.cxx
--- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
+++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
@@ -1054,40 +1054,27 @@ void SfxObjectShell::CheckMacrosOnLoadin
 		pImp->bMacroDisabled = sal_True;
 		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
 	}
-	else if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+	else
 	{
-		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
-		if ( xStorage.is() )
-		{
-			BOOL bHasMacros = StorageHasMacros( xStorage );
+		sal_Bool bHasMacros = sal_False;
 
-			if ( bHasMacros )
-			{
-				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
-				if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
-					&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-				{
-					WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
-					aBox.Execute();
-				}
-			}
-			else if ( !pImp->bMacroDisabled )
-			{
-				// if macros will be added by the user later, the security check is obsolete
-				pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
-			}
+		if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+		{
+			uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
+			if ( xStorage.is() )
+				bHasMacros = StorageHasMacros( xStorage );
+			else
+				SetError( ERRCODE_IO_GENERAL );
 		}
-		else
-			SetError( ERRCODE_IO_GENERAL );
-	}
-	else
-	{
-		if ( HasMacrosLib_Impl() )
+
+		if ( !bHasMacros )
+			bHasMacros = HasMacrosLib_Impl();
+
+		if ( bHasMacros )
 		{
-			// no signing in alien formats!
 			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
 			if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
-			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
+				&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
 			{
 				WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
 				aBox.Execute();
@@ -2250,23 +2237,30 @@ BOOL SfxObjectShell::HasMacrosLib_Impl()
         if ( bHasMacros )
         {
             // a library container exists; check if it's empty
-            try
-            {
-                // usually a "Standard" library is always present (design)
-                // for this reason we must check if it's empty
-                uno::Reference < container::XNameAccess > xLib;
-                uno::Any aAny = pImp->pBasicLibContainer->getByName(::rtl::OUString::createFromAscii("Standard"));
-                aAny >>= xLib;
-                if ( xLib.is() )
-                    bHasMacros = xLib->hasElements();
-            }
-            catch ( uno::Exception& )
-            {
-                // if no "Standard" library is present we check for others
-                // here we assume that they are not empty (because they have been created by the user)
-                bHasMacros = pImp->pBasicLibContainer->hasElements();
-            }
-        }
+
+			// if there are libraries except "Standard" library
+			// we assume that they are not empty (because they have been created by the user)
+			if ( pImp->pBasicLibContainer->hasElements() )
+			{
+				::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+				uno::Sequence< ::rtl::OUString > aElements = pImp->pBasicLibContainer->getElementNames();
+				if ( aElements.getLength() )
+				{
+					if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) )
+						bHasMacros = sal_True;
+					else	
+					{
+						// usually a "Standard" library is always present (design)
+						// for this reason we must check if it's empty
+						uno::Reference < container::XNameAccess > xLib;
+						uno::Any aAny = pImp->pBasicLibContainer->getByName( aStdLibName );
+						aAny >>= xLib;
+						if ( xLib.is() )
+							bHasMacros = xLib->hasElements();
+					}
+				}
+			}
+		}
     }
     catch( uno::Exception& )
     {



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	21 Dec 2005 18:29:41 -0000	1.59
+++ .cvsignore	9 Jun 2006 11:10:31 -0000	1.60
@@ -120,3 +120,4 @@
 OOA680_m1.tar.bz2
 evolocal.odb
 GSI_ga.sdf
+DisableJavaApplets.xcu


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- openoffice.org.spec	12 Jan 2006 14:00:51 -0000	1.239
+++ openoffice.org.spec	9 Jun 2006 11:10:31 -0000	1.240
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 %define build_fc5 0
 %define build_fc4 1
@@ -136,6 +136,7 @@
 Source7:	GSI_ga.sdf
 Source8:	gcj-sed.sh
 Source9:	evolocal.odb
+Source10:	DisableJavaApplets.xcu
 BuildRequires: 	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -216,6 +217,7 @@
 Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
 Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
 Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch53: openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -886,6 +888,7 @@
 %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
 %patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch53 -p1 -b .oooXXXXX.nolongname.sysui.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -1056,6 +1059,7 @@
 %install
 #add our custom configuration options
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE10}
 
 # rh#163147# convert non AMT to AMT fonts
 sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -3344,6 +3348,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Jun 09 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-6
+- security errata
+
 * Wed Jan 04 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-5
 - spinbutton factory needs to be uneditable as well as combobox
 - add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	21 Dec 2005 18:29:41 -0000	1.90
+++ sources	9 Jun 2006 11:10:31 -0000	1.91
@@ -8,3 +8,4 @@
 79d2ce6b3bf7e0b5d88f601838b791f7  OOA680_m1.tar.bz2
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 33abf0fa04f7ec90b49ba4a8072713b6  GSI_ga.sdf
+baaf6187c060cc0525acbe4c07748025  DisableJavaApplets.xcu



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:12:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:12:05 -0400
Subject: rpms/openoffice.org/FC-4
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, NONE,
	1.1 openoffice.org.spec, 1.240,
	1.241 openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch,
	1.1, NONE
Message-ID: <200606091112.k59BC4WE001565@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1516

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
Removed Files:
	openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch 
Log Message:
fc4 rebuild

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 objmisc.cxx |   84 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 39 insertions(+), 45 deletions(-)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch ---
Index: objmisc.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v
retrieving revision 1.78
diff -u -p -r1.78 objmisc.cxx
--- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
+++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
@@ -1054,40 +1054,27 @@ void SfxObjectShell::CheckMacrosOnLoadin
 		pImp->bMacroDisabled = sal_True;
 		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
 	}
-	else if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+	else
 	{
-		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
-		if ( xStorage.is() )
-		{
-			BOOL bHasMacros = StorageHasMacros( xStorage );
+		sal_Bool bHasMacros = sal_False;
 
-			if ( bHasMacros )
-			{
-				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
-				if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
-					&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-				{
-					WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
-					aBox.Execute();
-				}
-			}
-			else if ( !pImp->bMacroDisabled )
-			{
-				// if macros will be added by the user later, the security check is obsolete
-				pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
-			}
+		if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+		{
+			uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
+			if ( xStorage.is() )
+				bHasMacros = StorageHasMacros( xStorage );
+			else
+				SetError( ERRCODE_IO_GENERAL );
 		}
-		else
-			SetError( ERRCODE_IO_GENERAL );
-	}
-	else
-	{
-		if ( HasMacrosLib_Impl() )
+
+		if ( !bHasMacros )
+			bHasMacros = HasMacrosLib_Impl();
+
+		if ( bHasMacros )
 		{
-			// no signing in alien formats!
 			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
 			if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
-			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
+				&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
 			{
 				WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
 				aBox.Execute();
@@ -2250,23 +2237,30 @@ BOOL SfxObjectShell::HasMacrosLib_Impl()
         if ( bHasMacros )
         {
             // a library container exists; check if it's empty
-            try
-            {
-                // usually a "Standard" library is always present (design)
-                // for this reason we must check if it's empty
-                uno::Reference < container::XNameAccess > xLib;
-                uno::Any aAny = pImp->pBasicLibContainer->getByName(::rtl::OUString::createFromAscii("Standard"));
-                aAny >>= xLib;
-                if ( xLib.is() )
-                    bHasMacros = xLib->hasElements();
-            }
-            catch ( uno::Exception& )
-            {
-                // if no "Standard" library is present we check for others
-                // here we assume that they are not empty (because they have been created by the user)
-                bHasMacros = pImp->pBasicLibContainer->hasElements();
-            }
-        }
+
+			// if there are libraries except "Standard" library
+			// we assume that they are not empty (because they have been created by the user)
+			if ( pImp->pBasicLibContainer->hasElements() )
+			{
+				::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+				uno::Sequence< ::rtl::OUString > aElements = pImp->pBasicLibContainer->getElementNames();
+				if ( aElements.getLength() )
+				{
+					if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) )
+						bHasMacros = sal_True;
+					else	
+					{
+						// usually a "Standard" library is always present (design)
+						// for this reason we must check if it's empty
+						uno::Reference < container::XNameAccess > xLib;
+						uno::Any aAny = pImp->pBasicLibContainer->getByName( aStdLibName );
+						aAny >>= xLib;
+						if ( xLib.is() )
+							bHasMacros = xLib->hasElements();
+					}
+				}
+			}
+		}
     }
     catch( uno::Exception& )
     {



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- openoffice.org.spec	9 Jun 2006 11:10:31 -0000	1.240
+++ openoffice.org.spec	9 Jun 2006 11:12:02 -0000	1.241
@@ -217,7 +217,7 @@
 Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
 Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
 Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch53: openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch
+Patch53: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -888,7 +888,7 @@
 %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
 %patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch53 -p1 -b .oooXXXXX.nolongname.sysui.patch
+%patch53 -p1 -b .oooXXXXX.safety.sfx2.patch
 
 %if %{includingexternals}
 #start ludicrous workaround


--- openoffice.org-2.0.3.oooXXXXX.nolongname.sysui.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:16:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:16:05 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, NONE,
	1.1 .cvsignore, 1.102, 1.103 openoffice.org.spec, 1.667,
	1.668 sources, 1.164, 1.165
Message-ID: <200606091116.k59BG5oo007020@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5943

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
Log Message:
sfx2 safety

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 objmisc.cxx |   84 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 39 insertions(+), 45 deletions(-)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch ---
Index: objmisc.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v
retrieving revision 1.78
diff -u -p -r1.78 objmisc.cxx
--- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
+++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
@@ -1054,40 +1054,27 @@ void SfxObjectShell::CheckMacrosOnLoadin
 		pImp->bMacroDisabled = sal_True;
 		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
 	}
-	else if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+	else
 	{
-		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
-		if ( xStorage.is() )
-		{
-			BOOL bHasMacros = StorageHasMacros( xStorage );
+		sal_Bool bHasMacros = sal_False;
 
-			if ( bHasMacros )
-			{
-				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
-				if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
-					&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-				{
-					WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
-					aBox.Execute();
-				}
-			}
-			else if ( !pImp->bMacroDisabled )
-			{
-				// if macros will be added by the user later, the security check is obsolete
-				pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
-			}
+		if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+		{
+			uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
+			if ( xStorage.is() )
+				bHasMacros = StorageHasMacros( xStorage );
+			else
+				SetError( ERRCODE_IO_GENERAL );
 		}
-		else
-			SetError( ERRCODE_IO_GENERAL );
-	}
-	else
-	{
-		if ( HasMacrosLib_Impl() )
+
+		if ( !bHasMacros )
+			bHasMacros = HasMacrosLib_Impl();
+
+		if ( bHasMacros )
 		{
-			// no signing in alien formats!
 			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
 			if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
-			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
+				&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
 			{
 				WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
 				aBox.Execute();
@@ -2250,23 +2237,30 @@ BOOL SfxObjectShell::HasMacrosLib_Impl()
         if ( bHasMacros )
         {
             // a library container exists; check if it's empty
-            try
-            {
-                // usually a "Standard" library is always present (design)
-                // for this reason we must check if it's empty
-                uno::Reference < container::XNameAccess > xLib;
-                uno::Any aAny = pImp->pBasicLibContainer->getByName(::rtl::OUString::createFromAscii("Standard"));
-                aAny >>= xLib;
-                if ( xLib.is() )
-                    bHasMacros = xLib->hasElements();
-            }
-            catch ( uno::Exception& )
-            {
-                // if no "Standard" library is present we check for others
-                // here we assume that they are not empty (because they have been created by the user)
-                bHasMacros = pImp->pBasicLibContainer->hasElements();
-            }
-        }
+
+			// if there are libraries except "Standard" library
+			// we assume that they are not empty (because they have been created by the user)
+			if ( pImp->pBasicLibContainer->hasElements() )
+			{
+				::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+				uno::Sequence< ::rtl::OUString > aElements = pImp->pBasicLibContainer->getElementNames();
+				if ( aElements.getLength() )
+				{
+					if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) )
+						bHasMacros = sal_True;
+					else	
+					{
+						// usually a "Standard" library is always present (design)
+						// for this reason we must check if it's empty
+						uno::Reference < container::XNameAccess > xLib;
+						uno::Any aAny = pImp->pBasicLibContainer->getByName( aStdLibName );
+						aAny >>= xLib;
+						if ( xLib.is() )
+							bHasMacros = xLib->hasElements();
+					}
+				}
+			}
+		}
     }
     catch( uno::Exception& )
     {



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	11 May 2006 14:16:11 -0000	1.102
+++ .cvsignore	9 Jun 2006 11:16:02 -0000	1.103
@@ -164,3 +164,4 @@
 ooo64726.sdf
 AutoSaveCommon.xcu
 AutoSaveRecovery.xcu
+DisableJavaApplets.xcu


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -r1.667 -r1.668
--- openoffice.org.spec	8 Jun 2006 12:09:33 -0000	1.667
+++ openoffice.org.spec	9 Jun 2006 11:16:02 -0000	1.668
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 12
+%define rh_rpm_release 13
 
 %define build_fc5 1
 
@@ -96,6 +96,7 @@
 Source12:	ooo64726.sdf
 Source13:	AutoSaveRecovery.xcu
 Source14:	AutoSaveCommon.xcu
+Source15:	DisableJavaApplets.xcu
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -172,6 +173,7 @@
 Patch44: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
 Patch45: openoffice.org-2.0.3.ooo65721.crash.vcl.patch
 Patch46: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+Patch47: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -827,6 +829,7 @@
 %patch44 -p1 -b .oooXXXXX.atkbroken.vcl.patch
 %patch45 -p1 -b .ooo65721.crash.vcl.patch
 %patch46 -p1 -b .ooo66067.embeddedobj.crash.patch
+%patch47 -p1 -b .oooXXXXX.safety.sfx2.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -991,6 +994,7 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE4}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE13}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE14}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE15}
 
 # rh#163147# convert non AMT to AMT fonts
 sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -3274,6 +3278,7 @@
 %changelog
 * Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+- sfx2 safety patch
 
 * Tue May 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
 - ooo#65721# sneaky bug in a11y


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	11 May 2006 14:16:12 -0000	1.164
+++ sources	9 Jun 2006 11:16:02 -0000	1.165
@@ -13,3 +13,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
+baaf6187c060cc0525acbe4c07748025  DisableJavaApplets.xcu



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:16:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:16:52 -0400
Subject: rpms/libXi/devel libXi.spec,1.12,1.13
Message-ID: <200606091116.k59BGqKu013238@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13035

Modified Files:
	libXi.spec 
Log Message:
* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xi.pc
- Remove package ownership of mandir/libdir/etc.



Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXi.spec	6 Jun 2006 04:59:08 -0000	1.12
+++ libXi.spec	9 Jun 2006 11:16:49 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -22,8 +23,10 @@
 %package devel
 Summary: X.Org X11 libXi development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+# required by xi.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -70,12 +73,15 @@
 %{_libdir}/libXi.a
 %endif
 %{_libdir}/libXi.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xi.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xi.pc
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192721)
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:21:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:21:36 -0400
Subject: rpms/libXft/devel libXft.spec,1.13,1.14
Message-ID: <200606091121.k59BLago019854@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19746

Modified Files:
	libXft.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-4
- Replace "makeinstall" with "make install DESTDIR=..."



Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXft.spec	11 Feb 2006 04:19:41 -0000	1.13
+++ libXft.spec	9 Jun 2006 11:21:34 -0000	1.14
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.1.8.2
-Release: 3.2
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -25,8 +26,8 @@
 %package devel
 Summary: X.Org X11 libXft development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 Requires: xorg-x11-proto-devel
 Requires: libXrender-devel
@@ -53,9 +54,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: There's no real good reason to ship these anymore, as pkg-config
 # is the official way to detect flags, etc. now.
@@ -94,13 +95,16 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.8.2-3.2
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-4
+- Replace "makeinstall" with "make install DESTDIR=..."
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 2.1.8.2-3.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.8.2-3.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 2.1.8.2-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Thu Feb  2 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-3
+* Thu Feb 02 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-3
 - Added missing dependencies to devel subpackage to fix (#176744)
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-2
@@ -135,7 +139,7 @@
 - Add missing documentation files to doc macro
 - Fix BuildRequires to use new style X library package names
 
-* Sun Sep 4 2005 Mike A. Harris <mharris at redhat.com> 2.1.7-4
+* Sun Sep 04 2005 Mike A. Harris <mharris at redhat.com> 2.1.7-4
 - Added "BuildRequires: fontconfig-devel >= 2.2" dependency that was
   previously missed.  Also added "Requires: fontconfig >= 2.2" runtime
   dependency.



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:24:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:24:45 -0400
Subject: rpms/libXinerama/devel libXinerama.spec,1.10,1.11
Message-ID: <200606091124.k59BOjiL021115@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXinerama/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21083

Modified Files:
	libXinerama.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel" to devel for xinerama.pc
- Remove package ownership of mandir/libdir/etc.



Index: libXinerama.spec
===================================================================
RCS file: /cvs/dist/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXinerama.spec	11 Feb 2006 04:20:02 -0000	1.10
+++ libXinerama.spec	9 Jun 2006 11:24:43 -0000	1.11
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -22,8 +23,11 @@
 %package devel
 Summary: X.Org X11 libXinerama development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xinerama.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -45,9 +49,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,7 +65,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXinerama.so.1
 %{_libdir}/libXinerama.so.1.0.0
 
@@ -71,14 +74,18 @@
 %{_libdir}/libXinerama.a
 %endif
 %{_libdir}/libXinerama.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xinerama.pc
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel" to devel for xinerama.pc
+- Remove package ownership of mandir/libdir/etc.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:31:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:31:37 -0400
Subject: rpms/libXmu/devel libXmu.spec,1.12,1.13
Message-ID: <200606091131.k59BVbe7023353@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23320

Modified Files:
	libXmu.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel, libX11-devel, libXt-devel" to devel
  subpackage needed by xmu.pc, xmuu.pc
- Remove package ownership of mandir/libdir/etc.



Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXmu.spec	12 May 2006 20:46:00 -0000	1.12
+++ libXmu.spec	9 Jun 2006 11:31:34 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: libX11-devel
@@ -23,8 +24,14 @@
 %package devel
 Summary: X.Org X11 libXmu development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# proto and x11 needed by both xmu.pc and xmuu.pc
+Requires: xorg-x11-util-macros
+Requires: libX11-devel
+# xt needed by xmu.pc
+Requires: libXt-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -38,7 +45,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -46,9 +52,9 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,7 +68,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXmu.so.6
 %{_libdir}/libXmu.so.6.2.0
 %{_libdir}/libXmuu.so.1
@@ -100,21 +105,26 @@
 %endif
 %{_libdir}/libXmu.so
 %{_libdir}/libXmuu.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xmu.pc
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel, libX11-devel, libXt-devel" to devel
+  subpackage needed by xmu.pc, xmuu.pc
+- Remove package ownership of mandir/libdir/etc.
+
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:37:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:37:36 -0400
Subject: rpms/libXp/devel libXp.spec,1.11,1.12
Message-ID: <200606091137.k59BbaRe024133@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24108

Modified Files:
	libXp.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel" to devel for xp.pc
- Remove package ownership of mandir/libdir/etc.



Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXp.spec	11 Feb 2006 04:21:19 -0000	1.11
+++ libXp.spec	9 Jun 2006 11:37:21 -0000	1.12
@@ -3,13 +3,14 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 2.2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -26,8 +27,11 @@
 %package devel
 Summary: X.Org X11 libXp development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xp.pc
+BuildRequires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel, xorg-x11-deprecated-libs-devel
 
@@ -42,7 +46,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -52,7 +55,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %if %{libXp_deprecated}
 {
@@ -62,6 +65,7 @@
    rm -rf $RPM_BUILD_ROOT%{_mandir}
 }
 %endif
+# Don't encourage people to use the deprecated Xprint APIs.
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
 # We intentionally don't ship *.la files
@@ -76,7 +80,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXp.so.6
 %{_libdir}/libXp.so.6.2.0
 
@@ -90,18 +93,21 @@
 # that keep linking to libXp, will always get the static lib and not break
 # when we eventually drop libXp?
 %{_libdir}/libXp.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xp.pc
-#%dir %{_mandir}
-#%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 #%{_mandir}/man3/*.3x*
 %endif
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel" to devel for xp.pc
+- Remove package ownership of mandir/libdir/etc.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:42:18 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.13,1.14
Message-ID: <200606091142.k59BgIrp025173@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25116

Modified Files:
	libXpm.spec 
Log Message:
trivial spec cleanups


Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXpm.spec	6 Jun 2006 05:13:15 -0000	1.13
+++ libXpm.spec	9 Jun 2006 11:42:15 -0000	1.14
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -27,9 +28,9 @@
 %package devel
 Summary: X.Org X11 libXpm development package
 Group: Development/Libraries
-
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
 Requires: libX11-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -81,7 +82,6 @@
 %{_libdir}/libXpm.a
 %endif
 %{_libdir}/libXpm.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xpm.pc
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/*.1*
@@ -96,10 +96,10 @@
 * Thu Apr 26 2006 Adam Jackson <ajackson at redhat.com> 3.5.5-1
 - Update to 3.5.5
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.4.2-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 3.5.4.2-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.4.2-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 3.5.4.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 3.5.4.2-2
@@ -125,7 +125,6 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-
 * Mon Oct 24 2005 Mike A. Harris <mharris at redhat.com> 3.5.3-1
 - Updated libXpm to version 3.5.3 from X11R7 RC1
 - Added manpages for sxpm, cxpm



From fedora-cvs-commits at redhat.com  Fri Jun  9 11:59:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 07:59:32 -0400
Subject: rpms/libXrandr/devel libXrandr.spec,1.12,1.13
Message-ID: <200606091159.k59BxWo6013759@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13721

Modified Files:
	libXrandr.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-3
- Added "Requires: xorg-x11-proto-devel" to devel pkg for xrandr.pc



Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXrandr.spec	6 Jun 2006 04:23:18 -0000	1.12
+++ libXrandr.spec	9 Jun 2006 11:59:29 -0000	1.13
@@ -1,15 +1,16 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.1.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
-#BuildRequires: randrproto >= 0.99
+# xrandr.pc Requires: xproto randrproto >= 1.1
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -23,8 +24,11 @@
 %package devel
 Summary: X.Org X11 libXrandr development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xrandr.pc Requires: xproto randrproto >= 1.1
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -38,7 +42,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -74,12 +77,14 @@
 %{_libdir}/libXrandr.a
 %endif
 %{_libdir}/libXrandr.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xrandr.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel pkg for xrandr.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-2
 - Added "BuildRequires: pkgconfig" for (#193428)
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192724)



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:03:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:03:44 -0400
Subject: rpms/libXrender/devel libXrender.spec,1.13,1.14
Message-ID: <200606091203.k59C3ijl014195@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14172

Modified Files:
	libXrender.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-3
- Added "Requires: libX11-devel" to devel package for xrender.pc



Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXrender.spec	6 Jun 2006 05:16:59 -0000	1.13
+++ libXrender.spec	9 Jun 2006 12:03:41 -0000	1.14
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -20,11 +21,12 @@
 %package devel
 Summary: X.Org X11 libXrender development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
+# needed by xrender.pc
 Requires: xorg-x11-proto-devel
-#Requires: libX11-devel
+Requires: libX11-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -38,7 +40,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -77,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-3
+- Added "Requires: libX11-devel" to devel package for xrender.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-2
 - Added "BuildRequires: pkgconfig" for (#193429)
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:06:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:06:53 -0400
Subject: rpms/libXres/devel libXres.spec,1.12,1.13
Message-ID: <200606091206.k59C6r7P014379@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14330

Modified Files:
	libXres.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc



Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXres.spec	6 Jun 2006 04:51:53 -0000	1.12
+++ libXres.spec	9 Jun 2006 12:06:39 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -20,8 +21,11 @@
 %package devel
 Summary: X.Org X11 libXres development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xres.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -35,7 +39,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -44,6 +47,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -70,12 +74,14 @@
 %{_libdir}/libXRes.a
 %endif
 %{_libdir}/libXRes.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xres.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193502)
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192725)



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:07:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:07:44 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.89,1.90
Message-ID: <200606091207.k59C7ibH014531@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14475

Modified Files:
	nfs-utils.spec 
Log Message:
Added krb5-devel to BuildRequires



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- nfs-utils.spec	9 Jun 2006 00:53:28 -0000	1.89
+++ nfs-utils.spec	9 Jun 2006 12:07:41 -0000	1.90
@@ -39,11 +39,11 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
-BuildRequires: automake libtool
 BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
 BuildRequires: libevent-devel libgssapi-devel
+BuildRequires: automake libtool krb5-devel
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
 PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:08:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:08:49 -0400
Subject: rpms/elinks/devel elinks-0.11.1-negotiate.patch, NONE,
	1.1 .cvsignore, 1.17, 1.18 elinks.spec, 1.34, 1.35 sources,
	1.17, 1.18
Message-ID: <200606091208.k59C8n7A014661@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/elinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14629

Modified Files:
	.cvsignore elinks.spec sources 
Added Files:
	elinks-0.11.1-negotiate.patch 
Log Message:
add negotiate-auth support

elinks-0.11.1-negotiate.patch:
 Makefile.config.in                 |    1 
 config.h.in                        |    3 
 configure.in                       |   24 +++
 src/protocol/http/Makefile         |    2 
 src/protocol/http/http.c           |   50 +++++--
 src/protocol/http/http_negotiate.c |  259 +++++++++++++++++++++++++++++++++++++
 src/protocol/http/http_negotiate.h |   16 ++
 src/util/base64.c                  |   36 ++++-
 src/util/base64.h                  |    3 
 9 files changed, 376 insertions(+), 18 deletions(-)

--- NEW FILE elinks-0.11.1-negotiate.patch ---
--- elinks-0.11.1/Makefile.config.in.negotiate	2006-01-29 14:10:33.000000000 +0100
+++ elinks-0.11.1/Makefile.config.in	2006-06-09 13:09:41.000000000 +0200
@@ -148,6 +148,7 @@
 CONFIG_WIN32 = @CONFIG_WIN32@
 CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
 CONFIG_XMLTO = @CONFIG_XMLTO@
+CONFIG_GSSAPI = @CONFIG_GSSAPI@
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
--- elinks-0.11.1/config.h.in.negotiate	2006-01-29 14:10:46.000000000 +0100
+++ elinks-0.11.1/config.h.in	2006-06-09 13:09:41.000000000 +0200
@@ -84,6 +84,9 @@
 /* Define if you want: gpm support */
 #undef CONFIG_GPM
 
+/* Define if you want: GssApi support */
+#undef CONFIG_GSSAPI
+
 /* Define if you want: Guile support */
 #undef CONFIG_GUILE
 
--- elinks-0.11.1/src/protocol/http/Makefile.negotiate	2006-01-29 14:10:39.000000000 +0100
+++ elinks-0.11.1/src/protocol/http/Makefile	2006-06-09 13:09:41.000000000 +0200
@@ -1,6 +1,8 @@
 top_builddir=../../..
 include $(top_builddir)/Makefile.config
 
+OBJS-$(CONFIG_GSSAPI)	+= http_negotiate.o
+
 OBJS = blacklist.o codes.o http.o
 
 include $(top_srcdir)/Makefile.lib
--- /dev/null	2006-05-28 11:31:41.625940250 +0200
+++ elinks-0.11.1/src/protocol/http/http_negotiate.h	2006-06-09 13:09:41.000000000 +0200
@@ -0,0 +1,16 @@
+
+#ifndef EL__PROTOCOL_HTTP_HTTP_NEGOTIATE_H
+#define EL__PROTOCOL_HTTP_HTTP_NEGOTIATE_H
+
+#define PROTOCOL_HTTP_GSSNEG	1
+#define PROTOCOL_HTTP_NEG	2
+
+
+int http_negotiate_input(struct connection *conn, struct uri *uri, 
+					int type, unsigned char *data);
+
+int http_negotiate_output(struct uri *uri, struct string *header);
+
+
+#endif /* EL_PROTOCOL_HTTP_HTTP_NEGOTIATE_H */
+
--- /dev/null	2006-05-28 11:31:41.625940250 +0200
+++ elinks-0.11.1/src/protocol/http/http_negotiate.c	2006-06-09 13:14:25.000000000 +0200
@@ -0,0 +1,259 @@
+/* 
+ * HTTP Negotiate authentication method -- based on GSSAPI
+ *
+ * The Microsoft version with SPNEGO is unsupported. If you look for way how
+ * extend this code with SPNEGO see libcurl or firefox source code where is
+ * supported GSSAPI+SPNEGO.
+ *
+ * Copyright (C) 2006 Red Hat, Inc.
+ * Karel Zak <kzak at redhat.com> 
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <gssapi/gssapi.h>
+
+#include "elinks.h"
+#include "network/connection.h"
+#include "protocol/uri.h"
+#include "protocol/http/http.h"
+#include "protocol/http/http_negotiate.h"
+#include "util/base64.h"
+#include "main/object.h"
+#include "util/lists.h"
+
+struct negotiate {
+	OBJECT_HEAD(struct negotiate);
+
+	struct uri 	*uri;
+	
+	int 		type; 			/* GSS-Negotiate or Negotiate or zero */
+	OM_uint32	status;
+	gss_ctx_id_t	context;
+	gss_name_t	server_name;
+	gss_buffer_desc output_token;
+};
+
+static INIT_LIST_HEAD(negotiate_list);
+
+static struct negotiate *
+http_negotiate_get(struct uri *uri, int *isnew, int alloc)
+{
+	struct negotiate *neg;
+	
+	foreach (neg, negotiate_list) {	
+		if (compare_uri(neg->uri, uri, URI_HTTP_REFERRER_HOST))
+			return neg;
+	}
+	if (!alloc)	
+		return NULL;
+	if (isnew)
+		*isnew = 1;
+
+	if (!(neg = mem_calloc(1, sizeof(*neg))))
+		return NULL;
+		
+	memset(neg, 0, sizeof(*neg));
+	neg->uri = get_uri_reference(uri);	
+	
+	return neg;
+}
+
+static void
+http_negotiate_save(struct negotiate *neg)
+{
+	add_to_list(negotiate_list, neg);
+}
+
+static void 
+http_negotiate_cleanup(struct negotiate *neg, int full)
+{
+	OM_uint32 minor_status;
+
+	if (neg->context != GSS_C_NO_CONTEXT)
+		gss_delete_sec_context(&minor_status, &neg->context, GSS_C_NO_BUFFER);
+
+	if (neg->output_token.length != 0)
+		gss_release_buffer(&minor_status, &neg->output_token);
+
+	if (full && neg->server_name)
+		gss_release_name(&minor_status, &neg->server_name);
+
+	if (full)
+		memset(neg, 0, sizeof(*neg));
+}
+
+static int
+http_negotiate_get_name(struct connection *conn, struct negotiate *neg)
+{
+	OM_uint32 major_status, minor_status;
+	gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
+	char name[2048];
+	const char* service;
+	struct uri *uri = conn->proxied_uri;
+
+	/* GSSAPI implementation by Globus (known as GSI) requires the name to be
+	of form "<service>/<fqdn>" instead of <service>@<fqdn> (ie. slash instead
+	of at-sign). Also GSI servers are often identified as 'host' not 'khttp'.
+	Change following lines if you want to use GSI */
+
+	/* IIS uses the <service>@<fqdn> form but uses 'http' as the service name */
+
+	if (neg->type == PROTOCOL_HTTP_GSSNEG)
+		service = "KHTTP";
+	else
+		service = "HTTP";
+
+	token.length = strlen(service) + 1 + uri->hostlen + 1;
+	if (token.length + 1 > sizeof(name))
+		return EMSGSIZE;
+
+	snprintf(name, token.length, "%s@%*s", service, uri->hostlen, uri->host);
+
+	token.value = (void *) name;
+	major_status = gss_import_name(&minor_status,
+			 &token,
+			 GSS_C_NT_HOSTBASED_SERVICE,
+			 &neg->server_name);
+
+	return GSS_ERROR(major_status) ? -1 : 0;
+}
+
+#define GSSNEG_LEN	sizeof("GSS-Negotiate")
+#define NEG_LEN		sizeof("Negotiate")
+
+static int
+http_negotiate_parse_data(unsigned char *data, int type, 
+			gss_buffer_desc *token)
+{
+	int len = 0;
+	unsigned char *end;
+
+	if (data==NULL || *data=='\0')
+		return 0;
+	
+	data += type==PROTOCOL_HTTP_GSSNEG ? GSSNEG_LEN : NEG_LEN;
+	
+	while(*data && isspace((int)*data)) 
+		data++;
+	
+	if (*data=='\0' || *data==ASCII_CR || *data==ASCII_LF)
+		return 0;	/* no data */
+	
+	end = data;
+	while (isalnum((int) *end) || *end=='=')
+		end++;
+
+	/* Ignore line if we encountered an unexpected char. */
+	if (*end != ASCII_CR && *end != ASCII_LF)
+		return 0;
+
+	len = end - data;
+	
+	if (!len)
+		return 0;
+	
+	token->value = (void *) base64_decode_bin(data, len, &token->length);
+	
+	if (!token->value)
+		return -1;
+
+	return 0;
+}
+
+int 
+http_negotiate_input(struct connection *conn, struct uri *uri, 
+					int type, unsigned char *data)
+{
+	OM_uint32 major_status, minor_status, minor_status2;
+	gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
+	gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
+	struct negotiate *neg;
+	int ret, isnew = 0;
+
+	neg = http_negotiate_get(uri, &isnew, 1);
+	
+	if (neg->context) {
+		if (type != PROTOCOL_HTTP_GSSNEG) 
+			return -1;
+	}
+	neg->type = type;
+
+	if (neg->context && neg->status == GSS_S_COMPLETE) {
+		/* We finished succesfully our part of authentication, but server
+		 * rejected it (since we're again here). Exit with an error since we
+		 * can't invent anything better */
+		http_negotiate_cleanup(neg, 1);
+		return -1;
+	}
+	if (neg->server_name == NULL && (ret = http_negotiate_get_name(conn, neg)))
+		return ret;
+	if (data && http_negotiate_parse_data(data, type, &input_token)) 
+		return -1;
+	
+	major_status = gss_init_sec_context(&minor_status,
+					    GSS_C_NO_CREDENTIAL,
+					    &neg->context,
+					    neg->server_name,
+					    GSS_C_NO_OID,
+					    GSS_C_DELEG_FLAG,
+					    0,
+					    GSS_C_NO_CHANNEL_BINDINGS,
+					    &input_token,
+					    NULL,
+					    &output_token,
+					    NULL,
+					    NULL);
+	if (input_token.length > 0)
+		gss_release_buffer(&minor_status2, &input_token);
+	neg->status = major_status;
+
+	if (GSS_ERROR(major_status)) 
+		return -1;
+	if (output_token.length == 0) 
+		return -1;
+
+	neg->output_token = output_token;
+
+	if (isnew)
+		http_negotiate_save(neg);
+
+	return 0;
+}
+
+int
+http_negotiate_output(struct uri *uri, struct string *header)
+{
+	struct negotiate *neg;
+	char *encoded = NULL;
+	int len = 0;
+
+	neg = http_negotiate_get(uri, NULL, 0);	
+	if (neg==NULL || neg->output_token.length==0) 
+		return -1;
+	
+	encoded = base64_encode_bin((unsigned char *) neg->output_token.value, 
+				neg->output_token.length, &len);
+
+	if (encoded==NULL || len==0)
+	    return -1;
+
+	add_to_string(header, "Authorization: ");
+	add_to_string(header, neg->type==PROTOCOL_HTTP_GSSNEG ? 
+				"GSS-Negotiate " : "Negotiate ");
+	add_to_string(header, encoded);
+	add_crlf_to_string(header);
+	
+	http_negotiate_cleanup(neg, 0);
+	return 0;
+}
+
--- elinks-0.11.1/src/protocol/http/http.c.negotiate	2006-01-29 14:10:39.000000000 +0100
+++ elinks-0.11.1/src/protocol/http/http.c	2006-06-09 13:09:41.000000000 +0200
@@ -47,6 +47,9 @@
 #include "util/memory.h"
 #include "util/string.h"
 
+#ifdef CONFIG_GSSAPI
+#include "http_negotiate.h"
+#endif
 
 struct http_version {
 	int major;
@@ -82,7 +85,6 @@
 	int code;
 };
 
-
 static struct auth_entry proxy_auth;
 
 static unsigned char *accept_charset = NULL;
@@ -551,7 +553,7 @@
 	int trace = get_opt_bool("protocol.http.trace");
 	struct string header;
 	unsigned char *post_data = NULL;
-	struct auth_entry *entry;
+	struct auth_entry *entry = NULL;
 	struct uri *uri = conn->proxied_uri; /* Set to the real uri */
 	unsigned char *optstr;
 	int use_connect, talking_to_proxy;
@@ -808,7 +810,11 @@
 		add_crlf_to_string(&header);
 	}
 
-	entry = find_auth(uri);
+#ifdef CONFIG_GSSAPI
+	if (http_negotiate_output(uri, &header) != 0)
+#endif
+		entry = find_auth(uri);
+	
 	if (entry) {
 		if (entry->digest) {
 			unsigned char *response;
@@ -1327,12 +1333,12 @@
 	return 0;
 }
 
-
-static void
-check_http_authentication(struct uri *uri, unsigned char *header,
-			  unsigned char *header_field)
+static int
+check_http_authentication(struct connection *conn, struct uri *uri, 
+		unsigned char *header, unsigned char *header_field)
 {
 	unsigned char *str, *d;
+	int ret = 0;
 
 	d = parse_header(header, header_field, &str);
 	while (d) {
@@ -1358,10 +1364,24 @@
 			mem_free(d);
 			break;
 		}
-
+#ifdef CONFIG_GSSAPI
+		else if (!strncasecmp(d, "GSS-Negotiate", 13)) {
+			if (http_negotiate_input(conn, uri, PROTOCOL_HTTP_GSSNEG, str)==0)
+				ret = 1;
+			mem_free(d);
+			break;
+		}
+		else if (!strncasecmp(d, "Negotiate", 9)) {
+			if (http_negotiate_input(conn, uri, PROTOCOL_HTTP_NEG, str)==0)
+				ret = 1;
+			mem_free(d);
+			break;
+		}
+#endif
 		mem_free(d);
 		d = parse_header(str, header_field, &str);
 	}
+	return ret;
 }
 
 
@@ -1588,11 +1608,17 @@
 	}
 
 	if (h == 401) {
-		unsigned char *head = conn->cached->head;
-
-		check_http_authentication(uri, head, "WWW-Authenticate");
+		int ret = check_http_authentication(conn, uri, 
+				conn->cached->head, "WWW-Authenticate");
+	
+		
+		if (ret) {
+			// XXX: mem_free(conn->cached->head);
+			retry_connection(conn, S_RESTART);
+			return;
+		}
+	
 	}
-
 	if (h == 407) {
 		unsigned char *str;
 
--- elinks-0.11.1/src/util/base64.c.negotiate	2006-01-29 14:10:39.000000000 +0100
+++ elinks-0.11.1/src/util/base64.c	2006-06-09 13:09:41.000000000 +0200
@@ -17,14 +17,21 @@
 unsigned char *
 base64_encode(register unsigned char *in)
 {
+	assert(in && *in);
+	if_assert_failed return NULL;
+	
+	return base64_encode_bin((char *) in, strlen(in), NULL);
+}
+
+unsigned char *
+base64_encode_bin(register unsigned char *in, int inlen, int *outlen)
+{
 	unsigned char *out;
 	unsigned char *outstr;
-	int inlen;
 
 	assert(in && *in);
 	if_assert_failed return NULL;
 
-	inlen = strlen(in);
 	out = outstr = mem_alloc((inlen / 3) * 4 + 4 + 1);
 	if (!out) return NULL;
 
@@ -49,16 +56,29 @@
 	}
 	*out = 0;
 
+	if (outlen)
+		*outlen = out-outstr;
+
 	return outstr;
 }
 
-/* Base64 decoding is used only with the CONFIG_FORMHIST feature, so i'll #ifdef it */
-#ifdef CONFIG_FORMHIST
+/* Base64 decoding is used only with the CONFIG_FORMHIST or CONFIG_GSSAPI 
+   feature, so i'll #ifdef it */
+#if  defined(CONFIG_FORMHIST) || defined(CONFIG_GSSAPI)
+
+unsigned char *
+base64_decode(register unsigned char *in) 
+{
+	assert(in && *in);
+	if_assert_failed return NULL;
+
+	return base64_decode_bin(in, strlen(in), NULL);
+}
 
 /* base64_decode:  @in string to decode
  *		   returns the string decoded (must be freed by the caller) */
 unsigned char *
-base64_decode(register unsigned char *in)
+base64_decode_bin(register unsigned char *in, int inlen, int *outlen)
 {
 	static unsigned char is_base64_char[256]; /* static to force initialization at zero */
 	static unsigned char decode[256];
@@ -71,7 +91,7 @@
 	assert(in && *in);
 	if_assert_failed return NULL;
 
-	outstr = out = mem_alloc(strlen(in) / 4 * 3 + 1);
+	outstr = out = mem_alloc(inlen / 4 * 3 + 1);
 	if (!outstr) return NULL;
 
 	if (!once) {
@@ -123,6 +143,10 @@
 	}
 
 	*out = 0;
+
+	if (outlen)
+		*outlen = out-outstr;
+
 	return outstr;
 
 decode_error:
--- elinks-0.11.1/src/util/base64.h.negotiate	2006-01-29 14:10:39.000000000 +0100
+++ elinks-0.11.1/src/util/base64.h	2006-06-09 13:09:41.000000000 +0200
@@ -4,4 +4,7 @@
 unsigned char *base64_encode(unsigned char *);
 unsigned char *base64_decode(unsigned char *);
 
+unsigned char *base64_encode_bin(unsigned char *, int, int *);
+unsigned char *base64_decode_bin(unsigned char *, int, int *);
+
 #endif
--- elinks-0.11.1/configure.in.negotiate	2006-06-09 13:09:41.000000000 +0200
+++ elinks-0.11.1/configure.in	2006-06-09 13:09:41.000000000 +0200
@@ -447,6 +447,30 @@
 	[  --without-idn           disable international domain names support])
 
 dnl ===================================================================
+dnl Check for GSSAPI, optional even if installed.
+dnl ===================================================================
+
+enable_gssapi="no";
+
+AC_ARG_WITH(gssapi, [  --with-gssapi           enable GSSAPI support],
+            [ if test "x$withval" != xno; then enable_gssapi=yes; fi ])
+
+AC_MSG_CHECKING([for GSSAPI])
+
+if test "$enable_gssapi" = "yes"; then
+	AC_MSG_RESULT(yes)
+	GSSAPI_CFLAGS=`krb5-config --cflags gssapi`
+	GSSAPI_LIBS=`krb5-config --libs gssapi`
+	CFLAGS="$GSSAPI_CFLAGS $CFLAGS"
+	LIBS="$GSSAPI_LIBS $LIBS"
+ 	EL_CONFIG(CONFIG_GSSAPI, [GssApi])
+else
+	AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(CONFIG_GSSAPI)
+
+dnl ===================================================================
 dnl Bookmark and XBEL support
 dnl ===================================================================
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	29 May 2006 20:35:05 -0000	1.17
+++ .cvsignore	9 Jun 2006 12:08:47 -0000	1.18
@@ -1,2 +1 @@
 elinks-0.11.1.tar.bz2
-manual-0.82-en.tar.bz2


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- elinks.spec	29 May 2006 20:35:05 -0000	1.34
+++ elinks.spec	9 Jun 2006 12:08:47 -0000	1.35
@@ -2,14 +2,21 @@
 Name: elinks
 Summary: A text-mode Web browser.
 Version: 0.11.1
-Release: 2
+Release: 3
 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2
-Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2
 Group: Applications/Internet
 URL: http://elinks.or.cz/
 BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: autoconf, automake, openssl-devel, pkgconfig
-BuildRequires: bzip2-devel, expat-devel, libidn-devel
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: pkgconfig
+BuildRequires: openssl-devel
+BuildRequires: krb5-devel
+BuildRequires: bzip2-devel
+BuildRequires: expat-devel
+BuildRequires: libidn-devel
+
 License: GPL
 Provides: webclient
 Obsoletes: links
@@ -22,6 +29,7 @@
 Patch4: elinks-0.11.0-sysname.patch
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
+Patch7: elinks-0.11.1-negotiate.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -30,7 +38,7 @@
 quickly and swiftly displays Web pages.
 
 %prep
-%setup -q -a 1 -n %{name}-%{version}
+%setup -q -n %{name}-%{version}
 
 # Prevent crash when HOME is unset (bug #90663).
 %patch0 -p1 -b .noegd
@@ -45,6 +53,9 @@
 %patch5 -p1 -b .xterm
 # Fix #157300 - Strange behavior on ppc64
 %patch6 -p1 -b .union
+# Fix #194096 ??? elinks should support negotiate-auth
+%patch7 -p1 -b .negotiate
+
 
 %build
 #aclocal
@@ -53,7 +64,7 @@
 ./autogen.sh
 
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
-%configure %{?rescue:--without-gpm} --without-x
+%configure %{?rescue:--without-gpm} --without-x --with-gssapi
 %if "%{rescue}" != ""
 perl -pi -e "s,-O2,-O2 -Os,g" Make* */Make*
 %endif
@@ -72,7 +83,7 @@
 
 %files -f elinks.lang
 %defattr(-,root,root)
-%doc README SITES TODO manual-0.82-en
+%doc README SITES TODO
 %{_bindir}/links
 %{_bindir}/elinks
 %{_mandir}/man1/links.1*
@@ -80,6 +91,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Jun  9 2006 Karel Zak <kzak at redhat.com> 0.11.1-3
+- added negotiate-auth (GSSAPI) support -- EXPERIMENTAL!
+
 * Mon May 29 2006 Karel Zak <kzak at redhat.com> 0.11.1-2
 - update to new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 May 2006 20:35:05 -0000	1.17
+++ sources	9 Jun 2006 12:08:47 -0000	1.18
@@ -1,2 +1 @@
 db0d62394b03938eec81b749e49dfbbc  elinks-0.11.1.tar.bz2
-947950d4974c25f95f1a3988bf88cb21  manual-0.82-en.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:10:08 -0400
Subject: rpms/libXt/devel libXt.spec,1.17,1.18
Message-ID: <200606091210.k59CA8KW014840@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14812

Modified Files:
	libXt.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xt.pc



Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXt.spec	6 Jun 2006 08:25:05 -0000	1.17
+++ libXt.spec	9 Jun 2006 12:10:05 -0000	1.18
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,9 +22,11 @@
 %package devel
 Summary: X.Org X11 libXt development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
+# needed by xt.pc
+Requires: xorg-x11-proto-devel
 Requires: libX11-devel
 Requires: libSM-devel
 
@@ -122,7 +125,6 @@
 %{_libdir}/libXt.a
 %endif
 %{_libdir}/libXt.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xt.pc
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/makestrs.1x*
@@ -130,6 +132,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xt.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193503)
 - Replace "makeinstall" with "make install DESTDIR=..."
@@ -138,10 +143,10 @@
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2
@@ -160,7 +165,7 @@
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
-* Fri Dec  2 2005 Kristian H??gsberg <krh at redhat.com> 0.99.2-3
+* Fri Dec 02 2005 Kristian H??gsberg <krh at redhat.com> 0.99.2-3
 - Use the default value from configure.ac for --with-xfile-search-path
   except with %%{_datadir} instead of $(libdir), so Xt can search for
   app-default files as usual.
@@ -175,7 +180,7 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-* Wed Nov 2 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
+* Wed Nov 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
 - Actually spell RPM_OPT_FLAGS correctly this time.
 
 * Mon Oct 31 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
@@ -186,7 +191,7 @@
 - Updated libXt to version 0.99.1 from X11R7 RC1
 - Updated file manifest to find manpages in 'man3x'
 
-* Thu Oct 6 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-5
+* Thu Oct 06 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-5
 - Added Requires: libX11-devel to libXt-devel subpackage, as Xt headers
   include Xlib headers causing xterm and other things to fail to compile.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:13:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:13:03 -0400
Subject: rpms/libXtst/devel libXtst.spec,1.11,1.12
Message-ID: <200606091213.k59CD3k3015576@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15542

Modified Files:
	libXtst.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xtst.pc



Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXtst.spec	6 Jun 2006 08:31:44 -0000	1.11
+++ libXtst.spec	9 Jun 2006 12:13:01 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libXtst development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xtst.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -72,6 +76,9 @@
 %{_libdir}/pkgconfig/xtst.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xtst.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193504)
 - Replace "makeinstall" with "make install DESTDIR=..."
@@ -103,7 +110,6 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-
 * Mon Oct 24 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-1
 - Updated libXtst to version 0.99.1 from X11R7 RC1
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:15:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:15:14 -0400
Subject: rpms/openoffice.org/FC-4
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, 1.1, 1.2
Message-ID: <200606091215.k59CFEpw016507@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16476

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
Log Message:
adjust for 2.0.2

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 objmisc.cxx |   81 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 37 insertions(+), 44 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 11:12:02 -0000	1.1
+++ openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 12:15:11 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -p -r1.78 objmisc.cxx
 --- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
 +++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
-@@ -1054,40 +1054,27 @@ void SfxObjectShell::CheckMacrosOnLoadin
+@@ -1054,37 +1054,23 @@
  		pImp->bMacroDisabled = sal_True;
  		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
  	}
@@ -21,7 +21,7 @@
 -			if ( bHasMacros )
 -			{
 -				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
--				if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
+-				if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
 -					&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
 -				{
 -					WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
@@ -47,7 +47,6 @@
 -	else
 -	{
 -		if ( HasMacrosLib_Impl() )
-+
 +		if ( !bHasMacros )
 +			bHasMacros = HasMacrosLib_Impl();
 +
@@ -55,13 +54,9 @@
  		{
 -			// no signing in alien formats!
  			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
- 			if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
--			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-+				&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
- 			{
- 				WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
- 				aBox.Execute();
-@@ -2250,23 +2237,30 @@ BOOL SfxObjectShell::HasMacrosLib_Impl()
+ 			if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
+ 			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
+@@ -2245,23 +2231,30 @@
          if ( bHasMacros )
          {
              // a library container exists; check if it's empty
@@ -109,4 +104,3 @@
      }
      catch( uno::Exception& )
      {
-



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:15:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:15:51 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, 1.1, 1.2
Message-ID: <200606091215.k59CFpca018299@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17928

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
Log Message:
adjust for 2.0.2

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 objmisc.cxx |   81 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 37 insertions(+), 44 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 11:16:02 -0000	1.1
+++ openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 12:15:49 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -p -r1.78 objmisc.cxx
 --- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
 +++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
-@@ -1054,40 +1054,27 @@ void SfxObjectShell::CheckMacrosOnLoadin
+@@ -1054,37 +1054,23 @@
  		pImp->bMacroDisabled = sal_True;
  		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
  	}
@@ -21,7 +21,7 @@
 -			if ( bHasMacros )
 -			{
 -				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
--				if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
+-				if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
 -					&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
 -				{
 -					WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
@@ -47,7 +47,6 @@
 -	else
 -	{
 -		if ( HasMacrosLib_Impl() )
-+
 +		if ( !bHasMacros )
 +			bHasMacros = HasMacrosLib_Impl();
 +
@@ -55,13 +54,9 @@
  		{
 -			// no signing in alien formats!
  			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
- 			if ( SvtSecurityOptions().GetMacroSecurityLevel() > 2
--			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-+				&& MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
- 			{
- 				WarningBox aBox( NULL, SfxResId( MSG_WARNING_MACRO_ISDISABLED ) );
- 				aBox.Execute();
-@@ -2250,23 +2237,30 @@ BOOL SfxObjectShell::HasMacrosLib_Impl()
+ 			if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
+ 			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
+@@ -2245,23 +2231,30 @@
          if ( bHasMacros )
          {
              // a library container exists; check if it's empty
@@ -109,4 +104,3 @@
      }
      catch( uno::Exception& )
      {
-



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:21:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:21:45 -0400
Subject: rpms/libXv/devel libXv.spec,1.13,1.14
Message-ID: <200606091221.k59CLjcr000986@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv953

Modified Files:
	libXv.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
- Added "Requires: xorg-x11-proto-devel" to devel package for xv.pc



Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXv.spec	6 Jun 2006 08:36:02 -0000	1.13
+++ libXv.spec	9 Jun 2006 12:21:43 -0000	1.14
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,11 +22,13 @@
 %package devel
 Summary: X.Org X11 libXv development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 # NOTE: libXext-devel dependency added to fix bug #192167
 Requires: libXext-devel
+# needed by xv.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -39,7 +42,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -80,6 +82,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
+- Added "Requires: xorg-x11-proto-devel" to devel package for xv.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "BuildRequires: pkgconfig" for (#193505)
 - Replace "makeinstall" with "make install DESTDIR=..."
@@ -90,10 +95,10 @@
   packages that depend on libXv-devel from having to manually specify that
   dependency themselves, as it is required by Xv.  (#192167)
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:23:30 -0400
Subject: rpms/libXvMC/devel libXvMC.spec,1.14,1.15
Message-ID: <200606091223.k59CNUoJ001739@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1704

Modified Files:
	libXvMC.spec 
Log Message:
added comment


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXvMC.spec	6 Jun 2006 08:51:56 -0000	1.14
+++ libXvMC.spec	9 Jun 2006 12:23:27 -0000	1.15
@@ -23,9 +23,9 @@
 %package devel
 Summary: X.Org X11 libXvMC development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-
+Requires: %{name} = %{version}-%{release}
+# needed by xvmc.pc
 Requires: libXv-devel, xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -40,7 +40,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:25:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:25:50 -0400
Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.12,1.13
Message-ID: <200606091225.k59CPo11002676@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2647

Modified Files:
	libXxf86dga.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xxf86dga.pc



Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXxf86dga.spec	6 Jun 2006 04:41:25 -0000	1.12
+++ libXxf86dga.spec	9 Jun 2006 12:25:48 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libXxf86dga development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xxf86dga.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -69,12 +73,14 @@
 %{_libdir}/libXxf86dga.a
 %endif
 %{_libdir}/libXxf86dga.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xxf86dga.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xxf86dga.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193507)
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192728)



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:36:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:36:40 -0400
Subject: rpms/automake15/devel filter-provides-automake.sh, NONE,
	1.1 filter-requires-automake.sh, NONE, 1.1 automake15.spec,
	1.13, 1.14
Message-ID: <200606091236.k59CaeA2004745@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake15/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4711

Modified Files:
	automake15.spec 
Added Files:
	filter-provides-automake.sh filter-requires-automake.sh 
Log Message:
- filter self provided dependencies


--- NEW FILE filter-provides-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Automake::Struct\)' | sort -u


--- NEW FILE filter-requires-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Automake::Struct\)' | sort -u


Index: automake15.spec
===================================================================
RCS file: /cvs/dist/rpms/automake15/devel/automake15.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- automake15.spec	1 Jun 2006 10:59:39 -0000	1.13
+++ automake15.spec	9 Jun 2006 12:36:37 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake15
 Version:	1.5
-Release:	15
+Release:	16
 License:	GPL
 Group:		Development/Tools
 URL:		http://sources.redhat.com/automake
 Source:		ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
+Source10:   filter-provides-automake.sh
+Source11:   filter-requires-automake.sh
 Patch1:		automake-1.5-depout-mf.patch
 Patch2:		automake15-versioning.patch
 Patch3:		automake15-autoconf253.patch
@@ -18,6 +20,10 @@
 BuildArchitectures: noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE10}
+%define __find_requires %{SOURCE11}
+
 %description
 Automake is a tool for automatically generating
 `Makefile.in' files compliant with the GNU Coding Standards.
@@ -79,6 +85,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Fri Jun 09 2006 Karsten Hopp <karsten at redhat.de> 1.5-16
+- filter self provided dependencies
+
 * Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 1.5-15
 - buildrequire bison for self tests
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:37:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:37:58 -0400
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.10,1.11
Message-ID: <200606091237.k59Cbw9m005018@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gtk-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4991

Modified Files:
	gtk-sharp.spec 
Log Message:
* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 1.0.10-6
- Disable s390* for now as mono doesn't build there





Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-sharp.spec	13 Feb 2006 03:44:19 -0000	1.10
+++ gtk-sharp.spec	9 Jun 2006 12:37:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gtk-sharp
 Version:        1.0.10
-Release:        5
+Release:        6
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -14,7 +14,8 @@
 BuildRequires:  libgnomeprintui22-devel
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x 
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
+# no mono on s390 for now: s390 s390x 
 
 %description
 This package provides a library that allows you to build
@@ -71,6 +72,9 @@
 %{_prefix}/share/gapi
 
 %changelog
+* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 1.0.10-6
+- Disable s390* for now as mono doesn't build there
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 1.0.10-5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:51:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:51:54 -0400
Subject: rpms/automake16/devel filter-provides-automake.sh, NONE,
	1.1 filter-requires-automake.sh, NONE, 1.1 automake16.spec,
	1.9, 1.10
Message-ID: <200606091251.k59Cpsji030603@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake16/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30590

Modified Files:
	automake16.spec 
Added Files:
	filter-provides-automake.sh filter-requires-automake.sh 
Log Message:
- filter self provided dependencies


--- NEW FILE filter-provides-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Automake' | sort -u


--- NEW FILE filter-requires-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Automake' | sort -u


Index: automake16.spec
===================================================================
RCS file: /cvs/dist/rpms/automake16/devel/automake16.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- automake16.spec	6 Jun 2006 08:39:24 -0000	1.9
+++ automake16.spec	9 Jun 2006 12:51:52 -0000	1.10
@@ -3,10 +3,12 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake16
 Version:	%{api_version}.3
-Release:    7
+Release:    8
 License:	GPL
 Group:		Development/Tools
 Source:		ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
+Source10:   filter-provides-automake.sh
+Source11:   filter-requires-automake.sh
 URL:		http://sources.redhat.com/automake
 Conflicts:	automake = 1.6.3
 Requires:	perl
@@ -15,6 +17,10 @@
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 Patch1:		automake-pythondir-80994.patch
 
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE10}
+%define __find_requires %{SOURCE11}
+
 # run "make check" by default
 %{?_without_check: %define _without_check 1}
 %{!?_without_check: %define _without_check 0}
@@ -65,6 +71,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Fri Jun 09 2006 Karsten Hopp <karsten at redhat.de> 1.6.3-8
+- filter self provided dependencies
+
 * Tue Jun 06 2006 Karsten Hopp <karsten at redhat.de> 1.6.3-7
 - buildrequire flex for self tests
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:53:51 -0400
Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.12,1.13
Message-ID: <200606091253.k59CrpFw030685@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30672

Modified Files:
	libXxf86misc.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xxf86misc.pc



Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXxf86misc.spec	6 Jun 2006 04:46:43 -0000	1.12
+++ libXxf86misc.spec	9 Jun 2006 12:53:48 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libXxf86misc development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed for xxf86misc.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,6 +48,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -68,12 +73,14 @@
 %{_libdir}/libXxf86misc.a
 %endif
 %{_libdir}/libXxf86misc.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xxf86misc.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xxf86misc.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193508)
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192729)



From fedora-cvs-commits at redhat.com  Fri Jun  9 12:54:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 08:54:08 -0400
Subject: rpms/gmime/devel gmime.spec,1.12,1.13
Message-ID: <200606091254.k59Cs8TR030744@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30731/devel

Modified Files:
	gmime.spec 
Log Message:
* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 2.2.1-2
- Disable mono parts on s390* as mono doesn't build on s390 atm




Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gmime.spec	23 May 2006 15:58:47 -0000	1.12
+++ gmime.spec	9 Jun 2006 12:54:06 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.2.1
-Release:        1
+Release:        2
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -16,7 +16,8 @@
 
 
 # Mono only availible on these:
-%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc
+# no mono on s390 for now: s390 s390x 
 
 %ifarch %mono_archs
 BuildRequires:  mono-devel gtk-sharp2-gapi
@@ -114,6 +115,9 @@
 %endif
 
 %changelog
+* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 2.2.1-2
+- Disable mono parts on s390* as mono doesn't build on s390 atm
+
 * Tue May 23 2006 Alexander Larsson <alexl at redhat.com> - 2.2.1-1
 - Update to 2.2.1
 - Fix multilib -devel conflict by using pkg-config in gmime-config (#192675)



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:03:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:03:48 -0400
Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.12,1.13
Message-ID: <200606091303.k59D3mYa030909@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30896

Modified Files:
	gtk-sharp2.spec 
Log Message:
* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 2.8.2-2
- Disable on s390* as mono doesn't build on s390 atm




Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gtk-sharp2.spec	4 Mar 2006 02:22:18 -0000	1.12
+++ gtk-sharp2.spec	9 Jun 2006 13:03:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.8.2
-Release:        1
+Release:        2
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -17,7 +17,8 @@
 BuildRequires:  automake, libtool
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
+# no mono on s390 for now: s390 s390x 
 
 %description
 This package provides a library that allows you to build
@@ -92,6 +93,9 @@
 %{_prefix}/share/gapi-2.0
 
 %changelog
+* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 2.8.2-2
+- Disable on s390* as mono doesn't build on s390 atm
+
 * Fri Mar  3 2006 Christopher Aillon <caillon at redhat.com> - 2.8.2-1
 - Update to 2.8.2 to fix an issue with marshalling on x86-64
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:07:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:07:26 -0400
Subject: rpms/glade2/devel glade2.spec,1.22,1.23
Message-ID: <200606091307.k59D7QK9030999@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30977

Modified Files:
	glade2.spec 
Log Message:
Rebuild



Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- glade2.spec	2 Jun 2006 03:58:16 -0000	1.22
+++ glade2.spec	9 Jun 2006 13:07:13 -0000	1.23
@@ -16,7 +16,7 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 	3
+Release: 	4
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-4
+- Rebuild
+
 * Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:11:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:11:16 -0400
Subject: rpms/libIDL/devel libIDL.spec,1.20,1.21
Message-ID: <200606091311.k59DBENl009214@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9188

Modified Files:
	libIDL.spec 
Log Message:
Rebuild



Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libIDL.spec	6 Jun 2006 02:37:10 -0000	1.20
+++ libIDL.spec	9 Jun 2006 13:11:10 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
 Version: 0.8.6
-Release: 4
+Release: 5
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
@@ -76,6 +76,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-5
+- Rebuild
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-4
 - Fix missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:20:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:20:27 -0400
Subject: rpms/libXxf86vm/devel libXxf86vm.spec,1.13,1.14
Message-ID: <200606091320.k59DKRCn026419@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26384

Modified Files:
	libXxf86vm.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel"
- Remove package ownership of mandir/libdir/etc.



Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXxf86vm.spec	5 Jun 2006 11:07:27 -0000	1.13
+++ libXxf86vm.spec	9 Jun 2006 13:20:24 -0000	1.14
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -21,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libXxf86vm development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xxf86vm.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,6 +48,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -59,7 +64,6 @@
 %defattr(-,root,root,-)
 # FIXME: missing some of these files %doc AUTHORS COPYING README INSTALL ChangeLog
 %doc COPYING ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXxf86vm.so.1
 %{_libdir}/libXxf86vm.so.1.0.0
 
@@ -69,13 +73,15 @@
 %{_libdir}/libXxf86vm.a
 %endif
 %{_libdir}/libXxf86vm.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xxf86vm.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel"
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193509)
 - Use "make install DESTDIR=..." instead of makeinstall macro, to fix (#192731)
@@ -83,10 +89,10 @@
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Update to 1.0.1
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2
@@ -108,7 +114,7 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-* Tue Nov 1 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
+* Tue Nov 01 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
 - Bump release and rebuild to satiate beehive wonkiness.
 
 * Mon Oct 24 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-1



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:22:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:22:13 -0400
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.11,1.12
Message-ID: <200606091322.k59DMDMP026902@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26856

Modified Files:
	gsf-sharp.spec 
Log Message:
* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.6-10
- Disable on s390* as mono doesn't build on s390 atm





Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gsf-sharp.spec	21 Mar 2006 08:34:15 -0000	1.11
+++ gsf-sharp.spec	9 Jun 2006 13:22:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.6
-Release:        9
+Release:        10
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -13,7 +13,8 @@
 Requires:       libgsf
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
+# no mono on s390 for now: s390 s390x 
 
 %description
 Mono bindings for libgsf
@@ -50,6 +51,9 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.6-10
+- Disable on s390* as mono doesn't build on s390 atm
+
 * Tue Mar 21 2006 Caolan McNamara <caolanm at redhat.com> 0.6-9
 - rebuild against new libgsf
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:25:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:25:22 -0400
Subject: rpms/beagle/devel beagle.spec,1.53,1.54
Message-ID: <200606091325.k59DPMq1028109@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28071

Modified Files:
	beagle.spec 
Log Message:
* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.2.6-5
- Disable on s390* as mono doesn't build on s390 atm




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- beagle.spec	25 May 2006 18:33:58 -0000	1.53
+++ beagle.spec	9 Jun 2006 13:25:20 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.6
-Release:        4
+Release:        5
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -31,7 +31,8 @@
 Patch3: beagle-0.2.1-spew.patch
 
 # Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
+# no mono on s390 for now: s390 s390x 
 
 %description
 A general infrastructure for making your data easy to find. 
@@ -203,6 +204,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.2.6-5
+- Disable on s390* as mono doesn't build on s390 atm
+
 * Thu May 25 2006 Nalin Dahyabhai <nalin at redhat.com> - 0.2.6-4
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:27:18 -0400
Subject: rpms/libdmx/devel libdmx.spec,1.12,1.13
Message-ID: <200606091327.k59DRIii028915@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28827

Modified Files:
	libdmx.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Replace "makeinstall" with "make install DESTDIR=..."
- Added "Requires: xorg-x11-proto-devel" to devel for dmx.pc
- Remove package ownership of mandir/libdir/etc.



Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libdmx.spec	7 Jun 2006 22:04:05 -0000	1.12
+++ libdmx.spec	9 Jun 2006 13:27:15 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -22,8 +23,11 @@
 %package devel
 Summary: X.Org X11 libdmx development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed for dmx.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,7 +48,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +63,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libdmx.so.1
 %{_libdir}/libdmx.so.1.0.0
 
@@ -68,24 +72,26 @@
 %{_libdir}/libdmx.a
 %endif
 %{_libdir}/libdmx.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/dmx.pc
-#FIXME: manpages should be in man3x?
-%dir %{_mandir}
-%dir %{_mandir}/man3/
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
-* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.0.2-2
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel" to devel for dmx.pc
+- Remove package ownership of mandir/libdir/etc.
+
+* Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.0.2-2
 - rebuild for -devel deps
 
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:27:21 -0400
Subject: rpms/ImageMagick/devel .cvsignore, 1.17, 1.18 ImageMagick.spec, 1.59,
	1.60 sources, 1.17, 1.18
Message-ID: <200606091327.k59DRL0F028968@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28854

Modified Files:
	.cvsignore ImageMagick.spec sources 
Log Message:
6.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Nov 2005 17:56:48 -0000	1.17
+++ .cvsignore	9 Jun 2006 13:27:19 -0000	1.18
@@ -1,6 +1 @@
-ImageMagick-6.0.7-1.tar.bz2
-ImageMagick-6.2.0-7.tar.gz
-ImageMagick-6.2.1-7.tar.bz2
-ImageMagick-6.2.2-0.tar.bz2
-ImageMagick-6.2.4-6.tar.bz2
-ImageMagick-6.2.5-4.tar.bz2
+ImageMagick-6.2.8-0.tar.bz2


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ImageMagick.spec	2 Jun 2006 15:34:00 -0000	1.59
+++ ImageMagick.spec	9 Jun 2006 13:27:19 -0000	1.60
@@ -1,7 +1,7 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
-%define VER 6.2.5
-%define Patchlevel 4
+%define VER 6.2.8
+%define Patchlevel 
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
 %if "%{Patchlevel}" != ""
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 7
+Release: 1
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -251,6 +251,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.8-1
+- Update to 6.2.8
+
 * Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.5.4-7
 - Fix multilib issues
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Nov 2005 17:56:48 -0000	1.17
+++ sources	9 Jun 2006 13:27:19 -0000	1.18
@@ -1 +1 @@
-0c89ca5bc773ea41f77afb6f4099f7bd  ImageMagick-6.2.5-4.tar.bz2
+484cd7b62fac2164e8257449405f2563  ImageMagick-6.2.8-0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:28:45 -0400
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.60,1.61
Message-ID: <200606091328.k59DSjbd029537@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29479

Modified Files:
	ImageMagick.spec 
Log Message:
6.2.8



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ImageMagick.spec	9 Jun 2006 13:27:19 -0000	1.60
+++ ImageMagick.spec	9 Jun 2006 13:28:42 -0000	1.61
@@ -1,7 +1,7 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
 %define VER 6.2.8
-%define Patchlevel 
+#%define Patchlevel 
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
 %if "%{Patchlevel}" != ""



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:29:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:29:52 -0400
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.61,1.62
Message-ID: <200606091329.k59DTqtr029980@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29910

Modified Files:
	ImageMagick.spec 
Log Message:
PatchLevel games



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ImageMagick.spec	9 Jun 2006 13:28:42 -0000	1.61
+++ ImageMagick.spec	9 Jun 2006 13:29:49 -0000	1.62
@@ -1,7 +1,7 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
 %define VER 6.2.8
-#%define Patchlevel 
+%define Patchlevel 0
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
 %if "%{Patchlevel}" != ""



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:32:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:32:07 -0400
Subject: rpms/libfontenc/devel libfontenc.spec,1.13,1.14
Message-ID: <200606091332.k59DW7GB030512@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30487

Modified Files:
	libfontenc.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Remove package ownership of mandir/libdir/etc.



Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libfontenc.spec	27 Apr 2006 19:15:52 -0000	1.13
+++ libfontenc.spec	9 Jun 2006 13:32:04 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -23,8 +23,8 @@
 %package devel
 Summary: X.Org X11 libfontenc development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -53,6 +53,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove all libtool archives (*.la)
@@ -67,7 +68,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libfontenc.so.1
 %{_libdir}/libfontenc.so.1.0.0
 
@@ -80,17 +80,19 @@
 %{_libdir}/libfontenc.a
 %endif
 %{_libdir}/libfontenc.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:37:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:37:47 -0400
Subject: rpms/liboldX/devel liboldX.spec,1.12,1.13
Message-ID: <200606091337.k59Dblvu031418@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/liboldX/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31389

Modified Files:
	liboldX.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.



Index: liboldX.spec
===================================================================
RCS file: /cvs/dist/rpms/liboldX/devel/liboldX.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- liboldX.spec	5 Jun 2006 12:05:55 -0000	1.12
+++ liboldX.spec	9 Jun 2006 13:37:45 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 liboldX runtime library
 Name: liboldX
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 
@@ -19,8 +20,8 @@
 %package devel
 Summary: X.Org X11 liboldX development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -34,7 +35,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -42,9 +42,9 @@
 make %{?_smp_mflags}
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +58,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/liboldX.so.6
 %{_libdir}/liboldX.so.6.0.0
 
@@ -70,10 +69,13 @@
 %{_libdir}/liboldX.a
 %endif
 %{_libdir}/liboldX.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/oldx.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193420)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:40:01 -0400
Subject: rpms/glade2/devel glade2.spec,1.23,1.24
Message-ID: <200606091340.k59De1cF032027@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31975

Modified Files:
	glade2.spec 
Log Message:
fix build reqs



Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- glade2.spec	9 Jun 2006 13:07:13 -0000	1.23
+++ glade2.spec	9 Jun 2006 13:39:59 -0000	1.24
@@ -36,6 +36,7 @@
 BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
+BuildRequires: gettext
 
 %description
 Glade is a free user interface builder for GTK+ and the GNOME GUI
@@ -81,7 +82,7 @@
 
 %changelog
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-4
-- Rebuild
+- Add missing  BuildRequires
 
 * Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-3
 - Rebuild



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:43:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:43:11 -0400
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.15,1.16
Message-ID: <200606091343.k59DhBXu000342@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv311

Modified Files:
	libxkbfile.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xkbfile.pc 



Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libxkbfile.spec	6 Jun 2006 05:02:02 -0000	1.15
+++ libxkbfile.spec	9 Jun 2006 13:43:08 -0000	1.16
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.3
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -20,8 +21,11 @@
 %package devel
 Summary: X.Org X11 libxkbfile development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xkbfile.pc
+BuildRequires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -78,10 +82,12 @@
 %{_libdir}/libxkbfile.a
 %endif
 %{_libdir}/libxkbfile.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xkbfile.pc 
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2
 - Added "BuildRequires: pkgconfig" for (#193424)
 - Replace "makeinstall" with "make install DESTDIR=..."
@@ -90,13 +96,13 @@
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
 - Update to 1.0.3
 
-* Tue Feb 28 2006 Adam Jackson <ajackson at redhat.com> - 1.0.2-1
+* Tue Feb 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Updated libxkbfile to version 1.0.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
@@ -118,7 +124,6 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-
 * Thu Oct 27 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
 - Work around pointer aliasing problem with -fno-strict-aliasing
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:46:40 -0400
Subject: rpms/libxkbui/devel libxkbui.spec,1.12,1.13
Message-ID: <200606091346.k59DkegV010835@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libxkbui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10614

Modified Files:
	libxkbui.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
- Added "Requires: xorg-x11-proto-devel, libX11-devel" to devel for xkbui.pc



Index: libxkbui.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/libxkbui.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxkbui.spec	6 Jun 2006 05:08:45 -0000	1.12
+++ libxkbui.spec	9 Jun 2006 13:46:37 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libxkbui runtime library
 Name: libxkbui
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -21,8 +22,11 @@
 %package devel
 Summary: X.Org X11 libxkbui development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed for xkbui.pc
+Requires: xorg-x11-proto-devel, libX11-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -36,7 +40,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -72,10 +75,12 @@
 %{_libdir}/libxkbui.a
 %endif
 %{_libdir}/libxkbui.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xkbui.pc
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
+- Added "Requires: xorg-x11-proto-devel, libX11-devel" to devel for xkbui.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Added "BuildRequires: pkgconfig" for (#193425)
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Fri Jun  9 13:49:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 09:49:41 -0400
Subject: rpms/libfontenc/devel libfontenc.spec,1.14,1.15
Message-ID: <200606091349.k59DnfKe017367@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17333

Modified Files:
	libfontenc.spec 
Log Message:
Add autoconf dep


Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libfontenc.spec	9 Jun 2006 13:32:04 -0000	1.14
+++ libfontenc.spec	9 Jun 2006 13:49:39 -0000	1.15
@@ -14,6 +14,8 @@
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
+# FIXME: temporarily require autoconf for workaround
+BuildRequires: autoconf
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -85,6 +87,7 @@
 %changelog
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Remove package ownership of mandir/libdir/etc.
+- Added "BuildRequires: autoconf" temporarily as long as autoconf is needed
 
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:11:35 -0400
Subject: rpms/php/devel php.spec,1.114,1.115
Message-ID: <200606091411.k59EBZjC022928@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22913

Modified Files:
	php.spec 
Log Message:
%define contentdir /var/www
%define apiver 20041225
%define pdover 20060409

Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php
Version: 5.1.4
Release: 8
License: The PHP License v3.01
Group: Development/Languages
URL: http://www.php.net/

Source0: http://www.php.net/distributions/php-%{version}.tar.gz
Source50: php.conf
Source51: php.ini

Patch1: php-5.1.4-gnusrc.patch
Patch2: php-5.1.4-warnings.patch
Patch5: php-4.3.3-install.patch
Patch6: php-5.0.4-norpath.patch
Patch7: php-4.3.2-libtool15.patch
Patch13: php-5.0.2-phpize64.patch

# Fixes for extension modules
Patch21: php-4.3.1-odbc.patch
Patch22: php-4.3.11-shutdown.patch

# Functional changes
Patch30: php-5.0.4-dlopen.patch
Patch31: php-5.0.0-easter.patch

# Fixes for tests
Patch50: php-5.0.4-tests-dashn.patch
Patch51: php-5.0.4-tests-wddx.patch

BuildRoot: %{_tmppath}/%{name}-root

BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
BuildRequires: gmp-devel, aspell-devel >= 0.50.0
BuildRequires: httpd-devel >= 2.0.46-1, libjpeg-devel, libpng-devel, pam-devel
BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
BuildRequires: zlib-devel, pcre-devel >= 4.5, smtpdaemon
BuildRequires: bzip2, fileutils, file >= 4.0, perl, libtool >= 1.4.3, gcc-c++
Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php
# Enforce Apache module ABI compatibility
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
Requires: file >= 4.0
Provides: mod_php = %{version}-%{release}
Requires: php-common = %{version}-%{release}
# For backwards-compatibility, require php-cli for the time being:
Requires: php-cli = %{version}-%{release}

%description
PHP is an HTML-embedded scripting language. PHP attempts to make it
easy for developers to write dynamically generated webpages. PHP also
offers built-in database integration for several commercial and
non-commercial database management systems, so writing a
database-enabled webpage with PHP is fairly simple. The most common
use of PHP coding is probably as a replacement for CGI scripts. 

The php package contains the module which adds support for the PHP
language to Apache HTTP Server.

%package cli
Group: Development/Languages
Summary: Command-line interface for PHP
Requires: php-common = %{version}-%{release}
Provides: php-cgi = %{version}-%{release}
Provides: php-pcntl

%description cli
The php-cli package contains the command-line interface 
executing PHP scripts, /usr/bin/php, and the CGI interface.

%package common
Group: Development/Languages
Summary: Common files for PHP
Provides: php-api = %{apiver}
# Provides for all builtin modules:
Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
Provides: php-mime_magic, php-openssl, php-pcre, php-posix, php-pspell
Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
Provides: php-wddx, php-zlib
Obsoletes: php-openssl

%description common
The php-common package contains files used by both the php
package and the php-cli package.

%package devel
Group: Development/Libraries
Summary: Files needed for building PHP extensions.
Requires: php = %{version}-%{release}, autoconf, automake
Obsoletes: php-pecl-pdo-devel

%description devel
The php-devel package contains the files needed for building PHP
extensions. If you need to compile your own PHP extensions, you will
need to install this package.

%package imap
Summary: A module for PHP applications that use IMAP.
Group: Development/Languages
Requires: php = %{version}-%{release}
Obsoletes: mod_php3-imap, stronghold-php-imap
BuildRequires: krb5-devel, openssl-devel, libc-client-devel

%description imap
The php-imap package contains a dynamic shared object (DSO) for the
Apache Web server. When compiled into Apache, the php-imap module will
add IMAP (Internet Message Access Protocol) support to PHP. IMAP is a
protocol for retrieving and uploading e-mail messages on mail
servers. PHP is an HTML-embedded scripting language. If you need IMAP
support for PHP applications, you will need to install this package
and the php package.

%package ldap
Summary: A module for PHP applications that use LDAP.
Group: Development/Languages
Requires: php = %{version}-%{release}
Obsoletes: mod_php3-ldap, stronghold-php-ldap
BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel

%description ldap
The php-ldap package is a dynamic shared object (DSO) for the Apache
Web server that adds Lightweight Directory Access Protocol (LDAP)
support to PHP. LDAP is a set of protocols for accessing directory
services over the Internet. PHP is an HTML-embedded scripting
language. If you need LDAP support for PHP applications, you will
need to install this package in addition to the php package.

%package pdo
Summary: A database access abstraction module for PHP applications
Group: Development/Languages
Requires: php = %{version}-%{release}
Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
Provides: php-pdo-abi = %{pdoabi}

%description pdo
The php-pdo package contains a dynamic shared object that will add
a database access abstraction layer to PHP.  This module provides
a common interface for accessing MySQL, PostgreSQL or other 
databases.

%package mysql
Summary: A module for PHP applications that use MySQL databases.
Group: Development/Languages
Requires: php = %{version}-%{release}, php-pdo
Provides: php_database, php-mysqli
Obsoletes: mod_php3-mysql, stronghold-php-mysql
BuildRequires: mysql-devel >= 4.1.0

%description mysql
The php-mysql package contains a dynamic shared object that will add
MySQL database support to PHP. MySQL is an object-relational database
management system. PHP is an HTML-embeddable scripting language. If
you need MySQL support for PHP applications, you will need to install
this package and the php package.

%package pgsql
Summary: A PostgreSQL database module for PHP.
Group: Development/Languages
Requires: php = %{version}-%{release}, php-pdo
Provides: php_database
Obsoletes: mod_php3-pgsql, stronghold-php-pgsql
BuildRequires: krb5-devel, openssl-devel, postgresql-devel

%description pgsql
The php-pgsql package includes a dynamic shared object (DSO) that can
be compiled in to the Apache Web server to add PostgreSQL database
support to PHP. PostgreSQL is an object-relational database management
system that supports almost all SQL constructs. PHP is an
HTML-embedded scripting language. If you need back-end support for
PostgreSQL, you should install this package in addition to the main
php package.

%package odbc
Group: Development/Languages
Requires: php = %{version}-%{release}, php-pdo
Summary: A module for PHP applications that use ODBC databases.
Provides: php_database
Obsoletes: stronghold-php-odbc
BuildRequires: unixODBC-devel

%description odbc
The php-odbc package contains a dynamic shared object that will add
database support through ODBC to PHP. ODBC is an open specification
which provides a consistent API for developers to use for accessing
data sources (which are often, but not always, databases). PHP is an
HTML-embeddable scripting language. If you need ODBC support for PHP
applications, you will need to install this package and the php
package.

%package soap
Group: Development/Languages
Requires: php = %{version}-%{release}
Summary: A module for PHP applications that use the SOAP protocol
BuildRequires: libxml2-devel

%description soap
The php-soap package contains a dynamic shared object that will add
support to PHP for using the SOAP web services protocol.

%package snmp
Summary: A module for PHP applications that query SNMP-managed devices.
Group: Development/Languages
Requires: php = %{version}-%{release}, net-snmp
BuildRequires: net-snmp-devel

%description snmp
The php-snmp package contains a dynamic shared object that will add
support for querying SNMP devices to PHP.  PHP is an HTML-embeddable
scripting language. If you need SNMP support for PHP applications, you
will need to install this package and the php package.

%package xml
Summary: A module for PHP applications which use XML
Group: Development/Languages
Requires: php = %{version}-%{release}
Obsoletes: php-domxml, php-dom
Provides: php-dom, php-xsl
BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1

%description xml
The php-xml package contains dynamic shared objects which add support
to PHP for manipulating XML documents using the DOM tree,
and performing XSL transformations on XML documents.

%package xmlrpc
Summary: A module for PHP applications which use the XML-RPC protocol
Group: Development/Languages
Requires: php = %{version}-%{release}
BuildRequires: expat-devel

%description xmlrpc
The php-xmlrpc package contains a dynamic shared object that will add
support for the XML-RPC protocol to PHP.

%package mbstring
Summary: A module for PHP applications which need multi-byte string handling
Group: Development/Languages
Requires: php = %{version}-%{release}

%description mbstring
The php-mbstring package contains a dynamic shared object that will add
support for multi-byte string handling to PHP.

%package ncurses
Summary: A module for PHP applications for using ncurses interfaces
Group: Development/Languages
Requires: php = %{version}-%{release}
BuildRequires: ncurses-devel

%description ncurses
The php-ncurses package contains a dynamic shared object that will add
support for using the ncurses terminal output interfaces.

%package gd
Summary: A module for PHP applications for using the gd graphics library
Group: Development/Languages
Requires: php = %{version}-%{release}
BuildRequires: gd-devel, freetype-devel

%description gd
The php-gd package contains a dynamic shared object that will add
support for using the gd graphics library to PHP.

%package bcmath
Summary: A module for PHP applications for using the bcmath library
Group: Development/Languages
Requires: php = %{version}-%{release}

%description bcmath
The php-bcmath package contains a dynamic shared object that will add
support for using the bcmath library to PHP.

%package dba
Summary: A database abstraction layer module for PHP applications
Group: Development/Languages
Requires: php = %{version}-%{release}

%description dba
The php-dba package contains a dynamic shared object that will add
support for using the DBA database abstraction layer to PHP.

%prep
%setup -q
%patch1 -p1 -b .gnusrc
%patch2 -p1 -b .warnings
%patch5 -p1 -b .install
%patch6 -p1 -b .norpath
%patch7 -p1 -b .libtool15
%patch13 -p1 -b .phpize64

%patch21 -p1 -b .odbc
%patch22 -p1 -b .shutdown

%patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter

%patch50 -p1 -b .tests-dashn
%patch51 -p1 -b .tests-wddx

# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
cp TSRM/LICENSE TSRM_LICENSE
cp regex/COPYRIGHT regex_COPYRIGHT
cp ext/gd/libgd/README gd_README

# Source is built twice: once for /usr/bin/php, once for the Apache DSO.
mkdir build-cgi build-apache

# Remove bogus test; position of read position after fopen(, "a+")
# is not defined by C standard, so don't presume anything.
rm -f ext/standard/tests/file/bug21131.phpt

# Tests that fail.
rm -f ext/standard/tests/file/bug22414.phpt \
      ext/iconv/tests/bug16069.phpt

# Safety check for API version change.
vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
if test "x${vapi}" != "x%{apiver}"; then
   : Error: Upstream API version is now ${vapi}, expecting %{apiver}.
   : Update the apiver macro and rebuild.
   exit 1
fi

# Safety check for PDO ABI version change
vpdo=`sed -n '/#define PDO_DRIVER_API/{s/.*[ 	]//;p}' ext/pdo/php_pdo_driver.h`
if test "x${vpdo}" != "x%{pdover}"; then
   : Error: Upstream PDO ABI version is now ${vpdo}, expecting %{pdover}.
   : Update the pdover macro and rebuild.
   exit 1
fi

%build
# Force use of system libtool:
libtoolize --force --copy
cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4

# Regenerate configure scripts (patches change config.m4's)
./buildconf --force

CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign"
CPPFLAGS="-DLDAP_DEPRECATED=1"
export CFLAGS CPPFLAGS

# Install extension modules in %{_libdir}/php/modules.
EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR

# Set PEAR_INSTALLDIR to ensure that the hard-coded include_path
# includes the PEAR directory even though pear is packaged
# separately.
PEAR_INSTALLDIR=%{_datadir}/pear; export PEAR_INSTALLDIR

# Shell function to configure and build a PHP tree.
build() {
# bison-1.875-2 seems to produce a broken parser; workaround.
mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
ln -sf ../configure
%configure \
	--cache-file=../config.cache \
        --with-libdir=%{_lib} \
	--with-config-file-path=%{_sysconfdir} \
	--with-config-file-scan-dir=%{_sysconfdir}/php.d \
	--disable-debug \
	--with-pic \
	--disable-rpath \
	--without-pear \
	--with-bz2 \
	--with-curl \
	--with-exec-dir=%{_bindir} \
	--with-freetype-dir=%{_prefix} \
	--with-png-dir=%{_prefix} \
	--enable-gd-native-ttf \
	--without-gdbm \
	--with-gettext \
	--with-gmp \
	--with-iconv \
	--with-jpeg-dir=%{_prefix} \
	--with-openssl \
	--with-png \
	--with-pspell \
	--with-expat-dir=%{_prefix} \
        --with-pcre-regex=%{_prefix} \
	--with-zlib \
	--with-layout=GNU \
	--enable-exif \
	--enable-ftp \
	--enable-magic-quotes \
	--enable-sockets \
	--enable-sysvsem --enable-sysvshm --enable-sysvmsg \
	--enable-track-vars \
	--enable-trans-sid \
	--enable-yp \
	--enable-wddx \
	--with-kerberos \
	--enable-ucd-snmp-hack \
	--with-unixODBC=shared,%{_prefix} \
	--enable-memory-limit \
	--enable-shmop \
	--enable-calendar \
	--enable-dbx \
	--enable-dio \
        --with-mime-magic=%{_sysconfdir}/httpd/conf/magic \
        --without-sqlite \
        --with-libxml-dir=%{_prefix} \
	--with-xml \
	$* 
if test $? != 0; then 
  tail -500 config.log
  : configure failed
  exit 1
fi

make %{?_smp_mflags}
}

# Build /usr/bin/php-cgi with the CGI SAPI, and all the shared extensions
pushd build-cgi
build --enable-force-cgi-redirect \
      --enable-pcntl \
      --with-imap=shared --with-imap-ssl \
      --enable-mbstring=shared --enable-mbstr-enc-trans \
      --enable-mbregex \
      --with-ncurses=shared \
      --with-gd=shared \
      --enable-bcmath=shared \
      --enable-dba=shared --with-db4=%{_prefix} \
      --with-xmlrpc=shared \
      --with-ldap=shared \
      --with-mysql=shared,%{_prefix} \
      --with-mysqli=shared,%{_bindir}/mysql_config \
      --enable-dom=shared \
      --with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
      --with-pgsql=shared \
      --with-snmp=shared,%{_prefix} \
      --enable-soap=shared \
      --with-xsl=shared,%{_prefix} \
      --enable-xmlreader=shared --enable-xmlwriter=shared \
      --enable-fastcgi \
      --enable-pdo=shared \
      --with-pdo-odbc=shared,unixODBC,%{_prefix} \
      --with-pdo-mysql=shared,%{_prefix} \
      --with-pdo-pgsql=shared,%{_prefix} \
      --with-pdo-sqlite=shared,%{_prefix}
popd

# Build Apache module, and the CLI SAPI, /usr/bin/php
pushd build-apache
build --with-apxs2=%{_sbindir}/apxs \
      --without-mysql --without-gd \
      --without-odbc --disable-dom \
      --disable-dba --without-unixODBC \
      --disable-pdo --disable-xmlreader --disable-xmlwriter
popd

%check
cd build-apache
# Run tests, using the CLI SAPI
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
unset TZ LANG LC_ALL
if ! make test; then
  set +x
  for f in `find .. -name \*.diff -type f -print`; do
    echo "TEST FAILURE: $f --"
    cat "$f"
    echo "-- $f result ends."
  done
  set -x
  #exit 1
fi
unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_

%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

# Install everything from the CGI SAPI build
pushd build-cgi
make install INSTALL_ROOT=$RPM_BUILD_ROOT 
mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php-cgi
# Install the CLI SAPI as /usr/bin/php
make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT
popd

# Install the Apache module
pushd build-apache
make install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
popd

# Install the default configuration file and icons
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
install -m 644 $RPM_SOURCE_DIR/php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
install -m 644    *.gif $RPM_BUILD_ROOT%{contentdir}/icons/

# For PEAR packaging:
install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear

# Use correct libdir
sed -i -e 's|%{_prefix}/lib|%{_libdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini

# install the DSO
install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules
install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules

# Apache config fragment
install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d
install -m 644 $RPM_SOURCE_DIR/php.conf $RPM_BUILD_ROOT/etc/httpd/conf.d

install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php
install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session

# Generate files lists and stub .ini files for each subpackage
for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
    mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
    pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite; do
    cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
; Enable ${mod} extension module
extension=${mod}.so
EOF
    cat > files.${mod} <<EOF
%attr(755,root,root) %{_libdir}/php/modules/${mod}.so
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${mod}.ini
EOF
done

# The dom, xsl and xml* modules are all packaged in php-xml
cat files.dom files.xsl files.xml{reader,writer} > files.xml

# The mysql and mysqli modules are both packaged in php-mysql
cat files.mysqli >> files.mysql

# Split out the PDO modules
cat files.pdo_mysql >> files.mysql
cat files.pdo_pgsql >> files.pgsql
cat files.pdo_odbc >> files.odbc

# Package pdo_sqlite with pdo; isolating the sqlite dependency
# isn't useful at this time since rpm itself requires sqlite.
cat files.pdo_sqlite >> files.pdo

# Remove unpackaged files
rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
       $RPM_BUILD_ROOT%{_bindir}/{phptar} \
       $RPM_BUILD_ROOT%{_datadir}/pear

# Remove irrelevant docs
rm -f README.{Zeus,QNX,CVS-RULES}

%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
rm files.*

%files
%defattr(-,root,root)
%{_libdir}/httpd/modules/libphp5.so
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
%config %{_sysconfdir}/httpd/conf.d/php.conf
%{contentdir}/icons/php.gif

%files common
%defattr(-,root,root)
%doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
%doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
%config %{_sysconfdir}/php.ini
%dir %{_sysconfdir}/php.d
%dir %{_libdir}/php
%dir %{_libdir}/php/modules
%dir %{_localstatedir}/lib/php
%dir %{_libdir}/php/pear

%files cli
%defattr(-,root,root)
%{_bindir}/php
%{_bindir}/php-cgi
%{_mandir}/man?/*

%files devel
%defattr(-,root,root)
%{_bindir}/php-config
%{_bindir}/phpize
%{_includedir}/php
%{_libdir}/php/build

%files pgsql -f files.pgsql
%files mysql -f files.mysql
%files odbc -f files.odbc
%files imap -f files.imap
%files ldap -f files.ldap
%files snmp -f files.snmp
%files xml -f files.xml
%files xmlrpc -f files.xmlrpc
%files mbstring -f files.mbstring
%files ncurses -f files.ncurses
%files gd -f files.gd
%files soap -f files.soap
%files bcmath -f files.bcmath
%files dba -f files.dba
%files pdo -f files.pdo

%changelog
* Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-8
- Provide php-posix (#194583)
- only provide php-pcntl from -cli subpackage
- add missing defattr's (thanks to Matthias Saou)

* Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-7
- move Obsoletes for php-openssl to -common (#194501)
- Provide: php-cgi from -cli subpackage

* Fri Jun  2 2006 Joe Orton <jorton at redhat.com> 5.1.4-6
- split out php-cli, php-common subpackages (#177821)
- add php-pdo-abi version export (#193202)

* Wed May 24 2006 Radek Vokal <rvokal at redhat.com> 5.1.4-5.1
- rebuilt for new libnetsnmp

* Thu May 18 2006 Joe Orton <jorton at redhat.com> 5.1.4-5
- provide mod_php (#187891)
- provide php-cli (#192196)
- use correct LDAP fix (#181518)
- define _GNU_SOURCE in php_config.h and leave it defined
- drop (circular) dependency on php-pear

* Mon May  8 2006 Joe Orton <jorton at redhat.com> 5.1.4-3
- update to 5.1.4

* Wed May  3 2006 Joe Orton <jorton at redhat.com> 5.1.3-3
- update to 5.1.3

* Tue Feb 28 2006 Joe Orton <jorton at redhat.com> 5.1.2-5
- provide php-api (#183227)
- add provides for all builtin modules (Tim Jackson, #173804)
- own %%{_libdir}/php/pear for PEAR packages (per #176733)
- add obsoletes to allow upgrade from FE4 PDO packages (#181863)

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.1.2-4.3
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.1.2-4.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Tue Jan 31 2006 Joe Orton <jorton at redhat.com> 5.1.2-4
- rebuild for new libc-client soname

* Mon Jan 16 2006 Joe Orton <jorton at redhat.com> 5.1.2-3
- only build xmlreader and xmlwriter shared (#177810)

* Fri Jan 13 2006 Joe Orton <jorton at redhat.com> 5.1.2-2
- update to 5.1.2

* Thu Jan  5 2006 Joe Orton <jorton at redhat.com> 5.1.1-8
- rebuild again

* Mon Jan  2 2006 Joe Orton <jorton at redhat.com> 5.1.1-7
- rebuild for new net-snmp

* Mon Dec 12 2005 Joe Orton <jorton at redhat.com> 5.1.1-6
- enable short_open_tag in default php.ini again (#175381)

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Thu Dec  8 2005 Joe Orton <jorton at redhat.com> 5.1.1-5
- require net-snmp for php-snmp (#174800)

* Sun Dec  4 2005 Joe Orton <jorton at redhat.com> 5.1.1-4
- add /usr/share/pear back to hard-coded include_path (#174885)

* Fri Dec  2 2005 Joe Orton <jorton at redhat.com> 5.1.1-3
- rebuild for httpd 2.2

* Mon Nov 28 2005 Joe Orton <jorton at redhat.com> 5.1.1-2
- update to 5.1.1
- remove pear subpackage
- enable pdo extensions (php-pdo subpackage)
- remove non-standard conditional module builds
- enable xmlreader extension

* Thu Nov 10 2005 Tomas Mraz <tmraz at redhat.com> 5.0.5-6
- rebuilt against new openssl

* Mon Nov  7 2005 Joe Orton <jorton at redhat.com> 5.0.5-5
- pear: update to XML_RPC 1.4.4, XML_Parser 1.2.7, Mail 1.1.9 (#172528)

* Tue Nov  1 2005 Joe Orton <jorton at redhat.com> 5.0.5-4
- rebuild for new libnetsnmp

* Wed Sep 14 2005 Joe Orton <jorton at redhat.com> 5.0.5-3
- update to 5.0.5
- add fix for upstream #34435
- devel: require autoconf, automake (#159283)
- pear: update to HTTP-1.3.6, Mail-1.1.8, Net_SMTP-1.2.7, XML_RPC-1.4.1
- fix imagettftext et al (upstream, #161001)

* Thu Jun 16 2005 Joe Orton <jorton at redhat.com> 5.0.4-11
- ldap: restore ldap_start_tls() function

* Fri May  6 2005 Joe Orton <jorton at redhat.com> 5.0.4-10
- disable RPATHs in shared extensions (#156974)

* Tue May  3 2005 Joe Orton <jorton at redhat.com> 5.0.4-9
- build simplexml_import_dom even with shared dom (#156434)
- prevent truncation of copied files to ~2Mb (#155916)
- install /usr/bin/php from CLI build alongside CGI
- enable sysvmsg extension (#142988)

* Mon Apr 25 2005 Joe Orton <jorton at redhat.com> 5.0.4-8
- prevent build of builtin dba as well as shared extension

* Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 5.0.4-7
- split out dba and bcmath extensions into subpackages
- BuildRequire gcc-c++ to avoid AC_PROG_CXX{,CPP} failure (#155221)
- pear: update to DB-1.7.6
- enable FastCGI support in /usr/bin/php-cgi (#149596)

* Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 5.0.4-6
- build /usr/bin/php with the CLI SAPI, and add /usr/bin/php-cgi,
  built with the CGI SAPI (thanks to Edward Rudd, #137704)
- add php(1) man page for CLI
- fix more test cases to use -n when invoking php

* Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 5.0.4-5
- rebuild for new libpq soname

* Tue Apr 12 2005 Joe Orton <jorton at redhat.com> 5.0.4-4
- bundle from PEAR: HTTP, Mail, XML_Parser, Net_Socket, Net_SMTP
- snmp: disable MSHUTDOWN function to prevent error_log noise (#153988)
- mysqli: add fix for crash on x86_64 (Georg Richter, upstream #32282)

* Mon Apr 11 2005 Joe Orton <jorton at redhat.com> 5.0.4-3
- build shared objects as PIC (#154195)

* Mon Apr  4 2005 Joe Orton <jorton at redhat.com> 5.0.4-2
- fix PEAR installation and bundle PEAR DB-1.7.5 package

* Fri Apr  1 2005 Joe Orton <jorton at redhat.com> 5.0.4-1
- update to 5.0.4 (#153068)
- add .phps AddType to php.conf (#152973)
- better gcc4 fix for libxmlrpc

* Wed Mar 30 2005 Joe Orton <jorton at redhat.com> 5.0.3-5
- BuildRequire mysql-devel >= 4.1
- don't mark php.ini as noreplace to make upgrades work (#152171)
- fix subpackage descriptions (#152628)
- fix memset(,,0) in Zend (thanks to Dave Jones)
- fix various compiler warnings in Zend

* Thu Mar 24 2005 Joe Orton <jorton at redhat.com> 5.0.3-4
- package mysqli extension in php-mysql
- really enable pcntl (#142903)
- don't build with --enable-safe-mode (#148969)
- use "Instant Client" libraries for oci8 module (Kai Bolay, #149873)

* Fri Feb 18 2005 Joe Orton <jorton at redhat.com> 5.0.3-3
- fix build with GCC 4

* Wed Feb  9 2005 Joe Orton <jorton at redhat.com> 5.0.3-2
- install the ext/gd headers (#145891)
- enable pcntl extension in /usr/bin/php (#142903)
- add libmbfl array arithmetic fix (dcb314 at hotmail.com, #143795)
- add BuildRequire for recent pcre-devel (#147448)

* Wed Jan 12 2005 Joe Orton <jorton at redhat.com> 5.0.3-1
- update to 5.0.3 (thanks to Robert Scheck et al, #143101)
- enable xsl extension (#142174)
- package both the xsl and dom extensions in php-xml
- enable soap extension, shared (php-soap package) (#142901)
- add patches from upstream 5.0 branch:
 * Zend_strtod.c compile fixes
 * correct php_sprintf return value usage

* Mon Nov 22 2004 Joe Orton <jorton at redhat.com> 5.0.2-8
- update for db4-4.3 (Robert Scheck, #140167)
- build against mysql-devel
- run tests in %%check

* Wed Nov 10 2004 Joe Orton <jorton at redhat.com> 5.0.2-7
- truncate changelog at 4.3.1-1
- merge from 4.3.x package:
 - enable mime_magic extension and Require: file (#130276)

* Mon Nov  8 2004 Joe Orton <jorton at redhat.com> 5.0.2-6
- fix dom/sqlite enable/without confusion

* Mon Nov  8 2004 Joe Orton <jorton at redhat.com> 5.0.2-5
- fix phpize installation for lib64 platforms
- add fix for segfault in variable parsing introduced in 5.0.2

* Mon Nov  8 2004 Joe Orton <jorton at redhat.com> 5.0.2-4
- update to 5.0.2 (#127980)
- build against mysqlclient10-devel
- use new RTLD_DEEPBIND to load extension modules
- drop explicit requirement for elfutils-devel
- use AddHandler in default conf.d/php.conf (#135664)
- "fix" round() fudging for recent gcc on x86
- disable sqlite pending audit of warnings and subpackage split

* Fri Sep 17 2004 Joe Orton <jorton at redhat.com> 5.0.1-4
- don't build dom extension into 2.0 SAPI

* Fri Sep 17 2004 Joe Orton <jorton at redhat.com> 5.0.1-3
- ExclusiveArch: x86 ppc x86_64 for the moment

* Fri Sep 17 2004 Joe Orton <jorton at redhat.com> 5.0.1-2
- fix default extension_dir and conf.d/php.conf

* Thu Sep  9 2004 Joe Orton <jorton at redhat.com> 5.0.1-1
- update to 5.0.1
- only build shared modules once
- put dom extension in php-dom subpackage again
- move extension modules into %%{_libdir}/php/modules
- don't use --with-regex=system, it's ignored for the apache* SAPIs

* Wed Aug 11 2004 Tom Callaway <tcallawa at redhat.com>
- Merge in some spec file changes from Jeff Stern (jastern at uci.edu)

* Mon Aug 09 2004 Tom Callaway <tcallawa at redhat.com>
- bump to 5.0.0
- add patch to prevent clobbering struct re_registers from regex.h
- remove domxml references, replaced with dom now built-in
- fix php.ini to refer to php5 not php4

* Wed Aug 04 2004 Florian La Roche <Florian.LaRoche at redhat.de>
- rebuild

* Wed Jul 14 2004 Joe Orton <jorton at redhat.com> 4.3.8-3
- update to 4.3.8
- catch some fd > FD_SETSIZE vs select() issues (#125258)

* Mon Jun 21 2004 Joe Orton <jorton at redhat.com> 4.3.7-4
- pick up test failures again
- have -devel require php of same release

* Thu Jun 17 2004 Joe Orton <jorton at redhat.com> 4.3.7-3
- add gmp_powm fix (Oskari Saarenmaa, #124318)
- split mbstring, ncurses, gd, openssl extns into subpackages
- fix memory leak in apache2handler; use ap_r{write,flush}
  rather than brigade interfaces

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Jun  3 2004 Joe Orton <jorton at redhat.com> 4.3.7-1
- update to 4.3.7
- have -pear subpackage require php of same VR

* Wed May 26 2004 Joe Orton <jorton at redhat.com> 4.3.6-6
- buildrequire smtpdaemon (#124430)
- try switching to system libgd again (prevent symbol conflicts
  when e.g. mod_perl loads the system libgd library.)

* Wed May 19 2004 Joe Orton <jorton at redhat.com> 4.3.6-5
- don't obsolete php-imap (#123580)
- unconditionally build -imap subpackage

* Thu May 13 2004 Joe Orton <jorton at redhat.com> 4.3.6-4
- remove trigger

* Thu Apr 22 2004 Joe Orton <jorton at redhat.com> 4.3.6-3
- fix umask reset "feature" (#121454)
- don't use DL_GLOBAL when dlopen'ing extension modules

* Sun Apr 18 2004 Joe Orton <jorton at redhat.com> 4.3.6-2
- fix segfault on httpd SIGHUP (upstream #27810)

* Fri Apr 16 2004 Joe Orton <jorton at redhat.com> 4.3.6-1
- update to 4.3.6 (Robert Scheck, #121011)

* Wed Apr  7 2004 Joe Orton <jorton at redhat.com> 4.3.4-11
- add back imap subpackage, using libc-client (#115535)

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Feb 18 2004 Joe Orton <jorton at redhat.com> 4.3.4-10
- eliminate /usr/local/lib RPATH in odbc.so
- really use system pcre library

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com> 4.3.4-9
- rebuilt

* Mon Feb  2 2004 Bill Nottingham <notting at redhat.com> 4.3.4-8
- obsolete php-imap if we're not building it

* Wed Jan 28 2004 Joe Orton <jorton at redhat.com> 4.3.4-7
- gd fix for build with recent Freetype2 (from upstream)
- remove easter egg (Oden Eriksson, Mandrake)

* Wed Jan 21 2004 Joe Orton <jorton at redhat.com> 4.3.4-6
- php-pear requires php
- also remove extension=imap from php.ini in upgrade trigger
- merge from Taroon: allow upgrade from Stronghold 4.0

* Wed Jan 21 2004 Joe Orton <jorton at redhat.com> 4.3.4-5
- add defattr for php-pear subpackage
- restore defaults: output_buffering=Off, register_argc_argv=On
- add trigger to handle php.ini upgrades smoothly (#112470)

* Tue Jan 13 2004 Joe Orton <jorton at redhat.com> 4.3.4-4
- conditionalize support for imap extension for the time being
- switch /etc/php.ini to use php.ini-recommended (but leave
  variables_order as EGPCS) (#97765)
- set session.path to /var/lib/php/session by default (#89975)
- own /var/lib/php{,/session} and have apache own the latter
- split off php-pear subpackage (#83771)

* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org> 4.3.4-3
- rebuild against db-4.2.52.

* Mon Dec  1 2003 Joe Orton <jorton at redhat.com> 4.3.4-2
- rebuild for new libxslt (#110658) 
- use --with-{mssql,oci8} for enabling extensions (#110482)
- fix rebuild issues (Jan Visser, #110274)
- remove hard-coded LIBS
- conditional support for mhash (Aleksander Adamowski, #111251)

* Mon Nov 10 2003 Joe Orton <jorton at redhat.com> 4.3.4-1.1
- rebuild for FC1 updates

* Mon Nov 10 2003 Joe Orton <jorton at redhat.com> 4.3.4-1
- update to 4.3.4
- include all licence files
- libxmlrpc fixes

* Mon Oct 20 2003 Joe Orton <jorton at redhat.com> 4.3.3-6
- use bundled libgd (#107407)
- remove manual: up-to-date manual sources are no longer DFSG-free;
  it's too big; it's on the web anyway; #91292, #105804, #107384

* Wed Oct 15 2003 Joe Orton <jorton at redhat.com> 4.3.3-5
- add php-xmlrpc subpackage (#107138)

* Mon Oct 13 2003 Joe Orton <jorton at redhat.com> 4.3.3-4
- drop recode support, symbols collide with MySQL

* Sun Oct 12 2003 Joe Orton <jorton at redhat.com> 4.3.3-3
- split domxml extension into php-domxml subpackage
- enable xslt and xml support in domxml extension (#106042)
- fix httpd-devel build requirement (#104341)
- enable recode extension (#106755)
- add workaround for #103982

* Thu Sep 25 2003 Jeff Johnson <jbj at jbj.org> 4.3.3-3
- rebuild against db-4.2.42.

* Sun Sep  7 2003 Joe Orton <jorton at redhat.com> 4.3.3-2
- don't use --enable-versioning, it depends on libtool being
 broken (#103690)

* Sun Sep  7 2003 Joe Orton <jorton at redhat.com> 4.3.3-1
- update to 4.3.3
- add libtool build prereq (#103388)
- switch to apache2handler

* Mon Jul 28 2003 Joe Orton <jorton at redhat.com> 4.3.2-8
- rebuild

* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 4.3.2-7
- rebuild

* Tue Jul  8 2003 Joe Orton <jorton at redhat.com> 4.3.2-6
- use system pcre library

* Mon Jun  9 2003 Joe Orton <jorton at redhat.com> 4.3.2-5
- enable mbstring and mbregex (#81336)
- fix use of libtool 1.5

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jun  3 2003 Joe Orton <jorton at redhat.com> 4.3.2-3
- add lib64 and domxml fixes

* Tue Jun  3 2003 Frank Dauer <f at paf.net>
- added conditional support for mssql module (#92149)

* Fri May 30 2003 Joe Orton <jorton at redhat.com> 4.3.2-2
- update the -tests and -lib64 patches
- fixes for db4 detection
- require aspell-devel >= 0.50.0 for pspell compatibility

* Thu May 29 2003 Joe Orton <jorton at redhat.com> 4.3.2-1
- update to 4.3.2

* Fri May 16 2003 Joe Orton <jorton at redhat.com> 4.3.1-3
- link odbc module correctly
- patch so that php -n doesn't scan inidir
- run tests using php -n, avoid loading system modules

* Wed May 14 2003 Joe Orton <jorton at redhat.com> 4.3.1-2
- workaround broken parser produced by bison-1.875

* Tue May  6 2003 Joe Orton <jorton at redhat.com> 4.3.1-1
- update to 4.3.1; run test suite
- open extension modules with RTLD_NOW rather than _LAZY



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- php.spec	9 Jun 2006 09:20:52 -0000	1.114
+++ php.spec	9 Jun 2006 14:11:33 -0000	1.115
@@ -5,7 +5,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.4
-Release: 7
+Release: 8
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -66,6 +66,7 @@
 Summary: Command-line interface for PHP
 Requires: php-common = %{version}-%{release}
 Provides: php-cgi = %{version}-%{release}
+Provides: php-pcntl
 
 %description cli
 The php-cli package contains the command-line interface 
@@ -78,7 +79,7 @@
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
-Provides: php-mime_magic, php-openssl, php-pcntl, php-pcre, php-pspell
+Provides: php-mime_magic, php-openssl, php-pcre, php-posix, php-pspell
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
 Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
 Provides: php-wddx, php-zlib
@@ -563,6 +564,7 @@
 %{contentdir}/icons/php.gif
 
 %files common
+%defattr(-,root,root)
 %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
 %doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
 %config %{_sysconfdir}/php.ini
@@ -573,6 +575,7 @@
 %dir %{_libdir}/php/pear
 
 %files cli
+%defattr(-,root,root)
 %{_bindir}/php
 %{_bindir}/php-cgi
 %{_mandir}/man?/*
@@ -601,6 +604,11 @@
 %files pdo -f files.pdo
 
 %changelog
+* Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-8
+- Provide php-posix (#194583)
+- only provide php-pcntl from -cli subpackage
+- add missing defattr's (thanks to Matthias Saou)
+
 * Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-7
 - move Obsoletes for php-openssl to -common (#194501)
 - Provide: php-cgi from -cli subpackage



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:12:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:12:20 -0400
Subject: rpms/beagle/devel beagle.spec,1.54,1.55
Message-ID: <200606091412.k59ECK8G023207@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23166

Modified Files:
	beagle.spec 
Log Message:
- buildrequire gettext




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- beagle.spec	9 Jun 2006 13:25:20 -0000	1.54
+++ beagle.spec	9 Jun 2006 14:12:18 -0000	1.55
@@ -24,6 +24,7 @@
 BuildRequires:	pygtk2-devel
 BuildRequires:	python-devel
 BuildRequires:	libXt-devel
+BuildRequires:	gettext
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
@@ -206,6 +207,7 @@
 %changelog
 * Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.2.6-5
 - Disable on s390* as mono doesn't build on s390 atm
+- buildrequire gettext
 
 * Thu May 25 2006 Nalin Dahyabhai <nalin at redhat.com> - 0.2.6-4
 - rebuild



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:22:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:22:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2255.2.1,1.2255.2.2
Message-ID: <200606091422.k59EMQUt009141@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9024

Modified Files:
      Tag: private-lspp-35-branch
	kernel-2.6.spec 
Log Message:
lspp.36 kernel



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2255.2.1
retrieving revision 1.2255.2.2
diff -u -r1.2255.2.1 -r1.2255.2.2
--- kernel-2.6.spec	8 Jun 2006 21:19:24 -0000	1.2255.2.1
+++ kernel-2.6.spec	9 Jun 2006 14:22:24 -0000	1.2255.2.2
@@ -26,7 +26,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  .lspp.35
+%define rhbsys  .lspp.36
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
 %define signmodules 0
 %define xen_version 20060602
@@ -1142,7 +1142,7 @@
 # Audit patches
 %patch20100 -p1
 %patch20101 -p1
-#%patch20102 -p1
+%patch20102 -p1
 %patch20103 -p1
 
 
@@ -1823,6 +1823,9 @@
 %endif
 
 %changelog
+* Fri Jun  9 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.36, add netlabel patch
+
 * Thu Jun  8 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.35
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:25:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:25:10 -0400
Subject: rpms/ImageMagick/devel ImageMagick-6.2.8-multilib.patch, NONE,
	1.1 ImageMagick.spec, 1.62, 1.63
Message-ID: <200606091425.k59EPAHp010242@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10159

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.8-multilib.patch 
Log Message:
work on 6.2.8


ImageMagick-6.2.8-multilib.patch:
 magick/Magick-config.in |   16 ++++++++--------
 wand/Wand-config.in     |   16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE ImageMagick-6.2.8-multilib.patch ---
--- ImageMagick-6.2.8/magick/Magick-config.in.multilib	2006-05-26 21:58:55.000000000 -0400
+++ ImageMagick-6.2.8/magick/Magick-config.in	2006-06-09 10:12:09.000000000 -0400
@@ -15,28 +15,28 @@
 while test $# -gt 0; do
   case $1 in
     --prefix)
-      echo @PREFIX_DIR@
+      pkg-config --variable prefix ImageMagick
       ;;
     --exec-prefix)
-      echo @EXEC_PREFIX_DIR@
+      pkg-config --variable exec_prefix ImageMagick
       ;;
     --version)
-      echo @PACKAGE_VERSION@
+      pkg-config --modversion ImageMagick
       ;;
     --cflags)
-      echo '@MAGICK_CFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs ImageMagick
       ;;
     --libs)
-      echo '@MAGICK_LIBS@ -lWand -lMagick'
+      pkg-config --libs ImageMagick
       ;;
     *)
       echo "${usage}" 1>&2
--- ImageMagick-6.2.8/wand/Wand-config.in.multilib	2006-05-26 21:58:55.000000000 -0400
+++ ImageMagick-6.2.8/wand/Wand-config.in	2006-06-09 10:16:55.000000000 -0400
@@ -15,28 +15,28 @@
 while test $# -gt 0; do
   case $1 in
     --prefix)
-      echo @PREFIX_DIR@
+      pkg-config --variable prefix Wand
       ;;
     --exec-prefix)
-      echo @EXEC_PREFIX_DIR@
+      pkg-config --variable exec_prefix Wand
       ;;
     --version)
-      echo @PACKAGE_VERSION@
+      pkg-config --modversion Wand
       ;;
     --cflags)
-      echo '@MAGICK_CFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs Wand
       ;;
     --libs)
-      echo '@MAGICK_LIBS@ -lWand -lMagick'
+      pkg-config --libs Wand
       ;;
     *)
       echo "${usage}" 1>&2


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ImageMagick.spec	9 Jun 2006 13:29:49 -0000	1.62
+++ ImageMagick.spec	9 Jun 2006 14:25:08 -0000	1.63
@@ -21,7 +21,7 @@
 Patch1: ImageMagick-6.2.1-local_doc.patch
 Patch2: ImageMagick-6.2.5-format-string-again.patch
 Patch3: ImageMagick-6.2.5-yet-another-overflow.patch
-Patch4: ImageMagick-6.2.5-multilib.patch
+Patch4: ImageMagick-6.2.8-multilib.patch
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -116,8 +116,8 @@
 %prep
 %setup -q -n %{name}-%{VER}
 %patch1 -p1 -b .local_doc
-%patch2 -p1 -b .format-string-again
-%patch3 -p1 -b .yet-another-overflow
+#%patch2 -p1 -b .format-string-again
+#%patch3 -p1 -b .yet-another-overflow
 %patch4 -p1 -b .multilib
 
 %build



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:32:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:32:03 -0400
Subject: rpms/netatalk/devel netatalk.spec,1.26,1.27
Message-ID: <200606091432.k59EW3gO012303@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12290

Modified Files:
	netatalk.spec 
Log Message:
rebuild for libgssapi deps and brew build


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- netatalk.spec	11 Feb 2006 04:43:48 -0000	1.26
+++ netatalk.spec	9 Jun 2006 14:32:01 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 4.2.1
+Release: 6.fc6
 Epoch:   4
 License: GPL
 Group: 	 System Environment/Daemons
@@ -179,6 +179,9 @@
 %{_libdir}/atalk/*.la
 
 %changelog
+* Fri Jun 09 2006 Jason Vas Dias <jvdias at redhat.com> - 4:2.0.3-6.fc6
+- rebuild for broken libgssapi deps and brew build
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:2.0.3-4.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:38:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:38:55 -0400
Subject: rpms/libIDL/devel libIDL.spec,1.21,1.22
Message-ID: <200606091438.k59Ect3l013104@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13075

Modified Files:
	libIDL.spec 
Log Message:
Fix build reqs



Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libIDL.spec	9 Jun 2006 13:11:10 -0000	1.21
+++ libIDL.spec	9 Jun 2006 14:38:52 -0000	1.22
@@ -10,7 +10,7 @@
 BuildRequires: pkgconfig >= 0.8
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: automake14 libtool autoconf
-BuildRequires: flex
+BuildRequires: flex bison
 
 %description
 libIDL is a library for parsing IDL (Interface Definition Language). 
@@ -77,7 +77,7 @@
 
 %changelog
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-5
-- Rebuild
+- Fix missing BuildRequires
 
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-4
 - Fix missing BuildRequires



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:43:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:43:48 -0400
Subject: rpms/kdepim/FC-5 .cvsignore, 1.30, 1.31 kdepim.spec, 1.83,
	1.84 sources, 1.34, 1.35 kdepim-3.5.2-avscripts-typo.patch,
	1.1, NONE kdepim-3.5.2-crash-bz190491.patch, 1.1,
	NONE kdepim-3.5.2-crash-kde#125723.patch, 1.2,
	NONE kdepim-3.5.2-crash-proko2.patch, 1.1,
	NONE kdepim-3.5.2-crashes.patch, 1.1,
	NONE kdepim-3.5.2-kmail-crash-#126571.patch, 1.1,
	NONE kdepim-3.5.2-kmail-encoding.patch, 1.1, NONE
Message-ID: <200606091443.k59Ehmsc014583@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14508

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-3.5.2-avscripts-typo.patch 
	kdepim-3.5.2-crash-bz190491.patch 
	kdepim-3.5.2-crash-kde#125723.patch 
	kdepim-3.5.2-crash-proko2.patch kdepim-3.5.2-crashes.patch 
	kdepim-3.5.2-kmail-crash-#126571.patch 
	kdepim-3.5.2-kmail-encoding.patch 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	2 Feb 2006 17:28:58 -0000	1.30
+++ .cvsignore	9 Jun 2006 14:43:45 -0000	1.31
@@ -9,3 +9,4 @@
 kdepim-3.4.92.tar.bz2
 kdepim-3.5.0.tar.bz2
 kdepim-3.5.1.tar.bz2
+kdepim-3.5.3.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdepim.spec	8 May 2006 14:18:30 -0000	1.83
+++ kdepim.spec	9 Jun 2006 14:43:45 -0000	1.84
@@ -3,15 +3,15 @@
 
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define qt_version 1:3.3.5
-%define arts_version 8:1.5.2
+%define qt_version 1:3.3.6
+%define arts_version 8:1.5.3
 %define arts 1
-%define make_cvs 1
+%define make_cvs 0
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
-Release: 0.4.fc5
+Version: 3.5.3
+Release: 0.1.fc5
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Prefix: /usr
@@ -31,15 +31,6 @@
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
 
-# upstream patches
-Patch100: kdepim-3.5.2-crash-bz190491.patch
-Patch101: kdepim-3.5.2-crash-proko2.patch
-Patch102: kdepim-3.5.2-crash-kde#125723.patch
-Patch103: kdepim-3.5.2-kmail-encoding.patch
-Patch104: kdepim-3.5.2-kmail-crash-#126571.patch
-Patch105: kdepim-3.5.2-avscripts-typo.patch
-Patch106: kdepim-3.5.2-crashes.patch
-
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 
@@ -59,7 +50,7 @@
 BuildRequires: pilot-link-devel >= 0.11
 %endif
 %if %{make_cvs}
-BuildRequires: autoconf automake
+BuildRequires: autoconf automake libtool
 %endif
 
 %description
@@ -121,15 +112,6 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
-# upstream patches
-%patch100 -p1 -b .crash-bz#190491
-%patch101 -p1 -b .proko2
-%patch102 -p1 -b .crash-kde#125723
-%patch103 -p1 -b .kmail-encoding
-%patch104 -p1 -b .kmail-crash-#126571
-%patch105 -p1 -b .avscripts-typo
-%patch106 -p1 -b .crashes
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 FLAGS="%{optflags}"
@@ -227,6 +209,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Mon May 08 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.4.fc5 
 - apply upstream patch which fixes several crashes in kdepim
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	31 Mar 2006 09:24:35 -0000	1.34
+++ sources	9 Jun 2006 14:43:45 -0000	1.35
@@ -1 +1 @@
-ac6b3b503e27a65a7b883c1e0a57262e  kdepim-3.5.2.tar.bz2
+2b83885854a5953bca59508d9a7cf5ef  kdepim-3.5.3.tar.bz2


--- kdepim-3.5.2-avscripts-typo.patch DELETED ---


--- kdepim-3.5.2-crash-bz190491.patch DELETED ---


--- kdepim-3.5.2-crash-kde#125723.patch DELETED ---


--- kdepim-3.5.2-crash-proko2.patch DELETED ---


--- kdepim-3.5.2-crashes.patch DELETED ---


--- kdepim-3.5.2-kmail-crash-#126571.patch DELETED ---


--- kdepim-3.5.2-kmail-encoding.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:46:01 -0400
Subject: rpms/python/devel pydoc,1.1,1.2
Message-ID: <200606091446.k59Ek1Tt017325@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17001

Modified Files:
	pydoc 
Log Message:
Updated to match what ubuntu has


Index: pydoc
===================================================================
RCS file: /cvs/dist/rpms/python/devel/pydoc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pydoc	8 Jun 2006 13:59:13 -0000	1.1
+++ pydoc	9 Jun 2006 14:45:59 -0000	1.2
@@ -3,5 +3,5 @@
 # Wrapper script around pydoc.cli()
 
 import pydoc
-
-pydoc.cli()
+if __name__ == '__main__':
+    pydoc.cli()



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:46:43 -0400
Subject: rpms/libgnomecanvas/devel libgnomecanvas.spec,1.31,1.32
Message-ID: <200606091446.k59EkhKH023885@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecanvas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22982

Modified Files:
	libgnomecanvas.spec 
Log Message:
fix build reqs



Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgnomecanvas.spec	6 Jun 2006 03:21:49 -0000	1.31
+++ libgnomecanvas.spec	9 Jun 2006 14:46:41 -0000	1.32
@@ -8,7 +8,7 @@
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
 Version: 2.14.0
-Release: 3
+Release: 4
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -18,7 +18,7 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version}
 BuildRequires: libglade2-devel >= %{libglade2_version}
-BuildRequires: libtool
+BuildRequires: libtool gettext
 
 %description
 The canvas widget allows you to create custom displays using stock items 
@@ -86,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-4
+- Add missing BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 14:58:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 10:58:04 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.5, 1.6 libdhcp.spec, 1.20,
	1.21 sources, 1.16, 1.17
Message-ID: <200606091458.k59Ew4gx002180@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2153

Modified Files:
	.cvsignore libdhcp.spec sources 
Log Message:
fix dhcp_nic() logging configuration


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jun 2006 01:15:28 -0000	1.5
+++ .cvsignore	9 Jun 2006 14:58:02 -0000	1.6
@@ -2,3 +2,4 @@
 libdhcp-1.1.tar.gz
 libdhcp-1.2.tar.gz
 libdhcp-1.3.tar.gz
+libdhcp-1.4.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libdhcp.spec	9 Jun 2006 01:15:28 -0000	1.20
+++ libdhcp.spec	9 Jun 2006 14:58:02 -0000	1.21
@@ -1,6 +1,6 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.3
+Version: 	1.4
 Release: 	1
 License: 	GPL
 Group: 		Development/Libraries


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Jun 2006 01:15:28 -0000	1.16
+++ sources	9 Jun 2006 14:58:02 -0000	1.17
@@ -1 +1 @@
-c3477f65c93fcf1861f9f84a6cdd8443  libdhcp-1.3.tar.gz
+0ee140271ea6efdf6b908891df4bcedf  libdhcp-1.4.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun  9 15:23:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 11:23:56 -0400
Subject: rpms/kdepim/FC-5 kdepim-3.5.3-kmail-127538.patch, NONE,
	1.1 kdepim-3.5.3-kmail-encryption.patch, NONE,
	1.1 kdepim-3.5.3-kmail-typo.patch, NONE,
	1.1 kdepim-3.5.3-korganizer.patch, NONE, 1.1 kdepim.spec, 1.84, 1.85
Message-ID: <200606091523.k59FNuJg022706@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22412

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.3-kmail-127538.patch 
	kdepim-3.5.3-kmail-encryption.patch 
	kdepim-3.5.3-kmail-typo.patch kdepim-3.5.3-korganizer.patch 
Log Message:
add some upstream patches


kdepim-3.5.3-kmail-127538.patch:
 kmcomposewin.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdepim-3.5.3-kmail-127538.patch ---
--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig	2006-06-09 17:01:50.000000000 +0200
+++ kdepim-3.5.3/kmail/kmcomposewin.cpp	2006-06-09 17:20:20.000000000 +0200
@@ -667,6 +667,8 @@
 
   KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
   saveMainWindowSettings( KMKernel::config(), "Composer" );
+  // make sure config changes are written to disk, cf. bug 127538
+  GlobalSettings::self()->writeConfig();
 }
 
 //-----------------------------------------------------------------------------

kdepim-3.5.3-kmail-encryption.patch:
 partmetadata.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.3-kmail-encryption.patch ---
--- kdepim-3.5.3/kmail/partmetadata.h.orig	2006-06-09 17:08:26.000000000 +0200
+++ kdepim-3.5.3/kmail/partmetadata.h	2006-06-09 17:08:32.000000000 +0200
@@ -35,7 +35,12 @@
         isEncrypted( false ),
         isDecryptable( false ),
         technicalProblem( false ),
-        isEncapsulatedRfc822Message( false ) {}
+        isEncapsulatedRfc822Message( false )
+    {
+      creationTime.tm_year = 0;
+      creationTime.tm_mon  = 1;
+      creationTime.tm_mday = 1;
+    }
     bool isSigned;
     bool isGoodSignature;
     CryptPlugWrapper::SigStatusFlags sigStatusFlags;

kdepim-3.5.3-kmail-typo.patch:
 kmcomposewin.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.3-kmail-typo.patch ---
--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig	2006-06-09 17:01:50.000000000 +0200
+++ kdepim-3.5.3/kmail/kmcomposewin.cpp	2006-05-22 20:10:53.000000000 +0200
@@ -4021,7 +4021,7 @@
   }
 
   // Squeeze tabs and spaces
-  QRegExp squeeze( "[\t ]+" );
+  QRegExp squeeze( "[\t, ]+" );
   s.replace( squeeze, QChar( ' ' ) );
 
   // Remove trailing whitespace

kdepim-3.5.3-korganizer.patch:
 kogroupware.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.3-korganizer.patch ---
--- kdepim-3.5.3/korganizer/kogroupware.cpp.orig	2006-06-09 16:48:47.000000000 +0200
+++ kdepim-3.5.3/korganizer/kogroupware.cpp	2006-06-09 16:54:47.000000000 +0200
@@ -263,7 +263,7 @@
             "with the organizers calendar. Do you really want "
             "to edit it?" );
       rc = KMessageBox::warningYesNo( parent, txt );
-      return ( rc == KMessageBox::Continue );
+      return ( rc == KMessageBox::Yes );
     }
   } else {
     kdWarning(5850) << "Groupware messages for Journals are not implemented yet!" << endl;


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdepim.spec	9 Jun 2006 14:43:45 -0000	1.84
+++ kdepim.spec	9 Jun 2006 15:23:53 -0000	1.85
@@ -31,6 +31,12 @@
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
 
+# upstream patches
+Patch100: kdepim-3.5.3-korganizer.patch
+Patch101: kdepim-3.5.3-kmail-typo.patch
+Patch102: kdepim-3.5.3-kmail-encryption.patch
+Patch103: kdepim-3.5.3-kmail-127538.patch
+
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 
@@ -112,6 +118,12 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
+# upstream patches
+%patch100 -p1 -b .korganizer-kogroupware
+%patch101 -p1 -b .kmail-typo
+%patch102 -p1 -b .kmail-encryption
+%patch103 -p1 -b .kmail-127538.patch
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 FLAGS="%{optflags}"



From fedora-cvs-commits at redhat.com  Fri Jun  9 15:24:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 11:24:18 -0400
Subject: rpms/gnome-backgrounds/devel gnome-backgrounds.spec,1.5,1.6
Message-ID: <200606091524.k59FOIfu022891@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22452

Modified Files:
	gnome-backgrounds.spec 
Log Message:
Fix BuildRequires



Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-backgrounds.spec	1 Jun 2006 05:32:16 -0000	1.5
+++ gnome-backgrounds.spec	9 Jun 2006 15:24:16 -0000	1.6
@@ -3,13 +3,14 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
 Version: 2.14.2.1
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArchitectures: noarch
+BuildArch: noarch
+BuildRequires: gettext
 
 Patch0: gnome-backgrounds-2.14.0-paths.patch
 
@@ -49,6 +50,9 @@
 %{_datadir}/backgrounds
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-3
+- Add missing BuildRequires
+
 * Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-2
 - Update to 2.14.2.1
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 15:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 11:27:33 -0400
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.63,1.64
Message-ID: <200606091527.k59FRXEk024291@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24229

Modified Files:
	ImageMagick.spec 
Log Message:
6.2.8



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ImageMagick.spec	9 Jun 2006 14:25:08 -0000	1.63
+++ ImageMagick.spec	9 Jun 2006 15:27:31 -0000	1.64
@@ -19,9 +19,7 @@
 %endif
 Source1: magick_small.png
 Patch1: ImageMagick-6.2.1-local_doc.patch
-Patch2: ImageMagick-6.2.5-format-string-again.patch
-Patch3: ImageMagick-6.2.5-yet-another-overflow.patch
-Patch4: ImageMagick-6.2.8-multilib.patch
+Patch2: ImageMagick-6.2.8-multilib.patch
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -116,9 +114,7 @@
 %prep
 %setup -q -n %{name}-%{VER}
 %patch1 -p1 -b .local_doc
-#%patch2 -p1 -b .format-string-again
-#%patch3 -p1 -b .yet-another-overflow
-%patch4 -p1 -b .multilib
+%patch2 -p1 -b .multilib
 
 %build
 %configure --enable-shared \



From fedora-cvs-commits at redhat.com  Fri Jun  9 15:53:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 11:53:25 -0400
Subject: rpms/kdepim/FC-5 kdepim.spec,1.85,1.86
Message-ID: <200606091553.k59FrPNt020643@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20622

Modified Files:
	kdepim.spec 
Log Message:
typo fix



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdepim.spec	9 Jun 2006 15:23:53 -0000	1.85
+++ kdepim.spec	9 Jun 2006 15:53:22 -0000	1.86
@@ -3,7 +3,7 @@
 
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define qt_version 1:3.3.6
+%define qt_version 1:3.3.5
 %define arts_version 8:1.5.3
 %define arts 1
 %define make_cvs 0



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:06:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:06:44 -0400
Subject: rpms/amanda/devel amanda-2.5.0-amcheck_badtape.patch, NONE,
	1.1 amanda-2.5.0p2-big_holding_disk.patch, NONE,
	1.1 amanda-2.5.0p2-error_msg.patch, NONE,
	1.1 amanda-2.5.0p2-restore.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 amanda.spec, 1.30, 1.31 sources, 1.11,
	1.12 amanda-2.5.0-overflow.patch, 1.1, NONE
Message-ID: <200606091606.k59G6iCv020950@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20934

Modified Files:
	.cvsignore amanda.spec sources 
Added Files:
	amanda-2.5.0-amcheck_badtape.patch 
	amanda-2.5.0p2-big_holding_disk.patch 
	amanda-2.5.0p2-error_msg.patch amanda-2.5.0p2-restore.patch 
Removed Files:
	amanda-2.5.0-overflow.patch 
Log Message:
+- New upstream version
+- Make the BuildRequires on /usr/bin/Mail rather than mailx, because we
+  don't really care where the Mail command comes from.
+- include the amcheck_badtape patch by Paul Bijnens
+  <paul.bijnens at xplanation.com> to fix a problem where amcheck doesn't
+  realize the wrong tape is in the drive.
+- include the error_msg patch from Jean-Louis Martineau <martineau at zmanda.com>
+  to fix a double-free problem
+- include the restore patch from Jean-Louis Martineau <martineau at zmanda.com>
+  to fix an error in amrestore
+- include a slightly modified form of the big_holding_disk patch from
+  Andrej Filipcic <andrej.filipcic at ijs.si> to fix a problem with holding
+  disks bigger than 4tb



amanda-2.5.0-amcheck_badtape.patch:
 amcheck.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE amanda-2.5.0-amcheck_badtape.patch ---
--- amanda-2.5.0/server-src/amcheck.c_ORIG	2006-05-04 23:29:26.000000000 +0200
+++ amanda-2.5.0/server-src/amcheck.c	2006-05-08 11:43:32.000000000 +0200
@@ -855,10 +855,11 @@
         if (tape_status < 0) {
 	    tape_t *exptape = lookup_last_reusable_tape(0);
 	    fprintf(outf, "       (expecting ");
 	    if(exptape != NULL) fprintf(outf, "tape %s or ", exptape->label);
 	    fprintf(outf, "a new tape)\n");
+	    tapebad = 1;
 	} else {
             if (overwrite) {
                 char *wrlabel_status;
                 wrlabel_status = tape_wrlabel(tapename, "X", label,
                                               tp->blocksize * 1024);

amanda-2.5.0p2-big_holding_disk.patch:
 statfs.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amanda-2.5.0p2-big_holding_disk.patch ---
--- amanda-2.5.0p2/common-src/statfs.c.big_holding_disk	2006-03-28 16:09:51.000000000 -0500
+++ amanda-2.5.0p2/common-src/statfs.c	2006-06-09 11:45:06.000000000 -0400
@@ -127,7 +127,7 @@
 # endif
 #endif
 
-#define scale(r,s)	( (r) == -1? -1 : (int)((r)*(double)(s)/1024.0) )
+#define scale(r,s)	( (r) == -1? -1 : (long long)((r)*(double)(s)/1024.0) )
 
 int get_fs_stats(dir, sp)
 char *dir;

amanda-2.5.0p2-error_msg.patch:
 amcheck.c |    8 +++++---
 taper.c   |    3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE amanda-2.5.0p2-error_msg.patch ---
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.0p2.orig/server-src/amcheck.c amanda-2.5.0p2.new/server-src/amcheck.c
--- amanda-2.5.0p2.orig/server-src/amcheck.c	2006-05-12 15:26:12.000000000 -0400
+++ amanda-2.5.0p2.new/server-src/amcheck.c	2006-05-24 08:29:04.000000000 -0400
@@ -810,7 +810,7 @@ int start_server_check(fd, do_localchk, 
 
     if (testtape) {
 	/* check that the tape is a valid amanda tape */
-        char *error_msg;
+        char *error_msg = NULL;
         int tape_status;
 
 	tapedays = getconf_int(CNF_TAPECYCLE);
@@ -824,8 +824,10 @@ int start_server_check(fd, do_localchk, 
 
         tape_status = taper_scan(NULL, &label, &datestamp, &error_msg,
                                  &tapename);
-        fprintf(outf, "%s\n", error_msg);
-        amfree(error_msg);
+	if(error_msg) {
+            fprintf(outf, "%s\n", error_msg);
+            amfree(error_msg);
+	}
         if (tape_status < 0) {
 	    tape_t *exptape = lookup_last_reusable_tape(0);
 	    fprintf(outf, "       (expecting ");
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.0p2.orig/server-src/taper.c amanda-2.5.0p2.new/server-src/taper.c
--- amanda-2.5.0p2.orig/server-src/taper.c	2006-05-04 17:31:15.000000000 -0400
+++ amanda-2.5.0p2.new/server-src/taper.c	2006-05-24 08:33:31.000000000 -0400
@@ -2331,7 +2331,7 @@ int label_tape()
     char *result;
     static int first_call = 1;
     char *timestamp;
-    char *error_msg;
+    char *error_msg = NULL;
     char *s, *r;
     int slot = -1;
 
@@ -2348,6 +2348,7 @@ int label_tape()
 	if(r) {
 	    slot = atoi(r);
 	}
+	amfree(error_msg);
     }
     if((tape_fd = tape_open(tapedev, O_WRONLY)) == -1) {
 	if(errno == EACCES) {

amanda-2.5.0p2-restore.patch:
 common-src/fileheader.c    |    6 +++
 restore-src/.restore.c.swp |only
 restore-src/amrestore.c    |    5 +--
 restore-src/restore.c      |   73 ++++++++++++++++++++++++---------------------
 restore-src/restore.h      |    4 +-
 restore-src/restore1.c     |only
 6 files changed, 49 insertions(+), 39 deletions(-)

--- NEW FILE amanda-2.5.0p2-restore.patch ---
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.1b1.orig/common-src/fileheader.c amanda-2.5.1b1.new.restore/common-src/fileheader.c
--- amanda-2.5.1b1.orig/common-src/fileheader.c	2006-03-09 11:51:41.000000000 -0500
+++ amanda-2.5.1b1.new.restore/common-src/fileheader.c	2006-05-23 09:21:18.000000000 -0400
@@ -262,6 +262,12 @@ parse_file_header(buffer, file, buflen)
 	    amfree(line1);
 	    return;
 	}
+	tok = strtok(NULL, " ");
+	if (tok == NULL) {
+	    amfree(buf);
+	    amfree(line1);
+	    return;
+	}
 	strncpy(file->datestamp, tok, sizeof(file->datestamp) - 1);
 	break;
 
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.1b1.orig/restore-src/amrestore.c amanda-2.5.1b1.new.restore/restore-src/amrestore.c
--- amanda-2.5.1b1.orig/restore-src/amrestore.c	2006-04-07 06:53:51.000000000 -0400
+++ amanda-2.5.1b1.new.restore/restore-src/amrestore.c	2006-05-23 13:44:06.000000000 -0400
@@ -286,7 +286,7 @@ char **argv;
 	error("could not open %s: %s", tapename, strerror(errno));
     }
 
-    read_file_header(&file, tapedev, isafile, rst_flags);
+    read_result = read_file_header(&file, tapedev, isafile, rst_flags);
 
     if(file.type != F_TAPESTART && !isafile && filefsf == -1) {
 	fprintf(stderr, "%s: WARNING: not at start of tape, file numbers will be offset\n",
@@ -294,7 +294,6 @@ char **argv;
     }
 
     count_error=0;
-    read_result = 0;
     while(count_error < 10) {
 	if(file.type == F_TAPEEND) break;
 	found_match = 0;
@@ -363,7 +362,7 @@ char **argv;
 	    count_error=0;
 	}
 	file_number++;
-	read_file_header(&file, tapedev, isafile, rst_flags);
+	read_result = read_file_header(&file, tapedev, isafile, rst_flags);
     }
     if(isafile) {
 	close(tapedev);
Only in amanda-2.5.1b1.new.restore/restore-src: restore1.c
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.1b1.orig/restore-src/restore.c amanda-2.5.1b1.new.restore/restore-src/restore.c
--- amanda-2.5.1b1.orig/restore-src/restore.c	2006-05-12 19:13:11.000000000 -0400
+++ amanda-2.5.1b1.new.restore/restore-src/restore.c	2006-05-23 14:05:32.000000000 -0400
@@ -548,7 +548,7 @@ char *datestamp, *hostname, *diskname, *
 }
 
 
-void read_file_header(file, tapefd, isafile, flags)
+ssize_t read_file_header(file, tapefd, isafile, flags)
 dumpfile_t *file;
 int tapefd;
 int isafile;
@@ -584,6 +584,7 @@ rst_flags_t *flags;
 	parse_file_header(buffer, file, bytes_read);
     }
     amfree(buffer);
+    return bytes_read;
 }
 
 
@@ -1141,7 +1142,7 @@ am_feature_t *their_features;
     tapelist_t *desired_tape = NULL;
     struct sigaction act, oact;
     int newtape = 1;
-    ssize_t bytes_read = 0;
+    ssize_t read_result;
 
     struct seentapes{
 	struct seentapes *next;
@@ -1239,6 +1240,8 @@ am_feature_t *their_features;
 	int wrongtape = 0;
 	int isafile = 0;
 
+	read_result = 0;
+
 	/*
 	 * Deal with instances where we're being asked to restore from a file
 	 */
@@ -1251,7 +1254,7 @@ am_feature_t *their_features;
 	    }
 	    fprintf(stderr, "Reading %s to fd %d\n", desired_tape->label, tapefd);
 
-	    read_file_header(&file, tapefd, 1, flags);
+	    read_result = read_file_header(&file, tapefd, 1, flags);
 	    label = stralloc(desired_tape->label);
 	}
 	/*
@@ -1274,7 +1277,7 @@ am_feature_t *their_features;
 	    }
 
  	    if (!wrongtape) {
- 		read_file_header(&file, tapefd, 0, flags);
+ 		read_result = read_file_header(&file, tapefd, 0, flags);
  		if (file.type != F_TAPESTART) {
  		    fprintf(stderr, "Not an amanda tape\n");
  		    tapefd_close(tapefd);
@@ -1286,7 +1289,6 @@ am_feature_t *their_features;
  	    }
 	} else if(newtape) {
 	  wrongtape = 1; /* nothing loaded */
-	  bytes_read = -1;
 	}
 
 	/*
@@ -1453,7 +1455,7 @@ am_feature_t *their_features;
 		else {
 			filenum = fsf_by;
 		}
-		read_file_header(&file, tapefd, isafile, flags);
+		read_result = read_file_header(&file, tapefd, isafile, flags);
 	    }
 	}
 
@@ -1497,46 +1499,45 @@ am_feature_t *their_features;
 
 	    if(found_match){
 		char *filename = make_filename(&file);
+
 		fprintf(stderr, "%s: %3d: restoring ", get_pname(), filenum);
 		print_header(stderr, &file);
-		bytes_read = restore(&file, filename, tapefd, isafile, flags);
+		read_result = restore(&file, filename, tapefd, isafile, flags);
 		filenum ++;
 		amfree(filename);
 	    }
 
 	    /* advance to the next file, fast-forwarding where reasonable */
-	    if(bytes_read == 0 && !isafile) {
-		tapefd_close(tapefd);
-		if((tapefd = tape_open(cur_tapedev, 0)) < 0) {
-		    error("could not open %s: %s",
-		          cur_tapedev, strerror(errno));
+	    if(!isafile) {
+		if(read_result == 0) {
+		    tapefd_close(tapefd);
+		    if((tapefd = tape_open(cur_tapedev, 0)) < 0) {
+			error("could not open %s: %s",
+			      cur_tapedev, strerror(errno));
+		    }
 		}
-	    } else if(!isafile){
-		/* cheat and jump ahead to where we're going if we can */
-		if (!found_match && flags->fsf) {
-		    drain_file(tapefd, flags);
+		/* if the file is not what we're looking for fsf to next one */
+		else if (!found_match) {
+		    if(tapefd_fsf(tapefd, 1) < 0) {
+			error("could not fsf device %s: %s",
+			      cur_tapedev, strerror(errno));
+			/* NOTREACHED */
+		    }
 		    filenum ++;
-		} else if(tapefile_idx >= 0 && 
-			  tapefile_idx < desired_tape->numfiles &&
-			  flags->fsf){
+		}
+		else if(tapefile_idx >= 0 && 
+			tapefile_idx < desired_tape->numfiles &&
+			flags->fsf){
 		    int fsf_by = desired_tape->files[tapefile_idx] - filenum;
 		    if(fsf_by > 0){
 			if(tapefd_fsf(tapefd, fsf_by) < 0) {
-			    error("Could not fsf device %s by %d: %s", cur_tapedev, fsf_by,
-				  strerror(errno));
+			     error("Could not fsf device %s by %d: %s",
+				   cur_tapedev, fsf_by, strerror(errno));
 			}
-			else filenum = desired_tape->files[tapefile_idx];
-		    }
-		} else if (!found_match && flags->fsf) {
-		    /* ... or fsf by 1, whatever */
-		    if(tapefd_fsf(tapefd, 1) < 0) {
-			error("could not fsf device %s: %s",
-			      cur_tapedev, strerror(errno));
-		    } else {
-			filenum ++;
+			filenum = desired_tape->files[tapefile_idx];
 		    }
 		}
-	    }
+	    } /* !isafile */
 
 
 	    memcpy(&prev_rst_file, &file, sizeof(dumpfile_t));
@@ -1544,15 +1545,19 @@ am_feature_t *their_features;
 	      
 	    if(isafile)
                 break;
-            read_file_header(&file, tapefd, isafile, flags);
+
+            read_result = read_file_header(&file, tapefd, isafile, flags);
 
 	    /* only restore a single dump, if piping to stdout */
 	    if(!headers_equal(&prev_rst_file, &file, 1) &&
-	       flags->pipe_to_fd == fileno(stdout)) break;
+	       flags->pipe_to_fd == fileno(stdout) &&
+	       found_match)
+		break;
+
 	} /* while we keep seeing headers */
 
 	if(!isafile){
-	    if(bytes_read == 0) {
+	    if(read_result == 0) {
 		/* XXX is this dain-bramaged? */
 		aclose(tapefd);
 		if((tapefd = tape_open(cur_tapedev, 0)) < 0) {
Only in amanda-2.5.1b1.new.restore/restore-src: .restore.c.swp
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.1b1.orig/restore-src/restore.h amanda-2.5.1b1.new.restore/restore-src/restore.h
--- amanda-2.5.1b1.orig/restore-src/restore.h	2006-03-14 08:12:01.000000000 -0500
+++ amanda-2.5.1b1.new.restore/restore-src/restore.h	2006-05-23 13:48:18.000000000 -0400
@@ -70,8 +70,8 @@ typedef struct rst_flags_s {
 char *make_filename P((dumpfile_t *file));
 int disk_match P((dumpfile_t *file, char *datestamp,
 		    char *hostname, char *diskname, char *level));
-void read_file_header P((dumpfile_t *file, int tapefd, int isafile,
-			 rst_flags_t *flags));
+ssize_t read_file_header P((dumpfile_t *file, int tapefd, int isafile,
+			rst_flags_t *flags));
 ssize_t restore P((dumpfile_t *file, char *filename, int tapefd, int isafile,
 			rst_flags_t *flags));
 void flush_open_outputs P((int reassemble, dumpfile_t *only_file));


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Apr 2006 19:52:13 -0000	1.11
+++ .cvsignore	9 Jun 2006 16:06:40 -0000	1.12
@@ -1 +1 @@
-amanda-2.5.0.tar.gz
+amanda-2.5.0p2.tar.gz


Index: amanda.spec
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- amanda.spec	22 May 2006 22:18:07 -0000	1.30
+++ amanda.spec	9 Jun 2006 16:06:40 -0000	1.31
@@ -10,8 +10,8 @@
 
 Summary: A network-capable tape backup solution.
 Name: amanda
-Version: 2.5.0
-Release: 3
+Version: 2.5.0p2
+Release: 2
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -22,13 +22,16 @@
 Source8: amandahosts
 Patch0: amanda-2.4.2-bug18322.patch
 Patch1: amanda-2.5.0-pie.patch
-Patch2: amanda-2.5.0-overflow.patch
+Patch2: amanda-2.5.0-amcheck_badtape.patch
+Patch3: amanda-2.5.0p2-error_msg.patch
+Patch4: amanda-2.5.0p2-restore.patch
+Patch5: amanda-2.5.0p2-big_holding_disk.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
 Prereq: fileutils grep initscripts
-BuildRequires: dump gnuplot cups samba-client tar grep fileutils mailx
-BuildRequires: libtool automake autoconf gcc-c++ readline-devel
+BuildRequires: dump gnuplot cups samba-client tar grep fileutils
+BuildRequires: libtool automake autoconf gcc-c++ readline-devel /usr/bin/Mail
 Requires: tar /usr/bin/Mail
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -84,7 +87,11 @@
 %setup -q
 %patch0 -p1 -b .bug18322
 %patch1 -p1 -b .pie
-%patch2 -p1 -b .overflow
+%patch2 -p1 -b .amcheck_badtape
+%patch3 -p1 -b .error_msg
+%patch4 -p1 -b .restore
+%patch5 -p1 -b .big_holding_disk
+
 libtoolize --copy --force
 aclocal
 automake
@@ -341,6 +348,21 @@
 %{_libdir}/librestore.so
 
 %changelog
+* Thu Jun 8 2006 Jay Fenlason <fenlason at redhat.com> 2.5.0p2-2
+- New upstream version
+- Make the BuildRequires on /usr/bin/Mail rather than mailx, because we
+  don't really care where the Mail command comes from.
+- include the amcheck_badtape patch by Paul Bijnens
+  <paul.bijnens at xplanation.com> to fix a problem where amcheck doesn't
+  realize the wrong tape is in the drive.
+- include the error_msg patch from Jean-Louis Martineau <martineau at zmanda.com>
+  to fix a double-free problem
+- include the restore patch from Jean-Louis Martineau <martineau at zmanda.com>
+  to fix an error in amrestore
+- include a slightly modified form of the big_holding_disk patch from
+  Andrej Filipcic <andrej.filipcic at ijs.si> to fix a problem with holding
+  disks bigger than 4tb
+
 * Mon May 22 2006 Jesse Keating <jkeating at redhat.com> 2.5.0-3
 - Fix BuildReqs
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Apr 2006 19:52:13 -0000	1.11
+++ sources	9 Jun 2006 16:06:40 -0000	1.12
@@ -1 +1 @@
-a720dafd60ff215dd97aa3271d7e0051  amanda-2.5.0.tar.gz
+073828b8b5a5c377a08f8f19b5eccf85  amanda-2.5.0p2.tar.gz


--- amanda-2.5.0-overflow.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:32:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:32:51 -0400
Subject: rpms/kdemultimedia/FC-5 kdemultimedia-3.5.3-config.patch, NONE,
	1.1 .cvsignore, 1.33, 1.34 kdemultimedia.spec, 1.58,
	1.59 sources, 1.35, 1.36 kdemultimedia-3.4.0-config.patch, 1.1, NONE
Message-ID: <200606091632.k59GWp8L020994@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20954

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Added Files:
	kdemultimedia-3.5.3-config.patch 
Removed Files:
	kdemultimedia-3.4.0-config.patch 
Log Message:
update to 3.5.3


kdemultimedia-3.5.3-config.patch:
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdemultimedia-3.5.3-config.patch ---
--- kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am.config	2005-02-03 23:48:26.000000000 +0100
+++ kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am	2005-02-28 20:47:00.223979671 +0100
@@ -9,8 +9,8 @@
 
 noinst_LTLIBRARIES  = libworkman.la
 
-libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
+libworkman_la_LDFLAGS = $(all_libraries)
+libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTSC_LIBS) $(ARTS_LIBASOUND)
 
 libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
 database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	2 Feb 2006 21:30:13 -0000	1.33
+++ .cvsignore	9 Jun 2006 16:31:48 -0000	1.34
@@ -10,3 +10,4 @@
 kdemultimedia-3.5.0.tar.bz2
 kdemultimedia-3.5.0-patched.tar.bz2
 kdemultimedia-3.5.1-patched.tar.bz2
+kdemultimedia-3.5.3-patched.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/kdemultimedia.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdemultimedia.spec	4 Apr 2006 14:51:06 -0000	1.58
+++ kdemultimedia.spec	9 Jun 2006 16:32:04 -0000	1.59
@@ -27,7 +27,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Epoch: 6
 Name: kdemultimedia
@@ -39,7 +39,7 @@
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 Patch1: kde-libtool.patch
-Patch2: kdemultimedia-3.4.0-config.patch
+Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
 Prereq: /sbin/ldconfig
@@ -58,6 +58,13 @@
 BuildRequires: glib2-devel
 BuildRequires: libmng-devel
 BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: libtheora-devel
+%if %{make_cvs}
+BuildRequires: autoconf automake libtool
+%endif
+%if %{build_mpeglib}
+BuildRequires: libXxf86dga-devel
+%endif
 %if %{alsa}
 BuildRequires: alsa-lib-devel >= 1.0.2
 %endif
@@ -113,7 +120,7 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+FLAGS="%{optflags}"
 export KDEDIR=%{prefix}
 export PATH=%{prefix}/bin:$PATH
 export CFLAGS="$FLAGS"
@@ -166,27 +173,27 @@
 make $SMP_MFLAGS -C kaudiocreator
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
-make -C kaudiocreator DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=%{buildroot}
+make -C kaudiocreator DESTDIR=%{buildroot} install
 
 %if %{redhatify}
-  for f in $RPM_BUILD_ROOT%{appdir}/*.desktop ; do
-    if [ -f $RPM_BUILD_ROOT%{appdir}/*.desktop ] ; then
+  for f in %{buildroot}%{appdir}/*.desktop ; do
+    if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
       echo "OnlyShowIn=KDE;" >> $f
     fi
   done
 %endif
 
 %if ! %{juk}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/juk
+  rm -rf %{buildroot}%{_docdir}/HTML/en/juk
 %endif
 
 # don't make these world-writeable
-chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/*
+chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
-cd $RPM_BUILD_ROOT/%{_docdir}/HTML/en
+cd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    rm -f $i/common
    ln -sf ../common $i
@@ -197,7 +204,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -208,7 +215,7 @@
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
 %doc %{_docdir}/HTML/en/kaudiocreator
-%doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
+%doc %{_docdir}/HTML/en/kdemultimedia%{patch_name}-apidocs
 %doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid
 %doc %{_docdir}/HTML/en/kmix
@@ -235,6 +242,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	4 Apr 2006 14:51:06 -0000	1.35
+++ sources	9 Jun 2006 16:32:04 -0000	1.36
@@ -1 +1 @@
-54f9947051ee5cf50c81a5ea382943f1  kdemultimedia-3.5.2-patched.tar.bz2
+52bb137a4605a35e56ec9dc1070e0e28  kdemultimedia-3.5.3-patched.tar.bz2


--- kdemultimedia-3.4.0-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:38:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:38:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2258,1.2259
Message-ID: <200606091638.k59GcULX021379@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21342

Modified Files:
	kernel-2.6.spec 
Log Message:
* Fri Jun  9 2006 Dave Jones <davej at redhat.com>
- Disable KGDB again, it broke serial console :(



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2258
retrieving revision 1.2259
diff -u -r1.2258 -r1.2259
--- kernel-2.6.spec	8 Jun 2006 17:58:09 -0000	1.2258
+++ kernel-2.6.spec	9 Jun 2006 16:38:27 -0000	1.2259
@@ -1097,6 +1097,8 @@
 #
 
 # KGDB
+%define kgdb 0
+%if %{kgdb}
 %patch9000 -p1
 %patch9001 -p1
 %patch9002 -p1
@@ -1109,6 +1111,7 @@
 %patch9009 -p1
 %patch9010 -p1
 %patch9011 -p1
+%endif
 
 #
 # misc small stuff to make things compile or otherwise improve performance
@@ -1805,6 +1808,9 @@
 %endif
 
 %changelog
+* Fri Jun  9 2006 Dave Jones <davej at redhat.com>
+- Disable KGDB again, it broke serial console :(
+
 * Wed Jun  7 2006 Dave Jones <davej at redhat.com>
 - Experiment: Add KGDB.
 - AC97 fix for OLPC.



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:46:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:46:35 -0400
Subject: rpms/kdepim/FC-5 kdepim-3.5.3-kmail-typo.patch,1.1,1.2
Message-ID: <200606091646.k59GkZ4p000689@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27933

Modified Files:
	kdepim-3.5.3-kmail-typo.patch 
Log Message:
fix typo


kdepim-3.5.3-kmail-typo.patch:
 kmcomposewin.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: kdepim-3.5.3-kmail-typo.patch
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim-3.5.3-kmail-typo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-3.5.3-kmail-typo.patch	9 Jun 2006 15:23:53 -0000	1.1
+++ kdepim-3.5.3-kmail-typo.patch	9 Jun 2006 16:46:33 -0000	1.2
@@ -1,11 +1,11 @@
---- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig	2006-06-09 17:01:50.000000000 +0200
-+++ kdepim-3.5.3/kmail/kmcomposewin.cpp	2006-05-22 20:10:53.000000000 +0200
-@@ -4021,7 +4021,7 @@
+--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig	2006-06-09 18:44:15.000000000 +0200
++++ kdepim-3.5.3/kmail/kmcomposewin.cpp	2006-06-09 18:44:42.000000000 +0200
+@@ -4021,7 +4023,7 @@
    }
  
    // Squeeze tabs and spaces
--  QRegExp squeeze( "[\t ]+" );
-+  QRegExp squeeze( "[\t, ]+" );
+-  QRegExp squeeze( "[\t, ]+" );
++  QRegExp squeeze( "[\t ]+" );
    s.replace( squeeze, QChar( ' ' ) );
  
    // Remove trailing whitespace



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:50:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:50:26 -0400
Subject: rpms/ghostscript/devel ghostscript-big-cmap-post.patch, 1.2,
	1.3 ghostscript-gtk2.patch, 1.1, 1.2 ghostscript.spec, 1.116, 1.117
Message-ID: <200606091650.k59GoQVb007506@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7392

Modified Files:
	ghostscript-big-cmap-post.patch ghostscript-gtk2.patch 
	ghostscript.spec 
Log Message:
* Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-5
- Sync to svn165.


ghostscript-big-cmap-post.patch:
 gs_ttf.ps |  115 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 85 insertions(+), 30 deletions(-)

Index: ghostscript-big-cmap-post.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-big-cmap-post.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghostscript-big-cmap-post.patch	25 Apr 2006 16:20:39 -0000	1.2
+++ ghostscript-big-cmap-post.patch	9 Jun 2006 16:50:24 -0000	1.3
@@ -1,5 +1,5 @@
---- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2005-09-22 22:31:58.000000000 +0100
-+++ espgs-8.15.2/lib/gs_ttf.ps	2006-04-25 16:49:58.000000000 +0100
+--- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2006-06-09 13:37:44.000000000 +0100
++++ espgs-8.15.2/lib/gs_ttf.ps	2006-06-09 13:39:13.000000000 +0100
 @@ -261,6 +261,54 @@
    } for pop exch pop
  } bind def
@@ -145,10 +145,10 @@
    (OS/2) 1 index
 -  (post) 1 index
 +  (post) { .readbigtable }
-   %(vhea) 1 index
-   systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
-   (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
-@@ -867,10 +915,17 @@
+   (vhea) 1 index
+ 	% Big tables
+   (glyf) { .readbigtable }
+@@ -860,10 +908,17 @@
    } ifelse
  		% Stack: ... /FontInfo mark key1 value1 ...
    post null ne {
@@ -170,7 +170,7 @@
    } if
    counttomark 0 ne { .dicttomark } { pop pop } ifelse
    /XUID [orgXUID 42 curxuid]
-@@ -929,22 +984,22 @@
+@@ -922,22 +977,22 @@
      } if
      tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
      dup /cmaptab exch def % temporary

ghostscript-gtk2.patch:
 configure.ac     |    9 +++------
 src/unix-dll.mak |   11 ++---------
 2 files changed, 5 insertions(+), 15 deletions(-)

Index: ghostscript-gtk2.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-gtk2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-gtk2.patch	3 Jun 2005 16:04:52 -0000	1.1
+++ ghostscript-gtk2.patch	9 Jun 2006 16:50:24 -0000	1.2
@@ -1,11 +1,63 @@
---- espgs-8.15rc3/src/unix-dll.mak.gtk2	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15rc3/src/unix-dll.mak	2005-06-03 12:31:56.000000000 +0100
-@@ -67,7 +67,7 @@
- # Build the small Ghostscript loaders, with Gtk+ and without
+--- espgs-8.15.2/configure.ac.gtk2	2006-06-09 14:16:36.000000000 +0100
++++ espgs-8.15.2/configure.ac	2006-06-09 14:18:15.000000000 +0100
+@@ -481,12 +481,9 @@
+ SOC_LIBS=""
+ SOC_LOADER="dxmainc.c"
+ if test "x$enable_gtk" != "xno"; then
+-	AC_PATH_PROG(GTKCONFIG, gtk-config)
+-	if test "x$GTKCONFIG" != x; then
+-		SOC_LOADER="dxmain.c"
+-		SOC_CFLAGS="`$GTKCONFIG --cflags`"
+-		SOC_LIBS="`$GTKCONFIG --libs`"
+-	fi
++	SOC_LOADER="dxmain.c"
++	SOC_CFLAGS="`pkg-config gtk+-2.0 --cflags`"
++	SOC_LIBS="`pkg-config gtk+-2.0 --libs`"
+ fi
+ AC_SUBST(SOC_CFLAGS)
+ AC_SUBST(SOC_LIBS)
+--- espgs-8.15.2/src/unix-dll.mak.gtk2	2006-06-09 14:31:35.000000000 +0100
++++ espgs-8.15.2/src/unix-dll.mak	2006-06-09 14:35:55.000000000 +0100
+@@ -39,11 +39,6 @@
+ GSSOC_XE=$(BINDIR)/$(GSSOC_XENAME)
+ GSSOC=$(BINDIR)/$(SOBINRELDIR)/$(GSSOC_XENAME)
  
- $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
--	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
-+	$(GLCC) -g `pkg-config gtk+-2.0 --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config gtk+-2.0 --libs`
+-# loader suporting display device using Gtk+
+-GSSOX_XENAME=$(GS)x$(XE)
+-GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME)
+-GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
+-
+ # shared library
+ GS_SONAME=lib$(GS).so
+ GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
+@@ -83,13 +78,13 @@
  
- $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
- 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
+ # Normal shared object
+ so: SODIRS
+-	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
++	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC)
+ 
+ # Debug shared object
+ # Note that this is in the same directory as the normal shared
+ # object, so you will need to use 'make soclean', 'make sodebug'
+ sodebug: SODIRS
+-	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
++	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC)
+ 
+ install-so: so
+ 	-mkdir -p $(prefix)
+@@ -99,7 +94,6 @@
+ 	-mkdir -p $(bindir)
+ 	-mkdir -p $(libdir)
+ 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
+-	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
+ 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
+ 	$(RM_) $(libdir)/$(GS_SONAME)
+ 	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
+@@ -122,6 +116,5 @@
+ 	$(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME)
+ 	$(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)
+ 	$(RM_) $(GSSOC)
+-	$(RM_) $(GSSOX)
+ 
+ # End of unix-dll.mak


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ghostscript.spec	26 May 2006 14:04:13 -0000	1.116
+++ ghostscript.spec	9 Jun 2006 16:50:24 -0000	1.117
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 4
+Release: 5
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -14,6 +14,7 @@
 Source1: FAPIcidfmap
 Source4: cidfmap
 
+Patch0: espgs-svn165.patch
 Patch1: ghostscript-multilib.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
@@ -76,6 +77,7 @@
 
 %prep
 %setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
+%patch0 -p1 -b .svn165
 
 # Fix ijs-config not to have multilib conflicts (bug #192672)
 %patch1 -p1 -b .multilib
@@ -84,12 +86,12 @@
 %patch2 -p1 -b .gtk2
 
 # Fix some shell scripts
-%patch3 -p1 -b .scripts
+#%patch3 -p1 -b .scripts
 
 # Fix sed usage in ps2epsi (bug #89300).
-%patch4 -p1 -b .ps2epsi
+#%patch4 -p1 -b .ps2epsi
 
-%patch5 -p1 -b .badc
+#%patch5 -p1 -b .badc
 
 # Prevent pdf2ps generating "null setpagesize" (bug #126446).
 %patch6 -p1 -b .pagesize
@@ -98,7 +100,7 @@
 %patch7 -p1 -b .noopt
 
 # Use external freetype (bug #161187).
-%patch8 -p1 -b .use-external-freetype
+#%patch8 -p1 -b .use-external-freetype
 
 # Allow separated font configuration (bug #161187).
 %patch9 -p1 -b .split-font-configuration
@@ -113,6 +115,8 @@
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
+autoconf
+
 %build
 FONTPATH=
 for path in \
@@ -125,7 +129,7 @@
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
-%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH"
+%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --enable-gtk
 
 # Build IJS
 cd ijs
@@ -145,6 +149,11 @@
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
 %endif
 
+mv sobin/gsc sobin/gsx
+%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --disable-gtk
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
@@ -166,6 +175,8 @@
 	CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
 	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
 
+install -m0755 sobin/gsx $RPM_BUILD_ROOT%{_bindir}/gsx
+
 mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
 
 cd ijs
@@ -214,7 +225,7 @@
 find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
 
 MAIN_PWD=`pwd`
-(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib/* | \
+(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib -type f | \
 		sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
  find .%{_bindir}/ | sed -e 's/\.//;' | \
 		grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \
@@ -260,6 +271,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-5
+- Sync to svn165.
+
 * Fri May 26 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-4
 - Fix ijs-config not to have multilib conflicts (bug #192672)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:55:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:55:15 -0400
Subject: rpms/ghostscript/devel espgs-svn165.patch,NONE,1.1
Message-ID: <200606091655.k59GtFwE009481@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9349

Added Files:
	espgs-svn165.patch 
Log Message:
Include the patch.

espgs-svn165.patch:
 CHANGES               |   14 
 lib/cjkv/baseutil.ps  |  569 ++++++++++++++++++++++++++++++++++++++++
 lib/cjkv/cjkcidcm.ps  |  455 ++++++++++++++++++++++++++++++++
 lib/cjkv/cjkfnmap.ps  |  389 +++++++++++++++++++++++++++
 lib/cjkv/cjkvinit.ps  |   46 +++
 lib/cjkv/cjkvttcf.ps  |  154 ++++++++++
 lib/cjkv/tt11util.ps  |  708 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/cjkv/tt42util.ps  |  482 ++++++++++++++++++++++++++++++++++
 lib/gs_ttf.ps         |   11 
 lib/ps2epsi           |   26 +
 lib/pv.sh             |   16 -
 pstoraster/gdevcups.c |  229 ++++++++++------
 src/Makefile.in       |   15 -
 src/configure.ac      |  145 ++++++----
 src/devs.mak          |    2 
 src/fapi_ft.c         |   23 +
 src/gdevdflt.c        |    8 
 src/gdevpdtc.c        |   12 
 src/gdevpdtt.c        |   51 ---
 src/gdevps.c          |    2 
 src/gp_unix.c         |  187 ++++++++++++-
 src/gstype42.c        |  104 +++----
 src/gxfont42.h        |   18 -
 src/int.mak           |   15 -
 src/pipe_.h           |    2 
 src/scfd.c            |    2 
 src/unix-dll.mak      |   10 
 src/unixinst.mak      |    5 
 src/zcfont.c          |    4 
 src/zchar1.c          |   72 ++++-
 src/zchar42.c         |   22 +
 src/zfcid1.c          |   63 ----
 32 files changed, 3475 insertions(+), 386 deletions(-)

--- NEW FILE espgs-svn165.patch ---
diff -durN -x .svn espgs-8.15.2/CHANGES espgs/CHANGES
--- espgs-8.15.2/CHANGES	2006-06-09 13:01:38.000000000 +0100
+++ espgs/CHANGES	2006-06-09 12:55:17.000000000 +0100
@@ -1,6 +1,20 @@
 CHANGES - ESP Ghostscript 8.15.2 - 2006-04-25
 ---------------------------------------------
 
+CHANGES IN post-8.15.2 SVN
+
+	- Added gs8 CJKV patch
+	- Fix compilation on systems that don't have gtk (but still want
+	  the x11 driver)
+	- The omni driver doesn't use glib -- update configure.ac
+	  accordingly
+	- Fix ps2epsi in locales where ~ comes before ! (STR #1643)
+	- Use mktemp in ps2epsi if available (STR #1630)
+	- New --enable/disable-fontconfig switch, allows the use of
+	  fontconfig to retreive fonts lists on Unix (STR #1631,
+	  based on patch from Craig Ritter, craig at postnewspapers.com.au)
+	- Make fapi_ft compile with system freetype (STR #1632)
+
 CHANGES IN 8.15.2
 
 	- Ghostscript error messages now start with CUPS prefix
diff -durN -x .svn espgs-8.15.2/lib/cjkv/baseutil.ps espgs/lib/cjkv/baseutil.ps
--- espgs-8.15.2/lib/cjkv/baseutil.ps	1970-01-01 01:00:00.000000000 +0100
+++ espgs/lib/cjkv/baseutil.ps	2006-06-09 12:54:38.000000000 +0100
@@ -0,0 +1,569 @@
+%!
+%
+% Developed by AXE,Inc., BBR Inc. and Turbolinux Inc.
+%   under the technical advice by suzuki toshiya (Hiroshima University)
+% For questions, please send mail to espgs8-cjk at printing-japan.org
+%
+% (C) Copyright 2006 Center of the International Cooperation for
+%     Computerization
+%
+%
+% Based on gs-cjk patches
+% Copyright (C) 2001-2003 gs-cjk project:
+%   Taiji Yamada, Masatake Yamato, Hideyuki Suzuki and suzuki toshiya.
+%   Enhancements by Akira Tagoh and Taiji Yamada, 2005.
+%   All rights reserved.
+%
+%
+% Based on GNU Ghostscript 7.07 and 8.15
+% Copyright (C) 1996-2003 artofcode LLC.  All rights reserved.
+%
+% This software is provided AS-IS with no warranty, either express or
+% implied.
+%
+%
+% This program is free software;  you can redistribute it and/or
+% modify it under the terms of the GNU General Public License as
+% published by the Free Software Foundation; either version 2 of
+% the License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+% See the GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software Foundation,
+% Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+%
+
+[
+   /CJKV_DEBUG_BASE
+] {dup where {pop pop} { currentdict exch false def pop } ifelse} forall
+
+/_cjkv_ttcmap_tmp 10 dict def
+
+/_cjkv_base_util 50 dict dup begin
+
+  /.cjkv_newdicttomark { % <mark> <k1> <v1> ... <kn> <vn> <extra_space> .cjkv_newdicttomark <dict>
+    CJKV_DEBUG_BASE { (--- .cjkv_newdicttomark start\n) print flush  } if
+    counttomark 1 sub 2 idiv add dict   % <mark> <k1> <v1> ... <kn> <vn> <dict>
+    CJKV_DEBUG_BASE { (--- scratch dict making finished\n) print flush  } if
+    counttomark 1 sub 2 idiv {
+      dup                               % <mark> <k1> <v1> ... <kn> <vn> <dict> <dict>
+      4 2 roll                          % <mark> <k1> <v1> ... <dict> <dict> <kn> <vn>
+      dup type /stringtype eq { dup length string copy } if
+      dup type /arraytype  eq {
+        dup length array exch dup length 0 exch 1 exch 1 sub {
+          1 index 1 index get dup type /stringtype eq {
+            dup length string copy
+          } if
+          [ exch ]
+          3 index 3 1 roll putinterval
+        } for
+        pop
+      } if
+      dup type /dicttype   eq {
+        dup length dict exch
+        [ 1 index { pop } forall ] {
+          1 index 1 index get dup type /stringtype eq {
+            dup length string copy
+          } if
+          3 index 3 1 roll put
+        } forall
+        pop
+      } if
+      put                               % <mark> <k1> <v1> ... <dict>
+      CJKV_DEBUG_BASE { (--- copy ok\n) print flush  } if
+    } repeat                            % <mark> <dict>
+    exch pop                            % <dict>
+    CJKV_DEBUG_BASE { (--- .cjkv_newdicttomark ok\n) print flush  } if
+  } bind def
+
+  /orgXUID AladdinEnterprisesXUID def
+  /maxstring 32000 def    % half the maximum length of a PostScript string,
+                          % must be a multiple of 4 (for hmtx / loca / vmtx)
+  
+
+  /.cjkv_xuidstring <80000000> def
+
+  /.cjkv_curxuid {              % - curxuid <int>
+    0 .cjkv_xuidstring { exch 8 bitshift exch add } forall
+  } bind def
+
+  /.cjkv_nextxuid {             % - nextxuid -
+    3 -1 0 {
+      .cjkv_xuidstring 1 index 2 copy get dup 255 ne {
+        1 add put pop exit
+      } if pop 0 put pop
+    } for
+  } bind def
+  
+  % <string> <index> .cjkv_getu16 <integer>
+  /.cjkv_getu16 {
+    2 copy get 8 bitshift 3 1 roll 1 add get add
+  } bind def
+  
+  % <string> <index> .cjkv_gets16 <integer>
+  /.cjkv_gets16 {
+    .cjkv_getu16 16#8000 xor 16#8000 sub
+  } bind def
+  
+  % <string> <index> .cjkv_getu32 <integer>
+  /.cjkv_getu32 {
+    2 copy .cjkv_getu16 16 bitshift 3 1 roll 2 add .cjkv_getu16 add
+  } bind def
+  
+  % <string> <index> .cjkv_gets32 <integer>
+  /.cjkv_gets32 {
+    2 copy .cjkv_gets16 16 bitshift 3 1 roll 2 add .cjkv_getu16 add
+  } bind def
+  
+  % <string> <index> <integer> .cjkv_putu16 -
+  /.cjkv_putu16 {
+    3 copy -8 bitshift put
+    exch 1 add exch 16#ff and put
+  } bind def
+  
+  % <string> <index> <integer> .cjkv_putu32 -
+  /.cjkv_putu32 {
+    3 copy -16 bitshift .cjkv_putu16
+    exch 2 add exch 16#ffff and .cjkv_putu16
+  } bind def
+
+  /.cjkv_biglength { % <str>|<array of str> .biglength <integer>
+    dup type /arraytype eq { 0 exch { length add } forall } { length } ifelse
+  } bind def
+  
+  /.cjkv_concats { % [str ...] concats str
+    () exch dup length 1 sub -1 0 {
+      1 index exch get dup type /stringtype ne { dup length string cvs } if
+      3 -1 roll exch dup length 2 index length add string
+      dup dup 4 2 roll copy length 4 -1 roll putinterval exch
+    } for pop
+  } bind def
+  
+  % <str>|<array of str> <index> <count> .cjkv_biggetinterval <str>|<array of str>
+  /.cjkv_biggetinterval {
+    currentglobal 4 1 roll
+    false setglobal
+    5 dict begin
+    2 index type /arraytype eq {
+      /c exch def
+      /i exch def
+      [ exch {
+        dup length /l exch def
+        i c add l gt {
+          i l lt {
+            i l i sub getinterval
+            /c i c add l sub def
+            /i 0 def
+          } {
+            pop
+            /i i l sub def
+          } ifelse
+        } {
+          i c getinterval exit
+        } ifelse
+      } forall
+      counttomark array dup length 1 sub -1 0 { 1 index exch 3 index put exch pop } for exch pop
+      dup .cjkv_biglength 65535 le { .cjkv_concats } if
+    } { getinterval } ifelse
[...4138 lines suppressed...]
  	return zchar_set_cache(i_ctx_p, pbfont, op - 1,
 			       (pcxs->present == metricsSideBearingAndWidth
 			        && !pcxs->use_FontBBox_as_Metrics2 ?
 			        pcxs->sbw : NULL),
-			       pcxs->sbw + 2,
+			       w,
 			       &pcxs->char_bbox,
 			       cont, exec_cont, 
 			       (pcxs->use_FontBBox_as_Metrics2 ? pcxs->sbw : NULL));
@@ -581,7 +629,7 @@
     code = type1_exec_init(&cxs.cis, penum, igs, pfont1);
     if (code < 0)
 	return code;
-    cxs.char_bbox = pfont1->FontBBox;
+    cxs.char_bbox = bbox;
     code = type1exec_bbox(i_ctx_p, &cxs, pfont, exec_cont);
     return code;
 }
@@ -795,6 +843,7 @@
     int code;
     gs_text_enum_t *penum = op_show_find(i_ctx_p);
     gs_font *pfont;
+    double w[2];
 
     if ((code = gs_pathbbox(igs, &pcxs->char_bbox)) < 0 ||
 	(code = font_param(op - 3, &pfont)) < 0
@@ -807,13 +856,24 @@
 	gs_font_type1 *const pfont1 = (gs_font_type1 *) pfont;
 	op_proc_t cont, exec_cont = 0;
 
-	if (pcxs->present == metricsNone) {
+	if (pcxs->present == metricsNone
+	    || pcxs->use_FontBBox_as_Metrics2) {
 	    gs_point endpt;
 
 	    if ((code = gs_currentpoint(igs, &endpt)) < 0)
 		return code;
-	    pcxs->sbw[2] = endpt.x, pcxs->sbw[3] = endpt.y;
+	    /* We will not use sbw[3, 4]. 
+	       If pcxs->use_FontBBox_as_Metrics2 is true,
+	       sbw[3, 4] are used as arguments(W1x, W1y) of setcachedevice2. 
+	       We will use w[0, 1] as W0x and W0y of setcachedevice2.
+	       W0 and W1 is differrent parameters. Don't confuse. */
+	    w[0] = endpt.x, w[1] = endpt.y;
 	    pcxs->present = metricsSideBearingAndWidth;
+	    if (pcxs->use_FontBBox_as_Metrics2) {
+	      /* Now actual width is available, I can calculate much 
+		 better side bearing for WMode 1 from the width. */
+	      pcxs->sbw[0] = w[0] / 2;
+	    }
 	}
 	/*
 	 * We only need to rebuild the path from scratch if we might
@@ -830,7 +890,7 @@
 	} else {
 	    cont = (pbfont->PaintType == 0 ? nobbox_fill : nobbox_stroke), exec_cont = 0;
 	    code = zchar_set_cache(i_ctx_p, pbfont, op - 1, NULL,
-				   pcxs->sbw + 2,
+				    w,
 				   &pcxs->char_bbox,
 				   cont, &exec_cont,
 				   (pcxs->use_FontBBox_as_Metrics2 ? pcxs->sbw : NULL));
diff -durN -x .svn espgs-8.15.2/src/zchar42.c espgs/src/zchar42.c
--- espgs-8.15.2/src/zchar42.c	2006-06-09 13:00:18.000000000 +0100
+++ espgs/src/zchar42.c	2006-06-09 12:54:10.000000000 +0100
@@ -1,3 +1,12 @@
+/*
+ * Modified by AXE,Inc., BBR Inc. and Turbolinux Inc.
+ *   under the technical advice by suzuki toshiya (Hiroshima University)
+ * Based on bugfix by Masatake Yamato and Hideo Saito, 2001.
+ * For questions, please send mail to espgs8-cjk at printing-japan.org
+ *
+ * (C) Copyright 2006 Center of the International Cooperation for
+ *     Computerization
+ */
 /* Copyright (C) 1996, 1997, 1998, 1999 Aladdin Enterprises.  All rights reserved.
   
   This software is provided AS-IS with no warranty, either express or
@@ -44,8 +53,15 @@
 {   double sbw[4];
     double w[2];
     int present;
-    int code = zchar_get_metrics(pbfont, cnref, sbw);
+    gs_rect bbox, *pbbox;
+    int code = gs_type42_glyph_fbbox(pbfont, glyph_index, &bbox);
 
+    if (code != 0) {
+	pbbox = &pbfont->FontBBox;
+    } else {
+	pbbox = &bbox;
+    }
+    code = zchar_get_metrics(pbfont, cnref, sbw);
     if (code < 0)
 	return code;
     present = code;
@@ -75,7 +91,7 @@
 		}
 	    } else {
 		sbw[0] = sbw[2] / 2;
-		sbw[1] = (pbfont->FontBBox.q.y + pbfont->FontBBox.p.y - sbw42[3]) / 2;
+		sbw[1] = pbbox->q.y - sbw42[1];
 		sbw[2] = sbw42[2];
 		sbw[3] = sbw42[3];
 	    }
@@ -87,7 +103,7 @@
     return zchar_set_cache(i_ctx_p, pbfont, cnref,
 			   (put_lsb && present == metricsSideBearingAndWidth ?
 			    sbw : NULL),
-			   w, &pbfont->FontBBox,
+			   w, pbbox,
 			   cont, exec_cont,
 			   gs_rootfont(igs)->WMode ? sbw : NULL);
 }
diff -durN -x .svn espgs-8.15.2/src/zfcid1.c espgs/src/zfcid1.c
--- espgs-8.15.2/src/zfcid1.c	2006-06-09 13:00:19.000000000 +0100
+++ espgs/src/zfcid1.c	2006-06-09 12:54:11.000000000 +0100
@@ -35,10 +35,6 @@
 #include "stream.h"
 #include "files.h"
 
-#if 1 /* XXXX */
-private uint z11_find_repl_glyph(gs_font_cid2 *, uint);
-#endif
-
 /* ---------------- CIDFontType 1 (FontType 10) ---------------- */
 
 /* <string|name> <font_dict> .buildfont10 <string|name> <font> */
@@ -71,28 +67,6 @@
 
 /* ------ Accessing ------ */
 
-/* Replace a glyph with a vertical substitution */
-private uint
-z11_find_repl_glyph(gs_font_cid2 *pfont, uint glyph)
-{
-    int i;
-    const byte *data;
-
-    if (pfont->data.mort_ncgsv_off == 0)
-	return glyph;
-
-    if ((*pfont->data.string_proc)((gs_font_type42*)pfont,
-		(ulong)pfont->data.mort_ncgsv_off,
-		pfont->data.mort_ncgsv_len, &data) == 0) {
-	for (i=0; i < pfont->data.mort_ncgsv_len; i += 4) {
-	    if (((data[i]<<8)+data[i+1]) == glyph) {
-		return (uint)((data[i+2]<<8)+data[i+3]);
-	    }
-	}
-    }
-    return glyph;
-}
-
 /* Map a glyph CID to a TrueType glyph number using the CIDMap. */
 private int
 z11_CIDMap_proc(gs_font_cid2 *pfont, gs_glyph glyph)
@@ -133,43 +107,6 @@
     }
     for (i = 0; i < gdbytes; ++i)
 	gnum = (gnum << 8) + data[i];
-#if 1 /* XXXX */
-    if ( gnum != 0 &&
-	 pfont->cidata.common.CIDSystemInfo.Registry.size == 5 &&
-	!memcmp(pfont->cidata.common.CIDSystemInfo.Registry.data,"Adobe",5) &&
-	 pfont->cidata.common.CIDSystemInfo.Ordering.size == 6 &&
-	!memcmp(pfont->cidata.common.CIDSystemInfo.Ordering.data,"Japan1",6)) {
-	uint gnum0 = gnum;
-	  
-	/* ps string represented in EUC/ShiftJIS are mapped to CID string,
-	 * while certain characters (e.g. 0xa1c4) are mapped to different CID
-	 * (668 or 7897) depending on WMode(0 or 1).
-	 * But, when CID characters are mapped to ShiftJIS/Unicode to get
-	 * corresponding TTF glyphs, certain CID characters are mapped to
-	 * glyphs valid for horizonal writing
-	 * (there is no choice in ShiftJIS encoded TTF), using Resource/CMap
-	 *
-	 * Following code maps certain CID (for vertical writing chars)
-	 * to glyphs for vertical writing regardless of WMode!
-	 * This automatic mapping enables generating PDF of vertical writing.
-	 *
-	 * fixme: range correct?
-	 */
-	if (7887 <= cid && cid <= 7960) {
-	    /* substitute a glyph for vertical writing cid character */
-	    gnum = z11_find_repl_glyph(pfont, gnum);
-	}
-	if (gnum != gnum0) {
-	    if (gs_debug_c('J'))
-		dlprintf3("[J]z11_CIDMap_proc(): cid:%d -> %d -> %d\n",
-				cid, gnum0, gnum);
-	} else if (gs_debug_c('J')) {
-	    dlprintf2("[J]z11_CIDMap_proc(): cid:%d -> %d\n", cid, gnum);
-	}
-    } else if (gs_debug_c('J')) {
-	dlprintf2("[J]z11_CIDMap_proc(): cid:%d -> %d\n", cid, gnum);
-    }
-#endif
     return gnum;
 }
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 16:59:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 12:59:25 -0400
Subject: rpms/xorg-x11-drv-ati/devel db-root-visual.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.22, 1.23
Message-ID: <200606091659.k59GxP4L011193@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11163

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	db-root-visual.patch 
Log Message:
* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.0-7
- Committed db-root-visual.patch and reenabled.


db-root-visual.patch:
 radeon_dri.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE db-root-visual.patch ---
--- ./src/radeon_dri.c.db-root-visual	2006-03-22 17:30:14.000000000 -0500
+++ ./src/radeon_dri.c	2006-06-08 17:30:24.000000000 -0400
@@ -129,7 +129,7 @@
 	}
 
 	i = 0;
-	for (db = 0; db <= use_db; db++) {
+	for (db = use_db; db >= 0; db--) {
 	  for (accum = 0; accum <= RADEON_USE_ACCUM; accum++) {
 	    for (stencil = 0; stencil <= RADEON_USE_STENCIL; stencil++) {
 		pRADEONConfigPtrs[i] = &pRADEONConfigs[i];
@@ -212,7 +212,7 @@
 	}
 
 	i = 0;
-	for (db = 0; db <= use_db; db++) {
+	for (db = use_db; db >= 0; db--) {
 	  for (accum = 0; accum <= RADEON_USE_ACCUM; accum++) {
 	    for (stencil = 0; stencil <= RADEON_USE_STENCIL; stencil++) {
 		pRADEONConfigPtrs[i] = &pRADEONConfigs[i];


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drv-ati.spec	9 Jun 2006 08:15:56 -0000	1.22
+++ xorg-x11-drv-ati.spec	9 Jun 2006 16:59:22 -0000	1.23
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.0
-Release:   6
+Release:   7
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -42,7 +42,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
-#%patch0 -p0 -b .db-root-visual
+%patch0 -p0 -b .db-root-visual
 
 %build
 %configure --disable-static
@@ -86,6 +86,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.0-7
+- Committed db-root-visual.patch and reenabled.
+
 * Thu Jun  8 2006 Mike A. Harris <mharris@@redhat.com> 6.6.0-6
 - Disable db-root-visual.patch, because the file wasn't committed to CVS.
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:05:00 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.19,1.20
Message-ID: <200606091705.k59H506A011814@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11680

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
export dm-ioctl.h

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 +++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 ++
 include/linux/Kbuild                  |   63 ++++++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  130 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 49 files changed, 505 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-header-install-git.patch	30 May 2006 08:22:19 -0000	1.19
+++ linux-2.6-header-install-git.patch	9 Jun 2006 17:04:52 -0000	1.20
@@ -415,7 +415,7 @@
 +unifdef-y += mce.h mtrr.h vsyscall.h
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 new file mode 100644
-index 0000000..97eae77
+index 0000000..29f21a4
 --- /dev/null
 +++ b/include/linux/Kbuild
 @@ -0,0 +1,63 @@
@@ -429,10 +429,10 @@
 +	atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h	\
 +	awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h		\
 +	bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h		\
-+	consolemap.h cycx_cfm.h devfs_fs.h dn.h dqblk_v1.h dqblk_v2.h	\
-+	dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h fadvise.h	\
-+	fd.h fdreg.h ftape-header-segment.h ftape-vendors.h fuse.h	\
-+	futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h		\
++	consolemap.h cycx_cfm.h devfs_fs.h dm-ioctl.h dn.h dqblk_v1.h	\
++	dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h	\
++	fadvise.h fd.h fdreg.h ftape-header-segment.h ftape-vendors.h	\
++	fuse.h futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h	\
 +	hpfs_fs.h hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h		\
 +	if_arcnet.h if_arp.h if_bonding.h if_cablemodem.h if_fc.h	\
 +	if_fddi.h if.h if_hippi.h if_infiniband.h if_packet.h		\



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:12:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:12:14 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-dlm-headers.patch, NONE,
	1.1 kernel-2.6.spec, 1.2259, 1.2260 linux-2.6-gfs2-dlm.patch,
	1.2, 1.3 linux-2.6-header-cleanup-git.patch, 1.19, 1.20
Message-ID: <200606091712.k59HCELe012592@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12452

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
	linux-2.6-header-cleanup-git.patch 
Added Files:
	linux-2.6-gfs2-dlm-headers.patch 
Log Message:
Update GFS2 patch, export GFS2 and DLM headers


linux-2.6-gfs2-dlm-headers.patch:
 Kbuild |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE linux-2.6-gfs2-dlm-headers.patch ---
--- linux-2.6.16.ppc/include/linux/Kbuild~	2006-05-25 15:23:00.000000000 +0100
+++ linux-2.6.16.ppc/include/linux/Kbuild	2006-06-09 18:07:47.000000000 +0100
@@ -61,3 +61,6 @@ unifdef-y += acct.h adb.h adfs_fs.h agpg
 	wanrouter.h watchdog.h xfrm.h zftape.h
 
 objhdr-y := version.h
+
+header-y += dlm.h dlm_device.h lock_dlm_plock.h
+unifdef-y += gfs2_ondisk.h iflags.h


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2259
retrieving revision 1.2260
diff -u -r1.2259 -r1.2260
--- kernel-2.6.spec	9 Jun 2006 16:38:27 -0000	1.2259
+++ kernel-2.6.spec	9 Jun 2006 17:12:11 -0000	1.2260
@@ -363,6 +363,7 @@
 
 # GFS/DLM
 Patch1500: linux-2.6-gfs2-dlm.patch
+Patch1501: linux-2.6-gfs2-dlm-headers.patch
 
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
@@ -1125,6 +1126,7 @@
 %if %{buildheaders}
 %patch50 -p1
 %patch51 -p1
+%patch1501 -p1
 %endif
 
 # END OF PATCH APPLICATIONS
@@ -1808,6 +1810,9 @@
 %endif
 
 %changelog
+* Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update GFS2 patch, export GFS2 and DLM headers
+
 * Fri Jun  9 2006 Dave Jones <davej at redhat.com>
 - Disable KGDB again, it broke serial console :(
 

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   29 
 fs/dlm/Makefile                    |   21 
 fs/dlm/ast.c                       |  167 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 ++++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  296 +++
 fs/dlm/device.c                    | 1237 ++++++++++++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  494 +++++
 fs/dlm/lock.c                      | 3547 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   50 
 fs/dlm/lockspace.c                 |  678 +++++++
 fs/dlm/lockspace.h                 |   24 
 fs/dlm/lowcomms.c                  | 1239 ++++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   89 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  106 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  762 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  315 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1103 +++++++++++
 fs/gfs2/bmap.h                     |   32 
 fs/gfs2/daemon.c                   |  223 ++
 fs/gfs2/daemon.h                   |   20 
 fs/gfs2/dir.c                      | 1974 ++++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   31 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++++
 fs/gfs2/eattr.h                    |   97 +
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2340 ++++++++++++++++++++++++
 fs/gfs2/glock.h                    |  155 +
 fs/gfs2/glops.c                    |  491 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  683 +++++++
 fs/gfs2/inode.c                    | 1820 ++++++++++++++++++
 fs/gfs2/inode.h                    |   72 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 +++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  299 +++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  352 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  598 ++++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  804 ++++++++
 fs/gfs2/lops.h                     |   96 +
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  129 +
 fs/gfs2/meta_io.c                  |  892 +++++++++
 fs/gfs2/meta_io.h                  |   89 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  321 +++
 fs/gfs2/ops_address.c              |  670 ++++++
 fs/gfs2/ops_address.h              |   17 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  297 +++
 fs/gfs2/ops_export.h               |   15 
 fs/gfs2/ops_file.c                 | 1000 ++++++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  901 +++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1194 ++++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  399 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  195 ++
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/page.c                     |  280 ++
 fs/gfs2/page.h                     |   23 
 fs/gfs2/quota.c                    | 1305 +++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  576 ++++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1524 +++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  945 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  581 ++++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   35 
 fs/gfs2/unlinked.c                 |  459 ++++
 fs/gfs2/unlinked.h                 |   25 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/dlm.h                |  302 +++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  459 ++++
 include/linux/iflags.h             |  102 +
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   40 
 kernel/printk.c                    |    1 
 mm/filemap.c                       |    1 
 mm/readahead.c                     |    1 
 134 files changed, 41978 insertions(+), 4 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-gfs2-dlm.patch	25 May 2006 17:23:20 -0000	1.2
+++ linux-2.6-gfs2-dlm.patch	9 Jun 2006 17:12:12 -0000	1.3
@@ -67,10 +67,10 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index bd10b2a..328da34 100644
+index c3c5842..e593ace 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -828,6 +828,16 @@ M:	jack at suse.cz
+@@ -840,6 +840,16 @@ M:	jack at suse.cz
  L:	linux-kernel at vger.kernel.org
  S:	Maintained
  
@@ -87,7 +87,7 @@
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:	Tobias Ringstrom
  M:	tori at unhappy.mine.nu
-@@ -1078,6 +1088,14 @@ M:	khc at pm.waw.pl
+@@ -1090,6 +1100,14 @@ M:	khc at pm.waw.pl
  W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:	Maintained
  
@@ -1563,15 +1563,15 @@
 +
 diff --git a/fs/dlm/device.c b/fs/dlm/device.c
 new file mode 100644
-index 0000000..49a20d5
+index 0000000..47798fe
 --- /dev/null
 +++ b/fs/dlm/device.c
-@@ -0,0 +1,1091 @@
+@@ -0,0 +1,1237 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
 +**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-+**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
++**  Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
 +**
 +**  This copyrighted material is made available to anyone wishing to use,
 +**  modify, copy, or redistribute it subject to the terms and conditions
@@ -1628,6 +1628,9 @@
 +#define LS_FLAG_DELETED   1
 +#define LS_FLAG_AUTOFREE  2
 +
++/* flags in ls_flags*/
++#define FI_FLAG_OPEN      1
++#define FI_FLAG_COMPAT    2
 +
 +#define LOCKINFO_MAGIC 0x53595324
 +
@@ -1686,10 +1689,111 @@
 +	wait_queue_head_t   fi_wait;
 +	struct user_ls     *fi_ls;
 +	atomic_t            fi_refcnt;   /* Number of users */
-+	unsigned long       fi_flags;    /* Bit 1 means the device is open */
++	unsigned long       fi_flags;
++};
++
++#ifdef CONFIG_COMPAT
++
++struct dlm_lock_params32 {
++	__u8 mode;
++	__u8 namelen;
++	__u16 flags;
++	__u32 lkid;
++	__u32 parent;
++
++	__u32 castparam;
++	__u32 castaddr;
++	__u32 bastparam;
++	__u32 bastaddr;
++	__u32 lksb;
++
++	char lvb[DLM_USER_LVB_LEN];
++	char name[0];
++};
++
++struct dlm_write_request32 {
++	__u32 version[3];
++	__u8 cmd;
++	__u8 is64bit;
++	__u8 unused[2];
++
++	union  {
++		struct dlm_lock_params32 lock;
++		struct dlm_lspace_params lspace;
++	} i;
++};
++
++struct dlm_lksb32 {
++	__u32 	 sb_status;
++	__u32    sb_lkid;
++	__u8 	 sb_flags;
++	__u32    sb_lvbptr;
++};
++
++struct dlm_lock_result32 {
++	__u32 length;
++	__u32 user_astaddr;
++	__u32 user_astparam;
++	__u32 user_lksb;
++	struct dlm_lksb32 lksb;
++	__u8 bast_mode;
++	__u8 unused[3];
++	/* Offsets may be zero if no data is present */
++	__u32 lvb_offset;
 +};
 +
 +
++static void compat_input(struct dlm_write_request *kparams, struct dlm_write_request32 *k32params)
++{
++
++	kparams->version[0] = k32params->version[0];
++	kparams->version[1] = k32params->version[1];
++	kparams->version[2] = k32params->version[2];
++
++	kparams->cmd = k32params->cmd;
++	kparams->is64bit = k32params->is64bit;
++	if (kparams->cmd == DLM_USER_CREATE_LOCKSPACE ||
++	    kparams->cmd == DLM_USER_REMOVE_LOCKSPACE) {
++
++		kparams->i.lspace.flags = k32params->i.lspace.flags;
++		kparams->i.lspace.minor = k32params->i.lspace.minor;
++		strcpy(kparams->i.lspace.name, k32params->i.lspace.name);
++	}
++	else {
++		kparams->i.lock.mode = k32params->i.lock.mode;
++		kparams->i.lock.namelen = k32params->i.lock.namelen;
++		kparams->i.lock.flags = k32params->i.lock.flags;
++		kparams->i.lock.lkid = k32params->i.lock.lkid;
++		kparams->i.lock.parent = k32params->i.lock.parent;
++		kparams->i.lock.castparam = (void *)(long)k32params->i.lock.castparam;
++		kparams->i.lock.castaddr = (void *)(long)k32params->i.lock.castaddr;
++		kparams->i.lock.bastparam = (void *)(long)k32params->i.lock.bastparam;
++		kparams->i.lock.bastaddr = (void *)(long)k32params->i.lock.bastaddr;
++		kparams->i.lock.lksb = (void *)(long)k32params->i.lock.lksb;
++		memcpy(kparams->i.lock.lvb, k32params->i.lock.lvb, DLM_USER_LVB_LEN);
++		memcpy(kparams->i.lock.name, k32params->i.lock.name, kparams->i.lock.namelen);
++	}
++}
++
++void compat_output(struct dlm_lock_result *res, struct dlm_lock_result32 *res32)
++{
++	res32->length = res->length - (sizeof(struct dlm_lock_result) - sizeof(struct dlm_lock_result32));
++	res32->user_astaddr = (__u32)(long)res->user_astaddr;
++	res32->user_astparam = (__u32)(long)res->user_astparam;
++	res32->user_lksb = (__u32)(long)res->user_lksb;
++	res32->bast_mode = res->bast_mode;
++
++	res32->lvb_offset = res->lvb_offset;
++	res32->length = res->length;
++
++	res32->lksb.sb_status = res->lksb.sb_status;
++	res32->lksb.sb_flags = res->lksb.sb_flags;
++	res32->lksb.sb_lkid = res->lksb.sb_lkid;
++	res32->lksb.sb_lvbptr = (__u32)(long)res->lksb.sb_lvbptr;
++}
++#endif
++
++
 +/* get and put ops for file_info.
 +   Actually I don't really like "get" and "put", but everyone
 +   else seems to use them and I can't think of anything
@@ -1933,7 +2037,7 @@
 +			li->li_grmode = li->li_rqmode;
 +
 +		/* Only queue AST if the device is still open */
-+		if (test_bit(1, &li->li_file->fi_flags))
++		if (test_bit(FI_FLAG_OPEN, &li->li_file->fi_flags))
 +			add_to_astqueue(li, li->li_castaddr, li->li_castparam,
 +					lvb_updated);
 +
@@ -2018,7 +2122,7 @@
 +	f->fi_ls = lsinfo;
 +	f->fi_flags = 0;
 +	get_file_info(f);
-+	set_bit(1, &f->fi_flags);
++	set_bit(FI_FLAG_OPEN, &f->fi_flags);
 +
 +	file->private_data = f;
 +
@@ -2063,7 +2167,7 @@
 +		return -ENOENT;
 +
 +	/* Mark this closed so that ASTs will not be delivered any more */
-+	clear_bit(1, &f->fi_flags);
++	clear_bit(FI_FLAG_OPEN, &f->fi_flags);
 +
 +	/* Block signals while we are doing this */
 +	sigfillset(&allsigs);
@@ -2212,11 +2316,18 @@
 +{
 +	struct file_info *fi = file->private_data;
 +	struct ast_info *ast;
++	void *data;
 +	int data_size;
++	int struct_size;
 +	int offset;
 +	DECLARE_WAITQUEUE(wait, current);
++#ifdef CONFIG_COMPAT
++	struct dlm_lock_result32 result32;
 +
++	if (count < sizeof(struct dlm_lock_result32))
++#else
 +	if (count < sizeof(struct dlm_lock_result))
++#endif
 +		return -EINVAL;
 +
 +	spin_lock(&fi->fi_ast_lock);
@@ -2260,11 +2371,21 @@
 +	spin_unlock(&fi->fi_ast_lock);
 +
 +	/* Work out the size of the returned data */
-+	data_size = sizeof(struct dlm_lock_result);
++#ifdef CONFIG_COMPAT
++	if (test_bit(FI_FLAG_COMPAT, &fi->fi_flags)) {
++		data_size = struct_size = sizeof(struct dlm_lock_result32);
++		data = &result32;
++	}
++	else
++#endif
++	{
++		data_size = struct_size = sizeof(struct dlm_lock_result);
++		data = &ast->result;
++	}
 +	if (ast->lvb_updated && ast->result.lksb.sb_lvbptr)
 +		data_size += DLM_USER_LVB_LEN;
 +
-+	offset = sizeof(struct dlm_lock_result);
++	offset = struct_size;
 +
 +	/* Room for the extended data ? */
 +	if (count >= data_size) {
@@ -2280,8 +2401,13 @@
 +	}
 +
 +	ast->result.length = data_size;
++
++#ifdef CONFIG_COMPAT
++	compat_output(&ast->result, &result32);
++#endif
++
 +	/* Copy the header now it has all the offsets in it */
-+	if (copy_to_user(buffer, &ast->result, sizeof(struct dlm_lock_result)))
++	if (copy_to_user(buffer, data, struct_size))
 +		offset = -EFAULT;
 +
 +	/* If we only returned a header and there's more to come then put it
@@ -2539,8 +2665,14 @@
 +	sigset_t allsigs;
 +	int status;
 +
-+	/* -1 because lock name is optional */
-+	if (count < sizeof(struct dlm_write_request)-1)
++#ifdef CONFIG_COMPAT
++	if (count < sizeof(struct dlm_write_request32))
++#else
++	if (count < sizeof(struct dlm_write_request))
++#endif
++		return -EINVAL;
++
++	if (count > sizeof(struct dlm_write_request) + DLM_RESNAME_MAXLEN)
 +		return -EINVAL;
 +
 +	/* Has the lockspace been deleted */
@@ -2560,6 +2692,20 @@
 +	if (check_version(kparams))
 +		goto out_free;
 +
++#ifdef CONFIG_COMPAT
++	if (!kparams->is64bit) {
++		struct dlm_write_request32 *k32params = (struct dlm_write_request32 *)kparams;
++		kparams = kmalloc(count + (sizeof(struct dlm_write_request) - sizeof(struct dlm_write_request32)), GFP_KERNEL);
++		if (!kparams)
++			return -ENOMEM;
++
++		if (fi)
++			set_bit(FI_FLAG_COMPAT, &fi->fi_flags);
++		compat_input(kparams, k32params);
++		kfree(k32params);
++	}
++#endif
++
 +	/* Block signals while we are doing this */
 +	sigfillset(&allsigs);
 +	sigprocmask(SIG_BLOCK, &allsigs, &tmpsig);
@@ -16211,10 +16357,10 @@
 +
 diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
 new file mode 100644
-index 0000000..3466015
+index 0000000..2e114c0
 --- /dev/null
 +++ b/fs/gfs2/eattr.c
-@@ -0,0 +1,1549 @@
+@@ -0,0 +1,1548 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -16591,8 +16737,8 @@
 +		return 0;
 +
 +	if (er->er_data_len) {
-+		char *prefix;
-+		unsigned int l;
++		char *prefix = NULL;
++		unsigned int l = 0;
 +		char c = 0;
 +
 +		if (ei->ei_size + ea_size > er->er_data_len)
@@ -16611,11 +16757,10 @@
 +			prefix = "security.";
 +			l = 9;
 +			break;
-+		default:
-+			/* FIXME: Needs looking at again */
-+			break;
 +		}
 +
++		BUG_ON(l == 0);
++
 +		memcpy(er->er_data + ei->ei_size, prefix, l);
 +		memcpy(er->er_data + ei->ei_size + l, GFS2_EA2NAME(ea),
 +		       ea->ea_name_len);
@@ -20966,10 +21111,10 @@
 +#endif /* __GLOPS_DOT_H__ */
 diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
 new file mode 100644
-index 0000000..92091d0
+index 0000000..8caefec
 --- /dev/null
 +++ b/fs/gfs2/incore.h
-@@ -0,0 +1,687 @@
+@@ -0,0 +1,683 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21130,7 +21275,7 @@
 +	unsigned gh_flags;
 +
 +	int gh_error;
-+	unsigned long gh_iflags;
++	unsigned gh_iflags;
 +	struct completion gh_wait;
 +	unsigned long gh_ip;
 +};
@@ -21189,25 +21334,21 @@
 +struct gfs2_alloc {
 +	/* Quota stuff */
 +
-+	unsigned int al_qd_num;
 +	struct gfs2_quota_data *al_qd[4];
 +	struct gfs2_holder al_qd_ghs[4];
++	unsigned int al_qd_num;
 +
-+	/* Filled in by the caller to gfs2_inplace_reserve() */
-+
-+	uint32_t al_requested;
++	u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */
++	u32 al_alloced; /* Filled in by gfs2_alloc_*() */
 +
 +	/* Filled in by gfs2_inplace_reserve() */
 +
-+	char *al_file;
 +	unsigned int al_line;
++	char *al_file;
 +	struct gfs2_holder al_ri_gh;
 +	struct gfs2_holder al_rgd_gh;
 +	struct gfs2_rgrpd *al_rgd;
 +
-+	/* Filled in by gfs2_alloc_*() */
-+
-+	uint32_t al_alloced;
 +};
 +
 +enum {
@@ -41939,10 +42080,10 @@
 +
 diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
 new file mode 100644
-index 0000000..f8ba198
+index 0000000..2a2dd18
 --- /dev/null
 +++ b/include/linux/dlm_device.h
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,86 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -41963,35 +42104,37 @@
 +#define DLM_USER_LVB_LEN	32
 +
 +/* Version of the device interface */
-+#define DLM_DEVICE_VERSION_MAJOR 4
++#define DLM_DEVICE_VERSION_MAJOR 5
 +#define DLM_DEVICE_VERSION_MINOR 0
 +#define DLM_DEVICE_VERSION_PATCH 0
 +
 +/* struct passed to the lock write */
 +struct dlm_lock_params {
 +	__u8 mode;
++	__u8 namelen;
 +	__u16 flags;
 +	__u32 lkid;
 +	__u32 parent;
-+	__u8 namelen;
 +        void __user *castparam;
 +	void __user *castaddr;
 +	void __user *bastparam;
 +        void __user *bastaddr;
 +	struct dlm_lksb __user *lksb;
 +	char lvb[DLM_USER_LVB_LEN];
-+	char name[1];
++	char name[0];
 +};
 +
 +struct dlm_lspace_params {
 +	__u32 flags;
 +	__u32 minor;
-+	char name[1];
++	char name[0];
 +};
 +
 +struct dlm_write_request {
 +	__u32 version[3];
 +	__u8 cmd;
++	__u8 is64bit;
++	__u8 unused[2];
 +
 +	union  {
 +		struct dlm_lock_params   lock;
@@ -42008,6 +42151,7 @@
 +	struct dlm_lksb __user * user_lksb;
 +	struct dlm_lksb lksb;
 +	__u8 bast_mode;
++	__u8 unused[3];
 +	/* Offsets may be zero if no data is present */
 +	__u32 lvb_offset;
 +};

linux-2.6-header-cleanup-git.patch:
 drivers/s390/crypto/z90crypt.h                       |  185 ----------------
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-alpha/unistd.h                           |    7 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm/unistd.h                             |   10 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-arm26/unistd.h                           |   10 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-cris/unistd.h                            |    9 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/unistd.h                             |    7 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/unistd.h                           |    7 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/page.h                              |    5 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-i386/unistd.h                            |    7 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m32r/unistd.h                            |    5 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/unistd.h                            |    7 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-m68knommu/unistd.h                       |    7 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    7 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-parisc/unistd.h                          |    4 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    9 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    8 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/cmb.h                               |    2 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/ptrace.h                            |    6 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    8 
 include/asm-s390/vtoc.h                              |   38 +--
 include/asm-s390/z90crypt.h                          |  212 +++++++++++++++++++
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/unistd.h                              |    7 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sh64/unistd.h                            |    7 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/unistd.h                           |    4 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-sparc64/unistd.h                         |    4 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/unistd.h                            |   12 -
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    9 
 include/asm-x86_64/page.h                            |    5 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-x86_64/unistd.h                          |    7 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/asm-xtensa/unistd.h                          |   21 -
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/affs_hardblocks.h                      |   72 +++---
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/compiler.h                             |   19 -
 include/linux/cpufreq.h                              |    1 
 include/linux/cramfs_fs.h                            |   34 +--
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/divert.h                               |   20 -
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf-em.h                               |   44 +++
 include/linux/elf.h                                  |   59 -----
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++--------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |   10 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 
 include/linux/i2o-dev.h                              |  167 +++++++-------
 include/linux/ide.h                                  |    1 
 include/linux/if_fddi.h                              |    2 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/input.h                                |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/joystick.h                             |   22 -
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +-
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/nbd.h                                  |   12 -
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter/xt_conntrack.h               |    2 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 +--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    5 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/ppp_defs.h                             |   14 -
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 ++++----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 --
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/ufs_fs.h                               |    1 
 include/linux/unistd.h                               |    2 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/sound/hdsp.h                                 |   12 -
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 905 files changed, 816 insertions(+), 1635 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-header-cleanup-git.patch	27 May 2006 11:06:07 -0000	1.19
+++ linux-2.6-header-cleanup-git.patch	9 Jun 2006 17:12:12 -0000	1.20
@@ -11334,6 +11334,18 @@
  
  #ifdef CONFIG_INOTIFY
  
+diff --git a/include/linux/input.h b/include/linux/input.h
+index 50e338d..b48d987 100644
+--- a/include/linux/input.h
++++ b/include/linux/input.h
+@@ -15,6 +15,7 @@ #include <linux/list.h>
+ #else
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <asm/types.h>
+ #endif
+ 
 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
 index 2c08fdc..9e0fefd 100644
 --- a/include/linux/interrupt.h
@@ -11462,6 +11474,47 @@
  #include <linux/skbuff.h>
  
  /***************************************************************************/
+diff --git a/include/linux/joystick.h b/include/linux/joystick.h
+index 5fd20dd..e2d3a18 100644
+--- a/include/linux/joystick.h
++++ b/include/linux/joystick.h
+@@ -111,25 +111,25 @@ #define JS_GET_ALL		7
+ #define JS_SET_ALL		8
+ 
+ struct JS_DATA_TYPE {
+-	int32_t buttons;
+-	int32_t x;
+-	int32_t y;
++	__s32 buttons;
++	__s32 x;
++	__s32 y;
+ };
+ 
+ struct JS_DATA_SAVE_TYPE_32 {
+-	int32_t JS_TIMEOUT;
+-	int32_t BUSY;
+-	int32_t JS_EXPIRETIME;
+-	int32_t JS_TIMELIMIT;
++	__s32 JS_TIMEOUT;
++	__s32 BUSY;
++	__s32 JS_EXPIRETIME;
++	__s32 JS_TIMELIMIT;
+ 	struct JS_DATA_TYPE JS_SAVE;
+ 	struct JS_DATA_TYPE JS_CORR;
+ };
+ 
+ struct JS_DATA_SAVE_TYPE_64 {
+-	int32_t JS_TIMEOUT;
+-	int32_t BUSY;
+-	int64_t JS_EXPIRETIME;
+-	int64_t JS_TIMELIMIT;
++	__s32 JS_TIMEOUT;
++	__s32 BUSY;
++	__s64 JS_EXPIRETIME;
++	__s64 JS_TIMELIMIT;
+ 	struct JS_DATA_TYPE JS_SAVE;
+ 	struct JS_DATA_TYPE JS_CORR;
+ };
 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
 index 9bbd040..54e2549 100644
 --- a/include/linux/kallsyms.h



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:15:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:15:13 -0400
Subject: rpms/kdesdk/FC-5 .cvsignore, 1.31, 1.32 kdesdk.spec, 1.53,
	1.54 sources, 1.31, 1.32
Message-ID: <200606091715.k59HFDfw013767@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdesdk/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13698

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
update to 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	5 Apr 2006 13:07:59 -0000	1.31
+++ .cvsignore	9 Jun 2006 17:15:10 -0000	1.32
@@ -10,3 +10,4 @@
 kdesdk-3.5.0.tar.bz2
 kdesdk-3.5.1.tar.bz2
 kdesdk-3.5.2.tar.bz2
+kdesdk-3.5.3.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/kdesdk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdesdk.spec	5 Apr 2006 13:25:24 -0000	1.53
+++ kdesdk.spec	9 Jun 2006 17:15:10 -0000	1.54
@@ -7,14 +7,14 @@
 %define kdebase_epoch 6
 %define arts 1
 
-%define make_cvs 1
+%define make_cvs 0
 
 %define appdir %{_datadir}/applications/kde
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdesdk
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
@@ -212,7 +212,6 @@
 %{_libdir}/kde3/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
-%{_libdir}/*.a
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -224,12 +223,13 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/kde/*
-%ifarch %{ix86} ppc ia64 s390
 %{_libdir}/*.a
-%endif
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Apr 2006 13:08:00 -0000	1.31
+++ sources	9 Jun 2006 17:15:10 -0000	1.32
@@ -1 +1 @@
-0047e87532930a390d7a1826fd8cdaf5  kdesdk-3.5.2.tar.bz2
+75450d8905a2cc612df00927c7f81af9  kdesdk-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:15:55 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-dlm-headers.patch,1.1,1.2
Message-ID: <200606091715.k59HFtoI017138@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17003

Modified Files:
	linux-2.6-gfs2-dlm-headers.patch 
Log Message:
unifdef dlm.h

linux-2.6-gfs2-dlm-headers.patch:
 Kbuild |    3 +++
 1 files changed, 3 insertions(+)

Index: linux-2.6-gfs2-dlm-headers.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm-headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-gfs2-dlm-headers.patch	9 Jun 2006 17:12:11 -0000	1.1
+++ linux-2.6-gfs2-dlm-headers.patch	9 Jun 2006 17:15:52 -0000	1.2
@@ -5,5 +5,5 @@
  
  objhdr-y := version.h
 +
-+header-y += dlm.h dlm_device.h lock_dlm_plock.h
-+unifdef-y += gfs2_ondisk.h iflags.h
++header-y += dlm_device.h lock_dlm_plock.h
++unifdef-y += gfs2_ondisk.h iflags.h dlm.h



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:16:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:16:36 -0400
Subject: rpms/gnome-backgrounds/devel gnome-backgrounds.spec,1.6,1.7
Message-ID: <200606091716.k59HGaSH022439@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21332

Modified Files:
	gnome-backgrounds.spec 
Log Message:
more build reqs



Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-backgrounds.spec	9 Jun 2006 15:24:16 -0000	1.6
+++ gnome-backgrounds.spec	9 Jun 2006 17:16:34 -0000	1.7
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 
 Patch0: gnome-backgrounds-2.14.0-paths.patch
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:20:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:20:21 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.66,1.67
Message-ID: <200606091720.k59HKLHm030387@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30330

Modified Files:
	gnome-media.spec 
Log Message:



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-media.spec	29 May 2006 19:38:42 -0000	1.66
+++ gnome-media.spec	9 Jun 2006 17:20:19 -0000	1.67
@@ -35,6 +35,7 @@
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  nautilus-cd-burner-devel
 BuildRequires:  scrollkeeper
+BuildRequires:  gettext
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:20:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:20:44 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.6,
	1.7 glibc-kernheaders.spec, 1.143, 1.144 sources, 1.47, 1.48
Message-ID: <200606091720.k59HKiFb030553@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30524

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
Add GFS2 headers


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jun 2006 12:13:58 -0000	1.6
+++ .cvsignore	9 Jun 2006 17:20:42 -0000	1.7
@@ -1 +1 @@
-glibc-kernheaders-2.6.16-1.2240_FC6.tar.bz2
+glibc-kernheaders-2.6.16-1.2260_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- glibc-kernheaders.spec	4 Jun 2006 10:13:48 -0000	1.143
+++ glibc-kernheaders.spec	9 Jun 2006 17:20:42 -0000	1.144
@@ -1,12 +1,14 @@
+%define KVER 2.6.16-1.2260_FC6
+
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
 Obsoletes: kernel-headers
-Provides: kernel-headers = 2.6.16-1.2240_FC6
+Provides: kernel-headers = %{KVER}
 Prereq: fileutils initscripts >= 5.83
 BuildRequires: unifdef
 %undefine _enable_debug_packages
@@ -17,7 +19,7 @@
 %define _arch i386
 %endif
 
-Source0: glibc-kernheaders-2.6.16-1.2240_FC6.tar.bz2
+Source0: glibc-kernheaders-%{KVER}.tar.bz2
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -124,6 +126,11 @@
 /usr/include/*
 
 %changelog
+* Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-38
+- Update to 2.6.16-2.2260_FC6:
+- Add GFS2, DLM headers
+- Allow building for SPARC and Alpha if they're present
+
 * Wed May 24 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-37
 - Update to 2.6.16-1.2240_FC6:
 - Remove <asm-s390/sfp-machine.h> at Martin's request


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	1 Jun 2006 12:13:58 -0000	1.47
+++ sources	9 Jun 2006 17:20:42 -0000	1.48
@@ -1 +1 @@
-a5d942426c802beadacee4adeebbbed6  glibc-kernheaders-2.6.16-1.2240_FC6.tar.bz2
+1daf02630129c8d2ae355109f9516574  glibc-kernheaders-2.6.16-1.2260_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:21:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:21:07 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.67,1.68
Message-ID: <200606091721.k59HL72D030767@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30711

Modified Files:
	gnome-media.spec 
Log Message:
fix build reqs



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-media.spec	9 Jun 2006 17:20:19 -0000	1.67
+++ gnome-media.spec	9 Jun 2006 17:21:05 -0000	1.68
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.14.2
-Release:        2
+Release:        3
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
+- Fix missing BuildRequires
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:22:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:22:43 -0400
Subject: rpms/kernel/devel/configs config-generic,1.188,1.189
Message-ID: <200606091722.k59HMhVt031372@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv31345/configs

Modified Files:
	config-generic 
Log Message:
enable nandsim


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- config-generic	8 Jun 2006 00:35:44 -0000	1.188
+++ config-generic	9 Jun 2006 17:22:40 -0000	1.189
@@ -201,7 +201,7 @@
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NAND_IDS=m
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_ONENAND is not set
 
 CONFIG_MTD_REDBOOT_PARTS=m



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:24:09 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.30,1.31
Message-ID: <200606091724.k59HO9WD031771@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31711

Modified Files:
	gnome-menus.spec 
Log Message:
fix build reqs



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-menus.spec	6 Jun 2006 13:07:53 -0000	1.30
+++ gnome-menus.spec	9 Jun 2006 17:24:07 -0000	1.31
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.14.0
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -19,6 +19,7 @@
 BuildRequires: %{python}-devel >= 2.3.0
 BuildRequires: gamin-devel
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -90,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-4
+- More missing BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
 - Add a BuildRequires for perl-XML-Parser
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:33:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:33:19 -0400
Subject: rpms/kernel/devel/configs config-generic,1.189,1.190
Message-ID: <200606091733.k59HXJ71001812@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv1739/configs

Modified Files:
	config-generic 
Log Message:
2.6.17-rc6-git1


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- config-generic	9 Jun 2006 17:22:40 -0000	1.189
+++ config-generic	9 Jun 2006 17:33:16 -0000	1.190
@@ -2399,7 +2399,7 @@
 CONFIG_DLM=m
 CONFIG_DLM_DEVICE=m
 CONFIG_DLM_DEBUG=y
-# CONFIG_GFS2_FS is not set
+CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m
 CONFIG_GFS2_FS_LOCKING_DLM=m
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:33:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:33:16 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc6-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.449, 1.450 kernel-2.6.spec, 1.2260,
	1.2261 sources, 1.393, 1.394 upstream, 1.359, 1.360
Message-ID: <200606091733.k59HXGRY001788@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1739

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc6-git1.bz2.sign 
Log Message:
2.6.17-rc6-git1


--- NEW FILE patch-2.6.17-rc6-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEiR0nyGugalF9Dw4RAiEgAJ0bbJ+FJa+I4EPMM1tHVo9vg7PomACfe+Y7
6slqi7PssSudXFJCTjBIwv0=
=c6km
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- .cvsignore	6 Jun 2006 04:07:29 -0000	1.449
+++ .cvsignore	9 Jun 2006 17:32:57 -0000	1.450
@@ -4,3 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060602.tar.bz2
 patch-2.6.17-rc6.bz2
+patch-2.6.17-rc6-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2260
retrieving revision 1.2261
diff -u -r1.2260 -r1.2261
--- kernel-2.6.spec	9 Jun 2006 17:12:11 -0000	1.2260
+++ kernel-2.6.spec	9 Jun 2006 17:32:57 -0000	1.2261
@@ -246,6 +246,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc6.bz2
+Patch2: patch-2.6.17-rc6-git1.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -799,6 +800,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1815,6 +1817,7 @@
 
 * Fri Jun  9 2006 Dave Jones <davej at redhat.com>
 - Disable KGDB again, it broke serial console :(
+- 2.6.17-rc6-git1
 
 * Wed Jun  7 2006 Dave Jones <davej at redhat.com>
 - Experiment: Add KGDB.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- sources	6 Jun 2006 04:07:30 -0000	1.393
+++ sources	9 Jun 2006 17:32:58 -0000	1.394
@@ -1,3 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
 de03b1f1d050bb6c3bd68723299fa65b  xen-20060602.tar.bz2
+4507f5a167a2296cf5058691cae8fcda  patch-2.6.17-rc6-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- upstream	6 Jun 2006 04:07:30 -0000	1.359
+++ upstream	9 Jun 2006 17:32:58 -0000	1.360
@@ -1,2 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
+patch-2.6.17-rc6-git1.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:41:13 -0400
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.65,1.66
Message-ID: <200606091741.k59HfDBE003281@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kde-i18n/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3201

Modified Files:
	kde-i18n.spec 
Log Message:
fix dangling symlinks




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kde-i18n.spec	7 Jun 2006 12:49:16 -0000	1.65
+++ kde-i18n.spec	9 Jun 2006 17:41:11 -0000	1.66
@@ -4,7 +4,7 @@
 
 Name: kde-i18n
 Version: 3.5.3
-Release: 2
+Release: 3
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -645,21 +645,21 @@
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../$lang/docs/common $i
+        ln -sf ../../../docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../$lang/docs/common $i
+        ln -sf ../../docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../$lang/docs/common $i
+        ln -sf ../docs/common $i
       fi
     done
 
@@ -1145,6 +1145,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 1:3.5.3-3
+- fix dangling symlinks
+
 * Wed Jun 07 2006 Than Ngo <than at redhat.com> 1:3.5.3-2
 - add BR on gettext-devel
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:48:20 -0400
Subject: rpms/kdepim/FC-5 kdepim.spec,1.86,1.87
Message-ID: <200606091748.k59HmKeQ020877@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20674

Modified Files:
	kdepim.spec 
Log Message:
don't build kpilot on s390(x)



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdepim.spec	9 Jun 2006 15:53:22 -0000	1.86
+++ kdepim.spec	9 Jun 2006 17:48:18 -0000	1.87
@@ -6,7 +6,7 @@
 %define qt_version 1:3.3.5
 %define arts_version 8:1.5.3
 %define arts 1
-%define make_cvs 0
+%define make_cvs 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 17:51:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 13:51:53 -0400
Subject: rpms/kde-i18n/FC-5 kde-i18n.spec, 1.56, 1.57 sources, 1.35,
	1.36 subdirs-kde-i18n, 1.8, 1.9
Message-ID: <200606091751.k59HprcZ022258@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kde-i18n/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22206

Modified Files:
	kde-i18n.spec sources subdirs-kde-i18n 
Log Message:
update to 3.5.3



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/kde-i18n.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kde-i18n.spec	13 Apr 2006 11:22:55 -0000	1.56
+++ kde-i18n.spec	9 Jun 2006 17:51:50 -0000	1.57
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.2
-Release: 0.2.fc5
+Version: 3.5.3
+Release: 0.1.fc5
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -49,12 +49,15 @@
 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
 Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
+Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
 Requires: kdelibs >= 6:%{version}
 
 BuildPrereq: kdelibs-devel
 BuildPrereq: findutils
+BuildPrereq: gettext-devel
 
 %description
 Internationalization support for KDE
@@ -616,7 +619,7 @@
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
-  tar jxf $RPM_SOURCE_DIR/%{name}-$i-%{version}.tar.bz2
+  tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
 %build
@@ -628,62 +631,56 @@
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 for i in $(cat %{SOURCE1000}) ; do
-  make -C %{name}-$i-%{version} datadir=%{_datadir} DESTDIR=$RPM_BUILD_ROOT install
+  make -C %{name}-$i-%{version} datadir=%{_datadir} DESTDIR=%{buildroot} install
 done
 
 # make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
+pushd %{buildroot}%{_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../$lang/docs/common $i
+        ln -sf ../../../docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../$lang/docs/common $i
+        ln -sf ../../docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../$lang/docs/common $i
+        ln -sf ../docs/common $i
       fi
     done
 
     popd
   fi
 done
-
-rm -rf $RPM_BUILD_ROOT%{_docdir}/kinfocenter
-
-# workaround for rpm conflict
-for l in ca en_GB lt nb nn pt_BR pl; do
-  [ -d $l/common ] && (cd $l; rm -rf common && ln -s ../en/common common)
-done
-
 popd   
 
+rm -rf %{buildroot}%{_docdir}/kinfocenter
+
 # remove zero-length file
-for i in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -size 0) ; do
+for i in $(find %{buildroot}%{_docdir}/HTML -size 0) ; do
    rm -f $i
 done
 
 %if %{redhatify}
-   rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/flag.png
+   rm -f %{buildroot}%{_datadir}/locale/*/flag.png
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %if %{buildall}
 %files Afrikaans
@@ -813,6 +810,8 @@
 %defattr(-,root,root)
 %lang(et) %{_datadir}/locale/et/*
 %lang(et) %doc %{_docdir}/HTML/et
+%lang(et) %{_datadir}/apps/khangman/data/et
+%lang(et) %{_datadir}/apps/khangman/et.txt
 
 %if %{buildall}
 %files Basque
@@ -918,12 +917,10 @@
 %lang(ja) %{_datadir}/locale/ja/*
 %lang(ja) %doc %{_docdir}/HTML/ja
 
-%if %{buildall}
 %files Korean
 %defattr(-,root,root)
 %lang(ko) %{_datadir}/locale/ko/*
 %lang(ko) %doc %{_docdir}/HTML/ko
-%endif
 
 %if %{buildall}
 %files Kurdish
@@ -939,11 +936,9 @@
 %lang(lo) %doc %{_docdir}/HTML/lo
 %endif
 
-%if %{buildall}
 %files Lithuanian
 %defattr(-,root,root)
 %lang(lt) %{_datadir}/locale/lt/*
-%endif
 
 %if %{buildall}
 %files Latvian
@@ -1150,6 +1145,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 1:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.2.fc5
 - fix file conflict
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	3 Apr 2006 21:18:59 -0000	1.35
+++ sources	9 Jun 2006 17:51:50 -0000	1.36
@@ -1,37 +1,39 @@
-e5751af9f27c7fcb8ae691565c0150e0  kde-i18n-ar-3.5.2.tar.bz2
-d2ead3b2e13e851026fa9e685bec3dd7  kde-i18n-bg-3.5.2.tar.bz2
-7579ee4cd94f47b15773e85d8ba9437a  kde-i18n-bn-3.5.2.tar.bz2
-01793ef292bfa573ac6dc469af0105c3  kde-i18n-ca-3.5.2.tar.bz2
-8301411b09198bcdc5aec9096959b46f  kde-i18n-cs-3.5.2.tar.bz2
-de4a0854323591412dcb0fd973a828df  kde-i18n-da-3.5.2.tar.bz2
-af0d1dddc3fdbcc3f57f592c118336b7  kde-i18n-de-3.5.2.tar.bz2
-e08304492dca910772ef644522863d0b  kde-i18n-el-3.5.2.tar.bz2
-f9187d95c02ef569841b619d7dcd92b4  kde-i18n-en_GB-3.5.2.tar.bz2
-957dc11b57ade36543f09170dd319daa  kde-i18n-es-3.5.2.tar.bz2
-adb0d578fcc6f0489a70463a4ab27ba6  kde-i18n-et-3.5.2.tar.bz2
-56ccbbbe792ace2db28a36561ed73baa  kde-i18n-fi-3.5.2.tar.bz2
-d5ee851fdca9491dcb007d120e41ca66  kde-i18n-fr-3.5.2.tar.bz2
-c4d4f74171a00d99c942a454b4bf2031  kde-i18n-he-3.5.2.tar.bz2
-7bbf72d240bf936dffcb8a10b39bc0b8  kde-i18n-hi-3.5.2.tar.bz2
-5f56f6776207de40b6f08f15cf738f5d  kde-i18n-hu-3.5.2.tar.bz2
-2afa1257a615c57689d018cf4f0a5ce5  kde-i18n-is-3.5.2.tar.bz2
-f9593f15023920f274d633d93a1f71ac  kde-i18n-it-3.5.2.tar.bz2
-b267752f706d73792455671100b45e78  kde-i18n-ja-3.5.2.tar.bz2
-3173be9cf4021e7ceab17aa5208a9ff2  kde-i18n-nb-3.5.2.tar.bz2
-e626d95e7399fce30af12103d8e5abbc  kde-i18n-nl-3.5.2.tar.bz2
-7688c9e32d1bd0fe86d8929491436abf  kde-i18n-nn-3.5.2.tar.bz2
-15ae531f16c41983cc9513a3b39af360  kde-i18n-pa-3.5.2.tar.bz2
-ed2038f4a158435298e5d592c1897317  kde-i18n-pl-3.5.2.tar.bz2
-0b34803baab37652581a7930fa90f8a1  kde-i18n-pt-3.5.2.tar.bz2
-e2d4eca4287ca58d89a6b9e0afb1ed83  kde-i18n-pt_BR-3.5.2.tar.bz2
-ce015703992dfdfaa2b0a1a1b68613bf  kde-i18n-ro-3.5.2.tar.bz2
-6ada1113e2f16a04f67efff4a277afe2  kde-i18n-ru-3.5.2.tar.bz2
-ce005e23d4769643e80799e311d420fe  kde-i18n-sk-3.5.2.tar.bz2
-0abde80912580fc6981f12d33533c7a7  kde-i18n-sl-3.5.2.tar.bz2
-5646220dc1449378914bbace9cb0ed4f  kde-i18n-sr-3.5.2.tar.bz2
-15baccdec08346e5379bf88487a81e4d  kde-i18n-sv-3.5.2.tar.bz2
-2b9fcc05c46676421ac9c84833f238ec  kde-i18n-ta-3.5.2.tar.bz2
-f6f84000f374e0cacae6f74cb14be234  kde-i18n-tr-3.5.2.tar.bz2
-da83d2460f25478a61cf8eb09dd2540e  kde-i18n-uk-3.5.2.tar.bz2
-d451f1d96fd2bcdf7c432b6c9b0e5963  kde-i18n-zh_CN-3.5.2.tar.bz2
-2371a7ff043e9944e091ac30a48bcc07  kde-i18n-zh_TW-3.5.2.tar.bz2
+66358501eade79f2600f65767826268a  kde-i18n-ar-3.5.3.tar.bz2
+5ee352d11d976d133343575c0267e7df  kde-i18n-bg-3.5.3.tar.bz2
+a2764d9391d71125ebba255dcde003f7  kde-i18n-bn-3.5.3.tar.bz2
+c9519abf1f62bf69a7288f4144d680c9  kde-i18n-ca-3.5.3.tar.bz2
+e7a350afd2914188449749f10ad6d0bf  kde-i18n-cs-3.5.3.tar.bz2
+0e347230250eb65f8f6722ecacbaface  kde-i18n-da-3.5.3.tar.bz2
+e449fb462911191447210b8e2c8ccb8d  kde-i18n-de-3.5.3.tar.bz2
+aeeea7a9079ff5fd8f0bcfd34452ee4e  kde-i18n-el-3.5.3.tar.bz2
+1029cfba62fdd93fa2dc900111df2a4c  kde-i18n-en_GB-3.5.3.tar.bz2
+a84067e863f9c4eb6fdc1f64d03010b9  kde-i18n-es-3.5.3.tar.bz2
+e6b667f07e4426c2bdb1cda59b081272  kde-i18n-et-3.5.3.tar.bz2
+def712679b92b831b04ae704157f0c4f  kde-i18n-fi-3.5.3.tar.bz2
+02cd975bb784378b443855b8827b9607  kde-i18n-fr-3.5.3.tar.bz2
+2800fd107ca1879abec14d0600704a5d  kde-i18n-he-3.5.3.tar.bz2
+cde643d8b8760d092a16b475fdef3e89  kde-i18n-hi-3.5.3.tar.bz2
+18faeab413d89d3c9bde9fe1a6fb17a6  kde-i18n-hu-3.5.3.tar.bz2
+ecfd4dcb121a15fc69af80354d48d0f1  kde-i18n-is-3.5.3.tar.bz2
+ad8e550f7a2656fa6c5210881fd09bc7  kde-i18n-it-3.5.3.tar.bz2
+0bd28615477ec56978dcf5e700c1e5c3  kde-i18n-ja-3.5.3.tar.bz2
+e36ddd66007a7a405369731bea56ae83  kde-i18n-lt-3.5.3.tar.bz2
+b8698e7aa889cc25a65c948fb4228b9c  kde-i18n-nb-3.5.3.tar.bz2
+ebc1507bf23421c07e0e1bce2bcb216e  kde-i18n-nl-3.5.3.tar.bz2
+eed3d9cd4271df35b78fdb7aaf9c11e4  kde-i18n-nn-3.5.3.tar.bz2
+1bf7fb2adbf61536be4872d8be1dd5cd  kde-i18n-pa-3.5.3.tar.bz2
+7a57d7bf02a2700c71cb495894e08f81  kde-i18n-pl-3.5.3.tar.bz2
+31017190b2d125f4b072b84e6f8752f4  kde-i18n-pt-3.5.3.tar.bz2
+d76371a7a63cd728bfc6ff26c8f059bc  kde-i18n-pt_BR-3.5.3.tar.bz2
+e1a7a05994927ab9ac76174430d76991  kde-i18n-ro-3.5.3.tar.bz2
+a30e44b4dcaf0ff2937eb870903f3a47  kde-i18n-ru-3.5.3.tar.bz2
+6d74e2e2d58e0c10c177d9852e283f14  kde-i18n-sk-3.5.3.tar.bz2
+49f0579ca96ecbe65cee0ad13e2fd144  kde-i18n-sl-3.5.3.tar.bz2
+d8823f8b5765a61b290346257c660c61  kde-i18n-sr-3.5.3.tar.bz2
+dad7a462acf4dc90790aaeb63320e839  kde-i18n-sv-3.5.3.tar.bz2
+987f75a1f89abaa6f3562ef94d75d84d  kde-i18n-ta-3.5.3.tar.bz2
+598d5f55f9e4512757ee40f802968097  kde-i18n-tr-3.5.3.tar.bz2
+a852a8e6f9ee1c807e16f511ba4981a3  kde-i18n-uk-3.5.3.tar.bz2
+b57a6684ef11d1b0ac6d18824ac42799  kde-i18n-zh_CN-3.5.3.tar.bz2
+957f858c53efa4c62ed4bfa3dd06ddfe  kde-i18n-zh_TW-3.5.3.tar.bz2
+6076f24c27ad2a52eb3675e10e6b2af9  kde-i18n-ko-3.5.3.tar.bz2


Index: subdirs-kde-i18n
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/subdirs-kde-i18n,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- subdirs-kde-i18n	8 Mar 2006 15:19:17 -0000	1.8
+++ subdirs-kde-i18n	9 Jun 2006 17:51:50 -0000	1.9
@@ -17,6 +17,8 @@
 is
 it
 ja
+ko
+lt
 nb
 nl
 nn



From fedora-cvs-commits at redhat.com  Fri Jun  9 18:10:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 14:10:00 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.74,1.75
Message-ID: <200606091810.k59IA0x1026186@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26167

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-8
- Add our friend, libtool, to BuildRequires.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xorg-x11-server.spec	9 Jun 2006 10:39:02 -0000	1.74
+++ xorg-x11-server.spec	9 Jun 2006 18:09:50 -0000	1.75
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   7
+Release:   8
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -57,6 +57,7 @@
 #BuildRequires: automake17
 BuildRequires: automake
 BuildRequires: autoconf
+BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 0.99.1
 BuildRequires: xorg-x11-proto-devel >= 7.0-13
@@ -545,6 +546,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-8
+- Add our friend, libtool, to BuildRequires.
+
 * Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-7
 - Change "BuildRequires: freetype-devel >= 2.1.10" to 2.1.9, as Xorg 7.0
   contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on



From fedora-cvs-commits at redhat.com  Fri Jun  9 18:23:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 14:23:31 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.144,1.145
Message-ID: <200606091823.k59INVnl013231@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13166

Modified Files:
	glibc-kernheaders.spec 
Log Message:
remove dist from release


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- glibc-kernheaders.spec	9 Jun 2006 17:20:42 -0000	1.144
+++ glibc-kernheaders.spec	9 Jun 2006 18:23:28 -0000	1.145
@@ -3,7 +3,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 38%{?dist}
+Release: 38
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux



From fedora-cvs-commits at redhat.com  Fri Jun  9 18:24:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 14:24:56 -0400
Subject: rpms/kdemultimedia/FC-4 kdemultimedia-3.5.3-config.patch, NONE,
	1.1 kdemultimedia.spec, 1.48, 1.49 sources, 1.31,
	1.32 kdemultimedia-3.4.0-config.patch, 1.1, NONE
Message-ID: <200606091824.k59IOubF013837@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13775

Modified Files:
	kdemultimedia.spec sources 
Added Files:
	kdemultimedia-3.5.3-config.patch 
Removed Files:
	kdemultimedia-3.4.0-config.patch 
Log Message:
3.5.3


kdemultimedia-3.5.3-config.patch:
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdemultimedia-3.5.3-config.patch ---
--- kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am.config	2005-02-03 23:48:26.000000000 +0100
+++ kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am	2005-02-28 20:47:00.223979671 +0100
@@ -9,8 +9,8 @@
 
 noinst_LTLIBRARIES  = libworkman.la
 
-libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
+libworkman_la_LDFLAGS = $(all_libraries)
+libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTSC_LIBS) $(ARTS_LIBASOUND)
 
 libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
 database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdemultimedia.spec	11 Apr 2006 21:13:46 -0000	1.48
+++ kdemultimedia.spec	9 Jun 2006 18:24:54 -0000	1.49
@@ -26,7 +26,7 @@
 %define patch_name -patched
 %endif
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Epoch: 6
 Name: kdemultimedia
@@ -225,6 +225,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	11 Apr 2006 21:13:46 -0000	1.31
+++ sources	9 Jun 2006 18:24:54 -0000	1.32
@@ -1 +1 @@
-54f9947051ee5cf50c81a5ea382943f1  kdemultimedia-3.5.2-patched.tar.bz2
+52bb137a4605a35e56ec9dc1070e0e28  kdemultimedia-3.5.3-patched.tar.bz2


--- kdemultimedia-3.4.0-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 18:30:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 14:30:30 -0400
Subject: rpms/kdemultimedia/FC-4 kdemultimedia.spec,1.49,1.50
Message-ID: <200606091830.k59IUUxU015967@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15896

Modified Files:
	kdemultimedia.spec 
Log Message:
apply correct patch file



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdemultimedia.spec	9 Jun 2006 18:24:54 -0000	1.49
+++ kdemultimedia.spec	9 Jun 2006 18:30:14 -0000	1.50
@@ -38,7 +38,7 @@
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 Patch1: kde-libtool.patch
-Patch2: kdemultimedia-3.4.0-config.patch
+Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
 Prereq: /sbin/ldconfig



From fedora-cvs-commits at redhat.com  Fri Jun  9 18:41:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 14:41:43 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.145,1.146
Message-ID: <200606091841.k59IfhAR016068@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14209

Modified Files:
	glibc-kernheaders.spec 
Log Message:
bump release


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- glibc-kernheaders.spec	9 Jun 2006 18:23:28 -0000	1.145
+++ glibc-kernheaders.spec	9 Jun 2006 18:41:41 -0000	1.146
@@ -3,7 +3,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 38
+Release: 39
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -126,6 +126,9 @@
 /usr/include/*
 
 %changelog
+* Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-39
+- Bump release to 39 to retry build
+
 * Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-38
 - Update to 2.6.16-2.2260_FC6:
 - Add GFS2, DLM headers



From fedora-cvs-commits at redhat.com  Fri Jun  9 18:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 14:49:52 -0400
Subject: rpms/kdepim/FC-5 kdepim.spec,1.87,1.88
Message-ID: <200606091849.k59InqkX010549@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10537

Modified Files:
	kdepim.spec 
Log Message:
cleanup specfile



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdepim.spec	9 Jun 2006 17:48:18 -0000	1.87
+++ kdepim.spec	9 Jun 2006 18:49:50 -0000	1.88
@@ -172,21 +172,12 @@
 done
 popd
 
-desktop-file-install \
-   --vendor "" \
-   --delete-original \
-   --dir %{buildroot}%{_datadir}/applications/kde \
-   --add-only-show-in="KDE" \
-   %{buildroot}%{_datadir}/applications/kde/konsolekalendar.desktop \
-   %{buildroot}%{_datadir}/applications/kde/knotes.desktop \
-%ifnarch s390 s390x
-   %{buildroot}%{_datadir}/applications/kde/kpilotdaemon.desktop \
-   %{buildroot}%{_datadir}/applications/kde/kpilot.desktop \
-%endif
-   %{buildroot}%{_datadir}/applications/kde/KMail.desktop \
-   %{buildroot}%{_datadir}/applications/kde/KNode.desktop \
-   %{buildroot}%{_datadir}/applications/kde/Kontact.desktop \
-   %{buildroot}%{_datadir}/applications/kde/KOrn.desktop
+for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
+   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+   fi
+done
 
 %post -p /sbin/ldconfig
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 19:38:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 15:38:33 -0400
Subject: rpms/kdeaddons/FC-5 kdeaddons-3.5.1-rgb.txt-path.patch, NONE,
	1.1 kdeaddons-3.5.3-sdl.patch, NONE, 1.1 kdeaddons.spec, 1.46,
	1.47 sources, 1.31, 1.32
Message-ID: <200606091938.k59JcXk0010648@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10611

Modified Files:
	kdeaddons.spec sources 
Added Files:
	kdeaddons-3.5.1-rgb.txt-path.patch kdeaddons-3.5.3-sdl.patch 
Log Message:
update to 3.5.3


kdeaddons-3.5.1-rgb.txt-path.patch:
 kolourpicker.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdeaddons-3.5.1-rgb.txt-path.patch ---
--- kicker-applets/kolourpicker/kolourpicker.cpp~	2005-10-10 17:53:16.000000000 +0300
+++ kicker-applets/kolourpicker/kolourpicker.cpp	2005-11-25 00:09:18.000000000 +0200
@@ -340,7 +340,7 @@
 	static QStringList NullList;
 	if (m_colorNames.isEmpty())
 	{
-		QFile f("/usr/lib/X11/rgb.txt");
+		QFile f("/usr/share/X11/rgb.txt");
 		if (!f.open(IO_ReadOnly))
 			return NullList;
 		QTextStream str(&f);

kdeaddons-3.5.3-sdl.patch:
 tippercanoe/main.cpp    |    2 +-
 tippercanoe/sdlwrap.cpp |    2 ++
 tippercanoe/syna.h      |    2 +-
 tyler/main.cpp          |    4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdeaddons-3.5.3-sdl.patch ---
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than	2006-06-07 18:52:09.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp	2006-06-07 18:54:06.000000000 +0200
@@ -183,6 +183,7 @@
 	SDL_UpdateRect(surface, 0, 0, 0, 0);
 }
 
+#if 0
 int SdlScreen::winID(void)
 {
 	SDL_SysWMinfo info;
@@ -195,3 +196,4 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than	2006-06-07 18:54:19.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp	2006-06-07 18:54:27.000000000 +0200
@@ -112,7 +112,7 @@
 {
 	time_t timer = time(NULL);
 
-	printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
+	//printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
 	fflush(stdout);
 
 	int frames = 0;
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than	2006-06-07 18:51:25.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h	2006-06-07 18:51:56.000000000 +0200
@@ -108,7 +108,7 @@
 	int  sizeUpdate();
 	bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit);
 	void show();
-	int winID();
+	//int winID();
 };
 
 // core
--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than	2006-06-07 18:54:38.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp	2006-06-07 18:55:00.000000000 +0200
@@ -52,6 +52,7 @@
 SDL_Surface *screen;
 }
 
+#if 0
 int winID(void)
 {
 	SDL_SysWMinfo info;
@@ -61,6 +62,7 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
 
 int main(int, char **)
 {
@@ -74,7 +76,7 @@
 	access_mutex = SDL_CreateMutex();
 
 	init_renderer1();
-	printf("%u\n", winID());
+	//printf("%u\n", winID());
 	fflush(stdout);
 	init_renderer2();
 	thread = SDL_CreateThread((int (*)(void *))renderer, NULL);


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/kdeaddons.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeaddons.spec	6 Apr 2006 11:47:17 -0000	1.46
+++ kdeaddons.spec	9 Jun 2006 19:38:28 -0000	1.47
@@ -1,10 +1,10 @@
 %define xmms 0
 %define debug 0
 %define final 1
-%define make_cvs 1
+%define make_cvs 0
 
 %define qt_version 3.3.5
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define sdl_version 1.2.0
 
 %define kdelibs_epoch 6
@@ -14,7 +14,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
@@ -24,6 +24,8 @@
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
+Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
+Patch3: kdeaddons-3.5.3-sdl.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -32,6 +34,9 @@
 Requires: arts >= %{arts_epoch}:%{arts_version}
 Requires: SDL >= %{sdl_version}
 
+BuildPrereq: autoconf
+BuildPrereq: libtool
+BuildPrereq: automake
 BuildPrereq: kdegames-devel
 BuildPrereq: kdemultimedia-devel
 BuildPrereq: zlib-devel
@@ -75,6 +80,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
+%patch2 -p0 -b .rgb.txt-path
+%patch3 -p1 -b .sdl
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -114,7 +121,7 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
@@ -171,6 +178,9 @@
 %endif
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Thu Apr 06 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	6 Apr 2006 10:48:52 -0000	1.31
+++ sources	9 Jun 2006 19:38:29 -0000	1.32
@@ -1 +1 @@
-affb74174c6e3eda2c0748d6c052c8ff  kdeaddons-3.5.2.tar.bz2
+ea25326c6a775bbfa40d0efabed34c0d  kdeaddons-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 19:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 15:43:55 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.84,
	1.85 libselinux.spec, 1.202, 1.203
Message-ID: <200606091943.k59JhtFS011797@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11765

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-2
- Add selinux_getpolicytype()


libselinux-rhat.patch:
 include/selinux/selinux.h |    7 +++++++
 src/selinux.py            |    1 +
 src/selinux_config.c      |   31 +++++++++++++++++++++++++++++++
 src/selinux_internal.h    |    1 +
 src/selinuxswig.i         |    1 +
 src/selinuxswig_wrap.c    |   22 ++++++++++++++++++++++
 6 files changed, 63 insertions(+)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- libselinux-rhat.patch	1 Jun 2006 17:25:22 -0000	1.84
+++ libselinux-rhat.patch	9 Jun 2006 19:43:52 -0000	1.85
@@ -1,169 +1,128 @@
-diff -Nurp libselinux-1.29.7.orig/src/canonicalize_context.c libselinux-1.29.7/src/canonicalize_context.c
---- libselinux-1.29.7.orig/src/canonicalize_context.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/canonicalize_context.c	2006-05-31 20:42:47.000000000 +0800
-@@ -18,6 +18,9 @@ int security_canonicalize_context_raw(se
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/check_context.c libselinux-1.29.7/src/check_context.c
---- libselinux-1.29.7.orig/src/check_context.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/check_context.c	2006-05-31 20:43:24.000000000 +0800
-@@ -14,6 +14,9 @@ int security_check_context_raw(security_
- 	char path[PATH_MAX];
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/compute_av.c libselinux-1.29.7/src/compute_av.c
---- libselinux-1.29.7.orig/src/compute_av.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/compute_av.c	2006-05-31 20:44:00.000000000 +0800
-@@ -21,6 +21,9 @@ int security_compute_av_raw(security_con
- 	size_t len;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0) 
-diff -Nurp libselinux-1.29.7.orig/src/compute_create.c libselinux-1.29.7/src/compute_create.c
---- libselinux-1.29.7.orig/src/compute_create.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/compute_create.c	2006-05-31 20:44:53.000000000 +0800
-@@ -20,6 +20,9 @@ int security_compute_create_raw(security
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/create", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/compute_member.c libselinux-1.29.7/src/compute_member.c
---- libselinux-1.29.7.orig/src/compute_member.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/compute_member.c	2006-05-31 20:45:36.000000000 +0800
-@@ -20,6 +20,9 @@ int security_compute_member_raw(security
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/member", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/compute_relabel.c libselinux-1.29.7/src/compute_relabel.c
---- libselinux-1.29.7.orig/src/compute_relabel.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/compute_relabel.c	2006-05-31 20:46:04.000000000 +0800
-@@ -20,6 +20,9 @@ int security_compute_relabel_raw(securit
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/compute_user.c libselinux-1.29.7/src/compute_user.c
---- libselinux-1.29.7.orig/src/compute_user.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/compute_user.c	2006-05-31 20:46:32.000000000 +0800
-@@ -21,6 +21,9 @@ int security_compute_user_raw(security_c
- 	int fd, ret;
- 	unsigned int i, nel;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/user", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/disable.c libselinux-1.29.7/src/disable.c
---- libselinux-1.29.7.orig/src/disable.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/disable.c	2006-05-31 20:47:27.000000000 +0800
-@@ -15,6 +15,9 @@ int security_disable(void)
- 	char path[PATH_MAX];
- 	char buf[20];
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/disable", selinux_mnt);
- 	fd = open(path, O_WRONLY);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/enabled.c libselinux-1.29.7/src/enabled.c
---- libselinux-1.29.7.orig/src/enabled.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/enabled.c	2006-05-31 20:48:30.000000000 +0800
-@@ -65,6 +65,9 @@ int is_selinux_mls_enabled(void)
- 	char buf[20], path[PATH_MAX];
- 	int fd, ret, enabled = 0;
- 
-+	if (!selinux_mnt)
-+		return enabled;
-+
- 	snprintf(path, sizeof path, "%s/mls", selinux_mnt);
- 	fd = open(path, O_RDONLY);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/getenforce.c libselinux-1.29.7/src/getenforce.c
---- libselinux-1.29.7.orig/src/getenforce.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/getenforce.c	2006-05-31 20:48:56.000000000 +0800
-@@ -15,6 +15,9 @@ int security_getenforce(void)
- 	char path[PATH_MAX];
- 	char buf[20];
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
- 	fd = open(path, O_RDONLY);
- 	if (fd < 0)
-diff -Nurp libselinux-1.29.7.orig/src/load_policy.c libselinux-1.29.7/src/load_policy.c
---- libselinux-1.29.7.orig/src/load_policy.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/load_policy.c	2006-05-31 20:49:33.000000000 +0800
-@@ -20,6 +20,9 @@ int security_load_policy(void *data, siz
- 	char path[PATH_MAX];
- 	int fd, ret;
- 	
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/load", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0) 
-diff -Nurp libselinux-1.29.7.orig/src/policyvers.c libselinux-1.29.7/src/policyvers.c
---- libselinux-1.29.7.orig/src/policyvers.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/policyvers.c	2006-05-31 20:50:22.000000000 +0800
-@@ -19,6 +19,9 @@ int security_policyvers(void)
- 	char buf[20];
- 	unsigned vers = DEFAULT_POLICY_VERSION;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/policyvers", selinux_mnt);
- 	fd = open(path, O_RDONLY);
- 	if (fd < 0) {
-diff -Nurp libselinux-1.29.7.orig/src/setenforce.c libselinux-1.29.7/src/setenforce.c
---- libselinux-1.29.7.orig/src/setenforce.c	2006-01-20 23:37:52.000000000 +0800
-+++ libselinux-1.29.7/src/setenforce.c	2006-05-31 20:50:51.000000000 +0800
-@@ -15,6 +15,9 @@ int security_setenforce(int value)
- 	char path[PATH_MAX];
- 	char buf[20];
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.12/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2006-05-18 12:11:17.000000000 -0400
++++ libselinux-1.30.12/include/selinux/selinux.h	2006-06-09 15:29:18.000000000 -0400
+@@ -361,6 +361,13 @@
+ extern int selinux_getenforcemode(int *enforce);
+ 
+ /*
++  selinux_getpolicytype reads the /etc/selinux/config file and determines 
++  what the default policy for the machine is.  Calling application must 
++  free policytype.
++ */
++extern int selinux_getpolicytype(char **policytype);
++
++/*
+   selinux_policy_root reads the /etc/selinux/config file and returns 
+   the directory path under which the compiled policy file and context 
+   configuration files exist.
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.30.12/src/selinux_config.c
+--- nsalibselinux/src/selinux_config.c	2006-05-23 06:19:32.000000000 -0400
++++ libselinux-1.30.12/src/selinux_config.c	2006-06-09 15:42:35.000000000 -0400
+@@ -124,6 +124,37 @@
+ }
+ hidden_def(selinux_getenforcemode)
+ 
++int selinux_getpolicytype(char **intype) {
++  int ret=-1;
++  char *type=NULL;
++  char *end=NULL;
++  FILE *cfg = fopen(SELINUXCONFIG,"r");
++  char buf[4097];
++  int len=sizeof(SELINUXTYPETAG)-1;
++  if (!cfg) {
++    cfg = fopen(SECURITYCONFIG,"r");
++  }
++  if (cfg) {
++    while (fgets_unlocked(buf, 4096, cfg)) {
++      if (strncmp(buf,SELINUXTYPETAG,len))
++	continue;
++      type = strdupa(buf+sizeof(SELINUXTYPETAG)-1);
++      end  = type + strlen(type)-1;
++      while ((end > type) && 
++	     (isspace(*end) || iscntrl(*end))) {
++	      *end = 0;
++	      end--;
++      }
++      *intype=type;
++      ret=0;
++      break;
++    }
++    fclose(cfg);
++  }
++  return ret;
++}
++hidden_def(selinux_getpolicytype)
++
+ static char *selinux_policyroot = NULL;
+ static char *selinux_rootpath = NULL;
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.30.12/src/selinux_internal.h
+--- nsalibselinux/src/selinux_internal.h	2006-05-23 06:19:32.000000000 -0400
++++ libselinux-1.30.12/src/selinux_internal.h	2006-06-09 15:29:18.000000000 -0400
+@@ -64,6 +64,7 @@
+ hidden_proto(selinux_usersconf_path);
+ hidden_proto(selinux_translations_path);
+ hidden_proto(selinux_getenforcemode);
++hidden_proto(selinux_getpolicytype);
+ hidden_proto(selinux_raw_to_trans_context);
+ hidden_proto(selinux_trans_to_raw_context);
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-1.30.12/src/selinux.py
+--- nsalibselinux/src/selinux.py	2006-05-15 09:43:24.000000000 -0400
++++ libselinux-1.30.12/src/selinux.py	2006-06-09 15:29:18.000000000 -0400
+@@ -102,6 +102,7 @@
+ is_context_customizable = _selinux.is_context_customizable
+ selinux_trans_to_raw_context = _selinux.selinux_trans_to_raw_context
+ selinux_raw_to_trans_context = _selinux.selinux_raw_to_trans_context
++selinux_getpolicytype = _selinux.selinux_getpolicytype
+ getseuserbyname = _selinux.getseuserbyname
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.12/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2006-05-15 09:43:24.000000000 -0400
++++ libselinux-1.30.12/src/selinuxswig.i	2006-06-09 15:29:18.000000000 -0400
+@@ -126,4 +126,5 @@
+ %typemap(argout) char ** {
+ 	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
++extern int selinux_getpolicytype(char **enforce);
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.30.12/src/selinuxswig_wrap.c
+--- nsalibselinux/src/selinuxswig_wrap.c	2006-05-15 09:43:24.000000000 -0400
++++ libselinux-1.30.12/src/selinuxswig_wrap.c	2006-06-09 15:29:18.000000000 -0400
+@@ -4153,6 +4153,27 @@
+ }
+ 
+ 
++SWIGINTERN PyObject *_wrap_selinux_getpolicytype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char **arg1 = (char **) 0 ;
++  int result;
++  char *temp1 ;
++  
++  {
++    arg1 = &temp1;
++  }
++  if (!PyArg_ParseTuple(args,(char *)":selinux_getpolicytype")) SWIG_fail;
++  result = (int)selinux_getpolicytype(arg1);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
++  }
++  return resultobj;
++fail:
++  return NULL;
++}
++
++
+ SWIGINTERN PyObject *_wrap_getseuserbyname(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   char *arg1 = (char *) 0 ;
+@@ -4253,6 +4274,7 @@
+ 	 { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL},
++	 { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL},
+ 	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
+ 	 { NULL, NULL, 0, NULL }
+ };


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- libselinux.spec	5 Jun 2006 18:52:19 -0000	1.202
+++ libselinux.spec	9 Jun 2006 19:43:52 -0000	1.203
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.12
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -115,6 +117,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-2
+- Add selinux_getpolicytype()
+
 * Thu Jun 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-1
 - Upgrade to latest from NSA
 	* Merged !selinux_mnt checks from Ian Kent.



From fedora-cvs-commits at redhat.com  Fri Jun  9 19:44:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 15:44:23 -0400
Subject: rpms/kdegames/FC-5 kdegames.spec,1.49,1.50 sources,1.35,1.36
Message-ID: <200606091944.k59JiNqC011989@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegames/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11933

Modified Files:
	kdegames.spec sources 
Log Message:
3.5.3



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/kdegames.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdegames.spec	4 Apr 2006 15:57:22 -0000	1.49
+++ kdegames.spec	9 Jun 2006 19:44:20 -0000	1.50
@@ -18,7 +18,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Epoch: 6
 Summary: K Desktop Environment - Games
@@ -153,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	4 Apr 2006 15:57:22 -0000	1.35
+++ sources	9 Jun 2006 19:44:20 -0000	1.36
@@ -1 +1 @@
-143bbcb02e997767b4ba15f6bb5a653e  kdegames-3.5.2-patched.tar.bz2
+2120de8516ee24e989a1f9b097d0c572  kdegames-3.5.3-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 19:48:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 15:48:37 -0400
Subject: rpms/kdegames/FC-4 kdegames.spec, 1.41, 1.42 sources, 1.31,
	1.32 kdegames-3.5.0-s390x.patch, 1.1, NONE
Message-ID: <200606091948.k59JmbcH028141@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegames/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28091

Modified Files:
	kdegames.spec sources 
Removed Files:
	kdegames-3.5.0-s390x.patch 
Log Message:
3.5.3



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/kdegames.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdegames.spec	11 Apr 2006 22:41:18 -0000	1.41
+++ kdegames.spec	9 Jun 2006 19:48:34 -0000	1.42
@@ -14,7 +14,7 @@
 %define qt_version 3.3.4
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Epoch: 6
 Summary: K Desktop Environment - Games
@@ -142,6 +142,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4 
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	11 Apr 2006 22:41:18 -0000	1.31
+++ sources	9 Jun 2006 19:48:34 -0000	1.32
@@ -1 +1 @@
-143bbcb02e997767b4ba15f6bb5a653e  kdegames-3.5.2-patched.tar.bz2
+2120de8516ee24e989a1f9b097d0c572  kdegames-3.5.3-patched.tar.bz2


--- kdegames-3.5.0-s390x.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 20:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 16:09:16 -0400
Subject: rpms/kdesdk/FC-4 kdesdk.spec,1.40,1.41 sources,1.27,1.28
Message-ID: <200606092009.k59K9GeB000640@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdesdk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv591

Modified Files:
	kdesdk.spec sources 
Log Message:
3.5.3



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/kdesdk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdesdk.spec	12 Apr 2006 07:23:45 -0000	1.40
+++ kdesdk.spec	9 Jun 2006 20:09:13 -0000	1.41
@@ -11,7 +11,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdesdk
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
@@ -211,7 +211,6 @@
 %{_libdir}/kde3/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
-%{_libdir}/*.a
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -223,12 +222,13 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/kde/*
-%ifarch %{ix86} ppc ia64 s390
 %{_libdir}/*.a
-%endif
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3:3.5.3-0.1.fc4 
+- update to 3.5.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 2:3.5.2-0.1.fc4 
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	12 Apr 2006 07:23:45 -0000	1.27
+++ sources	9 Jun 2006 20:09:13 -0000	1.28
@@ -1 +1 @@
-0047e87532930a390d7a1826fd8cdaf5  kdesdk-3.5.2.tar.bz2
+75450d8905a2cc612df00927c7f81af9  kdesdk-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 20:21:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 16:21:27 -0400
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.18,1.19
Message-ID: <200606092021.k59KLRCR019183@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19126

Modified Files:
	gnome-mime-data.spec 
Log Message:
fix build reqs



Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-mime-data.spec	6 Jun 2006 13:17:43 -0000	1.18
+++ gnome-mime-data.spec	9 Jun 2006 20:21:24 -0000	1.19
@@ -1,13 +1,14 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.4.2
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 ### WE ARE NOT NOARCH, /usr/lib/pkgconfig is not noarch. 
 ### don't change this and don't file a bug. ;-)
@@ -62,6 +63,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.4.2-3
+- Add a BuildRequires for gettext
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.4.2-2
 - Add a BuildRequires for perl-XML-Parser
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 20:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 16:46:16 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.15,1.16
Message-ID: <200606092046.k59KkGHc025667@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25618

Modified Files:
	gnome-mount.spec 
Log Message:
Fix buildrequires



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-mount.spec	15 May 2006 13:48:19 -0000	1.15
+++ gnome-mount.spec	9 Jun 2006 20:46:14 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 6 
+Release: 7 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.31
 BuildRequires: gnome-keyring-devel
 BuildRequires: libgnomeui-devel
+BuildRequires: gettext
 Requires: hal >= 0.5.7
 Requires: dbus >= 0.60
 
@@ -65,6 +66,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.4-7
+- Fix BuildRequires
+
 * Mon May 15 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-6
 - Patch from Brian Pepple <bdpepple at ameritech.net> Add BR for 
   gnome-keyring-devel & libgnomeui-devel.



From fedora-cvs-commits at redhat.com  Fri Jun  9 20:46:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 16:46:21 -0400
Subject: rpms/libusb/devel libusb.spec,1.27,1.28
Message-ID: <200606092046.k59KkLaT025714@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25689

Modified Files:
	libusb.spec 
Log Message:
Fixing missing (Build)Requires.


Index: libusb.spec
===================================================================
RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libusb.spec	1 Jun 2006 11:21:38 -0000	1.27
+++ libusb.spec	9 Jun 2006 20:46:18 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices.
 Name: libusb
 Version: 0.1.12
-Release: 4
+Release: 5
 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
 Patch0: libusb-0.1.12-libusbconfig.patch
 License: LGPL
@@ -10,6 +10,7 @@
 URL: http://sourceforge.net/projects/libusb/
 BuildRequires: docbook-utils, pkgconfig
 BuildRequires: docbook-dtds >= 1.0-5, docbook-utils-pdf
+BuildRequires: automake, libtool 
 ExcludeArch: s390 s390x
 
 %description
@@ -19,6 +20,7 @@
 Summary: Development files for libusb.
 Group: Development/Libraries
 Requires: %{name} = %{version}
+Requires: pkgconfig
 
 %description devel
 This package contains the header files and documentation needed to
@@ -70,6 +72,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Jun 08 2006 Jesse Keating <jkeating at redhat.com> 0.1.12-5
+- Add missing BR automake, libtool.
+- Add missing Requires in -devel on pkgconfig
+
 * Thu Jun  1 2006 Jindrich Novy <jnovy at redhat.com> 0.1.12-4
 - remove .la files from libusb-devel (#172643)
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 20:50:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 16:50:55 -0400
Subject: rpms/gnome-netstatus/devel gnome-netstatus.spec,1.29,1.30
Message-ID: <200606092050.k59Kotve009638@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-netstatus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9544

Modified Files:
	gnome-netstatus.spec 
Log Message:
Fix build requires



Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-netstatus.spec	6 Jun 2006 13:29:46 -0000	1.29
+++ gnome-netstatus.spec	9 Jun 2006 20:50:52 -0000	1.30
@@ -7,7 +7,7 @@
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.0
-Release: 4
+Release: 5
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2
 License: GPL
@@ -28,6 +28,7 @@
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: gnome-doc-utils
+BuildRequires: gettext
 
 %description
 gnome-netstatus is an applet which provides information about a
@@ -97,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-5
+- Fix BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-4
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 20:52:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 16:52:04 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.16,1.17
Message-ID: <200606092052.k59Kq4se010129@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10076

Modified Files:
	gnome-mount.spec 
Log Message:
more build reqs



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-mount.spec	9 Jun 2006 20:46:14 -0000	1.16
+++ gnome-mount.spec	9 Jun 2006 20:52:01 -0000	1.17
@@ -12,6 +12,7 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 Requires: hal >= 0.5.7
 Requires: dbus >= 0.60
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 21:31:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 17:31:47 -0400
Subject: rpms/kdeaddons/FC-4 kdeaddons-3.5.3-sdl.patch, NONE,
	1.1 kdeaddons.spec, 1.40, 1.41 sources, 1.29, 1.30
Message-ID: <200606092131.k59LVl3R002536@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2429

Modified Files:
	kdeaddons.spec sources 
Added Files:
	kdeaddons-3.5.3-sdl.patch 
Log Message:
3.5.3


kdeaddons-3.5.3-sdl.patch:
 tippercanoe/main.cpp    |    2 +-
 tippercanoe/sdlwrap.cpp |    2 ++
 tippercanoe/syna.h      |    2 +-
 tyler/main.cpp          |    4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdeaddons-3.5.3-sdl.patch ---
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than	2006-06-07 18:52:09.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp	2006-06-07 18:54:06.000000000 +0200
@@ -183,6 +183,7 @@
 	SDL_UpdateRect(surface, 0, 0, 0, 0);
 }
 
+#if 0
 int SdlScreen::winID(void)
 {
 	SDL_SysWMinfo info;
@@ -195,3 +196,4 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than	2006-06-07 18:54:19.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp	2006-06-07 18:54:27.000000000 +0200
@@ -112,7 +112,7 @@
 {
 	time_t timer = time(NULL);
 
-	printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
+	//printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
 	fflush(stdout);
 
 	int frames = 0;
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than	2006-06-07 18:51:25.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h	2006-06-07 18:51:56.000000000 +0200
@@ -108,7 +108,7 @@
 	int  sizeUpdate();
 	bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit);
 	void show();
-	int winID();
+	//int winID();
 };
 
 // core
--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than	2006-06-07 18:54:38.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp	2006-06-07 18:55:00.000000000 +0200
@@ -52,6 +52,7 @@
 SDL_Surface *screen;
 }
 
+#if 0
 int winID(void)
 {
 	SDL_SysWMinfo info;
@@ -61,6 +62,7 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
 
 int main(int, char **)
 {
@@ -74,7 +76,7 @@
 	access_mutex = SDL_CreateMutex();
 
 	init_renderer1();
-	printf("%u\n", winID());
+	//printf("%u\n", winID());
 	fflush(stdout);
 	init_renderer2();
 	thread = SDL_CreateThread((int (*)(void *))renderer, NULL);


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/kdeaddons.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdeaddons.spec	11 Apr 2006 14:26:44 -0000	1.40
+++ kdeaddons.spec	9 Jun 2006 21:31:39 -0000	1.41
@@ -4,12 +4,12 @@
 %define make_cvs 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
@@ -19,6 +19,7 @@
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
+Patch2: kdeaddons-3.5.3-sdl.patch
 
 Prereq: /sbin/ldconfig
 
@@ -27,6 +28,9 @@
 Requires: arts >= 8:%{arts_version}
 Requires: SDL >= 1.2.0
 
+BuildPrereq: autoconf
+BuildPrereq: libtool
+BuildPrereq: automake
 BuildPrereq: kdegames-devel
 BuildPrereq: kdemultimedia-devel
 BuildPrereq: zlib-devel
@@ -70,6 +74,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
+%patch2 -p1 -b .sdl
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -165,6 +170,9 @@
 %endif
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
 - update to 3.5.2 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	11 Apr 2006 14:27:52 -0000	1.29
+++ sources	9 Jun 2006 21:31:39 -0000	1.30
@@ -1 +1 @@
-affb74174c6e3eda2c0748d6c052c8ff  kdeaddons-3.5.2.tar.bz2
+ea25326c6a775bbfa40d0efabed34c0d  kdeaddons-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:01:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:01:53 -0400
Subject: rpms/kdeaddons/FC-5 kdeaddons.spec,1.47,1.48
Message-ID: <200606092201.k59M1rkP030843@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30830

Modified Files:
	kdeaddons.spec 
Log Message:
update to 3.5.3



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/kdeaddons.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeaddons.spec	9 Jun 2006 19:38:28 -0000	1.47
+++ kdeaddons.spec	9 Jun 2006 22:01:50 -0000	1.48
@@ -29,6 +29,7 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -37,15 +38,17 @@
 BuildPrereq: autoconf
 BuildPrereq: libtool
 BuildPrereq: automake
-BuildPrereq: kdegames-devel
-BuildPrereq: kdemultimedia-devel
+%if %{arts}
+BuildPrereq: arts-devel >= 8:%{arts_version}
+%endif
+BuildPrereq: kdegames-devel >= 6:%{version}
+BuildPrereq: kdepim-devel >= 6:%{version}
+BuildPrereq: kdemultimedia-devel >= 6:%{version}
 BuildPrereq: zlib-devel
 BuildPrereq: libpng-devel
 BuildPrereq: libmng-devel
 BuildPrereq: SDL-devel >= %{sdl_version}
 BuildPrereq: perl
-BuildPrereq: arts-devel
-BuildPrereq: kdepim-devel
 %if %{xmms}
 BuildPrereq: xmms-devel
 %else
@@ -132,9 +135,27 @@
 done
 popd
 
-%post -p /sbin/ldconfig
+%post
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%post atlantikdesigner 
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun atlantikdesigner
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %clean
 rm -rf %{buildroot}



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:13:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:13:40 -0400
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.33,1.34
Message-ID: <200606092213.k59MDepx009387@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gconf-editor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9313

Modified Files:
	gconf-editor.spec 
Log Message:
fix build reqs



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gconf-editor.spec	6 Jun 2006 05:02:57 -0000	1.33
+++ gconf-editor.spec	9 Jun 2006 22:13:37 -0000	1.34
@@ -8,7 +8,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 2.14.0
-Release: 3
+Release: 4
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -24,6 +24,7 @@
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
+BuildRequires: gettext
 
 Patch0: gconf-editor-2.14.0-use-correct-free.patch
 
@@ -97,6 +98,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-4
+- Add missing BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:17:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:17:48 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.10,1.11
Message-ID: <200606092217.k59MHmfh014159@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11129

Modified Files:
	gnome-nettool.spec 
Log Message:
fix build reqs



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-nettool.spec	6 Jun 2006 13:34:56 -0000	1.10
+++ gnome-nettool.spec	9 Jun 2006 22:17:45 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
 Version: 2.13.90
-Release: 3
+Release: 4
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -19,6 +19,7 @@
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 %description
 GNOME Nettool is a set of front-ends to various networking command-line
@@ -60,6 +61,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-4
+- Add missing BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-3
 - Add BuildRequires for perl-XML-Parser
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:19:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:19:07 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-tux.patch, NONE,
	1.1 kernel-2.6.spec, 1.2261, 1.2262
Message-ID: <200606092219.k59MJ7aW025496@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25464

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-gfs2-tux.patch 
Log Message:
build fix

linux-2.6-gfs2-tux.patch:
 ops_file.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-gfs2-tux.patch ---
--- linux-2.6.16.noarch/fs/gfs2/ops_file.c~	2006-06-09 18:17:44.000000000 -0400
+++ linux-2.6.16.noarch/fs/gfs2/ops_file.c	2006-06-09 18:18:01.000000000 -0400
@@ -113,7 +113,7 @@ int gfs2_internal_read(struct gfs2_inode
 	desc.error = 0;
 	do_generic_mapping_read(inode->i_mapping, ra_state,
 				&gfs2_internal_file_sentinal, pos, &desc,
-				gfs2_read_actor);
+				gfs2_read_actor, 0);
 	return desc.written ? desc.written : desc.error;
 }
 
@@ -251,7 +251,7 @@ fallback_to_normal:
 			if (desc.count == 0)
 				continue;
 			desc.error = 0;
-			do_generic_file_read(filp,ppos,&desc,file_read_actor);
+			do_generic_file_read(filp,ppos,&desc,file_read_actor, 0);
 			retval += desc.written;
 			if (desc.error) {
 				retval = retval ?: desc.error;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2261
retrieving revision 1.2262
diff -u -r1.2261 -r1.2262
--- kernel-2.6.spec	9 Jun 2006 17:32:57 -0000	1.2261
+++ kernel-2.6.spec	9 Jun 2006 22:19:04 -0000	1.2262
@@ -365,6 +365,7 @@
 # GFS/DLM
 Patch1500: linux-2.6-gfs2-dlm.patch
 Patch1501: linux-2.6-gfs2-dlm-headers.patch
+Patch1502: linux-2.6-gfs2-tux.patch
 
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
@@ -1006,6 +1007,7 @@
 
 # GFS2/DLM
 %patch1500 -p1
+%patch1502 -p1
 
 #
 # Various SELinux fixes from 2.6.10rc



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:21:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:21:02 -0400
Subject: rpms/gnome-nettool/devel .cvsignore, 1.4, 1.5 gnome-nettool.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200606092221.k59ML2Fa026234@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26185

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jan 2006 03:33:57 -0000	1.4
+++ .cvsignore	9 Jun 2006 22:21:00 -0000	1.5
@@ -1,3 +1 @@
-gnome-nettool-0.99.3.tar.bz2
-gnome-nettool-1.2.0.tar.bz2
-gnome-nettool-2.13.90.tar.bz2
+gnome-nettool-2.15.0.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-nettool.spec	9 Jun 2006 22:17:45 -0000	1.11
+++ gnome-nettool.spec	9 Jun 2006 22:21:00 -0000	1.12
@@ -5,8 +5,8 @@
 
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
-Version: 2.13.90
-Release: 4
+Version: 2.15.0 
+Release: 1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-1
+- Update to 2.15.0
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-4
 - Add missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jan 2006 03:33:57 -0000	1.4
+++ sources	9 Jun 2006 22:21:00 -0000	1.5
@@ -1 +1 @@
-60d56c758c30a99460957a583561b482  gnome-nettool-2.13.90.tar.bz2
+ef2769bec8b0462c94b6a0ba39e6f0d4  gnome-nettool-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:24:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:24:07 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.127,1.128
Message-ID: <200606092224.k59MO7C9027778@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27697

Modified Files:
	gnome-panel.spec 
Log Message:
Fix build reqs



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gnome-panel.spec	30 May 2006 03:12:46 -0000	1.127
+++ gnome-panel.spec	9 Jun 2006 22:24:04 -0000	1.128
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -45,6 +45,9 @@
 BuildRequires: which
 BuildRequires: libxml2-python
 BuildRequires: intltool
+BuildRequires: gettext
+BuildRequires: automake
+BuildRequires: autoconf
 BuildRequires: scrollkeeper
 BuildRequires: libxslt
 BuildRequires: libX11-devel
@@ -221,6 +224,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
+- Add missing BuildRequires
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2
 - Drop upstreamed patches



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:26:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:26:45 -0400
Subject: rpms/eclipse/devel efj.sh.in, NONE, 1.1 eclipse-bz162177.patch, 1.2,
	1.3 eclipse-disable-junit4-apt.patch, 1.2, 1.3 eclipse.spec,
	1.275, 1.276 eclipse-efj-wrapper.sh, 1.1,
	NONE eclipse-genjavadocoutput.patch, 1.2,
	NONE eclipse-ppc64.patch, 1.12, NONE
Message-ID: <200606092226.k59MQjGs028852@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28599

Modified Files:
	eclipse-bz162177.patch eclipse-disable-junit4-apt.patch 
	eclipse.spec 
Added Files:
	efj.sh.in 
Removed Files:
	eclipse-efj-wrapper.sh eclipse-genjavadocoutput.patch 
	eclipse-ppc64.patch 
Log Message:
- Enable ppc64, s390 and s390x.
- Add check for jars at the end of prep.
- Fix patch for rh #162177 (square brackets patch).
- Fix swt symlinks rh #194500.
- Add versionless pde.build symlink.
- Rename efj-wrapper.sh to efj.sh.in.
- Re-pack all zips after the build to ensure that zips have the same md5sum
  across arch re-builds. This is needed to avoid multilib conflicts.



--- NEW FILE efj.sh.in ---
#!/bin/sh

java -cp startup.jar org.eclipse.core.launcher.Main \
     -application org.eclipse.jdt.core.JavaCodeFormatter \
     ${1+"$@"}

eclipse-bz162177.patch:
 Main.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

Index: eclipse-bz162177.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-bz162177.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-bz162177.patch	2 Jun 2006 21:46:06 -0000	1.2
+++ eclipse-bz162177.patch	9 Jun 2006 22:26:43 -0000	1.3
@@ -1,16 +1,45 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.jdt.core
 Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
 ===================================================================
 RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
 retrieving revision 1.254
 diff -u -r1.254 Main.java
 --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	2 May 2006 13:45:31 -0000	1.254
-+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	1 Jun 2006 17:56:02 -0000
-@@ -2972,7 +2972,7 @@
- 	String currentClasspathName = null;
- 	ArrayList currentRuleSpecs = new ArrayList(defaultSize);
- 	StringTokenizer tokenizer = new StringTokenizer(currentPath,
--			File.pathSeparator + "[]", true); //$NON-NLS-1$
-+			File.pathSeparator, true);
- 	// state machine
- 	final int start = 0; 
- 	final int readyToClose = 1;
++++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	8 Jun 2006 21:07:50 -0000
+@@ -2986,6 +2986,8 @@
+ 	final int rulesStart = 5;
+ 	// 'path[' 'path1;path2['
+ 	final int rulesReadyToClose = 6;
++	// '[name].jar'
++	final int pathBeginsWithSquareBracket = 7;
+ 	// 'path[rule' 'path[rule1;rule2'
+ 	final int error = 99;
+ 	int state = start;
+@@ -3011,6 +3013,9 @@
+ 			}
+ 		} else if (token.equals("[")) { //$NON-NLS-1$
+ 			switch (state) {
++			case start:
++				state = pathBeginsWithSquareBracket;
++				break;
+ 			case readyToClose:
+ 				state = rulesStart;
+ 				break;
+@@ -3039,6 +3044,16 @@
+ 				state = rulesReadyToClose;
+ 				currentRuleSpecs.add(token);
+ 				break;
++			case pathBeginsWithSquareBracket:
++				String name = "[" + token; //$NON-NLS-1$
++				while (tokenizer.hasMoreTokens()) {
++					name = name.concat(tokenizer.nextToken());
++					if (name.endsWith(".jar")) //$NON-NLS-1$
++						break;
++				}
++				currentClasspathName = name;
++				state = readyToClose;
++				break;
+ 			default:
+ 				state = error;
+ 			}

eclipse-disable-junit4-apt.patch:
 assemble.org.eclipse.sdk.linux.gtk.ia64.xml    |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.ppc.xml     |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml   |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.x86.xml     |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.x86_64.xml  |   24 ----------------------
 features/org.eclipse.jdt/build.xml             |   22 --------------------
 features/org.eclipse.jdt/feature.xml           |   27 -------------------------
 plugins/org.eclipse.jdt.doc.isv/buildDoc.xml   |    2 -
 plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt |    4 ---
 9 files changed, 3 insertions(+), 172 deletions(-)

Index: eclipse-disable-junit4-apt.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-disable-junit4-apt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-disable-junit4-apt.patch	5 Jun 2006 03:47:07 -0000	1.2
+++ eclipse-disable-junit4-apt.patch	9 Jun 2006 22:26:43 -0000	1.3
@@ -482,6 +482,18 @@
           id="org.eclipse.jdt.doc.user"
           download-size="0"
           install-size="0"
+diff -ruN eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
+--- eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-06-02 13:29:59.000000000 -0400
++++ eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-06-08 19:53:27.000000000 -0400
+@@ -75,7 +75,7 @@
+ 		<exec dir="." executable="${javadoc}" output="doc.bin.log">
+ 			<arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
+ 		</exec>
+-		<antcall target="generateJdtAptJavadoc" />
++	        <!-- <antcall target="generateJdtAptJavadoc" /> -->
+ 	</target>
+ 	
+ 	<target name="generateJdtAptJavadoc">
 diff -ruN eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
 --- eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-06-02 13:29:58.000000000 -0400
 +++ eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-06-04 21:47:48.000000000 -0400
@@ -499,4 +511,3 @@
  ;../org.apache.ant/lib/ant.jar
  ;../org.eclipse.compare/@dot
  ;../org.eclipse.core.commands/@dot
-Binary files eclipse-3.2RC7-src.orig/plugins/org.eclipse.pde.build/templates/features/.customBuildCallbacks.xml.swp and eclipse-3.2RC7-src/plugins/org.eclipse.pde.build/templates/features/.customBuildCallbacks.xml.swp differ


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- eclipse.spec	8 Jun 2006 18:47:33 -0000	1.275
+++ eclipse.spec	9 Jun 2006 22:26:43 -0000	1.276
@@ -51,7 +51,7 @@
 Source11:	%{name}-redhat-splash.png
 %endif
 Source16:       %{name}-copy-platform.sh
-Source17:       %{name}-efj-wrapper.sh
+Source17:       efj.sh.in
 Source19:       %{name}-filenamepatterns.txt
 Source20:	ecj.sh.in
 Source21:	rebuild-sdk-features
@@ -78,17 +78,12 @@
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770
 #Patch20: 	%{name}-gnuformatterjdt.patch
 #Patch21: 	%{name}-gnuformatterjdtui.patch
-# JPackage []s in names of symlinks ...
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
-Patch34:	%{name}-bz162177.patch
-Patch35:	%{name}-genjavadocoutput.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 Patch38:	%{name}-helpindexbuilder.patch
 Patch40:	%{name}-usebuiltlauncher.patch
 ## Build cairo native libs
 #Patch43:	%{name}-libswt-cairo1.0-3.patch
-# Again, I hate patches with spaces in the filenames
-#Patch45:	%{name}-webapp-jasperclasspath.patch
+Patch45:	%{name}-webapp-jasper-classpath.patch
 Patch46:	%{name}-libswt-xpcomgcc4.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
@@ -99,9 +94,6 @@
 Patch52:	%{name}-libswt-mozilla2.patch
 # Always generate debug info when building RPMs (Andrew Haley)
 Patch49:	%{name}-ecj-rpmdebuginfo.patch
-# Add support for ppc64:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172172
-Patch51:	%{name}-ppc64.patch
 # generic releng plugins that can be used to build plugins
 # see this thread for deails: 
 # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
@@ -126,6 +118,9 @@
 Patch54:	%{name}-swt-rm-ON_TOP.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
 Patch22: 	%{name}-updatehomedir.patch
+# JPackage []s in names of symlinks ...
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
+Patch34:	%{name}-bz162177.patch
 
 # these patches should be in 3.2 final
 Patch100:	customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
@@ -389,29 +384,19 @@
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
 %patch52 -p0
-%if %{gcj_support}
-#%patch14 -p0
-%endif
 popd
 %patch2 -p0
 %patch4 -p0
 %patch5 -p0
-%if %{gcj_support}
-#%patch13 -p0
-%endif
 pushd plugins/org.eclipse.swt.gtk.linux.x86_64
 %patch18 -p0
 popd
-#pushd plugins/org.eclipse.jdt.core
-#%patch20 -p0
-#popd
-#pushd plugins/org.eclipse.jdt.ui
-#%patch21 -p0
-#popd
 %patch22 -p0
 pushd plugins/org.eclipse.core.runtime
 %patch24 -p0
 popd
+
+# tomcat patches
 pushd plugins/org.eclipse.tomcat
 #%patch28 -p0
 #%patch29 -p0
@@ -427,23 +412,20 @@
 pushd plugins/org.eclipse.jdt.core
 %patch34 -p0
 popd
-%patch35 -p0
 %patch38 -p0
 %patch40 -p0
 #%patch43
-pushd plugins/org.eclipse.help.webapp
-#%patch45
-popd
+%patch45
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
 %patch46
 popd
 
 # Because the launcher source is zipped up, we need to unzip, patch, and re-pack
 mkdir launchertmp
-unzip -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
+unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
 pushd launchertmp
 %patch47 -p1
-zip -9 -r ../launchersrc.zip *
+zip -q -9 -r ../launchersrc.zip *
 popd
 mv launchersrc.zip plugins/org.eclipse.platform
 rm -rf launchertmp
@@ -460,7 +442,6 @@
 	plugins/org.eclipse.platform.doc.isv/platformOptions.txt 
 %patch49 -p0
 pwd
-#TODO FIXME %patch51 -p0
 
 pushd plugins/org.eclipse.pde.build
 %patch53
@@ -478,6 +459,10 @@
 cp %{SOURCE11} splash.bmp
 popd
 
+# FIXME this should be patched upstream with a flag to turn on and off 
+# all output should be directed to stdout
+find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
+
 # Remove existing .sos
 find -name \*.so | xargs rm
 
@@ -640,25 +625,30 @@
 sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
 sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
-exit 1
-# nasty hack to get suppport for pcc64, s390 and s390x
-# we're basically just replacing the arch 
+
+# FIXME: figure out what's going on with build.index on ppc64 and s390x   
+%ifarch ppc64 s390x
+  find plugins -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
+%endif
+
+# nasty hack to get suppport for pcc64 and s390(x)
+# move all of the ia64 directories to ppc64 or s390(x) dirs and replace the ia64 # strings with ppc64 or s390(x)
 %ifarch ppc64 s390 s390x
   # there is only partial support for ppc64 in 3.2 so we have to remove this 
   # partial support to get the replacemnt hack to work
-#  find -name \*ppc64\* | xargs rm -r
+  find -name \*ppc64\* | xargs rm -r
   
   # remove remove ppc64 support from features/org.eclipse.platform.source/feature.xml
   # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
-#  find -name \*.xml -exec sed --in-place "s/rootFileslinux_gtk_ppc64/rootFileslinux_gtk_ppc128/g" "{}" \;
+  find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
   # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
-#  sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
+  sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
   # replace final occurances with an existing arch
-#  sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
+  sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
 
   # remove remove ppc64 support from features/org.eclipse.platform.source/feature.xml
-#  mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig
-#  grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml	
+  mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig
+  grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml	
 
   # finally the replacement hack
   for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do 
@@ -669,6 +659,7 @@
   find -type f -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %endif 
 
+
 # make sure there are no jars left
 JARS=""
 for j in $(find -name \*.jar); do
@@ -678,7 +669,7 @@
 done
 if [ ! -z "$JARS" ]; then
     echo "These jar should be deleted and syslinked to system jars: $JARS"
-   #FIXME anable  exit 1
+   #FIXME: enable  exit 1
 fi
 
 %build
@@ -795,6 +786,21 @@
 #./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org
 #popd
 
+# FIXME: document this properly
+# re-pack all zips. we need to do this to work around the multilib problem 
+for zip in $(find -type f -name \*.zip); do
+  mkdir $zip-repack
+  pushd $zip-repack
+  zipfile=../$(echo $zip | sed "s:./.*/::")
+  unzip -qq $zipfile
+  rm $zipfile
+  find -type f -exec touch --date=1/1/1970 "{}" \; 
+  zip -q -X -9 -r $zipfile .
+  popd
+  rm -r $zip-repack
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -889,17 +895,20 @@
 ### begin libswt-gtk2 symlinks
 pushd $RPM_BUILD_ROOT%{_libdir}
 for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk glx-gtk; do
-  ln -s %{_libdir}/%{name}/libswt-${base}-$SWT_VERSION.so \
-         libswt-${base}-$SWT_VERSION.so
+  ln -s %{_libdir}/%{name}/libswt-${base}-$SWT_VERSION.so libswt-${base}-$SWT_VERSION.so
 done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.v$SWT_VERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
-ln -s %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.v$SWT_VERSION.jar swt-gtk-%{eclipse-majmin}.jar
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.v$SWT_VERSION*.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
 
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/
+ln -s org.eclipse.pde.build_* org.eclipse.pde.build
+popd
+
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
 ln -s %{_datadir}/%{name}/%{name}
@@ -1101,15 +1110,6 @@
 ln -s %{_datadir}/java/eclipse-ecj.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
 
-%if %{gcj_support}
-%ifarch ia64
-# FIXME: auto get version number; tweak aot-compile-rpm to fix this
-aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.I200606011710.jar
-%else
-aot-compile-rpm
-%endif
-%endif
-
 # FIXME:  due to aot-compile-rpm smarts, the required resource bundles aren't
 # being compiled so this truly native ecj binary isn't possible
 #%if %{native_ecj}
@@ -1326,7 +1326,6 @@
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
@@ -1354,7 +1353,7 @@
 
 %files pde
 %defattr(-,root,root)
-%{_datadir}/%{name}/plugins/org.eclipse.pde.build_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.build*
 %{_datadir}/%{name}/plugins/org.eclipse.pde.core_*
 %{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*
 %{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
@@ -1367,6 +1366,7 @@
 %{_libdir}/gcj/%{name}/pdebuild.jar*
 %{_libdir}/gcj/%{name}/pdebuild-ant.jar*
 %{_libdir}/gcj/%{name}/org.eclipse.pde.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_*
 %{_libdir}/gcj/%{name}/org.eclipse.pde.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.pde_*
 %endif
@@ -1444,7 +1444,6 @@
 %{_datadir}/%{name}/plugins/org.eclipse.osgi.services_*
 %{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*
 %{_datadir}/%{name}/plugins/org.eclipse.osgi_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
 %{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
 %{_datadir}/%{name}/plugins/org.eclipse.platform_*
 %{_datadir}/%{name}/plugins/org.eclipse.search_*
@@ -1553,8 +1552,11 @@
 %{_libdir}/gcj/%{name}/org.eclipse.ui.forms_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator.resources_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.views_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.views.properties.tabbed_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_*
 %{_libdir}/gcj/%{name}/compatibility.jar*
@@ -1572,6 +1574,7 @@
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_*
 %{_libdir}/gcj/%{name}/platform.jar*
 %{_libdir}/gcj/%{name}/org.eclipse.team.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh2_*
 # FIXME: work around aot-compile-rpm problem
 %ifnarch ia64
 %{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
@@ -1583,7 +1586,31 @@
 %{_libdir}/gcj/%{name}/org.eclipse.text_*
 %{_libdir}/gcj/%{name}/com.ibm.icu_*
 # FIXME: take this out when the tomcat patch is updated
-%{_libdir}/gcj/%{name}/*
+%{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
+%{_libdir}/gcj/%{name}/bootstrap.jar*
+%{_libdir}/gcj/%{name}/catalina.jar*
+%{_libdir}/gcj/%{name}/commons-beanutils.jar*
+%{_libdir}/gcj/%{name}/commons-collections.jar*
+%{_libdir}/gcj/%{name}/commons-digester.jar*
+%{_libdir}/gcj/%{name}/commons-logging-api.jar*
+%{_libdir}/gcj/%{name}/commons-modeler.jar*
+%{_libdir}/gcj/%{name}/jakarta-regexp-1.3.jar*
+%{_libdir}/gcj/%{name}/jasper-compiler.jar*
+%{_libdir}/gcj/%{name}/jasper-runtime.jar*
+%{_libdir}/gcj/%{name}/jsp.jar*
+%{_libdir}/gcj/%{name}/mx4j-jmx.jar*
+%{_libdir}/gcj/%{name}/naming-common.jar*
+%{_libdir}/gcj/%{name}/naming-factory.jar*
+%{_libdir}/gcj/%{name}/naming-resources.jar*
+%{_libdir}/gcj/%{name}/parser.jar*
+%{_libdir}/gcj/%{name}/servlet.jar*
+%{_libdir}/gcj/%{name}/servlets-common.jar*
+%{_libdir}/gcj/%{name}/servlets-default.jar*
+%{_libdir}/gcj/%{name}/servlets-invoker.jar*
+%{_libdir}/gcj/%{name}/servlets-manager.jar*
+%{_libdir}/gcj/%{name}/tomcat-coyote.jar*
+%{_libdir}/gcj/%{name}/tomcat-http11.jar*
+%{_libdir}/gcj/%{name}/tomcat-util.jar*
 %endif
 
 %files platform-devel
@@ -1592,11 +1619,21 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source_*
 %{_datadir}/%{name}/features/org.eclipse.platform.source_*
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
+%if %{gcj_support}
+# Native bits 
+%{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_*
+%endif
 
 %changelog
 * Wed Jun 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.3
-- Enable s390 and s390x.
-- Add small snippet to check for jars at the end of prep.
+- Enable ppc64, s390 and s390x.
+- Add check for jars at the end of prep.
+- Fix patch for rh #162177 (square brackets patch).
+- Fix swt symlinks rh #194500.
+- Add versionless pde.build symlink.
+- Rename efj-wrapper.sh to efj.sh.in.
+- Re-pack all zips after the build to ensure that zips have the same md5sum
+  across arch re-builds. This is needed to avoid multilib conflicts.
 
 * Wed Jun 07 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.2
 - Fix eclipse-ecj.jar symlink to include qualifier.


--- eclipse-efj-wrapper.sh DELETED ---


--- eclipse-genjavadocoutput.patch DELETED ---


--- eclipse-ppc64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:36:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:36:38 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.46,1.47
Message-ID: <200606092236.k59MaciB031084@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31030

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix build reqs



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-power-manager.spec	23 May 2006 00:59:28 -0000	1.46
+++ gnome-power-manager.spec	9 Jun 2006 22:36:36 -0000	1.47
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.15.2
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -20,7 +20,7 @@
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
-Requires: gnome-mime-data
+BuildRequires: gettext
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
@@ -101,6 +101,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-3
+- Drop unfounded gnome-mime-data dependency
+- Add missing BuildRequires
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:39:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:39:19 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.12,1.13
Message-ID: <200606092239.k59MdJpJ031642@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31564

Modified Files:
	gnome-nettool.spec 
Log Message:
fix biuld reqs



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-nettool.spec	9 Jun 2006 22:21:00 -0000	1.12
+++ gnome-nettool.spec	9 Jun 2006 22:39:07 -0000	1.13
@@ -20,6 +20,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
+BuildRequires: gnome-doc-utils
 
 %description
 GNOME Nettool is a set of front-ends to various networking command-line



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:44:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:44:43 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.75,1.76
Message-ID: <200606092244.k59MihNO000452@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv390

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix build reqs



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gnome-screensaver.spec	5 Jun 2006 20:08:05 -0000	1.75
+++ gnome-screensaver.spec	9 Jun 2006 22:44:41 -0000	1.76
@@ -12,7 +12,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.2
-Release: 4 
+Release: 5 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -42,6 +42,10 @@
 BuildRequires: libXinerama-devel libXmu-devel
 # this is here because the configure tests look for protocol headers
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: gettext
+BuildRequires: intltool
+BuildRequires: autoconf
+BuildRequires: automake
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -163,6 +167,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-5
+- Add missing BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-4
 - Move the branded lock dialog background to fedora-logos
 - Require system-logos, not fedora-logos



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:47:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:47:30 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.47,1.48
Message-ID: <200606092247.k59MlUqW010294@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9090

Modified Files:
	gnome-power-manager.spec 
Log Message:
fxi build reqs



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-power-manager.spec	9 Jun 2006 22:36:36 -0000	1.47
+++ gnome-power-manager.spec	9 Jun 2006 22:47:27 -0000	1.48
@@ -21,6 +21,7 @@
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
+BuildRequires: libtool
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}



From fedora-cvs-commits at redhat.com  Fri Jun  9 22:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 18:56:48 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.13,1.14
Message-ID: <200606092256.k59Mum04019724@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19650

Modified Files:
	gnome-nettool.spec 
Log Message:
more build reqs



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-nettool.spec	9 Jun 2006 22:39:07 -0000	1.13
+++ gnome-nettool.spec	9 Jun 2006 22:56:46 -0000	1.14
@@ -21,6 +21,7 @@
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils
+BuildRequires: scrollkeeper
 
 %description
 GNOME Nettool is a set of front-ends to various networking command-line



From fedora-cvs-commits at redhat.com  Fri Jun  9 23:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 19:02:39 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.42,
	1.43
Message-ID: <200606092302.k59N2dd8021448@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21368

Modified Files:
	gnome-volume-manager.spec 
Log Message:
fix build reqs



Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-volume-manager.spec	6 Jun 2006 03:09:37 -0000	1.42
+++ gnome-volume-manager.spec	9 Jun 2006 23:02:26 -0000	1.43
@@ -17,7 +17,8 @@
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5.0
 BuildRequires: perl-XML-Parser
-Requires: gnome-mime-data, hal >= 0.5.0, kernel >= 2.6, control-center >= 2.0
+BuildRequires: gettext
+Requires: hal >= 0.5.0, kernel >= 2.6, control-center >= 2.0
 Requires: dbus >= 0.60
 Requires: gthumb
 Requires: gnome-media
@@ -83,6 +84,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 1.5.15-3
+- Drop gratitious dependency on gnome-mime-data
+- Add missing BuildRequires
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.5.15-2
 - add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 23:03:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 19:03:41 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.14,1.15
Message-ID: <200606092303.k59N3faH021553@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21531

Modified Files:
	gnome-nettool.spec 
Log Message:
--disable-scrollkeeper



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-nettool.spec	9 Jun 2006 22:56:46 -0000	1.14
+++ gnome-nettool.spec	9 Jun 2006 23:03:32 -0000	1.15
@@ -31,7 +31,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-scrollkeeper
 make
 
 %install



From fedora-cvs-commits at redhat.com  Fri Jun  9 23:06:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 19:06:01 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.43,
	1.44
Message-ID: <200606092306.k59N61tk021917@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21898

Modified Files:
	gnome-volume-manager.spec 
Log Message:
fix build reqs



Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-volume-manager.spec	9 Jun 2006 23:02:26 -0000	1.43
+++ gnome-volume-manager.spec	9 Jun 2006 23:05:59 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.15
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -87,6 +87,7 @@
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 1.5.15-3
 - Drop gratitious dependency on gnome-mime-data
 - Add missing BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.5.15-2
 - add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 23:12:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 19:12:42 -0400
Subject: rpms/kernel/devel/configs config-generic,1.190,1.191
Message-ID: <200606092312.k59NCg6X023190@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv23147/configs

Modified Files:
	config-generic 
Log Message:
match default baud rate



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- config-generic	9 Jun 2006 17:33:16 -0000	1.190
+++ config-generic	9 Jun 2006 23:12:40 -0000	1.191
@@ -2504,7 +2504,7 @@
 # CONFIG_KGDB_CONSOLE is not set
 CONFIG_KGDBOE=m
 CONFIG_KGDB_SIMPLE_SERIAL=y
-CONFIG_KGDB_BAUDRATE=115200
+CONFIG_KGDB_BAUDRATE=9600
 CONFIG_KGDB_PORT_NUM=0
 
 #



From fedora-cvs-commits at redhat.com  Fri Jun  9 23:20:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 19:20:01 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-kfind-largefile.patch, NONE,
	1.1 kdebase-3.5.3-kicker-panel.patch, NONE,
	1.1 kdebase-3.5.3-kscreensaver.patch, NONE,
	1.1 kdebase-3.5.3-kxkb-kcmlayout.patch, NONE,
	1.1 kdebase-3.5.3-kioslave_media_dbus.patch, 1.1,
	1.2 kdebase.spec, 1.186, 1.187
Message-ID: <200606092320.k59NK1AO007578@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7507

Modified Files:
	kdebase-3.5.3-kioslave_media_dbus.patch kdebase.spec 
Added Files:
	kdebase-3.5.3-kfind-largefile.patch 
	kdebase-3.5.3-kicker-panel.patch 
	kdebase-3.5.3-kscreensaver.patch 
	kdebase-3.5.3-kxkb-kcmlayout.patch 
Log Message:
add several upstream patches


kdebase-3.5.3-kfind-largefile.patch:
 kftabdlg.cpp |   49 ++++++++++++++++++++++++-------------------------
 kquery.cpp   |   31 +++++++++++++++++++++++--------
 kquery.h     |    7 ++++---
 3 files changed, 51 insertions(+), 36 deletions(-)

--- NEW FILE kdebase-3.5.3-kfind-largefile.patch ---
--- kdebase-3.5.3/kfind/kftabdlg.cpp.me	2006-06-10 01:00:47.000000000 +0200
+++ kdebase-3.5.3/kfind/kftabdlg.cpp	2006-06-10 01:01:31.000000000 +0200
@@ -183,6 +183,7 @@
     sizeUnitBox ->insertItem( i18n("Bytes") );
     sizeUnitBox ->insertItem( i18n("KB") );
     sizeUnitBox ->insertItem( i18n("MB") );
+    sizeUnitBox ->insertItem( i18n("GB") );
     sizeUnitBox ->setCurrentItem(1);
 
     int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
@@ -574,7 +575,8 @@
 
 void KfindTabWidget::setQuery(KQuery *query)
 {
-	int size;
+  KIO::filesize_t size;
+  KIO::filesize_t sizeunit;
   bool itemAlreadyContained(false);
   // only start if we have valid dates
   if (!isDateValid()) return;
@@ -603,17 +605,25 @@
   switch (sizeUnitBox->currentItem())
   {
      case 0:
-         size = 1; //one byte
-			break;
+         sizeunit = 1; //one byte
+         break;
      case 2:
-         size = 1048576; //1M
-			break;
-		case 1:
-		default:
-			size=1024; //1k
-			break;
-  }
-  size = sizeEdit->value() * size;
+         sizeunit = 1048576; //1M
+         break;
+     case 3:
+         sizeunit = 1073741824; //1GB
+         break;
+     case 1: //fall to default case
+     default:
+         sizeunit = 1024; //1k
+         break;
+  }
+  size = sizeEdit->value() * sizeunit;
+
+// TODO: troeder: do we need this check since it is very unlikely-
+// to exceed ULLONG_MAX with INT_MAX * 1024^3.-
+// Or is there an arch where this can happen?
+#if 0
   if (size < 0)  // overflow
      if (KMessageBox::warningYesNo(this, i18n("Size is too big. Set maximum size value?"), i18n("Error"),i18n("Set"),i18n("Do Not Set"))
            == KMessageBox::Yes)
@@ -624,21 +634,10 @@
 		}
      else
         return;
+#endif
 
-  switch (sizeBox->currentItem())
-  {
-    case 1:
-      query->setSizeRange(size, -1);
-      break;
-    case 2:
-      query->setSizeRange(-1, size);
-      break;
-    case 3:
-      query->setSizeRange(size,size);
-      break;
-    default:
-      query->setSizeRange(-1, -1);
-  }
+  // set range mode and size value
+  query->setSizeRange(sizeBox->currentItem(),size,0);
 
   // dates
   QDateTime epoch;
--- kdebase-3.5.3/kfind/kquery.h.me	2006-06-10 01:01:11.000000000 +0200
+++ kdebase-3.5.3/kfind/kquery.h	2006-06-10 01:01:51.000000000 +0200
@@ -23,7 +23,7 @@
   KQuery(QObject *parent = 0, const char * name = 0);
   ~KQuery();
 
-  void setSizeRange( int min, int max );
+  void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 );
   void setTimeRange( time_t from, time_t to );
   void setRegExp( const QString &regexp, bool caseSensitive );
   void setRecursive( bool recursive );
@@ -65,8 +65,9 @@
   void checkEntries();
 
   int m_filetype;
-  int m_minsize;
-  int m_maxsize;
+  int m_sizemode;
+  KIO::filesize_t m_sizeboundary1;
+  KIO::filesize_t m_sizeboundary2;
   KURL m_url;
   time_t m_timeFrom;
   time_t m_timeTo;
--- kdebase-3.5.3/kfind/kquery.cpp.me	2006-06-10 01:01:00.000000000 +0200
+++ kdebase-3.5.3/kfind/kquery.cpp	2006-06-10 01:01:50.000000000 +0200
@@ -14,7 +14,7 @@
 
 KQuery::KQuery(QObject *parent, const char * name)
   : QObject(parent, name),
-    m_minsize(-1), m_maxsize(-1),
+    m_sizemode(0), m_sizeboundary1(0), m_sizeboundary2(0),
     m_timeFrom(0), m_timeTo(0),
     job(0), m_insideCheckEntries(false), m_result(0)
 {
@@ -178,10 +178,24 @@
     if (!matched)
       return;
 
-    // make sure the files are in the correct range
-    if (  ( m_minsize >= 0 && (int)file->size() < m_minsize ) ||
-          ( m_maxsize >= 0 && (int)file->size() > m_maxsize ) )
-      return;
+    switch( m_sizemode )
+    {
+        case 1: // "at least"
+            if ( file->size() < m_sizeboundary1 ) return;
+            break;
+        case 2: // "at most"
+            if ( file->size() > m_sizeboundary1 ) return;
+            break;
+        case 3: // "equal"
+            if ( file->size() != m_sizeboundary1 ) return;
+            break;
+        case 4: // "between"
+            if ( (file->size() < m_sizeboundary1) || (file->size() > m_sizeboundary2) ) return;
+            break;
+        case 0: // "none" -> fall to default
+        default:
+            break;
+    }
 
     // make sure it's in the correct date range
     // what about 0 times?
@@ -403,10 +417,11 @@
   m_filetype = filetype;
 }
 
-void KQuery::setSizeRange(int min, int max)
+void KQuery::setSizeRange(int mode, KIO::filesize_t value1, KIO::filesize_t value2)
 {
-  m_minsize = min;
-  m_maxsize = max;
+  m_sizemode = mode;
+  m_sizeboundary1 = value1;
+  m_sizeboundary2 = value2;
 }
 
 void KQuery::setTimeRange(time_t from, time_t to)

kdebase-3.5.3-kicker-panel.patch:
 panelbutton.cpp |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.3-kicker-panel.patch ---
--- kdebase-3.5.3/kicker/libkicker/panelbutton.cpp.orig	2006-06-10 00:46:06.000000000 +0200
+++ kdebase-3.5.3/kicker/libkicker/panelbutton.cpp	2006-06-10 00:46:21.000000000 +0200
@@ -631,7 +631,8 @@
     if (m_drawArrow && (m_highlight || active))
     {
         QStyle::PrimitiveElement e = QStyle::PE_ArrowUp;
-        QRect r(width() / 2 - 4, 0, 8, 8);
+        int arrowSize = style().pixelMetric(QStyle::PM_MenuButtonIndicator);
+        QRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
 
         switch (m_arrowDirection)
         {
@@ -640,27 +641,31 @@
                 break;
             case KPanelExtension::Bottom:
                 e = QStyle::PE_ArrowDown;
-                r.moveBy(0, height() - 8);
+                r.moveBy(0, height() - arrowSize);
                 break;
             case KPanelExtension::Right:
                 e = QStyle::PE_ArrowRight;
-                r.moveBy(width() - 8 , 0);
+                r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Left:
                 e = QStyle::PE_ArrowLeft;
+                r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Floating:
                 if (orientation() == Horizontal)
                 {
                     e = QStyle::PE_ArrowDown;
+                    r.moveBy(0, height() - arrowSize);
                 }
                 else if (QApplication::reverseLayout())
                 {
                     e = QStyle::PE_ArrowLeft;
+                    r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 }
                 else
                 {
                     e = QStyle::PE_ArrowRight;
+                    r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
                 }
                 break;
         }

kdebase-3.5.3-kscreensaver.patch:
 lockeng.cc   |   12 ++++++++----
 xautolock.cc |   11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-3.5.3-kscreensaver.patch ---
--- kdebase-3.5.3/kdesktop/lockeng.cc.orig	2006-06-10 00:11:36.000000000 +0200
+++ kdebase-3.5.3/kdesktop/lockeng.cc	2006-06-10 00:13:41.000000000 +0200
@@ -42,9 +42,6 @@
     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
                     &mXBlanking, &mXExposures);
 
-    // We'll handle blanking
-    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
-
     mState = Waiting;
     mXAutoLock = 0;
     mEnabled = false;
@@ -158,6 +155,9 @@
         mXAutoLock->setDPMS(mDPMS);
 	//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
 
+        // We'll handle blanking 
+        XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
+
         mXAutoLock->start();
 
         kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl;
@@ -170,6 +170,7 @@
 	    mXAutoLock = 0;
 	}
 
+	XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
         kdDebug(1204) << "Saver Engine disabled" << endl;
     }
 
@@ -291,7 +292,6 @@
     kdDebug(1204) << "SaverEngine: stopping lock" << endl;
     emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
 
-
     mLockProcess.kill();
 
     if (mXAutoLock)
@@ -300,6 +300,7 @@
     }
     processLockTransactions();
     mState = Waiting;
+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
 }
 
 void SaverEngine::lockProcessExited()
@@ -314,6 +315,7 @@
     }
     processLockTransactions();
     mState = Waiting;
+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
 }
 
 //---------------------------------------------------------------------------
@@ -322,6 +324,8 @@
 //
 void SaverEngine::idleTimeout()
 {
+    // disable X screensaver
+    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
     startLockProcess( DefaultLock );
 }
 
--- kdebase-3.5.3/kdesktop/xautolock.cc.orig	2006-06-10 00:11:55.000000000 +0200
+++ kdebase-3.5.3/kdesktop/xautolock.cc	2006-06-10 00:13:59.000000000 +0200
@@ -192,6 +192,7 @@
 
     bool activate = false;
 
+    kdDebug() << now << " " << mTrigger << endl;
     if (now >= mTrigger)
     {
         resetTrigger();
@@ -202,6 +203,8 @@
     BOOL on;
     CARD16 state;
     DPMSInfo( qt_xdisplay(), &state, &on );
+
+    kdDebug() << "DPMSInfo " << state << " " << on << endl;
     // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time
     // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
     // saving is active, simply always activate our saving too, otherwise
@@ -217,9 +220,11 @@
 #ifdef HAVE_XSCREENSAVER
     static XScreenSaverInfo* mitInfo = 0;
     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
-    XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo);
-    if (mitInfo->state == ScreenSaverDisabled)
-	activate = false;
+    if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) {
+        kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl;
+        if (mitInfo->state == ScreenSaverDisabled)
+	    activate = false;
+    }
 #endif
 
     if(mActive && activate)

kdebase-3.5.3-kxkb-kcmlayout.patch:
 kcmlayout.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdebase-3.5.3-kxkb-kcmlayout.patch ---
--- kdebase-3.5.3/kxkb/kcmlayout.cpp.orig	2006-06-10 00:53:38.000000000 +0200
+++ kdebase-3.5.3/kxkb/kcmlayout.cpp	2006-06-10 00:54:08.000000000 +0200
@@ -186,6 +186,7 @@
 	widget->comboModel->setCurrentText(i18n(modelName));
 
 	QValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts;
+	widget->listLayoutsDst->clear();
 // to optimize we should have gone from it.end to it.begin
 	QValueList<LayoutUnit>::ConstIterator it;
 	for (it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {

kdebase-3.5.3-kioslave_media_dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |    7 
 kcmodule/managermodule.cpp                  |    4 
 kcmodule/media.desktop                      |    2 
 kfile-plugin/kfile_media.desktop            |    2 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.cpp                   |    4 
 libmediacommon/medium.h                     |   21 
 mediaimpl.cpp                               |   15 
 mediamanager/halbackend.cpp                 |  620 +++++++++++++++++++++++++++-
 mediamanager/halbackend.h                   |   19 
 mediamanager/mediamanager.cpp               |   81 +++
 mediamanager/mediamanager.h                 |    8 
 medianotifier/medianotifier.cpp             |    9 
 mimetypes/audiocd.desktop                   |    4 
 mimetypes/blankcd.desktop                   |    2 
 mimetypes/blankdvd.desktop                  |    2 
 mimetypes/cdrom_mounted.desktop             |    4 
 mimetypes/cdrom_unmounted.desktop           |    2 
 mimetypes/cdwriter_mounted.desktop          |    2 
 mimetypes/cdwriter_unmounted.desktop        |    2 
 mimetypes/dvdvideo.desktop                  |    4 
 mimetypes/floppy5_mounted.desktop           |    2 
 mimetypes/floppy5_unmounted.desktop         |    2 
 mimetypes/floppy_mounted.desktop            |    2 
 mimetypes/floppy_unmounted.desktop          |    2 
 mimetypes/hdd_mounted.desktop               |    1 
 mimetypes/hdd_unmounted.desktop             |    1 
 mimetypes/nfs_mounted.desktop               |    1 
 mimetypes/nfs_unmounted.desktop             |    1 
 mimetypes/removable_mounted.desktop         |    5 
 mimetypes/removable_unmounted.desktop       |    5 
 mimetypes/smb_mounted.desktop               |    3 
 mimetypes/smb_unmounted.desktop             |    3 
 mimetypes/vcd.desktop                       |    1 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   51 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  217 +++++++++
 propsdlgplugin/propertiespage.h             |   46 ++
 propsdlgplugin/propertiespagegui.ui         |  390 +++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 ++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 +
 services/media_eject.desktop                |    2 
 46 files changed, 1654 insertions(+), 96 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 kdebase-3.5.3-kioslave_media_dbus.patch
Index: kdebase-3.5.3-kioslave_media_dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.3-kioslave_media_dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.3-kioslave_media_dbus.patch	1 Jun 2006 15:53:36 -0000	1.1
+++ kdebase-3.5.3-kioslave_media_dbus.patch	9 Jun 2006 23:19:58 -0000	1.2
@@ -1,148 +1,44 @@
-diff -Nur kdebase-3.5.3/kioslave/media/configure.in.in kdebase-3.5.3.me/kioslave/media/configure.in.in
---- kdebase-3.5.3/kioslave/media/configure.in.in	2005-10-10 17:04:01.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/configure.in.in	2006-06-01 17:13:01.000000000 +0200
-@@ -90,6 +90,13 @@
-   if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
-     KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
-   fi
+--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -54,7 +54,10 @@
+ {
+ 	kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
+ 	          << allowNotification << ")" << endl;
+-	
 +
-+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-+  if test -z "$dbus_bus_var"; then
-+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-+  fi
-+  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
++	if ( !allowNotification )
++	  return;
 +
-   if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
-     AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
-     dbus=FOUND
-diff -Nur kdebase-3.5.3/kioslave/media/kcmodule/managermodule.cpp kdebase-3.5.3.me/kioslave/media/kcmodule/managermodule.cpp
---- kdebase-3.5.3/kioslave/media/kcmodule/managermodule.cpp	2005-11-20 20:14:21.000000000 +0100
-+++ kdebase-3.5.3.me/kioslave/media/kcmodule/managermodule.cpp	2006-06-01 17:13:01.000000000 +0200
-@@ -39,15 +39,15 @@
- 	QString hal_text = view->kcfg_HalBackendEnabled->text();
- 	hal_text += " ("+i18n("No support for HAL on this system")+")";
- 	view->kcfg_HalBackendEnabled->setText( hal_text );
--	view->kcfg_HalBackendEnabled->setEnabled( false );
- #endif
-+	view->kcfg_HalBackendEnabled->setEnabled( false );
- 
- #ifndef COMPILE_LINUXCDPOLLING
- 	QString poll_text = view->kcfg_CdPollingEnabled->text();
- 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
- 	view->kcfg_CdPollingEnabled->setText( poll_text );
--	view->kcfg_CdPollingEnabled->setEnabled( false );
- #endif
-+	view->kcfg_CdPollingEnabled->setEnabled( false );
- 
- 	load();
- }
-diff -Nur kdebase-3.5.3/kioslave/media/kcmodule/media.desktop kdebase-3.5.3.me/kioslave/media/kcmodule/media.desktop
---- kdebase-3.5.3/kioslave/media/kcmodule/media.desktop	2006-05-22 20:12:42.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/kcmodule/media.desktop	2006-06-01 17:13:01.000000000 +0200
-@@ -83,7 +83,6 @@
- Comment[fi]=Aseta tallennusmedia
- Comment[fr]=Configurer le m??dia de stockage
- Comment[fy]=Opslachmedia ynstelle
--Comment[ga]=Cumraigh Me??in St??r??la
- Comment[gl]=Configurar Medios de Armacenaxe
- Comment[hr]=Konfiguriranje medija za pohranu
- Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa
-@@ -130,7 +129,6 @@
- Keywords[fi]=varasto,media,usb,cdrom,laite
- Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique
- Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
--Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as
- Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
- Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ure??aj
- Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z
-diff -Nur kdebase-3.5.3/kioslave/media/kcmodule/notifiermodule.cpp kdebase-3.5.3.me/kioslave/media/kcmodule/notifiermodule.cpp
---- kdebase-3.5.3/kioslave/media/kcmodule/notifiermodule.cpp	2006-05-22 20:12:42.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/kcmodule/notifiermodule.cpp	2006-06-01 17:16:21.000000000 +0200
-@@ -174,8 +174,8 @@
- 	ActionListBoxItem *action_item
- 		= static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem());
- 	
--	NotifierServiceAction * action;
--	if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) )
-+	NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() );
-+	if ( action )
- 	{
- 		ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this);
- 		
-@@ -195,7 +195,8 @@
- 		= static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem());
- 	
- 	NotifierServiceAction *action;
--	if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) )
-+        action = dynamic_cast<NotifierServiceAction*>( action_item->action() );
-+	if ( action )
- 	{
- 		m_settings.deleteAction( action );
- 		updateListBox();
-diff -Nur kdebase-3.5.3/kioslave/media/kfile-plugin/kfile_media.desktop kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfile_media.desktop
---- kdebase-3.5.3/kioslave/media/kfile-plugin/kfile_media.desktop	2006-05-22 20:12:42.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfile_media.desktop	2006-06-01 17:13:01.000000000 +0200
-@@ -61,4 +61,4 @@
- Name[zh_TW]=????????????
- ServiceTypes=KFilePlugin
- X-KDE-Library=kfile_media
--MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
-+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted
-diff -Nur kdebase-3.5.3/kioslave/media/kfile-plugin/kfilemediaplugin.cpp kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
---- kdebase-3.5.3/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2005-11-08 23:36:07.000000000 +0100
-+++ kdebase-3.5.3.me/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-06-01 17:13:01.000000000 +0200
-@@ -64,12 +64,16 @@
- 	addMimeType( "media/floppy_unmounted" );
- 	addMimeType( "media/zip_unmounted" );
- 	addMimeType( "media/gphoto2camera" );
-+	addMimeType( "media/camera_mounted" );
-+	addMimeType( "media/camera_unmounted" );	
- }
- 
- bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
+ // Update user activity timestamp, otherwise the notification dialog will be shown
+ // in the background due to focus stealing prevention. Entering a new media can
+ // be seen as a kind of user activity after all. It'd be better to update the timestamp
+@@ -95,11 +98,11 @@
  {
--	const Medium medium = askMedium(info);
-+        const Medium medium = askMedium(info);
+ 	QString mimetype = medium.mimetype();
  
-+	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
-+ 
- 	if (medium.id().isNull()) return false;
+-	bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" );
++	bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" );
+ 	bool is_mounted = mimetype.endsWith( "_mounted" );
  	
- 	QString mount_point = medium.mountPoint();
-@@ -161,7 +165,8 @@
- const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
- {
- 	DCOPRef mediamanager("kded", "mediamanager");
--	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
-+	kdDebug() << "properties " << info.url() << endl;
-+	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
- 
- 	if ( !reply.isValid() )
+ 	// We autorun only on CD/DVD or removable disks (USB, Firewire)
+-	if ( !( is_cdrom && is_mounted )
++	if ( !( is_cdrom || is_mounted )
+ 	  && mimetype!="media/removable_mounted" )
  	{
-diff -Nur kdebase-3.5.3/kioslave/media/libmediacommon/medium.cpp kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.cpp
---- kdebase-3.5.3/kioslave/media/libmediacommon/medium.cpp	2005-10-10 17:04:00.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.cpp	2006-06-01 17:13:01.000000000 +0200
-@@ -40,6 +40,8 @@
- 	m_properties+= QString::null; /* ICON_NAME */
- 
- 	loadUserLabel();
-+
-+	m_halmounted = false;
- }
- 
- Medium::Medium()
-@@ -57,6 +59,8 @@
- 	m_properties+= QString::null; /* BASE_URL */
- 	m_properties+= QString::null; /* MIME_TYPE */
- 	m_properties+= QString::null; /* ICON_NAME */
-+	
-+	m_halmounted = false;
- }
- 
- const Medium Medium::create(const QStringList &properties)
-diff -Nur kdebase-3.5.3/kioslave/media/libmediacommon/medium.h kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.h
---- kdebase-3.5.3/kioslave/media/libmediacommon/medium.h	2005-10-10 17:04:00.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/libmediacommon/medium.h	2006-06-01 17:13:01.000000000 +0200
+ 		return false;
+--- kdebase-3.5.2/kioslave/media/services/media_eject.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/services/media_eject.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -23,7 +23,7 @@
+ Name[eo]=Eligo
+ Name[es]=Expulsar
+ Name[et]=V??ljastamine
+-Name[eu]=Egotzi
++Name[eu]=Kanporatu
+ Name[fa]=??????????
+ Name[fi]=Poista
+ Name[fr]=??jecter
+--- kdebase-3.5.2/kioslave/media/libmediacommon/medium.h.kio	2005-10-10 17:04:00.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.h	2006-04-28 18:22:09.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <qstring.h>
  #include <qstringlist.h>
@@ -185,2422 +81,2405 @@
 +}
 +
  #endif
-diff -Nur kdebase-3.5.3/kioslave/media/Makefile.am kdebase-3.5.3.me/kioslave/media/Makefile.am
---- kdebase-3.5.3/kioslave/media/Makefile.am	2005-09-10 10:25:36.000000000 +0200
-+++ kdebase-3.5.3.me/kioslave/media/Makefile.am	2006-06-01 17:13:01.000000000 +0200
-@@ -1,5 +1,5 @@
[...4416 lines suppressed...]
+ Comment[sl]=Odklopljen odstranljiv medij
+--- kdebase-3.5.2/kioslave/media/mimetypes/blankcd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/blankcd.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -12,7 +12,7 @@
+ Comment[da]=Blank cd
+ Comment[de]=Leere CD
+ Comment[el]=???????? CD
+-Comment[es]=CD vac??o
++Comment[es]=Borrar CD
+ Comment[et]=T??hi CD
+ Comment[eu]=CD hutsik
+ Comment[fi]=Tyhj?? CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -21,7 +21,6 @@
+ Comment[fi]=Irrotettu kiintolevyosio
+ Comment[fr]=Partition de disque dur non mont??e
+ Comment[fy]=Ofkeppele F??steskiif folume
+-Comment[ga]=Imleabhar Diosca Crua Gan Fheisti??
+ Comment[gl]=Partiz??n do Disco Duro Non Montada
+ Comment[he]=?????????? ???????? ???????? ????????????
+ Comment[hi]=?????????????????????????????? ??????????????? ??????????????? ?????????????????????
+--- kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -52,7 +52,7 @@
+ Comment[pt]=Disquete de 5??" montada
+ Comment[pt_BR]=Disquete  5??" Montado
+ Comment[ro]=Dischet?? 5??" montat??
+-Comment[ru]=???????????????????????????? ?????????????? 5??"
++Comment[ru]=???????????????????????????? ???????????????? 5??"
+ Comment[rw]=Disikete 5??" Yashyizwemo
+ Comment[se]=??atnon 5??-dibmaskearru
+ Comment[sk]=Pripojen?? disketa 5??"
+--- kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -19,7 +19,7 @@
+ Comment[he]=???????????????? ??????
+ Comment[hi]=??????????????? ????????????
+ Comment[hu]=Hang-CD
+-Comment[is]=Hlj????diskur
++Comment[is]=Hlj???? CD
+ Comment[it]=CD audio
+ Comment[ja]=??????????????? CD
+ Comment[km]=???????????????????????????????????????
+@@ -33,7 +33,7 @@
+ Comment[pt]=CD ??udio
+ Comment[pt_BR]=CD de ??udio
+ Comment[ro]=CD Audio
+-Comment[ru]=?????????? CD
++Comment[ru]=???????????????? CD
+ Comment[rw]=CD y'Inyumvo
+ Comment[se]=Jietna-CD
+ Comment[sl]=Glasbeni CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ Comment[pt]=Gravador de CDs desmontado
+ Comment[pt_BR]=Gravador de CD Desmontado
+ Comment[ro]=CD Writer nemontat
+-Comment[ru]=?????????????????????????????? CD (?? ???????????????????????? ????????????)
++Comment[ru]=?????????????????????????????? CD Writer
+ Comment[rw]=Mwandika CD Yakuwemo
+ Comment[se]=G??lgajuvvon CD-????lli
+ Comment[sk]=Nepripojen?? napa??ovacia mechanika CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -21,7 +21,6 @@
+ Comment[fi]=Irrotettu NFS-jako
+ Comment[fr]=Ressource NFS non mont??e
+ Comment[fy]=Oankeppele NFS-boarne
+-Comment[ga]=Comhroinn NFS Gan Fheisti??
+ Comment[gl]=Compartiz??n NFS non Montada
+ Comment[he]=???????? NFS ??????????
+ Comment[hi]=?????????????????????????????? ????????????????????? ????????????
+--- kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ Comment[pt]=CD-ROM desmontado
+ Comment[pt_BR]=CD-ROM Desmontado
+ Comment[ro]=CD-ROM nemontat
+-Comment[ru]=?????????????????????????????? CD
++Comment[ru]=?????????????????????????????? CD-ROM
+ Comment[rw]=CD-ROM Yakuwemo
+ Comment[se]=G??lgajuvvon CD-ROM
+ Comment[sk]=Nepripojen?? CD-ROM
+--- kdebase-3.5.2/kioslave/media/mediaimpl.cpp.kio	2005-10-10 17:04:01.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediaimpl.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -226,6 +226,8 @@
+ 
+ 		mp_mounting = &medium;
+ 		
++		
++		/*
+ 		KIO::Job* job = KIO::mount(false, 0,
+ 		                           medium.deviceNode(),
+ 		                           medium.mountPoint());
+@@ -234,6 +236,7 @@
+ 		         this, SLOT( slotMountResult( KIO::Job * ) ) );
+ 		connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
+ 		         this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
++		*/
+ 		kapp->dcopClient()
+ 		->connectDCOPSignal("kded", "mediamanager",
+ 		                    "mediumChanged(QString, bool)",
+@@ -241,7 +244,17 @@
+ 		                    "slotMediumChanged(QString)",
+ 		                    false);
+ 
+-		qApp->eventLoop()->enterLoop();
++		DCOPRef mediamanager("kded", "mediamanager");
++		DCOPReply reply = mediamanager.call( "mount", medium.id());
++		if (reply.isValid())
++		  reply.get(m_lastErrorMessage);
++		else
++		  m_lastErrorMessage = i18n("Internal Error");
++		if (!m_lastErrorMessage.isEmpty())
++		  m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
++		else {
++		  qApp->eventLoop()->enterLoop();
++		}
+ 
+ 		mp_mounting = 0L;
+ 		
+--- kdebase-3.5.2/kioslave/media/kcmodule/media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -79,7 +79,6 @@
+ Comment[fi]=Aseta tallennusmedia
+ Comment[fr]=Configurer le m??dia de stockage
+ Comment[fy]=Opslachmedia ynstelle
+-Comment[ga]=Cumraigh Me??in St??r??la
+ Comment[gl]=Configurar Medios de Armacenaxe
+ Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa
+ Comment[is]=Stillingar geymslumi??la
+@@ -123,7 +122,6 @@
+ Keywords[fi]=varasto,media,usb,cdrom,laite
+ Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique
+ Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
+-Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as
+ Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
+ Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z
+ Keywords[is]=geymsla,mi??ill,usb,cdrom,t??ki
+--- kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp.kio	2005-11-20 20:14:21.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -39,15 +39,15 @@
+ 	QString hal_text = view->kcfg_HalBackendEnabled->text();
+ 	hal_text += " ("+i18n("No support for HAL on this system")+")";
+ 	view->kcfg_HalBackendEnabled->setText( hal_text );
+-	view->kcfg_HalBackendEnabled->setEnabled( false );
+ #endif
++	view->kcfg_HalBackendEnabled->setEnabled( false );
+ 
+ #ifndef COMPILE_LINUXCDPOLLING
+ 	QString poll_text = view->kcfg_CdPollingEnabled->text();
+ 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
+ 	view->kcfg_CdPollingEnabled->setText( poll_text );
+-	view->kcfg_CdPollingEnabled->setEnabled( false );
+ #endif
++	view->kcfg_CdPollingEnabled->setEnabled( false );
+ 
+ 	load();
+ }
+--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp.kio	2005-11-08 23:36:07.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -64,12 +64,16 @@
+ 	addMimeType( "media/floppy_unmounted" );
+ 	addMimeType( "media/zip_unmounted" );
+ 	addMimeType( "media/gphoto2camera" );
++	addMimeType( "media/camera_mounted" );
++	addMimeType( "media/camera_unmounted" );	
+ }
+ 
+ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
+ {
+-	const Medium medium = askMedium(info);
++        const Medium medium = askMedium(info);
+ 
++	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
++ 
+ 	if (medium.id().isNull()) return false;
+ 	
+ 	QString mount_point = medium.mountPoint();
+@@ -161,7 +165,8 @@
+ const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
+ {
+ 	DCOPRef mediamanager("kded", "mediamanager");
+-	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
++	kdDebug() << "properties " << info.url() << endl;
++	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
+ 
+ 	if ( !reply.isValid() )
+ 	{
+
+--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -58,4 +57,4 @@
+ Name[zh_TW]=????????????
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_media
+-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
++MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- kdebase.spec	8 Jun 2006 17:40:50 -0000	1.186
+++ kdebase.spec	9 Jun 2006 23:19:58 -0000	1.187
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 4
+Release: 5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -57,6 +57,12 @@
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 
+# upstream patches
+Patch100: kdebase-3.5.3-kfind-largefile.patch
+Patch101: kdebase-3.5.3-kicker-panel.patch
+Patch102: kdebase-3.5.3-kscreensaver.patch
+Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -101,7 +107,6 @@
 BuildPrereq: libXdamage-devel
 BuildPrereq: libXcomposite-devel
 BuildPrereq: libXrender-devel
-# XXX should be dependency of libXcomposite-devel... why it isn't?
 BuildPrereq: libXfixes-devel
 %ifnarch s390 s390x
 BuildPrereq: libraw1394-devel
@@ -150,6 +155,12 @@
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 
+# upstream patches
+%patch100 -p1 -b .kfind-largefile
+%patch101 -p1 -b .kicker-panel
+%patch102 -p1 -b .kscreensaver
+%patch103 -p1 -b .kxkb-kcmlayout
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -521,6 +532,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
+- add several upstream patches
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
 - fix rpm file list
 



From fedora-cvs-commits at redhat.com  Fri Jun  9 23:59:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 19:59:36 -0400
Subject: rpms/anaconda/devel anaconda.spec,1.389,1.390
Message-ID: <200606092359.k59Nxagn001926@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1893

Modified Files:
	anaconda.spec 
Log Message:
fixing netpbm-progs to match what is in elvis


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- anaconda.spec	9 Jun 2006 01:04:56 -0000	1.389
+++ anaconda.spec	9 Jun 2006 23:59:33 -0000	1.390
@@ -1,6 +1,6 @@
 Name: anaconda
 Version: 11.1.0.26
-Release: 1
+Release: 1.1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -43,7 +43,7 @@
 Requires: libxml2-python, python, rpm-python >= 4.2-0.61, yum >= 2.4.0
 Requires: anaconda = %{version}-%{release}
 Requires: createrepo >= 0.4.3-3.1, squashfs-tools, mkisofs, syslinux
-Requires: /usr/bin/strip, xorg-x11-font-utils, netpbm-tools
+Requires: /usr/bin/strip, xorg-x11-font-utils, netpbm-progs
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system which 
@@ -90,6 +90,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jun 09 2006 Jesse Keating <jkeating at redhat.com> 11.1.0.26-1.1
+- Fix netpbm requires
+
 * Thu Jun 08 2006 Chris Lumens <clumens at redhat.com> 11.1.0.26-1
 - Revert anaconda-runtime files fix.
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 00:23:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 20:23:25 -0400
Subject: rpms/kernel/devel/configs config-generic,1.191,1.192
Message-ID: <200606100023.k5A0NPUM022352@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22310/configs

Modified Files:
	config-generic 
Log Message:
safer.



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- config-generic	9 Jun 2006 23:12:40 -0000	1.191
+++ config-generic	10 Jun 2006 00:23:22 -0000	1.192
@@ -2503,9 +2503,8 @@
 CONFIG_KGDB=y
 # CONFIG_KGDB_CONSOLE is not set
 CONFIG_KGDBOE=m
-CONFIG_KGDB_SIMPLE_SERIAL=y
-CONFIG_KGDB_BAUDRATE=9600
-CONFIG_KGDB_PORT_NUM=0
+# CONFIG_KGDB_SIMPLE_SERIAL is not set
+CONFIG_KGDB_8250_CONF_STRING=""
 
 #
 # Security options



From fedora-cvs-commits at redhat.com  Sat Jun 10 01:29:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 21:29:46 -0400
Subject: rpms/kernel/devel .cvsignore, 1.450, 1.451 sources, 1.394,
	1.395 kernel-2.6.spec, 1.2262, 1.2263
Message-ID: <200606100129.k5A1TkAx017315@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17268

Modified Files:
	.cvsignore sources kernel-2.6.spec 
Log Message:
rebase HV to cset 10314


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- .cvsignore	9 Jun 2006 17:32:57 -0000	1.450
+++ .cvsignore	10 Jun 2006 01:29:41 -0000	1.451
@@ -2,6 +2,6 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-xen-20060602.tar.bz2
 patch-2.6.17-rc6.bz2
 patch-2.6.17-rc6-git1.bz2
+xen-20060610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- sources	9 Jun 2006 17:32:58 -0000	1.394
+++ sources	10 Jun 2006 01:29:42 -0000	1.395
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
-de03b1f1d050bb6c3bd68723299fa65b  xen-20060602.tar.bz2
 4507f5a167a2296cf5058691cae8fcda  patch-2.6.17-rc6-git1.bz2
+7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2262
retrieving revision 1.2263
diff -u -r1.2262 -r1.2263
--- kernel-2.6.spec	9 Jun 2006 22:19:04 -0000	1.2262
+++ kernel-2.6.spec	10 Jun 2006 01:29:42 -0000	1.2263
@@ -29,7 +29,7 @@
 %define tag %([ -r branch ] && cat branch |sed s/RHEL-5/EL/ | sed s/FC-6/FC6/ || echo FC6)
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
 %define signmodules 0
-%define xen_version 20060602
+%define xen_version 20060610
 %define make_target bzImage
 %define kernel_image x86
 
@@ -1814,6 +1814,9 @@
 %endif
 
 %changelog
+* Sat Jun 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase HV cset 10314
+
 * Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update GFS2 patch, export GFS2 and DLM headers
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 01:33:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 21:33:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2263,
	1.2264 linux-2.6-xen.patch, 1.23, 1.24
Message-ID: <200606100133.k5A1XhGV018106@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17908

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
rebase linux-2.6-xen patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2263
retrieving revision 1.2264
diff -u -r1.2263 -r1.2264
--- kernel-2.6.spec	10 Jun 2006 01:29:42 -0000	1.2263
+++ kernel-2.6.spec	10 Jun 2006 01:32:58 -0000	1.2264
@@ -1815,6 +1815,8 @@
 
 %changelog
 * Sat Jun 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase xen to linux-2.6 cset 27412
+- rebase xen to linux-2.6-xen cset 22608
 - rebase HV cset 10314
 
 * Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com>

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   54 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 257 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.23 -r 1.24 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-xen.patch	2 Jun 2006 15:45:53 -0000	1.23
+++ linux-2.6-xen.patch	10 Jun 2006 01:32:58 -0000	1.24
@@ -1,4 +1,4 @@
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
 --- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/boot-xen/Makefile	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,21 @@
@@ -23,7 +23,7 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
 --- ../upstream/hg/linux-2.6/arch/i386/Kconfig	2006-05-27 02:37:47.000000000 +0200
 +++ merge/arch/i386/Kconfig	2006-05-30 12:42:43.000000000 +0200
 @@ -91,6 +91,15 @@ config X86_PC
@@ -315,7 +315,7 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu merge/arch/i386/Kconfig.cpu
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu merge/arch/i386/Kconfig.cpu
 --- ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-04-14 19:01:33.000000000 +0200
 +++ merge/arch/i386/Kconfig.cpu	2006-05-30 12:42:43.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
@@ -327,7 +327,7 @@
  	default y
  
  config X86_WP_WORKS_OK
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug merge/arch/i386/Kconfig.debug
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug merge/arch/i386/Kconfig.debug
 --- ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug	2006-04-20 13:58:44.000000000 +0200
 +++ merge/arch/i386/Kconfig.debug	2006-05-30 12:42:43.000000000 +0200
 @@ -84,6 +84,7 @@ config X86_MPPARSE
@@ -338,7 +338,7 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c merge/arch/i386/kernel/acpi/boot-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c merge/arch/i386/kernel/acpi/boot-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/acpi/boot-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,1167 @@
@@ -1509,7 +1509,7 @@
 +
 +	return 0;
 +}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile merge/arch/i386/kernel/acpi/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile merge/arch/i386/kernel/acpi/Makefile
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-03-10 14:25:05.000000000 +0100
 +++ merge/arch/i386/kernel/acpi/Makefile	2006-05-30 12:42:43.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
@@ -1520,7 +1520,7 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c merge/arch/i386/kernel/apic-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c merge/arch/i386/kernel/apic-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/apic-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,160 @@
@@ -1684,7 +1684,7 @@
 +
 +	return 0;
 +}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2005-11-07 20:02:43.000000000 +0100
 +++ merge/arch/i386/kernel/asm-offsets.c	2006-05-30 12:42:43.000000000 +0200
 @@ -13,6 +13,7 @@
@@ -1713,7 +1713,7 @@
 -	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/cpu/common-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,732 @@
@@ -2449,7 +2449,7 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile merge/arch/i386/kernel/cpu/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile merge/arch/i386/kernel/cpu/Makefile
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2005-11-07 20:02:43.000000000 +0100
 +++ merge/arch/i386/kernel/cpu/Makefile	2006-05-30 12:42:43.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
@@ -2461,7 +2461,7 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c merge/arch/i386/kernel/cpu/mtrr/main-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c merge/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,197 @@
@@ -2662,7 +2662,7 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile merge/arch/i386/kernel/cpu/mtrr/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile merge/arch/i386/kernel/cpu/mtrr/Makefile
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2005-11-07 20:02:43.000000000 +0100
 +++ merge/arch/i386/kernel/cpu/mtrr/Makefile	2006-05-30 12:42:43.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
@@ -2676,13 +2676,13 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c merge/arch/i386/kernel/early_printk-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c merge/arch/i386/kernel/early_printk-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/early_printk-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S	2006-04-04 08:17:22.000000000 +0200
 +++ merge/arch/i386/kernel/entry.S	2006-05-30 12:42:43.000000000 +0200
 @@ -177,7 +177,7 @@ need_resched:
@@ -2730,7 +2730,7 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S merge/arch/i386/kernel/entry-xen.S
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S merge/arch/i386/kernel/entry-xen.S
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/entry-xen.S	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,903 @@
@@ -3637,7 +3637,7 @@
 +#include "syscall_table.S"
 +
 +syscall_table_size=(.-sys_call_table)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/fixup.c merge/arch/i386/kernel/fixup.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/fixup.c merge/arch/i386/kernel/fixup.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/fixup.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/fixup.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,86 @@
@@ -3727,9 +3727,9 @@
 +	return 0;
 +}
 +__initcall(fixup_init);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/head-xen.S merge/arch/i386/kernel/head-xen.S
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/head-xen.S merge/arch/i386/kernel/head-xen.S
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/head-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/head-xen.S	2006-05-30 12:42:43.000000000 +0200
++++ merge/arch/i386/kernel/head-xen.S	2006-06-05 16:00:51.000000000 +0200
 @@ -0,0 +1,181 @@
 +
 +
@@ -3906,13 +3906,13 @@
 +	.ascii	         "|pae_pgdir_above_4gb"
 +	.ascii	         "|supervisor_mode_kernel"
 +#ifdef CONFIG_X86_PAE
-+	.ascii	",PAE=yes"
++	.ascii	",PAE=yes[extended-cr3]"
 +#else
 +	.ascii	",PAE=no"
 +#endif
 +	.ascii	",LOADER=generic"
 +	.byte	0
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/init_task-xen.c merge/arch/i386/kernel/init_task-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/init_task-xen.c merge/arch/i386/kernel/init_task-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/init_task-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/init_task-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,51 @@
@@ -3967,7 +3967,7 @@
 +DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS;
 +#endif
 +
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/io_apic-xen.c merge/arch/i386/kernel/io_apic-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/io_apic-xen.c merge/arch/i386/kernel/io_apic-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/io_apic-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/io_apic-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,2751 @@
@@ -6722,7 +6722,7 @@
 +}
 +
 +#endif /* CONFIG_ACPI */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/ioport-xen.c merge/arch/i386/kernel/ioport-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/ioport-xen.c merge/arch/i386/kernel/ioport-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/ioport-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/ioport-xen.c	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,121 @@
@@ -6847,7 +6847,7 @@
 +	set_iopl_mask(t->iopl);
 +	return 0;
 +}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c merge/arch/i386/kernel/irq.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c merge/arch/i386/kernel/irq.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c	2006-01-09 15:53:47.000000000 +0100
[...6806 lines suppressed...]
 --- ../upstream/hg/linux-2.6/include/xen/public/privcmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ merge/include/xen/public/privcmd.h	2006-05-30 12:44:01.000000000 +0200
-@@ -0,0 +1,77 @@
++++ merge/include/xen/public/privcmd.h	2006-06-07 13:30:42.000000000 +0200
+@@ -0,0 +1,79 @@
 +/******************************************************************************
 + * privcmd.h
 + * 
@@ -85254,20 +85893,22 @@
 +#ifndef __LINUX_PUBLIC_PRIVCMD_H__
 +#define __LINUX_PUBLIC_PRIVCMD_H__
 +
++#include <linux/types.h>
++
 +#ifndef __user
 +#define __user
 +#endif
 +
 +typedef struct privcmd_hypercall
 +{
-+	unsigned long op;
-+	unsigned long arg[5];
++	__u64 op;
++	__u64 arg[5];
 +} privcmd_hypercall_t;
 +
 +typedef struct privcmd_mmap_entry {
-+	unsigned long va;
-+	unsigned long mfn;
-+	unsigned long npages;
++	__u64 va;
++	__u64 mfn;
++	__u64 npages;
 +} privcmd_mmap_entry_t; 
 +
 +typedef struct privcmd_mmap {
@@ -85279,8 +85920,8 @@
 +typedef struct privcmd_mmapbatch {
 +	int num;     /* number of pages to populate */
 +	domid_t dom; /* target domain */
-+	unsigned long addr;  /* virtual address */
-+	unsigned long __user *arr; /* array of mfns - top nibble set on err */
++	__u64 addr;  /* virtual address */
++	xen_pfn_t __user *arr; /* array of mfns - top nibble set on err */
 +} privcmd_mmapbatch_t; 
 +
 +/*
@@ -85296,7 +85937,7 @@
 +	_IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
 +
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/include/xen/xenbus.h merge/include/xen/xenbus.h
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/xen/xenbus.h merge/include/xen/xenbus.h
 --- ../upstream/hg/linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
 +++ merge/include/xen/xenbus.h	2006-05-30 12:46:38.000000000 +0200
 @@ -0,0 +1,296 @@
@@ -85596,7 +86237,7 @@
 +
 +
 +#endif /* _XEN_XENBUS_H */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/include/xen/xencons.h merge/include/xen/xencons.h
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/xen/xencons.h merge/include/xen/xencons.h
 --- ../upstream/hg/linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
 +++ merge/include/xen/xencons.h	2006-05-30 12:44:01.000000000 +0200
 @@ -0,0 +1,14 @@
@@ -85614,7 +86255,7 @@
 +int xencons_ring_send(const char *data, unsigned len);
 +
 +#endif /* __ASM_XENCONS_H__ */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/include/xen/xen_proc.h merge/include/xen/xen_proc.h
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/xen/xen_proc.h merge/include/xen/xen_proc.h
 --- ../upstream/hg/linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
 +++ merge/include/xen/xen_proc.h	2006-05-30 12:44:01.000000000 +0200
 @@ -0,0 +1,13 @@
@@ -85631,7 +86272,7 @@
 +	const char *name);
 +
 +#endif /* __ASM_XEN_PROC_H__ */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/kernel/irq/manage.c merge/kernel/irq/manage.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/irq/manage.c merge/kernel/irq/manage.c
 --- ../upstream/hg/linux-2.6/kernel/irq/manage.c	2006-05-13 02:59:52.000000000 +0200
 +++ merge/kernel/irq/manage.c	2006-05-30 12:44:02.000000000 +0200
 @@ -204,14 +204,10 @@ int setup_irq(unsigned int irq, struct i
@@ -85688,7 +86329,7 @@
  	if (irq >= NR_IRQS)
  		return;
  
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/kernel/Kconfig.preempt merge/kernel/Kconfig.preempt
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/Kconfig.preempt merge/kernel/Kconfig.preempt
 --- ../upstream/hg/linux-2.6/kernel/Kconfig.preempt	2005-11-07 20:03:01.000000000 +0100
 +++ merge/kernel/Kconfig.preempt	2006-05-30 12:44:02.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
@@ -85699,7 +86340,7 @@
  	help
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/lib/Makefile merge/lib/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/lib/Makefile merge/lib/Makefile
 --- ../upstream/hg/linux-2.6/lib/Makefile	2006-04-04 08:18:24.000000000 +0200
 +++ merge/lib/Makefile	2006-05-30 12:44:02.000000000 +0200
 @@ -48,6 +48,9 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
@@ -85712,7 +86353,7 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/highmem.c merge/mm/highmem.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/highmem.c merge/mm/highmem.c
 --- ../upstream/hg/linux-2.6/mm/highmem.c	2006-04-04 08:18:24.000000000 +0200
 +++ merge/mm/highmem.c	2006-05-30 12:44:03.000000000 +0200
 @@ -142,6 +142,17 @@ start:
@@ -85733,7 +86374,7 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/Kconfig merge/mm/Kconfig
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/Kconfig merge/mm/Kconfig
 --- ../upstream/hg/linux-2.6/mm/Kconfig	2006-04-04 08:18:24.000000000 +0200
 +++ merge/mm/Kconfig	2006-05-30 12:44:03.000000000 +0200
 @@ -126,11 +126,14 @@ comment "Memory hotplug is currently inc
@@ -85751,7 +86392,7 @@
  	default "4"
  
  #
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/memory.c merge/mm/memory.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/memory.c merge/mm/memory.c
 --- ../upstream/hg/linux-2.6/mm/memory.c	2006-04-04 08:18:24.000000000 +0200
 +++ merge/mm/memory.c	2006-05-30 12:44:03.000000000 +0200
 @@ -402,7 +402,8 @@ struct page *vm_normal_page(struct vm_ar
@@ -85903,7 +86544,7 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/mmap.c merge/mm/mmap.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/mmap.c merge/mm/mmap.c
 --- ../upstream/hg/linux-2.6/mm/mmap.c	2006-04-14 19:01:47.000000000 +0200
 +++ merge/mm/mmap.c	2006-05-30 12:44:03.000000000 +0200
 @@ -1942,6 +1942,10 @@ void exit_mmap(struct mm_struct *mm)
@@ -85917,7 +86558,7 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/page_alloc.c merge/mm/page_alloc.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/page_alloc.c merge/mm/page_alloc.c
 --- ../upstream/hg/linux-2.6/mm/page_alloc.c	2006-05-27 02:38:10.000000000 +0200
 +++ merge/mm/page_alloc.c	2006-05-30 12:44:03.000000000 +0200
 @@ -438,7 +438,8 @@ static void __free_pages_ok(struct page 
@@ -85940,7 +86581,7 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/core/dev.c merge/net/core/dev.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/dev.c merge/net/core/dev.c
 --- ../upstream/hg/linux-2.6/net/core/dev.c	2006-05-27 02:38:11.000000000 +0200
 +++ merge/net/core/dev.c	2006-05-30 12:45:46.000000000 +0200
 @@ -116,6 +116,12 @@
@@ -86041,7 +86682,7 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/core/skbuff.c merge/net/core/skbuff.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/skbuff.c merge/net/core/skbuff.c
 --- ../upstream/hg/linux-2.6/net/core/skbuff.c	2006-04-21 20:21:11.000000000 +0200
 +++ merge/net/core/skbuff.c	2006-05-30 12:44:04.000000000 +0200
 @@ -140,6 +140,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
@@ -86129,7 +86770,7 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-01-16 01:22:34.000000000 +0100
 +++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-05-30 12:44:05.000000000 +0200
 @@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
@@ -86151,7 +86792,7 @@
  	return 1;
  }
  
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-01-16 01:22:34.000000000 +0100
 +++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-05-30 12:44:05.000000000 +0200
 @@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
@@ -86176,7 +86817,7 @@
  	*portptr = newport;
  	return 1;
  }
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
 --- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-05-13 02:59:54.000000000 +0200
 +++ merge/net/ipv4/xfrm4_output.c	2006-05-30 12:44:06.000000000 +0200
 @@ -17,6 +17,8 @@
@@ -86199,7 +86840,7 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
 --- ../upstream/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
 +++ merge/scripts/Makefile.xen	2006-05-30 12:44:09.000000000 +0200
 @@ -0,0 +1,14 @@



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:17:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:17:33 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.76,1.77
Message-ID: <200606100217.k5A2HXfi022746@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16325

Modified Files:
	gnome-screensaver.spec 
Log Message:
remove autogunk



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gnome-screensaver.spec	9 Jun 2006 22:44:41 -0000	1.76
+++ gnome-screensaver.spec	10 Jun 2006 02:17:30 -0000	1.77
@@ -69,11 +69,11 @@
 tar xzf %{SOURCE2}
 
 %build
-intltoolize --force
-aclocal
-cat %{SOURCE3} >> aclocal.m4
-automake
-autoconf
+#intltoolize --force
+#aclocal
+#cat %{SOURCE3} >> aclocal.m4
+#automake
+#autoconf
 %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
            --with-xscreensaverhackdir=/usr/libexec/xscreensaver  \
            --with-gdm-config=/etc/X11/gdm/gdm.conf               \



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:21:38 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.77,1.78
Message-ID: <200606100221.k5A2LcHZ028378@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28291

Modified Files:
	gnome-screensaver.spec 
Log Message:
clean up



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gnome-screensaver.spec	10 Jun 2006 02:17:30 -0000	1.77
+++ gnome-screensaver.spec	10 Jun 2006 02:21:35 -0000	1.78
@@ -43,9 +43,6 @@
 # this is here because the configure tests look for protocol headers
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: gettext
-BuildRequires: intltool
-BuildRequires: autoconf
-BuildRequires: automake
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -69,11 +66,6 @@
 tar xzf %{SOURCE2}
 
 %build
-#intltoolize --force
-#aclocal
-#cat %{SOURCE3} >> aclocal.m4
-#automake
-#autoconf
 %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
            --with-xscreensaverhackdir=/usr/libexec/xscreensaver  \
            --with-gdm-config=/etc/X11/gdm/gdm.conf               \



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:38:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:38:31 -0400
Subject: rpms/perl-XML-SAX/devel perl-XML-SAX.spec,1.10,1.11
Message-ID: <200606100238.k5A2cVje032148@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-SAX/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32126

Modified Files:
	perl-XML-SAX.spec 
Log Message:
fix bug 194706


Index: perl-XML-SAX.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-SAX/devel/perl-XML-SAX.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-XML-SAX.spec	6 Jun 2006 00:14:32 -0000	1.10
+++ perl-XML-SAX.spec	10 Jun 2006 02:38:28 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: XML-SAX Perl module
 Name: perl-XML-SAX
 Version: 0.14
-Release: 1
+Release: 2
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-SAX/
@@ -17,7 +17,7 @@
 Requires: perl(:MODULE_COMPAT_%(perl -MConfig -e 'print $Config{version}'))
 Source1: filter-requires-xmlsax.sh
 BuildArch: noarch
-BuildRequires: perl-XML-NamespaceSupport
+BuildRequires: perl-XML-NamespaceSupport perl-XML-LibXML perl-XML-LibXML-Common
 
 # Provide perl-specific find-{provides,requires}.
 %define __find_provides /usr/lib/rpm/find-provides.perl
@@ -76,7 +76,10 @@
 %exclude %{perl_vendorlib}/XML/SAX/placeholder.pl
 
 %changelog
-* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 0.14-1.1
+* Fri Jun 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.14-2
+- fix bug 194706: fails to build under (new!) mock
+
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 0.14-1
 - upgrade to 0.14
 
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.13-1.1



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:39:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:39:22 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.266, 1.267 anaconda.spec, 1.390,
	1.391 sources, 1.387, 1.388
Message-ID: <200606100239.k5A2dM9c032388@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32332/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.27-1 on branch devel from anaconda-11.1.0.27-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- .cvsignore	9 Jun 2006 01:04:55 -0000	1.266
+++ .cvsignore	10 Jun 2006 02:39:19 -0000	1.267
@@ -1 +1 @@
-anaconda-11.1.0.26.tar.bz2
+anaconda-11.1.0.27.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- anaconda.spec	9 Jun 2006 23:59:33 -0000	1.390
+++ anaconda.spec	10 Jun 2006 02:39:20 -0000	1.391
@@ -1,6 +1,6 @@
 Name: anaconda
-Version: 11.1.0.26
-Release: 1.1
+Version: 11.1.0.27
+Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -78,6 +78,9 @@
 %doc docs/anaconda-release-notes.txt
 /usr/bin/mini-wm
 /usr/sbin/anaconda
+%ifarch i386
+/usr/sbin/gptsync
+%endif
 /usr/share/anaconda
 /usr/share/locale/*/*/*
 /usr/lib/anaconda
@@ -90,8 +93,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Fri Jun 09 2006 Jesse Keating <jkeating at redhat.com> 11.1.0.26-1.1
-- Fix netpbm requires
+* Fri Jun  9 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.27-1
+- fix dep problem (clumens)
+- initial pass at support for the intel-based macs
+- more trying to get s390 trees so they work
+- more ipv6 (dcantrel)
+- simplify error handling and return values in autopart code (clumens)
+- fix going back in a few places (clumens)
+- enable user_xattrs and acls by default
 
 * Thu Jun 08 2006 Chris Lumens <clumens at redhat.com> 11.1.0.26-1
 - Revert anaconda-runtime files fix.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- sources	9 Jun 2006 01:04:56 -0000	1.387
+++ sources	10 Jun 2006 02:39:20 -0000	1.388
@@ -1 +1 @@
-b616338b8d3a46bf2d68f45bd35347b8  anaconda-11.1.0.26.tar.bz2
+0f65ec6b4947536e5886138fb6d91409  anaconda-11.1.0.27.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:43:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:43:19 -0400
Subject: rpms/eclipse/devel eclipse-webapp-jasper-classpath.patch,NONE,1.1
Message-ID: <200606100243.k5A2hJmn001390@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1358

Added Files:
	eclipse-webapp-jasper-classpath.patch 
Log Message:
commit missing webapp jasper patch

eclipse-webapp-jasper-classpath.patch:
 build.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE eclipse-webapp-jasper-classpath.patch ---
Index: build.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v
retrieving revision 1.71
diff -u -r1.71 build.xml
--- plugins/org.eclipse.help.webapp/build.xml	16 Mar 2006 21:57:15 -0000	1.71
+++ plugins/org.eclipse.help.webapp/build.xml	9 Jun 2006 18:44:54 -0000
@@ -170,18 +170,17 @@
 		<!-- generate java code from JSPs -->
 		<path id="jasper.classpath" > 
 			<pathelement location="../org.apache.ant/lib/ant.jar"/>
-			<pathelement location="../org.apache.ant/lib/optional.jar"/>
+			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
 			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
 			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
 			<pathelement location="../org.eclipse.tomcat/servlet.jar" />
-			<pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />  
 		</path>
 		<delete dir="${temp.folder}/jsp.jar.src"/>
   		<mkdir dir="${temp.folder}/jsp.jar.src"/>
 		<java
 			classname="org.apache.jasper.JspC"
 			fork="true"
-			failonerror="false"
+			failonerror="true"
 			classpathref="jasper.classpath"
 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
 			<arg value="-v3" />



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:44:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:44:06 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-context-init-error.patch, NONE,
	1.1 autofs.spec, 1.99, 1.100
Message-ID: <200606100244.k5A2i67X001710@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1628

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-context-init-error.patch 
Log Message:
* Sat Jun 10 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-7
- fix context init error (introduced by memory leak patch).


autofs-5.0.0_beta4-context-init-error.patch:
 lookup_ldap.c    |    1 -
 lookup_nisplus.c |    1 +
 lookup_yp.c      |    1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta4-context-init-error.patch ---
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index ad676e7..bf1184e 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -760,7 +760,6 @@ #endif
 		*context = NULL;
 		return 1;
 	}
-
 	*context = ctxt;
 
 	return 0;
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 0bf1b02..6ea418e 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -74,6 +74,7 @@ int lookup_init(const char *mapfmt, int 
 		*context = NULL;
 		return 1;
 	}
+	*context = ctxt;
 
 	return 0;
 }
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 8c3a2ba..7eea62b 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -99,6 +99,7 @@ int lookup_init(const char *mapfmt, int 
 		*context = NULL;
 		return 1;
 	}
+	*context = ctxt;
 
 	return 0;
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- autofs.spec	9 Jun 2006 06:29:03 -0000	1.99
+++ autofs.spec	10 Jun 2006 02:44:04 -0000	1.100
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -24,6 +24,7 @@
 Patch10: autofs-5.0.0_beta4-misc-fixes-2.patch
 Patch11: autofs-5.0.0_beta4-sources-list-corruption.patch
 Patch12: autofs-5.0.0_beta4-memory-leaks.patch
+Patch13: autofs-5.0.0_beta4-context-init-error.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -75,6 +76,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -130,6 +132,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Sat Jun 10 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-7
+- fix context init error (introduced by memory leak patch).
+
 * Fri Jun 9 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-6
 - add free for working var in get_default_logging.
 - add inialisation for kver in autofs_point struct.



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:52:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:52:44 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.267, 1.268 anaconda.spec, 1.391,
	1.392 sources, 1.388, 1.389
Message-ID: <200606100252.k5A2qivC019508@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19454/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.28-1 on branch devel from anaconda-11.1.0.28-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- .cvsignore	10 Jun 2006 02:39:19 -0000	1.267
+++ .cvsignore	10 Jun 2006 02:52:42 -0000	1.268
@@ -1 +1 @@
-anaconda-11.1.0.27.tar.bz2
+anaconda-11.1.0.28.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- anaconda.spec	10 Jun 2006 02:39:20 -0000	1.391
+++ anaconda.spec	10 Jun 2006 02:52:42 -0000	1.392
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.27
+Version: 11.1.0.28
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -93,7 +93,7 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Fri Jun  9 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.27-1
+* Fri Jun  9 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.28-1
 - fix dep problem (clumens)
 - initial pass at support for the intel-based macs
 - more trying to get s390 trees so they work


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- sources	10 Jun 2006 02:39:20 -0000	1.388
+++ sources	10 Jun 2006 02:52:42 -0000	1.389
@@ -1 +1 @@
-0f65ec6b4947536e5886138fb6d91409  anaconda-11.1.0.27.tar.bz2
+56fd3712a59e3895a06ae98a4776f083  anaconda-11.1.0.28.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:57:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:57:42 -0400
Subject: rpms/tog-pegasus/devel pegasus_arch_alternatives, NONE,
	1.1 RedHat.OpenPegasus.Makefile, 1.2, 1.3
Message-ID: <200606100257.k5A2vgHr021423@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21396

Modified Files:
	RedHat.OpenPegasus.Makefile 
Added Files:
	pegasus_arch_alternatives 
Log Message:
fix bug 192754: remove multilib conflicts


--- NEW FILE pegasus_arch_alternatives ---
#!/bin/bash
#
#  Script to manage tog-pegasus alternatives for multi-lib platforms
#
#  Jason Vas Dias<jvdias at redhat.com>, Red Hat, Inc. June 2006
#
#  Usage:
#  pegasus_arch_alternatives 
#  ( --list [pfx]  | 
#    ( [ devel | test ] [ -64 ] [ -32 ] [ --remove ] [ --display ] ) 
#  )
#    no args  :  set up library and binary 'pegasus' alternatives
#    --list   :  list 64/32-bit alternatives, with optional prefix pfx  
#    devel    :  set up the 'pegasus-devel' alternative
#    test     :  set up the 'pegasus-test' alternative
#    -64      :  select 64-bit alternatives
#    -32      :  select 32-bit alternatives
#    --remove :  remove all pegasus alternatives
#    --display:  display the pegasus alternatives
#
ALT='pegasus'
LINK=/usr/sbin/cimserver
SLAVES=(/usr/{bin/{cimmof,cimmofl,cimprovider,osinfo,wbemexec},sbin/{cimauth,cimconfig,cimprovagt,cimuser,repupgrade}})
DEVEL_LINK=/usr/share/Pegasus/samples/mak/config.mak 
TEST_LINK=/usr/share/Pegasus/test/Makefile
#
# Handle listing arg:
#
if [ "$1" = '--list' ]; then
    pfx='';
    if [ $# -gt 1 ]; then
	pfx=$2' ';
    fi;
    for f in $LINK ${SLAVES[@]} $DEVEL_LINK $TEST_LINK; do
	echo ${pfx}$f;
    done;
    exit 0;
fi
#
# Ensure that files and alternatives are correctly in-sync for architecture:
#
ARCH=`/bin/uname -i`
case $ARCH in
    # return for arches that have no alternatives
    ia64 )
	# nothing to be done - shipped without binary suffix
	exit 0;
	;;
    i386 | ppc | s390 )
	# shipped with -32 suffix, but no alternatives possible - move:
    	for f in $LINK ${SLAVES[@]} $DEVEL_LINK $TEST_LINK; 
	do
	  if [ -f ${f}-32 ] ; then
	      /bin/mv -f ${f}-32 $f; 
	  fi;
	done;
	exit 0;
	;;
    x86_64 | ppc64 | s390x )
	# continue
	;;
    *)
	# unhandled architecture
	exit 1;
	;;
esac;
if [ "$1" = 'devel' ] || [ "$1" = 'test' ]; then
    ALT='pegasus-'$1;
    shift;
    SLAVES=();
    if [ "$ALT" = 'pegasus-devel' ]; then
	LINK=$DEVEL_LINK;
    else
	LINK=$TEST_LINK;
    fi;
fi;
#
# Ensure that whatever alternatives can be installed, are installed,
# and those that can't be installed are removed:
#
alternatives="`/usr/sbin/alternatives --display $ALT 2>/dev/null`";
slaves64=''
slaves32=''	    
installed64=1;
installed32=1;	
for f in $LINK ${SLAVES[@]}; do
    if [ $installed64 -eq 1 ] && [ -f ${f}-64 ]; then 
	slaves64=${slaves64}'--slave '$f' '${f##*/}' '${f}-64' ';
    else
	installed64=0;
	continue;
    fi;
    if [ $installed32 -eq 1 ] &&  [ -f ${f}-32 ]; then
	slaves32=${slaves32}'--slave '$f' '${f##*/}' '${f}-32' ';
    else
	installed32=0;
	continue;
    fi;	    
    if [ -e $f ] && [ ! -L $f ]; then
	/bin/rm -f $f;
    fi;
done
if [ $installed64 -eq 0 ]; then
    /usr/sbin/alternatives --remove $ALT ${LINK}-64 >/dev/null 2>&1 || :;
elif ! echo "$alternatives" | /bin/egrep -q "^${LINK}-64"; then
    /usr/sbin/alternatives --install $LINK $ALT ${LINK}-64 50 $slaves64;
fi;
if [ $installed32 -eq 0 ]; then
    /usr/sbin/alternatives --remove $ALT ${LINK}-32 >/dev/null 2>&1 || :;
elif  ! echo "$alternatives" | /bin/egrep -q "^${LINK}-32"; then
    /usr/sbin/alternatives --install $LINK $ALT ${LINK}-32 50 $slaves32;
fi;
#
# Handle optional user args
#
if [ -n "$1" ]; then
    case $1 in
	-64 )
	    if [ $installed64 -eq 1 ]; then
		/usr/sbin/alternatives --set $ALT ${LINK}-64;
		if [ "$ALT" = 'pegasus' ]; then
		    /usr/sbin/alternatives --set pegasus-devel ${DEVEL_LINK}-64 >/dev/null 2>&1;
    		    /usr/sbin/alternatives --set pegasus-test ${TEST_LINK}-64 >/dev/null 2>&1;
		fi;
	    fi
	    ;;
	-32 )
	    if [ $installed32 -eq 1 ]; then
		/usr/sbin/alternatives --set $ALT ${LINK}-32;
    		if [ "$ALT" = 'pegasus' ]; then
		    /usr/sbin/alternatives --set pegasus-devel ${DEVEL_LINK}-32 >/dev/null 2>&1;
    		    /usr/sbin/alternatives --set pegasus-test ${TEST_LINK}-32 >/dev/null 2>&1;
		fi;
	    fi
	    ;;
	--remove )
	    /usr/sbin/alternatives --remove $ALT ${LINK}-32 >/dev/null 2>&1;
	    /usr/sbin/alternatives --remove $ALT ${LINK}-64 >/dev/null 2>&1;
	    if [ "$ALT" = 'pegasus' ]; then
		/usr/sbin/alternatives --remove pegasus-devel ${DEVEL_LINK}-32 >/dev/null 2>&1;
		/usr/sbin/alternatives --remove pegasus-devel ${DEVEL_LINK}-64 >/dev/null 2>&1;
    		/usr/sbin/alternatives --remove pegasus-test  ${TEST_LINK}-32 >/dev/null 2>&1;
		/usr/sbin/alternatives --remove pegasus-test  ${TEST_LINK}-64 >/dev/null 2>&1;
	    fi;
	    ;;
	--display )
	    /usr/sbin/alternatives --display $ALT;
	    if [ "$ALT" = 'pegasus' ]; then
		/usr/sbin/alternatives --display pegasus-devel;
    		/usr/sbin/alternatives --display pegasus-test;
	    fi
	    ;;
	*)
	    exit 1;	    
	    ;;
    esac;
fi;
exit 0;


Index: RedHat.OpenPegasus.Makefile
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/RedHat.OpenPegasus.Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RedHat.OpenPegasus.Makefile	11 Apr 2006 19:46:17 -0000	1.2
+++ RedHat.OpenPegasus.Makefile	10 Jun 2006 02:57:40 -0000	1.3
@@ -9,9 +9,9 @@
 #   Jason Vas Dias <jvdias at redhat.com> Red Hat, Inc. April 2006
 #
 SRCNAME ?= pegasus
-RPM_BUILD_DIR ?= $(shell cd ..;pwd)
-RPM_ARCH ?= $(shell uname -i)
-RPM_OPT_FLAGS ?= $(shell rpm -q rpm --qf '%{OPTFLAGS}')
+export RPM_BUILD_DIR ?= $(shell cd ..;pwd)
+export RPM_ARCH ?= $(shell uname -i)
+export RPM_OPT_FLAGS ?= $(shell rpm -q rpm --qf '%{OPTFLAGS}')
 ifndef PEGASUS_PLATFORM
   ifeq ($(RPM_ARCH),ia64)
     export PEGASUS_PLATFORM := LINUX_IA64_GNU
@@ -73,7 +73,7 @@
 PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
 LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/lib!
 pegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1
 
-all: setup $(BINARIES) $(LIBRARIES) $(PROVIDERS)
+all:  $(BINARIES) $(LIBRARIES) $(PROVIDERS)
 
 setup:
 	$(MAKE) -f Makefile.Release create_ProductVersionFile
@@ -81,6 +81,8 @@
 	$(MAKE) -f Makefile.Release create_ConfigProductDirectoriesInclude
 	touch setup
 
+$(BINARIES) $(LIBRARIES) $(PROVIDERS): setup
+
 $(B)/bin/cimserver: $(B)/lib/libpegclient.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
 	$(MAKE) -C $(R)/src/Server
 
@@ -300,6 +302,7 @@
 PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA)))
 LINKED_LIBS=$(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1
 export PEGASUS_STAGING_DIR := $(D)
+BSX ?=
 
 install: dirs config libs lib_links bins mans mof SDK ghost_files repository
 
@@ -351,13 +354,15 @@
 
 lib_links: libs $(patsubst %.so.1,%.so,$(LINKED_LIBS))
 
-$(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)):
-	$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(sbin)/%,$(B)/bin/%, $@) $@
-
-$(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS)):
-	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(bin)/%,$(B)/bin/%, $@) $@
+$(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(patsubst %,%$(BSX),$(SBINS))):
+	$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $(patsubst %$(BSX),%,$(patsubst $(D)/$(sbin)/%,$(B)/bin/%, $@)) $@
+	if [ -n "$(BSX)" ]; then /bin/ln -s $(notdir $@) $(patsubst %$(BSX),%,$@); fi
+
+$(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(patsubst %,%$(BSX),$(UBINS))):
+	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst %$(BSX),%,$(patsubst $(D)/$(bin)/%,$(B)/bin/%, $@)) $@
+	if [ -n "$(BSX)" ]; then /bin/ln -s $(notdir $@) $(patsubst %$(BSX),%,$@); fi
 
-bins:   $(SBINS) $(UBINS) $(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)) $(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS))
+bins:   $(SBINS) $(UBINS) $(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(patsubst %,%$(BSX),$(SBINS))) $(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(patsubst %,%$(BSX),$(UBINS)))
 
 $(D)/$(mandir)/man8/%.8:
 	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man8.Z/$*.8 $@
@@ -375,6 +380,7 @@
 	/bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
 	$(MAKE) -f $(R)/mak/SDKMakefile stageSDK
 	/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
+	if [ -n "$(BSX)" ]; then mv $(D)/$(share)/Pegasus/samples/mak/config.mak $(D)/$(share)/Pegasus/samples/mak/config.mak$(BSX); /bin/ln -s config.mak$(BSX) $(D)/$(share)/Pegasus/samples/mak/config.mak; fi;
 	touch SDK
 
 ghost_files:
@@ -551,6 +557,7 @@
 
 test_makefile:
 	$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_Makefile
+	if [ -n "$(BSX)" ]; then /bin/mv $(D)/$(share)/Pegasus/test/Makefile $(D)/$(share)/Pegasus/test/Makefile$(BSX); /bin/ln -s Makefile$(BSX) $(D)/$(share)/Pegasus/test/Makefile; fi;
 
 test_repository:
 	LD_LIBRARY_PATH=$(B)/lib PATH=$(B)/bin:$$PATH $(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_repository



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:58:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:58:29 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-obz5115.patch,NONE,1.1
Message-ID: <200606100258.k5A2wTU8021740@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21717

Added Files:
	pegasus-2.5.1-obz5115.patch 
Log Message:
fix upstream bug 5115

pegasus-2.5.1-obz5115.patch:
 SetConfig_EnvVar |   60 +++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5115.patch ---
--- pegasus/SetConfig_EnvVar.obz5115	2006-01-30 11:16:16.000000000 -0500
+++ pegasus/SetConfig_EnvVar	2006-06-07 15:06:18.000000000 -0400
@@ -1,34 +1,34 @@
 #!/usr/bin/perl
-//%2006////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
-// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
-// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
-// IBM Corp.; EMC Corporation, The Open Group.
-// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
-// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
-// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-// EMC Corporation; VERITAS Software Corporation; The Open Group.
-// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-// EMC Corporation; Symantec Corporation; The Open Group.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
-// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
-// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//================================================================================
+#//%2006////////////////////////////////////////////////////////////////////////
+#//
+#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
+#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
+#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
+#// IBM Corp.; EMC Corporation, The Open Group.
+#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
+#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
+#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
+#// EMC Corporation; VERITAS Software Corporation; The Open Group.
+#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
+#// EMC Corporation; Symantec Corporation; The Open Group.
+#//
+#// Permission is hereby granted, free of charge, to any person obtaining a copy
+#// of this software and associated documentation files (the "Software"), to
+#// deal in the Software without restriction, including without limitation the
+#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+#// sell copies of the Software, and to permit persons to whom the Software is
+#// furnished to do so, subject to the following conditions:
+#// 
+#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
+#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
+#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+#// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#//
+#//================================================================================
 use strict;
 #use warnings;
 my $HELP_FILE = "SetConfig_EnvVar.help";



From fedora-cvs-commits at redhat.com  Sat Jun 10 02:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 22:58:44 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-obz5119.patch,NONE,1.1
Message-ID: <200606100258.k5A2wiAs021854@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21827

Added Files:
	pegasus-2.5.1-obz5119.patch 
Log Message:
fix upstream bug 5115

pegasus-2.5.1-obz5119.patch:
 CmpiImpl.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5119.patch ---
--- pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp.obz5119	2006-01-30 11:18:00.000000000 -0500
+++ pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp	2006-06-07 15:13:01.000000000 -0400
@@ -1197,7 +1197,7 @@
      else
        throw CmpiStatus(rc.rc,name->charPtr());
    }
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name= CmpiString(s);
    return d;
 };
 
@@ -1386,7 +1386,7 @@
    CMPIString *s;
    d._data=getEnc()->ft->getKeyAt(getEnc(),(int)pos,&s,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name= CmpiString(s);
    return d;
 }
 
@@ -1710,7 +1710,7 @@
      else
        throw CmpiStatus(rc.rc,name->charPtr());
    }
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name= CmpiString(s);
    return d;
 }
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:00:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:00:19 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.33,1.34
Message-ID: <200606100300.k5A30JMH022487@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22378

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 192754: remove multilib conflicts; fix upstream bugs 5115 & 5119


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tog-pegasus.spec	31 May 2006 19:06:15 -0000	1.33
+++ tog-pegasus.spec	10 Jun 2006 03:00:16 -0000	1.34
@@ -30,8 +30,18 @@
 %define pegasus_gid	65
 %define pegasus_uid	66
 
+%define multilib        0
+%define bsx             ''
+%ifarch i386 x86_64 ppc ppc64 s390 s390x
+%define multilib        1
+%define bsx             -32
+%ifarch x86_64 ppc64 s390x
+%define bsx             -64 
+%endif
+%endif
+
 Version: 		2.5.1
-Release: 		6%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		8%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -41,12 +51,13 @@
 #
 License:   		Open Group Pegasus Open Source
 #
-BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}-%(%{__id} -u -n)
 #
 Source:    		http://www.openpegasus.org/uploads/40/10123/%{srcname}-%{version}.tar.gz
 Source1:		RedHat.OpenPegasus.Makefile
 Source2:        	README.RedHat.Security
 Source3:		genOpenPegasusSSLCerts
+Source4:		pegasus_arch_alternatives
 #
 Patch0:			pegasus-2.5.1-initscript.patch
 Patch1:			pegasus-2.5.1-no-rpath.patch
@@ -81,6 +92,8 @@
 Patch30:		pegasus-2.5.1-obz5059.patch
 Patch31:		pegasus-2.5.1-obz5072.patch
 Patch32:		pegasus-2.5.1-obz5083.patch
+Patch33:		pegasus-2.5.1-obz5115.patch
+Patch34:		pegasus-2.5.1-obz5119.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -123,7 +136,6 @@
 supports C provider developers via the CMPI interface.
 
 %if %{PEGASUS_BUILD_TEST_RPM}
-
 %package test
 Summary: 		The OpenPegasus Tests
 Group: 			Systems Management/Base
@@ -169,6 +181,8 @@
 %patch30 -p1 -b .obz5059
 %patch31 -p1 -b .obz5072
 %patch32 -p1 -b .obz5083
+%patch33 -p1 -b .obz5115
+%patch34 -p1 -b .obz5119
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -176,15 +190,25 @@
 cp -fp %SOURCE2 doc
 cp -fp %SOURCE3 rpm
 export RPM_ARCH_LIB=%{_lib}
+export RPM_ARCH=%{_target_cpu}
 make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile;
 %if %{PEGASUS_BUILD_TEST_RPM}
     make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile tests;
 %endif
 
 %install
-make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_libdir} root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)
+export RPM_ARCH_LIB=%{_lib}
+export RPM_ARCH=%{_target_cpu}
+export BSX=%{bsx}
+make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_libdir} root_user=%(%{__id} -u -n) pegasus_user=%(%{__id} -u -n)
 %if %{PEGASUS_BUILD_TEST_RPM}
-    make -f RedHat.OpenPegasus.Makefile install_tests prefix=$RPM_BUILD_ROOT root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)    
+    make -f RedHat.OpenPegasus.Makefile install_tests prefix=$RPM_BUILD_ROOT root_user=%(%{__id} -u -n) pegasus_user=%(%{__id} -u -n)    
+%endif
+%if %{multilib}
+    %{SOURCE4} --list '%ghost' | grep 'bin/' > ghost_arch_binaries;
+    %{SOURCE4} --list '%ghost' | grep 'mak/' > ghost_arch_devel;
+    %{SOURCE4} --list '%ghost' | grep 'test/'> ghost_arch_test;
+    cp -fp %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts;
 %endif
 %if %{NODEBUGINFO}
     /usr/lib/rpm/brp-compress;
@@ -192,7 +216,11 @@
 %endif
 :;
 
+%if %{multilib}
+%files -f ghost_arch_binaries
+%else
 %files
+%endif
 %defattr(0750, root, pegasus, 0750)
 %if !%{NODEBUGINFO}
 %exclude /usr/lib/debug
@@ -234,17 +262,25 @@
 /usr/share/man/man1/*
 %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 
-%files devel
+%if %{multilib}
+%files devel -f ghost_arch_devel
+%else
+%files
+%endif
 %defattr(0644,root,pegasus,0755)
 /usr/include/Pegasus
 /usr/share/Pegasus/samples
 /usr/share/Pegasus/html
 
 %if %{PEGASUS_BUILD_TEST_RPM}
+%if %{multilib}
+%files test -f ghost_arch_test
+%else
 %files test
+%endif
 %defattr(0644,root,pegasus,0755)
 %dir /usr/share/Pegasus/test
-/usr/share/Pegasus/test/Makefile
+/usr/share/Pegasus/test/Makefile%{bsx}
 /usr/share/Pegasus/test/mak
 /var/lib/Pegasus/testrepository
 %defattr(0750,root,pegasus,0755)
@@ -277,17 +313,20 @@
 %post
 ldconfig;
 chkconfig --add tog-pegasus;
-if [ $1 -eq 1 ]; then
-   echo `date` >  /var/lib/Pegasus/log/install.log 2>&1
-elif [ $1 -gt 1 ]; then	
+if [ $1 -ge 1 ]; then	
    echo `date` >>  /var/lib/Pegasus/log/install.log 2>&1 || :;
-   if [ -d /var/lib/Pegasus/prev_repository ]; then
-   #  The user's old repository was moved to /var/lib/Pegasus/prev_repository, which 
-   #  now must be upgraded to the new repository in /var/lib/Pegasus/repository:
-	/usr/sbin/repupgrade 2>> /var/lib/Pegasus/log/install.log || :;
-        mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+%if %{multilib}
+    %{_datadir}/Pegasus/scripts/pegasus_arch_alternatives || :;
+%endif
+   if [ $1 -gt 1 ]; then
+      if [ -d /var/lib/Pegasus/prev_repository ]; then
+      #  The user's old repository was moved to /var/lib/Pegasus/prev_repository, which 
+      #  now must be upgraded to the new repository in /var/lib/Pegasus/repository:
+	 /usr/sbin/repupgrade 2>> /var/lib/Pegasus/log/install.log || :;
+         mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+      fi;
+      /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
    fi;
-   /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
 fi
 :;
 
@@ -295,20 +334,61 @@
 if [ $1 -eq 0 ]; then
    /sbin/service tog-pegasus stop >/dev/null 2>&1 || :;
    /sbin/chkconfig --del tog-pegasus >/dev/null 2>&1 || :;
+%if %{multilib}
+   if [ "$1" -eq 0 ]; then
+      /usr/sbin/alternatives --remove pegasus /usr/sbin/cimserver-64 >/dev/null 2>&1 || :;
+      /usr/sbin/alternatives --remove pegasus /usr/sbin/cimserver-32 >/dev/null 2>&1 || :;
+   fi
+%endif
 fi
 :;
 
-%postun
-ldconfig
+%postun -p /sbin/ldconfig
+
+%post devel
+if [ $1 -ge 0 ]; then
+    %{_datadir}/Pegasus/scripts/pegasus_arch_alternatives devel || :;
+fi
+:;
 
 %preun devel
 if [ $1 -eq 0 ] ; then
    make --directory /usr/share/Pegasus/samples -s clean >/dev/null 2>&1 || :;
+%if %{multilib}
+   /usr/sbin/alternatives --remove pegasus-devel %{_datadir}/Pegasus/samples/mak/config.mak-64 >/dev/null 2>&1 || :;
+   /usr/sbin/alternatives --remove pegasus-devel %{_datadir}/Pegasus/samples/mak/config.mak-32 >/dev/null 2>&1 || :;
+%endif
+fi
+:;
+
+%if %{PEGASUS_BUILD_TEST_RPM}
+%if %{multilib}
+%post test
+if [ $1 -ge 0 ]; then
+   %{_datadir}/Pegasus/scripts/pegasus_arch_alternatives test || :;
 fi
 :;
 
+%preun test
+if [ $1 -eq 0 ]; then
+%if %{multilib}
+   /usr/sbin/alternatives --remove pegasus-test %{_datadir}/Pegasus/test/Makefile-64 >/dev/null 2>&1 || :;
+   /usr/sbin/alternatives --remove pegasus-test %{_datadir}/Pegasus/test/Makefile-32 >/dev/null 2>&1 || :;
+%endif
+fi
+:;
+%endif
+%endif
+
+
 %changelog
-* Wed May 31 2006 JAson Vas Dias <jvdias at redhat.com> - 2:2.5.1-6
+* Fri Jun 09 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-8
+- Fix bug 192754: remove multilib conflicts
+- More upstream 2.5.2_APPROVED bug fixes:
+  o 5119: memory leak in CMPI implementation
+  o 5115: fix SetConfig_EnvVar comments
+
+* Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-6
 - Apply upstream patches for latest 2.5.2_APPROVED bugs:
   o 5046: cimprovider timeout needs to be increased
   o 5047: cimmof timeout needs to be increased



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:14:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:14:20 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.34,1.35
Message-ID: <200606100314.k5A3EKsV024455@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24426

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 192754: remove multilib conflicts; fix upstream bugs 5115 & 5119


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tog-pegasus.spec	10 Jun 2006 03:00:16 -0000	1.34
+++ tog-pegasus.spec	10 Jun 2006 03:14:18 -0000	1.35
@@ -209,6 +209,10 @@
     %{SOURCE4} --list '%ghost' | grep 'mak/' > ghost_arch_devel;
     %{SOURCE4} --list '%ghost' | grep 'test/'> ghost_arch_test;
     cp -fp %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts;
+%else
+    touch ghost_arch_binaries;
+    touch ghost_arch_devel;
+    touch ghost_arch_test;
 %endif
 %if %{NODEBUGINFO}
     /usr/lib/rpm/brp-compress;
@@ -216,11 +220,8 @@
 %endif
 :;
 
-%if %{multilib}
+
 %files -f ghost_arch_binaries
-%else
-%files
-%endif
 %defattr(0750, root, pegasus, 0750)
 %if !%{NODEBUGINFO}
 %exclude /usr/lib/debug
@@ -262,22 +263,15 @@
 /usr/share/man/man1/*
 %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 
-%if %{multilib}
+
 %files devel -f ghost_arch_devel
-%else
-%files
-%endif
 %defattr(0644,root,pegasus,0755)
 /usr/include/Pegasus
 /usr/share/Pegasus/samples
 /usr/share/Pegasus/html
 
-%if %{PEGASUS_BUILD_TEST_RPM}
-%if %{multilib}
+
 %files test -f ghost_arch_test
-%else
-%files test
-%endif
 %defattr(0644,root,pegasus,0755)
 %dir /usr/share/Pegasus/test
 /usr/share/Pegasus/test/Makefile%{bsx}



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:16:15 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.35,1.36
Message-ID: <200606100316.k5A3GFbK025184@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25103

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 192754: remove multilib conflicts; fix upstream bugs 5115 & 5119


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tog-pegasus.spec	10 Jun 2006 03:14:18 -0000	1.35
+++ tog-pegasus.spec	10 Jun 2006 03:16:12 -0000	1.36
@@ -270,7 +270,7 @@
 /usr/share/Pegasus/samples
 /usr/share/Pegasus/html
 
-
+%if %{PEGASUS_BUILD_TEST_RPM}
 %files test -f ghost_arch_test
 %defattr(0644,root,pegasus,0755)
 %dir /usr/share/Pegasus/test



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:17:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:17:08 -0400
Subject: rpms/rsync/devel rsync-2.6.8-xattrs_bug.patch, NONE, 1.1 rsync.spec,
	1.36, 1.37
Message-ID: <200606100317.k5A3H8gq031165@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/rsync/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30843

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.8-xattrs_bug.patch 
Log Message:
+- Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
+- Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable
+- replace --with... with --enable... so they actually work



rsync-2.6.8-xattrs_bug.patch:
 xattrs.diff |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE rsync-2.6.8-xattrs_bug.patch ---
--- rsync-2.6.8/patches/#xattrs.diff~	2006-06-09 22:00:05.000000000 -0400
+++ rsync-2.6.8/patches/xattrs.diff	2006-06-09 22:00:38.000000000 -0400
@@ -372,7 +372,7 @@
  transfer.  The resulting value is treated as though it was the permissions
 --- old/xattr.c
 +++ new/xattr.c
-@@ -0,0 +1,523 @@
+@@ -0,0 +1,524 @@
 +/* Extended Attribute support for rsync */
 +/* Copyright (C) 2004 Red Hat, Inc */
 +/* Written by Jay Fenlason, vaguely based on the ACLs patch */
@@ -590,10 +590,10 @@
 +		strcpy(ptr, name);
 +		if (datum_size)
 +			memcpy(ptr + len, datumbuf, datum_size);
-+		x->rxas[curr_rsync_xal.count].name_len = len;
-+		x->rxas[curr_rsync_xal.count].name = ptr;
-+		x->rxas[curr_rsync_xal.count].datum_len = datum_size;
-+		x->rxas[curr_rsync_xal.count].datum = ptr + len;
++		x->rxas[x->count].name_len = len;
++		x->rxas[x->count].name = ptr;
++		x->rxas[x->count].datum_len = datum_size;
++		x->rxas[x->count].datum = ptr + len;
 +		x->count++;
 +	}
 +	if (x->count > 1) {
@@ -656,6 +656,7 @@
 +	rsync_xal_l.count++;
 +	curr_rsync_xal.count = 0;
 +	curr_rsync_xal.alloc = 0;
++	curr_rsync_xal.rxas = NULL;
 +}
 +
 +/* send the make_xattr()-generated xattr list for this flist entry,


Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rsync.spec	8 May 2006 20:21:21 -0000	1.36
+++ rsync.spec	10 Jun 2006 03:17:06 -0000	1.37
@@ -1,13 +1,14 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.8
-Release: 2
+Release: 3
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
-
+Patch1: rsync-2.6.8-xattrs_bug.patch
+BuildRequires: libacl-devel, libattr-devel
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 License: GPL
@@ -25,6 +26,7 @@
 # TAG: for pre versions use
 # % setup -q -n rsync-%{version}pre1
 %setup -q
+%patch1 -p1 -b .xattrs_bug
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 
@@ -33,7 +35,7 @@
 autoconf
 autoheader
 %configure \
-  --with-acl-support --with-xattr-support
+  --enable-acl-support --enable-xattr-support
 make proto
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -56,6 +58,11 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Fri Jun 9 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-3
+- Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
+- Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable
+- replace --with... with --enable... so they actually work
+
 * Mon May 8 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-2
 - New upstream release
 - Use the upstream xattr patch instead of mine.  This closes



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:26:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:26:36 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.78,1.79
Message-ID: <200606100326.k5A3QaYU011285@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11189

Modified Files:
	gnome-screensaver.spec 
Log Message:
more build reqs



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gnome-screensaver.spec	10 Jun 2006 02:21:35 -0000	1.78
+++ gnome-screensaver.spec	10 Jun 2006 03:26:33 -0000	1.79
@@ -43,6 +43,7 @@
 # this is here because the configure tests look for protocol headers
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:29:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:29:23 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.15,1.16
Message-ID: <200606100329.k5A3TNRB012414@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12378

Modified Files:
	gnome-nettool.spec 
Log Message:
fix file lists



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-nettool.spec	9 Jun 2006 23:03:32 -0000	1.15
+++ gnome-nettool.spec	10 Jun 2006 03:29:21 -0000	1.16
@@ -60,7 +60,6 @@
 %{_bindir}/*
 %{_datadir}/gnome-nettool
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
 
 %changelog
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-1



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:37:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:37:12 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.70,1.71
Message-ID: <200606100337.k5A3bCwi023201@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23185

Modified Files:
	gnome-session.spec 
Log Message:
fix build reqs



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gnome-session.spec	6 Jun 2006 13:44:35 -0000	1.70
+++ gnome-session.spec	10 Jun 2006 03:36:55 -0000	1.71
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.1
-Release: 3
+Release: 4
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -24,6 +24,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 
 BuildRequires: intltool, autoconf, automake
+BuildRequires: libtool
 
 Requires: redhat-artwork >= 0.20
 Requires: system-logos
@@ -163,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen  <mclasen at redhat.com> 2.15.1-4
+- Add more missing BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen  <mclasen at redhat.com> 2.15.1-3
 - Add BuildRequires: intltool, autoconf, automake 
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:48:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:48:38 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.16,1.17
Message-ID: <200606100348.k5A3mcNM005510@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5497

Modified Files:
	gnome-nettool.spec 
Log Message:
fixups 



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-nettool.spec	10 Jun 2006 03:29:21 -0000	1.16
+++ gnome-nettool.spec	10 Jun 2006 03:48:36 -0000	1.17
@@ -23,6 +23,11 @@
 BuildRequires: gnome-doc-utils
 BuildRequires: scrollkeeper
 
+Requires(post): desktop-file-utils
+Requires(post): scrollkeeper
+Requires(postun): desktop-file-utils
+Requires(postun): scrollkeeper
+
 %description
 GNOME Nettool is a set of front-ends to various networking command-line
 tools, like ping, netstat, ifconfig, whois, traceroute, finger.
@@ -49,8 +54,23 @@
   --add-category X-Red-Hat-Base                                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-nettool.desktop
 
+rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+
 %find_lang %{name}
 
+%post
+scrollkeeper-update -q
+update-desktop-database -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
+%postun
+scrollkeeper-update -q
+update-desktop-database -q
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -59,6 +79,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/gnome-nettool
+%{_datadir}/gnome/help/gnome-nettool
+%{_datadir}/omf/gnome-nettool
+%{_datadir}/icons/hicolor/48x48/apps/gnome-nettool.png
 %{_datadir}/applications/*.desktop
 
 %changelog



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:55:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:55:11 -0400
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.25,1.26
Message-ID: <200606100355.k5A3tB6u005605@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5592

Modified Files:
	gnome-speech.spec 
Log Message:
fix build reqs



Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-speech.spec	17 May 2006 17:36:21 -0000	1.25
+++ gnome-speech.spec	10 Jun 2006 03:55:09 -0000	1.26
@@ -3,13 +3,14 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.4.0
-Release: 1
+Release: 2
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
 Source0: gnome-speech-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/gnome-speech-%{version}-%{release}-buildroot
 BuildRequires: pkgconfig
+BuildRequires: autoconf, automake, gettext
 BuildRequires: libbonobo-devel
 Patch1: gnome-speech-0.3.5-java-configure.patch
 Patch2: gnome-speech-0.3.5-no-gnome-common.patch
@@ -71,6 +72,9 @@
 
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.0-2
+- Add missing BuildRequires
+
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.0-1
 - Update to 0.4.0
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 03:58:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 9 Jun 2006 23:58:28 -0400
Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.23,1.24
Message-ID: <200606100358.k5A3wSsn005692@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5679

Modified Files:
	gnome-user-docs.spec 
Log Message:
fix build reqs



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-user-docs.spec	6 Jun 2006 03:13:12 -0000	1.23
+++ gnome-user-docs.spec	10 Jun 2006 03:58:25 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
 Version:        2.14.2
-Release:	3
+Release:	4
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
@@ -14,6 +14,7 @@
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.5.6
 BuildRequires: pkgconfig
+BuildRequires: gettext 
 
 %description
 This package contains end user documentation for the GNOME desktop 
@@ -48,6 +49,9 @@
 %{_datadir}/omf
 
 %changelog
+* Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-4
+- Add more BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-3
 - Fix BuildRequires
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:03:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:03:41 -0400
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.26,1.27
Message-ID: <200606100403.k5A43f9c016357@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16328

Modified Files:
	gnome-speech.spec 
Log Message:
more build reqs



Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-speech.spec	10 Jun 2006 03:55:09 -0000	1.26
+++ gnome-speech.spec	10 Jun 2006 04:03:39 -0000	1.27
@@ -10,7 +10,7 @@
 Source0: gnome-speech-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/gnome-speech-%{version}-%{release}-buildroot
 BuildRequires: pkgconfig
-BuildRequires: autoconf, automake, gettext
+BuildRequires: autoconf, automake, gettext, libtool
 BuildRequires: libbonobo-devel
 Patch1: gnome-speech-0.3.5-java-configure.patch
 Patch2: gnome-speech-0.3.5-no-gnome-common.patch



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:09:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:09:51 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.114,1.115
Message-ID: <200606100409.k5A49pTx017111@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16980

Modified Files:
	gnome-utils.spec 
Log Message:
fix build reqs



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-utils.spec	21 May 2006 04:28:23 -0000	1.114
+++ gnome-utils.spec	10 Jun 2006 04:09:48 -0000	1.115
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.15.0
-Release:        2
+Release:        3
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -34,6 +34,7 @@
 BuildRequires:  libX11-devel 
 BuildRequires:	libgtop2-devel
 BuildRequires:	e2fsprogs-devel
+BuildRequires:  usermode
 
 Requires:	usermode
 
@@ -228,6 +229,9 @@
 
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-3
+- More missing BuildRequires
+
 * Sun May 21 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-2
 - Add missing BuildRequires (#129097)
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:17:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:17:57 -0400
Subject: rpms/hal/devel hal.spec,1.95,1.96
Message-ID: <200606100417.k5A4HvUb021178@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19273

Modified Files:
	hal.spec 
Log Message:
fix build reqs



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- hal.spec	24 May 2006 21:46:03 -0000	1.95
+++ hal.spec	10 Jun 2006 04:17:27 -0000	1.96
@@ -20,7 +20,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 11
+Release: 12
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -41,6 +41,7 @@
 BuildRequires: doxygen >= %{doxygen_version}
 BuildRequires: gettext >= %{gettext_version}
 BuildRequires: dbus-glib >= %{dbus_version}
+BuildRequires: perl-XML-Parser
 
 %ifnarch s390 s390x
 BuildRequires: libusb-devel >= %{libusb_version}
@@ -203,6 +204,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-12
+- Add missing BuildRequires
+
 * Wed May 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-11
 - Updated autofs fix
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:22:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:22:27 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.115,1.116
Message-ID: <200606100422.k5A4MRlb029531@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28858

Modified Files:
	gnome-utils.spec 
Log Message:
more build reqs



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome-utils.spec	10 Jun 2006 04:09:48 -0000	1.115
+++ gnome-utils.spec	10 Jun 2006 04:22:24 -0000	1.116
@@ -35,6 +35,7 @@
 BuildRequires:	libgtop2-devel
 BuildRequires:	e2fsprogs-devel
 BuildRequires:  usermode
+BuildRequires:  gettext
 
 Requires:	usermode
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:32:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:32:01 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.116,1.117
Message-ID: <200606100432.k5A4W1Sp002354@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2257

Modified Files:
	gnome-utils.spec 
Log Message:
more fixes



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-utils.spec	10 Jun 2006 04:22:24 -0000	1.116
+++ gnome-utils.spec	10 Jun 2006 04:31:58 -0000	1.117
@@ -85,9 +85,17 @@
 echo "NoDisplay=true" >> gfloppy.desktop.in
 popd
 
+pushd logview
+cat <<EOF >gnome-system-log-pam
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
+EOF
+popd
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --enable-console-helper
 make %{?_smp_mflags}
 
 
@@ -106,27 +114,6 @@
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-# make gnome-system-log use consolehelper
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-/bin/mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}/gnome-system-log
-pushd $RPM_BUILD_ROOT%{_bindir}
-/bin/ln -fs consolehelper gnome-system-log
-popd
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
-cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
-USER=root
-PROGRAM=/usr/sbin/gnome-system-log
-SESSION=true
-EOF
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
-#%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
-EOF
-
 %find_lang gnome-utils-2.0
 
 
@@ -232,6 +219,7 @@
 %changelog
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-3
 - More missing BuildRequires
+- Use --enable-console-helper 
 
 * Sun May 21 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-2
 - Add missing BuildRequires (#129097)



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:39:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:39:45 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.39,1.40
Message-ID: <200606100439.k5A4djxD003315@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3264

Modified Files:
	libbonobo.spec 
Log Message:
fix build reqs



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libbonobo.spec	6 Jun 2006 03:51:10 -0000	1.39
+++ libbonobo.spec	10 Jun 2006 04:39:34 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.14.0
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -18,6 +18,7 @@
 BuildPreReq: automake16 autoconf libtool
 BuildPreReq: gtk-doc
 BuildPreReq: flex, bison, zlib-devel
+BuildRequires: gettext
 # From 2.3, libbonobo swallowed bonobo-activation
 Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
@@ -116,6 +117,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
+- Add missing BuildRequires
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:43:28 -0400
Subject: rpms/libbonoboui/devel libbonoboui.spec,1.39,1.40
Message-ID: <200606100443.k5A4hSdA004131@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonoboui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4085

Modified Files:
	libbonoboui.spec 
Log Message:
fix build reqs



Index: libbonoboui.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libbonoboui.spec	21 May 2006 04:12:00 -0000	1.39
+++ libbonoboui.spec	10 Jun 2006 04:43:24 -0000	1.40
@@ -14,7 +14,7 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.14.0
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -43,6 +43,7 @@
 BuildPreReq: automake autoconf
 BuildPreReq: glib2-devel >= %{glib2_version}
 BuildRequires: libXt-devel
+BuildRequires: gettext
 
 %description
 
@@ -128,6 +129,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
+- More missing BuildRequires
+
 * Sat May 21 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-2
 - Add missing BuildRequires (#129104)
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:47:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:47:17 -0400
Subject: rpms/libgnome/devel libgnome.spec,1.57,1.58
Message-ID: <200606100447.k5A4lHtB007759@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6463

Modified Files:
	libgnome.spec 
Log Message:
fix build reqs



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libgnome.spec	6 Jun 2006 04:06:32 -0000	1.57
+++ libgnome.spec	10 Jun 2006 04:47:15 -0000	1.58
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.14.1
-Release: 3
+Release: 4
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -40,6 +40,8 @@
 BuildRequires:  ORBit2-devel >= %{orbit2_version}
 BuildRequires:  libxslt-devel >= %{libxslt_version}
 BuildRequires:  intltool
+BuildRequires:  libtool
+BuildRequires:  gettext
 
 Patch1: libgnome-2.7.2-default-background.patch
 Patch2: libgnome-2.11.1-scoreloc.patch
@@ -156,6 +158,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-4
+- Add missing BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:52:16 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.37,1.38
Message-ID: <200606100452.k5A4qGdC021541@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21461

Modified Files:
	libgnomecups.spec 
Log Message:
fix build reqs



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libgnomecups.spec	15 May 2006 17:19:25 -0000	1.37
+++ libgnomecups.spec	10 Jun 2006 04:52:14 -0000	1.38
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release: 4 
+Release:  5 
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -12,6 +12,7 @@
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: dbus-glib
+BuildRequires: autoconf, automake, libtool, gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: %{name}-%{version}.tar.bz2
 Patch2: libgnomecups-no-gnome-common.patch
@@ -69,6 +70,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.2-5
+- More BuildRequires
+
 * Mon May 15 2006 John (J5) Palmieri <johnp at redhat.com> - 0.2.2-4
 - Patch from n0dalus <n0dalus+redhat at gmail.com> - add build requires
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 04:55:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 00:55:56 -0400
Subject: rpms/libgnomeui/devel libgnomeui.spec,1.47,1.48
Message-ID: <200606100455.k5A4tuja022974@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22924

Modified Files:
	libgnomeui.spec 
Log Message:
fix build reqs



Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgnomeui.spec	6 Jun 2006 03:26:59 -0000	1.47
+++ libgnomeui.spec	10 Jun 2006 04:55:54 -0000	1.48
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.15.1
-Release: 5
+Release: 6
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -63,6 +63,7 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: libjpeg-devel
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 %description
 
@@ -161,6 +162,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-6
+- More BuildRequires fixes
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-5
 - Fix BuildRequires
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 05:00:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 01:00:49 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.38,1.39
Message-ID: <200606100500.k5A50nRv024704@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24662

Modified Files:
	libgnomecups.spec 
Log Message:
more build reqs



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgnomecups.spec	10 Jun 2006 04:52:14 -0000	1.38
+++ libgnomecups.spec	10 Jun 2006 05:00:45 -0000	1.39
@@ -13,6 +13,7 @@
 BuildRequires: gnutls-devel
 BuildRequires: dbus-glib
 BuildRequires: autoconf, automake, libtool, gettext
+BuildRequires: intltool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: %{name}-%{version}.tar.bz2
 Patch2: libgnomecups-no-gnome-common.patch



From fedora-cvs-commits at redhat.com  Sat Jun 10 05:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 01:08:47 -0400
Subject: rpms/libwnck/devel libwnck.spec,1.47,1.48
Message-ID: <200606100508.k5A58l7u025780@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25751

Modified Files:
	libwnck.spec 
Log Message:
fix build reqs



Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libwnck.spec	21 May 2006 04:18:12 -0000	1.47
+++ libwnck.spec	10 Jun 2006 05:08:43 -0000	1.48
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.15.2
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -23,6 +23,8 @@
 BuildRequires:  startup-notification-devel >= %{startup_notification_version}
 BuildRequires:  libXt-devel
 BuildRequires:  libXres-devel
+BuildRequires:  perl-XML-Parser
+BuildRequires:  gettext
 
 %description
 
@@ -88,6 +90,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-3
+- More BuildRequires
+
 * Sat May 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
 - Fix missing BuildRequires (#129340)
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 05:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 01:15:55 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.9,1.10
Message-ID: <200606100515.k5A5FtK8027319@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27292

Modified Files:
	nautilus-sendto.spec 
Log Message:
fix build reqs



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nautilus-sendto.spec	22 May 2006 07:05:51 -0000	1.9
+++ nautilus-sendto.spec	10 Jun 2006 05:15:53 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.5
-Release: 1
+Release: 	2
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:  gtk2-devel, libglade2-devel, evolution-data-server-devel, libgnomeui-devel
 BuildRequires:	nautilus >= 2.5.4, gaim >= 1.0
+BuildRequires:  gettext
 
 # For compat with old nautilus-sendto packaging
 Provides: nautilus-sendto-gaim
@@ -75,6 +76,9 @@
 %endif
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 0.5-2
+- Add missing BuildRequires
+
 * Mon May 22 2006 Alexander Larsson <alexl at redhat.com> 0.5-1
 - Update to 0.5
 - Add libgnomeui-devel buildreq



From fedora-cvs-commits at redhat.com  Sat Jun 10 05:31:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 01:31:39 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.53,1.54
Message-ID: <200606100531.k5A5VdfJ014633@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14605

Modified Files:
	sound-juicer.spec 
Log Message:
fix build reqs



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sound-juicer.spec	21 May 2006 04:05:30 -0000	1.53
+++ sound-juicer.spec	10 Jun 2006 05:31:37 -0000	1.54
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.15.2.1
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -47,6 +47,7 @@
 BuildRequires:  nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
 BuildRequires:  scrollkeeper >= %{scrollkeeper_version}
 BuildRequires:  gcc-c++
+BuildRequires:  gettext
 # http://bugzilla.gnome.org/show_bug.cgi?id=157772
 ExcludeArch: s390
 ExcludeArch: s390x
@@ -106,6 +107,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2,15.2.1-3
+- More missing BuildRequires
+
 * Sat May 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2.1-2
 - Add missing BuildRequires (#182174)
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 05:36:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 01:36:51 -0400
Subject: rpms/tsclient/devel tsclient.spec,1.13,1.14
Message-ID: <200606100536.k5A5apZn015122@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/tsclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15089

Modified Files:
	tsclient.spec 
Log Message:
fix build reqs



Index: tsclient.spec
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tsclient.spec	6 Jun 2006 13:57:51 -0000	1.13
+++ tsclient.spec	10 Jun 2006 05:36:48 -0000	1.14
@@ -7,7 +7,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 0.148
-Release: 1
+Release: 2
 URL: http://www.gnomepro.com/tsclient/
 Source0: http://www.gnomepro.com/tsclient/%{name}-%{version}.tar.gz
 License: GPL
@@ -24,6 +24,7 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: gettext
 
 %description
 tsclient is a frontend that makes it easy to use rdesktop and vncviewer.
@@ -71,6 +72,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.148-2
+- Add missing BuildRequires
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.148-1
 - Update to 0.148
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 05:40:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 01:40:23 -0400
Subject: rpms/vino/devel vino.spec,1.36,1.37
Message-ID: <200606100540.k5A5eN3u015948@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vino/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15885

Modified Files:
	vino.spec 
Log Message:
fix build reqs



Index: vino.spec
===================================================================
RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vino.spec	22 May 2006 18:04:27 -0000	1.36
+++ vino.spec	10 Jun 2006 05:40:20 -0000	1.37
@@ -7,7 +7,7 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.13.5
-Release: 3
+Release: 4
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -30,6 +30,8 @@
 BuildRequires: libgcrypt-devel >= %{libgcrypt_version}
 BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel, avahi-glib-devel
 BuildRequires: desktop-file-utils
+BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 Prereq: gtk2 >= %{gtk2_version}
 
@@ -99,6 +101,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-4
+- More missing BuildRequires
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-3
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 07:16:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 03:16:40 -0400
Subject: rpms/imake/devel imake.spec,1.21,1.22
Message-ID: <200606100716.k5A7Ge2a014751@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14108

Modified Files:
	imake.spec 
Log Message:
clean up URLs


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- imake.spec	26 Apr 2006 00:33:48 -0000	1.21
+++ imake.spec	10 Jun 2006 07:16:37 -0000	1.22
@@ -7,12 +7,11 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0/src/everything
-Source0: %{xorgurl}/imake-%{version}.tar.bz2
-Source1: %{xorgurl}/makedepend-1.0.0.tar.bz2
-Source2: %{xorgurl}/gccmakedep-%{version}.tar.bz2
-Source3: %{xorgurl}/xorg-cf-files-%{version}.tar.bz2
-Source4: %{xorgurl}/lndir-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/util/imake-%{version}.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.0.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/util/gccmakedep-%{version}.tar.bz2
+Source3: http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-%{version}.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/util/lndir-%{version}.tar.bz2
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
 Patch2: xorg-cf-files-1.0.1-redhat.patch



From fedora-cvs-commits at redhat.com  Sat Jun 10 07:18:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 03:18:29 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.14,1.15
Message-ID: <200606100718.k5A7ITDC020766@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20736

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
cosmetic trivia


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-nv.spec	23 May 2006 19:16:36 -0000	1.14
+++ xorg-x11-drv-nv.spec	10 Jun 2006 07:18:26 -0000	1.15
@@ -64,10 +64,10 @@
 * Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2
 - Bump to appease beehive.
 
-* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
 - Update to 1.1.1 from 7.1RC1.
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.5-3.1
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1.5-3.1
 - bump again for double-long bug on ppc(64)
 
 * Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-3
@@ -91,16 +91,16 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-nv to version 1.0.1.2 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.1-1
 - Updated xorg-x11-drv-nv to version 1.0.1.1 from X11R7 RC1
 - Fix *.la file removal.
 - Add riva128.so subdriver to file manifest.
 
-* Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-1
+* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
 - Limit "ExclusiveArch" to x86, x86_64, ia64, ppc
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-0
 - Initial spec file for nv video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Sat Jun 10 08:02:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 04:02:26 -0400
Subject: rpms/xorg-x11-drv-nv/devel nv.xinf, 1.3, 1.4 xorg-x11-drv-nv.spec,
	1.15, 1.16
Message-ID: <200606100802.k5A82Q6Y015795@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15743

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-4
- Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
  this specific chip ID, the fallback code appears to work in bug #(186343)



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nv.xinf	9 Feb 2006 19:03:15 -0000	1.3
+++ nv.xinf	10 Jun 2006 08:01:50 -0000	1.4
@@ -99,6 +99,7 @@
 alias pcivideo:v000010DEd00000181sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000182sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000183sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000184sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-nv.spec	10 Jun 2006 07:18:26 -0000	1.15
+++ xorg-x11-drv-nv.spec	10 Jun 2006 08:01:50 -0000	1.16
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.1.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -58,6 +58,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-4
+- Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
+  this specific chip ID, the fallback code appears to work in bug #(186343)
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-3
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 08:08:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 04:08:15 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch, 1.1, 1.2
Message-ID: <200606100808.k5A88FEu016263@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16233

Modified Files:
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch 
Log Message:
typo

openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch:
 bf_linguistic/source/linguistic_misc.cxx           |    0 
 binfilter/bf_linguistic/source/linguistic_misc.cxx |   22 +++++++++++++++++--
 cppuhelper/source/implbase_ex.cxx                  |    6 +++++
 linguistic/source/misc.cxx                         |   23 +++++++++++++++++---
 source/implbase_ex.cxx                             |    0 
 source/misc.cxx                                    |    0 
 source/ui/uno/dlelstnr.cxx                         |    0 
 sw/source/ui/uno/dlelstnr.cxx                      |   24 +++++++++++++++++----
 8 files changed, 66 insertions(+), 9 deletions(-)

Index: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch	8 Jun 2006 09:41:21 -0000	1.1
+++ openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch	10 Jun 2006 08:07:57 -0000	1.2
@@ -123,7 +123,7 @@
 +			} 
 +			catch (const RuntimeException&)
 +			{
-+				DBG_ASERT(!this, "addLinguServiceManagerListener");
++				DBG_ASSERT(!this, "addLinguServiceManagerListener");
 +			}
 +		}
  	}



From fedora-cvs-commits at redhat.com  Sat Jun 10 08:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 04:41:54 -0400
Subject: rpms/kdeaccessibility/FC-5 kdeaccessibility.spec, 1.16, 1.17 sources,
	1.11, 1.12
Message-ID: <200606100841.k5A8fsof006943@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6880

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
update to 3.5.3



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/kdeaccessibility.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdeaccessibility.spec	4 Apr 2006 14:59:27 -0000	1.16
+++ kdeaccessibility.spec	10 Jun 2006 08:41:51 -0000	1.17
@@ -1,19 +1,20 @@
 %define debug 0
 %define final 1
 
+%define make_cvs 0
+
 %define qt_version 3.3.5
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
-Prefix: /usr
 License: GPL
-Group: Amusements/Games
+Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -21,6 +22,8 @@
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
@@ -34,6 +37,7 @@
 BuildRequires: libstdc++-devel
 BuildRequires: perl
 BuildRequires: libXtst-devel
+BuildRequires: desktop-file-utils
 
 %description
 Included with this package are:
@@ -42,6 +46,18 @@
 kmouth, program that allows people who have lost their voice
 to let their computer speak for them.
 
+%package devel
+Summary: Development files for kdeaccessibility
+Group:   Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs-devel
+
+%description devel
+Development files for the kdeaccessibility libraries.
+Install kdeaccessibility-devel if you wish to develop or compile for the
+KDE desktop.
+
+
 %prep
 %setup -q
 %patch -p1 -b .libtool
@@ -49,7 +65,9 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%if %{make_cvs}
 make -f admin/Makefile.common cvs
+%endif
 
 %configure \
    --enable-new-ldflags \
@@ -71,24 +89,36 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}
+make install DESTDIR=%{buildroot}
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
-      rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/$i/common
-      ln -sf ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/$i
+      rm -f %{buildroot}%{_docdir}/HTML/en/$i/common
+      ln -sf ../common %{buildroot}%{_docdir}/HTML/en/$i
    fi
 done
 popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+for f in hicolor locolor mono ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+
+%postun
+/sbin/ldconfig
+for f in hicolor locolor mono ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
 
 %files
 %defattr(-,root,root)
@@ -100,14 +130,21 @@
 %{_datadir}/servicetypes/*
 %{_datadir}/applnk/Applications/*
 %{_datadir}/apps/*
-%{_datadir}/config/*
+%verify(not md5 size mtime) %config(noreplace) %{_datadir}/config/*
 %{_datadir}/icons/*/*/*/*
 %{_libdir}/*.la
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 %{_libdir}/kde?/*
 
+%files devel
+%defattr(-,root,root)
+%{_includedir}/kde/*
+%{_libdir}/lib*.so
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 1:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Apr 2006 14:59:27 -0000	1.11
+++ sources	10 Jun 2006 08:41:51 -0000	1.12
@@ -1 +1 @@
-bcfd51875aa2a168fbc97055a576a33c  kdeaccessibility-3.5.2.tar.bz2
+99eadb3a73bc250e96cec370ee79caff  kdeaccessibility-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 09:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 05:10:15 -0400
Subject: rpms/kdeaccessibility/FC-5 kdeaccessibility.spec,1.17,1.18
Message-ID: <200606100910.k5A9AFY5029071@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28777

Modified Files:
	kdeaccessibility.spec 
Log Message:
remove redundant BR which are included in kdebase/kdelibs (workaround for beehive)



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/kdeaccessibility.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdeaccessibility.spec	10 Jun 2006 08:41:51 -0000	1.17
+++ kdeaccessibility.spec	10 Jun 2006 09:10:11 -0000	1.18
@@ -21,23 +21,11 @@
 Patch: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
+
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
-BuildRequires: perl
 BuildRequires: libXtst-devel
-BuildRequires: desktop-file-utils
 
 %description
 Included with this package are:
@@ -83,7 +71,7 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=%{prefix}/include/kde \
+   --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}



From fedora-cvs-commits at redhat.com  Sat Jun 10 09:25:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 05:25:27 -0400
Subject: rpms/xorg-x11-drv-nv/FC-5 nv.xinf, 1.3, 1.4 xorg-x11-drv-nv.spec,
	1.11, 1.12
Message-ID: <200606100925.k5A9PQK6016069@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16038

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-4
- Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
  this specific chip ID, the fallback code appears to work in bug #(186343)



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/nv.xinf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nv.xinf	9 Feb 2006 19:03:15 -0000	1.3
+++ nv.xinf	10 Jun 2006 09:25:24 -0000	1.4
@@ -99,6 +99,7 @@
 alias pcivideo:v000010DEd00000181sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000182sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000183sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000184sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/xorg-x11-drv-nv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-nv.spec	11 Feb 2006 06:21:09 -0000	1.11
+++ xorg-x11-drv-nv.spec	10 Jun 2006 09:25:24 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.0.1.5
-Release:   3.1
+Release:   4
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -60,7 +60,11 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.5-3.1
+* Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-4
+- Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
+  this specific chip ID, the fallback code appears to work in bug #(186343)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1.5-3.1
 - bump again for double-long bug on ppc(64)
 
 * Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-3
@@ -84,16 +88,16 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-nv to version 1.0.1.2 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.1-1
 - Updated xorg-x11-drv-nv to version 1.0.1.1 from X11R7 RC1
 - Fix *.la file removal.
 - Add riva128.so subdriver to file manifest.
 
-* Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-1
+* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
 - Limit "ExclusiveArch" to x86, x86_64, ia64, ppc
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-0
 - Initial spec file for nv video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Sat Jun 10 09:29:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 05:29:51 -0400
Subject: rpms/kdeaccessibility/FC-4 kdeaccessibility.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <200606100929.k5A9Tphn017827@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17760

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
update to 3.5.3



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/kdeaccessibility.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdeaccessibility.spec	11 Apr 2006 14:18:51 -0000	1.8
+++ kdeaccessibility.spec	10 Jun 2006 09:29:48 -0000	1.9
@@ -2,22 +2,25 @@
 %define final 1
 %define disable_gcc_check_and_hidden_visibility 1
 
+%define make_cvs 0
+
 %define qt_version 3.3.4
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
-Prefix: /usr
 License: GPL
-Group: Amusements/Games
+Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
 
 Requires: kdebase >= 6:%{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -39,6 +42,17 @@
 KMouth, program that allows people who have lost their voice
 to let their computer speak for them.
 
+%package devel
+Summary: Development files for kdeaccessibility
+Group:   Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs-devel
+
+%description devel
+Development files for the kdeaccessibility libraries.
+Install kdeaccessibility-devel if you wish to develop or compile for the
+KDE desktop.
+
 %prep
 %setup -q
 %patch -p1 -b .libtool
@@ -46,7 +60,9 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-make -f admin/Makefile.common cvs
+%if %{make_cvs}
+ make -f admin/Makefile.common cvs
+%endif
 
 %configure \
    --enable-new-ldflags \
@@ -62,7 +78,7 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=%{prefix}/include/kde \
+   --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}
@@ -72,8 +88,6 @@
 
 make install DESTDIR=%{buildroot}
 
-rm -rf %{buildroot}%{_includedir}
-
 # Make symlinks relative
 pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
@@ -100,11 +114,18 @@
 %{_datadir}/config/*
 %{_datadir}/icons/*/*/*/*
 %{_libdir}/*.la
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 %{_libdir}/kde?/*
 
+%files devel
+%defattr(-,root,root)
+%{_includedir}/kde/*
+%{_libdir}/lib*.so
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 1:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Apr 2006 14:18:51 -0000	1.7
+++ sources	10 Jun 2006 09:29:49 -0000	1.8
@@ -1 +1 @@
-bcfd51875aa2a168fbc97055a576a33c  kdeaccessibility-3.5.2.tar.bz2
+99eadb3a73bc250e96cec370ee79caff  kdeaccessibility-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 09:55:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 05:55:14 -0400
Subject: rpms/kde-i18n/FC-4 kde-i18n.spec, 1.44, 1.45 sources, 1.28,
	1.29 subdirs-kde-i18n, 1.8, 1.9
Message-ID: <200606100955.k5A9tEkJ012149@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kde-i18n/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12133

Modified Files:
	kde-i18n.spec sources subdirs-kde-i18n 
Log Message:
3.5.3



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/kde-i18n.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kde-i18n.spec	13 Apr 2006 12:48:26 -0000	1.44
+++ kde-i18n.spec	10 Jun 2006 09:55:12 -0000	1.45
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.2
-Release: 0.2.fc4
+Version: 3.5.3
+Release: 0.1.fc4
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -49,6 +49,9 @@
 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
 Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
+Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
+
 Source1000: subdirs-kde-i18n
 
 Requires: kdelibs >= 6:%{version}
@@ -615,7 +618,7 @@
 %prep
 %setup -q -n %{name}-%{version} -c
 for i in $(cat %{SOURCE1000}) ; do
-  tar jxf $RPM_SOURCE_DIR/%{name}-$i-%{version}.tar.bz2
+  tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
 %build
@@ -627,62 +630,56 @@
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 for i in $(cat %{SOURCE1000}) ; do
-  make -C %{name}-$i-%{version} datadir=%{_datadir} DESTDIR=$RPM_BUILD_ROOT install
+  make -C %{name}-$i-%{version} datadir=%{_datadir} DESTDIR=%{buildroot} install
 done
 
 # make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
+pushd %{buildroot}%{_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../$lang/docs/common $i
+        ln -sf ../../../docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../$lang/docs/common $i
+        ln -sf ../../docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../$lang/docs/common $i
+        ln -sf ../docs/common $i
       fi
     done
 
     popd
   fi
 done
-
-rm -rf $RPM_BUILD_ROOT%{_docdir}/kinfocenter
-
-# workaround for rpm conflict
-for l in ca en_GB lt nb nn pt_BR pl; do
-  [ -d $l/common ] && (cd $l; rm -rf common && ln -s ../en/common common)
-done
-
 popd   
 
+rm -rf %{buildroot}%{_docdir}/kinfocenter
+
 # remove zero-length file
-for i in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -size 0) ; do
+for i in $(find %{buildroot}%{_docdir}/HTML -size 0) ; do
    rm -f $i
 done
 
 %if %{redhatify}
-   rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/flag.png
+   rm -f %{buildroot}%{_datadir}/locale/*/flag.png
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %if %{buildall}
 %files Afrikaans
@@ -812,6 +809,8 @@
 %defattr(-,root,root)
 %lang(et) %{_datadir}/locale/et/*
 %lang(et) %doc %{_docdir}/HTML/et
+%lang(et) %{_datadir}/apps/khangman/data/et
+%lang(et) %{_datadir}/apps/khangman/et.txt
 
 %if %{buildall}
 %files Basque
@@ -917,12 +916,10 @@
 %lang(ja) %{_datadir}/locale/ja/*
 %lang(ja) %doc %{_docdir}/HTML/ja
 
-%if %{buildall}
 %files Korean
 %defattr(-,root,root)
 %lang(ko) %{_datadir}/locale/ko/*
 %lang(ko) %doc %{_docdir}/HTML/ko
-%endif
 
 %if %{buildall}
 %files Kurdish
@@ -938,11 +935,9 @@
 %lang(lo) %doc %{_docdir}/HTML/lo
 %endif
 
-%if %{buildall}
 %files Lithuanian
 %defattr(-,root,root)
 %lang(lt) %{_datadir}/locale/lt/*
-%endif
 
 %if %{buildall}
 %files Latvian
@@ -1149,6 +1144,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 1:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.2.fc4
 - fix file conflict
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Apr 2006 07:13:01 -0000	1.28
+++ sources	10 Jun 2006 09:55:12 -0000	1.29
@@ -1,37 +1,39 @@
-e5751af9f27c7fcb8ae691565c0150e0  kde-i18n-ar-3.5.2.tar.bz2
-d2ead3b2e13e851026fa9e685bec3dd7  kde-i18n-bg-3.5.2.tar.bz2
-7579ee4cd94f47b15773e85d8ba9437a  kde-i18n-bn-3.5.2.tar.bz2
-01793ef292bfa573ac6dc469af0105c3  kde-i18n-ca-3.5.2.tar.bz2
-8301411b09198bcdc5aec9096959b46f  kde-i18n-cs-3.5.2.tar.bz2
-de4a0854323591412dcb0fd973a828df  kde-i18n-da-3.5.2.tar.bz2
-af0d1dddc3fdbcc3f57f592c118336b7  kde-i18n-de-3.5.2.tar.bz2
-e08304492dca910772ef644522863d0b  kde-i18n-el-3.5.2.tar.bz2
-f9187d95c02ef569841b619d7dcd92b4  kde-i18n-en_GB-3.5.2.tar.bz2
-957dc11b57ade36543f09170dd319daa  kde-i18n-es-3.5.2.tar.bz2
-adb0d578fcc6f0489a70463a4ab27ba6  kde-i18n-et-3.5.2.tar.bz2
-56ccbbbe792ace2db28a36561ed73baa  kde-i18n-fi-3.5.2.tar.bz2
-d5ee851fdca9491dcb007d120e41ca66  kde-i18n-fr-3.5.2.tar.bz2
-c4d4f74171a00d99c942a454b4bf2031  kde-i18n-he-3.5.2.tar.bz2
-7bbf72d240bf936dffcb8a10b39bc0b8  kde-i18n-hi-3.5.2.tar.bz2
-5f56f6776207de40b6f08f15cf738f5d  kde-i18n-hu-3.5.2.tar.bz2
-2afa1257a615c57689d018cf4f0a5ce5  kde-i18n-is-3.5.2.tar.bz2
-f9593f15023920f274d633d93a1f71ac  kde-i18n-it-3.5.2.tar.bz2
-b267752f706d73792455671100b45e78  kde-i18n-ja-3.5.2.tar.bz2
-3173be9cf4021e7ceab17aa5208a9ff2  kde-i18n-nb-3.5.2.tar.bz2
-e626d95e7399fce30af12103d8e5abbc  kde-i18n-nl-3.5.2.tar.bz2
-7688c9e32d1bd0fe86d8929491436abf  kde-i18n-nn-3.5.2.tar.bz2
-15ae531f16c41983cc9513a3b39af360  kde-i18n-pa-3.5.2.tar.bz2
-ed2038f4a158435298e5d592c1897317  kde-i18n-pl-3.5.2.tar.bz2
-0b34803baab37652581a7930fa90f8a1  kde-i18n-pt-3.5.2.tar.bz2
-e2d4eca4287ca58d89a6b9e0afb1ed83  kde-i18n-pt_BR-3.5.2.tar.bz2
-ce015703992dfdfaa2b0a1a1b68613bf  kde-i18n-ro-3.5.2.tar.bz2
-6ada1113e2f16a04f67efff4a277afe2  kde-i18n-ru-3.5.2.tar.bz2
-ce005e23d4769643e80799e311d420fe  kde-i18n-sk-3.5.2.tar.bz2
-0abde80912580fc6981f12d33533c7a7  kde-i18n-sl-3.5.2.tar.bz2
-5646220dc1449378914bbace9cb0ed4f  kde-i18n-sr-3.5.2.tar.bz2
-15baccdec08346e5379bf88487a81e4d  kde-i18n-sv-3.5.2.tar.bz2
-2b9fcc05c46676421ac9c84833f238ec  kde-i18n-ta-3.5.2.tar.bz2
-f6f84000f374e0cacae6f74cb14be234  kde-i18n-tr-3.5.2.tar.bz2
-da83d2460f25478a61cf8eb09dd2540e  kde-i18n-uk-3.5.2.tar.bz2
-d451f1d96fd2bcdf7c432b6c9b0e5963  kde-i18n-zh_CN-3.5.2.tar.bz2
-2371a7ff043e9944e091ac30a48bcc07  kde-i18n-zh_TW-3.5.2.tar.bz2
+66358501eade79f2600f65767826268a  kde-i18n-ar-3.5.3.tar.bz2
+5ee352d11d976d133343575c0267e7df  kde-i18n-bg-3.5.3.tar.bz2
+a2764d9391d71125ebba255dcde003f7  kde-i18n-bn-3.5.3.tar.bz2
+c9519abf1f62bf69a7288f4144d680c9  kde-i18n-ca-3.5.3.tar.bz2
+e7a350afd2914188449749f10ad6d0bf  kde-i18n-cs-3.5.3.tar.bz2
+0e347230250eb65f8f6722ecacbaface  kde-i18n-da-3.5.3.tar.bz2
+e449fb462911191447210b8e2c8ccb8d  kde-i18n-de-3.5.3.tar.bz2
+aeeea7a9079ff5fd8f0bcfd34452ee4e  kde-i18n-el-3.5.3.tar.bz2
+1029cfba62fdd93fa2dc900111df2a4c  kde-i18n-en_GB-3.5.3.tar.bz2
+a84067e863f9c4eb6fdc1f64d03010b9  kde-i18n-es-3.5.3.tar.bz2
+e6b667f07e4426c2bdb1cda59b081272  kde-i18n-et-3.5.3.tar.bz2
+def712679b92b831b04ae704157f0c4f  kde-i18n-fi-3.5.3.tar.bz2
+02cd975bb784378b443855b8827b9607  kde-i18n-fr-3.5.3.tar.bz2
+2800fd107ca1879abec14d0600704a5d  kde-i18n-he-3.5.3.tar.bz2
+cde643d8b8760d092a16b475fdef3e89  kde-i18n-hi-3.5.3.tar.bz2
+18faeab413d89d3c9bde9fe1a6fb17a6  kde-i18n-hu-3.5.3.tar.bz2
+ecfd4dcb121a15fc69af80354d48d0f1  kde-i18n-is-3.5.3.tar.bz2
+ad8e550f7a2656fa6c5210881fd09bc7  kde-i18n-it-3.5.3.tar.bz2
+0bd28615477ec56978dcf5e700c1e5c3  kde-i18n-ja-3.5.3.tar.bz2
+e36ddd66007a7a405369731bea56ae83  kde-i18n-lt-3.5.3.tar.bz2
+b8698e7aa889cc25a65c948fb4228b9c  kde-i18n-nb-3.5.3.tar.bz2
+ebc1507bf23421c07e0e1bce2bcb216e  kde-i18n-nl-3.5.3.tar.bz2
+eed3d9cd4271df35b78fdb7aaf9c11e4  kde-i18n-nn-3.5.3.tar.bz2
+1bf7fb2adbf61536be4872d8be1dd5cd  kde-i18n-pa-3.5.3.tar.bz2
+7a57d7bf02a2700c71cb495894e08f81  kde-i18n-pl-3.5.3.tar.bz2
+31017190b2d125f4b072b84e6f8752f4  kde-i18n-pt-3.5.3.tar.bz2
+d76371a7a63cd728bfc6ff26c8f059bc  kde-i18n-pt_BR-3.5.3.tar.bz2
+e1a7a05994927ab9ac76174430d76991  kde-i18n-ro-3.5.3.tar.bz2
+a30e44b4dcaf0ff2937eb870903f3a47  kde-i18n-ru-3.5.3.tar.bz2
+6d74e2e2d58e0c10c177d9852e283f14  kde-i18n-sk-3.5.3.tar.bz2
+49f0579ca96ecbe65cee0ad13e2fd144  kde-i18n-sl-3.5.3.tar.bz2
+d8823f8b5765a61b290346257c660c61  kde-i18n-sr-3.5.3.tar.bz2
+dad7a462acf4dc90790aaeb63320e839  kde-i18n-sv-3.5.3.tar.bz2
+987f75a1f89abaa6f3562ef94d75d84d  kde-i18n-ta-3.5.3.tar.bz2
+598d5f55f9e4512757ee40f802968097  kde-i18n-tr-3.5.3.tar.bz2
+a852a8e6f9ee1c807e16f511ba4981a3  kde-i18n-uk-3.5.3.tar.bz2
+b57a6684ef11d1b0ac6d18824ac42799  kde-i18n-zh_CN-3.5.3.tar.bz2
+957f858c53efa4c62ed4bfa3dd06ddfe  kde-i18n-zh_TW-3.5.3.tar.bz2
+6076f24c27ad2a52eb3675e10e6b2af9  kde-i18n-ko-3.5.3.tar.bz2


Index: subdirs-kde-i18n
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/subdirs-kde-i18n,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- subdirs-kde-i18n	12 Apr 2006 07:13:01 -0000	1.8
+++ subdirs-kde-i18n	10 Jun 2006 09:55:12 -0000	1.9
@@ -17,6 +17,8 @@
 is
 it
 ja
+ko
+lt
 nb
 nl
 nn



From fedora-cvs-commits at redhat.com  Sat Jun 10 10:04:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 06:04:06 -0400
Subject: rpms/icu/devel icu.spec,1.17,1.18
Message-ID: <200606101004.k5AA46mQ012282@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12269

Modified Files:
	icu.spec 
Log Message:
rh#194686# BuildRequires


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- icu.spec	9 May 2006 14:35:37 -0000	1.17
+++ icu.spec	10 Jun 2006 10:04:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.4
-Release: 	9
+Release: 	10
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -9,7 +9,7 @@
 Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/%{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:  doxygen
+BuildRequires:  doxygen, autoconf
 Patch0: icu-3.4-gnustack.patch
 Patch1: icu-gcc41.patch
 Patch2: icu-config
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sat Jun 10 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-10
+- rh#194686# BuildRequires
+
 * Tue May 09 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-9
 - rh#190879# backport fix
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 10:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 06:25:58 -0400
Subject: rpms/kdeadmin/FC-5 kdeadmin.spec,1.57,1.58 sources,1.34,1.35
Message-ID: <200606101025.k5AAPwau009908@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9850

Modified Files:
	kdeadmin.spec sources 
Log Message:
3.5.3



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/kdeadmin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeadmin.spec	5 Apr 2006 14:06:50 -0000	1.57
+++ kdeadmin.spec	10 Jun 2006 10:25:55 -0000	1.58
@@ -1,16 +1,17 @@
 %define rhel 0
+
 %define debug 0
 %define final 0
 
 %define make_cvs 1
 
-%define ksysv 0
 %if %{rhel}
 %define kuser 0
 %else
 %define kuser 1
 %endif
 
+%define ksysv 0
 %define kpackage 0
 %define lilo 0
 %define kdat 1
@@ -21,11 +22,12 @@
 %define qt_version 3.3.5
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
+
 %define appdir %{_datadir}/applications/kde
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Name: kdeadmin
 Summary: Administrative tools for KDE.
@@ -43,18 +45,11 @@
 
 Patch1: kde-libtool.patch
 
-Requires(post,postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
 
-BuildPrereq: zlib-devel
-BuildPrereq: kdelibs-devel >= %{version}
-BuildPrereq: libjpeg-devel
-BuildPrereq: libpng-devel
+BuildPrereq: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildPrereq: rpm-devel
-BuildPrereq: bzip2-devel
-BuildPrereq: perl
 BuildPrereq: /usr/bin/desktop-file-install
 
 %description
@@ -187,14 +182,12 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG"
+FLAGS="%{optflags} -DNDEBUG -DNO_DEBUG"
 
 %if %{debug}
   FLAGS="-O0"
 %endif
 
-export KDEDIR=%{_prefix}
-export PATH=$KDEDIR/bin:$PATH
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 
@@ -222,12 +215,12 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # don't use, just delete. Our own versions come later.
-rm -rf $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security
+rm -rf %{buildroot}/etc/pam.d %{buildroot}/etc/security
 
 # fix absolute symbolic links
 (
@@ -238,8 +231,8 @@
   %if %{kuser}
   rpmlist="$rpmlist kuser"
   %endif
-  mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-  cd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+  mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+  cd %{buildroot}%{_docdir}/HTML/en
   for i in $rpmlist ; do
     cd $i && ln -nfs ../common .
     cd ..
@@ -248,8 +241,8 @@
 
 # Put in some sane defaults
 %if %{kuser}
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  cat >$RPM_BUILD_ROOT%{_datadir}/config/kuserrc <<EOF
+  mkdir -p %{buildroot}%{_datadir}/config
+  cat >%{buildroot}%{_datadir}/config/kuserrc <<EOF
 [template]
 copySkel=true
 createHomeDir=true
@@ -260,7 +253,7 @@
 %endif
 
 %if %{ksysv}
-  cat >$RPM_BUILD_ROOT%{_datadir}/config/ksysvrc <<EOF
+  cat >%{buildroot}%{_datadir}/config/ksysvrc <<EOF
 [Other Settings]
 Configured=true
 [Path Settings]
@@ -271,66 +264,77 @@
 EOF
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps \
-         $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/usr/sbin
+mkdir -p %{buildroot}/etc/security/console.apps \
+         %{buildroot}/etc/pam.d %{buildroot}/usr/sbin
 
 # Runkuser through consolehelper
 %if %{kuser}
-  mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
-  install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
-  install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kuser
-  ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kuser
+  mv %{buildroot}%{_bindir}/kuser %{buildroot}/usr/sbin
+  install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+  install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+  ln -s consolehelper %{buildroot}%{_bindir}/kuser
 %endif
 
 %if %{kpackage}
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
-  install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/kpackage
-  install -c -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/config
-  mv $RPM_BUILD_ROOT/usr/bin/kpackager $RPM_BUILD_ROOT/usr/sbin
-  ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kpackager
+  mkdir -p %{buildroot}%{_datadir}/config
+  install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
+  install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
+  install -c -m 644 %{SOURCE5} %{buildroot}%{_datadir}/config
+  mv %{buildroot}%{_bindir}/kpackager %{buildroot}/usr/sbin
+  ln -s consolehelper %{buildroot}%{_bindir}/kpackager
 %endif
 
 %if ! %{kcron}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kcron
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kcron
 %endif
 
 %if ! %{kdat}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdat
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kdat
 %endif
 
 %if ! %{kpackage}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kpackage
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kpackage
 %endif
 
 %if ! %{ksysv}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksysv
+  rm -rf %{buildroot}%{_docdir}/HTML/en/ksysv
 %endif
 
 %if ! %{kuser}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kuser
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kuser
 %endif
 
 %if ! %{lilo}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/lilo-config
+  rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config
 %endif
 
 desktop-file-install \
    --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
+   --dir %{buildroot}%{appdir} \
    --delete-original \
    --add-only-show-in KDE \
-   $RPM_BUILD_ROOT%{appdir}/kuser.desktop
-
-%post -p /sbin/ldconfig
+   %{buildroot}%{appdir}/kuser.desktop
 
-%postun -p /sbin/ldconfig
+%post
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING README
 %{_bindir}/secpolicy
 %{_libdir}/kde3/kfile_*
 %{_datadir}/services/kfile_*
@@ -405,6 +409,9 @@
 %endif
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	5 Apr 2006 14:06:50 -0000	1.34
+++ sources	10 Jun 2006 10:25:55 -0000	1.35
@@ -1 +1 @@
-ad1f645ed9f140a7c9ce8602cc0c88b8  kdeadmin-3.5.2.tar.bz2
+842e74881c89a719423bbd5cc1f4e226  kdeadmin-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 10:32:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 06:32:03 -0400
Subject: rpms/kdeadmin/FC-5 kdeadmin-3.5.2-knetworkconf-fedora.patch, NONE,
	1.1 kdeadmin.spec, 1.58, 1.59
Message-ID: <200606101032.k5AAW3Ik011752@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11714

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-3.5.2-knetworkconf-fedora.patch 
Log Message:
add kdeadmin-3.5.2-knetworkconf-fedora.patch


kdeadmin-3.5.2-knetworkconf-fedora.patch:
 network-conf.in |    2 +-
 network.pl.in   |    7 +++++++
 platform.pl.in  |    1 +
 service.pl.in   |    4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdeadmin-3.5.2-knetworkconf-fedora.patch ---
--- kdeadmin-3.5.2/knetworkconf/backends/network.pl.in.orig	2006-05-17 21:08:23.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/network.pl.in	2006-05-17 21:09:50.000000000 +0200
@@ -523,6 +523,7 @@
        "fedora-2"     => "redhat-6.2",
        "fedora-3"     => "redhat-6.2",
        "fedora-4"     => "redhat-6.2",
+       "fedora-5"     => "redhat-6.2",
        "rpath"        => "redhat-6.2",
        "vine-3.0"     => "redhat-6.2",
        "vine-3.1"     => "redhat-6.2",
@@ -1827,6 +1828,7 @@
           "fedora-2"     => \&gst_network_rh72_get_file,
           "fedora-3"     => \&gst_network_rh72_get_file,
           "fedora-4"     => \&gst_network_rh72_get_file,
+          "fedora-5"     => \&gst_network_rh72_get_file,
           "rpath"        => \&gst_network_rh72_get_file,
           "vine-3.0"     => \&gst_network_rh62_get_file,
           "vine-3.1"     => \&gst_network_rh62_get_file,
@@ -3947,6 +3949,7 @@
           "fedora-2"     => "",
           "fedora-3"     => "",
           "fedora-4"     => "",
+          "fedora-5"     => "",
           "rpath"        => "",
           "vine-3.0"     => "lo",
           "vine-3.1"     => "lo",
@@ -4112,6 +4115,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -4533,6 +4537,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
@@ -5371,6 +5376,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -5777,6 +5783,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
--- kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in.orig	2006-05-17 20:46:12.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in	2006-05-17 20:59:34.000000000 +0200
@@ -96,6 +96,7 @@
   "fedora-2"        => "Fedora Core 2 (Tettnang)",
   "fedora-3"        => "Fedora Core 3 (Heidelberg)",
   "fedora-4"        => "Fedora Core 4 (Stentz)",
+  "fedora-5"        => "Fedora Core 5 (Bordeaux)",
   "rpath"           => "rPath Linux",
   "ark"             => "Ark Linux",
 };
--- kdeadmin-3.5.2/knetworkconf/backends/service.pl.in.orig	2006-05-17 21:10:34.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/service.pl.in	2006-05-17 21:12:00.000000000 +0200
@@ -99,6 +99,7 @@
        "fedora-2"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "fedora-3"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "fedora-4"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+       "fedora-5"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "rpath"        => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
 
        "vine-3.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -169,6 +170,7 @@
        "fedora-2"       => [3, 5],
        "fedora-3"       => [3, 5],
        "fedora-4"       => [3, 5],
+       "fedora-5"       => [3, 5],
        "rpath"          => [3, 5],
        
        "vine-3.0"       => [3, 5],
@@ -236,6 +238,7 @@
      "fedora-2"       => "redhat-5.2",
      "fedora-3"       => "redhat-5.2",
      "fedora-4"       => "redhat-5.2",
+     "fedora-5"       => "redhat-5.2",
      "rpath"          => "redhat-5.2",
 
      "vine-3.0"       => "redhat-5.2",
@@ -1713,6 +1716,7 @@
        "fedora-2"     => \&gst_service_redhat_get_status,
        "fedora-3"     => \&gst_service_redhat_get_status,
        "fedora-4"     => \&gst_service_redhat_get_status,
+       "fedora-5"     => \&gst_service_redhat_get_status,
 
        "rpath"        => \&gst_service_redhat_get_status,
 
--- kdeadmin-3.5.2/knetworkconf/backends/network-conf.in.orig	2006-05-17 21:12:30.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/network-conf.in	2006-05-17 21:12:52.000000000 +0200
@@ -71,7 +71,7 @@
               "debian-2.2", "debian-3.0", "debian-sarge",
               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.04",
               "suse-7.0", "suse-9.0", "suse-9.1",
-              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
+              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
               "pld-1.0", "pld-1.1", "pld-1.99",
               "conectiva-9", "conectiva-10",
               "vine-3.0", "vine-3.1",


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/kdeadmin.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdeadmin.spec	10 Jun 2006 10:25:55 -0000	1.58
+++ kdeadmin.spec	10 Jun 2006 10:32:00 -0000	1.59
@@ -44,6 +44,7 @@
 Source5: kpackagerc
 
 Patch1: kde-libtool.patch
+Patch2: kdeadmin-3.5.2-knetworkconf-fedora.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
@@ -149,6 +150,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
+%patch2 -p1 -b .knetworkconf-fc5
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in



From fedora-cvs-commits at redhat.com  Sat Jun 10 10:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 06:46:54 -0400
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.36,1.37
Message-ID: <200606101046.k5AAksY1026518@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/rp-pppoe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25766

Modified Files:
	rp-pppoe.spec 
Log Message:
fix build problem in mock




Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/dist/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rp-pppoe.spec	15 Feb 2006 20:43:19 -0000	1.36
+++ rp-pppoe.spec	10 Jun 2006 10:46:51 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.5
-Release: 31
+Release: 32
 License: GPL
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -18,8 +18,6 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Prefix: %{_prefix}
-
 Prereq: /sbin/chkconfig
 Prereq: /sbin/service
 Prereq: fileutils
@@ -29,6 +27,11 @@
 Requires: iproute >= 2.6
 Requires: mktemp
 
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: coreutils
+
 ExcludeArch: s390 s390x
 
 %description
@@ -57,30 +60,30 @@
 install -m 0755 %{SOURCE5} scripts
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/sbin
-make -C src install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT 
+mkdir -p %{buildroot}/sbin
+make -C src install RPM_INSTALL_ROOT=%{buildroot}
 
-mv $RPM_BUILD_ROOT%{_sbindir}/* $RPM_BUILD_ROOT/sbin
+mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin
 
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/sbin
+install -m 0755 %{SOURCE1} %{buildroot}/sbin
+install -m 0755 %{SOURCE2} %{buildroot}/sbin
+install -m 0755 %{SOURCE3} %{buildroot}/sbin
+install -m 0755 %{SOURCE4} %{buildroot}/sbin
+install -m 0755 %{SOURCE5} %{buildroot}/sbin
 
-pushd $RPM_BUILD_ROOT%{_sbindir}
+pushd %{buildroot}%{_sbindir}
 ln -s ../../sbin/* .
 popd
 
-rm -rf $RPM_BUILD_ROOT/etc/ppp/pppoe.conf \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/pppoe \
-       $RPM_BUILD_ROOT/usr/doc \
-       $RPM_BUILD_ROOT%{_sysconfdir}/ppp/plugins
+rm -rf %{buildroot}/etc/ppp/pppoe.conf \
+       %{buildroot}/etc/rc.d/init.d/pppoe \
+       %{buildroot}/usr/doc \
+       %{buildroot}%{_sysconfdir}/ppp/plugins
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %triggerpostun -- rp-pppoe < 3.2-1
 if [ -f /etc/rc.d/init.d/pppoe ]; then
@@ -151,6 +154,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5-32
+- fix build problem in mock
+
 * Wed Feb 15 2006 Than Ngo <than at redhat.com> 3.5-31
 - apply patch to use mktemp
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 11:06:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 07:06:33 -0400
Subject: rpms/eject/devel .cvsignore, 1.8, 1.9 eject.spec, 1.22, 1.23 sources,
	1.8, 1.9 eject-2.1.1-config.patch, 1.1,
	NONE eject-2.1.2-media.patch, 1.1, NONE
Message-ID: <200606101106.k5AB6Xtm002872@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2822

Modified Files:
	.cvsignore eject.spec sources 
Removed Files:
	eject-2.1.1-config.patch eject-2.1.2-media.patch 
Log Message:
update to 2.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Aug 2005 09:34:26 -0000	1.8
+++ .cvsignore	10 Jun 2006 11:06:19 -0000	1.9
@@ -1,3 +1,4 @@
 eject-2.0.13.tar.gz
 eject-2.1.1.tar.gz
 eject-2.1.2.tar.gz
+eject-2.1.5.tar.gz


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- eject.spec	11 Feb 2006 02:34:27 -0000	1.22
+++ eject.spec	10 Jun 2006 11:06:19 -0000	1.23
@@ -1,17 +1,18 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
-Version: 2.1.2
-Release: 1.2.1
+Version: 2.1.5
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
-Patch1: eject-2.1.1-config.patch
-Patch2: eject-2.1.1-verbose.patch
-Patch3: eject-2.1.2-media.patch
+Patch1: eject-2.1.1-verbose.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://www.pobox.com/~tranter
 ExcludeArch: s390 s390x
 BuildRequires: gettext
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
 
 %description
 The eject program allows the user to eject removable media (typically
@@ -24,9 +25,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .config
-%patch2 -p1 -b .versbose
-%patch3 -p1 -b .media
+%patch1 -p1 -b .versbose
 
 %build
 %configure
@@ -36,7 +35,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 %find_lang %{name}
 
@@ -50,6 +49,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 2.1.5-1
+- 2.1.5 
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.2-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Aug 2005 09:34:26 -0000	1.8
+++ sources	10 Jun 2006 11:06:19 -0000	1.9
@@ -1 +1 @@
-cfdccb93d64869293dd6f5a6f42a8b15  eject-2.1.2.tar.gz
+b96a6d4263122f1711db12701d79f738  eject-2.1.5.tar.gz


--- eject-2.1.1-config.patch DELETED ---


--- eject-2.1.2-media.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jun 10 12:02:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 08:02:14 -0400
Subject: rpms/eject/devel eject.spec,1.23,1.24
Message-ID: <200606101202.k5AC2Ao3015781@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15700

Modified Files:
	eject.spec 
Log Message:
2.1.5



Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- eject.spec	10 Jun 2006 11:06:19 -0000	1.23
+++ eject.spec	10 Jun 2006 12:02:05 -0000	1.24
@@ -24,7 +24,7 @@
 control.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch1 -p1 -b .versbose
 
 %build



From fedora-cvs-commits at redhat.com  Sat Jun 10 12:12:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 08:12:28 -0400
Subject: rpms/kdeadmin/FC-4 kdeadmin.spec,1.47,1.48 sources,1.32,1.33
Message-ID: <200606101212.k5ACCSgo017366@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17322

Modified Files:
	kdeadmin.spec sources 
Log Message:
3.5.3



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/kdeadmin.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeadmin.spec	12 Apr 2006 07:17:51 -0000	1.47
+++ kdeadmin.spec	10 Jun 2006 12:12:25 -0000	1.48
@@ -20,7 +20,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Name: kdeadmin
 Summary: Administrative tools for KDE.
@@ -402,6 +402,9 @@
 %endif
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc4 
+- update to 3.5.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4 
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	12 Apr 2006 07:17:51 -0000	1.32
+++ sources	10 Jun 2006 12:12:25 -0000	1.33
@@ -1 +1 @@
-ad1f645ed9f140a7c9ce8602cc0c88b8  kdeadmin-3.5.2.tar.bz2
+842e74881c89a719423bbd5cc1f4e226  kdeadmin-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 12:14:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 08:14:42 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.737,1.738
Message-ID: <200606101214.k5ACEgO8018210@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18132

Modified Files:
	openoffice.org.spec 
Log Message:
new readme in langpack-es


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -r1.737 -r1.738
--- openoffice.org.spec	8 Jun 2006 09:41:21 -0000	1.737
+++ openoffice.org.spec	10 Jun 2006 12:14:39 -0000	1.738
@@ -1383,6 +1383,7 @@
 %dir %{instdir}/share/dict
 %dir %{instdir}/share/dict/ooo
 %{instdir}/share/dict/ooo/*es_*
+%{instdir}/share/dict/ooo/README-COMO-HYPH_ES.txt
 %{instdir}/share/readme/LICENSE_es*
 %{instdir}/share/readme/README_es*
 %dir %{instdir}/share/registry



From fedora-cvs-commits at redhat.com  Sat Jun 10 12:25:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 08:25:05 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.16-redhat.patch, 1.1,
	1.2 shadow-utils.spec, 1.74, 1.75
Message-ID: <200606101225.k5ACP5h9004282@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4229

Modified Files:
	shadow-4.0.16-redhat.patch shadow-utils.spec 
Log Message:
"useradd -r" must create a system group (#194728)


shadow-4.0.16-redhat.patch:
 man/groupadd.8 |    7 ++-
 man/useradd.8  |   18 ++++++++-
 src/groupadd.c |   19 ++++++++--
 src/useradd.c  |  103 ++++++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 107 insertions(+), 40 deletions(-)

Index: shadow-4.0.16-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-4.0.16-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shadow-4.0.16-redhat.patch	6 Jun 2006 11:01:03 -0000	1.1
+++ shadow-4.0.16-redhat.patch	10 Jun 2006 12:25:02 -0000	1.2
@@ -1,5 +1,5 @@
 --- shadow-4.0.16/man/groupadd.8.redhat	2006-06-06 07:07:24.000000000 +0200
-+++ shadow-4.0.16/man/groupadd.8	2006-06-06 10:32:10.000000000 +0200
++++ shadow-4.0.16/man/groupadd.8	2006-06-10 13:20:12.000000000 +0200
 @@ -14,7 +14,7 @@
  groupadd \- create a new group
  .SH "SYNOPSIS"
@@ -25,7 +25,7 @@
  \fB\-h\fR, \fB\-\-help\fR
  Display help message and exit.
 --- shadow-4.0.16/man/useradd.8.redhat	2006-06-06 07:08:57.000000000 +0200
-+++ shadow-4.0.16/man/useradd.8	2006-06-06 10:40:29.000000000 +0200
++++ shadow-4.0.16/man/useradd.8	2006-06-10 13:20:12.000000000 +0200
 @@ -25,7 +25,7 @@
  \fB\-D\fR
  option, the
@@ -94,7 +94,7 @@
  Default values for account creation.
  .TP 3n
 --- shadow-4.0.16/src/useradd.c.redhat	2006-05-30 20:28:45.000000000 +0200
-+++ shadow-4.0.16/src/useradd.c	2006-06-06 10:22:57.000000000 +0200
++++ shadow-4.0.16/src/useradd.c	2006-06-10 13:22:42.000000000 +0200
 @@ -81,7 +81,7 @@
  static gid_t def_group = 100;
  static const char *def_gname = "other";
@@ -186,7 +186,23 @@
  			fprintf (stderr, _("%s: UID %u is not unique\n"),
  				 Prog, (unsigned int) user_id);
  #ifdef WITH_AUDIT
-@@ -1016,7 +1035,7 @@
+@@ -917,8 +936,13 @@
+ 	const struct group *grp;
+ 	gid_t gid_min, gid_max;
+ 
+-	gid_min = getdef_num ("GID_MIN", 500);
+-	gid_max = getdef_num ("GID_MAX", 60000);
++        if (!rflg) {
++                gid_min = getdef_unum ("GID_MIN", 500);
++                gid_max = getdef_unum ("GID_MAX", 60000);
++        } else {
++                gid_min = 1;
++                gid_max = getdef_unum ("GID_MIN", 500) - 1;
++        }
+ 
+ 	/*
+ 	 * Start with some GID value if the user didn't provide us with
+@@ -1016,7 +1040,7 @@
  			{NULL, 0, NULL, '\0'}
  		};
  		while ((c =
@@ -195,7 +211,7 @@
  				     long_options, NULL)) != -1) {
  			switch (c) {
  			case 'b':
-@@ -1188,6 +1207,15 @@
+@@ -1188,6 +1212,15 @@
  				user_id = get_uid (optarg);
  				uflg++;
  				break;
@@ -211,7 +227,7 @@
  			default:
  				usage ();
  			}
-@@ -1195,6 +1223,9 @@
+@@ -1195,6 +1228,9 @@
  		}
  	}
  
@@ -221,7 +237,7 @@
  	/*
  	 * Certain options are only valid in combination with others.
  	 * Check it here so that they can be specified in any order.
-@@ -1695,6 +1726,14 @@
+@@ -1695,6 +1731,14 @@
  	}
  #endif				/* USE_PAM */
  
@@ -236,7 +252,7 @@
  	/*
  	 * See if we are messing with the defaults file, or creating
  	 * a new user.
-@@ -1725,7 +1764,7 @@
+@@ -1725,7 +1769,7 @@
  	 * to that group, use useradd -g username username.
  	 * --bero
  	 */
@@ -245,7 +261,7 @@
  		if (getgrnam (user_name)) {
  			fprintf (stderr,
  				 _
-@@ -1776,25 +1815,18 @@
+@@ -1776,25 +1820,18 @@
  				 ("%s: warning: the home directory already exists.\n"
  				  "Not copying any file from skel directory into it.\n"),
  				 Prog);
@@ -283,7 +299,7 @@
  	create_mail ();
  
 --- shadow-4.0.16/src/groupadd.c.redhat	2006-01-18 20:55:15.000000000 +0100
-+++ shadow-4.0.16/src/groupadd.c	2006-06-06 10:22:57.000000000 +0200
++++ shadow-4.0.16/src/groupadd.c	2006-06-10 13:20:12.000000000 +0200
 @@ -74,6 +74,7 @@
  static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
  static int gflg = 0;		/* ID value for the new group */


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- shadow-utils.spec	6 Jun 2006 11:01:03 -0000	1.74
+++ shadow-utils.spec	10 Jun 2006 12:25:02 -0000	1.75
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.16
-Release: 1
+Release: 2
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -202,6 +202,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Sat Jun 10 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.16-2
+- "useradd -r" must create a system group (#194728)
+
 * Tue Jun 06 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.16-1
 - upgrade
 - do not replace login.defs file (#190014)



From fedora-cvs-commits at redhat.com  Sat Jun 10 12:31:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 08:31:53 -0400
Subject: rpms/cpio/devel cpio.spec,1.39,1.40
Message-ID: <200606101231.k5ACVreO016229@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/cpio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16215

Modified Files:
	cpio.spec 
Log Message:
- autoconf was added to BuildRequires, because autoheader is
  used in prep phase (#194737)




Index: cpio.spec
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cpio.spec	28 Mar 2006 13:11:26 -0000	1.39
+++ cpio.spec	10 Jun 2006 12:31:51 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 17
+Release: 18
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -27,7 +27,7 @@
 Prereq: /sbin/rmt
 %endif
 Prereq: /sbin/install-info
-BuildRequires: texinfo
+BuildRequires: texinfo, autoconf
 Buildroot: %{_tmppath}/%{name}-root
 
 %description
@@ -106,6 +106,10 @@
 %{_infodir}/*.info*
 
 %changelog
+* Sat Jun 10 2006 Peter Vrabec <pvrabec at redhat.com> 2.6-18
+- autoconf was added to BuildRequires, because autoheader is 
+  used in prep phase (#194737)
+
 * Tue Mar 28 2006 Peter Vrabec <pvrabec at redhat.com> 2.6-17
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 12:59:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 08:59:27 -0400
Subject: rpms/kdeedu/FC-5 kdeedu.spec,1.45,1.46 sources,1.29,1.30
Message-ID: <200606101259.k5ACxR3H030985@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30970

Modified Files:
	kdeedu.spec sources 
Log Message:
update to 3.5.3



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/kdeedu.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdeedu.spec	5 Apr 2006 16:26:36 -0000	1.45
+++ kdeedu.spec	10 Jun 2006 12:59:25 -0000	1.46
@@ -12,14 +12,12 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeedu
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
-Prefix: %{_prefix}
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
@@ -28,7 +26,9 @@
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires(post,postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: python-devel
+BuildRequires: boost-devel
 
 Obsoletes: keduca
 Obsoletes: kig
@@ -120,9 +120,6 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-rm -rf doc/kgeography kgeography
-perl -pi -e "s|kgeography||" subdirs
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -151,20 +148,33 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
+%doc README COPYING
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/*.la
@@ -176,7 +186,9 @@
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/services/*
 %{_datadir}/config.kcfg/*
-%{_datadir}/config/*
+%config %{_datadir}/config/*
+%exclude %{_datadir}/apps/kgeography/flags/taiwan.png
+%exclude %{_datadir}/apps/kgeography/flags/china.png
 
 %files devel
 %defattr(-,root,root)
@@ -184,6 +196,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Apr 2006 16:26:36 -0000	1.29
+++ sources	10 Jun 2006 12:59:25 -0000	1.30
@@ -1 +1 @@
-ce62d2e67579280a3e000152fb365bff  kdeedu-3.5.2.tar.bz2
+5c9cb7f25c8627772d6de5a3ed550691  kdeedu-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 13:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 09:05:24 -0400
Subject: rpms/kdeedu/FC-4 kdeedu.spec,1.29,1.30 sources,1.25,1.26
Message-ID: <200606101305.k5AD5OYr031082@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31067

Modified Files:
	kdeedu.spec sources 
Log Message:
update to 3.5.3



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/kdeedu.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdeedu.spec	12 Apr 2006 09:19:32 -0000	1.29
+++ kdeedu.spec	10 Jun 2006 13:05:09 -0000	1.30
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeedu
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
@@ -26,7 +26,9 @@
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires(post,postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= 6:%{version}
+BuildRequires: python-devel
+BuildRequires: boost-devel
 
 Obsoletes: keduca
 Obsoletes: kig
@@ -115,9 +117,6 @@
   perl -pi -e "s|kstars||" subdirs
 %endif
 
-rm -rf doc/kgeography kgeography
-perl -pi -e "s|kgeography||" subdirs
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -163,6 +162,7 @@
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
+%doc README COPYING
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/*.la
@@ -174,7 +174,9 @@
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/services/*
 %{_datadir}/config.kcfg/*
-%{_datadir}/config/*
+%config %{_datadir}/config/*
+%exclude %{_datadir}/apps/kgeography/flags/taiwan.png
+%exclude %{_datadir}/apps/kgeography/flags/china.png
 
 %files devel
 %defattr(-,root,root)
@@ -182,6 +184,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc4 
+- update to 3.5.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
 - 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Apr 2006 09:18:42 -0000	1.25
+++ sources	10 Jun 2006 13:05:09 -0000	1.26
@@ -1 +1 @@
-ce62d2e67579280a3e000152fb365bff  kdeedu-3.5.2.tar.bz2
+5c9cb7f25c8627772d6de5a3ed550691  kdeedu-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 13:38:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 09:38:04 -0400
Subject: rpms/kdeartwork/FC-5 kdeartwork.spec,1.47,1.48 sources,1.31,1.32
Message-ID: <200606101338.k5ADc43v031257@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31161

Modified Files:
	kdeartwork.spec sources 
Log Message:
3.5.3



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/kdeartwork.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeartwork.spec	5 Apr 2006 15:14:09 -0000	1.47
+++ kdeartwork.spec	10 Jun 2006 13:37:59 -0000	1.48
@@ -4,7 +4,7 @@
 %define make_cvs 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -13,35 +13,25 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
 
-BuildRequires: perl
-BuildRequires: kdebase-devel
-BuildRequires: arts-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
-BuildRequires: xscreensaver-base
-
-Prereq: /sbin/ldconfig
-
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: xscreensaver-extras
+Requires: xscreensaver-gl-extras
+Requires: xscreensaver-base
+
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: xscreensaver-extras
+BuildRequires: xscreensaver-gl-extras
+BuildRequires: xscreensaver-base
 
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE
@@ -62,10 +52,6 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -92,27 +78,23 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR="$RPM_BUILD_ROOT"
+rm -rf %{buildroot}
 
-mv $RPM_BUILD_ROOT%{_datadir}/icons/Locolor $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+make install DESTDIR=%{buildroot}
 
-#fix file conflict with other kde packages
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kig.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/lskat.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktux.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktimemon.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/gvim* \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kbabel.png \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/gear-flowers* \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/fulmine.jpg*
+mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+# fix file conflict with other kde packages
+rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kig.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/lskat.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktux.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktimemon.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/gvim* \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png \
+      %{buildroot}%{_datadir}/wallpapers/gear-flowers* \
+      %{buildroot}%{_datadir}/wallpapers/fulmine.jpg*
 
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
@@ -156,6 +138,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Apr 2006 15:14:09 -0000	1.31
+++ sources	10 Jun 2006 13:37:59 -0000	1.32
@@ -1 +1 @@
-211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2
+e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 13:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 09:46:10 -0400
Subject: rpms/kdeartwork/FC-4 kdeartwork.spec,1.37,1.38 sources,1.27,1.28
Message-ID: <200606101346.k5ADk9Yk006587@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5282

Modified Files:
	kdeartwork.spec sources 
Log Message:
update to 3.5.3



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/kdeartwork.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdeartwork.spec	11 Apr 2006 14:45:19 -0000	1.37
+++ kdeartwork.spec	10 Jun 2006 13:46:07 -0000	1.38
@@ -4,13 +4,13 @@
 %define make_cvs 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
@@ -22,7 +22,7 @@
 Patch: kde-libtool.patch
 
 BuildRequires: perl
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= 6:%{version}
 BuildRequires: arts-devel
 BuildRequires: autoconf
 BuildRequires: automake
@@ -38,7 +38,9 @@
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
 Requires: qt >= 1:%{qt_version}
-Requires: xscreensaver >= 4.18-14
+Requires: xscreensaver
+Requires: xscreensaver-extras 
+Requires: xscreensaver-gl-extras
 
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE
@@ -153,6 +155,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	11 Apr 2006 14:45:19 -0000	1.27
+++ sources	10 Jun 2006 13:46:07 -0000	1.28
@@ -1 +1 @@
-211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2
+e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 14:02:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 10:02:05 -0400
Subject: rpms/kdeartwork/FC-5 kdeartwork.spec,1.48,1.49
Message-ID: <200606101402.k5AE25nd021271@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21057

Modified Files:
	kdeartwork.spec 
Log Message:
BR on mesa-libGL-devel mesa-libGLU-devel (will be removed later)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/kdeartwork.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdeartwork.spec	10 Jun 2006 13:37:59 -0000	1.48
+++ kdeartwork.spec	10 Jun 2006 14:02:01 -0000	1.49
@@ -28,6 +28,8 @@
 Requires: xscreensaver-gl-extras
 Requires: xscreensaver-base
 
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: xscreensaver-extras
 BuildRequires: xscreensaver-gl-extras



From fedora-cvs-commits at redhat.com  Sat Jun 10 14:43:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 10:43:11 -0400
Subject: rpms/kdebindings/FC-5 kdebindings.spec,1.42,1.43 sources,1.30,1.31
Message-ID: <200606101443.k5AEhBLU013927@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13848

Modified Files:
	kdebindings.spec sources 
Log Message:
update to 3.5.3



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/kdebindings.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kdebindings.spec	5 Apr 2006 15:37:41 -0000	1.42
+++ kdebindings.spec	10 Jun 2006 14:43:08 -0000	1.43
@@ -3,18 +3,11 @@
 
 %define appdir %{_datadir}/applications/kde
 
-## stil need fix to build java -> disable java at the moment
-##define support_arch %{ix86} alpha ia64 ppc
-%define support_arch none
-
-%define mozilla_archs %{ix86} ppc s390 s390x x86_64
-
-%define mozilla_version 1.7.10
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
 %define qt_version 3.3.5
-%define arts_version 1.5.1
+%define arts_version 1.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define pythonver 2.4
 %define perlver 5.8
 %define perlepoch 3
 %define rubyver 1.8
@@ -27,7 +20,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
@@ -45,12 +38,7 @@
 Patch8: kdebindings-3.3.0-python.patch
 Patch9: kdebindings-3.3.92-xdg.patch
 
-BuildRequires: zlib-devel
-BuildRequires: kdelibs-devel
-BuildRequires: arts-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: automake
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}
@@ -89,22 +77,11 @@
 Install %{name}-devel if you want to develop non-KDE
 applications that talk to KDE.
 
-%ifarch %{mozilla_archs}
-%package kmozilla
-Summary: KDE bindings to mozilla
-Group: User Interface/Desktops
-Requires: mozilla
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-
-%description kmozilla
-KDE bindings to mozilla - embed Mozilla in Konqueror
-%endif
-
 %package perl
 Summary: Perl bindings to DCOP
 Group: Development/Libraries
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: perl >= 5.6.0
+Requires: perl >= %{perlver}
 
 %description perl
 Perl bindings to the DCOP interprocess communication protocol used by KDE
@@ -118,54 +95,6 @@
 %description python
 Python bindings to the DCOP interprocess communication protocol used by KDE
 
-%ifarch %{support_arch}
-%package qtjava
-Summary: Java bindings to Qt
-Group: System Environment/Libraries
-Requires: qt >= %{qt_version}
-Requires: libgcj >= 3.1
-Requires: jdkgcj >= 0.2.2
-BuildRequires: gcc-java >= 3.1
-BuildRequires: libgcj >= 3.1
-BuildRequires: jdkgcj >= 0.2.2
-
-%description qtjava
-Java bindings to Qt.
-%endif
-
-%package qtc
-Summary: C bindings to Qt
-Group: System Environment/Libraries
-Requires: qt >= 1:%{qt_version}
-
-%description qtc
-C bindings to Qt.
-Install kdebindings-qtc if you wish to develop Qt applications
-in C (rather than C++).
-
-%package kdec
-Summary: C bindings to KDE
-Group: System Environment/Libraries
-Requires: qt >= 1:%{qt_version}
-Requires: %{name}-qtc >= 3.0.2
-
-%description kdec
-C bindings to KDE.
-Install kdebindings-kdec if you wish to develop Qt applications
-in C (rather than C++).
-
-%ifarch %{support_arch}
-%package kdejava
-Summary: Java bindings to KDE
-Group: Development/Libraries
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: kdebindings-qtjava = %{version}-%{release}
-Requires: libgcj
-
-%description kdejava
-Java bindings to KDE
-%endif
-
 %prep
 %setup -q
 %patch4 -p1 -b .ssl-krb5
@@ -182,22 +111,6 @@
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
-# workaround for ia64, need to be fixed later
-%ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
-%endif
-
-%ifarch %{support_arch}
-export CFLAGS="$CFLAGS `mozilla-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `mozilla-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `mozilla-config --cflags`"
-export LDFLAGS="$LDFLAGS `mozilla-config --libs`"
-%endif
-
 make -f admin/Makefile.common cvs
 
 suffix=""
@@ -225,41 +138,40 @@
    --disable-debug \
    --disable-warnings \
 %endif
-%ifarch %{support_arch}
-   --with-java=%{prefix}
-%else
    --without-java
 %endif
 
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-if [ -d "$RPM_BUILD_ROOT%{_prefix}/doc" ]; then
-   mkdir -p $RPM_BUILD_ROOT%{_docdir}
-   mv -f $RPM_BUILD_ROOT%{_prefix}/doc/* $RPM_BUILD_ROOT%{_docdir}
-   rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
-fi
-
-find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+find %{buildroot} -size 0 | xargs rm -f
 
 desktop-file-install \
    --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
+   --dir %{buildroot}%{appdir} \
    --delete-original \
    --add-only-show-in KDE \
-   $RPM_BUILD_ROOT%{appdir}/kjscmd.desktop \
-   $RPM_BUILD_ROOT%{appdir}/embedjs.desktop
+   %{buildroot}%{appdir}/kjscmd.desktop \
+   %{buildroot}%{appdir}/embedjs.desktop
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
+rm -rf %{buildroot}
 
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -281,10 +193,6 @@
 %{_libdir}/python*
 %endif
 %{_libdir}/perl5
-%ifarch %{support_arch}
-%{_libdir}/java
-%doc %{_docdir}/javalib
-%endif
 
 %files devel
 %defattr(-,root,root)
@@ -293,6 +201,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Apr 2006 15:37:41 -0000	1.30
+++ sources	10 Jun 2006 14:43:08 -0000	1.31
@@ -1 +1 @@
-cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2
+5595b2de6593d1d535ba520abeab4580  kdebindings-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 17:43:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 13:43:57 -0400
Subject: rpms/mysql/devel mysql-testing.patch,1.6,1.7 mysql.spec,1.78,1.79
Message-ID: <200606101743.k5AHhvcc000778@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv748

Modified Files:
	mysql-testing.patch mysql.spec 
Log Message:
Add code to cleanup leftover mysql daemon processes --- should make
brew/beehive builds more robust when retrying after a failure.

mysql-testing.patch:
 Makefile.am                  |    4 ++--
 mysql-test/mysql-test-run.sh |   18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysql-testing.patch	9 Jun 2006 04:11:59 -0000	1.6
+++ mysql-testing.patch	10 Jun 2006 17:43:55 -0000	1.7
@@ -2,7 +2,10 @@
 in Red Hat's build environment.  The 32-bit and 64-bit variants of a single
 architecture may be built on the same machine at the same time, so we have
 to ensure that the tests use different port numbers on each arch, else they
-will interfere with each other.
+will interfere with each other.  Also, it's been observed that sometimes
+the build environment fails to kill a test mysql daemon when a build is
+stopped early due to build failure on another machine.  To ensure subsequent
+tests can succeed, kill off any such daemons.
 
 We also have to hack the top-level Makefile to enable the openssl regression
 tests.  (Why doesn't this happen automatically given the configure option??)
@@ -16,7 +19,7 @@
 
 diff -Naur mysql-5.0.22.orig/Makefile.am mysql-5.0.22/Makefile.am
 --- mysql-5.0.22.orig/Makefile.am	2006-05-25 04:56:41.000000000 -0400
-+++ mysql-5.0.22/Makefile.am	2006-06-09 00:03:21.000000000 -0400
++++ mysql-5.0.22/Makefile.am	2006-06-10 13:13:34.000000000 -0400
 @@ -106,8 +106,8 @@
  
  test:
@@ -30,39 +33,36 @@
  	cd mysql-test; \
 diff -Naur mysql-5.0.22.orig/mysql-test/mysql-test-run.sh mysql-5.0.22/mysql-test/mysql-test-run.sh
 --- mysql-5.0.22.orig/mysql-test/mysql-test-run.sh	2006-05-25 04:56:49.000000000 -0400
-+++ mysql-5.0.22/mysql-test/mysql-test-run.sh	2006-06-09 00:06:22.000000000 -0400
-@@ -252,6 +252,34 @@
++++ mysql-5.0.22/mysql-test/mysql-test-run.sh	2006-06-10 13:36:32.000000000 -0400
+@@ -252,6 +252,16 @@
  # 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
  # all port numbers might not be used in this version of the script.
  #
 +# hack to allow 32- and 64-bit tests to run concurrently on same build machine
 +case `uname -m` in
-+  i?86)
-+    MTR_BUILD_THREAD=0
-+    ;;
-+  x86_64)
-+    MTR_BUILD_THREAD=1
-+    ;;
-+  ia64)
-+    MTR_BUILD_THREAD=2
-+    ;;
-+  ppc)
-+    MTR_BUILD_THREAD=3
-+    ;;
-+  ppc64)
-+    MTR_BUILD_THREAD=4
-+    ;;
-+  s390)
-+    MTR_BUILD_THREAD=5
-+    ;;
-+  s390x)
-+    MTR_BUILD_THREAD=6
++  ppc64 | s390x | x86_64)
++    MTR_BUILD_THREAD=7
 +    ;;
 +  *)
-+    MTR_BUILD_THREAD=7
++    MTR_BUILD_THREAD=11
 +    ;;
 +esac
 +
  if [ -n "$MTR_BUILD_THREAD" ] ; then
    MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 10 + 10000`
    MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
+@@ -265,6 +275,14 @@
+   echo "Using NDBCLUSTER_PORT    = $NDBCLUSTER_PORT"
+ fi
+ 
++#
++# If a previous build attempt failed it's possible that mysql daemons
++# launched by previous run of this script are still hanging around.
++# Kill 'em so we can re-use the ports.
++#
++ps auxww | grep "/sql/mysqld .*port=$MASTER_MYPORT" | awk '{print $2}' | xargs kill
++ps auxww | grep "/sql/mysqld .*port=$SLAVE_MYPORT" | awk '{print $2}' | xargs kill
++
+ NO_SLAVE=0
+ USER_TEST=
+ FAILED_CASES=


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mysql.spec	8 Jun 2006 18:11:47 -0000	1.78
+++ mysql.spec	10 Jun 2006 17:43:55 -0000	1.79
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.22
-Release: 1
+Release: 2
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -414,6 +414,10 @@
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 
 %changelog
+* Sat Jun 10 2006 Tom Lane <tgl at redhat.com> 5.0.22-2
+- Work around brew's tendency not to clean up failed builds completely,
+  by adding code in mysql-testing.patch to kill leftover mysql daemons.
+
 * Thu Jun  8 2006 Tom Lane <tgl at redhat.com> 5.0.22-1
 - Update to MySQL 5.0.22 (fixes CVE-2006-2753)
 - Install temporary workaround for gcc bug on s390x (bz #193912)



From fedora-cvs-commits at redhat.com  Sat Jun 10 20:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 16:59:03 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.268, 1.269 anaconda.spec, 1.392,
	1.393 sources, 1.389, 1.390
Message-ID: <200606102059.k5AKx3GY006893@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6833/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.29-1 on branch devel from anaconda-11.1.0.29-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- .cvsignore	10 Jun 2006 02:52:42 -0000	1.268
+++ .cvsignore	10 Jun 2006 20:59:00 -0000	1.269
@@ -1 +1 @@
-anaconda-11.1.0.28.tar.bz2
+anaconda-11.1.0.29.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- anaconda.spec	10 Jun 2006 02:52:42 -0000	1.392
+++ anaconda.spec	10 Jun 2006 20:59:00 -0000	1.393
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.28
+Version: 11.1.0.29
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -42,7 +42,10 @@
 AutoReqProv: false
 Requires: libxml2-python, python, rpm-python >= 4.2-0.61, yum >= 2.4.0
 Requires: anaconda = %{version}-%{release}
-Requires: createrepo >= 0.4.3-3.1, squashfs-tools, mkisofs, syslinux
+Requires: createrepo >= 0.4.3-3.1, squashfs-tools, mkisofs
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 Requires: /usr/bin/strip, xorg-x11-font-utils, netpbm-progs
 
 %description runtime
@@ -93,6 +96,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sat Jun 10 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.29-1
+- Fix syslinux requires
+- Fix autopartitioning on the mactels
+- Close leaky fd in reiserfs label reading code so that partitioning 
+  succeeds in that case
+
 * Fri Jun  9 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.28-1
 - fix dep problem (clumens)
 - initial pass at support for the intel-based macs


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- sources	10 Jun 2006 02:52:42 -0000	1.389
+++ sources	10 Jun 2006 20:59:00 -0000	1.390
@@ -1 +1 @@
-56fd3712a59e3895a06ae98a4776f083  anaconda-11.1.0.28.tar.bz2
+d7a1dafa1e03987d8a60762bd84603cd  anaconda-11.1.0.29.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 10 22:27:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 18:27:19 -0400
Subject: rpms/kdebindings/FC-5 kdebindings.spec,1.43,1.44
Message-ID: <200606102227.k5AMRJMB027822@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27771

Modified Files:
	kdebindings.spec 
Log Message:
fix typo



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/kdebindings.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdebindings.spec	10 Jun 2006 14:43:08 -0000	1.43
+++ kdebindings.spec	10 Jun 2006 22:27:17 -0000	1.44
@@ -139,7 +139,6 @@
    --disable-warnings \
 %endif
    --without-java
-%endif
 
 make %{?_smp_mflags}
 



From fedora-cvs-commits at redhat.com  Sat Jun 10 23:06:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 19:06:36 -0400
Subject: rpms/kdebindings/FC-4 kdebindings.spec,1.38,1.39 sources,1.28,1.29
Message-ID: <200606102306.k5AN6aRq020009@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv19979

Modified Files:
	kdebindings.spec sources 
Log Message:
update to 3.5.3



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/kdebindings.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdebindings.spec	11 Apr 2006 14:52:30 -0000	1.38
+++ kdebindings.spec	10 Jun 2006 23:06:17 -0000	1.39
@@ -4,16 +4,9 @@
 
 %define appdir %{_datadir}/applications/kde
 
-## stil need fix to build java -> disable java at the moment
-##define support_arch %{ix86} alpha ia64 ppc
-%define support_arch none
-
-%define mozilla_archs %{ix86} ppc s390 s390x x86_64
-
-%define mozilla_version 1.6.0
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
 %define qt_version 3.3.4
-%define arts_version 1.5.2
-%define pythonver 2.4
+%define arts_version 1.5.3
 %define perlver 5.8
 %define perlepoch 3
 %define rubyver 1.8
@@ -24,7 +17,7 @@
 %define ruby 1
 %define pyqt 0
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
@@ -43,7 +36,7 @@
 Patch9: kdebindings-3.3.92-xdg.patch
 
 BuildRequires: zlib-devel
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs-devel >= 6:%{version}
 BuildRequires: arts-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -87,17 +80,6 @@
 Install %{name}-devel if you want to develop non-KDE
 applications that talk to KDE.
 
-%ifarch %{mozilla_archs}
-%package kmozilla
-Summary: KDE bindings to mozilla
-Group: User Interface/Desktops
-Requires: mozilla
-Requires: kdebase >= 6:%{version}
-
-%description kmozilla
-KDE bindings to mozilla - embed Mozilla in Konqueror
-%endif
-
 %package perl
 Summary: Perl bindings to DCOP
 Group: Development/Libraries
@@ -116,54 +98,6 @@
 %description python
 Python bindings to the DCOP interprocess communication protocol used by KDE
 
-%ifarch %{support_arch}
-%package qtjava
-Summary: Java bindings to Qt
-Group: System Environment/Libraries
-Requires: qt >= %{qt_version}
-Requires: libgcj >= 3.1
-Requires: jdkgcj >= 0.2.2
-BuildRequires: gcc-java >= 3.1
-BuildRequires: libgcj >= 3.1
-BuildRequires: jdkgcj >= 0.2.2
-
-%description qtjava
-Java bindings to Qt.
-%endif
-
-%package qtc
-Summary: C bindings to Qt
-Group: System Environment/Libraries
-Requires: qt >= 1:%{qt_version}
-
-%description qtc
-C bindings to Qt.
-Install kdebindings-qtc if you wish to develop Qt applications
-in C (rather than C++).
-
-%package kdec
-Summary: C bindings to KDE
-Group: System Environment/Libraries
-Requires: qt >= 1:%{qt_version}
-Requires: %{name}-qtc >= 3.0.2
-
-%description kdec
-C bindings to KDE.
-Install kdebindings-kdec if you wish to develop Qt applications
-in C (rather than C++).
-
-%ifarch %{support_arch}
-%package kdejava
-Summary: Java bindings to KDE
-Group: Development/Libraries
-Requires: kdelibs >= 6:%{version}
-Requires: kdebindings-qtjava = %{version}-%{release}
-Requires: libgcj
-
-%description kdejava
-Java bindings to KDE
-%endif
-
 %prep
 %setup -q
 %patch4 -p1 -b .ssl-krb5
@@ -183,13 +117,6 @@
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 
-%ifarch %{support_arch}
-export CFLAGS="$CFLAGS `mozilla-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `mozilla-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `mozilla-config --cflags`"
-export LDFLAGS="$LDFLAGS `mozilla-config --libs`"
-%endif
-
 make -f admin/Makefile.common cvs
 
 suffix=""
@@ -217,11 +144,7 @@
    --disable-debug \
    --disable-warnings \
 %endif
-%ifarch %{support_arch}
-   --with-java=%{prefix}
-%else
    --without-java
-%endif
 
 make #%{?_smp_mflags}
 
@@ -230,12 +153,6 @@
 
 make install DESTDIR=%{buildroot}
 
-if [ -d "%{buildroot}%{_prefix}/doc" ]; then
-   mkdir -p %{buildroot}%{_docdir}
-   mv -f %{buildroot}%{_prefix}/doc/* %{buildroot}%{_docdir}
-   rm -rf %{buildroot}%{_prefix}/doc
-fi
-
 find %{buildroot} -size 0 | xargs rm -f
 
 desktop-file-install \
@@ -285,6 +202,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sun Jun 11 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	11 Apr 2006 14:52:31 -0000	1.28
+++ sources	10 Jun 2006 23:06:17 -0000	1.29
@@ -1 +1 @@
-cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2
+5595b2de6593d1d535ba520abeab4580  kdebindings-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Jun 11 02:36:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 10 Jun 2006 22:36:05 -0400
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.14,1.15
Message-ID: <200606110236.k5B2a5IY027741@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27710

Modified Files:
	postgresql-odbc.spec 
Log Message:
Fix BuildRequires: for mock build environment


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- postgresql-odbc.spec	22 Mar 2006 16:21:44 -0000	1.14
+++ postgresql-odbc.spec	11 Jun 2006 02:35:52 -0000	1.15
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver.
 Version: 08.01.0200
-Release: 2
+Release: 3
 License: LGPL
 Group: Applications/Databases
 Url: http://gborg.postgresql.org/project/psqlodbc
@@ -11,7 +11,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: unixODBC-devel
-BuildRequires: automake autoconf postgresql-devel
+BuildRequires: libtool automake autoconf postgresql-devel
 
 Requires: postgresql-libs >= 8.0
 Provides: postgresql-odbc
@@ -70,6 +70,9 @@
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Sat Jun 10 2006 Tom Lane <tgl at redhat.com> 08.01.0200-3
+- Fix BuildRequires: for mock build environment
+
 * Wed Mar 22 2006 Tom Lane <tgl at redhat.com> 08.01.0200-2
 - Change library name back to psqlodbc.so, because it appears that upstream
   will revert to that name in next release; no point in thrashing the name.



From fedora-cvs-commits at redhat.com  Sun Jun 11 05:54:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 01:54:49 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc6-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.451, 1.452 kernel-2.6.spec, 1.2264,
	1.2265 sources, 1.395, 1.396 upstream, 1.360,
	1.361 patch-2.6.17-rc6-git1.bz2.sign, 1.1, NONE
Message-ID: <200606110554.k5B5snko030064@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30027

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc6-git2.bz2.sign 
Removed Files:
	patch-2.6.17-rc6-git1.bz2.sign 
Log Message:
git2


--- NEW FILE patch-2.6.17-rc6-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEixdnyGugalF9Dw4RAhpZAKCAabJA8/rpH890HYkTtSC17GwKlwCcDAIa
unDAetMwooox3NKcJ8WycQQ=
=SMH1
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- .cvsignore	10 Jun 2006 01:29:41 -0000	1.451
+++ .cvsignore	11 Jun 2006 05:54:46 -0000	1.452
@@ -3,5 +3,5 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git1.bz2
+patch-2.6.17-rc6-git2.bz2
 xen-20060610.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2264
retrieving revision 1.2265
diff -u -r1.2264 -r1.2265
--- kernel-2.6.spec	10 Jun 2006 01:32:58 -0000	1.2264
+++ kernel-2.6.spec	11 Jun 2006 05:54:46 -0000	1.2265
@@ -246,7 +246,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc6.bz2
-Patch2: patch-2.6.17-rc6-git1.bz2
+Patch2: patch-2.6.17-rc6-git2.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -847,7 +847,7 @@
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
 # Make HVC console generic; support simulator console device using it.
-%patch306 -p1
+#%patch306 -p1
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 # No input layer on iseries
@@ -1814,6 +1814,9 @@
 %endif
 
 %changelog
+* Sat Jun 10 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-rc6-git2
+
 * Sat Jun 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase xen to linux-2.6 cset 27412
 - rebase xen to linux-2.6-xen cset 22608


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- sources	10 Jun 2006 01:29:42 -0000	1.395
+++ sources	11 Jun 2006 05:54:46 -0000	1.396
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
-4507f5a167a2296cf5058691cae8fcda  patch-2.6.17-rc6-git1.bz2
+176a8941b4212b3beddf3e8bfbf5e4aa  patch-2.6.17-rc6-git2.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- upstream	9 Jun 2006 17:32:58 -0000	1.360
+++ upstream	11 Jun 2006 05:54:46 -0000	1.361
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git1.bz2
+patch-2.6.17-rc6-git2.bz2


--- patch-2.6.17-rc6-git1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 11 12:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 08:17:47 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.20,1.21
Message-ID: <200606111217.k5BCHlQi000996@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv982

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
Sam's header-install cleanup

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 +
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 +++
 include/asm-m68knommu/Kbuild          |   12 ++
 include/asm-mips/Kbuild               |   15 +++
 include/asm-parisc/Kbuild             |    8 +
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 +
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 +++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 ++
 include/linux/Kbuild                  |   63 ++++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  145 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 520 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-header-install-git.patch	9 Jun 2006 17:04:52 -0000	1.20
+++ linux-2.6-header-install-git.patch	11 Jun 2006 12:17:43 -0000	1.21
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index a940eae..8d92d78 100644
+index a940eae..0d372a6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -858,6 +858,21 @@ depend dep:
@@ -10,13 +10,13 @@
 +INSTALL_HDR_PATH=$(MODLIB)/abi
 +export INSTALL_HDR_PATH
 +
-+.PHONY: headers_install
-+headers_install: include/linux/version.h
-+	@unifdef -Ux /dev/null
-+	@rm -rf $(INSTALL_HDR_PATH)/include
++PHONY += headers_install
++headers_install: prepare
++	$(Q)unifdef -Ux /dev/null
++	$(Q)rm -rf $(INSTALL_HDR_PATH)/include
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
 +
-+.PHONY: headers_check
++PHONY += headers_check
 +headers_check: headers_install
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1
 +
@@ -661,12 +661,17 @@
 +unifdef-y := sisfb.h
 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
 new file mode 100644
-index 0000000..e653334
+index 0000000..4e1f973
 --- /dev/null
 +++ b/scripts/Makefile.headersinst
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,145 @@
 +# ==========================================================================
 +# Installing headers
++#
++# header-y files will be installed verbatim
++# unifdef-y are the files where unifdef will be run before installing files
++# objhdr-y are generated files that will be installed verbatim
++#
 +# ==========================================================================
 +
 +UNIFDEF := unifdef -U__KERNEL__
@@ -686,10 +691,10 @@
 +GENASM := 1
 +archasm	   := $(subst include/asm,asm-$(ARCH),$(obj))
 +altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj))
-+-include $(if $(wildcard $(srctree)/include/$(archasm)/Kbuild), include/$(archasm)/Kbuild, include/$(archasm)/Makefile)
-+-include $(if $(wildcard $(srctree)/include/$(altarchasm)/Kbuild), include/$(altarchasm)/Kbuild, include/$(altarchasm)/Makefile)
++-include $(srctree)/include/$(archasm)/Kbuild
++-include $(srctree)/include/$(altarchasm)/Kbuild
 +else
-+include $(if $(wildcard $(srctree)/$(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
++include $(srctree)/$(obj)/Kbuild
 +endif
 +
 +include scripts/Kbuild.include
@@ -712,47 +717,55 @@
 +endif
 +endif
 +
++# Make the definitions visible for recursive make invocations
 +export ALTARCH
 +export ARCHDEF
 +export ALTARCHDEF
 +
-+quiet_cmd_o_hdr_install   = INSTALL_O $(_dst)/$@
++quiet_cmd_o_hdr_install   = INSTALL $(_dst)/$@
 +      cmd_o_hdr_install   = cp $(objtree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
 +
 +quiet_cmd_headers_install = INSTALL $(_dst)/$@
 +      cmd_headers_install = cp $(srctree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
 +
 +quiet_cmd_unifdef	  = UNIFDEF $(_dst)/$@
-+      cmd_unifdef	  = $(UNIFDEF) $(srctree)/$(obj)/$@ > $(INSTALL_HDR_PATH)/$(_dst)/$@ || :
++      cmd_unifdef	  = $(UNIFDEF) $(srctree)/$(obj)/$@          \
++                            > $(INSTALL_HDR_PATH)/$(_dst)/$@ || :
 +
-+quiet_cmd_check		  = CHECK $(_dst)/$@
-+      cmd_check		  = $(srctree)/scripts/hdrcheck.sh $(INSTALL_HDR_PATH)/include $(INSTALL_HDR_PATH)/$(_dst)/$@
++quiet_cmd_check		  = CHECK   $(_dst)/$@
++      cmd_check		  = $(srctree)/scripts/hdrcheck.sh           \
++                              $(INSTALL_HDR_PATH)/include            \
++			      $(INSTALL_HDR_PATH)/$(_dst)/$@
 +
-+quiet_cmd_mkdir		  = MKDIR $@
++quiet_cmd_mkdir		  = MKDIR   $@
 +      cmd_mkdir		  = mkdir -p $(INSTALL_HDR_PATH)/$@
 +
-+quiet_cmd_gen		  = GEN $(_dst)/$@
-+      cmd_gen		  = STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_` ;					\
-+			    ( echo "/* File autogenerated by 'make headers_install' */"	;			\
-+			    echo "\#ifndef $$STUBDEF" ;								\
-+			    echo "\#define $$STUBDEF" ;								\
-+			    echo "\# if $(ARCHDEF)" ;								\
-+			    if [ -r $(srctree)/include/$(archasm)/$@ ]; then					\
-+			       echo "\#  include <$(archasm)/$@>" ;						\
-+			    else										\
-+			       echo "\#  error $(archasm)/$@ does not exist in the $(ARCH) architecture" ;	\
-+			    fi ;										\
-+			    echo "\# elif $(ALTARCHDEF)" ;							\
-+			    if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then					\
-+			       echo "\#  include <$(altarchasm)/$@>" ;						\
-+			    else										\
-+			       echo "\#  error $(altarchasm)/$@ does not exist in the $(ALTARCH) architecture" ;	\
-+			    fi ;										\
-+			    echo "\# else" ;									\
-+			    echo "\#  warning This machine appears to be neither $(ARCH) nor $(ALTARCH)." ;	\
-+			    echo "\# endif" ;									\
-+			    echo "\#endif /* $$STUBDEF */" ;							\
-+			    	 ) > $(INSTALL_HDR_PATH)/$(_dst)/$@
++quiet_cmd_gen		  = GEN     $(_dst)/$@
++      cmd_gen		  = \
++STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_`;				\
++(echo "/* File autogenerated by 'make headers_install' */" ;		\
++echo "\#ifndef $$STUBDEF" ;						\
++echo "\#define $$STUBDEF" ;						\
++echo "\# if $(ARCHDEF)" ;						\
++if [ -r $(srctree)/include/$(archasm)/$@ ]; then			\
++	echo "\#  include <$(archasm)/$@>" ;				\
++else									\
++	echo "\#  error $(archasm)/$@ does not exist in"		\
++			"the $(ARCH) architecture" ;			\
++fi ;									\
++echo "\# elif $(ALTARCHDEF)" ;						\
++if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then			\
++	echo "\#  include <$(altarchasm)/$@>" ;				\
++else									\
++	echo "\#  error $(altarchasm)/$@ does not exist in"		\
++			"the $(ALTARCH) architecture" ;			\
++fi ;									\
++echo "\# else" ;							\
++echo "\#  warning This machine appears to be"				\
++		 "neither $(ARCH) nor $(ALTARCH)." ;			\
++echo "\# endif" ;							\
++echo "\#endif /* $$STUBDEF */" ;					\
++) > $(INSTALL_HDR_PATH)/$(_dst)/$@
 +
 +__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y) $(objhdr-y)
 +
@@ -787,14 +800,16 @@
 +endif
 +endif
 +
++hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
++
 +.PHONY: altarch-dir
 +altarch-dir:
-+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
-+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include/asm dst=include/asm
++	$(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
++	$(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm
 +
 +# Recursion
 +$(subdir-y):
-+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
++	$(Q)$(MAKE) $(hdrinst)=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
 diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
 new file mode 100755
 index 0000000..b3bb683



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:04:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:04:03 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.21,1.22
Message-ID: <200606111504.k5BF43WI004294@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4280

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
fix cross-install of headers

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 +
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 +++
 include/asm-m68knommu/Kbuild          |   12 ++
 include/asm-mips/Kbuild               |   15 +++
 include/asm-parisc/Kbuild             |    8 +
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 +
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 +++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 ++
 include/linux/Kbuild                  |   63 ++++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  145 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 520 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-header-install-git.patch	11 Jun 2006 12:17:43 -0000	1.21
+++ linux-2.6-header-install-git.patch	11 Jun 2006 15:03:44 -0000	1.22
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index a940eae..0d372a6 100644
+index a940eae..504d4d1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -858,6 +858,21 @@ depend dep:
@@ -11,7 +11,7 @@
 +export INSTALL_HDR_PATH
 +
 +PHONY += headers_install
-+headers_install: prepare
++headers_install: include/linux/version.h
 +	$(Q)unifdef -Ux /dev/null
 +	$(Q)rm -rf $(INSTALL_HDR_PATH)/include
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:23:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:23:32 -0400
Subject: rpms/bluez-libs/devel .cvsignore, 1.15, 1.16 bluez-libs.spec, 1.24,
	1.25 sources, 1.15, 1.16
Message-ID: <200606111523.k5BFNWkY019066@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19051

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Feb 2006 21:28:53 -0000	1.15
+++ .cvsignore	11 Jun 2006 15:23:29 -0000	1.16
@@ -1 +1 @@
-bluez-libs-2.25.tar.gz
+bluez-libs-3.0.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bluez-libs.spec	23 Feb 2006 21:28:53 -0000	1.24
+++ bluez-libs.spec	11 Jun 2006 15:23:29 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 2.25
+Version: 3.0
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-1
+- Update to bluez-libs 3.0
+
 * Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com> - 2.25-1
 - Update to bluez-libs 2.25
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Feb 2006 21:28:53 -0000	1.15
+++ sources	11 Jun 2006 15:23:29 -0000	1.16
@@ -1 +1 @@
-ebc8408c9a74c785786a2ef7185fe628  bluez-libs-2.25.tar.gz
+ecc076ce6c5957311fcad60f250e7e9d  bluez-libs-3.0.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:24:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:24:45 -0400
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.45,1.46
Message-ID: <200606111524.k5BFOjkY019155@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19142/devel

Modified Files:
	bluez-utils.spec 
Log Message:
rebuild against new bluez-libs


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- bluez-utils.spec	16 May 2006 13:07:34 -0000	1.45
+++ bluez-utils.spec	11 Jun 2006 15:24:42 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 9
+Release: 10
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -59,8 +59,6 @@
 %patch2 -p1
 
 %build
-aclocal
-autoconf
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
 	   --enable-all --disable-bcm203x --disable-alsa
 make
@@ -123,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at infradead.org> 2.25-10
+- Rebuild against bluez-libs-3.0 (libbluetooth.so.2)
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 2.25-9
 - buildrequire libusb-devel, otherwise dfutool,avctrl,bccmd,hid2hci won't
   get built in a mock environment



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:30:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:30:57 -0400
Subject: rpms/bluez-hcidump/devel .cvsignore, 1.10, 1.11 bluez-hcidump.spec,
	1.16, 1.17 sources, 1.10, 1.11
Message-ID: <200606111530.k5BFUv45019258@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19240

Modified Files:
	.cvsignore bluez-hcidump.spec sources 
Log Message:
1.31


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Feb 2006 21:19:47 -0000	1.10
+++ .cvsignore	11 Jun 2006 15:30:16 -0000	1.11
@@ -1 +1 @@
-bluez-hcidump-1.30.tar.gz
+bluez-hcidump-1.31.tar.gz


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bluez-hcidump.spec	23 Feb 2006 21:19:47 -0000	1.16
+++ bluez-hcidump.spec	11 Jun 2006 15:30:29 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
-Version: 1.30
+Version: 1.31
 Release: 1
 License: GPL
 Group: Applications/System
@@ -40,8 +40,11 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
-* Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.co,> 1.30-1
-- update to bluez-hcidump 1.30
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-1
+- update to bluez-hcidump 1.31
+
+* Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com> 1.30-1
+- Ipdate to bluez-hcidump 1.30
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.27-1.2.1
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Feb 2006 21:19:47 -0000	1.10
+++ sources	11 Jun 2006 15:30:29 -0000	1.11
@@ -1 +1 @@
-46ac502055ccab1fd6f11cab7187e9c7  bluez-hcidump-1.30.tar.gz
+505a0843eccfea4e4467304d63be8396  bluez-hcidump-1.31.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:35:47 -0400
Subject: rpms/bluez-libs/devel bluez-libs.spec,1.25,1.26
Message-ID: <200606111535.k5BFZl6X019316@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19303

Modified Files:
	bluez-libs.spec 
Log Message:
bump release


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bluez-libs.spec	11 Jun 2006 15:23:29 -0000	1.25
+++ bluez-libs.spec	11 Jun 2006 15:35:45 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
 Version: 3.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-2
+- Bump release because 3.0-1 build failed
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-1
 - Update to bluez-libs 3.0
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:37:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:37:42 -0400
Subject: rpms/bluez-pin/devel bluez-pin.spec,1.15,1.16
Message-ID: <200606111537.k5BFbgdw019394@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19381

Modified Files:
	bluez-pin.spec 
Log Message:
rebuild


Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bluez-pin.spec	14 Mar 2006 17:35:24 -0000	1.15
+++ bluez-pin.spec	11 Jun 2006 15:37:40 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: D-BUS Bluetooth PIN helper
 Name: bluez-pin
 Version: 0.30
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-0.27.tar.gz
@@ -52,6 +52,9 @@
 %{_sysconfdir}/xdg/autostart/bluez-pin.desktop
 
 %changelog
+* Sun Jun 11 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-3
+- Rebuild against bluez-libs-3.0 (libbluetooth.so.2)
+
 * Tue Mar 14 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-2
 - Don't abort when user cancels a PIN request
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:43:24 -0400
Subject: rpms/libwpd/devel libwpd-0.8.5-wp5nofontlistcrash.patch, NONE,
	1.1 libwpd.spec, 1.25, 1.26
Message-ID: <200606111543.k5BFhOQD031284@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31245

Modified Files:
	libwpd.spec 
Added Files:
	libwpd-0.8.5-wp5nofontlistcrash.patch 
Log Message:
add wp5nofontlistcrash

libwpd-0.8.5-wp5nofontlistcrash.patch:
 WP5FontGroup.cpp |    3 ++-
 WP5Parser.cpp    |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libwpd-0.8.5-wp5nofontlistcrash.patch ---
--- src/lib/WP5Parser.cpp	27 May 2006 14:09:33 -0000	1.29
+++ src/lib/WP5Parser.cpp	10 Jun 2006 20:37:45 -0000	1.30
@@ -180,7 +180,6 @@
 		{
 			tmpFontSize = static_cast<const WP5ListFontsUsedPacket*>(listener.getGeneralPacketData(2))->getFontSize(0);
 			tmpFontNameOffset = static_cast<const WP5ListFontsUsedPacket*>(listener.getGeneralPacketData(2))->getFontNameOffset(0);
-			tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener.getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
 		}
 		else
 			tmpHasFontsUsedPacket = false;
--- src/lib/WP5FontGroup.cpp	15 May 2006 12:39:49 -0000	1.2
+++ src/lib/WP5FontGroup.cpp	10 Jun 2006 20:37:45 -0000	1.3
@@ -97,7 +97,8 @@
 				return;
 			}
 
-			tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener->getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
+			if (listener->getGeneralPacketData(7))
+				tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener->getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
 			if (m_fontSize >= 0)
 				tmpFontSize = m_fontSize;
 


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libwpd.spec	2 Jun 2006 15:47:06 -0000	1.25
+++ libwpd.spec	11 Jun 2006 15:43:22 -0000	1.26
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
 Version: 0.8.5
-Release: 2
+Release: 3
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -10,6 +10,8 @@
 Requires: glib2 >= 2.0.0, libgsf >= 1.6.0
 BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0
 
+Patch0: libwpd-0.8.5-wp5nofontlistcrash.patch
+
 %description
 Library that handles Word Perfect documents.
 
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .wp5nofontlistcrash
 
 %build
 %configure --without-docs
@@ -66,6 +69,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Sun Jun 11 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-3
+- add wp5nofontlistcrash
+
 * Fri Jun 02 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-2
 - build through brew
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:48:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:48:22 -0400
Subject: rpms/libwpd/devel libwpd.spec,1.26,1.27
Message-ID: <200606111548.k5BFmMOS015246@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15201

Modified Files:
	libwpd.spec 
Log Message:
-p0


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libwpd.spec	11 Jun 2006 15:43:22 -0000	1.26
+++ libwpd.spec	11 Jun 2006 15:48:19 -0000	1.27
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .wp5nofontlistcrash
+%patch0 -p0 -b .wp5nofontlistcrash
 
 %build
 %configure --without-docs



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:55:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:55:28 -0400
Subject: rpms/libwpd/FC-5 libwpd-0.8.5-wp5nofontlistcrash.patch, NONE,
	1.1 libwpd.spec, 1.23, 1.24
Message-ID: <200606111555.k5BFtSKT017995@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17960

Modified Files:
	libwpd.spec 
Added Files:
	libwpd-0.8.5-wp5nofontlistcrash.patch 
Log Message:
additional fix

libwpd-0.8.5-wp5nofontlistcrash.patch:
 WP5FontGroup.cpp |    3 ++-
 WP5Parser.cpp    |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libwpd-0.8.5-wp5nofontlistcrash.patch ---
--- src/lib/WP5Parser.cpp	27 May 2006 14:09:33 -0000	1.29
+++ src/lib/WP5Parser.cpp	10 Jun 2006 20:37:45 -0000	1.30
@@ -180,7 +180,6 @@
 		{
 			tmpFontSize = static_cast<const WP5ListFontsUsedPacket*>(listener.getGeneralPacketData(2))->getFontSize(0);
 			tmpFontNameOffset = static_cast<const WP5ListFontsUsedPacket*>(listener.getGeneralPacketData(2))->getFontNameOffset(0);
-			tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener.getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
 		}
 		else
 			tmpHasFontsUsedPacket = false;
--- src/lib/WP5FontGroup.cpp	15 May 2006 12:39:49 -0000	1.2
+++ src/lib/WP5FontGroup.cpp	10 Jun 2006 20:37:45 -0000	1.3
@@ -97,7 +97,8 @@
 				return;
 			}
 
-			tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener->getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
+			if (listener->getGeneralPacketData(7))
+				tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener->getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
 			if (m_fontSize >= 0)
 				tmpFontSize = m_fontSize;
 


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/FC-5/libwpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libwpd.spec	7 Jun 2006 10:20:17 -0000	1.23
+++ libwpd.spec	11 Jun 2006 15:55:26 -0000	1.24
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
 Version: 0.8.5
-Release: 0.1
+Release: 0.2
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -10,6 +10,8 @@
 Requires: glib2 >= 2.0.0, libgsf >= 1.6.0
 BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0
 
+Patch0: libwpd-0.8.5-wp5nofontlistcrash.patch
+
 %description
 Library that handles Word Perfect documents.
 
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 .wp5nofontlistcrash
 
 %build
 %configure --without-docs
@@ -66,6 +69,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Sun Jun 11 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-0.2
+- additional fix
+
 * Wed Jun 07 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-0.1
 - bug fixes for FC-5
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:56:16 -0400
Subject: rpms/libwpd/FC-5 libwpd.spec,1.24,1.25
Message-ID: <200606111556.k5BFuGuj018327@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18297

Modified Files:
	libwpd.spec 
Log Message:
additional fix


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/FC-5/libwpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libwpd.spec	11 Jun 2006 15:55:26 -0000	1.24
+++ libwpd.spec	11 Jun 2006 15:56:14 -0000	1.25
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 .wp5nofontlistcrash
+%patch0 -p0 -b .wp5nofontlistcrash
 
 %build
 %configure --without-docs



From fedora-cvs-commits at redhat.com  Sun Jun 11 15:57:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 11:57:54 -0400
Subject: rpms/libbtctl/devel libbtctl.spec,1.37,1.38
Message-ID: <200606111557.k5BFvsZV019017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18985

Modified Files:
	libbtctl.spec 
Log Message:
Bump for new bluetooth


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libbtctl.spec	7 Jun 2006 11:16:38 -0000	1.37
+++ libbtctl.spec	11 Jun 2006 15:57:51 -0000	1.38
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -105,6 +105,9 @@
 %endif
 
 %changelog
+* Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-8
+- Bump for new libbluetooth
+
 * Wed Jun  7 2006 Harald Hoyer <harald at redhat.com> - 0.6.0-7
 - printf format corrected
 - more build requires



From fedora-cvs-commits at redhat.com  Sun Jun 11 16:03:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 12:03:20 -0400
Subject: rpms/bluez-hcidump/devel bluez-hcidump-1.30-to-1.31.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 bluez-hcidump.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200606111603.k5BG3KOp020057@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20024

Modified Files:
	.cvsignore bluez-hcidump.spec sources 
Added Files:
	bluez-hcidump-1.30-to-1.31.patch 
Log Message:
use 1.30 tarball + patch

bluez-hcidump-1.30-to-1.31.patch:
 ChangeLog          |    8 
 Makefile.in        |  266 ++++++----
 acinclude.m4       |   33 -
 aclocal.m4         | 1403 +++++++++++++++++++++++++++--------------------------
 config.h.in        |   30 -
 configure          | 1167 +++++++++-----------------------------------
 configure.in       |    2 
 depcomp            |  103 ++-
 install-sh         |  471 +++++++++--------
 missing            |  144 +++--
 mkinstalldirs      |  111 ----
 parser/Makefile.am |    2 
 parser/Makefile.in |  192 +++----
 parser/ericsson.c  |   53 ++
 parser/hci.c       |   22 
 parser/lmp.c       |    2 
 parser/parser.h    |    2 
 parser/sdp.c       |    8 
 parser/sdp.h       |    1 
 src/Makefile.in    |  236 ++++----
 20 files changed, 1840 insertions(+), 2416 deletions(-)

--- NEW FILE bluez-hcidump-1.30-to-1.31.patch ---
diff -uNr bluez-hcidump-1.30/acinclude.m4 bluez-hcidump-1.31/acinclude.m4
--- bluez-hcidump-1.30/acinclude.m4	2005-10-30 00:04:28.000000000 +0100
+++ bluez-hcidump-1.31/acinclude.m4	2006-06-10 23:59:08.000000000 +0100
@@ -45,38 +45,7 @@
 ])
 
 AC_DEFUN([AC_PATH_BLUEZ], [
-	bluez_prefix=${prefix}
-
-	AC_ARG_WITH(bluez, AC_HELP_STRING([--with-bluez=DIR], [BlueZ library is installed in DIR]), [
-		if (test "${withval}" != "yes"); then
-			bluez_prefix=${withval}
-		fi
-	])
-
-	ac_save_CPPFLAGS=$CPPFLAGS
-	ac_save_LDFLAGS=$LDFLAGS
-
-	BLUEZ_CFLAGS=""
-	test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include"
-
-	CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS"
-	AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found))
-
-	BLUEZ_LIBS=""
-	if (test "${prefix}" = "${bluez_prefix}"); then
-		test -d "${libdir}" && BLUEZ_LIBS="$BLUEZ_LIBS -L${libdir}"
-	else
-		test -d "${bluez_prefix}/lib64" && BLUEZ_LIBS="$BLUEZ_LIBS -L${bluez_prefix}/lib64"
-		test -d "${bluez_prefix}/lib" && BLUEZ_LIBS="$BLUEZ_LIBS -L${bluez_prefix}/lib"
-	fi
-
-	LDFLAGS="$LDFLAGS $BLUEZ_LIBS"
-	AC_CHECK_LIB(bluetooth, hci_open_dev, BLUEZ_LIBS="$BLUEZ_LIBS -lbluetooth", AC_MSG_ERROR(Bluetooth library not found))
-	AC_CHECK_LIB(bluetooth, sdp_connect, dummy=yes, AC_CHECK_LIB(sdp, sdp_connect, BLUEZ_LIBS="$BLUEZ_LIBS -lsdp"))
-
-	CPPFLAGS=$ac_save_CPPFLAGS
-	LDFLAGS=$ac_save_LDFLAGS
-
+	PKG_CHECK_MODULES(BLUEZ, bluez, dummy=yes, AC_MSG_ERROR(Bluetooth library is required))
 	AC_SUBST(BLUEZ_CFLAGS)
 	AC_SUBST(BLUEZ_LIBS)
 ])
diff -uNr bluez-hcidump-1.30/aclocal.m4 bluez-hcidump-1.31/aclocal.m4
--- bluez-hcidump-1.30/aclocal.m4	2006-02-15 18:09:07.000000000 +0000
+++ bluez-hcidump-1.31/aclocal.m4	2006-06-10 23:59:17.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,446 +11,189 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-AC_DEFUN([AC_PROG_CC_PIE], [
-	AC_CACHE_CHECK([whether ${CC-cc} accepts -fPIE], ac_cv_prog_cc_pie, [
-		echo 'void f(){}' > conftest.c
-		if test -z "`${CC-cc} -fPIE -pie -c conftest.c 2>&1`"; then
-			ac_cv_prog_cc_pie=yes
-		else
-			ac_cv_prog_cc_pie=no
-		fi
-		rm -rf conftest*
-	])
-])
-
-AC_DEFUN([AC_INIT_BLUEZ], [
-	AC_PREFIX_DEFAULT(/usr/local)
-
-	if (test "${CFLAGS}" = ""); then
-		CFLAGS="-Wall -O2"
-	fi
-
-	if (test "${prefix}" = "NONE"); then
-		dnl no prefix and no sysconfdir, so default to /etc
-		if (test "$sysconfdir" = '${prefix}/etc'); then
-			AC_SUBST([sysconfdir], ['/etc'])
-		fi
-
-		dnl no prefix and no mandir, so use ${prefix}/share/man as default
-		if (test "$mandir" = '${prefix}/man'); then
-			AC_SUBST([mandir], ['${prefix}/share/man'])
-		fi
-
-		prefix="${ac_default_prefix}"
-	fi
-
-	if (test "${libdir}" = '${exec_prefix}/lib'); then
-		libdir="${prefix}/lib"
-	fi
-
-	if (test "$sysconfdir" = '${prefix}/etc'); then
-		configdir="${prefix}/etc/bluetooth"
-	else
-		configdir="${sysconfdir}/bluetooth"
-	fi
-
-	AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}", [Directory for the configuration files])
-])
-
-AC_DEFUN([AC_PATH_BLUEZ], [
-	bluez_prefix=${prefix}
-
-	AC_ARG_WITH(bluez, AC_HELP_STRING([--with-bluez=DIR], [BlueZ library is installed in DIR]), [
-		if (test "${withval}" != "yes"); then
-			bluez_prefix=${withval}
-		fi
-	])
-
-	ac_save_CPPFLAGS=$CPPFLAGS
-	ac_save_LDFLAGS=$LDFLAGS
-
-	BLUEZ_CFLAGS=""
-	test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include"
-
-	CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS"
-	AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found))
-
-	BLUEZ_LIBS=""
-	if (test "${prefix}" = "${bluez_prefix}"); then
-		test -d "${libdir}" && BLUEZ_LIBS="$BLUEZ_LIBS -L${libdir}"
-	else
-		test -d "${bluez_prefix}/lib64" && BLUEZ_LIBS="$BLUEZ_LIBS -L${bluez_prefix}/lib64"
-		test -d "${bluez_prefix}/lib" && BLUEZ_LIBS="$BLUEZ_LIBS -L${bluez_prefix}/lib"
-	fi
-
-	LDFLAGS="$LDFLAGS $BLUEZ_LIBS"
-	AC_CHECK_LIB(bluetooth, hci_open_dev, BLUEZ_LIBS="$BLUEZ_LIBS -lbluetooth", AC_MSG_ERROR(Bluetooth library not found))
-	AC_CHECK_LIB(bluetooth, sdp_connect, dummy=yes, AC_CHECK_LIB(sdp, sdp_connect, BLUEZ_LIBS="$BLUEZ_LIBS -lsdp"))
-
-	CPPFLAGS=$ac_save_CPPFLAGS
-	LDFLAGS=$ac_save_LDFLAGS
-
-	AC_SUBST(BLUEZ_CFLAGS)
-	AC_SUBST(BLUEZ_LIBS)
-])
-
-AC_DEFUN([AC_ARG_BLUEZ], [
-	fortify_enable=yes
-	debug_enable=no
-	pie_enable=no
-
-	AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
-		fortify_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
-		debug_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], [enable position independent executables flag]), [
-		pie_enable=${enableval}
-	])
-
-	if (test "${fortify_enable}" = "yes"); then
-		CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-	fi
-
-	if (test "${debug_enable}" = "yes" && test "${ac_cv_prog_cc_g}" = "yes"); then
-		CFLAGS="$CFLAGS -g"
-	fi
-
-	if (test "${pie_enable}" = "yes" && test "${ac_cv_prog_cc_pie}" = "yes"); then
-		CFLAGS="$CFLAGS -fPIE"
-		LDFLAGS="$LDFLAGS -pie"
-	fi
-])
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright ?? 2004 Scott James Remnant <scott at netsplit.com>.
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
[...5172 lines suppressed...]
-	   echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -197,8 +213,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
 	done
 
 clean-sbinPROGRAMS:
@@ -214,7 +230,7 @@
 	$(LINK) $(hcidump_LDFLAGS) $(hcidump_OBJECTS) $(hcidump_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -224,32 +240,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hcidump.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@	fi
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@	fi
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
-
-man8dir = $(mandir)/man8
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -268,8 +274,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 uninstall-man8:
 	@$(NORMAL_UNINSTALL)
@@ -289,18 +295,10 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -309,6 +307,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -320,10 +319,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -346,10 +346,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -363,7 +359,7 @@
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -381,9 +377,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -403,7 +400,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -424,6 +421,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -462,14 +461,15 @@
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstPROGRAMS clean-sbinPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-man8 install-sbinPROGRAMS \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-	uninstall-man8 uninstall-sbinPROGRAMS
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-man8 \
+	install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am uninstall-man uninstall-man8 \
+	uninstall-sbinPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jun 2006 15:30:16 -0000	1.11
+++ .cvsignore	11 Jun 2006 16:02:55 -0000	1.12
@@ -1 +1 @@
-bluez-hcidump-1.31.tar.gz
+bluez-hcidump-1.30.tar.gz


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bluez-hcidump.spec	11 Jun 2006 15:30:29 -0000	1.17
+++ bluez-hcidump.spec	11 Jun 2006 16:02:56 -0000	1.18
@@ -1,10 +1,11 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.31
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
-Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
+Source: http://bluez.sourceforge.net/download/%{name}-1.30.tar.gz
+Patch0: bluez-hcidump-1.30-to-1.31.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 Requires: glibc >= 2.2.4
@@ -20,7 +21,8 @@
 
 %prep
 
-%setup -q
+%setup -q -n bluez-hcidump-1.30
+%patch0 -p1
 
 %build
 %configure
@@ -40,6 +42,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-2
+- use 1.30 tarball and patch, since lookaside cache seems broken
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-1
 - update to bluez-hcidump 1.31
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jun 2006 15:30:29 -0000	1.11
+++ sources	11 Jun 2006 16:02:58 -0000	1.12
@@ -1 +1 @@
-505a0843eccfea4e4467304d63be8396  bluez-hcidump-1.31.tar.gz
+46ac502055ccab1fd6f11cab7187e9c7  bluez-hcidump-1.30.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jun 11 16:11:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 12:11:32 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.32,1.33
Message-ID: <200606111611.k5BGBW4L021559@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21464

Modified Files:
	gnome-bluetooth.spec 
Log Message:
bump for new bluetooth


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-bluetooth.spec	30 May 2006 10:07:01 -0000	1.32
+++ gnome-bluetooth.spec	11 Jun 2006 16:11:29 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -133,6 +133,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-6
+- Bump for new libbluetooth
+
 * Tue May 30 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-5
 - install schemata correctly (bug #193518)
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 16:36:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 12:36:37 -0400
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.46,1.47
Message-ID: <200606111636.k5BGabgT011013@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10986

Modified Files:
	bluez-utils.spec 
Log Message:
rebuild, again


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- bluez-utils.spec	11 Jun 2006 15:24:42 -0000	1.46
+++ bluez-utils.spec	11 Jun 2006 16:36:08 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 10
+Release: 11
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -121,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at infradead.org> 2.25-11
+- Really rebuild against bluez-libs-3.0 (libbluetooth.so.2)
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at infradead.org> 2.25-10
 - Rebuild against bluez-libs-3.0 (libbluetooth.so.2)
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 16:37:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 12:37:50 -0400
Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.18,1.19
Message-ID: <200606111637.k5BGbonT011095@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11082

Modified Files:
	bluez-hcidump.spec 
Log Message:
another rebuild


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bluez-hcidump.spec	11 Jun 2006 16:02:56 -0000	1.18
+++ bluez-hcidump.spec	11 Jun 2006 16:37:47 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.31
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-1.30.tar.gz
@@ -42,6 +42,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-3
+- Rebuild now that new bluez-libs is actually in the repo
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-2
 - use 1.30 tarball and patch, since lookaside cache seems broken
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 16:39:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 12:39:34 -0400
Subject: rpms/bluez-pin/devel bluez-pin.spec,1.16,1.17
Message-ID: <200606111639.k5BGdYua011339@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11313

Modified Files:
	bluez-pin.spec 
Log Message:
really rebuild against new libs


Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bluez-pin.spec	11 Jun 2006 15:37:40 -0000	1.16
+++ bluez-pin.spec	11 Jun 2006 16:39:32 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: D-BUS Bluetooth PIN helper
 Name: bluez-pin
 Version: 0.30
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-0.27.tar.gz
@@ -52,6 +52,9 @@
 %{_sysconfdir}/xdg/autostart/bluez-pin.desktop
 
 %changelog
+* Sun Jun 11 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-4
+- Really rebuild against bluez-libs-3.0 (libbluetooth.so.2)
+
 * Sun Jun 11 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-3
 - Rebuild against bluez-libs-3.0 (libbluetooth.so.2)
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 17:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 13:07:32 -0400
Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.19,1.20
Message-ID: <200606111707.k5BH7Wd0001606@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1566

Modified Files:
	bluez-hcidump.spec 
Log Message:
BR pkgconfig


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bluez-hcidump.spec	11 Jun 2006 16:37:47 -0000	1.19
+++ bluez-hcidump.spec	11 Jun 2006 17:07:08 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.31
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-1.30.tar.gz
@@ -12,6 +12,7 @@
 Requires: bluez-libs >= 2.23
 BuildRequires: glibc-devel >= 2.2.4
 BuildRequires: bluez-libs-devel >= 2.23
+BuildRequires: pkgconfig
 ExcludeArch: s390 s390x
 
 %description
@@ -42,6 +43,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-4
+- BuildRequire pkgconfig so that the autocrap stuff doesn't break
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-3
 - Rebuild now that new bluez-libs is actually in the repo
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 17:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 13:19:25 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.33,1.34
Message-ID: <200606111719.k5BHJPFn020372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20349

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Missing BR


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-bluetooth.spec	11 Jun 2006 16:11:29 -0000	1.33
+++ gnome-bluetooth.spec	11 Jun 2006 17:19:22 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -14,7 +14,7 @@
 BuildRequires: libbtctl-devel >= 0.6.0
 BuildRequires: gob2 openobex-devel >= 1.0.1
 BuildRequires: pygtk2-devel python-devel
-BuildRequires: intltool
+BuildRequires: intltool automake
 Requires: %{name}-libs = %{version}-%{release}
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -133,6 +133,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-7
+- Missing automake BR
+
 * Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-6
 - Bump for new libbluetooth
 



From fedora-cvs-commits at redhat.com  Sun Jun 11 17:28:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 13:28:13 -0400
Subject: rpms/kernel/devel linux-2.6-warn-c-p-a.patch, NONE,
	1.1 kernel-2.6.spec, 1.2265, 1.2266
Message-ID: <200606111728.k5BHSDGc023873@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23772

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-warn-c-p-a.patch 
Log Message:
warn if things start changing page protections


linux-2.6-warn-c-p-a.patch:
 pageattr.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE linux-2.6-warn-c-p-a.patch ---

--- linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c.org	2006-05-04 09:23:56.000000000 +0200
+++ linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c	2006-05-04 09:27:21.000000000 +0200
@@ -9,6 +9,7 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/kernel.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
@@ -18,6 +19,7 @@
 static DEFINE_SPINLOCK(cpa_lock);
 static struct list_head df_list = LIST_HEAD_INIT(df_list);
 
+extern char __start_rodata, __end_rodata;
 
 pte_t *lookup_address(unsigned long address) 
 { 
@@ -127,10 +129,16 @@
 	pte_t *kpte; 
 	unsigned long address;
 	struct page *kpte_page;
+	static int once = 0;
 
 	BUG_ON(PageHighMem(page));
 	address = (unsigned long)page_address(page);
 
+	if (address >= __start_rodata && address <= __end_rodata && prot != PAGE_KERNEL_RO && once++ == 0) {
+		printk(KERN_ERR "Possible trojan or rootkit detected!\n");
+		add_taint(TAINT_MACHINE_CHECK);
+	}
+
 	kpte = lookup_address(address);
 	if (!kpte)
 		return -EINVAL;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2265
retrieving revision 1.2266
diff -u -r1.2265 -r1.2266
--- kernel-2.6.spec	11 Jun 2006 05:54:46 -0000	1.2265
+++ kernel-2.6.spec	11 Jun 2006 17:28:11 -0000	1.2266
@@ -301,6 +301,7 @@
 Patch810: linux-2.6-execshield.patch
 Patch811: linux-2.6-execshield-xen.patch
 Patch812: linux-2.6-xen-vdso-note.patch
+Patch813: linux-2.6-warn-c-p-a.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
@@ -909,6 +910,7 @@
 
 # Exec shield 
 %patch810 -p1
+%patch813 -p1
 
 # Xen exec-shield bits
 %if %{includexen}



From fedora-cvs-commits at redhat.com  Sun Jun 11 17:38:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 13:38:42 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.34,1.35
Message-ID: <200606111738.k5BHcg3F025174@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25152

Modified Files:
	gnome-bluetooth.spec 
Log Message:
more missing BRs


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-bluetooth.spec	11 Jun 2006 17:19:22 -0000	1.34
+++ gnome-bluetooth.spec	11 Jun 2006 17:38:40 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 7
+Release: 9
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -14,7 +14,7 @@
 BuildRequires: libbtctl-devel >= 0.6.0
 BuildRequires: gob2 openobex-devel >= 1.0.1
 BuildRequires: pygtk2-devel python-devel
-BuildRequires: intltool automake
+BuildRequires: intltool automake libtool gettext
 Requires: %{name}-libs = %{version}-%{release}
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -133,8 +133,8 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
-* Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-7
-- Missing automake BR
+* Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-9
+- Missing automake, libtool, gettext BR
 
 * Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-6
 - Bump for new libbluetooth



From fedora-cvs-commits at redhat.com  Sun Jun 11 18:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 14:39:14 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch, 1.2, 1.3
Message-ID: <200606111839.k5BIdE3m006202@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6161

Modified Files:
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch 
Log Message:
another bit

openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch:
 bf_linguistic/source/linguistic_misc.cxx           |    0 
 binfilter/bf_linguistic/source/linguistic_misc.cxx |   22 +++++++++++++++++--
 cppuhelper/source/implbase_ex.cxx                  |    6 +++++
 linguistic/source/misc.cxx                         |   23 +++++++++++++++++---
 source/editeng/unolingu.cxx                        |    0 
 source/implbase_ex.cxx                             |    0 
 source/misc.cxx                                    |    0 
 source/ui/uno/dlelstnr.cxx                         |    0 
 svx/source/editeng/unolingu.cxx                    |    7 ++++++
 sw/source/ui/uno/dlelstnr.cxx                      |   24 +++++++++++++++++----
 10 files changed, 73 insertions(+), 9 deletions(-)

Index: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch	10 Jun 2006 08:07:57 -0000	1.2
+++ openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch	11 Jun 2006 18:39:12 -0000	1.3
@@ -148,3 +148,31 @@
  		}
  		xDesktop = NULL;
  	}
+Index: source/editeng/unolingu.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/editeng/unolingu.cxx,v
+retrieving revision 1.24
+diff -u -r1.24 unolingu.cxx
+--- openoffice.org.orig/svx/source/editeng/unolingu.cxx	8 Sep 2005 22:36:17 -0000	1.24
++++ openoffie.org/svx/source/editeng/unolingu.cxx	11 Jun 2006 18:34:57 -0000
+@@ -1391,6 +1391,8 @@
+ 			::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord )
+ {
+ 	SvxAlternativeSpelling aRes;
++	try
++	{
+ 	if (rHyphWord.is() && rHyphWord->isAlternativeSpelling())
+ 	{
+ 		OUString aWord( rHyphWord->getWord() ),
+@@ -1422,6 +1424,11 @@
+         aRes.nChangedLength     = nLen - nL - nR;
+ 		aRes.bIsAltSpelling		= TRUE;
+ 		aRes.xHyphWord			= rHyphWord;
++	}
++	}
++	catch (const RuntimeException&)
++	{
++		DBG_ASSERT(!this, "Strange Failure on SvxGetAltSpelling");
+ 	}
+ 	return aRes;
+ }



From fedora-cvs-commits at redhat.com  Sun Jun 11 18:40:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 14:40:31 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.738,1.739
Message-ID: <200606111840.k5BIeVrd016968@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16909

Modified Files:
	openoffice.org.spec 
Log Message:
foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.738
retrieving revision 1.739
diff -u -r1.738 -r1.739
--- openoffice.org.spec	10 Jun 2006 12:14:39 -0000	1.738
+++ openoffice.org.spec	11 Jun 2006 18:40:28 -0000	1.739
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 5
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -3310,6 +3310,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sun Jun 11 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.4
+- There's something real strange going on with the linguistic component
+now being a valid uno component. 
+
 * Wed Jun 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.3
 - rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses
 (thesari?) etc



From fedora-cvs-commits at redhat.com  Sun Jun 11 22:36:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 18:36:41 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.22,1.23
Message-ID: <200606112236.k5BMaW3n013364@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13315

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
remove compiler.h

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 +
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 +
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 +++
 include/asm-m68knommu/Kbuild          |   12 ++
 include/asm-mips/Kbuild               |   15 +++
 include/asm-parisc/Kbuild             |    8 +
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 +
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 ++
 include/asm-sparc64/Kbuild            |   16 +++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 ++
 include/linux/Kbuild                  |   63 +++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  158 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 533 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-header-install-git.patch	11 Jun 2006 15:03:44 -0000	1.22
+++ linux-2.6-header-install-git.patch	11 Jun 2006 22:36:26 -0000	1.23
@@ -106,12 +106,12 @@
 +	timex.h unistd.h user.h
 diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
 new file mode 100644
-index 0000000..2558ee8
+index 0000000..70594b2
 --- /dev/null
 +++ b/include/asm-generic/Kbuild
 @@ -0,0 +1,3 @@
-+header-y += errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h signal.h	\
-+	statfs.h
++header-y += atomic.h errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h \
++	signal.h statfs.h
 +unifdef-y := resource.h siginfo.h
 diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
 new file mode 100644
@@ -415,7 +415,7 @@
 +unifdef-y += mce.h mtrr.h vsyscall.h
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 new file mode 100644
-index 0000000..29f21a4
+index 0000000..5c95aa4
 --- /dev/null
 +++ b/include/linux/Kbuild
 @@ -0,0 +1,63 @@
@@ -454,15 +454,15 @@
 +unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h	\
 +	atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h	\
 +	capability.h capi.h cciss_ioctl.h cdrom.h cm4000_cs.h		\
-+	cn_proc.h coda.h compiler.h connector.h cramfs_fs.h cuda.h	\
-+	cyclades.h dccp.h dirent.h divert.h elfcore.h errno.h		\
-+	errqueue.h ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h	\
-+	fcntl.h filter.h flat.h fs.h ftape.h gameport.h			\
-+	generic_serial.h genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h	\
-+	hiddev.h hpet.h i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h		\
-+	if_bridge.h if_ec.h if_eql.h if_ether.h if_frad.h if_ltalk.h	\
-+	if_pppox.h if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h	\
-+	igmp.h inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h	\
++	cn_proc.h coda.h connector.h cramfs_fs.h cuda.h cyclades.h	\
++	dccp.h dirent.h divert.h elfcore.h errno.h errqueue.h		\
++	ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h		\
++	filter.h flat.h fs.h ftape.h gameport.h generic_serial.h	\
++	genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h	\
++	i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h	\
++	if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h		\
++	if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h	\
++	inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h		\
 +	ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h		\
 +	joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h	\
 +	llc.h loop.h lp.h mempolicy.h mii.h mman.h mroute.h msdos_fs.h	\
@@ -661,10 +661,10 @@
 +unifdef-y := sisfb.h
 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
 new file mode 100644
-index 0000000..4e1f973
+index 0000000..aa9990a
 --- /dev/null
 +++ b/scripts/Makefile.headersinst
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,158 @@
 +# ==========================================================================
 +# Installing headers
 +#
@@ -676,6 +676,18 @@
 +
 +UNIFDEF := unifdef -U__KERNEL__
 +
++# Eliminate the contents of (and inclusions of) compiler.h
++HDRSED  := sed 	-e "s/ inline / __inline__ /g" \
++		-e "s/[[:space:]]__user[[:space:]]\+/ /g" \
++		-e "s/(__user[[:space:]]\+/ (/g" \
++		-e "s/[[:space:]]__force[[:space:]]\+/ /g" \
++		-e "s/(__force[[:space:]]\+/ (/g" \
++		-e "s/[[:space:]]__iomem[[:space:]]\+/ /g" \
++		-e "s/(__iomem[[:space:]]\+/ (/g" \
++		-e "s/[[:space:]]__attribute_const__[[:space:]]\+/\ /g" \
++		-e "s/[[:space:]]__attribute_const__$$//" \
++		-e "/^\#include <linux\/compiler.h>/d"
++
 +_dst := $(if $(dst),$(dst),$(obj))
 +
 +.PHONY: __headersinst
@@ -726,15 +738,16 @@
 +      cmd_o_hdr_install   = cp $(objtree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
 +
 +quiet_cmd_headers_install = INSTALL $(_dst)/$@
-+      cmd_headers_install = cp $(srctree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
++      cmd_headers_install = $(HDRSED) $(srctree)/$(obj)/$@		\
++			    > $(INSTALL_HDR_PATH)/$(_dst)/$@
 +
 +quiet_cmd_unifdef	  = UNIFDEF $(_dst)/$@
-+      cmd_unifdef	  = $(UNIFDEF) $(srctree)/$(obj)/$@          \
++      cmd_unifdef	  = $(UNIFDEF) $(srctree)/$(obj)/$@ | $(HDRSED)	\
 +                            > $(INSTALL_HDR_PATH)/$(_dst)/$@ || :
 +
 +quiet_cmd_check		  = CHECK   $(_dst)/$@
-+      cmd_check		  = $(srctree)/scripts/hdrcheck.sh           \
-+                              $(INSTALL_HDR_PATH)/include            \
++      cmd_check		  = $(srctree)/scripts/hdrcheck.sh		\
++                              $(INSTALL_HDR_PATH)/include		\
 +			      $(INSTALL_HDR_PATH)/$(_dst)/$@
 +
 +quiet_cmd_mkdir		  = MKDIR   $@



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:03:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:03:19 -0400
Subject: rpms/kernel/devel linux-2.6-usb-unusual-devices.patch, NONE,
	1.1 kernel-2.6.spec, 1.2266, 1.2267
Message-ID: <200606112303.k5BN3IUb002438@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2381

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-usb-unusual-devices.patch 
Log Message:
add MyMusix PD-205 to the unusual USB quirk list.


linux-2.6-usb-unusual-devices.patch:
 unusual_devs.h |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-usb-unusual-devices.patch ---
--- linux-2.6.15/drivers/usb/storage/unusual_devs.h~	2006-02-20 21:36:07.000000000 -0500
+++ linux-2.6.15/drivers/usb/storage/unusual_devs.h	2006-02-20 21:36:24.000000000 -0500
@@ -113,6 +113,12 @@ UNUSUAL_DEV(  0x0419, 0xaaf6, 0x0100, 0x
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Pete Zaitcev <zaitcev at redhat.com>, bz#176584 */
+UNUSUAL_DEV(  0x0420, 0x0001, 0x0100, 0x0100,
+		"GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_IGNORE_RESIDUE ),
+
 /* Reported by Olaf Hering <olh at suse.de> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
 		"SMSC",


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2266
retrieving revision 1.2267
diff -u -r1.2266 -r1.2267
--- kernel-2.6.spec	11 Jun 2006 17:28:11 -0000	1.2266
+++ kernel-2.6.spec	11 Jun 2006 23:02:58 -0000	1.2267
@@ -377,6 +377,7 @@
 Patch1650: linux-2.6-pci-reverse-pci-config-space-restore-order.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
+Patch1680: linux-2.6-usb-unusual-devices.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -1032,6 +1033,8 @@
 %patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
+# Add some USB devices to the unusual quirk list.
+%patch1680 -p1
 # Silence debug messages in w1
 %patch1700 -p1
 # Only print migration info on SMP
@@ -1818,6 +1821,7 @@
 %changelog
 * Sat Jun 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git2
+- Add MyMusix PD-205 to the unusual USB quirk list.
 
 * Sat Jun 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase xen to linux-2.6 cset 27412



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:05:00 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-noisy-syscalls.patch, NONE,
	1.1 kernel-2.6.spec, 1.2267, 1.2268
Message-ID: <200606112305.k5BN50Ju002651@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2620

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-noisy-syscalls.patch 
Log Message:
Silence noisy unimplemented 32bit syscalls on x86-64.


linux-2.6-x86_64-noisy-syscalls.patch:
 sys_ia32.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-x86_64-noisy-syscalls.patch ---
--- linux-2.6.16.noarch/arch/x86_64/ia32/sys_ia32.c~	2006-05-21 14:50:57.000000000 -0400
+++ linux-2.6.16.noarch/arch/x86_64/ia32/sys_ia32.c	2006-05-21 14:51:48.000000000 -0400
@@ -522,17 +522,9 @@ sys32_waitpid(compat_pid_t pid, unsigned
 }
 
 int sys32_ni_syscall(int call)
-{ 
-	struct task_struct *me = current;
-	static char lastcomm[sizeof(me->comm)];
-
-	if (strncmp(lastcomm, me->comm, sizeof(lastcomm))) {
-		printk(KERN_INFO "IA32 syscall %d from %s not implemented\n",
-		       call, me->comm);
-		strncpy(lastcomm, me->comm, sizeof(lastcomm));
-	} 
-	return -ENOSYS;	       
-} 
+{
+	return -ENOSYS;
+}
 
 /* 32-bit timeval and related flotsam.  */
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2267
retrieving revision 1.2268
diff -u -r1.2267 -r1.2268
--- kernel-2.6.spec	11 Jun 2006 23:02:58 -0000	1.2267
+++ kernel-2.6.spec	11 Jun 2006 23:04:47 -0000	1.2268
@@ -268,6 +268,7 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
+Patch208: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
 Patch302: linux-2.6-offb-find-fb.patch
@@ -840,6 +841,8 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
+# Hush noisy unimplemented 32bit syscalls
+%patch208 -p1
 
 #
 # ppc64
@@ -1822,6 +1825,7 @@
 * Sat Jun 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git2
 - Add MyMusix PD-205 to the unusual USB quirk list.
+- Silence noisy unimplemented 32bit syscalls on x86-64.
 
 * Sat Jun 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase xen to linux-2.6 cset 27412



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:28:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:28:28 -0400
Subject: rpms/kernel/devel linux-2.6-tux.patch,1.18,1.19
Message-ID: <200606112328.k5BNSS80022971@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22913

Modified Files:
	linux-2.6-tux.patch 
Log Message:
fix up a bunch of wierdo indentation.


linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    3 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12697 insertions(+), 32 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-tux.patch	16 Apr 2006 22:58:48 -0000	1.18
+++ linux-2.6-tux.patch	11 Jun 2006 23:28:22 -0000	1.19
@@ -6698,12 +6698,12 @@
 +		GOTO_ERR_no_unlock;
 +	mimetype[ret] = 0;
 +	Dprintk("got MIME type: %s.\n", mimetype);
-+        ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
-+        if (ret >= 0)
-+        	expires[ret] = 0;
++       ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
++       if (ret >= 0)
++		expires[ret] = 0;
 +	else
 +		expires[0] = 0;
-+        Dprintk("got expires header: %s.\n", expires);
++       Dprintk("got expires header: %s.\n", expires);
 +
 +	add_mimetype(extension, mimetype, expires);
 +	ret = 0;
@@ -6841,8 +6841,8 @@
 +			TUX_BUG();
 +
 +	if (!capable(CAP_SYS_ADMIN)
-+		 	&& (action != TUX_ACTION_CONTINUE_REQ) &&
-+		 		(action != TUX_ACTION_STOPTHREAD))
++			&& (action != TUX_ACTION_CONTINUE_REQ) &&
++				(action != TUX_ACTION_STOPTHREAD))
 +		goto userspace_actions;
 +
 +	switch (action) {
@@ -9306,7 +9306,7 @@
 +		req, bytes, ftp_bytes_sent, ftp_bandwidth);
 +}
 +
-+#define update_bandwidth(req,bytes) 				\
++#define update_bandwidth(req,bytes)				\
 +	do {							\
 +		if (unlikely(tux_ftp_login_message))		\
 +			__update_bandwidth(req, bytes);		\
@@ -10556,7 +10556,7 @@
 +		icsk = inet_csk(data_sock->sk);
 +
 +		tp->nonagle = 2;
-+	       	Dprintk("PASV bind() ret: %d.\n", err);
++		Dprintk("PASV bind() ret: %d.\n", err);
 +		if (err < 0) {
 +			req_err(req);
 +			sock_release(data_sock);
@@ -10634,7 +10634,7 @@
 +				(struct sockaddr*)&addr, sizeof(addr));
 +		current->cap_effective = saved_cap;
 +
-+	       	Dprintk("ACTIVE bind() ret: %d.\n", err);
++		Dprintk("ACTIVE bind() ret: %d.\n", err);
 +		if (err) {
 +			sock_release(data_sock);
 +			req_err(req);
@@ -11182,7 +11182,7 @@
 +				GOTO_REDIR;
 +		}
 +
-+#define PARSE_STR_FIELD(char,field,str,len) 				\
++#define PARSE_STR_FIELD(char,field,str,len)				\
 +	if (PARSE_TOKEN(curr,field,left)) {				\
 +		req->str = curr;					\
 +		SKIP_LINE(curr,left);					\
@@ -13026,7 +13026,7 @@
 +
 +static struct request_sock_ops tux_req =
 +{
-+ 	.destructor = &nop_destructor,
++	.destructor = &nop_destructor,
 +};
 +
 +static int redirect_sock (tux_req_t *req, const int port)
@@ -13331,13 +13331,13 @@
 +	s++;
 +	if ((s[0]!='G')||(s[1]!='M')||(s[2]!='T'))
 +	{
-+  		return 0; /* No GMT */
-+  	}
++		return 0; /* No GMT */
++	}
 +
 +	if (Y<TUX_YEAROFFSET) Y = TUX_YEAROFFSET;
 +	if (Y>TUX_YEAROFFSET+9) Y = TUX_YEAROFFSET+9;
 +
-+	Temp = 	TimeDays[Y-TUX_YEAROFFSET][M];
++	Temp = TimeDays[Y-TUX_YEAROFFSET][M];
 +	Temp += D*86400+H*3600+Min*60+S;
 +
 +	return Temp;
@@ -13522,7 +13522,7 @@
 +			/* Wed Jun  9 01:29:59 1993 */
 +
 +			if (str_len < 24)
-+                        	return -1;
++				return -1;
 +
 +			mon = make_month(str+4);
 +			mday = make_num(str+8);



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:37:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:37:40 -0400
Subject: rpms/kernel/devel linux-2.6-optimise-spinlock-debug.patch,1.2,1.3
Message-ID: <200606112337.k5BNbd7b024870@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24769

Modified Files:
	linux-2.6-optimise-spinlock-debug.patch 
Log Message:
Even under contention, we shouldn't spin long enough to have to relax,
and it does have an impact on uber-boxen.


linux-2.6-optimise-spinlock-debug.patch:
 spinlock_debug.c |    3 ---
 1 files changed, 3 deletions(-)

Index: linux-2.6-optimise-spinlock-debug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-optimise-spinlock-debug.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-optimise-spinlock-debug.patch	21 Mar 2006 22:03:59 -0000	1.2
+++ linux-2.6-optimise-spinlock-debug.patch	11 Jun 2006 23:37:27 -0000	1.3
@@ -1,42 +1,27 @@
 
 --- linux-2.6.16/lib/spinlock_debug.c~	2006-03-20 16:31:13.000000000 -0500
 +++ linux-2.6.16/lib/spinlock_debug.c	2006-03-20 16:31:24.000000000 -0500
-@@ -9,8 +9,9 @@
- #include <linux/config.h>
- #include <linux/spinlock.h>
- #include <linux/interrupt.h>
- #include <linux/delay.h>
- #include <linux/module.h>
-+#include <asm/processor.h>
- 
- int nopanic;
- static int __init nopanic_setup(char *str)
---- linux-2.6.16/lib/spinlock_debug.c~	2006-03-20 16:29:56.000000000 -0500
-+++ linux-2.6.16/lib/spinlock_debug.c	2006-03-20 16:30:52.000000000 -0500
-@@ -88,7 +88,7 @@ static void __spin_lock_debug(spinlock_t
+@@ -88,7 +88,6 @@ static void __spin_lock_debug(spinlock_t
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_spin_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {
-@@ -160,7 +160,7 @@ static void __read_lock_debug(rwlock_t *
+@@ -160,7 +160,6 @@ static void __read_lock_debug(rwlock_t *
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_read_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {
-@@ -233,7 +233,7 @@ static void __write_lock_debug(rwlock_t 
+@@ -233,7 +233,6 @@ static void __write_lock_debug(rwlock_t 
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_write_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:42:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:42:16 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.7,
	1.8 glibc-kernheaders.spec, 1.146, 1.147 sources, 1.48, 1.49
Message-ID: <200606112342.k5BNgG7u025877@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25845

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
update to 2.6.16-2.2266_FC6, move sed magic to kernel


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Jun 2006 17:20:42 -0000	1.7
+++ .cvsignore	11 Jun 2006 23:42:13 -0000	1.8
@@ -1 +1 @@
-glibc-kernheaders-2.6.16-1.2260_FC6.tar.bz2
+glibc-kernheaders-2.6.16-1.2266_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- glibc-kernheaders.spec	9 Jun 2006 18:41:41 -0000	1.146
+++ glibc-kernheaders.spec	11 Jun 2006 23:42:13 -0000	1.147
@@ -1,9 +1,9 @@
-%define KVER 2.6.16-1.2260_FC6
+%define KVER 2.6.16-1.2266_FC6
 
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 39
+Release: 40
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -82,23 +82,6 @@
 # glibc-headers provides /usr/include/scsi, although it's kernel headers
 rm -rf scsi
 
-unifdef -D__ASSEMBLY__ -D__attribute_const__ linux/compiler.h > tmpfile || :
-mv tmpfile linux/compiler.h
-
-for FILE in  `find . -name \*.h` ; do
-        sed -i \
-                -e "s/ inline / __inline__ /g" \
-		-e "s/[[:space:]]__user[[:space:]]\+/ /g" \
-		-e "s/(__user[[:space:]]\+/ (/g" \
-		-e "s/[[:space:]]__force[[:space:]]\+/ /g" \
-		-e "s/(__force[[:space:]]\+/ (/g" \
-		-e "s/[[:space:]]__iomem[[:space:]]\+/ /g" \
-		-e "s/(__iomem[[:space:]]\+/ (/g" \
-		-e "s/[[:space:]]__attribute_const__[[:space:]]\+/\ /g" \
-		-e "s/[[:space:]]__attribute_const__$//" \
-                "$FILE"
-done
-
 popd
 
 %clean
@@ -126,11 +109,14 @@
 /usr/include/*
 
 %changelog
+* Mon Jun 12 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-40
+- Update to 2.6.16-1.2266_FC6, remove compiler.h sed magic
+
 * Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-39
 - Bump release to 39 to retry build
 
 * Fri Jun  9 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-38
-- Update to 2.6.16-2.2260_FC6:
+- Update to 2.6.16-1.2260_FC6:
 - Add GFS2, DLM headers
 - Allow building for SPARC and Alpha if they're present
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	9 Jun 2006 17:20:42 -0000	1.48
+++ sources	11 Jun 2006 23:42:13 -0000	1.49
@@ -1 +1 @@
-1daf02630129c8d2ae355109f9516574  glibc-kernheaders-2.6.16-1.2260_FC6.tar.bz2
+88d6bb17adac3c562a51ed887d635318  glibc-kernheaders-2.6.16-1.2266_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:46:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:46:02 -0400
Subject: rpms/bluez-hcidump/devel .cvsignore, 1.12, 1.13 bluez-hcidump.spec,
	1.20, 1.21 sources, 1.12,
	1.13 bluez-hcidump-1.30-to-1.31.patch, 1.1, NONE
Message-ID: <200606112346.k5BNk26A027343@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27266

Modified Files:
	.cvsignore bluez-hcidump.spec sources 
Removed Files:
	bluez-hcidump-1.30-to-1.31.patch 
Log Message:
1.31 tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Jun 2006 16:02:55 -0000	1.12
+++ .cvsignore	11 Jun 2006 23:45:59 -0000	1.13
@@ -1 +1 @@
-bluez-hcidump-1.30.tar.gz
+bluez-hcidump-1.31.tar.gz


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bluez-hcidump.spec	11 Jun 2006 17:07:08 -0000	1.20
+++ bluez-hcidump.spec	11 Jun 2006 23:45:59 -0000	1.21
@@ -1,11 +1,10 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.31
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/System
-Source: http://bluez.sourceforge.net/download/%{name}-1.30.tar.gz
-Patch0: bluez-hcidump-1.30-to-1.31.patch
+Source: http://bluez.sourceforge.net/download/%{name}-1.31.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 Requires: glibc >= 2.2.4
@@ -22,8 +21,7 @@
 
 %prep
 
-%setup -q -n bluez-hcidump-1.30
-%patch0 -p1
+%setup -q
 
 %build
 %configure
@@ -43,6 +41,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-5
+- Upload 1.31 tarball now that the lookaside works again
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-4
 - BuildRequire pkgconfig so that the autocrap stuff doesn't break
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Jun 2006 16:02:58 -0000	1.12
+++ sources	11 Jun 2006 23:45:59 -0000	1.13
@@ -1 +1 @@
-46ac502055ccab1fd6f11cab7187e9c7  bluez-hcidump-1.30.tar.gz
+505a0843eccfea4e4467304d63be8396  bluez-hcidump-1.31.tar.gz


--- bluez-hcidump-1.30-to-1.31.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 11 23:49:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 19:49:09 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-vdso-compile-m32.patch,1.1,NONE
Message-ID: <200606112349.k5BNn9di009755@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9720

Removed Files:
	linux-2.6-x86_64-vdso-compile-m32.patch 
Log Message:
dead patch



--- linux-2.6-x86_64-vdso-compile-m32.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 01:50:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 11 Jun 2006 21:50:45 -0400
Subject: rpms/lv/devel lv.spec,1.22,1.23
Message-ID: <200606120150.k5C1oiVd018630@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/lv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18596

Modified Files:
	lv.spec 
Log Message:
* Mon Jun 12 2006 Akira TAGOH <tagoh at redhat.com> - 4.51-8
- clean up the spec file.
- add autoconf to BuildReq. (#194753)


Index: lv.spec
===================================================================
RCS file: /cvs/dist/rpms/lv/devel/lv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lv.spec	11 Feb 2006 04:26:05 -0000	1.22
+++ lv.spec	12 Jun 2006 01:50:42 -0000	1.23
@@ -1,21 +1,22 @@
 %define vver	451
 
-Summary:	A Powerful Multilingual File Viewer
 Name:		lv
 Version:	4.51
-Release: 7.2.1
-License: distributable
-Group: Applications/Text
-URL: http://www.ff.iij4u.or.jp/~nrt/lv/
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-BuildPrereq: libtermcap-devel
-Source: http://www.ff.iij4u.or.jp/~nrt/freeware/%{name}%{vver}.tar.gz
-Patch1: lv-4.49.4-nonstrip.patch
-Patch2: lv-4.51-162372.patch
-Patch3: lv-+num-option.patch
-Patch4: lv-fastio.patch
-Patch5: lv-lfs.patch
+Release:	8
+License:	distributable
+URL:		http://www.ff.iij4u.or.jp/~nrt/lv/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildPrereq:	libtermcap-devel autoconf
+
+Source:		http://www.ff.iij4u.or.jp/~nrt/freeware/%{name}%{vver}.tar.gz
+Patch1:		lv-4.49.4-nonstrip.patch
+Patch2:		lv-4.51-162372.patch
+Patch3:		lv-+num-option.patch
+Patch4:		lv-fastio.patch
+Patch5:		lv-lfs.patch
 
+Summary:	A Powerful Multilingual File Viewer
+Group:		Applications/Text
 %description
 lv is a powerful file viewer like less.
 lv can decode and encode multilingual streams through
@@ -38,29 +39,33 @@
 cd src
 autoconf
 %configure --enable-fastio
-make
+make %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 cd src
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
-%makeinstall
+make install bindir=$RPM_BUILD_ROOT%{_bindir} libdir=$RPM_BUILD_ROOT%{_libdir} mandir=$RPM_BUILD_ROOT%{_mandir}
 
 %files
 %defattr(-, root, root)
 %doc GPL.txt README build hello.sample hello.sample.gif index.html
-%doc lv.1 lv.hlp relnote.html
+%doc relnote.html
 %{_bindir}/lv
 %{_bindir}/lgrep
 %{_mandir}/man1/lv.1.gz
 %{_libdir}/lv
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jun 12 2006 Akira TAGOH <tagoh at redhat.com> - 4.51-8
+- clean up the spec file.
+- add autoconf to BuildReq. (#194753)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.51-7.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 05:23:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 01:23:15 -0400
Subject: rpms/anthy/devel .cvsignore, 1.16, 1.17 anthy.spec, 1.27,
	1.28 sources, 1.16, 1.17
Message-ID: <200606120523.k5C5NFRP023072@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23036

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Mon Jun 12 2006 Akira TAGOH <tagoh at redhat.com> - 7811-1
- New upstream snapshot release.
- use make install DESTDIR=... instead of %%makeinstall.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Jun 2006 06:07:18 -0000	1.16
+++ .cvsignore	12 Jun 2006 05:23:12 -0000	1.17
@@ -19,3 +19,4 @@
 anthy-7714.tar.gz
 anthy-7716.tar.gz
 anthy-7802.tar.gz
+anthy-7811.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- anthy.spec	5 Jun 2006 10:05:24 -0000	1.27
+++ anthy.spec	12 Jun 2006 05:23:12 -0000	1.28
@@ -1,10 +1,10 @@
-%define	version		7802
+%define	version		7811
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
 Name:		anthy
 Version:	%{version}
-Release:	2.fc6
+Release:	1.fc6
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,12 +65,12 @@
 %build
 %configure
 cp anthy_gcanna_ut-%{gcanna_ver}/gcanna.ctd cannadic/
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %ifnarch ppc64
 ## for anthy-el
@@ -127,6 +127,10 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Akira TAGOH <tagoh at redhat.com> - 7811-1
+- New upstream snapshot release.
+- use make install DESTDIR=... instead of %%makeinstall.
+
 * Mon Jun  5 2006 Akira TAGOH <tagoh at redhat.com> - 7802-2
 - exclude ppc64 to make anthy-el package. right now emacs.ppc64 isn't provided
   and buildsys became much stricter.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Jun 2006 06:07:24 -0000	1.16
+++ sources	12 Jun 2006 05:23:12 -0000	1.17
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-e882a4f15892e473a24c770c89562cb6  anthy-7802.tar.gz
+e3619c07bd175ce5f73d67388c0c2ea5  anthy-7811.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 12 07:14:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 03:14:56 -0400
Subject: rpms/autofs/devel autofs.spec,1.100,1.101
Message-ID: <200606120714.k5C7Eual008903@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8822

Modified Files:
	autofs.spec 
Log Message:
* Mon Jun 12 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-8
- fix handling of master map entry update (bz # 193718).
- fix program map handling of invalid multi-mount offsets.



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- autofs.spec	10 Jun 2006 02:44:04 -0000	1.100
+++ autofs.spec	12 Jun 2006 07:14:53 -0000	1.101
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 7
+%define release 8
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -25,6 +25,8 @@
 Patch11: autofs-5.0.0_beta4-sources-list-corruption.patch
 Patch12: autofs-5.0.0_beta4-memory-leaks.patch
 Patch13: autofs-5.0.0_beta4-context-init-error.patch
+Patch14: autofs-5.0.0_beta4-map-update.patch
+Patch15: autofs-5.0.0_beta4-program-map-offset-handling.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -77,6 +79,8 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -132,6 +136,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jun 12 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-8
+- fix handling of master map entry update (bz # 193718).
+- fix program map handling of invalid multi-mount offsets.
+
 * Sat Jun 10 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-7
 - fix context init error (introduced by memory leak patch).
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 07:16:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 03:16:21 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-map-update.patch, NONE,
	1.1 autofs-5.0.0_beta4-program-map-offset-handling.patch, NONE, 1.1
Message-ID: <200606120716.k5C7GLl7015584@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12727

Added Files:
	autofs-5.0.0_beta4-map-update.patch 
	autofs-5.0.0_beta4-program-map-offset-handling.patch 
Log Message:
- didn't add patches.


autofs-5.0.0_beta4-map-update.patch:
 CHANGELOG               |    1 +
 daemon/automount.c      |   44 ++++++++++++++++++++++++++++++++++++++++++--
 daemon/direct.c         |   20 +++++++++++++++++++-
 daemon/lookup.c         |   40 +++++++++++++++++++++++++++++++---------
 daemon/state.c          |    3 ++-
 include/automount.h     |    6 +++++-
 lib/master.c            |   48 +++++++++++++++++++++++++++++++++---------------
 lib/master_parse.y      |   19 ++++++++++++-------
 lib/mounts.c            |   16 +++++++++++++++-
 modules/lookup_file.c   |    2 +-
 modules/mount_autofs.c  |    2 +-
 modules/mount_bind.c    |    2 +-
 modules/mount_ext2.c    |    2 +-
 modules/mount_generic.c |    2 +-
 modules/mount_nfs.c     |    2 +-
 15 files changed, 166 insertions(+), 43 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-map-update.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index f2557bb..a584f4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@
 - fix memory leak in walk_tree.
 - fix memory leak in rpc_portmap_getport and rpc_ping_proto.
 - fix memory leak in initialisation of lookup modules.
+- fix handling of master map entry update.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 827541f..147be1c 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -345,7 +345,7 @@ static int umount_ent(struct autofs_poin
 		 * so that we do not try to call rmdir_path on the
 		 * directory.
 		 */
-		if (!rv && is_mounted(_PATH_MOUNTED, path)) {
+		if (!rv && is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
 			crit(ap->logopt,
 			     "the umount binary reported that %s was "
 			     "unmounted, but there is still something "
@@ -502,6 +502,44 @@ static void check_rm_dirs(struct autofs_
 		rm_unwanted(path, 0, ap->dev);
 }
 
+/* Try to purge cache entries kept around due to existing mounts */
+static void update_map_cache(struct autofs_point *ap, const char *path)
+{
+	struct map_source *map;
+	struct mapent_cache *mc;
+	const char *key;
+
+	if (ap->type == LKP_INDIRECT)
+		key = strrchr(path, '/') + 1;
+	else
+		key = path;
+
+	pthread_cleanup_push(master_source_lock_cleanup, ap->entry);
+	master_source_readlock(ap->entry);
+	map = ap->entry->first;
+	while (map) {
+		struct mapent *me = NULL;
+
+		/* Skip current, in-use cache */
+		if (ap->entry->age <= map->age) {
+			map = map->next;
+			continue;
+		}
+
+		mc = map->mc;
+		cache_writelock(mc);
+		me = cache_lookup_distinct(mc, key);
+		if (me)
+			cache_delete(mc, key);
+		cache_unlock(mc);
+
+		map = map->next;
+	}
+	pthread_cleanup_pop(1);
+
+	return;
+}
+
 /* umount all filesystems mounted under path.  If incl is true, then
    it also tries to umount path itself */
 int umount_multi(struct autofs_point *ap, struct mnt_list *mnts, const char *path, int incl)
@@ -550,8 +588,10 @@ int umount_multi(struct autofs_point *ap
 	}
 
 	/* Delete detritus like unwanted mountpoints and symlinks */
-	if (left == 0)
+	if (left == 0) {
+		update_map_cache(ap, path);
 		check_rm_dirs(ap, path, incl);
+	}
 
 	return left;
 }
diff --git a/daemon/direct.c b/daemon/direct.c
index 817e38b..bfe4dbf 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -451,6 +451,15 @@ int mount_autofs_direct(struct autofs_po
 	master_source_readlock(ap->entry);
 	map = ap->entry->first;
 	while (map) {
+		/*
+		 * Only consider map sources that have been read since
+		 * the map entry was last updated.
+		 */
+		if (ap->entry->age > map->age) {
+			map = map->next;
+			continue;
+		}
+
 		ap->entry->current = map;
 		mc = map->mc;
 		pthread_cleanup_push(cache_lock_cleanup, mc);
@@ -546,7 +555,7 @@ int mount_autofs_offset(struct autofs_po
 	struct stat st;
 	int status, ret;
 
-	if (is_mounted(_PROC_MOUNTS, me->key)) {
+	if (is_mounted(_PROC_MOUNTS, me->key, MNTS_AUTOFS)) {
 		if (ap->state != ST_READMAP)
 			debug(ap->logopt,
 			      "trigger %s already mounted", me->key);
@@ -1191,6 +1200,15 @@ int handle_packet_missing_direct(struct 
 	master_source_readlock(ap->entry);
 	map = ap->entry->first;
 	while (map) {
+		/*
+		 * Only consider map sources that have been read since
+		 * the map entry was last updated.
+		 */
+		if (ap->entry->age > map->age) {
+			map = map->next;
+			continue;
+		}
+
 		mc = map->mc;
 		cache_readlock(mc);
 		me = cache_lookup_ino(mc, pkt->dev, pkt->ino);
diff --git a/daemon/lookup.c b/daemon/lookup.c
index a88abdf..4db7cef 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -402,7 +402,8 @@ int lookup_nss_read_map(struct autofs_po
 	master_source_readlock(entry);
 	map = entry->first;
 	while (map) {
-		if (!map->stale) {
+		/* Is map source up to date or no longer valid */
+		if (!map->stale || entry->age > map->age) {
 			map = map->next;
 			continue;
 		}
@@ -484,6 +485,7 @@ done:
 
 int lookup_ghost(struct autofs_point *ap)
 {
+	struct master_mapent *entry = ap->entry;
 	struct map_source *map;
 	struct mapent_cache *mc;
 	struct mapent *me;
@@ -498,10 +500,19 @@ int lookup_ghost(struct autofs_point *ap
 	if (!ap->ghost)
 		return LKP_INDIRECT;
 
-	pthread_cleanup_push(master_source_lock_cleanup, ap->entry);
-	master_source_readlock(ap->entry);
-	map = ap->entry->first;
+	pthread_cleanup_push(master_source_lock_cleanup, entry);
+	master_source_readlock(entry);
+	map = entry->first;
 	while (map) {
+		/*
+		 * Only consider map sources that have been read since 
+		 * the map entry was last updated.
+		 */
+		if (entry->age > map->age) {
+			map = map->next;
+			continue;
+		}
+
 		mc = map->mc;
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_readlock(mc);
@@ -715,6 +726,15 @@ int lookup_nss_mount(struct autofs_point
 	master_source_readlock(entry);
 	map = entry->first;
 	while (map) {
+		/*
+		 * Only consider map sources that have been read since 
+		 * the map entry was last updated.
+		 */
+		if (entry->age > map->age) {
+			map = map->next;
+			continue;
+		}
+
 		sched_yield();
 		entry->current = map;
 		if (map->type) {
@@ -839,16 +859,16 @@ static char *make_fullpath(const char *r
 
 int lookup_prune_cache(struct autofs_point *ap, time_t age)
 {
+	struct master_mapent *entry = ap->entry;
 	struct map_source *map;
 	struct mapent_cache *mc;
 	struct mapent *me, *this;
-	struct master_mapent *entry = ap->entry;
 	char *path;
 	int status = CHE_FAIL;
 
 	master_source_readlock(entry);
 
-	map = ap->entry->first;
+	map = entry->first;
 	while (map) {
 		if (!map->stale) {
 			map = map->next;
@@ -878,7 +898,7 @@ int lookup_prune_cache(struct autofs_poi
 				continue;
 			}
 
-			if (is_mounted(_PATH_MOUNTED, path)) {
+			if (is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
 				debug(ap->logopt,
 				      "prune posponed, %s is mounted", path);
 				free(key);
@@ -904,8 +924,10 @@ int lookup_prune_cache(struct autofs_poi
 			status = cache_delete(mc, key);
 			cache_unlock(mc);
 
-			if (status != CHE_FAIL)
-				rmdir_path(ap, path);
+			if (status != CHE_FAIL) {
+				if (!is_mounted(_PROC_MOUNTS, path, MNTS_AUTOFS))
+					rmdir_path(ap, path);
+			}
 
 			if (!next_key) {
 				free(key);
diff --git a/daemon/state.c b/daemon/state.c
index cf2df67..cf9282f 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -370,7 +370,8 @@ static void *do_readmap(void *arg)
 		master_source_readlock(ap->entry);
 		map = ap->entry->first;
 		while (map) {
-			if (!map->stale) {
+			/* Is map source up to date or no longer valid */
+			if (!map->stale || ap->entry->age > map->age) {
 				map = map->next;
 				continue;
 			}
diff --git a/include/automount.h b/include/automount.h
index b01373f..2630722 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -309,6 +309,10 @@ int ncat_path(char *buf, size_t len,
 
 /* mount table utilities */
 
+#define MNTS_ALL	0x0000
+#define MNTS_REAL	0x0001
+#define MNTS_AUTOFS	0x0002
+
 struct mnt_list {
 	char *path;
 	char *fs_type;
@@ -338,7 +342,7 @@ char *make_mnt_name_string(char *path);
 struct mnt_list *get_mnt_list(const char *table, const char *path, int include);
 struct mnt_list *reverse_mnt_list(struct mnt_list *list);
 void free_mnt_list(struct mnt_list *list);
-int is_mounted(const char *table, const char *path);
+int is_mounted(const char *table, const char *path, unsigned int type);
 int has_fstab_option(const char *path, const char *opt);
 char *find_mnt_ino(const char *table, dev_t dev, ino_t ino);
 char *get_offset(const char *prefix, char *offset,
diff --git a/lib/master.c b/lib/master.c
index 167054d..b0c5b58 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -630,24 +630,27 @@ void master_free_mapent_sources(struct m
 			m = n;
 		}
 		entry->maps = NULL;
+		entry->first = NULL;
 	}
 
 	master_source_unlock(entry);
 
-	status = pthread_rwlock_destroy(&entry->source_lock);
-	if (status)
-		fatal(status);
-
 	return;
 }
 
 void master_free_mapent(struct master_mapent *entry)
 {
+	int status;
+
 	if (entry->path)
 		free(entry->path);
 
 	master_free_autofs_point(entry->ap);
 
+	status = pthread_rwlock_destroy(&entry->source_lock);
+	if (status)
+		fatal(status);
+
 	free(entry);
 
 	return;
@@ -926,22 +929,37 @@ static void check_update_map_sources(str
 
 	master_source_writelock(entry);
 
-	source = entry->maps;
 	last = NULL;
+	source = entry->maps;
 	while (source) {
 		if (readall)
 			source->stale = 1;
 
-		/* Map source has gone away */
-		if (source->age < age) {
-			struct map_source *next;
-			if (last)
-				last->next = source->next;
-			next = source->next;
-			master_free_map_source(source, 1);
-			source = next;
-			map_stale = 1;
-			continue;
+		/*
+		 * If a map source is no longer valid and all it's
+		 * entries have expired away we can get rid of it.
+		 */
+		if (entry->age > source->age) {
+			struct mapent *me;
+			cache_readlock(source->mc);
+			me = cache_lookup_first(source->mc);
+			cache_unlock(source->mc);
+			if (!me) {
+				struct map_source *next = source->next;
+
+				if (!last)
+					entry->maps = next;
+				else
+					last->next = next;
+
+				if (entry->first == source)
+					entry->first = next;
+
+				master_free_map_source(source, 1);
+
+				source = next;
+				continue;
+			}
 		} else if (source->type) {
 			if (!strcmp(source->type, "null")) {
 /*				entry->ap->mc = cache_init(entry->ap); */
diff --git a/lib/master_parse.y b/lib/master_parse.y
index 4d8bcf3..54543af 100644
--- a/lib/master_parse.y
+++ b/lib/master_parse.y
@@ -473,8 +473,7 @@ int master_parse_entry(const char *buffe
 		if (!new)
 			return 0;
 		entry = new;
-	} else
-		entry->age = age;
+	}
 
 	if (!entry->ap) {
 		ret = master_add_autofs_point(entry, timeout, logopt, ghost, 0);
@@ -520,14 +519,20 @@ int master_parse_entry(const char *buffe
 		return 0;
 	}
 
-	source->mc = cache_init(source);
 	if (!source->mc) {
-		error(LOGOPT_ANY, "failed to init source cache");
-		if (new)
-			master_free_mapent(new);
-		return 0;
+		source->mc = cache_init(source);
+		if (!source->mc) {
+			error(LOGOPT_ANY, "failed to init source cache");
+			if (new)
+				master_free_mapent(new);
+			return 0;
+		}
 	}
 
+	entry->age = age;
+	entry->first = entry->maps;
+	entry->current = NULL;
+
 	if (new)
 		master_add_mapent(master, entry);
 
diff --git a/lib/mounts.c b/lib/mounts.c
index ef93d1b..b1d5e48 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -255,7 +255,7 @@ void free_mnt_list(struct mnt_list *list
 	}
 }
 
-int is_mounted(const char *table, const char *path)
+int is_mounted(const char *table, const char *path, unsigned int type)
 {
 	struct mntent *mnt;
 	struct mntent mnt_wrk;
@@ -277,6 +277,20 @@ int is_mounted(const char *table, const 
 	while ((mnt = getmntent_r(tab, &mnt_wrk, buf, PATH_MAX))) {
 		int len = strlen(mnt->mnt_dir);
 
+		if (type) {
+			unsigned int autofs_fs;
+
+			autofs_fs = !strcmp(mnt->mnt_type, "autofs");
+
+			if (type & MNTS_REAL)
+				if (autofs_fs)
+					continue;
+
+			if (type & MNTS_AUTOFS)
+				if (!autofs_fs)
+					continue;
+		}
+
 		if (pathlen == len && !strncmp(path, mnt->mnt_dir, pathlen)) {
 			ret = 1;
 			break;
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index b9e7701..6e8b5dc 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -442,7 +442,7 @@ static int check_self_include(const char
 static struct autofs_point *
 prepare_plus_include(struct autofs_point *ap, time_t age, char *key, unsigned int inc)
 {
-	struct master_mapent *entry = ap->entry;
+	struct master_mapent *entry;
 	struct map_source *current = ap->entry->current;
 	struct map_source *source;
 	struct autofs_point *iap;
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index 370dba6..885280a 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -82,7 +82,7 @@ int mount_mount(struct autofs_point *ap,
 	else
 		sprintf(fullpath, "%s", name);
 
-	if (is_mounted(_PATH_MOUNTED, fullpath)) {
+	if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
 		error(ap->logopt,
 		      MODPREFIX 
 		      "warning: about to mount over %s, continuing",
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 8df2cfa..07c3c3b 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -137,7 +137,7 @@ int mount_mount(struct autofs_point *ap,
 		if (!status)
 			existed = 0;
 
-		if (is_mounted(_PATH_MOUNTED, fullpath)) {
+		if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
 			error(ap->logopt,
 			      MODPREFIX "warning: %s is already mounted",
 			      fullpath);
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index f137291..16effdd 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -84,7 +84,7 @@ int mount_mount(struct autofs_point *ap,
 	if (!status)
 		existed = 0;
 
-	if (is_mounted(_PATH_MOUNTED, fullpath)) {
+	if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
 		error(ap->logopt,
 		      MODPREFIX "warning: %s is already mounted", fullpath);
 		return 0;
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index 059fc7c..290ccc0 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -83,7 +83,7 @@ int mount_mount(struct autofs_point *ap,
 	if (!status)
 		existed = 0;
 
-	if (is_mounted(_PATH_MOUNTED, fullpath)) {
+	if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
 		error(ap->logopt,
 		      MODPREFIX "warning: %s is already mounted", fullpath);
 		return 0;
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 09f431f..e25988d 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -185,7 +185,7 @@ int mount_mount(struct autofs_point *ap,
 		int err;
 		char *loc;
 
-		if (is_mounted(_PATH_MOUNTED, fullpath)) {
+		if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
 			error(ap->logopt,
 			      MODPREFIX
 			      "warning: %s is already mounted", fullpath);

autofs-5.0.0_beta4-program-map-offset-handling.patch:
 CHANGELOG                |    1 +
 modules/lookup_program.c |   22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-program-map-offset-handling.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index a584f4e..553b662 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@
 - fix memory leak in rpc_portmap_getport and rpc_ping_proto.
 - fix memory leak in initialisation of lookup modules.
 - fix handling of master map entry update.
+- fix program map handling of iinvalid multi-mount offsets.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index 0f9f205..e20054b 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -117,11 +117,23 @@ int lookup_mount(struct autofs_point *ap
 	int distance;
 	int alloci = 1;
 
-	debug(ap->logopt, MODPREFIX "looking up %s", name);
-
 	/* Catch installed direct offset triggers */
-	me = cache_lookup(mc, name);
-	if (me) {
+	cache_readlock(mc);
+	me = cache_lookup_distinct(mc, name);
+	if (!me) {
+		cache_unlock(mc);
+		/*
+		 * If there's a '/' in the name and the offset is not in
+		 * the cache then it's not a valid path in the mount tree.
+		 */
+		if (strchr(name, '/')) {
+			debug(ap->logopt,
+			      MODPREFIX "offset %s not found", name);
+			return NSS_STATUS_NOTFOUND;
+		}
+	} else {
+		cache_unlock(mc);
+		/* Otherwise we found a valid offset so try mount it */
 		debug(ap->logopt, MODPREFIX "%s -> %s", name, me->mapent);
 
 		ret = ctxt->parse->parse_mount(ap, name, name_len,
@@ -136,6 +148,8 @@ int lookup_mount(struct autofs_point *ap
 		return NSS_STATUS_UNAVAIL;
 	}
 
+	debug(ap->logopt, MODPREFIX "looking up %s", name);
+
 	/*
 	 * We don't use popen because we don't want to run /bin/sh plus we
 	 * want to send stderr to the syslog, and we don't use spawnl()



From fedora-cvs-commits at redhat.com  Mon Jun 12 08:09:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 04:09:00 -0400
Subject: rpms/cvs/devel cvs-1.11.22-cvspass.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 cvs.spec, 1.43, 1.44 sources, 1.12,
	1.13 cvs-1.11.19-cvspass.patch, 1.1, NONE
Message-ID: <200606120809.k5C8909d020109@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/cvs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20029

Modified Files:
	.cvsignore cvs.spec sources 
Added Files:
	cvs-1.11.22-cvspass.patch 
Removed Files:
	cvs-1.11.19-cvspass.patch 
Log Message:
new upstream

cvs-1.11.22-cvspass.patch:
 login.c   |    9 +++++++++
 logmsg.c  |    2 +-
 sanity.sh |    6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE cvs-1.11.22-cvspass.patch ---
--- cvs-1.11.22/src/logmsg.c.cvspass	2006-05-16 02:16:31.000000000 +0200
+++ cvs-1.11.22/src/logmsg.c	2006-06-12 09:46:15.000000000 +0200
@@ -267,7 +267,7 @@
     }
 
     (void) fprintf (fp,
-  "%s----------------------------------------------------------------------\n",
+  "\n%s----------------------------------------------------------------------\n",
 		    CVSEDITPREFIX);
     (void) fprintf (fp,
   "%sEnter Log.  Lines beginning with `%.*s' are removed automatically\n%s\n",
--- cvs-1.11.22/src/login.c.cvspass	2006-05-04 17:13:41.000000000 +0200
+++ cvs-1.11.22/src/login.c	2006-06-12 09:46:15.000000000 +0200
@@ -313,6 +313,15 @@
     fp = CVS_FOPEN (passfile, "r");
     if (fp == NULL)
     {
+       fp = CVS_FOPEN (passfile, "w");
+       if (fp != NULL)
+       {
+           fclose (fp);
+           fp = CVS_FOPEN (passfile, "r");
+       }
+    }
+    if (fp == NULL)
+    {
 	error (0, errno, "warning: failed to open %s for reading", passfile);
 	goto process;
     }
--- cvs-1.11.22/src/sanity.sh.cvspass	2006-06-09 04:09:41.000000000 +0200
+++ cvs-1.11.22/src/sanity.sh	2006-06-12 09:54:44.000000000 +0200
@@ -15183,6 +15183,7 @@
 revision 1\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15194,6 +15195,7 @@
 ----------------------------
 revision 1\.1\.2\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15221,6 +15223,7 @@
 revision 1\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15232,6 +15235,7 @@
 ----------------------------
 revision 1\.1\.2\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15253,6 +15257,7 @@
 revision 1\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15264,6 +15269,7 @@
 ----------------------------
 revision 1\.1\.2\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Nov 2005 10:36:06 -0000	1.12
+++ .cvsignore	12 Jun 2006 08:08:31 -0000	1.13
@@ -1,3 +1,4 @@
 cvs-1.11.17.tar.bz2
 cvs-1.11.19.tar.bz2
 cvs-1.11.21.tar.bz2
+cvs-1.11.22.tar.bz2


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cvs.spec	9 May 2006 12:11:40 -0000	1.43
+++ cvs.spec	12 Jun 2006 08:08:43 -0000	1.44
@@ -3,8 +3,8 @@
 
 Summary: A version control system.
 Name: cvs
-Version: 1.11.21
-Release: 4
+Version: 1.11.22
+Release: 1
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -13,7 +13,7 @@
 Source3: cvs.pam
 Source4: cvs.sh
 URL: http://www.cvshome.org/
-Patch0: cvs-1.11.19-cvspass.patch
+Patch0: cvs-1.11.22-cvspass.patch
 Patch1: cvs-1.11.19-extzlib.patch
 Patch2: cvs-1.11.19-netbsd-tag.patch
 Patch3: cvs-1.11.19-abortabort.patch
@@ -61,7 +61,7 @@
 %patch3 -p1 -b .abortabort
 %patch4 -p1 -b .bs
 %patch5 -p1 -b .proxy
-%patch7 -p1
+%patch7 -p1 -b .log
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1 -b .tmp
@@ -141,6 +141,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Jun 12 2006 Martin Stransky <stransky at redhat.com> - 1.11.22-1
+- new upstream
+
 * Tue May 9  2006 Martin Stransky <stransky at redhat.com> - 1.11.21-4
 - fix for #189858 - /etc/profile.d/cvs.sh overwrite personal settings
 - fix for #190009 - rcs2log uses obsolete sort option


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Nov 2005 10:36:06 -0000	1.12
+++ sources	12 Jun 2006 08:08:43 -0000	1.13
@@ -1 +1 @@
-54dd9eeb0648c9eef680df7cb26c710e  cvs-1.11.21.tar.bz2
+f24043a640509aff1aa28871dd345762  cvs-1.11.22.tar.bz2


--- cvs-1.11.19-cvspass.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 08:14:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 04:14:25 -0400
Subject: rpms/cvs/FC-5 cvs-1.11.22-cvspass.patch, NONE, 1.1 cvs.spec, 1.42,
	1.43 sources, 1.12, 1.13 cvs-1.11.19-cvspass.patch, 1.1, NONE
Message-ID: <200606120814.k5C8EPwp021492@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/cvs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21458

Modified Files:
	cvs.spec sources 
Added Files:
	cvs-1.11.22-cvspass.patch 
Removed Files:
	cvs-1.11.19-cvspass.patch 
Log Message:
new upstream

cvs-1.11.22-cvspass.patch:
 login.c   |    9 +++++++++
 logmsg.c  |    2 +-
 sanity.sh |    6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE cvs-1.11.22-cvspass.patch ---
--- cvs-1.11.22/src/logmsg.c.cvspass	2006-05-16 02:16:31.000000000 +0200
+++ cvs-1.11.22/src/logmsg.c	2006-06-12 09:46:15.000000000 +0200
@@ -267,7 +267,7 @@
     }
 
     (void) fprintf (fp,
-  "%s----------------------------------------------------------------------\n",
+  "\n%s----------------------------------------------------------------------\n",
 		    CVSEDITPREFIX);
     (void) fprintf (fp,
   "%sEnter Log.  Lines beginning with `%.*s' are removed automatically\n%s\n",
--- cvs-1.11.22/src/login.c.cvspass	2006-05-04 17:13:41.000000000 +0200
+++ cvs-1.11.22/src/login.c	2006-06-12 09:46:15.000000000 +0200
@@ -313,6 +313,15 @@
     fp = CVS_FOPEN (passfile, "r");
     if (fp == NULL)
     {
+       fp = CVS_FOPEN (passfile, "w");
+       if (fp != NULL)
+       {
+           fclose (fp);
+           fp = CVS_FOPEN (passfile, "r");
+       }
+    }
+    if (fp == NULL)
+    {
 	error (0, errno, "warning: failed to open %s for reading", passfile);
 	goto process;
     }
--- cvs-1.11.22/src/sanity.sh.cvspass	2006-06-09 04:09:41.000000000 +0200
+++ cvs-1.11.22/src/sanity.sh	2006-06-12 09:54:44.000000000 +0200
@@ -15183,6 +15183,7 @@
 revision 1\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15194,6 +15195,7 @@
 ----------------------------
 revision 1\.1\.2\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15221,6 +15223,7 @@
 revision 1\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15232,6 +15235,7 @@
 ----------------------------
 revision 1\.1\.2\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15253,6 +15257,7 @@
 revision 1\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15264,6 +15269,7 @@
 ----------------------------
 revision 1\.1\.2\.1
 date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/FC-5/cvs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cvs.spec	11 Feb 2006 02:21:59 -0000	1.42
+++ cvs.spec	12 Jun 2006 08:14:23 -0000	1.43
@@ -3,8 +3,8 @@
 
 Summary: A version control system.
 Name: cvs
-Version: 1.11.21
-Release: 3.2
+Version: 1.11.22
+Release: 1.FC5
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -13,7 +13,7 @@
 Source3: cvs.pam
 Source4: cvs.sh
 URL: http://www.cvshome.org/
-Patch0: cvs-1.11.19-cvspass.patch
+Patch0: cvs-1.11.22-cvspass.patch
 Patch1: cvs-1.11.19-extzlib.patch
 Patch2: cvs-1.11.19-netbsd-tag.patch
 Patch3: cvs-1.11.19-abortabort.patch
@@ -139,6 +139,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Jun 12 2006 Martin Stransky <stransky at redhat.com> 1.11.22-1.FC5
+- new upstream
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.21-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cvs/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Nov 2005 10:36:06 -0000	1.12
+++ sources	12 Jun 2006 08:14:23 -0000	1.13
@@ -1 +1 @@
-54dd9eeb0648c9eef680df7cb26c710e  cvs-1.11.21.tar.bz2
+f24043a640509aff1aa28871dd345762  cvs-1.11.22.tar.bz2


--- cvs-1.11.19-cvspass.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 08:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 04:21:38 -0400
Subject: rpms/cvs/devel cvs-1.11.22.tar.bz2.sig, NONE,
	1.1 cvs-1.11.21.tar.bz2.sig, 1.1, NONE
Message-ID: <200606120821.k5C8LcTT006229@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/cvs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6185

Added Files:
	cvs-1.11.22.tar.bz2.sig 
Removed Files:
	cvs-1.11.21.tar.bz2.sig 
Log Message:
added sig file


--- NEW FILE cvs-1.11.22.tar.bz2.sig ---
??
?????-IE???^9I?

--- cvs-1.11.21.tar.bz2.sig DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 08:21:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 04:21:48 -0400
Subject: rpms/stardict/devel stardict.spec,1.20,1.21
Message-ID: <200606120821.k5C8LmG5006324@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6142

Modified Files:
	stardict.spec 
Log Message:
Updated package description



Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- stardict.spec	5 Jun 2006 22:25:32 -0000	1.20
+++ stardict.spec	12 Jun 2006 08:21:46 -0000	1.21
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:    2.4.5
-Release:    3
+Release:    4
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
@@ -62,6 +62,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Mon Jun 12 2006 Mayank Jain <majain at redhat.com>
+- Updated package description
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com>
 - Added missing BuildRequires scrollkeeper
 - Added Requires(post) and (postun) accordingly



From fedora-cvs-commits at redhat.com  Mon Jun 12 08:23:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 04:23:21 -0400
Subject: rpms/cvs/FC-5 cvs-1.11.22.tar.bz2.sig, NONE,
	1.1 cvs-1.11.21.tar.bz2.sig, 1.1, NONE
Message-ID: <200606120823.k5C8NLie006838@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/cvs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6810

Added Files:
	cvs-1.11.22.tar.bz2.sig 
Removed Files:
	cvs-1.11.21.tar.bz2.sig 
Log Message:
added sig file


--- NEW FILE cvs-1.11.22.tar.bz2.sig ---
??
?????-IE???^9I?

--- cvs-1.11.21.tar.bz2.sig DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 09:15:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 05:15:45 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.10,1.11
Message-ID: <200606120915.k5C9FjAI000942@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv904

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Mon Jun 12 2006 Alexander Larsson <alexl at redhat.com> - 0.5-3
- Rebuild for new libbluetooth soname




Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nautilus-sendto.spec	10 Jun 2006 05:15:53 -0000	1.10
+++ nautilus-sendto.spec	12 Jun 2006 09:15:33 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.5
-Release: 	2
+Release: 	3
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -76,6 +76,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Alexander Larsson <alexl at redhat.com> - 0.5-3
+- Rebuild for new libbluetooth soname
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 0.5-2
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 09:22:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 05:22:12 -0400
Subject: rpms/automake14/devel automake14.spec,1.11,1.12
Message-ID: <200606120922.k5C9MCoD017822@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake14/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17793

Modified Files:
	automake14.spec 
Log Message:
- don't run autoreconf during build (#194735)


Index: automake14.spec
===================================================================
RCS file: /cvs/dist/rpms/automake14/devel/automake14.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake14.spec	9 Dec 2005 22:39:43 -0000	1.11
+++ automake14.spec	12 Jun 2006 09:22:09 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake14
 Version:	1.4p6
-Release: 12.1
+Release:    13
 License:	GPL
 Group:		Development/Tools
 URL:		http://sources.redhat.com/automake
@@ -36,9 +36,6 @@
 %patch7 -p1 -b .dollar
 
 %build
-# patch 6 touches Makefile.am
-autoreconf
-
 %configure
 make
 
@@ -73,6 +70,9 @@
 %{_datadir}/automake-1.4
 
 %changelog
+* Mon Jun 12 2006 Karsten Hopp <karsten at redhat.de> 1.4p6-13
+- don't run autoreconf during build (#194735)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 10:50:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 06:50:44 -0400
Subject: rpms/shadow-utils/FC-5 shadow-4.0.14-redhat.patch, 1.1,
	1.2 shadow-utils.spec, 1.75, 1.76
Message-ID: <200606121050.k5CAoi5O002975@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2721

Modified Files:
	shadow-4.0.14-redhat.patch shadow-utils.spec 
Log Message:
 "useradd -r" must create a system group (#194728)


shadow-4.0.14-redhat.patch:
 man/groupadd.8 |    7 ++-
 man/useradd.8  |   22 ++++++++++--
 src/groupadd.c |   19 ++++++++--
 src/useradd.c  |  103 ++++++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 110 insertions(+), 41 deletions(-)

Index: shadow-4.0.14-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-4.0.14-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shadow-4.0.14-redhat.patch	6 Jan 2006 09:56:57 -0000	1.1
+++ shadow-4.0.14-redhat.patch	12 Jun 2006 10:50:41 -0000	1.2
@@ -1,5 +1,5 @@
 --- shadow-4.0.14/man/groupadd.8.redhat	2006-01-03 17:44:56.000000000 +0100
-+++ shadow-4.0.14/man/groupadd.8	2006-01-04 15:12:43.000000000 +0100
++++ shadow-4.0.14/man/groupadd.8	2006-06-12 12:31:00.000000000 +0200
 @@ -11,7 +11,7 @@
  groupadd \- Create a new group
  .SH "SYNOPSIS"
@@ -25,7 +25,7 @@
  \fB\-h\fR, \fB\-\-help\fR
  Display help message and exit.
 --- shadow-4.0.14/man/useradd.8.redhat	2006-01-03 17:44:57.000000000 +0100
-+++ shadow-4.0.14/man/useradd.8	2006-01-04 15:01:33.000000000 +0100
++++ shadow-4.0.14/man/useradd.8	2006-06-12 12:31:00.000000000 +0200
 @@ -22,7 +22,7 @@
  \fB\-D\fR
  option, the
@@ -100,64 +100,8 @@
  \fI/etc/skel/\fR
  directory containing default files
  .TP
---- shadow-4.0.14/src/groupadd.c.redhat	2005-12-06 21:24:03.000000000 +0100
-+++ shadow-4.0.14/src/groupadd.c	2006-01-04 15:01:45.000000000 +0100
-@@ -74,6 +74,7 @@
- static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
- static int gflg = 0;		/* ID value for the new group */
- static int fflg = 0;		/* if group already exists, do nothing and exit(0) */
-+static int rflg = 0;            /* for adding system accounts (Red Hat) */
- 
- /* local function prototypes */
- static void usage (void);
-@@ -100,6 +101,7 @@
- 			   "Options:\n"
- 			   "  -f, --force		force exit with success status if the specified\n"
- 			   "				group already exists\n"
-+			   "  -r,			create system account\n"
- 			   "  -g, --gid GID		use GID for the new group\n"
- 			   "  -h, --help			display this help message and exit\n"
- 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
-@@ -197,8 +199,13 @@
- 	const struct group *grp;
- 	gid_t gid_min, gid_max;
- 
--	gid_min = getdef_unum ("GID_MIN", 1000);
--	gid_max = getdef_unum ("GID_MAX", 60000);
-+	if (!rflg) {
-+		gid_min = getdef_unum ("GID_MIN", 500);
-+                gid_max = getdef_unum ("GID_MAX", 60000);
-+        } else {
-+                gid_min = 1;
-+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
-+        }
- 
- 	/*
- 	 * Start with some GID value if the user didn't provide us with
-@@ -412,7 +419,7 @@
- 		};
- 
- 		while ((c =
--			getopt_long (argc, argv, "fg:hK:o", long_options,
-+			getopt_long (argc, argv, "frg:hK:o", long_options,
- 				     &option_index)) != -1) {
- 			switch (c) {
- 			case 'f':
-@@ -425,6 +432,12 @@
- 				 */
- 				fflg++;
- 				break;
-+	                case 'r':
-+	                        /*
-+	                         * create a system group
-+	                         */
-+	                        rflg++;
-+	                        break;
- 			case 'g':
- 				gflg++;
- 				if (!isdigit (optarg[0]))
 --- shadow-4.0.14/src/useradd.c.redhat	2005-12-15 16:06:28.000000000 +0100
-+++ shadow-4.0.14/src/useradd.c	2006-01-04 15:01:33.000000000 +0100
++++ shadow-4.0.14/src/useradd.c	2006-06-12 12:40:02.000000000 +0200
 @@ -81,7 +81,7 @@
  static gid_t def_group = 100;
  static const char *def_gname = "other";
@@ -249,7 +193,23 @@
  			fprintf (stderr, _("%s: UID %u is not unique\n"),
  				 Prog, (unsigned int) user_id);
  #ifdef WITH_AUDIT
-@@ -1016,7 +1115,7 @@
+@@ -917,8 +936,13 @@
+ 	const struct group *grp;
+ 	gid_t gid_min, gid_max;
+ 
+-	gid_min = getdef_num ("GID_MIN", 500);
+-	gid_max = getdef_num ("GID_MAX", 60000);
++        if (!rflg) {
++                gid_min = getdef_unum ("GID_MIN", 500);
++                gid_max = getdef_unum ("GID_MAX", 60000);
++        } else {
++                gid_min = 1;
++                gid_max = getdef_unum ("GID_MIN", 500) - 1;
++        }
+ 
+ 	/*
+ 	 * Start with some GID value if the user didn't provide us with
+@@ -1016,7 +1040,7 @@
  			{NULL, 0, NULL, '\0'}
  		};
  		while ((c =
@@ -258,7 +218,7 @@
  				     long_options, NULL)) != -1) {
  			switch (c) {
  			case 'b':
-@@ -1188,6 +1287,15 @@
+@@ -1188,6 +1212,15 @@
  				user_id = get_uid (optarg);
  				uflg++;
  				break;
@@ -274,7 +234,7 @@
  			default:
  				usage ();
  			}
-@@ -1195,6 +1303,9 @@
+@@ -1195,6 +1228,9 @@
  		}
  	}
  
@@ -284,7 +244,7 @@
  	/*
  	 * Certain options are only valid in combination with others.
  	 * Check it here so that they can be specified in any order.
-@@ -1700,6 +1811,14 @@
+@@ -1700,6 +1736,14 @@
  	}
  #endif				/* USE_PAM */
  
@@ -299,7 +259,7 @@
  	/*
  	 * See if we are messing with the defaults file, or creating
  	 * a new user.
-@@ -1730,7 +1849,7 @@
+@@ -1730,7 +1774,7 @@
  	 * to that group, use useradd -g username username.
  	 * --bero
  	 */
@@ -308,7 +268,7 @@
  		if (getgrnam (user_name)) {
  			fprintf (stderr,
  				 _
-@@ -1779,25 +1910,18 @@
+@@ -1779,25 +1823,18 @@
  				 ("%s: warning: the home directory already exists.\n"
  				  "Not copying any file from skel directory into it.\n"),
  				 Prog);
@@ -345,3 +305,59 @@
  
  	create_mail ();
  
+--- shadow-4.0.14/src/groupadd.c.redhat	2005-12-06 21:24:03.000000000 +0100
++++ shadow-4.0.14/src/groupadd.c	2006-06-12 12:31:00.000000000 +0200
+@@ -74,6 +74,7 @@
+ static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
+ static int gflg = 0;		/* ID value for the new group */
+ static int fflg = 0;		/* if group already exists, do nothing and exit(0) */
++static int rflg = 0;            /* for adding system accounts (Red Hat) */
+ 
+ /* local function prototypes */
+ static void usage (void);
+@@ -100,6 +101,7 @@
+ 			   "Options:\n"
+ 			   "  -f, --force		force exit with success status if the specified\n"
+ 			   "				group already exists\n"
++			   "  -r,			create system account\n"
+ 			   "  -g, --gid GID		use GID for the new group\n"
+ 			   "  -h, --help			display this help message and exit\n"
+ 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
+@@ -197,8 +199,13 @@
+ 	const struct group *grp;
+ 	gid_t gid_min, gid_max;
+ 
+-	gid_min = getdef_unum ("GID_MIN", 1000);
+-	gid_max = getdef_unum ("GID_MAX", 60000);
++	if (!rflg) {
++		gid_min = getdef_unum ("GID_MIN", 500);
++                gid_max = getdef_unum ("GID_MAX", 60000);
++        } else {
++                gid_min = 1;
++                gid_max = getdef_unum ("GID_MIN", 500) - 1;
++        }
+ 
+ 	/*
+ 	 * Start with some GID value if the user didn't provide us with
+@@ -412,7 +419,7 @@
+ 		};
+ 
+ 		while ((c =
+-			getopt_long (argc, argv, "fg:hK:o", long_options,
++			getopt_long (argc, argv, "frg:hK:o", long_options,
+ 				     &option_index)) != -1) {
+ 			switch (c) {
+ 			case 'f':
+@@ -425,6 +432,12 @@
+ 				 */
+ 				fflg++;
+ 				break;
++	                case 'r':
++	                        /*
++	                         * create a system group
++	                         */
++	                        rflg++;
++	                        break;
+ 			case 'g':
+ 				gflg++;
+ 				if (!isdigit (optarg[0]))


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- shadow-utils.spec	31 May 2006 12:51:49 -0000	1.75
+++ shadow-utils.spec	12 Jun 2006 10:50:41 -0000	1.76
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.14
-Release: 8.FC5
+Release: 9.FC5
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -202,6 +202,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Mon Jun 12 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-9.FC5
+- "useradd -r" must create a system group (#194728)
+ 
 * Wed May 31 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-8.FC5
 - do not replace login.defs
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 11:38:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 07:38:53 -0400
Subject: rpms/util-linux/devel util-linux-2.12a-raw-man-dd.patch, NONE,
	1.1 util-linux-2.13-cal-wide.patch, NONE,
	1.1 util-linux-2.13-fdisk-isfull.patch, NONE,
	1.1 util-linux-2.13-fdisk-sectors.patch, NONE,
	1.1 util-linux-2.13-hexdump-gcc.patch, NONE,
	1.1 util-linux-2.13-mount-context.patch, NONE,
	1.1 util-linux-2.13-mount-man-bugs.patch, NONE,
	1.1 util-linux-2.13-mount-move.patch, NONE,
	1.1 util-linux-2.13-mount-subtree.patch, NONE,
	1.1 util-linux-2.13-mount-uuid.patch, NONE,
	1.1 util-linux.spec, 1.117,
	1.118 util-linux-2.13-fdisk-xvd.patch, 1.1, NONE
Message-ID: <200606121138.k5CBcre8030174@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30100

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.12a-raw-man-dd.patch 
	util-linux-2.13-cal-wide.patch 
	util-linux-2.13-fdisk-isfull.patch 
	util-linux-2.13-fdisk-sectors.patch 
	util-linux-2.13-hexdump-gcc.patch 
	util-linux-2.13-mount-context.patch 
	util-linux-2.13-mount-man-bugs.patch 
	util-linux-2.13-mount-move.patch 
	util-linux-2.13-mount-subtree.patch 
	util-linux-2.13-mount-uuid.patch 
Removed Files:
	util-linux-2.13-fdisk-xvd.patch 
Log Message:
sync with RHEL4, add new things from Suse

util-linux-2.12a-raw-man-dd.patch:
 raw.8 |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE util-linux-2.12a-raw-man-dd.patch ---
--- util-linux-2.12a/disk-utils/raw.8.dd	2006-04-24 15:27:39.000000000 +0200
+++ util-linux-2.12a/disk-utils/raw.8	2006-04-24 15:53:46.000000000 +0200
@@ -15,6 +15,12 @@
 .PP
 .B raw
 .B \-qa
+.SH WARNING
+Although Linux includes support for rawio, it is now a deprecated interface. If
+your application performs device access using this interface, Red Hat
+encourages you to modify your application to open the block device with the
+O_DIRECT flag. The rawio interface will exist for the life of Red Hat
+Enterprise Linux 4, but is a candidate for removal from future releases.
 .SH DESCRIPTION
 .B raw
 is used to bind a Linux raw character device to a block device.  Any
@@ -82,8 +88,10 @@
 .SH BUGS
 The Linux 
 .B dd
-(1) command does not currently align its buffers correctly, and so
-cannot be used on raw devices.
+(1) command should be used without bs= option or the blocksize needs to be a
+multiple of the sector size of the device (512 bytes usually) otherwise it
+will fail with "Invalid Argument" messages (EINVAL).
+
 .PP
 Raw I/O devices do not maintain cache coherency with the Linux block
 device buffer cache.  If you use raw I/O to overwrite data already in

util-linux-2.13-cal-wide.patch:
 include/widechar.h  |    2 +-
 misc-utils/cal.c    |   14 +++++++-------
 text-utils/column.c |    6 +++---
 text-utils/more.c   |   12 ++++++------
 text-utils/pg.c     |   14 +++++++-------
 text-utils/ul.c     |    2 +-
 6 files changed, 25 insertions(+), 25 deletions(-)

--- NEW FILE util-linux-2.13-cal-wide.patch ---
--- util-linux-2.13-pre7/include/widechar.h.kzak	2005-08-01 20:18:35.000000000 +0200
+++ util-linux-2.13-pre7/include/widechar.h	2006-03-29 19:38:56.000000000 +0200
@@ -2,7 +2,7 @@
 /* This file must be included last because the redefinition of wchar_t may
    cause conflicts when system include files were included after it. */
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 
 # include <wchar.h>
 # include <wctype.h>
--- util-linux-2.13-pre7/misc-utils/cal.c.kzak	2006-03-29 19:40:26.000000000 +0200
+++ util-linux-2.13-pre7/misc-utils/cal.c	2006-03-29 19:40:34.000000000 +0200
@@ -355,7 +355,7 @@
 	exit(0);
 }
 
-#ifndef ENABLE_WIDECHAR
+#ifndef HAVE_WIDECHAR
 static char *eos(char *s) {
 	while (s && *s)
 		s++;
@@ -366,14 +366,14 @@
 void headers_init(void)
 {
   int i, wd;
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
   wchar_t day_headings_wc[22],j_day_headings_wc[29];
   char *cur_dh = day_headings, *cur_j_dh = j_day_headings;
 #endif
 
   strcpy(day_headings,"");
   strcpy(j_day_headings,"");
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
   wcscpy(day_headings_wc,L"");
   wcscpy(j_day_headings_wc,L"");
 #endif
@@ -387,7 +387,7 @@
   for(i = 0 ; i < 7 ; i++ ) {
      ssize_t space_left;
      wd = (i + week1stday) % 7;
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
      swprintf(day_headings_wc, sizeof(day_headings_wc)/sizeof(day_headings_wc[0]),
 		L"%1.2s ", weekday(wd));
      swprintf(j_day_headings_wc, sizeof(j_day_headings_wc)/sizeof(j_day_headings_wc[0]),
@@ -718,7 +718,7 @@
 void
 center_str(const char* src, char* dest, size_t dest_size, int width)
 {
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	wchar_t str_wc[FMT_ST_CHARS];
 #endif
 	char str[FMT_ST_CHARS];
@@ -727,7 +727,7 @@
 
 	len = strlen(src);
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	if (mbstowcs(str_wc, src, FMT_ST_CHARS) > 0) {
 		wide_char_enabled = 1;
 		len = wcswidth(str_wc, SIZE(str_wc));
@@ -736,7 +736,7 @@
 	if (len > width) {
 		str_to_print=str;
 		if (wide_char_enabled) {
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 			str_wc[width]=L'\0';
 			wcstombs(str, str_wc, SIZE(str));
 #endif
--- util-linux-2.13-pre7/text-utils/column.c.kzak	2006-03-29 19:41:20.000000000 +0200
+++ util-linux-2.13-pre7/text-utils/column.c	2006-03-29 19:41:25.000000000 +0200
@@ -52,7 +52,7 @@
 
 #include "widechar.h"
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 #define wcs_width(s) wcswidth(s,wcslen(s))
 static wchar_t *mbs_to_wcs(const char *);
 #else
@@ -312,7 +312,7 @@
 	}
 }
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 static wchar_t *mbs_to_wcs(const char *s)
 {
 	size_t n;
@@ -330,7 +330,7 @@
 }
 #endif
 
-#ifndef ENABLE_WIDECHAR
+#ifndef HAVE_WIDECHAR
 static char *mtsafe_strtok(char *str, const char *delim, char **ptr)
 {
 	if (str == NULL) {
--- util-linux-2.13-pre7/text-utils/pg.c.kzak	2006-03-29 19:41:52.000000000 +0200
+++ util-linux-2.13-pre7/text-utils/pg.c	2006-03-29 19:41:59.000000000 +0200
@@ -255,7 +255,7 @@
 	usage();
 }
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 /*
  * A mbstowcs()-alike function that transparently handles invalid sequences.
  */
@@ -402,7 +402,7 @@
 	return 0;
 }
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 /*
  * Return the last character that will fit on the line at col columns
  * in case MB_CUR_MAX > 1.
@@ -489,7 +489,7 @@
 	unsigned pos = 0;
 	char *t = s;
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	if (MB_CUR_MAX > 1)
 		return endline_for_mb(col, s);
 #endif
@@ -776,7 +776,7 @@
 	cmd.count = getcount(cmd.cmdline);
 }
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 /*
  * Remove backspace formatting, for searches
  * in case MB_CUR_MAX > 1.
@@ -817,7 +817,7 @@
 {
 	char *p = s, *q;
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	if (MB_CUR_MAX > 1)
 		return colb_for_mb(s);
 #endif
@@ -836,7 +836,7 @@
 	return s;
 }
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 /*
  * Convert nonprintable characters to spaces
  * in case MB_CUR_MAX > 1.
@@ -867,7 +867,7 @@
 static void
 makeprint(char *s, size_t l)
 {
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	if (MB_CUR_MAX > 1)
 		return makeprint_for_mb(s, l);
 #endif
--- util-linux-2.13-pre7/text-utils/more.c.kzak	2006-03-29 19:41:01.000000000 +0200
+++ util-linux-2.13-pre7/text-utils/more.c	2006-03-29 19:41:08.000000000 +0200
@@ -782,7 +782,7 @@
     int	column;
     static int colflg;
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
     int i;
     wchar_t wc;
     int wc_width;
@@ -805,7 +805,7 @@
 	c = Getc (f);
     }
     while (p < &Line[LINSIZ - 1]) {
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	if (fold_opt && use_mbc_buffer_flag && MB_CUR_MAX > 1) {
 	    use_mbc_buffer_flag = 0;
 	    state_bak = state;
@@ -923,7 +923,7 @@
 	    *length = p - Line;
 	    return (column);
 	} else {
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	    if (fold_opt && MB_CUR_MAX > 1) {
 		memset (mbc, '\0', MB_LEN_MAX);
 		mbc_pos = 0;
@@ -1054,7 +1054,7 @@
 		    my_putstring(state ? ULenter : ULexit);
 	    }
 	    if (c != ' ' || pstate == 0 || state != 0 || ulglitch == 0)
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 	    {
 		wchar_t wc;
 		size_t mblength;
@@ -1070,7 +1070,7 @@
 	    }
 #else
 	        putchar(c);
-#endif /* ENABLE_WIDECHAR */
+#endif /* HAVE_WIDECHAR */
 	    if (state && *chUL) {
 		putsout(chBS);
 		my_putstring(chUL);
@@ -1867,7 +1867,7 @@
 	}
 	else if (((cc_t) c == otty.c_cc[VERASE]) && !slash) {
 	    if (sp > buf) {
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 		if (MB_CUR_MAX > 1)
 		  {
 		    wchar_t wc;
--- util-linux-2.13-pre7/text-utils/ul.c.kzak	2006-03-29 19:42:09.000000000 +0200
+++ util-linux-2.13-pre7/text-utils/ul.c	2006-03-29 19:42:25.000000000 +0200
@@ -50,7 +50,7 @@
 
 #include "widechar.h"
 
-#ifdef ENABLE_WIDECHAR
+#ifdef HAVE_WIDECHAR
 static int put1wc(int c) /* Output an ASCII character as a wide character */
 {
   if (putwchar(c) == WEOF)

util-linux-2.13-fdisk-isfull.patch:
 common.h   |    1 +
 fdisk.c    |   20 --------------------
 partname.c |   30 ++++++++++++++++++++++++++++++
 sfdisk.c   |   13 -------------
 4 files changed, 31 insertions(+), 33 deletions(-)

--- NEW FILE util-linux-2.13-fdisk-isfull.patch ---
--- util-linux-2.13-pre6/fdisk/sfdisk.c.isfull	2006-06-12 13:31:46.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/sfdisk.c	2006-06-12 13:31:47.000000000 +0200
@@ -2413,19 +2413,6 @@
 	return is_ide;
 }
 
-static int
-is_probably_full_disk(char *name) {
-	struct hd_geometry geometry;
-	int fd, i = 0;
-
-	fd = open(name, O_RDONLY);
-	if (fd >= 0) {
-		i = ioctl(fd, HDIO_GETGEO, &geometry);
-		close(fd);
-	}
-	return (fd >= 0 && i == 0 && geometry.start == 0);
-}
-
 #define PROC_PARTITIONS	"/proc/partitions"
 static FILE *procf = NULL;
 
--- util-linux-2.13-pre6/fdisk/common.h.isfull	2004-09-06 20:07:11.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/common.h	2006-06-12 13:31:47.000000000 +0200
@@ -28,5 +28,6 @@
 extern struct systypes i386_sys_types[];
 
 extern char *partname(char *dev, int pno, int lth);
+extern int is_probably_full_disk(char *name);
 
 int disksize(int fd, unsigned long long *sectors);
--- util-linux-2.13-pre6/fdisk/partname.c.isfull	2002-07-07 14:16:43.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/partname.c	2006-06-12 13:32:54.000000000 +0200
@@ -1,6 +1,9 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "common.h"
 
 /*
@@ -45,3 +48,30 @@
 partname(char *dev, int pno, int lth) {
 	return partnamebf(dev, pno, lth, 0, NULL);
 }
+
+int
+is_probably_full_disk(char *name) {
+#ifdef HDIO_GETGEO
+	struct hd_geometry geometry;
+	int fd, i = 0;
+
+	fd = open(name, O_RDONLY);
+	if (fd >= 0) {
+		i = ioctl(fd, HDIO_GETGEO, &geometry);
+		close(fd);
+	}
+	if (i==0)
+		return (fd >= 0 && geometry.start == 0);
+	/*
+	 * "silly heuristic" is still so sexy for us, because
+	 * for example Xen doesn't implement HDIO_GETGEO for virtual
+	 * block devices (/dev/xvda).
+	 * -- kzak at redhat.com (23-Feb-2006)
+	 */
+#endif
+	/* silly heuristic */
+	while (*name)
+		name++;
+	return !isdigit(name[-1]);
+}
+
--- util-linux-2.13-pre6/fdisk/fdisk.c.isfull	2006-06-12 13:31:47.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/fdisk.c	2006-06-12 13:31:47.000000000 +0200
@@ -788,26 +788,6 @@
 #endif
 }
 
-static int
-is_probably_full_disk(char *name) {
-#ifdef HDIO_GETGEO
-	struct hd_geometry geometry;
-	int fd, i = 0;
-
-	fd = open(name, O_RDONLY);
-	if (fd >= 0) {
-		i = ioctl(fd, HDIO_GETGEO, &geometry);
-		close(fd);
-	}
-	return (fd >= 0 && i == 0 && geometry.start == 0);
-#else
-	/* silly heuristic */
-	while (*name)
-		name++;
-	return !isdigit(name[-1]);
-#endif
-}
-
 static void
 get_partition_table_geometry(void) {
 	unsigned char *bufp = MBRbuffer;

util-linux-2.13-fdisk-sectors.patch:
 fdisk.c         |   72 ++++++++++++++++++++++++++++----------------------------
 fdisk.h         |    4 +--
 fdiskaixlabel.h |    5 ++-
 fdisksgilabel.h |    5 ++-
 fdisksunlabel.c |    6 ++--
 fdisksunlabel.h |    5 ++-
 6 files changed, 50 insertions(+), 47 deletions(-)

--- NEW FILE util-linux-2.13-fdisk-sectors.patch ---
--- util-linux-2.13-pre6/fdisk/fdisk.h.sectors	2006-06-12 10:50:11.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/fdisk.h	2006-06-12 10:50:52.000000000 +0200
@@ -81,8 +81,8 @@
 #define SINGULAR 1
 extern char *const str_units(int);
 
-extern unsigned int get_start_sect(struct partition *p);
-extern unsigned int get_nr_sects(struct partition *p);
+extern unsigned long long get_start_sect(struct partition *p);
+extern unsigned long long get_nr_sects(struct partition *p);
 
 extern int osf_label;
 
--- util-linux-2.13-pre6/fdisk/fdisksgilabel.h.sectors	2004-12-14 00:39:29.000000000 +0100
+++ util-linux-2.13-pre6/fdisk/fdisksgilabel.h	2006-06-12 10:50:52.000000000 +0200
@@ -103,8 +103,9 @@
 /* fdisk.c */
 #define sgilabel ((sgi_partition *)MBRbuffer)
 #define sgiparam (sgilabel->devparam)
-extern char MBRbuffer[MAX_SECTOR_SIZE];
-extern unsigned int heads, sectors, cylinders, sector_size;
+extern unsigned char MBRbuffer[MAX_SECTOR_SIZE];
+extern unsigned int heads, cylinders, sector_size;
+extern unsigned long long sectors;
 extern int show_begin;
 extern int sgi_label;
 extern char *partition_type(unsigned char type);
--- util-linux-2.13-pre6/fdisk/fdisksunlabel.h.sectors	2004-12-14 00:39:18.000000000 +0100
+++ util-linux-2.13-pre6/fdisk/fdisksunlabel.h	2006-06-12 10:50:52.000000000 +0200
@@ -37,8 +37,9 @@
 				 : (__u32)(x))
 				 
 /* fdisk.c */
-extern char MBRbuffer[MAX_SECTOR_SIZE];
-extern unsigned int heads, sectors, cylinders;
+extern unsigned char MBRbuffer[MAX_SECTOR_SIZE];
+extern unsigned int heads, cylinders;
+extern unsigned long long sectors;
 extern int show_begin;
 extern int sun_label;
 extern char *partition_type(unsigned char type);
--- util-linux-2.13-pre6/fdisk/fdiskaixlabel.h.sectors	2004-12-14 00:39:47.000000000 +0100
+++ util-linux-2.13-pre6/fdisk/fdiskaixlabel.h	2006-06-12 10:50:52.000000000 +0200
@@ -19,9 +19,10 @@
 
 /* fdisk.c */
 #define aixlabel ((aix_partition *)MBRbuffer)
-extern char MBRbuffer[MAX_SECTOR_SIZE];
+extern unsigned char MBRbuffer[MAX_SECTOR_SIZE];
 extern char changed[MAXIMUM_PARTS];
-extern unsigned int heads, sectors, cylinders;
+extern unsigned int heads, cylinders;
+extern unsigned long long sectors;
 extern int show_begin;
 extern int aix_label;
 extern char *partition_type(unsigned char type);
--- util-linux-2.13-pre6/fdisk/fdisksunlabel.c.sectors	2005-07-31 18:00:29.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/fdisksunlabel.c	2006-06-12 10:50:52.000000000 +0200
@@ -348,7 +348,7 @@
 	}
 
 	snprintf(sunlabel->info, sizeof(sunlabel->info),
-		 "%s%s%s cyl %d alt %d hd %d sec %d", 
+		 "%s%s%s cyl %d alt %d hd %d sec %llu", 
 		 p ? p->vendor : "", (p && *p->vendor) ? " " : "",
 		 p ? p->model
 		   : (floppy ? _("3,5\" floppy") : _("Linux custom")),
@@ -655,7 +655,7 @@
 	w = strlen(disk_device);
 	if (xtra)
 		printf(
-		_("\nDisk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
+		_("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
 		"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
 		"%d extra sects/cyl, interleave %d:1\n"
 		"%s\n"
@@ -669,7 +669,7 @@
 		       str_units(PLURAL), units_per_sector);
 	else
 		printf(
-	_("\nDisk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
+	_("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
 	"Units = %s of %d * 512 bytes\n\n"),
 		       disk_device, heads, sectors, cylinders,
 		       str_units(PLURAL), units_per_sector);
--- util-linux-2.13-pre6/fdisk/fdisk.c.sectors	2006-06-12 10:50:11.000000000 +0200
+++ util-linux-2.13-pre6/fdisk/fdisk.c	2006-06-12 10:51:53.000000000 +0200
@@ -64,7 +64,7 @@
 
 /* A valid partition table sector ends in 0x55 0xaa */
 static unsigned int
-part_table_flag(char *b) {
+part_table_flag(unsigned char *b) {
 	return ((unsigned int) b[510]) + (((unsigned int) b[511]) << 8);
 }
 
@@ -74,7 +74,7 @@
 }
 
 static void
-write_part_table_flag(char *b) {
+write_part_table_flag(unsigned char *b) {
 	b[510] = 0x55;
 	b[511] = 0xaa;
 }
@@ -101,17 +101,17 @@
 	store4_little_endian(p->start4, start_sect);
 }
 
-unsigned int
+unsigned long long
 get_start_sect(struct partition *p) {
 	return read4_little_endian(p->start4);
 }
 
 static void
-set_nr_sects(struct partition *p, unsigned int nr_sects) {
+set_nr_sects(struct partition *p, unsigned long long nr_sects) {
 	store4_little_endian(p->size4, nr_sects);
 }
 
-unsigned int
+unsigned long long
 get_nr_sects(struct partition *p) {
 	return read4_little_endian(p->size4);
 }
@@ -123,7 +123,7 @@
  * Raw disk label. For DOS-type partition tables the MBR,
  * with descriptions of the primary partitions.
  */
-char MBRbuffer[MAX_SECTOR_SIZE];
+unsigned char MBRbuffer[MAX_SECTOR_SIZE];
 
 /*
  * per partition table entry data
@@ -137,8 +137,8 @@
 	struct partition *part_table;	/* points into sectorbuffer */
 	struct partition *ext_pointer;	/* points into sectorbuffer */
 	char changed;			/* boolean */
-	unsigned int offset;		/* disk sector number */
-	char *sectorbuffer;		/* disk sector contents */
+	unsigned long long offset;	/* disk sector number */
+	unsigned char *sectorbuffer;	/* disk sector contents */
 } ptes[MAXIMUM_PARTS];
 
 char	*disk_device,			/* must be specified */
@@ -157,15 +157,14 @@
 unsigned int	pt_heads, pt_sectors;
 unsigned int	kern_heads, kern_sectors;
 
+unsigned long long sector_offset = 1, extended_offset = 0, sectors;
+
 unsigned int	heads,
-	sectors,
 	cylinders,
 	sector_size = DEFAULT_SECTOR_SIZE,
 	user_set_sector_size = 0,
-	sector_offset = 1,
 	units_per_sector = 1,
-	display_in_cyl_units = 1,
-	extended_offset = 0;		/* offset of link pointers */
+	display_in_cyl_units = 1;
 
 unsigned long long total_number_of_sectors;
 
@@ -242,21 +241,21 @@
 }
 
 static void
-seek_sector(int fd, unsigned int secno) {
+seek_sector(int fd, unsigned long long secno) {
 	off_t offset = (off_t) secno * sector_size;
 	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
 		fatal(unable_to_seek);
 }
 
 static void
-read_sector(int fd, unsigned int secno, char *buf) {
+read_sector(int fd, unsigned long long secno, char *buf) {
 	seek_sector(fd, secno);
 	if (read(fd, buf, sector_size) != sector_size)
 		fatal(unable_to_read);
 }
 
 static void
-write_sector(int fd, unsigned int secno, char *buf) {
+write_sector(int fd, unsigned long long secno, char *buf) {
 	seek_sector(fd, secno);
 	if (write(fd, buf, sector_size) != sector_size)
 		fatal(unable_to_write);
@@ -264,11 +263,11 @@
 
 /* Allocate a buffer and read a partition table sector */
 static void
-read_pte(int fd, int pno, unsigned int offset) {
+read_pte(int fd, int pno, unsigned long long offset) {
 	struct pte *pe = &ptes[pno];
 
 	pe->offset = offset;
-	pe->sectorbuffer = (char *) malloc(sector_size);
+	pe->sectorbuffer = malloc(sector_size);
 	if (!pe->sectorbuffer)
 		fatal(out_of_memory);
 	read_sector(fd, offset, pe->sectorbuffer);
@@ -276,7 +275,7 @@
 	pe->part_table = pe->ext_pointer = NULL;
 }
 
-static unsigned int
+static unsigned long long
 get_partition_start(struct pte *pe) {
 	return pe->offset + get_start_sect(pe->part_table);
 }
@@ -542,10 +541,10 @@
 }
 
 static void
-set_partition(int i, int doext, unsigned int start, unsigned int stop,
-	      int sysid) {
+set_partition(int i, int doext, unsigned long long start,
+	      unsigned long long stop, int sysid) {
 	struct partition *p;
-	unsigned int offset;
+	unsigned long long offset;
 
 	if (doext) {
 		p = ptes[i].ext_pointer;
@@ -1544,7 +1543,7 @@
 	else
 		printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"),
 		       disk_device, megabytes/1000, (megabytes/100)%10, bytes);
-	printf(_("%d heads, %d sectors/track, %d cylinders"),
+	printf(_("%d heads, %Ld sectors/track, %d cylinders"),
 	       heads, sectors, cylinders);
 	if (units_per_sector == 1)
 		printf(_(", total %llu sectors"),
@@ -1776,20 +1775,21 @@
 	struct partition *p;
 	int i;
 
-	printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"),
+	printf(_("\nDisk %s: %d heads, %Ld sectors, %d cylinders\n\n"),
 		disk_device, heads, sectors, cylinders);
         printf(_("Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"));
 	for (i = 0 ; i < partitions; i++) {
 		pe = &ptes[i];
 		p = (extend ? pe->ext_pointer : pe->part_table);
 		if (p != NULL) {
-                        printf("%2d %02x%4d%4d%5d%4d%4d%5d%11u%11u %02x\n",
+                        printf("%2d %02x%4d%4d%5d%4d%4d%5d%11lu%11lu %02x\n",
 				i + 1, p->boot_ind, p->head,
 				sector(p->sector),
 				cylinder(p->sector, p->cyl), p->end_head,
 				sector(p->end_sector),
 				cylinder(p->end_sector, p->end_cyl),
-				get_start_sect(p), get_nr_sects(p), p->sys_ind);
+				(unsigned long) get_start_sect(p),
+				(unsigned long) get_nr_sects(p), p->sys_ind);
 			if (p->sys_ind)
 				check_consistency(p, i);
 		}
@@ -1797,7 +1797,7 @@
 }
 
 static void
-fill_bounds(unsigned int *first, unsigned int *last) {
+fill_bounds(unsigned long long *first, unsigned long long *last) {
 	int i;
 	struct pte *pe = &ptes[0];
 	struct partition *p;
@@ -1830,7 +1830,7 @@
 			n, h + 1, heads);
 	if (real_s >= sectors)
 		fprintf(stderr, _("Partition %d: sector %d greater than "
-			"maximum %d\n"), n, s, sectors);
+			"maximum %Ld\n"), n, s, sectors);
 	if (real_c >= cylinders)
 		fprintf(stderr, _("Partitions %d: cylinder %d greater than "
 			"maximum %d\n"), n, real_c + 1, cylinders);
@@ -1843,8 +1843,8 @@
 static void
 verify(void) {
 	int i, j;
-	unsigned int total = 1;
-	unsigned int first[partitions], last[partitions];
+	unsigned long total = 1;
+	unsigned long long first[partitions], last[partitions];
 	struct partition *p;
 
 	if (warn_geometry())
@@ -1888,7 +1888,7 @@
 
 	if (extended_offset) {
 		struct pte *pex = &ptes[ext_index];
-		unsigned int e_last = get_start_sect(pex->part_table) +
+		unsigned long long e_last = get_start_sect(pex->part_table) +
 			get_nr_sects(pex->part_table) - 1;
 
 		for (i = 4; i < partitions; i++) {
@@ -1907,8 +1907,8 @@
 	}
 
 	if (total > total_number_of_sectors)
-		printf(_("Total allocated sectors %d greater than the maximum "
-			"%lld\n"), total, total_number_of_sectors);
+		printf(_("Total allocated sectors %ld greater than the maximum"
+			" %lld\n"), total, total_number_of_sectors);
 	else if (total < total_number_of_sectors)
 		printf(_("%lld unallocated sectors\n"),
 		       total_number_of_sectors - total);
@@ -1921,7 +1921,7 @@
 	struct partition *p = ptes[n].part_table;
 	struct partition *q = ptes[ext_index].part_table;
 	long long llimit;
-	unsigned int start, stop = 0, limit, temp,
+	unsigned long long start, stop = 0, limit, temp,
 		first[partitions], last[partitions];
 
 	if (p && p->sys_ind) {
@@ -1967,7 +1967,7 @@
 		if (start > limit)
 			break;
 		if (start >= temp+units_per_sector && read) {
-			printf(_("Sector %d is already allocated\n"), temp);
+			printf(_("Sector %llu is already allocated\n"), temp);
 			temp = start;
 			read = 0;
 		}
@@ -2225,14 +2225,14 @@
 
 #define MAX_PER_LINE	16
 static void
-print_buffer(char pbuffer[]) {
+print_buffer(unsigned char pbuffer[]) {
 	int	i,
 		l;
 
 	for (i = 0, l = 0; i < sector_size; i++, l++) {
 		if (l == 0)
 			printf("0x%03X:", i);
-		printf(" %02X", (unsigned char) pbuffer[i]);
+		printf(" %02X", pbuffer[i]);
 		if (l == MAX_PER_LINE - 1) {
 			printf("\n");
 			l = -1;

util-linux-2.13-hexdump-gcc.patch:
 display.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE util-linux-2.13-hexdump-gcc.patch ---

 gcc 4.1.0: "warning: memset used with constant zero length parameter; this
 could be due to transposed parameters". So, fix it!
 -- 03/30/2006 Karel Zak <kzak at redhat.com> 

--- util-linux-2.13-pre7/text-utils/display.c.gcc	2006-03-31 10:44:50.000000000 +0200
+++ util-linux-2.13-pre7/text-utils/display.c	2006-03-31 10:45:22.000000000 +0200
@@ -255,7 +255,8 @@
 					(void)printf("*\n");
 				return(NULL);
 			}
-			memset((char *)curp + nread, 0, need);
+			if (need > 0)
+				memset((char *)curp + nread, 0, need);
 			eaddress = address + nread;
 			return(curp);
 		}

util-linux-2.13-mount-context.patch:
 mount.8 |   44 +++++++++++++++++++++++++++++++++++++++++++
 mount.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 107 insertions(+), 2 deletions(-)

--- NEW FILE util-linux-2.13-mount-context.patch ---

 This patch adds to the mount man page docs about context, fscontext and
defcontext mount options and translate context options from human to raw
selinux context format.  -- 03/30/2006 Karel Zak <kzak at redhat.com> 

--- util-linux-2.13-pre7/mount/mount.8.cxt	2006-03-30 17:15:06.000000000 +0200
+++ util-linux-2.13-pre7/mount/mount.8	2006-03-30 17:15:06.000000000 +0200
@@ -661,6 +661,50 @@
 .BR noexec ", " nosuid ", and " nodev
 (unless overridden by subsequent options, as in the option line
 .BR users,exec,dev,suid ).
+.TP
+\fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP and \fBdefcontext=\fP\fIcontext\fP
+The 
+.BR context= 
+option is useful when mounting filesystems that do not support
+extended attributes, such as a floppy or hard disk formatted with VFAT, or
+systems that are not normally running under SELinux, such as an ext3 formatted
+disk from a non-SELinux workstation. You can also use
+.BR context= 
+on filesystems you do not trust, such as a floppy. It also helps in compatibility with
+xattr-supporting filesystems on earlier 2.4.<x> kernel versions. Even where
+xattrs are supported, you can save time not having to label every file by
+assigning the entire disk one security context.
+
+A commonly used option for removable media is 
+.BR context=system_u:object_r:removable_t .
+
+Two other options are 
+.BR fscontext= 
+and 
+.BR defcontext= ,
+both of which are mutually exclusive of the context option. This means you
+can use fscontext and defcontext with each other, but neither can be used with
+context.
+
+The 
+.BR fscontext= 
+option works for all filesystems, regardless of their xattr
+support. The fscontext option sets the overarching filesystem label to a
+specific security context. This filesystem label is separate from the
+individual labels on the files. It represents the entire filesystem for
+certain kinds of permission checks, such as during mount or file creation.
+Individual file labels are still obtained from the xattrs on the files
+themselves. The context option actually sets the aggregate context that
+fscontext provides, in addition to supplying the same label for individual
+files.
+
+You can set the default security context for unlabeled files using 
+.BR defcontext=
+option. This overrides the value set for unlabeled files in the policy and requires a
+file system that supports xattr labeling. 
+
+For more details see 
+.BR selinux (8)
 .RE
 .TP
 .B \-\-bind
--- util-linux-2.13-pre7/mount/mount.c.cxt	2006-03-30 17:15:06.000000000 +0200
+++ util-linux-2.13-pre7/mount/mount.c	2006-03-30 20:16:57.000000000 +0200
@@ -21,6 +21,11 @@
 #include <sys/wait.h>
 #include <sys/mount.h>
 
+#ifdef HAVE_LIBSELINUX
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#endif
+
 #include "mount_blkid.h"
 #include "mount_constants.h"
 #include "sundries.h"
@@ -255,6 +260,49 @@
 		free((void *) s);
 }
 
+#ifdef HAVE_LIBSELINUX
+/* translates SELinux context from human to raw format and 
+ * appends it to the mount extra options.
+ *
+ * returns -1 on error and 0 on success 
+ */
+static int
+append_context(const char *optname, const char *optdata, char *extra_opts, int *len)
+{
+	security_context_t raw = NULL;
+	char *buf = NULL;
+	int bufsz;
+	
+	if (!is_selinux_enabled())
+		/* ignore the option if we running without selinux */
+		return 0;
+
+	if (optdata==NULL || *optdata=='\0' || optname==NULL)
+		return -1;
+	
+	if (selinux_trans_to_raw_context(
+			(security_context_t) optdata, &raw)==-1 ||
+			raw==NULL)
+		return -1;
+	
+	if (verbose)
+		printf(_("mount: translated %s '%s' to '%s'\n"), 
+				optname, optdata, (char *) raw);
+
+	bufsz = strlen(optname) + strlen(raw) + 2;	/* 2 is \0 and '=' */ 
+	buf = xmalloc(bufsz);
+
+	snprintf(buf, bufsz, "%s=%s", optname, (char *) raw);
+	freecon(raw);
+	
+	if ((*len -= bufsz-1) > 0)
+		strcat(extra_opts, buf);
+	
+	my_free(buf);
+	return 0;
+}
+#endif
+
 /*
  * Look for OPT in opt_map table and return mask value.
  * If OPT isn't found, tack it onto extra_opts (which is non-NULL).
@@ -313,7 +361,20 @@
 			return;
 		}
 	}
-
+#ifdef HAVE_LIBSELINUX
+	if (strncmp(opt, "context=", 8)==0 && *(opt+8)) {
+		if (append_context("context", opt+8, extra_opts, &len)==0)
+			return;
+	}
+	if (strncmp(opt, "fscontext=", 10)==0 && *(opt+10)) {
+		if (append_context("fscontext", opt+10, extra_opts, &len)==0)
+			return;
+	}
+	if (strncmp(opt, "defcontext=", 11)==0 && *(opt+11)) {
+		if (append_context("defcontext", opt+11, extra_opts, &len)==0)
+			return;
+	}
+#endif
 	if ((len -= strlen(opt)) > 0)
 		strcat(extra_opts, opt);
 }
@@ -330,7 +391,7 @@
 	if (options != NULL) {
 		char *opts = xstrdup(options);
 		char *opt;
-		int len = strlen(opts) + 20;
+		int len = strlen(opts) + 256;
 
 		*extra_opts = xmalloc(len); 
 		**extra_opts = '\0';

util-linux-2.13-mount-man-bugs.patch:
 mount.8 |   17 +++++++++++++++++
 nfs.5   |    7 +++++++
 2 files changed, 24 insertions(+)

--- NEW FILE util-linux-2.13-mount-man-bugs.patch ---
--- util-linux-2.13-pre7/mount/nfs.5.bugs	2006-03-30 21:37:53.000000000 +0200
+++ util-linux-2.13-pre7/mount/nfs.5	2006-03-30 21:38:13.000000000 +0200
@@ -443,3 +443,10 @@
 .P
 The umount command should notify the server
 when an NFS filesystem is unmounted.
+.P
+Checking files on NFS filesystem referenced by file descriptors (i.e. the 
+.BR fcntl 
+and 
+.BR ioctl
+families of functions) may lead to inconsistent result due to the lack of
+consistency check in kernel even if noac is used.
--- util-linux-2.13-pre7/mount/mount.8.bugs	2006-03-30 21:36:56.000000000 +0200
+++ util-linux-2.13-pre7/mount/mount.8	2006-03-30 21:37:35.000000000 +0200
@@ -2047,6 +2047,23 @@
 .IR /proc/partitions .
 In particular, it may well fail if the kernel was compiled with devfs
 but devfs is not mounted.
+.PP
+It is possible that files 
+.IR /etc/mtab
+and 
+.IR /proc/mounts
+don't match. The first file is based only on the mount command options, but the
+content of the second file also depends on the kernel and others settings (e.g.
+remote NFS server. In particular case the mount command may reports unreliable
+information about a NFS mount point and the /proc/mounts file usually contains
+more reliable information.)
+.PP
+Checking files on NFS filesystem referenced by file descriptors (i.e. the 
+.BR fcntl 
+and 
+.BR ioctl
+families of functions) may lead to inconsistent result due to the lack of
+consistency check in kernel even if noac is used.
 .SH HISTORY
 A
 .B mount

util-linux-2.13-mount-move.patch:
 mount.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+)

--- NEW FILE util-linux-2.13-mount-move.patch ---
--- util-linux-2.13-pre6/mount/mount.c.move	2006-06-12 09:19:43.000000000 +0200
+++ util-linux-2.13-pre6/mount/mount.c	2006-06-12 09:45:05.000000000 +0200
@@ -768,6 +768,25 @@
 		else {
 			mntFILE *mfp;
 
+			/* when moving a mount point, we have to make sure the mtab
+			 * gets updated properly.  We get info about the old mount
+			 * point, copy it to the new mount point, and then delete
+			 * the old mount point. */
+			if (flags & MS_MOVE) {
+				const char *olddir = mnt.mnt_fsname;
+				struct mntentchn *oldmc = oldmc = getmntfile(olddir);
+				if (oldmc != NULL) {
+					mnt.mnt_fsname = strdup(oldmc->m.mnt_fsname);
+					mnt.mnt_type = oldmc->m.mnt_type;
+					mnt.mnt_opts = oldmc->m.mnt_opts;
+					mnt.mnt_freq = oldmc->m.mnt_freq;
+					mnt.mnt_passno = oldmc->m.mnt_passno;
+				}
+				update_mtab(olddir, NULL);
+				if (oldmc != NULL)
+					my_free(olddir);
+			}
+
 			lock_mtab();
 			mfp = my_setmntent(MOUNTED, "a+");
 			if (mfp == NULL || mfp->mntent_fp == NULL) {

util-linux-2.13-mount-subtree.patch:
 mount.8           |   35 +++++++++++++++++++++++++++++
 mount.c           |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 mount_constants.h |   12 +++++++++
 3 files changed, 110 insertions(+), 2 deletions(-)

--- NEW FILE util-linux-2.13-mount-subtree.patch ---
--- util-linux-2.13-pre6/mount/mount.8.subtree	2006-06-12 09:18:26.000000000 +0200
+++ util-linux-2.13-pre6/mount/mount.8	2006-06-12 09:19:43.000000000 +0200
@@ -131,6 +131,41 @@
 .B "mount --move olddir newdir"
 .RE
 
+Since Linux 2.6.15 it is possible to mark a mount and its submounts as shared,
+private, slave or unbindable. A shared mount provides ability to create mirrors
+of that mount such that mounts and umounts within any of the mirrors propagate
+to the other mirror. A slave mount receives propagation from its master, but
+any not vice-versa.  A private mount carries no propagation abilities.  A
+unbindable mount is a private mount which cannot cloned through a bind
+operation. Detailed semantics is documented in Documentation/sharedsubtree.txt
+file in the kernel source tree.
+.RS
+.br
+.B "mount --make-shared mountpoint"
+.br
+.B "mount --make-slave mountpoint"
+.br
+.B "mount --make-private mountpoint"
+.br
+.B "mount --make-unbindable mountpoint"
+.br
+.RE
+
+The following commands allows one to recursively change the type of all the
+mounts under a given mountpoint.
+.RS
+.br
+.B "mount --make-rshared mountpoint"
+.br
+.B "mount --make-rslave mountpoint"
+.br
+.B "mount --make-rprivate mountpoint"
+.br
+.B
+"mount --make-runbindable mountpoint"
+.br
+.RE
+
 The
 .I proc
 file system is not associated with a special device, and when
--- util-linux-2.13-pre6/mount/mount_constants.h.subtree	2002-11-01 01:24:36.000000000 +0100
+++ util-linux-2.13-pre6/mount/mount_constants.h	2006-06-12 09:19:43.000000000 +0200
@@ -57,6 +57,18 @@
 #ifndef MS_VERBOSE
 #define MS_VERBOSE	0x8000	/* 32768 */
 #endif
+#ifndef MS_UNBINDABLE
+#define MS_UNBINDABLE	(1<<17)	/* 131072 unbindable*/
+#endif
+#ifndef MS_PRIVATE
+#define MS_PRIVATE	(1<<18)	/* 262144 Private*/
+#endif
+#ifndef MS_SLAVE
+#define MS_SLAVE	(1<<19)	/* 524288 Slave*/
+#endif
+#ifndef MS_SHARED
+#define MS_SHARED	(1<<20)	/* 1048576 Shared*/
+#endif
 /*
  * Magic mount flag number. Had to be or-ed to the flag values.
  */
--- util-linux-2.13-pre6/mount/mount.c.subtree	2006-06-12 09:18:26.000000000 +0200
+++ util-linux-2.13-pre6/mount/mount.c	2006-06-12 09:19:43.000000000 +0200
@@ -74,7 +74,9 @@
 /* Add volumelabel in a listing of mounted devices (-l). */
 static int list_with_volumelabel = 0;
 
-/* Nonzero for mount {--bind|--replace|--before|--after|--over|--move} */
+/* Nonzero for mount {--bind|--replace|--before|--after|--over|--move|
+ * 		       make-shared|make-private|make-unbindable|make-slave}
+ */
 static int mounttype = 0;
 
 /* True if ruid != euid.  */
@@ -109,6 +111,8 @@
 /* Options that we keep from appearing in the options field in the mtab.  */
 #define MS_NOMTAB	(MS_REMOUNT|MS_NOAUTO|MS_USERS|MS_USER|MS_PAMCONSOLE)
 
+#define MS_PROPAGATION  (MS_SHARED|MS_SLAVE|MS_UNBINDABLE|MS_PRIVATE)
+
 /* Options that we make ordinary users have by default.  */
 #define MS_SECURE	(MS_NOEXEC|MS_NOSUID|MS_NODEV)
 
@@ -346,6 +350,9 @@
 		*flags |= MS_RDONLY;
 	if (readwrite)
 		*flags &= ~MS_RDONLY;
+
+	if (mounttype & MS_PROPAGATION)
+		*flags &= ~MS_BIND;
 	*flags |= mounttype;
 }
 
@@ -916,13 +923,15 @@
       if (loop)
 	  opt_loopdev = loopdev;
 
-      update_mtab_entry(loop ? loopfile : spec,
+      if (!(mounttype & MS_PROPAGATION)) {
+	      update_mtab_entry(loop ? loopfile : spec,
 			node,
 			types ? types : "unknown",
 			fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user),
 			flags,
 			freq,
 			pass);
+      }
 
       block_signals (SIG_UNBLOCK);
       res = 0;
@@ -1461,6 +1470,14 @@
 	{ "move", 0, 0, 133 },
 	{ "guess-fstype", 1, 0, 134 },
 	{ "rbind", 0, 0, 135 },
+	{ "make-shared", 0, 0, 136 },
+	{ "make-slave", 0, 0, 137 },
+	{ "make-private", 0, 0, 138 },
+	{ "make-unbindable", 0, 0, 139 },
+	{ "make-rshared", 0, 0, 140 },
+	{ "make-rslave", 0, 0, 141 },
+	{ "make-rprivate", 0, 0, 142 },
+	{ "make-runbindable", 0, 0, 143 },
 	{ "internal-only", 0, 0, 'i' },
 	{ NULL, 0, 0, 0 }
 };
@@ -1487,6 +1504,17 @@
 	  "       mount --bind olddir newdir\n"
 	  "or move a subtree:\n"
 	  "       mount --move olddir newdir\n"
+	  "One can change the type of mount containing the directory dir:\n"
+	  "       mount --make-shared dir\n"
+	  "       mount --make-slave dir\n"
+	  "       mount --make-private dir\n"
+	  "       mount --make-unbindable dir\n"
+	  "One can change the type of all the mounts in a mount subtree\n"
+	  "containing the directory dir:\n"
+	  "       mount --make-rshared dir\n"
+	  "       mount --make-rslave dir\n"
+	  "       mount --make-rprivate dir\n"
+	  "       mount --make-runbindable dir\n"
 	  "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 	  "or by label, using  -L label  or by uuid, using  -U uuid .\n"
 	  "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
@@ -1638,6 +1666,39 @@
 		case 135:
 			mounttype = (MS_BIND | MS_REC);
 			break;
+
+		case 136:
+			mounttype = MS_SHARED;
+			break;
+
+		case 137:
+			mounttype = MS_SLAVE;
+			break;
+
+		case 138:
+			mounttype = MS_PRIVATE;
+			break;
+
+		case 139:
+			mounttype = MS_UNBINDABLE;
+			break;
+
+		case 140:
+			mounttype = (MS_SHARED | MS_REC);
+			break;
+
+		case 141:
+			mounttype = (MS_SLAVE | MS_REC);
+			break;
+
+		case 142:
+			mounttype = (MS_PRIVATE | MS_REC);
+			break;
+
+		case 143:
+			mounttype = (MS_UNBINDABLE | MS_REC);
+			break;
+
 		case '?':
 		default:
 			usage (stderr, EX_USAGE);

util-linux-2.13-mount-uuid.patch:
 fstab.c       |   16 ++++++----------
 mount_blkid.c |    5 +++++
 mount_blkid.h |    1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE util-linux-2.13-mount-uuid.patch ---

 The UUID code in the mount command is broken -- en example UUID= in the fstab
 file is reason for SIGSEG when non-root user tries umount any device.
 -- 03/30/2006 Karel Zak <kzak at redhat.com> 

--- util-linux-2.13-pre6/mount/mount_blkid.h.uuid	2006-03-29 15:34:24.000000000 +0200
+++ util-linux-2.13-pre6/mount/mount_blkid.h	2006-03-29 15:34:57.000000000 +0200
@@ -8,5 +8,6 @@
 extern const char *mount_get_devname_by_uuid(const char *uuid);
 extern const char *mount_get_devname_by_label(const char *label);
 extern const char *mount_get_volume_label_by_spec(const char *spec);
+extern const char *mount_get_volume_uuid_by_spec(const char *spec);
 extern const char *mount_get_devname(const char *spec);
 extern const char *mount_get_devname_for_mounting(const char *spec);
--- util-linux-2.13-pre6/mount/mount_blkid.c.uuid	2006-03-29 15:33:44.000000000 +0200
+++ util-linux-2.13-pre6/mount/mount_blkid.c	2006-03-29 15:34:14.000000000 +0200
@@ -21,6 +21,11 @@
 }
 
 const char *
+mount_get_volume_uuid_by_spec(const char *spec) {
+	return blkid_get_tag_value(blkid, "UUID", spec);
+}
+
+const char *
 mount_get_devname(const char *spec) {
 	return blkid_get_devname(blkid, spec, 0);
 }
--- util-linux-2.13-pre6/mount/fstab.c.uuid	2006-03-29 15:29:28.000000000 +0200
+++ util-linux-2.13-pre6/mount/fstab.c	2006-03-29 15:36:30.000000000 +0200
@@ -301,23 +301,19 @@
 static int
 has_label(const char *device, const char *label) {
 	const char *devlabel;
-	int ret;
 
-	devlabel = mount_get_volume_label_by_spec(device);
-	ret = !strcmp(label, devlabel);
-	/* free(devlabel); */
-	return ret;
+	if (!(devlabel = mount_get_volume_label_by_spec(device)))
+		return 0;
+	return !strcmp(label, devlabel);
 }
 
 static int
 has_uuid(const char *device, const char *uuid){
 	const char *devuuid;
-	int ret;
 
-	devuuid = mount_get_devname_by_uuid(device);
-	ret = !strcmp(uuid, devuuid);
-	/* free(devuuid); */
-	return ret;
+	if (!(devuuid = mount_get_volume_uuid_by_spec(device)))
+		return 0;
+	return !strcmp(uuid, devuuid);
 }
 
 /* Find the entry (SPEC,FILE) in fstab */


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- util-linux.spec	25 May 2006 19:39:35 -0000	1.117
+++ util-linux.spec	12 Jun 2006 11:38:50 -0000	1.118
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.24
+Release: 0.25
 License: distributable
 Group: System Environment/Base
 
@@ -177,8 +177,6 @@
 Patch226: util-linux-2.13-login-pam-acct.patch
 # 177523 - umount -a should not unmount sysfs
 Patch227: util-linux-2.13-umount-sysfs.patch
-# 182553 - fdisk -l inside xen guest shows no disks
-Patch228: util-linux-2.13-fdisk-xvd.patch
 # 169042 - Changed nfsmount to try udp before using tcp when rpc-ing
 #          the remote rpc.mountd (iff -o tcp is not specified).
 Patch229: util-linux-2.13-nfsmount-mountd-udp.patch
@@ -188,7 +186,29 @@
 Patch231: util-linux-2.13-nfsmount-retry.patch
 # Adds syslog logging to background mounts
 Patch232: util-linux-2.13-nfsmount-syslog.patch
-
+# 187014 - umount segfaults for normal user
+Patch233: util-linux-2.13-mount-uuid.patch
+# 183446 - cal not UTF-8-aware
+Patch234: util-linux-2.13-cal-wide.patch
+# 186915 - mount does not translate SELIinux context options though libselinux
+# 185500 - Need man page entry for -o context= mount option
+Patch235: util-linux-2.13-mount-context.patch
+# 152579 - missing info about /etc/mtab and /proc/mounts mismatch
+# 183890 - missing info about possible ioctl() and fcntl() problems on NFS filesystem
+Patch236: util-linux-2.13-mount-man-bugs.patch
+# Keep gcc happy
+Patch237: util-linux-2.13-hexdump-gcc.patch
+# 191230 - using mount --move results in wrong data in /etc/mtab
+Patch238: util-linux-2.13-mount-move.patch
+# Subtrees support
+Patch239: util-linux-2.13-mount-subtree.patch
+# wrong number of sectors for large disks (suse#160822)
+Patch240: util-linux-2.13-fdisk-sectors.patch
+# 182553 - fdisk -l inside xen guest shows no disks
+# 188981 - "sfdisk -l" tries to open partitions
+Patch241: util-linux-2.13-fdisk-isfull.patch
+# 181549 - raw(8) manpage has old information about dd
+Patch242: util-linux-2.12a-raw-man-dd.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -268,11 +288,21 @@
 %patch225 -p1
 %patch226 -p1
 %patch227 -p1
-%patch228 -p1
 %patch229 -p1
 %patch230 -p1
 %patch231 -p1
 %patch232 -p1
+%patch233 -p1
+%patch234 -p1
+%patch235 -p1
+%patch236 -p1
+%patch237 -p1
+%patch238 -p1
+%patch239 -p1
+%patch240 -p1
+%patch241 -p1 -b .isfull
+%patch242 -p1
+
 
 %build
 unset LINGUAS || :
@@ -658,6 +688,19 @@
 /sbin/losetup
 
 %changelog
+* Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 2.13-0.25
+- fix #187014 - umount segfaults for normal user
+- fix #183446 - cal not UTF-8-aware
+- fix #186915 - mount does not translate SELIinux context options though libselinux
+- fix #185500 - Need man page entry for -o context= mount option
+- fix #152579 - missing info about /etc/mtab and /proc/mounts mismatch
+- fix #183890 - missing info about possible ioctl() and fcntl() problems on NFS filesystem
+- fix #191230 - using mount --move results in wrong data in /etc/mtab
+- added mount subtrees support
+- fdisk: wrong number of sectors for large disks (suse#160822)
+- merge fdisk-xvd (#182553) with new fdisk-isfull (#188981) patch 
+- fix #181549 - raw(8) manpage has old information about dd
+
 * Wed May 24 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.24
 - Remove requirement on restorecon, since we can do the same thing
 - with chcon/matchpathcon, and not add requirement on policycoreutils


--- util-linux-2.13-fdisk-xvd.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 12:06:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 08:06:41 -0400
Subject: rpms/mailman/devel mailman.spec,1.55,1.56
Message-ID: <200606121206.k5CC6fEI020549@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/mailman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20517

Modified Files:
	mailman.spec 
Log Message:
- more build requirements


Index: mailman.spec
===================================================================
RCS file: /cvs/dist/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mailman.spec	8 May 2006 16:07:13 -0000	1.55
+++ mailman.spec	12 Jun 2006 12:06:34 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access.
 Name: mailman
 Version: 2.1.8
-Release: 1
+Release: 2
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -24,8 +24,8 @@
 URL: http://www.list.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Prereq: shadow-utils, /sbin/chkconfig, /sbin/service
-Requires: vixie-cron >= 4.1-9, webserver, python >= 2.2, mktemp
-BuildPrereq: python-devel >= 2.2
+Requires: vixie-cron >= 4.1-9, httpd, python >= 2.2, mktemp
+BuildRequires: python-devel >= 2.2, automake
 
 %define contentdir /var/www
 
@@ -325,6 +325,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Mon Jun 12 2006 Harald Hoyer <harald at redhat.com> - 3:2.1.8-2
+- more build requirements
+
 * Mon May 08 2006 Harald Hoyer <harald at redhat.com> - 3:2.1.8-1
 - version 2.1.8
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 12:26:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 08:26:14 -0400
Subject: rpms/gcc/devel gcc41-pr27793.patch, NONE, 1.1 gcc41-rh192700.patch,
	1.3, 1.4 gcc41.spec, 1.69, 1.70 gcc41-pr27758.patch, 1.1, NONE
Message-ID: <200606121226.k5CCQESg008829@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8799

Modified Files:
	gcc41-rh192700.patch gcc41.spec 
Added Files:
	gcc41-pr27793.patch 
Removed Files:
	gcc41-pr27758.patch 
Log Message:
4.1.1-2

gcc41-pr27793.patch:
 cp/cp-gimplify.c                    |   37 ++++++++++++++++
 cp/cp-tree.h                        |   10 ++++
 cp/decl.c                           |    1 
 cp/name-lookup.c                    |   26 ++++++++---
 testsuite/g++.dg/tree-ssa/pr26757.C |   44 +++++++++++++++++++
 testsuite/g++.dg/tree-ssa/pr27894.C |   82 ++++++++++++++++++++++++++++++++++++
 6 files changed, 194 insertions(+), 6 deletions(-)

--- NEW FILE gcc41-pr27793.patch ---
2006-06-12  Andrew MacLeod  <amacleod at redhat.com>

	PR middle-end/27793
	* tree-dfa.c (add_referenced_var): Assert DECL_UID is unique for
	different decls.

2006-06-12  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/27793
	* cp-tree.h (cxx_int_tree_map): New struct.
	(struct language_function): Add extern_decl_map field.
	* name-lookup.c (pushdecl_maybe_friend): Add x -> t mapping
	to cp_function_chain->extern_decl_map hash table instead of
	copying over DECL_UID.
	* cp-gimplify.c (cxx_int_tree_map_eq, cxx_int_tree_map_hash): New
	functions.
	(cp_genericize_r): Remap DECL_EXTERN local decls using
	cp_function_chain->extern_decl_map hash table.
	* decl.c (finish_function): Clear extern_decl_map.

	Revert:
	2006-06-06  Andrew MacLeod  <amacleod at redhat.com>
	PR middle-end/27793
	* tree-dfa.c (referenced_vars_dup_list): New.  List of duplicate 
	referenced_variables with matching DECL_UID's.
	(find_referenced_vars): Make sure duplicate list is empty to start.
	(add_referenced_var): Add var to duplicate list if required.
	* tree-ssa.c (delete_tree_ssa): Clear var_ann's on duplicates.
	* tree-flow.h (referenced_vars_dup_list): External declaration.

	PR c++/26757
	PR c++/27894
	* g++.dg/tree-ssa/pr26757.C: New test.
	* g++.dg/tree-ssa/pr27894.C: New test.

--- gcc/tree-flow.h	(revision 114458)
+++ gcc/tree-flow.h	(revision 114457)
@@ -420,8 +420,6 @@ typedef struct
 
 /* Array of all variables referenced in the function.  */
 extern GTY((param_is (struct int_tree_map))) htab_t referenced_vars;
-/* List of referenced variables in the function with duplicate UID's.  */
-extern VEC(tree,gc) *referenced_vars_dup_list;
 
 extern tree referenced_var_lookup (unsigned int);
 extern tree referenced_var_lookup_if_exists (unsigned int);
--- gcc/tree-ssa.c	(revision 114458)
+++ gcc/tree-ssa.c	(revision 114457)
@@ -821,7 +821,6 @@ delete_tree_ssa (void)
   block_stmt_iterator bsi;
   referenced_var_iterator rvi;
   tree var;
-  unsigned u;
 
   /* Release any ssa_names still in use.  */
   for (i = 0; i < num_ssa_names; i++)
@@ -856,16 +855,6 @@ delete_tree_ssa (void)
       ggc_free (var->common.ann);
       var->common.ann = NULL;
     }
-
-  /* Remove any referenced variables which had duplicate UID's.  */
-  for (u = 0; u < VEC_length (tree, referenced_vars_dup_list); u++)
-    {
-      var = VEC_index (tree, referenced_vars_dup_list, u);
-      ggc_free (var->common.ann);
-      var->common.ann = NULL;
-    }
-  VEC_free (tree, gc, referenced_vars_dup_list);
-
   htab_delete (referenced_vars);
   referenced_vars = NULL;
 
--- gcc/tree-dfa.c	(revision 114458)
+++ gcc/tree-dfa.c	(revision 114457)
@@ -76,8 +76,6 @@ static void add_referenced_var (tree, bo
 
 /* Array of all variables referenced in the function.  */
 htab_t referenced_vars;
-/* List of referenced variables with duplicate UID's.  */
-VEC(tree,gc) *referenced_vars_dup_list;
 
 
 /*---------------------------------------------------------------------------
@@ -97,7 +95,6 @@ find_referenced_vars (void)
   basic_block bb;
   block_stmt_iterator si;
 
-  gcc_assert (VEC_length (tree, referenced_vars_dup_list) == 0);
   FOR_EACH_BB (bb)
     for (si = bsi_start (bb); !bsi_end_p (si); bsi_next (&si))
       {
@@ -613,31 +610,18 @@ static void
 add_referenced_var (tree var, bool always)
 {
   var_ann_t v_ann;
-  tree dup = referenced_var_lookup_if_exists (DECL_UID (var));
+  tree ref;
 
   v_ann = get_var_ann (var);
   gcc_assert (DECL_P (var));
-  
-  /* PRs 26757 and 27793.  Maintain a list of duplicate variable pointers
-     with the same DECL_UID.  There isn't usually very many.  
-     TODO.  Once the C++ front end doesn't create duplicate DECL UID's, this
-     code can be removed.  */
-  if (dup && dup != var)
-    {
-      unsigned u;
-      tree t = NULL_TREE;
 
-      for (u = 0; u < VEC_length (tree, referenced_vars_dup_list); u++)
-	{
-	  t = VEC_index (tree, referenced_vars_dup_list, u);
-	  if (t == var)
-	    break;
-	}
-      if (t != var)
-	VEC_safe_push (tree, gc, referenced_vars_dup_list, var);
-    }
+  ref = referenced_var_lookup_if_exists (DECL_UID (var));  
+
+  /* Catch PRs 26757 and 27793.  If this assert triggers, REF and VAR are
+     two different variables in this function with the same DECL_UID.  */
+  gcc_assert (!ref || ref == var);
 
-  if (always || dup == NULL_TREE)
+  if (always || ref == NULL_TREE)
     {
       /* This is the first time we find this variable, add it to the
          REFERENCED_VARS array and annotate it with attributes that are
--- gcc/cp/name-lookup.c.jj	2006-03-27 14:32:50.000000000 +0200
+++ gcc/cp/name-lookup.c	2006-06-12 13:46:57.000000000 +0200
@@ -669,14 +669,28 @@ pushdecl_maybe_friend (tree x, bool is_f
 	      if (decls_match (x, t))
 		/* The standard only says that the local extern
 		   inherits linkage from the previous decl; in
-		   particular, default args are not shared.  We must
-		   also tell cgraph to treat these decls as the same,
-		   or we may neglect to emit an "unused" static - we
-		   do this by making the DECL_UIDs equal, which should
-		   be viewed as a kludge.  FIXME.  */
+		   particular, default args are not shared.  Add
+		   the decl into a hash table to make sure only
+		   the previous decl in this case is seen by the
+		   middle end.  */
 		{
+		  struct cxx_int_tree_map *h;
+		  void **loc;
+
 		  TREE_PUBLIC (x) = TREE_PUBLIC (t);
-		  DECL_UID (x) = DECL_UID (t);
+
+		  if (cp_function_chain->extern_decl_map == NULL)
+		    cp_function_chain->extern_decl_map
+		      = htab_create_ggc (20, cxx_int_tree_map_hash,
+					 cxx_int_tree_map_eq, NULL);
+
+		  h = GGC_NEW (struct cxx_int_tree_map);
+		  h->uid = DECL_UID (x);
+		  h->to = t;
+		  loc = htab_find_slot_with_hash
+			  (cp_function_chain->extern_decl_map, h,
+			   h->uid, INSERT);
+		  *(struct cxx_int_tree_map **) loc = h;
 		}
 	    }
 	  else if (TREE_CODE (t) == PARM_DECL)
--- gcc/cp/cp-gimplify.c.jj	2006-02-10 21:24:13.000000000 +0100
+++ gcc/cp/cp-gimplify.c	2006-06-12 13:46:57.000000000 +0200
@@ -589,6 +589,24 @@ is_invisiref_parm (tree t)
 	  && DECL_BY_REFERENCE (t));
 }
 
+/* Return true if the uid in both int tree maps are equal.  */
+
+int
+cxx_int_tree_map_eq (const void *va, const void *vb)
+{
+  const struct cxx_int_tree_map *a = (const struct cxx_int_tree_map *) va;
+  const struct cxx_int_tree_map *b = (const struct cxx_int_tree_map *) vb;
+  return (a->uid == b->uid);
+}
+
+/* Hash a UID in a cxx_int_tree_map.  */
+
+unsigned int
+cxx_int_tree_map_hash (const void *item)
+{
+  return ((const struct cxx_int_tree_map *)item)->uid;
+}
+
 /* Perform any pre-gimplification lowering of C++ front end trees to
    GENERIC.  */
 
@@ -608,6 +626,25 @@ cp_genericize_r (tree *stmt_p, int *walk
       return NULL;
     }
 
+  /* Map block scope extern declarations to visible declarations with the
+     same name and type in outer scopes if any.  */
+  if (cp_function_chain->extern_decl_map
+      && (TREE_CODE (stmt) == FUNCTION_DECL || TREE_CODE (stmt) == VAR_DECL)
+      && DECL_EXTERNAL (stmt))
+    {
+      struct cxx_int_tree_map *h, in;
+      in.uid = DECL_UID (stmt);
+      h = (struct cxx_int_tree_map *)
+	  htab_find_with_hash (cp_function_chain->extern_decl_map,
+			       &in, in.uid);
+      if (h)
+	{
+	  *stmt_p = h->to;
+	  *walk_subtrees = 0;
+	  return NULL;
+	}
+    }
+
   /* Other than invisiref parms, don't walk the same tree twice.  */
   if (pointer_set_contains (p_set, stmt))
     {
--- gcc/cp/decl.c.jj	2006-06-08 09:10:47.000000000 +0200
+++ gcc/cp/decl.c	2006-06-12 13:46:57.000000000 +0200
@@ -11004,6 +11004,7 @@ finish_function (int flags)
       f->x_vtt_parm = NULL;
       f->x_return_value = NULL;
       f->bindings = NULL;
+      f->extern_decl_map = NULL;
 
       /* Handle attribute((warn_unused_result)).  Relies on gimple input.  */
       c_warn_unused_result (&DECL_SAVED_TREE (fndecl));
--- gcc/cp/cp-tree.h.jj	2006-06-08 09:10:47.000000000 +0200
+++ gcc/cp/cp-tree.h	2006-06-12 13:46:57.000000000 +0200
@@ -719,6 +719,15 @@ struct saved_scope GTY(())
 
 extern GTY(()) struct saved_scope *scope_chain;
 
+struct cxx_int_tree_map GTY(())
+{
+  unsigned int uid;
+  tree to;
+};
+
+extern unsigned int cxx_int_tree_map_hash (const void *);
+extern int cxx_int_tree_map_eq (const void *, const void *);
+
 /* Global state pertinent to the current function.  */
 
 struct language_function GTY(())
@@ -746,6 +755,7 @@ struct language_function GTY(())
   struct named_label_list *x_named_labels;
   struct cp_binding_level *bindings;
   VEC(tree,gc) *x_local_names;
+  htab_t GTY((param_is (struct cxx_int_tree_map))) extern_decl_map;
 };
 
 /* The current C++-specific per-function global variables.  */
--- gcc/testsuite/g++.dg/tree-ssa/pr27894.C.jj	2006-06-12 14:15:10.000000000 +0200
+++ gcc/testsuite/g++.dg/tree-ssa/pr27894.C	2006-06-12 13:45:41.000000000 +0200
@@ -0,0 +1,82 @@
+// PR c++/27894
+// { dg-do compile }
+// { dg-options "-O" }
+
+class A;
+struct B
+{
+  B (unsigned long);
+  int b2 () const;
+  A *b1 () const;
+};
+
+enum { P = 0 };
+enum O { Q = 75, };
+class C;
+struct D { A *d; };
+struct E
+{
+  B e1 (int) const;
+  A *e2 (const B &) const;
+  D e3[4096];
+};
+
+inline A *
+E::e2 (const B & x) const
+{
+  const D *w = &e3[x.b2 ()];
+  return (A *) w->d;
+}
+
+extern E *e;
+
+inline A *
+B::b1 () const
+{
+  extern E *e;
+  return e->e2 (*this);
+}
+
+template <class T> struct F : public B
+{
+  F (const B &);
+  T *b1 () const;
+};
+
+template < class T > inline T * F <T>::b1 () const
+{
+  return (T *) B::b1 ();
+};
+
+typedef F <C> N;
+
+class G {};
+class H : public G {};
+class I : public H {};
+class J {};
+class K {};
+struct L
+{
+  void l (J *, C *, int, const char *, O);
+};
+class M : public K, public I
+{
+  void m (J &, int, const char *);
+  void m (J &, int, int, const char *, float);
+};
+
+void
+M::m (J &x, int y, const char *z)
+{
+  L *w = new L;
+  N v = e->e1 (y);
+  w->l (&x, v.b1 (), P, z, Q);
+}
+
+void
+M::m (J &x, int y, int s, const char *z, float t)
+{
+  L *w = new L;
+  N v = e->e1 (y);
+  w->l (&x, v.b1 (), s, z, (O) (int) ((t) ? (50 + 20 / (float) t) : 0));
+}
--- gcc/testsuite/g++.dg/tree-ssa/pr26757.C.jj	2006-06-12 14:15:26.000000000 +0200
+++ gcc/testsuite/g++.dg/tree-ssa/pr26757.C	2006-06-12 14:11:17.000000000 +0200
@@ -0,0 +1,44 @@
+// PR c++/26757
+// { dg-do run }
+// { dg-options "-O" }
+
+extern "C" void abort ();
+
+typedef struct A
+{
+  int c;
+  int d;
+} A;
+
+A *b;
+
+void
+foo ()
+{
+  b->c++;
+  extern A *b;
+  b->d++;
+
+}
+
+void
+bar ()
+{
+  if (b->d)
+    b->c++;
+}
+
+
+int
+main ()
+{
+  A a = { 0, 0 };
+  b = &a;
+  foo ();
+  bar ();
+  if (b->c != 2)
+    abort ();
+  if (b->d != 1)
+    abort ();
+  return 0;
+}

gcc41-rh192700.patch:
 javaop.h   |   29 +++++++++++++++++++++++++++++
 jcf-dump.c |    2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

Index: gcc41-rh192700.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh192700.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-rh192700.patch	25 May 2006 11:57:06 -0000	1.3
+++ gcc41-rh192700.patch	12 Jun 2006 12:26:12 -0000	1.4
@@ -52,7 +52,7 @@
  
  
  #ifndef jword
-+#if defined (__LP64__) || defined(__alpha__) || defined (__MMIX__) \
++#if defined (__LP64__) || defined (__alpha__) || defined (__MMIX__) \
 +    || (defined (_ARCH_PPC) && defined (__64BIT__)) \
 +    || defined (__powerpc64__) || defined (__s390x__) || defined (__x86_64__) \
 +    || defined (__sparcv9) || (defined (__sparc__) && defined (__arch64__))


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gcc41.spec	25 May 2006 09:47:21 -0000	1.69
+++ gcc41.spec	12 Jun 2006 12:26:12 -0000	1.70
@@ -1,6 +1,6 @@
-%define DATE 20060525
+%define DATE 20060612
 %define gcc_version 4.1.1
-%define gcc_release 1
+%define gcc_release 2
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -119,7 +119,7 @@
 Patch22: gcc41-pr26881.patch
 Patch23: gcc41-pr27532.patch
 Patch24: gcc41-pr26885.patch
-Patch25: gcc41-pr27758.patch
+Patch25: gcc41-pr27793.patch
 Patch26: gcc41-rh192700.patch
 Patch27: gcc41-sw2438.patch
 %define _gnu %{nil}
@@ -424,7 +424,7 @@
 %patch22 -p0 -b .pr26881~
 %patch23 -p0 -b .pr27532~
 %patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .pr27758~
+%patch25 -p0 -b .pr27793~
 %patch26 -p0 -b .rh192700~
 %patch27 -p0 -b .sw2438~
 
@@ -1468,6 +1468,27 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Jun 12 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-2
+- update from gcc-4_1-branch (-r114107:114555)
+  - PRs ada/27769, c++/20173, c++/26068, c++/26433, c++/26496, c++/27177,
+	c++/27385, c++/27447, c++/27451, c++/27601, c++/27713, c++/27716,
+	c++/27722, c++/27801, c++/27806, c++/27807, c++/27819, c/25161,
+	c/26818, c/27020, c/27718, fortran/14067, fortran/16943,
+	fortran/18003, fortran/19015, fortran/19777, fortran/20839,
+	fortran/20877, fortran/23091, fortran/23151, fortran/24168,
+	fortran/24558, fortran/25047, fortran/25058, fortran/25082,
+	fortran/25090, fortran/25098, fortran/25147, fortran/25746,
+	fortran/26551, fortran/27155, fortran/27320, fortran/27411,
+	fortran/27449, fortran/27470, fortran/27524, fortran/27552,
+	fortran/27584, fortran/27613, fortran/27655, fortran/27662,
+	fortran/27709, fortran/27897, libgcj/26483, libgfortran/24459,
+	libgfortran/27757, middle-end/27743, middle-end/27793,
+	target/25758, target/26223, target/27790, target/27842,
+	testsuite/27705, tree-optimization/26242, tree-optimization/26622
+- merge gomp changes from the trunk (-r114518:114520 and -r114524:114525)
+  - PRs preprocessor/27746, c/27747, c++/27748, fortran/27916
+- don't generate decls with the same DECL_UID in C++ FE (PR middle-end/27793)
+
 * Thu May 25 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-1
 - update from gcc-4_1-branch (-r113848:114107)
   - GCC 4.1.1 release


--- gcc41-pr27758.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 12:29:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 08:29:42 -0400
Subject: rpms/gcc/devel .cvsignore,1.155,1.156 sources,1.157,1.158
Message-ID: <200606121229.k5CCTgWf016047@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13382

Modified Files:
	.cvsignore sources 
Log Message:
4.1.1-2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	25 May 2006 09:47:00 -0000	1.155
+++ .cvsignore	12 Jun 2006 12:29:39 -0000	1.156
@@ -1 +1 @@
-gcc-4.1.1-20060525.tar.bz2
+gcc-4.1.1-20060612.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- sources	25 May 2006 09:47:00 -0000	1.157
+++ sources	12 Jun 2006 12:29:39 -0000	1.158
@@ -1 +1 @@
-5d866ef97be7903a6fc3ab28c0f39e50  gcc-4.1.1-20060525.tar.bz2
+2c8d223d158721bcc926b014998d3f3f  gcc-4.1.1-20060612.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 12:31:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 08:31:47 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.118,1.119
Message-ID: <200606121231.k5CCVl6j020692@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20678

Modified Files:
	util-linux.spec 
Log Message:
BuidReq...


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- util-linux.spec	12 Jun 2006 11:38:50 -0000	1.118
+++ util-linux.spec	12 Jun 2006 12:31:43 -0000	1.119
@@ -41,6 +41,8 @@
 BuildRequires: libselinux-devel
 BuildRequires: e2fsprogs-devel >= 1.36
 BuildRequires: audit-libs-devel >= 1.0.6
+BuildRequires: autoconf
+BuildRequires: automake
 
 ### Sources
 # TODO [stable]: s/2.13-pre6/%{version}/



From fedora-cvs-commits at redhat.com  Mon Jun 12 12:48:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 08:48:26 -0400
Subject: rpms/gcc/devel gcc41-ppc64-ldouble-stdarg.patch,1.2,1.3
Message-ID: <200606121248.k5CCmQTr003110@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3093

Modified Files:
	gcc41-ppc64-ldouble-stdarg.patch 
Log Message:
4.1.1-2

gcc41-ppc64-ldouble-stdarg.patch:
 0 files changed

Index: gcc41-ppc64-ldouble-stdarg.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ppc64-ldouble-stdarg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-ppc64-ldouble-stdarg.patch	21 Apr 2006 20:45:38 -0000	1.2
+++ gcc41-ppc64-ldouble-stdarg.patch	12 Jun 2006 12:48:24 -0000	1.3
@@ -1,8 +1,5 @@
 2006-04-20  Alan Modra  <amodra at bigpond.net.au>
 
-	* config/rs6000/rs6000.c (rs6000_gimplify_va_arg): Consume all
-	fp regs if the last fp arg doesn't fit in regs.
-
 	* gcc.dg/compat/scalar-by-value-5.c: New.
 	* gcc.dg/compat/scalar-by-value-5_main.c: New.
 	* gcc.dg/compat/scalar-by-value-5_x.c: New.
@@ -14,17 +11,6 @@
 	* gcc.dg/compat/scalar-by-value-x.h: New.
 	* gcc.dg/compat/scalar-by-value-y.h: New.
 
---- gcc/config/rs6000/rs6000.c	(revision 113079)
-+++ gcc/config/rs6000/rs6000.c	(working copy)
-@@ -5960,7 +5973,7 @@ rs6000_gimplify_va_arg (tree valist, tre
-       t = build1 (LABEL_EXPR, void_type_node, lab_false);
-       append_to_statement_list (t, pre_p);
- 
--      if (n_reg > 2)
-+      if ((n_reg == 2 && reg != gpr) || n_reg > 2)
- 	{
- 	  /* Ensure that we don't find any more args in regs.
- 	     Alignment has taken care of the n_reg == 2 case.  */
 --- gcc/testsuite/gcc.dg/compat/scalar-by-value-5.c	(revision 0)
 +++ gcc/testsuite/gcc.dg/compat/scalar-by-value-5.c	(revision 0)
 @@ -0,0 +1,16 @@



From fedora-cvs-commits at redhat.com  Mon Jun 12 12:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 08:57:43 -0400
Subject: rpms/gcc/devel gcc41.spec, 1.70, 1.71 gcc41-pr27532.patch, 1.1,
	NONE gcc41-rh192700.patch, 1.4, NONE gcc41-sw2438.patch, 1.1, NONE
Message-ID: <200606121257.k5CCvhWx003274@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3260

Modified Files:
	gcc41.spec 
Removed Files:
	gcc41-pr27532.patch gcc41-rh192700.patch gcc41-sw2438.patch 
Log Message:
4.1.1-2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gcc41.spec	12 Jun 2006 12:26:12 -0000	1.70
+++ gcc41.spec	12 Jun 2006 12:57:41 -0000	1.71
@@ -117,11 +117,8 @@
 Patch20: gcc41-ppc64-ldouble-stdarg.patch
 Patch21: gcc41-pr25874.patch
 Patch22: gcc41-pr26881.patch
-Patch23: gcc41-pr27532.patch
+Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
-Patch25: gcc41-pr27793.patch
-Patch26: gcc41-rh192700.patch
-Patch27: gcc41-sw2438.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -422,11 +419,8 @@
 %patch20 -p0 -b .ppc64-ldouble-stdarg~
 %patch21 -p0 -b .pr25874~
 %patch22 -p0 -b .pr26881~
-%patch23 -p0 -b .pr27532~
+%patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .pr27793~
-%patch26 -p0 -b .rh192700~
-%patch27 -p0 -b .sw2438~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c


--- gcc41-pr27532.patch DELETED ---


--- gcc41-rh192700.patch DELETED ---


--- gcc41-sw2438.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 13:04:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 09:04:36 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc6-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.452, 1.453 kernel-2.6.spec, 1.2268,
	1.2269 sources, 1.396, 1.397 upstream, 1.361,
	1.362 linux-2.6-pci-reverse-pci-config-space-restore-order.patch,
	1.2, NONE patch-2.6.17-rc6-git2.bz2.sign, 1.1, NONE
Message-ID: <200606121304.k5CD4a9H003410@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3397

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc6-git3.bz2.sign 
Removed Files:
	linux-2.6-pci-reverse-pci-config-space-restore-order.patch 
	patch-2.6.17-rc6-git2.bz2.sign 
Log Message:
git3



--- NEW FILE patch-2.6.17-rc6-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEjRIoyGugalF9Dw4RAvKmAJ4tJKcQj2U5mRCORLZcaHKczJIGuACgjWT2
wB44+p3uyziGwYW1VAlgq+4=
=4ULB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- .cvsignore	11 Jun 2006 05:54:46 -0000	1.452
+++ .cvsignore	12 Jun 2006 13:04:19 -0000	1.453
@@ -3,5 +3,5 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git2.bz2
 xen-20060610.tar.bz2
+patch-2.6.17-rc6-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2268
retrieving revision 1.2269
diff -u -r1.2268 -r1.2269
--- kernel-2.6.spec	11 Jun 2006 23:04:47 -0000	1.2268
+++ kernel-2.6.spec	12 Jun 2006 13:04:19 -0000	1.2269
@@ -246,7 +246,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc6.bz2
-Patch2: patch-2.6.17-rc6-git2.bz2
+Patch2: patch-2.6.17-rc6-git3.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -375,7 +375,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-ide-tune-locking.patch
-Patch1650: linux-2.6-pci-reverse-pci-config-space-restore-order.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
@@ -1030,8 +1029,6 @@
 %patch1630 -p1
 # Fix IDE locking bug.
 %patch1640 -p1
-# Restore PCI config space in reverse
-%patch1650 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor
@@ -1822,7 +1819,10 @@
 %endif
 
 %changelog
-* Sat Jun 10 2006 Dave Jones <davej at redhat.com>
+* Mon Jun 12 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-rc6-git3
+
+* Sun Jun 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git2
 - Add MyMusix PD-205 to the unusual USB quirk list.
 - Silence noisy unimplemented 32bit syscalls on x86-64.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- sources	11 Jun 2006 05:54:46 -0000	1.396
+++ sources	12 Jun 2006 13:04:27 -0000	1.397
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
-176a8941b4212b3beddf3e8bfbf5e4aa  patch-2.6.17-rc6-git2.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
+c2706c9e56dfd9a6e6d77d8cc18ab5a3  patch-2.6.17-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- upstream	11 Jun 2006 05:54:46 -0000	1.361
+++ upstream	12 Jun 2006 13:04:27 -0000	1.362
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git2.bz2
+patch-2.6.17-rc6-git3.bz2


--- linux-2.6-pci-reverse-pci-config-space-restore-order.patch DELETED ---


--- patch-2.6.17-rc6-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 13:44:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 09:44:12 -0400
Subject: rpms/gcc/devel gcc41-fortran-merge-glitch.patch, 1.2, 1.3 gcc41.spec,
	1.71, 1.72
Message-ID: <200606121344.k5CDiCDs004167@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4137

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-fortran-merge-glitch.patch 
Log Message:
4.1.1-2

gcc41-fortran-merge-glitch.patch:
 trans-stmt.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gcc41-fortran-merge-glitch.patch
===================================================================
RCS file: gcc41-fortran-merge-glitch.patch
diff -N gcc41-fortran-merge-glitch.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gcc41-fortran-merge-glitch.patch	12 Jun 2006 13:44:09 -0000	1.3
@@ -0,0 +1,11 @@
+--- gcc/fortran/trans-stmt.c	2006-06-12 11:48:17.000000000 +0200
++++ gcc/fortran/trans-stmt.c	2006-06-12 15:37:25.000000000 +0200
+@@ -253,7 +253,7 @@ gfc_conv_elemental_dependencies (gfc_se 
+ 	    && fsym->attr.intent == INTENT_OUT
+ 	    && arg->next->expr
+ 	    && arg->next->expr->expr_type ==  EXPR_VARIABLE
+-	    && gfc_check_dependency (e, arg->next->expr, NULL, 0))
++	    && gfc_check_dependency (e, arg->next->expr, 0))
+ 	{
+ 	  /* Make a local loopinfo for the temporary creation, so that
+ 	     none of the other ss->info's have to be renormalized.  */


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gcc41.spec	12 Jun 2006 12:57:41 -0000	1.71
+++ gcc41.spec	12 Jun 2006 13:44:09 -0000	1.72
@@ -119,6 +119,7 @@
 Patch22: gcc41-pr26881.patch
 Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
+Patch25: gcc41-fortran-merge-glitch.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -421,6 +422,7 @@
 %patch22 -p0 -b .pr26881~
 %patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
+%patch25 -p0 -b .fortran-merge-glitch~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:06:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:06:08 -0400
Subject: rpms/libselinux/FC-5 libselinux-rhat.patch,1.76,1.77
Message-ID: <200606121406.k5CE684S024522@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24494

Modified Files:
	libselinux-rhat.patch 
Log Message:
* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-3.fc5
- Apply patch this time...


libselinux-rhat.patch:
 include/selinux/selinux.h  |    3 
 man/man3/getfscreatecon.3  |    4 
 man/man3/matchpathcon.3    |   11 ++
 man/man8/booleans.8        |   24 +----
 src/booleans.c             |    2 
 src/canonicalize_context.c |    6 -
 src/check_context.c        |    3 
 src/compute_av.c           |    6 -
 src/compute_create.c       |    6 -
 src/compute_member.c       |    6 -
 src/compute_relabel.c      |    6 -
 src/compute_user.c         |    6 -
 src/context.c              |    8 -
 src/disable.c              |    3 
 src/enabled.c              |    6 -
 src/getcon.c               |    3 
 src/getenforce.c           |    3 
 src/getexeccon.c           |    3 
 src/getfscreatecon.c       |    3 
 src/getpidcon.c            |    3 
 src/getprevcon.c           |    3 
 src/init.c                 |    6 -
 src/load_policy.c          |    3 
 src/matchmediacon.c        |    2 
 src/matchpathcon.c         |   27 +++++
 src/policyvers.c           |    3 
 src/selinux_internal.h     |    1 
 src/selinuxswig.i          |   13 ++
 src/selinuxswig_wrap.c     |  206 ++++++++++++++++++++-------------------------
 src/setenforce.c           |    3 
 utils/avcstat.c            |   18 +--
 utils/matchpathcon.c       |    1 
 32 files changed, 227 insertions(+), 174 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux-rhat.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- libselinux-rhat.patch	6 Jun 2006 18:28:29 -0000	1.76
+++ libselinux-rhat.patch	12 Jun 2006 14:06:05 -0000	1.77
@@ -99,17 +99,6 @@
 -
 -.SH FILES
 -/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/avc_internal.c libselinux-1.30.3/src/avc_internal.c
---- nsalibselinux/src/avc_internal.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/avc_internal.c	2006-06-06 13:58:11.000000000 -0400
-@@ -16,7 +16,6 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
--#include <asm/types.h>
- #include <linux/netlink.h>
- #include "selinux_netlink.h"
- #include "avc_internal.h"
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/booleans.c libselinux-1.30.3/src/booleans.c
 --- nsalibselinux/src/booleans.c	2006-04-14 07:21:53.000000000 -0400
 +++ libselinux-1.30.3/src/booleans.c	2006-06-06 13:41:21.000000000 -0400



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:37:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:37:52 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec, 1.84, 1.85 sources, 1.34,
	1.35 kdegraphics-3.5.1-gphoto2-config.patch, 1.1, NONE
Message-ID: <200606121437.k5CEbqDO014371@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14352

Modified Files:
	kdegraphics.spec sources 
Removed Files:
	kdegraphics-3.5.1-gphoto2-config.patch 
Log Message:
3.5.3



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdegraphics.spec	5 Apr 2006 22:10:30 -0000	1.84
+++ kdegraphics.spec	12 Jun 2006 14:37:49 -0000	1.85
@@ -17,7 +17,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
@@ -33,7 +33,6 @@
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
 Patch4: kdegraphics-3.5.2-kpdf-xft.patch
-Patch5: kdegraphics-3.5.1-gphoto2-config.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -45,15 +44,9 @@
 BuildRequires: freeglut-devel
 %endif
 BuildRequires: kdebase-devel
-BuildRequires: zlib-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: imlib-devel
-BuildRequires: libtiff-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 
@@ -270,7 +263,6 @@
 %patch2 -p1 -b .xorg
 %patch3 -p1 -b .gcc-warning
 %patch4 -p1 -b .kpdf-xft
-%patch5 -p1 -b .gphoto2-config
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -287,10 +279,6 @@
 %endif
 
 %build
-export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
@@ -311,22 +299,22 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=/usr/include/kde \
-   --with-xinerama \
+   --includedir=%{_include}/kde \
 %ifnarch %{no_scanner_archs}
    --with-kamera \
 %else
-   --without-kamera
+   --without-kamera \
 %endif
+   --with-xinerama
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -336,15 +324,27 @@
 popd
 
 for i in kcmkmrml ksnapshot ; do
-  [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+  [ -f %{buildroot}%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -370,6 +370,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	5 Apr 2006 16:59:21 -0000	1.34
+++ sources	12 Jun 2006 14:37:49 -0000	1.35
@@ -1 +1 @@
-8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2
+56bd5537521dc94633f8effaace523cb  kdegraphics-3.5.3.tar.bz2


--- kdegraphics-3.5.1-gphoto2-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:38:08 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.12,1.13
Message-ID: <200606121438.k5CEc8Ak014438@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv14414/configs

Modified Files:
	config-i586 
Log Message:
reenable ndlc


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-i586	7 May 2006 00:41:20 -0000	1.12
+++ config-i586	12 Jun 2006 14:38:06 -0000	1.13
@@ -30,7 +30,6 @@
 # CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
-# CONFIG_N_HDLC is not set
 # CONFIG_STALDRV is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_DTLK is not set



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:38:08 -0400
Subject: rpms/kernel/FC-5 linux-2.6-x86-smp-alternatives.patch,1.3,NONE
Message-ID: <200606121438.k5CEc8oL014433@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14414

Removed Files:
	linux-2.6-x86-smp-alternatives.patch 
Log Message:
reenable ndlc


--- linux-2.6-x86-smp-alternatives.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:41:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:41:46 -0400
Subject: rpms/kernel/devel/configs config-i586,1.13,1.14
Message-ID: <200606121441.k5CEfkoL015015@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv14974/configs

Modified Files:
	config-i586 
Log Message:
reenable n_hdlc


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-i586	7 May 2006 00:48:29 -0000	1.13
+++ config-i586	12 Jun 2006 14:41:43 -0000	1.14
@@ -29,7 +29,6 @@
 # CONFIG_GAMEPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
-# CONFIG_N_HDLC is not set
 # CONFIG_STALDRV is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:51:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:51:11 -0400
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.16,
	1.17 policy-20060608.patch, 1.2, 1.3 selinux-policy.spec,
	1.205, 1.206
Message-ID: <200606121451.k5CEpBbP000586@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv503

Modified Files:
	modules-mls.conf policy-20060608.patch selinux-policy.spec 
Log Message:
* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-2
- Allow useradd to create_home_dir in MLS environment



Index: modules-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modules-mls.conf	9 May 2006 21:50:36 -0000	1.16
+++ modules-mls.conf	12 Jun 2006 14:51:08 -0000	1.17
@@ -935,7 +935,7 @@
 #
 # The unconfined domain.
 # 
-unconfined = base
+unconfined = off
 
 # Layer: system
 # Module: miscfiles

policy-20060608.patch:
 config/appconfig-strict-mls/default_type  |    1 
 policy/modules/admin/consoletype.te       |    7 ++++
 policy/modules/admin/prelink.fc           |    2 -
 policy/modules/admin/rpm.te               |    8 ++++-
 policy/modules/apps/webalizer.te          |    1 
 policy/modules/kernel/files.if            |   35 ++++++++++++++++++++++++
 policy/modules/kernel/filesystem.te       |    3 +-
 policy/modules/kernel/kernel.te           |    1 
 policy/modules/services/automount.te      |    8 ++++-
 policy/modules/services/cron.te           |    1 
 policy/modules/services/cups.te           |    4 ++
 policy/modules/services/ftp.te            |    1 
 policy/modules/services/hal.te            |    2 +
 policy/modules/services/mysql.te          |    2 -
 policy/modules/services/networkmanager.te |    4 ++
 policy/modules/services/ntp.te            |    2 +
 policy/modules/services/pegasus.if        |   31 +++++++++++++++++++++
 policy/modules/services/pegasus.te        |    5 +--
 policy/modules/services/procmail.te       |    5 +++
 policy/modules/services/pyzor.te          |    4 ++
 policy/modules/services/xfs.te            |    2 +
 policy/modules/system/authlogin.if        |    1 
 policy/modules/system/hostname.te         |    5 ++-
 policy/modules/system/init.te             |    1 
 policy/modules/system/logging.fc          |    6 ++--
 policy/modules/system/logging.te          |   10 ++++--
 policy/modules/system/mount.te            |    1 
 policy/modules/system/unconfined.fc       |    8 +++--
 policy/modules/system/unconfined.if       |   28 +++++++++++++++++++
 policy/modules/system/unconfined.te       |   13 ++++++---
 policy/modules/system/userdomain.if       |   30 --------------------
 policy/modules/system/userdomain.te       |   43 ++++++++++++++++++++++++++----
 policy/rolemap                            |    1 
 policy/support/misc_macros.spt            |    2 -
 policy/users                              |    6 ++--
 35 files changed, 222 insertions(+), 62 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060608.patch	9 Jun 2006 02:55:43 -0000	1.2
+++ policy-20060608.patch	12 Jun 2006 14:51:08 -0000	1.3
@@ -1,14 +1,14 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.44/config/appconfig-strict-mls/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.45/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.44/config/appconfig-strict-mls/default_type	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/config/appconfig-strict-mls/default_type	2006-06-09 15:45:23.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
  user_r:user_t
 +auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.44/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.45/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/admin/consoletype.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/admin/consoletype.te	2006-06-09 15:45:23.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -23,9 +23,9 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.44/policy/modules/admin/prelink.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.45/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-01-25 12:52:21.000000000 -0500
-+++ serefpolicy-2.2.44/policy/modules/admin/prelink.fc	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/admin/prelink.fc	2006-06-09 15:45:23.000000000 -0400
 @@ -3,6 +3,6 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -34,9 +34,9 @@
 +/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
  
  /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.44/policy/modules/admin/rpm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.45/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/admin/rpm.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/admin/rpm.te	2006-06-09 15:45:23.000000000 -0400
 @@ -341,12 +341,16 @@
  	optional_policy(`
  		mono_domtrans(rpm_script_t)
@@ -56,9 +56,9 @@
  ifdef(`distro_redhat',`
  	optional_policy(`
  		mta_send_mail(rpm_script_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.44/policy/modules/apps/webalizer.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.45/policy/modules/apps/webalizer.te
 --- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/apps/webalizer.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/apps/webalizer.te	2006-06-09 15:45:23.000000000 -0400
 @@ -44,6 +44,7 @@
  allow webalizer_t self:unix_dgram_socket sendto;
  allow webalizer_t self:unix_stream_socket connectto;
@@ -67,10 +67,10 @@
  allow webalizer_t self:netlink_route_socket r_netlink_socket_perms;
  
  allow webalizer_t webalizer_etc_t:file { getattr read };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.44/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/files.if	2006-06-08 20:41:26.000000000 -0400
-@@ -1913,6 +1913,21 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.45/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/kernel/files.if	2006-06-09 15:45:23.000000000 -0400
+@@ -1931,6 +1931,21 @@
  ')
  
  ########################################
@@ -92,7 +92,7 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-@@ -4360,3 +4375,23 @@
+@@ -4379,3 +4394,23 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -116,9 +116,9 @@
 +	allow $1 { file_type -security_file_type }:file mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.44/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.45/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/filesystem.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/kernel/filesystem.te	2006-06-09 15:45:23.000000000 -0400
 @@ -23,7 +23,7 @@
  # Requires that a security xattr handler exist for the filesystem.
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
@@ -136,9 +136,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.44/policy/modules/kernel/kernel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.45/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/kernel/kernel.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/kernel/kernel.te	2006-06-09 15:45:23.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -147,9 +147,9 @@
  ')
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.44/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.45/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/automount.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/automount.te	2006-06-09 15:45:23.000000000 -0400
 @@ -30,7 +30,7 @@
  
  allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
@@ -194,9 +194,9 @@
  
  term_dontaudit_use_console(automount_t)
  term_dontaudit_getattr_pty_dirs(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.44/policy/modules/services/cron.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.45/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/cron.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/cron.te	2006-06-09 15:45:23.000000000 -0400
 @@ -353,6 +353,7 @@
  
  	tunable_policy(`cron_can_relabel',`
@@ -205,10 +205,10 @@
  	',`
  		selinux_get_fs_mount(system_crond_t)
  		selinux_validate_context(system_crond_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.44/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/cups.te	2006-06-08 16:10:33.000000000 -0400
-@@ -655,6 +655,10 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.45/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 23:00:30.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/cups.te	2006-06-09 15:45:23.000000000 -0400
+@@ -638,6 +638,10 @@
  ')
  
  optional_policy(`
@@ -219,9 +219,9 @@
  	udev_read_db(hplip_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.44/policy/modules/services/ftp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.45/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/ftp.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/ftp.te	2006-06-09 15:45:23.000000000 -0400
 @@ -59,6 +59,7 @@
  
  allow ftpd_t ftpd_var_run_t:file create_file_perms;
@@ -230,9 +230,9 @@
  files_pid_filetrans(ftpd_t,ftpd_var_run_t,file)
  
  # Create and modify /var/log/xferlog.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.44/policy/modules/services/hal.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.45/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/hal.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/hal.te	2006-06-09 15:45:23.000000000 -0400
 @@ -140,6 +140,8 @@
  
  sysnet_read_config(hald_t)
@@ -242,9 +242,9 @@
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_sysadm_home_dirs(hald_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.44/policy/modules/services/mysql.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.45/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/mysql.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/mysql.te	2006-06-09 15:45:23.000000000 -0400
 @@ -101,7 +101,7 @@
  
  miscfiles_read_localization(mysqld_t)
@@ -254,9 +254,20 @@
  sysnet_read_config(mysqld_t)
  
  userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.44/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.45/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/networkmanager.te	2006-06-11 07:42:46.000000000 -0400
+@@ -172,3 +172,7 @@
+ 	vpn_domtrans(NetworkManager_t)
+ 	vpn_signal(NetworkManager_t)
+ ')
++
++optional_policy(`
++	ppp_domtrans(NetworkManager_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.45/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/ntp.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/ntp.te	2006-06-09 15:45:23.000000000 -0400
 @@ -112,6 +112,8 @@
  
  sysnet_read_config(ntpd_t)
@@ -266,9 +277,9 @@
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.44/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.45/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pegasus.if	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/pegasus.if	2006-06-09 15:45:23.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -302,9 +313,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.44/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.45/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pegasus.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/pegasus.te	2006-06-09 15:45:23.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -321,9 +332,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.44/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.45/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/procmail.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/procmail.te	2006-06-09 15:45:23.000000000 -0400
 @@ -109,3 +109,8 @@
  	spamassassin_exec(procmail_t)
  	spamassassin_exec_client(procmail_t)
@@ -333,9 +344,9 @@
 +	clamav_domtrans_clamscan(procmail_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.44/policy/modules/services/pyzor.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.45/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/pyzor.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/pyzor.te	2006-06-09 15:45:23.000000000 -0400
 @@ -126,3 +126,7 @@
  optional_policy(`
  	nscd_socket_use(pyzord_t)
@@ -344,9 +355,9 @@
 +ifdef(`targeted_policy',`
 +	userdom_read_generic_user_home_content_files(pyzord_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.44/policy/modules/services/xfs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.45/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/services/xfs.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/services/xfs.te	2006-06-09 15:45:23.000000000 -0400
 @@ -69,6 +69,8 @@
  miscfiles_read_localization(xfs_t)
  miscfiles_read_fonts(xfs_t)
@@ -356,9 +367,9 @@
  userdom_dontaudit_use_unpriv_user_fds(xfs_t)
  userdom_dontaudit_search_sysadm_home_dirs(xfs_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.44/policy/modules/system/authlogin.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.45/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-05-12 09:22:08.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/authlogin.if	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/authlogin.if	2006-06-09 15:45:23.000000000 -0400
 @@ -1287,6 +1287,7 @@
  	allow $1 var_auth_t:dir r_dir_perms;
  	allow $1 var_auth_t:file create_file_perms;
@@ -367,9 +378,9 @@
  
  	sysnet_dns_name_resolve($1)
  	sysnet_use_ldap($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.44/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.45/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.44/policy/modules/system/hostname.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/hostname.te	2006-06-09 15:45:23.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -382,9 +393,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.44/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/init.te	2006-06-08 16:10:33.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.45/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/init.te	2006-06-09 15:45:23.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -393,9 +404,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.2.44/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.2.45/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-02-02 16:12:27.000000000 -0500
-+++ serefpolicy-2.2.44/policy/modules/system/logging.fc	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/logging.fc	2006-06-09 15:45:23.000000000 -0400
 @@ -1,9 +1,6 @@
  
  /dev/log			-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -413,9 +424,9 @@
 +/etc/audit(/.*)?		gen_context(system_u:object_r:auditd_etc_t,s15:c0.c255)
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.44/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.45/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/logging.te	2006-06-08 18:04:43.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/logging.te	2006-06-09 15:45:23.000000000 -0400
 @@ -70,6 +70,7 @@
  
  allow auditctl_t etc_t:file { getattr read };
@@ -458,9 +469,9 @@
  
  domain_use_interactive_fds(auditd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.44/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.45/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/mount.te	2006-06-08 20:42:32.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/mount.te	2006-06-09 15:45:23.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -469,9 +480,9 @@
  	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.44/policy/modules/system/unconfined.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.45/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.fc	2006-06-08 20:27:36.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/unconfined.fc	2006-06-09 15:45:23.000000000 -0400
 @@ -4,7 +4,9 @@
  # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
  /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -485,9 +496,9 @@
 +/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.44/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.45/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.if	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/unconfined.if	2006-06-09 15:45:23.000000000 -0400
 @@ -449,3 +449,31 @@
  
  	allow $1 unconfined_t:dbus acquire_svc;
@@ -520,9 +531,9 @@
 +		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
 +	')
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.44/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.45/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/unconfined.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/unconfined.te	2006-06-09 15:45:23.000000000 -0400
 @@ -33,8 +33,6 @@
  	allow unconfined_t self:system syslog_read;
  	dontaudit unconfined_t self:capability sys_module;
@@ -561,9 +572,9 @@
  #
  
  ifdef(`targeted_policy',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.44/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.45/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/userdomain.if	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/userdomain.if	2006-06-12 10:32:05.000000000 -0400
 @@ -474,34 +474,6 @@
  		xserver_create_xdm_tmp_sockets($1_t)
  	')
@@ -599,9 +610,18 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.44/policy/modules/system/userdomain.te
+@@ -4174,7 +4146,7 @@
+ 	gen_require(`
+ 		type user_home_dir_t;
+ 	')
+-
++	allow $1 user_home_dir_t:dir manage_dir_perms;
+ 	files_home_filetrans($1,user_home_dir_t,dir)
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.45/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.44/policy/modules/system/userdomain.te	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/modules/system/userdomain.te	2006-06-09 15:45:23.000000000 -0400
 @@ -1,11 +1,12 @@
  
 -policy_module(userdomain,1.3.27)
@@ -719,9 +739,9 @@
  		')
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.44/policy/rolemap
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.45/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.44/policy/rolemap	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/rolemap	2006-06-09 15:45:23.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -729,9 +749,9 @@
 +		auditadm_r auditadm auditadm_t
  	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.44/policy/support/misc_macros.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.45/policy/support/misc_macros.spt
 --- nsaserefpolicy/policy/support/misc_macros.spt	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.44/policy/support/misc_macros.spt	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/support/misc_macros.spt	2006-06-09 15:45:23.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  # gen_context(context,mls_sensitivity,[mcs_categories])
@@ -741,9 +761,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.44/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.45/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.44/policy/users	2006-06-08 16:10:33.000000000 -0400
++++ serefpolicy-2.2.45/policy/users	2006-06-09 15:45:23.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- selinux-policy.spec	9 Jun 2006 03:03:22 -0000	1.205
+++ selinux-policy.spec	12 Jun 2006 14:51:08 -0000	1.206
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.45
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -336,6 +336,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-2
+- Allow useradd to create_home_dir in MLS environment
+
 * Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-1
 - Update from upstream
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:55:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:55:21 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.85,1.86
Message-ID: <200606121455.k5CEtLch002241@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2190

Modified Files:
	kdegraphics.spec 
Log Message:
typo fix



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdegraphics.spec	12 Jun 2006 14:37:49 -0000	1.85
+++ kdegraphics.spec	12 Jun 2006 14:55:18 -0000	1.86
@@ -299,7 +299,7 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=%{_include}/kde \
+   --includedir=%{_includedir}/kde \
 %ifnarch %{no_scanner_archs}
    --with-kamera \
 %else



From fedora-cvs-commits at redhat.com  Mon Jun 12 14:59:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 10:59:00 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.53, 1.54 firstboot.spec, 1.74,
	1.75 sources, 1.70, 1.71
Message-ID: <200606121459.k5CEx0Cd003681@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3640

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 May 2006 17:23:15 -0000	1.53
+++ .cvsignore	12 Jun 2006 14:58:58 -0000	1.54
@@ -25,3 +25,4 @@
 firstboot-1.4.8.tar.bz2
 firstboot-1.4.9.tar.bz2
 firstboot-1.4.10.tar.bz2
+firstboot-1.4.11.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- firstboot.spec	30 May 2006 17:23:15 -0000	1.74
+++ firstboot.spec	12 Jun 2006 14:58:58 -0000	1.75
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.10
+Version: 1.4.11
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,11 @@
 
 
 %changelog
+* Mon Jun 12 2006 Chris Lumens <clumens at redhat.com> 1.4.11-1
+- Don't traceback on the display module if there's no display hardware
+  (#142522).
+- Don't forget about reconfig mode if the timer expires (#170609).
+
 * Fri May 26 2006 Chris Lumens <clumens at redhat.com> 1.4.10-1
 - Fix reconfig mode.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	30 May 2006 17:23:15 -0000	1.70
+++ sources	12 Jun 2006 14:58:58 -0000	1.71
@@ -1 +1 @@
-d68b6fe9e8bbd5eec3d6aa13ce530b7d  firstboot-1.4.10.tar.bz2
+91e5523cc5eef1e52f79010cadc3c0cb  firstboot-1.4.11.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:03:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:03:02 -0400
Subject: rpms/util-linux/devel util-linux-2.13-swapon-debug.patch, NONE,
	1.1 util-linux.spec, 1.119, 1.120
Message-ID: <200606121503.k5CF32mJ004449@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4398

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-swapon-debug.patch 
Log Message:


util-linux-2.13-swapon-debug.patch:
 swap.configure |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE util-linux-2.13-swapon-debug.patch ---
--- util-linux-2.13-pre6/mount/swap.configure.debug	2006-06-12 16:56:13.000000000 +0200
+++ util-linux-2.13-pre6/mount/swap.configure	2006-06-12 16:54:45.000000000 +0200
@@ -3,7 +3,7 @@
 
 # Prepare test
 CC=${CC-cc}
-compile="$CC -o conftest conftest.c >/dev/null 2>&1"
+compile="$CC -o conftest conftest.c"
 rm -f conftest conftest.c swapargs.h
 
 # What include files shall we try?
@@ -22,6 +22,9 @@
 echo $SWAPH >> conftest.c
 echo '#include <unistd.h>
 main(){ exit(0); swapon("/dev/null", 0); }' >> conftest.c
+echo $compile
+echo $PAGEH
+echo $SWAPH
 eval $compile
 if test -s conftest; then
 	echo "#define SWAPON_HAS_TWO_ARGS" > swapargs.h


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- util-linux.spec	12 Jun 2006 12:31:43 -0000	1.119
+++ util-linux.spec	12 Jun 2006 15:02:58 -0000	1.120
@@ -30,19 +30,19 @@
 Group: System Environment/Base
 
 ### Dependences
-BuildRequires: sed
-BuildRequires: pam-devel
-BuildRequires: ncurses-devel
-BuildRequires: libtermcap-devel
-BuildRequires: zlib-devel
-BuildRequires: slang-devel
-BuildRequires: texinfo
-BuildRequires: gettext-devel
-BuildRequires: libselinux-devel
-BuildRequires: e2fsprogs-devel >= 1.36
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: e2fsprogs-devel >= 1.36
+BuildRequires: gettext-devel
+BuildRequires: libselinux-devel
+BuildRequires: libtermcap-devel
+BuildRequires: ncurses-devel
+BuildRequires: pam-devel
+BuildRequires: sed
+BuildRequires: slang-devel
+BuildRequires: texinfo
+BuildRequires: zlib-devel
 
 ### Sources
 # TODO [stable]: s/2.13-pre6/%{version}/
@@ -212,6 +212,8 @@
 # 181549 - raw(8) manpage has old information about dd
 Patch242: util-linux-2.12a-raw-man-dd.patch
 
+Patch243: util-linux-2.13-swapon-debug.patch
+
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
 ########### END upstreamable
@@ -305,6 +307,7 @@
 %patch241 -p1 -b .isfull
 %patch242 -p1
 
+%patch243 -p1
 
 %build
 unset LINGUAS || :



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:16:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:16:20 -0400
Subject: rpms/automake17/devel automake17.spec,1.7,1.8
Message-ID: <200606121516.k5CFGKA3011929@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake17/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10803

Modified Files:
	automake17.spec 
Log Message:
- filter dependencies
- buildrequire texinfo for self checks



Index: automake17.spec
===================================================================
RCS file: /cvs/dist/rpms/automake17/devel/automake17.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- automake17.spec	9 Dec 2005 22:39:44 -0000	1.7
+++ automake17.spec	12 Jun 2006 15:16:18 -0000	1.8
@@ -3,18 +3,24 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake17
 Version:	%{api_version}.9
-Release: 6.1
+Release:    7
 License:	GPL
 Group:		Development/Tools
 Source:		ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
+Source10:   filter-provides-automake.sh
+Source11:   filter-requires-automake.sh
 Patch0:		automake-1.7.9-dvi.patch
 URL:		http://sources.redhat.com/automake
 Conflicts:	automake = 1.7.8
 Requires:	perl, autoconf >= 2.54
-Buildrequires:	autoconf >= 2.54
+Buildrequires:	autoconf >= 2.54, texinfo, texinfo-tex
 BuildArchitectures: noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE10}
+%define __find_requires %{SOURCE11}
+
 # run "make check" by default
 %{?_without_check: %define _without_check 1}
 %{!?_without_check: %define _without_check 0}
@@ -65,6 +71,10 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Mon Jun 12 2006 Karsten Hopp <karsten at redhat.de> 1.7.9-7
+- filter dependencies
+- buildrequire texinfo for self checks
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:19:08 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.199,
	1.200 policycoreutils.spec, 1.280, 1.281
Message-ID: <200606121519.k5CFJ8Jd022545@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22510

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-4
- Update to required versions
- Update translations


policycoreutils-rhat.patch:
 audit2allow/Makefile   |    1 
 po/af.po               |    2 
 po/am.po               |    2 
 po/ar.po               |    2 
 po/be.po               |    2 
 po/bg.po               |    2 
 po/bn.po               |    2 
 po/bn_IN.po            |    2 
 po/ca.po               |    2 
 po/cs.po               |    2 
 po/cy.po               |    2 
 po/de.po               |    2 
 po/el.po               |    2 
 po/en_GB.po            |    2 
 po/es.po               |    2 
 po/eu_ES.po            |    2 
 po/fa.po               |    2 
 po/fi.po               |    2 
 po/gu.po               |    2 
 po/he.po               |    2 
 po/hi.po               |    2 
 po/hr.po               |    2 
 po/hu.po               |    2 
 po/hy.po               |    2 
 po/is.po               |    2 
 po/it.po               |    2 
 po/ja.po               |    2 
 po/ka.po               |    2 
 po/kn.po               |    2 
 po/ko.po               |    2 
 po/ku.po               |    2 
 po/lo.po               |    2 
 po/lt.po               |    2 
 po/lv.po               |    2 
 po/mk.po               |    2 
 po/ml.po               |  267 ++++++++++++----------
 po/mr.po               |    2 
 po/ms.po               |  237 +++++++++++++-------
 po/my.po               |    2 
 po/nb.po               |    2 
 po/nn.po               |    2 
 po/no.po               |    2 
 po/nso.po              |    2 
 po/or.po               |    2 
 po/pa.po               |    2 
 po/pl.po               |    2 
 po/policycoreutils.pot |   26 +-
 po/pt.po               |    2 
 po/pt_BR.po            |   94 +++-----
 po/ro.po               |    2 
 po/ru.po               |    2 
 po/si.po               |    2 
 po/sk.po               |    2 
 po/sl.po               |    2 
 po/sq.po               |    2 
 po/sr.po               |    2 
 po/sr at Latn.po          |    2 
 po/ta.po               |    2 
 po/te.po               |    2 
 po/th.po               |    2 
 po/tr.po               |    2 
 po/uk.po               |    2 
 po/ur.po               |    2 
 po/vi.po               |    2 
 po/zh_CN.po            |  573 +++++++++++++++++++++++++++----------------------
 po/zh_TW.po            |    2 
 po/zu.po               |    2 
 scripts/fixfiles       |    3 
 scripts/genhomedircon  |   10 
 setfiles/Makefile      |    1 
 setfiles/setfiles.c    |   38 +++
 71 files changed, 781 insertions(+), 591 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.199 -r 1.200 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- policycoreutils-rhat.patch	7 Jun 2006 14:51:47 -0000	1.199
+++ policycoreutils-rhat.patch	12 Jun 2006 15:19:05 -0000	1.200
@@ -11,7 +11,7 @@
  PYLIBVER ?= python2.4
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.12/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/af.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/af.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -23,7 +23,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.12/po/am.po
 --- nsapolicycoreutils/po/am.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/am.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/am.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -35,7 +35,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.30.12/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ar.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/ar.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -47,7 +47,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.30.12/po/be.po
 --- nsapolicycoreutils/po/be.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/be.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/be.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -59,7 +59,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.30.12/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/bg.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/bg.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -71,7 +71,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.30.12/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/bn_IN.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/bn_IN.po	2006-06-12 11:18:36.000000000 -0400
 @@ -35,7 +35,7 @@
  msgstr ""
  "Project-Id-Version: bn_IN\n"
@@ -83,7 +83,7 @@
  "Language-Team: Bangla (INDIA) <redhat-translation at bengalinux.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.30.12/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/bn.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/bn.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -95,7 +95,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.12/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/ca.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/ca.po	2006-06-12 11:18:36.000000000 -0400
 @@ -21,7 +21,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -107,7 +107,7 @@
  "Language-Team: Catalan <tradgnome at softcatala.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.30.12/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/cs.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/cs.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -119,7 +119,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.30.12/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/cy.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/cy.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -131,7 +131,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.30.12/po/de.po
 --- nsapolicycoreutils/po/de.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/de.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/de.po	2006-06-12 11:18:36.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils 1.28-4\n"
@@ -143,7 +143,7 @@
  "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.30.12/po/el.po
 --- nsapolicycoreutils/po/el.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/el.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/el.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -155,7 +155,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.30.12/po/en_GB.po
 --- nsapolicycoreutils/po/en_GB.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/en_GB.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/en_GB.po	2006-06-12 11:18:36.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -167,7 +167,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.30.12/po/es.po
 --- nsapolicycoreutils/po/es.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/es.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/es.po	2006-06-12 11:18:36.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: \n"
@@ -179,7 +179,7 @@
  "Language-Team:  <es at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/eu_ES.po policycoreutils-1.30.12/po/eu_ES.po
 --- nsapolicycoreutils/po/eu_ES.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/eu_ES.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/eu_ES.po	2006-06-12 11:18:37.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -191,7 +191,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fa.po policycoreutils-1.30.12/po/fa.po
 --- nsapolicycoreutils/po/fa.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/fa.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/fa.po	2006-06-12 11:18:37.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -203,7 +203,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fi.po policycoreutils-1.30.12/po/fi.po
 --- nsapolicycoreutils/po/fi.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/fi.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/fi.po	2006-06-12 11:18:37.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -215,7 +215,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gu.po policycoreutils-1.30.12/po/gu.po
 --- nsapolicycoreutils/po/gu.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/gu.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/gu.po	2006-06-12 11:18:37.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: gu\n"
@@ -227,7 +227,7 @@
  "Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/he.po policycoreutils-1.30.12/po/he.po
 --- nsapolicycoreutils/po/he.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/he.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/he.po	2006-06-12 11:18:37.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -239,7 +239,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.12/po/hi.po
 --- nsapolicycoreutils/po/hi.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/hi.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/hi.po	2006-06-12 11:18:37.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: hi\n"
@@ -251,7 +251,7 @@
  "Language-Team: Hindi <fedora-trans-hi at redhat.com>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hr.po policycoreutils-1.30.12/po/hr.po
 --- nsapolicycoreutils/po/hr.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/hr.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/hr.po	2006-06-12 11:18:37.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -263,7 +263,7 @@
  "Language-Team: Croatian <www.translator-shop.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hu.po policycoreutils-1.30.12/po/hu.po
[...2734 lines suppressed...]
++msgstr "????????? %s ???????????? context"
  
 -#: ../semanage/seobject.py:894 ../semanage/seobject.py:898
 +#: ../semanage/seobject.py:894
@@ -2376,7 +3197,7 @@
  #, python-format
  msgid "Interface %s is not defined"
  msgstr ""
-@@ -791,7 +850,8 @@
+@@ -791,7 +852,8 @@
  msgid "Could not query interface %s"
  msgstr ""
  
@@ -2386,7 +3207,7 @@
  #, python-format
  msgid "Could not modify interface %s"
  msgstr ""
-@@ -801,20 +861,23 @@
+@@ -801,116 +863,125 @@
  msgid "Interface %s is defined in policy, cannot be deleted"
  msgstr ""
  
@@ -2413,54 +3234,55 @@
 +#, python-format
  msgid "Could not check if file context for %s is defined"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "?????? %s ??????????????????????????????????????????"
++msgstr "?????? %s ????????? context ????????????????????????"
  
  #: ../semanage/seobject.py:1024
  #, python-format
-@@ -822,95 +885,101 @@
- msgstr ""
+ msgid "File context for %s already defined"
+-msgstr ""
++msgstr "%s ????????? context ???????????????"
  
  #: ../semanage/seobject.py:1028
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not create file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "????????? %s ?????????????????????"
++msgstr "????????? %s ???????????? context"
  
  #: ../semanage/seobject.py:1037
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not set user in file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "?????????????????????????????? %s ????????????"
++msgstr "??????????????? context ?????? %s ????????????"
  
  #: ../semanage/seobject.py:1041
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not set role in file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "?????????????????????????????? %s ????????????"
++msgstr "??????????????? context ?????? %s ????????????"
  
  #: ../semanage/seobject.py:1045
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not set type in file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "?????????????????????????????? %s ????????????"
++msgstr "??????????????? context ?????? %s ????????????"
  
  #: ../semanage/seobject.py:1050
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not set mls fields in file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "?????????????????????????????? %s ?????? mls ???"
++msgstr "??????????????? context ?????? %s ?????? mls ???"
  
  #: ../semanage/seobject.py:1056
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not set file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "????????? %s ?????????????????????"
++msgstr "????????? %s ???????????? context"
  
 -#: ../semanage/seobject.py:1064 ../semanage/seobject.py:1068
 -#, fuzzy, python-format
@@ -2469,7 +3291,7 @@
 +#, python-format
  msgid "Could not add file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "????????? %s ?????????????????????"
++msgstr "????????? %s ???????????? context"
  
  #: ../semanage/seobject.py:1076
  msgid "Requires setype, serange or seuser"
@@ -2480,14 +3302,15 @@
 +#: ../semanage/seobject.py:1125
  #, python-format
  msgid "File context for %s is not defined"
- msgstr ""
+-msgstr ""
++msgstr "%s ????????? context ???????????????"
  
  #: ../semanage/seobject.py:1090
 -#, fuzzy, python-format
 +#, python-format
  msgid "Could not query file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "????????? %s ?????????????????????"
++msgstr "????????? %s ???????????? context"
  
 -#: ../semanage/seobject.py:1107 ../semanage/seobject.py:1111
 -#, fuzzy, python-format
@@ -2496,12 +3319,13 @@
 +#, python-format
  msgid "Could not modify file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "????????? %s ?????????????????????"
++msgstr "????????? %s ???????????? context"
  
  #: ../semanage/seobject.py:1131
  #, python-format
  msgid "File context for %s is defined in policy, cannot be deleted"
- msgstr ""
+-msgstr ""
++msgstr "%s ????????? context ??????????????????????????????????????????"
  
 -#: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143
 -#, fuzzy, python-format
@@ -2510,13 +3334,13 @@
 +#, python-format
  msgid "Could not delete file context for %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "????????? %s ?????????????????????"
++msgstr "????????? %s ???????????? context"
  
  #: ../semanage/seobject.py:1151
 -#, fuzzy
  msgid "Could not list file contexts"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "???????????????????????????"
++msgstr "?????????????????? context"
  
  #: ../semanage/seobject.py:1184
  msgid "Requires value"
@@ -2543,7 +3367,7 @@
 +#, python-format
  msgid "Could not query file context %s"
 -msgstr "%s!  ????????? %s ??????????????????\n"
-+msgstr "??????????????????????????? %s"
++msgstr "?????????????????? context %s"
  
 -#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1214
 +#: ../semanage/seobject.py:1210
@@ -2551,7 +3375,7 @@
  #, python-format
  msgid "Could not modify boolean %s"
  msgstr ""
-@@ -920,10 +989,11 @@
+@@ -920,10 +991,11 @@
  msgid "Boolean %s is defined in policy, cannot be deleted"
  msgstr ""
  
@@ -2565,7 +3389,7 @@
  
  #: ../semanage/seobject.py:1254
  msgid "Could not list booleans"
-@@ -936,13 +1006,15 @@
+@@ -936,13 +1008,15 @@
  
  #: ../audit2allow/audit2allow:184
  msgid "Compiling policy"
@@ -2582,7 +3406,7 @@
  
  #: ../audit2allow/audit2allow:196
  #, c-format
-@@ -957,4 +1029,5 @@
+@@ -957,4 +1031,5 @@
  #: ../audit2allow/audit2allow:203
  #, c-format
  msgid "Options Error: %s "
@@ -2591,7 +3415,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.12/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/zh_TW.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/zh_TW.po	2006-06-12 11:18:37.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2603,7 +3427,7 @@
  "Language-Team: LANGUAGE <LL at li.org>\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.30.12/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2006-05-30 09:07:13.000000000 -0400
-+++ policycoreutils-1.30.12/po/zu.po	2006-06-07 10:50:41.000000000 -0400
++++ policycoreutils-1.30.12/po/zu.po	2006-06-12 11:18:37.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- policycoreutils.spec	7 Jun 2006 14:51:47 -0000	1.280
+++ policycoreutils.spec	12 Jun 2006 15:19:05 -0000	1.281
@@ -1,11 +1,11 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.12.14-1
-%define libsemanagever 1.6.5-1
-%define libselinuxver 1.30.11-1
+%define libsepolver 1.12.17-1
+%define libsemanagever 1.6.8-1
+%define libselinuxver 1.30.12-2
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.12
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -110,6 +110,10 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-4
+- Update to required versions
+- Update translations
+
 * Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-3
 - Fix shell selection
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:22:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:22:20 -0400
Subject: rpms/k3b/devel k3b-0.12.8-docsym.patch,1.1,1.2 k3b.spec,1.30,1.31
Message-ID: <200606121522.k5CFMKrv023831@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23796

Modified Files:
	k3b-0.12.8-docsym.patch k3b.spec 
Log Message:
fixed symlinks

k3b-0.12.8-docsym.patch:
 admin/am_edit   |    2 +-
 doc/Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: k3b-0.12.8-docsym.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-0.12.8-docsym.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-0.12.8-docsym.patch	8 Jun 2006 08:48:14 -0000	1.1
+++ k3b-0.12.8-docsym.patch	12 Jun 2006 15:22:17 -0000	1.2
@@ -5,7 +5,7 @@
  	fi
  	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
 -	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
-+	$(LN_S) ../$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
++	$(LN_S) ../common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
  
  uninstall-docs:
  	-rm -rf $(kde_htmldir)/$(KDE_LANG)/k3b
@@ -16,7 +16,7 @@
        $lines .= "\tfi\n";
        $lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
 -      $lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-+      $lines .= "\t\$(LN_S) ../$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
++      $lines .= "\t\$(LN_S) ../common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
  
        $lines .= "\n";
        $lines .= "uninstall-docs:\n";


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- k3b.spec	8 Jun 2006 09:00:33 -0000	1.30
+++ k3b.spec	12 Jun 2006 15:22:17 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name: k3b
 Version: 0.12.15
-Release: 2
+Release: 3
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Mon Jun 12 2006 Harald Hoyer <harald at redhat.com> - 0:0.12.15-3
+- fixed symlinks
+
 * Tue May 02 2006 Harald Hoyer <harald at redhat.com> 0:0.12.15-1
 - version 0.12.15
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:22:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:22:32 -0400
Subject: rpms/xen/devel xen-initscript.patch,1.1,1.2 xen.spec,1.113,1.114
Message-ID: <200606121522.k5CFMW3h023957@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23658

Modified Files:
	xen-initscript.patch xen.spec 
Log Message:
Trying to fix #184452 i.e. /etc/init.d/xend misbehaving, Daniel


xen-initscript.patch:
 xend |   42 +++++++++++!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 1 files changed, 11 insertions(+), 31 modifications(!)

Index: xen-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-initscript.patch	9 Sep 2005 03:27:15 -0000	1.1
+++ xen-initscript.patch	12 Jun 2006 15:22:29 -0000	1.2
@@ -1,37 +1,120 @@
---- xen-unstable/tools/examples/init.d/xend.path	2005-09-08 10:41:54.000000000 -0400
-+++ xen-unstable/tools/examples/init.d/xend	2005-09-08 10:43:03.000000000 -0400
-@@ -16,28 +16,28 @@
- {
- 	i=1
- 	rets=10
--	xend status
-+	/usr/sbin/xend status
- 	while [ $? -ne 0 -a $i -lt $rets ]; do
- 	    sleep 1
- 	    echo -n .
- 	    i=$(($i + 1))
--	    xend status
-+	    /usr/sbin/xend status
- 	done
- }
- 
- case "$1" in
-   start)
--	xend start
-+	/usr/sbin/xend start
- 	await_daemons_up
- 	;;
-   stop)
--	xend stop
-+	/usr/sbin/xend stop
- 	;;
-   status)
--	xend status
-+	/usr/sbin/xend status
- 	;;
-   restart|reload|force-reload)
--	xend restart
-+	/usr/sbin/xend restart
- 	await_daemons_up
- 	;;
-   *)
+*** xen-unstable/tools/examples/init.d/xend.orig	2006-06-12 17:10:53.000000000 +0200
+--- xen-unstable/tools/examples/init.d/xend	2006-06-12 17:11:22.000000000 +0200
+***************
+*** 7,43 ****
+  # chkconfig: 2345 98 01
+  # description: Starts and stops the Xen control daemon.
+  
+  if ! grep -q "control_d" /proc/xen/capabilities ; then
+  	exit 0
+  fi
+  
+  # Wait for Xend to be up
+  function await_daemons_up
+  {
+  	i=1
+  	rets=10
+! 	xend status
+  	while [ $? -ne 0 -a $i -lt $rets ]; do
+  	    sleep 1
+  	    echo -n .
+  	    i=$(($i + 1))
+! 	    xend status
+  	done
+  }
+  
+  case "$1" in
+    start)
+! 	xend start
+  	await_daemons_up
+  	;;
+    stop)
+! 	xend stop
+  	;;
+    status)
+! 	xend status
+  	;;
+    restart|reload|force-reload)
+! 	xend restart
+  	await_daemons_up
+  	;;
+    *)
+--- 7,64 ----
+  # chkconfig: 2345 98 01
+  # description: Starts and stops the Xen control daemon.
+  
++ # Source function library.
++ . /etc/rc.d/init.d/functions
++ 
++ RETVAL=0
+  if ! grep -q "control_d" /proc/xen/capabilities ; then
++         RETVAL=-1
+  	exit 0
+  fi
++ prog=xend
+  
+  # Wait for Xend to be up
+  function await_daemons_up
+  {
+  	i=1
+  	rets=10
+! 	/usr/sbin/xend status
+  	while [ $? -ne 0 -a $i -lt $rets ]; do
+  	    sleep 1
+  	    echo -n .
+  	    i=$(($i + 1))
+! 	    /usr/sbin/xend status
+  	done
++         if [ $i -ge $rets ]; then
++             RETVAL=-1
++             return 1
++         fi
++         return 0
+  }
+  
+  case "$1" in
+    start)
+! 	echo -n $"Starting $prog: "
+! 	/usr/sbin/xend start
+  	await_daemons_up
+  	;;
+    stop)
+! 	echo -n $"Stopping $prog: "
+! 	/usr/sbin/xend stop
+!         RETVAL=$?
+  	;;
+    status)
+! 	/usr/sbin/xend status
+! 	if [ $? = 0 ] ; then
+! 	    echo xend is running
+! 	else
+! 	    echo xend is stopped
+! 	fi
+!         exit 0
+  	;;
+    restart|reload|force-reload)
+!         echo -n $"$1 $prog: "
+! 	/usr/sbin/xend restart
+  	await_daemons_up
+  	;;
+    *)
+*************** case "$1" in
+*** 47,51 ****
+  	exit 1
+  esac
+  
+! exit $?
+  
+--- 68,79 ----
+  	exit 1
+  esac
+  
+! if [ $RETVAL = 0 ] ; then
+!     echo_success
+!     echo
+! else
+!     echo_failure
+!     echo
+! fi
+! exit $RETVAL
+  


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- xen.spec	7 Jun 2006 14:52:52 -0000	1.113
+++ xen.spec	12 Jun 2006 15:22:29 -0000	1.114
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 6
+Release: 7
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -165,6 +165,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Mon Jun 12 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-7
+- more initscript patch to report status #184452
+
 * Wed Jun  7 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-6
 - Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
   glibc32 correctly



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:39:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:39:19 -0400
Subject: rpms/automake17/devel filter-provides-automake.sh, NONE,
	1.1 filter-requires-automake.sh, NONE, 1.1
Message-ID: <200606121539.k5CFdJvC027932@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/automake17/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27903

Added Files:
	filter-provides-automake.sh filter-requires-automake.sh 
Log Message:



--- NEW FILE filter-provides-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Automake' | sort -u


--- NEW FILE filter-requires-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Automake' | sort -u



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:45:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:45:23 -0400
Subject: rpms/hplip/devel hplip.spec,1.82,1.83
Message-ID: <200606121545.k5CFjNie029396@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29360

Modified Files:
	hplip.spec 
Log Message:
* Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.9.11-6
- Build requires autoconf (bug #194682).



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- hplip.spec	26 May 2006 12:56:27 -0000	1.82
+++ hplip.spec	12 Jun 2006 15:45:20 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.11
-Release: 5
+Release: 6
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -29,6 +29,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libusb-devel
+BuildRequires: autoconf
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -172,6 +173,9 @@
 fi
 
 %changelog
+* Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.9.11-6
+- Build requires autoconf (bug #194682).
+
 * Fri May 26 2006 Tim Waugh <twaugh at redhat.com> 0.9.11-5
 - Include doc files (bug #192790).
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:48:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:48:49 -0400
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.20,1.21
Message-ID: <200606121548.k5CFmnir012855@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/linuxdoc-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12816

Modified Files:
	linuxdoc-tools.spec 
Log Message:
* Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.9.21-7
- Build requires autoconf (bug #194752).



Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linuxdoc-tools.spec	11 Feb 2006 04:24:10 -0000	1.20
+++ linuxdoc-tools.spec	12 Jun 2006 15:48:47 -0000	1.21
@@ -5,7 +5,7 @@
 Obsoletes: sgml-tools
 Obsoletes: linuxdoc-sgml
 Version: 0.9.21
-Release: 6.2.1
+Release: 7
 License: Freely distributable
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -17,7 +17,7 @@
 Requires: jade
 Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: flex sgml-common jade groff
+BuildRequires: flex sgml-common jade groff autoconf
 Requires: gawk groff
 # this should anyway be only a "suggest"
 %if %{tetex}
@@ -100,6 +100,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.9.21-7
+- Build requires autoconf (bug #194752).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.21-6.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:52:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:52:50 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.75,1.76
Message-ID: <200606121552.k5CFqo24006046@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24429

Modified Files:
	xorg-x11-server.spec 
Log Message:
- --enable-xorg on ppc64 too.
- Re-add cvt, got dropped somehow.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-server.spec	9 Jun 2006 18:09:50 -0000	1.75
+++ xorg-x11-server.spec	12 Jun 2006 15:52:48 -0000	1.76
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   8
+Release:   9
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -28,14 +28,14 @@
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
 
-# INFO: We don't ship the X server on s390/s390x/ppc64
+# INFO: We don't ship the X server on s390/s390x
 ExcludeArch: s390 s390x
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
 
-%ifarch %{ix86} x86_64 ppc ia64
+%ifarch %{ix86} x86_64 ppc ia64 ppc64
 %define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest
 %else
 %define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest
@@ -334,7 +334,6 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/outl
     rm -f $RPM_BUILD_ROOT%{_bindir}/outw
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
-    rm -f $RPM_BUILD_ROOT%{_bindir}/cvt
 %endif
 }
 
@@ -400,8 +399,8 @@
 %{_bindir}/getconfig
 %{_bindir}/getconfig.pl
 %{_bindir}/gtf
-%if %{with_developer_utils}
 %{_bindir}/cvt
+%if %{with_developer_utils}
 %{_bindir}/inb
 %{_bindir}/inl
 %{_bindir}/inw
@@ -546,6 +545,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 12 2006 Adam Jackson <ajax at redhat.com> 1.1.0-9
+- --enable-xorg on ppc64 too.
+- Re-add cvt, got dropped somehow.
+
 * Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-8
 - Add our friend, libtool, to BuildRequires.
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:56:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:56:59 -0400
Subject: rpms/kdebindings/FC-4 kdebindings.spec,1.39,1.40
Message-ID: <200606121556.k5CFuxfb024785@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24762

Modified Files:
	kdebindings.spec 
Log Message:
fix rpm file list



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/kdebindings.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdebindings.spec	10 Jun 2006 23:06:17 -0000	1.39
+++ kdebindings.spec	12 Jun 2006 15:56:57 -0000	1.40
@@ -184,7 +184,7 @@
 %{_datadir}/servicetypes/*
 %{_bindir}/*
 %if %{ruby}
-%{_libdir}/site_ruby
+%{_prefix}/lib*/ruby/site_ruby/%{rubyver}/*
 %endif
 %if %{python}
 %{_libdir}/python*



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:57:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:57:07 -0400
Subject: rpms/lftp/devel lftp.spec,1.48,1.49
Message-ID: <200606121557.k5CFv7nt024807@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24794

Modified Files:
	lftp.spec 
Log Message:
add BuildRequires for broken Brew


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- lftp.spec	31 May 2006 23:27:36 -0000	1.48
+++ lftp.spec	12 Jun 2006 15:57:05 -0000	1.49
@@ -1,13 +1,13 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.7
-Release: 	1.FC6
+Release: 	2.FC6
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
 URL: 		http://lftp.yar.ru/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildPrereq: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel
+BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool
 Requires:    	perl-String-CRC32
 Patch173276: 	lftp-3.3.5-bz173276.patch
 Patch2:		lftp-3.4.1-dont_core.patch



From fedora-cvs-commits at redhat.com  Mon Jun 12 15:58:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 11:58:28 -0400
Subject: rpms/lftp/devel lftp.spec,1.49,1.50
Message-ID: <200606121558.k5CFwSGp024912@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24899

Modified Files:
	lftp.spec 
Log Message:
add BuildRequires for broken Brew


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- lftp.spec	12 Jun 2006 15:57:05 -0000	1.49
+++ lftp.spec	12 Jun 2006 15:58:26 -0000	1.50
@@ -84,6 +84,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Mon Jun 12 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.7-2
+- Add BuildRequires for broken Brew
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.7-1
 - Upgrade to upstream version 3.4.7
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:05:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:05:01 -0400
Subject: rpms/util-linux/devel util-linux-2.13-swap-page.patch, NONE,
	1.1 util-linux.spec, 1.120,
	1.121 util-linux-2.13-swapon-debug.patch, 1.1, NONE
Message-ID: <200606121605.k5CG51KC025100@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25081

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-swap-page.patch 
Removed Files:
	util-linux-2.13-swapon-debug.patch 
Log Message:
remove asm/page.h usage

util-linux-2.13-swap-page.patch:
 configure.ac         |    3 ++-
 disk-utils/mkswap.c  |   15 ---------------
 mount/swap.configure |    9 +++++----
 3 files changed, 7 insertions(+), 20 deletions(-)

--- NEW FILE util-linux-2.13-swap-page.patch ---
--- util-linux-2.13-pre6/disk-utils/mkswap.c.page	2006-06-12 17:30:57.000000000 +0200
+++ util-linux-2.13-pre6/disk-utils/mkswap.c	2006-06-12 17:30:31.000000000 +0200
@@ -53,17 +53,6 @@
 #include <uuid/uuid.h>
 #endif
 
-/* Try to get PAGE_SIZE from libc or kernel includes */
-#ifdef HAVE_SYS_USER_H
-				/* Note: <sys/user.h> says: for gdb only */
-#include <sys/user.h>		/* for PAGE_SIZE and PAGE_SHIFT */
-#else
-#ifdef HAVE_ASM_PAGE_H
-#include <asm/page.h>		/* for PAGE_SIZE and PAGE_SHIFT */
-				/* we also get PAGE_SIZE via getpagesize() */
-#endif
-#endif
-
 #ifndef _IO
 /* pre-1.3.45 */
 #define BLKGETSIZE 0x1260
@@ -172,10 +161,6 @@
 
 static void
 init_signature_page(void) {
-
-#ifdef PAGE_SIZE
-	defined_pagesize = PAGE_SIZE;
-#endif
 	kernel_pagesize = getpagesize();
 	pagesize = kernel_pagesize;
 
--- util-linux-2.13-pre6/configure.ac.page	2006-06-12 17:28:51.000000000 +0200
+++ util-linux-2.13-pre6/configure.ac	2006-06-12 17:28:28.000000000 +0200
@@ -26,7 +26,8 @@
 ])
 AC_CHECK_HEADERS(langinfo.h)
 AC_CHECK_HEADERS(sys/user.h)
-AC_CHECK_HEADERS(asm/page.h)
+# Suck ...
+#AC_CHECK_HEADERS(asm/page.h)
 AC_CHECK_HEADERS(rpcsvc/nfs_prot.h)
 AC_CHECK_HEADERS(sys/io.h)
 AC_CHECK_HEADERS(pty.h)
--- util-linux-2.13-pre6/mount/swap.configure.page	2006-06-12 17:23:27.000000000 +0200
+++ util-linux-2.13-pre6/mount/swap.configure	2006-06-12 17:25:28.000000000 +0200
@@ -3,7 +3,7 @@
 
 # Prepare test
 CC=${CC-cc}
-compile="$CC -o conftest conftest.c >/dev/null 2>&1"
+compile="$CC -o conftest conftest.c"
 rm -f conftest conftest.c swapargs.h
 
 # What include files shall we try?
@@ -14,9 +14,10 @@
 PAGEH=
 if [ -f /usr/include/sys/swap.h ]; then
 	SWAPH="#include <sys/swap.h>"
-	if [ -f /usr/include/asm/page.h ]; then
-		PAGEH="#include <asm/page.h>"
-	fi
+	# Suck ...
+	#if [ -f /usr/include/asm/page.h ]; then
+	#	PAGEH="#include <asm/page.h>"
+	#fi
 fi
 echo $PAGEH > conftest.c
 echo $SWAPH >> conftest.c


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- util-linux.spec	12 Jun 2006 15:02:58 -0000	1.120
+++ util-linux.spec	12 Jun 2006 16:04:59 -0000	1.121
@@ -211,8 +211,8 @@
 Patch241: util-linux-2.13-fdisk-isfull.patch
 # 181549 - raw(8) manpage has old information about dd
 Patch242: util-linux-2.12a-raw-man-dd.patch
-
-Patch243: util-linux-2.13-swapon-debug.patch
+# Don't use asm/page.h
+Patch243: util-linux-2.13-swap-page.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -304,9 +304,8 @@
 %patch238 -p1
 %patch239 -p1
 %patch240 -p1
-%patch241 -p1 -b .isfull
+%patch241 -p1
 %patch242 -p1
-
 %patch243 -p1
 
 %build
@@ -705,6 +704,7 @@
 - fdisk: wrong number of sectors for large disks (suse#160822)
 - merge fdisk-xvd (#182553) with new fdisk-isfull (#188981) patch 
 - fix #181549 - raw(8) manpage has old information about dd
+- remove asm/page.h usage
 
 * Wed May 24 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.24
 - Remove requirement on restorecon, since we can do the same thing


--- util-linux-2.13-swapon-debug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:07:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:07:29 -0400
Subject: rpms/kdegraphics/FC-4 kdegraphics.spec,1.55,1.56 sources,1.30,1.31
Message-ID: <200606121607.k5CG7TWD025288@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv25273

Modified Files:
	kdegraphics.spec sources 
Log Message:
3.5.3



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdegraphics.spec	12 Apr 2006 09:39:41 -0000	1.55
+++ kdegraphics.spec	12 Jun 2006 16:07:26 -0000	1.56
@@ -17,7 +17,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
@@ -51,10 +51,8 @@
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-
-Prereq: /sbin/ldconfig
+Requires(post,postun): /sbin/ldconfig
 
 %description
 Graphics applications for the K Desktop Environment.
@@ -363,6 +361,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	12 Apr 2006 09:39:41 -0000	1.30
+++ sources	12 Jun 2006 16:07:27 -0000	1.31
@@ -1 +1 @@
-8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2
+56bd5537521dc94633f8effaace523cb  kdegraphics-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:14:49 -0400
Subject: rpms/sgml-common/devel sgml-common.spec,1.11,1.12
Message-ID: <200606121614.k5CGEnTh004059@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/sgml-common/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4031

Modified Files:
	sgml-common.spec 
Log Message:
* Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.6.3-18
- Build requires automake and autoconf (bug #194709).



Index: sgml-common.spec
===================================================================
RCS file: /cvs/dist/rpms/sgml-common/devel/sgml-common.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sgml-common.spec	9 Dec 2005 22:43:12 -0000	1.11
+++ sgml-common.spec	12 Jun 2006 16:14:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 17.1
+Release: 18
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files.
@@ -26,6 +26,8 @@
 
 Requires: sh-utils fileutils textutils grep
 BuildRequires: libxml2 >= 2.4.8-2
+BuildRequires: automake
+BuildRequires: autoconf
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -130,6 +132,9 @@
 %dir /usr/share/xml
 
 %changelog
+* Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.6.3-18
+- Build requires automake and autoconf (bug #194709).
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:16:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:16:31 -0400
Subject: rpms/kdenetwork/FC-4 kdenetwork.spec,1.59,1.60 sources,1.37,1.38
Message-ID: <200606121616.k5CGGVtB012984@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11856

Modified Files:
	kdenetwork.spec sources 
Log Message:
3.5.3



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/kdenetwork.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdenetwork.spec	12 Apr 2006 12:37:59 -0000	1.59
+++ kdenetwork.spec	12 Jun 2006 16:16:28 -0000	1.60
@@ -15,7 +15,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
@@ -121,7 +121,7 @@
    --with-qt-libraries=$QTDIR/lib \
    --includedir=%{_includedir}/kde
 
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -228,6 +228,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	12 Apr 2006 09:51:44 -0000	1.37
+++ sources	12 Jun 2006 16:16:29 -0000	1.38
@@ -1 +1 @@
-dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2
+119af91a048c34d9a917a1898f215554  kdenetwork-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:18:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:18:17 -0400
Subject: rpms/lsof/devel lsof_4.78B-rh-selinux.patch, NONE, 1.1 lsof.spec,
	1.28, 1.29
Message-ID: <200606121618.k5CGIHkT020045@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20013

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.78B-rh-selinux.patch 
Log Message:
fix selinux bug

lsof_4.78B-rh-selinux.patch:
 main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lsof_4.78B-rh-selinux.patch ---
--- lsof_4.78B-rh/main.c.selinux	2006-06-12 18:09:34.000000000 +0200
+++ lsof_4.78B-rh/main.c	2006-06-12 18:11:22.000000000 +0200
@@ -185,9 +185,9 @@
 #endif	/* defined(HASXOPT) */
 
 #if	defined(HASZONES)
-	    "z:"
+	    "z:",
 #else	/* !defined(HASZONES) */
-	    ""
+	    "",
 #endif	/* defined(HASZONES) */
  
 #if	defined(HASSELINUX)


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- lsof.spec	5 Jun 2006 10:25:23 -0000	1.28
+++ lsof.spec	12 Jun 2006 16:18:15 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.78
-Release: 06052006devel.1
+Release: 06052006devel.2
 License: Free
 %define lsofrh lsof_4.78B-rh
 Group: Development/Debuggers
@@ -9,6 +9,11 @@
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 
+BuildRequires: libselinux-devel
+
+# 194864 - lsof segfaults on starting
+Patch0: lsof_4.78B-rh-selinux.patch
+
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
 information about files that are open by the processes running on a
@@ -16,6 +21,7 @@
 
 %prep
 %setup -q -n %{lsofrh}
+%patch0 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -39,6 +45,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 4.78-06052006devel.2
+- added BuildRequires libselinux-devel
+- fix #194864 - lsof segfaults on starting
+
 * Wed May 24 2006 Karel Zak <kzak at redhat.com> 4.78-06052006devel.1
 - upgrade to 4.78B (upstream devel version with selinux patch)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:27:42 -0400
Subject: rpms/glib2/devel .cvsignore, 1.52, 1.53 glib2.spec, 1.99,
	1.100 sources, 1.52, 1.53
Message-ID: <200606121627.k5CGRgHi023678@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23635

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	5 Jun 2006 18:28:43 -0000	1.52
+++ .cvsignore	12 Jun 2006 16:27:40 -0000	1.53
@@ -1 +1 @@
-glib-2.11.2.tar.bz2
+glib-2.11.3.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- glib2.spec	5 Jun 2006 18:28:43 -0000	1.99
+++ glib2.spec	12 Jun 2006 16:27:40 -0000	1.100
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.11.2
+Version: 2.11.3
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.3-1
+- Update to 2.11.3
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-1
 - Update to 2.11.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	5 Jun 2006 18:28:43 -0000	1.52
+++ sources	12 Jun 2006 16:27:40 -0000	1.53
@@ -1 +1 @@
-18464b85bfd589f83897623c637a1553  glib-2.11.2.tar.bz2
+41931c4965f7e1848f81b800914905cd  glib-2.11.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:38:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:38:52 -0400
Subject: rpms/kdebindings/FC-5 kdebindings.spec,1.44,1.45
Message-ID: <200606121638.k5CGcqfI025454@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25409

Modified Files:
	kdebindings.spec 
Log Message:
fix rpm file list



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/kdebindings.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdebindings.spec	10 Jun 2006 22:27:17 -0000	1.44
+++ kdebindings.spec	12 Jun 2006 16:38:40 -0000	1.45
@@ -140,7 +140,7 @@
 %endif
    --without-java
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -186,7 +186,7 @@
 %{_datadir}/servicetypes/*
 %{_bindir}/*
 %if %{ruby}
-%{_libdir}/site_ruby
+%{_prefix}/lib*/ruby/site_ruby/%{rubyver}/*
 %endif
 %if %{python}
 %{_libdir}/python*



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:38:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:38:54 -0400
Subject: rpms/gcc/devel gcc41.spec,1.72,1.73
Message-ID: <200606121638.k5CGcsnK025479@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25431

Modified Files:
	gcc41.spec 
Log Message:
4.1.1-2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gcc41.spec	12 Jun 2006 13:44:09 -0000	1.72
+++ gcc41.spec	12 Jun 2006 16:38:44 -0000	1.73
@@ -52,6 +52,9 @@
 # Ada requires Ada to build
 BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
 %endif
+%ifarch ia64
+BuildRequires: libunwind >= 0.98
+%endif
 Requires: cpp = %{version}-%{release}
 # Need .eh_frame ld optimizations
 # Need proper visibility support



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:41:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:41:47 -0400
Subject: rpms/kernel/devel linux-2.6-warn-c-p-a.patch,1.1,1.2
Message-ID: <200606121641.k5CGfl1M026031@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25991

Modified Files:
	linux-2.6-warn-c-p-a.patch 
Log Message:
buildfix

linux-2.6-warn-c-p-a.patch:
 pageattr.c |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: linux-2.6-warn-c-p-a.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warn-c-p-a.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-warn-c-p-a.patch	11 Jun 2006 17:28:11 -0000	1.1
+++ linux-2.6-warn-c-p-a.patch	12 Jun 2006 16:41:35 -0000	1.2
@@ -26,7 +26,7 @@
  	BUG_ON(PageHighMem(page));
  	address = (unsigned long)page_address(page);
  
-+	if (address >= __start_rodata && address <= __end_rodata && prot != PAGE_KERNEL_RO && once++ == 0) {
++	if (address >= __start_rodata && address <= __end_rodata && prot != __PAGE_KERNEL_RO && once++ == 0) {
 +		printk(KERN_ERR "Possible trojan or rootkit detected!\n");
 +		add_taint(TAINT_MACHINE_CHECK);
 +	}



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:43:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:43:12 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.200,1.201
Message-ID: <200606121643.k5CGhCEF026450@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26423

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-4
- Update to required versions
- Update translations


policycoreutils-rhat.patch:
 audit2allow/Makefile   |    1 
 po/af.po               |    2 
 po/am.po               |    2 
 po/ar.po               |    2 
 po/be.po               |    2 
 po/bg.po               |    2 
 po/bn.po               |    2 
 po/bn_IN.po            |    2 
 po/ca.po               |    2 
 po/cs.po               |    2 
 po/cy.po               |    2 
 po/de.po               |    2 
 po/el.po               |    2 
 po/en_GB.po            |    2 
 po/es.po               |    2 
 po/eu_ES.po            |    2 
 po/fa.po               |    2 
 po/fi.po               |    2 
 po/gu.po               |    2 
 po/he.po               |    2 
 po/hi.po               |    2 
 po/hr.po               |    2 
 po/hu.po               |    2 
 po/hy.po               |    2 
 po/is.po               |    2 
 po/it.po               |    2 
 po/ja.po               |    2 
 po/ka.po               |    2 
 po/kn.po               |    2 
 po/ko.po               |    2 
 po/ku.po               |    2 
 po/lo.po               |    2 
 po/lt.po               |    2 
 po/lv.po               |    2 
 po/mk.po               |    2 
 po/ml.po               |  267 ++++++++++++----------
 po/mr.po               |    2 
 po/ms.po               |  237 +++++++++++++-------
 po/my.po               |    2 
 po/nb.po               |    2 
 po/nn.po               |    2 
 po/no.po               |    2 
 po/nso.po              |    2 
 po/or.po               |    2 
 po/pa.po               |    2 
 po/pl.po               |    2 
 po/policycoreutils.pot |   26 +-
 po/pt.po               |    2 
 po/pt_BR.po            |   94 +++-----
 po/ro.po               |    2 
 po/ru.po               |    2 
 po/si.po               |    2 
 po/sk.po               |    2 
 po/sl.po               |    2 
 po/sq.po               |    2 
 po/sr.po               |    2 
 po/sr at Latn.po          |    2 
 po/ta.po               |    2 
 po/te.po               |    2 
 po/th.po               |    2 
 po/tr.po               |    2 
 po/uk.po               |    2 
 po/ur.po               |    2 
 po/vi.po               |    2 
 po/zh_CN.po            |  573 +++++++++++++++++++++++++++----------------------
 po/zh_TW.po            |    2 
 po/zu.po               |    2 
 scripts/fixfiles       |    3 
 scripts/genhomedircon  |   10 
 semanage/seobject.py   |    4 
 setfiles/Makefile      |    1 
 setfiles/setfiles.c    |   38 +++
 72 files changed, 783 insertions(+), 593 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- policycoreutils-rhat.patch	12 Jun 2006 15:19:05 -0000	1.200
+++ policycoreutils-rhat.patch	12 Jun 2006 16:43:09 -0000	1.201
@@ -3501,6 +3501,20 @@
  		fd.close()
  		return ret
  
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.12/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-05-30 09:07:12.000000000 -0400
++++ policycoreutils-1.30.12/semanage/seobject.py	2006-06-12 12:42:06.000000000 -0400
+@@ -195,8 +195,8 @@
+ 
+ 	def save(self):
+ 		(fd, newfilename) = tempfile.mkstemp('', self.filename)
+-		fd.write(self.out())
+-		fd.close()
++		os.write(fd, self.out())
++		os.close(fd)
+ 		os.rename(newfilename, self.filename)
+ 
+ class semanageRecords:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-1.30.12/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2006-05-30 09:07:14.000000000 -0400
 +++ policycoreutils-1.30.12/setfiles/Makefile	2006-06-07 10:50:41.000000000 -0400



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:45:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:45:55 -0400
Subject: rpms/kernel/devel linux-2.6-autofs-invalidate.patch, NONE,
	1.1 kernel-2.6.spec, 1.2269, 1.2270
Message-ID: <200606121645.k5CGjtJ4030148@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29599

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-autofs-invalidate.patch 
Log Message:
autofs4 - need to invalidate children on tree mount expire


linux-2.6-autofs-invalidate.patch:
 expire.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-autofs-invalidate.patch ---

From: Ian Kent <raven at themaw.net>
To: Andrew Morton <akpm at osdl.org>
Cc: autofs mailing list <autofs at linux.kernel.org>, Kernel Mailing List
<linux-kernel at vger.kernel.org>, linux-fsdevel
<linux-fsdevel at vger.kernel.org>
Subject: [PATCH] autofs4 - need to invalidate children on tree mount expire
Date: Mon, 12 Jun 2006 14:52:45 +0800 (WST)

Hi Andrew,

I've found a case where invalid dentrys in a mount tree, waiting to be 
cleaned up by d_invalidate, prevent the expected expire.

In this case dentrys created during a lookup for which a mount fails or 
has no entry in the mount map contribute to the d_count of the parent 
dentry. These dentrys may not be invalidated prior to comparing the 
interanl usage count of valid autofs dentrys against the dentry d_count 
which makes a mount tree appear busy so it doesn't expire.

Signed-off-by: Ian Kent <raven at themaw.net>

--

--- linux-2.6.17-rc6-mm2/fs/autofs4/expire.c.need-invalidate-on-tree-expire	2006-06-12 14:24:21.000000000 +0800
+++ linux-2.6.17-rc6-mm2/fs/autofs4/expire.c	2006-06-12 14:24:36.000000000 +0800
@@ -174,6 +174,12 @@ static int autofs4_tree_busy(struct vfsm
 			struct autofs_info *ino = autofs4_dentry_ino(p);
 			unsigned int ino_count = atomic_read(&ino->count);
 
+			/*
+			 * Clean stale dentries below that have not been
+			 * invalidated after a mount fail during lookup
+			 */
+			d_invalidate(p);
+
 			/* allow for dget above and top is already dgot */
 			if (p == top)
 				ino_count += 2;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2269
retrieving revision 1.2270
diff -u -r1.2269 -r1.2270
--- kernel-2.6.spec	12 Jun 2006 13:04:19 -0000	1.2269
+++ kernel-2.6.spec	12 Jun 2006 16:45:53 -0000	1.2270
@@ -378,6 +378,7 @@
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
+Patch1690: linux-2.6-autofs-invalidate.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -1035,6 +1036,8 @@
 %patch1670 -p1
 # Add some USB devices to the unusual quirk list.
 %patch1680 -p1
+# autofs4 - need to invalidate children on tree mount expire
+%patch1690 -p1
 # Silence debug messages in w1
 %patch1700 -p1
 # Only print migration info on SMP
@@ -1821,6 +1824,7 @@
 %changelog
 * Mon Jun 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git3
+- autofs4 - need to invalidate children on tree mount expire
 
 * Sun Jun 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git2



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:45:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:45:54 -0400
Subject: rpms/lftp/devel lftp.spec,1.50,1.51
Message-ID: <200606121645.k5CGjsw2030131@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29705

Modified Files:
	lftp.spec 
Log Message:






From fedora-cvs-commits at redhat.com  Mon Jun 12 16:53:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:53:00 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.281,1.282
Message-ID: <200606121653.k5CGr0xF012317@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12292

Modified Files:
	policycoreutils.spec 
Log Message:
* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-4
- Update to required versions
- Update translation



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- policycoreutils.spec	12 Jun 2006 15:19:05 -0000	1.281
+++ policycoreutils.spec	12 Jun 2006 16:52:57 -0000	1.282
@@ -1,7 +1,7 @@
 %define libauditver 1.1.4-3
 %define libsepolver 1.12.17-1
 %define libsemanagever 1.6.8-1
-%define libselinuxver 1.30.12-2
+%define libselinuxver 1.30.12-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.12
@@ -112,7 +112,7 @@
 %changelog
 * Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-4
 - Update to required versions
-- Update translations
+- Update translation
 
 * Wed Jun 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-3
 - Fix shell selection



From fedora-cvs-commits at redhat.com  Mon Jun 12 16:55:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 12:55:20 -0400
Subject: rpms/dbus/devel dbus.spec,1.81,1.82
Message-ID: <200606121655.k5CGtKN8013276@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13206

Modified Files:
	dbus.spec 
Log Message:
- Update to upstream 0.62



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- dbus.spec	6 Jun 2006 13:49:50 -0000	1.81
+++ dbus.spec	12 Jun 2006 16:55:18 -0000	1.82
@@ -18,8 +18,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 0.61
-Release: 6
+Version: 0.62
+Release: 1 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -55,8 +55,6 @@
 #make sure we take this out if ABI changes
 Patch4: dbus-0.61-mono-no-abi-version-change.patch 
 
-Patch5: dbus-0.61.dbus-connection.c.backport.patch
-
 %description
 
 D-BUS is a system for sending messages between applications. It is
@@ -147,8 +145,6 @@
 #make sure we take this out if ABI changes
 %patch4 -p1 -b .mono-no-abi-version-change
 
-%patch5 -p1 -b .backport
-
 autoreconf -f -i
 
 %build
@@ -349,6 +345,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 John (J5) Palmieri <johnp at redhat.com> - 0.62-1
+- Update to upstream 0.62
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 0.61-6
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 17:07:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 13:07:11 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2270,1.2271
Message-ID: <200606121707.k5CH7BrD015825@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15793

Modified Files:
	kernel-2.6.spec 
Log Message:
disable broken patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2270
retrieving revision 1.2271
diff -u -r1.2270 -r1.2271
--- kernel-2.6.spec	12 Jun 2006 16:45:53 -0000	1.2270
+++ kernel-2.6.spec	12 Jun 2006 17:07:09 -0000	1.2271
@@ -914,7 +914,7 @@
 
 # Exec shield 
 %patch810 -p1
-%patch813 -p1
+#%patch813 -p1
 
 # Xen exec-shield bits
 %if %{includexen}



From fedora-cvs-commits at redhat.com  Mon Jun 12 17:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 13:18:34 -0400
Subject: rpms/rsync/devel rsync.spec,1.37,1.38
Message-ID: <200606121718.k5CHIYKk000905@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/rsync/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv852

Modified Files:
	rsync.spec 
Log Message:
More BuildRequires



Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rsync.spec	10 Jun 2006 03:17:06 -0000	1.37
+++ rsync.spec	12 Jun 2006 17:18:32 -0000	1.38
@@ -8,7 +8,7 @@
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
 Patch1: rsync-2.6.8-xattrs_bug.patch
-BuildRequires: libacl-devel, libattr-devel
+BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 License: GPL
@@ -62,6 +62,7 @@
 - Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
 - Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable
 - replace --with... with --enable... so they actually work
+- Add make, autoconf and gcc to BuildRequires
 
 * Mon May 8 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-2
 - New upstream release



From fedora-cvs-commits at redhat.com  Mon Jun 12 17:37:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 13:37:13 -0400
Subject: rpms/dbus/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <200606121737.k5CHbDTA006282@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5647

Modified Files:
	.cvsignore sources 
Log Message:
- upload 0.62 sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	24 Feb 2006 20:36:51 -0000	1.18
+++ .cvsignore	12 Jun 2006 17:37:10 -0000	1.19
@@ -11,3 +11,4 @@
 dbus-0.50.tar.gz
 dbus-0.60.tar.gz
 dbus-0.61.tar.gz
+dbus-0.62.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	24 Feb 2006 20:36:51 -0000	1.18
+++ sources	12 Jun 2006 17:37:10 -0000	1.19
@@ -1 +1 @@
-cfd4f26004e4304e0dace4d82894e50b  dbus-0.61.tar.gz
+ba7692f63d0e9f1ef06703dff56cb650  dbus-0.62.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 12 17:48:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 13:48:24 -0400
Subject: rpms/dbus/devel dbus.spec,1.82,1.83
Message-ID: <200606121748.k5CHmN7K024022@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23867

Modified Files:
	dbus.spec 
Log Message:
- add gettext BR



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- dbus.spec	12 Jun 2006 16:55:18 -0000	1.82
+++ dbus.spec	12 Jun 2006 17:48:21 -0000	1.83
@@ -41,6 +41,8 @@
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libcap-devel
+BuildRequires: gettext
+
 %ifarch %mono_archs
 BuildRequires: mono-devel gtk-sharp
 %endif



From fedora-cvs-commits at redhat.com  Mon Jun 12 18:06:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 14:06:24 -0400
Subject: rpms/aqbanking/devel aqbanking.spec,1.14,1.15
Message-ID: <200606121806.k5CI6OtS029358@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29339

Modified Files:
	aqbanking.spec 
Log Message:
buildreq autoconf



Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aqbanking.spec	30 May 2006 06:36:10 -0000	1.14
+++ aqbanking.spec	12 Jun 2006 18:06:19 -0000	1.15
@@ -1,7 +1,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 1.8.1beta
-Release: 4
+Release: 5
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Source1: aqbanking-%{version}-gladesrc.tar.gz
 Group: System Environment/Libraries
@@ -12,7 +12,7 @@
 Patch3: aqbanking-1.8.1beta-noglade.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel
-BuildRequires: libofx-devel >= 0.7.0, gettext
+BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf
 Prereq: /sbin/ldconfig
 Obsoletes: aqhbci, aqhbci-qt-tools
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 1.8.1beta-5
+- buildreq autoconf
+
 * Tue May 30 2006 Bill Nottingham <notting at redhat.com> - 1.8.1beta-4
 - add gettext buildreq (#193348)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 18:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 14:10:33 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch,1.85,1.86
Message-ID: <200606121810.k5CIAXDX029830@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29716

Modified Files:
	libselinux-rhat.patch 
Log Message:
Add MLSENabled check

libselinux-rhat.patch:
 include/selinux/selinux.h |    7 +++++++
 src/selinux.py            |    1 +
 src/selinux_config.c      |   31 +++++++++++++++++++++++++++++++
 src/selinux_internal.h    |    1 +
 src/selinuxswig.i         |    1 +
 src/selinuxswig_wrap.c    |   22 ++++++++++++++++++++++
 src/setrans_client.c      |   14 ++++++++++++++
 7 files changed, 77 insertions(+)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- libselinux-rhat.patch	9 Jun 2006 19:43:52 -0000	1.85
+++ libselinux-rhat.patch	12 Jun 2006 18:10:30 -0000	1.86
@@ -126,3 +126,40 @@
  	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
  	 { NULL, NULL, 0, NULL }
  };
+--- libselinux-1.30.12/src/setrans_client.c~	2006-06-05 13:20:37.000000000 -0400
++++ libselinux-1.30.12/src/setrans_client.c	2006-06-12 13:39:55.000000000 -0400
+@@ -16,6 +16,9 @@
+ #include "selinux_internal.h"
+ #include "setrans_internal.h"
+ 
++static int mls_enabled=-1;
++#define MLSENABLED ((mls_enabled==-1) ? (mls_enabled=is_selinux_mls_enabled()) : mls_enabled)
++
+ // Simple cache
+ static	__thread security_context_t prev_t2r_trans=NULL;
+ static	__thread security_context_t prev_t2r_raw=NULL;
+@@ -243,6 +246,12 @@
+ 		*rawp = NULL;
+ 		return 0;
+ 	}
++
++	if (! MLSENABLED) {
++		*rawp = strdup(trans);
++		return 0;
++	}
++
+ 	if (cache_trans) {
+ 		if (prev_t2r_trans && strcmp(prev_t2r_trans, trans) == 0) {
+ 			*rawp=strdup(prev_t2r_raw);
+@@ -279,6 +288,11 @@
+ 		return 0;
+ 	}
+ 
++	if (! MLSENABLED) {
++		*transp = strdup(raw);
++		return 0;
++	}
++
+ 	if (cache_trans) {
+ 		if (prev_r2t_raw && strcmp(prev_r2t_raw, raw) == 0) {
+ 			*transp=strdup(prev_r2t_trans);



From fedora-cvs-commits at redhat.com  Mon Jun 12 18:11:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 14:11:29 -0400
Subject: rpms/pvm/devel pvm.spec,1.36,1.37
Message-ID: <200606121811.k5CIBTt9029963@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/pvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29911

Modified Files:
	pvm.spec 
Log Message:
fix bug 194758 - mock BuildRequires


Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/devel/pvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pvm.spec	11 Feb 2006 05:19:39 -0000	1.36
+++ pvm.spec	12 Jun 2006 18:11:15 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Libraries for distributed computing.
 Name: pvm 
 Version: 3.4.5
-Release: 6.7.1
+Release: 7.fc6
 License: freely distributable
 Group: Development/Libraries
 Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
@@ -27,8 +27,8 @@
 URL: http://www.epm.ornl.gov/pvm/pvm_home.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: initscripts >= 5.54, bash >= 2
-BuildRequires: tk-devel tcl-devel tcl tk
-BuildPrereq: tk-devel tcl-devel tcl tk
+BuildRequires: tk-devel tcl-devel tcl tk m4
+BuildPrereq: tk-devel tcl-devel tcl tk m4
 
 %package gui
 Requires: pvm
@@ -225,6 +225,9 @@
 /usr/share/pvm3/xpvm/*
 
 %changelog
+* Mon Jun 12 2006 Jason Vas Dias <jvdias at redhat.com> - 2.4.5-7.fc6
+- fix bug 194758: BuildRequires for mock
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4.5-6.7.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 18:15:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 14:15:48 -0400
Subject: rpms/aqbanking/devel aqbanking.spec,1.15,1.16
Message-ID: <200606121815.k5CIFlHX030857@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30782

Modified Files:
	aqbanking.spec 
Log Message:
libtool too



Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aqbanking.spec	12 Jun 2006 18:06:19 -0000	1.15
+++ aqbanking.spec	12 Jun 2006 18:15:43 -0000	1.16
@@ -12,7 +12,7 @@
 Patch3: aqbanking-1.8.1beta-noglade.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel
-BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf
+BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf, libtool
 Prereq: /sbin/ldconfig
 Obsoletes: aqhbci, aqhbci-qt-tools
 
@@ -94,7 +94,7 @@
 
 %changelog
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 1.8.1beta-5
-- buildreq autoconf
+- buildreq autoconf, libtool
 
 * Tue May 30 2006 Bill Nottingham <notting at redhat.com> - 1.8.1beta-4
 - add gettext buildreq (#193348)



From fedora-cvs-commits at redhat.com  Mon Jun 12 18:22:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 14:22:15 -0400
Subject: rpms/rsync/FC-5 rsync-2.6.8-xattrs_bug.patch, NONE, 1.1 rsync.spec,
	1.36, 1.37
Message-ID: <200606121822.k5CIMFfj015566@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/rsync/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15452

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.8-xattrs_bug.patch 
Log Message:
Backport xattrs_bug patch and BuildRequires from devel


rsync-2.6.8-xattrs_bug.patch:
 xattrs.diff |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE rsync-2.6.8-xattrs_bug.patch ---
--- rsync-2.6.8/patches/#xattrs.diff~	2006-06-09 22:00:05.000000000 -0400
+++ rsync-2.6.8/patches/xattrs.diff	2006-06-09 22:00:38.000000000 -0400
@@ -372,7 +372,7 @@
  transfer.  The resulting value is treated as though it was the permissions
 --- old/xattr.c
 +++ new/xattr.c
-@@ -0,0 +1,523 @@
+@@ -0,0 +1,524 @@
 +/* Extended Attribute support for rsync */
 +/* Copyright (C) 2004 Red Hat, Inc */
 +/* Written by Jay Fenlason, vaguely based on the ACLs patch */
@@ -590,10 +590,10 @@
 +		strcpy(ptr, name);
 +		if (datum_size)
 +			memcpy(ptr + len, datumbuf, datum_size);
-+		x->rxas[curr_rsync_xal.count].name_len = len;
-+		x->rxas[curr_rsync_xal.count].name = ptr;
-+		x->rxas[curr_rsync_xal.count].datum_len = datum_size;
-+		x->rxas[curr_rsync_xal.count].datum = ptr + len;
++		x->rxas[x->count].name_len = len;
++		x->rxas[x->count].name = ptr;
++		x->rxas[x->count].datum_len = datum_size;
++		x->rxas[x->count].datum = ptr + len;
 +		x->count++;
 +	}
 +	if (x->count > 1) {
@@ -656,6 +656,7 @@
 +	rsync_xal_l.count++;
 +	curr_rsync_xal.count = 0;
 +	curr_rsync_xal.alloc = 0;
++	curr_rsync_xal.rxas = NULL;
 +}
 +
 +/* send the make_xattr()-generated xattr list for this flist entry,


Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/FC-5/rsync.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rsync.spec	8 May 2006 21:26:36 -0000	1.36
+++ rsync.spec	12 Jun 2006 18:22:13 -0000	1.37
@@ -1,13 +1,14 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.8
-Release: 1.FC5
+Release: 1.FC5.1
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
-
+Patch1: rsync-2.6.8-xattrs_bug.patch
+BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 License: GPL
@@ -25,6 +26,7 @@
 # TAG: for pre versions use
 # % setup -q -n rsync-%{version}pre1
 %setup -q
+%patch1 -p1 -b .xattrs_bug
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 
@@ -33,7 +35,7 @@
 autoconf
 autoheader
 %configure \
-  --with-acl-support --with-xattr-support
+  --enable-acl-support --enable-xattr-support
 make proto
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -56,6 +58,12 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Jun 12 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-1.FC5.1
+- Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
+- Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable
+- replace --with... with --enable... so they actually work
+- Add make, autoconf and gcc to BuildRequires
+
 * Mon May 8 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-1.FC5
 - New upstream release
 - Use the upstream xattr patch instead of mine.  This closes



From fedora-cvs-commits at redhat.com  Mon Jun 12 18:47:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 14:47:32 -0400
Subject: rpms/rsync/FC-4 rsync-2.6.8-xattrs_bug.patch, NONE, 1.1 rsync.spec,
	1.31, 1.32
Message-ID: <200606121847.k5CIlWW1027171@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/rsync/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv25515

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.8-xattrs_bug.patch 
Log Message:
Backport xattrs_bug patch and BuildRequires


rsync-2.6.8-xattrs_bug.patch:
 xattrs.diff |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE rsync-2.6.8-xattrs_bug.patch ---
--- rsync-2.6.8/patches/#xattrs.diff~	2006-06-09 22:00:05.000000000 -0400
+++ rsync-2.6.8/patches/xattrs.diff	2006-06-09 22:00:38.000000000 -0400
@@ -372,7 +372,7 @@
  transfer.  The resulting value is treated as though it was the permissions
 --- old/xattr.c
 +++ new/xattr.c
-@@ -0,0 +1,523 @@
+@@ -0,0 +1,524 @@
 +/* Extended Attribute support for rsync */
 +/* Copyright (C) 2004 Red Hat, Inc */
 +/* Written by Jay Fenlason, vaguely based on the ACLs patch */
@@ -590,10 +590,10 @@
 +		strcpy(ptr, name);
 +		if (datum_size)
 +			memcpy(ptr + len, datumbuf, datum_size);
-+		x->rxas[curr_rsync_xal.count].name_len = len;
-+		x->rxas[curr_rsync_xal.count].name = ptr;
-+		x->rxas[curr_rsync_xal.count].datum_len = datum_size;
-+		x->rxas[curr_rsync_xal.count].datum = ptr + len;
++		x->rxas[x->count].name_len = len;
++		x->rxas[x->count].name = ptr;
++		x->rxas[x->count].datum_len = datum_size;
++		x->rxas[x->count].datum = ptr + len;
 +		x->count++;
 +	}
 +	if (x->count > 1) {
@@ -656,6 +656,7 @@
 +	rsync_xal_l.count++;
 +	curr_rsync_xal.count = 0;
 +	curr_rsync_xal.alloc = 0;
++	curr_rsync_xal.rxas = NULL;
 +}
 +
 +/* send the make_xattr()-generated xattr list for this flist entry,


Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/FC-4/rsync.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rsync.spec	26 May 2006 19:27:32 -0000	1.31
+++ rsync.spec	12 Jun 2006 18:47:30 -0000	1.32
@@ -1,13 +1,14 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.8
-Release: 1.FC4
+Release: 1.FC4.1
 Group: Applications/Internet
 # TAG: for pre versions use
-# Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre2.tar.gz
+#Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre2.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
-
+Patch1: rsync-2.6.8-xattrs_bug.patch
+BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 License: GPL
@@ -25,6 +26,7 @@
 # TAG: for pre versions use
 # % setup -q -n rsync-%{version}pre2
 %setup -q
+%patch1 -p1 -b .xattrs_bug
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 
@@ -33,7 +35,7 @@
 autoconf
 autoheader
 %configure \
-  --with-acl-support --with-xattr-support
+  --enable-acl-support --enable-xattr-support
 make proto
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -56,6 +58,12 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Jun 12 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-1.FC4.1
+- Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
+- Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable
+- replace --with... with --enable... so they actually work
+- Add make, autoconf and gcc to BuildRequires
+
 * Fri May 26 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-1.FC4
 - Upgrade to 2.6.8, which closes
   bz#190208 CVE-2006-2083 rsync buffer overflow issue



From fedora-cvs-commits at redhat.com  Mon Jun 12 19:13:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 15:13:25 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-ppc64-build-fix.patch, NONE,
	1.1 xorg-x11-server.spec, 1.76, 1.77
Message-ID: <200606121913.k5CJDPtt017302@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17288

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-ppc64-build-fix.patch 
Log Message:
- Misc build fixes for ppc64.


xorg-x11-server-1.1.0-ppc64-build-fix.patch:
 compiler.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-ppc64-build-fix.patch ---
--- xorg-server-1.1.0/hw/xfree86/common/compiler.h.ppc64	2006-06-12 13:32:39.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/compiler.h	2006-06-12 13:33:21.000000000 -0400
@@ -1078,7 +1078,7 @@
 
 extern volatile unsigned char *ioBase;
 
-#if defined(linux) && defined(__powerpc64__)
+#if defined(linux) && defined(__powerpc64__) && 0
 # include <asm/memory.h>
 #endif /* defined(linux) && defined(__powerpc64__) */
 #ifndef eieio /* We deal with arch-specific eieio() routines above... */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xorg-x11-server.spec	12 Jun 2006 15:52:48 -0000	1.76
+++ xorg-x11-server.spec	12 Jun 2006 19:13:22 -0000	1.77
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   9
+Release:   10
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -20,6 +20,7 @@
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=6010
 Patch6:    xserver-1.0.1-randr-sdk.patch
+Patch7:	   xorg-x11-server-1.1.0-ppc64-build-fix.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -254,6 +255,7 @@
 %patch0 -p0 -b .init-origins-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch6 -p1 -b .randrsdk
+%patch7 -p1 -b .ppc64
 
 %patch100 -p0 -b .spiffiffity
 
@@ -545,6 +547,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 12 2006 Adam Jackson <ajax at redhat.com> 1.1.0-10
+- Misc build fixes for ppc64.
+
 * Mon Jun 12 2006 Adam Jackson <ajax at redhat.com> 1.1.0-9
 - --enable-xorg on ppc64 too.
 - Re-add cvt, got dropped somehow.



From fedora-cvs-commits at redhat.com  Mon Jun 12 19:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 15:36:03 -0400
Subject: rpms/python/devel python-2.4-gen-assert.patch, NONE, 1.1 python.spec,
	1.71, 1.72
Message-ID: <200606121936.k5CJa3dq000305@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32759

Modified Files:
	python.spec 
Added Files:
	python-2.4-gen-assert.patch 
Log Message:
Fixed #192592 and #167468

python-2.4-gen-assert.patch:
 genobject.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.4-gen-assert.patch ---
--- python/trunk/Objects/genobject.c    2005/08/02 00:46:46 39239
+++ python/trunk/Objects/genobject.c    2005/08/13 03:29:00 39279
@@ -82,7 +82,7 @@
	/* Don't keep the reference to f_back any longer than necessary.  It
	 * may keep a chain of frames alive or it could create a reference
	 * cycle. */
-	assert(f->f_back != NULL);
+	assert(f->f_back == tstate->frame);
	Py_CLEAR(f->f_back);

	/* If the generator just returned (as opposed to yielding), signal


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- python.spec	8 Jun 2006 13:58:50 -0000	1.71
+++ python.spec	12 Jun 2006 19:36:01 -0000	1.72
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 5.FC6
+Release: 6.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -41,6 +41,7 @@
 Patch13: python-2.4-distutils-bdist-rpm.patch
 Patch14: python-2.3.4-pydocnodoc.patch
 Patch15: python-2.4.1-canonicalize.patch
+Patch16: python-2.4-gen-assert.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -146,6 +147,7 @@
 %patch13 -p1 -b .bdist-rpm
 %patch14 -p1 -b .no-doc
 %patch15 -p1 -b .canonicalize
+%patch16 -p2 -b .gen-assert
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -245,6 +247,10 @@
 install Tools/README $RPM_BUILD_ROOT%{tools_dir}/
 install Tools/scripts/*py $RPM_BUILD_ROOT%{tools_dir}/scripts/
 
+# Documentation tools
+%{__tar} cf - Doc/tools | \
+    %{__tar} xf - -C %$RPM_BUILD_ROOT%{_libdir}/python%{pybasever}
+
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}
 cp -ar Demo/* $RPM_BUILD_ROOT%{demo_dir}
@@ -357,6 +363,7 @@
 %{_bindir}/pydoc*
 %{tools_dir}
 %{demo_dir}
+%{_libdir}/python%{pybasever}/Doc
 
 %files -n %{tkinter}
 %defattr(-,root,root,755)
@@ -364,6 +371,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-6
+- Fixed bug #192592 (too aggressive assertion fails) - SF#1257960
+- Fixed bug #167468 (Doc/tools not included) - added in the python-tools package
+
 * Thu Jun  8 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-5
 - Fixed bug #193484 (added pydoc)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 19:39:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 15:39:34 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.101, 1.102 initscripts.spec,
	1.116, 1.117 sources, 1.112, 1.113
Message-ID: <200606121939.k5CJdY1X000431@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv418

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	23 May 2006 19:23:20 -0000	1.101
+++ .cvsignore	12 Jun 2006 19:39:32 -0000	1.102
@@ -1 +1 @@
-initscripts-8.34.tar.bz2
+initscripts-8.35.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- initscripts.spec	23 May 2006 19:46:45 -0000	1.116
+++ initscripts.spec	12 Jun 2006 19:39:32 -0000	1.117
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.34
+Version: 8.35
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -209,6 +209,13 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 8.35-1
+- readonly root enhancments (modified from <law at redhat.com>, #193164)
+- encrypted swap, non-root filesystem support (#127378, <mitr at redhat.com, <redhat at flyn.org>)
+- clarify killproc usage (#193711, <mitr at redhat.com>)
+- document BRIDGE= (#192576, <mitr at redhat.com>)
+- rc.sysinit: allow for sulogin instead of automatic relabeling (<dwalsh at rehdat.com>)
+
 * Tue May 23 2006 Bill Nottingham <notting at redhat.com> 8.34-1
 - link glib2 dynamically now that it's in /lib, conflict with older
   versions


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sources	23 May 2006 19:46:45 -0000	1.112
+++ sources	12 Jun 2006 19:39:32 -0000	1.113
@@ -1 +1 @@
-74799bbde68b59ad462591266326226b  initscripts-8.34.tar.bz2
+1da30d32edad78687034067556b41cc7  initscripts-8.35.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 19:39:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 15:39:55 -0400
Subject: rpms/lam/devel .cvsignore, 1.11, 1.12 lam.spec, 1.33, 1.34 sources,
	1.11, 1.12
Message-ID: <200606121939.k5CJdtum004921@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2990

Modified Files:
	.cvsignore lam.spec sources 
Log Message:
fix bugs 191433, 194747


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Feb 2005 16:49:11 -0000	1.11
+++ .cvsignore	12 Jun 2006 19:39:52 -0000	1.12
@@ -1,2 +1,3 @@
 lam-7.0.6.tar.bz2
 lam-7.1.1.tar.bz2
+lam-7.1.2.tar.bz2


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lam.spec	22 Feb 2006 00:50:34 -0000	1.33
+++ lam.spec	12 Jun 2006 19:39:52 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
-Version: 7.1.1
-Release: 11
+Version: 7.1.2
+Release: 1.fc6
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -11,9 +11,9 @@
 Source3: lam.module.in
 URL: http://www.lam-mpi.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel
+BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel autoconf automake libtool
 Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-gfortran
-Patch0: lam-7.1.1-f77-f95.patch
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 %{?!LAMbinpfx: %define LAMbinpfx 'lam-'} # prefix for LAM binaries that clash with OpenMPI
 
@@ -43,9 +43,23 @@
 cumulative record of communication, which can be visualized either at
 runtime or post-mortem.
 
+%package libs
+Summary:        Libraries for LAM
+Group:          System/Libraries
+
+%description libs
+Runtime libraries for LAM
+
+%package devel
+Summary:        Development files for LAM
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Contains development headers and libraries for LAM
+
 %prep
-%setup -q
-%patch0 -p1 -b .f77-f95
+%setup -q -n lam-%{version}
 
 %build
 %ifarch x86_64
@@ -53,15 +67,14 @@
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
 FFLAGS="$RPM_OPT_FLAGS -fPIC"
 %endif 
-autoconf
 export FC=f95
 %ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --with-trillium --enable-shared
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --disable-tv --disable-tv-dll --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --disable-tv --disable-tv-dll --with-trillium --enable-shared
 %endif
 
 make %{?_smp_mflags} all
@@ -140,17 +153,33 @@
 %files
 %defattr(-,root,root)
 %doc LICENSE HISTORY INSTALL README AUTHORS
-%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
 %doc doc/user.pdf doc/install.pdf
 %doc share/memory/darwin7/APPLE_LICENSE share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
-%config(noreplace) %{_sysconfdir}/lam
+%config(noreplace) %{_sysconfdir}/%{name}
 %ghost %{_sysconfdir}/ld.so.conf.d/mpi.conf
-%config %{_libdir}/pkgconfig/%{name}.pc
 %{_bindir}/*
-%{_includedir}/%{name}
-%{_libdir}/%{name}
 %{_datadir}/%{name}
 
+%files libs
+%defattr(-,root,root)
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so.*
+%ifarch i386 s390 ppc
+%dir %{_libdir}/%{name}/lam
+%{_libdir}/%{name}/lam/*.so.*
+%endif
+
+%files devel
+%defattr(-,root,root)
+%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
+%{_includedir}/%{name}
+%{_libdir}/%{name}/*.a
+%{_libdir}/%{name}/*.so
+%ifarch i386 s390 ppc
+%{_libdir}/%{name}/lam/*.so
+%endif
+%config %{_libdir}/pkgconfig/%{name}.pc
+
 %post
 if [ $1 -ge 1 ]; then
    if [ ! -e %{_sysconfdir}/ld.so.conf.d/mpi.conf ]; then
@@ -159,6 +188,12 @@
 fi;
 
 %changelog
+* Mon Jun 12 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.2-1.fc6
+- Upgrade to upstream version 7.1.2
+- fix bug 191433 - Split into -libs and -devel packages
+  ( apply .spec file patch from Orion Poplawski <orion at cora.nwra.com> )
+- fix bug 194747 - fix BuildRequires for mock
+
 * Tue Feb 21 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.1-11
 - ld.so.conf.d/mpi.conf integration with openmpi
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Feb 2005 16:49:11 -0000	1.11
+++ sources	12 Jun 2006 19:39:52 -0000	1.12
@@ -1,2 +1,3 @@
 4037133e564648bd7815e36f3f017d8b  lam-7.0.6.tar.bz2
 0a3eee53281884a063ce2c44793672b3  lam-7.1.1.tar.bz2
+07c59cf03c773a67199e066e500e499b  lam-7.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 19:41:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 15:41:05 -0400
Subject: rpms/lam/devel sources,1.12,1.13
Message-ID: <200606121941.k5CJf5TI011076@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11039

Modified Files:
	sources 
Log Message:
upgrade to 7.1.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jun 2006 19:39:52 -0000	1.12
+++ sources	12 Jun 2006 19:41:02 -0000	1.13
@@ -1,3 +1 @@
-4037133e564648bd7815e36f3f017d8b  lam-7.0.6.tar.bz2
-0a3eee53281884a063ce2c44793672b3  lam-7.1.1.tar.bz2
 07c59cf03c773a67199e066e500e499b  lam-7.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 19:47:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 15:47:32 -0400
Subject: rpms/dbus/devel dbus.spec,1.83,1.84
Message-ID: <200606121947.k5CJlWiX027361@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22676

Modified Files:
	dbus.spec 
Log Message:
- remove the s390s from the archs the mono binding is built on



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- dbus.spec	12 Jun 2006 17:48:21 -0000	1.83
+++ dbus.spec	12 Jun 2006 19:47:30 -0000	1.84
@@ -14,7 +14,7 @@
 %define dbus_user_uid           81
 
 # Mono only availible on these:
-%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc
 
 Summary: D-BUS message bus
 Name: dbus
@@ -349,6 +349,7 @@
 %changelog
 * Mon Jun 12 2006 John (J5) Palmieri <johnp at redhat.com> - 0.62-1
 - Update to upstream 0.62
+- Remove mono for s390s
 
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 0.61-6
 - Rebuild



From fedora-cvs-commits at redhat.com  Mon Jun 12 20:30:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 16:30:01 -0400
Subject: rpms/python/devel python.spec,1.72,1.73
Message-ID: <200606122030.k5CKU14r021221@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21192

Modified Files:
	python.spec 
Log Message:
Fixing stray %


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- python.spec	12 Jun 2006 19:36:01 -0000	1.72
+++ python.spec	12 Jun 2006 20:29:58 -0000	1.73
@@ -249,7 +249,7 @@
 
 # Documentation tools
 %{__tar} cf - Doc/tools | \
-    %{__tar} xf - -C %$RPM_BUILD_ROOT%{_libdir}/python%{pybasever}
+    %{__tar} xf - -C $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}
 
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}



From fedora-cvs-commits at redhat.com  Mon Jun 12 20:32:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 16:32:49 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.149,
	1.150
Message-ID: <200606122032.k5CKWnIe021474@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21451

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Jun 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
- Remove bootstrap logic.
- Fix ppc64 file system corruption workaround.
- Make ecj.sh.in call gij.
- Require eclipse-ecj to build.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- java-1.4.2-gcj-compat.spec	8 Jun 2006 14:38:50 -0000	1.149
+++ java-1.4.2-gcj-compat.spec	12 Jun 2006 20:32:45 -0000	1.150
@@ -1,12 +1,5 @@
 %define section		free
 
-%ifarch %{ix86} x86_64 ppc
-%define bootstrap	0
-%else
-%define bootstrap	1
-%endif
-
-# custom and bootstrap are incompatible; enable only one or the other.
 %{!?custom:	%define custom 0}
 %{!?gcjprefix: 	%define gcjprefix %{nil}}
 %{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
@@ -52,9 +45,7 @@
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires:	gjdoc
 BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
-%if ! %{bootstrap}
 BuildRequires:	eclipse-ecj
-%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.1
@@ -102,11 +93,7 @@
 Provides:       java-devel = %{javaver}
 Provides:	java-gcj-compat-devel = %{jgcver}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-%if %{bootstrap}
-Obsoletes:	ecj
-%else
 Requires:	eclipse-ecj
-%endif
 Requires:	python
 Requires:	gcc%{gccsuffix}-java >= %{gccver}
 Obsoletes:	java-1.4.2-gcj4-compat-devel <= 1.4.2.0-4jpp_2rh
@@ -160,34 +147,16 @@
 sed "s,compiler.batch.Main,compiler.batch.Main -bootclasspath $LIBGCJ_JAR,g" < ecj-2 > ecj-%{cname}
 %endif
 
-%if %{bootstrap}
-mkdir tmp
-cp -a %{SOURCE2} eclipse-ecj.jar
-%ifnarch ia64
-mv eclipse-ecj.jar tmp
-# close your eyes...
-RPM_BUILD_ROOT=tmp python aot-compile-rpm
-mv tmp/eclipse-ecj.jar tmp%{_libdir}/gcj/%{name}/* .
-# (you can open them again now)
-%endif
-sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj
-%endif
-
 gzip -dc %{SOURCE1} | tar -xf -
 # build bouncy castle provider
 pushd bcprov-jdk14-%{bcarchivever}/src
   find -type d -name test | xargs rm -rf
-%if %{bootstrap}
-  sh ../../ecj `find . -type f -name "*.java"`
-%else
   ecj `find . -type f -name "*.java"`
-%endif
   jar2="bcprov-%{bcfullver}.jar"
   files="`find . -type f -name "*.class"`"
   test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
   test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
 
-  %if ! %{bootstrap}
   # natively compile BouncyCastle
   mkdir bctmp
   mv bcprov-%{bcfullver}.jar bctmp
@@ -195,9 +164,6 @@
   RPM_BUILD_ROOT=bctmp python ../../aot-compile-rpm
   mv bctmp/bcprov-%{bcfullver}.jar bctmp%{_libdir}/gcj/%{name}/* ../..
   # (you can open them again now)
-  %else
-  mv bcprov-%{bcfullver}.jar ../..
-  %endif
 popd
 
 %install
@@ -271,11 +237,9 @@
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
 install -pm 644 bcprov-%{bcfullver}.jar \
   $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar
-%if ! %{bootstrap}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m755 bcprov-%{bcfullver}.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m644 bcprov-%{bcfullver}.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-%endif
 
 # classmap database directory
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj
@@ -287,18 +251,6 @@
 install -m755 ecj-%{cname} $RPM_BUILD_ROOT%{_bindir}
 %endif
 
-%if %{bootstrap}
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m644 eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}
-%ifnarch ia64
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-install -m755 eclipse-ecj.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-install -m644 eclipse-ecj.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-%endif
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
-%endif
-
 # build and install api documentation
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 touch $RPM_BUILD_ROOT%{_javadocdir}/{%{name},java}
@@ -606,9 +558,7 @@
 %ifarch x86_64
 %{_jvmdir}/%{jredir}/lib/amd64
 %endif
-%if ! %{bootstrap}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -625,13 +575,6 @@
 %{_bindir}/ecj-%{cname}
 %{_javadir}/eclipse-ecj-%{cname}.jar
 %endif
-%if %{bootstrap}
-%{_bindir}/ecj
-%ifnarch ia64
-%{_libdir}/gcj/%{name}
-%endif
-%{_javadir}/eclipse-ecj.jar
-%endif
 
 %files src
 %defattr(-,root,root)
@@ -643,7 +586,8 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
-* Thu Jun  8 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
+* Mon Jun 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
+- Remove bootstrap logic.
 - Fix ppc64 file system corruption workaround.
 - Make ecj.sh.in call gij.
 - Require eclipse-ecj to build.



From fedora-cvs-commits at redhat.com  Mon Jun 12 20:42:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 16:42:46 -0400
Subject: rpms/doxygen/devel .cvsignore, 1.20, 1.21 doxygen.spec, 1.41,
	1.42 sources, 1.20, 1.21 doxygen-1.4.5-gcc4.1.patch, 1.1,
	NONE doxygen-1.4.6-crash.patch, 1.1, NONE
Message-ID: <200606122042.k5CKgkNm023109@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/doxygen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23050

Modified Files:
	.cvsignore doxygen.spec sources 
Removed Files:
	doxygen-1.4.5-gcc4.1.patch doxygen-1.4.6-crash.patch 
Log Message:
update to 1.4.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	31 Jan 2006 18:10:47 -0000	1.20
+++ .cvsignore	12 Jun 2006 20:42:44 -0000	1.21
@@ -7,3 +7,4 @@
 doxygen-1.4.4.src.tar.gz
 doxygen-1.4.5.src.tar.gz
 doxygen-1.4.6.src.tar.gz
+doxygen-1.4.7.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- doxygen.spec	8 Jun 2006 20:38:47 -0000	1.41
+++ doxygen.spec	12 Jun 2006 20:42:44 -0000	1.42
@@ -3,21 +3,18 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.4.6
-Release: 5
+Version: 1.4.7
+Release: 1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
 Patch0: doxygen-1.4.3-config.patch
 Patch2: doxygen-1.2.18-libdir.patch
 Patch3: doxygen-1.2.18-libdir64.patch
-Patch4: doxygen-1.4.5-gcc4.1.patch
-Patch5: doxygen-1.4.6-crash.patch
 
 Group: Development/Tools
 License: GPL
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
-Prefix: %{_prefix}
 
 BuildPrereq: libstdc++-devel
 BuildPrereq: perl
@@ -56,8 +53,6 @@
 %else
 %patch2 -p1 -b .libdir
 %endif
-%patch4 -p1 -b .gcc4.1
-%patch5 -p1 -b .crash
 
 %build
 %if %{with_qt}
@@ -105,6 +100,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 1:1.4.7-1
+- update to 1.4.7
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:1.4.6-5
 - fix build problem in mock #193358 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	31 Jan 2006 18:10:47 -0000	1.20
+++ sources	12 Jun 2006 20:42:44 -0000	1.21
@@ -1 +1 @@
-ebf11130bec7987e9b69b1e0301d151a  doxygen-1.4.6.src.tar.gz
+11db63a72bd3b510fd2fa7ae48086979  doxygen-1.4.7.src.tar.gz


--- doxygen-1.4.5-gcc4.1.patch DELETED ---


--- doxygen-1.4.6-crash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 20:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 16:49:13 -0400
Subject: rpms/grub/devel grub-0.97-mactel-kbd.patch,1.1,1.2
Message-ID: <200606122049.k5CKnD3K007707@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7540

Modified Files:
	grub-0.97-mactel-kbd.patch 
Log Message:
- I fucking hate x86 assembly.
- I fucking hate broken x86 BIOSes
- mactel should work correctly now.


grub-0.97-mactel-kbd.patch:
 asm.S |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 deletions(-)

Index: grub-0.97-mactel-kbd.patch
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-mactel-kbd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-0.97-mactel-kbd.patch	27 May 2006 17:22:08 -0000	1.1
+++ grub-0.97-mactel-kbd.patch	12 Jun 2006 20:49:10 -0000	1.2
@@ -1,5 +1,5 @@
---- grub-0.97/stage2/asm.S.mactel-kbd	2006-05-27 13:13:47.000000000 -0400
-+++ grub-0.97/stage2/asm.S	2006-05-27 13:15:52.000000000 -0400
+--- grub-0.97/stage2/asm.S.mactel-kbd	2006-06-12 15:24:41.000000000 -0400
++++ grub-0.97/stage2/asm.S	2006-06-12 16:35:17.000000000 -0400
 @@ -1651,7 +1651,30 @@
  	jnz	3f
  	ret
@@ -54,3 +54,51 @@
  	andb	$K_IBUF_FUL, %al
  	jnz	gloop1
  
+@@ -1993,17 +2021,31 @@
+ 
+ 	call	EXT_C(prot_to_real)
+ 	.code16
+-
++.again:
++	mov	$0x11, %ah		/* poll kbd */
+ 	int	$0x16
+-
+-	movw	%ax, %dx		/* real_to_prot uses %eax */
++	jz	.again
++#if 0
++/* XXX handle serial here? -- pj */
++	jnz	.kbd
++#endif
++.kbd:
++	mov	$0x10, %ah
++	int	$0x16
++	cmp	$0xe0, %al
++	jnz	.not_ext
++	xor	%al, %al
++.not_ext:
++	and	%al, %al
++	jz	.func_key
++.func_key:
++	movw	%ax, %dx		/* real_to_prot uses %eax */
+ 	call	translate_keycode
+ 	call	remap_ascii_char
+ 	DATA32	call	EXT_C(real_to_prot)
+ 	.code32
+-
+-	movw	%dx, %ax
++	mov	%edx, %eax
+ 
+ 	pop	%ebp
+ 	ret
+@@ -2029,11 +2071,11 @@
+ 	call	EXT_C(prot_to_real)	/* enter real mode */
+ 	.code16
+ 
+-	movb	$0x1, %ah
++	movb	$0x11, %ah
+ 	int	$0x16
+
+ 	DATA32	jz	notpending
+ 	movw	%ax, %dx
+ 	call	translate_keycode
+ 	call	remap_ascii_char



From fedora-cvs-commits at redhat.com  Mon Jun 12 20:49:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 16:49:56 -0400
Subject: rpms/grub/devel grub.spec,1.42,1.43
Message-ID: <200606122049.k5CKnukR007995@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7973

Modified Files:
	grub.spec 
Log Message:
- release + changelog


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- grub.spec	5 Jun 2006 20:52:02 -0000	1.42
+++ grub.spec	12 Jun 2006 20:49:53 -0000	1.43
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 7
+Release: 8
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -227,6 +227,10 @@
 %{_datadir}/grub
 
 %changelog
+* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> - 0.97-8
+- Fix BIOS keyboard handler to use extended keyboard interrupts, so the
+  Mac Mini works.
+
 * Mon Jun  5 2006 Jesse Keating <jkeating at redhat.com> - 0.97-7
 - Added BuildRequires on a 32bit library
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 20:52:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 16:52:15 -0400
Subject: rpms/python/devel python.spec,1.73,1.74 pydoc,1.2,NONE
Message-ID: <200606122052.k5CKqFDb008992@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8960

Modified Files:
	python.spec 
Removed Files:
	pydoc 
Log Message:
pydoc was already part of the -tools package, moving into main python package


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- python.spec	12 Jun 2006 20:29:58 -0000	1.73
+++ python.spec	12 Jun 2006 20:52:12 -0000	1.74
@@ -31,7 +31,6 @@
 Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 Source7: python-2.3.4-optik.py
-Source8: pydoc
 
 Patch0: python-2.4.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
@@ -301,16 +300,13 @@
 install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
 %endif
 
-# Install pydoc wrapper (bug #193484)
-install -m 0755 %{SOURCE8} %{_bindir}/pydoc
-
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files -f dynfiles
 %defattr(-, root, root)
 %doc LICENSE README
-%{_bindir}/pydoc
+%{_bindir}/pydoc*
 %{_bindir}/python*
 %{_mandir}/*/*
 %{_libdir}/libpython%{pybasever}.so*
@@ -360,7 +356,6 @@
 %{_bindir}/pynche*
 %{_bindir}/pygettext*.py*
 %{_bindir}/msgfmt*.py*
-%{_bindir}/pydoc*
 %{tools_dir}
 %{demo_dir}
 %{_libdir}/python%{pybasever}/Doc
@@ -376,7 +371,7 @@
 - Fixed bug #167468 (Doc/tools not included) - added in the python-tools package
 
 * Thu Jun  8 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-5
-- Fixed bug #193484 (added pydoc)
+- Fixed bug #193484 (added pydoc in the main package)
 
 * Mon Jun  5 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-4
 - Added dist in the release


--- pydoc DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:05:55 -0400
Subject: rpms/grub/devel grub-0.97-mactel-kbd.patch,1.2,1.3
Message-ID: <200606122105.k5CL5t8R012325@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12264

Modified Files:
	grub-0.97-mactel-kbd.patch 
Log Message:
- fix the patch so it applies... ;)


grub-0.97-mactel-kbd.patch:
 asm.S |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 3 deletions(-)

Index: grub-0.97-mactel-kbd.patch
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-mactel-kbd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-0.97-mactel-kbd.patch	12 Jun 2006 20:49:10 -0000	1.2
+++ grub-0.97-mactel-kbd.patch	12 Jun 2006 21:05:36 -0000	1.3
@@ -1,5 +1,5 @@
---- grub-0.97/stage2/asm.S.mactel-kbd	2006-06-12 15:24:41.000000000 -0400
-+++ grub-0.97/stage2/asm.S	2006-06-12 16:35:17.000000000 -0400
+--- grub-0.97/stage2/asm.S.mactel-kbd	2006-06-12 17:00:10.000000000 -0400
++++ grub-0.97/stage2/asm.S	2006-06-12 17:03:38.000000000 -0400
 @@ -1651,7 +1651,30 @@
  	jnz	3f
  	ret
@@ -54,16 +54,14 @@
  	andb	$K_IBUF_FUL, %al
  	jnz	gloop1
  
-@@ -1993,17 +2021,31 @@
- 
+@@ -1994,8 +2022,25 @@
  	call	EXT_C(prot_to_real)
  	.code16
--
+ 
 +.again:
 +	mov	$0x11, %ah		/* poll kbd */
  	int	$0x16
--
--	movw	%ax, %dx		/* real_to_prot uses %eax */
+ 
 +	jz	.again
 +#if 0
 +/* XXX handle serial here? -- pj */
@@ -79,26 +77,24 @@
 +	and	%al, %al
 +	jz	.func_key
 +.func_key:
-+	movw	%ax, %dx		/* real_to_prot uses %eax */
+ 	movw	%ax, %dx		/* real_to_prot uses %eax */
  	call	translate_keycode
  	call	remap_ascii_char
+@@ -2003,7 +2048,7 @@
  	DATA32	call	EXT_C(real_to_prot)
  	.code32
--
+ 
 -	movw	%dx, %ax
-+	mov	%edx, %eax
++	mov	%dx, %ax
  
  	pop	%ebp
  	ret
-@@ -2029,11 +2071,11 @@
+@@ -2029,7 +2074,7 @@
  	call	EXT_C(prot_to_real)	/* enter real mode */
  	.code16
  
 -	movb	$0x1, %ah
 +	movb	$0x11, %ah
  	int	$0x16
-
+ 
  	DATA32	jz	notpending
- 	movw	%ax, %dx
- 	call	translate_keycode
- 	call	remap_ascii_char



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:07:37 -0400
Subject: rpms/amtu/devel amtu.spec,1.13,1.14
Message-ID: <200606122107.k5CL7bZd012438@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amtu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12409

Modified Files:
	amtu.spec 
Log Message:
fix missing BR


Index: amtu.spec
===================================================================
RCS file: /cvs/dist/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- amtu.spec	11 Feb 2006 01:35:24 -0000	1.13
+++ amtu.spec	12 Jun 2006 21:07:05 -0000	1.14
@@ -1,12 +1,13 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.4
-Release: 2.2
+Release: 3
 License: Common Public License
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: audit-libs-devel >= 1.1.2
+BuildRequires: automake
 Requires: audit >= 1.1.2
 
 # Red Hat AMTU SPEC file
@@ -60,6 +61,9 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Mon Jun 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-3
+- Fix missing BR on automake
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:11:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:11:48 -0400
Subject: rpms/elinks/devel elinks-0.11.1-negotiate.patch, 1.1,
	1.2 elinks.spec, 1.35, 1.36
Message-ID: <200606122111.k5CLBmfC012840@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/elinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12800

Modified Files:
	elinks-0.11.1-negotiate.patch elinks.spec 
Log Message:
iproved negotiate-auth

elinks-0.11.1-negotiate.patch:
 Makefile.config.in                 |    1 
 config.h.in                        |    3 
 configure.in                       |   24 +++
 src/protocol/http/Makefile         |    2 
 src/protocol/http/http.c           |   46 ++++-
 src/protocol/http/http_negotiate.c |  287 +++++++++++++++++++++++++++++++++++++
 src/protocol/http/http_negotiate.h |   16 ++
 src/util/base64.c                  |   36 +++-
 src/util/base64.h                  |    3 
 9 files changed, 401 insertions(+), 17 deletions(-)

Index: elinks-0.11.1-negotiate.patch
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks-0.11.1-negotiate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elinks-0.11.1-negotiate.patch	9 Jun 2006 12:08:47 -0000	1.1
+++ elinks-0.11.1-negotiate.patch	12 Jun 2006 21:11:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- elinks-0.11.1/Makefile.config.in.negotiate	2006-01-29 14:10:33.000000000 +0100
-+++ elinks-0.11.1/Makefile.config.in	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/Makefile.config.in	2006-06-12 20:33:59.000000000 +0200
 @@ -148,6 +148,7 @@
  CONFIG_WIN32 = @CONFIG_WIN32@
  CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
@@ -9,7 +9,7 @@
  DEFS = @DEFS@
  CFLAGS = @CFLAGS@
 --- elinks-0.11.1/config.h.in.negotiate	2006-01-29 14:10:46.000000000 +0100
-+++ elinks-0.11.1/config.h.in	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/config.h.in	2006-06-12 20:33:59.000000000 +0200
 @@ -84,6 +84,9 @@
  /* Define if you want: gpm support */
  #undef CONFIG_GPM
@@ -21,7 +21,7 @@
  #undef CONFIG_GUILE
  
 --- elinks-0.11.1/src/protocol/http/Makefile.negotiate	2006-01-29 14:10:39.000000000 +0100
-+++ elinks-0.11.1/src/protocol/http/Makefile	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/src/protocol/http/Makefile	2006-06-12 20:33:59.000000000 +0200
 @@ -1,6 +1,8 @@
  top_builddir=../../..
  include $(top_builddir)/Makefile.config
@@ -32,7 +32,7 @@
  
  include $(top_srcdir)/Makefile.lib
 --- /dev/null	2006-05-28 11:31:41.625940250 +0200
-+++ elinks-0.11.1/src/protocol/http/http_negotiate.h	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/src/protocol/http/http_negotiate.h	2006-06-12 22:52:18.000000000 +0200
 @@ -0,0 +1,16 @@
 +
 +#ifndef EL__PROTOCOL_HTTP_HTTP_NEGOTIATE_H
@@ -43,7 +43,7 @@
 +
 +
 +int http_negotiate_input(struct connection *conn, struct uri *uri, 
-+					int type, unsigned char *data);
++			int type, unsigned char *data);
 +
 +int http_negotiate_output(struct uri *uri, struct string *header);
 +
@@ -51,8 +51,8 @@
 +#endif /* EL_PROTOCOL_HTTP_HTTP_NEGOTIATE_H */
 +
 --- /dev/null	2006-05-28 11:31:41.625940250 +0200
-+++ elinks-0.11.1/src/protocol/http/http_negotiate.c	2006-06-09 13:14:25.000000000 +0200
-@@ -0,0 +1,259 @@
++++ elinks-0.11.1/src/protocol/http/http_negotiate.c	2006-06-12 23:09:49.000000000 +0200
+@@ -0,0 +1,287 @@
 +/* 
 + * HTTP Negotiate authentication method -- based on GSSAPI
 + *
@@ -96,6 +96,7 @@
 +	gss_ctx_id_t	context;
 +	gss_name_t	server_name;
 +	gss_buffer_desc output_token;
++	gss_buffer_desc input_token;
 +};
 +
 +static INIT_LIST_HEAD(negotiate_list);
@@ -143,6 +144,12 @@
 +	if (full && neg->server_name)
 +		gss_release_name(&minor_status, &neg->server_name);
 +
++	if (full && neg->input_token.length != 0) {
++		/* allocated by mem_free().. so beter not use gss_release_buffer() */
++		mem_free(neg->input_token.value);
++		neg->input_token.length = 0;
++	}
++	
 +	if (full)
 +		memset(neg, 0, sizeof(*neg));
 +}
@@ -170,7 +177,7 @@
 +
 +	token.length = strlen(service) + 1 + uri->hostlen + 1;
 +	if (token.length + 1 > sizeof(name))
-+		return EMSGSIZE;
++		return -1;
 +
 +	snprintf(name, token.length, "%s@%*s", service, uri->hostlen, uri->host);
 +
@@ -225,15 +232,47 @@
 +	return 0;
 +}
 +
++static int
++http_negotiate_create_context(struct negotiate *neg)
++{
++	OM_uint32 major_status, minor_status;
++
++	major_status = gss_init_sec_context(&minor_status,
++					    GSS_C_NO_CREDENTIAL,
++					    &neg->context,
++					    neg->server_name,
++					    GSS_C_NO_OID,
++					    GSS_C_DELEG_FLAG,
++					    0,
++					    GSS_C_NO_CHANNEL_BINDINGS,
++					    &neg->input_token,
++					    NULL,
++					    &neg->output_token,
++					    NULL,
++					    NULL);
++	neg->status = major_status;
++
++	if (GSS_ERROR(major_status)) 
++		return -1;
++	if (neg->output_token.length == 0) 
++		return -1;
++
++	return 0;
++}
++
++/*
++ * Register new negotiate-auth request
++ *
++ * It's possible that server sends to client input token (at least
++ * libcurl supports it) in WWW-Authenticate header, but ususaly 
++ * is this input token undefined.
++ */
 +int 
 +http_negotiate_input(struct connection *conn, struct uri *uri, 
 +					int type, unsigned char *data)
 +{
-+	OM_uint32 major_status, minor_status, minor_status2;
-+	gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
-+	gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
 +	struct negotiate *neg;
-+	int ret, isnew = 0;
++	int ret = 0, isnew = 0;
 +
 +	neg = http_negotiate_get(uri, &isnew, 1);
 +	
@@ -250,41 +289,19 @@
 +		http_negotiate_cleanup(neg, 1);
 +		return -1;
 +	}
-+	if (neg->server_name == NULL && (ret = http_negotiate_get_name(conn, neg)))
-+		return ret;
-+	if (data && http_negotiate_parse_data(data, type, &input_token)) 
-+		return -1;
-+	
-+	major_status = gss_init_sec_context(&minor_status,
-+					    GSS_C_NO_CREDENTIAL,
-+					    &neg->context,
-+					    neg->server_name,
-+					    GSS_C_NO_OID,
-+					    GSS_C_DELEG_FLAG,
-+					    0,
-+					    GSS_C_NO_CHANNEL_BINDINGS,
-+					    &input_token,
-+					    NULL,
-+					    &output_token,
-+					    NULL,
-+					    NULL);
-+	if (input_token.length > 0)
-+		gss_release_buffer(&minor_status2, &input_token);
-+	neg->status = major_status;
-+
-+	if (GSS_ERROR(major_status)) 
++	if (neg->server_name == NULL && http_negotiate_get_name(conn, neg) < 0)
 +		return -1;
-+	if (output_token.length == 0) 
++	if (data && http_negotiate_parse_data(data, type, &neg->input_token)) 
 +		return -1;
-+
-+	neg->output_token = output_token;
-+
-+	if (isnew)
++	if ((ret=http_negotiate_create_context(neg)) == 0 && isnew)
 +		http_negotiate_save(neg);
 +
-+	return 0;
++	return ret;
 +}
 +
++/*
++ * Fill output token to "Authorization: Negotiate <token>".
++ */
 +int
 +http_negotiate_output(struct uri *uri, struct string *header)
 +{
@@ -292,10 +309,18 @@
 +	char *encoded = NULL;
 +	int len = 0;
 +
-+	neg = http_negotiate_get(uri, NULL, 0);	
-+	if (neg==NULL || neg->output_token.length==0) 
++	if (!(neg = http_negotiate_get(uri, NULL, 0)))
 +		return -1;
 +	
++	if (neg->output_token.length==0) {
++		if (http_negotiate_create_context(neg) < 0) {		
++			/* full cleanup on error and ask for 
++			   new WWW-Authenticate from server */
++			http_negotiate_cleanup(neg, 1);
++			return -1;
++		}
++	}
++	
 +	encoded = base64_encode_bin((unsigned char *) neg->output_token.value, 
 +				neg->output_token.length, &len);
 +
@@ -309,11 +334,14 @@
 +	add_crlf_to_string(header);
 +	
 +	http_negotiate_cleanup(neg, 0);
++
++	mem_free(encoded);
++	
 +	return 0;
 +}
 +
 --- elinks-0.11.1/src/protocol/http/http.c.negotiate	2006-01-29 14:10:39.000000000 +0100
-+++ elinks-0.11.1/src/protocol/http/http.c	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/src/protocol/http/http.c	2006-06-12 23:06:57.000000000 +0200
 @@ -47,6 +47,9 @@
  #include "util/memory.h"
  #include "util/string.h"
@@ -324,15 +352,7 @@
  
  struct http_version {
  	int major;
-@@ -82,7 +85,6 @@
- 	int code;
- };
- 
--
- static struct auth_entry proxy_auth;
- 
- static unsigned char *accept_charset = NULL;
-@@ -551,7 +553,7 @@
+@@ -551,7 +554,7 @@
  	int trace = get_opt_bool("protocol.http.trace");
  	struct string header;
  	unsigned char *post_data = NULL;
@@ -341,7 +361,7 @@
  	struct uri *uri = conn->proxied_uri; /* Set to the real uri */
  	unsigned char *optstr;
  	int use_connect, talking_to_proxy;
-@@ -808,7 +810,11 @@
+@@ -808,7 +811,11 @@
  		add_crlf_to_string(&header);
  	}
  
@@ -354,7 +374,7 @@
  	if (entry) {
  		if (entry->digest) {
  			unsigned char *response;
-@@ -1327,12 +1333,12 @@
+@@ -1327,12 +1334,13 @@
  	return 0;
  }
  
@@ -362,6 +382,7 @@
 -static void
 -check_http_authentication(struct uri *uri, unsigned char *header,
 -			  unsigned char *header_field)
++/* returns 1 if we need retry the connection (for negotiate-auth only) */
 +static int
 +check_http_authentication(struct connection *conn, struct uri *uri, 
 +		unsigned char *header, unsigned char *header_field)
@@ -371,7 +392,7 @@
  
  	d = parse_header(header, header_field, &str);
  	while (d) {
-@@ -1358,10 +1364,24 @@
+@@ -1358,10 +1366,24 @@
  			mem_free(d);
  			break;
  		}
@@ -397,19 +418,15 @@
  }
  
  
-@@ -1588,11 +1608,17 @@
+@@ -1588,11 +1610,13 @@
  	}
  
  	if (h == 401) {
 -		unsigned char *head = conn->cached->head;
 -
 -		check_http_authentication(uri, head, "WWW-Authenticate");
-+		int ret = check_http_authentication(conn, uri, 
-+				conn->cached->head, "WWW-Authenticate");
-+	
-+		
-+		if (ret) {
-+			// XXX: mem_free(conn->cached->head);
++		if (check_http_authentication(conn, uri, 
++				conn->cached->head, "WWW-Authenticate")) {
 +			retry_connection(conn, S_RESTART);
 +			return;
 +		}
@@ -420,7 +437,7 @@
  		unsigned char *str;
  
 --- elinks-0.11.1/src/util/base64.c.negotiate	2006-01-29 14:10:39.000000000 +0100
-+++ elinks-0.11.1/src/util/base64.c	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/src/util/base64.c	2006-06-12 20:33:59.000000000 +0200
 @@ -17,14 +17,21 @@
  unsigned char *
  base64_encode(register unsigned char *in)
@@ -499,7 +516,7 @@
  
  decode_error:
 --- elinks-0.11.1/src/util/base64.h.negotiate	2006-01-29 14:10:39.000000000 +0100
-+++ elinks-0.11.1/src/util/base64.h	2006-06-09 13:09:41.000000000 +0200
++++ elinks-0.11.1/src/util/base64.h	2006-06-12 20:33:59.000000000 +0200
 @@ -4,4 +4,7 @@
  unsigned char *base64_encode(unsigned char *);
  unsigned char *base64_decode(unsigned char *);
@@ -508,8 +525,8 @@
 +unsigned char *base64_decode_bin(unsigned char *, int, int *);
 +
  #endif
---- elinks-0.11.1/configure.in.negotiate	2006-06-09 13:09:41.000000000 +0200
-+++ elinks-0.11.1/configure.in	2006-06-09 13:09:41.000000000 +0200
+--- elinks-0.11.1/configure.in.negotiate	2006-06-12 20:33:59.000000000 +0200
++++ elinks-0.11.1/configure.in	2006-06-12 20:33:59.000000000 +0200
 @@ -447,6 +447,30 @@
  	[  --without-idn           disable international domain names support])
  


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- elinks.spec	9 Jun 2006 12:08:47 -0000	1.35
+++ elinks.spec	12 Jun 2006 21:11:25 -0000	1.36
@@ -2,7 +2,7 @@
 Name: elinks
 Summary: A text-mode Web browser.
 Version: 0.11.1
-Release: 3
+Release: 4
 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2
 Group: Applications/Internet
 URL: http://elinks.or.cz/
@@ -91,6 +91,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 0.11.1-4
+- improved negotiate-auth patch (faster now)
+
 * Fri Jun  9 2006 Karel Zak <kzak at redhat.com> 0.11.1-3
 - added negotiate-auth (GSSAPI) support -- EXPERIMENTAL!
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:14:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:14:44 -0400
Subject: rpms/rcs/devel rcs.spec,1.16,1.17
Message-ID: <200606122114.k5CLEidU013561@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rcs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13539

Modified Files:
	rcs.spec 
Log Message:
adding missing BR


Index: rcs.spec
===================================================================
RCS file: /cvs/dist/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rcs.spec	11 Feb 2006 05:28:07 -0000	1.16
+++ rcs.spec	12 Jun 2006 21:14:42 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 29.2.1
+Release: 30
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -12,6 +12,7 @@
 Patch3: rcs-5.7-option.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: automake
 
 %description
 The Revision Control System (RCS) is a system for managing multiple
@@ -55,6 +56,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Mon Jun 12 2006 Jesse Keating <jkeating at redhat.com> - 5.7-30
+- Add missing BR automake
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.7-29.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:24:24 -0400
Subject: rpms/syslinux/devel syslinux.spec,1.32,1.33
Message-ID: <200606122124.k5CLOOqX031845@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31787

Modified Files:
	syslinux.spec 
Log Message:
- nuke subpackage



Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- syslinux.spec	5 Jun 2006 15:56:30 -0000	1.32
+++ syslinux.spec	12 Jun 2006 21:24:21 -0000	1.33
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.10
 %define tarball_version 3.10
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -19,26 +19,18 @@
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)
 %endif
+Provides: syslinux-devel
 
 # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
 # a system bootloader, and may be necessary for system recovery.
 %define _sbindir /sbin
 
-%package devel
-Summary: Development environment for SYSLINUX add-on modules
-Group: Development/Libraries
-
 %description
 SYSLINUX is a suite of bootloaders, currently supporting DOS FAT
 filesystems, Linux ext2/ext3 filesystems (EXTLINUX), PXE network boots
 (PXELINUX), or ISO 9660 CD-ROMs (ISOLINUX).  It also includes a tool,
 MEMDISK, which loads legacy operating systems from these media.
 
-%description devel
-The SYSLINUX boot loader contains an API, called COM32, for writing
-sophisticated add-on modules.  This package contains the libraries
-necessary to compile such modules.
-
 %prep
 %setup -q -n syslinux-%{tarball_version}
 %patch0 -p1 -b .x86_64
@@ -79,6 +71,7 @@
 %defattr(-,root,root)
 %doc NEWS README* TODO COPYING 
 %doc *.doc memdisk/*.doc
+%doc sample
 %{_bindir}/syslinux
 %{_sbindir}/extlinux
 %{_bindir}/ppmtolss16
@@ -94,13 +87,12 @@
 %{_prefix}/lib/syslinux/mkdiskimage
 %{_prefix}/lib/syslinux/syslinux
 %{_prefix}/lib/syslinux/syslinux-nomtools
-
-%files devel
-%defattr(-,root,root)
-%doc sample
 %{_prefix}/lib/syslinux/com32
 
 %changelog
+* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> - 3.10-6
+- Fold -devel subpackage into "syslinux"
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-5
 - Use the actual file as a BuildRequire
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:26:48 -0400
Subject: rpms/kdeutils/FC-5 kdeutils.spec,1.55,1.56 sources,1.33,1.34
Message-ID: <200606122126.k5CLQm10000372@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv319

Modified Files:
	kdeutils.spec sources 
Log Message:
3.5.3



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/kdeutils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdeutils.spec	5 Apr 2006 18:53:26 -0000	1.55
+++ kdeutils.spec	12 Jun 2006 21:26:45 -0000	1.56
@@ -12,10 +12,9 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Name: kdeutils
-Prefix: /usr
 Summary: K Desktop Environment - Utilities
 Epoch: 6
 License: GPL
@@ -27,12 +26,10 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: kdebase-devel
-BuildRequires: automake
 BuildRequires: net-snmp-devel
 
 Obsoletes: ark
@@ -247,10 +244,6 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -278,35 +271,48 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Show only in KDE
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
          irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
-   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
-     echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+     echo "OnlyShowIn=KDE;" >>  %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd  %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -sf ../common $i
 done
 popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS README COPYING
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
@@ -328,7 +334,10 @@
 %{_includedir}/kde/*
 
 %changelog
-* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Apr 2006 18:53:26 -0000	1.33
+++ sources	12 Jun 2006 21:26:45 -0000	1.34
@@ -1 +1 @@
-08c01d6ceb8fb2173463838e43f986f5  kdeutils-3.5.2.tar.bz2
+b3d792c21e9a72bf8a82c5756fcd742d  kdeutils-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:26:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:26:54 -0400
Subject: rpms/lsof/devel .cvsignore, 1.12, 1.13 lsof.spec, 1.29, 1.30 sources,
	1.13, 1.14
Message-ID: <200606122126.k5CLQs81000470@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv438

Modified Files:
	.cvsignore lsof.spec sources 
Log Message:
upgrade to 4.78C


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Jun 2006 10:25:23 -0000	1.12
+++ .cvsignore	12 Jun 2006 21:26:52 -0000	1.13
@@ -1 +1 @@
-lsof_4.78B-rh.tar.bz2
+lsof_4.78C-rh.tar.bz2


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lsof.spec	12 Jun 2006 16:18:15 -0000	1.29
+++ lsof.spec	12 Jun 2006 21:26:52 -0000	1.30
@@ -1,9 +1,9 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.78
-Release: 06052006devel.2
+Release: 06122006devel.1
 License: Free
-%define lsofrh lsof_4.78B-rh
+%define lsofrh lsof_4.78C-rh
 Group: Development/Debuggers
 Source0: %{lsofrh}.tar.bz2
 Prefix: %{_prefix}
@@ -11,9 +11,6 @@
 
 BuildRequires: libselinux-devel
 
-# 194864 - lsof segfaults on starting
-Patch0: lsof_4.78B-rh-selinux.patch
-
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
 information about files that are open by the processes running on a
@@ -21,7 +18,6 @@
 
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -45,6 +41,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 4.78-06122006devel.1
+- upgrade to 4.78C (last bugfix accepted by upstream)
+
 * Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 4.78-06052006devel.2
 - added BuildRequires libselinux-devel
 - fix #194864 - lsof segfaults on starting


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jun 2006 10:25:23 -0000	1.13
+++ sources	12 Jun 2006 21:26:52 -0000	1.14
@@ -1 +1 @@
-1929e399143e2aab5ab4292632924874  lsof_4.78B-rh.tar.bz2
+6a604dacc4544486634d5421f7d6d31b  lsof_4.78C-rh.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:30:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:30:31 -0400
Subject: rpms/kdeutils/FC-4 kdeutils.spec,1.37,1.38 sources,1.29,1.30
Message-ID: <200606122130.k5CLUVXW001715@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1657

Modified Files:
	kdeutils.spec sources 
Log Message:
3.5.3



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/kdeutils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdeutils.spec	12 Apr 2006 10:06:58 -0000	1.37
+++ kdeutils.spec	12 Jun 2006 21:30:15 -0000	1.38
@@ -13,7 +13,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Name: kdeutils
 Prefix: %{_prefix}
@@ -308,6 +308,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS README COPYING
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
@@ -329,6 +330,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	12 Apr 2006 10:06:58 -0000	1.29
+++ sources	12 Jun 2006 21:30:15 -0000	1.30
@@ -1 +1 @@
-08c01d6ceb8fb2173463838e43f986f5  kdeutils-3.5.2.tar.bz2
+b3d792c21e9a72bf8a82c5756fcd742d  kdeutils-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:34:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:34:16 -0400
Subject: rpms/syslinux/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 syslinux.spec, 1.33, 1.34
Message-ID: <200606122134.k5CLYGMG001914@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1885

Modified Files:
	.cvsignore sources syslinux.spec 
Log Message:
- update to 3.11-2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	24 Aug 2005 20:59:55 -0000	1.18
+++ .cvsignore	12 Jun 2006 21:33:58 -0000	1.19
@@ -1 +1 @@
-syslinux-3.10.tar.bz2
+syslinux-3.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	24 Aug 2005 20:59:55 -0000	1.18
+++ sources	12 Jun 2006 21:33:58 -0000	1.19
@@ -1 +1 @@
-777d868eef7619ce971bfbc0c3ad4245  syslinux-3.10.tar.bz2
+f1fe9e44d8062ad6dccf93920bbc7626  syslinux-3.11.tar.bz2


Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- syslinux.spec	12 Jun 2006 21:24:21 -0000	1.33
+++ syslinux.spec	12 Jun 2006 21:33:58 -0000	1.34
@@ -1,8 +1,8 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 3.10
-%define tarball_version 3.10
-Release: 6
+Version: 3.11
+%define tarball_version 3.11
+Release: 2
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -90,7 +90,7 @@
 %{_prefix}/lib/syslinux/com32
 
 %changelog
-* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> - 3.10-6
+* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> - 3.11-2
 - Fold -devel subpackage into "syslinux"
 
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 3.10-5



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:38:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:38:43 -0400
Subject: rpms/cracklib/devel cracklib.spec,1.29,1.30
Message-ID: <200606122138.k5CLchf1002304@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cracklib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2262

Modified Files:
	cracklib.spec 
Log Message:
Fixing missing BRs


Index: cracklib.spec
===================================================================
RCS file: /cvs/dist/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cracklib.spec	25 Apr 2006 20:43:08 -0000	1.29
+++ cracklib.spec	12 Jun 2006 21:38:25 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: A password-checking library.
 Name: cracklib
 Version: 2.8.9
-Release: 2
+Release: 3
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/cracklib/cracklib-words.gz
@@ -39,7 +39,7 @@
 URL: http://sourceforge.net/projects/cracklib/
 License: Artistic
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: gzip, python-devel, words
+BuildPrereq: gzip, python-devel, words, automake, libtool
 Conflicts: cracklib-dicts < 2.8
 
 %description
@@ -147,6 +147,9 @@
 %{_sbindir}/packer
 
 %changelog
+* Mon Jun 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.9-3
+- Add missing br, automake, libtool
+
 * Tue Apr 25 2006 Nalin Dahyabhai <nalin at redhat.com> - 2.8.9-2
 - update to 2.8.9
 - only create compat symlinks for the dictionaries if we aren't installing



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:47:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:47:53 -0400
Subject: rpms/syslinux/devel sources,1.19,1.20
Message-ID: <200606122147.k5CLlr8g018831@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18779

Modified Files:
	sources 
Log Message:
huh?



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Jun 2006 21:33:58 -0000	1.19
+++ sources	12 Jun 2006 21:47:50 -0000	1.20
@@ -1 +1 @@
-f1fe9e44d8062ad6dccf93920bbc7626  syslinux-3.11.tar.bz2
+513ff71287a4397d507879a1a836c2e8  syslinux-3.11.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:48:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:48:44 -0400
Subject: rpms/lftp/FC-5 lftp.spec,1.47,1.48
Message-ID: <200606122148.k5CLmigM019267@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19234

Modified Files:
	lftp.spec 
Log Message:
upgrade to 3.4.7


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/lftp.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- lftp.spec	1 Jun 2006 16:19:11 -0000	1.47
+++ lftp.spec	12 Jun 2006 21:48:41 -0000	1.48
@@ -1,18 +1,17 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.7
-Release: 	1.FC5
+Release: 	2.FC5
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
 URL: 		http://lftp.yar.ru/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildPrereq: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel
+BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool
 Requires:    	perl-String-CRC32
 Patch173276: 	lftp-3.3.5-bz173276.patch
 Patch2:		lftp-3.4.1-dont_core.patch
 Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
-Patch193773:    lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -28,10 +27,6 @@
 #^- now fixed upstream
 #%patch181694 -p1 -b .bz181694
 #^- now fixed upstream
-%ifarch s390x
-%patch193773 -p1 -b .s390x-gcc-4.1.1-no-exceptions
-# workaround gcc bug 193773 on s390x
-%endif
 
 %build
 if pkg-config openssl ; then
@@ -89,6 +84,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Mon Jun 12 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.7-2
+- Add BuildRequires for broken Brew
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.7-1
 - Upgrade to upstream version 3.4.7
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 21:55:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 17:55:20 -0400
Subject: rpms/kdevelop/FC-5 kdevelop.spec,1.46,1.47 sources,1.30,1.31
Message-ID: <200606122155.k5CLtK7L021878@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21821

Modified Files:
	kdevelop.spec sources 
Log Message:
3.3.3



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/kdevelop.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdevelop.spec	5 Apr 2006 21:08:17 -0000	1.46
+++ kdevelop.spec	12 Jun 2006 21:55:17 -0000	1.47
@@ -1,7 +1,7 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define qt_version 3.3.5
 %define qt_epoch 1
 %define kdelibs_epoch 6
@@ -12,7 +12,7 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.2
+Version: 3.3.3
 Release: 0.1.fc5
 Epoch: 9
 URL: http://www.kdevelop.org/
@@ -33,12 +33,14 @@
 Requires: perl >= 0:5.004
 Requires: libtool
 Requires: flex >= 2.5.4
-Requires: qt-designer >= %{qt_epoch}:%{qt_version}
+Requires: qt-designer
+Requires: ctags
+Requires: kdelibs-apidocs
+
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
+BuildRequires: db4-devel
+BuildRequires: kdesdk-devel >= 0:%{kde_version}
 
-BuildPrereq: autoconf
-BuildPrereq: automake
-BuildPrereq: libtool
-BuildPrereq: kdelibs-devel >= %{kde_version}
 Obsoletes: kdevelop-c_c++_ref
 
 %description
@@ -73,7 +75,6 @@
 %patch3 -p1 -b .doc
 
 %build
-export KDEDIR=%{_prefix}
 QTDIR="" && source /etc/profile.d/qt.sh
 
 # Workaround for legacy auto* tools
@@ -87,8 +88,6 @@
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="$RPM_OPT_FLAGS"
-
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
@@ -120,23 +119,36 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
-make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
+make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR= %{buildroot} install
 
 # remove useless files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
-
-%post -p /sbin/ldconfig
+rm -rf  %{buildroot}%{_prefix}/kdevbdb
 
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS README COPYING
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
@@ -154,6 +166,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 9:3.3.3-0.1.fc5
+- update to 3.3.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 9:3.3.2-0.1.fc5
 - update to 3.3.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Apr 2006 21:08:17 -0000	1.30
+++ sources	12 Jun 2006 21:55:17 -0000	1.31
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2
+89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:10:20 -0400
Subject: rpms/kdevelop/FC-4 kdevelop.spec,1.35,1.36 sources,1.25,1.26
Message-ID: <200606122210.k5CMAK6x024243@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24208

Modified Files:
	kdevelop.spec sources 
Log Message:
3.3.3



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/kdevelop.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdevelop.spec	12 Apr 2006 11:59:52 -0000	1.35
+++ kdevelop.spec	12 Jun 2006 22:10:17 -0000	1.36
@@ -1,7 +1,7 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define qt_version 3.3.4
 %define qt_epoch 1
 %define kdelibs_epoch 6
@@ -11,7 +11,7 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.2
+Version: 3.3.3
 Release: 0.1.fc4
 Epoch: 9
 URL: http://www.kdevelop.org/
@@ -26,19 +26,21 @@
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
-Prereq: /sbin/ldconfig
-
+Requires(post,postun): /sbin/ldconfig
 Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
 Requires: perl >= 0:5.004
 Requires: libtool
 Requires: flex >= 2.5.4
-Requires: qt-designer >= %{qt_epoch}:%{qt_version}
+Requires: qt-designer
 
 BuildPrereq: autoconf
 BuildPrereq: automake
 BuildPrereq: libtool
-BuildPrereq: kdelibs-devel >= %{kde_version}
+BuildPrereq: db4-devel
+BuildPrereq: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
+BuildPrereq: kdesdk-devel >= 0:%{kde_version}
+
 Obsoletes: kdevelop-c_c++_ref
 
 %description
@@ -131,6 +133,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS README COPYING
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
@@ -148,6 +151,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Tue Jun 13 2006 Than Ngo <than at redhat.com> 9:3.3.3-0.1.fc4
+- update to 3.3.3
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 9:3.3.2-0.1.fc4
 - update to 3.3.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Apr 2006 10:19:50 -0000	1.25
+++ sources	12 Jun 2006 22:10:17 -0000	1.26
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2
+89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:12:48 -0400
Subject: rpms/firefox/FC-5 .cvsignore, 1.22, 1.23 firefox.spec, 1.114,
	1.115 sources, 1.26, 1.27
Message-ID: <200606122212.k5CMCmEF024546@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/firefox/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24494

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Firefox 1.5.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	18 Apr 2006 04:32:45 -0000	1.22
+++ .cvsignore	12 Jun 2006 22:12:45 -0000	1.23
@@ -1,22 +1,2 @@
-firefox-0.9.3-source.tar.bz2
-firefox-1.0PR-source.tar.bz2
-firefox-0.10.1-source.tar.bz2
-firefox-1.0rc1-source.tar.bz2
-firefox-gnomestripe-0.1.tar.gz
-firefox-1.0-source.tar.bz2
-firefox-1.0-langpacks-3.tar.bz2
-firefox-1.0.1-source.tar.bz2
-firefox-1.0.2-source.tar.bz2
-firefox-1.0.3-source.tar.bz2
-firefox-1.0-locales.tar.bz2
-deerpark-alpha1-source.tar.bz2
-firefox-1.1a2-source.tar.bz2
-firefox-1.5b1-source.tar.bz2
-firefox-1.5rc1-source.tar.bz2
-firefox-1.5rc3-source.tar.bz2
-firefox-1.5-source.tar.bz2
-firefox-langpacks-20060125.tar.bz2
-firefox-1.5.0.1-source.tar.bz2
-firefox-langpacks-1.5.0.1-20060201.tar.bz2
-firefox-langpacks-1.5.0.2-20060417.tar.bz2
-firefox-1.5.0.2-source.tar.bz2
+firefox-1.5.0.4-source.tar.bz2
+firefox-langpacks-1.5.0.4-20060612.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- firefox.spec	4 May 2006 19:24:30 -0000	1.114
+++ firefox.spec	12 Jun 2006 22:12:45 -0000	1.115
@@ -8,7 +8,7 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.3
+Version:        1.5.0.4
 Release:        1.1.fc5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -19,7 +19,7 @@
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20060504.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060612.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -264,6 +264,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.1.fc5
+- Firefox 1.5.0.4
+
 * Thu May  4 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.3-1.1.fc5
 - Firefox 1.5.0.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 May 2006 19:24:30 -0000	1.26
+++ sources	12 Jun 2006 22:12:45 -0000	1.27
@@ -1,2 +1,2 @@
-30e99f7ac4f4cc1c8c69a6895292ef3c  firefox-1.5.0.3-source.tar.bz2
-0ced144ab49dffc4a4d9d50f06c213db  firefox-langpacks-1.5.0.3-20060504.tar.bz2
+4cb3d7c1b5345585750766c589308b5e  firefox-1.5.0.4-source.tar.bz2
+f86cb08ab1d8d172e4cd87bb58d8fee2  firefox-langpacks-1.5.0.4-20060612.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:14:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:14:21 -0400
Subject: rpms/firefox/devel .cvsignore, 1.25, 1.26 firefox.spec, 1.118,
	1.119 sources, 1.28, 1.29
Message-ID: <200606122214.k5CMELHM025042@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24931

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Firefox 1.5.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 May 2006 19:11:13 -0000	1.25
+++ .cvsignore	12 Jun 2006 22:14:17 -0000	1.26
@@ -1,25 +1,2 @@
-firefox-0.9.3-source.tar.bz2
-firefox-1.0PR-source.tar.bz2
-firefox-0.10.1-source.tar.bz2
-firefox-1.0rc1-source.tar.bz2
-firefox-gnomestripe-0.1.tar.gz
-firefox-1.0-source.tar.bz2
-firefox-1.0-langpacks-3.tar.bz2
-firefox-1.0.1-source.tar.bz2
-firefox-1.0.2-source.tar.bz2
-firefox-1.0.3-source.tar.bz2
-firefox-1.0-locales.tar.bz2
-deerpark-alpha1-source.tar.bz2
-firefox-1.1a2-source.tar.bz2
-firefox-1.5b1-source.tar.bz2
-firefox-1.5rc1-source.tar.bz2
-firefox-1.5rc3-source.tar.bz2
-firefox-1.5-source.tar.bz2
-firefox-langpacks-20060125.tar.bz2
-firefox-1.5.0.1-source.tar.bz2
-firefox-langpacks-1.5.0.1-20060201.tar.bz2
-firefox-1.5.0.2-source.tar.bz2
-firefox-langpacks-1.5.0.2-20060413.tar.bz2
-firefox-langpacks-1.5.0.2-20060418.tar.bz2
-firefox-1.5.0.3-source.tar.bz2
-firefox-langpacks-1.5.0.3-20060504.tar.bz2
+firefox-1.5.0.4-source.tar.bz2
+firefox-langpacks-1.5.0.4-20060612.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- firefox.spec	4 May 2006 19:11:13 -0000	1.118
+++ firefox.spec	12 Jun 2006 22:14:18 -0000	1.119
@@ -8,7 +8,7 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.3
+Version:        1.5.0.4
 Release:        2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -19,7 +19,7 @@
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20060504.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060612.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -264,6 +264,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
+- Firefox 1.5.0.4
+
 * Thu May  4 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.3-2
 - Firefox 1.5.0.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 May 2006 19:11:14 -0000	1.28
+++ sources	12 Jun 2006 22:14:18 -0000	1.29
@@ -1,2 +1,2 @@
-30e99f7ac4f4cc1c8c69a6895292ef3c  firefox-1.5.0.3-source.tar.bz2
-0ced144ab49dffc4a4d9d50f06c213db  firefox-langpacks-1.5.0.3-20060504.tar.bz2
+4cb3d7c1b5345585750766c589308b5e  firefox-1.5.0.4-source.tar.bz2
+f86cb08ab1d8d172e4cd87bb58d8fee2  firefox-langpacks-1.5.0.4-20060612.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:17:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:17:16 -0400
Subject: rpms/kdeutils/FC-5 kdeutils.spec,1.56,1.57
Message-ID: <200606122217.k5CMHGDl006603@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4257

Modified Files:
	kdeutils.spec 
Log Message:
BR: libXtst-devel python-devel




Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/kdeutils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdeutils.spec	12 Jun 2006 21:26:45 -0000	1.56
+++ kdeutils.spec	12 Jun 2006 22:17:13 -0000	1.57
@@ -31,6 +31,8 @@
 
 BuildRequires: kdebase-devel
 BuildRequires: net-snmp-devel
+BuildRequires: libXtst-devel
+BuildRequires: python-devel
 
 Obsoletes: ark
 Obsoletes: kcalc



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:18:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:18:55 -0400
Subject: rpms/cman/devel .cvsignore, 1.5, 1.6 cman.spec, 1.26, 1.27 sources,
	1.10, 1.11
Message-ID: <200606122218.k5CMItnB009020@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8983

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
First build for FC6.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Mar 2006 20:17:12 -0000	1.5
+++ .cvsignore	12 Jun 2006 22:18:52 -0000	1.6
@@ -1 +1 @@
-cman-1.0.5.tar.gz
+cman-2.0.0.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cman.spec	3 Mar 2006 16:49:55 -0000	1.26
+++ cman.spec	12 Jun 2006 22:18:52 -0000	1.27
@@ -11,23 +11,20 @@
 ###############################################################################
 
 Name: cman
-Version: 1.0.5
-Release: 0.FC5.1
+Version: 2.0.0
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
-BuildRequires: cman-kernheaders >= 2.6.9
-BuildRequires: ccs-devel
+BuildRequires: kernel >= 2.6.16
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
-Requires: ccs
-Requires: cman-kernel-modules >= 2.6.11
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 ExclusiveArch: %{ix86} x86_64
+URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
-Patch1: cman-1.0-pre33-norun.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 cman - The Cluster Manager
@@ -42,18 +39,41 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .norun
+#%patch1 -p1 -b .norun
 
 %build
-./configure --libdir=%{_libdir} --mandir=%{_mandir}
-sed -i '/RELEASE_MAJOR/s/= .*/= 1/' make/defines.mk
-sed -i '/RELEASE_MINOR/s/= .*/= 0.0/' make/defines.mk
-sed -i '/RELEASE /s/= .*/= %version/' make/defines.mk
-make
+TOPDIR=`pwd`
+
+cd ccs ; ./configure --libdir=%{_libdir}; cd ..
+cd dlm ; ./configure --kernel_src=/usr/; cd ..
+cd cman; ./configure --ccsincdir=${TOPDIR}/ccs/lib --ccslibdir=${TOPDIR}/ccs/lib --libdir=%{_libdir}  ; cd ..
+cd group; ./configure --kernel_src=/usr/; cd ..
+cd fence; ./configure -ccslibdir=${TOPDIR}/ccs/lib --ccsincdir=${TOPDIR}/ccs/lib --cmanincdir=${TOPDIR}/cman/lib ; cd ..
+
+for dir in ccs cman dlm fence group; do
+  cd $dir
+  sed -i '/RELEASE_MAJOR/s/= .*/= 2/' make/defines.mk
+  sed -i '/RELEASE_MINOR/s/= .*/= 0.0/' make/defines.mk
+  sed -i '/RELEASE /s/= .*/= %version/' make/defines.mk
+  cd ..
+done
+
+
+for dir in 'cman/lib' ccs cman dlm group fence; do
+  cd $dir
+  make
+  cd $TOPDIR
+done
 
 %install
+TOPDIR=`pwd`
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+for dir in ccs cman dlm fence group; do
+  cd $dir
+  make install DESTDIR=$RPM_BUILD_ROOT
+  cd $TOPDIR
+done
+
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d
 mv -f $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d/
 
@@ -70,15 +90,16 @@
 
 %files
 %defattr(-,root,root,-)
-/sbin/cman_tool
-%{_libdir}/libcman.so*
-%config /etc/rc.d/init.d/cman
+/sbin/*
+/etc/rc.d/init.d/*
+/usr/libexec/cman/*
+%{_libdir}/*.so*
 %{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
-/usr/include/libcman.h
-%{_libdir}/libcman.a
+/usr/include/*
+%{_libdir}/*.a
 
 %changelog
 * Wed Mar 1 2006 Chris Feist <cfeist at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 16:49:55 -0000	1.10
+++ sources	12 Jun 2006 22:18:52 -0000	1.11
@@ -1 +1 @@
-28093928d8ea68c10ade13525c6342cd  cman-1.0.5.tar.gz
+65c943523994fae31aa3fadc93352c0f  cman-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:21:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:21:18 -0400
Subject: rpms/python/devel python.spec,1.74,1.75
Message-ID: <200606122221.k5CMLIVO010002@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9976

Modified Files:
	python.spec 
Log Message:
Fixed bug #121198


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- python.spec	12 Jun 2006 20:52:12 -0000	1.74
+++ python.spec	12 Jun 2006 22:21:15 -0000	1.75
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 6.FC6
+Release: 7.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -41,6 +41,7 @@
 Patch14: python-2.3.4-pydocnodoc.patch
 Patch15: python-2.4.1-canonicalize.patch
 Patch16: python-2.4-gen-assert.patch
+Patch17: python-2.4-webbrowser.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -147,6 +148,7 @@
 %patch14 -p1 -b .no-doc
 %patch15 -p1 -b .canonicalize
 %patch16 -p2 -b .gen-assert
+%patch17 -p0 -b .web-browser
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -366,6 +368,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-7
+- Fixed bug #121198 (webbrowser.py should use the user's preferences first)
+
 * Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-6
 - Fixed bug #192592 (too aggressive assertion fails) - SF#1257960
 - Fixed bug #167468 (Doc/tools not included) - added in the python-tools package



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:21:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:21:43 -0400
Subject: rpms/lam/FC-5 .cvsignore, 1.11, 1.12 lam.spec, 1.33, 1.34 sources,
	1.11, 1.12
Message-ID: <200606122221.k5CMLh5C010229@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lam/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10173

Modified Files:
	.cvsignore lam.spec sources 
Log Message:
upgrade to 7.1.2; split into -devel and -libs subpackages


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Feb 2005 16:49:11 -0000	1.11
+++ .cvsignore	12 Jun 2006 22:21:40 -0000	1.12
@@ -1,2 +1,3 @@
 lam-7.0.6.tar.bz2
 lam-7.1.1.tar.bz2
+lam-7.1.2.tar.bz2


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/lam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lam.spec	22 Feb 2006 00:50:34 -0000	1.33
+++ lam.spec	12 Jun 2006 22:21:40 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
-Version: 7.1.1
-Release: 11
+Version: 7.1.2
+Release: 1.fc5
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -11,9 +11,9 @@
 Source3: lam.module.in
 URL: http://www.lam-mpi.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel
+BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel autoconf automake libtool
 Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-gfortran
-Patch0: lam-7.1.1-f77-f95.patch
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 %{?!LAMbinpfx: %define LAMbinpfx 'lam-'} # prefix for LAM binaries that clash with OpenMPI
 
@@ -43,9 +43,23 @@
 cumulative record of communication, which can be visualized either at
 runtime or post-mortem.
 
+%package libs
+Summary:        Libraries for LAM
+Group:          System/Libraries
+
+%description libs
+Runtime libraries for LAM
+
+%package devel
+Summary:        Development files for LAM
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Contains development headers and libraries for LAM
+
 %prep
-%setup -q
-%patch0 -p1 -b .f77-f95
+%setup -q -n lam-%{version}
 
 %build
 %ifarch x86_64
@@ -53,15 +67,14 @@
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
 FFLAGS="$RPM_OPT_FLAGS -fPIC"
 %endif 
-autoconf
 export FC=f95
 %ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --with-trillium --enable-shared
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --disable-tv --disable-tv-dll --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --disable-tv --disable-tv-dll --with-trillium --enable-shared
 %endif
 
 make %{?_smp_mflags} all
@@ -140,17 +153,33 @@
 %files
 %defattr(-,root,root)
 %doc LICENSE HISTORY INSTALL README AUTHORS
-%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
 %doc doc/user.pdf doc/install.pdf
 %doc share/memory/darwin7/APPLE_LICENSE share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
-%config(noreplace) %{_sysconfdir}/lam
+%config(noreplace) %{_sysconfdir}/%{name}
 %ghost %{_sysconfdir}/ld.so.conf.d/mpi.conf
-%config %{_libdir}/pkgconfig/%{name}.pc
 %{_bindir}/*
-%{_includedir}/%{name}
-%{_libdir}/%{name}
 %{_datadir}/%{name}
 
+%files libs
+%defattr(-,root,root)
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so.*
+%ifarch i386 s390 ppc
+%dir %{_libdir}/%{name}/lam
+%{_libdir}/%{name}/lam/*.so.*
+%endif
+
+%files devel
+%defattr(-,root,root)
+%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
+%{_includedir}/%{name}
+%{_libdir}/%{name}/*.a
+%{_libdir}/%{name}/*.so
+%ifarch i386 s390 ppc
+%{_libdir}/%{name}/lam/*.so
+%endif
+%config %{_libdir}/pkgconfig/%{name}.pc
+
 %post
 if [ $1 -ge 1 ]; then
    if [ ! -e %{_sysconfdir}/ld.so.conf.d/mpi.conf ]; then
@@ -159,6 +188,12 @@
 fi;
 
 %changelog
+* Mon Jun 12 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.2-1.fc6
+- Upgrade to upstream version 7.1.2
+- fix bug 191433 - Split into -libs and -devel packages
+  ( apply .spec file patch from Orion Poplawski <orion at cora.nwra.com> )
+- fix bug 194747 - fix BuildRequires for mock
+
 * Tue Feb 21 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.1-11
 - ld.so.conf.d/mpi.conf integration with openmpi
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Feb 2005 16:49:11 -0000	1.11
+++ sources	12 Jun 2006 22:21:40 -0000	1.12
@@ -1,2 +1 @@
-4037133e564648bd7815e36f3f017d8b  lam-7.0.6.tar.bz2
-0a3eee53281884a063ce2c44793672b3  lam-7.1.1.tar.bz2
+07c59cf03c773a67199e066e500e499b  lam-7.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:21:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:21:42 -0400
Subject: rpms/python/devel python-2.4-webbrowser.patch,NONE,1.1
Message-ID: <200606122221.k5CMLgLw010215@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10186

Added Files:
	python-2.4-webbrowser.patch 
Log Message:
Fixed bug #121198

python-2.4-webbrowser.patch:
 webbrowser.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE python-2.4-webbrowser.patch ---
--- Lib/webbrowser.py~	2005-09-15 10:29:38.000000000 +0300
+++ Lib/webbrowser.py	2005-11-17 19:48:20.000000000 +0200
@@ -277,12 +277,17 @@
 
     # X browsers have more in the way of options
     if os.environ.get("DISPLAY"):
-        _tryorder = ["galeon", "skipstone",
+        _tryorder = ["htmlview", "firefox", "galeon", "skipstone",
                      "mozilla-firefox", "mozilla-firebird", "mozilla", "netscape",
                      "kfm", "grail"] + _tryorder
 
+        # Try htmlview (in order to honor user config) before anything else.
+        if _iscommand("htmlview"):
+            register("htmlview", None, GenericBrowser(
+                "htmlview '%s' >/dev/null &"))
+
         # First, the Netscape series
-        for browser in ("mozilla-firefox", "mozilla-firebird",
+        for browser in ("firefox", "mozilla-firefox", "mozilla-firebird",
                         "mozilla", "netscape"):
             if _iscommand(browser):
                 register(browser, None, Netscape(browser))



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:26:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:26:16 -0400
Subject: rpms/kdevelop/FC-5 kdevelop.spec,1.47,1.48 sources,1.31,1.32
Message-ID: <200606122226.k5CMQG4G012155@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12044

Modified Files:
	kdevelop.spec sources 
Log Message:
fix typo



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/kdevelop.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdevelop.spec	12 Jun 2006 21:55:17 -0000	1.47
+++ kdevelop.spec	12 Jun 2006 22:26:14 -0000	1.48
@@ -122,7 +122,7 @@
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
-make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR= %{buildroot} install
+make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
 
 # remove useless files
 rm -rf  %{buildroot}%{_prefix}/kdevbdb


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	12 Jun 2006 21:55:17 -0000	1.31
+++ sources	12 Jun 2006 22:26:14 -0000	1.32
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2
+494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:26:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:26:58 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.276,1.277
Message-ID: <200606122226.k5CMQwSi012464@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12289

Modified Files:
	eclipse.spec 
Log Message:
- Require java-gcj-compat 1.0.52.
- Don't use '*' to set the quatifier name in the eclipse-ecj symlink.
- Really fix swt symlinks rh #194500.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- eclipse.spec	9 Jun 2006 22:26:43 -0000	1.276
+++ eclipse.spec	12 Jun 2006 22:26:55 -0000	1.277
@@ -36,7 +36,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.3
+Release:        0jpp_0fc.3.2RC7.4
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -153,7 +153,7 @@
 BuildRequires:  java-javadoc
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
-BuildRequires:	java-gcj-compat-devel >= 1.0.43
+BuildRequires:	java-gcj-compat-devel >= 1.0.52
 BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
@@ -177,8 +177,8 @@
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description
@@ -194,8 +194,8 @@
 Provides:	ecj
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):	java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):	java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -214,9 +214,9 @@
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires:	java-gcj-compat >= 1.0.43
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires:	java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -270,8 +270,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description    jdt
@@ -298,8 +298,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description    pde
@@ -314,8 +314,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description    pde-runtime
@@ -339,8 +339,8 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description -n %{libname}-gtk2
@@ -351,8 +351,8 @@
 Group:          Development/Languages
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -899,8 +899,9 @@
 done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.v$SWT_VERSION*.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
@@ -1105,7 +1106,9 @@
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}*.jar \
+jdtcoreversion=$(grep "compiler\.version = 0\..*, 3.2.0" batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
+                 sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/")
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$jdtcoreversion.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
 ln -s %{_datadir}/java/eclipse-ecj.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
@@ -1625,6 +1628,11 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.4
+- Require java-gcj-compat 1.0.52.
+- Don't use '*' to set the quatifier name in the eclipse-ecj symlink.
+- Really fix swt symlinks rh #194500.
+
 * Wed Jun 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.3
 - Enable ppc64, s390 and s390x.
 - Add check for jars at the end of prep.



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:27:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:27:26 -0400
Subject: rpms/cman/devel cman.spec,1.27,1.28
Message-ID: <200606122227.k5CMRQUL012682@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12642

Modified Files:
	cman.spec 
Log Message:
Added buildrequires for libxml-devel.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cman.spec	12 Jun 2006 22:18:52 -0000	1.27
+++ cman.spec	12 Jun 2006 22:27:23 -0000	1.28
@@ -12,11 +12,12 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
 BuildRequires: kernel >= 2.6.16
+BuildRequires: libxml-devel
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires(post): /sbin/chkconfig



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:28:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:28:36 -0400
Subject: rpms/pirut/devel .cvsignore, 1.21, 1.22 pirut.spec, 1.22,
	1.23 sources, 1.22, 1.23
Message-ID: <200606122228.k5CMSaYi013255@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13187/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.0-1 on branch devel from pirut-1.1.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	15 May 2006 18:16:54 -0000	1.21
+++ .cvsignore	12 Jun 2006 22:28:34 -0000	1.22
@@ -1,2 +1 @@
-pirut-1.0.2.tar.gz
-pirut-1.0.3.tar.gz
+pirut-1.1.0.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pirut.spec	15 May 2006 18:16:54 -0000	1.22
+++ pirut.spec	12 Jun 2006 22:28:34 -0000	1.23
@@ -2,18 +2,19 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.0.3
+Version: 1.1.0
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://fedoraproject.org
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pygtk2, pygtk2-libglade, yum >= 2.5.3, comps-extras, rhpl
+Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0, comps-extras, rhpl
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
 BuildArch: noarch
+BuildRequires: intltool gettext python
 
 %description
 pirut (pronounced "pirate") provides a set of graphical tools for managing 
@@ -67,6 +68,14 @@
 
 
 %changelog
+* Mon Jun 12 2006 Jeremy Katz <katzj at redhat.com> - 1.1.0-1
+- Update for yum 2.9.0 API
+- Handle missing summaries (bretm)
+- Fix BuildRequires (#194071)
+
+* Mon Jun  5 2006 Jeremy Katz <katzj at redhat.com>
+- fix buildrequires (#194071)
+
 * Mon May 15 2006 Jeremy Katz <katzj at redhat.com> - 1.0.3-1
 - fix plugin type bug (#191630)
 - keep apply at bottom of the window (#191721)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	15 May 2006 18:16:54 -0000	1.22
+++ sources	12 Jun 2006 22:28:34 -0000	1.23
@@ -1,2 +1 @@
-00016ba9e89dcd61274f9597824dd2f2  pirut-1.0.2.tar.gz
-e289f6787eb438d803ba1f28e6ef659d  pirut-1.0.3.tar.gz
+30aef8a0cf0b33bd2cfc7fd005f75cf6  pirut-1.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:32:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:32:10 -0400
Subject: rpms/cman/devel cman.spec,1.28,1.29
Message-ID: <200606122232.k5CMWA2W026296@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22665

Modified Files:
	cman.spec 
Log Message:
Added buildrequires for libxml2-devel.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cman.spec	12 Jun 2006 22:27:23 -0000	1.28
+++ cman.spec	12 Jun 2006 22:31:37 -0000	1.29
@@ -12,12 +12,13 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.1
+Release: 0.fc6.2
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
 BuildRequires: kernel >= 2.6.16
 BuildRequires: libxml-devel
+BuildRequires: libxml2-devel
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires(post): /sbin/chkconfig



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:36:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:36:13 -0400
Subject: rpms/kdevelop/FC-5 sources,1.32,1.33
Message-ID: <200606122236.k5CMaDrD020350@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14988

Modified Files:
	sources 
Log Message:
3.3.3



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	12 Jun 2006 22:26:14 -0000	1.32
+++ sources	12 Jun 2006 22:36:09 -0000	1.33
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2
+89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:42:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:42:29 -0400
Subject: rpms/lftp/FC-5 lftp.spec,1.48,1.49
Message-ID: <200606122242.k5CMgTbt024683@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24670

Modified Files:
	lftp.spec 
Log Message:
upgrade to 3.4.7


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/lftp.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- lftp.spec	12 Jun 2006 21:48:41 -0000	1.48
+++ lftp.spec	12 Jun 2006 22:42:27 -0000	1.49
@@ -12,6 +12,7 @@
 Patch173276: 	lftp-3.3.5-bz173276.patch
 Patch2:		lftp-3.4.1-dont_core.patch
 Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
+Patch4:         lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -27,6 +28,9 @@
 #^- now fixed upstream
 #%patch181694 -p1 -b .bz181694
 #^- now fixed upstream
+%ifarch s390x
+%patch4 -p1 -b .s390x-fno-exceptions
+%endif
 
 %build
 if pkg-config openssl ; then



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:44:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:44:59 -0400
Subject: rpms/kdewebdev/FC-5 kdewebdev.spec,1.29,1.30 sources,1.13,1.14
Message-ID: <200606122244.k5CMixBh024770@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24751

Modified Files:
	kdewebdev.spec sources 
Log Message:
update to 3.5.3



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdewebdev.spec	5 Apr 2006 21:45:12 -0000	1.29
+++ kdewebdev.spec	12 Jun 2006 22:44:56 -0000	1.30
@@ -5,13 +5,13 @@
 %define arts 1
 
 %define qt_version 3.3.5
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
@@ -29,7 +29,8 @@
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
 
 Patch0: javascript.patch
-Prereq: /sbin/ldconfig
+
+Requires(post,postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
 BuildPrereq: qt-devel >= %{qt_version}
@@ -67,9 +68,6 @@
   make -f admin/Makefile.common cvs
 %endif
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -92,24 +90,24 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # install docs
 for i in css html javascript ; do
    pushd $i
    ./install.sh <<EOF
-$RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+%{buildroot}%{_datadir}/apps/quanta/doc
 EOF
    popd
    rm -rf $i
 done
 
-cp -R php php.docrc $RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
 
 # fix dangling symlinks
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -118,15 +116,28 @@
 done
 popd
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/*.so.*
@@ -147,6 +158,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jun 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Apr 2006 21:45:12 -0000	1.13
+++ sources	12 Jun 2006 22:44:57 -0000	1.14
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2
+0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:57:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:57:04 -0400
Subject: rpms/cman/devel cman.spec,1.29,1.30 sources,1.11,1.12
Message-ID: <200606122257.k5CMv4xL007104@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7090

Modified Files:
	cman.spec sources 
Log Message:
Fixed sources.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cman.spec	12 Jun 2006 22:31:37 -0000	1.29
+++ cman.spec	12 Jun 2006 22:57:02 -0000	1.30
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.2
+Release: 0.fc6.3
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Jun 2006 22:18:52 -0000	1.11
+++ sources	12 Jun 2006 22:57:02 -0000	1.12
@@ -1 +1 @@
-65c943523994fae31aa3fadc93352c0f  cman-2.0.0.tar.gz
+7c659d17404402ee4884df22bc5f1052  cman-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 12 22:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 18:57:20 -0400
Subject: rpms/kdewebdev/FC-4 kdewebdev.spec,1.17,1.18 sources,1.9,1.10
Message-ID: <200606122257.k5CMvKWJ007161@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7146

Modified Files:
	kdewebdev.spec sources 
Log Message:
3.5.3



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/kdewebdev.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdewebdev.spec	21 Apr 2006 09:00:40 -0000	1.17
+++ kdewebdev.spec	12 Jun 2006 22:57:18 -0000	1.18
@@ -5,14 +5,14 @@
 %define arts 1
 
 %define qt_version 3.3.4
-%define kde_version 3.5.2
+%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
-Release: 0.2.fc4
+Version: 3.5.3
+Release: 0.1.fc4
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -20,7 +20,6 @@
 Group: Applications/Editors
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
@@ -31,11 +30,11 @@
 
 Patch0: javascript.patch
 
-Prereq: /sbin/ldconfig
-Requires: kdelibs >= 6:%{kde_version}
+Requires(post,postun): /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
 BuildPrereq: qt-devel >= %{qt_version}
-BuildPrereq: kdesdk-devel >= %{kde_version}
+BuildPrereq: kdesdk-devel >= 0:%{kde_version}
 BuildPrereq: perl
 
 Obsoletes: WebMaker
@@ -135,6 +134,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/*.so.*
@@ -155,6 +155,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Jun 12 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4 
+- update to 3.5.3
+
 * Fri Apr 21 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc4
 - add Obsoletes: tidy
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Apr 2006 10:29:38 -0000	1.9
+++ sources	12 Jun 2006 22:57:18 -0000	1.10
@@ -3,4 +3,4 @@
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
 98076a205e30873dad43d384b2366d23  tidy_src_041026.tgz
-ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2
+0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jun 12 23:05:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 19:05:29 -0400
Subject: rpms/cman/devel cman.spec,1.30,1.31 sources,1.12,1.13
Message-ID: <200606122305.k5CN5T9A007370@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7354

Modified Files:
	cman.spec sources 
Log Message:
More source fixes.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cman.spec	12 Jun 2006 22:57:02 -0000	1.30
+++ cman.spec	12 Jun 2006 23:05:27 -0000	1.31
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.3
+Release: 0.fc6.4
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jun 2006 22:57:02 -0000	1.12
+++ sources	12 Jun 2006 23:05:27 -0000	1.13
@@ -1 +1 @@
-7c659d17404402ee4884df22bc5f1052  cman-2.0.0.tar.gz
+60bb6f7f263b54bed7397c850d1a1b8a  cman-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 12 23:26:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 19:26:05 -0400
Subject: rpms/thunderbird/devel .cvsignore, 1.11, 1.12 sources, 1.15,
	1.16 thunderbird.spec, 1.71, 1.72
Message-ID: <200606122326.k5CNQ5GH004415@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4297

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to 1.5.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Apr 2006 17:47:14 -0000	1.11
+++ .cvsignore	12 Jun 2006 23:26:02 -0000	1.12
@@ -1,12 +1,2 @@
-thunderbird-0.7.3-source.tar.bz2
-thunderbird-source-0.8.tar.bz2
-thunderbird-0.9-source.tar.bz2
-thunderbird-1.0rc-source.tar.bz2
-thunderbird-1.0-source.tar.bz2
-thunderbird-1.5b1-source.tar.bz2
-thunderbird-1.5b2-source.tar.bz2
-thunderbird-1.5rc1-source.tar.bz2
-thunderbird-1.5-source.tar.bz2
-thunderbird-langpacks-20060127.tar.bz2
-thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
-thunderbird-1.5.0.2-source.tar.bz2
+thunderbird-1.5.0.4-source.tar.bz2
+thunderbird-langpacks-1.5.0.4-20060612.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Apr 2006 20:34:40 -0000	1.15
+++ sources	12 Jun 2006 23:26:02 -0000	1.16
@@ -1,2 +1,2 @@
-8e8a91c64ae69aec4fd472b74962f16f  thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
-3f32b847330c9d58297147be19714962  thunderbird-1.5.0.2-source.tar.bz2
+ada9c163f5b26fe81958e7a85340811e  thunderbird-1.5.0.4-source.tar.bz2
+b47823f68664d8a278be8b9a796cdce0  thunderbird-langpacks-1.5.0.4-20060612.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- thunderbird.spec	19 Apr 2006 18:27:14 -0000	1.71
+++ thunderbird.spec	12 Jun 2006 23:26:02 -0000	1.72
@@ -7,7 +7,7 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5.0.2
+Version:	1.5.0.4
 Release:	2
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
@@ -19,7 +19,7 @@
 %define tarball thunderbird-1.5rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20060419.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20060612.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -211,6 +211,9 @@
 #===============================================================================
 
 %changelog
+* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
+- Update to 1.5.0.4
+
 * Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
 - Update to 1.5.0.2
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 23:30:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 19:30:02 -0400
Subject: rpms/thunderbird/FC-5 .cvsignore, 1.11, 1.12 sources, 1.14,
	1.15 thunderbird.spec, 1.69, 1.70
Message-ID: <200606122330.k5CNU2PI005971@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/thunderbird/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5840

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to 1.5.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Apr 2006 19:54:27 -0000	1.11
+++ .cvsignore	12 Jun 2006 23:30:00 -0000	1.12
@@ -1,12 +1,2 @@
-thunderbird-0.7.3-source.tar.bz2
-thunderbird-source-0.8.tar.bz2
-thunderbird-0.9-source.tar.bz2
-thunderbird-1.0rc-source.tar.bz2
-thunderbird-1.0-source.tar.bz2
-thunderbird-1.5b1-source.tar.bz2
-thunderbird-1.5b2-source.tar.bz2
-thunderbird-1.5rc1-source.tar.bz2
-thunderbird-1.5-source.tar.bz2
-thunderbird-langpacks-20060127.tar.bz2
-thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
-thunderbird-1.5.0.2-source.tar.bz2
+thunderbird-1.5.0.4-source.tar.bz2
+thunderbird-langpacks-1.5.0.4-20060612.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Apr 2006 19:54:27 -0000	1.14
+++ sources	12 Jun 2006 23:30:00 -0000	1.15
@@ -1,2 +1,2 @@
-8e8a91c64ae69aec4fd472b74962f16f  thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
-3f32b847330c9d58297147be19714962  thunderbird-1.5.0.2-source.tar.bz2
+ada9c163f5b26fe81958e7a85340811e  thunderbird-1.5.0.4-source.tar.bz2
+b47823f68664d8a278be8b9a796cdce0  thunderbird-langpacks-1.5.0.4-20060612.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- thunderbird.spec	28 Apr 2006 19:54:27 -0000	1.69
+++ thunderbird.spec	12 Jun 2006 23:30:00 -0000	1.70
@@ -7,7 +7,7 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5.0.2
+Version:	1.5.0.4
 Release:	1.1.fc5
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
@@ -19,7 +19,7 @@
 %define tarball thunderbird-1.5rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20060419.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20060612.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -211,6 +211,9 @@
 #===============================================================================
 
 %changelog
+* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.1.fc5
+- Update to 1.5.0.4
+
 * Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
 - Update to 1.5.0.2
 



From fedora-cvs-commits at redhat.com  Mon Jun 12 23:53:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 19:53:39 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.23,1.24
Message-ID: <200606122353.k5CNrd6f025634@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25368

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
Missing ipv6 netfilter headers

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 +
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 +
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 +++
 include/asm-m68knommu/Kbuild          |   12 ++
 include/asm-mips/Kbuild               |   15 +++
 include/asm-parisc/Kbuild             |    8 +
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 +
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 ++
 include/asm-sparc64/Kbuild            |   16 +++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 ++
 include/linux/Kbuild                  |   63 +++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    6 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  158 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 534 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-header-install-git.patch	11 Jun 2006 22:36:26 -0000	1.23
+++ linux-2.6-header-install-git.patch	12 Jun 2006 23:53:36 -0000	1.24
@@ -576,14 +576,15 @@
 +	ip_tables.h
 diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
 new file mode 100644
-index 0000000..0e64a36
+index 0000000..913ddbf
 --- /dev/null
 +++ b/include/linux/netfilter_ipv6/Kbuild
-@@ -0,0 +1,5 @@
-+header-y += ip6t_LOG.h ip6t_MARK.h ip6t_ah.h ip6t_esp.h \
-+	ip6t_frag.h ip6t_hl.h ip6t_ipv6header.h ip6t_length.h \
-+	ip6t_limit.h ip6t_mac.h ip6t_mark.h ip6t_multiport.h ip6t_opts.h \
-+	ip6t_owner.h ip6t_physdev.h ip6t_rt.h
+@@ -0,0 +1,6 @@
++header-y += ip6t_HL.h ip6t_LOG.h ip6t_MARK.h ip6t_REJECT.h ip6t_ah.h	\
++	ip6t_esp.h ip6t_frag.h ip6t_hl.h ip6t_ipv6header.h		\
++	ip6t_length.h ip6t_limit.h ip6t_mac.h ip6t_mark.h		\
++	ip6t_multiport.h ip6t_opts.h ip6t_owner.h ip6t_policy.h		\
++	ip6t_physdev.h ip6t_rt.h
 +unifdef-y := ip6_tables.h
 diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
 new file mode 100644



From fedora-cvs-commits at redhat.com  Tue Jun 13 00:02:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 20:02:20 -0400
Subject: rpms/mesa/devel mesa-6.5-fix-pbuffer-dispatch.patch, NONE,
	1.1 mesa.spec, 1.61, 1.62
Message-ID: <200606130002.k5D02KiP028329@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28283

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-fix-pbuffer-dispatch.patch 
Log Message:
* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-9
- Add mesa-6.5-fix-pbuffer-dispatch.patch to fix pbuffer marshalling code.


mesa-6.5-fix-pbuffer-dispatch.patch:
 glx_pbuffer.c |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

--- NEW FILE mesa-6.5-fix-pbuffer-dispatch.patch ---
--- ./src/glx/x11/glx_pbuffer.c.fix-pbuffer-dispatch	2006-02-06 19:41:27.000000000 -0500
+++ ./src/glx/x11/glx_pbuffer.c	2006-06-12 17:49:46.000000000 -0400
@@ -72,12 +72,13 @@
 {
    __GLXdisplayPrivate *priv = __glXInitialize(dpy);
    CARD32 * output;
-
+   CARD8 opcode;
 
    if ( (dpy == NULL) || (drawable == 0) ) {
       return;
    }
 
+   opcode = __glXSetupForCommand(dpy);
 
    LockDisplay(dpy);
 
@@ -87,7 +88,7 @@
       GetReqExtra( GLXChangeDrawableAttributes, 8 + (8 * num_attribs), req );
       output = (CARD32 *) (req + 1);
 
-      req->reqType = __glXSetupForCommand(dpy);
+      req->reqType = opcode;
       req->glxCode = X_GLXChangeDrawableAttributes;
       req->drawable = drawable;
       req->numAttribs = (CARD32) num_attribs;
@@ -98,7 +99,7 @@
       GetReqExtra( GLXVendorPrivateWithReply, 4 + (8 * num_attribs), vpreq );
       output = (CARD32 *) (vpreq + 1);
 
-      vpreq->reqType = __glXSetupForCommand(dpy);
+      vpreq->reqType = opcode;
       vpreq->glxCode = X_GLXVendorPrivateWithReply;
       vpreq->vendorCode = X_GLXvop_ChangeDrawableAttributesSGIX;
 
@@ -132,11 +133,13 @@
 DestroyPbuffer( Display * dpy, GLXDrawable drawable )
 {
    __GLXdisplayPrivate *priv = __glXInitialize(dpy);
+   CARD8 opcode;
 
    if ( (dpy == NULL) || (drawable == 0) ) {
       return;
    }
 
+   opcode = __glXSetupForCommand(dpy);
 
    LockDisplay(dpy);
 
@@ -144,7 +147,7 @@
       xGLXDestroyPbufferReq * req;
 
       GetReqExtra( GLXDestroyPbuffer, 4, req );
-      req->reqType = __glXSetupForCommand(dpy);
+      req->reqType = opcode;
       req->glxCode = X_GLXDestroyPbuffer;
       req->pbuffer = (GLXPbuffer) drawable;
    }
@@ -157,7 +160,7 @@
 
       data[0] = (CARD32) drawable;
 
-      vpreq->reqType = __glXSetupForCommand(dpy);
+      vpreq->reqType = opcode;
       vpreq->glxCode = X_GLXVendorPrivateWithReply;
       vpreq->vendorCode = X_GLXvop_DestroyGLXPbufferSGIX;
    }
@@ -194,6 +197,7 @@
    __GLXdisplayPrivate *priv = __glXInitialize(dpy);
    xGLXGetDrawableAttributesReply reply;
    CARD32 * data;
+   CARD8 opcode;
    unsigned int length;
    unsigned int i;
    unsigned int num_attributes;
@@ -206,6 +210,7 @@
       return 0;
    }
 
+   opcode = __glXSetupForCommand(dpy);
    
    LockDisplay(dpy);
 
@@ -213,7 +218,7 @@
       xGLXGetDrawableAttributesReq *req;
 
       GetReqExtra( GLXGetDrawableAttributes, 4, req );
-      req->reqType = __glXSetupForCommand(dpy);
+      req->reqType = opcode;
       req->glxCode = X_GLXGetDrawableAttributes;
       req->drawable = drawable;
    }
@@ -224,7 +229,7 @@
       data = (CARD32 *) (vpreq + 1);
       data[0] = (CARD32) drawable;
 
-      vpreq->reqType = __glXSetupForCommand(dpy);
+      vpreq->reqType = opcode;
       vpreq->glxCode = X_GLXVendorPrivateWithReply;
       vpreq->vendorCode = X_GLXvop_GetDrawableAttributesSGIX;
    }
@@ -284,6 +289,7 @@
    xGLXCreateWindowReq * req;
    CARD32 * data;
    unsigned int i;
+   CARD8 opcode;
 
    i = 0;
    if (attrib_list) {
@@ -291,11 +297,13 @@
 	   i++;
    }
 
+   opcode = __glXSetupForCommand(dpy);
+
    LockDisplay(dpy);
    GetReqExtra( GLXCreateWindow, 8 * i, req );
    data = (CARD32 *) (req + 1);
 
-   req->reqType = __glXSetupForCommand(dpy);
+   req->reqType = opcode;
    req->glxCode = glxCode;
    req->screen = (CARD32) fbconfig->screen;
    req->fbconfig = fbconfig->fbconfigID;
@@ -322,16 +330,19 @@
 DestroyDrawable( Display * dpy, GLXDrawable drawable, CARD32 glxCode )
 {
    xGLXDestroyPbufferReq * req;
+   CARD8 opcode;
 
    if ( (dpy == NULL) || (drawable == 0) ) {
       return;
    }
 
 
+   opcode = __glXSetupForCommand(dpy);
+
    LockDisplay(dpy);
 
    GetReqExtra( GLXDestroyPbuffer, 4, req );
-   req->reqType = __glXSetupForCommand(dpy);
+   req->reqType = opcode;
    req->glxCode = glxCode;
    req->pbuffer = (GLXPbuffer) drawable;
 
@@ -363,6 +374,7 @@
    __GLXdisplayPrivate *priv = __glXInitialize(dpy);
    GLXDrawable id = 0;
    CARD32 * data;
+   CARD8 opcode;
    unsigned int  i;
 
    i = 0;
@@ -371,6 +383,7 @@
 	   i++;
    }
 
+   opcode = __glXSetupForCommand(dpy);
    LockDisplay(dpy);
    id = XAllocID(dpy);
 
@@ -381,7 +394,7 @@
       GetReqExtra( GLXCreatePbuffer, (8 * (i + extra)), req );
       data = (CARD32 *) (req + 1);
 
-      req->reqType = __glXSetupForCommand(dpy);
+      req->reqType = opcode;
       req->glxCode = X_GLXCreatePbuffer;
       req->screen = (CARD32) fbconfig->screen;
       req->fbconfig = fbconfig->fbconfigID;
@@ -402,7 +415,7 @@
       GetReqExtra( GLXVendorPrivate, 20 + (8 * i), vpreq );
       data = (CARD32 *) (vpreq + 1);
 
-      vpreq->reqType = __glXSetupForCommand(dpy);
+      vpreq->reqType = opcode;
       vpreq->glxCode = X_GLXVendorPrivate;
       vpreq->vendorCode = X_GLXvop_CreateGLXPbufferSGIX;
 


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mesa.spec	29 May 2006 23:33:52 -0000	1.61
+++ mesa.spec	13 Jun 2006 00:02:01 -0000	1.62
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 8
+Release: 9
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,12 +75,13 @@
 Patch5: mesa-6.5-drop-static-inline.patch
 Patch6: mesa-6.5-noexecstack.patch
 Patch7: mesa-6.5-force-r300.patch
-
+Patch8: mesa-6.5-fix-pbuffer-dispatch.patch
 # General patches from upstream go here:
 
 # Red Hat custom patches, feature development
 Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
+Patch202: mesa-6.5-tfp-fbconfig-attribs.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -244,12 +245,14 @@
 %patch5 -p0 -b .drop-static-inline
 %patch6 -p0 -b .noexecstack
 %patch7 -p0 -b .force-r300
+%patch8 -p0 -b .fix-pbuffer-dispatch
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
 # a change for post feature freeze.  Leaving off for now...
 %patch200 -p0 -b .texture-from-pixmap-fixes
 %patch201 -p1 -b .radeon-use-right-format
+%patch202 -p0 -b .tfp-fbconfig-attribs
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -435,6 +438,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-9
+- Add mesa-6.5-fix-pbuffer-dispatch.patch to fix pbuffer marshalling code.
+
 * Mon May 29 2006 Kristian H??gsberg <krh at redhat.com> 6.5-8
 - Bump for rawhide build.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 00:02:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 20:02:42 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.8,
	1.9 glibc-kernheaders.spec, 1.147, 1.148 sources, 1.49, 1.50
Message-ID: <200606130002.k5D02goc028366@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28323

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
add ipv6 netfilter headers


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Jun 2006 23:42:13 -0000	1.8
+++ .cvsignore	13 Jun 2006 00:02:38 -0000	1.9
@@ -1 +1 @@
-glibc-kernheaders-2.6.16-1.2266_FC6.tar.bz2
+glibc-kernheaders-2.6.16-1.2271_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- glibc-kernheaders.spec	11 Jun 2006 23:42:13 -0000	1.147
+++ glibc-kernheaders.spec	13 Jun 2006 00:02:39 -0000	1.148
@@ -1,9 +1,9 @@
-%define KVER 2.6.16-1.2266_FC6
+%define KVER 2.6.16-1.2271_FC6
 
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 40
+Release: 41
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -109,6 +109,9 @@
 /usr/include/*
 
 %changelog
+* Tue Jun 13 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-41
+- Update to 2.6.16-1.2271_FC6; add new IPv6 netfilter headers (#121257)
+
 * Mon Jun 12 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-40
 - Update to 2.6.16-1.2266_FC6, remove compiler.h sed magic
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	11 Jun 2006 23:42:13 -0000	1.49
+++ sources	13 Jun 2006 00:02:39 -0000	1.50
@@ -1 +1 @@
-88d6bb17adac3c562a51ed887d635318  glibc-kernheaders-2.6.16-1.2266_FC6.tar.bz2
+4800e20798524fd81fb1bb7930cf48f1  glibc-kernheaders-2.6.16-1.2271_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 00:15:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 20:15:05 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.277,1.278
Message-ID: <200606130015.k5D0F5TL029844@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29809

Modified Files:
	eclipse.spec 
Log Message:
fix jdtcore symlink


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- eclipse.spec	12 Jun 2006 22:26:55 -0000	1.277
+++ eclipse.spec	13 Jun 2006 00:15:03 -0000	1.278
@@ -1106,7 +1106,7 @@
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
-jdtcoreversion=$(grep "compiler\.version = 0\..*, 3.2.0" batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
+jdtcoreversion=$(grep "compiler\.version = 0\..*, 3.2.0" plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
                  sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/")
 ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$jdtcoreversion.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar



From fedora-cvs-commits at redhat.com  Tue Jun 13 00:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 20:27:41 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.278,1.279
Message-ID: <200606130027.k5D0Rfrg016688@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16659

Modified Files:
	eclipse.spec 
Log Message:
bump release


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- eclipse.spec	13 Jun 2006 00:15:03 -0000	1.278
+++ eclipse.spec	13 Jun 2006 00:27:39 -0000	1.279
@@ -36,7 +36,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.4
+Release:        0jpp_0fc.3.2RC7.5
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1628,6 +1628,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.5
+- Bump release.
+
 * Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.4
 - Require java-gcj-compat 1.0.52.
 - Don't use '*' to set the quatifier name in the eclipse-ecj symlink.



From fedora-cvs-commits at redhat.com  Tue Jun 13 01:13:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 21:13:40 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.279,1.280
Message-ID: <200606130113.k5D1DeRV008857@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8827

Modified Files:
	eclipse.spec 
Log Message:
one more fix for jdtcore symlink


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- eclipse.spec	13 Jun 2006 00:27:39 -0000	1.279
+++ eclipse.spec	13 Jun 2006 01:13:37 -0000	1.280
@@ -985,6 +985,10 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features 
 chmod a+x $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
 
+
+JDTCOREVERSION=$(grep "compiler\.version = 0\..*, 3.2.0" plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
+                 sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/")
+
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ## BEGIN ANT ##
 rm plugins/org.apache.ant_*/lib/ant-antlr.jar
@@ -1106,9 +1110,7 @@
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
-jdtcoreversion=$(grep "compiler\.version = 0\..*, 3.2.0" plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
-                 sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/")
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$jdtcoreversion.jar \
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$JDTCOREVERSION.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
 ln -s %{_datadir}/java/eclipse-ecj.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar



From fedora-cvs-commits at redhat.com  Tue Jun 13 01:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 21:23:13 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.280,1.281
Message-ID: <200606130123.k5D1NDfV025980@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25950

Modified Files:
	eclipse.spec 
Log Message:
bump relase again


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- eclipse.spec	13 Jun 2006 01:13:37 -0000	1.280
+++ eclipse.spec	13 Jun 2006 01:23:08 -0000	1.281
@@ -36,7 +36,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.5
+Release:        0jpp_0fc.3.2RC7.6
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1630,6 +1630,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.6
+- Bump release again.
+
 * Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.5
 - Bump release.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 01:51:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 21:51:02 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-gl-include-inferiors.patch, NONE,
	1.1 xorg-x11-server.spec, 1.77, 1.78
Message-ID: <200606130151.k5D1p2hV015626@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15601

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-gl-include-inferiors.patch 
Log Message:
* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-11
- Add xorg-x11-server-1.1.0-gl-include-inferiors.patch to let GL
  rendering include child windows.


xorg-x11-server-1.1.0-gl-include-inferiors.patch:
 dri.c |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-gl-include-inferiors.patch ---
--- ./hw/xfree86/dri/dri.c-gl-include-inferiors	2006-04-02 21:34:54.000000000 -0400
+++ ./hw/xfree86/dri/dri.c	2006-06-12 20:58:00.000000000 -0400
@@ -69,6 +69,8 @@
 #include "mi.h"
 #include "mipointer.h"
 
+#include "selection.h"
+
 #if defined(XFree86LOADER) && !defined(PANORAMIX)
 extern Bool noPanoramiXExtension;
 #endif
@@ -1116,6 +1118,31 @@
     return TRUE;
 }
 
+extern Selection *CurrentSelections;
+extern int NumCurrentSelections;
+
+static Bool
+DRIIncludeInferiors(void)
+{
+
+  static Atom atom = BAD_RESOURCE;
+  static char atom_name[] = "X-REDHAT-GL-INCLUDE-INFERIORS";
+  int i;
+
+  if (atom == BAD_RESOURCE) {
+    atom = MakeAtom(atom_name, strlen(atom_name), True);
+    if (atom == BAD_RESOURCE)
+      return False;
+  }
+
+  for (i = 0; i < NumCurrentSelections; i++)
+    if (CurrentSelections[i].selection == atom &&
+	CurrentSelections[i].window != None)
+      return True;
+
+  return False;
+}
+
 Bool
 DRIGetDrawableInfo(ScreenPtr pScreen,
                    DrawablePtr pDrawable,
@@ -1134,6 +1161,7 @@
 {
     DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIDrawablePrivPtr	pDRIDrawablePriv, pOldDrawPriv;
+    RegionPtr		pClipList;
     WindowPtr		pWin, pOldWin;
     int			i;
 
@@ -1227,8 +1255,13 @@
 #endif
 	    *W = (int)(pWin->drawable.width);
 	    *H = (int)(pWin->drawable.height);
-	    *numClipRects = REGION_NUM_RECTS(&pWin->clipList);
-	    *pClipRects = (drm_clip_rect_t *)REGION_RECTS(&pWin->clipList);
+	    if (DRIIncludeInferiors())
+	      pClipList = &pWin->borderClip;
+	    else
+	      pClipList = &pWin->clipList;
+	      
+	    *numClipRects = REGION_NUM_RECTS(pClipList);
+	    *pClipRects = (drm_clip_rect_t *)REGION_RECTS(pClipList);
 
 	    if (!*numClipRects && pDRIPriv->fullscreen) {
 				/* use fake full-screen clip rect */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xorg-x11-server.spec	12 Jun 2006 19:13:22 -0000	1.77
+++ xorg-x11-server.spec	13 Jun 2006 01:50:59 -0000	1.78
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   10
+Release:   11
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -24,6 +24,7 @@
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
+Patch101:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
@@ -258,6 +259,7 @@
 %patch7 -p1 -b .ppc64
 
 %patch100 -p0 -b .spiffiffity
+%patch101 -p0 -b .gl-include-inferiors
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -547,6 +549,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-11
+- Add xorg-x11-server-1.1.0-gl-include-inferiors.patch to let GL
+  rendering include child windows.
+
 * Mon Jun 12 2006 Adam Jackson <ajax at redhat.com> 1.1.0-10
 - Misc build fixes for ppc64.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:17:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:17:16 -0400
Subject: rpms/libIDL/devel libIDL.spec,1.22,1.23
Message-ID: <200606130217.k5D2HGTi009419@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9406

Modified Files:
	libIDL.spec 
Log Message:
remove seemingly unneeded build deps



Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libIDL.spec	9 Jun 2006 14:38:52 -0000	1.22
+++ libIDL.spec	13 Jun 2006 02:17:14 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
 Version: 0.8.6
-Release: 5
+Release: 6
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
@@ -9,7 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig >= 0.8
 BuildRequires: glib2-devel >= 2.0
-BuildRequires: automake14 libtool autoconf
 BuildRequires: flex bison
 
 %description
@@ -76,6 +75,10 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 0.8.6-6
+- we don't call the autotools or libtoolize during build - don't
+  buildreq them
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-5
 - Fix missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:23:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:23:56 -0400
Subject: rpms/gtk2/FC-5 .cvsignore, 1.51, 1.52 gtk2.spec, 1.137,
	1.138 sources, 1.55, 1.56
Message-ID: <200606130223.k5D2Nugf009545@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9530

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.8.19



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	26 May 2006 18:18:37 -0000	1.51
+++ .cvsignore	13 Jun 2006 02:23:54 -0000	1.52
@@ -34,3 +34,4 @@
 gtk+-2.8.15.tar.bz2
 gtk+-2.8.16.tar.bz2
 gtk+-2.8.18.tar.bz2
+gtk+-2.8.19.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/gtk2.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gtk2.spec	26 May 2006 18:18:37 -0000	1.137
+++ gtk2.spec	13 Jun 2006 02:23:54 -0000	1.138
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.18
+%define base_version 2.8.19
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
@@ -266,6 +266,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.19-1
+- Update to 2.8.19
+
 * Fri May 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.18-1
 - Update to 2.8.18
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	26 May 2006 18:18:37 -0000	1.55
+++ sources	13 Jun 2006 02:23:54 -0000	1.56
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-0d27a026428732337676d47d22e5e23c  gtk+-2.8.18.tar.bz2
+1a03dbed4b794194a610e9d7eb175b06  gtk+-2.8.19.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:27:42 -0400
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.33,1.34
Message-ID: <200606130227.k5D2RgNi009625@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnome-mag/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9612

Modified Files:
	gnome-mag.spec 
Log Message:
don't buildreq automake



Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-mag.spec	18 May 2006 04:42:46 -0000	1.33
+++ gnome-mag.spec	13 Jun 2006 02:27:40 -0000	1.34
@@ -3,13 +3,12 @@
 Summary: GNOME Magnifier
 Name: gnome-mag
 Version: 0.12.5
-Release: 1
+Release: 2
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: automake14
 BuildRequires: intltool
 BuildRequires: libX11-devel, libXtst-devel, libXdamage-devel
 BuildRequires: libXfixes-devel, libXt-devel
@@ -70,6 +69,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham  <notting at redhat.com> 0.12.5-2
+- we don't call automake, don't buildreq it
+
 * Thu May 18 2006 Matthias Clasen  <mclasen at redhat.com> 0.12.5-1
 - Update to 0.12.5
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:30:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:30:05 -0400
Subject: rpms/gdm/devel gdm.spec,1.161,1.162
Message-ID: <200606130230.k5D2U5hE009693@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9673

Modified Files:
	gdm.spec 
Log Message:
we call automake-1.9, don't buildreq automake14



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gdm.spec	8 Jun 2006 22:32:45 -0000	1.161
+++ gdm.spec	13 Jun 2006 02:30:03 -0000	1.162
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.3
-Release: 7
+Release: 8
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -81,7 +81,7 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gail-devel >= 0:%{gail_version}
 BuildRequires: libgsf-devel
-BuildRequires: libtool automake14 autoconf
+BuildRequires: libtool automake autoconf
 BuildRequires: libcroco-devel
 BuildRequires: libattr-devel
 BuildRequires: gettext 
@@ -318,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 1:2.15.3-8
+- replace automake14 buildreq with automake
+
 * Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> 1:2.15.3-7
 - fix CVE-2006-2452
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:33:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:33:53 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.71,1.72
Message-ID: <200606130233.k5D2XrLN009783@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9767

Modified Files:
	gnome-session.spec 
Log Message:
remove obsolete automake14 buildreq



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gnome-session.spec	10 Jun 2006 03:36:55 -0000	1.71
+++ gnome-session.spec	13 Jun 2006 02:33:33 -0000	1.72
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.1
-Release: 4
+Release: 5
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -23,9 +23,6 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 
-BuildRequires: intltool, autoconf, automake
-BuildRequires: libtool
-
 Requires: redhat-artwork >= 0.20
 Requires: system-logos
 # required to get gconf-sanity-check-2 in the right place
@@ -67,7 +64,9 @@
 # this is so the configure checks find /usr/bin/halt etc.
 BuildRequires: usermode
 
-BuildRequires: automake14 autoconf gettext
+BuildRequires: intltool, autoconf, automake
+BuildRequires: libtool
+BuildRequires: gettext
 BuildRequires: libX11-devel libXt-devel
 
 %description
@@ -164,6 +163,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham  <notting at redhat.com> 2.15.1-5
+- remove obsolete automake14 buildreq
+
 * Fri Jun  9 2006 Matthias Clasen  <mclasen at redhat.com> 2.15.1-4
 - Add more missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:35:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:35:30 -0400
Subject: rpms/librsvg2/devel librsvg2.spec,1.48,1.49
Message-ID: <200606130235.k5D2ZUn2009847@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9825

Modified Files:
	librsvg2.spec 
Log Message:
remove libtool, automake14 buildreqs



Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- librsvg2.spec	11 May 2006 04:14:14 -0000	1.48
+++ librsvg2.spec	13 Jun 2006 02:35:24 -0000	1.49
@@ -33,10 +33,8 @@
 BuildRequires:	freetype-devel >= %{freetype_version}
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libgsf-devel, libcroco-devel
-BuildRequires:  automake14
 BuildRequires:  libcroco >= %{libcroco_version}
 BuildRequires:  libgnomeui >= %{libgnomeui_version}
-BuildRequires:  libtool
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgsf-devel >= %{libgsf_version}
 BuildRequires: 	gnome-vfs2-devel >= %{gnome_vfs_version}
@@ -118,6 +116,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 2.15.0-2
+- remove libtool, automake14 buildreqs
+
 * Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-1
 - Update to 2.15.0
 - Don't ship static libs



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:35:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:35:51 -0400
Subject: rpms/librsvg2/devel librsvg2.spec,1.49,1.50
Message-ID: <200606130235.k5D2ZpkF009872@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9859

Modified Files:
	librsvg2.spec 
Log Message:
bump


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- librsvg2.spec	13 Jun 2006 02:35:24 -0000	1.49
+++ librsvg2.spec	13 Jun 2006 02:35:49 -0000	1.50
@@ -12,7 +12,7 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
 Version: 2.15.0
-Release: 1
+Release: 2
 
 License: 	LGPL
 Group: System Environment/Libraries



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:51:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:51:20 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.40,1.41
Message-ID: <200606130251.k5D2pKba006181@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6017

Modified Files:
	libbonobo.spec 
Log Message:
buildreq automake, not automake16



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libbonobo.spec	10 Jun 2006 04:39:34 -0000	1.40
+++ libbonobo.spec	13 Jun 2006 02:51:18 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.14.0
-Release: 3
+Release: 4
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -15,7 +15,7 @@
 BuildPreReq: libxml2-devel >= %{libxml2_version}
 BuildPreReq: ORBit2-devel >= %{orbit2_version}
 BuildPreReq: intltool >= 0.14-1
-BuildPreReq: automake16 autoconf libtool
+BuildPreReq: automake autoconf libtool
 BuildPreReq: gtk-doc
 BuildPreReq: flex, bison, zlib-devel
 BuildRequires: gettext
@@ -117,6 +117,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 2.14.0-4
+- buildreq automake, not automake16
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:56:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:56:21 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.28,1.29
Message-ID: <200606130256.k5D2uLXg008202@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8085

Modified Files:
	libgnomeprintui22.spec 
Log Message:
buildreq automake, not automake16



Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgnomeprintui22.spec	6 Jun 2006 03:01:41 -0000	1.28
+++ libgnomeprintui22.spec	13 Jun 2006 02:56:19 -0000	1.29
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 2
+Release: 3
 Source0: libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -25,7 +25,7 @@
 # For GTK_DOC autoconf macro
 BuildRequires:  gtk-doc >= 1.2
 
-BuildPrereq: automake16 >= 1.6.3
+BuildPrereq: automake
 BuildPrereq: autoconf
 BuildPrereq: libtool
 
@@ -101,6 +101,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-3
+- buildreq automake, not automake16
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:58:01 -0400
Subject: rpms/redhat-rpm-config/devel .cvsignore, 1.18,
	1.19 redhat-rpm-config.spec, 1.27, 1.28 sources, 1.18, 1.19
Message-ID: <200606130258.k5D2w1nq008892@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8590

Modified Files:
	.cvsignore redhat-rpm-config.spec sources 
Log Message:
Added KMP packaging to Red Hat RPM macros, bumped version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	3 Feb 2006 23:13:22 -0000	1.18
+++ .cvsignore	13 Jun 2006 02:57:59 -0000	1.19
@@ -1 +1 @@
-redhat-rpm-config-8.0.40.tar.gz
+redhat-rpm-config-8.0.41.tar.gz


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- redhat-rpm-config.spec	3 Feb 2006 23:13:22 -0000	1.27
+++ redhat-rpm-config.spec	13 Jun 2006 02:57:59 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.40
+Version: 8.0.41
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Tue Jun 13 2006 Jon Masters <jcm at redhat.com> - 8.0.41-1
+- Add support for KMP Fedora Extras packaging.
+
 * Fri Feb  3 2006 Jeremy Katz <katzj at redhat.com> - 8.0.40-1
 - use -mtune=generic for x86 and x86_64
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Feb 2006 23:13:22 -0000	1.18
+++ sources	13 Jun 2006 02:57:59 -0000	1.19
@@ -1 +1 @@
-2ac1416b5232864d0233841b348afe34  redhat-rpm-config-8.0.40.tar.gz
+29f1557705ce5651b39d869c71453dcd  redhat-rpm-config-8.0.41.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 02:58:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 22:58:12 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.34,1.35
Message-ID: <200606130258.k5D2wCut008984@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8659

Modified Files:
	libgnomeprint22.spec 
Log Message:
buildreq automake, not automake16



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgnomeprint22.spec	22 May 2006 18:43:36 -0000	1.34
+++ libgnomeprint22.spec	13 Jun 2006 02:58:10 -0000	1.35
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	5
+Release:	6
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -48,7 +48,7 @@
 BuildRequires:  gnutls-devel
 BuildRequires:  openssl-devel
 
-BuildRequires:	automake16 >= 1.6.3
+BuildRequires:	automake >= 1.6.3
 BuildRequires:	autoconf
 BuildRequires:	libtool
 BuildRequires:	libgnomecups-devel >= 0.1.9-2
@@ -133,6 +133,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-6
+- buildreq automake, not automake16
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-5
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:02:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:02:13 -0400
Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.51,
	1.52
Message-ID: <200606130302.k5D32DZx009907@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9808

Modified Files:
	gnome-system-monitor.spec 
Log Message:
don't buildreq automake/autoconf/libtool



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-system-monitor.spec	18 May 2006 17:13:29 -0000	1.51
+++ gnome-system-monitor.spec	13 Jun 2006 03:01:51 -0000	1.52
@@ -11,7 +11,7 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.14.3
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -28,7 +28,6 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: startup-notification-devel
-BuildRequires: libtool autoconf automake16
 BuildRequires: intltool scrollkeeper gettext
 BuildRequires: libselinux-devel >= %{libselinux_version}
 
@@ -95,6 +94,10 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 2.14.3-4
+- don't buildreq libtool/automake/autoconf, they're not called during
+  the build
+
 * Thu May 18 2006 Bill Nottingham <notting at redhat.com> 2.14.3-3
 - s/GConf/GConf2
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:04:17 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.35,1.36
Message-ID: <200606130304.k5D34HMT009997@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9949

Modified Files:
	libgnomeprint22.spec 
Log Message:
buildreq gettext



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgnomeprint22.spec	13 Jun 2006 02:58:10 -0000	1.35
+++ libgnomeprint22.spec	13 Jun 2006 03:03:56 -0000	1.36
@@ -52,6 +52,7 @@
 BuildRequires:	autoconf
 BuildRequires:	libtool
 BuildRequires:	libgnomecups-devel >= 0.1.9-2
+BuildRequires:  gettext
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -135,6 +136,7 @@
 %changelog
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-6
 - buildreq automake, not automake16
+- buildreq gettext
 
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-5
 - Add missing BuildRequires



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:03:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:03:59 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.29,1.30
Message-ID: <200606130303.k5D33xlT009974@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9929

Modified Files:
	libgnomeprintui22.spec 
Log Message:
buildreq gettext



Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgnomeprintui22.spec	13 Jun 2006 02:56:19 -0000	1.29
+++ libgnomeprintui22.spec	13 Jun 2006 03:03:41 -0000	1.30
@@ -28,6 +28,7 @@
 BuildPrereq: automake
 BuildPrereq: autoconf
 BuildPrereq: libtool
+BuildPrereq: gettext
 
 # Re-autogen without GNOME_COMPILE_WARNINGS
 Patch1: libgnomeprintui-nognomecommon.patch
@@ -103,6 +104,7 @@
 %changelog
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-3
 - buildreq automake, not automake16
+- buildreq gettext
 
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-2
 - Rebuild



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:10:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:10:02 -0400
Subject: rpms/dasher/devel .cvsignore, 1.13, 1.14 dasher.spec, 1.42,
	1.43 sources, 1.13, 1.14
Message-ID: <200606130310.k5D3A2Se010491@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10453

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 May 2006 19:17:54 -0000	1.13
+++ .cvsignore	13 Jun 2006 03:09:59 -0000	1.14
@@ -1 +1 @@
-dasher-4.1.0.tar.bz2
+dasher-4.1.4.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- dasher.spec	9 Jun 2006 02:48:41 -0000	1.42
+++ dasher.spec	13 Jun 2006 03:09:59 -0000	1.43
@@ -1,6 +1,6 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.1.0
+Version: 4.1.4
 Release: 2
 License: GPL
 Group: Desktop/Accessibility
@@ -98,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.4-2
+- Update to 4.1.4
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.0-2
 - Add missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 May 2006 19:17:54 -0000	1.13
+++ sources	13 Jun 2006 03:09:59 -0000	1.14
@@ -1 +1 @@
-a940a40c89587032c343e86dbe8799cf  dasher-4.1.0.tar.bz2
+690393b537de95df59388b18772a7a3f  dasher-4.1.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:13:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:13:39 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.15,
	1.16 eclipse-cdt-no-tests.patch, 1.2, 1.3 eclipse-cdt.spec,
	1.39, 1.40 sources, 1.16, 1.17
Message-ID: <200606130313.k5D3DdDM011202@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11042

Modified Files:
	.cvsignore eclipse-cdt-no-tests.patch eclipse-cdt.spec sources 
Log Message:
- 3.1.0 RC2.
- Remove unused hover patch.
- Use newly-created versionless pde.build symlink.
- Remove no-sdkbuild patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Mar 2006 14:58:16 -0000	1.15
+++ .cvsignore	13 Jun 2006 03:13:37 -0000	1.16
@@ -1 +1 @@
-eclipse-cdt-fetched-src-3.0.2.tar.gz
+eclipse-cdt-fetched-src-3.1.0RC2.tar.bz2

eclipse-cdt-no-tests.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: eclipse-cdt-no-tests.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt-no-tests.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-cdt-no-tests.patch	15 Apr 2005 21:47:09 -0000	1.2
+++ eclipse-cdt-no-tests.patch	13 Jun 2006 03:13:37 -0000	1.3
@@ -1,11 +1,11 @@
---- build.xml.orig	2005-04-11 09:01:15.241527048 -0500
-+++ build.xml	2005-04-11 09:01:30.151743318 -0500
+--- build.xml.orig	2006-06-08 11:34:05.000000000 -0400
++++ build.xml	2006-06-08 11:57:56.000000000 -0400
 @@ -4,7 +4,7 @@
  		<echo message="${eclipse.home}"/>
  	</target>
  	
 -	<target name="build" depends="zips,test"/>
 +	<target name="build" depends="zips"/>
- 	<target name="cdtbuild" depends="zips,test,upload"/>
+ 	<target name="nightly" depends="tag,zips,test,copy"/>
+ 	<target name="cdtbuild" depends="tag,zips,test,upload"/>
  	
- 	<target name="init">


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eclipse-cdt.spec	3 Apr 2006 21:03:04 -0000	1.39
+++ eclipse-cdt.spec	13 Jun 2006 03:13:37 -0000	1.40
@@ -5,9 +5,9 @@
 %define section			free
 %define eclipse_name		eclipse
 %define major   		3
-%define minor   		0	
+%define minor   		1	
 %define majmin  		%{major}.%{minor}
-%define micro   		2
+%define micro   		0
 %define eclipse_base   		%{_datadir}/%{eclipse_name}
 %define eclipse_lib_base 	%{_libdir}/%{eclipse_name}
 
@@ -21,36 +21,34 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_3fc
+Release: 	0jpp_0fc.3.1.0RC2
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
 Requires:	eclipse-platform
 
-# This tarball was generating following the instructions here:
-# https://www.redhat.com/archives/fedora-devel-java-list/2005-March/msg00198.html
+# This tarball was generated like this:
+# (I got the tag by looking at the Callisto update site)
+# 
 # mkdir temp && cd temp
-# sh /usr/share/eclipse/buildscripts/copy-platform SDK /usr/share/eclipse
 # mkdir home
 # cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co \
 #   org.eclipse.cdt-releng/org.eclipse.cdt.releng 
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/@cdtTag@/CDT_3_0_1/' maps/cdt.map
-# # FIXME:  this shouldn't require root
-# sudo java -cp ../../SDK/startup.jar -Duser.home=../../home \
+# sed --in-place 's/@cdtTag@/v200605290500/' maps/cdt.map
+# java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \
 #   org.eclipse.core.launcher.Main \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
+#   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
 #   -DdontUnzip=true fetch
-# cd .. && tar zcf eclipse-cdt-fetched-src-3.0.1.tar.gz org.eclipse.cdt.releng
-Source0: %{name}-fetched-src-%{version}.tar.gz
+# cd .. && tar zcf eclipse-cdt-fetched-src-3.1.0RC2.tar.bz2 org.eclipse.cdt.releng
+Source0: %{name}-fetched-src-%{version}RC2.tar.bz2
 
 Patch1: %{name}-no-cvs2-patch
 Patch2: %{name}-platform-build-linux.patch
 Patch3: %{name}-sdk-build-linux.patch
 Patch4: %{name}-no-tests.patch
-Patch5: %{name}-no-sdkbuild.patch
-Patch6: %{name}-libhover.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -63,8 +61,7 @@
 %endif
 
 Requires: 	ctags gdb make
-Requires: 	eclipse-platform >= 1:3.1.2
-Requires: 	eclipse-platform < 1:3.1.3
+Requires: 	eclipse-platform >= 1:3.2.0
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -84,8 +81,6 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
-%patch5 -p0
-%patch6 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -123,7 +118,7 @@
     -DjavacFailOnError=true \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
+    -Dpde.build.scripts=%{eclipse_base}/plugins/org.eclipse.pde.build/scripts \
     -DdontFetchAnything=true 
 
 if ! [ -e $(pwd)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}* ]; then
@@ -188,7 +183,8 @@
 %defattr(-,root,root)
 %{eclipse_base}/features/org.eclipse.cdt*
 %{eclipse_base}/plugins/org.eclipse.cdt*
-%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch}
+#%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch}
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
@@ -232,6 +228,12 @@
 
 
 %changelog
+* Thu Jun 08 2006 Andrew Overholt <overholt at redhat.com> 3.1.0-0jpp_0fc.3.1.0RC2 
+- 3.1.0 RC2.
+- Remove unused hover patch.
+- Use newly-created versionless pde.build symlink.
+- Remove no-sdkbuild patch.
+
 * Mon Apr 03 2006 Andrew Overholt <overholt at redhat.com> 3.0.2-1jpp_3fc
 - Add ia64.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Mar 2006 14:58:17 -0000	1.16
+++ sources	13 Jun 2006 03:13:37 -0000	1.17
@@ -1 +1 @@
-87bc3ab942f6d747246c6623a292437a  eclipse-cdt-fetched-src-3.0.2.tar.gz
+f06ae8cdb66ac2fa8749c5d47f0522a0  eclipse-cdt-fetched-src-3.1.0RC2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:19:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:19:03 -0400
Subject: rpms/gnome-themes/devel gnome-themes.spec,1.59,1.60
Message-ID: <200606130319.k5D3J395027824@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnome-themes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27761

Modified Files:
	gnome-themes.spec 
Log Message:
buildreq automake, not automake17



Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-themes.spec	7 Jun 2006 13:06:43 -0000	1.59
+++ gnome-themes.spec	13 Jun 2006 03:19:00 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
 Version: 2.15.2
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
@@ -21,7 +21,7 @@
 Requires: gtk2-engines >= 2.6.0-1
 Prereq: gtk2 >= 2.6.2
 BuildRequires: autoconf
-BuildRequires: automake17
+BuildRequires: automake
 BuildRequires: intltool
 BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
@@ -91,6 +91,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.15.2-3
+- buildreq automake, not automake17
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
 - Fix a problem in %%post (#194323)
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:19:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:19:24 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.16,1.17 sources,1.6,1.7
Message-ID: <200606130319.k5D3JOTc028013@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27864

Modified Files:
	gcalctool.spec sources 
Log Message:
5.8.16



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcalctool.spec	9 Jun 2006 04:27:12 -0000	1.16
+++ gcalctool.spec	13 Jun 2006 03:19:21 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gcalctool
-Version:        5.8.13
-Release:        3
+Version:        5.8.16
+Release:        2
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> 5.8.16-2
+- Update to 5.8.16
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> 5.8.13-3
 - More BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 May 2006 17:43:07 -0000	1.6
+++ sources	13 Jun 2006 03:19:21 -0000	1.7
@@ -1 +1 @@
-6807694b49801413be3aa9a3198f4363  gcalctool-5.8.13.tar.bz2
+3c14ad97edd4e445b14ca99bb7c60e5b  gcalctool-5.8.16.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:21:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:21:39 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.36,1.37
Message-ID: <200606130321.k5D3Ld7l028909@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28833

Modified Files:
	libgnomeprint22.spec 
Log Message:
and the bison says, "moo"



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgnomeprint22.spec	13 Jun 2006 03:03:56 -0000	1.36
+++ libgnomeprint22.spec	13 Jun 2006 03:21:36 -0000	1.37
@@ -53,6 +53,7 @@
 BuildRequires:	libtool
 BuildRequires:	libgnomecups-devel >= 0.1.9-2
 BuildRequires:  gettext
+BuildRequires:  bison
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -136,7 +137,7 @@
 %changelog
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-6
 - buildreq automake, not automake16
-- buildreq gettext
+- buildreq gettext, bison 
 
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-5
 - Add missing BuildRequires



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:22:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:22:10 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.269, 1.270 anaconda.spec, 1.393,
	1.394 sources, 1.390, 1.391
Message-ID: <200606130322.k5D3MA7r029172@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29107/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.30-1 on branch devel from anaconda-11.1.0.30-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- .cvsignore	10 Jun 2006 20:59:00 -0000	1.269
+++ .cvsignore	13 Jun 2006 03:22:07 -0000	1.270
@@ -1 +1 @@
-anaconda-11.1.0.29.tar.bz2
+anaconda-11.1.0.30.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- anaconda.spec	10 Jun 2006 20:59:00 -0000	1.393
+++ anaconda.spec	13 Jun 2006 03:22:07 -0000	1.394
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.29
+Version: 11.1.0.30
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -11,12 +11,13 @@
 BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
 BuildPreReq: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel
 BuildPreReq: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber
-BuildPreReq: pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel
+BuildPreReq: pykickstart, yum >= 2.9.0, device-mapper >= 1.01.05-3, 
+BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
 BuildPreReq: libdhcp-devel, libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
-Requires: kudzu > 1.2.0, yum >= 2.5.1-3, pirut
+Requires: kudzu > 1.2.0, yum >= 2.9.0, pirut >= 1.1.0
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
 Requires: device-mapper >= 1.01.05-3
@@ -96,6 +97,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jun 12 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.30-1
+- make loader flags global (dcantrel)
+- fixups for yum 2.9, pull in yum-metadata-parser
+
 * Sat Jun 10 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.29-1
 - Fix syslinux requires
 - Fix autopartitioning on the mactels


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- sources	10 Jun 2006 20:59:00 -0000	1.390
+++ sources	13 Jun 2006 03:22:07 -0000	1.391
@@ -1 +1 @@
-d7a1dafa1e03987d8a60762bd84603cd  anaconda-11.1.0.29.tar.bz2
+475b158ee5e87254c6a45db35a6bdde0  anaconda-11.1.0.30.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:23:04 -0400
Subject: rpms/pkgconfig/devel pkgconfig.spec,1.31,1.32
Message-ID: <200606130323.k5D3N4HN029611@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/pkgconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29528

Modified Files:
	pkgconfig.spec 
Log Message:
don't call auto*; we don't patch their input files



Index: pkgconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pkgconfig.spec	2 Jun 2006 03:26:36 -0000	1.31
+++ pkgconfig.spec	13 Jun 2006 03:23:02 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.20
-Release: 3
+Release: 4
 Epoch: 1
 License: GPL
 Group: Development/Tools
@@ -9,8 +9,6 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=2661 
 Patch5:  pkgconfig-0.15.0-reqprov.patch
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: automake17
-BuildRequires: autoconf
 
 %description
 The pkgconfig tool determines compilation options. For each required
@@ -20,9 +18,6 @@
 %prep
 %setup -n pkg-config-%{version} -q
 %patch5 -p1 -b .reqprov
-autoheader
-autoconf
-automake-1.7
 
 %build
 %configure --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -47,6 +42,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 1:0.20-4
+- don't call auto*
+
 * Thu Jun  1 2006 Matthias Clasen <mclasen at redhat.com> - 1:0.20-3
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:34:24 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.34,1.35
Message-ID: <200606130334.k5D3YOVR000348@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv312

Modified Files:
	libglade-java.spec 
Log Message:
fix BuildRequires


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libglade-java.spec	24 May 2006 13:47:50 -0000	1.34
+++ libglade-java.spec	13 Jun 2006 03:34:21 -0000	1.35
@@ -27,10 +27,16 @@
 Requires:	libglade2 >= 2.5.1
 Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
 Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.1.0.20060301.rh1
+Requires:	libgnomeui
+Requires:       libgnomecanvas
 BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
 BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.0
 BuildRequires:  libglade2-devel >= 2.5.0, gcc-java >= 3.3.3
 BuildRequires:	java-devel >= 1.4.2
+BuildRequires:	java-devel >= 1.4.2
+BuildRequires:	libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+
 
 # exclude while beehive s390x is borked
 #ExcludeArch: s390x



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:34:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:34:56 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.37,1.38
Message-ID: <200606130334.k5D3YurI000467@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv387

Modified Files:
	libgnomeprint22.spec 
Log Message:
buildreq flex



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libgnomeprint22.spec	13 Jun 2006 03:21:36 -0000	1.37
+++ libgnomeprint22.spec	13 Jun 2006 03:34:54 -0000	1.38
@@ -54,6 +54,7 @@
 BuildRequires:	libgnomecups-devel >= 0.1.9-2
 BuildRequires:  gettext
 BuildRequires:  bison
+BuildRequires:  flex
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -137,7 +138,7 @@
 %changelog
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-6
 - buildreq automake, not automake16
-- buildreq gettext, bison 
+- buildreq gettext, bison, flex
 
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-5
 - Add missing BuildRequires



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:39:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:39:53 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.15,1.16
Message-ID: <200606130339.k5D3drtp001016@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv992

Modified Files:
	libvte-java.spec 
Log Message:
Add libgnomeui{,-devel} and libgnomecanvas{,-devel}


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libvte-java.spec	24 May 2006 13:50:54 -0000	1.15
+++ libvte-java.spec	13 Jun 2006 03:39:50 -0000	1.16
@@ -13,10 +13,14 @@
 Requires: 	glib-java >= 0.2.3.0.20060301.rh1
 Requires:	libgtk-java >= 2.8.3.0.20060301.rh1
 Requires:	vte >= 0.11.10
+Requires:       libgnomeui
+Requires:       libgnomecanvas
 BuildRequires:  java-devel >= 1.4.2, glib-java-devel >= 0.2
 BuildRequires:	libgtk-java-devel >= 2.8.0
 BuildRequires:  gcc-java >= 3.3.3, docbook-utils, vte-devel >= 0.11.10
 BuildRequires: 	pkgconfig
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
 
 # libgtk-java is/was broken on s390x so we have to avoid it
 ExcludeArch:	s390x
@@ -100,6 +104,7 @@
 %changelog
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 0.11.11.0.20060301.rh1-4
 - Change mod time of all java source files for the src zip.
+- Add libgnomeui{,-devel} and libgnomecanvas{,-devel}.
 
 * Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> -  0.11.11.0.20060301.rh1-3
 - Add -X to src zip and ensure Config.java has the same mod time across



From fedora-cvs-commits at redhat.com  Tue Jun 13 03:52:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 12 Jun 2006 23:52:19 -0400
Subject: rpms/dasher/devel dasher.spec,1.43,1.44
Message-ID: <200606130352.k5D3qJA9019704@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19628

Modified Files:
	dasher.spec 
Log Message:
--disable-scrollkeeper



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- dasher.spec	13 Jun 2006 03:09:59 -0000	1.43
+++ dasher.spec	13 Jun 2006 03:52:16 -0000	1.44
@@ -32,7 +32,7 @@
 
 %build
 
-%configure
+%configure --disable-scrollkeeper
 
 make
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 04:05:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 00:05:32 -0400
Subject: rpms/thunderbird/devel thunderbird.spec,1.72,1.73
Message-ID: <200606130405.k5D45Wux023382@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23337

Modified Files:
	thunderbird.spec 
Log Message:
Fix desktop-file-utils requires



Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- thunderbird.spec	12 Jun 2006 23:26:02 -0000	1.72
+++ thunderbird.spec	13 Jun 2006 04:05:26 -0000	1.73
@@ -61,11 +61,12 @@
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:	libIDL-devel
+BuildRequires:  desktop-file-utils
 BuildRequires:	tcsh
 BuildRequires:	freetype-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
-Prereq:		desktop-file-utils >= %{desktop_file_utils_version}
+Requires:	desktop-file-utils >= %{desktop_file_utils_version}
 Obsoletes:	MozillaThunderbird
 
 %define tbdir %{_libdir}/thunderbird-%{version}
@@ -213,6 +214,7 @@
 %changelog
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
 - Update to 1.5.0.4
+- Fix desktop-file-utils requires
 
 * Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
 - Update to 1.5.0.2



From fedora-cvs-commits at redhat.com  Tue Jun 13 04:06:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 00:06:21 -0400
Subject: rpms/thunderbird/FC-5 thunderbird.spec,1.70,1.71
Message-ID: <200606130406.k5D46L9i023513@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/thunderbird/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23467

Modified Files:
	thunderbird.spec 
Log Message:
Fix desktop-file-utils requires



Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- thunderbird.spec	12 Jun 2006 23:30:00 -0000	1.70
+++ thunderbird.spec	13 Jun 2006 04:06:18 -0000	1.71
@@ -61,11 +61,12 @@
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:	libIDL-devel
+BuildRequires:  desktop-file-utils
 BuildRequires:	tcsh
 BuildRequires:	freetype-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
-Prereq:		desktop-file-utils >= %{desktop_file_utils_version}
+Requires:	desktop-file-utils >= %{desktop_file_utils_version}
 Obsoletes:	MozillaThunderbird
 
 %define tbdir %{_libdir}/thunderbird-%{version}
@@ -213,6 +214,7 @@
 %changelog
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.1.fc5
 - Update to 1.5.0.4
+- Fix desktop-file-utils requires
 
 * Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
 - Update to 1.5.0.2



From fedora-cvs-commits at redhat.com  Tue Jun 13 04:23:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 00:23:23 -0400
Subject: rpms/eog/devel .cvsignore, 1.31, 1.32 eog.spec, 1.52, 1.53 sources,
	1.31, 1.32
Message-ID: <200606130423.k5D4NMXx008628@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8579

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	23 May 2006 02:24:41 -0000	1.31
+++ .cvsignore	13 Jun 2006 04:23:13 -0000	1.32
@@ -1 +1 @@
-eog-2.15.2.tar.bz2
+eog-2.15.3.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- eog.spec	23 May 2006 02:27:03 -0000	1.52
+++ eog.spec	13 Jun 2006 04:23:13 -0000	1.53
@@ -12,7 +12,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.15.2
+Version: 2.15.3
 Release: 1
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
@@ -106,6 +106,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	23 May 2006 02:24:41 -0000	1.31
+++ sources	13 Jun 2006 04:23:13 -0000	1.32
@@ -1 +1 @@
-b6a42a76e096ee2bde92d503fe1c9438  eog-2.15.2.tar.bz2
+29a9768a41dce2823e93c8de60b638e3  eog-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 04:28:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 00:28:07 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.17,
	1.18 gnome-doc-utils.spec, 1.22, 1.23 sources, 1.17, 1.18
Message-ID: <200606130428.k5D4S7cB009611@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9563

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	12 Mar 2006 19:52:51 -0000	1.17
+++ .cvsignore	13 Jun 2006 04:28:04 -0000	1.18
@@ -1 +1 @@
-gnome-doc-utils-0.6.0.tar.bz2
+gnome-doc-utils-0.7.1.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-doc-utils.spec	6 Jun 2006 12:56:16 -0000	1.22
+++ gnome-doc-utils.spec	13 Jun 2006 04:28:04 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
-Version: 0.6.0
-Release: 3
+Version: 0.7.1
+Release: 1
 License: LGPL
 Group: Development/Tools
 URL: http://www.gnome.org/
@@ -55,6 +55,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.1-1
+- Update to 0.7.1
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.0-3
 - Add a BuildRequires for perl-XML-Parser
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	12 Mar 2006 19:52:51 -0000	1.17
+++ sources	13 Jun 2006 04:28:04 -0000	1.18
@@ -1 +1 @@
-1e0c26e3e1159f60551aab5187634744  gnome-doc-utils-0.6.0.tar.bz2
+21fe881ab473fdc9246c36bd8ef929b0  gnome-doc-utils-0.7.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 04:37:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 00:37:51 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.39, 1.40 gnome-games.spec, 1.79,
	1.80 sources, 1.42, 1.43
Message-ID: <200606130437.k5D4bp3q011058@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11014

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	17 May 2006 14:26:47 -0000	1.39
+++ .cvsignore	13 Jun 2006 04:37:46 -0000	1.40
@@ -9,3 +9,4 @@
 gnome-games-extra-data-2.14.0.tar.bz2
 gnome-games-2.15.1.tar.bz2
 gnome-games-2.15.2.tar.bz2
+gnome-games-2.15.3.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gnome-games.spec	17 May 2006 14:26:47 -0000	1.79
+++ gnome-games.spec	13 Jun 2006 04:37:46 -0000	1.80
@@ -13,7 +13,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.15.2
+Version: 2.15.3
 Release: 1
 Epoch: 1
 License: LGPL
@@ -247,6 +247,9 @@
 
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-1
+- Update to 2.15.3
+
 * Wed May 16 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	17 May 2006 14:26:47 -0000	1.42
+++ sources	13 Jun 2006 04:37:46 -0000	1.43
@@ -1,2 +1,2 @@
 01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2
-ed53690a7865d0e4fabec101af3f17fb  gnome-games-2.15.2.tar.bz2
+378d4280593a7dee51bc9ac5f126d5c8  gnome-games-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 04:43:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 00:43:54 -0400
Subject: rpms/yelp/devel .cvsignore, 1.27, 1.28 sources, 1.28, 1.29 yelp.spec,
	1.60, 1.61
Message-ID: <200606130443.k5D4hsbR012098@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12054

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	17 May 2006 15:16:54 -0000	1.27
+++ .cvsignore	13 Jun 2006 04:43:46 -0000	1.28
@@ -1 +1 @@
-yelp-2.15.2.tar.bz2
+yelp-2.15.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	17 May 2006 15:16:54 -0000	1.28
+++ sources	13 Jun 2006 04:43:46 -0000	1.29
@@ -1 +1 @@
-0a6928685d289b67773eeff6ae90869b  yelp-2.15.2.tar.bz2
+29f058de3aacaf700a8ef535333474a9  yelp-2.15.3.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- yelp.spec	17 May 2006 15:16:54 -0000	1.60
+++ yelp.spec	13 Jun 2006 04:43:46 -0000	1.61
@@ -13,7 +13,7 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.15.2
+Version: 2.15.3
 Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -123,6 +123,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Tue May 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 07:38:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 03:38:00 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-module-load-to-init.patch, NONE,
	1.1 autofs.spec, 1.101, 1.102
Message-ID: <200606130738.k5D7c0cJ024116@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24050

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-module-load-to-init.patch 
Log Message:
* Tue Jun 13 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-9
- move autofs4 module loading back to init script (part bz # 194061).


autofs-5.0.0_beta4-module-load-to-init.patch:
 CHANGELOG                              |    1 +
 daemon/automount.c                     |    4 ++--
 gentoo/net-fs/autofs/files/autofs.init |    7 +++++++
 redhat/autofs.init.in                  |   24 ++++++++++++++++++++++++
 samples/rc.autofs.in                   |   20 ++++++++++++++++++++
 5 files changed, 54 insertions(+), 2 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-module-load-to-init.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 553b662..c3bc17d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@
 - fix memory leak in initialisation of lookup modules.
 - fix handling of master map entry update.
 - fix program map handling of iinvalid multi-mount offsets.
+- move autofs4 module loading back to init script.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 147be1c..4b14392 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1701,7 +1701,7 @@ #endif
 		close(start_pipefd[1]);
 		exit(1);
 	}
-
+#if 0
 	if (!load_autofs4_module()) {
 		crit(LOGOPT_ANY, "%s: can't load %s filesystem module",
 			program, FS_MODULE_NAME);
@@ -1711,7 +1711,7 @@ #endif
 		close(start_pipefd[1]);
 		exit(2);
 	}
-
+#endif
 	if (!master_read_master(master, age, 0)) {
 		master_kill(master, 1);
 		*pst_stat = 3;
diff --git a/gentoo/net-fs/autofs/files/autofs.init b/gentoo/net-fs/autofs/files/autofs.init
index 8711f9b..4e65e81 100644
--- a/gentoo/net-fs/autofs/files/autofs.init
+++ b/gentoo/net-fs/autofs/files/autofs.init
@@ -21,6 +21,13 @@ opts="start stop status reload restart"
 start() {
 	ebegin "Starting automounter"
 
+	# ensure autofs support is loaded
+	grep -q autofs /proc/filesystems || modprobe -k autofs4 2>/dev/null
+	if [ $? -ne 0 ]
+		eend 1 "No autofs support available"
+		exit 1
+	fi
+
 	# ensure pid file directory exists
 	if [ ! -e /var/run/autofs ]
 	then
diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
index 00f34e8..57174f0 100644
--- a/redhat/autofs.init.in
+++ b/redhat/autofs.init.in
@@ -14,6 +14,7 @@ # Location of the automount daemon and t
 #
 DAEMON=@@sbindir@@/automount
 prog=`basename $DAEMON`
+MODULE="autofs4"
 initdir=@@initdir@@
 confdir=@@autofsconfdir@@
 
@@ -34,6 +35,29 @@ if [ -x $confdir/autofs ]; then
 fi
 
 function start() {
+	# Make sure autofs4 module is loaded
+	if ! grep -q autofs /proc/filesystems
+	then
+		echo -n "Loading $MODULE: "
+		# Try load the autofs4 module fail if we can't
+		modprobe $MODULE >/dev/null 2>&1
+		RETVAL=$?
+		if [ $RETVAL -eq 1 ]
+		then
+			failure "Load $MODULE"
+			echo
+			return $RETVAL
+		else
+			success "Load $MODULE"
+			echo
+		fi
+	elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
+	then
+		RETVAL=1
+		failure "Load $MODULE"
+		echo
+		return $RETVAL
+	fi
 	echo -n $"Starting $prog: "
 	$prog $OPTIONS 
 	RETVAL=$?
diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
index 892f1d5..27458cb 100644
--- a/samples/rc.autofs.in
+++ b/samples/rc.autofs.in
@@ -13,6 +13,7 @@ # Location of the automount daemon and t
 #
 DAEMON=@@sbindir@@/automount
 prog=`basename $DAEMON`
+MODULE="autofs4"
 confdir=@@autofsconfdir@@
 
 test -e $DAEMON || exit 0
@@ -29,6 +30,25 @@ fi
 
 function start() {
 	echo -n "Starting $prog: "
+
+	# Make sure autofs4 module is loaded
+	if ! grep -q autofs /proc/filesystems
+	then
+		# Try load the autofs4 module fail if we can't
+		modprobe $MODULE >/dev/null 2>&1
+		if [ $? -eq 1 ]
+		then
+			echo "Error: failed to load autofs4 module."
+			return 1
+		fi
+	elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
+	then
+		# wrong autofs filesystem module loaded
+		echo
+		echo "Error: autofs kernel module is loaded, autofs4 required"
+		return 1
+	fi
+
 	$prog $OPTIONS 
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ] ; then


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- autofs.spec	12 Jun 2006 07:14:53 -0000	1.101
+++ autofs.spec	13 Jun 2006 07:37:58 -0000	1.102
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 8
+%define release 9
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -27,6 +27,7 @@
 Patch13: autofs-5.0.0_beta4-context-init-error.patch
 Patch14: autofs-5.0.0_beta4-map-update.patch
 Patch15: autofs-5.0.0_beta4-program-map-offset-handling.patch
+Patch16: autofs-5.0.0_beta4-module-load-to-init.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -81,6 +82,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -136,6 +138,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jun 13 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-9
+- move autofs4 module loading back to init script (part bz # 194061).
+
 * Mon Jun 12 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-8
 - fix handling of master map entry update (bz # 193718).
 - fix program map handling of invalid multi-mount offsets.



From fedora-cvs-commits at redhat.com  Tue Jun 13 08:22:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 04:22:51 -0400
Subject: rpms/metacity/devel metacity.spec,1.84,1.85
Message-ID: <200606130822.k5D8Mp1A031783@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31743

Modified Files:
	metacity.spec 
Log Message:
- fix from Michael J. Knox to use automake instead of automake14, add BR gettext


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- metacity.spec	6 Jun 2006 17:09:15 -0000	1.84
+++ metacity.spec	13 Jun 2006 08:22:47 -0000	1.85
@@ -9,7 +9,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 5
+Release: 6
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
@@ -24,7 +24,7 @@
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: intltool >= 0.35
 BuildRequires: startup-notification-devel >= 0.7
-BuildRequires: libtool automake14 autoconf
+BuildRequires: libtool automake autoconf gettext
 BuildRequires: xorg-x11-proto-devel >= 7.0-13
 BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel
 BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
@@ -141,6 +141,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jun 13 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.15.5-6
+- remove BR on automake14, use current automake instead
+
 * Tue Jun 6 2006 Soren Sandmann <sandmann at redhat.com> 2.15.5-5
 - Update to new tarball with different intltool magic in it.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 09:20:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 05:20:00 -0400
Subject: rpms/net-snmp/devel net-snmp.spec,1.76,1.77
Message-ID: <200606130920.k5D9K0UI015443@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15431

Modified Files:
	net-snmp.spec 
Log Message:
- add tcp-mib (#194856)


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- net-snmp.spec	2 Jun 2006 11:42:53 -0000	1.76
+++ net-snmp.spec	13 Jun 2006 09:19:55 -0000	1.77
@@ -6,7 +6,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3.1.pre3
-Release: 1
+Release: 2
 
 License: BSDish
 Group: System Environment/Daemons
@@ -159,7 +159,7 @@
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
 %ifarch %{ix86} x86_64
-	--with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib" \
+	--with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib tcp-mib" \
 %else
 	--with-mib-modules="host agentx smux "	\
 %endif
@@ -343,6 +343,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Jun 13 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.pre3-2
+- add tcp-mib (#194856)
+
 * Fri Jun  2 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.pre3-1
 - update to another prerelease (fixes perl agents)
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 11:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 07:58:31 -0400
Subject: rpms/scim/FC-5 scim.spec,1.31,1.32
Message-ID: <200606131158.k5DBwVPc026045@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25943

Modified Files:
	scim.spec 
Log Message:
- update libtool tweak for libsrdc++so7 to gcc-4.1.1 (#194935)



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scim.spec	7 Jun 2006 05:54:45 -0000	1.31
+++ scim.spec	13 Jun 2006 11:58:26 -0000	1.32
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   9.3.fc5
+Release:   9.4.fc5
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -96,7 +96,7 @@
 %endif
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make %{?_smp_mflags}
 
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Tue Jun 13 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.4.fc5
+- update libtool tweak for libsrdc++so7 to gcc-4.1.1 (#194935)
+
 * Tue Jun  6 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.3.fc5
 - obsolete scim-qtimm to avoid KDE apps crashing (#192471)
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 12:01:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 08:01:49 -0400
Subject: rpms/scim/FC-5 scim.spec,1.32,1.33
Message-ID: <200606131201.k5DC1n7E026984@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26861

Modified Files:
	scim.spec 
Log Message:
better changelog



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- scim.spec	13 Jun 2006 11:58:26 -0000	1.32
+++ scim.spec	13 Jun 2006 12:01:32 -0000	1.33
@@ -198,7 +198,7 @@
 
 %changelog
 * Tue Jun 13 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.4.fc5
-- update libtool tweak for libsrdc++so7 to gcc-4.1.1 (#194935)
+- update libtool tweak for libsrdc++so7 to handle gcc-4.1.x (#194935)
 
 * Tue Jun  6 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.3.fc5
 - obsolete scim-qtimm to avoid KDE apps crashing (#192471)



From fedora-cvs-commits at redhat.com  Tue Jun 13 12:14:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 08:14:21 -0400
Subject: rpms/python/devel python.spec,1.75,1.76
Message-ID: <200606131214.k5DCELNo028939@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28899

Modified Files:
	python.spec 
Log Message:
Only copying mkhowto from the Docs - we don't need perl dependencies from python-tools.


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- python.spec	12 Jun 2006 22:21:15 -0000	1.75
+++ python.spec	13 Jun 2006 12:14:02 -0000	1.76
@@ -15,11 +15,12 @@
 %define jp_codecs 1.4.11
 %define tools_dir %{_libdir}/python%{pybasever}/Tools
 %define demo_dir %{_libdir}/python%{pybasever}/Demo
+%define doc_tools_dir %{_libdir}/python%{pybasever}/Doc/tools
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 7.FC6
+Release: 8.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -249,8 +250,8 @@
 install Tools/scripts/*py $RPM_BUILD_ROOT%{tools_dir}/scripts/
 
 # Documentation tools
-%{__tar} cf - Doc/tools | \
-    %{__tar} xf - -C $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}
+install -m755 -d $RPM_BUILD_ROOT%{doc_tools_dir}
+install -m755 Doc/tools/mkhowto $RPM_BUILD_ROOT%{doc_tools_dir}
 
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}
@@ -368,6 +369,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-8
+- Only copying mkhowto from the Docs - we don't need perl dependencies from
+  python-tools.
+
 * Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-7
 - Fixed bug #121198 (webbrowser.py should use the user's preferences first)
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 12:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 08:44:39 -0400
Subject: rpms/opensp/devel opensp-multilib.patch, 1.1, 1.2 opensp.spec, 1.9,
	1.10
Message-ID: <200606131244.k5DCidEo017879@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/opensp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17839

Modified Files:
	opensp-multilib.patch opensp.spec 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1.5.2-3
- Fixed multilib fix (bug #194702).


opensp-multilib.patch:
 config.h.in         |   20 +++-----------------
 configure.in        |    2 +-
 lib/parser_inst.cxx |    3 ++-
 lib/parser_inst.m4  |    3 ++-
 4 files changed, 8 insertions(+), 20 deletions(-)

Index: opensp-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/opensp/devel/opensp-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensp-multilib.patch	26 May 2006 17:20:31 -0000	1.1
+++ opensp-multilib.patch	13 Jun 2006 12:44:33 -0000	1.2
@@ -1,5 +1,5 @@
---- OpenSP-1.5.2/configure.in.multilib	2006-05-26 18:12:45.000000000 +0100
-+++ OpenSP-1.5.2/configure.in	2006-05-26 18:13:04.000000000 +0100
+--- OpenSP-1.5.2/configure.in.multilib	2005-12-23 14:15:21.000000000 +0000
++++ OpenSP-1.5.2/configure.in	2006-06-13 13:36:49.000000000 +0100
 @@ -90,7 +90,7 @@
  #define SP_SIZEOF_BOOL_1
  #endif
@@ -9,8 +9,8 @@
  #define SP_WCHAR_T_USHORT
  #endif
  
---- OpenSP-1.5.2/lib/parser_inst.cxx.multilib	2006-05-26 16:30:16.000000000 +0100
-+++ OpenSP-1.5.2/lib/parser_inst.cxx	2006-05-26 16:41:10.000000000 +0100
+--- OpenSP-1.5.2/lib/parser_inst.cxx.multilib	2005-07-21 16:33:41.000000000 +0100
++++ OpenSP-1.5.2/lib/parser_inst.cxx	2006-06-13 13:36:49.000000000 +0100
 @@ -9,6 +9,7 @@
  // Copyright (c) 1994 James Clark
  // See the file COPYING for copying permission.
@@ -28,8 +28,8 @@
  #ifdef __DECCXX
  #pragma define_template Vector<unsigned int>
  #else
---- OpenSP-1.5.2/lib/parser_inst.m4.multilib	2006-05-26 16:30:32.000000000 +0100
-+++ OpenSP-1.5.2/lib/parser_inst.m4	2006-05-26 16:39:32.000000000 +0100
+--- OpenSP-1.5.2/lib/parser_inst.m4.multilib	2005-05-14 10:17:35.000000000 +0100
++++ OpenSP-1.5.2/lib/parser_inst.m4	2006-06-13 13:36:49.000000000 +0100
 @@ -1,6 +1,7 @@
  // Copyright (c) 1994 James Clark
  // See the file COPYING for copying permission.
@@ -47,9 +47,17 @@
  __instantiate(Vector<unsigned int>)
  #endif
  
---- OpenSP-1.5.2/config.h.in.multilib	2006-05-26 16:41:21.000000000 +0100
-+++ OpenSP-1.5.2/config.h.in	2006-05-26 18:13:39.000000000 +0100
-@@ -333,22 +333,6 @@
+--- OpenSP-1.5.2/config.h.in.multilib	2005-11-05 09:43:42.000000000 +0000
++++ OpenSP-1.5.2/config.h.in	2006-06-13 13:41:45.000000000 +0100
+@@ -1,5 +1,7 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ 
++#include <limits.h>
++
+ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+    systems. This function is required for `alloca.c' support on those systems.
+    */
+@@ -333,22 +335,6 @@
  /* The size of a `bool', as computed by sizeof. */
  #undef SIZEOF_BOOL
  
@@ -72,3 +80,12 @@
  /* define this if h_errno should be declared extern int */
  #undef SP_DECLARE_H_ERRNO
  
+@@ -503,7 +489,7 @@
+ #define SP_SIZEOF_BOOL_1
+ #endif
+ 
+-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
++#if (WCHAR_MAX == SHRT_MAX)
+ #define SP_WCHAR_T_USHORT
+ #endif
+ 


Index: opensp.spec
===================================================================
RCS file: /cvs/dist/rpms/opensp/devel/opensp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- opensp.spec	26 May 2006 17:20:49 -0000	1.9
+++ opensp.spec	13 Jun 2006 12:44:33 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: SGML and XML parser
 Name: opensp
 Version: 1.5.2
-Release: 2
+Release: 3
 Requires: sgml-common >= 0.5
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1.5.2-3
+- Fixed multilib fix (bug #194702).
+
 * Fri May 26 2006 Tim Waugh <twaugh at redhat.com> 1.5.2-2
 - Fixed multilib devel conflicts (bug #192741).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 12:52:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 08:52:20 -0400
Subject: rpms/ghostscript/devel ghostscript-big-cmap-post.patch, 1.3,
	1.4 ghostscript-gtk2.patch, 1.2, 1.3 ghostscript.spec, 1.117,
	1.118 espgs-svn165.patch, 1.1, NONE
Message-ID: <200606131252.k5DCqKbe001893@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1834

Modified Files:
	ghostscript-big-cmap-post.patch ghostscript-gtk2.patch 
	ghostscript.spec 
Removed Files:
	espgs-svn165.patch 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com>
- Undo svn sync.


ghostscript-big-cmap-post.patch:
 gs_ttf.ps |  115 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 85 insertions(+), 30 deletions(-)

Index: ghostscript-big-cmap-post.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-big-cmap-post.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghostscript-big-cmap-post.patch	9 Jun 2006 16:50:24 -0000	1.3
+++ ghostscript-big-cmap-post.patch	13 Jun 2006 12:52:15 -0000	1.4
@@ -1,5 +1,5 @@
---- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2006-06-09 13:37:44.000000000 +0100
-+++ espgs-8.15.2/lib/gs_ttf.ps	2006-06-09 13:39:13.000000000 +0100
+--- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2005-09-22 22:31:58.000000000 +0100
++++ espgs-8.15.2/lib/gs_ttf.ps	2006-04-25 16:49:58.000000000 +0100
 @@ -261,6 +261,54 @@
    } for pop exch pop
  } bind def
@@ -145,10 +145,10 @@
    (OS/2) 1 index
 -  (post) 1 index
 +  (post) { .readbigtable }
-   (vhea) 1 index
- 	% Big tables
-   (glyf) { .readbigtable }
-@@ -860,10 +908,17 @@
+   %(vhea) 1 index
+   systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
+   (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
+@@ -867,10 +915,17 @@
    } ifelse
  		% Stack: ... /FontInfo mark key1 value1 ...
    post null ne {
@@ -170,7 +170,7 @@
    } if
    counttomark 0 ne { .dicttomark } { pop pop } ifelse
    /XUID [orgXUID 42 curxuid]
-@@ -922,22 +977,22 @@
+@@ -929,22 +984,22 @@
      } if
      tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
      dup /cmaptab exch def % temporary

ghostscript-gtk2.patch:
 unix-dll.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ghostscript-gtk2.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-gtk2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghostscript-gtk2.patch	9 Jun 2006 16:50:24 -0000	1.2
+++ ghostscript-gtk2.patch	13 Jun 2006 12:52:15 -0000	1.3
@@ -1,63 +1,11 @@
---- espgs-8.15.2/configure.ac.gtk2	2006-06-09 14:16:36.000000000 +0100
-+++ espgs-8.15.2/configure.ac	2006-06-09 14:18:15.000000000 +0100
-@@ -481,12 +481,9 @@
- SOC_LIBS=""
- SOC_LOADER="dxmainc.c"
- if test "x$enable_gtk" != "xno"; then
--	AC_PATH_PROG(GTKCONFIG, gtk-config)
--	if test "x$GTKCONFIG" != x; then
--		SOC_LOADER="dxmain.c"
--		SOC_CFLAGS="`$GTKCONFIG --cflags`"
--		SOC_LIBS="`$GTKCONFIG --libs`"
--	fi
-+	SOC_LOADER="dxmain.c"
-+	SOC_CFLAGS="`pkg-config gtk+-2.0 --cflags`"
-+	SOC_LIBS="`pkg-config gtk+-2.0 --libs`"
- fi
- AC_SUBST(SOC_CFLAGS)
- AC_SUBST(SOC_LIBS)
---- espgs-8.15.2/src/unix-dll.mak.gtk2	2006-06-09 14:31:35.000000000 +0100
-+++ espgs-8.15.2/src/unix-dll.mak	2006-06-09 14:35:55.000000000 +0100
-@@ -39,11 +39,6 @@
- GSSOC_XE=$(BINDIR)/$(GSSOC_XENAME)
- GSSOC=$(BINDIR)/$(SOBINRELDIR)/$(GSSOC_XENAME)
+--- espgs-8.15rc3/src/unix-dll.mak.gtk2	2005-01-19 04:08:41.000000000 +0000
++++ espgs-8.15rc3/src/unix-dll.mak	2005-06-03 12:31:56.000000000 +0100
+@@ -67,7 +67,7 @@
+ # Build the small Ghostscript loaders, with Gtk+ and without
  
--# loader suporting display device using Gtk+
--GSSOX_XENAME=$(GS)x$(XE)
--GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME)
--GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
--
- # shared library
- GS_SONAME=lib$(GS).so
- GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
-@@ -83,13 +78,13 @@
+ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
+-	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
++	$(GLCC) -g `pkg-config gtk+-2.0 --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config gtk+-2.0 --libs`
  
- # Normal shared object
- so: SODIRS
--	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-+	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC)
- 
- # Debug shared object
- # Note that this is in the same directory as the normal shared
- # object, so you will need to use 'make soclean', 'make sodebug'
- sodebug: SODIRS
--	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
-+	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC)
- 
- install-so: so
- 	-mkdir -p $(prefix)
-@@ -99,7 +94,6 @@
- 	-mkdir -p $(bindir)
- 	-mkdir -p $(libdir)
- 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
- 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
- 	$(RM_) $(libdir)/$(GS_SONAME)
- 	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
-@@ -122,6 +116,5 @@
- 	$(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME)
- 	$(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)
- 	$(RM_) $(GSSOC)
--	$(RM_) $(GSSOX)
- 
- # End of unix-dll.mak
+ $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
+ 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ghostscript.spec	9 Jun 2006 16:50:24 -0000	1.117
+++ ghostscript.spec	13 Jun 2006 12:52:15 -0000	1.118
@@ -14,7 +14,6 @@
 Source1: FAPIcidfmap
 Source4: cidfmap
 
-Patch0: espgs-svn165.patch
 Patch1: ghostscript-multilib.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
@@ -77,7 +76,6 @@
 
 %prep
 %setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
-%patch0 -p1 -b .svn165
 
 # Fix ijs-config not to have multilib conflicts (bug #192672)
 %patch1 -p1 -b .multilib
@@ -86,12 +84,12 @@
 %patch2 -p1 -b .gtk2
 
 # Fix some shell scripts
-#%patch3 -p1 -b .scripts
+%patch3 -p1 -b .scripts
 
 # Fix sed usage in ps2epsi (bug #89300).
-#%patch4 -p1 -b .ps2epsi
+%patch4 -p1 -b .ps2epsi
 
-#%patch5 -p1 -b .badc
+%patch5 -p1 -b .badc
 
 # Prevent pdf2ps generating "null setpagesize" (bug #126446).
 %patch6 -p1 -b .pagesize
@@ -100,7 +98,7 @@
 %patch7 -p1 -b .noopt
 
 # Use external freetype (bug #161187).
-#%patch8 -p1 -b .use-external-freetype
+%patch8 -p1 -b .use-external-freetype
 
 # Allow separated font configuration (bug #161187).
 %patch9 -p1 -b .split-font-configuration
@@ -115,8 +113,6 @@
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
-autoconf
-
 %build
 FONTPATH=
 for path in \
@@ -129,7 +125,7 @@
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
-%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --enable-gtk
+%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH"
 
 # Build IJS
 cd ijs
@@ -149,11 +145,6 @@
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
 %endif
 
-mv sobin/gsc sobin/gsx
-%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --disable-gtk
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
-	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
@@ -175,8 +166,6 @@
 	CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
 	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
 
-install -m0755 sobin/gsx $RPM_BUILD_ROOT%{_bindir}/gsx
-
 mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
 
 cd ijs
@@ -271,6 +260,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com>
+- Undo svn sync.
+
 * Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-5
 - Sync to svn165.
 


--- espgs-svn165.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 13 12:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 08:55:13 -0400
Subject: rpms/openjade/devel openjade.spec,1.32,1.33
Message-ID: <200606131255.k5DCtDsh002648@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2603

Modified Files:
	openjade.spec 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-24
- Rebuild against opensp.



Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openjade.spec	11 Feb 2006 04:49:51 -0000	1.32
+++ openjade.spec	13 Jun 2006 12:55:10 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 23.2
+Release: 24
 Prereq: sgml-common >= 0.5
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
@@ -93,6 +93,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-24
+- Rebuild against opensp.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.2-23.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 12:56:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 08:56:34 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.46,1.47 sources,1.19,1.20
Message-ID: <200606131256.k5DCuYnZ003162@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3084

Modified Files:
	logrotate.spec sources 
Log Message:
- rename ENOSUP to ENOTSUP
- clean up a couple of SELinux problems. Patch from Daniel J. Walsh.



Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- logrotate.spec	17 May 2006 15:08:08 -0000	1.46
+++ logrotate.spec	13 Jun 2006 12:56:30 -0000	1.47
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.4
-Release: 1
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,12 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
+* Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 3.7.4-3
+- rename ENOSUP to ENOTSUP
+
+* Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 3.7.4-2
+- clean up a couple of SELinux problems. Patch from Daniel J. Walsh.
+
 * Wed May 17 2006 Peter Vrabec <pvrabec at redhat.com> 3.7.4-1
 - add new "minsize" option (#173088)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 May 2006 15:08:08 -0000	1.19
+++ sources	13 Jun 2006 12:56:30 -0000	1.20
@@ -1 +1 @@
-73db959389da200b3a0203446e5fe6a6  logrotate-3.7.4.tar.gz
+0d8d8b9df8fd9ddcd0c1692186474779  logrotate-3.7.4.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:15:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:15:26 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.150,1.151
Message-ID: <200606131315.k5DDFPcg006590@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6578

Modified Files:
	gtk2.spec 
Log Message:
2.9.3



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- gtk2.spec	8 Jun 2006 13:02:00 -0000	1.150
+++ gtk2.spec	13 Jun 2006 13:15:12 -0000	1.151
@@ -28,8 +28,6 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
-# Fixed in 2.9.3
-Patch2: gtk+-2.9.2.evo-crash.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -43,7 +41,7 @@
 BuildRequires: gtk-doc
 BuildRequires: cups-devel
 
-BuildRoot: %{_tmppath}/gtk-%{PACKAGE_VERSION}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gtk+-gtkbeta
 Obsoletes: Inti
 
@@ -76,7 +74,7 @@
 suites.
 
 %package devel
-Summary: Development tools for GTK+ applications.
+Summary: Development tools for GTK+ applications
 Group: Development/Libraries
 Requires: gtk2 = %{version}-%{release}
 Requires: pango-devel >= %{pango_version}
@@ -103,7 +101,6 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
-%patch2 -p1 -b .evo-crash
 
 cp %{SOURCE2} gtk/
 
@@ -275,6 +272,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-1
+- Update to 2.9.3
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.2-4
 - Fix a crash in evolution
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:19:26 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.151,1.152
Message-ID: <200606131319.k5DDJQBf014340@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5166

Modified Files:
	gtk2.spec 
Log Message:
try again



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- gtk2.spec	13 Jun 2006 13:15:12 -0000	1.151
+++ gtk2.spec	13 Jun 2006 13:19:15 -0000	1.152
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.9.2
+%define base_version 2.9.3
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:28:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:28:26 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.152,1.153 sources,1.58,1.59
Message-ID: <200606131328.k5DDSQ38032215@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32199

Modified Files:
	gtk2.spec sources 
Log Message:
remove leftovers



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gtk2.spec	13 Jun 2006 13:19:15 -0000	1.152
+++ gtk2.spec	13 Jun 2006 13:28:23 -0000	1.153
@@ -21,8 +21,6 @@
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
 Source1: update-scripts.tar.gz
-# the builtin cache in the 2.9.2 tarball is defective
-Source2: gtkbuiltincache.h
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
@@ -102,8 +100,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 
-cp %{SOURCE2} gtk/
-
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
 done


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	7 Jun 2006 04:56:51 -0000	1.58
+++ sources	13 Jun 2006 13:28:23 -0000	1.59
@@ -1,3 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-c63e7d0cf7c4e983206c3088a0fb8862  gtk+-2.9.2.tar.bz2
-164b8b84dcbc15335dbaf59efa7253a2  gtkbuiltincache.h
+d73039a3b5847c352f5740ac908be7d2  gtk+-2.9.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:37:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:37:10 -0400
Subject: rpms/gstreamer/devel .cvsignore, 1.20, 1.21 gstreamer.spec, 1.49,
	1.50 sources, 1.21, 1.22
Message-ID: <200606131337.k5DDbAqs032375@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32359

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
0.10.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	23 May 2006 02:57:28 -0000	1.20
+++ .cvsignore	13 Jun 2006 13:37:05 -0000	1.21
@@ -1 +1 @@
-gstreamer-0.10.6.tar.bz2
+gstreamer-0.10.8.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gstreamer.spec	23 May 2006 03:24:51 -0000	1.49
+++ gstreamer.spec	13 Jun 2006 13:37:06 -0000	1.50
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.6
+Version: 	0.10.8
 Release: 	1
 Summary: 	GStreamer streaming media framework runtime
 
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-1
+- Update to 0.10.8
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.6-1
 - Update to 0.10.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	23 May 2006 02:57:28 -0000	1.21
+++ sources	13 Jun 2006 13:37:06 -0000	1.22
@@ -1 +1 @@
-ca7513efcca608a42836fd54b70a5814  gstreamer-0.10.6.tar.bz2
+a094ea86d4cea4f23ef2eb8c6e7bfc10  gstreamer-0.10.8.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:47:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:47:43 -0400
Subject: rpms/openobex/devel openobex-1.1-noreq.patch, NONE,
	1.1 openobex-apps-flush.patch, NONE,
	1.1 openobex-apps-push.patch, NONE, 1.1 openobex.spec, 1.13, 1.14
Message-ID: <200606131347.k5DDlhZd006793@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6020

Modified Files:
	openobex.spec 
Added Files:
	openobex-1.1-noreq.patch openobex-apps-flush.patch 
	openobex-apps-push.patch 
Log Message:
- more build requirements

openobex-1.1-noreq.patch:
 acinclude.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openobex-1.1-noreq.patch ---
--- openobex-1.1/acinclude.m4.noreq	2006-01-19 16:44:50.000000000 +0100
+++ openobex-1.1/acinclude.m4	2006-04-25 03:57:33.000000000 +0200
@@ -190,12 +190,12 @@
 
 	if (test "${bluetooth_enable}" = "yes" && test "${bluez_found}" = "yes"); then
 		AC_DEFINE(HAVE_BLUETOOTH, 1, [Define if system supports Bluetooth and it's enabled])
-		REQUIRES="bluez"
+		dnl REQUIRES="bluez"
 	fi
 
 	if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
 		AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
-		AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
+		dnl AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, )
 	fi
 
 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")

openobex-apps-flush.patch:
 obex_put_common.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE openobex-apps-flush.patch ---
--- openobex-apps-1.0.0/apps/obex_put_common.c.flush	2004-09-21 15:46:27.797739136 +0200
+++ openobex-apps-1.0.0/apps/obex_put_common.c	2004-09-21 15:46:46.885837304 +0200
@@ -167,6 +167,7 @@
 	switch (event)	{
 	case OBEX_EV_PROGRESS:
 		printf(".");
+		fflush(stdout);
 		break;
 	case OBEX_EV_REQDONE:
 		printf("\n");

openobex-apps-push.patch:
 Makefile.am |    6 +-
 obex_push.1 |   39 +++++++++++++
 obex_push.c |  170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 214 insertions(+), 1 deletion(-)

--- NEW FILE openobex-apps-push.patch ---
--- /dev/null	2006-04-22 12:11:24.035516750 +0200
+++ openobex-1.2/apps/obex_push.1	2006-04-25 04:13:16.000000000 +0200
@@ -0,0 +1,39 @@
+.TH OBEX_PUSH 1 "04 June 2003" "1.0.0"  "openobex-apps"
+.SH NAME
+obex_push \- Push and Receive Files over the Bluetooth OBEX Push Channel
+.SH SYNOPSIS
+obex_push \fI[\fR\fB<channel>\fR\fI]  \fI[\fR\fB<bdaddr> <filename>\fR\fI] 
+.SH DESCRIPTION
+obex_push can send and receive files over the Bluetooth OBEX Push Channel.
+.PP
+To configure your bluetooth device, you should do the following:
+.PP
+Add modules into /etc/modules.conf: 
+.PP
+.RS
+.nf
+alias net-pf-31 bluez
+alias bt-proto-0 l2cap
+alias bt-proto-2 sco
+alias bt-proto-3 rfcomm
+.fi
+.RE
+.PP
+Link your bluetooth device with your computer.
+.PP
+You can see the SDP services with:
+.PP
+$ sdptool browse <bdaddr>
+.PP
+.SH OPTIONS
+If no options are given, any files sent over bluetooth will be received over channel 10 and stored in /tmp.
+.PP 
+If \fI<bdaddr>\fR and \fI<filename>\fR are given, the file will be send to the device specified with \fI<bdaddr>\fR.
+.TP
+\fI<channel>\fR - The bluetooth channel to use. Lookup the OBEX Push channel with sdptool browse <bdaddr>.
+.TP
+\fI<bdaddr>\fR - The bluetooth address <bdaddr> of the device to send to.
+.TP
+\fI<filename>\fR - The file to send.
+.SH AUTHOR
+Harald Hoyer \fI<harald at redhat.com>\fR
--- /dev/null	2006-04-22 12:11:24.035516750 +0200
+++ openobex-1.2/apps/obex_push.c	2006-04-25 04:13:16.000000000 +0200
@@ -0,0 +1,170 @@
+/*********************************************************************
+ *                
+ * Filename:      obex_push.c
+ * Version:       0.1
+ * Description:   Demonstrates use of PUSH command
+ * Status:        Experimental.
+ * Author:        Harald Hoyer <harald at redhat.com
+ *
+ *     modified irobex_palm3.c
+ * 
+ *     Copyright (C) 2003 Harald Hoyer, All Rights Reserved.
+ *     Copyright (C) 2003 Red Hat, Inc.
+ *     
+ *     This program is free software; you can redistribute it and/or 
+ *     modify it under the terms of the GNU General Public License as 
+ *     published by the Free Software Foundation; either version 2 of 
+ *     the License, or (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License 
+ *     along with this program; if not, write to the Free Software 
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *     MA 02111-1307 USA
+ *
+ *
+ *     Start without arguments to receive a file.
+ *     Start with address and filename as argument to send a file. 
+ *     
+ ********************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if _WIN32
+#include <winsock.h>
+#else
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#endif /* _WIN32 */
+
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/rfcomm.h>
+
+
+#include <openobex/obex.h>
+#include "obex_put_common.h"
+#include "obex_io.h"
+
+#define OBEX_PUSH_HANDLE	10
+
+#define TRUE  1
+#define FALSE 0
+
+obex_t *handle = NULL;
+volatile int finished = FALSE;
+extern int last_rsp;
+
+/*
+ * Function main (argc, )
+ *
+ *    Starts all the fun!
+ *
+ */
+int main(int argc, char *argv[])
+{
+	obex_object_t *object;
+	int ret, exitval = EXIT_SUCCESS;
+	bdaddr_t bdaddr;
+	uint8_t channel;
+	char *filename;
+	if ((argc < 1) || (argc > 4))	{
+		printf ("Usage: %s [<channel>] [<bdaddr> <filename>]\n", argv[0]); 
+		return -1;
+	}
+	handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+
+	switch (argc) {
+#ifdef HAVE_BLUETOOTH
+	case 4:
+		channel = atoi(argv[1]);
+		str2ba(argv[2], &bdaddr);
+		filename = argv[3];
+		break;
+	case 3:
+		str2ba(argv[1], &bdaddr);
+		filename = argv[2];
+		channel = OBEX_PUSH_HANDLE;
+		break;
+	case 2:
+		channel = atoi(argv[1]);
+		break;
+	case 1:
+		channel = OBEX_PUSH_HANDLE;
+		break;
+#endif
+	default:
+		printf("Wrong number of arguments\n");
+		exit(0);
+	}
+
+	printf("Send and receive files through bluetooth OBEX PUSH channel %d\n", channel);
+	if (argc <= 2)	{
+		char cmd[1024];
+		/* We are server*/
+		snprintf(cmd, sizeof(cmd), "sdptool add --channel=%d OPUSH", channel);
+		system(cmd);
+		
+		printf("Waiting for files\n");
+		BtOBEX_ServerRegister(handle, NULL, channel);
+		
+		while (!finished)
+			OBEX_HandleInput(handle, 1);
+	}
+	else {
+		/* We are a client */
+		if (bacmp(&bdaddr, BDADDR_ANY) == 0) {
+			printf("Device address error! (Bluetooth)\n");
+			return -1;
+		}
+
+		/* Try to connect to peer */
+		ret = BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr,
+					      channel);
+		if (ret < 0) {
+			printf("Sorry, unable to connect!\n");
+			return EXIT_FAILURE;
+		}
+
+		object = OBEX_ObjectNew(handle, OBEX_CMD_CONNECT);
+		ret = do_sync_request(handle, object, FALSE);
+		if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0)) {
+			printf("Sorry, unable to connect!\n");
+			return EXIT_FAILURE;
+		}
+		if ((object = build_object_from_file(handle, filename)))
+		{
+			ret = do_sync_request(handle, object, FALSE);
+			if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0))
+				exitval = EXIT_FAILURE;
+		} else
+			exitval = EXIT_FAILURE;
+
+		object = OBEX_ObjectNew(handle, OBEX_CMD_DISCONNECT);
+		ret = do_sync_request(handle, object, FALSE);
+		if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0))
+			exitval = EXIT_FAILURE;
+
+		if (exitval == EXIT_SUCCESS)
+			printf("PUT successful\n");
+		else
+			printf("PUT failed\n");
+	}
+//	sleep(1);
+	return exitval;
+}
--- openobex-1.2/apps/Makefile.am.push	2006-01-03 19:36:15.000000000 +0100
+++ openobex-1.2/apps/Makefile.am	2006-04-25 04:13:51.000000000 +0200
@@ -6,7 +6,7 @@
 	obex_io.c obex_io.h \
 	obex_put_common.c obex_put_common.h
 
-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
+bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test obex_push
 
 obex_test_SOURCES = \
 	obex_test.c obex_test.h \
@@ -16,6 +16,10 @@
 
 obex_test_LDADD = $(top_builddir)/lib/libopenobex.la @BLUEZ_LIBS@ @USB_LIBS@ libmisc.a
 
+obex_push_SOURCES = obex_push.c
+obex_push_LDADD = $(top_builddir)/lib/libopenobex.la @BLUEZ_LIBS@ @USB_LIBS@ libmisc.a
+man_MANS = obex_push.1
+
 LDADD = $(top_builddir)/lib/libopenobex.la libmisc.a
 
 INCLUDES = @USB_CFLAGS@ @BLUEZ_CFLAGS@ -I$(top_builddir)/include


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openobex.spec	16 Feb 2006 13:30:02 -0000	1.13
+++ openobex.spec	13 Jun 2006 13:47:37 -0000	1.14
@@ -1,14 +1,19 @@
 Summary: Library for using OBEX
 Name: openobex
-Version: 1.1
-Release: 1
+Version: 1.2
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
 Source: ftp://download.sourceforge.net/pub/sourceforge/openobex/openobex-%{version}.tar.gz
 Patch: openobex-1.1-inc.patch
+Patch2: openobex-1.1-noreq.patch
+Patch3: openobex-apps-flush.patch
+Patch4: openobex-apps-push.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed
+BuildRequires: automake autoconf
 ExcludeArch: s390 s390x
 
 %description
@@ -22,16 +27,29 @@
 %description devel
 Open OBEX shared c-library
 
+%package apps
+Summary: Applications for using OBEX
+Group: System Environment/Libraries
+BuildRequires: bluez-libs-devel
+BuildRequires: autoconf >= 0:2.57
+Excludearch: s390x s390
+
+%description apps
+Open OBEX Applications
+
 %prep
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
 %patch -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1 -b .push
 sed -i -e 's#includedir=@includedir@#includedir=@includedir@/openobex#g' openobex.pc.in
 
 %build
 autoreconf --install --force
-%configure
+%configure --disable-static --enable-apps
 make
 make -C doc 
 
@@ -56,11 +74,22 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README 
 %{_libdir}/libopenobex*.so
-%{_libdir}/libopenobex*.a
 %{_datadir}/aclocal/openobex.m4
 %{_includedir}/openobex/*.h
 %{_libdir}/pkgconfig/openobex.pc
 
+%files apps
+%defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_bindir}/irobex_palm3
+%{_bindir}/irxfer
+%{_bindir}/ircp
+%{_bindir}/obex_tcp
+%{_bindir}/obex_test
+%{_bindir}/obex_push
+%{_mandir}/man1/obex_push.1*
+
+
 %changelog
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> 1.1-1
 - version 1.1



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:47:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:47:51 -0400
Subject: rpms/python/devel python.spec,1.76,1.77
Message-ID: <200606131347.k5DDlm95007209@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7032

Modified Files:
	python.spec 
Log Message:
Fixed python-devel to be multilib friendly (bug #192747, #139911)


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- python.spec	13 Jun 2006 12:14:02 -0000	1.76
+++ python.spec	13 Jun 2006 13:47:45 -0000	1.77
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 8.FC6
+Release: 9.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -303,6 +303,32 @@
 install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
 %endif
 
+# Install pydoc wrapper (bug #193484)
+install -m 0755 %{SOURCE8} %{_bindir}/pydoc
+
+# Make python-devel multilib-ready (bug #192747, #139911)
+%define _pyconfig32_h pyconfig-32.h
+%define _pyconfig64_h pyconfig-64.h
+
+%if %{_lib} == lib64
+%define _pyconfig_h %{_pyconfig64.h}
+%else
+%define _pyconfig_h %{_pyconfig32.h}
+%endif
+mv $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h \
+   $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/%{_pyconfig_h}
+cat > $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h << EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "%{_pyconfig32_h}"
+#elif __WORDSIZE == 64
+#include "%{_pyconfig64_h}"
+#else
+#error "Unkown word size"
+#endif
+EOF
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -369,6 +395,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-9
+- Fixed python-devel to be multilib friendly (bug #192747, #139911)
+
 * Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-8
 - Only copying mkhowto from the Docs - we don't need perl dependencies from
   python-tools.



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:51:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:51:59 -0400
Subject: rpms/openobex/devel openobex-apps-1.0.0-push.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 openobex.spec, 1.14, 1.15 sources, 1.4, 1.5
Message-ID: <200606131351.k5DDpxe3014941@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14928

Modified Files:
	.cvsignore openobex.spec sources 
Added Files:
	openobex-apps-1.0.0-push.patch 
Log Message:
- more build requirements

openobex-apps-1.0.0-push.patch:
 apps/Makefile.am |    6 +
 apps/obex_push.c |  170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/obex_push.1  |   39 ++++++++++++
 3 files changed, 214 insertions(+), 1 deletion(-)

--- NEW FILE openobex-apps-1.0.0-push.patch ---
--- openobex-apps-1.0.0/apps/Makefile.am.push	2002-12-01 18:34:41.000000000 +0100
+++ openobex-apps-1.0.0/apps/Makefile.am	2003-06-04 17:04:22.000000000 +0200
@@ -9,7 +9,7 @@
 		obex_put_common.c obex_put_common.h
 
 
-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
+bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test obex_push
 
 obex_test_SOURCES = \
 	obex_test.c obex_test.h \
@@ -25,6 +25,10 @@
 
 irobex_palm3_SOURCES = irobex_palm3.c
 
+obex_push_SOURCES = obex_push.c
+obex_push_LDADD = @OPENOBEX_LIBS@ @BLUETOOTH_LIBS@ libmisc.a
+
+man_MANS = obex_push.1
 
 LDADD = @OPENOBEX_LIBS@ libmisc.a
 
--- /dev/null	2003-01-30 11:24:37.000000000 +0100
+++ openobex-apps-1.0.0/apps/obex_push.c	2003-06-04 17:04:22.000000000 +0200
@@ -0,0 +1,170 @@
+/*********************************************************************
+ *                
+ * Filename:      obex_push.c
+ * Version:       0.1
+ * Description:   Demonstrates use of PUSH command
+ * Status:        Experimental.
+ * Author:        Harald Hoyer <harald at redhat.com
+ *
+ *     modified irobex_palm3.c
+ * 
+ *     Copyright (C) 2003 Harald Hoyer, All Rights Reserved.
+ *     Copyright (C) 2003 Red Hat, Inc.
+ *     
+ *     This program is free software; you can redistribute it and/or 
+ *     modify it under the terms of the GNU General Public License as 
+ *     published by the Free Software Foundation; either version 2 of 
+ *     the License, or (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License 
+ *     along with this program; if not, write to the Free Software 
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *     MA 02111-1307 USA
+ *
+ *
+ *     Start without arguments to receive a file.
+ *     Start with address and filename as argument to send a file. 
+ *     
+ ********************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if _WIN32
+#include <winsock.h>
+#else
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#endif /* _WIN32 */
+
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/rfcomm.h>
+
+
+#include <openobex/obex.h>
+#include "obex_put_common.h"
+#include "obex_io.h"
+
+#define OBEX_PUSH_HANDLE	10
+
+#define TRUE  1
+#define FALSE 0
+
+obex_t *handle = NULL;
+volatile int finished = FALSE;
+extern int last_rsp;
+
+/*
+ * Function main (argc, )
+ *
+ *    Starts all the fun!
+ *
+ */
+int main(int argc, char *argv[])
+{
+	obex_object_t *object;
+	int ret, exitval = EXIT_SUCCESS;
+	bdaddr_t bdaddr;
+	uint8_t channel;
+	char *filename;
+	if ((argc < 1) || (argc > 4))	{
+		printf ("Usage: %s [<channel>] [<bdaddr> <filename>]\n", argv[0]); 
+		return -1;
+	}
+	handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+
+	switch (argc) {
+#ifdef HAVE_BLUETOOTH
+	case 4:
+		channel = atoi(argv[1]);
+		str2ba(argv[2], &bdaddr);
+		filename = argv[3];
+		break;
+	case 3:
+		str2ba(argv[1], &bdaddr);
+		filename = argv[2];
+		channel = OBEX_PUSH_HANDLE;
+		break;
+	case 2:
+		channel = atoi(argv[1]);
+		break;
+	case 1:
+		channel = OBEX_PUSH_HANDLE;
+		break;
+#endif
+	default:
+		printf("Wrong number of arguments\n");
+		exit(0);
+	}
+
+	printf("Send and receive files through bluetooth OBEX PUSH channel %d\n", channel);
+	if (argc <= 2)	{
+		char cmd[1024];
+		/* We are server*/
+		snprintf(cmd, sizeof(cmd), "sdptool add --channel=%d OPUSH", channel);
+		system(cmd);
+		
+		printf("Waiting for files\n");
+		BtOBEX_ServerRegister(handle, NULL, channel);
+		
+		while (!finished)
+			OBEX_HandleInput(handle, 1);
+	}
+	else {
+		/* We are a client */
+		if (bacmp(&bdaddr, BDADDR_ANY) == 0) {
+			printf("Device address error! (Bluetooth)\n");
+			return -1;
+		}
+
+		/* Try to connect to peer */
+		ret = BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr,
+					      channel);
+		if (ret < 0) {
+			printf("Sorry, unable to connect!\n");
+			return EXIT_FAILURE;
+		}
+
+		object = OBEX_ObjectNew(handle, OBEX_CMD_CONNECT);
+		ret = do_sync_request(handle, object, FALSE);
+		if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0)) {
+			printf("Sorry, unable to connect!\n");
+			return EXIT_FAILURE;
+		}
+		if ((object = build_object_from_file(handle, filename)))
+		{
+			ret = do_sync_request(handle, object, FALSE);
+			if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0))
+				exitval = EXIT_FAILURE;
+		} else
+			exitval = EXIT_FAILURE;
+
+		object = OBEX_ObjectNew(handle, OBEX_CMD_DISCONNECT);
+		ret = do_sync_request(handle, object, FALSE);
+		if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0))
+			exitval = EXIT_FAILURE;
+
+		if (exitval == EXIT_SUCCESS)
+			printf("PUT successful\n");
+		else
+			printf("PUT failed\n");
+	}
+//	sleep(1);
+	return exitval;
+}
--- /dev/null	2003-01-30 11:24:37.000000000 +0100
+++ openobex-apps-1.0.0/src/obex_push.1	2003-06-04 17:05:59.000000000 +0200
@@ -0,0 +1,39 @@
+.TH OBEX_PUSH 1 "04 June 2003" "1.0.0"  "openobex-apps"
+.SH NAME
+obex_push \- Push and Receive Files over the Bluetooth OBEX Push Channel
+.SH SYNOPSIS
+obex_push \fI[\fR\fB<channel>\fR\fI]  \fI[\fR\fB<bdaddr> <filename>\fR\fI] 
+.SH DESCRIPTION
+obex_push can send and receive files over the Bluetooth OBEX Push Channel.
+.PP
+To configure your bluetooth device, you should do the following:
+.PP
+Add modules into /etc/modules.conf: 
+.PP
+.RS
+.nf
+alias net-pf-31 bluez
+alias bt-proto-0 l2cap
+alias bt-proto-2 sco
+alias bt-proto-3 rfcomm
+.fi
+.RE
+.PP
+Link your bluetooth device with your computer.
+.PP
+You can see the SDP services with:
+.PP
+$ sdptool browse <bdaddr>
+.PP
+.SH OPTIONS
+If no options are given, any files sent over bluetooth will be received over channel 10 and stored in /tmp.
+.PP 
+If \fI<bdaddr>\fR and \fI<filename>\fR are given, the file will be send to the device specified with \fI<bdaddr>\fR.
+.TP
+\fI<channel>\fR - The bluetooth channel to use. Lookup the OBEX Push channel with sdptool browse <bdaddr>.
+.TP
+\fI<bdaddr>\fR - The bluetooth address <bdaddr> of the device to send to.
+.TP
+\fI<filename>\fR - The file to send.
+.SH AUTHOR
+Harald Hoyer \fI<harald at redhat.com>\fR


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2006 13:35:11 -0000	1.4
+++ .cvsignore	13 Jun 2006 13:51:51 -0000	1.5
@@ -1 +1 @@
-openobex-1.1.tar.gz
+openobex-1.2.tar.gz


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openobex.spec	13 Jun 2006 13:47:37 -0000	1.14
+++ openobex.spec	13 Jun 2006 13:51:51 -0000	1.15
@@ -91,6 +91,12 @@
 
 
 %changelog
+* Tue Jun 13 2006 Harald Hoyer <harald at redhat.com> - 1.2-2
+- more build requirements
+
+* Tue Jun 13 2006 Harald Hoyer <harald at redhat.com> - 1.2-1
+- version 1.2
+
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> 1.1-1
 - version 1.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Feb 2006 13:35:12 -0000	1.4
+++ sources	13 Jun 2006 13:51:51 -0000	1.5
@@ -1 +1 @@
-c93327b636333d58e1d6ac362970ac21  openobex-1.1.tar.gz
+c92746ae7bd69255c2c41f51e9349c65  openobex-1.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:57:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:57:40 -0400
Subject: rpms/kdewebdev/FC-5 kdewebdev.spec,1.30,1.31
Message-ID: <200606131357.k5DDvecg015046@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15020

Modified Files:
	kdewebdev.spec 
Log Message:
build with -O0 on s390(x) (gcc workaround)



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kdewebdev.spec	12 Jun 2006 22:44:56 -0000	1.30
+++ kdewebdev.spec	13 Jun 2006 13:57:36 -0000	1.31
@@ -68,6 +68,11 @@
   make -f admin/Makefile.common cvs
 %endif
 
+%ifarch s390x s390
+export CXXFLAGS="%{optflags} -O0"
+export CFLAGS="%{optflags} -O0"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \



From fedora-cvs-commits at redhat.com  Tue Jun 13 13:58:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 09:58:09 -0400
Subject: rpms/ghostscript/devel espgs-cjkv.patch, NONE, 1.1 ghostscript.spec,
	1.118, 1.119
Message-ID: <200606131358.k5DDw9E1015096@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15080

Modified Files:
	ghostscript.spec 
Added Files:
	espgs-cjkv.patch 
Log Message:
- Apply CJKV patch from svn164:165.

espgs-cjkv.patch:
 lib/cjkv/baseutil.ps |  569 ++++++++++++++++++++++++++++++++++++++++
 lib/cjkv/cjkcidcm.ps |  455 ++++++++++++++++++++++++++++++++
 lib/cjkv/cjkfnmap.ps |  389 ++++++++++++++++++++++++++++
 lib/cjkv/cjkvinit.ps |   46 +++
 lib/cjkv/cjkvttcf.ps |  154 +++++++++++
 lib/cjkv/tt11util.ps |  708 +++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/cjkv/tt42util.ps |  482 ++++++++++++++++++++++++++++++++++
 lib/gs_ttf.ps        |   11 
 src/gdevpdtc.c       |   12 
 src/gdevpdtt.c       |   51 ---
 src/gstype42.c       |  104 +++----
 src/gxfont42.h       |   18 -
 src/unixinst.mak     |    5 
 src/zcfont.c         |    4 
 src/zchar1.c         |   72 ++++-
 src/zchar42.c        |   22 +
 src/zfcid1.c         |   63 ----
 17 files changed, 2958 insertions(+), 207 deletions(-)

--- NEW FILE espgs-cjkv.patch ---
--- espgs-8.15.2/src/unixinst.mak.cjkv	2006-04-23 14:38:33.000000000 +0100
+++ espgs-8.15.2/src/unixinst.mak	2006-06-13 13:53:00.000000000 +0100
@@ -63,6 +63,7 @@
 	-mkdir -p $(install_prefix)$(gsdir)
 	-mkdir -p $(install_prefix)$(gsdatadir)
 	-mkdir -p $(install_prefix)$(gsdatadir)/lib
+	-mkdir -p $(install_prefix)$(gsdatadir)/lib/cjkv
 	$(SH) -c 'for f in \
 Fontmap Fontmap.GS cidfmap \
 FAPIcidfmap FAPIconfig FAPIfontmap xlatmap \
@@ -88,6 +89,10 @@
 	$(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
 	do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
 	done'
+# install cjkv patch
+	$(SH) -c 'for f in $(PSLIBDIR)/cjkv/*.ps ;\
+	do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib/cjkv/ ;\
+	done'
 
 # install the default resource files
 # copy in every category (directory) but CVS
--- espgs-8.15.2/src/gstype42.c.cjkv	2005-09-22 22:31:58.000000000 +0100
+++ espgs-8.15.2/src/gstype42.c	2006-06-13 13:53:00.000000000 +0100
@@ -1,3 +1,11 @@
+/*
+ * Modified by AXE,Inc., BBR Inc. and Turbolinux Inc.
+ *   under the technical advice by suzuki toshiya (Hiroshima University)
+ * For questions, please send mail to espgs8-cjk at printing-japan.org
+ *
+ * (C) Copyright 2006 Center of the International Cooperation for
+ *     Computerization
+ */
 /* Copyright (C) 1996, 2000 Aladdin Enterprises.  All rights reserved.
   
   This software is provided AS-IS with no warranty, either express or
@@ -146,45 +154,6 @@
 	    pfont->data.metrics[1].offset = offset;
 	    pfont->data.metrics[1].length = (uint)u32(tab + 12);
 	}
-#if 1 /* XXXX */
-	else if (!memcmp(tab, "mort", 4)) {
-	    /* find vertical substitution */
-	    byte *mort;
-
-	    ACCESS(offset, 20, mort);	/* length not accurate */
-	    if ((uint)u32(mort) == 0x00010000) {
-		int nChains, i;
-		ulong Chainp = 8;
-
-		nChains = (int)u32(mort+4);
-		for (i=1; i <= nChains; i++) {
-		  int nSub, j;
-		  ulong Subp;
-
-		  nSub = U16(mort+Chainp+10);
-		  Subp = Chainp + U16(mort+Chainp+8)*12 + 12;
-		  for (j=1; j <= nSub; j++) {
-		     if ((U16(mort+Subp+2)&7) == 4) {
-			if ((U16(mort+Subp+8) == 6) &&
-			    (U16(mort+Subp+10) == 4)) {
-			  byte *ncgsv;
-			  int  cnt;
-			  cnt = U16(mort+Subp+12);
-			  ACCESS(offset+Subp+20, cnt*4, ncgsv);
-			  if (!pfont->data.mort_ncgsv_off) {
-			    pfont->data.mort_ncgsv_off = offset+Subp+20;
-			    pfont->data.mort_ncgsv_len = cnt*4;
-			  } else
-			    dlprintf("multiple ncgsv ignored.\n");
-			}
-		     }
-		     Subp += U16(mort+Subp);
-		  }
-		  Chainp += (int)u32(mort+Chainp+4);
-		}
-	    }
-	}
-#endif
     }
     loca_size >>= pfont->data.indexToLocFormat + 1;
     pfont->data.numGlyphs = (loca_size == 0 ? 0 : loca_size - 1);
@@ -206,20 +175,6 @@
 	pfont->FontBBox.q.x = S16(head_box + 4) / upem;
 	pfont->FontBBox.q.y = S16(head_box + 6) / upem;
     }
-#if 1 /* XXX */
-    if (! pfont->data.metrics[1].offset) {
-	/* no vhea/vmtx
-	 * shrink/expand the height to 1.0
- 	 */
-	float v;
-	v = - pfont->FontBBox.p.y + pfont->FontBBox.q.y;
-	    pfont->FontBBox.p.y /= v;
-	    pfont->FontBBox.q.y /= v;
-
-	    pfont->FontBBox.p.x /= v;
-	    pfont->FontBBox.q.x /= v;
-    }
-#endif
 #if NEW_TT_INTERPRETER
     pfont->data.warning_patented = false;
     pfont->data.warning_bad_instruction = false;
@@ -573,6 +528,49 @@
 			     origin.y + float2fixed(info.width[WMode].y));
 }
 
+/* Get glyph bounding box from font file */
+int
+gs_type42_glyph_fbbox(gs_font *font, uint glyph_index, gs_rect *pbbox)
+{
+    gs_font_type42 *const pfont = (gs_font_type42 *)font;
+    gs_glyph_data_t glyph_data;
+    double factor = 1.0 / pfont->data.unitsPerEm;
+    int code = 0;
+    const byte *gdata;
+
+    if ((code = pfont->data.get_outline(pfont, glyph_index, &glyph_data)) < 0) {
+	return code;		/* non-existent glyph */
+    }
+    if (glyph_data.bits.size == 0) {
+	return 1; /* notdef */
+    }
+    if (glyph_data.bits.size != 0 && S16(glyph_data.bits.data) == -1) {
+	/* This is a composite glyph. */
+	uint flags;
+	gs_matrix_fixed mat;
+
+	gdata = glyph_data.bits.data + 10;
+	memset(&mat, 0, sizeof(mat)); /* arbitrary */
+	do {
+	    uint comp_index = U16(gdata + 2);
+
+	    parse_component(&gdata, &flags, &mat, NULL, pfont, &mat);
+	    if (flags & TT_CG_USE_MY_METRICS) {
+		code = gs_type42_glyph_fbbox(pfont, comp_index,pbbox);
+		goto done;
+	    }
+	}
+	while (flags & TT_CG_MORE_COMPONENTS);
+    }
+    gdata = glyph_data.bits.data;
+    pbbox->p.x = S16(gdata+2)*factor;
+    pbbox->p.y = S16(gdata+4)*factor;
+    pbbox->q.x = S16(gdata+6)*factor;
+    pbbox->q.y = S16(gdata+8)*factor;
+done:
+    gs_glyph_data_free(&glyph_data, "gs_type42_enumerate_glyph");
+    return code;
+}
 /* Get glyph info by glyph index. */
 int
 gs_type42_glyph_info_by_gid(gs_font *font, gs_glyph glyph, const gs_matrix *pmat,
--- espgs-8.15.2/src/zchar42.c.cjkv	2005-01-19 04:08:41.000000000 +0000
+++ espgs-8.15.2/src/zchar42.c	2006-06-13 13:53:00.000000000 +0100
@@ -1,3 +1,12 @@
+/*
+ * Modified by AXE,Inc., BBR Inc. and Turbolinux Inc.
+ *   under the technical advice by suzuki toshiya (Hiroshima University)
+ * Based on bugfix by Masatake Yamato and Hideo Saito, 2001.
+ * For questions, please send mail to espgs8-cjk at printing-japan.org
+ *
+ * (C) Copyright 2006 Center of the International Cooperation for
+ *     Computerization
+ */
 /* Copyright (C) 1996, 1997, 1998, 1999 Aladdin Enterprises.  All rights reserved.
   
   This software is provided AS-IS with no warranty, either express or
@@ -44,8 +53,15 @@
 {   double sbw[4];
     double w[2];
     int present;
-    int code = zchar_get_metrics(pbfont, cnref, sbw);
+    gs_rect bbox, *pbbox;
+    int code = gs_type42_glyph_fbbox(pbfont, glyph_index, &bbox);
 
+    if (code != 0) {
+	pbbox = &pbfont->FontBBox;
+    } else {
+	pbbox = &bbox;
+    }
+    code = zchar_get_metrics(pbfont, cnref, sbw);
     if (code < 0)
 	return code;
     present = code;
@@ -75,7 +91,7 @@
 		}
 	    } else {
 		sbw[0] = sbw[2] / 2;
-		sbw[1] = (pbfont->FontBBox.q.y + pbfont->FontBBox.p.y - sbw42[3]) / 2;
+		sbw[1] = pbbox->q.y - sbw42[1];
 		sbw[2] = sbw42[2];
 		sbw[3] = sbw42[3];
 	    }
@@ -87,7 +103,7 @@
     return zchar_set_cache(i_ctx_p, pbfont, cnref,
 			   (put_lsb && present == metricsSideBearingAndWidth ?
 			    sbw : NULL),
-			   w, &pbfont->FontBBox,
+			   w, pbbox,
[...3027 lines suppressed...]
+      } }
+      /Unicode { 4 {
+        /Adobe-Japan1-UCS2      _cjkv_type11_util /.applyCIDToUnicode get exec
+        /UniJIS-UCS2-V          _cjkv_type11_util /.applyvCMapUnicode get exec
+        /UniJIS-UCS2-H          _cjkv_type11_util /.applyhCMap        get exec
+      } }
+    >>
+    /Adobe-Japan2 <<
+      /Registry (Adobe)
+      /Ordering (Japan2)
+      /CIDCounts [ 6068 ]
+      /Unicode { 0  {
+        /UniHojo-UCS2-V         _cjkv_type11_util /.applyvCMapUnicode get exec
+        /UniHojo-UCS2-H         _cjkv_type11_util /.applyhCMap        get exec
+      } }
+    >>
+    /Adobe-Korea1 <<
+      /Registry (Adobe)
+      /Ordering (Korea1)
+      /CIDCounts [ 9333 18155 18352 ]
+      /Johab { 1 {
+        /KSC-Johab-V            _cjkv_type11_util /.applyvCMap        get exec
+        /KSC-Johab-H            _cjkv_type11_util /.applyhCMap        get exec
+      } }
+      /Unicode { 2 {
+        /Adobe-Korea1-UCS2      _cjkv_type11_util /.applyCIDToUnicode get exec
+        /UniKS-UCS2-V           _cjkv_type11_util /.applyvCMapUnicode get exec
+        /UniKS-UCS2-H           _cjkv_type11_util /.applyhCMap        get exec
+      } }
+      /Wansung { 1 {
+        /Adobe-Korea1-KSCms-UHC _cjkv_type11_util /.applyCIDToCode    get exec
+        /KSCms-UHC-V            _cjkv_type11_util /.applyvCMap        get exec
+        /KSCms-UHC-H            _cjkv_type11_util /.applyhCMap        get exec
+      } }
+    >>
+    /Identity <<        % ttcmap ordering CIDMap only for specific and rare CJK TTF
+      /Registry (Unregistered)        % Thus Registry value is unpredictable. This
+      /Ordering (Identity)        % CIDFont can be used with Identity-H|V CMap
+      /CIDCounts [ 65535 ]
+      /H { 0 {
+        /Identity-H             _cjkv_type11_util /.applyhCMap        get exec % for ttcmap-order CIDMap
+      } }
+      /V { 0 {
+        /Identity-H             _cjkv_type11_util /.applyvCMap        get exec % for ttcmap-order and vertically-used CIDMap
+      } }
+    >>
+  .dicttomark def
+  
+  /.cjkv_ttencmap <<
+    /Identity              false
+    /Auto                  { 
+                             CJKV_DEBUG_TT11 { (+++ ttencmap->Auto exec\n) print flush } if
+                             _cjkv_type11_util /.cjkv_ttencoding get exec {
+                               dup
+                               _cjkv_type11_util /.cjkv_ttcharset get
+                               exch get
+                             CJKV_DEBUG_TT11 { (+++                exec\n) print flush } if
+                               exec
+                             CJKV_DEBUG_TT11 { (+++                      ok\n) print flush } if
+                               exch true
+                             } {
+                               false
+                             } ifelse
+                           } bind
+    /Adobe-CNS1            { /Adobe-CNS1   _cjkv_type11_util /.cjkv_ttencoding get exec }
+    /Adobe-GB1             { /Adobe-GB1    _cjkv_type11_util /.cjkv_ttencoding get exec }
+    /Adobe-Japan1          { /Adobe-Japan1 _cjkv_type11_util /.cjkv_ttencoding get exec }
+    /Adobe-Japan2          { /Adobe-Japan2 _cjkv_type11_util /.cjkv_ttencoding get exec }
+    /Adobe-Korea1          { /Adobe-Korea1 _cjkv_type11_util /.cjkv_ttencoding get exec }
+    /Adobe-CNS1-Big5       { /Adobe-CNS1   /Big5     true }
+    /Adobe-CNS1-Unicode    { /Adobe-CNS1   /Unicode  true }
+    /Adobe-GB1-PRC         { /Adobe-GB1    /PRC      true }
+    /Adobe-GB1-Unicode     { /Adobe-GB1    /Unicode  true }
+    /Adobe-Japan1-ShiftJIS { /Adobe-Japan1 /ShiftJIS true }
+    /Adobe-Japan1-Unicode  { /Adobe-Japan1 /Unicode  true }
+    /Adobe-Japan2-Unicode  { /Adobe-Japan2 /Unicode  true }
+    /Adobe-Korea1-Johab    { /Adobe-Korea1 /Johab    true }
+    /Adobe-Korea1-Unicode  { /Adobe-Korea1 /Unicode  true }
+    /Adobe-Korea1-Wansung  { /Adobe-Korea1 /Wansung  true }
+    /Identity-H            { /Identity     /H        true }
+    /Identity-V            { /Identity     /V        true }
+  >> def
+  
+  /.cjkv_ttcharset <<
+    /Unicode  { _cjkv_type11_util /.cjkv_detectos2 get exec }
+    /ShiftJIS /Adobe-Japan1
+    /Big5     /Adobe-CNS1
+    /PRC      /Adobe-GB1
+    /Wansung  /Adobe-Korea1
+    /Johab    /Adobe-Korea1
+  >> def
+  
+  /.cjkv_ttencdict <<
+    <00030001> /Unicode
+    <00030002> /ShiftJIS
+    <00030003> /Big5
+    <00030004> /PRC
+    <00030005> /Wansung
+    <00030006> /Johab
+  >> def
+  
+  /.cjkv_ttencoding {
+    CJKV_DEBUG_TT11 { (.cjkv_ttencoding\n) print flush } if
+    _cjkv_type11_util /.cjkv_ttencdict get _cjkv_ttcmap_tmp /cmapsub get 0 4 getinterval .knownget
+  } bind def
+  
+  /.cjkv_ttos2tab [
+    [ 1 20 bitshift /Adobe-CNS1   ]
+    [ 1 18 bitshift /Adobe-GB1    ]
+    [ 1 17 bitshift /Adobe-Japan1 ]
+    [ 1 19 bitshift /Adobe-Korea1 ]
+    [ 1 21 bitshift /Adobe-Korea1 ]
+  ] def
+  
+  /.cjkv_detectos2 {
+    CJKV_DEBUG_TT11 { (.cjkv_detectos2\n) print flush } if
+    /Identity        % default linear ordering to GID, Adobe Identity CIDs
+    os2ver 0 gt {
+      _cjkv_type11_util /.cjkv_ttos2tab get {
+        dup 0 get os2cp1 and 0 ne {
+          1 get exch
+        } if pop
+      } forall
+    } if
+  } bind def
+
+end readonly def
--- /dev/null	2006-06-13 09:28:26.680721750 +0100
+++ espgs-8.15.2/lib/cjkv/cjkvinit.ps	2006-06-13 13:53:00.000000000 +0100
@@ -0,0 +1,46 @@
+%!
+%
+% Developed by AXE,Inc., BBR Inc. and Turbolinux Inc.
+%   under the technical advice by suzuki toshiya (Hiroshima University)
+% For questions, please send mail to espgs8-cjk at printing-japan.org
+%
+% (C) Copyright 2006 Center of the International Cooperation for
+%     Computerization 
+%
+% This program is free software;  you can redistribute it and/or
+% modify it under the terms of the GNU General Public License as
+% published by the Free Software Foundation; either version 2 of
+% the License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+% See the GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software Foundation,
+% Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+%
+
+/CJKV_DEBUG dup where {
+  pop pop
+  currentdict
+  [
+    /CJKV_DEBUG_BASE
+    /CJKV_DEBUG_CIDCM
+    /CJKV_DEBUG_FNMAP
+    /CJKV_DEBUG_TTCF
+    /CJKV_DEBUG_TT11
+    /CJKV_DEBUG_TT42
+    /CJKV_DEBUG_GSUB
+%   /CJKV_DEBUG_OS2	% fragile
+  ] { true def } forall
+} if
+pop
+
+(cjkv/baseutil.ps) runlibfile
+(cjkv/tt42util.ps) runlibfile
+(cjkv/tt11util.ps) runlibfile
+(cjkv/cjkvttcf.ps) runlibfile
+(cjkv/cjkfnmap.ps) runlibfile
+(cjkv/cjkcidcm.ps) runlibfile
--- espgs-8.15.2/lib/gs_ttf.ps.cjkv	2006-06-13 13:52:41.000000000 +0100
+++ espgs-8.15.2/lib/gs_ttf.ps	2006-06-13 14:48:39.000000000 +0100
@@ -568,19 +568,12 @@
   (name) 1 index
   (OS/2) 1 index
   (post) { .readbigtable }
-  %(vhea) 1 index
-  systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
-  (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
-  } if
-  (mort) 1 index  % for WMode glyph substitution
+  (vhea) 1 index
 	% Big tables
   (glyf) { .readbigtable }
   (loca) 1 index
   (hmtx) 1 index
-  %(vmtx) 1 index
-  systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
-  (vmtx) 1 index  % better to be ignored for vertical writing in pdfwrite
-  } if
+  (vmtx) 1 index
 	% Tables only needed for embedding in PDF files
   (cvt ) { .readtable }
   (fpgm) 1 index


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ghostscript.spec	13 Jun 2006 12:52:15 -0000	1.118
+++ ghostscript.spec	13 Jun 2006 13:58:06 -0000	1.119
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 5
+Release: 6
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -24,6 +24,7 @@
 Patch8: ghostscript-use-external-freetype.patch
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
+Patch11: espgs-cjkv.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -106,6 +107,9 @@
 # Support reading a big cmap/post table from a TrueType font.
 %patch10 -p1 -b .big-cmap-post
 
+# CJKV patch from svn164:165.
+%patch11 -p1 -b .cjkv
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -260,8 +264,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
-* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-6
 - Undo svn sync.
+- Apply CJKV patch from svn164:165.
 
 * Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-5
 - Sync to svn165.



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:01:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:01:04 -0400
Subject: rpms/openobex/devel openobex.spec,1.15,1.16
Message-ID: <200606131401.k5DE14hE015244@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15217

Modified Files:
	openobex.spec 
Log Message:
- more build requirements


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openobex.spec	13 Jun 2006 13:51:51 -0000	1.15
+++ openobex.spec	13 Jun 2006 14:00:47 -0000	1.16
@@ -13,7 +13,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool
 ExcludeArch: s390 s390x
 
 %description



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:05:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:05:07 -0400
Subject: rpms/eel2/devel .cvsignore, 1.34, 1.35 eel2.spec, 1.48, 1.49 sources,
	1.34, 1.35
Message-ID: <200606131405.k5DE57Da015427@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15408

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	17 May 2006 14:33:06 -0000	1.34
+++ .cvsignore	13 Jun 2006 14:05:04 -0000	1.35
@@ -1 +1 @@
-eel-2.15.1.tar.bz2
+eel-2.15.2.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- eel2.spec	9 Jun 2006 03:39:59 -0000	1.48
+++ eel2.spec	13 Jun 2006 14:05:05 -0000	1.49
@@ -15,8 +15,8 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library
-Version: 	2.15.1
-Release: 	3
+Version: 	2.15.2
+Release: 	1
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-3
 - More missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	17 May 2006 14:33:06 -0000	1.34
+++ sources	13 Jun 2006 14:05:05 -0000	1.35
@@ -1 +1 @@
-b99df9fb1ebfe1cd0e66cb32296ea041  eel-2.15.1.tar.bz2
+84a66b6633b18d8d7ed884847db55d67  eel-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:05:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:05:19 -0400
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.4,
	1.5 gnome-python-desktop.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200606131405.k5DE5JvF015459@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15436

Modified Files:
	.cvsignore gnome-python-desktop.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 May 2006 20:08:10 -0000	1.4
+++ .cvsignore	13 Jun 2006 14:05:16 -0000	1.5
@@ -1 +1 @@
-gnome-python-desktop-2.15.2.tar.bz2
+gnome-python-desktop-2.15.3.tar.bz2


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-python-desktop.spec	31 May 2006 04:58:31 -0000	1.8
+++ gnome-python-desktop.spec	13 Jun 2006 14:05:17 -0000	1.9
@@ -7,13 +7,14 @@
 %define gtksourceview_version 1.1.90 
 %define libwnck_version 2.8.0
 %define libgtop_version 2.9.5
-%define nautilus_cd_burner_version 2.9.4
+%define nautilus_cd_burner_version 2.15.3
 %define gnome_media_version 2.12.0
 %define nautilus_version 2.12.0
+%define metacity_version 2.15.5
 
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
-Version: 2.15.2
+Version: 2.15.3
 Release: 1
 License: GPL/LGPL
 Group: Development/Languages
@@ -235,6 +236,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomedesktop
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Tue May 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 - Add subpackages gnome-python2-rsvg and gnome-python2-gnomedesktop


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 May 2006 20:08:10 -0000	1.4
+++ sources	13 Jun 2006 14:05:17 -0000	1.5
@@ -1 +1 @@
-e4fa976f2bff29e8333a5ff581673bfe  gnome-python-desktop-2.15.2.tar.bz2
+02274896fb2e1bd9ca57989fc02832d0  gnome-python-desktop-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:11:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:11:33 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.20,1.21
Message-ID: <200606131411.k5DEBXct015772@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15759

Modified Files:
	dvd+rw-tools.spec 
Log Message:
more build requirements


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dvd+rw-tools.spec	18 Apr 2006 14:54:02 -0000	1.20
+++ dvd+rw-tools.spec	13 Jun 2006 14:11:31 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	6.1
-Release: 	3
+Release: 	4
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -10,7 +10,7 @@
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
 BuildRoot:	%{_tmppath}/%{name}-root
-BuildRequires:	kernel-headers 
+BuildRequires:	kernel-headers m4
 
 %description
 Collection of tools to master DVD+RW/+R media. For further
@@ -52,6 +52,9 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Tue Jun 13 2006 Harald Hoyer <harald at redhat.com> - 6.1-4
+- more build requirements
+
 * Tue Apr 18 2006 Harald Hoyer <harald at redhat.com> - 6.1-2
 - compile with smaller buffer size
 - removed O_EXCL patch



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:15:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:15:10 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.32, 1.33 gnome-vfs2.spec, 1.110,
	1.111 sources, 1.32, 1.33
Message-ID: <200606131415.k5DEFAsJ026796@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26741

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	17 May 2006 16:19:19 -0000	1.32
+++ .cvsignore	13 Jun 2006 14:15:08 -0000	1.33
@@ -1 +1 @@
-gnome-vfs-2.15.1.tar.bz2
+gnome-vfs-2.15.2.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-vfs2.spec	29 May 2006 13:09:00 -0000	1.110
+++ gnome-vfs2.spec	13 Jun 2006 14:15:08 -0000	1.111
@@ -10,8 +10,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.15.1
-Release: 2
+Version: 2.15.2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -190,6 +190,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
 * Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 2.15.1-2
 - buildrequires gettext (#193392)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	17 May 2006 16:19:19 -0000	1.32
+++ sources	13 Jun 2006 14:15:08 -0000	1.33
@@ -1 +1 @@
-1c38e19011530fbc28b52d2cfcab8e62  gnome-vfs-2.15.1.tar.bz2
+a2bfa7c76d77d777589995634051b293  gnome-vfs-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:18:44 -0400
Subject: rpms/python/devel python.spec,1.77,1.78
Message-ID: <200606131418.k5DEIicR002597@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2531

Modified Files:
	python.spec 
Log Message:
Fixing date for changelog entry


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- python.spec	13 Jun 2006 13:47:45 -0000	1.77
+++ python.spec	13 Jun 2006 14:18:36 -0000	1.78
@@ -395,7 +395,7 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
-* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-9
+* Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-9
 - Fixed python-devel to be multilib friendly (bug #192747, #139911)
 
 * Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-8



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:22:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:22:45 -0400
Subject: rpms/gnome-keyring/devel .cvsignore, 1.16, 1.17 gnome-keyring.spec,
	1.23, 1.24 sources, 1.16, 1.17
Message-ID: <200606131422.k5DEMilN010375@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-keyring/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10315

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Mar 2006 13:06:55 -0000	1.16
+++ .cvsignore	13 Jun 2006 14:22:41 -0000	1.17
@@ -1,11 +1 @@
-gnome-keyring-0.3.3.tar.bz2
-gnome-keyring-0.4.0.tar.bz2
-gnome-keyring-0.4.1.tar.bz2
-gnome-keyring-0.4.2.tar.bz2
-gnome-keyring-0.4.3.tar.bz2
-gnome-keyring-0.4.4.tar.bz2
-gnome-keyring-0.4.5.tar.bz2
-gnome-keyring-0.4.6.tar.bz2
-gnome-keyring-0.4.7.tar.bz2
-gnome-keyring-0.4.8.tar.bz2
-gnome-keyring-0.4.9.tar.bz2
+gnome-keyring-0.5.1.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-keyring.spec	29 May 2006 12:24:16 -0000	1.23
+++ gnome-keyring.spec	13 Jun 2006 14:22:42 -0000	1.24
@@ -2,8 +2,8 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 0.4.9
-Release: 2
+Version: 0.5.1
+Release: 1
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.1-1
+- Update to 0.5.1
+
 * Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 0.4.9-2
 - buildrequire gettext (#193377)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Mar 2006 13:06:55 -0000	1.16
+++ sources	13 Jun 2006 14:22:42 -0000	1.17
@@ -1 +1 @@
-9a90820acf11a66e4c3dd9e163231071  gnome-keyring-0.4.9.tar.bz2
+63e3614d864198d7793b1dba9189e992  gnome-keyring-0.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:26:48 -0400
Subject: rpms/python/devel python.spec,1.78,1.79
Message-ID: <200606131426.k5DEQm3u011169@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11141

Modified Files:
	python.spec 
Log Message:
Stray SOURCE8 reference removed


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- python.spec	13 Jun 2006 14:18:36 -0000	1.78
+++ python.spec	13 Jun 2006 14:26:43 -0000	1.79
@@ -303,9 +303,6 @@
 install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
 %endif
 
-# Install pydoc wrapper (bug #193484)
-install -m 0755 %{SOURCE8} %{_bindir}/pydoc
-
 # Make python-devel multilib-ready (bug #192747, #139911)
 %define _pyconfig32_h pyconfig-32.h
 %define _pyconfig64_h pyconfig-64.h



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:32:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:32:41 -0400
Subject: rpms/cups/devel cups.spec,1.214,1.215
Message-ID: <200606131432.k5DEWfSW012331@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12269

Modified Files:
	cups.spec 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-10
- Remove old-style certs directory after upgrade (bug #194581).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- cups.spec	7 Jun 2006 16:04:02 -0000	1.214
+++ cups.spec	13 Jun 2006 14:32:37 -0000	1.215
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -285,6 +285,9 @@
 %postun
 if [ "$1" -ge "1" ]; then
 	/sbin/service cups condrestart > /dev/null 2>&1
+	# Remove old-style certs directory; new-style is /var/run
+	# (see bug #194581 for why this is necessary).
+	rm -rf /etc/cups/certs
 fi
 exit 0
 
@@ -389,6 +392,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-10
+- Remove old-style certs directory after upgrade (bug #194581).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-9
 - Prevent 'too many open files' error (STR #1736, bug #194368).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:34:41 -0400
Subject: rpms/python/devel python.spec,1.79,1.80
Message-ID: <200606131434.k5DEYfBr012658@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12639

Modified Files:
	python.spec 
Log Message:
Fixing typo in pyconfig macros


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- python.spec	13 Jun 2006 14:26:43 -0000	1.79
+++ python.spec	13 Jun 2006 14:34:38 -0000	1.80
@@ -308,9 +308,9 @@
 %define _pyconfig64_h pyconfig-64.h
 
 %if %{_lib} == lib64
-%define _pyconfig_h %{_pyconfig64.h}
+%define _pyconfig_h %{_pyconfig64_h}
 %else
-%define _pyconfig_h %{_pyconfig32.h}
+%define _pyconfig_h %{_pyconfig32_h}
 %endif
 mv $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h \
    $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/%{_pyconfig_h}



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:37:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:37:29 -0400
Subject: rpms/cups/FC-5 cups.spec,1.190,1.191
Message-ID: <200606131437.k5DEbSmT013225@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13180

Modified Files:
	cups.spec 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com>
- Remove old-style certs directory after upgrade (bug #194581).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- cups.spec	7 Jun 2006 16:02:26 -0000	1.190
+++ cups.spec	13 Jun 2006 14:37:24 -0000	1.191
@@ -309,6 +309,9 @@
 %postun
 if [ "$1" -ge "1" ]; then
 	/sbin/service cups condrestart > /dev/null 2>&1
+	# Remove old-style certs directory; new-style is /var/run
+	# (see bug #194581 for why this is necessary).
+	rm -rf /etc/cups/certs
 fi
 exit 0
 
@@ -413,6 +416,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com>
+- Remove old-style certs directory after upgrade (bug #194581).
+
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.7
 - Prevent 'too many open files' error (STR #1736, bug #194368).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:38:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:38:22 -0400
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.24,1.25
Message-ID: <200606131438.k5DEcM6M013373@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-keyring/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13312

Modified Files:
	gnome-keyring.spec 
Log Message:
add missing BuildRequires



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-keyring.spec	13 Jun 2006 14:22:42 -0000	1.24
+++ gnome-keyring.spec	13 Jun 2006 14:38:17 -0000	1.25
@@ -12,6 +12,7 @@
 Requires: gtk2 >= %{gtk2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 
 %description
 gnome-keyring manages passwords and other types of secrets



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:50:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:50:28 -0400
Subject: rpms/cups/FC-5 cups.spec,1.191,1.192
Message-ID: <200606131450.k5DEoSw4030531@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30474

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-1.8


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- cups.spec	13 Jun 2006 14:37:24 -0000	1.191
+++ cups.spec	13 Jun 2006 14:50:25 -0000	1.192
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.7
+Release: 1.8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -416,7 +416,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.8
 - Remove old-style certs directory after upgrade (bug #194581).
 
 * Wed Jun  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.7



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:50:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:50:37 -0400
Subject: rpms/nautilus/devel nautilus-2.15.2-format.patch, NONE,
	1.1 .cvsignore, 1.39, 1.40 nautilus.spec, 1.106, 1.107 sources,
	1.42, 1.43
Message-ID: <200606131450.k5DEobPG030608@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30561

Modified Files:
	.cvsignore nautilus.spec sources 
Added Files:
	nautilus-2.15.2-format.patch 
Log Message:
update patches


nautilus-2.15.2-format.patch:
 fm-directory-view.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE nautilus-2.15.2-format.patch ---
--- nautilus-2.15.2/src/file-manager/fm-directory-view.c.format	2006-06-13 10:35:04.000000000 -0400
+++ nautilus-2.15.2/src/file-manager/fm-directory-view.c	2006-06-13 10:49:07.000000000 -0400
@@ -6315,6 +6315,8 @@
 	GList *selection, *l;
 	GnomeVFSDrive *drive;
 	FMDirectoryView *view;
+        char *device_path;
+        char *cmdline;
 
         view = FM_DIRECTORY_VIEW (data);
 	
@@ -6324,9 +6326,18 @@
 
 		if (nautilus_file_has_drive (file)) {
 			drive = nautilus_file_get_drive (file);
+                        device_path = gnome_vfs_drive_get_device_path (drive);
+
 			if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY) {
-				g_spawn_command_line_async ("gfloppy", NULL);
+                                cmdline = g_strconcat ("gfloppy ", device_path, NULL);
+
 			}
+                        else {
+                               cmdline = g_strconcat ("userformat ", device_path, NULL);
+                        }
+                        g_spawn_command_line_async (cmdline, NULL);
+                        g_free (cmdline);
+                        g_free (device_path);
 		}
 	}	
 	nautilus_file_list_free (selection);
@@ -7188,17 +7199,18 @@
 	} else if (nautilus_file_has_drive (file)) {
 		drive = nautilus_file_get_drive (file);
 		*show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive));
+		if ((gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
+		     g_find_program_in_path ("gfloppy")) ||
+		    g_find_program_in_path ("userformat")) {
+			*show_format = TRUE;
+		}
 		if (gnome_vfs_drive_is_mounted (drive)) {
 			*show_unmount = TRUE;
+			*show_format = FALSE;
 		} else {
 			*show_mount = TRUE;
 		}
 
-		if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
-		    !gnome_vfs_drive_is_mounted (drive) &&
-		    g_find_program_in_path ("gfloppy")) {
-			*show_format = TRUE;
-		}
 	} else if (nautilus_file_is_nautilus_link (file)) {
 		uri = nautilus_file_get_activation_uri (file);
 		if (uri != NULL &&


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	17 May 2006 14:41:13 -0000	1.39
+++ .cvsignore	13 Jun 2006 14:50:34 -0000	1.40
@@ -1 +1 @@
-nautilus-2.15.1.tar.bz2
+nautilus-2.15.2.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- nautilus.spec	21 May 2006 04:39:58 -0000	1.106
+++ nautilus.spec	13 Jun 2006 14:50:34 -0000	1.107
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.1
-Release:	2
+Version: 	2.15.2
+Release:	1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -69,6 +69,8 @@
 BuildRequires:  gettext
 %ifnarch  s390 s390x ppc64
 BuildRequires:  libbeagle-devel
+%else
+%define disable_beagle --disable-beagle
 %endif
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
@@ -82,7 +84,7 @@
 
 # Some changes to default config
 Patch1:         nautilus-2.5.7-rhconfig.patch
-Patch2:         nautilus-2.13-format.patch
+Patch2:         nautilus-2.15.2-format.patch
 Patch3:		background-no-delay.patch
 
 %description
@@ -102,7 +104,7 @@
 %build
 
 libtoolize --force --copy
-CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE" %configure --disable-more-warnings --disable-update-mimedb
+CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE" %configure --disable-more-warnings --disable-update-mimedb %{disable_beagle}
 
 export tagname=CC
 LANG=en_US make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
@@ -176,6 +178,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.1
+
 * Sun May 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
 - Add missing BuildRequires (#129184)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	17 May 2006 14:41:13 -0000	1.42
+++ sources	13 Jun 2006 14:50:34 -0000	1.43
@@ -1 +1 @@
-57d5dea7758205258d85afc30cb3afaf  nautilus-2.15.1.tar.bz2
+1c175ed790330aa48bdb62de8ac98343  nautilus-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:53:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:53:03 -0400
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.25,1.26
Message-ID: <200606131453.k5DEr3nA031438@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-keyring/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31382

Modified Files:
	gnome-keyring.spec 
Log Message:
Update file lists



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-keyring.spec	13 Jun 2006 14:38:17 -0000	1.25
+++ gnome-keyring.spec	13 Jun 2006 14:53:00 -0000	1.26
@@ -21,7 +21,7 @@
 with the keyring.
 
 %package devel
-Summary: The files needed for gnome-keyring application development.
+Summary: The files needed for gnome-keyring application development
 Group: Development/Libraries
 Requires: %name = %{PACKAGE_VERSION}
 Requires: glib2-devel
@@ -65,6 +65,7 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
+%{_datadir}/gtk-doc/html/gnome-keyring/
 
 %changelog
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.1-1



From fedora-cvs-commits at redhat.com  Tue Jun 13 14:58:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 10:58:54 -0400
Subject: rpms/numactl/devel .cvsignore, 1.3, 1.4 numactl.spec, 1.29,
	1.30 sources, 1.2, 1.3
Message-ID: <200606131458.k5DEwrcM000864@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv834

Modified Files:
	.cvsignore numactl.spec sources 
Log Message:
rebasing to numactl-0.9.8 for FC-6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jul 2005 00:33:50 -0000	1.3
+++ .cvsignore	13 Jun 2006 14:58:47 -0000	1.4
@@ -1,2 +1,3 @@
 numactl-0.6.4.tar.gz
 numactl-0.6.4
+numactl-0.9.8.tar.gz


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- numactl.spec	27 Apr 2006 14:58:35 -0000	1.29
+++ numactl.spec	13 Jun 2006 14:58:47 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		numactl
 Summary:	library for tuning for Non Uniform Memory Access machines
-Version:	0.6.4
+Version:	0.9.8
 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
 License:	LGPL/GPL
 Group: 		System Environment/Base
@@ -24,23 +24,6 @@
 %prep
 %setup -q -c -a 0
 
-#
-# reduce the number of relocations and PLT entries
-#
-%patch1
-
-# Support ppc
-%patch2
-
-# Fix breakage with aliases to tentatitive common symbols.
-%patch3
-
-# Fix 64 bit overruns
-%patch4
-
-# Fix cpu mask computation for > 7 nodes
-%patch5
-
 %build
 cd numactl-%{version}
 make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC"
@@ -50,8 +33,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man2
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 
 cd numactl-%{version}
@@ -74,11 +57,15 @@
 %{_bindir}/numademo
 %{_bindir}/numastat
 %{_bindir}/memhog
-%{_mandir}/man2/*.2*
+%{_bindir}/migratepages
 %{_mandir}/man3/*.3*
+%{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Jun 13 2006 Neil Horman <nhorman at redhat.com>
+- Rebased numactl to version 0.9.8 for FC6/RHEL5
+
 * Wed Apr 26 2006 Neil Horman <nhorman at redhat.com>
 - Added patches for 64 bit overflows and cpu mask problem
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 09:20:04 -0000	1.2
+++ sources	13 Jun 2006 14:58:47 -0000	1.3
@@ -1 +1,2 @@
 4d79d74c69637e1d2a5d64dfc2662fab  numactl-0.6.4.tar.gz
+ebc1ed785733f5af9d4139cef32e1192  numactl-0.9.8.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:06:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:06:04 -0400
Subject: rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.12,1.13
Message-ID: <200606131506.k5DF64TP002256@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2211

Modified Files:
	xorg-x11-drv-mouse.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-mouse.spec	17 May 2006 17:47:00 -0000	1.12
+++ xorg-x11-drv-mouse.spec	13 Jun 2006 15:06:01 -0000	1.13
@@ -7,17 +7,17 @@
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
 Version:   1.1.0
-Release:   2
+Release:   3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.1.0
 BuildRequires: xorg-x11-proto-devel
 
 Requires: xorg-x11-server-Xorg >= 1.0.99.901
@@ -55,6 +55,9 @@
 %{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
+- Build on ppc64
+
 * Wed May 17 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-2
 - Add missing build requires (#192047).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:07:16 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.111,1.112
Message-ID: <200606131507.k5DF75uX002531@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2472

Modified Files:
	gnome-vfs2.spec 
Log Message:
Add more build reqs



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gnome-vfs2.spec	13 Jun 2006 14:15:08 -0000	1.111
+++ gnome-vfs2.spec	13 Jun 2006 15:07:02 -0000	1.112
@@ -42,6 +42,7 @@
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
+BuildRequires: libacl-devel
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:07:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:07:20 -0400
Subject: rpms/xorg-x11-drv-vesa/devel xorg-x11-drv-vesa.spec,1.10,1.11
Message-ID: <200606131507.k5DF7Jpp002554@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2448

Modified Files:
	xorg-x11-drv-vesa.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-vesa.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/xorg-x11-drv-vesa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-vesa.spec	30 May 2006 17:41:07 -0000	1.10
+++ xorg-x11-drv-vesa.spec	13 Jun 2006 15:07:16 -0000	1.11
@@ -7,17 +7,17 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.2.0
-Release:   1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.1.0
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Tue Jun 13 2005 Adam Jackson <ajackson at redhat.com> 1.2.0-2
+- Build on ppc64
+
 * Tue May 30 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1
 - Update to 1.2.0 from 7.1.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:07:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:07:57 -0400
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.9,1.10
Message-ID: <200606131507.k5DF7vmb002650@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2602

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-void.spec	10 Apr 2006 03:28:08 -0000	1.9
+++ xorg-x11-drv-void.spec	13 Jun 2006 15:07:54 -0000	1.10
@@ -7,17 +7,17 @@
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
 Version: 1.1.0
-Release: 1
+Release: 2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.1.0
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
@@ -53,6 +53,9 @@
 %{_mandir}/man4/void.4*
 
 %changelog
+* Tue Jun 13 2005 Adam Jackson <ajackson at redhat.com> 1.1.0-2
+- Build on ppc64
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:08:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:08:38 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel xorg-x11-drv-keyboard.spec, 1.9,
	1.10
Message-ID: <200606131508.k5DF8cwa002812@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2760

Modified Files:
	xorg-x11-drv-keyboard.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-keyboard.spec	10 Apr 2006 03:19:55 -0000	1.9
+++ xorg-x11-drv-keyboard.spec	13 Jun 2006 15:08:34 -0000	1.10
@@ -7,17 +7,17 @@
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
 Version: 1.1.0
-Release: 1
+Release: 2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.1.0
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
@@ -54,6 +54,9 @@
 %{_mandir}/man4/keyboard.4*
 
 %changelog
+* Tue Jun 13 2005 Adam Jackson <ajackson at redhat.com> 1.1.0-2
+- Build on ppc64
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:12:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:12:44 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.33,
	1.34 nautilus-cd-burner.spec, 1.58, 1.59 sources, 1.33, 1.34
Message-ID: <200606131512.k5DFCi5M003436@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3395

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	17 May 2006 14:48:06 -0000	1.33
+++ .cvsignore	13 Jun 2006 15:12:41 -0000	1.34
@@ -1 +1 @@
-nautilus-cd-burner-2.15.2.tar.bz2
+nautilus-cd-burner-2.15.3.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- nautilus-cd-burner.spec	29 May 2006 13:23:58 -0000	1.58
+++ nautilus-cd-burner.spec	13 Jun 2006 15:12:41 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.15.2
-Release: 3
+Version: 2.15.3
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 2.15.2-3
 - Fix schema name (#193325)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	17 May 2006 14:48:06 -0000	1.33
+++ sources	13 Jun 2006 15:12:41 -0000	1.34
@@ -1 +1 @@
-d7138dd1668b3d3a6fcbd2fc7ce9b4c7  nautilus-cd-burner-2.15.2.tar.bz2
+9c508a19359e510ed48793e81599c168  nautilus-cd-burner-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:13:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:13:17 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.59,1.60
Message-ID: <200606131513.k5DFDHLk003570@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3525

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
Bump hal req



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- nautilus-cd-burner.spec	13 Jun 2006 15:12:41 -0000	1.59
+++ nautilus-cd-burner.spec	13 Jun 2006 15:13:14 -0000	1.60
@@ -20,7 +20,7 @@
 BuildRequires: libglade2-devel
 BuildRequires: eel2-devel
 BuildRequires: gettext
-BuildRequires: hal-devel >= 0.5.4
+BuildRequires: hal-devel >= 0.5.7
 # Fix hal-devel not requiring dbus-devel for the moment
 BuildRequires: dbus-devel >= 0.60
 # need nautilus-extensions



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:14:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:14:45 -0400
Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.12,1.13
Message-ID: <200606131514.k5DFEjhk003888@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3843

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
typo



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-evdev.spec	5 Jun 2006 19:32:04 -0000	1.12
+++ xorg-x11-drv-evdev.spec	13 Jun 2006 15:14:42 -0000	1.13
@@ -7,14 +7,14 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.1.2
-Release: 1
+Release: 2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.1.0
@@ -55,6 +55,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.2-2
+- Build on ppc64
+
 * Mon Jun 05 2006 Adam Jackson <ajackson at redhat.com> 1.1.2-1
 - Update to 1.1.2 + CVS fixes.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:16:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:16:09 -0400
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.10,1.11
Message-ID: <200606131516.k5DFG98B004170@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4097

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-void.spec	13 Jun 2006 15:07:54 -0000	1.10
+++ xorg-x11-drv-void.spec	13 Jun 2006 15:16:07 -0000	1.11
@@ -53,7 +53,7 @@
 %{_mandir}/man4/void.4*
 
 %changelog
-* Tue Jun 13 2005 Adam Jackson <ajackson at redhat.com> 1.1.0-2
+* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Build on ppc64
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:17:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:17:00 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel xorg-x11-drv-keyboard.spec, 1.10,
	1.11
Message-ID: <200606131517.k5DFH0Cn008169@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7178

Modified Files:
	xorg-x11-drv-keyboard.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-keyboard.spec	13 Jun 2006 15:08:34 -0000	1.10
+++ xorg-x11-drv-keyboard.spec	13 Jun 2006 15:16:57 -0000	1.11
@@ -54,7 +54,7 @@
 %{_mandir}/man4/keyboard.4*
 
 %changelog
-* Tue Jun 13 2005 Adam Jackson <ajackson at redhat.com> 1.1.0-2
+* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Build on ppc64
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:17:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:17:57 -0400
Subject: rpms/xorg-x11-drv-vesa/devel xorg-x11-drv-vesa.spec,1.11,1.12
Message-ID: <200606131517.k5DFHv5Z011838@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11402

Modified Files:
	xorg-x11-drv-vesa.spec 
Log Message:
- Build on ppc64



Index: xorg-x11-drv-vesa.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/xorg-x11-drv-vesa.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-vesa.spec	13 Jun 2006 15:07:16 -0000	1.11
+++ xorg-x11-drv-vesa.spec	13 Jun 2006 15:17:54 -0000	1.12
@@ -52,7 +52,7 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
-* Tue Jun 13 2005 Adam Jackson <ajackson at redhat.com> 1.2.0-2
+* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2
 - Build on ppc64
 
 * Tue May 30 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:19:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:19:40 -0400
Subject: rpms/totem/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 totem.spec, 1.59, 1.60
Message-ID: <200606131519.k5DFJdnd019786@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19748

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
require hal



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 May 2006 18:52:20 -0000	1.22
+++ .cvsignore	13 Jun 2006 15:19:37 -0000	1.23
@@ -1 +1 @@
-totem-1.5.1.tar.bz2
+totem-1.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 May 2006 18:52:20 -0000	1.22
+++ sources	13 Jun 2006 15:19:37 -0000	1.23
@@ -1 +1 @@
-a3fbceb3648dfe97e5de4479b9bb12cc  totem-1.5.1.tar.bz2
+72bbc885374c6322c0a7106e96dc75c4  totem-1.5.2.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- totem.spec	17 May 2006 19:17:09 -0000	1.59
+++ totem.spec	13 Jun 2006 15:19:37 -0000	1.60
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 1.5.1
+Version: 1.5.2
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -37,6 +37,7 @@
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
 BuildRequires: dbus-devel
+BuildRequires: hal-devel
 
 Obsoletes: nautilus-media
 
@@ -54,7 +55,7 @@
 for totem allows totem to be embeded into a web browser. 
 
 %package devel
-Summary: Libraries/include files for Totem.
+Summary: Libraries/include files for Totem
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: gnome-vfs2-devel
@@ -149,6 +150,10 @@
 %{_libdir}/*so
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.2-1
+- Update to 1.5.2
+- BuildRequire hal
+
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.1-1
 - Update to 1.5.1
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:21:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:21:49 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.60,1.61
Message-ID: <200606131521.k5DFLnEY020390@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20341

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
drop old patch



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- nautilus-cd-burner.spec	13 Jun 2006 15:13:14 -0000	1.60
+++ nautilus-cd-burner.spec	13 Jun 2006 15:21:46 -0000	1.61
@@ -27,14 +27,12 @@
 BuildRequires: nautilus >= 2.5.4
 BuildRequires: gnome-mount >= 0.4
 
-Patch0: nautilus-cd-burner-2.11.4-c++.patch
-
 %description
 An easy to use CD burning package, well integrated with
 Nautilus and the Gnome desktop.
 
 %package devel
-Summary: The files needed for nautilus-cd-burner application development.
+Summary: The files needed for nautilus-cd-burner application development
 Group: Development/Libraries
 Requires: %name = %{PACKAGE_VERSION}
 Requires: gtk2-devel
@@ -46,7 +44,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .c++
 
 %build
 %configure --enable-hal --enable-gnome-mount



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:31:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:31:49 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.21,
	1.22 gnome-screensaver.spec, 1.79, 1.80 sources, 1.24, 1.25
Message-ID: <200606131531.k5DFVngY022894@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22858

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	17 May 2006 18:07:58 -0000	1.21
+++ .cvsignore	13 Jun 2006 15:31:47 -0000	1.22
@@ -12,3 +12,4 @@
 gnome-screensaver-2.15.1.tar.bz2
 lock-dialog-fedoralogo-floaters.tar.gz
 gnome-screensaver-2.15.2.tar.bz2
+gnome-screensaver-2.15.3.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gnome-screensaver.spec	10 Jun 2006 03:26:33 -0000	1.79
+++ gnome-screensaver.spec	13 Jun 2006 15:31:47 -0000	1.80
@@ -11,8 +11,8 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.15.2
-Release: 5 
+Version: 2.15.3
+Release: 1 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -160,6 +160,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
+- Update to 2.15.3
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-5
 - Add missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	5 Jun 2006 19:40:14 -0000	1.24
+++ sources	13 Jun 2006 15:31:47 -0000	1.25
@@ -1,2 +1,2 @@
-52bb4698f2362ffd0b92f725ae9a890d  gnome-screensaver-2.15.2.tar.bz2
 b8d23b049231d57dec24cad4cfdeee5d  lock-dialog-fedoralogo-floaters.tar.gz
+d2e0550ef59b8701e08d45955330404f  gnome-screensaver-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:38:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:38:44 -0400
Subject: rpms/python/FC-5 python-2.4-gen-assert.patch, NONE,
	1.1 python-2.4-webbrowser.patch, NONE, 1.1 python.spec, 1.67, 1.68
Message-ID: <200606131538.k5DFciXv023702@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23639

Modified Files:
	python.spec 
Added Files:
	python-2.4-gen-assert.patch python-2.4-webbrowser.patch 
Log Message:
Incorporating bug fixes from rawhide python

python-2.4-gen-assert.patch:
 genobject.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.4-gen-assert.patch ---
--- python/trunk/Objects/genobject.c    2005/08/02 00:46:46 39239
+++ python/trunk/Objects/genobject.c    2005/08/13 03:29:00 39279
@@ -82,7 +82,7 @@
	/* Don't keep the reference to f_back any longer than necessary.  It
	 * may keep a chain of frames alive or it could create a reference
	 * cycle. */
-	assert(f->f_back != NULL);
+	assert(f->f_back == tstate->frame);
	Py_CLEAR(f->f_back);

	/* If the generator just returned (as opposed to yielding), signal

python-2.4-webbrowser.patch:
 webbrowser.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE python-2.4-webbrowser.patch ---
--- Lib/webbrowser.py~	2005-09-15 10:29:38.000000000 +0300
+++ Lib/webbrowser.py	2005-11-17 19:48:20.000000000 +0200
@@ -277,12 +277,17 @@
 
     # X browsers have more in the way of options
     if os.environ.get("DISPLAY"):
-        _tryorder = ["galeon", "skipstone",
+        _tryorder = ["htmlview", "firefox", "galeon", "skipstone",
                      "mozilla-firefox", "mozilla-firebird", "mozilla", "netscape",
                      "kfm", "grail"] + _tryorder
 
+        # Try htmlview (in order to honor user config) before anything else.
+        if _iscommand("htmlview"):
+            register("htmlview", None, GenericBrowser(
+                "htmlview '%s' >/dev/null &"))
+
         # First, the Netscape series
-        for browser in ("mozilla-firefox", "mozilla-firebird",
+        for browser in ("firefox", "mozilla-firefox", "mozilla-firebird",
                         "mozilla", "netscape"):
             if _iscommand(browser):
                 register(browser, None, Netscape(browser))


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-5/python.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- python.spec	5 Jun 2006 14:47:43 -0000	1.67
+++ python.spec	13 Jun 2006 15:38:26 -0000	1.68
@@ -15,11 +15,12 @@
 %define jp_codecs 1.4.11
 %define tools_dir %{_libdir}/python%{pybasever}/Tools
 %define demo_dir %{_libdir}/python%{pybasever}/Demo
+%define doc_tools_dir %{_libdir}/python%{pybasever}/Doc/tools
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 4.FC5
+Release: 8.FC5
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -40,6 +41,8 @@
 Patch13: python-2.4-distutils-bdist-rpm.patch
 Patch14: python-2.3.4-pydocnodoc.patch
 Patch15: python-2.4.1-canonicalize.patch
+Patch16: python-2.4-gen-assert.patch
+Patch17: python-2.4-webbrowser.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -145,6 +148,8 @@
 %patch13 -p1 -b .bdist-rpm
 %patch14 -p1 -b .no-doc
 %patch15 -p1 -b .canonicalize
+%patch16 -p2 -b .gen-assert
+%patch17 -p0 -b .web-browser
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -244,6 +249,10 @@
 install Tools/README $RPM_BUILD_ROOT%{tools_dir}/
 install Tools/scripts/*py $RPM_BUILD_ROOT%{tools_dir}/scripts/
 
+# Documentation tools
+install -m755 -d $RPM_BUILD_ROOT%{doc_tools_dir}
+install -m755 Doc/tools/mkhowto $RPM_BUILD_ROOT%{doc_tools_dir}
+
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}
 cp -ar Demo/* $RPM_BUILD_ROOT%{demo_dir}
@@ -300,6 +309,7 @@
 %files -f dynfiles
 %defattr(-, root, root)
 %doc LICENSE README
+%{_bindir}/pydoc*
 %{_bindir}/python*
 %{_mandir}/*/*
 %{_libdir}/libpython%{pybasever}.so*
@@ -349,9 +359,9 @@
 %{_bindir}/pynche*
 %{_bindir}/pygettext*.py*
 %{_bindir}/msgfmt*.py*
-%{_bindir}/pydoc*
 %{tools_dir}
 %{demo_dir}
+%{_libdir}/python%{pybasever}/Doc
 
 %files -n %{tkinter}
 %defattr(-,root,root,755)
@@ -359,6 +369,20 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-8
+- Only copying mkhowto from the Docs - we don't need perl dependencies from
+  python-tools.
+
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-7
+- Fixed bug #121198 (webbrowser.py should use the user's preferences first)
+
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-6
+- Fixed bug #192592 (too aggressive assertion fails) - SF#1257960
+- Fixed bug #167468 (Doc/tools not included) - added in the python-tools package
+
+* Thu Jun  8 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-5
+- Fixed bug #193484 (added pydoc in the main package)
+
 * Mon Jun  5 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-4
 - Added dist in the release
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:38:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:38:28 -0400
Subject: rpms/python/FC-4 python-2.4-gen-assert.patch, NONE,
	1.1 python-2.4-webbrowser.patch, NONE,
	1.1 python-2.4.1-canonicalize.patch, NONE,
	1.1 python-2.4.3-config.patch, NONE, 1.1 modulator, 1.3,
	1.4 pynche, 1.3, 1.4 python-2.4.1-lib64.patch, 1.1,
	1.2 python.spec, 1.42, 1.43 sources, 1.12,
	1.13 python-2.4.1-config.patch, 1.1, NONE
Message-ID: <200606131538.k5DFcSlA023676@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23640

Modified Files:
	modulator pynche python-2.4.1-lib64.patch python.spec sources 
Added Files:
	python-2.4-gen-assert.patch python-2.4-webbrowser.patch 
	python-2.4.1-canonicalize.patch python-2.4.3-config.patch 
Removed Files:
	python-2.4.1-config.patch 
Log Message:
Incorporating bug fixes from rawhide python

python-2.4-gen-assert.patch:
 genobject.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.4-gen-assert.patch ---
--- python/trunk/Objects/genobject.c    2005/08/02 00:46:46 39239
+++ python/trunk/Objects/genobject.c    2005/08/13 03:29:00 39279
@@ -82,7 +82,7 @@
	/* Don't keep the reference to f_back any longer than necessary.  It
	 * may keep a chain of frames alive or it could create a reference
	 * cycle. */
-	assert(f->f_back != NULL);
+	assert(f->f_back == tstate->frame);
	Py_CLEAR(f->f_back);

	/* If the generator just returned (as opposed to yielding), signal

python-2.4-webbrowser.patch:
 webbrowser.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE python-2.4-webbrowser.patch ---
--- Lib/webbrowser.py~	2005-09-15 10:29:38.000000000 +0300
+++ Lib/webbrowser.py	2005-11-17 19:48:20.000000000 +0200
@@ -277,12 +277,17 @@
 
     # X browsers have more in the way of options
     if os.environ.get("DISPLAY"):
-        _tryorder = ["galeon", "skipstone",
+        _tryorder = ["htmlview", "firefox", "galeon", "skipstone",
                      "mozilla-firefox", "mozilla-firebird", "mozilla", "netscape",
                      "kfm", "grail"] + _tryorder
 
+        # Try htmlview (in order to honor user config) before anything else.
+        if _iscommand("htmlview"):
+            register("htmlview", None, GenericBrowser(
+                "htmlview '%s' >/dev/null &"))
+
         # First, the Netscape series
-        for browser in ("mozilla-firefox", "mozilla-firebird",
+        for browser in ("firefox", "mozilla-firefox", "mozilla-firebird",
                         "mozilla", "netscape"):
             if _iscommand(browser):
                 register(browser, None, Netscape(browser))

python-2.4.1-canonicalize.patch:
 Python/sysmodule.c |   65 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in       |    4 +--
 pyconfig.h.in      |    3 ++
 3 files changed, 70 insertions(+), 2 deletions(-)

--- NEW FILE python-2.4.1-canonicalize.patch ---
--- Python-2.4.1/pyconfig.h.in.canonicalize	2004-10-13 11:30:55.000000000 -0400
+++ Python-2.4.1/pyconfig.h.in	2005-10-06 14:04:06.000000000 -0400
@@ -58,6 +58,9 @@
 /* Define if pthread_sigmask() does not work on your system. */
 #undef HAVE_BROKEN_PTHREAD_SIGMASK
 
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
 /* Define to 1 if you have the `chown' function. */
 #undef HAVE_CHOWN
 
--- Python-2.4.1/Python/sysmodule.c.canonicalize	2005-01-27 13:58:30.000000000 -0500
+++ Python-2.4.1/Python/sysmodule.c	2005-10-06 14:56:37.000000000 -0400
@@ -1168,11 +1168,13 @@
 void
 PySys_SetArgv(int argc, char **argv)
 {
+#ifndef HAVE_CANONICALIZE_FILE_NAME
 #if defined(HAVE_REALPATH)
 	char fullpath[MAXPATHLEN];
 #elif defined(MS_WINDOWS)
 	char fullpath[MAX_PATH];
 #endif
+#endif
 	PyObject *av = makeargvobject(argc, argv);
 	PyObject *path = PySys_GetObject("path");
 	if (av == NULL)
@@ -1184,6 +1186,64 @@
 		char *p = NULL;
 		int n = 0;
 		PyObject *a;
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+		char *link = NULL, *argv0copy = NULL;
+                
+                if (argc > 0 && argv0 != NULL) {
+			
+			link = canonicalize_file_name(argv0);
+			if (link == NULL) {
+				link = strdup(argv0);
+				if (!link)
+					Py_FatalError("no mem for sys.argv");
+			}
+		}
+		if (link) {
+			if (link[0] == SEP) /* Link to absolute path */
+				argv0 = link;
+			else if (strchr(link, SEP) == NULL) {
+				/* Link without path */
+				/* strdup argv0 so we can free it 
+				   unconditionally */
+				argv0 = strdup(argv0);
+				if (!argv0)
+					Py_FatalError("no mem for sys.argv");
+				free(link);
+			} else {
+				/* Must join(dirname(argv0), link) */
+				char *q = strrchr(argv0, SEP);
+				if (q == NULL) /* argv0 without path */
+					argv0 = link;
+				else {
+					/* Must make a copy */
+					argv0copy = calloc(
+                                                strlen(link) + strlen(q) +1,
+                                                sizeof (char));
+					if (!argv0copy)
+						Py_FatalError("no mem for sys.argv");
+					strcpy(argv0copy, argv0);
+					q = strrchr(argv0copy, SEP);
+					strcpy(argv0copy+1, link);
+					argv0 = argv0copy;
+					p = NULL;
+					free(link);
+				}
+			}
+		}
+		if (argc > 0 && argv0 != NULL) {
+			char *q;
+			p = strrchr(argv0, SEP);
+			/* Test for alternate separator */
+			q = strrchr(p ? p : argv0, '/');
+			if (q != NULL)
+				p = q;
+			if (p != NULL) {
+				n = p + 1 - argv0;
+				if (n > 1 && p[-1] != ':')
+					n--; /* Drop trailing separator */
+			}
+		}
+#else /* ! HAVE_CANONICALIZE_FILE_NAME */
 #ifdef HAVE_READLINK
 		char link[MAXPATHLEN+1];
 		char argv0copy[2*MAXPATHLEN+1];
@@ -1256,9 +1316,14 @@
 #endif /* Unix */
 		}
 #endif /* All others */
+#endif /* ! HAVE_CANONICALIZE_FILE_NAME */
 		a = PyString_FromStringAndSize(argv0, n);
 		if (a == NULL)
 			Py_FatalError("no mem for sys.path insertion");
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+		if (argc > 0 && argv0 != NULL)
+			free(argv0);
+#endif /* HAVE_CANONICALIZE_FILE_NAME */
 		if (PyList_Insert(path, 0, a) < 0)
 			Py_FatalError("sys.path.insert(0) failed");
 		Py_DECREF(a);
--- Python-2.4.1/configure.in.canonicalize	2005-03-28 18:23:34.000000000 -0500
+++ Python-2.4.1/configure.in	2005-10-06 14:04:06.000000000 -0400
@@ -2096,8 +2096,8 @@
 AC_MSG_RESULT(MACHDEP_OBJS)
 
 # checks for library functions
-AC_CHECK_FUNCS(alarm bind_textdomain_codeset chown clock confstr ctermid \
- execv fork fpathconf ftime ftruncate \
+AC_CHECK_FUNCS(alarm bind_textdomain_codeset canonicalize_file_name chown \
+ clock confstr ctermid execv fork fpathconf ftime ftruncate \
  gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
  getpriority getpwent getsid getwd \
  kill killpg lchown lstat mkfifo mknod mktime \

python-2.4.3-config.patch:
 Setup.dist |  123 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 61 insertions(+), 62 deletions(-)

--- NEW FILE python-2.4.3-config.patch ---
--- Python-2.4.3/Modules/Setup.dist.rhconfig	2005-12-27 12:37:16.000000000 -0500
+++ Python-2.4.3/Modules/Setup.dist	2006-04-06 12:33:28.000000000 -0400
@@ -149,7 +149,7 @@
 # modules are to be built as shared libraries (see above for more
 # detail; also note that *static* reverses this effect):
 
-#*shared*
+*shared*
 
 # GNU readline.  Unlike previous Python incarnations, GNU readline is
 # now incorporated in an optional module, configured in the Setup file
@@ -159,68 +159,68 @@
 # it, depending on your system -- see the GNU readline instructions.
 # It's okay for this to be a shared library, too.
 
-#readline readline.c -lreadline -ltermcap
+readline readline.c -lreadline -ltermcap
 
 
 # Modules that should always be present (non UNIX dependent):
 
-#array arraymodule.c	# array objects
-#cmath cmathmodule.c # -lm # complex math library functions
-#math mathmodule.c # -lm # math library functions, e.g. sin()
-#struct structmodule.c	# binary structure packing/unpacking
-#time timemodule.c # -lm # time operations and variables
-#operator operator.c	# operator.add() and similar goodies
-#_weakref _weakref.c	# basic weak reference support
-#_testcapi _testcapimodule.c    # Python C API test module
-#_random _randommodule.c	# Random number generator
-#collections collectionsmodule.c # Container types
-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
-#strop stropmodule.c		# String manipulations
+array arraymodule.c	# array objects
+cmath cmathmodule.c # -lm # complex math library functions
+math mathmodule.c # -lm # math library functions, e.g. sin()
+struct structmodule.c	# binary structure packing/unpacking
+time timemodule.c # -lm # time operations and variables
+operator operator.c	# operator.add() and similar goodies
+_weakref _weakref.c	# basic weak reference support
+_testcapi _testcapimodule.c    # Python C API test module
+_random _randommodule.c	# Random number generator
+collections collectionsmodule.c # Container types
+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
+strop stropmodule.c		# String manipulations
 
-#unicodedata unicodedata.c    # static Unicode character database
+unicodedata unicodedata.c    # static Unicode character database
 
 # access to ISO C locale support
-#_locale _localemodule.c  # -lintl
+_locale _localemodule.c  # -lintl
 
 
 # Modules with some UNIX dependencies -- on by default:
 # (If you have a really backward UNIX, select and socket may not be
 # supported...)
 
-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
-#grp grpmodule.c		# grp(3)
-#select selectmodule.c	# select(2); not on ancient System V
+fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
+grp grpmodule.c		# grp(3)
+select selectmodule.c	# select(2); not on ancient System V
 
 # Memory-mapped files (also works on Win32).
-#mmap mmapmodule.c
+mmap mmapmodule.c
 
 # CSV file helper
-#_csv _csv.c
+_csv _csv.c
 
 # Socket module helper for socket(2)
-#_socket socketmodule.c
+_socket socketmodule.c
 
 # Socket module helper for SSL support; you must comment out the other
 # socket line above, and possibly edit the SSL variable:
-#SSL=/usr/local/ssl
-#_ssl _ssl.c \
-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-#	-L$(SSL)/lib -lssl -lcrypto
+SSL=/usr/local/ssl
+_ssl _ssl.c \
+	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+	-L$(SSL)/lib -lssl -lcrypto
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
+crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
 
 
 # Some more UNIX dependent modules -- off by default, since these
 # are not supported by all UNIX systems:
 
-#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
-#termios termios.c	# Steen Lumholt's termios module
-#resource resource.c	# Jeremy Hylton's rlimit interface
+nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
+termios termios.c	# Steen Lumholt's termios module
+resource resource.c	# Jeremy Hylton's rlimit interface
 
 
 # Multimedia modules -- off by default.
@@ -228,21 +228,21 @@
 # #993173 says audioop works on 64-bit platforms, though.
 # These represent audio samples or images as strings:
 
-#audioop audioop.c	# Operations on audio samples
-#imageop imageop.c	# Operations on images
-#rgbimg rgbimgmodule.c	# Read SGI RGB image files (but coded portably)
+audioop audioop.c	# Operations on audio samples
+imageop imageop.c	# Operations on images
+rgbimg rgbimgmodule.c	# Read SGI RGB image files (but coded portably)
 
 
 # The md5 module implements the RSA Data Security, Inc. MD5
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 # md5c.c and md5.h are included here.
 
-#md5 md5module.c md5c.c
+md5 md5module.c md5c.c
 
 
 # The sha module implements the SHA checksum algorithm.
 # (NIST's Secure Hash Algorithm.)
-#sha shamodule.c
+sha shamodule.c
 
 
 # SGI IRIX specific modules -- off by default.
@@ -289,12 +289,12 @@
 # A Linux specific module -- off by default; this may also work on 
 # some *BSDs.
 
-#linuxaudiodev linuxaudiodev.c
+linuxaudiodev linuxaudiodev.c
 
 
 # George Neville-Neil's timing module:
 
-#timing timingmodule.c
+timing timingmodule.c
 
 
 # The _tkinter module.
@@ -309,7 +309,7 @@
 # every system.
 
 # *** Always uncomment this (leave the leading underscore in!):
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
 #	-L/usr/local/lib \
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
@@ -319,7 +319,7 @@
 # *** Or uncomment this for Solaris:
 #	-I/usr/openwin/include \
 # *** Uncomment and edit for Tix extension only:
-#	-DWITH_TIX -ltix8.1.8.2 \
+	-DWITH_TIX -ltix \
 # *** Uncomment and edit for BLT extension only:
 #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
 # *** Uncomment and edit for PIL (TkImaging) extension only:
@@ -328,7 +328,7 @@
 # *** Uncomment and edit for TOGL extension only:
 #	-DWITH_TOGL togl.c \
 # *** Uncomment and edit to reflect your Tcl/Tk versions:
-#	-ltk8.2 -ltcl8.2 \
+	-ltk -ltcl \
 # *** Uncomment and edit to reflect where your X11 libraries are:
 #	-L/usr/X11R6/lib \
 # *** Or uncomment this for Solaris:
@@ -338,7 +338,7 @@
 # *** Uncomment for AIX:
 #	-lld \
 # *** Always uncomment this; X11 libraries to link with:
-#	-lX11
+	-lX11
 
 # Lance Ellinghaus's syslog module
 #syslog syslogmodule.c		# syslog daemon interface
@@ -350,9 +350,9 @@
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#_curses _cursesmodule.c -lcurses -ltermcap
+_curses _cursesmodule.c -lcurses -ltermcap
 # Wrapper for the panel library that's part of ncurses and SYSV curses.
-#_curses_panel _curses_panel.c -lpanel -lncurses 
+_curses_panel _curses_panel.c -lpanel -lncurses 
 
 
 # Generic (SunOS / SVR4) dynamic loading module.
@@ -360,7 +360,7 @@
 # it is a highly experimental and dangerous device for calling
 # *arbitrary* C functions in *arbitrary* shared libraries:
 
-#dl dlmodule.c
+dl dlmodule.c
 
 
 # Modules that provide persistent dictionary-like semantics.  You will
@@ -383,7 +383,7 @@
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
+gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
 
 
 # Sleepycat Berkeley DB interface.
@@ -398,11 +398,10 @@
 #
 # Edit the variables DB and DBLIBVERto point to the db top directory
 # and the subdirectory of PORT where you built it.
-#DB=/usr/local/BerkeleyDB.4.0
-#DBLIBVER=4.0
-#DBINC=$(DB)/include
-#DBLIB=$(DB)/lib
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+DBLIBVER=4.3
+DBINC=/usr/include/db4
+DBLIB=/usr/lib
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
 
 # Historical Berkeley DB 1.85
 #
@@ -417,14 +416,14 @@
 
 
 # Helper module for various ascii-encoders
-#binascii binascii.c
+binascii binascii.c
 
 # Fred Drake's interface to the Python parser
-#parser parsermodule.c
+parser parsermodule.c
 
 # cStringIO and cPickle
-#cStringIO cStringIO.c
-#cPickle cPickle.c
+cStringIO cStringIO.c
+cPickle cPickle.c
 
 
 # Lee Busby's SIGFPE modules.
@@ -447,7 +446,7 @@
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
 # See http://www.gzip.org/zlib/
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 
 # Interface to the Expat XML parser
 #
@@ -467,14 +466,14 @@
 # Hye-Shik Chang's CJKCodecs
 
 # multibytecodec is required for all the other CJK codec modules
-#_multibytecodec cjkcodecs/multibytecodec.c
+_multibytecodec cjkcodecs/multibytecodec.c
 
-#_codecs_cn cjkcodecs/_codecs_cn.c
-#_codecs_hk cjkcodecs/_codecs_hk.c
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
-#_codecs_jp cjkcodecs/_codecs_jp.c
-#_codecs_kr cjkcodecs/_codecs_kr.c
-#_codecs_tw cjkcodecs/_codecs_tw.c
+_codecs_cn cjkcodecs/_codecs_cn.c
+_codecs_hk cjkcodecs/_codecs_hk.c
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
+_codecs_jp cjkcodecs/_codecs_jp.c
+_codecs_kr cjkcodecs/_codecs_kr.c
+_codecs_tw cjkcodecs/_codecs_tw.c
 
 # Example -- included for reference only:
 # xx xxmodule.c


Index: modulator
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/modulator,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modulator	9 Sep 2004 11:03:56 -0000	1.3
+++ modulator	13 Jun 2006 15:38:24 -0000	1.4
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /usr/lib/python2.3/site-packages/modulator/modulator.py
+exec /usr/lib/python2.4/site-packages/modulator/modulator.py


Index: pynche
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/pynche,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pynche	9 Sep 2004 11:03:56 -0000	1.3
+++ pynche	13 Jun 2006 15:38:25 -0000	1.4
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /usr/lib/python2.3/site-packages/pynche/pynche
+exec /usr/lib/python2.4/site-packages/pynche/pynche

python-2.4.1-lib64.patch:
 Python-2.4b1/Lib/distutils/command/install.py |    4 ++--
 Python-2.4b1/Lib/distutils/sysconfig.py       |    6 +++++-
 Python-2.4b1/Makefile.pre.in                  |    4 ++--
 Python-2.4b1/Modules/Setup.dist               |    4 ++--
 Python-2.4b1/Modules/getpath.c                |   10 +++++-----
 Python-2.4b1/setup.py                         |   10 +++++-----
 Python-2.4b2/Lib/site.py                      |    7 ++++++-
 7 files changed, 27 insertions(+), 18 deletions(-)

Index: python-2.4.1-lib64.patch
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/python-2.4.1-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-2.4.1-lib64.patch	6 Apr 2005 17:57:56 -0000	1.1
+++ python-2.4.1-lib64.patch	13 Jun 2006 15:38:25 -0000	1.2
@@ -145,15 +145,6 @@
                  sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
 --- Python-2.4b1/Modules/Setup.dist.lib64	2004-11-04 14:35:15.805241496 -0500
 +++ Python-2.4b1/Modules/Setup.dist	2004-11-04 14:38:43.884254818 -0500
-@@ -325,7 +325,7 @@
- # *** Uncomment and edit to reflect your Tcl/Tk versions:
- 	-ltk -ltcl \
- # *** Uncomment and edit to reflect where your X11 libraries are:
--	-L/usr/X11R6/lib \
-+	-L/usr/X11R6/lib64 \
- # *** Or uncomment this for Solaris:
- #	-L/usr/openwin/lib \
- # *** Uncomment these for TOGL extension only:
 @@ -395,7 +395,7 @@
  # and the subdirectory of PORT where you built it.
  DBLIBVER=4.2


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/python.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- python.spec	20 Apr 2005 19:40:59 -0000	1.42
+++ python.spec	13 Jun 2006 15:38:25 -0000	1.43
@@ -15,11 +15,12 @@
 %define jp_codecs 1.4.11
 %define tools_dir %{_libdir}/python%{pybasever}/Tools
 %define demo_dir %{_libdir}/python%{pybasever}/Demo
+%define doc_tools_dir %{_libdir}/python%{pybasever}/Doc/tools
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-Version: %{pybasever}.1
-Release: 2
+Version: %{pybasever}.3
+Release: 8.FC4
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -28,19 +29,20 @@
 Provides: python-optik = 1.4.1
 Obsoletes: python-optik
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
-Source3: modulator
-Source4: pynche
 Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 Source7: python-2.3.4-optik.py
 
-Patch0: python-2.4.1-config.patch
+Patch0: python-2.4.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch7: python-2.3.4-lib64-regex.patch
 Patch8: python-2.4.1-lib64.patch
 Patch9: japanese-codecs-lib64.patch
 Patch13: python-2.4-distutils-bdist-rpm.patch
 Patch14: python-2.3.4-pydocnodoc.patch
+Patch15: python-2.4.1-canonicalize.patch
+Patch16: python-2.4-gen-assert.patch
+Patch17: python-2.4-webbrowser.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -55,9 +57,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
-BuildPrereq: Mesa-devel tk tix gcc-c++ XFree86-devel glibc-devel
+BuildPrereq: libGL-devel tk tix gcc-c++ libX11-devel glibc-devel
 BuildPrereq: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
 BuildPrereq: tix-devel bzip2-devel
+BuildPrereq: autoconf
 URL: http://www.python.org/
 
 %description
@@ -104,7 +107,7 @@
 Summary: A collection of development tools included with Python.
 Group: Development/Tools
 Requires: %{name} = %{version}-%{release}
-Requires: tkinter = %{version}-%{release}
+Requires: %{tkinter} = %{version}-%{release}
 %if %{main_python}
 Obsoletes: python2-tools
 Provides: python2-tools = %{version}
@@ -144,6 +147,9 @@
 %endif
 %patch13 -p1 -b .bdist-rpm
 %patch14 -p1 -b .no-doc
+%patch15 -p1 -b .canonicalize
+%patch16 -p2 -b .gen-assert
+%patch17 -p0 -b .web-browser
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -175,6 +181,8 @@
 fi
 # Force CC
 export CC=gcc
+# For patch 15, need to get a newer configure generated out of configure.in
+autoconf
 %configure --enable-ipv6 --enable-unicode=%{unicode} --enable-shared
 
 make OPT="$CFLAGS" %{?_smp_mflags}
@@ -211,12 +219,20 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages
 
 #modulator
-install -m 755 $RPM_SOURCE_DIR/modulator ${RPM_BUILD_ROOT}%{_bindir}/modulator
+cat > ${RPM_BUILD_ROOT}%{_bindir}/modulator << EOF
+#!/bin/bash
+exec %{_libdir}/python%{pybasever}/site-packages/modulator/modulator.py
+EOF
+chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/modulator
 cp -r Tools/modulator \
   ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/
 
 #pynche
-install -m 755 $RPM_SOURCE_DIR/pynche ${RPM_BUILD_ROOT}%{_bindir}/pynche
+cat > ${RPM_BUILD_ROOT}%{_bindir}/pynche << EOF
+#!/bin/bash
+exec %{_libdir}/python%{pybasever}/site-packages/pynche/pynche
+EOF
+chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/pynche
 rm -f Tools/pynche/*.pyw
 cp -r Tools/pynche \
   ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/
@@ -233,6 +249,10 @@
 install Tools/README $RPM_BUILD_ROOT%{tools_dir}/
 install Tools/scripts/*py $RPM_BUILD_ROOT%{tools_dir}/scripts/
 
+# Documentation tools
+install -m755 -d $RPM_BUILD_ROOT%{doc_tools_dir}
+install -m755 Doc/tools/mkhowto $RPM_BUILD_ROOT%{doc_tools_dir}
+
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}
 cp -ar Demo/* $RPM_BUILD_ROOT%{demo_dir}
@@ -259,6 +279,7 @@
 mv pynche pynche%{__python_ver}
 mv pygettext.py pygettext%{__python_ver}.py
 mv msgfmt.py msgfmt%{__python_ver}.py
+mv smtpd.py smtpd%{__python_ver}.py
 mv pydoc pydoc%{__python_ver}
 popd
 %endif
@@ -275,7 +296,7 @@
 find $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/lib-dynload -type f | grep -v "_tkinter.so$" | sed "s|$RPM_BUILD_ROOT||" >> dynfiles
 
 # Fix for bug #136654
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/email/test/data/audiotest.au
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/email/test/data/audiotest.au $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test/audiotest.au
 
 # Fix bug #143667: python should own /usr/lib/python2.x on 64-bit machines
 %if %{_lib} == lib64
@@ -288,6 +309,7 @@
 %files -f dynfiles
 %defattr(-, root, root)
 %doc LICENSE README
+%{_bindir}/pydoc*
 %{_bindir}/python*
 %{_mandir}/*/*
 %{_libdir}/libpython%{pybasever}.so*
@@ -331,15 +353,15 @@
 %doc Tools/pynche/README.pynche
 %{_libdir}/python%{pybasever}/site-packages/modulator
 %{_libdir}/python%{pybasever}/site-packages/pynche
-%{_bindir}/smtpd.py*
+%{_bindir}/smtpd*.py*
 %{_bindir}/idle*
 %{_bindir}/modulator*
 %{_bindir}/pynche*
 %{_bindir}/pygettext*.py*
 %{_bindir}/msgfmt*.py*
-%{_bindir}/pydoc*
 %{tools_dir}
 %{demo_dir}
+%{_libdir}/python%{pybasever}/Doc
 
 %files -n %{tkinter}
 %defattr(-,root,root,755)
@@ -347,6 +369,88 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-8
+- Only copying mkhowto from the Docs - we don't need perl dependencies from
+  python-tools.
+
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-7
+- Fixed bug #121198 (webbrowser.py should use the user's preferences first)
+
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-6
+- Fixed bug #192592 (too aggressive assertion fails) - SF#1257960
+- Fixed bug #167468 (Doc/tools not included) - added in the python-tools package
+
+* Thu Jun  8 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-5
+- Fixed bug #193484 (added pydoc in the main package)
+
+* Mon Jun  5 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-4
+- Added dist in the release
+
+* Mon May 15 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-3
+- rebuilt to fix broken libX11 dependency
+
+* Wed Apr 12 2006 Jeremy Katz <katzj at redhat.com> - 2.4.3-2
+- rebuild with new gcc to fix #188649
+
+* Thu Apr  6 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-1
+- Updated to 2.4.3
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-3.2.1
+- bump again for double-long bug on ppc(64)
+
+* Fri Feb 10 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-3.2
+- rebuilt for newer tix
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Jan 20 2006 Mihai Ibanescu <misa at redhat.com> 2.4.2-3
+- fixed #136654 for another instance of audiotest.au
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Sat Nov 19 2005 Bill Nottingham <notting at redhat.com> 2.4.2-2
+- fix build for modular X, remove X11R6 path references
+
+* Tue Nov 15 2005 Mihai Ibanescu <misa at redhat.com> 2.4.2-1
+- Upgraded to 2.4.2
+- BuildRequires autoconf
+
+* Wed Nov  9 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-16
+- Rebuilding against newer openssl.
+- XFree86-devel no longer exists
+
+* Mon Sep 26 2005 Peter Jones <pjones at redhat.com> 2.4.1-14
+- Once more -- this time, to fix -EPERM when you run it in a directory
+  you can't read from.
+
+* Mon Sep 26 2005 Peter Jones <pjones at redhat.com> 2.4.1-13
+- So, 5 or 6 people have said it works for them with this patch...
+
+* Sun Sep 25 2005 Peter Jones <pjones at redhat.com> 2.4.1-12
+- Fixed bug #169159 (check for argc>0 and argv[0] == NULL, not just
+    argv[0][0]='\0')
+  Reworked the patch from -8 a bit more.
+
+* Fri Sep 23 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-10
+- Fixed bug #169159 (don't let python core dump if no arguments are passed in)
+  Reworked the patch from -8 a bit more.
+
+* Thu Sep 22 2005 Peter Jones <pjones at redhat.com> 2.4.1-8
+- Fix bug #169046 more correctly.
+
+* Thu Sep 22 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-7
+- Fixed bug #169046 (realpath is unsafe); thanks to 
+  Peter Jones <pjones at redhat.com> and Arjan van de Ven <arjanv at redhat.com> for
+  diagnosing and the patch.
+
+* Tue Sep 20 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-4
+- Fixed bug #168655 (fixes for building as python24)
+
+* Tue Jul 26 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-3
+- Fixed bug #163435 (pynche doesn't start))
+
 * Wed Apr 20 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-2
 - Fixed bug #143667 (python should own /usr/lib/python* on 64-bit systems, for
   noarch packages)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Apr 2005 17:57:56 -0000	1.12
+++ sources	13 Jun 2006 15:38:25 -0000	1.13
@@ -1,2 +1,2 @@
-de3e9a8836fab6df7c7ce545331afeb3  Python-2.4.1.tar.bz2
 e4f2ed866f4ce978fb54bb962eab4fdf  JapaneseCodecs-1.4.11.tar.gz
+141c683447d5e76be1d2bd4829574f02  Python-2.4.3.tar.bz2


--- python-2.4.1-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:39:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:39:19 -0400
Subject: rpms/avahi/devel avahi.spec,1.59,1.60
Message-ID: <200606131539.k5DFdJLS023887@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23873

Modified Files:
	avahi.spec 
Log Message:
rebuild for broken mono deps


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- avahi.spec	6 Jun 2006 23:08:54 -0000	1.59
+++ avahi.spec	13 Jun 2006 15:39:16 -0000	1.60
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.10
-Release: 	2.FC6
+Release: 	3.FC6
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -397,6 +397,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-3.FC6
+- rebuild for broken mono deps
+
 * Tue Jun 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-2.FC6
 - fix bug 194203: fix permissions on /var/run/avahi-daemon
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:46:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:46:42 -0400
Subject: rpms/python/FC-4 python.spec,1.43,1.44
Message-ID: <200606131546.k5DFkgqj030130@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29811

Modified Files:
	python.spec 
Log Message:
FC4 did not have the newer X dependencies


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/python.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- python.spec	13 Jun 2006 15:38:25 -0000	1.43
+++ python.spec	13 Jun 2006 15:46:39 -0000	1.44
@@ -57,7 +57,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
-BuildPrereq: libGL-devel tk tix gcc-c++ libX11-devel glibc-devel
+BuildPrereq: Mesa-devel tk tix gcc-c++ XFree86-devel glibc-devel
 BuildPrereq: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
 BuildPrereq: tix-devel bzip2-devel
 BuildPrereq: autoconf



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:48:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:48:09 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.28,1.29
Message-ID: <200606131548.k5DFm9UV008131@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6928

Modified Files:
	cairo-java.spec 
Log Message:
Add BuildRequires java-gcj-compat-devel.


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cairo-java.spec	24 May 2006 13:38:55 -0000	1.28
+++ cairo-java.spec	13 Jun 2006 15:48:07 -0000	1.29
@@ -33,6 +33,7 @@
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0, gcc-java >= 3.3.3
 BuildRequires:	docbook-utils
 BuildRequires:	java-1.4.2-gcj-compat >= 1.4.2
+BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2
 
 %description
 Cairo-java is a language binding that allows developers to write Cairo
@@ -116,6 +117,7 @@
 %changelog
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 1.0.3-2
 - Change mod time of all java source files for the src zip. 
+- Add BuildRequires java-gcj-compat-devel.
 
 * Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 1.0.3-1
 - Add -X to src zip and ensure Config.java has the same mod time across 



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:48:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:48:35 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.45, 1.46 gnome-utils.spec,
	1.117, 1.118 sources, 1.49, 1.50
Message-ID: <200606131548.k5DFmZ7q008335@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8291

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	9 May 2006 20:25:38 -0000	1.45
+++ .cvsignore	13 Jun 2006 15:48:32 -0000	1.46
@@ -1 +1 @@
-gnome-utils-2.15.0.tar.bz2
+gnome-utils-2.15.3.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gnome-utils.spec	10 Jun 2006 04:31:58 -0000	1.117
+++ gnome-utils.spec	13 Jun 2006 15:48:32 -0000	1.118
@@ -9,8 +9,8 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.15.0
-Release:        3
+Version:        2.15.3
+Release:        1
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -217,6 +217,9 @@
 
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
+- Update to 2.15.3
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-3
 - More missing BuildRequires
 - Use --enable-console-helper 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	9 May 2006 20:25:38 -0000	1.49
+++ sources	13 Jun 2006 15:48:32 -0000	1.50
@@ -1 +1 @@
-4628989354585116362c5e06c144402a  gnome-utils-2.15.0.tar.bz2
+e74f8e3039660da6754e931afbab8619  gnome-utils-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 15:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 11:49:52 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.33, 1.34 libwnck.spec, 1.48,
	1.49 sources, 1.33, 1.34
Message-ID: <200606131549.k5DFnqJ6008891@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8848

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	17 May 2006 15:47:08 -0000	1.33
+++ .cvsignore	13 Jun 2006 15:49:50 -0000	1.34
@@ -1 +1 @@
-libwnck-2.15.2.tar.bz2
+libwnck-2.15.3.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libwnck.spec	10 Jun 2006 05:08:43 -0000	1.48
+++ libwnck.spec	13 Jun 2006 15:49:50 -0000	1.49
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.15.2
-Release: 3
+Version: 2.15.3
+Release: 1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -90,6 +90,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-3
 - More BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	17 May 2006 15:47:08 -0000	1.33
+++ sources	13 Jun 2006 15:49:50 -0000	1.34
@@ -1 +1 @@
-52607b2629569c5524cacc70f6cbf551  libwnck-2.15.2.tar.bz2
+6e9ef41d1aa9e81d6bc33047cccbe07f  libwnck-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:05:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:05:10 -0400
Subject: rpms/gnome-utils/devel gnome-utils-2.15.3-chooser.patch, NONE,
	1.1 gnome-utils.spec, 1.118, 1.119
Message-ID: <200606131605.k5DG5A8T013191@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13168

Modified Files:
	gnome-utils.spec 
Added Files:
	gnome-utils-2.15.3-chooser.patch 
Log Message:
fix some erronous files


gnome-utils-2.15.3-chooser.patch:
 Makefile.in |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE gnome-utils-2.15.3-chooser.patch ---
--- gnome-utils-2.15.3/gnome-dictionary/libgdict/Makefile.in.chooser	2006-06-13 12:02:12.000000000 -0400
+++ gnome-utils-2.15.3/gnome-dictionary/libgdict/Makefile.in	2006-06-13 12:02:21.000000000 -0400
@@ -353,8 +353,6 @@
 	$(top_srcdir)/gnome-dictionary/libgdict/gdict-client-context.h \
 	$(top_srcdir)/gnome-dictionary/libgdict/gdict-defbox.h \
 	$(top_srcdir)/gnome-dictionary/libgdict/gdict-entry.h \
-	$(top_srcdir)/gnome-dictionary/libgdict/gdict-database-chooser.h \
-	$(top_srcdir)/gnome-dictionary/libgdict/gdict-strategy-chooser.h \
 	$(top_srcdir)/gnome-dictionary/libgdict/gdict-source.h \
 	$(top_srcdir)/gnome-dictionary/libgdict/gdict-source-loader.h \
 	$(top_srcdir)/gnome-dictionary/libgdict/gdict-speller.h \


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnome-utils.spec	13 Jun 2006 15:48:32 -0000	1.118
+++ gnome-utils.spec	13 Jun 2006 16:05:07 -0000	1.119
@@ -21,6 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
+Patch1:         gnome-utils-2.15.3-chooser.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -75,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .logview-close
+%patch1 -p1 -b .chooser
 
 # Hide from menus
 pushd gsearchtool



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:09:50 -0400
Subject: rpms/totem/devel totem.spec,1.60,1.61
Message-ID: <200606131609.k5DG9orT013799@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13782

Modified Files:
	totem.spec 
Log Message:
Adjust file lists



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- totem.spec	13 Jun 2006 15:19:37 -0000	1.60
+++ totem.spec	13 Jun 2006 16:09:44 -0000	1.61
@@ -129,7 +129,6 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
-%{_datadir}/pixmaps/media-player-48.png
 %{_datadir}/%{name}/
 %{_libdir}/libtotem-plparser.*
 %{_libdir}/nautilus/extensions-1.0/*.so*



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:11:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:11:14 -0400
Subject: rpms/gedit/devel .cvsignore, 1.42, 1.43 gedit.spec, 1.83,
	1.84 sources, 1.44, 1.45
Message-ID: <200606131611.k5DGBEMo014009@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13971

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	17 May 2006 16:45:06 -0000	1.42
+++ .cvsignore	13 Jun 2006 16:11:01 -0000	1.43
@@ -1 +1 @@
-gedit-2.15.2.tar.bz2
+gedit-2.15.3.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gedit.spec	17 May 2006 16:45:06 -0000	1.83
+++ gedit.spec	13 Jun 2006 16:11:01 -0000	1.84
@@ -16,7 +16,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.2
+Version: 	2.15.3
 Release: 	1	
 Epoch:		1
 License:	GPL
@@ -181,6 +181,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
+- Update to 2.15.3
+
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	17 May 2006 16:45:06 -0000	1.44
+++ sources	13 Jun 2006 16:11:01 -0000	1.45
@@ -1 +1 @@
-a265839769777898047c1832a042d39b  gedit-2.15.2.tar.bz2
+e43046da726b9df3119ff8db00c7f4ad  gedit-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:16:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:16:25 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.119,1.120
Message-ID: <200606131616.k5DGGPv2022115@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20816

Modified Files:
	gnome-utils.spec 
Log Message:
adjust file lists



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-utils.spec	13 Jun 2006 16:05:07 -0000	1.119
+++ gnome-utils.spec	13 Jun 2006 16:16:22 -0000	1.120
@@ -192,7 +192,6 @@
 %{_datadir}/gnome/help/gnome-system-log/
 %{_datadir}/gnome/help/gfloppy/
 %{_datadir}/gnome/help/baobab/
-%{_datadir}/pixmaps/gnome-dictionary.png
 %{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
 %{_datadir}/icons/hicolor/48x48/apps/baobab.png
 %{_libexecdir}/gnome-dictionary-applet



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:23:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:23:06 -0400
Subject: rpms/cups/FC-5 cups.spec,1.192,1.193
Message-ID: <200606131623.k5DGN6g0032394@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32337

Modified Files:
	cups.spec 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.9
- Remove certs directory in %post, not %postun.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- cups.spec	13 Jun 2006 14:50:25 -0000	1.192
+++ cups.spec	13 Jun 2006 16:23:04 -0000	1.193
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.8
+Release: 1.9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -269,6 +269,9 @@
 %post
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
 /sbin/chkconfig --add cups || true
+# Remove old-style certs directory; new-style is /var/run
+# (see bug #194581 for why this is necessary).
+/bin/rm -rf /etc/cups/certs
 %if %use_alternatives
 /usr/sbin/alternatives --install %{_bindir}/lpr print %{_bindir}/lpr.cups 40 \
 	 --slave %{_bindir}/lp print-lp %{_bindir}/lp.cups \
@@ -309,9 +312,6 @@
 %postun
 if [ "$1" -ge "1" ]; then
 	/sbin/service cups condrestart > /dev/null 2>&1
-	# Remove old-style certs directory; new-style is /var/run
-	# (see bug #194581 for why this is necessary).
-	rm -rf /etc/cups/certs
 fi
 exit 0
 
@@ -416,6 +416,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.9
+- Remove certs directory in %%post, not %%postun.
+
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.8
 - Remove old-style certs directory after upgrade (bug #194581).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:23:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:23:54 -0400
Subject: rpms/cups/devel cups.spec,1.215,1.216
Message-ID: <200606131623.k5DGNsPs032756@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32689

Modified Files:
	cups.spec 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-11
- Remove certs directory in %post, not %postun.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- cups.spec	13 Jun 2006 14:32:37 -0000	1.215
+++ cups.spec	13 Jun 2006 16:23:51 -0000	1.216
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 10
+Release: 11
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -245,6 +245,9 @@
 %post
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
 /sbin/chkconfig --add cups || true
+# Remove old-style certs directory; new-style is /var/run
+# (see bug #194581 for why this is necessary).
+/bin/rm -rf /etc/cups/certs
 %if %use_alternatives
 /usr/sbin/alternatives --install %{_bindir}/lpr print %{_bindir}/lpr.cups 40 \
 	 --slave %{_bindir}/lp print-lp %{_bindir}/lp.cups \
@@ -285,9 +288,6 @@
 %postun
 if [ "$1" -ge "1" ]; then
 	/sbin/service cups condrestart > /dev/null 2>&1
-	# Remove old-style certs directory; new-style is /var/run
-	# (see bug #194581 for why this is necessary).
-	rm -rf /etc/cups/certs
 fi
 exit 0
 
@@ -392,6 +392,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-11
+- Remove certs directory in %%post, not %%postun.
+
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-10
 - Remove old-style certs directory after upgrade (bug #194581).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:25:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:25:44 -0400
Subject: rpms/totem/devel totem.spec,1.61,1.62
Message-ID: <200606131625.k5DGPiBJ001044@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv995

Modified Files:
	totem.spec 
Log Message:
Update icon themes



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- totem.spec	13 Jun 2006 16:09:44 -0000	1.61
+++ totem.spec	13 Jun 2006 16:25:42 -0000	1.62
@@ -116,10 +116,18 @@
     %{_sysconfdir}/gconf/schemas/$S \
      >/dev/null || :
 done
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %postun
 /sbin/ldconfig
 update-desktop-database -q
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -133,6 +141,7 @@
 %{_libdir}/libtotem-plparser.*
 %{_libdir}/nautilus/extensions-1.0/*.so*
 %{_bindir}/%{name}-video-thumbnailer
+%{_datadir}/icons/hicolor/48x48/apps/media-player-48.png
 %exclude %{_datadir}/%{name}/vanity.*
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/totem-video-thumbnailer.1.gz
@@ -152,6 +161,7 @@
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.2-1
 - Update to 1.5.2
 - BuildRequire hal
+- Update icon themes
 
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.1-1
 - Update to 1.5.1



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:48:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:48:00 -0400
Subject: rpms/python/FC-4 python-2.4.3-config.patch,1.1,1.2
Message-ID: <200606131648.k5DGm0fE020840@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20783

Modified Files:
	python-2.4.3-config.patch 
Log Message:
Reworked config patch, making it FC4 friendly

python-2.4.3-config.patch:
 Setup.dist |  127 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 63 insertions(+), 64 deletions(-)

Index: python-2.4.3-config.patch
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/python-2.4.3-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-2.4.3-config.patch	13 Jun 2006 15:38:25 -0000	1.1
+++ python-2.4.3-config.patch	13 Jun 2006 16:47:58 -0000	1.2
@@ -149,7 +149,7 @@
  
  
  # The _tkinter module.
-@@ -309,7 +309,7 @@
+@@ -309,17 +309,17 @@
  # every system.
  
  # *** Always uncomment this (leave the leading underscore in!):
@@ -158,7 +158,10 @@
  # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
  #	-L/usr/local/lib \
  # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-@@ -319,7 +319,7 @@
+ #	-I/usr/local/include \
+ # *** Uncomment and edit to reflect where your X11 header files are:
+-#	-I/usr/X11R6/include \
++	-I/usr/X11R6/include \
  # *** Or uncomment this for Solaris:
  #	-I/usr/openwin/include \
  # *** Uncomment and edit for Tix extension only:
@@ -167,15 +170,18 @@
  # *** Uncomment and edit for BLT extension only:
  #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
  # *** Uncomment and edit for PIL (TkImaging) extension only:
-@@ -328,7 +328,7 @@
+@@ -328,9 +328,9 @@
  # *** Uncomment and edit for TOGL extension only:
  #	-DWITH_TOGL togl.c \
  # *** Uncomment and edit to reflect your Tcl/Tk versions:
 -#	-ltk8.2 -ltcl8.2 \
 +	-ltk -ltcl \
  # *** Uncomment and edit to reflect where your X11 libraries are:
- #	-L/usr/X11R6/lib \
+-#	-L/usr/X11R6/lib \
++	-L/usr/X11R6/lib \
  # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
 @@ -338,7 +338,7 @@
  # *** Uncomment for AIX:
  #	-lld \



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:50:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:50:19 -0400
Subject: rpms/cman/devel cman.spec,1.31,1.32
Message-ID: <200606131650.k5DGoJ7c021764@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21727

Modified Files:
	cman.spec 
Log Message:
Specify libdir for dlm & group.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cman.spec	12 Jun 2006 23:05:27 -0000	1.31
+++ cman.spec	13 Jun 2006 16:50:16 -0000	1.32
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.4
+Release: 0.fc6.5
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -47,9 +47,9 @@
 TOPDIR=`pwd`
 
 cd ccs ; ./configure --libdir=%{_libdir}; cd ..
-cd dlm ; ./configure --kernel_src=/usr/; cd ..
+cd dlm ; ./configure --kernel_src=/usr/ --libdir=%{_libdir}; cd ..
 cd cman; ./configure --ccsincdir=${TOPDIR}/ccs/lib --ccslibdir=${TOPDIR}/ccs/lib --libdir=%{_libdir}  ; cd ..
-cd group; ./configure --kernel_src=/usr/; cd ..
+cd group; ./configure --kernel_src=/usr/ --libdir=%{_libdir}; cd ..
 cd fence; ./configure -ccslibdir=${TOPDIR}/ccs/lib --ccsincdir=${TOPDIR}/ccs/lib --cmanincdir=${TOPDIR}/cman/lib ; cd ..
 
 for dir in ccs cman dlm fence group; do
@@ -104,7 +104,7 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Mar 1 2006 Chris Feist <cfeist at redhat.com>
+* Wed Mar 1 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.4
 - Rebuilt w/ new upstream sources
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.FC5.1.1



From fedora-cvs-commits at redhat.com  Tue Jun 13 16:55:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 12:55:22 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.29, 1.30 gnome-themes.spec,
	1.60, 1.61 sources, 1.30, 1.31
Message-ID: <200606131655.k5DGtMv5023675@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-themes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23624

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	16 May 2006 19:18:00 -0000	1.29
+++ .cvsignore	13 Jun 2006 16:55:20 -0000	1.30
@@ -3,3 +3,4 @@
 gnome-themes-2.14.0.tar.bz2
 gnome-themes-2.15.1.tar.bz2
 gnome-themes-2.15.2.tar.bz2
+gnome-themes-2.15.3.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-themes.spec	13 Jun 2006 03:19:00 -0000	1.60
+++ gnome-themes.spec	13 Jun 2006 16:55:20 -0000	1.61
@@ -3,8 +3,8 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.15.2
-Release: 3
+Version: 2.15.3
+Release: 1
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
@@ -91,6 +91,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.15.2-3
 - buildreq automake, not automake17
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	29 May 2006 19:28:17 -0000	1.30
+++ sources	13 Jun 2006 16:55:20 -0000	1.31
@@ -1,3 +1,3 @@
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2
 64bffb05ef1c8d2f3a3cbb18480cd3f0  clearlooks-metacity-2.0.tar.gz
-b5f19062e51b18d4644453d31b865be7  gnome-themes-2.15.2.tar.bz2
+9fb11c076154315a674ddd86b8113f7b  gnome-themes-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:02:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:02:22 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.35,1.36
Message-ID: <200606131702.k5DH2MOd025740@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25654

Modified Files:
	libglade-java.spec 
Log Message:
add version to BuildRequires, add BuildRequires docbook-utils


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libglade-java.spec	13 Jun 2006 03:34:21 -0000	1.35
+++ libglade-java.spec	13 Jun 2006 17:01:47 -0000	1.36
@@ -27,16 +27,16 @@
 Requires:	libglade2 >= 2.5.1
 Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
 Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.1.0.20060301.rh1
-Requires:	libgnomeui
-Requires:       libgnomecanvas
+Requires:       libgnomeui >= 2.11.0
+Requires:       libgnomecanvas >= 2.11.0
 BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
 BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.0
 BuildRequires:  libglade2-devel >= 2.5.0, gcc-java >= 3.3.3
 BuildRequires:	java-devel >= 1.4.2
 BuildRequires:	java-devel >= 1.4.2
-BuildRequires:	libgnomeui-devel
-BuildRequires:  libgnomecanvas-devel
-
+BuildRequires:  libgnomeui-devel >= 2.11.0
+BuildRequires:  libgnomecanvas-devel >= 2.11.0 
+BuildRequires:  docbook-utils
 
 # exclude while beehive s390x is borked
 #ExcludeArch: s390x



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:09:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:09:08 -0400
Subject: rpms/gedit/devel gedit.spec,1.84,1.85
Message-ID: <200606131709.k5DH98Is026152@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26098

Modified Files:
	gedit.spec 
Log Message:
build req which



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gedit.spec	13 Jun 2006 16:11:01 -0000	1.84
+++ gedit.spec	13 Jun 2006 17:08:51 -0000	1.85
@@ -65,6 +65,7 @@
 BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
 BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: which
 
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgnomeprintui22 >= %{libgnomeprintui_version}



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:15:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:15:40 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.27, 1.28 bug-buddy.spec, 1.49,
	1.50 sources, 1.27, 1.28
Message-ID: <200606131715.k5DHFenX027978@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27824

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Mar 2006 02:16:54 -0000	1.27
+++ .cvsignore	13 Jun 2006 17:15:37 -0000	1.28
@@ -1,6 +1 @@
-bug-buddy-2.11.1.tar.bz2
-bug-buddy-2.12.0.tar.bz2
-bug-buddy-2.12.1.tar.bz2
-bug-buddy-2.13.0.tar.bz2
-bug-buddy-2.13.90.tar.bz2
-bug-buddy-2.14.0.tar.bz2
+bug-buddy-2.15.0.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bug-buddy.spec	13 Mar 2006 02:16:54 -0000	1.49
+++ bug-buddy.spec	13 Jun 2006 17:15:37 -0000	1.50
@@ -4,7 +4,7 @@
 %define gnome_doc_utils_version 0.2.0
 
 Name: bug-buddy
-Version: 2.14.0
+Version: 2.15.0
 Release: 1
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
@@ -108,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
+- Update to 2.15.0
+
 * Sun Mar 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Mar 2006 02:16:54 -0000	1.27
+++ sources	13 Jun 2006 17:15:37 -0000	1.28
@@ -1 +1 @@
-4fb288adc8f67cbfb8886ddf7b400530  bug-buddy-2.14.0.tar.bz2
+58ca17dca26bfae3354f17fdfa6cdcee  bug-buddy-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:20:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:20:50 -0400
Subject: rpms/pyorbit/devel .cvsignore, 1.5, 1.6 pyorbit.spec, 1.18,
	1.19 sources, 1.5, 1.6
Message-ID: <200606131720.k5DHKoV3006927@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pyorbit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28974

Modified Files:
	.cvsignore pyorbit.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Mar 2006 16:27:40 -0000	1.5
+++ .cvsignore	13 Jun 2006 17:20:48 -0000	1.6
@@ -1 +1 @@
-pyorbit-2.14.0.tar.bz2
+pyorbit-2.14.1.tar.bz2


Index: pyorbit.spec
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pyorbit.spec	13 Mar 2006 16:27:40 -0000	1.18
+++ pyorbit.spec	13 Jun 2006 17:20:48 -0000	1.19
@@ -2,7 +2,7 @@
 
 Summary: Python bindings for ORBit2.
 Name: pyorbit
-Version: 2.14.0
+Version: 2.14.1
 Release: 1
 License: LGPL
 Group: Development/Languages
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Mar 2006 16:27:40 -0000	1.5
+++ sources	13 Jun 2006 17:20:48 -0000	1.6
@@ -1 +1 @@
-ff62b983d5d9be164bd5a207d692eab5  pyorbit-2.14.0.tar.bz2
+a3728affed2aa878966f792ae171e0f0  pyorbit-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:25:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:25:31 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.50,1.51
Message-ID: <200606131725.k5DHPVAK022552@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22535

Modified Files:
	bug-buddy.spec 
Log Message:
comment out patch for now



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- bug-buddy.spec	13 Jun 2006 17:15:37 -0000	1.50
+++ bug-buddy.spec	13 Jun 2006 17:25:29 -0000	1.51
@@ -15,7 +15,7 @@
 BuildRoot:%{_tmppath}/%{name}-%{version}-root
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=304508
-Patch1: bug-buddy-2.13.0-save.patch
+#Patch1: bug-buddy-2.13.0-save.patch
 
 Requires: gdb
 
@@ -52,7 +52,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .save
+#%patch1 -p1 -b .save
 
 %build
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:29:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:29:55 -0400
Subject: rpms/avahi/devel avahi.spec,1.60,1.61
Message-ID: <200606131729.k5DHTtOn022790@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22777

Modified Files:
	avahi.spec 
Log Message:
BuildRequires: glib-devel -> glib2-devel


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- avahi.spec	13 Jun 2006 15:39:16 -0000	1.60
+++ avahi.spec	13 Jun 2006 17:29:53 -0000	1.61
@@ -24,7 +24,7 @@
 BuildRequires:  qt-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  libdaemon-devel
-BuildRequires:  glib-devel
+BuildRequires:  glib2-devel
 BuildRequires:  libcap-devel
 BuildRequires:  expat-devel
 BuildRequires:  python



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:33:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:33:14 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.120,1.121
Message-ID: <200606131733.k5DHXEgF022917@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22902

Modified Files:
	gnome-utils.spec 
Log Message:
fix file lists



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-utils.spec	13 Jun 2006 16:16:22 -0000	1.120
+++ gnome-utils.spec	13 Jun 2006 17:33:10 -0000	1.121
@@ -194,6 +194,8 @@
 %{_datadir}/gnome/help/baobab/
 %{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
 %{_datadir}/icons/hicolor/48x48/apps/baobab.png
+%{_datadir}/icons/hicolor/48x48/apps/gnome-dictionary.png
+%{_datadir}/icons/hicolor/scalable/gnome-dictionary.svg
 %{_libexecdir}/gnome-dictionary-applet
 %{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 %{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:56:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:56:45 -0400
Subject: rpms/libsoup/devel .cvsignore, 1.17, 1.18 libsoup.spec, 1.33,
	1.34 sources, 1.17, 1.18
Message-ID: <200606131756.k5DHujM8021271@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21202

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.2.94



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	11 Apr 2006 03:10:00 -0000	1.17
+++ .cvsignore	13 Jun 2006 17:56:43 -0000	1.18
@@ -1,3 +1 @@
-libsoup-2.2.7.tar.bz2
-libsoup-2.2.91.tar.bz2
-libsoup-2.2.92.tar.bz2
+libsoup-2.2.94.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libsoup.spec	11 Apr 2006 03:10:01 -0000	1.33
+++ libsoup.spec	13 Jun 2006 17:56:43 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
-Version: 2.2.92
-Release: 2 
+Version: 2.2.94
+Release: 1
 License: LGPL
 Group: Development/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.94-1
+- Update to 2.2.94
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.92-2
 - Update to 2.2.92
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Apr 2006 03:10:01 -0000	1.17
+++ sources	13 Jun 2006 17:56:43 -0000	1.18
@@ -1 +1 @@
-44803c568d80f0adf3141fa23998ca74  libsoup-2.2.92.tar.bz2
+a242a7c4b874e080f049c8fdf90ea836  libsoup-2.2.94.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 17:57:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 13:57:28 -0400
Subject: rpms/avahi/devel avahi.spec,1.61,1.62
Message-ID: <200606131757.k5DHvSng021609@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21583

Modified Files:
	avahi.spec 
Log Message:
No mono on s390 / s390x anymore


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- avahi.spec	13 Jun 2006 17:29:53 -0000	1.61
+++ avahi.spec	13 Jun 2006 17:57:26 -0000	1.62
@@ -1,7 +1,7 @@
 %{?!WITH_MONO:  %define WITH_MONO 1}
 %{?!WITH_COMPAT_DNSSD:  %define WITH_COMPAT_DNSSD 1}
 %{?!WITH_COMPAT_HOWL:   %define WITH_COMPAT_HOWL  1}
-%ifarch ppc64
+%ifarch ppc64 s390 s390x
 %define WITH_MONO 0
 %endif
 Name:           avahi



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:02:39 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.51,1.52
Message-ID: <200606131802.k5DI2dUD022877@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22810

Modified Files:
	bug-buddy.spec 
Log Message:
fix build reqs



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- bug-buddy.spec	13 Jun 2006 17:25:29 -0000	1.51
+++ bug-buddy.spec	13 Jun 2006 18:02:19 -0000	1.52
@@ -41,6 +41,9 @@
 # Needed by intltool
 BuildRequires: perl-XML-Parser
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: libsoup-devel >= 2.2.90
+BuildRequires: libgtop2-devel >= 2.13.3
+BuildRequires: evolution-data-server-devel >= 1.3.0
 
 %description
 Bug-buddy is a bug reporting utility for the GNOME desktop GUI
@@ -110,6 +113,7 @@
 %changelog
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
 - Update to 2.15.0
+- Add more BuildRequires
 
 * Sun Mar 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:06:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:06:26 -0400
Subject: rpms/yelp/devel yelp.spec,1.61,1.62
Message-ID: <200606131806.k5DI6Qka023211@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23170

Modified Files:
	yelp.spec 
Log Message:
fix more build reqs



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- yelp.spec	13 Jun 2006 04:43:46 -0000	1.61
+++ yelp.spec	13 Jun 2006 18:06:24 -0000	1.62
@@ -55,6 +55,7 @@
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: libgnomeprintui22-devel
 BuildRequires: libXt-devel
+BuildRequires: perl-XML-Simple
 
 %ifnarch  s390 s390x ppc64
 BuildRequires:  libbeagle-devel



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:08:47 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.270, 1.271 anaconda.spec, 1.394,
	1.395 sources, 1.391, 1.392
Message-ID: <200606131808.k5DI8lPl023554@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23530/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.31-1 on branch devel from anaconda-11.1.0.31-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- .cvsignore	13 Jun 2006 03:22:07 -0000	1.270
+++ .cvsignore	13 Jun 2006 18:08:44 -0000	1.271
@@ -1 +1 @@
-anaconda-11.1.0.30.tar.bz2
+anaconda-11.1.0.31.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- anaconda.spec	13 Jun 2006 03:22:07 -0000	1.394
+++ anaconda.spec	13 Jun 2006 18:08:44 -0000	1.395
@@ -1,11 +1,11 @@
 Name: anaconda
-Version: 11.1.0.30
+Version: 11.1.0.31
 Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
 Source: anaconda-%{PACKAGE_VERSION}.tar.bz2
-BuildPreReq: pump-devel >= 0.8.20, kudzu-devel >= 1.2.0, pciutils-devel
+BuildPreReq: kudzu-devel >= 1.2.0, pciutils-devel
 BuildPreReq: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
 BuildPreReq: rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11
 BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
@@ -97,6 +97,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.31-1
+- Fix loader sigsegv (dcantrel, #194882)
+- Fix so we don't require yum.conf (clumens, #194987)
+- Fix s390 tree
+- Fix pkgorder for new yum API
+- Fix release notes (dcantrel)
+- More api fixing (clumens/nasrat)
+
 * Mon Jun 12 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.30-1
 - make loader flags global (dcantrel)
 - fixups for yum 2.9, pull in yum-metadata-parser


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- sources	13 Jun 2006 03:22:07 -0000	1.391
+++ sources	13 Jun 2006 18:08:44 -0000	1.392
@@ -1 +1 @@
-475b158ee5e87254c6a45db35a6bdde0  anaconda-11.1.0.30.tar.bz2
+8c639b9fa5ad827c3c6291cbae474660  anaconda-11.1.0.31.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:10:15 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.54,1.55
Message-ID: <200606131810.k5DIAFAw023829@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23815

Modified Files:
	libgtk-java.spec 
Log Message:
Add BuildRequires libtool


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libgtk-java.spec	24 May 2006 14:12:53 -0000	1.54
+++ libgtk-java.spec	13 Jun 2006 18:10:12 -0000	1.55
@@ -38,7 +38,7 @@
 BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
-BuildRequires:	autoconf automake
+BuildRequires:	autoconf automake libtool
 
 # ExcludeArch: s390x
 
@@ -159,6 +159,7 @@
 %changelog
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.8.4-4
 - Change mod time of all java source files for the src zip.
+- Add BuildRequires libtool.
 
 * Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 2.8.4-3
 - Add -X to src zip and ensure Config.java has the same mod time across



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:12:11 -0400
Subject: rpms/emacs/devel emacs.spec,1.70,1.71
Message-ID: <200606131812.k5DICBbS024175@cvs.devel.redhat.com>

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24139

Modified Files:
	emacs.spec 
Log Message:
lets try building on ppc64 again, just to see what happens


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- emacs.spec	18 Apr 2006 17:24:17 -0000	1.70
+++ emacs.spec	13 Jun 2006 18:12:08 -0000	1.71
@@ -1,6 +1,6 @@
 # This file is encoded in UTF-8.  -*- coding: utf-8 -*-
 # FIXME: doesn't currently build on ppc64
-ExcludeArch: ppc64
+# ExcludeArch: ppc64
 
 %define emacs21 1
 %define muleucs_ver current



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:12:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:12:44 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.68,1.69
Message-ID: <200606131812.k5DICi7m024341@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24285

Modified Files:
	gnome-media.spec 
Log Message:
Rebuild



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnome-media.spec	9 Jun 2006 17:21:05 -0000	1.68
+++ gnome-media.spec	13 Jun 2006 18:12:40 -0000	1.69
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.14.2
-Release:        3
+Release:        4
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
+- Rebuild against new nautilus-cd-burner
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - Fix missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:26:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:26:03 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.69,
	1.70 booleans-targeted.conf, 1.11, 1.12 policy-20060608.patch,
	1.3, 1.4 selinux-policy.spec, 1.206, 1.207 sources, 1.73, 1.74
Message-ID: <200606131826.k5DIQ3bL011003@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10966

Modified Files:
	.cvsignore booleans-targeted.conf policy-20060608.patch 
	selinux-policy.spec sources 
Log Message:
* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	9 Jun 2006 03:03:22 -0000	1.69
+++ .cvsignore	13 Jun 2006 18:26:00 -0000	1.70
@@ -70,3 +70,4 @@
 serefpolicy-2.2.42.tgz
 serefpolicy-2.2.43.tgz
 serefpolicy-2.2.45.tgz
+serefpolicy-2.2.46.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- booleans-targeted.conf	9 Jun 2006 02:55:43 -0000	1.11
+++ booleans-targeted.conf	13 Jun 2006 18:26:00 -0000	1.12
@@ -38,6 +38,10 @@
 # 
 allow_httpd_anon_write = false
 
+# Allow Apache to use mod_auth_pam module
+# 
+allow_httpd_mod_auth_pam = false
+
 # Allow system to run with kerberos
 # 
 allow_kerberos = true

policy-20060608.patch:
 global_tunables               |    7 +++++++
 modules/admin/bootloader.te   |    2 +-
 modules/admin/consoletype.te  |    7 ++++++-
 modules/admin/prelink.fc      |    3 +--
 modules/kernel/files.if       |   35 +++++++++++++++++++++++++++++++++++
 modules/kernel/kernel.if      |   38 ++++++++++++++++++++++++++++++++++++++
 modules/services/apache.te    |    4 ++++
 modules/services/ntp.te       |    1 +
 modules/services/pegasus.if   |   31 +++++++++++++++++++++++++++++++
 modules/services/pegasus.te   |    5 ++---
 modules/system/authlogin.if   |   22 +++++++++++-----------
 modules/system/hostname.te    |    5 ++++-
 modules/system/init.te        |    1 +
 modules/system/mount.te       |    1 +
 modules/system/selinuxutil.te |    2 ++
 modules/system/unconfined.fc  |    2 ++
 modules/system/userdomain.if  |    2 +-
 17 files changed, 148 insertions(+), 20 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060608.patch	12 Jun 2006 14:51:08 -0000	1.3
+++ policy-20060608.patch	13 Jun 2006 18:26:00 -0000	1.4
@@ -1,14 +1,35 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.45/config/appconfig-strict-mls/default_type
---- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.45/config/appconfig-strict-mls/default_type	2006-06-09 15:45:23.000000000 -0400
-@@ -2,3 +2,4 @@
- secadm_r:secadm_t
- staff_r:staff_t
- user_r:user_t
-+auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.45/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.46/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
++++ serefpolicy-2.2.46/policy/global_tunables	2006-06-13 13:00:04.000000000 -0400
+@@ -89,6 +89,13 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow Apache to use mod_auth_pam
++## </p>
++## </desc>
++gen_tunable(allow_httpd_mod_auth_pam,false)
++
++## <desc>
++## <p>
+ ## Allow java executable stack
+ ## </p>
+ ## </desc>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.46/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/admin/bootloader.te	2006-06-13 07:31:06.000000000 -0400
+@@ -49,7 +49,7 @@
+ #
+ 
+ allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
+-allow bootloader_t self:process { sigkill sigstop signull signal };
++allow bootloader_t self:process { sigkill sigstop signull signal execmem };
+ allow bootloader_t self:fifo_file rw_file_perms;
+ 
+ allow bootloader_t bootloader_etc_t:file r_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.46/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/admin/consoletype.te	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/admin/consoletype.te	2006-06-13 07:15:34.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -23,53 +44,20 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.45/policy/modules/admin/prelink.fc
---- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-01-25 12:52:21.000000000 -0500
-+++ serefpolicy-2.2.45/policy/modules/admin/prelink.fc	2006-06-09 15:45:23.000000000 -0400
-@@ -3,6 +3,6 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.46/policy/modules/admin/prelink.fc
+--- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/admin/prelink.fc	2006-06-13 07:24:35.000000000 -0400
+@@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
  
--/var/lib/misc/prelink\.*		--	gen_context(system_u:object_r:prelink_cache_t,s0)
-+/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
- 
+-/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
+-
  /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.45/policy/modules/admin/rpm.te
---- nsaserefpolicy/policy/modules/admin/rpm.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/admin/rpm.te	2006-06-09 15:45:23.000000000 -0400
-@@ -341,12 +341,16 @@
- 	optional_policy(`
- 		mono_domtrans(rpm_script_t)
- 	')
--',`
-+
- 	optional_policy(`
--		bootloader_domtrans(rpm_script_t)
-+		unconfined_domtrans(rpm_script_t)
- 	')
- ')
- 
-+optional_policy(`
-+	bootloader_domtrans(rpm_script_t)
-+')
-+
- ifdef(`distro_redhat',`
- 	optional_policy(`
- 		mta_send_mail(rpm_script_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.2.45/policy/modules/apps/webalizer.te
---- nsaserefpolicy/policy/modules/apps/webalizer.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/apps/webalizer.te	2006-06-09 15:45:23.000000000 -0400
-@@ -44,6 +44,7 @@
- allow webalizer_t self:unix_dgram_socket sendto;
- allow webalizer_t self:unix_stream_socket connectto;
- allow webalizer_t self:tcp_socket connected_stream_socket_perms;
-+allow webalizer_t self:udp_socket { connect connected_socket_perms };
- allow webalizer_t self:netlink_route_socket r_netlink_socket_perms;
- 
- allow webalizer_t webalizer_etc_t:file { getattr read };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.45/policy/modules/kernel/files.if
++/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.46/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/kernel/files.if	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/kernel/files.if	2006-06-13 07:15:34.000000000 -0400
 @@ -1931,6 +1931,21 @@
  ')
  
@@ -116,170 +104,79 @@
 +	allow $1 { file_type -security_file_type }:file mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.45/policy/modules/kernel/filesystem.te
---- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/kernel/filesystem.te	2006-06-09 15:45:23.000000000 -0400
-@@ -23,7 +23,7 @@
- # Requires that a security xattr handler exist for the filesystem.
- fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
- fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
--fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
-+fs_use_xattr gfs2 gen_context(system_u:object_r:fs_t,s0);
- fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0);
- fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0);
- 
-@@ -174,6 +174,7 @@
- genfscon hfs / gen_context(system_u:object_r:nfs_t,s0)
- genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0)
- genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
-+genfscon gfs / gen_context(system_u:object_r:nfs_t,s0)
- 
- ########################################
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.45/policy/modules/kernel/kernel.te
---- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/kernel/kernel.te	2006-06-09 15:45:23.000000000 -0400
-@@ -28,6 +28,7 @@
- 
- ifdef(`enable_mls',`
- 	role secadm_r;
-+	role auditadm_r;
- ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.46/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/kernel/kernel.if	2006-06-13 10:46:36.000000000 -0400
+@@ -2096,3 +2096,41 @@
  
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.45/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/automount.te	2006-06-09 15:45:23.000000000 -0400
-@@ -30,7 +30,7 @@
- 
- allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
- dontaudit automount_t self:capability sys_tty_config;
--allow automount_t self:process { signal_perms getpgid setpgid setsched };
-+allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
- allow automount_t self:fifo_file rw_file_perms;
- allow automount_t self:unix_stream_socket create_socket_perms;
- allow automount_t self:unix_dgram_socket create_socket_perms;
-@@ -58,9 +58,11 @@
- files_pid_filetrans(automount_t,automount_var_run_t,file)
- 
- kernel_read_kernel_sysctls(automount_t)
-+kernel_read_irq_sysctls(automount_t)
- kernel_read_fs_sysctls(automount_t)
- kernel_read_proc_symlinks(automount_t)
- kernel_read_system_state(automount_t)
-+kernel_read_network_state(automount_t)
- kernel_list_proc(automount_t)
- 
- files_search_boot(automount_t)
-@@ -92,6 +94,7 @@
- dev_read_urand(automount_t)
- 
- domain_use_interactive_fds(automount_t)
-+domain_dontaudit_read_all_domains_state(automount_t)
- 
- files_dontaudit_write_var_dirs(automount_t)
- files_getattr_all_dirs(automount_t)
-@@ -104,11 +107,14 @@
- files_getattr_default_dirs(automount_t)
- # because config files can be shell scripts
- files_exec_etc_files(automount_t)
-+files_mounton_mnt(automount_t)
- 
- fs_getattr_all_fs(automount_t)
- fs_getattr_all_dirs(automount_t)
- fs_search_auto_mountpoints(automount_t)
- fs_manage_auto_mountpoints(automount_t)
-+fs_unmount_autofs(automount_t)
-+fs_mount_autofs(automount_t)
- 
- term_dontaudit_use_console(automount_t)
- term_dontaudit_getattr_pty_dirs(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.45/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/cron.te	2006-06-09 15:45:23.000000000 -0400
-@@ -353,6 +353,7 @@
- 
- 	tunable_policy(`cron_can_relabel',`
- 		seutil_domtrans_setfiles(system_crond_t)
-+		seutil_domtrans_restorecon(system_crond_t)
- 	',`
- 		selinux_get_fs_mount(system_crond_t)
- 		selinux_validate_context(system_crond_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.45/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-06-08 23:00:30.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/cups.te	2006-06-09 15:45:23.000000000 -0400
-@@ -638,6 +638,10 @@
+ 	typeattribute $1 kern_unconfined;
  ')
- 
- optional_policy(`
-+	mount_send_nfs_client_request(hplip_t)
++
++########################################
++## <summary>
++##	Do not audit attempts to list sysctl_type directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_dontaudit_list_sysctls',`
++	gen_require(`
++		attribute sysctl_type;
++	')
++
++	dontaudit $1 sysctl_type:dir list_dir_perms;
 +')
 +
-+optional_policy(`
- 	udev_read_db(hplip_t)
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.45/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/ftp.te	2006-06-09 15:45:23.000000000 -0400
-@@ -59,6 +59,7 @@
- 
- allow ftpd_t ftpd_var_run_t:file create_file_perms;
- allow ftpd_t ftpd_var_run_t:dir rw_dir_perms;
-+allow ftpd_t ftpd_var_run_t:sock_file create_file_perms;
- files_pid_filetrans(ftpd_t,ftpd_var_run_t,file)
- 
- # Create and modify /var/log/xferlog.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.45/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/hal.te	2006-06-09 15:45:23.000000000 -0400
-@@ -140,6 +140,8 @@
- 
- sysnet_read_config(hald_t)
- 
-+auth_use_nsswitch(hald_t)
-+
- userdom_dontaudit_use_unpriv_user_fds(hald_t)
- userdom_dontaudit_search_sysadm_home_dirs(hald_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.45/policy/modules/services/mysql.te
---- nsaserefpolicy/policy/modules/services/mysql.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/mysql.te	2006-06-09 15:45:23.000000000 -0400
-@@ -101,7 +101,7 @@
- 
- miscfiles_read_localization(mysqld_t)
- 
--sysnet_use_ldap(mysqld_t)
-+auth_use_nsswitch(mysqld_t)
- sysnet_read_config(mysqld_t)
- 
- userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.45/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/networkmanager.te	2006-06-11 07:42:46.000000000 -0400
-@@ -172,3 +172,7 @@
- 	vpn_domtrans(NetworkManager_t)
- 	vpn_signal(NetworkManager_t)
- ')
 +
-+optional_policy(`
-+	ppp_domtrans(NetworkManager_t)
++########################################
++## <summary>
++##	Do not audit attempts to list proc_type file/directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_dontaudit_list_all_proc',`
++	gen_require(`
++		attribute proc_type;
++	')
++
++	dontaudit $1 proc_type:dir list_dir_perms;
++	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.45/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/ntp.te	2006-06-09 15:45:23.000000000 -0400
-@@ -112,6 +112,8 @@
- 
- sysnet_read_config(ntpd_t)
- 
-+auth_use_nsswitch(ntpd_t)
-+
- userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
- userdom_list_sysadm_home_dirs(ntpd_t)
- userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.45/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.46/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/services/apache.te	2006-06-13 13:21:35.000000000 -0400
+@@ -293,6 +293,10 @@
+ 	miscfiles_manage_public_files(httpd_t)
+ ') 
+ 
++tunable_policy(`allow_httpd_mod_auth_pam',`
++	auth_domtrans_chk_passwd(httpd_t)
++')
++
+ tunable_policy(`httpd_can_network_connect',`
+ 	corenet_tcp_connect_all_ports(httpd_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.46/policy/modules/services/ntp.te
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/services/ntp.te	2006-06-13 07:35:06.000000000 -0400
+@@ -62,6 +62,7 @@
+ 
+ kernel_read_kernel_sysctls(ntpd_t)
+ kernel_read_system_state(ntpd_t)
++kernel_read_network_state(ntpd_t)
+ 
+ corenet_non_ipsec_sendrecv(ntpd_t)
+ corenet_tcp_sendrecv_all_if(ntpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.46/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/pegasus.if	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/services/pegasus.if	2006-06-13 07:15:34.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -313,9 +210,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.45/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.46/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/pegasus.te	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/services/pegasus.te	2006-06-13 07:15:34.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -332,55 +229,41 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.45/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/procmail.te	2006-06-09 15:45:23.000000000 -0400
-@@ -109,3 +109,8 @@
- 	spamassassin_exec(procmail_t)
- 	spamassassin_exec_client(procmail_t)
- ')
-+
-+optional_policy(`
-+	clamav_domtrans_clamscan(procmail_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.45/policy/modules/services/pyzor.te
---- nsaserefpolicy/policy/modules/services/pyzor.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/pyzor.te	2006-06-09 15:45:23.000000000 -0400
-@@ -126,3 +126,7 @@
- optional_policy(`
- 	nscd_socket_use(pyzord_t)
- ')
-+
-+ifdef(`targeted_policy',`
-+	userdom_read_generic_user_home_content_files(pyzord_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.45/policy/modules/services/xfs.te
---- nsaserefpolicy/policy/modules/services/xfs.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/services/xfs.te	2006-06-09 15:45:23.000000000 -0400
-@@ -69,6 +69,8 @@
- miscfiles_read_localization(xfs_t)
- miscfiles_read_fonts(xfs_t)
- 
-+auth_use_nsswitch(xfs_t)
-+
- userdom_dontaudit_use_unpriv_user_fds(xfs_t)
- userdom_dontaudit_search_sysadm_home_dirs(xfs_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.45/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2006-05-12 09:22:08.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/authlogin.if	2006-06-09 15:45:23.000000000 -0400
-@@ -1287,6 +1287,7 @@
- 	allow $1 var_auth_t:dir r_dir_perms;
- 	allow $1 var_auth_t:file create_file_perms;
- 	files_list_var_lib($1)
-+	allow $1 self:netlink_route_socket r_netlink_socket_perms;
- 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.46/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/authlogin.if	2006-06-13 13:32:13.000000000 -0400
+@@ -275,17 +275,17 @@
  	sysnet_dns_name_resolve($1)
  	sysnet_use_ldap($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.45/policy/modules/system/hostname.te
+ 
+-	optional_policy(`
+-		kerberos_use($1)
+-	')
+-
+-	optional_policy(`
+-		nis_use_ypbind($1)
+-	')
+-
+-	optional_policy(`
+-		samba_stream_connect_winbind($1)
+-	')
++#	optional_policy(`
++#		kerberos_use($1)
++#	')
++
++#	optional_policy(`
++#		nis_use_ypbind($1)
++#	')
++
++#	optional_policy(`
++#		samba_stream_connect_winbind($1)
++#	')
+ ')
+ 
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.46/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.45/policy/modules/system/hostname.te	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/hostname.te	2006-06-13 07:15:34.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -393,9 +276,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.45/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.46/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/init.te	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/init.te	2006-06-13 07:15:34.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -404,74 +287,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.2.45/policy/modules/system/logging.fc
---- nsaserefpolicy/policy/modules/system/logging.fc	2006-02-02 16:12:27.000000000 -0500
-+++ serefpolicy-2.2.45/policy/modules/system/logging.fc	2006-06-09 15:45:23.000000000 -0400
-@@ -1,9 +1,6 @@
- 
- /dev/log			-s	gen_context(system_u:object_r:devlog_t,s0)
- 
--/etc/auditd.conf		--	gen_context(system_u:object_r:auditd_etc_t,s0)
--/etc/audit.rules		--	gen_context(system_u:object_r:auditd_etc_t,s0)
--
- /sbin/auditctl		--	gen_context(system_u:object_r:auditctl_exec_t,s0)
- /sbin/auditd		--	gen_context(system_u:object_r:auditd_exec_t,s0)
- /sbin/klogd		--	gen_context(system_u:object_r:klogd_exec_t,s0)
-@@ -39,3 +36,6 @@
- /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
- 
- /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
-+/etc/audit(/.*)?		gen_context(system_u:object_r:auditd_etc_t,s15:c0.c255)
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.45/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/logging.te	2006-06-09 15:45:23.000000000 -0400
-@@ -70,6 +70,7 @@
- 
- allow auditctl_t etc_t:file { getattr read };
- 
-+allow auditctl_t auditd_etc_t:dir r_dir_perms;
- allow auditctl_t auditd_etc_t:file r_file_perms;
- 
- # Needed for adding watches
-@@ -111,6 +112,7 @@
- allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
- allow auditd_t self:fifo_file rw_file_perms;
- 
-+allow auditd_t auditd_etc_t:dir r_dir_perms;
- allow auditd_t auditd_etc_t:file r_file_perms;
- 
- allow auditd_t auditd_log_t:dir rw_dir_perms;
-@@ -123,9 +125,8 @@
- files_pid_filetrans(auditd_t,auditd_var_run_t,file)
- 
- kernel_read_kernel_sysctls(auditd_t)
--# Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
--# Probably want a transition, and a new auditd_helper app
--kernel_read_system_state(auditd_t)
-+kernel_list_proc(auditd_t)
-+kernel_read_proc_symlinks(auditd_t)
- 
- dev_read_sysfs(auditd_t)
- 
-@@ -134,11 +135,12 @@
- 
- term_dontaudit_use_console(auditd_t)
- 
-+# cjp: why?
- # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
- # Probably want a transition, and a new auditd_helper app
- corecmd_exec_sbin(auditd_t)
- corecmd_exec_bin(auditd_t)
--
-+kernel_read_system_state(auditd_t)
- 
- domain_use_interactive_fds(auditd_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.45/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.46/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/mount.te	2006-06-09 15:45:23.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/mount.te	2006-06-13 07:15:34.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -480,137 +298,32 @@
  	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.45/policy/modules/system/unconfined.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.46/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/selinuxutil.te	2006-06-13 10:46:54.000000000 -0400
+@@ -352,6 +352,8 @@
+ kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
+ kernel_relabelfrom_unlabeled_pipes(restorecon_t)
+ kernel_relabelfrom_unlabeled_sockets(restorecon_t)
++kernel_dontaudit_list_all_proc(restorecon_t)
++kernel_dontaudit_list_sysctls(restorecon_t)
+ 
+ dev_relabel_all_dev_nodes(restorecon_t)
+ # cjp: why is this needed?
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.46/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/unconfined.fc	2006-06-09 15:45:23.000000000 -0400
-@@ -4,7 +4,9 @@
- # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
- /usr/bin/vncserver	--	gen_context(system_u:object_r:unconfined_exec_t,s0)
- 
--ifdef(`targeted_policy',`
--/usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
--/usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/lib/openoffice.org.*/program/.*\.bin	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/bin/valgrind 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+ifdef(`targeted_policy', `
-+/usr/bin/mplayer 	-- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.45/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/unconfined.if	2006-06-09 15:45:23.000000000 -0400
-@@ -449,3 +449,31 @@
- 
- 	allow $1 unconfined_t:dbus acquire_svc;
- ')
-+
-+########################################
-+## <summary>
-+##	Execute the application that requires dexecmem program in the unconfined_execmem domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`unconfined_execmem_domtrans',`
-+	ifdef(`targeted_policy',`
-+		gen_require(`
-+			type unconfined_execmem_t, unconfined_execmem_exec_t;
-+		')
-+
-+		corecmd_search_bin($1)
-+		domain_auto_trans($1, unconfined_execmem_exec_t, unconfined_execmem_t)
-+
-+		allow $1 unconfined_execmem_t:fd use;
-+		allow unconfined_execmem_t $1:fd use;
-+		allow unconfined_execmem_t $1:fifo_file rw_file_perms;
-+		allow unconfined_execmem_t $1:process sigchld;
-+	',`
-+		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
-+	')
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.45/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/unconfined.te	2006-06-09 15:45:23.000000000 -0400
-@@ -33,8 +33,6 @@
- 	allow unconfined_t self:system syslog_read;
- 	dontaudit unconfined_t self:capability sys_module;
- 
--	domain_auto_trans(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
--
- 	files_create_boot_flag(unconfined_t)
- 
- 	init_domtrans_script(unconfined_t)
-@@ -114,6 +112,10 @@
- 	')
- 
- 	optional_policy(`
-+		unconfined_execmem_domtrans(unconfined_t)
-+	')
-+
-+	optional_policy(`
- 		lpd_domtrans_checkpc(unconfined_t)
- 	')
- 
-@@ -180,11 +182,16 @@
- 	optional_policy(`
- 		xserver_domtrans_xdm_xserver(unconfined_t)
- 	')
-+
-+	optional_policy(`
-+		pegasus_domtrans(unconfined_t)
-+	')
-+
- ')
- 
- ########################################
- #
--# Unconfined Execmem Local policy
-+# Local policy
- #
- 
++++ serefpolicy-2.2.46/policy/modules/system/unconfined.fc	2006-06-13 07:22:25.000000000 -0400
+@@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.45/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/userdomain.if	2006-06-12 10:32:05.000000000 -0400
-@@ -474,34 +474,6 @@
- 		xserver_create_xdm_tmp_sockets($1_t)
- 	')
- 
--	ifdef(`TODO',`
--	#
--	# Cups daemon running as user tries to write /etc/printcap
--	#
--	dontaudit $1_t usr_t:file setattr;
--
--	# /initrd is left mounted, various programs try to look at it
--	dontaudit $1_t ramfs_t:dir getattr;
--
--	#
--	# Running ifconfig as a user generates the following
--	#
--	dontaudit $1_t sysctl_net_t:dir search;
--
--	r_dir_file($1_t, usercanread)
--
--	# old browser_domain():
--	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir_file_class_set getattr;
--	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir search;
--	dontaudit $1 { fs_type proc_fs dev_fs sysctl_type }:dir read;
--
--	allow $1_t usbtty_device_t:chr_file read;
--
--	ifdef(`xdm.te', `
--		allow $1_t xdm_var_lib_t:file r_file_perms;
--	')
--	') dnl endif TODO
--
- ')
- 
- #######################################
-@@ -4174,7 +4146,7 @@
+ /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/local/RealPlay/realplay 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.46/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/userdomain.if	2006-06-13 07:15:34.000000000 -0400
+@@ -4145,7 +4145,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -619,168 +332,3 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.45/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.45/policy/modules/system/userdomain.te	2006-06-09 15:45:23.000000000 -0400
-@@ -1,11 +1,12 @@
- 
--policy_module(userdomain,1.3.27)
-+policy_module(userdomain,1.3.26)
- 
- gen_require(`
- 	role sysadm_r, staff_r, user_r;
- 
- 	ifdef(`enable_mls',`
- 		role secadm_r;
-+		role auditadm_r;
- 	')
- ')
- 
-@@ -67,6 +68,7 @@
- 	# Define some type aliases to help with compatibility with
- 	# macros and domains from the "strict" policy.
- 	unconfined_alias_domain(secadm_t)
-+	unconfined_alias_domain(auditadm_t)
- 	unconfined_alias_domain(sysadm_t)
- 
- 	# User home directory type.
-@@ -82,6 +84,7 @@
- 
- 	# compatibility for switching from strict
- #	dominance { role secadm_r { role system_r; }}
-+#	dominance { role auditadm_r { role system_r; }}
- #	dominance { role sysadm_r { role system_r; }}
- #	dominance { role user_r { role system_r; }}
- #	dominance { role staff_r { role system_r; }}
-@@ -105,8 +108,10 @@
- 
- 	ifdef(`enable_mls',`
- 		allow secadm_r system_r;
-+		allow auditadm_r system_r;
- 		allow secadm_r user_r;
- 		allow staff_r secadm_r;
-+		allow staff_r auditadm_r;
- 	')
- 
- 	optional_policy(`
-@@ -126,9 +131,21 @@
- 	role_change(staff, sysadm)
- 
- 	ifdef(`enable_mls',`
--		admin_user_template(secadm)
-+#		admin_user_template(secadm)
-+#		admin_user_template(auditadm)
-+		unpriv_user_template(secadm)
-+		unpriv_user_template(auditadm)
-+
-+		role_change(staff,auditadm)
- 		role_change(staff,secadm)
-+
- 		role_change(sysadm,secadm)
-+		role_change(sysadm,auditadm)
-+
-+		role_change(auditadm,secadm)
-+		role_change(auditadm,sysadm)
-+
-+		role_change(secadm,auditadm)
- 		role_change(secadm,sysadm)
- 	')
- 
-@@ -172,19 +189,33 @@
- 	')
- 
- 	ifdef(`enable_mls',`
-+		allow secadm_t self:capability dac_override;
- 		corecmd_exec_shell(secadm_t)
- 		mls_process_read_up(secadm_t)
-+		mls_file_read_up(secadm_t)
- 		mls_file_write_down(secadm_t)
- 		mls_file_upgrade(secadm_t)
- 		mls_file_downgrade(secadm_t)
- 		init_exec(secadm_t)
- 		logging_read_audit_log(secadm_t)
--		logging_run_auditctl(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
- 		userdom_dontaudit_append_staff_home_content_files(secadm_t)
--		files_relabel_all_files(secadm_t)
-+	        auth_relabel_all_files_except_shadow(secadm_t)
- 		auth_relabel_shadow(secadm_t)
-+		domain_obj_id_change_exemption(secadm_t)
-+	        logging_read_generic_logs(secadm_t)
-+
-+		seutil_run_runinit(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t })
-+		domain_kill_all_domains(auditadm_t)
-+	        seutil_read_bin_policy(auditadm_t)
-+		corecmd_exec_shell(auditadm_t)
-+	        logging_read_generic_logs(auditadm_t)
-+		logging_manage_audit_log(auditadm_t)
-+		logging_manage_audit_config(auditadm_t)
-+		logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t })
-+		logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t })
- 	', `
--		logging_read_audit_log(sysadm_t)
-+		logging_manage_audit_log(sysadm_t)
-+		logging_manage_audit_config(sysadm_t)
- 		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
- 	')
- 
-@@ -252,6 +283,7 @@
- 
- 		ifdef(`enable_mls',`
- 			consoletype_exec(secadm_t)
-+			consoletype_exec(auditadm_t)
- 		')
- 	')
- 
-@@ -270,6 +302,7 @@
- 
- 		ifdef(`enable_mls',`
- 			dmesg_exec(secadm_t)
-+			dmesg_exec(auditadm_t)
- 		')
- 	')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.45/policy/rolemap
---- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.45/policy/rolemap	2006-06-09 15:45:23.000000000 -0400
-@@ -15,5 +15,6 @@
- 
- 	ifdef(`enable_mls',`
- 		secadm_r secadm secadm_t
-+		auditadm_r auditadm auditadm_t
- 	')
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_macros.spt serefpolicy-2.2.45/policy/support/misc_macros.spt
---- nsaserefpolicy/policy/support/misc_macros.spt	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.45/policy/support/misc_macros.spt	2006-06-09 15:45:23.000000000 -0400
-@@ -37,7 +37,7 @@
- #
- # gen_context(context,mls_sensitivity,[mcs_categories])
- #
--define(`gen_context',`$1`'ifdef(`enable_mls',`:$2')`'ifdef(`enable_mcs',`:s0`'ifelse(`$3',,,`:$3')')')dnl
-+define(`gen_context',`$1`'ifdef(`enable_mls',`:$2')`'ifdef(`enable_mcs',`:s0`'ifelse(`$3',,,`:$3')')') dnl
- 
- ########################################
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.45/policy/users
---- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.45/policy/users	2006-06-09 15:45:23.000000000 -0400
-@@ -29,7 +29,7 @@
- gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
- ',`
- gen_user(user_u, user, user_r, s0, s0)
--gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
-+gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
- gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - s15:c0.c255, c0.c255)
- ')
- 
-@@ -44,8 +44,8 @@
- 	gen_user(root, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
- ',`
- 	ifdef(`direct_sysadm_daemon',`
--		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
-+		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
- 	',`
--		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
-+		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
- 	')
- ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- selinux-policy.spec	12 Jun 2006 14:51:08 -0000	1.206
+++ selinux-policy.spec	13 Jun 2006 18:26:00 -0000	1.207
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.45
-Release: 2
+Version: 2.2.46
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -336,6 +336,12 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-1
+- Update to upstream
+
+* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-3
+- Fix semanage
+
 * Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-2
 - Allow useradd to create_home_dir in MLS environment
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	9 Jun 2006 03:03:22 -0000	1.73
+++ sources	13 Jun 2006 18:26:00 -0000	1.74
@@ -1 +1 @@
-e5a6df9971751f496d9f2fd1f9c74e19  serefpolicy-2.2.45.tgz
+f2d0b4bf8b24ad899b08dcd4f347a044  serefpolicy-2.2.46.tgz



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:27:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:27:59 -0400
Subject: rpms/lftp/FC-5 lftp.spec,1.49,1.50
Message-ID: <200606131827.k5DIRxdb011855@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11807

Modified Files:
	lftp.spec 
Log Message:
stop building lftp on ia64, ppc64, s390*


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/lftp.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- lftp.spec	12 Jun 2006 22:42:27 -0000	1.49
+++ lftp.spec	13 Jun 2006 18:27:56 -0000	1.50
@@ -12,7 +12,13 @@
 Patch173276: 	lftp-3.3.5-bz173276.patch
 Patch2:		lftp-3.4.1-dont_core.patch
 Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
-Patch4:         lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch
+#Patch4:         lftp-3.4.7-s390x-gcc-4.1.1-no-exceptions.patch
+#
+ExclusiveArch:  i386 ppc x86_64
+# ^- We only ship updates for these architectures, so since
+#    the s390x build is blocked by gcc bug 193773, let's not
+#    build lftp for arches that will never be shipped.
+#
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -28,9 +34,9 @@
 #^- now fixed upstream
 #%patch181694 -p1 -b .bz181694
 #^- now fixed upstream
-%ifarch s390x
-%patch4 -p1 -b .s390x-fno-exceptions
-%endif
+#%ifarch s390x
+#%patch4 -p1 -b .s390x-fno-exceptions
+#%endif
 
 %build
 if pkg-config openssl ; then



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:34:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:34:33 -0400
Subject: rpms/control-center/devel .cvsignore, 1.40, 1.41 control-center.spec,
	1.141, 1.142 sources, 1.43, 1.44
Message-ID: <200606131834.k5DIYXjY012985@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12951

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	29 May 2006 19:23:57 -0000	1.40
+++ .cvsignore	13 Jun 2006 18:34:19 -0000	1.41
@@ -13,3 +13,4 @@
 control-center-2.14.0.tar.bz2
 control-center-2.14.1.tar.bz2
 control-center-2.14.2.tar.bz2
+control-center-2.15.3.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- control-center.spec	7 Jun 2006 20:21:36 -0000	1.141
+++ control-center.spec	13 Jun 2006 18:34:20 -0000	1.142
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.14.2
-Release: 3
+Version: 2.15.3
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -250,6 +250,9 @@
 %{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Tue Jun  6 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-3
 - Add devel package.
 - Add build requires for autoconf, automake, and libtool.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	29 May 2006 19:23:57 -0000	1.43
+++ sources	13 Jun 2006 18:34:20 -0000	1.44
@@ -1,2 +1,2 @@
 e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
-08711b0f14584e7eaa9f4c275085ab36  control-center-2.14.2.tar.bz2
+8e6f9e1247e7878642177f6c6acd78fe  control-center-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:41:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:41:32 -0400
Subject: rpms/star/devel star.spec,1.27,1.28
Message-ID: <200606131841.k5DIfW6B014295@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/star/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14246

Modified Files:
	star.spec 
Log Message:
use autoconf provided by star



Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- star.spec	2 Jun 2006 10:53:52 -0000	1.27
+++ star.spec	13 Jun 2006 18:41:30 -0000	1.28
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5a74
-Release: 2
+Release: 3
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
@@ -13,7 +13,7 @@
 License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libattr-devel libacl-devel libtool libselinux-devel autoconf213
+BuildRequires: libattr-devel libacl-devel libtool libselinux-devel
 
 %description
 Star saves many files together into a single tape or disk archive,
@@ -37,7 +37,7 @@
 export COPTOPT="$RPM_OPT_FLAGS"
 export MAKEPROG=gmake
 # Autoconfiscate
-(cd conf; autoconf-2.13)
+(cd conf; AC_MACRODIR=. AWK=gawk ./autoconf)
 # Disable fat binary
 (cd star; rm Makefile; cp all.mk Makefile)
 
@@ -97,6 +97,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a74-3
+- use autoconf provided by star
+
 * Fri Jun 02 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a74-2
 - update tarball
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:42:18 -0400
Subject: rpms/gdm/devel .cvsignore, 1.28, 1.29 gdm.spec, 1.162, 1.163 sources,
	1.30, 1.31
Message-ID: <200606131842.k5DIgIRf014528@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14420

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.15.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	17 May 2006 20:08:03 -0000	1.28
+++ .cvsignore	13 Jun 2006 18:42:16 -0000	1.29
@@ -1 +1 @@
-gdm-2.15.3.tar.bz2
+gdm-2.15.5.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gdm.spec	13 Jun 2006 02:30:03 -0000	1.162
+++ gdm.spec	13 Jun 2006 18:42:16 -0000	1.163
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.15.3
-Release: 8
+Version: 2.15.5
+Release: 1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -318,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 1:2.15.5-1
+- Update to 2.15.5
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 1:2.15.3-8
 - replace automake14 buildreq with automake
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	17 May 2006 20:08:05 -0000	1.30
+++ sources	13 Jun 2006 18:42:16 -0000	1.31
@@ -1 +1 @@
-e357d94954a774acbdc8b620d5a91e15  gdm-2.15.3.tar.bz2
+dd4475699ff58fdbf29b4e56ffdc74e1  gdm-2.15.5.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:44:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:44:45 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.35, 1.36 gtkhtml3.spec, 1.62,
	1.63 sources, 1.35, 1.36
Message-ID: <200606131844.k5DIij4l015557@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15503

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
3.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 May 2006 16:34:11 -0000	1.35
+++ .cvsignore	13 Jun 2006 18:44:43 -0000	1.36
@@ -1 +1 @@
-gtkhtml-3.11.2.tar.bz2
+gtkhtml-3.11.3.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gtkhtml3.spec	16 May 2006 16:34:12 -0000	1.62
+++ gtkhtml3.spec	13 Jun 2006 18:44:43 -0000	1.63
@@ -4,7 +4,7 @@
 
 Summary: gtkhtml library
 Name: gtkhtml3
-Version: 3.11.2
+Version: 3.11.3
 Release: 1
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 3.11.3-1
+- Update to 3.11.3
+
 * Tue May 16 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.2-1
 - Update to 3.11.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	16 May 2006 16:34:12 -0000	1.35
+++ sources	13 Jun 2006 18:44:43 -0000	1.36
@@ -1 +1 @@
-b7c8ab5530130c1ad86af93eb0cca255  gtkhtml-3.11.2.tar.bz2
+32bfb28f4dabd16d750473f049157dd6  gtkhtml-3.11.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:47:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:47:41 -0400
Subject: rpms/gdm/devel gdm.spec,1.163,1.164
Message-ID: <200606131847.k5DIlflw031277@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31212

Modified Files:
	gdm.spec 
Log Message:
drop upstreamed patches



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gdm.spec	13 Jun 2006 18:42:16 -0000	1.163
+++ gdm.spec	13 Jun 2006 18:47:39 -0000	1.164
@@ -43,7 +43,8 @@
 Patch18: gdm-2.8.0.4-dont-call-xsm.patch
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch22: gdm-2.13.0.7-pam_stack.patch
-Patch23: gdm-2.15.3-chown.patch
+# got upstreamed
+#Patch23: gdm-2.15.3-chown.patch
 Patch24: gdm-2.15.3-support-xdm-nodaemon-option.patch
 Patch25: gdm-2.15.3-CVE-2006-2452.patch
 
@@ -122,7 +123,7 @@
 %patch18 -p1 -b .dont-call-xsm
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
-%patch23 -p1 -b .chown
+#%patch23 -p1 -b .chown
 %patch24 -p1 -b .support-xdm-nodaemon-option
 
 # fix the time format for ja



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:49:39 -0400
Subject: rpms/control-center/devel control-center.spec,1.142,1.143
Message-ID: <200606131849.k5DIndY9032097@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32036

Modified Files:
	control-center.spec 
Log Message:
add more build reqs



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- control-center.spec	13 Jun 2006 18:34:20 -0000	1.142
+++ control-center.spec	13 Jun 2006 18:49:36 -0000	1.143
@@ -86,6 +86,8 @@
 BuildRequires: libxkbfile-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gnome-doc-utils
+BuildRequires: gstreamer
+BuildRequires: gstreamer-plugins-base
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:53:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:53:09 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.52,1.53
Message-ID: <200606131853.k5DIr9B7001040@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv996

Modified Files:
	bug-buddy.spec 
Log Message:
fix file lists



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- bug-buddy.spec	13 Jun 2006 18:02:19 -0000	1.52
+++ bug-buddy.spec	13 Jun 2006 18:53:06 -0000	1.53
@@ -101,9 +101,7 @@
 
 %{_datadir}/pixmaps
 %{_datadir}/bug-buddy
-%{_datadir}/mime-info
 %{_datadir}/applications
-%{_datadir}/application-registry
 %{_datadir}/gnome
 %{_datadir}/omf
 %{_bindir}/*



From fedora-cvs-commits at redhat.com  Tue Jun 13 18:59:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 14:59:36 -0400
Subject: rpms/rgmanager/devel .cvsignore, 1.4, 1.5 rgmanager.spec, 1.22,
	1.23 sources, 1.9, 1.10
Message-ID: <200606131859.k5DIxawa003475@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3443

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
Build for fc6.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2006 16:52:55 -0000	1.4
+++ .cvsignore	13 Jun 2006 18:59:34 -0000	1.5
@@ -1 +1 @@
-rgmanager-1.9.46.tar.gz
+rgmanager-2.0.0.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rgmanager.spec	13 Feb 2006 16:52:57 -0000	1.22
+++ rgmanager.spec	13 Jun 2006 18:59:34 -0000	1.23
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 1.9.46
-Release: 0.FC5.0
+Version: 2.0.0
+Release: 0.fc6.0
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
@@ -24,7 +24,7 @@
 Provides: rgmanager
 Obsoletes: clumanager
 BuildRequires: glibc-devel ncurses-devel libxml2-devel /bin/grep
-BuildRequires: magma ccs-devel magma-devel
+BuildRequires: cman
 ExclusiveArch: %{ix86} x86_64
 Source: %{name}-%{version}.tar.gz
 Patch1: rgmanager-1.9.31-norun.patch
@@ -38,7 +38,7 @@
 %patch1 -p1 -b .norun
 
 %build
-./configure
+./configure --kernel_src=/usr/src/kernels/2.6.16-1.2236_FC6-i686/
 
 sed -i '/RELEASE_MAJOR/s/= .*/= %version/' make/defines.mk
 sed -i '/RELEASE_MINOR/s/= .*/= %release/' make/defines.mk
@@ -70,6 +70,9 @@
 %config /etc/rc.d/init.d/rgmanager
 
 %changelog
+* Tue Jun 13 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.0
+- Built for fc6
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.44-0.FC5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Feb 2006 16:52:57 -0000	1.9
+++ sources	13 Jun 2006 18:59:34 -0000	1.10
@@ -1 +1 @@
-323f9b74c62b14223012c9676f83a4d4  rgmanager-1.9.46.tar.gz
+dbedb8b0c390a90f4ac7c0cfa6d8af17  rgmanager-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:06:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:06:33 -0400
Subject: rpms/control-center/devel control-center.spec,1.143,1.144
Message-ID: <200606131906.k5DJ6Xmc004059@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4018

Modified Files:
	control-center.spec 
Log Message:
fix more build reqs



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- control-center.spec	13 Jun 2006 18:49:36 -0000	1.143
+++ control-center.spec	13 Jun 2006 19:06:20 -0000	1.144
@@ -56,7 +56,7 @@
 Requires: usermode >= %{usermode_version}
 
 BuildRequires: autoconf automake libtool
-BuildRequires: esound
+BuildRequires: esound-devel
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
@@ -88,6 +88,8 @@
 BuildRequires: gnome-doc-utils
 BuildRequires: gstreamer
 BuildRequires: gstreamer-plugins-base
+BuildRequires: libglade2-devel
+BuildRequires: libxml2-devel
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:08:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:08:57 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.23,1.24
Message-ID: <200606131908.k5DJ8vW0004397@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4376

Modified Files:
	rgmanager.spec 
Log Message:
Added buildrequire for cman-devel.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rgmanager.spec	13 Jun 2006 18:59:34 -0000	1.23
+++ rgmanager.spec	13 Jun 2006 19:08:43 -0000	1.24
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.0
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
@@ -24,7 +24,7 @@
 Provides: rgmanager
 Obsoletes: clumanager
 BuildRequires: glibc-devel ncurses-devel libxml2-devel /bin/grep
-BuildRequires: cman
+BuildRequires: cman-devel
 ExclusiveArch: %{ix86} x86_64
 Source: %{name}-%{version}.tar.gz
 Patch1: rgmanager-1.9.31-norun.patch



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:16:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:16:21 -0400
Subject: rpms/gdm/devel gdm.spec,1.164,1.165
Message-ID: <200606131916.k5DJGL12011783@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10683

Modified Files:
	gdm.spec 
Log Message:
drop more patches



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gdm.spec	13 Jun 2006 18:47:39 -0000	1.164
+++ gdm.spec	13 Jun 2006 19:16:19 -0000	1.165
@@ -45,8 +45,8 @@
 Patch22: gdm-2.13.0.7-pam_stack.patch
 # got upstreamed
 #Patch23: gdm-2.15.3-chown.patch
-Patch24: gdm-2.15.3-support-xdm-nodaemon-option.patch
-Patch25: gdm-2.15.3-CVE-2006-2452.patch
+#Patch24: gdm-2.15.3-support-xdm-nodaemon-option.patch
+#Patch25: gdm-2.15.3-CVE-2006-2452.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -124,7 +124,7 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
 #%patch23 -p1 -b .chown
-%patch24 -p1 -b .support-xdm-nodaemon-option
+#%patch24 -p1 -b .support-xdm-nodaemon-option
 
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:19:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:19:13 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.24,1.25 sources,1.10,1.11
Message-ID: <200606131919.k5DJJDSV021572@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21546

Modified Files:
	rgmanager.spec sources 
Log Message:
Build with new sources package.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rgmanager.spec	13 Jun 2006 19:08:43 -0000	1.24
+++ rgmanager.spec	13 Jun 2006 19:19:10 -0000	1.25
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.0
-Release: 0.fc6.1
+Release: 0.fc6.2
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jun 2006 18:59:34 -0000	1.10
+++ sources	13 Jun 2006 19:19:10 -0000	1.11
@@ -1 +1 @@
-dbedb8b0c390a90f4ac7c0cfa6d8af17  rgmanager-2.0.0.tar.gz
+5ba1f14223f0b2c08f3c9d26940d6b18  rgmanager-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:21:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:21:40 -0400
Subject: rpms/yelp/devel yelp.spec,1.62,1.63
Message-ID: <200606131921.k5DJLeYT022550@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22301

Modified Files:
	yelp.spec 
Log Message:
Mmore build reqs



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- yelp.spec	13 Jun 2006 18:06:24 -0000	1.62
+++ yelp.spec	13 Jun 2006 19:21:37 -0000	1.63
@@ -56,6 +56,8 @@
 BuildRequires: libgnomeprintui22-devel
 BuildRequires: libXt-devel
 BuildRequires: perl-XML-Simple
+BuildRequires: dbus-glib
+
 
 %ifnarch  s390 s390x ppc64
 BuildRequires:  libbeagle-devel



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:22:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:22:16 -0400
Subject: rpms/audit/devel audit-1.2.1-header-abuse.patch, 1.1,
	NONE audit-1.2.1-include.patch, 1.1, NONE
Message-ID: <200606131922.k5DJMGA2022870@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22792

Removed Files:
	audit-1.2.1-header-abuse.patch audit-1.2.1-include.patch 
Log Message:
Little cleanup



--- audit-1.2.1-header-abuse.patch DELETED ---


--- audit-1.2.1-include.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:27:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:27:08 -0400
Subject: rpms/gnome-python2/devel .cvsignore, 1.15, 1.16 gnome-python.spec,
	1.36, 1.37 sources, 1.15, 1.16
Message-ID: <200606131927.k5DJR8nb024785@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24738

Modified Files:
	.cvsignore gnome-python.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Mar 2006 15:44:59 -0000	1.15
+++ .cvsignore	13 Jun 2006 19:27:05 -0000	1.16
@@ -1 +1 @@
-gnome-python-2.12.4.tar.bz2
+gnome-python-2.15.2.tar.bz2


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-python.spec	13 Mar 2006 15:44:59 -0000	1.36
+++ gnome-python.spec	13 Jun 2006 19:27:05 -0000	1.37
@@ -6,7 +6,7 @@
 
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
-Version: 2.12.4
+Version: 2.15.2
 Release: 1
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
 Patch1: gnome-python-1.99.11-client-command.patch
@@ -180,6 +180,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.12.4-1
 - Update to 2.12.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Mar 2006 15:44:59 -0000	1.15
+++ sources	13 Jun 2006 19:27:05 -0000	1.16
@@ -1 +1 @@
-94347f1bff86ffcce76111fa8dac1efc  gnome-python-2.12.4.tar.bz2
+d0ec52fafc7c307028f5208e06bda98e  gnome-python-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:30:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:30:01 -0400
Subject: rpms/yelp/devel yelp.spec,1.63,1.64
Message-ID: <200606131930.k5DJU1YY025972@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25888

Modified Files:
	yelp.spec 
Log Message:
build req fix



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- yelp.spec	13 Jun 2006 19:21:37 -0000	1.63
+++ yelp.spec	13 Jun 2006 19:29:59 -0000	1.64
@@ -56,7 +56,7 @@
 BuildRequires: libgnomeprintui22-devel
 BuildRequires: libXt-devel
 BuildRequires: perl-XML-Simple
-BuildRequires: dbus-glib
+BuildRequires: dbus-devel
 
 
 %ifnarch  s390 s390x ppc64



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:34:24 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.25,1.26 sources,1.11,1.12
Message-ID: <200606131934.k5DJYOLP026385@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26355

Modified Files:
	rgmanager.spec sources 
Log Message:
Build w/ new sources.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rgmanager.spec	13 Jun 2006 19:19:10 -0000	1.25
+++ rgmanager.spec	13 Jun 2006 19:34:21 -0000	1.26
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.0
-Release: 0.fc6.2
+Release: 0.fc6.3
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jun 2006 19:19:10 -0000	1.11
+++ sources	13 Jun 2006 19:34:21 -0000	1.12
@@ -1 +1 @@
-5ba1f14223f0b2c08f3c9d26940d6b18  rgmanager-2.0.0.tar.gz
+79b51511a491aca05769f0c8b3502dc8  rgmanager-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:40:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:40:12 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.4,
	1.5 selinux-policy.spec, 1.207, 1.208
Message-ID: <200606131940.k5DJeCa3026957@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26904

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-2
- Fix spec of realplay


policy-20060608.patch:
 global_tunables               |    7 +++++++
 modules/admin/bootloader.te   |    2 +-
 modules/admin/consoletype.te  |    7 ++++++-
 modules/admin/prelink.fc      |    3 +--
 modules/kernel/files.if       |   35 +++++++++++++++++++++++++++++++++++
 modules/kernel/kernel.if      |   38 ++++++++++++++++++++++++++++++++++++++
 modules/services/apache.te    |    9 +++++++++
 modules/services/ntp.te       |    1 +
 modules/services/pegasus.if   |   31 +++++++++++++++++++++++++++++++
 modules/services/pegasus.te   |    5 ++---
 modules/system/hostname.te    |    5 ++++-
 modules/system/init.te        |    1 +
 modules/system/mount.te       |    1 +
 modules/system/selinuxutil.te |    2 ++
 modules/system/unconfined.fc  |    2 ++
 modules/system/userdomain.if  |    2 +-
 16 files changed, 142 insertions(+), 9 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060608.patch	13 Jun 2006 18:26:00 -0000	1.4
+++ policy-20060608.patch	13 Jun 2006 19:39:55 -0000	1.5
@@ -151,14 +151,19 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.46/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/services/apache.te	2006-06-13 13:21:35.000000000 -0400
-@@ -293,6 +293,10 @@
++++ serefpolicy-2.2.46/policy/modules/services/apache.te	2006-06-13 13:39:28.000000000 -0400
+@@ -293,6 +293,15 @@
  	miscfiles_manage_public_files(httpd_t)
  ') 
  
++ifdef(`TODO', `
++#
++# We need optionals to be able to be within booleans to make this work
++#
 +tunable_policy(`allow_httpd_mod_auth_pam',`
 +	auth_domtrans_chk_passwd(httpd_t)
 +')
++')
 +
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
@@ -229,38 +234,6 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.46/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/authlogin.if	2006-06-13 13:32:13.000000000 -0400
-@@ -275,17 +275,17 @@
- 	sysnet_dns_name_resolve($1)
- 	sysnet_use_ldap($1)
- 
--	optional_policy(`
--		kerberos_use($1)
--	')
--
--	optional_policy(`
--		nis_use_ypbind($1)
--	')
--
--	optional_policy(`
--		samba_stream_connect_winbind($1)
--	')
-+#	optional_policy(`
-+#		kerberos_use($1)
-+#	')
-+
-+#	optional_policy(`
-+#		nis_use_ypbind($1)
-+#	')
-+
-+#	optional_policy(`
-+#		samba_stream_connect_winbind($1)
-+#	')
- ')
- 
- ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.46/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
 +++ serefpolicy-2.2.46/policy/modules/system/hostname.te	2006-06-13 07:15:34.000000000 -0400
@@ -312,12 +285,12 @@
  # cjp: why is this needed?
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.46/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/unconfined.fc	2006-06-13 07:22:25.000000000 -0400
++++ serefpolicy-2.2.46/policy/modules/system/unconfined.fc	2006-06-13 15:38:45.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/local/RealPlay/realplay 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.46/policy/modules/system/userdomain.if


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- selinux-policy.spec	13 Jun 2006 18:26:00 -0000	1.207
+++ selinux-policy.spec	13 Jun 2006 19:39:56 -0000	1.208
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.46
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -336,6 +336,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-2
+- Fix spec of realplay
+
 * Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:41:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:41:51 -0400
Subject: rpms/gedit/devel gedit.spec,1.85,1.86
Message-ID: <200606131941.k5DJfp38027256@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27200

Modified Files:
	gedit.spec 
Log Message:
fix file lists



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gedit.spec	13 Jun 2006 17:08:51 -0000	1.85
+++ gedit.spec	13 Jun 2006 19:41:46 -0000	1.86
@@ -180,6 +180,7 @@
 %defattr(-, root, root)
 %{_includedir}/gedit-2.14
 %{_libdir}/pkgconfig/gedit-2.14.pc
+%{_datadir}/gtk-doc/gedit/
 
 %changelog
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:46:43 -0400
Subject: rpms/shadow-utils/devel .cvsignore, 1.12, 1.13 shadow-utils.spec,
	1.75, 1.76 sources, 1.12, 1.13
Message-ID: <200606131946.k5DJkhSe006422@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5313

Modified Files:
	.cvsignore shadow-utils.spec sources 
Log Message:
call "nscd -i" to flush nscd cache (#191464)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Jun 2006 11:01:02 -0000	1.12
+++ .cvsignore	13 Jun 2006 19:46:40 -0000	1.13
@@ -1 +1,2 @@
 shadow-4.0.16.tar.bz2
+shadow-4.0.16-nscd.c


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- shadow-utils.spec	10 Jun 2006 12:25:02 -0000	1.75
+++ shadow-utils.spec	13 Jun 2006 19:46:40 -0000	1.76
@@ -5,12 +5,13 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.16
-Release: 2
+Release: 3
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.15-login.defs
 Source2: shadow-970616.useradd
+Source3: shadow-4.0.16-nscd.c
 Patch0: shadow-4.0.16-redhat.patch
 Patch1: shadow-4.0.3-noinst.patch
 Patch2: shadow-4.0.11.1-vipw.patch
@@ -48,6 +49,8 @@
 %patch3 -p1 -b .goodname
 %patch4 -p1 -b .newgrpPwd
 %patch5 -p1 -b .lOption
+#replace whole file
+cp %{SOURCE3} lib/nscd.c
 
 rm po/*.gmo
 rm po/stamp-po
@@ -202,6 +205,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.16-3
+- call "nscd -i" to flush nscd cache (#191464)
+
 * Sat Jun 10 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.16-2
 - "useradd -r" must create a system group (#194728)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Jun 2006 11:01:03 -0000	1.12
+++ sources	13 Jun 2006 19:46:40 -0000	1.13
@@ -1 +1,2 @@
 1d91f7479143d1d705b94180c0d4874b  shadow-4.0.16.tar.bz2
+7ebc6a5cd0207246a6b2c9ebf9b30391  shadow-4.0.16-nscd.c



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:52:43 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc6-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.453, 1.454 kernel-2.6.spec, 1.2271,
	1.2272 sources, 1.397, 1.398 upstream, 1.362,
	1.363 patch-2.6.17-rc6-git3.bz2.sign, 1.1, NONE
Message-ID: <200606131952.k5DJqgEQ013146@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13116

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc6-git5.bz2.sign 
Removed Files:
	patch-2.6.17-rc6-git3.bz2.sign 
Log Message:
git5


--- NEW FILE patch-2.6.17-rc6-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEjmLsyGugalF9Dw4RAvaUAJ41ciH2awXYghXDWm/a6zCMRYqsbgCfV88k
+uXT5zhMzLi8cHEnK84py1I=
=asJp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- .cvsignore	12 Jun 2006 13:04:19 -0000	1.453
+++ .cvsignore	13 Jun 2006 19:52:40 -0000	1.454
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
 xen-20060610.tar.bz2
-patch-2.6.17-rc6-git3.bz2
+patch-2.6.17-rc6-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2271
retrieving revision 1.2272
diff -u -r1.2271 -r1.2272
--- kernel-2.6.spec	12 Jun 2006 17:07:09 -0000	1.2271
+++ kernel-2.6.spec	13 Jun 2006 19:52:40 -0000	1.2272
@@ -246,7 +246,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc6.bz2
-Patch2: patch-2.6.17-rc6-git3.bz2
+Patch2: patch-2.6.17-rc6-git5.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1822,6 +1822,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-rc6-git5
+
 * Mon Jun 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git3
 - autofs4 - need to invalidate children on tree mount expire


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- sources	12 Jun 2006 13:04:27 -0000	1.397
+++ sources	13 Jun 2006 19:52:40 -0000	1.398
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-c2706c9e56dfd9a6e6d77d8cc18ab5a3  patch-2.6.17-rc6-git3.bz2
+f5c9443aeb71ad5578d7e0b2951e9c3d  patch-2.6.17-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- upstream	12 Jun 2006 13:04:27 -0000	1.362
+++ upstream	13 Jun 2006 19:52:40 -0000	1.363
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git3.bz2
+patch-2.6.17-rc6-git5.bz2


--- patch-2.6.17-rc6-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 13 19:57:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 15:57:37 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.44,
	1.45 evolution-data-server.spec, 1.96, 1.97 sources, 1.44, 1.45
Message-ID: <200606131957.k5DJvbDG015036@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14995

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
1.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	17 May 2006 16:16:27 -0000	1.44
+++ .cvsignore	13 Jun 2006 19:57:35 -0000	1.45
@@ -1 +1 @@
-evolution-data-server-1.7.2.tar.bz2
+evolution-data-server-1.7.3.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- evolution-data-server.spec	9 Jun 2006 02:44:18 -0000	1.96
+++ evolution-data-server.spec	13 Jun 2006 19:57:35 -0000	1.97
@@ -20,8 +20,8 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.7.2
-Release: 3
+Version: 1.7.3
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -324,6 +324,9 @@
 
 
 %changelog
+* Tue Jun 13 2006 Matthisa Clasen  <mclasen at redhat.com> 1.7.3-1
+- Update to 1.7.3
+
 * Thu Jun  8 2006 Jeremy Katz <katzj at redhat.com> - 1.7.2-3
 - BR flex
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	17 May 2006 16:16:28 -0000	1.44
+++ sources	13 Jun 2006 19:57:35 -0000	1.45
@@ -1 +1 @@
-ccd8cd291cdea417b4d3ae19363cc4c5  evolution-data-server-1.7.2.tar.bz2
+8d1134598c1cefa669ecd42a85e3cd56  evolution-data-server-1.7.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:05:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:05:18 -0400
Subject: rpms/kernel/devel linux-2.6-serial-resume.patch, NONE,
	1.1 kernel-2.6.spec, 1.2272, 1.2273
Message-ID: <200606132005.k5DK5IJS016270@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16218

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-serial-resume.patch 
Log Message:
hopefully fix serial console & resume.



linux-2.6-serial-resume.patch:
 drivers/char/tty_io.c        |   13 +++++++++++++
 drivers/serial/serial_core.c |   12 ++++++------
 include/linux/tty.h          |    2 ++
 3 files changed, 21 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-serial-resume.patch ---

On Fri, Jun 09, 2006 at 09:42:34AM +0100, Russell King wrote:
> The only sane solution is for the tty layer to be adjusted to allow
> suspend/resume support for consoles.

And for those who can't work out how to do that, here's something which
_probably_ does it.  Would folk mind testing it out please?

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1674,6 +1674,19 @@ release_mem_out:
 }
 
 /*
+ * Get a copy of the termios structure for the driver/index
+ */
+void tty_get_termios(struct tty_driver *driver, int idx, struct termios *tio)
+{
+	lock_kernel();
+	if (driver->termios[idx])
+		*tio = *driver->termios[idx];
+	else
+		*tio = driver->init_termios;
+	unlock_kernel();
+}
+
+/*
  * Releases memory associated with a tty structure, and clears out the
  * driver table slots.
  */
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1968,16 +1968,16 @@ int uart_resume_port(struct uart_driver 
 		struct termios termios;
 
 		/*
-		 * First try to use the console cflag setting.
+		 * Get the termios for this line
 		 */
-		memset(&termios, 0, sizeof(struct termios));
-		termios.c_cflag = port->cons->cflag;
+		tty_get_termios(drv->tty_driver, port->line, &termios);
 
 		/*
-		 * If that's unset, use the tty termios setting.
+		 * If the console cflag is still set, subsitute that
+		 * for the termios cflag.
 		 */
-		if (state->info && state->info->tty && termios.c_cflag == 0)
-			termios = *state->info->tty->termios;
+		if (port->cons->cflag)
+			termios.c_cflag = port->cons->cflag;
 
 		port->ops->set_termios(port, &termios, NULL);
 		console_start(port->cons);
diff --git a/include/linux/tty.h b/include/linux/tty.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -297,6 +297,8 @@ extern int tty_read_raw_data(struct tty_
 			     int buflen);
 extern void tty_write_message(struct tty_struct *tty, char *msg);
 
+extern void tty_get_termios(struct tty_driver *drv, int idx, struct termios *tio);
+
 extern int is_orphaned_pgrp(int pgrp);
 extern int is_ignored(int sig);
 extern int tty_signal(int sig, struct tty_struct *tty);




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2272
retrieving revision 1.2273
diff -u -r1.2272 -r1.2273
--- kernel-2.6.spec	13 Jun 2006 19:52:40 -0000	1.2272
+++ kernel-2.6.spec	13 Jun 2006 20:05:13 -0000	1.2273
@@ -384,6 +384,7 @@
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1730: linux-2.6-ac97_unregister_controls_ad18xx.patch
 Patch1740: linux-2.6-softlockup-disable.patch
+Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1780: linux-2.6-powernow-k7-smp.patch
@@ -1048,6 +1049,8 @@
 %patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
+# serial/tty resume fixing.
+%patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
 %patch1760 -p1
 # Speed up spinlock debug.
@@ -1824,6 +1827,7 @@
 %changelog
 * Tue Jun 13 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git5
+- serial/tty resume fixing.
 
 * Mon Jun 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git3



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:07:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:07:00 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.271, 1.272 anaconda.spec, 1.395,
	1.396 sources, 1.392, 1.393
Message-ID: <200606132007.k5DK70KA016438@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16403/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.32-1 on branch devel from anaconda-11.1.0.32-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- .cvsignore	13 Jun 2006 18:08:44 -0000	1.271
+++ .cvsignore	13 Jun 2006 20:06:55 -0000	1.272
@@ -1 +1 @@
-anaconda-11.1.0.31.tar.bz2
+anaconda-11.1.0.32.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- anaconda.spec	13 Jun 2006 18:08:44 -0000	1.395
+++ anaconda.spec	13 Jun 2006 20:06:56 -0000	1.396
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.31
+Version: 11.1.0.32
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.32-1
+- fix ppc images
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.31-1
 - Fix loader sigsegv (dcantrel, #194882)
 - Fix so we don't require yum.conf (clumens, #194987)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- sources	13 Jun 2006 18:08:44 -0000	1.392
+++ sources	13 Jun 2006 20:06:58 -0000	1.393
@@ -1 +1 @@
-8c639b9fa5ad827c3c6291cbae474660  anaconda-11.1.0.31.tar.bz2
+b50af4cdb23da225cc88ba9d5e77712b  anaconda-11.1.0.32.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:11:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:11:32 -0400
Subject: rpms/evolution/devel .cvsignore, 1.49, 1.50 evolution.spec, 1.149,
	1.150 sources, 1.49, 1.50
Message-ID: <200606132011.k5DKBVAk016895@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16868

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
2.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	17 May 2006 17:21:50 -0000	1.49
+++ .cvsignore	13 Jun 2006 20:11:28 -0000	1.50
@@ -1 +1 @@
-evolution-2.7.2.1.tar.bz2
+evolution-2.7.3.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- evolution.spec	29 May 2006 23:38:46 -0000	1.149
+++ evolution.spec	13 Jun 2006 20:11:28 -0000	1.150
@@ -40,8 +40,8 @@
 ### Description ###
 
 Name: evolution
-Version: 2.7.2.1
-Release: 4
+Version: 2.7.3
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -658,6 +658,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen  <mclasen at redhat.com> - 2.7.3-1
+- Update to 2.7.3
+
 * Mon May 29 2006 Dan Williams <dcbw at redhat.com> - 2.7.2.1-4
 - Don't crash on quit when trying to save window size (Gnome.org #343331)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	17 May 2006 17:21:50 -0000	1.49
+++ sources	13 Jun 2006 20:11:29 -0000	1.50
@@ -1 +1 @@
-9a239d549094daf2ad6892f10d152d4f  evolution-2.7.2.1.tar.bz2
+e6f155e9c5d5a11ff61ef364752af6a9  evolution-2.7.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:12:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:12:38 -0400
Subject: rpms/gcc/devel gcc41-pr27959.patch,NONE,1.1 gcc41.spec,1.73,1.74
Message-ID: <200606132012.k5DKCcJW017054@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17026

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr27959.patch 
Log Message:
4.1.1-3

gcc41-pr27959.patch:
 reload1.c                  |    2 
 testsuite/gcc.dg/pr27959.c |   93 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)

--- NEW FILE gcc41-pr27959.patch ---
2006-06-13  Andreas Krebbel  <krebbel1 at de.ibm.com>

	PR middle-end/27959
	* reload1.c (reload): Remove registers returned by update_eliminables
	from used_spill_regs.

	* gcc.dg/pr27959.c: New testcase.

--- gcc/reload1.c.jj	2006-03-27 14:33:14.000000000 +0200
+++ gcc/reload1.c	2006-06-13 22:01:59.000000000 +0200
@@ -987,6 +987,8 @@ reload (rtx first, int global)
 	HARD_REG_SET to_spill;
 	CLEAR_HARD_REG_SET (to_spill);
 	update_eliminables (&to_spill);
+	AND_COMPL_HARD_REG_SET(used_spill_regs, to_spill);
+
 	for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
 	  if (TEST_HARD_REG_BIT (to_spill, i))
 	    {
--- gcc/testsuite/gcc.dg/pr27959.c.jj	2006-06-13 22:01:59.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr27959.c	2006-06-13 22:01:59.000000000 +0200
@@ -0,0 +1,93 @@
+/* PR middle-end/27959 */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+/* { dg-options "-O2 -mtune=z990" { target s390*-*-* } } */
+
+extern void abort (void);
+
+struct B
+{
+  unsigned int b1, b2, b3;
+  char b4;
+};
+
+struct C
+{
+  char c1;
+};
+
+struct D
+{
+  char *d1;
+  struct C **d2;
+  unsigned int d3;
+};
+
+void
+__attribute__((noinline))
+foo (void *x, struct B *y, unsigned int *z)
+{
+  if (x)
+    abort ();
+  if (y->b1 != 7 || y->b2 != 5 || y->b3 != 3 || y->b4)
+    abort ();
+  if (*z != 2)
+    abort ();
+}
+
+int
+__attribute__((noinline))
+baz (unsigned int *x, unsigned int y)
+{
+  asm volatile ("" : : "r" (&x), "r" (&y) : "memory");
+  return *x + y;
+}
+
+inline int bar (unsigned int *x, unsigned int y)
+{
+  if (y < *x)
+    return 0;
+  return baz (x, y);
+}
+
+unsigned int *
+__attribute__((noinline))
+test (struct D *x, unsigned int *y)
+{
+  struct B b;
+  unsigned int c;
+
+  bar (y, x->d3);
+  if ((*(x->d2))->c1)
+    c = ((unsigned char) x->d1[0]
+	 + ((unsigned char) x->d1[1] << 8)
+	 + ((unsigned char) x->d1[2] << 16)
+	 + ((short) x->d1[3] << 24));
+  else
+    {
+      int d;
+      ((char *) &d)[0] = x->d1[0];
+      ((char *) &d)[1] = x->d1[1];
+      ((char *) &d)[2] = x->d1[2];
+      ((char *) &d)[3] = x->d1[3];
+      c = d;
+    }
+  b.b4 = 0;
+  b.b1 = c / 10000L % 10000;
+  b.b2 = c / 100 % 100;
+  b.b3 = c % 100;
+  foo (0, &b, y);
+  return y;
+}
+
+int
+main (void)
+{
+  unsigned int x = 900070503;
+  unsigned int y = 2;
+  struct C c = { 0 }, *cptr = &c;
+  struct D d = { (char *) &x, &cptr, 0 };
+  if (test (&d, &y) != &y)
+    abort ();
+  return 0;
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gcc41.spec	12 Jun 2006 16:38:44 -0000	1.73
+++ gcc41.spec	13 Jun 2006 20:12:36 -0000	1.74
@@ -1,6 +1,6 @@
 %define DATE 20060612
 %define gcc_version 4.1.1
-%define gcc_release 2
+%define gcc_release 3
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -40,6 +40,7 @@
 # Make sure pthread.h doesn't contain __thread tokens
 # Make sure glibc supports stack protector
 BuildRequires: glibc-devel >= 2.3.90-2
+BuildRequires: elfutils-devel >= 0.72
 %ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
 # Make sure glibc supports TFmode long double
 BuildRequires: glibc >= 2.3.90-35
@@ -123,6 +124,7 @@
 Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
 Patch25: gcc41-fortran-merge-glitch.patch
+Patch26: gcc41-pr27959.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -426,6 +428,7 @@
 %patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
 %patch25 -p0 -b .fortran-merge-glitch~
+%patch26 -p0 -b .pr27959~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1467,6 +1470,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jun 13 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-3
+- add BuildRequires for elfutils-devel on ia64
+- fix a reload bug visible on s390x (Andreas Krebbel, #193912,
+  PR middle-end/27959)
+
 * Mon Jun 12 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-2
 - update from gcc-4_1-branch (-r114107:114555)
   - PRs ada/27769, c++/20173, c++/26068, c++/26433, c++/26496, c++/27177,



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:25:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:25:15 -0400
Subject: rpms/policycoreutils/devel
	policycoreutils-1.30.12-audit-mass-relabel.patch, NONE,
	1.1 policycoreutils-rhat.patch, 1.201,
	1.202 policycoreutils.spec, 1.282, 1.283
Message-ID: <200606132025.k5DKPF30003685@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3599

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Added Files:
	policycoreutils-1.30.12-audit-mass-relabel.patch 
Log Message:
* Tue Jun 13 2006 James Antill <jantill at redhat.com> 1.30.12-5
- Update audit mass relabel to only compile in when audit is installed.


policycoreutils-1.30.12-audit-mass-relabel.patch:
 Makefile   |    7 +++++++
 setfiles.c |   43 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)

--- NEW FILE policycoreutils-1.30.12-audit-mass-relabel.patch ---
diff -ru policycoreutils-1.30.12-orig/setfiles/Makefile policycoreutils-1.30.12/setfiles/Makefile
--- policycoreutils-1.30.12-orig/setfiles/Makefile	2006-06-05 13:20:53.000000000 -0400
+++ policycoreutils-1.30.12/setfiles/Makefile	2006-06-13 16:21:44.000000000 -0400
@@ -4,10 +4,17 @@
 MANDIR = $(PREFIX)/share/man
 LIBDIR ?= $(PREFIX)/lib
 
+AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
+
 CFLAGS = -Werror -Wall -W 
 override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include
 LDLIBS = -lselinux -lsepol -L$(LIBDIR)
 
+ifeq (${AUDITH}, /usr/include/libaudit.h)
+	override CFLAGS += -DUSE_AUDIT
+	LDLIBS += -laudit
+endif
+
 all: setfiles
 
 setfiles:  setfiles.o 
diff -ru policycoreutils-1.30.12-orig/setfiles/setfiles.c policycoreutils-1.30.12/setfiles/setfiles.c
--- policycoreutils-1.30.12-orig/setfiles/setfiles.c	2006-06-05 13:20:53.000000000 -0400
+++ policycoreutils-1.30.12/setfiles/setfiles.c	2006-06-13 16:21:44.000000000 -0400
@@ -75,6 +75,13 @@
 #include <selinux/selinux.h>
 #include <syslog.h> 
 #include <libgen.h>
+#ifdef USE_AUDIT
+#include <libaudit.h>
+
+#ifndef AUDIT_FS_RELABEL
+#define AUDIT_FS_RELABEL 2309
+#endif
+#endif
 
 static int add_assoc = 1;
 static FILE *outfile=NULL;
@@ -395,7 +402,7 @@
 
 	/* trim trailing /, if present */
 	len = strlen(rootpath);
-	while ('/' == rootpath[len - 1])
+	while (len && ('/' == rootpath[len - 1]))
 		rootpath[--len] = 0;
 	rootpathlen = len;
 }
@@ -443,11 +450,38 @@
   return 0;
 }
 
+static void maybe_audit_mass_relabel(int done_root, int errs)
+{
+#ifdef USE_AUDIT
+  int audit_fd = -1;
+  int rc = 0;
+  
+  if (!done_root) /* only audit a forced full relabel */
+    return;
+  
+  audit_fd = audit_open();
+
+  if (audit_fd < 0) {
+    fprintf(stderr, "Error connecting to audit system.\n");
+    exit(-1);
+  }
+
+  rc = audit_log_user_message(audit_fd, AUDIT_FS_RELABEL,
+                              "op=mass relabel", NULL, NULL, NULL, !errs);
+  if (rc <= 0) {
+    fprintf(stderr, "Error sending audit message: %s.\n", strerror(errno));
+    /* exit(-1); -- don't exit atm. as fix for eff_cap isn't in most kernels */
+  }
+  audit_close(audit_fd);
+#endif
+}
+
 int main(int argc, char **argv)
 {
 	struct stat sb;
 	int opt, rc, i;
-
+        int done_root = 0; /* have we processed the / directory as an arg */
+        
 	memset(excludeArray,0, sizeof(excludeArray));
 
 	/* Validate all file contexts during matchpathcon_init. */
@@ -618,6 +652,8 @@
 	}
 	else for (; optind < argc; optind++)
 	{
+                done_root |= !strcmp(argv[optind], "/");
+                
 		if (NULL != rootpath) {
 			qprintf("%s:  labeling files, pretending %s is /\n",
 				argv[0], rootpath);
@@ -648,6 +684,7 @@
 				fprintf(stderr,
 				"%s:  error while labeling files under %s\n",
 				argv[0], argv[optind]);
+				maybe_audit_mass_relabel(done_root, 1);
 				exit(1);
 			}
 		}
@@ -664,6 +701,8 @@
 		matchpathcon_filespec_destroy();
 	}
 
+        maybe_audit_mass_relabel(done_root, 0);
+
 	if (warn_no_match)
 		matchpathcon_checkmatches(argv[0]);
 

policycoreutils-rhat.patch:
 audit2allow/Makefile   |    1 
 po/af.po               |    2 
 po/am.po               |    2 
 po/ar.po               |    2 
 po/be.po               |    2 
 po/bg.po               |    2 
 po/bn.po               |    2 
 po/bn_IN.po            |    2 
 po/ca.po               |    2 
 po/cs.po               |    2 
 po/cy.po               |    2 
 po/de.po               |    2 
 po/el.po               |    2 
 po/en_GB.po            |    2 
 po/es.po               |    2 
 po/eu_ES.po            |    2 
 po/fa.po               |    2 
 po/fi.po               |    2 
 po/gu.po               |    2 
 po/he.po               |    2 
 po/hi.po               |    2 
 po/hr.po               |    2 
 po/hu.po               |    2 
 po/hy.po               |    2 
 po/is.po               |    2 
 po/it.po               |    2 
 po/ja.po               |    2 
 po/ka.po               |    2 
 po/kn.po               |    2 
 po/ko.po               |    2 
 po/ku.po               |    2 
 po/lo.po               |    2 
 po/lt.po               |    2 
 po/lv.po               |    2 
 po/mk.po               |    2 
 po/ml.po               |  267 ++++++++++++----------
 po/mr.po               |    2 
 po/ms.po               |  237 +++++++++++++-------
 po/my.po               |    2 
 po/nb.po               |    2 
 po/nn.po               |    2 
 po/no.po               |    2 
 po/nso.po              |    2 
 po/or.po               |    2 
 po/pa.po               |    2 
 po/pl.po               |    2 
 po/policycoreutils.pot |   26 +-
 po/pt.po               |    2 
 po/pt_BR.po            |   94 +++-----
 po/ro.po               |    2 
 po/ru.po               |    2 
 po/si.po               |    2 
 po/sk.po               |    2 
 po/sl.po               |    2 
 po/sq.po               |    2 
 po/sr.po               |    2 
 po/sr at Latn.po          |    2 
 po/ta.po               |    2 
 po/te.po               |    2 
 po/th.po               |    2 
 po/tr.po               |    2 
 po/uk.po               |    2 
 po/ur.po               |    2 
 po/vi.po               |    2 
 po/zh_CN.po            |  573 +++++++++++++++++++++++++++----------------------
 po/zh_TW.po            |    2 
 po/zu.po               |    2 
 scripts/fixfiles       |    3 
 scripts/genhomedircon  |   10 
 semanage/seobject.py   |    4 
 70 files changed, 746 insertions(+), 591 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- policycoreutils-rhat.patch	12 Jun 2006 16:43:09 -0000	1.201
+++ policycoreutils-rhat.patch	13 Jun 2006 20:25:13 -0000	1.202
@@ -3515,101 +3515,3 @@
  		os.rename(newfilename, self.filename)
  
  class semanageRecords:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-1.30.12/setfiles/Makefile
---- nsapolicycoreutils/setfiles/Makefile	2006-05-30 09:07:14.000000000 -0400
-+++ policycoreutils-1.30.12/setfiles/Makefile	2006-06-07 10:50:41.000000000 -0400
-@@ -7,6 +7,7 @@
- CFLAGS = -Werror -Wall -W 
- override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include
- LDLIBS = -lselinux -lsepol -L$(LIBDIR)
-+LDLIBS += -laudit
- 
- all: setfiles
- 
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.12/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2006-05-15 09:43:12.000000000 -0400
-+++ policycoreutils-1.30.12/setfiles/setfiles.c	2006-06-07 10:50:41.000000000 -0400
-@@ -75,6 +75,11 @@
- #include <selinux/selinux.h>
- #include <syslog.h> 
- #include <libgen.h>
-+#include <libaudit.h>
-+
-+#ifndef AUDIT_FS_RELABEL
-+#define AUDIT_FS_RELABEL 2309
-+#endif
- 
- static int add_assoc = 1;
- static FILE *outfile=NULL;
-@@ -395,7 +400,7 @@
- 
- 	/* trim trailing /, if present */
- 	len = strlen(rootpath);
--	while ('/' == rootpath[len - 1])
-+	while (len && ('/' == rootpath[len - 1]))
- 		rootpath[--len] = 0;
- 	rootpathlen = len;
- }
-@@ -443,11 +448,35 @@
-   return 0;
- }
- 
-+static void maybe_audit_mass_relabel(int done_root, int errs)
-+{
-+  int audit_fd = -1;
-+  int rc = 0;
-+  
-+  if (!done_root) /* only audit a forced full relabel */
-+    return;
-+  
-+  audit_fd = audit_open();
-+
-+  if (audit_fd < 0) {
-+    fprintf(stderr, "Error connecting to audit system.\n");
-+    return;
-+  }
-+
-+  rc = audit_log_user_message(audit_fd, AUDIT_FS_RELABEL,
-+                              "op=mass relabel", NULL, NULL, NULL, !errs);
-+  if (rc <= 0) {
-+    fprintf(stderr, "Error sending audit message: %s.\n", strerror(errno));
-+  }
-+  audit_close(audit_fd);
-+}
-+
- int main(int argc, char **argv)
- {
- 	struct stat sb;
- 	int opt, rc, i;
--
-+        int done_root = 0; /* have we processed the / directory as an arg */
-+        
- 	memset(excludeArray,0, sizeof(excludeArray));
- 
- 	/* Validate all file contexts during matchpathcon_init. */
-@@ -618,6 +647,8 @@
- 	}
- 	else for (; optind < argc; optind++)
- 	{
-+                done_root |= !strcmp(argv[optind], "/");
-+                
- 		if (NULL != rootpath) {
- 			qprintf("%s:  labeling files, pretending %s is /\n",
- 				argv[0], rootpath);
-@@ -648,6 +679,7 @@
- 				fprintf(stderr,
- 				"%s:  error while labeling files under %s\n",
- 				argv[0], argv[optind]);
-+				maybe_audit_mass_relabel(done_root, 1);
- 				exit(1);
- 			}
- 		}
-@@ -664,6 +696,8 @@
- 		matchpathcon_filespec_destroy();
- 	}
- 
-+        maybe_audit_mass_relabel(done_root, 0);
-+
- 	if (warn_no_match)
- 		matchpathcon_checkmatches(argv[0]);
- 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- policycoreutils.spec	12 Jun 2006 16:52:57 -0000	1.282
+++ policycoreutils.spec	13 Jun 2006 20:25:13 -0000	1.283
@@ -10,6 +10,7 @@
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
 Patch: policycoreutils-rhat.patch
+Patch2: policycoreutils-1.30.12-audit-mass-relabel.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -37,6 +38,7 @@
 %prep
 %setup -q
 %patch -p1 -b .rhat
+%patch2 -p1 -b .audit
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -110,6 +112,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Tue Jun 13 2006 James Antill <jantill at redhat.com> 1.30.12-5
+- Update audit mass relabel to only compile in when audit is installed.
+
 * Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.12-4
 - Update to required versions
 - Update translation



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:26:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:26:14 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.283,1.284
Message-ID: <200606132026.k5DKQEZ4022024@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7348

Modified Files:
	policycoreutils.spec 
Log Message:
* Tue Jun 13 2006 James Antill <jantill at redhat.com> 1.30.12-5
- Update audit mass relabel to only compile in when audit is installed.



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- policycoreutils.spec	13 Jun 2006 20:25:13 -0000	1.283
+++ policycoreutils.spec	13 Jun 2006 20:26:11 -0000	1.284
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.12
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz



From fedora-cvs-commits at redhat.com  Tue Jun 13 20:33:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 16:33:18 -0400
Subject: rpms/python/FC-4 python-2.4.1-lib64.patch,1.2,1.3
Message-ID: <200606132033.k5DKXIKu014813@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14797

Modified Files:
	python-2.4.1-lib64.patch 
Log Message:
Need to specify 64-bit path for x86_64

python-2.4.1-lib64.patch:
 Python-2.4b1/Lib/distutils/command/install.py |    4 ++--
 Python-2.4b1/Lib/distutils/sysconfig.py       |    6 +++++-
 Python-2.4b1/Makefile.pre.in                  |    4 ++--
 Python-2.4b1/Modules/Setup.dist               |    6 +++---
 Python-2.4b1/Modules/getpath.c                |   10 +++++-----
 Python-2.4b1/setup.py                         |   10 +++++-----
 Python-2.4b2/Lib/site.py                      |    7 ++++++-
 7 files changed, 28 insertions(+), 19 deletions(-)

Index: python-2.4.1-lib64.patch
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/python-2.4.1-lib64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-2.4.1-lib64.patch	13 Jun 2006 15:38:25 -0000	1.2
+++ python-2.4.1-lib64.patch	13 Jun 2006 20:32:46 -0000	1.3
@@ -145,6 +145,15 @@
                  sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
 --- Python-2.4b1/Modules/Setup.dist.lib64	2004-11-04 14:35:15.805241496 -0500
 +++ Python-2.4b1/Modules/Setup.dist	2004-11-04 14:38:43.884254818 -0500
+@@ -325,7 +325,7 @@
+ # *** Uncomment and edit to reflect your Tcl/Tk versions:
+ 	-ltk -ltcl \
+ # *** Uncomment and edit to reflect where your X11 libraries are:
+-	-L/usr/X11R6/lib \
++	-L/usr/X11R6/lib64 \
+ # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
 @@ -395,7 +395,7 @@
  # and the subdirectory of PORT where you built it.
  DBLIBVER=4.2



From fedora-cvs-commits at redhat.com  Tue Jun 13 21:13:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 17:13:09 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.32,1.33
Message-ID: <200606132113.k5DLD9tI008772@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8751

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-3
- Rebuilding for new version of the SDK, with a versionless pde.build.



Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eclipse-changelog.spec	23 May 2006 20:26:18 -0000	1.32
+++ eclipse-changelog.spec	13 Jun 2006 21:13:04 -0000	1.33
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        2
+Release:        3
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -96,7 +96,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
+    -Dpde.build.scripts=%{eclipse_base}/plugins/org.eclipse.pde.build/scripts \
     -DdontFetchAnything=true 
 popd
 
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-3
+- Rebuilding for new version of the SDK, with a versionless pde.build.
+
 * Tue May 23 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-2
 - Building for rawhide.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 21:14:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 17:14:51 -0400
Subject: rpms/python-docs/FC-4 python-2.4-tex-fix.patch, 1.1,
	1.2 python-docs.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200606132114.k5DLEpX1009206@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python-docs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9173

Modified Files:
	python-2.4-tex-fix.patch python-docs.spec sources 
Log Message:
Building 2.4.3 docs too

python-2.4-tex-fix.patch:
 howto.cls  |   14 ++++++++++----
 manual.cls |   14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

Index: python-2.4-tex-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/python-docs/FC-4/python-2.4-tex-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-2.4-tex-fix.patch	15 Mar 2005 21:54:46 -0000	1.1
+++ python-2.4-tex-fix.patch	13 Jun 2006 21:14:49 -0000	1.2
@@ -1,29 +1,6 @@
---- Python-2.4/Doc/texinputs/howto.cls.tex-fix	2004-03-31 03:08:34.000000000 -0500
-+++ Python-2.4/Doc/texinputs/howto.cls	2005-03-14 09:30:13.000000000 -0500
-@@ -55,10 +55,16 @@
-     % changes \\ to ', ' (comma-space), making it pass muster for
-     % generating document info in the PDF file.
-     \def\\{, }
--    \pdfinfo{
--      /Author (\@author)
--      /Title (\@title)
--    }
-+    \ifx\pdfoutput\relax
-+    \else
-+      \ifcase\pdfoutput
-+      \else
-+        \pdfinfo{%
-+          /Author (\@author)
-+          /Title (\@title)
-+        }
-+      \fi
-+    \fi
-   }}
-   \begin{flushright}
-     {\rm\Huge\py at HeaderFamily \@title} \par
---- Python-2.4/Doc/texinputs/manual.cls.tex-fix	2005-03-14 09:32:50.000000000 -0500
-+++ Python-2.4/Doc/texinputs/manual.cls	2005-03-14 09:34:20.000000000 -0500
-@@ -69,10 +69,16 @@
+--- Python-2.4.2/Doc/texinputs/manual.cls.tex-fix	2005-09-04 12:20:30.000000000 -0400
++++ Python-2.4.2/Doc/texinputs/manual.cls	2005-11-16 08:27:14.000000000 -0500
+@@ -70,10 +70,16 @@
        % changes \\ to ', ' (comma-space), making it pass muster for
        % generating document info in the PDF file.
        \def\\{, }
@@ -41,6 +18,29 @@
 +          }
 +        \fi
 +      \fi
-     }}
+       \endgroup
+     \fi
      \begin{flushright}%
-       {\rm\Huge\py at HeaderFamily \@title \par}%
+--- Python-2.4.2/Doc/texinputs/howto.cls.tex-fix	2005-09-04 12:20:30.000000000 -0400
++++ Python-2.4.2/Doc/texinputs/howto.cls	2005-11-16 08:26:21.000000000 -0500
+@@ -56,10 +56,16 @@
+     % changes \\ to ', ' (comma-space), making it pass muster for
+     % generating document info in the PDF file.
+     \def\\{, }
+-    \pdfinfo{
+-      /Author (\@author)
+-      /Title (\@title)
+-    }
++    \ifx\pdfoutput\relax
++    \else
++      \ifcase\pdfoutput
++      \else
++        \pdfinfo{%
++          /Author (\@author)
++          /Title (\@title)
++        }
++      \fi
++    \fi
+     \endgroup
+   \fi
+   \begin{flushright}


Index: python-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/python-docs/FC-4/python-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-docs.spec	8 Apr 2005 20:24:36 -0000	1.6
+++ python-docs.spec	13 Jun 2006 21:14:49 -0000	1.7
@@ -12,8 +12,8 @@
 
 Summary: Documentation for the Python programming language.
 Name: %{python}-docs
-Version: %{pybasever}.1
-Release: 1
+Version: %{pybasever}.3
+Release: 0.9.FC4
 License: PSF - see LICENSE
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -67,6 +67,18 @@
 %doc Misc/HISTORY Doc/html
 
 %changelog
+* Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> 2.4.3-0.9
+- built older version for FC4
+
+* Sat Apr  8 2006 Mihai Ibanescu <misa at redhat.com> 2.4.3-1
+- updated to 2.4.3
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Wed Nov 16 2005 Mihai Ibanescu <misa at redhat.com> 2.4.2-1
+- updated to 2.4.2
+
 * Fri Apr  8 2005 Mihai Ibanescu <misa at redhat.com> 2.4.1-1
 - updated to 2.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-docs/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Apr 2005 20:24:36 -0000	1.3
+++ sources	13 Jun 2006 21:14:49 -0000	1.4
@@ -1 +1 @@
-de3e9a8836fab6df7c7ce545331afeb3  Python-2.4.1.tar.bz2
+141c683447d5e76be1d2bd4829574f02  Python-2.4.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 13 21:28:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 17:28:58 -0400
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.44,1.45
Message-ID: <200606132128.k5DLSwrl029183@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29160

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 0.2.2-6
- Rebuilding for new SDK, with versionless pde.build.




Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- eclipse-bugzilla.spec	8 Jun 2006 18:08:50 -0000	1.44
+++ eclipse-bugzilla.spec	13 Jun 2006 21:28:56 -0000	1.45
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	5
+Release:	6
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -103,7 +103,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.2.0/scripts \
+    -Dpde.build.scripts=%{eclipse_base}/plugins/org.eclipse.pde.build/scripts \
     -DdontFetchAnything=true 
 popd
 
@@ -156,6 +156,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 0.2.2-6
+- Rebuilding for new SDK, with versionless pde.build.
+
 * Thu Jun 08 2006 Igor Foox <ifoox at redhat.com> 0.2.2-5
 - Rebuild for 3.2.0.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:01:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:01:16 -0400
Subject: rpms/autofs/devel autofs.spec,1.102,1.103
Message-ID: <200606132201.k5DM1GOQ019778@cvs.devel.redhat.com>

Author: jmoyer

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19746

Modified Files:
	autofs.spec 
Log Message:
- Add a BuildPrereq for cyrus-sasl-devel




Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- autofs.spec	13 Jun 2006 07:37:58 -0000	1.102
+++ autofs.spec	13 Jun 2006 22:00:52 -0000	1.103
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 9
+%define release 10
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -29,7 +29,7 @@
 Patch15: autofs-5.0.0_beta4-program-map-offset-handling.patch
 Patch16: autofs-5.0.0_beta4-module-load-to-init.patch
 Buildroot: /var/tmp/autofs-tmp
-BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
+BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex, cyrus-sasl-devel
 Prereq: chkconfig
 Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps
 Obsoletes: autofs-ldap
@@ -138,6 +138,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jun 13 2006 Jeff Moyer <jmoyer at redhat.com> - 5.0.0_beta4-10
+- Add a BuildPrereq for cyrus-sasl-devel
+
 * Tue Jun 13 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-9
 - move autofs4 module loading back to init script (part bz # 194061).
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:41:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:41:31 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.281,1.282
Message-ID: <200606132241.k5DMfVbb010704@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10586

Modified Files:
	eclipse.spec 
Log Message:
- Rename -devel packages to -sdk to match upstream names.
- Add Provides eclipse-sdk to platform-sdk.
- Remove zip re-pack code.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- eclipse.spec	13 Jun 2006 01:23:08 -0000	1.281
+++ eclipse.spec	13 Jun 2006 22:41:27 -0000	1.282
@@ -36,7 +36,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.6
+Release:        0jpp_0fc.3.2RC7.7
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -248,16 +248,19 @@
 Eclipse platform common files.  This package now contains the GTK2 UI (the
 former eclipse-gtk2 package).
 
-%package        platform-devel
+%package        platform-sdk
 Summary:        Eclipse platform Source
 Group:          Text Editors/Integrated Development Environments (IDE)
+Provides:	platform-devel
+Obsoletes:	platform-devel
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
-Requires:       %{name}-rcp-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       java-javadoc
 
-%description    platform-devel
+#FIXME: fix description to include docs
+%description    platform-sdk
 Source for Eclipse platform for use within Eclipse.
 
 %package        jdt
@@ -277,15 +280,19 @@
 %description    jdt
 Eclipse Java developments tools.
 
-%package        jdt-devel
+%package        jdt-sdk
 Summary:        Eclipse JDT Source
 Group:          Text Editors/Integrated Development Environments (IDE)
+Provides:	jdt-devel
+Obsoletes:	jdt-devel
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       java-javadoc
 
-%description    jdt-devel
+
+#FIXME: fix description to include docs
+%description    jdt-sdk
 Source for JDT for use within Eclipse.
 
 %package        pde
@@ -293,7 +300,7 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
-Requires:       %{name}-platform-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-platform-sdk = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
@@ -309,7 +316,7 @@
 Summary:        Eclipse PDE runtime plugin.
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires:       %{name}-platform-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-platform-sdk = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
@@ -321,17 +328,21 @@
 %description    pde-runtime
 Eclipse Plug-in Development Environment runtime plugin (org.eclipse.pde.runtime).
 
-%package        pde-devel
+%package        pde-sdk
 Summary:        Eclipse PDE Source
 Group:          Text Editors/Integrated Development Environments (IDE)
+Provides:	%{name}-sdk
+Provides:	pde-devel
+Obsoletes:	pde-devel
 Requires:       %{name}-pde = %{epoch}:%{version}-%{release}
-Requires:       %{name}-jdt-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-source
 Provides:       %{name}-source = %{epoch}:%{version}-%{release}
 
-%description    pde-devel
+#FIXME: fix description to include docs
+%description    pde-sdk
 Source for Eclipse Plug-in Development Environment for use within Eclipse.
 
 %package     -n %{libname}-gtk2
@@ -360,13 +371,16 @@
 %description    rcp
 Eclipse Rich Client Platform
 
-%package        rcp-devel
+%package        rcp-sdk
 Summary:        Eclipse RCP Source
 Group:          Text Editors/Integrated Development Environments (IDE)
+Provides:	rcp-devel
+Obsoletes:	rcp-devel
 Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
-Requires:       %{name}-jdt-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
 
-%description    rcp-devel
+#FIXME: fix description to include docs
+%description    rcp-sdk
 Source for RCP for use within Eclipse.
 
 %prep
@@ -786,20 +800,6 @@
 #./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org
 #popd
 
-# FIXME: document this properly
-# re-pack all zips. we need to do this to work around the multilib problem 
-for zip in $(find -type f -name \*.zip); do
-  mkdir $zip-repack
-  pushd $zip-repack
-  zipfile=../$(echo $zip | sed "s:./.*/::")
-  unzip -qq $zipfile
-  rm $zipfile
-  find -type f -exec touch --date=1/1/1970 "{}" \; 
-  zip -q -X -9 -r $zipfile .
-  popd
-  rm -r $zip-repack
-done
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1161,7 +1161,7 @@
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
 
-%post jdt-devel
+%post jdt-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1179,7 +1179,7 @@
 %{_bindir}/rebuild-gcj-db
 %endif
 
-%post pde-devel
+%post pde-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1189,7 +1189,7 @@
 %{_bindir}/rebuild-gcj-db
 %endif
 
-%post rcp-devel
+%post rcp-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1211,7 +1211,7 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%post platform-devel
+%post platform-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1229,7 +1229,7 @@
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
 
-%postun jdt-devel
+%postun jdt-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1247,7 +1247,7 @@
 %{_bindir}/rebuild-gcj-db
 %endif
 
-%postun pde-devel
+%postun pde-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1257,7 +1257,7 @@
 %{_bindir}/rebuild-gcj-db
 %endif
 
-%postun rcp-devel
+%postun rcp-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1276,7 +1276,7 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%postun platform-devel
+%postun platform-sdk
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -1350,7 +1350,7 @@
 %{_libdir}/gcj/%{name}/jdi.jar.*
 %endif
 
-%files jdt-devel
+%files jdt-sdk
 %defattr(-,root,root)
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
@@ -1383,7 +1383,7 @@
 %{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_*
 %endif
 
-%files pde-devel
+%files pde-sdk
 %defattr(-,root,root)
 %{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
 %{_datadir}/%{name}/features/org.eclipse.pde.source_*
@@ -1400,7 +1400,7 @@
 %{_libdir}/gcj/%{name}/org.eclipse.core.runtime_*
 %endif
 
-%files rcp-devel
+%files rcp-sdk
 %defattr(-,root,root)
 %{_datadir}/%{name}/plugins/com.ibm.icu.source_*
 %{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
@@ -1618,7 +1618,7 @@
 %{_libdir}/gcj/%{name}/tomcat-util.jar*
 %endif
 
-%files platform-devel
+%files platform-sdk
 %defattr(-,root,root)
 %{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source_*
@@ -1630,6 +1630,11 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.7
+- Rename -devel packages to -sdk to match upstream names.
+- Add Provides eclipse-sdk to platform-sdk. 
+- Remove zip re-pack code.
+
 * Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.6
 - Bump release again.
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:47:00 -0400
Subject: rpms/kernel/devel Makefile.config, 1.38, 1.39 kernel-2.6.spec,
	1.2273, 1.2274
Message-ID: <200606132247.k5DMl0Z0018992@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18587

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
rename xen0/xenU to single xen kernel


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.config	6 Jun 2006 04:35:47 -0000	1.38
+++ Makefile.config	13 Jun 2006 22:46:56 -0000	1.39
@@ -12,9 +12,7 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
-	$(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
-	$(CFG)-i686-xen0-PAE.config $(CFG)-i686-xenU-PAE.config \
-	$(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
+	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -123,21 +121,9 @@
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
 	perl scripts/merge.pl $^ ia64 > $@
 
-kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen.config: configs/config-xen-xen temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE kernel-$(VERSION)-i686-xen0.config
-	perl scripts/merge.pl $^ i386 > $@
-
-kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic
-	perl scripts/merge.pl $^ i386 > $@
-
-kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE kernel-$(VERSION)-i686-xenU.config
-	perl scripts/merge.pl $^ i386 > $@
-
-kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic
-	perl scripts/merge.pl $^ x86_64 > $@
-
-kernel-$(VERSION)-x86_64-xenU.config: configs/config-xen-xenU temp-x86_64-xen-generic
+kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2273
retrieving revision 1.2274
diff -u -r1.2273 -r1.2274
--- kernel-2.6.spec	13 Jun 2006 20:05:13 -0000	1.2273
+++ kernel-2.6.spec	13 Jun 2006 22:46:56 -0000	1.2274
@@ -237,6 +237,8 @@
 Source37: kernel-%{kversion}-i686-xenU-PAE.config
 Source38: kernel-%{kversion}-x86_64-xen0.config
 Source39: kernel-%{kversion}-x86_64-xenU.config
+Source40: kernel-%{kversion}-i686-xen.config
+Source41: kernel-%{kversion}-x86_64-xen.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -577,6 +579,41 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the SMP kernel package.
 
+%package xen
+Summary: The Linux kernel compiled for Xen VM operations
+
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
+Prereq: %{kernel_prereq}
+Requires: xen
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Conflicts: %{xen_conflicts}
+# the hypervisor kernel needs a newer mkinitrd than everything else right now
+Conflicts: mkinitrd <= 4.2.0
+# We can't let RPM do the dependencies automatic because it'll then pick up
+# a correct but undesirable perl dependency from the module headers which
+# isn't required for the kernel proper to function
+AutoReqProv: no
+
+%description xen
+This package includes a version of the Linux kernel which
+runs in Xen VM. It works for both priviledged and unpriviledged guests.
+
+%package xen-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-xen-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen
+Provides: kernel-devel = %{rpmversion}-%{release}xen
+Prereq: /usr/bin/find
+
+%description xen-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
 %package xen0
 Summary: The Linux kernel compiled for Xen guest0 VM operations
 
@@ -1525,6 +1562,20 @@
   popd > /dev/null
 fi
 
+%post xen
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
+/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
+/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post xen-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu} > /dev/null
+  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
+  popd > /dev/null
+fi
+
 %post xen0
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0
 /sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen0
@@ -1605,6 +1656,10 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
 
+%preun xen
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
+
 %preun xen0
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
@@ -1699,6 +1754,29 @@
 
 %if %{includexen}
 %if %{buildxen}
+%files xen
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}xen
+/boot/System.map-%{KVERREL}xen
+/boot/symvers-%{KVERREL}xen.gz
+/boot/symsets-%{KVERREL}xen.tar.gz
+/boot/config-%{KVERREL}xen
+/boot/xen.gz-%{KVERREL}
+/boot/xen-syms-%{KVERREL}
+%dir /lib/modules/%{KVERREL}xen
+/lib/modules/%{KVERREL}xen/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}xen/build
+/lib/modules/%{KVERREL}xen/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}xen/extra
+/lib/modules/%{KVERREL}xen/updates
+/lib/modules/%{KVERREL}xen/weak-updates
+
+%files xen-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
+
 %files xen0
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen0



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:47:00 -0400
Subject: rpms/kernel/devel/configs config-xen-xen, NONE,
	1.1 config-xen-generic, 1.18, 1.19
Message-ID: <200606132247.k5DMl0uC019005@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv18587/configs

Modified Files:
	config-xen-generic 
Added Files:
	config-xen-xen 
Log Message:
rename xen0/xenU to single xen kernel


--- NEW FILE config-xen-xen ---
#
# XEN
#
CONFIG_XEN_PRIVILEGED_GUEST=y
CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=m
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set

#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOANY is not set

# Microcode driver in Xen won't work as a module - should be upgraded
CONFIG_MICROCODE=y

#
# PCI Hotplug Support
#
# CONFIG_HOTPLUG_PCI is not set

#
# Ethernet (10 or 100Mbit)
# 
# CONFIG_LANCE is not set
# CONFIG_SUNLANCE is not set
# CONFIG_3C515 is not set
# CONFIG_NI65 is not set
# CONFIG_ELPLUS is not set
# B44 results in "b44.ko needs unknown symbol dma_get_cache_alignment"
# CONFIG_B44 is not set

#
# SCSI low-level drivers
#
# CONFIG_SCSI_AHA1542 is not set

#
# ISA devices
#
# CONFIG_SND_SB16_CSP is not set

#
# Serial drivers
#
CONFIG_SERIAL_8250=m
# CONFIG_SERIAL_8250_CONSOLE is not set
# CONFIG_XEN_DISABLE_SERIAL is not set

# CONFIG_SYNCLINK is not set
# CONFIG_SYNCLINKMP is not set

#
# FIR device drivers
#
# CONFIG_TOSHIBA_FIR is not set

# 
# TPM
# 
# CONFIG_XEN_TPMDEV_BACKEND is not set
# CONFIG_XEN_TPMDEV_FRONTEND is not set

#
# Power management bits that don't work in Xen:
#
# CONFIG_X86_POWERNOW_K7 is not set
# CONFIG_X86_P4_CLOCKMOD is not set
CONFIG_PCI=y
CONFIG_PCI_GODIRECT=y
# CONFIG_PCI_GOXEN_FE is not set
CONFIG_PCI_DIRECT=y
CONFIG_PCIEPORTBUS=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-xen-generic	12 May 2006 02:00:26 -0000	1.18
+++ config-xen-generic	13 Jun 2006 22:46:57 -0000	1.19
@@ -62,8 +62,8 @@
 #
 # CONFIG_EDD is not set
 # CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_REGPARM is not set
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:48:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:48:28 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2274,1.2275
Message-ID: <200606132248.k5DMmS11024919@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24115

Modified Files:
	kernel-2.6.spec 
Log Message:
rename xen0/xenU to single xen kernel, add changelog


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2274
retrieving revision 1.2275
diff -u -r1.2274 -r1.2275
--- kernel-2.6.spec	13 Jun 2006 22:46:56 -0000	1.2274
+++ kernel-2.6.spec	13 Jun 2006 22:48:14 -0000	1.2275
@@ -1903,6 +1903,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
+- rename xen0 & xenU to single xen kernels.
+
 * Tue Jun 13 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git5
 - serial/tty resume fixing.



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:49:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:49:56 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2275,1.2276
Message-ID: <200606132249.k5DMnuxT027540@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27507

Modified Files:
	kernel-2.6.spec 
Log Message:
right %post for xen kernel


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2275
retrieving revision 1.2276
diff -u -r1.2275 -r1.2276
--- kernel-2.6.spec	13 Jun 2006 22:48:14 -0000	1.2275
+++ kernel-2.6.spec	13 Jun 2006 22:49:54 -0000	1.2276
@@ -1564,8 +1564,11 @@
 
 %post xen
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
-/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
-/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+if [ -e /proc/xen/xsd_kva ]; then 
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+else 
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
+fi
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-devel



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:57:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:57:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2276,1.2277
Message-ID: <200606132257.k5DMvQll029823@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29788

Modified Files:
	kernel-2.6.spec 
Log Message:
remove xen0/xenU source files


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2276
retrieving revision 1.2277
diff -u -r1.2276 -r1.2277
--- kernel-2.6.spec	13 Jun 2006 22:49:54 -0000	1.2276
+++ kernel-2.6.spec	13 Jun 2006 22:57:21 -0000	1.2277
@@ -230,13 +230,13 @@
 
 Source32: kernel-%{kversion}-ia64.config
 
-Source33: kernel-%{kversion}-i686-xen0.config
-Source34: kernel-%{kversion}-i686-xenU.config
+#Source33: kernel-%{kversion}-i686-xen0.config
+#Source34: kernel-%{kversion}-i686-xenU.config
 Source35: kernel-%{kversion}-i686-kdump.config
-Source36: kernel-%{kversion}-i686-xen0-PAE.config
-Source37: kernel-%{kversion}-i686-xenU-PAE.config
-Source38: kernel-%{kversion}-x86_64-xen0.config
-Source39: kernel-%{kversion}-x86_64-xenU.config
+#Source36: kernel-%{kversion}-i686-xen0-PAE.config
+#Source37: kernel-%{kversion}-i686-xenU-PAE.config
+#Source38: kernel-%{kversion}-x86_64-xen0.config
+#Source39: kernel-%{kversion}-x86_64-xenU.config
 Source40: kernel-%{kversion}-i686-xen.config
 Source41: kernel-%{kversion}-x86_64-xen.config
 



From fedora-cvs-commits at redhat.com  Tue Jun 13 22:59:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 18:59:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2277,1.2278
Message-ID: <200606132259.k5DMxY3q030593@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30559

Modified Files:
	kernel-2.6.spec 
Log Message:
remove xen0/xenU %files section


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2277
retrieving revision 1.2278
diff -u -r1.2277 -r1.2278
--- kernel-2.6.spec	13 Jun 2006 22:57:21 -0000	1.2277
+++ kernel-2.6.spec	13 Jun 2006 22:59:31 -0000	1.2278
@@ -1421,7 +1421,7 @@
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
   make clean
 %endif
-  make debug=y verbose=y crash_debug=y
+  make debug=y pae=y verbose=y crash_debug=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
@@ -1449,8 +1449,7 @@
 %endif
 
 %if %{buildxen}
-BuildKernel vmlinuz vmlinuz xen0
-BuildKernel vmlinuz vmlinuz xenU
+BuildKernel vmlinuz vmlinuz xen
 %endif
 %endif
 
@@ -1780,6 +1779,7 @@
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 
+%if %{buildxenPAE}
 %files xen0
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen0
@@ -1825,7 +1825,6 @@
 /usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
 %endif
 
-%if %{buildxenPAE}
 %files xen0-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE



From fedora-cvs-commits at redhat.com  Tue Jun 13 23:24:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 19:24:04 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.272, 1.273 anaconda.spec, 1.396,
	1.397 sources, 1.393, 1.394
Message-ID: <200606132324.k5DNO4qw017193@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17152/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.33-1 on branch devel from anaconda-11.1.0.33-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- .cvsignore	13 Jun 2006 20:06:55 -0000	1.272
+++ .cvsignore	13 Jun 2006 23:23:59 -0000	1.273
@@ -1 +1 @@
-anaconda-11.1.0.32.tar.bz2
+anaconda-11.1.0.33.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- anaconda.spec	13 Jun 2006 20:06:56 -0000	1.396
+++ anaconda.spec	13 Jun 2006 23:23:59 -0000	1.397
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.32
+Version: 11.1.0.33
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.33-1
+- Fix text mode package selection (clumens)
+- Fix IP editing (clumens)
+- Fix segfault on x86_64 dhcp (dcantrel)
+- Filter out sitX devs (dcantrel)
+- More release notes fixes (dcantrel)
+- More pkgorder fixage 
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.32-1
 - fix ppc images
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- sources	13 Jun 2006 20:06:58 -0000	1.393
+++ sources	13 Jun 2006 23:24:01 -0000	1.394
@@ -1 +1 @@
-b50af4cdb23da225cc88ba9d5e77712b  anaconda-11.1.0.32.tar.bz2
+09762517814a306ce6790c1c1ebca2e5  anaconda-11.1.0.33.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 00:05:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 20:05:21 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-cvt-generator-in-core.patch, NONE,
	1.1 xorg-x11-server-1.1.0-edid-mode-injection-1.patch, NONE,
	1.1 xorg-x11-server-1.1.0-edid-mode-injection-2.patch, NONE,
	1.1 xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch,
	NONE, 1.1 xorg-x11-server-1.1.0-input-autoconfig-2.patch, 1.1,
	1.2 xorg-x11-server.spec, 1.78, 1.79
Message-ID: <200606140005.k5E05LZ7018100@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18087

Modified Files:
	xorg-x11-server-1.1.0-input-autoconfig-2.patch 
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-cvt-generator-in-core.patch 
	xorg-x11-server-1.1.0-edid-mode-injection-1.patch 
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch 
	xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch 
Log Message:
- Add EDID mode autodetection.


xorg-x11-server-1.1.0-cvt-generator-in-core.patch:
 common/Makefile.am    |    2 
 common/xf86.h         |    4 
 common/xf86cvt.c      |  292 ++++++++++++++++++++++++++++++++++++++++++++++++++
 loader/xf86sym.c      |    3 
 utils/cvt/Makefile.am |    5 
 utils/cvt/cvt.c       |  263 ---------------------------------------------
 6 files changed, 303 insertions(+), 266 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-cvt-generator-in-core.patch ---
--- xorg-server-1.1.0/hw/xfree86/loader/xf86sym.c.cvt	2006-03-28 02:21:50.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/xf86sym.c	2006-06-06 18:29:46.000000000 -0400
@@ -375,6 +375,9 @@
     SYMFUNC(xf86AllocateEntityPrivateIndex)
     SYMFUNC(xf86GetEntityPrivate)
 
+    /* xf86cvt.c */
+    SYMFUNC(xf86CVTMode)
+
     /* xf86Configure.c */
     SYMFUNC(xf86AddDeviceToConfigure)
 
--- xorg-server-1.1.0/hw/xfree86/common/xf86.h.cvt	2006-03-07 18:58:22.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/common/xf86.h	2006-06-06 18:29:46.000000000 -0400
@@ -199,6 +199,10 @@
 void xf86InitOrigins(void);
 void xf86ReconfigureLayout(void);
 
+/* xf86cvt.c */
+DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
+                           Bool Reduced, Bool Interlaced);
+
 /* xf86DPMS.c */
 
 Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);
--- /dev/null	2006-06-06 17:50:50.883305500 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86cvt.c	2006-06-06 18:29:46.000000000 -0400
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2005-2006 Luc Verhaegen.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The reason for having this function in a file of its own is
+ * so that ../utils/cvt/cvt can link to it, and that xf86CVTMode
+ * code is shared directly.
+ */
+
+#include "xf86.h"
+
+/*
+ * Generate a CVT standard mode from HDisplay, VDisplay and VRefresh.
+ *
+ * These calculations are stolen from the CVT calculation spreadsheet written
+ * by Graham Loveridge. He seems to be claiming no copyright and there seems to
+ * be no license attached to this. He apparently just wants to see his name
+ * mentioned.
+ *
+ * This file can be found at http://www.vesa.org/Public/CVT/CVTd6r1.xls
+ *
+ * Comments and structure corresponds to the comments and structure of the xls.
+ * This should ease importing of future changes to the standard (not very
+ * likely though).
+ *
+ * About margins; i'm sure that they are to be the bit between HDisplay and
+ * HBlankStart, HBlankEnd and HTotal, VDisplay and VBlankStart, VBlankEnd and 
+ * VTotal, where the overscan colour is shown. FB seems to call _all_ blanking
+ * outside sync "margin" for some reason. Since we prefer seeing proper
+ * blanking instead of the overscan colour, and since the Crtc* values will
+ * probably get altered after us, we will disable margins altogether. With
+ * these calculations, Margins will plainly expand H/VDisplay, and we don't
+ * want that. -- libv
+ *
+ */
+DisplayModePtr
+xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
+            Bool Interlaced)
+{
+    DisplayModeRec  *Mode = xnfalloc(sizeof(DisplayModeRec));
+
+    /* 1) top/bottom margin size (% of height) - default: 1.8 */
+#define CVT_MARGIN_PERCENTAGE 1.8    
+
+    /* 2) character cell horizontal granularity (pixels) - default 8 */
+#define CVT_H_GRANULARITY 8
+
+    /* 4) Minimum vertical porch (lines) - default 3 */
+#define CVT_MIN_V_PORCH 3
+
+    /* 4) Minimum number of vertical back porch lines - default 6 */
+#define CVT_MIN_V_BPORCH 6
+
+    /* Pixel Clock step (kHz) */
+#define CVT_CLOCK_STEP 250
+
+    Bool Margins = FALSE;
+    float  VFieldRate, HPeriod;
+    int  HDisplayRnd, HMargin;
+    int  VDisplayRnd, VMargin, VSync;
+    float  Interlace; /* Please rename this */
+
+    memset(Mode, 0, sizeof(DisplayModeRec));
+
+    /* CVT default is 60.0Hz */
+    if (!VRefresh)
+        VRefresh = 60.0;
+
+    /* 1. Required field rate */
+    if (Interlaced)
+        VFieldRate = VRefresh * 2;
+    else
+        VFieldRate = VRefresh;
+
+    /* 2. Horizontal pixels */
+    HDisplayRnd = HDisplay - (HDisplay % CVT_H_GRANULARITY);
+
+    /* 3. Determine left and right borders */
+    if (Margins) {
+        /* right margin is actually exactly the same as left */
+        HMargin = (((float) HDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0);
+        HMargin -= HMargin % CVT_H_GRANULARITY;
+    } else
+        HMargin = 0;
+
+    /* 4. Find total active pixels */
+    Mode->HDisplay = HDisplayRnd + 2*HMargin;
+
+    /* 5. Find number of lines per field */
+    if (Interlaced)
+        VDisplayRnd = VDisplay / 2;
+    else
+        VDisplayRnd = VDisplay;
+
+    /* 6. Find top and bottom margins */
+    /* nope. */
+    if (Margins)
+        /* top and bottom margins are equal again. */
+        VMargin = (((float) VDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0);
+    else
+        VMargin = 0;
+
+    Mode->VDisplay = VDisplay + 2*VMargin;
+
+    /* 7. Interlace */
+    if (Interlaced)
+        Interlace = 0.5;
+    else
+        Interlace = 0.0;
+
+    /* Determine VSync Width from aspect ratio */
+    if (!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay))
+        VSync = 4;
+    else if (!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay))
+        VSync = 5;
+    else if (!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay))
+        VSync = 6;
+    else if (!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay))
+        VSync = 7;
+    else if (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay))
+        VSync = 7;
+    else /* Custom */
+        VSync = 10;
+
+    if (!Reduced) { /* simplified GTF calculation */
+
+        /* 4) Minimum time of vertical sync + back porch interval (?s) 
+         * default 550.0 */
+#define CVT_MIN_VSYNC_BP 550.0
+
+        /* 3) Nominal HSync width (% of line period) - default 8 */
+#define CVT_HSYNC_PERCENTAGE 8
+
+        float  HBlankPercentage;
+        int  VSyncAndBackPorch, VBackPorch;
+        int  HBlank;
+
+        /* 8. Estimated Horizontal period */
+        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_MIN_VSYNC_BP)) / 
+            (VDisplayRnd + 2 * VMargin + CVT_MIN_V_PORCH + Interlace);
+
+        /* 9. Find number of lines in sync + backporch */
+        if (((int)(CVT_MIN_VSYNC_BP / HPeriod) + 1) < (VSync + CVT_MIN_V_PORCH))
+            VSyncAndBackPorch = VSync + CVT_MIN_V_PORCH;
+        else
+            VSyncAndBackPorch = (int)(CVT_MIN_VSYNC_BP / HPeriod) + 1;
+
+        /* 10. Find number of lines in back porch */
+        VBackPorch = VSyncAndBackPorch - VSync;
+
+        /* 11. Find total number of lines in vertical field */
+        Mode->VTotal = VDisplayRnd + 2 * VMargin + VSyncAndBackPorch + Interlace
+            + CVT_MIN_V_PORCH;
+
+        /* 5) Definition of Horizontal blanking time limitation */
+        /* Gradient (%/kHz) - default 600 */
+#define CVT_M_FACTOR 600
+
+        /* Offset (%) - default 40 */
+#define CVT_C_FACTOR 40
+
+        /* Blanking time scaling factor - default 128 */
+#define CVT_K_FACTOR 128
+
+        /* Scaling factor weighting - default 20 */
+#define CVT_J_FACTOR 20
+
+#define CVT_M_PRIME CVT_M_FACTOR * CVT_K_FACTOR / 256
+#define CVT_C_PRIME (CVT_C_FACTOR - CVT_J_FACTOR) * CVT_K_FACTOR / 256 + \
+        CVT_J_FACTOR
+
+        /* 12. Find ideal blanking duty cycle from formula */
+        HBlankPercentage = CVT_C_PRIME - CVT_M_PRIME * HPeriod/1000.0;
+
+        /* 13. Blanking time */
+        if (HBlankPercentage < 20)
+            HBlankPercentage = 20;
+
+        HBlank = Mode->HDisplay * HBlankPercentage/(100.0 - HBlankPercentage);
+        HBlank -= HBlank % (2*CVT_H_GRANULARITY);
+        
+        /* 14. Find total number of pixels in a line. */
+        Mode->HTotal = Mode->HDisplay + HBlank;
+
+        /* Fill in HSync values */
+        Mode->HSyncEnd = Mode->HDisplay + HBlank / 2;
+
+        Mode->HSyncStart = Mode->HSyncEnd - 
+            (Mode->HTotal * CVT_HSYNC_PERCENTAGE) / 100;
+        Mode->HSyncStart += CVT_H_GRANULARITY - 
+            Mode->HSyncStart % CVT_H_GRANULARITY;
+
+        /* Fill in VSync values */
+        Mode->VSyncStart = Mode->VDisplay + CVT_MIN_V_PORCH;
+        Mode->VSyncEnd = Mode->VSyncStart + VSync;
+
+    } else { /* Reduced blanking */
+        /* Minimum vertical blanking interval time (?s) - default 460 */
+#define CVT_RB_MIN_VBLANK 460.0
+
+        /* Fixed number of clocks for horizontal sync */
+#define CVT_RB_H_SYNC 32.0
+
+        /* Fixed number of clocks for horizontal blanking */
+#define CVT_RB_H_BLANK 160.0
+
+        /* Fixed number of lines for vertical front porch - default 3 */
+#define CVT_RB_VFPORCH 3
+
+        int  VBILines;
+
+        /* 8. Estimate Horizontal period. */
+        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_RB_MIN_VBLANK)) / 
+            (VDisplayRnd + 2*VMargin);
+
+        /* 9. Find number of lines in vertical blanking */
+        VBILines = ((float) CVT_RB_MIN_VBLANK) / HPeriod + 1;
+
+        /* 10. Check if vertical blanking is sufficient */
+        if (VBILines < (CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH))
+            VBILines = CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH;
+        
+        /* 11. Find total number of lines in vertical field */
+        Mode->VTotal = VDisplayRnd + 2 * VMargin + Interlace + VBILines;
+
+        /* 12. Find total number of pixels in a line */
+        Mode->HTotal = Mode->HDisplay + CVT_RB_H_BLANK;
+
+        /* Fill in HSync values */
+        Mode->HSyncEnd = Mode->HDisplay + CVT_RB_H_BLANK / 2;
+        Mode->HSyncStart = Mode->HSyncEnd - CVT_RB_H_SYNC;
+
+        /* Fill in VSync values */
+        Mode->VSyncStart = Mode->VDisplay + CVT_RB_VFPORCH;
+        Mode->VSyncEnd = Mode->VSyncStart + VSync;
+    }
+
+    /* 15/13. Find pixel clock frequency (kHz for xf86) */
+    Mode->Clock = Mode->HTotal * 1000.0 / HPeriod;
+    Mode->Clock -= Mode->Clock % CVT_CLOCK_STEP;
+
+    /* 16/14. Find actual Horizontal Frequency (kHz) */
+    Mode->HSync = ((float) Mode->Clock) / ((float) Mode->HTotal);
+
+    /* 17/15. Find actual Field rate */
+    Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 
+        ((float) (Mode->HTotal * Mode->VTotal));
+
+    /* 18/16. Find actual vertical frame frequency */
+    /* ignore - just set the mode flag for interlaced */
+    if (Interlaced)
+        Mode->VTotal *= 2;
+
+    {
+        char  Name[256];
+        Name[0] = 0;
+
+        snprintf(Name, 256, "%dx%d", HDisplay, VDisplay);
+
+        Mode->name = xnfalloc(strlen(Name) + 1);
+        memcpy(Mode->name, Name, strlen(Name) + 1);
+    }
+
+    if (Reduced)
+        Mode->Flags |= V_PHSYNC | V_NVSYNC;
+    else
+        Mode->Flags |= V_NHSYNC | V_PVSYNC;
+
+    if (Interlaced)
+        Mode->Flags |= V_INTERLACE;
+
+    return Mode;
+}
--- xorg-server-1.1.0/hw/xfree86/common/Makefile.am.cvt	2006-05-09 14:04:29.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/Makefile.am	2006-06-06 18:29:46.000000000 -0400
@@ -32,7 +32,7 @@
 
 AM_LDFLAGS = -r
 libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
-                      xf86Cursor.c xf86DGA.c xf86DPMS.c \
+                      xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
                       xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
                       xf86Globals.c xf86Io.c xf86AutoConfig.c \
                       xf86MiscExt.c xf86Option.c \
--- xorg-server-1.1.0/hw/xfree86/utils/cvt/cvt.c.cvt	2006-04-24 14:43:14.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/utils/cvt/cvt.c	2006-06-06 18:29:46.000000000 -0400
@@ -26,269 +26,6 @@
 #include "xf86.h"
 
 /*
- * Generate a CVT standard mode from HDisplay, VDisplay and VRefresh.
- *
- * These calculations are stolen from the CVT calculation spreadsheet written
- * by Graham Loveridge. He seems to be claiming no copyright and there seems to
- * be no license attached to this. He apparently just wants to see his name
- * mentioned.
- *
- * This file can be found at http://www.vesa.org/Public/CVT/CVTd6r1.xls
- *
- * Comments and structure corresponds to the comments and structure of the xls.
- * This should ease importing of future changes to the standard (not very
- * likely though).
- *
- * About margins; i'm sure that they are to be the bit between HDisplay and
- * HBlankStart, HBlankEnd and HTotal, VDisplay and VBlankStart, VBlankEnd and 
- * VTotal, where the overscan colour is shown. FB seems to call _all_ blanking
- * outside sync "margin" for some reason. Since we prefer seeing proper
- * blanking instead of the overscan colour, and since the Crtc* values will
- * probably get altered after us, we will disable margins altogether. With
- * these calculations, Margins will plainly expand H/VDisplay, and we don't
- * want that. -- libv
- *
- */
-static DisplayModePtr
-xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
-            Bool Interlaced)
-{
-    DisplayModeRec  *Mode = xnfalloc(sizeof(DisplayModeRec));
-
-    /* 1) top/bottom margin size (% of height) - default: 1.8 */
-#define CVT_MARGIN_PERCENTAGE 1.8    
-
-    /* 2) character cell horizontal granularity (pixels) - default 8 */
-#define CVT_H_GRANULARITY 8
-
-    /* 4) Minimum vertical porch (lines) - default 3 */
-#define CVT_MIN_V_PORCH 3
-
-    /* 4) Minimum number of vertical back porch lines - default 6 */
-#define CVT_MIN_V_BPORCH 6
-
-    /* Pixel Clock step (kHz) */
-#define CVT_CLOCK_STEP 250
-
-    Bool Margins = FALSE;
-    float  VFieldRate, HPeriod;
-    int  HDisplayRnd, HMargin;
-    int  VDisplayRnd, VMargin, VSync;
-    float  Interlace; /* Please rename this */
-
-    memset(Mode, 0, sizeof(DisplayModeRec));
-
-    /* CVT default is 60.0Hz */
-    if (!VRefresh)
-        VRefresh = 60.0;
-
-    /* 1. Required field rate */
-    if (Interlaced)
-        VFieldRate = VRefresh * 2;
-    else
-        VFieldRate = VRefresh;
-
-    /* 2. Horizontal pixels */
-    HDisplayRnd = HDisplay - (HDisplay % CVT_H_GRANULARITY);
-
-    /* 3. Determine left and right borders */
-    if (Margins) {
-        /* right margin is actually exactly the same as left */
-        HMargin = (((float) HDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0);
-        HMargin -= HMargin % CVT_H_GRANULARITY;
-    } else
-        HMargin = 0;
-
-    /* 4. Find total active pixels */
-    Mode->HDisplay = HDisplayRnd + 2*HMargin;
-
-    /* 5. Find number of lines per field */
-    if (Interlaced)
-        VDisplayRnd = VDisplay / 2;
-    else
-        VDisplayRnd = VDisplay;
-
-    /* 6. Find top and bottom margins */
-    /* nope. */
-    if (Margins)
-        /* top and bottom margins are equal again. */
-        VMargin = (((float) VDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0);
-    else
-        VMargin = 0;
-
-    Mode->VDisplay = VDisplay + 2*VMargin;
-
-    /* 7. Interlace */
-    if (Interlaced)
-        Interlace = 0.5;
-    else
-        Interlace = 0.0;
-
-    /* Determine VSync Width from aspect ratio */
-    if (!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay))
-        VSync = 4;
-    else if (!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay))
-        VSync = 5;
-    else if (!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay))
-        VSync = 6;
-    else if (!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay))
-        VSync = 7;
-    else if (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay))
-        VSync = 7;
-    else /* Custom */
-        VSync = 10;
-
-    if (!Reduced) { /* simplified GTF calculation */
-
-        /* 4) Minimum time of vertical sync + back porch interval (?s) 
-         * default 550.0 */
-#define CVT_MIN_VSYNC_BP 550.0
-
-        /* 3) Nominal HSync width (% of line period) - default 8 */
-#define CVT_HSYNC_PERCENTAGE 8
-
-        float  HBlankPercentage;
-        int  VSyncAndBackPorch, VBackPorch;
-        int  HBlank;
-
-        /* 8. Estimated Horizontal period */
-        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_MIN_VSYNC_BP)) / 
-            (VDisplayRnd + 2 * VMargin + CVT_MIN_V_PORCH + Interlace);
-
-        /* 9. Find number of lines in sync + backporch */
-        if (((int)(CVT_MIN_VSYNC_BP / HPeriod) + 1) < (VSync + CVT_MIN_V_PORCH))
-            VSyncAndBackPorch = VSync + CVT_MIN_V_PORCH;
-        else
-            VSyncAndBackPorch = (int)(CVT_MIN_VSYNC_BP / HPeriod) + 1;
-
-        /* 10. Find number of lines in back porch */
-        VBackPorch = VSyncAndBackPorch - VSync;
-
-        /* 11. Find total number of lines in vertical field */
-        Mode->VTotal = VDisplayRnd + 2 * VMargin + VSyncAndBackPorch + Interlace
-            + CVT_MIN_V_PORCH;
-
-        /* 5) Definition of Horizontal blanking time limitation */
-        /* Gradient (%/kHz) - default 600 */
-#define CVT_M_FACTOR 600
-
-        /* Offset (%) - default 40 */
-#define CVT_C_FACTOR 40
-
-        /* Blanking time scaling factor - default 128 */
-#define CVT_K_FACTOR 128
-
-        /* Scaling factor weighting - default 20 */
-#define CVT_J_FACTOR 20
-
-#define CVT_M_PRIME CVT_M_FACTOR * CVT_K_FACTOR / 256
-#define CVT_C_PRIME (CVT_C_FACTOR - CVT_J_FACTOR) * CVT_K_FACTOR / 256 + \
-        CVT_J_FACTOR
-
-        /* 12. Find ideal blanking duty cycle from formula */
-        HBlankPercentage = CVT_C_PRIME - CVT_M_PRIME * HPeriod/1000.0;
-
-        /* 13. Blanking time */
-        if (HBlankPercentage < 20)
-            HBlankPercentage = 20;
-
-        HBlank = Mode->HDisplay * HBlankPercentage/(100.0 - HBlankPercentage);
-        HBlank -= HBlank % (2*CVT_H_GRANULARITY);
-        
-        /* 14. Find total number of pixels in a line. */
-        Mode->HTotal = Mode->HDisplay + HBlank;
-
-        /* Fill in HSync values */
-        Mode->HSyncEnd = Mode->HDisplay + HBlank / 2;
-
-        Mode->HSyncStart = Mode->HSyncEnd - 
-            (Mode->HTotal * CVT_HSYNC_PERCENTAGE) / 100;
-        Mode->HSyncStart += CVT_H_GRANULARITY - 
-            Mode->HSyncStart % CVT_H_GRANULARITY;
-
-        /* Fill in VSync values */
-        Mode->VSyncStart = Mode->VDisplay + CVT_MIN_V_PORCH;
-        Mode->VSyncEnd = Mode->VSyncStart + VSync;
-
-    } else { /* Reduced blanking */
-        /* Minimum vertical blanking interval time (?s) - default 460 */
-#define CVT_RB_MIN_VBLANK 460.0
-
-        /* Fixed number of clocks for horizontal sync */
-#define CVT_RB_H_SYNC 32.0
-
-        /* Fixed number of clocks for horizontal blanking */
-#define CVT_RB_H_BLANK 160.0
-
-        /* Fixed number of lines for vertical front porch - default 3 */
-#define CVT_RB_VFPORCH 3
-
-        int  VBILines;
-
-        /* 8. Estimate Horizontal period. */
-        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_RB_MIN_VBLANK)) / 
-            (VDisplayRnd + 2*VMargin);
-
-        /* 9. Find number of lines in vertical blanking */
-        VBILines = ((float) CVT_RB_MIN_VBLANK) / HPeriod + 1;
-
-        /* 10. Check if vertical blanking is sufficient */
-        if (VBILines < (CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH))
-            VBILines = CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH;
-        
-        /* 11. Find total number of lines in vertical field */
-        Mode->VTotal = VDisplayRnd + 2 * VMargin + Interlace + VBILines;
-
-        /* 12. Find total number of pixels in a line */
-        Mode->HTotal = Mode->HDisplay + CVT_RB_H_BLANK;
-
-        /* Fill in HSync values */
-        Mode->HSyncEnd = Mode->HDisplay + CVT_RB_H_BLANK / 2;
-        Mode->HSyncStart = Mode->HSyncEnd - CVT_RB_H_SYNC;
-
-        /* Fill in VSync values */
-        Mode->VSyncStart = Mode->VDisplay + CVT_RB_VFPORCH;
-        Mode->VSyncEnd = Mode->VSyncStart + VSync;
-    }
-
-    /* 15/13. Find pixel clock frequency (kHz for xf86) */
-    Mode->Clock = Mode->HTotal * 1000.0 / HPeriod;
-    Mode->Clock -= Mode->Clock % CVT_CLOCK_STEP;
-
-    /* 16/14. Find actual Horizontal Frequency (kHz) */
-    Mode->HSync = ((float) Mode->Clock) / ((float) Mode->HTotal);
-
-    /* 17/15. Find actual Field rate */
-    Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 
-        ((float) (Mode->HTotal * Mode->VTotal));
-
-    /* 18/16. Find actual vertical frame frequency */
-    /* ignore - just set the mode flag for interlaced */
-    if (Interlaced)
-        Mode->VTotal *= 2;
-
-    {
-        char  Name[256];
-        Name[0] = 0;
-
-        snprintf(Name, 256, "%dx%d", HDisplay, VDisplay);
-
-        Mode->name = xnfalloc(strlen(Name) + 1);
-        memcpy(Mode->name, Name, strlen(Name) + 1);
-    }
-
-    if (Reduced)
-        Mode->Flags |= V_PHSYNC | V_NVSYNC;
-    else
-        Mode->Flags |= V_NHSYNC | V_PVSYNC;
-
-    if (Interlaced)
-        Mode->Flags |= V_INTERLACE;
-
-    return Mode;
-}
-
-/*
  * Quickly check wether this is a CVT standard mode.
  */
 static Bool
--- xorg-server-1.1.0/hw/xfree86/utils/cvt/Makefile.am.cvt	2005-12-28 10:22:21.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/utils/cvt/Makefile.am	2006-06-06 18:46:11.000000000 -0400
@@ -31,9 +31,10 @@
 INCLUDES = $(XORG_INCS)
 DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
 
-cvt_SOURCES = cvt.c
+# gah
+cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/common/xf86cvt.c
 cvt_CFLAGS = $(XORG_CFLAGS)
-cvt_LDADD = ../../dummylib/libdummy-nonserver.a
+cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a
 
 man1_MANS = cvt.man
 

xorg-x11-server-1.1.0-edid-mode-injection-1.patch:
 common/xf86Mode.c |  187 -------------------
 ddc/ddcProperty.c |  513 ++++++++++++++++++++++++++++++++++++++++--------------
 ddc/xf86DDC.h     |    3 
 3 files changed, 383 insertions(+), 320 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-edid-mode-injection-1.patch ---
Forward port of libv's patch from fdo bug #5386 to 1.1. - ajax

--- xorg-server-1.1.0/hw/xfree86/ddc/xf86DDC.h.edid	2005-08-24 07:18:33.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/ddc/xf86DDC.h	2006-06-06 16:03:18.000000000 -0400
@@ -48,6 +48,9 @@
     CARD8 *c
 );
 
+extern void 
+xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC);
+
 extern Bool xf86SetDDCproperties(
     ScrnInfoPtr pScreen,
     xf86MonPtr DDC
--- xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c.edid	2006-06-06 16:02:38.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c	2006-06-06 16:03:18.000000000 -0400
@@ -1,160 +1,407 @@
-/* ddcProperty.c: Make the DDC monitor information available to clients
- * as properties on the root window
- * 
- * Copyright 1999 by Andrew C Aitchison <A.C.Aitchison at dpmms.cam.ac.uk>
+/*
+ * Copyright 2006 Luc Verhaegen.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#include <string.h>
-#include "misc.h"
 #include "xf86.h"
-/* #include "xf86_OSproc.h" */
-#include <X11/Xatom.h>
-#include "property.h"
-#include "propertyst.h"
 #include "xf86DDC.h"
 
-#define EDID1_ATOM_NAME         "XFree86_DDC_EDID1_RAWDATA"
-#define EDID2_ATOM_NAME         "XFree86_DDC_EDID2_RAWDATA"
-#define VDIF_ATOM_NAME          "XFree86_DDC_VDIF_RAWDATA"
+/*
+ * xf86Mode.c should have a some more DisplayModePtr list handling.
+ */
+static DisplayModePtr
+xf86ModesAdd(DisplayModePtr Modes, DisplayModePtr Additions)
+{
+    if (!Modes) {
+        if (Additions)
+            return Additions;
+        else
+            return NULL;
+    }
 
-Bool
-xf86SetDDCproperties(ScrnInfoPtr pScrnInfo, xf86MonPtr DDC)
+    if (Additions) {
+        DisplayModePtr Mode = Modes;
+
+        while (Mode->next)
+            Mode = Mode->next;
+        
+        Mode->next = Additions;
+        Additions->prev = Mode;
+    }
+
+    return Modes;
+}
+
+static DisplayModePtr
+xf86ModeCopy(DisplayModePtr Mode)
 {
-    Atom EDID1Atom=-1, EDID2Atom=-1, VDIFAtom=-1;
-    CARD8 *EDID1rawdata = NULL;
-    CARD8 *EDID2rawdata = NULL;
-    int  i, ret;
-    Bool  makeEDID1prop = FALSE;
-    Bool  makeEDID2prop = FALSE;
+    DisplayModePtr New;
+
+    if (!Mode)
+        return NULL;
+
+    New = xnfalloc(sizeof(DisplayModeRec));
+
+    memcpy(New, Mode, sizeof(DisplayModeRec));
+    
+    New->name = xnfalloc(strlen(Mode->name) + 1);
+    memcpy(New->name, Mode->name, strlen(Mode->name) + 1);
 
-#ifdef DEBUG
-    ErrorF("xf86SetDDCproperties(%p, %p)\n", pScrnInfo, DDC);
+    /* We ignore privates as DDC code doesn't use it currently */
+    return New;
+}
+
+/*
+ * Temporary.
+ */
+static void
+add(char **p, char *new)
+{
+    *p = xnfrealloc(*p, strlen(*p) + strlen(new) + 2);
+    strcat(*p, " ");
+    strcat(*p, new);
+}
+
+static void
+PrintModeline(int scrnIndex,DisplayModePtr mode)
+{
+    char tmp[256];
+    char *flags = xnfcalloc(1, 1);
+
+    if (mode->HSkew) { 
+	snprintf(tmp, 256, "hskew %i", mode->HSkew); 
+	add(&flags, tmp);
+    }
+    if (mode->VScan) { 
+	snprintf(tmp, 256, "vscan %i", mode->VScan); 
+	add(&flags, tmp);
+    }
+    if (mode->Flags & V_INTERLACE) add(&flags, "interlace");
+    if (mode->Flags & V_CSYNC) add(&flags, "composite");
+    if (mode->Flags & V_DBLSCAN) add(&flags, "doublescan");
+    if (mode->Flags & V_BCAST) add(&flags, "bcast");
+    if (mode->Flags & V_PHSYNC) add(&flags, "+hsync");
+    if (mode->Flags & V_NHSYNC) add(&flags, "-hsync");
+    if (mode->Flags & V_PVSYNC) add(&flags, "+vsync");
+    if (mode->Flags & V_NVSYNC) add(&flags, "-vsync");
+    if (mode->Flags & V_PCSYNC) add(&flags, "+csync");
+    if (mode->Flags & V_NCSYNC) add(&flags, "-csync");
+#if 0
+    if (mode->Flags & V_CLKDIV2) add(&flags, "vclk/2");
 #endif
+    xf86DrvMsgVerb(scrnIndex, X_INFO, 3,
+		   "Modeline \"%s\"  %6.2f  %i %i %i %i  %i %i %i %i%s\n",
+		   mode->name, mode->Clock/1000., mode->HDisplay,
+		   mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
+		   mode->VDisplay, mode->VSyncStart, mode->VSyncEnd,
+		   mode->VTotal, flags);
+    xfree(flags);
+}
 
-    if (pScrnInfo==NULL || pScrnInfo->monitor==NULL || DDC==NULL) {
-      return FALSE;
+/*
+ * TODO:
+ *  - for those with access to the VESA DMT standard; review please.
+ *  - swap M_T_DEFAULT for M_T_EDID_...
+ */
+#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DEFAULT
+#define MODESUFFIX   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
+
+DisplayModeRec DDCEstablishedModes[17] = {
+    { MODEPREFIX("800x600"),    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600 at 60Hz */
+    { MODEPREFIX("800x600"),    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600 at 56Hz */
+    { MODEPREFIX("640x480"),    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480 at 75Hz */
+    { MODEPREFIX("640x480"),    31500,  640,  664,  704,  832, 0,  480,  489,  491,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480 at 72Hz */
+    { MODEPREFIX("640x480"),    30240,  640,  704,  768,  864, 0,  480,  483,  486,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480 at 67Hz */
+    { MODEPREFIX("640x480"),    25200,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480 at 60Hz */
+    { MODEPREFIX("720x400"),    35500,  720,  738,  846,  900, 0,  400,  421,  423,  449, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 720x400 at 88Hz */
+    { MODEPREFIX("720x400"),    28320,  720,  738,  846,  900, 0,  400,  412,  414,  449, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400 at 70Hz */
+    { MODEPREFIX("1280x1024"), 135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024 at 75Hz */
+    { MODEPREFIX("1024x768"),   78800, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768 at 75Hz */
+    { MODEPREFIX("1024x768"),   75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768 at 70Hz */
+    { MODEPREFIX("1024x768"),   65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768 at 60Hz */
+    { MODEPREFIX("1024x768"),   44900, 1024, 1032, 1208, 1264, 0,  768,  768,  776,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768 at 43Hz */
+    { MODEPREFIX("832x624"),    57284,  832,  864,  928, 1152, 0,  624,  625,  628,  667, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 832x624 at 75Hz */
+    { MODEPREFIX("800x600"),    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600 at 75Hz */
+    { MODEPREFIX("800x600"),    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600 at 72Hz */
+    { MODEPREFIX("1152x864"),  108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864 at 75Hz */
+};
+
+static DisplayModePtr
+DDCModesFromEstablished(int scrnIndex, struct established_timings *timing)
+{
+    DisplayModePtr Modes = NULL, Mode = NULL;
+    CARD32 bits = (timing->t1) | (timing->t2 << 8) |
+        ((timing->t_manu & 0x80) << 9);
+    int i;
+
+    for (i = 0; i < 17; i++)
+        if (bits & (0x01 << i)) {
+            Mode = xf86ModeCopy(&(DDCEstablishedModes[i]));
+            Modes = xf86ModesAdd(Modes, Mode);
+        }
+
+    return Modes;
+}
+
+/*
+ *
+ */
+static DisplayModePtr
+DDCModesFromStandardTiming(int scrnIndex, struct std_timings *timing)
+{
+    DisplayModePtr Modes = NULL, Mode = NULL;
+    int i;
+    
+    for (i = 0; i < 5; i++)
+        if (timing[i].hsize && timing[i].vsize && timing[i].refresh) {
+            Mode =  xf86CVTMode(timing[i].hsize, timing[i].vsize,
+                                timing[i].refresh, FALSE, FALSE);
+            Modes = xf86ModesAdd(Modes, Mode);
+        }
+
+    return Modes;
+}
+
+/*
+ *
+ */
+static DisplayModePtr
+DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing)
+{
+    DisplayModePtr Mode;
+
+    /* We don't do stereo */
+    if (timing->stereo) {
+        xf86DrvMsg(scrnIndex, X_INFO, "%s: Ignoring: We don't handle stereo.\n",
+                   __func__);
+        return NULL;
+    }
+    
+    /* We only do seperate sync currently */
+    if (timing->sync != 0x03) {
+         xf86DrvMsg(scrnIndex, X_INFO, "%s: Ignoring: We only handle seperate"
+                    " sync.\n", __func__);
+         return NULL;
     }
+    
+    Mode = xnfalloc(sizeof(DisplayModeRec));
+    memset(Mode, 0, sizeof(DisplayModeRec));
+    
+    Mode->name = xnfalloc(10); /* "1234x1234" */
+    xf86snprintf(Mode->name, 20, "%dx%d", timing->h_active,
+                 timing->v_active);
+    
+    Mode->type = M_T_DEFAULT; /* get ourselves a nice type of our own */
+    
+    Mode->Clock = timing->clock / 1000.0;
+    
+    Mode->HDisplay = timing->h_active;
+    Mode->HSyncStart = timing->h_active + timing->h_sync_off;
+    Mode->HSyncEnd = Mode->HSyncStart + timing->h_sync_width;
+    Mode->HTotal = timing->h_active + timing->h_blanking;
+    
+    Mode->VDisplay = timing->v_active;
+    Mode->VSyncStart = timing->v_active + timing->v_sync_off;
+    Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width;
+    Mode->VTotal = timing->v_active + timing->v_blanking;
+    
+    /* We ignore h/v_size and h/v_border for now. */
+    
+    if (timing->interlaced)
+        Mode->Flags |= V_INTERLACE;
+    
+    if (timing->misc & 0x02)
+        Mode->Flags |= V_PHSYNC;
+    else
+        Mode->Flags |= V_NHSYNC;
+    
+    if (timing->misc & 0x01)
+        Mode->Flags |= V_PVSYNC;
+    else
+        Mode->Flags |= V_NVSYNC;
+ 
+    return Mode;
+}
 
-#ifdef DEBUG
-    ErrorF("pScrnInfo->scrnIndex %d\n", pScrnInfo->scrnIndex);
+/*
+ *
+ */
+static void
+DDCGuessRangesFromModes(int scrnIndex, MonPtr Monitor, DisplayModePtr Modes)
+{
+    DisplayModePtr Mode = Modes;
 
-    ErrorF("pScrnInfo->monitor was %p\n", pScrnInfo->monitor);
-#endif
+    if (!Monitor || !Modes)
+        return;
 
-    pScrnInfo->monitor->DDC = DDC;
+    /* set up the ranges for scanning through the modes */
+    Monitor->nHsync = 1;
+    Monitor->hsync[0].lo = 1024.0;
+    Monitor->hsync[0].hi = 0.0;
 
-    if (DDC->ver.version == 1) {
-      makeEDID1prop = TRUE;
-    } else if (DDC->ver.version == 2) {
-      int checksum1;
-      int checksum2;
-      makeEDID2prop = TRUE;
-
-      /* Some monitors (eg Panasonic PanaSync4)
-       * report version==2 because they used EDID v2 spec document,
-       * although they use EDID v1 data structure :-(
-       *
-       * Try using checksum to determine when we have such a monitor.
-       */
-      checksum2 = 0;
-      for (i=0; i<256; i++) { checksum2 += DDC->rawData[i]; }
-      if ( (checksum2 % 256) != 0 ) {
-	xf86DrvMsg(pScrnInfo->scrnIndex,X_INFO, "Monitor EDID v2 checksum failed\n");
-	xf86DrvMsg(pScrnInfo->scrnIndex,X_INFO, "XFree86_DDC_EDID2_RAWDATA property may be bad\n");
-	checksum1 = 0;
-	for (i=0; i<128; i++) { checksum1 += DDC->rawData[i]; }
-	if ( (checksum1 % 256) == 0 ) {
-	  xf86DrvMsg(pScrnInfo->scrnIndex,X_INFO, "Monitor EDID v1 checksum passed,\n");
-	  xf86DrvMsg(pScrnInfo->scrnIndex,X_INFO, "XFree86_DDC_EDID1_RAWDATA property created\n");
-	  makeEDID1prop = TRUE;
-	}
-      }
-    } else {
-     xf86DrvMsg(pScrnInfo->scrnIndex, X_PROBED,
-		"unexpected EDID version %d revision %d\n",
-		DDC->ver.version, DDC->ver.revision );      
-    }
-
-    if (makeEDID1prop) {
-      if ( (EDID1rawdata = xalloc(128*sizeof(CARD8)))==NULL ) {
-	return FALSE;
-      }
-
-      EDID1Atom = MakeAtom(EDID1_ATOM_NAME, sizeof(EDID1_ATOM_NAME), TRUE);
-
-
-      for (i=0; i<128; i++) {
-	EDID1rawdata[i] = DDC->rawData[i];
-      }
-
-#ifdef DEBUG
-      ErrorF("xf86RegisterRootWindowProperty %p(%d,%d,%d,%d,%d,%p)\n",
-	     xf86RegisterRootWindowProperty,
-	     pScrnInfo->scrnIndex,
-	     EDID1Atom, XA_INTEGER, 8,
-	     128, (unsigned char *)EDID1rawdata  );
-#endif
+    Monitor->nVrefresh = 1;
+    Monitor->vrefresh[0].lo = 1024.0;
+    Monitor->vrefresh[0].hi = 0.0;
 
-      ret = xf86RegisterRootWindowProperty(pScrnInfo->scrnIndex,
-					   EDID1Atom, XA_INTEGER, 8, 
-					   128, (unsigned char *)EDID1rawdata
-					   );
-      if (ret != Success)
-      ErrorF("xf86RegisterRootWindowProperty returns %d\n", ret );
-    } 
-
-    if (makeEDID2prop) {
-      if ( (EDID2rawdata = xalloc(256*sizeof(CARD8)))==NULL ) {
-	return FALSE;
-      }
-      for (i=0; i<256; i++) {
-	EDID2rawdata[i] = DDC->rawData[i];
-      }
-
-      EDID2Atom = MakeAtom(EDID2_ATOM_NAME, sizeof(EDID2_ATOM_NAME), TRUE);
-
-#ifdef DEBUG
-      ErrorF("xf86RegisterRootWindowProperty %p(%d,%d,%d,%d,%d,%p)\n",
-	     xf86RegisterRootWindowProperty,
-	     pScrnInfo->scrnIndex,
-	     EDID2Atom, XA_INTEGER, 8,
-	     256, (unsigned char *)EDID2rawdata  );
-#endif
-      ret = xf86RegisterRootWindowProperty(pScrnInfo->scrnIndex,
-					   EDID2Atom, XA_INTEGER, 8, 
-					   256, (unsigned char *)EDID2rawdata
-					   );
-      if (ret != Success)
-      ErrorF("xf86RegisterRootWindowProperty returns %d\n", ret );
-    }
-
-    if (DDC->vdif) {
-#define VDIF_DUMMY_STRING "setting dummy VDIF property - please insert correct values\n"
-#ifdef DEBUG
-      ErrorF("xf86RegisterRootWindowProperty %p(%d,%d,%d,%d,%d,%p)\n",
-	     xf86RegisterRootWindowProperty,
-	     pScrnInfo->scrnIndex,
-	     VDIFAtom, XA_STRING, 8,
-	     strlen(VDIF_DUMMY_STRING), VDIF_DUMMY_STRING 
-	     );
-#endif
+    while (Mode) {
+        if (!Mode->HSync)
+            Mode->HSync = ((float) Mode->Clock ) / ((float) Mode->HTotal);
 
+        if (!Mode->VRefresh)
+            Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 
+                ((float) (Mode->HTotal * Mode->VTotal));
 
-      VDIFAtom = MakeAtom(VDIF_ATOM_NAME, sizeof(VDIF_ATOM_NAME), TRUE);
+        if (Mode->HSync < Monitor->hsync[0].lo)
+            Monitor->hsync[0].lo = Mode->HSync;
 
-      ret = xf86RegisterRootWindowProperty(pScrnInfo->scrnIndex,
-					   VDIFAtom, XA_STRING, 8, 
-					   strlen(VDIF_DUMMY_STRING),
-					   VDIF_DUMMY_STRING 
-					   );
-      if (ret != Success)
-      ErrorF("xf86RegisterRootWindowProperty returns %d\n", ret );
+        if (Mode->HSync > Monitor->hsync[0].hi)
+            Monitor->hsync[0].hi = Mode->HSync;
+
+        if (Mode->VRefresh < Monitor->vrefresh[0].lo)
+            Monitor->vrefresh[0].lo = Mode->VRefresh;
+
+        if (Mode->VRefresh > Monitor->vrefresh[0].hi)
+            Monitor->vrefresh[0].hi = Mode->VRefresh;
+        
+        Mode = Mode->next;
+    }
+}
+
+/*
+ * Fill out MonPtr with xf86MonPtr information.
+ */
+void
+xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
+{
+    DisplayModePtr Modes = NULL, Mode;
+    int i;
+    
+    if (!Monitor || !DDC)
+        return;
+
+    Monitor->DDC = DDC;
+
+    if (DDC->features.gamma > 0.0) {
+        Monitor->gamma.red = DDC->features.gamma;
+        Monitor->gamma.green = DDC->features.gamma;
+        Monitor->gamma.blue = DDC->features.gamma;
     }
 
+    Monitor->widthmm = 10 * DDC->features.hsize;
+    Monitor->heightmm = 10 * DDC->features.vsize;
+    
+    /* If this is a digital display, then we can use reduced blanking */
+    if (DDC->features.input_type) 
+        Monitor->reducedblanking = TRUE;
+    /* Allow the user to also enable this through config */
+
+    /* Add established timings */
+    Mode = DDCModesFromEstablished(scrnIndex, &DDC->timings1);
+    Modes = xf86ModesAdd(Modes, Mode);
+
+    /* Add standard timings */
+    Mode = DDCModesFromStandardTiming(scrnIndex, DDC->timings2);
+    Modes = xf86ModesAdd(Modes, Mode);
+
+    /* Go through the detailed monitor sections */
+    for (i = 0; i < DET_TIMINGS; i++)
+        switch (DDC->det_mon[i].type) {
+        case DS_RANGES:
+            if (Monitor->nHsync && Monitor->nVrefresh) {
+                xf86DrvMsg(scrnIndex, X_INFO, "Ignoring EDID Ranges. Using"
+                           " configured ranges.\n");
+                break;
+            }
+
+            xf86DrvMsg(scrnIndex, X_INFO, "Using EDID ranges info for Monitor"
+                       " timing.\n");
+            Monitor->nHsync = 1;
+            Monitor->hsync[0].lo = DDC->det_mon[i].section.ranges.min_h;
+            Monitor->hsync[0].hi = DDC->det_mon[i].section.ranges.max_h;
+            
+            Monitor->nVrefresh = 1;
+            Monitor->vrefresh[0].lo = DDC->det_mon[i].section.ranges.min_v;
+            Monitor->vrefresh[0].hi = DDC->det_mon[i].section.ranges.max_v;
+
+            break;
+        case DT:
+            Mode = DDCModeFromDetailedTiming(scrnIndex, 
+                                             &DDC->det_mon[i].section.d_timings);
+            Modes = xf86ModesAdd(Modes, Mode);
+            break;
+        case DS_STD_TIMINGS:
+            Mode = DDCModesFromStandardTiming(scrnIndex,
+                                             DDC->det_mon[i].section.std_t);
+            Modes = xf86ModesAdd(Modes, Mode);
+            break;
+        default:
+            break;
+        }
+
+    if (Modes) {
+        /* Print Modes */
+        xf86DrvMsg(scrnIndex, X_INFO, "Printing DDC gathered Modelines:\n");
+
+        Mode = Modes;
+        while (Mode) {
+            PrintModeline(scrnIndex, Mode);
+            Mode = Mode->next;
+        }
+
+        /* Do we still need ranges to be filled in? */
+        if (!Monitor->nHsync || !Monitor->nVrefresh)
+            DDCGuessRangesFromModes(scrnIndex, Monitor, Modes);
+
+        /* look for last Mode */
+        Mode = Modes;
+
+        while (Mode->next)
+            Mode = Mode->next;
+        
+        /* add to MonPtr */
+        if (Monitor->Modes) {
+            Monitor->Last->next = Modes;
+            Modes->prev = Monitor->Last;
+            Monitor->Last = Mode;
+        } else {
+            Monitor->Modes = Modes;
+            Monitor->Last = Mode;
+        }
+    }
+}
+
+/*
+ * Empty shell that keeps most drivers happy.
+ */
+Bool
+xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
+{
+    if (!pScrn || !pScrn->monitor || !DDC)
+        return FALSE;
+
+    xf86DDCMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
+
     return TRUE;
 }
--- xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c.edid	2006-03-25 14:52:03.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c	2006-06-06 16:03:18.000000000 -0400
@@ -47,7 +47,6 @@
 #include "globals.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "xf86DDC.h"
 
 /*
  * xf86GetNearestClock --
@@ -752,31 +751,6 @@
 	   mode, mode->name, monitor, monitor->id);
 #endif
 
-    if (monitor->DDC) {
-	xf86MonPtr DDC = (xf86MonPtr)(monitor->DDC);
-	struct detailed_monitor_section* detMon;
-	struct monitor_ranges *mon_range;
-	int i;
-
-	mon_range = NULL;
-	for (i = 0; i < 4; i++) {
-	    detMon = &DDC->det_mon[i];
-	    if(detMon->type == DS_RANGES) {
-		mon_range = &detMon->section.ranges;
-	    }
-	}
-	if (mon_range) {
-	    /* mode->Clock in kHz, DDC in MHz */
-	    if (mon_range->max_clock < 2550 &&
-		 mode->Clock / 1000.0 > mon_range->max_clock) {
-		xf86Msg(X_WARNING,
-		   "(%s,%s) mode clock %gMHz exceeds DDC maximum %dMHz\n",
-		   mode->name, monitor->id,
-		   mode->Clock/1000.0, mon_range->max_clock);
-	    }
-	}
-    }
-
     /* Some basic mode validity checks */
     if (0 >= mode->HDisplay || mode->HDisplay > mode->HSyncStart ||
 	mode->HSyncStart >= mode->HSyncEnd || mode->HSyncEnd >= mode->HTotal)
@@ -1253,7 +1227,6 @@
     PixmapFormatRec *BankFormat;
     ClockRangePtr cp;
     ClockRangesPtr storeClockRanges;
-    struct monitor_ranges *mon_range = NULL;
     double targetRefresh = 0.0;
     int numTimings = 0;
     range hsync[MAX_HSYNC];
@@ -1288,166 +1261,6 @@
     }
 
     /*
-     * Probe monitor so that we can enforce/warn about its limits.
-     * If one or more DS_RANGES descriptions are present, use the parameters
-     * that they provide.  Otherwise, deduce limits based on the modes that
-     * are shown as supported via standard and detailed timings.
-     *
-     * XXX The full potential of the DDC/EDID data still isn't being tapped.
-     */
-    if (scrp->monitor->DDC) {
-	MonPtr monitor = scrp->monitor;
-	xf86MonPtr DDC = (xf86MonPtr)(scrp->monitor->DDC);
-	int i, j;
-	float hmin = 1e6, hmax = 0.0, vmin = 1e6, vmax = 0.0;
-	float h;
-	struct std_timings *t;
-	struct detailed_timings *dt;
-
-	numTimings = 0;
-	for (i = 0; i < DET_TIMINGS; i++) {
-	    switch (DDC->det_mon[i].type) {
-	    case DS_RANGES:
-		mon_range = &DDC->det_mon[i].section.ranges;
-		hsync[numTimings].lo = mon_range->min_h;
-		hsync[numTimings].hi = mon_range->max_h;
-		vrefresh[numTimings].lo = mon_range->min_v;
-		vrefresh[numTimings].hi = mon_range->max_v;
-		numTimings++;
-		break;
-
-	    case DS_STD_TIMINGS:
-		t = DDC->det_mon[i].section.std_t;
-		for (j = 0; j < 5; j++) {
-		    if (t[j].hsize > 256) { /* sanity check */
-			if (t[j].refresh < vmin)
-			    vmin = t[i].refresh;
-			if (t[j].refresh > vmax)
-			    vmax = t[i].refresh;
-			/*
-			 * For typical modes this is a reasonable estimate
-			 * of the horizontal sync rate.
-			 */
-			h = t[j].refresh * 1.07 * t[j].vsize / 1000.0;
-			if (h < hmin)
-			    hmin = h;
-			if (h > hmax)
-			    hmax = h;
-		    }
-		}
-		break;
-
-	    case DT:
-		dt = &DDC->det_mon[i].section.d_timings;
-		if (dt->clock > 15000000) { /* sanity check */
-		    float v;
-		    h = (float)dt->clock / (dt->h_active + dt->h_blanking);
-		    v = h / (dt->v_active + dt->v_blanking);
-		    h /= 1000.0;
-		    if (dt->interlaced) 
-			v /= 2.0;
-
-		    if (v < vmin)
-			vmin = v;
-		    if (v > vmax)
-			vmax = v;
-		    if (h < hmin)
-			hmin = h;
-		    if (h > hmax)
-			hmax = h;
-		}
-		break;
-	    }
-
-	    if (numTimings > MAX_HSYNC)
-		break;
-	}
-
-	if (numTimings == 0) {
-	    t = DDC->timings2;
-	    for (i = 0; i < STD_TIMINGS; i++) {
-		if (t[i].hsize > 256) { /* sanity check */
-		    if (t[i].refresh < vmin)
-			vmin = t[i].refresh;
-		    if (t[i].refresh > vmax)
-			vmax = t[i].refresh;
-		    /*
-		     * For typical modes this is a reasonable estimate
-		     * of the horizontal sync rate.
-		     */
-		    h = t[i].refresh * 1.07 * t[i].vsize / 1000.0;
-		    if (h < hmin)
-			hmin = h;
-		    if (h > hmax)
-			hmax = h;
-		}
-	    }
-
-	    if (hmax > 0.0) {
-		hsync[numTimings].lo = hmin;
-		hsync[numTimings].hi = hmax;
-		vrefresh[numTimings].lo = vmin;
-		vrefresh[numTimings].hi = vmax;
-		numTimings++;
-	    }
-	}
-
-	if (numTimings > 0) {
-
-#ifdef DEBUG
-	    for (i = 0; i < numTimings; i++) {
-		ErrorF("DDC - Hsync %.1f-%.1f kHz - Vrefresh %.1f-%.1f Hz\n",
-		       hsync[i].lo, hsync[i].hi,
-		       vrefresh[i].lo, vrefresh[i].hi);
-	    }
-#endif
-
-#define DDC_SYNC_TOLERANCE SYNC_TOLERANCE
-	    if (monitor->nHsync > 0) {
-		for (i = 0; i < monitor->nHsync; i++) {
-		    Bool good = FALSE;
-		    for (j = 0; j < numTimings; j++) {
-			if ((1.0 - DDC_SYNC_TOLERANCE) * hsync[j].lo <=
-				monitor->hsync[i].lo &&
-			    (1.0 + DDC_SYNC_TOLERANCE) * hsync[j].hi >=
-				monitor->hsync[i].hi) {
-			    good = TRUE;
-			    break;
-			}
-		    }
-		    if (!good) {
-			xf86DrvMsg(scrp->scrnIndex, X_WARNING,
-			  "config file hsync range %g-%gkHz not within DDC "
-			  "hsync ranges.\n",
-			  monitor->hsync[i].lo, monitor->hsync[i].hi);
-		    }
-		}
-	    }
-
-	    if (monitor->nVrefresh > 0) {
-		for (i = 0; i < monitor->nVrefresh; i++) {
-		    Bool good = FALSE;
-		    for (j = 0; j < numTimings; j++) {
-			if ((1.0 - DDC_SYNC_TOLERANCE) * vrefresh[j].lo <=
-				monitor->vrefresh[0].lo &&
-			    (1.0 + DDC_SYNC_TOLERANCE) * vrefresh[j].hi >=
-				monitor->vrefresh[0].hi) {
-			    good = TRUE;
-			    break;
-			}
-		    }
-		    if (!good) {
-			xf86DrvMsg(scrp->scrnIndex, X_WARNING,
-			  "config file vrefresh range %g-%gHz not within DDC "
-			  "vrefresh ranges.\n",
-			  monitor->vrefresh[i].lo, monitor->vrefresh[i].hi);
-		    }
-		}
-	    }
-        }
-    }
-
-    /*
      * If requested by the driver, allow missing hsync and/or vrefresh ranges
      * in the monitor section.
      */

xorg-x11-server-1.1.0-edid-mode-injection-2.patch:
 common/xf86Config.c |    1 +
 common/xf86Mode.c   |    3 +++
 common/xf86str.h    |    1 +
 ddc/ddcProperty.c   |   11 ++++++++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-edid-mode-injection-2.patch ---
--- xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c.edid2	2006-06-07 17:28:45.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c	2006-06-07 18:08:27.000000000 -0400
@@ -296,7 +296,7 @@
 xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
 {
     DisplayModePtr Modes = NULL, Mode;
-    int i;
+    int i, clock;
     
     if (!Monitor || !DDC)
         return;
@@ -345,6 +345,15 @@
             Monitor->vrefresh[0].lo = DDC->det_mon[i].section.ranges.min_v;
             Monitor->vrefresh[0].hi = DDC->det_mon[i].section.ranges.max_v;
 
+	    /*
+	     * Strictly this is wrong.  If the monitor reports multiple
+	     * ranges, each one might have a different maximum, but I've
+	     * yet to find such a monitor so LA LA LA I CAN'T HEAR YOU.
+	     */
+	    clock = DDC->det_mon[i].section.ranges.max_clock * 1000;
+	    if (clock > Monitor->maxPixClock)
+		Monitor->maxPixClock = clock;
+
             break;
         case DT:
             Mode = DDCModeFromDetailedTiming(scrnIndex, 
--- xorg-server-1.1.0/hw/xfree86/common/xf86Config.c.edid2	2006-06-07 17:28:45.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c	2006-06-07 18:00:04.000000000 -0400
@@ -2220,6 +2220,7 @@
     monitorp->heightmm = conf_monitor->mon_height;
     monitorp->reducedblanking = FALSE;
     monitorp->options = conf_monitor->mon_option_lst;
+    monitorp->maxPixClock = 0;
 
     /*
      * fill in the monitor structure
--- xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c.edid2	2006-06-07 17:28:45.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c	2006-06-07 18:08:30.000000000 -0400
@@ -810,6 +810,9 @@
         }
     }
 
+    if ((monitor->maxPixClock) && (mode->Clock > monitor->maxPixClock))
+	return MODE_CLOCK_HIGH;
+
     return MODE_OK;
 }
 
--- xorg-server-1.1.0/hw/xfree86/common/xf86str.h.edid2	2006-03-07 18:58:22.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/common/xf86str.h	2006-06-07 17:59:41.000000000 -0400
@@ -208,6 +208,7 @@
     pointer		options;
     pointer		DDC;
     Bool                reducedblanking; /* Allow CVT reduced blanking modes? */
+    int			maxPixClock;	 /* in kHz, like mode->Clock */
 } MonRec, *MonPtr;
 
 /* the list of clock ranges */

xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch:
 xf86AutoConfig.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch ---
--- xorg-server-1.1.0/hw/xfree86/common/xf86AutoConfig.c.targetrefresh	2006-06-07 18:10:32.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86AutoConfig.c	2006-06-07 18:10:47.000000000 -0400
@@ -78,7 +78,6 @@
 #define BUILTIN_MONITOR_SECTION \
 	"Section \"Monitor\"\n" \
 	"\tIdentifier\t" BUILTIN_MONITOR_NAME "\n" \
-	"\tOption\t\"TargetRefresh\"\t\"75.0\"\n" \
 	"EndSection\n\n"
 
 #define BUILTIN_SCREEN_NAME \

xorg-x11-server-1.1.0-input-autoconfig-2.patch:
 xf86Config.c |  393 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 198 insertions(+), 195 deletions(-)

Index: xorg-x11-server-1.1.0-input-autoconfig-2.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-input-autoconfig-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-input-autoconfig-2.patch	6 Jun 2006 19:34:59 -0000	1.1
+++ xorg-x11-server-1.1.0-input-autoconfig-2.patch	14 Jun 2006 00:05:17 -0000	1.2
@@ -1,6 +1,6 @@
 --- xorg-server-1.1.0/hw/xfree86/common/xf86Config.c.autoconfig	2006-04-06 21:40:52.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c	2006-06-06 14:54:25.000000000 -0400
-@@ -1435,131 +1435,106 @@
++++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c	2006-06-13 17:15:37.000000000 -0400
+@@ -1435,131 +1435,109 @@
    return TRUE;
  }
  
@@ -70,10 +70,15 @@
 -		xf86Msg(X_WARNING, "Duplicate core pointer devices.  "
 -			"Removing core pointer attribute from \"%s\"\n",
 -			indp->identifier);
--	    }
--	}
 +    for (p = pLayout->inputs; p->identifier; p++) {
- 	opt1 = opt2 = NULL;
++	for (i = 0; i < 2; i++) {
++	    opt1 = opt2 = NULL;
++	    if (p->commonOptions &&
++		    xf86CheckBoolOption(p->commonOptions, opts[i], FALSE)) {
++		opt1 = p->commonOptions;
+ 	    }
+-	}
+-	opt1 = opt2 = NULL;
 -	if (indp->commonOptions &&
 -	    xf86CheckBoolOption(indp->commonOptions, "CoreKeyboard", FALSE)) {
 -	    opt1 = indp->commonOptions;
@@ -93,16 +98,12 @@
 -		xf86Msg(X_WARNING, "Duplicate core keyboard devices.  "
 -			"Removing core keyboard attribute from \"%s\"\n",
 -			indp->identifier);
-+	for (i = 0; i < 2; i++) {
-+	    if (p->commonOptions &&
-+		    xf86CheckBoolOption(p->commonOptions, opts[i], FALSE)) {
-+		opt1 = p->commonOptions;
-+	    }
 +	    if (p->extraOptions &&
 +		    xf86CheckBoolOption(p->extraOptions, opts[i], FALSE)) {
 +		opt2 = p->extraOptions;
 +	    }
 +	    if (opt1 || opt2) {
++		xf86Msg(X_INFO, "Found %s \"%s\"\n", opts[i], p->identifier);
 +		if (!(*devs[i])) {
 +		    *devs[i] = p;
 +		} else {
@@ -187,6 +188,8 @@
      if (corePointer) {
  	foundPointer = TRUE;
 -	from = X_CONFIG;
++	confInput = xf86findInput(corePointer->identifier,
++				  xf86configptr->conf_input_lst);
 +	*from = X_CONFIG;
      }
  
@@ -204,7 +207,7 @@
  		pointerMsg = "first core pointer device";
  		break;
  	    }
-@@ -1576,87 +1551,55 @@
+@@ -1576,87 +1554,57 @@
  	}
  	if (confInput) {
  	    foundPointer = TRUE;
@@ -303,6 +306,8 @@
      if (coreKeyboard) {
  	foundKeyboard = TRUE;
 -	from = X_CONFIG;
++	confInput = xf86findInput(coreKeyboard->identifier,
++				  xf86configptr->conf_input_lst);
 +	*from = X_CONFIG;
      }
  
@@ -320,7 +325,7 @@
  		keyboardMsg = "first core keyboard device";
  		break;
  	    }
-@@ -1671,62 +1614,119 @@
+@@ -1671,62 +1619,117 @@
  	    confInput = xf86findInputByDriver("kbd",
  					      xf86configptr->conf_input_lst);
  	}
@@ -400,10 +405,9 @@
 +	confPtr = &defPtr;
 +	from = X_DEFAULT;
 +	pointerMsg = "default mouse configuration";
-+    }
-+
-+    if (confPtr && configInput(&Pointer, confPtr, from))
++	configInput(&Pointer, confPtr, from);
 +	addInputDeviceToLayout(servlayoutp, &Pointer, "CorePointer");
++    }
 +
 +    confKbd = locateCoreKeyboard(servlayoutp, coreKeyboard, &from);
 +    if (!confKbd) {
@@ -416,6 +420,8 @@
 +	confKbd = &defKbd;
  	keyboardMsg = "default keyboard configuration";
  	from = X_DEFAULT;
++	configInput(&Keyboard, confKbd, from);
++	addInputDeviceToLayout(servlayoutp, &Keyboard, "CoreKeyboard");
      }
  
 -    /* Add the core keyboard device to the layout, and set it to Core. */
@@ -432,9 +438,7 @@
 -	    servlayoutp->inputs = indp;
 -	}
 -    }
-+    if (confKbd && configInput(&Keyboard, confKbd, from))
-+	addInputDeviceToLayout(servlayoutp, &Keyboard, "CoreKeyboard");
- 
+-
 -    if (!foundKeyboard) {
 -	/* This shouldn't happen. */
 -	xf86Msg(X_ERROR, "Cannot locate a core keyboard device.\n");
@@ -475,7 +479,7 @@
  }
  
  typedef enum {
-@@ -1992,7 +1992,7 @@
+@@ -1992,7 +1995,7 @@
      servlayoutp->options = conf_layout->lay_option_lst;
      from = X_DEFAULT;
  
@@ -484,7 +488,7 @@
  	return FALSE;
      return TRUE;
  }
-@@ -2052,7 +2052,7 @@
+@@ -2052,7 +2055,7 @@
      indp = xnfalloc(sizeof(IDevRec));
      indp->identifier = NULL;
      servlayoutp->inputs = indp;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xorg-x11-server.spec	13 Jun 2006 01:50:59 -0000	1.78
+++ xorg-x11-server.spec	14 Jun 2006 00:05:17 -0000	1.79
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   11
+Release:   12
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -30,6 +30,13 @@
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
 
+# autoconfiguration feature patches
+#Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
+Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
+Patch3002:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
+Patch3003:  xorg-x11-server-1.1.0-edid-mode-injection-2.patch
+Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
+
 # INFO: We don't ship the X server on s390/s390x
 ExcludeArch: s390 s390x
 
@@ -265,6 +272,13 @@
 %patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
 
+#%patch2000 -p1 -b .autoconfig
+
+%patch3001 -p1 -b .edid1
+%patch3002 -p1 -b .cvt
+%patch3003 -p1 -b .edid2
+%patch3004 -p1 -b .targetrefresh
+
 %build
 #FONTDIR="${datadir}/X11/fonts"
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
@@ -549,6 +563,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-12
+- Add EDID mode autodetection.
+
 * Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-11
 - Add xorg-x11-server-1.1.0-gl-include-inferiors.patch to let GL
   rendering include child windows.



From fedora-cvs-commits at redhat.com  Wed Jun 14 00:15:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 20:15:07 -0400
Subject: rpms/kernel/devel/configs config-rhel-generic,1.6,1.7
Message-ID: <200606140015.k5E0F7ps018245@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv18221

Modified Files:
	config-rhel-generic 
Log Message:

Tweaking the config options to build properly on all RHEL5 platforms.




Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-rhel-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-rhel-generic	11 May 2006 03:03:15 -0000	1.6
+++ config-rhel-generic	14 Jun 2006 00:15:04 -0000	1.7
@@ -34,6 +34,7 @@
 # CONFIG_SND_OPTI92X_AD1848 is not set
 # CONFIG_SND_OPTI92X_CS4231 is not set
 # CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_MIRO is not set
 # CONFIG_SND_SB8 is not set
 # CONFIG_SND_SB16 is not set
 # CONFIG_SND_SBAWE is not set
@@ -121,7 +122,6 @@
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_BWQCAM is not set
 # CONFIG_VIDEO_CQCAM is not set



From fedora-cvs-commits at redhat.com  Wed Jun 14 00:41:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 20:41:25 -0400
Subject: rpms/libsepol/devel libsepol.spec,1.132,1.133
Message-ID: <200606140041.k5E0fPsp011206@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11099

Modified Files:
	libsepol.spec 
Log Message:
bump so it's newer than the FC5 version



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- libsepol.spec	5 Jun 2006 18:48:30 -0000	1.132
+++ libsepol.spec	14 Jun 2006 00:41:22 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.12.17
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -81,6 +81,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Tue Jun 13 2006 Bill Nottingham <notting at redhat.com> 1.12.17-2
+- bump so it's newer than the FC5 version
+
 * Mon Jun 5 2006 Dan Walsh <dwalsh at redhat.com> 1.12.17-1
 - Upgrade to latest from NSA
 	* Revert 1.12.16.



From fedora-cvs-commits at redhat.com  Wed Jun 14 01:09:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 21:09:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2278,1.2279
Message-ID: <200606140109.k5E19CLf000974@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv944

Modified Files:
	kernel-2.6.spec 
Log Message:
put %endif on right places


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2278
retrieving revision 1.2279
diff -u -r1.2278 -r1.2279
--- kernel-2.6.spec	13 Jun 2006 22:59:31 -0000	1.2278
+++ kernel-2.6.spec	14 Jun 2006 01:08:59 -0000	1.2279
@@ -1778,6 +1778,7 @@
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
+%endif
 
 %if %{buildxenPAE}
 %files xen0
@@ -1823,7 +1824,6 @@
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
-%endif
 
 %files xen0-PAE
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Wed Jun 14 01:41:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 21:41:48 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-devmapper.patch, 1.2,
	1.3 e2fsprogs.spec, 1.54, 1.55
Message-ID: <200606140141.k5E1fmBs023531@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23467

Modified Files:
	e2fsprogs-1.38-blkid-devmapper.patch e2fsprogs.spec 
Log Message:
don't prepend DM device names with /dev/ ; this confuses probe_one()


e2fsprogs-1.38-blkid-devmapper.patch:
 MCONFIG.in            |    3 
 configure.in          |   30 ++++++++
 e2fsck/Makefile.in    |    2 
 lib/blkid/Makefile.in |    4 -
 lib/blkid/blkid.pc.in |    2 
 lib/blkid/blkidP.h    |    1 
 lib/blkid/devname.c   |  176 ++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 214 insertions(+), 4 deletions(-)

Index: e2fsprogs-1.38-blkid-devmapper.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-blkid-devmapper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.38-blkid-devmapper.patch	21 Mar 2006 22:01:01 -0000	1.2
+++ e2fsprogs-1.38-blkid-devmapper.patch	14 Jun 2006 01:41:44 -0000	1.3
@@ -265,7 +265,7 @@
 +
 +		names = (void *)names + next;
 +
-+		rc = asprintf(&device, "/dev/mapper/%s", names->name);
++		rc = asprintf(&device, "mapper/%s", names->name);
 +		if (rc < 0)
 +			goto try_next;
 +


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- e2fsprogs.spec	21 Mar 2006 22:01:02 -0000	1.54
+++ e2fsprogs.spec	14 Jun 2006 01:41:44 -0000	1.55
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -310,6 +310,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Jun 13 2006 Bill Nottingham <notting at redhat.com> - 1.38-15
+- prevent libblkid returning /dev/dm-X
+
 * Tue Mar 21 2006 Karel Zak <kzak at redhat.com> - 1.38-14
 - prevent error messages to stderr caused by libblkid calling libdevmapper
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 01:49:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 21:49:45 -0400
Subject: rpms/rhpxl/devel rhpxl.spec,1.24,1.25
Message-ID: <200606140149.k5E1njO6008171@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8147

Modified Files:
	rhpxl.spec 
Log Message:
enable ppc64


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rhpxl.spec	4 Apr 2006 17:33:24 -0000	1.24
+++ rhpxl.spec	14 Jun 2006 01:49:42 -0000	1.25
@@ -3,14 +3,14 @@
 Summary: Python library for configuring and running X.
 Name: rhpxl
 Version: 0.19
-Release: 1
+Release: 1.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: python-devel, gettext
 BuildArch: noarch
-ExcludeArch: s390 s390x ppc64
+ExcludeArch: s390 s390x
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
 Requires: rhpl, kudzu >= 1.2.0, newt, hwdata >= 0.169
 Requires: pyxf86config >= 0.3.2
@@ -43,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Jun 13 2006 Jesse Keating <jkeating at redhat.com> 0.19-1.1
+- Enable build on ppc64
+
 * Tue Apr 04 2006 Chris Lumens <clumens at redhat.com> 0.19-1 
 - Remove obsolete functions in mouse.py.
 - Create a new Modes class.



From fedora-cvs-commits at redhat.com  Wed Jun 14 02:36:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 22:36:17 -0400
Subject: rpms/e2fsprogs/devel ext2resize-fixbuild.patch, NONE,
	1.1 e2fsprogs.spec, 1.55, 1.56
Message-ID: <200606140236.k5E2aHc9000853@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv823

Modified Files:
	e2fsprogs.spec 
Added Files:
	ext2resize-fixbuild.patch 
Log Message:
fix build


ext2resize-fixbuild.patch:
 ext2_unix_io.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ext2resize-fixbuild.patch ---
--- ext2resize-1.1.19/src/ext2_unix_io.c.fixbuild	2006-06-13 22:30:58.000000000 -0400
+++ ext2resize-1.1.19/src/ext2_unix_io.c	2006-06-13 22:31:07.000000000 -0400
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <linux/fs.h>
 #include "ext2.h"
 
 #ifndef O_LARGEFILE


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- e2fsprogs.spec	14 Jun 2006 01:41:44 -0000	1.55
+++ e2fsprogs.spec	14 Jun 2006 02:36:08 -0000	1.56
@@ -18,6 +18,7 @@
 Patch19: ext2resize-byteorder.patch
 Patch20: ext2resize-nofallback.patch
 Patch21: ext2resize-nowrite.patch
+Patch22: ext2resize-fixbuild.patch
 Patch26: e2fsprogs-1.37-blkid-swsuspend.patch
 Patch27: e2fsprogs-1.37-blkid-ext23.patch
 Patch28: e2fsprogs-1.37-blkid-nomagicvfat.patch
@@ -110,6 +111,8 @@
 %patch20 -p2 -b .nofallback
 # Disable the write path used by old-style online
 %patch21 -p2 -b .nowrite
+# Use the kernel prototypes, as they don't cause errors
+%patch22 -p1 -b .fixbuild
 popd
 
 # drop ext2resize, ext2prepare and e2fsadm from man page of ext2online
@@ -312,6 +315,7 @@
 %changelog
 * Tue Jun 13 2006 Bill Nottingham <notting at redhat.com> - 1.38-15
 - prevent libblkid returning /dev/dm-X
+- fix build
 
 * Tue Mar 21 2006 Karel Zak <kzak at redhat.com> - 1.38-14
 - prevent error messages to stderr caused by libblkid calling libdevmapper



From fedora-cvs-commits at redhat.com  Wed Jun 14 02:37:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 22:37:48 -0400
Subject: rpms/evolution/devel evolution.spec,1.150,1.151
Message-ID: <200606140237.k5E2bm7Z000949@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv734

Modified Files:
	evolution.spec 
Log Message:
drop an upstreamed patch



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- evolution.spec	13 Jun 2006 20:11:28 -0000	1.150
+++ evolution.spec	14 Jun 2006 02:37:45 -0000	1.151
@@ -71,9 +71,6 @@
 # Move autosave file
 Patch107: evolution-2.5.4-move-autosave-file.patch
 
-# Fix for RH bug 150458:
-Patch108: evolution-2.3.5.1-fix-150458.patch
-
 # Fix for RH bug 164957 (was for 145552):
 Patch109: evolution-2.0.2-fix-145552.patch
 
@@ -244,9 +241,6 @@
 
 %patch106 -p1 -b .commit-enter-on-calendar
 %patch107 -p1 -b .move-autosave-file
-cd widgets/table
-%patch108 -p3 -b .fix-150458
-cd ../..
 %patch109 -p1 -b .fix-164957
 
 %patch110 -p1 -b .hide-switcher-buttons-by-default



From fedora-cvs-commits at redhat.com  Wed Jun 14 02:44:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 22:44:25 -0400
Subject: rpms/mesa/devel mesa-6.5-tfp-fbconfig-attribs.patch,NONE,1.1
Message-ID: <200606140244.k5E2iPwR002660@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2632

Added Files:
	mesa-6.5-tfp-fbconfig-attribs.patch 
Log Message:
Actually add mesa-6.5-tfp-fbconfig-attribs.patch

mesa-6.5-tfp-fbconfig-attribs.patch:
 include/GL/internal/glcore.h                 |   18 +++++++++++++
 src/mesa/drivers/dri/common/glcontextmodes.c |   36 ++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

--- NEW FILE mesa-6.5-tfp-fbconfig-attribs.patch ---
--- ./src/mesa/drivers/dri/common/glcontextmodes.c.tfp-fbconfig-attribs	2006-03-20 10:03:44.000000000 -0500
+++ ./src/mesa/drivers/dri/common/glcontextmodes.c	2006-06-08 19:48:52.000000000 -0400
@@ -182,6 +182,15 @@
     mode->transparentIndex = config->transparentIndex;
 
     mode->swapMethod = GLX_SWAP_UNDEFINED_OML;
+
+    mode->bindToTextureRgb = (mode->rgbMode) ? GL_TRUE : GL_FALSE;
+    mode->bindToTextureRgba = (mode->rgbMode && mode->alphaBits) ?
+	GL_TRUE : GL_FALSE;
+    mode->bindToMipmapTexture = mode->rgbMode ? GL_TRUE : GL_FALSE;
+    mode->bindToTextureTargets = mode->rgbMode ?
+	GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |
+	GLX_TEXTURE_RECTANGLE_BIT_EXT : 0;
+    mode->yInverted = GL_FALSE;
 }
 
 
@@ -313,6 +322,21 @@
       case GLX_SAMPLES_SGIS:
 	*value_return = mode->samples;
 	return 0;
+      case GLX_BIND_TO_TEXTURE_RGB_EXT:
+	*value_return = mode->bindToTextureRgb;
+	return 0;
+      case GLX_BIND_TO_TEXTURE_RGBA_EXT:
+	*value_return = mode->bindToTextureRgba;
+	return 0;
+      case GLX_BIND_TO_MIPMAP_TEXTURE_EXT:
+	*value_return = mode->bindToMipmapTexture;
+	return 0;
+      case GLX_BIND_TO_TEXTURE_TARGETS_EXT:
+	*value_return = mode->bindToTextureTargets;
+	return 0;
+      case GLX_Y_INVERTED_EXT:
+	*value_return = mode->yInverted;
+	return 0;
 
       /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.
        * It is ONLY for communication between the GLX client and the GLX
@@ -383,6 +407,11 @@
       (*next)->xRenderable = GLX_DONT_CARE;
       (*next)->fbconfigID = GLX_DONT_CARE;
       (*next)->swapMethod = GLX_SWAP_UNDEFINED_OML;
+      (*next)->bindToTextureRgb = GLX_DONT_CARE;
+      (*next)->bindToTextureRgba = GLX_DONT_CARE;
+      (*next)->bindToMipmapTexture = GLX_DONT_CARE;
+      (*next)->bindToTextureTargets = 0;
+      (*next)->yInverted = GLX_DONT_CARE;
 
       next = & ((*next)->next);
    }
@@ -495,5 +524,10 @@
 	    (a->maxPbufferPixels == b->maxPbufferPixels) &&
 	    (a->optimalPbufferWidth == b->optimalPbufferWidth) &&
 	    (a->optimalPbufferHeight == b->optimalPbufferHeight) &&
-	    (a->swapMethod == b->swapMethod) );
+	    (a->swapMethod == b->swapMethod) &&
+	    (a->bindToTextureRgb == b->bindToTextureRgb) &&
+	    (a->bindToTextureRgba == b->bindToTextureRgba) &&
+	    (a->bindToMipmapTexture == b->bindToMipmapTexture) &&
+	    (a->bindToTextureTargets == b->bindToTextureTargets) &&
+	    (a->yInverted == b->yInverted) );
 }
--- ./include/GL/internal/glcore.h.tfp-fbconfig-attribs	2004-06-20 17:06:49.000000000 -0400
+++ ./include/GL/internal/glcore.h	2006-06-08 20:03:15.000000000 -0400
@@ -137,6 +137,13 @@
     GLint swapMethod;
 
     GLint screen;
+
+    /* EXT_texture_from_pixmap */
+    GLint bindToTextureRgb;
+    GLint bindToTextureRgba;
+    GLint bindToMipmapTexture;
+    GLint bindToTextureTargets;
+    GLint yInverted;
 } __GLcontextModes;
 
 /* Several fields of __GLcontextModes can take these as values.  Since
@@ -166,6 +173,17 @@
 #define GLX_PIXMAP_BIT                     0x00000002
 #define GLX_PBUFFER_BIT                    0x00000004
 
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+
+#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+
+
 /************************************************************************/
 
 /*



From fedora-cvs-commits at redhat.com  Wed Jun 14 02:48:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 22:48:13 -0400
Subject: rpms/gstreamer/devel gstreamer.spec,1.50,1.51
Message-ID: <200606140248.k5E2mDM1018657@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18562

Modified Files:
	gstreamer.spec 
Log Message:
Rebuild



Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gstreamer.spec	13 Jun 2006 13:37:06 -0000	1.50
+++ gstreamer.spec	14 Jun 2006 02:48:10 -0000	1.51
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.8
-Release: 	1
+Release: 	2
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-2
+- Rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-1
 - Update to 0.10.8
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 02:59:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 22:59:30 -0400
Subject: rpms/pm-utils/devel pm-utils-0.19-vidhooks.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 pm-utils.spec, 1.34, 1.35 sources,
	1.24, 1.25
Message-ID: <200606140259.k5E2xUTB022976@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22931

Modified Files:
	.cvsignore pm-utils.spec sources 
Added Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
- update to CVS


pm-utils-0.19-vidhooks.patch:
 functions        |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-ati    |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-intel  |   29 ++++++++++++++++
 functions-nvidia |   30 +++++++++++++++++
 hooks/20video    |   34 +++++++------------
 5 files changed, 259 insertions(+), 21 deletions(-)

--- NEW FILE pm-utils-0.19-vidhooks.patch ---
--- pm/functions	16 May 2006 15:15:05 -0000	1.19
+++ pm/functions	14 Jun 2006 02:47:40 -0000
@@ -30,6 +30,97 @@ source_configs()
 
 source_configs
 
+get_video_type()
+{
+	vendor=""
+	vendor=$(/sbin/lspci -mn|awk '{if ($2 ~ /^"0300"$/ ) {print $3;exit;}}')
+	vendor=$(eval echo $vendor)
+	[ -z "$vendor" ] && return 1
+	case "$vendor" in
+		1002)
+			echo ATI
+			return 0
+			;;
+		10de)
+			echo nVidia
+			return 0
+			;;
+		8086)
+			echo Intel
+			return 0
+			;;
+		*)
+			echo $vendor
+			return 0
+			;;
+	esac
+}
+
+get_lcd_status()
+{
+	return 0
+}
+
+lcd_on()
+{
+	return 0
+}
+
+lcd_off()
+{
+	return 0
+}
+
+get_crt_status()
+{
+	return 0
+}
+
+crt_on()
+{
+	return 0
+}
+
+crt_off()
+{
+	return 0
+}
+
+suspend_video()
+{
+	return 0;
+}
+
+resume_video()
+{
+	return 0;
+}
+
+rotate_video_state()
+{
+    STATUS="$(get_crt_status) $(get_lcd_status)"
+    case "$STATUS" in
+    "off off")
+        crt_off
+        lcd_on
+        ;;
+    "off on")
+        crt_on
+        lcd_on
+        ;;
+    "on on")
+        crt_on
+        lcd_off
+        ;;
+    "on off")
+        crt_off
+        lcd_off
+        ;;
+    *)
+        ;;
+    esac
+}
+
 take_suspend_lock()
 {
 	VT=$(/usr/bin/fgconsole)
--- pm/hooks/20video	27 Apr 2006 08:05:43 -0000	1.7
+++ pm/hooks/20video	14 Jun 2006 02:47:40 -0000
@@ -2,27 +2,19 @@
 
 . /etc/pm/functions
 
-suspend_video()
-{
-	# Suspend all video devices using the HAL dbus methods
-	devices=`hal-find-by-capability --capability video_adapter_pm`
-	for device in $devices
-	do
-		dbus-send --system --print-reply --dest=org.freedesktop.Hal \
-			  $device org.freedesktop.Hal.Device.VideoAdapterPM.SuspendVideo
-	done
-}
-
-resume_video()
-{
-	# Resume all video devices using the HAL dbus methods
-	devices=`hal-find-by-capability --capability video_adapter_pm`
-	for device in $devices
-	do
-		dbus-send --system --print-reply --dest=org.freedesktop.Hal \
-			  $device org.freedesktop.Hal.Device.VideoAdapterPM.ResumeVideo
-	done
-}
+case "$(get_video_type)" in
+        ATI)
+		. /etc/pm/functions-ati
+		;;
+	nVidia)
+		. /etc/pm/functions-nvidia
+		;;
+	Intel)
+		. /etc/pm/functions-intel
+		;;
+	*)
+		;;
+esac
 
 case "$1" in
 	suspend)
--- pm/functions-ati.old	1969-12-31 19:00:00.000000000 -0500
+++ pm/functions-ati	2006-06-13 22:43:58.000000000 -0400
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+get_lcd_status()
+{
+	if [ ! -x /usr/sbin/radeontool ]; then
+		echo "error"
+		return 2
+	fi
+	STATUS=$(/usr/sbin/radeontool light | cut -d\  -f5 2>/dev/null)
+	RETVAL=0
+	case "x$STATUS" in
+		"xon")
+			echo "on"
+			RETVAL=0
+			;;
+		"xoff")
+			echo "off"
+			RETVAL=1
+			;;
+		*)
+			echo "error"
+			RETVAL=2
+			;;
+	esac
+	return $RETVAL
+}
+
+lcd_off()
+{
+	if [ "$(get_lcd_status)" != "on" ]; then
+		return
+	fi
+	[ -x /usr/sbin/radeontool] && /usr/sbin/radeontool light off
+}
+
+lcd_on()
+{
+	if [ "$(get_lcd_status)" != "off" ]; then
+		return
+	fi
+	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool light on
+}
+
+get_crt_status()
+{
+	if [ ! -x /usr/sbin/radeontool ]; then
+		echo "error"
+		return 2
+	fi
+	STATUS=$(/usr/sbin/radeontool light | cut -d\  -f5 2>/dev/null)
+	RETVAL=0
+	case "x$STATUS" in
+		"xon")
+			echo "on"
+			RETVAL=0
+			;;
+		"xoff")
+			echo "off"
+			RETVAL=1
+			;;
+		*)
+			echo "error"
+			RETVAL=2
+			;;
+	esac
+	return $RETVAL
+}
+
+crt_off()
+{
+	if [ "$(get_lcd_status)" != "on" ]; then
+		return
+	fi
+	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac off
+}
+
+crt_on()
+{
+	if [ "$(get_lcd_status)" != "on" ]; then
+		return
+	fi
+	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac on
+}
+
+[ -x /usr/sbin/vbetool ] || return
+
+suspend_video()
+{
+	/usr/sbin/vbetool dpms suspend >/dev/null 2>&1
+}
+
+resume_video()
+{
+#	/usr/sbin/vbetool dpms on >/dev/null 2>&1
+	:
+}
--- pm/functions-intel.old	1969-12-31 19:00:00.000000000 -0500
+++ pm/functions-intel	2006-06-13 22:43:58.000000000 -0400
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+[ -x /usr/sbin/vbetool ] || return
+
+suspend_video()
+{
+{
+	/usr/sbin/vbetool vbestate save > /var/run/vbestate
+	/usr/sbin/vbetool dpms suspend
+} >/dev/null 2>&1
+}
+
+resume_video()
+{
+{
+	/usr/sbin/vbetool post
+	/usr/sbin/vbetool vbestate restore < /var/run/vbestate
+} >/dev/null 2>&1
+}
+
+lcd_on()
+{
+	/usr/sbin/vbetool dpms on >/dev/null 2>&1
+}
+
+lcd_off()
+{
+	/usr/sbin/vbetool dpms off >/dev/null 2>&1
+}
--- pm/functions-nvidia.old	1969-12-31 19:00:00.000000000 -0500
+++ pm/functions-nvidia	2006-06-13 22:43:58.000000000 -0400
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+[ -x /usr/sbin/vbetool ] || return
+
+suspend_video()
+{
+{
+	/usr/sbin/vbetool vbestate save > /var/run/vbestate
+	/usr/sbin/vbetool dpms suspend
+} >/dev/null 2>&1
+}
+
+resume_video()
+{
+{
+	/usr/sbin/vbetool post
+	/usr/sbin/vbetool dpms on
+	/usr/sbin/vbetool vbestate restore < /var/run/vbestate
+} >/dev/null 2>&1
+}
+
+lcd_on()
+{
+	/usr/sbin/vbetool dpms on >/dev/null 2>&1
+}
+
+lcd_off()
+{
+	/usr/sbin/vbetool dpms off >/dev/null 2>&1
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Apr 2006 14:31:41 -0000	1.20
+++ .cvsignore	14 Jun 2006 02:59:28 -0000	1.21
@@ -1,3 +1,4 @@
 vbetool_0.5-1.tar.gz
 radeontool-1.5.tar.gz
 pm-utils-0.18.tar.gz
+pm-utils-0.19.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pm-utils.spec	27 Apr 2006 23:43:20 -0000	1.34
+++ pm-utils.spec	14 Jun 2006 02:59:28 -0000	1.35
@@ -1,7 +1,7 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.18
+Version: 0.19
 Release: 1
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
@@ -26,8 +26,9 @@
 BuildRequires: hal-devel pkgconfig pciutils-devel
 BuildRequires: dbus-devel >= 0.60
 
-Patch10: vbetool-0.3-fix-gcc4bug.patch
-Patch11: vbetool-0.3-libpci.patch
+Patch1: vbetool-0.3-fix-gcc4bug.patch
+Patch2: vbetool-0.3-libpci.patch
+Patch3: pm-utils-0.19-vidhooks.patch
 
 %description
 The pm-utils package contains utilities and scripts for Fedora Core
@@ -35,8 +36,9 @@
 
 %prep
 %setup -q -a 10 -a 20
-%patch10 -p0
-%patch11 -p0
+%patch1 -p0 -b .gcc4
+%patch2 -p0 -b .libpci
+%patch3 -p0 -b .vidhooks
 
 %build
 cd vbetool-0.4
@@ -99,8 +101,10 @@
 %{_mandir}/man*/*
 
 %changelog
-* xxx
+* Tue Jun 13 2006 Peter Jones <pjones at redhat.com> - 0.19-1
+- update from CVS
 - move pam and consolehelper stuff here.
+- move video hooks here since HAL isn't ready
 
 * Tue Apr 25 2006 Peter Jones <pjones at redhat.com> - 0.18-1
 - Make it work cross-distro


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Apr 2006 14:31:43 -0000	1.24
+++ sources	14 Jun 2006 02:59:28 -0000	1.25
@@ -1,3 +1,4 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
 1dba0a22ca8ccd235ee40de0ed59442a  pm-utils-0.18.tar.gz
+e9433732e9717e9d76b9eb6c3421dc8a  pm-utils-0.19.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:03:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:03:36 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-types.patch, NONE,
	1.1 e2fsprogs.spec, 1.56, 1.57
Message-ID: <200606140303.k5E33aZK023416@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23367

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.38-blkid-types.patch 
Log Message:
more build fixing

e2fsprogs-1.38-blkid-types.patch:
 blkid_types.h.in |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE e2fsprogs-1.38-blkid-types.patch ---
--- e2fsprogs-1.38/lib/blkid/blkid_types.h.in.foo	2006-06-13 22:58:07.000000000 -0400
+++ e2fsprogs-1.38/lib/blkid/blkid_types.h.in	2006-06-13 22:58:55.000000000 -0400
@@ -7,9 +7,12 @@
 	!defined(_EXT2_TYPES_H))
 #define _BLKID_TYPES_H
 
+#ifndef __u8
 typedef unsigned char __u8;
 typedef signed char __s8;
+#endif
 
+#ifndef __u64
 #if (@SIZEOF_INT@ == 8)
 typedef int		__s64;
 typedef unsigned int	__u64;
@@ -28,7 +31,9 @@
 #endif /* SIZEOF_LONG_LONG == 8 */
 #endif /* SIZEOF_LONG == 8 */
 #endif /* SIZEOF_INT == 8 */
+#endif
 
+#ifndef __u16
 #if (@SIZEOF_INT@ == 2)
 typedef	int		__s16;
 typedef	unsigned int	__u16;
@@ -40,7 +45,9 @@
   ?==error: undefined 16 bit type
 #endif /* SIZEOF_SHORT == 2 */
 #endif /* SIZEOF_INT == 2 */
+#endif
 
+#ifndef __u32
 #if (@SIZEOF_INT@ == 4)
 typedef	int		__s32;
 typedef	unsigned int	__u32;
@@ -57,5 +64,6 @@
 #endif /* SIZEOF_SHORT == 4 */
 #endif /* SIZEOF_LONG == 4 */
 #endif /* SIZEOF_INT == 4 */
+#endif
 
 #endif /* _*_TYPES_H */


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- e2fsprogs.spec	14 Jun 2006 02:36:08 -0000	1.56
+++ e2fsprogs.spec	14 Jun 2006 03:03:14 -0000	1.57
@@ -30,6 +30,7 @@
 Patch34: e2fsprogs-1.38-blkid-devmapper.patch
 Patch35: e2fsprogs-1.38-blkid-epoch.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
+Patch37: e2fsprogs-1.38-blkid-types.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -131,6 +132,9 @@
 # put blkid.tab in /etc/blkid/
 %patch36 -p1 -b .etcblkid
 
+# only define types if they haven't already been defined
+%patch37 -p1 -b .blkidtypes
+
 %build
 aclocal
 autoconf



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:37:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:37:54 -0400
Subject: rpms/scim-anthy/FC-5 scim-anthy.spec,1.28,1.29
Message-ID: <200606140337.k5E3bsnS021278@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-anthy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21266

Modified Files:
	scim-anthy.spec 
Log Message:
update libstdc++so7 libtool tweak to handle gcc-4.1.x



Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/FC-5/scim-anthy.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- scim-anthy.spec	11 May 2006 10:52:33 -0000	1.28
+++ scim-anthy.spec	14 Jun 2006 03:37:51 -0000	1.29
@@ -39,7 +39,7 @@
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make %{?_smp_mflags}
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x
+
 * Thu May 11 2006 Jens Petersen <petersen at redhat.com> - 1.0.0-1.fc5.1
 - rebuild to fix deps on ppc (#188443)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:40:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:40:17 -0400
Subject: rpms/scim-chewing/FC-5 scim-chewing.spec,1.9,1.10
Message-ID: <200606140340.k5E3eHcV021363@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-chewing/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21315

Modified Files:
	scim-chewing.spec 
Log Message:
update libstdc++so7 libtool tweak to handle gcc-4.1.x



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/FC-5/scim-chewing.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-chewing.spec	11 May 2006 10:57:05 -0000	1.9
+++ scim-chewing.spec	14 Jun 2006 03:40:14 -0000	1.10
@@ -32,7 +32,7 @@
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make %{?_smp_mflags}
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x
+
 * Thu May 11 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-5.2
 - rebuild to fix deps on ppc (#188443)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:45:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:45:09 -0400
Subject: rpms/scim-hangul/FC-5 scim-hangul.spec,1.14,1.15
Message-ID: <200606140345.k5E3j9Ee021591@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-hangul/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21549

Modified Files:
	scim-hangul.spec 
Log Message:
update libstdc++so7 libtool tweak to handle gcc-4.1.x



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/FC-5/scim-hangul.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-hangul.spec	11 May 2006 11:07:48 -0000	1.14
+++ scim-hangul.spec	14 Jun 2006 03:45:06 -0000	1.15
@@ -33,7 +33,7 @@
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make %{?_smp_mflags}
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x
+
 * Thu May 11 2006 Jens Petersen <petersen at redhat.com> - 0.2.2-1.fc5.1
 - rebuild to fix deps on ppc (#188443)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:47:07 -0400
Subject: rpms/scim-m17n/FC-5 scim-m17n.spec,1.7,1.8
Message-ID: <200606140347.k5E3l7pG003920@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-m17n/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3898

Modified Files:
	scim-m17n.spec 
Log Message:
update libstdc++so7 libtool tweak to handle gcc-4.1.x



Index: scim-m17n.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-m17n/FC-5/scim-m17n.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-m17n.spec	11 May 2006 11:11:10 -0000	1.7
+++ scim-m17n.spec	14 Jun 2006 03:47:05 -0000	1.8
@@ -33,7 +33,7 @@
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make %{?_smp_mflags}
 
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x
+
 * Thu May 11 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-2.1
 - rebuild to fix deps on ppc (#188443)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:48:32 -0400
Subject: rpms/scim-pinyin/FC-5 scim-pinyin.spec,1.13,1.14
Message-ID: <200606140348.k5E3mW13003970@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-pinyin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3946

Modified Files:
	scim-pinyin.spec 
Log Message:
update libstdc++so7 libtool tweak to handle gcc-4.1.x



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/FC-5/scim-pinyin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-pinyin.spec	11 May 2006 11:45:27 -0000	1.13
+++ scim-pinyin.spec	14 Jun 2006 03:48:30 -0000	1.14
@@ -37,7 +37,7 @@
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make %{?_smp_mflags}
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x
+
 * Thu May 11 2006 Jens Petersen <petersen at redhat.com> - 0.5.91-4.4
 - rebuild to fix deps on ppc (#188443)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:49:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:49:35 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.273, 1.274 anaconda.spec, 1.397,
	1.398 sources, 1.394, 1.395
Message-ID: <200606140349.k5E3nZr5004006@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3991

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- .cvsignore	13 Jun 2006 23:23:59 -0000	1.273
+++ .cvsignore	14 Jun 2006 03:49:32 -0000	1.274
@@ -1 +1 @@
-anaconda-11.1.0.33.tar.bz2
+anaconda-11.1.0.34.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- anaconda.spec	13 Jun 2006 23:23:59 -0000	1.397
+++ anaconda.spec	14 Jun 2006 03:49:32 -0000	1.398
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.33
+Version: 11.1.0.34
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jun 13 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.34-1
+- Fix logging segfaults in loader on x86_64
+- More release notes viewer fixes
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.33-1
 - Fix text mode package selection (clumens)
 - Fix IP editing (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- sources	13 Jun 2006 23:24:01 -0000	1.394
+++ sources	14 Jun 2006 03:49:32 -0000	1.395
@@ -1 +1,2 @@
 09762517814a306ce6790c1c1ebca2e5  anaconda-11.1.0.33.tar.bz2
+895323bcf30208a8d6f6de4666a5b43c  anaconda-11.1.0.34.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:50:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:50:38 -0400
Subject: rpms/scim-tables/FC-5 scim-tables.spec,1.24,1.25
Message-ID: <200606140350.k5E3ocRn004075@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-tables/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4055

Modified Files:
	scim-tables.spec 
Log Message:
update libstdc++so7 libtool tweak to handle gcc-4.1.x



Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/FC-5/scim-tables.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- scim-tables.spec	11 May 2006 11:54:12 -0000	1.24
+++ scim-tables.spec	14 Jun 2006 03:50:35 -0000	1.25
@@ -214,7 +214,7 @@
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+sed -i -e "s/4\.1\.. /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
 %endif
 make  %{?_smp_mflags}
 
@@ -452,6 +452,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x
+
 * Thu May 11 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-3.1
 - obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt)
 - rebuild to fix deps on ppc (#188443)



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:52:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:52:47 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-devmapper.patch, 1.3,
	1.4 e2fsprogs.spec, 1.57,
	1.58 e2fsprogs-1.38-blkid-types.patch, 1.1, NONE
Message-ID: <200606140352.k5E3qlIH004173@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4158

Modified Files:
	e2fsprogs-1.38-blkid-devmapper.patch e2fsprogs.spec 
Removed Files:
	e2fsprogs-1.38-blkid-types.patch 
Log Message:
fix differently


e2fsprogs-1.38-blkid-devmapper.patch:
 MCONFIG.in            |    3 
 configure.in          |   30 ++++++++
 e2fsck/Makefile.in    |    2 
 lib/blkid/Makefile.in |    4 -
 lib/blkid/blkid.pc.in |    2 
 lib/blkid/blkidP.h    |    1 
 lib/blkid/devname.c   |  176 ++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 214 insertions(+), 4 deletions(-)

Index: e2fsprogs-1.38-blkid-devmapper.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-blkid-devmapper.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- e2fsprogs-1.38-blkid-devmapper.patch	14 Jun 2006 01:41:44 -0000	1.3
+++ e2fsprogs-1.38-blkid-devmapper.patch	14 Jun 2006 03:52:44 -0000	1.4
@@ -81,26 +81,19 @@
  .c.o:
 --- e2fsprogs-1.38/lib/blkid/devname.c.dm	2005-05-07 21:26:03.000000000 +0200
 +++ e2fsprogs-1.38/lib/blkid/devname.c	2006-03-21 22:45:17.000000000 +0100
-@@ -11,6 +11,8 @@
+@@ -11,6 +11,12 @@
   * %End-Header%
   */
  
 +#define _GNU_SOURCE 1
 +
- #include <stdio.h>
- #include <string.h>
- #if HAVE_UNISTD_H
-@@ -35,6 +37,10 @@
- 
- #include "blkidP.h"
- 
 +#ifdef HAVE_DEVMAPPER
 +#include <libdevmapper.h>
 +#endif
 +
- /*
-  * Find a dev struct in the cache by device name, if available.
-  *
+ #include <stdio.h>
+ #include <string.h>
+ #if HAVE_UNISTD_H
 @@ -75,6 +81,10 @@
  	return dev;
  }


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- e2fsprogs.spec	14 Jun 2006 03:03:14 -0000	1.57
+++ e2fsprogs.spec	14 Jun 2006 03:52:44 -0000	1.58
@@ -30,7 +30,6 @@
 Patch34: e2fsprogs-1.38-blkid-devmapper.patch
 Patch35: e2fsprogs-1.38-blkid-epoch.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
-Patch37: e2fsprogs-1.38-blkid-types.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -132,9 +131,6 @@
 # put blkid.tab in /etc/blkid/
 %patch36 -p1 -b .etcblkid
 
-# only define types if they haven't already been defined
-%patch37 -p1 -b .blkidtypes
-
 %build
 aclocal
 autoconf


--- e2fsprogs-1.38-blkid-types.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 03:56:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 13 Jun 2006 23:56:26 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.18,
	1.19 gnome-power-manager.spec, 1.48, 1.49 sources, 1.18, 1.19
Message-ID: <200606140356.k5E3uQ86004246@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4231

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 May 2006 18:20:33 -0000	1.18
+++ .cvsignore	14 Jun 2006 03:56:24 -0000	1.19
@@ -1,2 +1 @@
-gnome-power-manager-2.15.1.tar.bz2
-gnome-power-manager-2.15.2.tar.bz2
+gnome-power-manager-2.15.3.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-power-manager.spec	9 Jun 2006 22:47:27 -0000	1.48
+++ gnome-power-manager.spec	14 Jun 2006 03:56:24 -0000	1.49
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.15.2
-Release: 3
+Version: 2.15.3
+Release: 1
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -102,6 +102,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-3
 - Drop unfounded gnome-mime-data dependency
 - Add missing BuildRequires


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 May 2006 18:20:33 -0000	1.18
+++ sources	14 Jun 2006 03:56:24 -0000	1.19
@@ -1 +1 @@
-8d9a6dfcc25d191d373f37e859a01b9f  gnome-power-manager-2.15.2.tar.bz2
+7c0634be8699156d9546fc92ba8c7ccf  gnome-power-manager-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:09:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:09:04 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.14.0-gpm-integration.patch, 1.1,
	1.2 gnome-panel.spec, 1.128, 1.129
Message-ID: <200606140409.k5E494oi015335@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15259

Modified Files:
	gnome-panel-2.14.0-gpm-integration.patch gnome-panel.spec 
Log Message:
Adjust to gnome-power-manager changes


gnome-panel-2.14.0-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   57 +++-
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   31 +-
 gnome-panel/panel-menu-items.c    |   26 +
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 724 insertions(+), 13 deletions(-)

Index: gnome-panel-2.14.0-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.14.0-gpm-integration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.14.0-gpm-integration.patch	13 Mar 2006 20:49:10 -0000	1.1
+++ gnome-panel-2.14.0-gpm-integration.patch	14 Jun 2006 04:09:00 -0000	1.2
@@ -719,7 +719,7 @@
 +    }
 +
 +  can_sleep = FALSE;
-+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend", &error,
++  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend", &error,
 +	                  G_TYPE_INVALID,
 +	                  G_TYPE_BOOLEAN, &can_sleep, G_TYPE_INVALID)) 
 +    {
@@ -751,7 +751,7 @@
 +    }
 +
 +  can_sleep_and_power_down = FALSE;
-+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate", &error,
++  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate", &error,
 +	                  G_TYPE_INVALID,
 +	                  G_TYPE_BOOLEAN, &can_sleep_and_power_down, 
 +	                  G_TYPE_INVALID)) 


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gnome-panel.spec	9 Jun 2006 22:24:04 -0000	1.128
+++ gnome-panel.spec	14 Jun 2006 04:09:01 -0000	1.129
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 3
+Release: 4
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -79,7 +79,7 @@
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 
-Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
+Conflicts: gnome-power-manager < 2.15.3
 
 %description
 The GNOME panel provides the window list, workspace switcher, menus, and other 
@@ -224,6 +224,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
+- Update to new gnome-power-manager interface
+- Conflict with gnome-power-manager < 2.15.3
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:10:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:10:58 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.35,1.36 sources,1.25,1.26
Message-ID: <200606140410.k5E4AtJf015705@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15425

Modified Files:
	pm-utils.spec sources 
Log Message:
- get patch depth right for video hooks
- use %configure
- get install syntax right for pam files and friends
- make consolehelper symlinks
- update tarball from cvs



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pm-utils.spec	14 Jun 2006 02:59:28 -0000	1.35
+++ pm-utils.spec	14 Jun 2006 04:10:51 -0000	1.36
@@ -38,7 +38,7 @@
 %setup -q -a 10 -a 20
 %patch1 -p0 -b .gcc4
 %patch2 -p0 -b .libpci
-%patch3 -p0 -b .vidhooks
+%patch3 -p1 -b .vidhooks
 
 %build
 cd vbetool-0.4
@@ -59,6 +59,7 @@
 cd ..
 %endif
 
+%configure
 make
 
 %install
@@ -76,10 +77,16 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -m 755 -d %{_sysconfdir}/pam.d
-install -m 644 %{source1} %{source2} %{source3} $(sysconfdir)/pam.d/
-install -m 755 -d %{_sysconfdir}/security/console.apps/
-install -m 644 %{source4} %{source5} %{source6} $(sysconfdir)/security/console.apps
+install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/
+install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
+install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
+install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
+pushd $RPM_BUILD_ROOT/%{_bindir}
+for x in pm-hibernate pm-powersave pm-restart pm-shutdown pm-suspend ; do
+	ln -sf consolehelper $x
+done
+popd
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Jun 2006 02:59:28 -0000	1.25
+++ sources	14 Jun 2006 04:10:51 -0000	1.26
@@ -1,4 +1,4 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
 1dba0a22ca8ccd235ee40de0ed59442a  pm-utils-0.18.tar.gz
-e9433732e9717e9d76b9eb6c3421dc8a  pm-utils-0.19.tar.gz
+2c83f260940deb244f19e7545543e829  pm-utils-0.19.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:17:29 -0400
Subject: rpms/pirut/devel .cvsignore, 1.22, 1.23 pirut.spec, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <200606140417.k5E4HTwm019199@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19028/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.1-1 on branch devel from pirut-1.1.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	12 Jun 2006 22:28:34 -0000	1.22
+++ .cvsignore	14 Jun 2006 04:17:24 -0000	1.23
@@ -1 +1 @@
-pirut-1.1.0.tar.gz
+pirut-1.1.1.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pirut.spec	12 Jun 2006 22:28:34 -0000	1.23
+++ pirut.spec	14 Jun 2006 04:17:24 -0000	1.24
@@ -2,14 +2,14 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.0
+Version: 1.1.1
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://fedoraproject.org
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0, comps-extras, rhpl
+Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0-4, comps-extras, rhpl
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
@@ -52,12 +52,14 @@
 %{python_sitelib}/pirut/*.pyo
 %{_bindir}/pirut
 %{_bindir}/pup
+%{_bindir}/puplet
 %{_bindir}/system-install-packages
 %{_sbindir}/pirut
 %{_sbindir}/pup
 %{_sbindir}/system-install-packages
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/security/console.apps/*
+%{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
 %dir %{_datadir}/pirut
 %dir %{_datadir}/pirut/ui
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 1.1.1-1
+- add puplet
+
 * Mon Jun 12 2006 Jeremy Katz <katzj at redhat.com> - 1.1.0-1
 - Update for yum 2.9.0 API
 - Handle missing summaries (bretm)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Jun 2006 22:28:34 -0000	1.23
+++ sources	14 Jun 2006 04:17:24 -0000	1.24
@@ -1 +1 @@
-30aef8a0cf0b33bd2cfc7fd005f75cf6  pirut-1.1.0.tar.gz
+d70d78674a4a07b73e07884ecc6f5c63  pirut-1.1.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:20:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:20:39 -0400
Subject: rpms/pm-utils/devel pm-utils-0.19-vidhooks.patch,1.1,1.2
Message-ID: <200606140420.k5E4KdZr024181@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23625

Modified Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
- fix Makefile.am/Makefile.in for functions-*


pm-utils-0.19-vidhooks.patch:
 Makefile.am      |    3 +
 Makefile.in      |    3 +
 functions        |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-ati    |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-intel  |   29 ++++++++++++++++
 functions-nvidia |   30 +++++++++++++++++
 hooks/20video    |   34 +++++++------------
 7 files changed, 265 insertions(+), 21 deletions(-)

Index: pm-utils-0.19-vidhooks.patch
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19-vidhooks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pm-utils-0.19-vidhooks.patch	14 Jun 2006 02:59:28 -0000	1.1
+++ pm-utils-0.19-vidhooks.patch	14 Jun 2006 04:20:20 -0000	1.2
@@ -1,6 +1,105 @@
---- pm/functions	16 May 2006 15:15:05 -0000	1.19
-+++ pm/functions	14 Jun 2006 02:47:40 -0000
-@@ -30,6 +30,97 @@ source_configs()
+--- /dev/null	2006-06-09 14:24:51.853484500 -0400
++++ pm-utils-0.19/pm/functions-ati	2006-06-14 00:15:55.000000000 -0400
+@@ -0,0 +1,96 @@
++#!/bin/bash
++
++get_lcd_status()
++{
++	if [ ! -x /usr/sbin/radeontool ]; then
++		echo "error"
++		return 2
++	fi
++	STATUS=$(/usr/sbin/radeontool light | cut -d\  -f5 2>/dev/null)
++	RETVAL=0
++	case "x$STATUS" in
++		"xon")
++			echo "on"
++			RETVAL=0
++			;;
++		"xoff")
++			echo "off"
++			RETVAL=1
++			;;
++		*)
++			echo "error"
++			RETVAL=2
++			;;
++	esac
++	return $RETVAL
++}
++
++lcd_off()
++{
++	if [ "$(get_lcd_status)" != "on" ]; then
++		return
++	fi
++	[ -x /usr/sbin/radeontool] && /usr/sbin/radeontool light off
++}
++
++lcd_on()
++{
++	if [ "$(get_lcd_status)" != "off" ]; then
++		return
++	fi
++	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool light on
++}
++
++get_crt_status()
++{
++	if [ ! -x /usr/sbin/radeontool ]; then
++		echo "error"
++		return 2
++	fi
++	STATUS=$(/usr/sbin/radeontool light | cut -d\  -f5 2>/dev/null)
++	RETVAL=0
++	case "x$STATUS" in
++		"xon")
++			echo "on"
++			RETVAL=0
++			;;
++		"xoff")
++			echo "off"
++			RETVAL=1
++			;;
++		*)
++			echo "error"
++			RETVAL=2
++			;;
++	esac
++	return $RETVAL
++}
++
++crt_off()
++{
++	if [ "$(get_lcd_status)" != "on" ]; then
++		return
++	fi
++	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac off
++}
++
++crt_on()
++{
++	if [ "$(get_lcd_status)" != "on" ]; then
++		return
++	fi
++	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac on
++}
++
++[ -x /usr/sbin/vbetool ] || return
++
++suspend_video()
++{
++	/usr/sbin/vbetool dpms suspend >/dev/null 2>&1
++}
++
++resume_video()
++{
++#	/usr/sbin/vbetool dpms on >/dev/null 2>&1
++	:
++}
+--- pm-utils-0.19/pm/functions.vidhooks	2006-06-13 22:50:37.000000000 -0400
++++ pm-utils-0.19/pm/functions	2006-06-14 00:15:55.000000000 -0400
+@@ -30,6 +30,97 @@
  
  source_configs
  
@@ -98,8 +197,8 @@
  take_suspend_lock()
  {
  	VT=$(/usr/bin/fgconsole)
---- pm/hooks/20video	27 Apr 2006 08:05:43 -0000	1.7
-+++ pm/hooks/20video	14 Jun 2006 02:47:40 -0000
+--- pm-utils-0.19/pm/hooks/20video.vidhooks	2006-06-13 22:50:37.000000000 -0400
++++ pm-utils-0.19/pm/hooks/20video	2006-06-14 00:15:55.000000000 -0400
 @@ -2,27 +2,19 @@
  
  . /etc/pm/functions
@@ -141,107 +240,8 @@
  
  case "$1" in
  	suspend)
---- pm/functions-ati.old	1969-12-31 19:00:00.000000000 -0500
-+++ pm/functions-ati	2006-06-13 22:43:58.000000000 -0400
-@@ -0,0 +1,96 @@
-+#!/bin/bash
-+
-+get_lcd_status()
-+{
-+	if [ ! -x /usr/sbin/radeontool ]; then
-+		echo "error"
-+		return 2
-+	fi
-+	STATUS=$(/usr/sbin/radeontool light | cut -d\  -f5 2>/dev/null)
-+	RETVAL=0
-+	case "x$STATUS" in
-+		"xon")
-+			echo "on"
-+			RETVAL=0
-+			;;
-+		"xoff")
-+			echo "off"
-+			RETVAL=1
-+			;;
-+		*)
-+			echo "error"
-+			RETVAL=2
-+			;;
-+	esac
-+	return $RETVAL
-+}
-+
-+lcd_off()
-+{
-+	if [ "$(get_lcd_status)" != "on" ]; then
-+		return
-+	fi
-+	[ -x /usr/sbin/radeontool] && /usr/sbin/radeontool light off
-+}
-+
-+lcd_on()
-+{
-+	if [ "$(get_lcd_status)" != "off" ]; then
-+		return
-+	fi
-+	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool light on
-+}
-+
-+get_crt_status()
-+{
-+	if [ ! -x /usr/sbin/radeontool ]; then
-+		echo "error"
-+		return 2
-+	fi
-+	STATUS=$(/usr/sbin/radeontool light | cut -d\  -f5 2>/dev/null)
-+	RETVAL=0
-+	case "x$STATUS" in
-+		"xon")
-+			echo "on"
-+			RETVAL=0
-+			;;
-+		"xoff")
-+			echo "off"
-+			RETVAL=1
-+			;;
-+		*)
-+			echo "error"
-+			RETVAL=2
-+			;;
-+	esac
-+	return $RETVAL
-+}
-+
-+crt_off()
-+{
-+	if [ "$(get_lcd_status)" != "on" ]; then
-+		return
-+	fi
-+	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac off
-+}
-+
-+crt_on()
-+{
-+	if [ "$(get_lcd_status)" != "on" ]; then
-+		return
-+	fi
-+	[ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac on
-+}
-+
-+[ -x /usr/sbin/vbetool ] || return
-+
-+suspend_video()
-+{
-+	/usr/sbin/vbetool dpms suspend >/dev/null 2>&1
-+}
-+
-+resume_video()
-+{
-+#	/usr/sbin/vbetool dpms on >/dev/null 2>&1
-+	:
-+}
---- pm/functions-intel.old	1969-12-31 19:00:00.000000000 -0500
-+++ pm/functions-intel	2006-06-13 22:43:58.000000000 -0400
+--- /dev/null	2006-06-09 14:24:51.853484500 -0400
++++ pm-utils-0.19/pm/functions-intel	2006-06-14 00:15:55.000000000 -0400
 @@ -0,0 +1,29 @@
 +#!/bin/bash
 +
@@ -272,8 +272,8 @@
 +{
 +	/usr/sbin/vbetool dpms off >/dev/null 2>&1
 +}
---- pm/functions-nvidia.old	1969-12-31 19:00:00.000000000 -0500
-+++ pm/functions-nvidia	2006-06-13 22:43:58.000000000 -0400
+--- /dev/null	2006-06-09 14:24:51.853484500 -0400
++++ pm-utils-0.19/pm/functions-nvidia	2006-06-14 00:15:55.000000000 -0400
 @@ -0,0 +1,30 @@
 +#!/bin/bash
 +
@@ -305,3 +305,27 @@
 +{
 +	/usr/sbin/vbetool dpms off >/dev/null 2>&1
 +}
+--- pm-utils-0.19/pm/Makefile.am.vidhooks	2006-06-14 00:16:49.000000000 -0400
++++ pm-utils-0.19/pm/Makefile.am	2006-06-14 00:17:13.000000000 -0400
+@@ -4,6 +4,9 @@
+ 
+ extra_SCRIPTS =			\
+ 	functions		\
++	functions-ati		\
++	functions-intel		\
++	functions-nvidia	\
+ 	config
+ 
+ EXTRA_DIST =			\
+--- pm-utils-0.19/pm/Makefile.in.vidhooks	2006-06-14 00:16:53.000000000 -0400
++++ pm-utils-0.19/pm/Makefile.in	2006-06-14 00:17:20.000000000 -0400
+@@ -136,6 +136,9 @@
+ extradir = $(sysconfdir)/pm
+ extra_SCRIPTS = \
+ 	functions		\
++	functions-ati		\
++	functions-intel		\
++	functions-nvidia	\
+ 	config
+ 
+ EXTRA_DIST = \



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:32:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:32:41 -0400
Subject: rpms/booty/devel .cvsignore, 1.46, 1.47 booty.spec, 1.50,
	1.51 sources, 1.49, 1.50
Message-ID: <200606140432.k5E4Wf8p001064@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1030/devel

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
auto-import booty-0.76-1 on branch devel from booty-0.76-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	3 May 2006 14:50:07 -0000	1.46
+++ .cvsignore	14 Jun 2006 04:32:36 -0000	1.47
@@ -1,2 +1 @@
-booty-0.74.tar.bz2
-booty-0.75.tar.bz2
+booty-0.76.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- booty.spec	3 May 2006 14:50:07 -0000	1.50
+++ booty.spec	14 Jun 2006 04:32:36 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.75
+Version: 0.76
 Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
@@ -35,6 +35,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 0.76-1
+- handle new xen kernel naming
+
 * Wed May 03 2006 Chris Lumens <clumens at redhat.com> 0.75-1
 - Remove rogue reference to butil.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	3 May 2006 14:50:07 -0000	1.49
+++ sources	14 Jun 2006 04:32:36 -0000	1.50
@@ -1 +1 @@
-71f959a32965c441fc4556f600be9cb3  booty-0.75.tar.bz2
+b2f09cf1fe79b7af01233c58308461fb  booty-0.76.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:33:55 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.36,1.37
Message-ID: <200606140433.k5E4Xtpe001287@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1225

Modified Files:
	pm-utils.spec 
Log Message:
- fix pam/consolehelper installation to have no extensions



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pm-utils.spec	14 Jun 2006 04:10:51 -0000	1.36
+++ pm-utils.spec	14 Jun 2006 04:33:48 -0000	1.37
@@ -78,9 +78,13 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/
+for x in %{SOURCE1} %{SOURCE2} %{SOURCE3} ; do
+	install -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/${x%%.pam}
+done
 install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
-install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
+for x in %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do
+	install -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/${x%%.app}
+done
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
 for x in pm-hibernate pm-powersave pm-restart pm-shutdown pm-suspend ; do



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:40:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:40:44 -0400
Subject: rpms/pirut/devel .cvsignore, 1.23, 1.24 pirut.spec, 1.24,
	1.25 sources, 1.24, 1.25
Message-ID: <200606140440.k5E4eiAd002314@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2213/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.2-1 on branch devel from pirut-1.1.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	14 Jun 2006 04:17:24 -0000	1.23
+++ .cvsignore	14 Jun 2006 04:40:42 -0000	1.24
@@ -1 +1 @@
-pirut-1.1.1.tar.gz
+pirut-1.1.2.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pirut.spec	14 Jun 2006 04:17:24 -0000	1.24
+++ pirut.spec	14 Jun 2006 04:40:42 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.1
+Version: 1.1.2
 Release: 1
 License: GPL
 Group: Applications/System
@@ -10,6 +10,7 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0-4, comps-extras, rhpl
+Requires: gnome-python2-libegg, gnome-python2-gconf
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Jun 2006 04:17:24 -0000	1.24
+++ sources	14 Jun 2006 04:40:42 -0000	1.25
@@ -1 +1 @@
-d70d78674a4a07b73e07884ecc6f5c63  pirut-1.1.1.tar.gz
+9d21544bf07e33171f9695d40a993b29  pirut-1.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:42:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:42:55 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.37,1.38
Message-ID: <200606140442.k5E4gtoS002688@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2642

Modified Files:
	pm-utils.spec 
Log Message:
- install the right filename
- get "install" syntax right



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pm-utils.spec	14 Jun 2006 04:33:48 -0000	1.37
+++ pm-utils.spec	14 Jun 2006 04:42:40 -0000	1.38
@@ -79,11 +79,13 @@
 
 install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 for x in %{SOURCE1} %{SOURCE2} %{SOURCE3} ; do
-	install -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/${x%%.pam}
+	y=$(basename ${x%%.pam})
+	install -T -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/$y
 done
 install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
 for x in %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do
-	install -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/${x%%.app}
+	y=$(basename ${x%%.app})
+	install -T -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/$y
 done
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}



From fedora-cvs-commits at redhat.com  Wed Jun 14 04:47:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 00:47:55 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.274, 1.275 anaconda.spec, 1.398,
	1.399 sources, 1.395, 1.396
Message-ID: <200606140447.k5E4ltX6010002@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9630/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.36-1 on branch devel from anaconda-11.1.0.36-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- .cvsignore	14 Jun 2006 03:49:32 -0000	1.274
+++ .cvsignore	14 Jun 2006 04:47:52 -0000	1.275
@@ -1 +1 @@
-anaconda-11.1.0.34.tar.bz2
+anaconda-11.1.0.36.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- anaconda.spec	14 Jun 2006 03:49:32 -0000	1.398
+++ anaconda.spec	14 Jun 2006 04:47:52 -0000	1.399
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.34
+Version: 11.1.0.36
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.36-1
+- new xen kernel names
+- more trying to fix s390
+
 * Tue Jun 13 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.34-1
 - Fix logging segfaults in loader on x86_64
 - More release notes viewer fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- sources	14 Jun 2006 03:49:32 -0000	1.395
+++ sources	14 Jun 2006 04:47:52 -0000	1.396
@@ -1,2 +1 @@
-09762517814a306ce6790c1c1ebca2e5  anaconda-11.1.0.33.tar.bz2
-895323bcf30208a8d6f6de4666a5b43c  anaconda-11.1.0.34.tar.bz2
+b6b66056cc662f88bc6f29c54674c0d8  anaconda-11.1.0.36.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 05:04:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 01:04:36 -0400
Subject: rpms/gnome-python2/devel gnome-python.spec,1.37,1.38
Message-ID: <200606140504.k5E54aec022539@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22494

Modified Files:
	gnome-python.spec 
Log Message:
fix build



Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-python.spec	13 Jun 2006 19:27:05 -0000	1.37
+++ gnome-python.spec	14 Jun 2006 05:04:33 -0000	1.38
@@ -9,11 +9,11 @@
 Version: 2.15.2
 Release: 1
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
-Patch1: gnome-python-1.99.11-client-command.patch
+#Patch1: gnome-python-1.99.11-client-command.patch
 
 License: LGPL
 Group: Development/Languages
-BuildRoot: %{_tmppath}/gnome-python-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: gnome-python2-bonobo
 Requires: python-abi = %{pyver}
 Requires: gnome-python2-gnomevfs
@@ -21,6 +21,7 @@
 BuildRequires: %{python}-devel >= 2.3.0
 BuildRequires: pyorbit-devel >= 2.0.1
 BuildRequires: libbonoboui-devel >= 2.0.0
+BuildRequires: libgnomeui-devel
 
 %if %{buildzvt}
 BuildRequires: libzvt-devel >= 2.0.0
@@ -106,7 +107,7 @@
 
 %prep
 %setup -q -n gnome-python-%{version}
-%patch1 -p1 -b .client-command
+#%patch1 -p1 -b .client-command
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Wed Jun 14 05:26:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 01:26:46 -0400
Subject: rpms/bind/devel bind-9.3.2-9_3_3_bind.patch, NONE,
	1.1 bind-9.3.2-9_3_3_dig.patch, NONE,
	1.1 bind-9.3.2-9_3_3_dns.patch, NONE,
	1.1 bind-9.3.2-9_3_3_dnssec.patch, NONE,
	1.1 bind-9.3.2-9_3_3_isc.patch, NONE,
	1.1 bind-9.3.2-9_3_3_isccfg.patch, NONE,
	1.1 bind-9.3.2-9_3_3_lwres.patch, NONE,
	1.1 bind-9.3.2-9_3_3_named.patch, NONE,
	1.1 bind-9.3.2-9_3_3_nsupdate.patch, NONE,
	1.1 bind-9.3.2-9_3_3_resolver.patch, NONE,
	1.1 bind-9.3.2-9_3_3_tests.patch, NONE,
	1.1 bind-9.3.2-9_3_3_validator.patch, NONE,
	1.1 bind-9.3.2-ch1991_rt15813.patch, NONE,
	1.1 bind-9.3.2-ch1994_rt15694.patch, NONE,
	1.1 bind-9.3.2-ch1997_rt15818.patch, NONE,
	1.1 bind-9.3.2-ch2009_rt15808.patch, NONE,
	1.1 bind-9.3.2-ch2013_rt15941.patch, NONE,
	1.1 bind-9.3.2-ch2024_rt16027.patch, NONE,
	1.1 bind-chroot-admin.in, 1.8, 1.9 bind.spec, 1.108,
	1.109 named.conf.sample, 1.1, 1.2
Message-ID: <200606140526.k5E5Qk3Z011090@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11061

Modified Files:
	bind-chroot-admin.in bind.spec named.conf.sample 
Added Files:
	bind-9.3.2-9_3_3_bind.patch bind-9.3.2-9_3_3_dig.patch 
	bind-9.3.2-9_3_3_dns.patch bind-9.3.2-9_3_3_dnssec.patch 
	bind-9.3.2-9_3_3_isc.patch bind-9.3.2-9_3_3_isccfg.patch 
	bind-9.3.2-9_3_3_lwres.patch bind-9.3.2-9_3_3_named.patch 
	bind-9.3.2-9_3_3_nsupdate.patch 
	bind-9.3.2-9_3_3_resolver.patch bind-9.3.2-9_3_3_tests.patch 
	bind-9.3.2-9_3_3_validator.patch 
	bind-9.3.2-ch1991_rt15813.patch 
	bind-9.3.2-ch1994_rt15694.patch 
	bind-9.3.2-ch1997_rt15818.patch 
	bind-9.3.2-ch2009_rt15808.patch 
	bind-9.3.2-ch2013_rt15941.patch 
	bind-9.3.2-ch2024_rt16027.patch 
Log Message:
fix bugs 191093, 189789; backport selected fixes from upstream v9_3_3b1 CVS

bind-9.3.2-9_3_3_bind.patch:
 dst/dst_api.c                 |   23 +++++++++++++----------
 dst/hmac_link.c               |   25 ++++++++++++++-----------
 dst/support.c                 |    2 +-
 include/arpa/nameser_compat.h |    7 ++++---
 include/netdb.h               |    4 ++--
 irs/dns.c                     |    4 ++--
 irs/dns_ho.c                  |   22 ++++++++++------------
 irs/gai_strerror.c            |   25 +++++++++++++++++++------
 irs/gen_ho.c                  |    4 +---
 irs/getaddrinfo.c             |   16 ++++++----------
 irs/gethostent.c              |    4 ++--
 irs/getnameinfo.c             |   10 ++++++++++
 irs/irp.c                     |    7 +++++--
 irs/irp_nw.c                  |    4 +++-
 irs/irpmarshall.c             |    6 +++---
 irs/irs_data.c                |   25 +++++++++++++++++++------
 irs/lcl_ho.c                  |    4 ++--
 irs/lcl_pr.c                  |   10 +++++++++-
 isc/ev_connects.c             |   10 +++++-----
 isc/eventlib.c                |    9 +++------
 isc/eventlib_p.h              |    4 +++-
 isc/heap.c                    |    8 ++++++--
 isc/hex.c                     |    5 +++--
 nameser/ns_sign.c             |    7 +++++--
 nameser/ns_verify.c           |    6 ++++--
 resolv/mtctxres.c             |    7 ++++---
 resolv/res_query.c            |    2 --
 resolv/res_send.c             |   14 +++++++-------
 resolv/res_sendsigned.c       |    5 +++--
 29 files changed, 168 insertions(+), 111 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_bind.patch ---
--- bind-9.3.2/lib/bind/nameser/ns_verify.c.9_3_3_bind	2005-10-10 20:48:16.000000000 -0400
+++ bind-9.3.2/lib/bind/nameser/ns_verify.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.1.206.2 2005/10/11 00:48:16 marka Exp $";
+static const char rcsid[] = "$Id: ns_verify.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -343,7 +343,7 @@
 	HEADER *hp = (HEADER *)msg;
 	u_char *recstart, *sigstart;
 	unsigned int sigfieldlen, otherfieldlen;
-	u_char *cp, *eom = msg + *msglen, *cp2;
+	u_char *cp, *eom, *cp2;
 	char name[MAXDNAME], alg[MAXDNAME];
 	u_char buf[MAXDNAME];
 	int n, type, length, fudge, error;
@@ -352,6 +352,8 @@
 	if (msg == NULL || msglen == NULL || state == NULL)
 		return (-1);
 
+	eom = msg + *msglen;
+
 	state->counter++;
 	if (state->counter == 0)
 		return (ns_verify(msg, msglen, state->key,
--- bind-9.3.2/lib/bind/nameser/ns_sign.c.9_3_3_bind	2004-03-09 03:33:45.000000000 -0500
+++ bind-9.3.2/lib/bind/nameser/ns_sign.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_sign.c,v 1.1.2.2.4.1 2004/03/09 08:33:45 marka Exp $";
+static const char rcsid[] = "$Id: ns_sign.c,v 1.1.2.2.4.2 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -89,7 +89,7 @@
 {
 	HEADER *hp = (HEADER *)msg;
 	DST_KEY *key = (DST_KEY *)k;
-	u_char *cp = msg + *msglen, *eob = msg + msgsize;
+	u_char *cp, *eob;
 	u_char *lenp;
 	u_char *alg;
 	int n;
@@ -100,6 +100,9 @@
 	if (msg == NULL || msglen == NULL || sig == NULL || siglen == NULL)
 		return (-1);
 
+	cp = msg + *msglen;
+	eob = msg + msgsize;
+
 	/* Name. */
 	if (key != NULL && error != ns_r_badsig && error != ns_r_badkey) {
 		n = ns_name_pton(key->dk_key_name, name, sizeof name);
--- bind-9.3.2/lib/bind/irs/irp_nw.c.9_3_3_bind	2004-03-09 03:33:37.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/irp_nw.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irp_nw.c,v 1.1.206.1 2004/03/09 08:33:37 marka Exp $";
+static const char rcsid[] = "$Id: irp_nw.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -319,6 +319,8 @@
 		nw = NULL;
 	}
 
+	if (body != NULL)
+		memput(body, bodylen);
 	return (nw);
 }
 
--- bind-9.3.2/lib/bind/irs/lcl_ho.c.9_3_3_bind	2004-03-16 19:29:50.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/lcl_ho.c	2006-03-09 19:17:21.000000000 -0500
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: lcl_ho.c,v 1.1.206.2 2004/03/17 00:29:50 marka Exp $";
+static const char rcsid[] = "$Id: lcl_ho.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -541,7 +541,7 @@
 		ai = hostent2addrinfo(hp, pai);
 		if (ai) {
 			cur->ai_next = ai;
-			while (cur && cur->ai_next)
+			while (cur->ai_next)
 				cur = cur->ai_next;
 		}
 	}
--- bind-9.3.2/lib/bind/irs/dns_ho.c.9_3_3_bind	2005-10-10 20:48:14.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/dns_ho.c	2006-03-09 19:17:21.000000000 -0500
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.7.4.6 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.7.4.8 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -218,8 +218,7 @@
 	ho_minimize(this);
 	if (pvt->res && pvt->free_res)
 		(*pvt->free_res)(pvt->res);
-	if (pvt)
-		memput(pvt, sizeof *pvt);
+	memput(pvt, sizeof *pvt);
 	memput(this, sizeof *this);
 }
 
@@ -260,7 +259,7 @@
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q));
+	memset(q, 0, sizeof(*q));
 
 	switch (af) {
 	case AF_INET:
@@ -352,8 +351,8 @@
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q));
-	memset(q2, 0, sizeof(q2));
+	memset(q, 0, sizeof(*q));
+	memset(q2, 0, sizeof(*q2));
 
 	if (af == AF_INET6 && len == IN6ADDRSZ &&
 	    (!memcmp(uaddr, mapped, sizeof mapped) ||
@@ -578,8 +577,8 @@
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q2));
-	memset(q2, 0, sizeof(q2));
+	memset(q, 0, sizeof(*q2));
+	memset(q2, 0, sizeof(*q2));
 
 	switch (pai->ai_family) {
 	case AF_UNSPEC:
@@ -649,10 +648,9 @@
 		if (ai) {
 			querystate = RESQRY_SUCCESS;
 			cur->ai_next = ai;
-			while (cur && cur->ai_next)
+			while (cur->ai_next)
 				cur = cur->ai_next;
-		}
-		else
+		} else
 			querystate = RESQRY_FAIL;
 	}
 
@@ -948,7 +946,7 @@
 				continue;
 			}
 			if (ret_aip) { /* need addrinfo. keep it. */
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else if (cur->ai_next) { /* need hostent */
 				struct addrinfo *aip = cur->ai_next;
--- bind-9.3.2/lib/bind/irs/gai_strerror.c.9_3_3_bind	2004-11-29 20:15:43.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/gai_strerror.c	2006-03-09 19:17:21.000000000 -0500
@@ -66,18 +66,26 @@
 
 #ifdef DO_PTHREADS
         if (!once) {
-                pthread_mutex_lock(&lock);
-                if (!once++)
-                        pthread_key_create(&key, free);
-                pthread_mutex_unlock(&lock);
+                if (pthread_mutex_lock(&lock) != 0)
+			goto unknown;
+                if (!once) {
+                        if (pthread_key_create(&key, free) != 0)
+				goto unknown;
+			once = 1;
+		}
+                if (pthread_mutex_unlock(&lock) != 0)
+			goto unknown;
         }
 
 	buf = pthread_getspecific(key);
         if (buf == NULL) {
 		buf = malloc(EAI_BUFSIZE);
                 if (buf == NULL)
-                        return ("unknown error");
-                pthread_setspecific(key, buf);
+                        goto unknown;
+                if (pthread_setspecific(key, buf) != 0) {
+			free(buf);
+			goto unknown;
+		}
         }
 #endif
 	/* 
@@ -86,4 +94,9 @@
 	 */
 	sprintf(buf, "%s: %d", gai_errlist[gai_nerr - 1], ecode);
 	return (buf);
+
+#ifdef DO_PTHREADS
+ unknown:
+	return ("unknown error");
+#endif
 }
--- bind-9.3.2/lib/bind/irs/gethostent.c.9_3_3_bind	2004-03-16 20:49:40.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/gethostent.c	2006-01-10 00:09:16.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.2.4.2 2004/03/17 01:49:40 marka Exp $";
+static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.2.4.3 2006/01/10 05:09:16 marka Exp $";
 #endif
 
 /* Imports */
@@ -608,7 +608,7 @@
 }
 #endif
 
-#ifdef __linux
+#if ( defined(__linux__) || defined(__linux) || defined(LINUX) )
 #ifndef IF_NAMESIZE
 # ifdef IFNAMSIZ
 #  define IF_NAMESIZE  IFNAMSIZ
--- bind-9.3.2/lib/bind/irs/dns.c.9_3_3_bind	2004-03-16 19:29:47.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/dns.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns.c,v 1.1.206.2 2004/03/17 00:29:47 marka Exp $";
+static const char rcsid[] = "$Id: dns.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /*
@@ -114,7 +114,7 @@
 		res = (struct __res_state *)malloc(sizeof *res);
 		if (res == NULL)
 			return (NULL);
-		memset(dns->res, 0, sizeof *dns->res);
+		memset(res, 0, sizeof *res);
 		dns_res_set(this, res, free);
 	}
 
--- bind-9.3.2/lib/bind/irs/gen_ho.c.9_3_3_bind	2004-03-16 20:49:39.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/gen_ho.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: gen_ho.c,v 1.1.206.2 2004/03/17 01:49:39 marka Exp $";
+static const char rcsid[] = "$Id: gen_ho.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports */
@@ -371,8 +371,6 @@
 	}
 	if (softerror != 0 && pvt->res->res_h_errno == HOST_NOT_FOUND)
 		RES_SET_H_ERRNO(pvt->res, therrno);
-	if (rval)
-		freeaddrinfo(rval);
 	return (NULL);
 }
 
--- bind-9.3.2/lib/bind/irs/irpmarshall.c.9_3_3_bind	2004-03-16 20:13:34.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/irpmarshall.c	2006-03-09 19:17:21.000000000 -0500
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irpmarshall.c,v 1.3.206.3 2004/03/17 01:13:34 marka Exp $";
+static const char rcsid[] = "$Id: irpmarshall.c,v 1.3.206.4 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -1020,7 +1020,7 @@
 	int hoaddrtype;
 	int holength;
 	long t;
-	char *name = NULL;
+	char *name;
 	char **aliases = NULL;
 	char **hohaddrlist = NULL;
 	size_t hoaddrsize;
@@ -1143,6 +1143,7 @@
 	errno = myerrno;
 
 	if (name != NULL) free(name);
+	free_array(hohaddrlist, 0);
 	free_array(aliases, 0);
 
 	return (-1);
@@ -1313,7 +1314,6 @@
 
 	if (host != NULL) free(host);
 	if (user != NULL) free(user);
-	if (domain != NULL) free(domain);
 
 	return (-1);
 }
--- bind-9.3.2/lib/bind/irs/irp.c.9_3_3_bind	2004-03-16 20:49:41.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/irp.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irp.c,v 1.3.2.1.10.2 2004/03/17 01:49:41 marka Exp $";
+static const char rcsid[] = "$Id: irp.c,v 1.3.2.1.10.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Imports */
@@ -425,6 +425,9 @@
 	char *buffer = memget(len);
 	int idx = 0;
 
+	if (buffer == NULL)
+		return (NULL);
+
 	for (;;) {
 		if (irs_irp_read_line(pvt, line, sizeof line) <= 0 ||
 		    strchr(line, '\n') == NULL)
@@ -517,7 +520,7 @@
  * int irs_irp_send_command(struct irp_p *pvt, const char *fmt, ...);
  *
  *	Sends command to remote connected via the PVT
- *	struture. FMT and args after it are fprintf-like
+ *	structure. FMT and args after it are fprintf-like
  *	arguments for formatting.
  *
  * Returns:
--- bind-9.3.2/lib/bind/irs/getnameinfo.c.9_3_3_bind	2004-06-24 20:35:00.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/getnameinfo.c	2006-01-10 00:09:16.000000000 -0500
@@ -3,6 +3,16 @@
  * - Thread safe-ness must be checked
  */
 
+#if ( defined(__linux__) || defined(__linux) || defined(LINUX) )
+#ifndef IF_NAMESIZE
+# ifdef IFNAMSIZ
+#  define IF_NAMESIZE  IFNAMSIZ
+# else
+#  define IF_NAMESIZE 16
+# endif
+#endif
+#endif
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
--- bind-9.3.2/lib/bind/irs/lcl_pr.c.9_3_3_bind	2004-03-09 03:33:38.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/lcl_pr.c	2006-03-09 19:17:21.000000000 -0500
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.1 2004/03/09 08:33:38 marka Exp $";
+static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* extern */
@@ -85,6 +85,7 @@
 struct pvt {
 	FILE *		fp;
 	char		line[BUFSIZ+1];
+	char *		dbuf;
 	struct protoent	proto;
 	char *		proto_aliases[MAXALIASES];
 };
@@ -141,6 +142,8 @@
 
 	if (pvt->fp)
 		(void) fclose(pvt->fp);
+	if (pvt->dbuf)
+		free(pvt->dbuf);
 	memput(pvt, sizeof *pvt);
 	memput(this, sizeof *this);
 }
@@ -202,6 +205,10 @@
 		pr_rewind(this);
 	if (!pvt->fp)
 		return (NULL);
+	if (pvt->dbuf) {
+		free(pvt->dbuf);
+		pvt->dbuf = NULL;
+	}
 	bufp = pvt->line;
 	bufsiz = BUFSIZ;
 	offset = 0;
@@ -270,6 +277,7 @@
 		}
 	}
 	*q = NULL;
+	pvt->dbuf = dbuf;
 	return (&pvt->proto);
 }
 
--- bind-9.3.2/lib/bind/irs/irs_data.c.9_3_3_bind	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/irs_data.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irs_data.c,v 1.3.2.2.4.3 2004/11/30 01:15:43 marka Exp $";
+static const char rcsid[] = "$Id: irs_data.c,v 1.3.2.2.4.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -128,10 +128,15 @@
 	struct net_data *net_data;
 
 	if (!once) {
-		pthread_mutex_lock(&keylock);
-		if (!once++)
-			pthread_key_create(&key, net_data_destroy);
-		pthread_mutex_unlock(&keylock);
+		if (pthread_mutex_lock(&keylock) != 0)
+			return (NULL);
+		if (!once) {
+			if (pthread_key_create(&key, net_data_destroy) != 0)
+				return (NULL);
+			once = 1;
+		}
+		if (pthread_mutex_unlock(&keylock) != 0)
+			return (NULL);
 	}
 	net_data = pthread_getspecific(key);
 #endif
@@ -141,7 +146,10 @@
 		if (net_data == NULL)
 			return (NULL);
 #ifdef	DO_PTHREADS
-		pthread_setspecific(key, net_data);
+		if (pthread_setspecific(key, net_data) != 0) {
+			net_data_destroy(net_data);
+			return (NULL);
+		}
 #endif
 	}
 
@@ -222,7 +230,12 @@
 void
 __h_errno_set(struct __res_state *res, int err) {
 
+
+#if (__GLIBC__ > 2 || __GLIBC__ == 2 &&  __GLIBC_MINOR__ >= 3)
+	res->res_h_errno = err;
+#else
 	h_errno = res->res_h_errno = err;
+#endif
 }
 
 #endif /*__BIND_NOSTATIC*/
--- bind-9.3.2/lib/bind/irs/getaddrinfo.c.9_3_3_bind	2005-07-28 03:43:19.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/getaddrinfo.c	2006-03-09 19:17:21.000000000 -0500
@@ -332,7 +332,7 @@
 	pai->ai_family = PF_UNSPEC;
 	pai->ai_socktype = ANY;
 	pai->ai_protocol = ANY;
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 	/*
 	 * clear _ai_pad to preserve binary
 	 * compatibility with previously compiled 64-bit
@@ -340,7 +340,7 @@
 	 * guaranteeing the upper 32-bits are empty.
 	 */
 	pai->_ai_pad = 0;
-#endif /* __sparcv9 */
+#endif
 	pai->ai_addrlen = 0;
 	pai->ai_canonname = NULL;
 	pai->ai_addr = NULL;
@@ -365,7 +365,7 @@
 		}
 		memcpy(pai, hints, sizeof(*pai));
 
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 		/*
 		 * We need to clear _ai_pad to preserve binary
 		 * compatibility.  See prior comment.
@@ -576,10 +576,6 @@
 
 	freeaddrinfo(afai);	/* afai must not be NULL at this point. */
 
-	/* we must not have got any errors. */
-	if (error != 0) /* just for diagnosis */
-		abort();
-
 	if (sentinel.ai_next) {
 good:
 		*res = sentinel.ai_next;
@@ -804,7 +800,7 @@
 			    pai->ai_family == PF_UNSPEC /*?*/) {
 				GET_AI(cur->ai_next, afd, pton);
 				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else
 				ERR(EAI_FAMILY);	/*xxx*/
@@ -817,7 +813,7 @@
 			    pai->ai_family == PF_UNSPEC /*?*/) {
 				GET_AI(cur->ai_next, afd, pton);
 				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else
 				ERR(EAI_FAMILY);	/*xxx*/
@@ -1202,7 +1198,7 @@
 			 */
 			GET_CANONNAME(cur->ai_next, hp->h_name);
 		}
-		while (cur && cur->ai_next) /* no need to loop, actually. */
+		while (cur->ai_next) /* no need to loop, actually. */
 			cur = cur->ai_next;
 		continue;
 
--- bind-9.3.2/lib/bind/dst/hmac_link.c.9_3_3_bind	2005-07-28 03:43:16.000000000 -0400
+++ bind-9.3.2/lib/bind/dst/hmac_link.c	2006-03-09 19:17:21.000000000 -0500
@@ -1,6 +1,6 @@
 #ifdef HMAC_MD5
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/hmac_link.c,v 1.2.2.1.4.1 2005/07/28 07:43:16 marka Exp $";
+static const char rcsid[] = "$Header: /var/snap/bind9/lib/bind/dst/hmac_link.c,v 1.2.2.1.4.2 2006/03/10 00:17:21 marka Exp $";
 #endif
 /*
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -93,6 +93,9 @@
 	int sign_len = 0;
 	MD5_CTX *ctx = NULL;
 
+	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
+		return (-1);
+
 	if (mode & SIG_MODE_INIT) 
 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 	else if (context)
@@ -100,8 +103,6 @@
 	if (ctx == NULL) 
 		return (-1);
 
-	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
-		return (-1);
 	key = (HMAC_Key *) d_key->dk_KEY_struct;
 
 	if (mode & SIG_MODE_INIT) {
@@ -160,6 +161,9 @@
 	HMAC_Key *key;
 	MD5_CTX *ctx = NULL;
 
+	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
+		return (-1);
+
 	if (mode & SIG_MODE_INIT) 
 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 	else if (context)
@@ -167,9 +171,6 @@
 	if (ctx == NULL) 
 		return (-1);
 
-	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
-		return (-1);
-
 	key = (HMAC_Key *) d_key->dk_KEY_struct;
 	if (mode & SIG_MODE_INIT) {
 		MD5Init(ctx);
@@ -272,7 +273,7 @@
 
 static int
 dst_hmac_md5_key_to_file_format(const DST_KEY *dkey, char *buff,
-			    const int buff_len)
+			        const int buff_len)
 {
 	char *bp;
 	int len, b_len, i, key_len;
@@ -289,7 +290,7 @@
 	/* write file header */
 	sprintf(buff, key_file_fmt_str, KEY_FILE_FORMAT, KEY_HMAC_MD5, "HMAC");
 
-	bp = (char *) strchr(buff, '\0');
+	bp = buff + strlen(buff);
 	b_len = buff_len - (bp - buff);
 
 	memset(key, 0, HMAC_LEN);
@@ -334,9 +335,9 @@
 {
 	const char *p = buff, *eol;
 	u_char key[HMAC_LEN+1];	/* b64_pton needs more than 64 bytes do decode
-							 * it should probably be fixed rather than doing
-							 * this
-							 */
+				 * it should probably be fixed rather than doing
+				 * this
+				 */
 	u_char *tmp;
 	int key_len, len;
 
@@ -355,6 +356,8 @@
 		return (-4);
 	len = eol - p;
 	tmp = malloc(len + 2);
+	if (tmp == NULL)
+		return (-5);
 	memcpy(tmp, p, len);
 	*(tmp + len) = 0x0;
 	key_len = b64_pton((char *)tmp, key, HMAC_LEN+1);	/* see above */
--- bind-9.3.2/lib/bind/dst/support.c.9_3_3_bind	2005-10-10 20:48:14.000000000 -0400
+++ bind-9.3.2/lib/bind/dst/support.c	2005-10-10 20:48:14.000000000 -0400
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/support.c,v 1.2.2.1.10.2 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Header: /var/snap/bind9/lib/bind/dst/support.c,v 1.2.2.1.10.2 2005/10/11 00:48:14 marka Exp $";
 
 
 /*
--- bind-9.3.2/lib/bind/dst/dst_api.c.9_3_3_bind	2005-10-10 20:48:14.000000000 -0400
+++ bind-9.3.2/lib/bind/dst/dst_api.c	2006-03-09 19:17:21.000000000 -0500
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/dst_api.c,v 1.4.2.6.8.3 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Header: /var/snap/bind9/lib/bind/dst/dst_api.c,v 1.4.2.6.8.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /*
@@ -170,6 +170,10 @@
 
 	memset(new_key, 0, sizeof(*new_key));
 	new_key->dk_key_name = strdup(name);
+	if (new_key->dk_key_name == NULL) {
+		free(new_key);
+		return (NULL);
+	}
 	new_key->dk_alg = alg;
 	new_key->dk_flags = flags;
 	new_key->dk_proto = protocol;
@@ -655,11 +659,13 @@
 			 alg));
 		return (NULL);
 	}
-	if ((key_st = dst_s_get_key_struct(in_name, alg, 0, 0, 0)) == NULL)
-		return (NULL);
 
 	if (in_name == NULL)
 		return (NULL);
+
+	if ((key_st = dst_s_get_key_struct(in_name, alg, 0, 0, 0)) == NULL)
+		return (NULL);
+
 	key_st->dk_id = dst_s_dns_key_id(rdata, len);
 	key_st->dk_flags = dst_s_get_int16(rdata);
 	key_st->dk_proto = (u_int16_t) rdata[DST_KEY_PROT];
@@ -772,13 +778,11 @@
 		return (NULL);
 	}
 
-	dkey = dst_s_get_key_struct(key_name, alg, flags, 
-					     protocol, -1);
+	dkey = dst_s_get_key_struct(key_name, alg, flags, protocol, -1);
 
-	if (dkey == NULL)
-		return (NULL);
-	if (dkey->dk_func == NULL || dkey->dk_func->from_dns_key == NULL)
-		return NULL;
+	if (dkey == NULL || dkey->dk_func == NULL ||
+	    dkey->dk_func->from_dns_key == NULL) 
+		return (dst_free_key(dkey));
 
 	if (dkey->dk_func->from_dns_key(dkey, key_buf, key_len) < 0) {
 		EREPORT(("dst_buffer_to_key(): dst_buffer_to_hmac failed\n"));
@@ -1013,7 +1017,6 @@
 	else {
 		EREPORT(("dst_free_key(): Unknown key alg %d\n",
 			 f_key->dk_alg));
-		free(f_key->dk_KEY_struct);	/* SHOULD NOT happen */
 	}
 	if (f_key->dk_KEY_struct) {
 		free(f_key->dk_KEY_struct);
--- bind-9.3.2/lib/bind/resolv/res_sendsigned.c.9_3_3_bind	2005-07-28 03:43:23.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/res_sendsigned.c	2006-03-09 19:17:21.000000000 -0500
@@ -52,6 +52,7 @@
 	bufsize = msglen + 1024;
 	newmsg = (u_char *) malloc(bufsize);
 	if (newmsg == NULL) {
+		free(nstatp);
 		errno = ENOMEM;
 		return (-1);
 	}
@@ -102,11 +103,11 @@
 retry:
 
 	len = res_nsend(nstatp, newmsg, newmsglen, answer, anslen);
-	if (ret < 0) {
+	if (len < 0) {
 		free (nstatp);
 		free (newmsg);
 		dst_free_key(dstkey);
-		return (ret);
+		return (len);
 	}
 
 	ret = ns_verify(answer, &len, dstkey, sig, siglen,
--- bind-9.3.2/lib/bind/resolv/res_send.c.9_3_3_bind	2005-08-14 22:04:41.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/res_send.c	2006-03-07 23:13:31.000000000 -0500
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -130,7 +130,7 @@
 static int		send_vc(res_state, const u_char *, int,
 				u_char *, int, int *, int);
 static int		send_dg(res_state, const u_char *, int,
-				u_char *, int, int *, int,
+				u_char *, int, int *, int, int,
 				int *, int *);
 static void		Aerror(const res_state, FILE *, const char *, int,
 			       const struct sockaddr *, int);
@@ -458,7 +458,7 @@
 		} else {
 			/* Use datagrams. */
 			n = send_dg(statp, buf, buflen, ans, anssiz, &terrno,
-				    ns, &v_circuit, &gotsomewhere);
+				    ns, try, &v_circuit, &gotsomewhere);
 			if (n < 0)
 				goto fail;
 			if (n == 0)
@@ -766,9 +766,9 @@
 }
 
 static int
-send_dg(res_state statp,
-	const u_char *buf, int buflen, u_char *ans, int anssiz,
-	int *terrno, int ns, int *v_circuit, int *gotsomewhere)
+send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
+	int anssiz, int *terrno, int ns, int try, int *v_circuit,
+	int *gotsomewhere)
 {
 	const HEADER *hp = (const HEADER *) buf;
 	HEADER *anhp = (HEADER *) ans;
@@ -849,7 +849,7 @@
 	/*
 	 * Wait for reply.
 	 */
-	seconds = (statp->retrans << ns);
+	seconds = (statp->retrans << try);
 	if (ns > 0)
 		seconds /= statp->nscount;
 	if (seconds <= 0)
--- bind-9.3.2/lib/bind/resolv/mtctxres.c.9_3_3_bind	2005-08-23 00:48:40.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/mtctxres.c	2006-03-09 19:17:21.000000000 -0500
@@ -106,9 +106,10 @@
 	 */
 	if (!mt_key_initialized) {
 		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                pthread_mutex_lock(&keylock);
-		_mtctxres_init();
-                pthread_mutex_unlock(&keylock);
+                if (pthread_mutex_lock(&keylock) == 0) {
+			_mtctxres_init();
+			(void) pthread_mutex_unlock(&keylock);
+		}
 	}
 
 	/*
--- bind-9.3.2/lib/bind/resolv/res_query.c.9_3_3_bind	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/res_query.c	2004-03-16 07:34:19.000000000 -0500
@@ -192,8 +192,6 @@
 		}
 		return (-1);
 	}
-	if( n > 0 )
-		RES_SET_H_ERRNO(statp,0);
 	return (n);
 }
 
--- bind-9.3.2/lib/bind/include/arpa/nameser_compat.h.9_3_3_bind	2004-07-01 00:43:41.000000000 -0400
+++ bind-9.3.2/lib/bind/include/arpa/nameser_compat.h	2006-05-18 22:38:15.000000000 -0400
@@ -32,7 +32,7 @@
 
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp $
+ *	$Id: nameser_compat.h,v 1.1.2.3.4.3 2006/05/19 02:38:15 marka Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
@@ -52,8 +52,9 @@
 #define	PDP_ENDIAN	3412	/* LSB first in word, MSW first in long (pdp)*/
 
 #if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
-    defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
-    defined(__alpha__) || defined(__alpha) || \
+    defined(__i386__) || defined(__i386) || defined(__amd64__) || \
+    defined(__x86_64__) || defined(MIPSEL) || defined(_MIPSEL) || \
+    defined(BIT_ZERO_ON_RIGHT) || defined(__alpha__) || defined(__alpha) || \
     (defined(__Lynx__) && defined(__x86__))
 #define BYTE_ORDER	LITTLE_ENDIAN
 #endif
--- bind-9.3.2/lib/bind/include/netdb.h.9_3_3_bind	2004-11-29 20:15:42.000000000 -0500
+++ bind-9.3.2/lib/bind/include/netdb.h	2006-03-05 21:27:35.000000000 -0500
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *	$Id: netdb.h,v 1.12.2.1.4.5 2004/11/30 01:15:42 marka Exp $
+ *	$Id: netdb.h,v 1.12.2.1.4.6 2006/03/06 02:27:35 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -175,7 +175,7 @@
 	int		ai_socktype;	/* SOCK_xxx */
 	int		ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
 #if defined(sun) && defined(_SOCKLEN_T)
-#ifdef __sparc9
+#ifdef __sparcv9
 	int		_ai_pad;
 #endif
 	socklen_t	ai_addrlen;
--- bind-9.3.2/lib/bind/isc/heap.c.9_3_3_bind	2004-03-09 03:33:43.000000000 -0500
+++ bind-9.3.2/lib/bind/isc/heap.c	2006-03-09 19:17:21.000000000 -0500
@@ -26,7 +26,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: heap.c,v 1.1.206.1 2004/03/09 08:33:43 marka Exp $";
+static const char rcsid[] = "$Id: heap.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -54,9 +54,13 @@
 	 int array_size_increment) {
 	heap_context ctx;
 
+	if (higher_priority == NULL)
+		return (NULL);
+
 	ctx = (heap_context)malloc(sizeof (struct heap_context));
-	if (ctx == NULL || higher_priority == NULL)
+	if (ctx == NULL)
 		return (NULL);
+
 	ctx->array_size = 0;
 	if (array_size_increment == 0)
 		ctx->array_size_increment = ARRAY_SIZE_INCREMENT;
--- bind-9.3.2/lib/bind/isc/eventlib_p.h.9_3_3_bind	2005-07-28 03:43:20.000000000 -0400
+++ bind-9.3.2/lib/bind/isc/eventlib_p.h	2006-03-09 19:17:21.000000000 -0500
@@ -18,7 +18,7 @@
 /* eventlib_p.h - private interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib_p.h,v 1.3.2.1.4.3 2005/07/28 07:43:20 marka Exp $
+ * $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $
  */
 
 #ifndef _EVENTLIB_P_H
@@ -45,6 +45,8 @@
 #define	EV_MASK_ALL	(EV_READ | EV_WRITE | EV_EXCEPT)
 #define EV_ERR(e)		return (errno = (e), -1)
 #define OK(x)		if ((x) < 0) EV_ERR(errno); else (void)NULL
+#define OKFREE(x, y)	if ((x) < 0) { FREE((y)); EV_ERR(errno); } \
+			else (void)NULL
 
 #define	NEW(p)		if (((p) = memget(sizeof *(p))) != NULL) \
 				FILL(p); \
--- bind-9.3.2/lib/bind/isc/ev_connects.c.9_3_3_bind	2005-07-08 00:52:54.000000000 -0400
+++ bind-9.3.2/lib/bind/isc/ev_connects.c	2006-03-09 19:17:21.000000000 -0500
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_connects.c,v 1.4.206.2 2005/07/08 04:52:54 marka Exp $";
+static const char rcsid[] = "$Id: ev_connects.c,v 1.4.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -69,7 +69,7 @@
 
 	OKNEW(new);
 	new->flags = EV_CONN_LISTEN;
-	OK(mode = fcntl(fd, F_GETFL, NULL));	/* side effect: validate fd. */
+	OKFREE(mode = fcntl(fd, F_GETFL, NULL), new);	/* side effect: validate fd. */
 	/*
 	 * Remember the nonblocking status.  We assume that either evSelectFD
 	 * has not been done to this fd, or that if it has then the caller
@@ -80,13 +80,13 @@
 	if ((mode & PORT_NONBLOCK) == 0) {
 #ifdef USE_FIONBIO_IOCTL
 		int on = 1;
-		OK(ioctl(fd, FIONBIO, (char *)&on));
+		OKFREE(ioctl(fd, FIONBIO, (char *)&on), new);
 #else
-		OK(fcntl(fd, F_SETFL, mode | PORT_NONBLOCK));
+		OKFREE(fcntl(fd, F_SETFL, mode | PORT_NONBLOCK), new);
 #endif
 		new->flags |= EV_CONN_BLOCK;
 	}
-	OK(listen(fd, maxconn));
+	OKFREE(listen(fd, maxconn), new);
 	if (evSelectFD(opaqueCtx, fd, EV_READ, listener, new, &new->file) < 0){
 		int save = errno;
 
--- bind-9.3.2/lib/bind/isc/eventlib.c.9_3_3_bind	2005-07-28 03:43:20.000000000 -0400
+++ bind-9.3.2/lib/bind/isc/eventlib.c	2006-03-09 19:17:21.000000000 -0500
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.1.4.5 2005/07/28 07:43:20 marka Exp $";
+static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.1.4.6 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -784,13 +784,10 @@
 		pnfds = 0;
 	}
 	n = poll(fds, pnfds, polltimeout);
-	/*
-	 * pselect() should return the total number of events on the file
-	 * desriptors, not just the count of fd:s with activity. Hence,
-	 * traverse the pollfds array and count the events.
-	 */
 	if (n > 0) {
 		int     i, e;
+
+		INSIST(ctx != NULL);
 		for (e = 0, i = ctx->firstfd; i <= ctx->fdMax; i++) {
 			if (ctx->pollfds[i].fd < 0)
 				continue;
--- bind-9.3.2/lib/bind/isc/hex.c.9_3_3_bind	2004-03-16 07:34:16.000000000 -0500
+++ bind-9.3.2/lib/bind/isc/hex.c	2006-01-30 19:53:21.000000000 -0500
@@ -45,8 +45,9 @@
 			goto formerr;
 		/* comment */
 		if (c == ';') {
-			while ((c = fgetc(fp)) != EOF && c != '\n')
-				/* empty */
+			do {
+				c = fgetc(fp);
+			} while (c != EOF && c != '\n');
 			if (c == '\n' && *multiline)
 				continue;
 			goto formerr;

bind-9.3.2-9_3_3_dig.patch:
 host.c |  106 +++++++++++++++++++++++------------------------------------------
 1 files changed, 38 insertions(+), 68 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_dig.patch ---
--- bind-9.3.2/bin/dig/host.c.9_3_3_dig	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/bin/dig/host.c	2006-06-13 23:04:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.76.2.5.2.13 2005/07/04 03:29:45 marka Exp $ */
+/* $Id: host.c,v 1.76.2.5.2.16 2006/05/23 04:43:47 marka Exp $ */
 
 #include <config.h>
 #include <limits.h>
@@ -46,6 +46,7 @@
 static int seen_error = -1;
 static isc_boolean_t list_addresses = ISC_TRUE;
 static dns_rdatatype_t list_type = dns_rdatatype_a;
+static isc_boolean_t printed_server = ISC_FALSE;
 
 static const char *opcodetext[] = {
 	"QUERY",
@@ -329,60 +330,6 @@
 }
 
 static isc_result_t
-get_cname( dig_query_t *query, dns_message_t *msg, char *cnamestr, int cnamestrlen )
-{
-    /*  check for a cname result in msg answer section; if present, copy it into cnamestr 
-     *  Jason Vas Dias<jvdias at redhat.com>, Red Hat, Inc. fix for bugzilla 187286 (RT #15702)
-     */
-	isc_result_t result;
-	dns_name_t   *aname;
-	dns_rdataset_t *rdataset;
-	dns_rdata_t  rdata = DNS_RDATA_INIT;
-
-	*cnamestr = '\0';
-			
-	result = dns_message_firstname(msg, DNS_SECTION_ANSWER);
-	if (result != ISC_R_SUCCESS)
-	    return ISC_R_FAILURE;
-
-	do
-	{
-		aname = NULL;
-		dns_message_currentname(msg, DNS_SECTION_ANSWER, &aname);
-		if (   aname 
-		    &&(dns_name_equal(query->lookup->name, aname) == ISC_TRUE)
-		   )
-		{
-			for (rdataset = ISC_LIST_HEAD(aname->list);
-			     rdataset != NULL;
-			     rdataset = ISC_LIST_NEXT(rdataset, link)) 
-			{
-				isc_result_t loopresult = dns_rdataset_first(rdataset);
-				while (loopresult == ISC_R_SUCCESS) 
-				{
-					dns_rdataset_current(rdataset, &rdata);
-					if ( rdata.type == dns_rdatatype_cname )
-					{
-						dns_rdata_cname_t cname;
-						if ( dns_rdata_tostruct( &rdata, &cname, NULL ) 
-						     == ISC_R_SUCCESS
-						   )
-						{
-							dns_name_format(&(cname.cname), cnamestr, cnamestrlen );
-							return ( ISC_R_SUCCESS );
-						}
-					}
-					dns_rdata_reset(&rdata);
-					loopresult = dns_rdataset_next(rdataset);
-				}
-			}
-		}
-	} while ( dns_message_nextname(msg, DNS_SECTION_ANSWER) == ISC_R_SUCCESS );
-
-	return ( ISC_R_FAILURE );
-}
-
-static isc_result_t
 printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner,
 	   const char *set_name, isc_boolean_t headers)
 {
@@ -407,6 +354,32 @@
 	return (ISC_R_SUCCESS);
 }
 
+static void
+chase_cnamechain(dns_message_t *msg, dns_name_t *qname) {
+	isc_result_t result;
+	dns_rdataset_t *rdataset;
+	dns_rdata_cname_t cname;
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	unsigned int i = msg->counts[DNS_SECTION_ANSWER];
+
+ 	while (i-- > 0) {
+		rdataset = NULL;
+		result = dns_message_findname(msg, DNS_SECTION_ANSWER, qname,
+					      dns_rdatatype_cname, 0, NULL,
+					      &rdataset);
+		if (result != ISC_R_SUCCESS)
+			return;
+		result = dns_rdataset_first(rdataset);
+		check_result(result, "dns_rdataset_first");
+		dns_rdata_reset(&rdata);
+		dns_rdataset_current(rdataset, &rdata);
+		result = dns_rdata_tostruct(&rdata, &cname, NULL);
+		check_result(result, "dns_rdata_tostruct");
+		dns_name_copy(&cname.cname, qname, NULL);
+		dns_rdata_freestruct(&cname);
+	}
+}
+
 isc_result_t
 printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	isc_boolean_t did_flag = ISC_FALSE;
@@ -423,7 +396,7 @@
 	 */
 	force_error = (seen_error == 1) ? 1 : 0;
 	seen_error = 1;
-	if (listed_server) {
+	if (listed_server && !printed_server) {
 		char sockstr[ISC_SOCKADDR_FORMATSIZE];
 
 		printf("Using domain server:\n");
@@ -432,6 +405,7 @@
 				    sizeof(sockstr));
 		printf("Address: %s\n", sockstr);
 		printf("Aliases: \n\n");
+		printed_server = ISC_TRUE;
 	}
 
 	if (msg->rcode != 0) {
@@ -445,19 +419,15 @@
 	if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) {
 		char namestr[DNS_NAME_FORMATSIZE];
 		dig_lookup_t *lookup;
+		dns_fixedname_t fixed;
+		dns_name_t *name;
 
 		/* Add AAAA and MX lookups. */
-
-		if ( ! ISC_LIST_EMPTY( msg->sections[DNS_SECTION_ANSWER] ) )
-		{ 
-			/* check for CNAME answer ; if present, then use canonical name for
-			 * AAAA and MX lookups.
-			 */		
-			if ( get_cname( query, msg, namestr, sizeof(namestr) ) != ISC_R_SUCCESS )
-				dns_name_format(query->lookup->name, namestr, sizeof(namestr));			
-		} else	/* use same name for AAAA and MX lookups */			
-			dns_name_format(query->lookup->name, namestr, sizeof(namestr));
-
+		dns_fixedname_init(&fixed);
+		name = dns_fixedname_name(&fixed);
+		dns_name_copy(query->lookup->name, name, NULL);
+		chase_cnamechain(msg, name);
+		dns_name_format(name, namestr, sizeof(namestr));
 		lookup = clone_lookup(query->lookup, ISC_FALSE);
 		if (lookup != NULL) {
 			strncpy(lookup->textname, namestr,

bind-9.3.2-9_3_3_dns.patch:
 lib/dns/Makefile.in |    9 +++++----
 lib/dns/adb.c       |    7 +++----
 lib/dns/cache.c     |   39 ++++++++++++++++++++++++++-------------
 lib/dns/dispatch.c  |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 lib/dns/dnssec.c    |    7 +++----
 lib/dns/dst_api.c   |    8 +++++---
 lib/dns/keytable.c  |   13 ++++++++++---
 lib/dns/lookup.c    |   14 +++++---------
 lib/dns/request.c   |    6 ++++--
 lib/dns/xfrin.c     |   19 ++++++++++++++++---
 make/rules.in       |   10 ++++++++--
 11 files changed, 131 insertions(+), 49 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_dns.patch ---
--- bind-9.3.2/make/rules.in.9_3_3_dns	2006-06-13 23:34:04.000000000 -0400
+++ bind-9.3.2/make/rules.in	2006-06-13 23:34:05.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.40.2.5.4.8 2005/10/28 01:53:44 marka Exp $
+# $Id: rules.in,v 1.40.2.5.4.10 2006/01/06 00:01:42 marka Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -101,6 +101,12 @@
 STD_CDEFINES =	@STD_CDEFINES@
 STD_CWARNINGS =	@STD_CWARNINGS@
 
+BUILD_CC = @BUILD_CC@
+BUILD_CFLAGS = @BUILD_CFLAGS@
+BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
+BUILD_LDFAGS = @BUILD_LDFAGS@
+BUILD_LIBS = @BUILD_LIBS@
+
 .SUFFIXES:
 .SUFFIXES: .c . at O@
 
--- bind-9.3.2/lib/dns/dispatch.c.9_3_3_dns	2004-09-01 00:27:41.000000000 -0400
+++ bind-9.3.2/lib/dns/dispatch.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.101.2.6.2.10 2004/09/01 04:27:41 marka Exp $ */
+/* $Id: dispatch.c,v 1.101.2.6.2.12 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -641,6 +641,50 @@
 		free_buffer(disp, ev->region.base, ev->region.length);
 		goto unlock;
 	} 
+
+	/*
+	 * Now that we have the original dispatch the query was sent
+	 * from check that the address and port the response was
+	 * sent to make sense.
+	 */
+	if (disp != resp->disp) {
+		isc_sockaddr_t a1;
+		isc_sockaddr_t a2;
+		
+		/*
+		 * Check that the socket types and ports match.
+		 */
+		if (disp->socktype != resp->disp->socktype ||
+		    isc_sockaddr_getport(&disp->local) !=
+		    isc_sockaddr_getport(&resp->disp->local)) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+
+		/*
+		 * If both dispatches are bound to an address then fail as
+		 * the addresses can't be equal (enforced by the IP stack).  
+		 *
+		 * Note under Linux a packet can be sent out via IPv4 socket
+		 * and the response be received via a IPv6 socket.
+		 * 
+		 * Requests sent out via IPv6 should always come back in
+		 * via IPv6.
+		 */
+		if (isc_sockaddr_pf(&resp->disp->local) == PF_INET6 &&
+		    isc_sockaddr_pf(&disp->local) != PF_INET6) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+		isc_sockaddr_anyofpf(&a1, isc_sockaddr_pf(&resp->disp->local));
+		isc_sockaddr_anyofpf(&a2, isc_sockaddr_pf(&disp->local));
+		if (!isc_sockaddr_eqaddr(&a1, &resp->disp->local) &&
+		    !isc_sockaddr_eqaddr(&a2, &disp->local)) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+	}
+
 	queue_response = resp->item_out;
 	rev = allocate_event(resp->disp);
 	if (rev == NULL) {
--- bind-9.3.2/lib/dns/dnssec.c.9_3_3_dns	2004-06-10 20:30:54.000000000 -0400
+++ bind-9.3.2/lib/dns/dnssec.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.69.2.5.2.7 2004/06/11 00:30:54 marka Exp $
+ * $Id: dnssec.c,v 1.69.2.5.2.9 2006/01/04 23:50:20 marka Exp $
  */
 
 
@@ -330,8 +330,7 @@
 cleanup_context:
 	dst_context_destroy(&ctx);
 cleanup_databuf:
-	if (databuf != NULL)
-		isc_buffer_free(&databuf);
+	isc_buffer_free(&databuf);
 cleanup_signature:
 	isc_mem_put(mctx, sig.signature, sig.siglen);
 
--- bind-9.3.2/lib/dns/keytable.c.9_3_3_dns	2004-03-08 04:04:30.000000000 -0500
+++ bind-9.3.2/lib/dns/keytable.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.c,v 1.26.12.3 2004/03/08 09:04:30 marka Exp $ */
+/* $Id: keytable.c,v 1.26.12.5 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -244,6 +244,13 @@
 
 	RWLOCK(&keytable->rwlock, isc_rwlocktype_read);
 
+	/*
+	 * Note we don't want the DNS_R_PARTIALMATCH from dns_rbt_findname()
+	 * as that indicates that 'name' was not found.
+	 *
+	 * DNS_R_PARTIALMATCH indicates that the name was found but we
+	 * didn't get a match on algorithm and key id arguments.
+	 */
 	knode = NULL;
 	data = NULL;
 	result = dns_rbt_findname(keytable->table, name, 0, NULL, &data);
@@ -261,7 +268,7 @@
 			UNLOCK(&keytable->lock);
 			*keynodep = knode;
 		} else
-			result = ISC_R_NOTFOUND;
+			result = DNS_R_PARTIALMATCH;
 	} else if (result == DNS_R_PARTIALMATCH)
 		result = ISC_R_NOTFOUND;
 
--- bind-9.3.2/lib/dns/xfrin.c.9_3_3_dns	2005-11-03 18:08:41.000000000 -0500
+++ bind-9.3.2/lib/dns/xfrin.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.4.2.12 2005/11/03 23:08:41 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.15 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -797,7 +797,18 @@
 	return (ISC_R_SUCCESS);
 
  failure:
-	xfrin_fail(xfr, result, "failed creating transfer context");
+	if (xfr->timer != NULL)
+		isc_timer_detach(&xfr->timer);
+	if (dns_name_dynamic(&xfr->name))
+		dns_name_free(&xfr->name, xfr->mctx);
+	if (xfr->tsigkey != NULL)
+		dns_tsigkey_detach(&xfr->tsigkey);
+	if (xfr->db != NULL)
+		dns_db_detach(&xfr->db);
+	isc_task_detach(&xfr->task);
+	dns_zone_idetach(&xfr->zone);
+	isc_mem_put(mctx, xfr, sizeof(*xfr));
+
 	return (result);
 }
 
@@ -808,7 +819,9 @@
 				isc_sockaddr_pf(&xfr->sourceaddr),
 				isc_sockettype_tcp,
 				&xfr->socket));
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 	CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr));
+#endif
 	CHECK(isc_socket_connect(xfr->socket, &xfr->masteraddr, xfr->task,
 				 xfrin_connect_done, xfr));
 	xfr->connects++;
--- bind-9.3.2/lib/dns/request.c.9_3_3_dns	2004-03-08 04:04:31.000000000 -0500
+++ bind-9.3.2/lib/dns/request.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.64.2.1.10.6 2004/03/08 09:04:31 marka Exp $ */
+/* $Id: request.c,v 1.64.2.1.10.8 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -512,6 +512,7 @@
 				   isc_sockettype_tcp, &socket);
 	if (result != ISC_R_SUCCESS)
 		return (result);
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 	if (srcaddr == NULL) {
 		isc_sockaddr_anyofpf(&bind_any,
 				     isc_sockaddr_pf(destaddr));
@@ -523,6 +524,7 @@
 	}
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
+#endif
 	attrs = 0;
 	attrs |= DNS_DISPATCHATTR_TCP;
 	attrs |= DNS_DISPATCHATTR_PRIVATE;
--- bind-9.3.2/lib/dns/adb.c.9_3_3_dns	2005-10-14 01:19:00.000000000 -0400
+++ bind-9.3.2/lib/dns/adb.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.181.2.11.2.24 2005/10/14 05:19:00 marka Exp $ */
+/* $Id: adb.c,v 1.181.2.11.2.26 2006/01/04 23:50:20 marka Exp $ */
 
 /*
  * Implementation notes
@@ -2587,8 +2587,7 @@
 		}
 	}
 
-	if (bucket != DNS_ADB_INVALIDBUCKET)
-		UNLOCK(&adb->namelocks[bucket]);
+	UNLOCK(&adb->namelocks[bucket]);
 
 	return (result);
 }
--- bind-9.3.2/lib/dns/dst_api.c.9_3_3_dns	2004-12-08 23:07:16.000000000 -0500
+++ bind-9.3.2/lib/dns/dst_api.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.1.4.1 2004/12/09 04:07:16 marka Exp $
+ * $Id: dst_api.c,v 1.1.4.3 2006/01/04 23:50:20 marka Exp $
  */
 
 #include <config.h>
@@ -1027,8 +1027,10 @@
 	}
 
 	ret = dns_name_print(key->key_name, fp);
-	if (ret != ISC_R_SUCCESS)
+	if (ret != ISC_R_SUCCESS) {
+		fclose(fp);
 		return (ret);
+	}
 
 	fprintf(fp, " ");
 
--- bind-9.3.2/lib/dns/Makefile.in.9_3_3_dns	2006-06-13 23:34:04.000000000 -0400
+++ bind-9.3.2/lib/dns/Makefile.in	2006-06-13 23:40:09.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.126.2.3.2.17 2004/12/09 04:07:15 marka Exp $
+# $Id: Makefile.in,v 1.126.2.3.2.19 2006/01/06 00:01:42 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -123,7 +123,7 @@
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns. at A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns. at A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libdns. at A@ timestamp
@@ -156,7 +156,8 @@
 	./gen -s ${srcdir} > code.h
 
 gen: gen.c
-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
+	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir} -I${top_srcdir}/lib/isc/include \
+	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
 
 rbtdb64. at O@: rbtdb.c
 
--- bind-9.3.2/lib/dns/cache.c.9_3_3_dns	2005-03-16 22:58:30.000000000 -0500
+++ bind-9.3.2/lib/dns/cache.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.c,v 1.45.2.4.8.9 2005/03/17 03:58:30 marka Exp $ */
+/* $Id: cache.c,v 1.45.2.4.8.14 2006/05/04 02:21:46 marka Exp $ */
 
 #include <config.h>
 
@@ -68,7 +68,6 @@
  * Convenience macros for comprehensive assertion checking.
  */
 #define CLEANER_IDLE(c) ((c)->state == cleaner_s_idle && \
-			 (c)->iterator == NULL && \
 			 (c)->resched_event != NULL)
 #define CLEANER_BUSY(c) ((c)->state == cleaner_s_busy && \
 			 (c)->iterator != NULL && \
@@ -507,6 +506,11 @@
 	cleaner->resched_event = NULL;
 	cleaner->overmem_event = NULL;
 
+	result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
+				       &cleaner->iterator);
+	if (result != ISC_R_SUCCESS)
+		goto cleanup;
+
 	if (taskmgr != NULL && timermgr != NULL) {
 		result = isc_task_create(taskmgr, 1, &cleaner->task);
 		if (result != ISC_R_SUCCESS) {
@@ -575,6 +579,8 @@
 		isc_timer_detach(&cleaner->cleaning_timer);
 	if (cleaner->task != NULL)
 		isc_task_detach(&cleaner->task);
+	if (cleaner->iterator != NULL)
+		dns_dbiterator_destroy(&cleaner->iterator);
 	DESTROYLOCK(&cleaner->lock);
  fail:
 	return (result);
@@ -582,15 +588,17 @@
 
 static void
 begin_cleaning(cache_cleaner_t *cleaner) {
-	isc_result_t result;
+	isc_result_t result = ISC_R_SUCCESS;
 
 	REQUIRE(CLEANER_IDLE(cleaner));
 
 	/*
-	 * Create an iterator and position it at the beginning of the cache.
+	 * Create an iterator, if it does not already exist, and
+         * position it at the beginning of the cache.
 	 */
-	result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
-				       &cleaner->iterator);
+	if (cleaner->iterator == NULL)
+		result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
+					       &cleaner->iterator);
 	if (result != ISC_R_SUCCESS)
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
 			      DNS_LOGMODULE_CACHE, ISC_LOG_WARNING,
@@ -600,20 +608,21 @@
 		dns_dbiterator_setcleanmode(cleaner->iterator, ISC_TRUE);
 		result = dns_dbiterator_first(cleaner->iterator);
 	}
-
 	if (result != ISC_R_SUCCESS) {
 		/*
 		 * If the result is ISC_R_NOMORE, the database is empty,
 		 * so there is nothing to be cleaned.
 		 */
-		if (result != ISC_R_NOMORE)
+		if (result != ISC_R_NOMORE && cleaner->iterator != NULL) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "cache cleaner: "
 					 "dns_dbiterator_first() failed: %s",
 					 dns_result_totext(result));
-
-		if (cleaner->iterator != NULL)
 			dns_dbiterator_destroy(&cleaner->iterator);
+		} else if (cleaner->iterator != NULL) {
+			result = dns_dbiterator_pause(cleaner->iterator);
+			RUNTIME_CHECK(result == ISC_R_SUCCESS);
+		}
 	} else {
 		/*
 		 * Pause the iterator to free its lock.
@@ -634,10 +643,14 @@
 
 static void
 end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) {
+	isc_result_t result;
+
 	REQUIRE(CLEANER_BUSY(cleaner));
 	REQUIRE(event != NULL);
 
-	dns_dbiterator_destroy(&cleaner->iterator);
+	result = dns_dbiterator_pause(cleaner->iterator);
+	if (result != ISC_R_SUCCESS)
+		dns_dbiterator_destroy(&cleaner->iterator);
 
 	dns_cache_setcleaninginterval(cleaner->cache,
 				      cleaner->cleaning_interval);
@@ -774,7 +787,7 @@
 			 * Either the end was reached (ISC_R_NOMORE) or
 			 * some error was signaled.  If the cache is still
 			 * overmem and no error was encountered,
-			 * keep trying to clean it, otherwise stop cleanng.
+			 * keep trying to clean it, otherwise stop cleaning.
 			 */
 			if (result != ISC_R_NOMORE)
 				UNEXPECTED_ERROR(__FILE__, __LINE__,
--- bind-9.3.2/lib/dns/lookup.c.9_3_3_dns	2004-04-14 22:10:40.000000000 -0400
+++ bind-9.3.2/lib/dns/lookup.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.c,v 1.9.12.5 2004/04/15 02:10:40 marka Exp $ */
+/* $Id: lookup.c,v 1.9.12.7 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -154,11 +154,6 @@
 			dns_rdataset_disassociate(rdataset);
 		isc_mem_put(lookup->mctx, rdataset, sizeof(dns_rdataset_t));
 	}
-	if (sigrdataset != NULL) {
-		if (dns_rdataset_isassociated(sigrdataset))
-			dns_rdataset_disassociate(sigrdataset);
-		isc_mem_put(lookup->mctx, sigrdataset, sizeof(dns_rdataset_t));
-	}
 	return (result);
 }
 
@@ -229,13 +224,14 @@
 					send_event = ISC_TRUE;
 				goto done;
 			}
-		} else {
+		} else if (event != NULL) {
 			result = event->result;
 			fname = dns_fixedname_name(&event->foundname);
 			dns_resolver_destroyfetch(&lookup->fetch);
 			INSIST(event->rdataset == &lookup->rdataset);
 			INSIST(event->sigrdataset == &lookup->sigrdataset);
-		}
+		} else
+			fname = NULL;	/* Silence compiler warning. */
 
 		/*
 		 * If we've been canceled, forget about the result.

bind-9.3.2-9_3_3_dnssec.patch:
 dnssec-signzone.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_dnssec.patch ---
--- bind-9.3.2/bin/dnssec/dnssec-signzone.c.9_3_3_dnssec	2005-10-13 21:38:41.000000000 -0400
+++ bind-9.3.2/bin/dnssec/dnssec-signzone.c	2006-06-13 23:08:25.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.139.2.2.4.21 2005/10/14 01:38:41 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.139.2.2.4.23 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -1292,10 +1292,6 @@
 				result = dns_dbiterator_next(dbiter);
 				continue;
 			}
-			if (result != ISC_R_SUCCESS) {
-				dns_db_detachnode(gdb, &nextnode);
-				break;
-			}
 			if (!dns_name_issubdomain(nextname, gorigin) ||
 			    (zonecut != NULL &&
 			     dns_name_issubdomain(nextname, zonecut)))

bind-9.3.2-9_3_3_isc.patch:
 hash.c              |   13 ++--
 hmacmd5.c           |    5 -
 include/isc/heap.h  |  143 +++++++++++++++++++++++++++++++++++++++++++++++-----
 lex.c               |   20 ++++---
 taskpool.c          |    8 ++
 timer.c             |   13 ++--
 unix/entropy.c      |   14 ++---
 unix/ifiter_ioctl.c |   10 ++-
 unix/socket.c       |   32 +++++++++--
 9 files changed, 206 insertions(+), 52 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_isc.patch ---
--- bind-9.3.2/lib/isc/lex.c.9_3_3_isc	2004-08-28 02:25:21.000000000 -0400
+++ bind-9.3.2/lib/isc/lex.c	2006-06-13 20:47:01.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.66.2.6.2.8 2004/08/28 06:25:21 marka Exp $ */
+/* $Id: lex.c,v 1.66.2.6.2.10 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -372,9 +372,6 @@
 	source = HEAD(lex->sources);
 	REQUIRE(tokenp != NULL);
 
-	lex->saved_paren_count = lex->paren_count;
-	source->saved_line = source->line;
-
 	if (source == NULL) {
 		if ((options & ISC_LEXOPT_NOMORE) != 0) {
 			tokenp->type = isc_tokentype_nomore;
@@ -386,6 +383,9 @@
 	if (source->result != ISC_R_SUCCESS)
 		return (source->result);
 
+	lex->saved_paren_count = lex->paren_count;
+	source->saved_line = source->line;
+
 	if (isc_buffer_remaininglength(source->pushback) == 0 &&
 	    source->at_eof)
 	{
@@ -633,9 +633,13 @@
 			remaining--;
 			break;
 		case lexstate_string:
-			if ((!escaped &&
-			     (c == ' ' || c == '\t' || lex->specials[c])) ||
-			    c == '\r' || c == '\n' || c == EOF) {
+			/*
+			 * EOF needs to be checked before lex->specials[c]
+			 * as lex->specials[EOF] is not a good idea.
+			 */
+			if (c == '\r' || c == '\n' || c == EOF ||
+			    (!escaped &&
+			     (c == ' ' || c == '\t' || lex->specials[c]))) {
 				pushback(source, c);
 				if (source->result != ISC_R_SUCCESS) {
 					result = source->result;
--- bind-9.3.2/lib/isc/timer.c.9_3_3_isc	2005-10-26 20:27:29.000000000 -0400
+++ bind-9.3.2/lib/isc/timer.c	2006-06-13 20:57:17.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.64.12.11 2005/10/27 00:27:29 marka Exp $ */
+/* $Id: timer.c,v 1.64.12.13 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -212,9 +212,10 @@
 		isc_time_t then;
 
 		isc_interval_set(&fifteen, 15, 0);
-		isc_time_add(&manager->due, &fifteen, &then);
+		result = isc_time_add(&manager->due, &fifteen, &then);
 
-		if (isc_time_compare(&then, now) < 0) {
+		if (result == ISC_R_SUCCESS &&
+		    isc_time_compare(&then, now) < 0) {
 			SIGNAL(&manager->wakeup);
 			signal_ok = ISC_FALSE;
 			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
@@ -347,8 +348,10 @@
 
 	if (type == isc_timertype_once && !isc_interval_iszero(interval)) {
 		result = isc_time_add(&now, interval, &timer->idle);
-		if (result != ISC_R_SUCCESS)
+		if (result != ISC_R_SUCCESS) {
+			isc_mem_put(manager->mctx, timer, sizeof(*timer));
 			return (result);
+		}
 	} else
 		isc_time_settoepoch(&timer->idle);
 
--- bind-9.3.2/lib/isc/taskpool.c.9_3_3_isc	2004-03-08 04:04:50.000000000 -0500
+++ bind-9.3.2/lib/isc/taskpool.c	2006-06-13 20:55:21.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.c,v 1.10.12.3 2004/03/08 09:04:50 marka Exp $ */
+/* $Id: taskpool.c,v 1.10.12.5 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -52,6 +52,10 @@
 	pool->mctx = mctx;
 	pool->ntasks = ntasks;
 	pool->tasks = isc_mem_get(mctx, ntasks * sizeof(isc_task_t *));
+	if (pool->tasks == NULL) {
+		isc_mem_put(mctx, pool, sizeof(*pool));
+		return (ISC_R_NOMEMORY);
+	}
 	for (i = 0; i < ntasks; i++)
 		pool->tasks[i] = NULL;
 	for (i = 0; i < ntasks; i++) {
--- bind-9.3.2/lib/isc/hash.c.9_3_3_isc	2004-03-06 03:14:29.000000000 -0500
+++ bind-9.3.2/lib/isc/hash.c	2006-06-13 20:43:53.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.c,v 1.2.2.4.2.1 2004/03/06 08:14:29 marka Exp $ */
+/* $Id: hash.c,v 1.2.2.4.2.3 2006/01/04 00:37:22 marka Exp $ */
 
 /*
  * Some portion of this code was derived from universal hash function
@@ -68,7 +68,6 @@
 #include <isc/once.h>
 #include <isc/random.h>
 #include <isc/refcount.h>
-#include <isc/rwlock.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
@@ -99,7 +98,7 @@
 	hash_random_t	*rndvector; /* random vector for universal hashing */
 };
 
-static isc_rwlock_t createlock;
+static isc_mutex_t createlock;
 static isc_once_t once = ISC_ONCE_INIT;
 static isc_hash_t *hash = NULL;
 
@@ -209,7 +208,7 @@
 
 static void
 initialize_lock(void) {
-	RUNTIME_CHECK(isc_rwlock_init(&createlock, 0, 0) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mutex_init(&createlock) == ISC_R_SUCCESS);
 }
 
 isc_result_t
@@ -221,12 +220,12 @@
 
 	RUNTIME_CHECK(isc_once_do(&once, initialize_lock) == ISC_R_SUCCESS);
 
-	RWLOCK(&createlock, isc_rwlocktype_write);
+	LOCK(&createlock);
 
 	if (hash == NULL)
 		result = isc_hash_ctxcreate(mctx, entropy, limit, &hash);
 
-	RWUNLOCK(&createlock, isc_rwlocktype_write);
+	UNLOCK(&createlock);
 
 	return (result);
 }
--- bind-9.3.2/lib/isc/unix/ifiter_ioctl.c.9_3_3_isc	2005-10-13 22:13:07.000000000 -0400
+++ bind-9.3.2/lib/isc/unix/ifiter_ioctl.c	2006-06-13 21:13:06.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.17 2005/10/14 02:13:07 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.19 2006/02/03 23:51:37 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -529,7 +529,8 @@
 #endif
 
 	REQUIRE(VALID_IFITER(iter));
-	REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len);
+	REQUIRE(iter->ifc.ifc_len == 0 ||
+		iter->pos < (unsigned int) iter->ifc.ifc_len);
 
 #ifdef __linux
 	result = linux_if_inet6_current(iter);
@@ -538,6 +539,9 @@
 	iter->first = ISC_TRUE;
 #endif
 
+	if (iter->ifc.ifc_len == 0)
+		return (ISC_R_NOMORE);
+
 	ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
 
 	memset(&ifreq, 0, sizeof(ifreq));
--- bind-9.3.2/lib/isc/unix/socket.c.9_3_3_isc	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/isc/unix/socket.c	2006-06-13 21:17:43.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.22 2005/11/03 23:08:42 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.26 2006/05/19 02:53:36 marka Exp $ */
 
 #include <config.h>
 
@@ -109,7 +109,7 @@
  * to collect the destination address and interface so the client can
  * set them on outgoing packets.
  */
-#ifdef ISC_PLATFORM_HAVEIPV6
+#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
 #ifndef USE_CMSG
 #define USE_CMSG	1
 #endif
@@ -752,8 +752,26 @@
 
 	if (sock->type == isc_sockettype_udp) {
 		memset(&dev->address, 0, sizeof(dev->address));
+#ifdef BROKEN_RECVMSG
+		if (sock->pf == AF_INET) {
+			msg->msg_name = (void *)&dev->address.type.sin;
+			msg->msg_namelen = sizeof(dev->address.type.sin6);
+		} else if (sock->pf == AF_INET6) {
+			msg->msg_name = (void *)&dev->address.type.sin6;
+			msg->msg_namelen = sizeof(dev->address.type.sin6);
+#ifdef ISC_PLATFORM_HAVESYSUNH
+		} else if (sock->pf == AF_UNIX) {
+			msg->msg_name = (void *)&dev->address.type.sunix;
+			msg->msg_namelen = sizeof(dev->address.type.sunix);
+#endif
+		} else {
+			msg->msg_name = (void *)&dev->address.type.sa;
+			msg->msg_namelen = sizeof(dev->address.type);
+		}
+#else
 		msg->msg_name = (void *)&dev->address.type.sa;
 		msg->msg_namelen = sizeof(dev->address.type);
+#endif
 #ifdef ISC_NET_RECVOVERFLOW
 		/* If needed, steal one iovec for overflow detection. */
 		maxiov--;
@@ -926,6 +944,10 @@
 	cc = recvmsg(sock->fd, &msghdr, 0);
 	recv_errno = errno;
 
+#if defined(ISC_SOCKET_DEBUG)
+	dump_msg(&msghdr);
+#endif
+
 	if (cc < 0) {
 		if (SOFT_ERROR(recv_errno))
 			return (DOIO_SOFT);
@@ -2737,8 +2759,8 @@
 		dev->attributes |= ISC_SOCKEVENTATTR_PKTINFO;
 		dev->pktinfo = *pktinfo;
 
-		if (!isc_sockaddr_issitelocal(address) &&
-		    !isc_sockaddr_islinklocal(address)) {
+		if (!isc_sockaddr_issitelocal(&dev->address) &&
+		    !isc_sockaddr_islinklocal(&dev->address)) {
 			socket_log(sock, NULL, TRACE, isc_msgcat,
 				   ISC_MSGSET_SOCKET, ISC_MSG_PKTINFOPROVIDED,
 				   "pktinfo structure provided, ifindex %u "
--- bind-9.3.2/lib/isc/unix/entropy.c.9_3_3_isc	2005-07-12 01:47:43.000000000 -0400
+++ bind-9.3.2/lib/isc/unix/entropy.c	2006-06-13 21:11:13.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.60.2.3.8.11 2005/07/12 05:47:43 marka Exp $ */
+/* $Id: entropy.c,v 1.60.2.3.8.14 2006/03/02 23:29:17 marka Exp $ */
 
 /*
  * This is the system depenedent part of the ISC entropy API.
@@ -127,7 +127,7 @@
 		switch ( source->sources.usocket.status ) {
 		case isc_usocketsource_ndesired:
 			buf[0] = ndesired;
-			if ((n = send(fd, buf, 1, 0)) < 0) {
+			if ((n = sendto(fd, buf, 1, 0, NULL, 0)) < 0) {
 				if (errno == EWOULDBLOCK || errno == EINTR ||
 				    errno == ECONNRESET)
 					goto out;
@@ -142,7 +142,7 @@
 		case isc_usocketsource_connected:
 			buf[0] = 1;
 			buf[1] = ndesired;
-			if ((n = send(fd, buf, 2, 0)) < 0) {
+			if ((n = sendto(fd, buf, 2, 0, NULL, 0)) < 0) {
 				if (errno == EWOULDBLOCK || errno == EINTR ||
 				    errno == ECONNRESET)
 					goto out;
@@ -159,12 +159,12 @@
 			/*FALLTHROUGH*/
 		
 		case isc_usocketsource_wrote:
-			if (recv(fd, buf, 1, 0) != 1) {
+			if (recvfrom(fd, buf, 1, 0, NULL, NULL) != 1) {
 				if (errno == EAGAIN) {
 					/*
 					 * The problem of EAGAIN (try again
 					 * later) is a major issue on HP-UX.
-					 * Solaris actually tries the recv
+					 * Solaris actually tries the recvfrom
 					 * call again, while HP-UX just dies. 
 					 * This code is an attempt to let the
 					 * entropy pool fill back up (at least
@@ -503,7 +503,7 @@
 	if (S_ISSOCK(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
-#if defined(S_ISFIFO)
+#if defined(S_ISFIFO) && defined(sun)
 	if (S_ISFIFO(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
--- bind-9.3.2/lib/isc/hmacmd5.c.9_3_3_isc	2004-03-08 04:04:48.000000000 -0500
+++ bind-9.3.2/lib/isc/hmacmd5.c	2006-06-13 20:59:23.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.c,v 1.5.12.3 2004/03/08 09:04:48 marka Exp $ */
+/* $Id: hmacmd5.c,v 1.5.12.5 2006/02/26 23:49:48 marka Exp $ */
 
 /*
  * This code implements the HMAC-MD5 keyed hash algorithm
@@ -65,7 +65,6 @@
 isc_hmacmd5_invalidate(isc_hmacmd5_t *ctx) {
 	isc_md5_invalidate(&ctx->md5ctx);
 	memset(ctx->key, 0, sizeof(ctx->key));
-	memset(ctx, 0, sizeof(ctx));
 }
 
 /*
--- bind-9.3.2/lib/isc/include/isc/heap.h.9_3_3_isc	2004-03-06 03:14:41.000000000 -0500
+++ bind-9.3.2/lib/isc/include/isc/heap.h	2006-06-13 21:02:28.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,36 +15,155 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.h,v 1.16.206.1 2004/03/06 08:14:41 marka Exp $ */
+/* $Id: heap.h,v 1.16.206.2 2006/04/17 18:27:20 explorer Exp $ */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1
 
+/*! \file */
+
 #include <isc/lang.h>
 #include <isc/types.h>
 
 ISC_LANG_BEGINDECLS
 
-/*
+/*%
  * The comparision function returns ISC_TRUE if the first argument has
  * higher priority than the second argument, and ISC_FALSE otherwise.
  */
 typedef isc_boolean_t (*isc_heapcompare_t)(void *, void *);
 
+/*%
+ * The index function allows the client of the heap to receive a callback
+ * when an item's index number changes.  This allows it to maintain
+ * sync with its external state, but still delete itself, since deletions
+ * from the heap require the index be provided.
+ */
 typedef void (*isc_heapindex_t)(void *, unsigned int);
+
+/*%
+ * The heapaction function is used when iterating over the heap.
+ *
+ * NOTE:  The heap structure CANNOT BE MODIFIED during the call to
+ * isc_heap_foreach().
+ */
 typedef void (*isc_heapaction_t)(void *, void *);
 
 typedef struct isc_heap isc_heap_t;
 
-isc_result_t	isc_heap_create(isc_mem_t *, isc_heapcompare_t,
-				isc_heapindex_t, unsigned int, isc_heap_t **);
-void		isc_heap_destroy(isc_heap_t **);
-isc_result_t	isc_heap_insert(isc_heap_t *, void *);
-void		isc_heap_delete(isc_heap_t *, unsigned int);
-void		isc_heap_increased(isc_heap_t *, unsigned int);
-void		isc_heap_decreased(isc_heap_t *, unsigned int);
-void *		isc_heap_element(isc_heap_t *, unsigned int);
-void		isc_heap_foreach(isc_heap_t *, isc_heapaction_t, void *);
+isc_result_t
+isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
+		isc_heapindex_t index, unsigned int size_increment,
+		isc_heap_t **heapp);
+/*!<
+ * \brief Create a new heap.  The heap is implemented using a space-efficient
+ * storage method.  When the heap elements are deleted space is not freed
+ * but will be reused when new elements are inserted.
+ *
+ * Requires:
+ *\li	"mctx" is valid.
+ *\li	"compare" is a function which takes two void * arguments and
+ *	returns ISC_TRUE if the first argument has a higher priority than
+ *	the second, and ISC_FALSE otherwise.
+ *\li	"index" is a function which takes a void *, and an unsigned int
+ *	argument.  This function will be called whenever an element's
+ *	index value changes, so it may continue to delete itself from the
+ *	heap.  This option may be NULL if this functionality is unneeded.
+ *\li	"size_increment" is a hint about how large the heap should grow
+ *	when resizing is needed.  If this is 0, a default size will be
+ *	used, which is currently 1024, allowing space for an additional 1024
+ *	heap elements to be inserted before adding more space.
+ *\li	"heapp" is not NULL, and "*heap" is NULL.
+ *
+ * Returns:
+ *\li	ISC_R_SUCCESS		- success
+ *\li	ISC_R_NOMEMORY		- insufficient memory
+ */
+
+void
+isc_heap_destroy(isc_heap_t **heapp);
+/*!<
+ * \brief Destroys a heap.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ */
+
+isc_result_t
+isc_heap_insert(isc_heap_t *heap, void *elt);
+/*!<
+ * \brief Inserts a new element into a heap.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ */
+
+void
+isc_heap_delete(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Deletes an element from a heap, by element index.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void
+isc_heap_increased(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Indicates to the heap that an element's priority has increased.
+ * This function MUST be called whenever an element has increased in priority.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void
+isc_heap_decreased(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Indicates to the heap that an element's priority has decreased.
+ * This function MUST be called whenever an element has decreased in priority.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void *
+isc_heap_element(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Returns the element for a specific element index.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ *
+ * Returns:
+ *\li	A pointer to the element for the element index.
+ */
+
+void
+isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap);
+/*!<
+ * \brief Iterate over the heap, calling an action for each element.  The
+ * order of iteration is not sorted.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"action" is not NULL, and is a function which takes two arguments.
+ *	The first is a void *, representing the element, and the second is
+ *	"uap" as provided to isc_heap_foreach.
+ *\li	"uap" is a caller-provided argument, and may be NULL.
+ *
+ * Note:
+ *\li	The heap structure CANNOT be modified during this iteration.  The only
+ *	safe function to call while iterating the heap is isc_heap_element().
+ */
 
 ISC_LANG_ENDDECLS
 

bind-9.3.2-9_3_3_isccfg.patch:
 parser.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE bind-9.3.2-9_3_3_isccfg.patch ---
--- bind-9.3.2/lib/isccfg/parser.c.9_3_3_isccfg	2004-05-14 23:46:13.000000000 -0400
+++ bind-9.3.2/lib/isccfg/parser.c	2006-06-13 21:56:19.000000000 -0400
@@ -1556,6 +1556,10 @@
 	isc_lex_getlasttokentext(pctx->lexer, &pctx->token, &r);
 
 	obj->value.string.base = isc_mem_get(pctx->mctx, r.length + 1);
+	if (obj->value.string.base == NULL) {
+		result = ISC_R_NOMEMORY;
+		goto cleanup;
+	}
 	obj->value.string.length = r.length;
 	memcpy(obj->value.string.base, r.base, r.length);
 	obj->value.string.base[r.length] = '\0';

bind-9.3.2-9_3_3_lwres.patch:
 getaddrinfo.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE bind-9.3.2-9_3_3_lwres.patch ---
--- bind-9.3.2/lib/lwres/getaddrinfo.c.9_3_3_lwres	2005-06-09 19:54:33.000000000 -0400
+++ bind-9.3.2/lib/lwres/getaddrinfo.c	2006-06-13 22:01:34.000000000 -0400
@@ -326,7 +326,10 @@
 						      NI_NUMERICHOST) == 0) {
 					ai->ai_canonname = strdup(nbuf);
 					if (ai->ai_canonname == NULL)
+					{
+					        lwres_freeaddrinfo(ai_list);
 						return (EAI_MEMORY);
+					}
 				} else {
 					/* XXX raise error? */
 					ai->ai_canonname = NULL;

bind-9.3.2-9_3_3_named.patch:
 client.c       |   71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 config.c       |   13 +++++-----
 controlconf.c  |   50 +++++++++++++++++++++++++---------------
 interfacemgr.c |   15 +++++-------
 lwdgrbn.c      |    8 +++---
 lwresd.c       |    5 ++--
 query.c        |   47 ++++++++++++++++++++++++++-----------
 server.c       |   53 ++++++++++++++++++++++++------------------
 update.c       |   34 +++++++++++++++++++++------
 zoneconf.c     |    9 ++++---
 10 files changed, 218 insertions(+), 87 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_named.patch ---
--- bind-9.3.2/bin/named/lwdgrbn.c.9_3_3_named	2004-03-07 23:04:19.000000000 -0500
+++ bind-9.3.2/bin/named/lwdgrbn.c	2006-06-13 22:23:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgrbn.c,v 1.11.208.3 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwdgrbn.c,v 1.11.208.5 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -358,7 +358,7 @@
 	client->sendlength = r.length;
 	result = ns_lwdclient_sendreply(client, &r);
 	if (result != ISC_R_SUCCESS)
-		goto out;
+		goto out2;
 
 	NS_LWDCLIENT_SETSEND(client);
 
@@ -378,7 +378,7 @@
 	if (grbn->siglen != NULL)
 		isc_mem_put(cm->mctx, grbn->siglen,
 			    grbn->nsigs * sizeof(lwres_uint16_t));
-
+ out2:
 	if (client->lookup != NULL)
 		dns_lookup_destroy(&client->lookup);
 	if (lwb.base != NULL)
--- bind-9.3.2/bin/named/controlconf.c.9_3_3_named	2004-03-08 04:04:14.000000000 -0500
+++ bind-9.3.2/bin/named/controlconf.c	2006-06-13 22:12:06.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.28.2.9.2.6 2004/03/08 09:04:14 marka Exp $ */
+/* $Id: controlconf.c,v 1.28.2.9.2.10 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -356,6 +356,9 @@
 	{
 		ccregion.rstart = isc_buffer_base(&conn->ccmsg.buffer);
 		ccregion.rend = isc_buffer_used(&conn->ccmsg.buffer);
+		if (secret.rstart != NULL)
+			isc_mem_put(listener->mctx, secret.rstart,
+				    REGION_SIZE(secret));
 		secret.rstart = isc_mem_get(listener->mctx, key->secret.length);
 		if (secret.rstart == NULL)
 			goto cleanup;
@@ -371,8 +374,6 @@
 			 */
 			if (request != NULL)
 				isccc_sexpr_free(&request);
-			isc_mem_put(listener->mctx, secret.rstart,
-				    REGION_SIZE(secret));
 		} else {
 			log_invalid(&conn->ccmsg, result);
 			goto cleanup;
@@ -977,18 +978,25 @@
 		result = get_rndckey(listener->mctx, &listener->keys);
 	}
 
-	if (result != ISC_R_SUCCESS && global_keylist != NULL)
+	if (result != ISC_R_SUCCESS && global_keylist != NULL) {
 		/*
 		 * This message might be a little misleading since the
 		 * "new keys" might in fact be identical to the old ones,
 		 * but tracking whether they are identical just for the
 		 * sake of avoiding this message would be too much trouble.
 		 */
-		cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
-			    "couldn't install new keys for "
-			    "command channel %s: %s",
-			    socktext, isc_result_totext(result));
-
+		if (control != NULL)
+			cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
+				    "couldn't install new keys for "
+				    "command channel %s: %s",
+				    socktext, isc_result_totext(result));
+		else
+			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+				      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
+				      "couldn't install new keys for "
+				      "command channel %s: %s",
+				      socktext, isc_result_totext(result));
+	}
 
 	/*
 	 * Now, keep the old access list unless a new one can be made.
@@ -1005,12 +1013,18 @@
 		dns_acl_detach(&listener->acl);
 		dns_acl_attach(new_acl, &listener->acl);
 		dns_acl_detach(&new_acl);
-	} else
 		/* XXXDCL say the old acl is still used? */
+	} else if (control != NULL)
 		cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
 			    "couldn't install new acl for "
 			    "command channel %s: %s",
 			    socktext, isc_result_totext(result));
+	else
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
+			      "couldn't install new acl for "
+			      "command channel %s: %s",
+			      socktext, isc_result_totext(result));
 
 	*listenerp = listener;
 }
@@ -1176,7 +1190,7 @@
 			     element2 = cfg_list_next(element2)) {
 				cfg_obj_t *control;
 				cfg_obj_t *obj;
-				isc_sockaddr_t *addr;
+				isc_sockaddr_t addr;
 
 				/*
 				 * The parser handles BIND 8 configuration file
@@ -1189,12 +1203,12 @@
 				control = cfg_listelt_value(element2);
 
 				obj = cfg_tuple_get(control, "address");
-				addr = cfg_obj_assockaddr(obj);
-				if (isc_sockaddr_getport(addr) == 0)
-					isc_sockaddr_setport(addr,
+				addr = *cfg_obj_assockaddr(obj);
+				if (isc_sockaddr_getport(&addr) == 0)
+					isc_sockaddr_setport(&addr,
 							     NS_CONTROL_PORT);
 
-				isc_sockaddr_format(addr, socktext,
+				isc_sockaddr_format(&addr, socktext,
 						    sizeof(socktext));
 
 				isc_log_write(ns_g_lctx,
@@ -1205,7 +1219,7 @@
 					      socktext);
 
 				update_listener(cp, &listener, control, config,
-						addr, aclconfctx, socktext);
+						&addr, aclconfctx, socktext);
 
 				if (listener != NULL)
 					/*
@@ -1219,7 +1233,7 @@
 					 * This is a new listener.
 					 */
 					add_listener(cp, &listener, control,
-						     config, addr, aclconfctx,
+						     config, &addr, aclconfctx,
 						     socktext);
 
 				if (listener != NULL)
--- bind-9.3.2/bin/named/zoneconf.c.9_3_3_named	2005-09-05 22:12:39.000000000 -0400
+++ bind-9.3.2/bin/named/zoneconf.c	2006-06-13 22:21:09.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.87.2.4.10.15 2005/09/06 02:12:39 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.4.10.19 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -106,8 +106,10 @@
 	isc_result_t result;
 
 	(void)cfg_map_get(zconfig, "update-policy", &updatepolicy);
-	if (updatepolicy == NULL)
+	if (updatepolicy == NULL) {
+		dns_zone_setssutable(zone, NULL);
 		return (ISC_R_SUCCESS);
+	}
 
 	result = dns_ssutable_create(mctx, &table);
 	if (result != ISC_R_SUCCESS)
@@ -612,6 +614,7 @@
 	switch (ztype) {
 	case dns_zone_slave:
 	case dns_zone_stub:
+		count = 0;
 		obj = NULL;
 		result = cfg_map_get(zoptions, "masters", &obj);
 		if (obj != NULL) {
--- bind-9.3.2/bin/named/lwresd.c.9_3_3_named	2004-03-07 23:04:19.000000000 -0500
+++ bind-9.3.2/bin/named/lwresd.c	2006-06-13 22:28:30.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.37.2.2.2.5 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwresd.c,v 1.37.2.2.2.8 2006/02/28 06:32:53 marka Exp $ */
 
 /*
  * Main program for the Lightweight Resolver Daemon.
@@ -407,6 +407,7 @@
 		ns_lwsearchlist_detach(&lwresd->search);
 	if (lwresd->mctx != NULL)
 		isc_mem_detach(&lwresd->mctx);
+	isc_mem_put(mctx, lwresd, sizeof(ns_lwresd_t));
 	return (result);
 }
 
--- bind-9.3.2/bin/named/query.c.9_3_3_named	2005-08-11 01:25:20.000000000 -0400
+++ bind-9.3.2/bin/named/query.c	2006-06-13 22:34:22.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.41 2006/05/18 03:15:46 marka Exp $ */
 
 #include <config.h>
 
@@ -2091,17 +2091,31 @@
 		result = isc_quota_attach(&ns_g_server->recursionquota,
 					  &client->recursionquota);
 		if  (result == ISC_R_SOFTQUOTA) {
-			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-				      NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-				      "recursive-clients soft limit exceeded, "
-				      "aborting oldest query");
+			static isc_stdtime_t last = 0;
+			isc_stdtime_t now;
+			isc_stdtime_get(&now);
+			if (now != last) {
+				last = now;
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY,
+					      ISC_LOG_WARNING,
+					      "recursive-clients soft limit "
+					      "exceeded, aborting oldest query");
+			}
 			ns_client_killoldestquery(client);
 			result = ISC_R_SUCCESS;
 		} else if (result == ISC_R_QUOTA) {
-			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-				      NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-				      "no more recursive clients: %s",
-				      isc_result_totext(result));
+			static isc_stdtime_t last = 0;
+			isc_stdtime_t now;
+			isc_stdtime_get(&now);
+			if (now != last) {
+				last = now;
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY,
+					      ISC_LOG_WARNING,
+					      "no more recursive clients: %s",
+					      isc_result_totext(result));
+			}
 			ns_client_killoldestquery(client);
 		}
 		if (result == ISC_R_SUCCESS && !client->mortal &&
@@ -2469,7 +2483,7 @@
 	/*
 	 * First we must find the right database.
 	 */
-	options = 0;
+	options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */
 	if (dns_rdatatype_atparent(qtype) &&
 	    !dns_name_equal(client->query.qname, dns_rootname))
 		options |= DNS_GETDB_NOEXACT;
@@ -2509,9 +2523,10 @@
 		}
 	}
 	if (result != ISC_R_SUCCESS) {
-		if (result == DNS_R_REFUSED)
-			QUERY_ERROR(DNS_R_REFUSED);
-		else
+		if (result == DNS_R_REFUSED) {
+			if (!PARTIALANSWER(client))
+				QUERY_ERROR(DNS_R_REFUSED);
+		} else
 			QUERY_ERROR(DNS_R_SERVFAIL);
 		goto cleanup;
 	}
@@ -2998,6 +3013,8 @@
 		query_maybeputqname(client);
 		client->query.qname = tname;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	case DNS_R_DNAME:
 		/*
@@ -3115,6 +3132,8 @@
 		client->query.qname = fname;
 		fname = NULL;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	default:
 		/*
--- bind-9.3.2/bin/named/update.c.9_3_3_named	2005-10-07 20:21:06.000000000 -0400
+++ bind-9.3.2/bin/named/update.c	2006-06-13 22:54:34.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.88.2.5.2.27 2005/10/08 00:21:06 marka Exp $ */
+/* $Id: update.c,v 1.88.2.5.2.29 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -36,6 +36,7 @@
 #include <dns/rdataclass.h>
 #include <dns/rdataset.h>
 #include <dns/rdatasetiter.h>
+#include <dns/rdatastruct.h>
 #include <dns/rdatatype.h>
 #include <dns/soa.h>
 #include <dns/ssu.h>
@@ -1517,7 +1518,8 @@
  */
 static isc_result_t
 add_nsec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
-	dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff)
+	 dns_dbversion_t *ver, dns_name_t *name, dns_ttl_t nsecttl,
+	 dns_diff_t *diff)
 {
 	isc_result_t result;
 	dns_dbnode_t *node = NULL;
@@ -1552,8 +1554,7 @@
 	 * Add the new NSEC and record the change.
 	 */
 	CHECK(dns_difftuple_create(diff->mctx, DNS_DIFFOP_ADD, name,
-				   3600,	/* XXXRTH */
-				   &rdata, &tuple));
+				   nsecttl, &rdata, &tuple));
 	CHECK(do_one_tuple(&tuple, db, ver, diff));
 	INSIST(tuple == NULL);
 
@@ -1678,6 +1679,11 @@
 	unsigned int nkeys = 0;
 	unsigned int i;
 	isc_stdtime_t now, inception, expire;
+	dns_ttl_t nsecttl;
+	dns_rdata_soa_t soa;
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	dns_rdataset_t rdataset;
+	dns_dbnode_t *node = NULL;
 
 	dns_diff_init(client->mctx, &diffnames);
 	dns_diff_init(client->mctx, &affected);
@@ -1699,6 +1705,20 @@
 	expire = now + sigvalidityinterval;
 
 	/*
+	 * Get the NSEC's TTL from the SOA MINIMUM field.
+	 */
+	CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node));
+	dns_rdataset_init(&rdataset);
+	CHECK(dns_db_findrdataset(db, node, newver, dns_rdatatype_soa, 0,
+                                  (isc_stdtime_t) 0, &rdataset, NULL));
+	CHECK(dns_rdataset_first(&rdataset));
+	dns_rdataset_current(&rdataset, &rdata);
+	CHECK(dns_rdata_tostruct(&rdata, &soa, NULL));
+	nsecttl = soa.minimum;
+	dns_rdataset_disassociate(&rdataset);
+	dns_db_detachnode(db, &node);
+
+	/*
 	 * Find all RRsets directly affected by the update, and
 	 * update their RRSIGs.  Also build a list of names affected
 	 * by the update in "diffnames".
@@ -1901,8 +1921,8 @@
 			 * there is other data, and if there is other data,
 			 * there are other RRSIGs.
 			 */
-			CHECK(add_nsec(client, zone, db, newver,
-				      &t->name, &nsec_diff));
+			CHECK(add_nsec(client, zone, db, newver, &t->name,
+				       nsecttl, &nsec_diff));
 		}
 	}
 
--- bind-9.3.2/bin/named/config.c.9_3_3_named	2004-10-04 22:52:26.000000000 -0400
+++ bind-9.3.2/bin/named/config.c	2006-06-13 22:17:33.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.11.2.4.8.29 2004/10/05 02:52:26 marka Exp $ */
+/* $Id: config.c,v 1.11.2.4.8.32 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -439,13 +439,14 @@
 		if (val > ISC_UINT16_MAX) {
 			cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR,
 				    "port '%u' out of range", val);
-			return (ISC_R_RANGE);
+			result = ISC_R_RANGE;
+			goto cleanup;
 		}
 		port = (in_port_t) val;
 	} else {
 		result = ns_config_getport(config, &port);
 		if (result != ISC_R_SUCCESS)
-			return (result);
+			goto cleanup;
 	}
 
 	result = ISC_R_NOMEMORY;
@@ -606,9 +607,9 @@
 			if (new == NULL)
 				goto cleanup;
 			memcpy(new, addrs, newsize);
-			isc_mem_put(mctx, addrs, oldsize);
 		} else
 			new = NULL;
+		isc_mem_put(mctx, addrs, oldsize);
 		addrs = new;
 		addrcount = i;
 
@@ -619,9 +620,9 @@
 			if (new == NULL)
 				goto cleanup;
 			memcpy(new, keys,  newsize);
-			isc_mem_put(mctx, keys, oldsize);
 		} else
 			new = NULL;
+		isc_mem_put(mctx, keys, oldsize);
 		keys = new;
 		keycount = i;
 	}
--- bind-9.3.2/bin/named/interfacemgr.c.9_3_3_named	2004-08-10 00:56:23.000000000 -0400
+++ bind-9.3.2/bin/named/interfacemgr.c	2006-06-13 22:31:59.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.59.2.5.8.15 2004/08/10 04:56:23 jinmei Exp $ */
+/* $Id: interfacemgr.c,v 1.59.2.5.8.17 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -717,9 +717,8 @@
 			 * See if the address matches the listen-on statement;
 			 * if not, ignore the interface.
 			 */
-			result = dns_acl_match(&listen_netaddr, NULL,
-					       le->acl, &mgr->aclenv,
-					       &match, NULL);
+			(void)dns_acl_match(&listen_netaddr, NULL, le->acl,
+					    &mgr->aclenv, &match, NULL);
 			if (match <= 0)
 				continue;
 
@@ -745,9 +744,9 @@
 				for (ele = ISC_LIST_HEAD(ext_listen->elts);
 				     ele != NULL;
 				     ele = ISC_LIST_NEXT(ele, link)) {
-					dns_acl_match(&listen_netaddr, NULL,
-						      ele->acl, NULL,
-						      &match, NULL);
+					(void)dns_acl_match(&listen_netaddr,
+							    NULL, ele->acl,
+							    NULL, &match, NULL);
 					if (match > 0 && ele->port == le->port)
 						break;
 					else
--- bind-9.3.2/bin/named/server.c.9_3_3_named	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/bin/named/server.c	2006-06-13 22:45:55.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.339.2.15.2.65 2005/07/27 02:53:15 marka Exp $ */
+/* $Id: server.c,v 1.339.2.15.2.70 2006/05/24 04:30:24 marka Exp $ */
 
 #include <config.h>
 
@@ -220,7 +220,7 @@
 	}
 	maps[i] = NULL;
 
-	result = ns_config_get(maps, aclname, &aclobj);
+	(void)ns_config_get(maps, aclname, &aclobj);
 	if (aclobj == NULL)
 		/*
 		 * No value available.  *aclp == NULL.
@@ -438,7 +438,6 @@
 	case AF_INET:
 		result = ns_config_get(maps, "query-source", &obj);
 		INSIST(result == ISC_R_SUCCESS);
-
 		break;
 	case AF_INET6:
 		result = ns_config_get(maps, "query-source-v6", &obj);
@@ -569,7 +568,7 @@
 	/*
 	 * "*" should match everything including the root (BIND 8 compat).
 	 * As dns_name_matcheswildcard(".", "*.") returns FALSE add a
-	 * explict entry for "." when the name is "*".
+	 * explicit entry for "." when the name is "*".
 	 */
 	if (addroot) {
 		result = dns_order_add(order, dns_rootname,
@@ -1080,7 +1079,7 @@
 	 * Configure the "match-recursive-only" option.
 	 */
 	obj = NULL;
-	(void) ns_config_get(maps, "match-recursive-only", &obj);
+	(void)ns_config_get(maps, "match-recursive-only", &obj);
 	if (obj != NULL && cfg_obj_asboolean(obj))
 		view->matchrecursiveonly = ISC_TRUE;
 	else
@@ -1498,8 +1497,8 @@
 	if (result != ISC_R_SUCCESS) {
 		char namebuf[DNS_NAME_FORMATSIZE];
 		dns_name_format(origin, namebuf, sizeof(namebuf));
-		cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_NOTICE,
-			    "setting up forwarding failed for domain '%s': %s",
+		cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_WARNING,
+			    "could not set up forwarding for domain '%s': %s",
 			    namebuf, isc_result_totext(result));
 		goto cleanup;
 	}
@@ -1893,8 +1892,7 @@
 
  clean:
 	INSIST(lelt == NULL);
-	if (src_acl != NULL)
-		dns_acl_detach(&src_acl);
+	dns_acl_detach(&src_acl);
 
 	return (result);
 }
@@ -3477,20 +3475,29 @@
 ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
 	isc_result_t result;
 	dns_zone_t *zone = NULL;
-	const unsigned char msg[] = "zone refresh queued";
-
+	const unsigned char msg1[] = "zone refresh queued";
+	const unsigned char msg2[] = "not a slave or stub zone";
+	dns_zonetype_t type;
+	
 	result = zone_from_args(server, args, &zone);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 	if (zone == NULL)
 		return (ISC_R_UNEXPECTEDEND);
-	
-	dns_zone_refresh(zone);
-	dns_zone_detach(&zone);
-	if (sizeof(msg) <= isc_buffer_availablelength(text))
-		isc_buffer_putmem(text, msg, sizeof(msg));
 
-	return (ISC_R_SUCCESS);
+	type = dns_zone_gettype(zone);
+	if (type == dns_zone_slave || type == dns_zone_stub) {
+		dns_zone_refresh(zone);
+		dns_zone_detach(&zone);
+		if (sizeof(msg1) <= isc_buffer_availablelength(text))
+			isc_buffer_putmem(text, msg1, sizeof(msg1));
+		return (ISC_R_SUCCESS);
+	}
+		
+	dns_zone_detach(&zone);
+	if (sizeof(msg2) <= isc_buffer_availablelength(text))
+		isc_buffer_putmem(text, msg2, sizeof(msg2));
+	return (ISC_R_FAILURE);
 }	
 
 isc_result_t
@@ -3842,6 +3849,11 @@
 	char *ptr;
 	const char *sep;
 
+	/* Skip the command name. */
+	ptr = next_token(&args, " \t");
+	if (ptr == NULL)
+		return (ISC_R_UNEXPECTEDEND);
+
 	dctx = isc_mem_get(server->mctx, sizeof(*dctx));
 	if (dctx == NULL)
 		return (ISC_R_NOMEMORY);
@@ -3864,11 +3876,6 @@
 	CHECKMF(isc_stdio_open(server->dumpfile, "w", &dctx->fp),
 		"could not open dump file", server->dumpfile);
 
-	/* Skip the command name. */
-	ptr = next_token(&args, " \t");
-	if (ptr == NULL)
-		return (ISC_R_UNEXPECTEDEND);
-
 	sep = (args == NULL) ? "" : ": ";
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 		      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
--- bind-9.3.2/bin/named/client.c.9_3_3_named	2005-07-26 22:53:14.000000000 -0400
+++ bind-9.3.2/bin/named/client.c	2006-06-13 22:26:31.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176.2.13.4.26 2005/07/27 02:53:14 marka Exp $ */
+/* $Id: client.c,v 1.176.2.13.4.28 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -164,6 +164,12 @@
  * Must be greater than any valid state.
  */
 
+/*
+ * Enable ns_client_dropport() by default.
+ */
+#ifndef NS_CLIENT_DROPPORT
+#define NS_CLIENT_DROPPORT 1
+#endif
 
 static void client_read(ns_client_t *client);
 static void client_accept(ns_client_t *client);
@@ -972,6 +978,34 @@
 	ns_client_next(client, result);
 }
 
+#if NS_CLIENT_DROPPORT
+#define DROPPORT_NO		0
+#define DROPPORT_REQUEST	1
+#define DROPPORT_RESPONSE	2
+/*%
+ * ns_client_dropport determines if certain requests / responses
+ * should be dropped based on the port number.
+ *
+ * Returns:
+ * \li	0:	Don't drop.
+ * \li	1:	Drop request.
+ * \li	2:	Drop (error) response.
+ */
+static int
+ns_client_dropport(in_port_t port) {
+	switch (port) {
+	case 7: /* echo */
+	case 13: /* daytime */
+	case 19: /* chargen */
+	case 37: /* time */
+		return (DROPPORT_REQUEST);
+	case 464: /* kpasswd */
+		return (DROPPORT_RESPONSE);
+	}
+	return (DROPPORT_NO);
+}
+#endif
+
 void
 ns_client_error(ns_client_t *client, isc_result_t result) {
 	dns_rcode_t rcode;
@@ -984,6 +1018,28 @@
 	message = client->message;
 	rcode = dns_result_torcode(result);
 
+#if NS_CLIENT_DROPPORT
+	/*
+	 * Don't send FORMERR to ports on the drop port list.
+	 */
+	if (rcode == dns_rcode_formerr &&
+	    ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) !=
+	    DROPPORT_NO) {
+		char buf[64];
+		isc_buffer_t b;
+
+		isc_buffer_init(&b, buf, sizeof(buf) - 1);
+		if (dns_rcode_totext(rcode, &b) != ISC_R_SUCCESS)
+			isc_buffer_putstr(&b, "UNKNOWN RCODE");
+		ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
+			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
+			      "dropped error (%.*s) response: suspicious port",
+			      (int)isc_buffer_usedlength(&b), buf);
+		ns_client_next(client, ISC_R_SUCCESS);
+		return;
+	}
+#endif
+
 	/*
 	 * Message may be an in-progress reply that we had trouble
 	 * with, in which case QR will be set.  We need to clear QR before
@@ -1208,6 +1264,17 @@
 
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
 
+#if NS_CLIENT_DROPPORT
+	if (ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) ==
+	    DROPPORT_REQUEST) {
+		ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
+			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
+			      "dropped request: suspicious port");
+		ns_client_next(client, ISC_R_SUCCESS);
+		goto cleanup;
+	}
+#endif
+
 	ns_client_log(client, NS_LOGCATEGORY_CLIENT,
 		      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(3),
 		      "%s request",

bind-9.3.2-9_3_3_nsupdate.patch:
 nsupdate.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_nsupdate.patch ---
--- bind-9.3.2/bin/nsupdate/nsupdate.c.9_3_3_nsupdate	2005-03-16 22:58:26.000000000 -0500
+++ bind-9.3.2/bin/nsupdate/nsupdate.c	2006-06-13 23:12:59.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.103.2.15.2.20 2005/03/17 03:58:26 marka Exp $ */
+/* $Id: nsupdate.c,v 1.103.2.15.2.22 2006/01/07 00:23:33 marka Exp $ */
 
 #include <config.h>
 
@@ -1665,7 +1665,7 @@
 		result = dns_request_createvia3(requestmgr, soaquery,
 						localaddr, addr, 0, NULL,
 						FIND_TIMEOUT * 20,
-						FIND_TIMEOUT * 20, 3,
+						FIND_TIMEOUT, 3,
 						global_task, recvsoa, reqinfo,
 						&request);
 		check_result(result, "dns_request_createvia");

bind-9.3.2-9_3_3_resolver.patch:
 resolver.c |   54 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 40 insertions(+), 14 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_resolver.patch ---
--- bind-9.3.2/lib/dns/resolver.c.9_3_3_resolver	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/dns/resolver.c	2006-06-13 19:03:28.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.63 2006/01/06 01:21:08 marka Exp $ */
 
 #include <config.h>
 
@@ -27,8 +27,10 @@
 
 #include <dns/acl.h>
 #include <dns/adb.h>
+#include <dns/cache.h>
 #include <dns/db.h>
 #include <dns/dispatch.h>
+#include <dns/ds.h>
 #include <dns/events.h>
 #include <dns/forward.h>
 #include <dns/keytable.h>
@@ -47,6 +49,7 @@
 #include <dns/rdatatype.h>
 #include <dns/resolver.h>
 #include <dns/result.h>
+#include <dns/rootns.h>
 #include <dns/tsig.h>
 #include <dns/validator.h>
 
@@ -1027,9 +1030,11 @@
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_query;
 
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 		result = isc_socket_bind(query->tcpsocket, &addr);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_socket;
+#endif
 
 		/*
 		 * A dispatch will be created once the connect succeeds.
@@ -1287,6 +1292,12 @@
 	}
 
 	/*
+	 * Clear CD if EDNS is not in use.
+	 */
+	if ((query->options & DNS_FETCHOPT_NOEDNS0) != 0)
+		fctx->qmessage->flags &= ~DNS_MESSAGEFLAG_CD;
+
+	/*
 	 * Add TSIG record tailored to the current recipient.
 	 */
 	result = dns_view_getpeertsig(fctx->res->view, &ipaddr, &tsigkey);
@@ -3155,10 +3166,12 @@
 	 * so, destroy the fctx.
 	 */
 	if (SHUTTINGDOWN(fctx) && !sentresponse) {
-		maybe_destroy(fctx);
+		maybe_destroy(fctx);	/* Locks bucket. */
 		goto cleanup_event;
 	}
 
+	LOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
 	/*
 	 * If chaining, we need to make sure that the right result code is
 	 * returned, and that the rdatasets are bound.
@@ -3217,10 +3230,11 @@
 		result = vevent->result;
 		add_bad(fctx, &addrinfo->sockaddr, result);
 		isc_event_free(&event);
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		if (sentresponse)
-			fctx_done(fctx, result);
+			fctx_done(fctx, result);	/* Locks bucket. */
 		else
-			fctx_try(fctx);
+			fctx_try(fctx);			/* Locks bucket. */
 		return;
 	}
 
@@ -3265,6 +3279,7 @@
 		result = dns_rdataset_addnoqname(vevent->rdataset,
 				   vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF]);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
+		INSIST(vevent->sigrdataset != NULL);
 		vevent->sigrdataset->ttl = vevent->rdataset->ttl;
 	}
 
@@ -3297,9 +3312,9 @@
 		 * If we only deferred the destroy because we wanted to cache
 		 * the data, destroy now.
 		 */
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		if (SHUTTINGDOWN(fctx))
-			maybe_destroy(fctx);
-
+			maybe_destroy(fctx);	/* Locks bucket. */
 		goto cleanup_event;
 	}
 
@@ -3312,6 +3327,7 @@
 		 * more rdatasets that still need to
 		 * be validated.
 		 */
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		goto cleanup_event;
 	}
 
@@ -3384,7 +3400,9 @@
 	if (node != NULL)
 		dns_db_detachnode(fctx->cache, &node);
 
-	fctx_done(fctx, result);
+	UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
+	fctx_done(fctx, result);	/* Locks bucket. */
 
  cleanup_event:
 	isc_event_free(&event);
@@ -3771,7 +3789,7 @@
 	}
 	result = dns_ncache_add(message, cache, node, covers, now,
 				maxttl, ardataset);
-	if ((result == DNS_R_UNCHANGED) || (result == ISC_R_SUCCESS)) {
+	if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
 		/*
 		 * If the cache now contains a negative entry and we
 		 * care about whether it is DNS_R_NCACHENXDOMAIN or
@@ -3799,7 +3817,7 @@
 		}
 		result = ISC_R_SUCCESS;
 	}
-	if ((ardataset == &rdataset) && dns_rdataset_isassociated(ardataset))
+	if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset))
 		dns_rdataset_disassociate(ardataset);
 
 	return (result);
@@ -4916,6 +4934,7 @@
 		fctx_try(fctx);
 	} else {
 		unsigned int n;
+		dns_rdataset_t *nsrdataset = NULL;
 
 		/*
 		 * Retrieve state from fctx->nsfetch before we destroy it.
@@ -4923,13 +4942,20 @@
 		dns_fixedname_init(&fixed);
 		domain = dns_fixedname_name(&fixed);
 		dns_name_copy(&fctx->nsfetch->private->domain, domain, NULL);
-		dns_rdataset_clone(&fctx->nsfetch->private->nameservers,
-				   &nameservers);
-		dns_resolver_destroyfetch(&fctx->nsfetch);
 		if (dns_name_equal(&fctx->nsname, domain)) {
 			fctx_done(fctx, DNS_R_SERVFAIL);
+			dns_resolver_destroyfetch(&fctx->nsfetch);
 			goto cleanup;
 		}
+		if (dns_rdataset_isassociated(
+		    &fctx->nsfetch->private->nameservers)) {
+			dns_rdataset_clone(
+			    &fctx->nsfetch->private->nameservers,
+			    &nameservers);
+			nsrdataset = &nameservers;
+		} else
+			domain = NULL;
+		dns_resolver_destroyfetch(&fctx->nsfetch);
 		n = dns_name_countlabels(&fctx->nsname);
 		dns_name_getlabelsequence(&fctx->nsname, 1, n - 1,
 					  &fctx->nsname);
@@ -4939,7 +4965,7 @@
 		FCTXTRACE("continuing to look for parent's NS records");
 		result = dns_resolver_createfetch(fctx->res, &fctx->nsname,
 						  dns_rdatatype_ns, domain,
-						  &nameservers, NULL, 0, task,
+						  nsrdataset, NULL, 0, task,
 						  resume_dslookup, fctx,
 						  &fctx->nsrrset, NULL,
 						  &fctx->nsfetch);

bind-9.3.2-9_3_3_tests.patch:
 compress_test.c         |    6 +--
 db/t_db.c               |    8 +++-
 dst/dst_test.c          |   27 ++++++++++++----
 dst/t_dst.c             |   29 ++++++++++++++---
 master/t_master.c       |    8 +++-
 names/t_names.c         |   64 ++++++++++++++++++++++++++++-----------
 rbt/t_rbt.c             |   78 ++++++++++++++++++++++++++++--------------------
 rdata_test.c            |   10 +++---
 system/tkey/keycreate.c |    8 +++-
 system/tkey/keydelete.c |    8 +++-
 tasks/t_tasks.c         |   20 ++++++++----
 11 files changed, 180 insertions(+), 86 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_tests.patch ---
--- bind-9.3.2/bin/tests/names/t_names.c.9_3_3_tests	2004-03-08 16:06:23.000000000 -0500
+++ bind-9.3.2/bin/tests/names/t_names.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.32.2.2.8.3 2004/03/08 21:06:23 marka Exp $ */
+/* $Id: t_names.c,v 1.32.2.2.8.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -566,8 +566,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -677,8 +679,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -831,8 +835,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 6) {
@@ -949,8 +955,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1049,8 +1057,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1145,8 +1155,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1226,8 +1238,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -1336,8 +1350,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1464,8 +1480,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1552,8 +1570,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 1) {
@@ -1600,8 +1620,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 1) {
@@ -1735,8 +1757,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1869,8 +1893,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -2028,8 +2054,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 6) {
@@ -2221,8 +2249,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 5) {
--- bind-9.3.2/bin/tests/tasks/t_tasks.c.9_3_3_tests	2005-07-19 03:08:36.000000000 -0400
+++ bind-9.3.2/bin/tests/tasks/t_tasks.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.29.12.9 2005/07/19 07:08:36 marka Exp $ */
+/* $Id: t_tasks.c,v 1.29.12.11 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -2131,6 +2131,7 @@
 #define T14_NTASKS 10
 #define T14_EXCLTASK 6
 
+int t14_exclusiveerror = ISC_R_SUCCESS;
 int t14_error = 0;
 int t14_done = 0;
 
@@ -2146,8 +2147,12 @@
 	t_info("task enter %d\n", taskno);	
 	if (taskno == T14_EXCLTASK) {
 		int	i;
-		isc_task_beginexclusive(task);
-		t_info("task %d got exclusive access\n", taskno);			
+		t14_exclusiveerror = isc_task_beginexclusive(task);
+		if (t14_exclusiveerror == ISC_R_SUCCESS)
+			t_info("task %d got exclusive access\n", taskno);
+		else
+			t_info("task %d failed to got exclusive access: %d\n",
+				taskno, t14_exclusiveerror);
 		for (i = 0; i < T14_NTASKS; i++) {
    		        t_info("task %d state %d\n", i , t14_active[i]);
 			if (t14_active[i])
@@ -2251,8 +2256,11 @@
 
 	isc_taskmgr_destroy(&manager);
 
-	if (t14_error) {
-		t_info("mutual access occurred\n");
+	if (t14_exclusiveerror != ISC_R_SUCCESS || t14_error) {
+		if (t14_exclusiveerror != ISC_R_SUCCESS)
+			t_info("isc_task_beginexclusive() failed\n");
+		if (t14_error)
+			t_info("mutual access occurred\n");
 		return(T_FAIL);
 	}
 
--- bind-9.3.2/bin/tests/system/tkey/keycreate.c.9_3_3_tests	2004-06-10 20:30:53.000000000 -0400
+++ bind-9.3.2/bin/tests/system/tkey/keycreate.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keycreate.c,v 1.7.12.5 2004/06/11 00:30:53 marka Exp $ */
+/* $Id: keycreate.c,v 1.7.12.7 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -144,7 +144,9 @@
 
 	isc_event_free(&event);
 
-	inet_pton(AF_INET, "10.53.0.1", &inaddr);
+	result = ISC_R_FAILURE;
+	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
+		CHECK("inet_pton", result);
 	isc_sockaddr_fromin(&address, &inaddr, PORT);
 
 	dns_fixedname_init(&keyname);
--- bind-9.3.2/bin/tests/system/tkey/keydelete.c.9_3_3_tests	2004-06-10 20:30:53.000000000 -0400
+++ bind-9.3.2/bin/tests/system/tkey/keydelete.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keydelete.c,v 1.4.206.3 2004/06/11 00:30:53 marka Exp $ */
+/* $Id: keydelete.c,v 1.4.206.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -118,7 +118,9 @@
 
 	isc_event_free(&event);
 
-	inet_pton(AF_INET, "10.53.0.1", &inaddr);
+	result = ISC_R_FAILURE;
+	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
+		CHECK("inet_pton", result);
 	isc_sockaddr_fromin(&address, &inaddr, PORT);
 
 	query = NULL;
--- bind-9.3.2/bin/tests/rbt/t_rbt.c.9_3_3_tests	2004-10-24 21:36:07.000000000 -0400
+++ bind-9.3.2/bin/tests/rbt/t_rbt.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_rbt.c,v 1.23.206.4 2004/10/25 01:36:07 marka Exp $ */
+/* $Id: t_rbt.c,v 1.23.206.6 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -127,6 +127,7 @@
 	isc_result_t	result;
 	isc_buffer_t	source;
 	isc_buffer_t	target;
+	dns_name_t	*name;
 
 	nfails = 0;
 
@@ -141,22 +142,26 @@
 		 * The buffer for the actual name will immediately follow the
 		 * name structure.
 		 */
-		*dns_name = isc_mem_get(mctx, sizeof(**dns_name) + DNSNAMELEN);
-		if (*dns_name == NULL) {
+		name = isc_mem_get(mctx, sizeof(*name) + DNSNAMELEN);
+		if (name == NULL) {
 			t_info("isc_mem_get failed\n");
 			++nfails;
-		}
+		} else {
 
-		dns_name_init(*dns_name, NULL);
-		isc_buffer_init(&target, *dns_name + 1, DNSNAMELEN);
+			dns_name_init(name, NULL);
+			isc_buffer_init(&target, name + 1, DNSNAMELEN);
 
-		result = dns_name_fromtext(*dns_name, &source, dns_rootname,
-					   ISC_FALSE, &target);
+			result = dns_name_fromtext(name, &source, dns_rootname,
+						   ISC_FALSE, &target);
 
-		if (result != ISC_R_SUCCESS) {
-			++nfails;
-			t_info("dns_name_fromtext(%s) failed %s\n",
-			       s, dns_result_totext(result));
+			if (result != ISC_R_SUCCESS) {
+				++nfails;
+				t_info("dns_name_fromtext(%s) failed %s\n",
+				       s, dns_result_totext(result));
+				 isc_mem_put(mctx, name,
+					     sizeof(*name) + DNSNAMELEN);
+			} else
+				*dns_name = name;
 		}
 	} else {
 		++nfails;
@@ -182,15 +187,17 @@
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_name);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_name) == 0) {
 			if (T_debug)
 				t_info("dns_rbt_addname succeeded\n");
 			*dns_result = dns_rbt_addname(rbt, dns_name, dns_name);
+			if (*dns_result != ISC_R_SUCCESS) {
+				delete_name(dns_name, mctx);
+				t_info("dns_rbt_addname failed %s\n",
+		       		       dns_result_totext(*dns_result));
+				++nprobs;
+			}
 		} else {
-			t_info("dns_rbt_addname failed %s\n",
-		       			dns_result_totext(*dns_result));
-			delete_name(dns_name, mctx);
 			++nprobs;
 		}
 	} else {
@@ -208,8 +215,7 @@
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_name);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_name) == 0) {
 			*dns_result = dns_rbt_deletename(rbt, dns_name,
 							 ISC_FALSE);
 			delete_name(dns_name, mctx);
@@ -234,8 +240,7 @@
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_searchname);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_searchname) == 0) {
 			dns_fixedname_init(&dns_fixedname);
 			dns_foundname = dns_fixedname_name(&dns_fixedname);
 			data = NULL;
@@ -281,7 +286,7 @@
 		 * Skip any comment lines.
 		 */
 		if ((*p == '#') || (*p == '\0') || (*p == ' ')) {
-			free(p);
+			(void)free(p);
 			continue;
 		}
 
@@ -362,8 +367,7 @@
 	if (strcmp(command, "create") == 0) {
 		result = T_PASS;
 	} else if (strcmp(command, "add") == 0) {
-		dns_result = create_name(testname, mctx, &dns_name);
-		if (dns_result == ISC_R_SUCCESS) {
+		if (create_name(testname, mctx, &dns_name) == 0) {
 			dns_result = dns_rbt_addname(rbt, dns_name, dns_name);
 
 			if (dns_result != ISC_R_SUCCESS)
@@ -466,8 +470,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			/*
 			 * Name of db file, command, testname,
@@ -976,8 +982,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 10) {
@@ -1163,8 +1171,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1354,8 +1364,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1560,8 +1572,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1765,8 +1779,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 4) {
--- bind-9.3.2/bin/tests/master/t_master.c.9_3_3_tests	2004-03-07 23:04:29.000000000 -0500
+++ bind-9.3.2/bin/tests/master/t_master.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_master.c,v 1.30.206.3 2004/03/08 04:04:29 marka Exp $ */
+/* $Id: t_master.c,v 1.30.206.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -153,8 +153,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace(*p & 0xff)) || (*p == '#'))
+			if ((isspace(*p & 0xff)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			/*
 			 * Name of data file, origin, zclass, expected result.
--- bind-9.3.2/bin/tests/db/t_db.c.9_3_3_tests	2004-10-24 21:36:06.000000000 -0400
+++ bind-9.3.2/bin/tests/db/t_db.c	2006-01-04 18:50:19.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.29.206.3 2004/10/25 01:36:06 marka Exp $ */
+/* $Id: t_db.c,v 1.29.206.5 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -403,8 +403,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, tokens);
 			if (cnt == 4) {
--- bind-9.3.2/bin/tests/rdata_test.c.9_3_3_tests	2005-03-16 22:58:28.000000000 -0500
+++ bind-9.3.2/bin/tests/rdata_test.c	2006-02-26 18:49:48.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata_test.c,v 1.35.12.9 2005/03/17 03:58:28 marka Exp $ */
+/* $Id: rdata_test.c,v 1.35.12.11 2006/02/26 23:49:48 marka Exp $ */
 
 #include <config.h>
 
@@ -304,7 +304,7 @@
 		break;
 	}
 	if (result != ISC_R_SUCCESS)
-		fprintf(stdout, "viastruct: tostuct %d %d return %s\n",
+		fprintf(stdout, "viastruct: tostruct %d %d return %s\n",
 			rdata->type, rdata->rdclass,
 			dns_result_totext(result));
 	else
@@ -561,7 +561,7 @@
 		break;
 	}
 	if (result != ISC_R_SUCCESS)
-		fprintf(stdout, "viastruct: tostuct %d %d return %s\n",
+		fprintf(stdout, "viastruct: tostruct %d %d return %s\n",
 			rdata->type, rdata->rdclass,
 			dns_result_totext(result));
 	else {
@@ -572,7 +572,7 @@
 		result = dns_rdata_fromstruct(rdata2, rdc, rdt, sp, b);
 		if (result != ISC_R_SUCCESS)
 			fprintf(stdout,
-				"viastruct: fromstuct %d %d return %s\n",
+				"viastruct: fromstruct %d %d return %s\n",
 				rdata->type, rdata->rdclass,
 				dns_result_totext(result));
 		else if (rdata->length != rdata2->length ||
--- bind-9.3.2/bin/tests/compress_test.c.9_3_3_tests	2004-03-07 23:04:25.000000000 -0500
+++ bind-9.3.2/bin/tests/compress_test.c	2006-02-26 18:49:48.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress_test.c,v 1.24.12.4 2004/03/08 04:04:25 marka Exp $ */
+/* $Id: compress_test.c,v 1.24.12.6 2006/02/26 23:49:48 marka Exp $ */
 
 #include <config.h>
 
@@ -131,7 +131,7 @@
 		case DNS_COMPRESS_NONE: s = "DNS_COMPRESS_NONE"; break;
 		case DNS_COMPRESS_GLOBAL14: s = "DNS_COMPRESS_GLOBAL14"; break;
 		/* case DNS_COMPRESS_ALL: s = "DNS_COMPRESS_ALL"; break; */
-		default: s = "UNKOWN"; break;
+		default: s = "UNKNOWN"; break;
 		}
 		fprintf(stdout, "Allowed = %s\n", s);
 	}
--- bind-9.3.2/bin/tests/dst/dst_test.c.9_3_3_tests	2004-06-10 20:30:52.000000000 -0400
+++ bind-9.3.2/bin/tests/dst/dst_test.c	2006-01-04 18:50:19.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_test.c,v 1.37.206.2 2004/06/11 00:30:52 marka Exp $ */
+/* $Id: dst_test.c,v 1.37.206.4 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -236,23 +236,34 @@
 	isc_buffer_t b;
 	dns_fixedname_t fname;
 	dns_name_t *name;
+	isc_result_t result;
 
-	isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(0, 0, &mctx);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 
 	current = isc_mem_get(mctx, 256);
+	if (current == NULL)
+		return (1);
 	getcwd(current, 256);
 
 	dns_result_register();
 
-	isc_entropy_create(mctx, &ectx);
-	isc_entropy_createfilesource(ectx, "randomfile");
+	result = isc_entropy_create(mctx, &ectx);
+	if (result != ISC_R_SUCCESS)
+		return (1);
+	result = isc_entropy_createfilesource(ectx, "randomfile");
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
 
 	dns_fixedname_init(&fname);
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, "test.", 5);
 	isc_buffer_add(&b, 5);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
 	io(name, 54622, DST_ALG_RSAMD5, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
 	   mctx);
@@ -262,7 +273,9 @@
 
 	isc_buffer_init(&b, "dh.", 3);
 	isc_buffer_add(&b, 3);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	dh(name, 18602, name, 48957, mctx);
 
 	generate(DST_ALG_RSAMD5, mctx);
--- bind-9.3.2/bin/tests/dst/t_dst.c.9_3_3_tests	2004-06-10 20:30:52.000000000 -0400
+++ bind-9.3.2/bin/tests/dst/t_dst.c	2006-01-04 18:50:19.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.47.206.2 2004/06/11 00:30:52 marka Exp $ */
+/* $Id: t_dst.c,v 1.47.206.4 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -405,7 +405,13 @@
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, "test.", 5);
 	isc_buffer_add(&b, 5);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+		       isc_result_totext(isc_result));
+		t_result(T_UNRESOLVED);
+		return;
+	}
 	io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
 			mctx, ISC_R_SUCCESS, &nfails, &nprobs);
 	t_info("testing use of stored keys [2]\n");
@@ -421,7 +427,13 @@
 
 	isc_buffer_init(&b, "dh.", 3);
 	isc_buffer_add(&b, 3);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+		       isc_result_totext(isc_result));
+		t_result(T_UNRESOLVED);
+		return;
+	}
 
 	dh(name, 18602, name, 48957, mctx, ISC_R_SUCCESS, &nfails, &nprobs);
 
@@ -674,7 +686,14 @@
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, keyname, strlen(keyname));
 	isc_buffer_add(&b, strlen(keyname));
-	dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+			isc_result_totext(isc_result));
+		(void) free(data);
+		++*nprobs;
+		return;
+	}
 	isc_result = dst_key_fromfile(name, id, alg, type, NULL, mctx, &key);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("dst_key_fromfile failed %s\n",

bind-9.3.2-9_3_3_validator.patch:
 validator.c |  435 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 314 insertions(+), 121 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_validator.patch ---
--- bind-9.3.2/lib/dns/validator.c.9_3_3_validator	2005-11-01 21:07:47.000000000 -0500
+++ bind-9.3.2/lib/dns/validator.c	2006-06-13 18:51:23.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91.2.5.8.21 2005/11/02 02:07:47 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */
 
 #include <config.h>
 
@@ -43,20 +43,65 @@
 #include <dns/validator.h>
 #include <dns/view.h>
 
+/*! \file
+ * \brief
+ * Basic processing sequences.
+ *
+ * \li When called with rdataset and sigrdataset:
+ * validator_start -> validate -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> validate -> proveunsecure
+ *
+ * validator_start -> validate -> nsecvalidate	(secure wildcard answer)
+ * 
+ * \li When called with rdataset, sigrdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> validate -> proveunsecure
+ *
+ * \li When called with rdataset:
+ * validator_start -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> proveunsecure
+ *
+ * \li When called with rdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> proveunsecure
+ *
+ * \li When called without a rdataset:
+ * validator_start -> nsecvalidate -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> nsecvalidate -> proveunsecure
+ *
+ * \li When called without a rdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> nsecvalidate -> proveunsecure
+ *
+ * validator_start: determines what type of validation to do.
+ * validate: attempts to perform a positive validation.
+ * proveunsecure: attempts to prove the answer comes from a unsecure zone.
+ * nsecvalidate: attempts to prove a negative response.
+ * startfinddlvsep: starts the DLV record lookup.
+ * dlv_validator_start: resets state and restarts the lookup using the
+ *	DLV RRset found by startfinddlvsep.
+ */
+
 #define VALIDATOR_MAGIC			ISC_MAGIC('V', 'a', 'l', '?')
 #define VALID_VALIDATOR(v)		ISC_MAGIC_VALID(v, VALIDATOR_MAGIC)
 
-#define VALATTR_SHUTDOWN		0x0001
-#define VALATTR_FOUNDNONEXISTENCE	0x0002
-#define VALATTR_TRIEDVERIFY		0x0004
-#define VALATTR_NEGATIVE		0x0008
-#define VALATTR_INSECURITY		0x0010
-#define VALATTR_DLVTRIED		0x0020
+#define VALATTR_SHUTDOWN		0x0001	/*%< Shutting down. */
+#define VALATTR_TRIEDVERIFY		0x0004  /*%< We have found a key and
+						 * have attempted a verify. */
+#define VALATTR_INSECURITY		0x0010	/*%< Attempting proveunsecure. */
+#define VALATTR_DLVTRIED		0x0020	/*%< Looked for a DLV record. */
+#define VALATTR_AUTHNONPENDING		0x0040	/*%< Tidy up pending auth. */
 
+/*!
+ * NSEC proofs to be looked for.
+ */
 #define VALATTR_NEEDNOQNAME		0x0100
 #define VALATTR_NEEDNOWILDCARD		0x0200
 #define VALATTR_NEEDNODATA		0x0400
 
+/*!
+ * NSEC proofs that have been found.
+ */
 #define VALATTR_FOUNDNOQNAME		0x1000
 #define VALATTR_FOUNDNOWILDCARD		0x2000
 #define VALATTR_FOUNDNODATA		0x4000
@@ -104,19 +149,35 @@
 static isc_result_t
 dlv_validatezonekey(dns_validator_t *val);
 
-static isc_result_t
+static void
 dlv_validator_start(dns_validator_t *val);
 
 static isc_result_t
 finddlvsep(dns_validator_t *val, isc_boolean_t resume);
 
+static void
+auth_nonpending(dns_message_t *message);
+
+static isc_result_t
+startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure);
+
+/*%
+ * Mark the RRsets as a answer.
+ *
+ * If VALATTR_AUTHNONPENDING is set then this is a negative answer
+ * in a insecure zone.  We need to mark any pending RRsets as
+ * dns_trust_authauthority answers (this is deferred from resolver.c).
+ */
 static inline void
 markanswer(dns_validator_t *val) {
 	validator_log(val, ISC_LOG_DEBUG(3), "marking as answer");
-	if (val->event->rdataset)
+	if (val->event->rdataset != NULL)
 		val->event->rdataset->trust = dns_trust_answer;
-	if (val->event->sigrdataset)
+	if (val->event->sigrdataset != NULL)
 		val->event->sigrdataset->trust = dns_trust_answer;
+	if (val->event->message != NULL &&
+	    (val->attributes & VALATTR_AUTHNONPENDING) != 0)
+		auth_nonpending(val->event->message);
 }
 
 static void
@@ -155,6 +216,9 @@
 	return (ISC_TRUE);
 }
 
+/*%
+ * Mark pending answers in the authority section as dns_trust_authauthority.
+ */
 static void
 auth_nonpending(dns_message_t *message) {
 	isc_result_t result;
@@ -177,6 +241,10 @@
 	}
 }
 
+/*%
+ * Look in the NSEC record returned from a DS query to see if there is
+ * a NS RRset at this name.  If it is found we are at a delegation point.
+ */
 static isc_boolean_t
 isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
 	     isc_result_t dbresult)
@@ -210,6 +278,11 @@
 	return (found);
 }
 
+/*%
+ * We have been asked to to look for a key.
+ * If found resume the validation process.
+ * If not found fail the validation process.
+ */
 static void
 fetch_callback_validator(isc_task_t *task, isc_event_t *event) {
 	dns_fetchevent_t *devent;
@@ -269,6 +342,11 @@
 		destroy(val);
 }
 
+/*%
+ * We were asked to look for a DS record as part of following a key chain
+ * upwards.  If found resume the validation process.  If not found fail the
+ * validation process.
+ */
 static void
 dsfetched(isc_task_t *task, isc_event_t *event) {
 	dns_fetchevent_t *devent;
@@ -330,8 +408,16 @@
 		destroy(val);
 }
 
-/*
- * XXX there's too much duplicated code here.
+/*%
+ * We were asked to look for the DS record as part of proving that a
+ * name is unsecure.
+ *
+ * If the DS record doesn't exist and the query name corresponds to
+ * a delegation point we are transitioning from a secure zone to a
+ * unsecure zone.
+ *
+ * If the DS record exists it will be secure.  We can continue looking
+ * for the break point in the chain of trust.
  */
 static void
 dsfetched2(isc_task_t *task, isc_event_t *event) {
@@ -359,7 +445,8 @@
 
 	INSIST(val->event != NULL);
 
-	validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2");
+	validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2: %s",
+		      dns_result_totext(eresult));
 	LOCK(&val->lock);
 	if (eresult == DNS_R_NXRRSET || eresult == DNS_R_NCACHENXRRSET) {
 		/*
@@ -371,9 +458,13 @@
 				validator_log(val, ISC_LOG_WARNING,
 					      "must be secure failure");
 				validator_done(val, DNS_R_MUSTBESECURE);
-			} else {
+			} else if (val->view->dlv == NULL || DLVTRIED(val)) {
 				markanswer(val);
 				validator_done(val, ISC_R_SUCCESS);
+			} else {
+				result = startfinddlvsep(val, tname);
+				if (result != DNS_R_WAIT)
+					validator_done(val, result);
 			}
 		} else {
 			result = proveunsecure(val, ISC_TRUE);
@@ -385,7 +476,9 @@
 		   eresult == DNS_R_NCACHENXDOMAIN)
 	{
 		/*
-		 * Either there is a DS or this is not a zone cut.  Continue.
+		 * There is a DS which may or may not be a zone cut. 
+		 * In either case we are still in a secure zone resume
+		 * validation.
 		 */
 		result = proveunsecure(val, ISC_TRUE);
 		if (result != DNS_R_WAIT)
@@ -403,6 +496,11 @@
 		destroy(val);
 }
 
+/*%
+ * Callback from when a DNSKEY RRset has been validated.
+ *
+ * Resumes the stalled validation process.
+ */
 static void
 keyvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -448,6 +546,11 @@
 		destroy(val);
 }
 
+/*%
+ * Callback when the DS record has been validated.
+ *
+ * Resumes validation of the zone key or the unsecure zone proof.
+ */
 static void
 dsvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -491,10 +594,12 @@
 		destroy(val);
 }
 
-/*
+/*%
  * Return ISC_R_SUCCESS if we can determine that the name doesn't exist
  * or we can determine whether there is data or not at the name.
  * If the name does not exist return the wildcard name.
+ *
+ * Return ISC_R_IGNORE when the NSEC is not the appropriate one.
  */
 static isc_result_t
 nsecnoexistnodata(dns_validator_t *val, dns_name_t* name, dns_name_t *nsecname,
@@ -627,7 +732,7 @@
 					       wild, NULL);
 		if (result != ISC_R_SUCCESS) {
 			validator_log(val, ISC_LOG_DEBUG(3),
-				    "failure generating wilcard name");
+				    "failure generating wildcard name");
 			return (result);
 		}
 	}
@@ -637,6 +742,13 @@
 	return (ISC_R_SUCCESS);
 }
 
+/*%
+ * Callback for when NSEC records have been validated.
+ *
+ * Looks for NOQNAME and NODATA proofs.
+ *
+ * Resumes nsecvalidate.
+ */
 static void
 authvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -715,44 +827,20 @@
 	isc_event_free(&event);
 }
 
-static void
-negauthvalidated(isc_task_t *task, isc_event_t *event) {
-	dns_validatorevent_t *devent;
-	dns_validator_t *val;
-	isc_boolean_t want_destroy;
-	isc_result_t eresult;
-
-	UNUSED(task);
-	INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE);
-
-	devent = (dns_validatorevent_t *)event;
-	val = devent->ev_arg;
-	eresult = devent->result;
-	isc_event_free(&event);
-	dns_validator_destroy(&val->subvalidator);
-
-	INSIST(val->event != NULL);
-
-	validator_log(val, ISC_LOG_DEBUG(3), "in negauthvalidated");
-	LOCK(&val->lock);
-	if (eresult == ISC_R_SUCCESS) {
-		val->attributes |= VALATTR_FOUNDNONEXISTENCE;
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof found");
-		auth_nonpending(val->event->message);
-		validator_done(val, ISC_R_SUCCESS);
-	} else {
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "negauthvalidated: got %s",
-			      isc_result_totext(eresult));
-		validator_done(val, eresult);
-	}
-	want_destroy = exit_check(val);
-	UNLOCK(&val->lock);
-	if (want_destroy)
-		destroy(val);
-}
-
+/*%
+ * Looks for the requested name and type in the view (zones and cache).
+ *
+ * When looking for a DLV record also checks to make sure the NSEC record
+ * returns covers the query name as part of aggressive negative caching.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS
+ * \li	ISC_R_NOTFOUND
+ * \li	DNS_R_NCACHENXDOMAIN
+ * \li	DNS_R_NCACHENXRRSET
+ * \li	DNS_R_NXRRSET
+ * \li	DNS_R_NXDOMAIN
+ */
 static inline isc_result_t
 view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	dns_fixedname_t fixedname;
@@ -855,12 +943,9 @@
 		dns_rdata_freestruct(&nsec);
 		result = DNS_R_NCACHENXDOMAIN;
 	} else if (result != ISC_R_SUCCESS &&
-                   result != DNS_R_GLUE &&
-                   result != DNS_R_HINT &&
                    result != DNS_R_NCACHENXDOMAIN &&
                    result != DNS_R_NCACHENXRRSET &&
                    result != DNS_R_NXRRSET &&
-                   result != DNS_R_HINTNXRRSET &&
                    result != ISC_R_NOTFOUND) {
 		goto  notfound;
 	}
@@ -874,11 +959,15 @@
 	return (ISC_R_NOTFOUND);
 }
 
+/*%
+ * Checks to make sure we are not going to loop.  As we use a SHARED fetch
+ * the validation process will stall if looping was to occur.
+ */
 static inline isc_boolean_t
 check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	dns_validator_t *parent;
 
-	for (parent = val->parent; parent != NULL; parent = parent->parent) {
+	for (parent = val; parent != NULL; parent = parent->parent) {
 		if (parent->event != NULL &&
 		    parent->event->type == type &&
 		    dns_name_equal(parent->event->name, name))
@@ -892,6 +981,9 @@
 	return (ISC_FALSE);
 }
 
+/*%
+ * Start a fetch for the requested name and type.
+ */
 static inline isc_result_t
 create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 	     isc_taskaction_t callback, const char *caller)
@@ -914,6 +1006,9 @@
 					 &val->fetch));
 }
 
+/*%
+ * Start a subvalidation process.
+ */
 static inline isc_result_t
 create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 		 dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
@@ -936,7 +1031,7 @@
 	return (result);
 }
 
-/*
+/*%
  * Try to find a key that could have signed 'siginfo' among those
  * in 'rdataset'.  If found, build a dst_key_t for it and point
  * val->key at it.
@@ -1004,6 +1099,9 @@
 	return (result);
 }
 
+/*%
+ * Get the key that generated this signature.
+ */
 static isc_result_t
 get_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo) {
 	isc_result_t result;
@@ -1130,7 +1228,7 @@
 	return (dst_region_computeid(&r, key->algorithm));
 }
 
-/*
+/*%
  * Is this keyset self-signed?
  */
 static isc_boolean_t
@@ -1172,8 +1270,19 @@
 	return (ISC_FALSE);
 }
 
+/*%
+ * Attempt to verify the rdataset using the given key and rdata (RRSIG).
+ * The signature was good and from a wildcard record and the QNAME does
+ * not match the wildcard we need to look for a NOQNAME proof.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS if the verification succeeds.
+ * \li	Others if the verification fails.
+ */
 static isc_result_t
-verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata) {
+verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata,
+       isc_uint16_t keyid)
+{
 	isc_result_t result;
 	dns_fixedname_t fixed;
 
@@ -1183,8 +1292,8 @@
 				    key, ISC_FALSE, val->view->mctx, rdata,
 				    dns_fixedname_name(&fixed));
 	validator_log(val, ISC_LOG_DEBUG(3),
-		      "verify rdataset: %s",
-		      isc_result_totext(result));
+		      "verify rdataset (keyid=%u): %s",
+		      keyid, isc_result_totext(result));
 	if (result == DNS_R_FROMWILDCARD) {
 		if (!dns_name_equal(val->event->name,
 				    dns_fixedname_name(&fixed)))
@@ -1194,14 +1303,14 @@
 	return (result);
 }
 
-/*
+/*%
  * Attempts positive response validation of a normal RRset.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 validate(dns_validator_t *val, isc_boolean_t resume) {
@@ -1272,7 +1381,8 @@
 		}
 
 		do {
-			result = verify(val, val->key, &rdata);
+			result = verify(val, val->key, &rdata,
+					val->siginfo->keyid);
 			if (result == ISC_R_SUCCESS)
 				break;
 			if (val->keynode != NULL) {
@@ -1356,6 +1466,10 @@
 	return (DNS_R_NOVALIDSIG);
 }
 
+/*%
+ * Validate the DNSKEY RRset by looking for a DNSKEY that matches a
+ * DLV record and that also verifies the DNSKEY RRset.
+ */
 static isc_result_t
 dlv_validatezonekey(dns_validator_t *val) {
 	dns_keytag_t keytag;
@@ -1373,12 +1487,12 @@
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
 
 	validator_log(val, ISC_LOG_DEBUG(3), "dlv_validatezonekey");
+
 	/*
 	 * Look through the DLV record and find the keys that can sign the
 	 * key set and the matching signature.  For each such key, attempt
 	 * verification.
 	 */
-
 	supported_algorithm = ISC_FALSE;
 
 	for (result = dns_rdataset_first(&val->dlv);
@@ -1456,7 +1570,7 @@
 				 */
 				continue;
 
-			result = verify(val, dstkey, &sigrdata);
+			result = verify(val, dstkey, &sigrdata, sig.keyid);
 			dst_key_free(&dstkey);
 			if (result == ISC_R_SUCCESS)
 				break;
@@ -1486,14 +1600,14 @@
 		return (DNS_R_NOVALIDSIG);
 }
 
-/*
+/*%
  * Attempts positive response validation of an RRset containing zone keys.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 validatezonekey(dns_validator_t *val) {
@@ -1505,12 +1619,14 @@
 	dns_rdata_t keyrdata = DNS_RDATA_INIT;
 	dns_rdata_t sigrdata = DNS_RDATA_INIT;
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
+	char namebuf[DNS_NAME_FORMATSIZE];
 	dns_keytag_t keytag;
 	dns_rdata_ds_t ds;
 	dns_rdata_dnskey_t key;
 	dns_rdata_rrsig_t sig;
 	dst_key_t *dstkey;
 	isc_boolean_t supported_algorithm;
+	isc_boolean_t atsep = ISC_FALSE;
 
 	/*
 	 * Caller must be holding the validator lock.
@@ -1541,9 +1657,13 @@
 							  sig.algorithm,
 							  sig.keyid,
 							  &keynode);
+			if (result == DNS_R_PARTIALMATCH ||
+			    result == ISC_R_SUCCESS)
+				atsep = ISC_TRUE;
 			while (result == ISC_R_SUCCESS) {
 				dstkey = dns_keynode_key(keynode);
-				result = verify(val, dstkey, &sigrdata);
+				result = verify(val, dstkey, &sigrdata,
+						sig.keyid);
 				if (result == ISC_R_SUCCESS) {
 					dns_keytable_detachkeynode(val->keytable,
 								   &keynode);
@@ -1578,6 +1698,22 @@
 				return (DNS_R_NOVALIDDS);
 		}
 
+		if (atsep) {
+			/*
+			 * We have not found a key to verify this DNSKEY
+			 * RRset.  As this is a SEP we have to assume that
+			 * the RRset is invalid.
+			 */
+			dns_name_format(val->event->name, namebuf,
+				        sizeof(namebuf));
+			validator_log(val, ISC_LOG_DEBUG(2),
+				      "unable to find a DNSKEY which verifies "
+				      "the DNSKEY RRset and also matches one "
+				      "of specified trusted-keys for '%s'",
+				      namebuf);
+			return (DNS_R_NOVALIDKEY);
+		}
+
 		/*
 		 * Otherwise, try to find the DS record.
 		 */
@@ -1680,6 +1816,9 @@
 		dns_rdataset_init(&trdataset);
 		dns_rdataset_clone(val->event->rdataset, &trdataset);
 
+		/*
+		 * Look for the KEY that matches the DS record.
+		 */
 		for (result = dns_rdataset_first(&trdataset);
 		     result == ISC_R_SUCCESS;
 		     result = dns_rdataset_next(&trdataset))
@@ -1714,7 +1853,7 @@
 			dns_rdataset_current(val->event->sigrdataset,
 					     &sigrdata);
 			(void)dns_rdata_tostruct(&sigrdata, &sig, NULL);
-			if (ds.key_tag != sig.keyid &&
+			if (ds.key_tag != sig.keyid ||
 			    ds.algorithm != sig.algorithm)
 				continue;
 
@@ -1728,8 +1867,7 @@
 				 * This really shouldn't happen, but...
 				 */
 				continue;
-
-			result = verify(val, dstkey, &sigrdata);
+			result = verify(val, dstkey, &sigrdata, sig.keyid);
 			dst_key_free(&dstkey);
 			if (result == ISC_R_SUCCESS)
 				break;
@@ -1759,14 +1897,14 @@
 		return (DNS_R_NOVALIDSIG);
 }
 
-/*
+/*%
  * Starts a positive response validation.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 start_positive_validation(dns_validator_t *val) {
@@ -1779,6 +1917,14 @@
 	return (validatezonekey(val));
 }
 
+/*%
+ * Look for NODATA at the wildcard and NOWILDCARD proofs in the
+ * previously validated NSEC records.  As these proofs are mutually
+ * exclusive we stop when one is found.
+ *
+ * Returns
+ * \li	ISC_R_SUCCESS 
+ */
 static isc_result_t
 checkwildcard(dns_validator_t *val) {
 	dns_name_t *name, *wild;
@@ -1851,6 +1997,18 @@
 	return (result);
 }
 
+/*%
+ * Prove a negative answer is good or that there is a NOQNAME when the
+ * answer is from a wildcard.
+ *
+ * Loop through the authority section looking for NODATA, NOWILDCARD
+ * and NOQNAME proofs in the NSEC records by calling authvalidated().
+ *
+ * If the required proofs are found we are done.
+ *
+ * If the proofs are not found attempt to prove this is a unsecure
+ * response.
+ */
 static isc_result_t
 nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
 	dns_name_t *name;
@@ -1946,7 +2104,8 @@
 		return (result);
 
 	/*
-	 * Do we only need to check for NOQNAME?
+	 * Do we only need to check for NOQNAME?  To get here we must have
+	 * had a secure wildcard answer.
 	 */
 	if ((val->attributes & VALATTR_NEEDNODATA) == 0 &&
 	    (val->attributes & VALATTR_NEEDNOWILDCARD) == 0 &&
@@ -1982,28 +2141,17 @@
 	    ((val->attributes & VALATTR_NEEDNOQNAME) != 0 &&
 	     (val->attributes & VALATTR_FOUNDNOQNAME) != 0 &&
 	     (val->attributes & VALATTR_NEEDNOWILDCARD) != 0 &&
-	     (val->attributes & VALATTR_FOUNDNOWILDCARD) != 0))
-		val->attributes |= VALATTR_FOUNDNONEXISTENCE;
-
-	if ((val->attributes & VALATTR_FOUNDNONEXISTENCE) == 0) {
-		if (!val->seensig && val->soaset != NULL) {
-			result = create_validator(val, val->soaname,
-						  dns_rdatatype_soa,
-						  val->soaset, NULL,
-						  negauthvalidated,
-						  "nsecvalidate");
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			return (DNS_R_WAIT);
-		}
+	     (val->attributes & VALATTR_FOUNDNOWILDCARD) != 0)) {
 		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof not found");
-		return (DNS_R_NOVALIDNSEC);
-	} else {
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof found");
+			      "nonexistence proof(s) found");
 		return (ISC_R_SUCCESS);
 	}
+
+	validator_log(val, ISC_LOG_DEBUG(3),
+		      "nonexistence proof(s) not found");
+	val->attributes |= VALATTR_AUTHNONPENDING;
+	val->attributes |= VALATTR_INSECURITY;
+	return (proveunsecure(val, ISC_FALSE));
 }
 
 static isc_boolean_t
@@ -2029,6 +2177,11 @@
 	return (ISC_FALSE);
 }
 
+/*%
+ * Callback from fetching a DLV record.
+ * 
+ * Resumes the DLV lookup process.
+ */
 static void
 dlvfetched(isc_task_t *task, isc_event_t *event) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2065,9 +2218,7 @@
 		dns_rdataset_clone(&val->frdataset, &val->dlv);
 		val->havedlvsep = ISC_TRUE;
 		validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-		result = dlv_validator_start(val);
-		if (result != DNS_R_WAIT)
-			validator_done(val, result);
+		dlv_validator_start(val);
 	} else if (eresult == DNS_R_NXRRSET ||
 		   eresult == DNS_R_NXDOMAIN ||
 		   eresult == DNS_R_NCACHENXRRSET ||
@@ -2078,9 +2229,7 @@
 					namebuf, sizeof(namebuf));
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
 				      namebuf);
-			result = dlv_validator_start(val);
-			if (result != DNS_R_WAIT)
-				validator_done(val, result);
+			dlv_validator_start(val);
 		} else if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV not found");
 			markanswer(val);
@@ -2094,6 +2243,7 @@
 	} else {
 		validator_log(val, ISC_LOG_DEBUG(3), "DLV lookup: %s",
 			      dns_result_totext(eresult));
+		validator_done(val, eresult);
 	}
 	want_destroy = exit_check(val);
 	UNLOCK(&val->lock);
@@ -2101,6 +2251,14 @@
 		destroy(val);
 }
 
+/*%
+ * Start the DLV lookup proccess.
+ * 
+ * Returns
+ * \li	ISC_R_SUCCESS
+ * \li	DNS_R_WAIT
+ * \li	Others on validation failures.
+ */
 static isc_result_t
 startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2135,9 +2293,19 @@
 	dns_name_format(dns_fixedname_name(&val->dlvsep), namebuf,
 			sizeof(namebuf));
 	validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-	return (dlv_validator_start(val));
+	dlv_validator_start(val);
+	return (DNS_R_WAIT);
 }
 
+/*%
+ * Continue the DLV lookup process.
+ *
+ * Returns
+ * \li	ISC_R_SUCCESS
+ * \li	ISC_R_NOTFOUND
+ * \li	DNS_R_WAIT
+ * \li	Others on validation failure.
+ */
 static isc_result_t
 finddlvsep(dns_validator_t *val, isc_boolean_t resume) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2147,7 +2315,7 @@
 	dns_name_t noroot;
 	isc_result_t result;
 	unsigned int labels;
-		
+
 	INSIST(val->view->dlv != NULL);
 
 	if (!resume) {
@@ -2231,11 +2399,24 @@
 	return (ISC_R_NOTFOUND);
 }
 
-/*
+/*%
  * proveunsecure walks down from the SEP looking for a break in the
- * chain of trust.   That occurs when we can prove the DS record does
+ * chain of trust.  That occurs when we can prove the DS record does
  * not exist at a delegation point or the DS exists at a delegation
  * but we don't support the algorithm/digest.
+ *
+ * If DLV is active and we look for a DLV record at or below the
+ * point we go insecure.  If found we restart the validation process.
+ * If not found or DLV isn't active we mark the response as a answer.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS		val->event->name is in a unsecure zone
+ * \li	DNS_R_WAIT		validation is in progress.
+ * \li	DNS_R_MUSTBESECURE	val->event->name is supposed to be secure
+ *				(policy) but we proved that it is unsecure.
+ * \li	DNS_R_NOVALIDSIG
+ * \li	DNS_R_NOVALIDNSEC
+ * \li	DNS_R_NOTINSECURE
  */
 static isc_result_t
 proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
@@ -2253,7 +2434,7 @@
 		result = dns_keytable_finddeepestmatch(val->keytable,
 						       val->event->name,
 						       secroot);
-
+	
 		if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3),
 				      "not beneath secure root");
@@ -2395,8 +2576,7 @@
 				goto out;
 			return (DNS_R_WAIT);
 		} else if (result == DNS_R_NXDOMAIN ||
-			   result == DNS_R_NCACHENXDOMAIN)
-		{
+			   result == DNS_R_NCACHENXDOMAIN) {
 			/*
 			 * This is not a zone cut.  Assuming things are
 			 * as expected, continue.
@@ -2441,7 +2621,10 @@
 	return (result);
 }
 
-static isc_result_t
+/*%
+ * Reset state and revalidate the answer using DLV.
+ */
+static void
 dlv_validator_start(dns_validator_t *val) {
 	isc_event_t *event;
 
@@ -2455,9 +2638,20 @@
 
 	event = (isc_event_t *)val->event;
 	isc_task_send(val->task, &event);
-	return (DNS_R_WAIT);
 }
 
+/*%
+ * Start the validation process.
+ *
+ * Attempt to valididate the answer based on the category it appears to
+ * fall in.
+ * \li	1. secure positive answer.
+ * \li	2. unsecure positive answer.
+ * \li	3. a negative answer (secure or unsecure).
+ *
+ * Note a answer that appears to be a secure positive answer may actually
+ * be a unsecure positive answer.
+ */
 static void
 validator_start(isc_task_t *task, isc_event_t *event) {
 	dns_validator_t *val;
@@ -2529,7 +2723,6 @@
 		validator_log(val, ISC_LOG_DEBUG(3),
 			      "attempting negative response validation");
 
-		val->attributes |= VALATTR_NEGATIVE;
 		if (val->event->message->rcode == dns_rcode_nxdomain) {
 			val->attributes |= VALATTR_NEEDNOQNAME;
 			val->attributes |= VALATTR_NEEDNOWILDCARD;
@@ -2640,7 +2833,7 @@
 
  cleanup_event:
 	isc_task_detach(&tclone);
-	isc_event_free((isc_event_t **)&val->event);
+	isc_event_free(ISC_EVENT_PTR(&event));
 
  cleanup_val:
 	dns_view_weakdetach(&val->view);

bind-9.3.2-ch1991_rt15813.patch:
 include/dns/message.h |   25 +++++++++++++++++++++++--
 message.c             |   42 +++++++++++++++++++++++++++++++++---------
 2 files changed, 56 insertions(+), 11 deletions(-)

--- NEW FILE bind-9.3.2-ch1991_rt15813.patch ---
--- bind-9.3.2/lib/dns/message.c.ch1991_rt15813	2005-06-06 21:42:23.000000000 -0400
+++ bind-9.3.2/lib/dns/message.c	2006-06-13 18:37:54.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.194.2.10.2.20 2005/06/07 01:42:23 marka Exp $ */
+/* $Id: message.c,v 1.194.2.10.2.24 2006/02/28 06:32:54 marka Exp $ */
 
 /***
  *** Imports
@@ -801,11 +801,37 @@
 }
 
 isc_result_t
+dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass,
+		 dns_rdatatype_t type, dns_rdatatype_t covers,
+		 dns_rdataset_t **rdataset)
+{
+	dns_rdataset_t *curr;
+
+	if (rdataset != NULL) {
+		REQUIRE(*rdataset == NULL);
+	}
+
+	for (curr = ISC_LIST_TAIL(name->list);
+	     curr != NULL;
+	     curr = ISC_LIST_PREV(curr, link)) {
+		if (curr->rdclass == rdclass &&
+		    curr->type == type && curr->covers == covers) {
+			if (rdataset != NULL)
+				*rdataset = curr;
+			return (ISC_R_SUCCESS);
+		}
+	}
+
+	return (ISC_R_NOTFOUND);
+}
+
+isc_result_t
 dns_message_findtype(dns_name_t *name, dns_rdatatype_t type,
 		     dns_rdatatype_t covers, dns_rdataset_t **rdataset)
 {
 	dns_rdataset_t *curr;
 
+	REQUIRE(name != NULL);
 	if (rdataset != NULL) {
 		REQUIRE(*rdataset == NULL);
 	}
@@ -1030,7 +1056,7 @@
 		/*
 		 * Can't ask the same question twice.
 		 */
-		result = dns_message_findtype(name, rdtype, 0, NULL);
+		result = dns_message_find(name, rdclass, rdtype, 0, NULL);
 		if (result == ISC_R_SUCCESS)
 			DO_FORMERR;
 
@@ -1190,6 +1216,7 @@
 		    && rdtype != dns_rdatatype_dnskey /* in a TKEY query */
 		    && rdtype != dns_rdatatype_sig /* SIG(0) */
 		    && rdtype != dns_rdatatype_tkey /* Win2000 TKEY */
+		    && msg->rdclass != dns_rdataclass_any
 		    && msg->rdclass != rdclass)
 			DO_FORMERR;
 
@@ -1279,12 +1306,9 @@
 			rdata->type = rdtype;
 			rdata->flags = DNS_RDATA_UPDATE;
 			result = ISC_R_SUCCESS;
-		} else if (rdtype == dns_rdatatype_tsig)
+		} else
 			result = getrdata(source, msg, dctx, rdclass,
 					  rdtype, rdatalen, rdata);
-		else
-			result = getrdata(source, msg, dctx, msg->rdclass,
-					  rdtype, rdatalen, rdata);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup;
 		rdata->rdclass = rdclass;
@@ -1360,8 +1384,8 @@
 				DO_FORMERR;
 
 			rdataset = NULL;
-			result = dns_message_findtype(name, rdtype, covers,
-						      &rdataset);
+			result = dns_message_find(name, rdclass, rdtype,
+						   covers, &rdataset);
 		}
 
 		/*
--- bind-9.3.2/lib/dns/include/dns/message.h.ch1991_rt15813	2004-03-07 21:08:00.000000000 -0500
+++ bind-9.3.2/lib/dns/include/dns/message.h	2006-06-13 19:21:33.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.100.2.3.8.7 2004/03/08 02:08:00 marka Exp $ */
+/* $Id: message.h,v 1.100.2.3.8.10 2006/02/28 06:32:54 marka Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -710,6 +710,27 @@
  *	ISC_R_NOTFOUND		-- the desired type does not exist.
  */
 
+isc_result_t
+dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass,
+		 dns_rdatatype_t type, dns_rdatatype_t covers,
+		 dns_rdataset_t **rdataset);
+/*%<
+ * Search the name for the specified rdclass and type.  If it is found,
+ * *rdataset is filled in with a pointer to that rdataset.
+ *
+ * Requires:
+ *\li	if '**rdataset' is non-NULL, *rdataset needs to be NULL.
+ *
+ *\li	'type' be a valid type, and NOT dns_rdatatype_any.
+ *
+ *\li	If 'type' is dns_rdatatype_rrsig, 'covers' must be a valid type.
+ *	Otherwise it should be 0.
+ *
+ * Returns:
+ *\li	#ISC_R_SUCCESS		-- all is well.
+ *\li	#ISC_R_NOTFOUND		-- the desired type does not exist.
+ */
+
 void
 dns_message_movename(dns_message_t *msg, dns_name_t *name,
 		     dns_section_t fromsection,

bind-9.3.2-ch1994_rt15694.patch:
 configure.in              |   59 ++++++++++++++++++++++++--
 lib/dns/openssl_link.c    |    8 +--
 lib/dns/openssldh_link.c  |   77 +++++++++++++++++++++++++++++++++-
 lib/dns/openssldsa_link.c |   81 +++++++++++++++++++++++++++++++++++-
 lib/dns/opensslrsa_link.c |  102 +++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 312 insertions(+), 15 deletions(-)

--- NEW FILE bind-9.3.2-ch1994_rt15694.patch ---
--- bind-9.3.2/configure.in.ch1994_rt15694	2006-06-14 00:37:24.000000000 -0400
+++ bind-9.3.2/configure.in	2006-06-14 00:40:04.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.294.2.23.2.51 $)
+AC_REVISION($Revision: 1.294.2.23.2.60 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -466,6 +466,9 @@
 		[AC_MSG_RESULT(assuming it does work on target platform)]
 		)
 		 
+		AC_CHECK_FUNC(DH_generate_parameters, [echo '#define HAVE_DH_GENERATE_PARAMETERS 1' > openssl_config.h])
+		AC_CHECK_FUNC(RSA_generate_key, [echo '#define  HAVE_RSA_GENERATE_KEY 1' >> openssl_config.h])
+		AC_CHECK_FUNC(DSA_generate_parameters,[echo '#define HAVE_DSA_GENERATE_PARAMETERS 1' >> openssl_config.h])
 #
 #	OpenSSLDie is new with CERT CS-2002-23.  If we see it we have may
 #	have a patched library otherwise check that we are greater than
@@ -1571,11 +1574,11 @@
 
 AC_CHECK_FUNC(strtoul,
 	[ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
+	 LWRES_PLATFORM_NEEDSTRTOUL="#undef LWRES_PLATFORM_NEEDSTRTOUL"
 	 GENRANDOMLIB=""],
 	[ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 "GENRANDOMLIB=${ISCLIBS}"])
+	 LWRES_PLATFORM_NEEDSTRTOUL="#define LWRES_PLATFORM_NEEDSTRTOUL 1"
+	 GENRANDOMLIB="${ISCLIBS}"])
 AC_SUBST(ISC_PLATFORM_NEEDSTRTOUL)
 AC_SUBST(LWRES_PLATFORM_NEEDSTRTOUL)
 AC_SUBST(GENRANDOMLIB)
@@ -1690,6 +1693,7 @@
 [optarg = 0;],
 [AC_MSG_RESULT(yes)],
 [AC_MSG_RESULT(no)
+GEN_NEED_OPTARG="-DNEED_OPTARG=1"
 AC_DEFINE(NEED_OPTARG, 1, [Defined if extern char *optarg is not declared.])])
 
 #
@@ -1753,6 +1757,17 @@
 esac
 
 #
+# Some hosts need msg_namelen to match the size of the socket structure.
+# Some hosts don't set msg_namelen appropriately on return from recvmsg().
+#
+case $host in
+*os2*|*hp-mpeix*)
+	AC_DEFINE(BROKEN_RECVMSG, 1,
+		  [Define if recvmsg() does not meet all of the BSD socket API specifications.])
+	;;
+esac
+
+#
 # Microsoft has their own way of handling shared libraries that requires
 # additional qualifiers on extern variables.  Unix systems don't need it.
 #
@@ -1865,6 +1880,16 @@
 	;;
 esac
 #
+# Solaris 2.5.1 and earlier cannot bind() then connect() a TCP socket.
+# This prevents the source address being set.
+#
+case "$host" in
+*-solaris2.[[012345]]|*-solaris2.5.1)
+	AC_DEFINE(BROKEN_TCP_BIND_BEFORE_CONNECT, 1,
+		  [Define if you cannot bind() before connect() for TCP sockets.])
+	;;
+esac
+#
 # The following sections deal with tools used for formatting
 # the documentation.  They are all optional, unless you are
 # a developer editing the documentation source.
@@ -2040,6 +2065,28 @@
 AC_SUBST_FILE(LIBLWRES_API)
 LIBLWRES_API=$srcdir/lib/lwres/api
 
+if test "cross_compiling" = "yes"; then
+	if test -z "$BUILD_CC"; then
+		AC_ERROR([BUILD_CC not set])
+	fi
+	BUILD_CFLAGS="$BUILD_CFLAGS"
+	BUILD_CPPFLAGS="$BUILD_CPPFLAGS"
+	BUILD_LDFLAGS="$BUILD_LDFLAGS"
+	BUILD_LIBS="$BUILD_LIBS"
+else
+	BUILD_CC="$CC" 
+	BUILD_CFLAGS="$CFLAGS" 
+	BUILD_CPPFLAGS="$CPPFLAGS $GEN_NEED_OPTARG"
+	BUILD_LDFLAGS="$LDFLAGS"
+	BUILD_LIBS="$LIBS"
+fi
+
+AC_SUBST(BUILD_CC)
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_CPPFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
+AC_SUBST(BUILD_LIBS)
+
 AC_OUTPUT(
 	make/rules
 	make/includes
@@ -2123,6 +2170,8 @@
 )
 chmod a+x isc-config.sh
 
+if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h; fi;
+
 # Tell Emacs to edit this file in shell mode.
 # Local Variables:
 # mode: sh
--- bind-9.3.2/lib/dns/opensslrsa_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/opensslrsa_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.4.4 2006/03/01 02:40:17 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -68,6 +68,12 @@
 	(rsa)->flags &= ~(RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_CACHE_PRIVATE); \
 	(rsa)->flags &= ~RSA_FLAG_BLINDING; \
 	} while (0)
+#elif defined(RSA_FLAG_NO_BLINDING)
+#define SET_FLAGS(rsa) \
+	do { \
+		(rsa)->flags &= ~RSA_FLAG_BLINDING; \
+		(rsa)->flags |= RSA_FLAG_NO_BLINDING; \
+	} while (0)
 #else
 #define SET_FLAGS(rsa) \
 	do { \
@@ -87,12 +93,16 @@
 		isc_md5_t *md5ctx;
 
 		md5ctx = isc_mem_get(dctx->mctx, sizeof(isc_md5_t));
+		if (md5ctx == NULL)
+			return (ISC_R_NOMEMORY);
 		isc_md5_init(md5ctx);
 		dctx->opaque = md5ctx;
 	} else {
 		isc_sha1_t *sha1ctx;
 
 		sha1ctx = isc_mem_get(dctx->mctx, sizeof(isc_sha1_t));
+		if (sha1ctx == NULL)
+			return (ISC_R_NOMEMORY);
 		isc_sha1_init(sha1ctx);
 		dctx->opaque = sha1ctx;
 	}
@@ -258,6 +268,94 @@
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_RSA_GENERATE_KEY
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+static RSA *
+RSA_generate_key(int bits, unsigned long e_value,
+		 void (*callback)(int,int,void *), void *cb_arg)
+{
+        BN_GENCB cb;
+        size_t i;
+        RSA *rsa = RSA_new();
+        BIGNUM *e = BN_new();
+
+        if (rsa == NULL || e == NULL)
+		goto err;
+
+        /* The problem is when building with 8, 16, or 32 BN_ULONG,
+         * unsigned long can be larger */
+        for (i = 0; i < sizeof(unsigned long) * 8; i++) {
+                if ((e_value & (1UL<<i)) != 0)
+                        BN_set_bit(e, i);
+	}
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if (RSA_generate_key_ex(rsa, bits, e, &cb)) {
+                BN_free(e);
+                return (rsa);
+        }
+err:
+        if (e != NULL)
+		BN_free(e);
+        if (rsa != NULL)
+		RSA_free(rsa);
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 opensslrsa_generate(dst_key_t *key, int exp) {
 	RSA *rsa;
--- bind-9.3.2/lib/dns/openssl_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/openssl_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: openssl_link.c,v 1.1.4.3 2006/05/23 23:51:03 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -39,7 +39,7 @@
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
 
-#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER < 0x00907000L)
+#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER != 0x00907000L)
 #define USE_ENGINE 1
 #endif
 
@@ -160,7 +160,7 @@
 		goto cleanup_rm;
 	}
 	ENGINE_set_RAND(e, rm);
-	RAND_set_rand_method(e);
+	RAND_set_rand_method(rm);
 #else
 	RAND_set_rand_method(rm);
 #endif
--- bind-9.3.2/lib/dns/openssldh_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/openssldh_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: openssldh_link.c,v 1.1.4.3 2006/03/02 00:37:20 marka Exp $
  */
 
 #ifdef OPENSSL
@@ -138,6 +138,79 @@
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_DH_GENERATE_PARAMETERS
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+static DH *
+DH_generate_parameters(int prime_len, int generator,
+		       void (*callback)(int,int,void *), void *cb_arg)
+{
+        BN_GENCB cb;
+        DH *dh = NULL;
+
+	dh = DH_new();
+	if (dh != NULL) {
+		BN_GENCB_set_old(&cb, callback, cb_arg);
+
+		if (DH_generate_parameters_ex(dh, prime_len, generator, &cb))
+			return (dh);
+		DH_free(dh);
+	}
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 openssldh_generate(dst_key_t *key, int generator) {
 	DH *dh = NULL;
--- bind-9.3.2/lib/dns/openssldsa_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/openssldsa_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.1.4.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifdef OPENSSL
 
@@ -169,6 +169,83 @@
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_DSA_GENERATE_PARAMETERS
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+static DSA *
+DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
+			int *counter_ret, unsigned long *h_ret,
+			void (*callback)(int, int, void *),
+			void *cb_arg)
+{
+        BN_GENCB cb;
+        DSA *dsa;
+ 
+        dsa = DSA_new();
+	if (dsa != NULL) {
+ 
+		BN_GENCB_set_old(&cb, callback, cb_arg);
+  
+		if (DSA_generate_parameters_ex(dsa, bits, seed_in, seed_len,  
+					       counter_ret, h_ret, &cb))
+			return (dsa);
+		DSA_free(dsa);
+	}
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 openssldsa_generate(dst_key_t *key, int unused) {
 	DSA *dsa;

bind-9.3.2-ch1997_rt15818.patch:
 rbtdb.c |  202 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 128 insertions(+), 74 deletions(-)

--- NEW FILE bind-9.3.2-ch1997_rt15818.patch ---
--- bind-9.3.2/lib/dns/rbtdb.c.ch1997_rt15818	2005-10-13 21:38:48.000000000 -0400
+++ bind-9.3.2/lib/dns/rbtdb.c	2006-06-13 18:17:55.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.168.2.11.2.22 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: rbtdb.c,v 1.168.2.11.2.26 2006/03/02 23:18:20 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -1011,6 +1011,47 @@
 	}
 }
 
+static isc_boolean_t
+iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
+	dns_rdataset_t keyset;
+	dns_rdataset_t nsecset, signsecset;
+	isc_boolean_t haszonekey = ISC_FALSE;
+	isc_boolean_t hasnsec = ISC_FALSE;
+	isc_result_t result;
+
+	dns_rdataset_init(&keyset);
+	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_dnskey, 0,
+				     0, &keyset, NULL);
+	if (result == ISC_R_SUCCESS) {
+		dns_rdata_t keyrdata = DNS_RDATA_INIT;
+		result = dns_rdataset_first(&keyset);
+		while (result == ISC_R_SUCCESS) {
+			dns_rdataset_current(&keyset, &keyrdata);
+			if (dns_zonekey_iszonekey(&keyrdata)) {
+				haszonekey = ISC_TRUE;
+				break;
+			}
+			result = dns_rdataset_next(&keyset);
+		}
+		dns_rdataset_disassociate(&keyset);
+	}
+	if (!haszonekey)
+		return (ISC_FALSE);
+
+	dns_rdataset_init(&nsecset);
+	dns_rdataset_init(&signsecset);
+	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_nsec, 0,
+				     0, &nsecset, &signsecset);
+	if (result == ISC_R_SUCCESS) {
+		if (dns_rdataset_isassociated(&signsecset)) {
+			hasnsec = ISC_TRUE;
+			dns_rdataset_disassociate(&signsecset);
+		}
+		dns_rdataset_disassociate(&nsecset);
+	}
+	return (hasnsec);
+}
+
 static void
 closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
@@ -1136,6 +1177,12 @@
 	least_serial = rbtdb->least_serial;
 	UNLOCK(&rbtdb->lock);
 
+	/*
+	 * Update the zone's secure status.
+	 */
+	if (version->writer && commit && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	if (cleanup_version != NULL) {
 		INSIST(EMPTY(cleanup_version->changed_list));
 		isc_mem_put(rbtdb->common.mctx, cleanup_version,
@@ -2184,12 +2231,12 @@
 
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
-	 * (RFC 2535, section 2.3.5).
+	 * (RFC4035, section 2.5 and RFC3007).
 	 *
 	 * We don't check for RRSIG, because we don't store RRSIG records
 	 * directly.
 	 */
-	if (type == dns_rdatatype_dnskey || type == dns_rdatatype_nsec)
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec)
 		cname_ok = ISC_FALSE;
 
 	/*
@@ -2247,9 +2294,15 @@
 				search.need_cleanup = ISC_TRUE;
 				maybe_zonecut = ISC_FALSE;
 				at_zonecut = ISC_TRUE;
+				/*
+				 * It is not clear if KEY should still be
+				 * allowed at the parent side of the zone
+				 * cut or not.  It is needed for RFC3007
+				 * validated updates.
+				 */
 				if ((search.options & DNS_DBFIND_GLUEOK) == 0
 				    && type != dns_rdatatype_nsec
-				    && type != dns_rdatatype_dnskey) {
+				    && type != dns_rdatatype_key) {
 					/*
 					 * Glue is not OK, but any answer we
 					 * could return would be glue.  Return
@@ -2430,8 +2483,14 @@
 		 * and the type is NSEC or KEY.
 		 */
 		if (search.zonecut == node) {
+			/*
+			 * It is not clear if KEY should still be
+			 * allowed at the parent side of the zone
+			 * cut or not.  It is needed for RFC3007
+			 * validated updates.
+			 */
 			if (type == dns_rdatatype_nsec ||
-			    type == dns_rdatatype_dnskey)
+			    type == dns_rdatatype_key)
 				result = ISC_R_SUCCESS;
 			else if (type == dns_rdatatype_any)
 				result = DNS_R_ZONECUT;
@@ -2860,7 +2919,7 @@
 	rdatasetheader_t *header, *header_prev, *header_next;
 	rdatasetheader_t *found, *nsheader;
 	rdatasetheader_t *foundsig, *nssig, *cnamesig;
-	rbtdb_rdatatype_t sigtype, nsectype;
+	rbtdb_rdatatype_t sigtype, negtype;
 
 	UNUSED(version);
 
@@ -2918,12 +2977,12 @@
 
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
-	 * (RFC 2535, section 2.3.5).
+	 * (RFC4035, section 2.5 and RFC3007).
 	 *
 	 * We don't check for RRSIG, because we don't store RRSIG records
 	 * directly.
 	 */
-	if (type == dns_rdatatype_dnskey || type == dns_rdatatype_nsec)
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec)
 		cname_ok = ISC_FALSE;
 
 	/*
@@ -2935,7 +2994,7 @@
 	found = NULL;
 	foundsig = NULL;
 	sigtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
-	nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+	negtype = RBTDB_RDATATYPE_VALUE(0, type);
 	nsheader = NULL;
 	nssig = NULL;
 	cnamesig = NULL;
@@ -3007,7 +3066,7 @@
 				 */
 				foundsig = header;
 			} else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-				   header->type == nsectype) {
+				   header->type == negtype) {
 				/*
 				 * We've found a negative cache entry.
 				 */
@@ -3618,7 +3677,7 @@
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
 	dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node;
 	rdatasetheader_t *header, *header_next, *found, *foundsig;
-	rbtdb_rdatatype_t matchtype, sigmatchtype, nsectype;
+	rbtdb_rdatatype_t matchtype, sigmatchtype, negtype;
 	isc_result_t result;
 
 	REQUIRE(VALID_RBTDB(rbtdb));
@@ -3636,7 +3695,7 @@
 	found = NULL;
 	foundsig = NULL;
 	matchtype = RBTDB_RDATATYPE_VALUE(type, covers);
-	nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+	negtype = RBTDB_RDATATYPE_VALUE(0, type);
 	if (covers == 0)
 		sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
 	else
@@ -3659,7 +3718,7 @@
 			if (header->type == matchtype)
 				found = header;
 			else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-				 header->type == nsectype)
+				 header->type == negtype)
 				found = header;
 			else if (header->type == sigmatchtype)
 				foundsig = header;
@@ -3785,16 +3844,13 @@
 			 * Look for active extant "other data".
 			 *
 			 * "Other data" is any rdataset whose type is not
-			 * DNSKEY, RRSIG DNSKEY, NSEC, RRSIG NSEC,
-			 * or RRSIG CNAME.
+			 * KEY, RRSIG KEY, NSEC, RRSIG NSEC or RRSIG CNAME.
 			 */
 			rdtype = RBTDB_RDATATYPE_BASE(header->type);
 			if (rdtype == dns_rdatatype_rrsig ||
 			    rdtype == dns_rdatatype_sig)
 				rdtype = RBTDB_RDATATYPE_EXT(header->type);
 			if (rdtype != dns_rdatatype_nsec &&
-			    rdtype != dns_rdatatype_dnskey &&
-			    rdtype != dns_rdatatype_nxt &&
 			    rdtype != dns_rdatatype_key &&
 			    rdtype != dns_rdatatype_cname) {
 				/*
@@ -3839,7 +3895,8 @@
 	isc_boolean_t header_nx;
 	isc_boolean_t newheader_nx;
 	isc_boolean_t merge;
-	dns_rdatatype_t nsectype, rdtype, covers;
+	dns_rdatatype_t rdtype, covers;
+	rbtdb_rdatatype_t negtype;
 	dns_trust_t trust;
 
 	/*
@@ -3877,7 +3934,7 @@
 	newheader_nx = NONEXISTENT(newheader) ? ISC_TRUE : ISC_FALSE;
 	topheader_prev = NULL;
 
-	nsectype = 0;
+	negtype = 0;
 	if (rbtversion == NULL && !newheader_nx) {
 		rdtype = RBTDB_RDATATYPE_BASE(newheader->type);
 		if (rdtype == 0) {
@@ -3887,12 +3944,13 @@
 			covers = RBTDB_RDATATYPE_EXT(newheader->type);
 			if (covers == dns_rdatatype_any) {
 				/*
-				 * We're adding an NXDOMAIN negative cache
-				 * entry.
+				 * We're adding an negative cache entry
+				 * which covers all types (NXDOMAIN,
+				 * NODATA(QTYPE=ANY)).
 				 *
 				 * We make all other data stale so that the
 				 * only rdataset that can be found at this
-				 * node is the NXDOMAIN negative cache entry.
+				 * node is the negative cache entry.
 				 */
 				for (topheader = rbtnode->data;
 				     topheader != NULL;
@@ -3904,17 +3962,19 @@
 				rbtnode->dirty = 1;
 				goto find_header;
 			}
-			nsectype = RBTDB_RDATATYPE_VALUE(covers, 0);
+			negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
 		} else {
 			/*
 			 * We're adding something that isn't a
 			 * negative cache entry.  Look for an extant
-			 * non-stale NXDOMAIN negative cache entry.
+			 * non-stale NXDOMAIN/NODATA(QTYPE=ANY) negative
+			 * cache entry.
 			 */
 			for (topheader = rbtnode->data;
 			     topheader != NULL;
 			     topheader = topheader->next) {
-				if (NXDOMAIN(topheader))
+				if (topheader->type == 
+				    RBTDB_RDATATYPE_NCACHEANY)
 					break;
 			}
 			if (topheader != NULL && EXISTS(topheader) &&
@@ -3924,7 +3984,8 @@
 				 */
 				if (trust < topheader->trust) {
 					/*
-					 * The NXDOMAIN is more trusted.
+					 * The NXDOMAIN/NODATA(QTYPE=ANY)
+					 * is more trusted.
 					 */
 					free_rdataset(rbtdb->common.mctx,
 						      newheader);
@@ -3936,7 +3997,7 @@
 				}
 				/*
 				 * The new rdataset is better.  Expire the
-				 * NXDOMAIN.
+				 * NXDOMAIN/NODATA(QTYPE=ANY).
 				 */
 				topheader->ttl = 0;
 				topheader->attributes |= RDATASET_ATTR_STALE;
@@ -3944,7 +4005,7 @@
 				topheader = NULL;
 				goto find_header;
 			}
-			nsectype = RBTDB_RDATATYPE_VALUE(0, rdtype);
+			negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
 		}
 	}
 
@@ -3952,7 +4013,7 @@
 	     topheader != NULL;
 	     topheader = topheader->next) {
 		if (topheader->type == newheader->type ||
-		    topheader->type == nsectype)
+		    topheader->type == negtype)
 			break;
 		topheader_prev = topheader;
 	}
@@ -4118,6 +4179,10 @@
 			rbtnode->dirty = 1;
 			if (changed != NULL)
 				changed->dirty = ISC_TRUE;
+			if (rbtversion == NULL) {
+				header->ttl = 0;
+				header->attributes |= RDATASET_ATTR_STALE;
+			}
 		}
 	} else {
 		/*
@@ -4318,6 +4383,13 @@
 	if (delegating)
 		RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4460,6 +4532,13 @@
  unlock:
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4501,6 +4580,13 @@
 
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4615,48 +4701,6 @@
 	return (ISC_R_SUCCESS);
 }
 
-static isc_boolean_t
-iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
-	dns_rdataset_t keyset;
-	dns_rdataset_t nsecset, signsecset;
-	isc_boolean_t haszonekey = ISC_FALSE;
-	isc_boolean_t hasnsec = ISC_FALSE;
-	isc_result_t result;
-
-	dns_rdataset_init(&keyset);
-	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_dnskey, 0,
-				     0, &keyset, NULL);
-	if (result == ISC_R_SUCCESS) {
-		dns_rdata_t keyrdata = DNS_RDATA_INIT;
-		result = dns_rdataset_first(&keyset);
-		while (result == ISC_R_SUCCESS) {
-			dns_rdataset_current(&keyset, &keyrdata);
-			if (dns_zonekey_iszonekey(&keyrdata)) {
-				haszonekey = ISC_TRUE;
-				break;
-			}
-			result = dns_rdataset_next(&keyset);
-		}
-		dns_rdataset_disassociate(&keyset);
-	}
-	if (!haszonekey)
-		return (ISC_FALSE);
-
-	dns_rdataset_init(&nsecset);
-	dns_rdataset_init(&signsecset);
-	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_nsec, 0,
-				     0, &nsecset, &signsecset);
-	if (result == ISC_R_SUCCESS) {
-		if (dns_rdataset_isassociated(&signsecset)) {
-			hasnsec = ISC_TRUE;
-			dns_rdataset_disassociate(&signsecset);
-		}
-		dns_rdataset_disassociate(&nsecset);
-	}
-	return (hasnsec);
-
-}
-
 static isc_result_t
 endload(dns_db_t *db, dns_dbload_t **dbloadp) {
 	rbtdb_load_t *loadctx;
@@ -5235,7 +5279,8 @@
 	rdatasetheader_t *header, *top_next;
 	rbtdb_serial_t serial;
 	isc_stdtime_t now;
-	rbtdb_rdatatype_t type;
+	rbtdb_rdatatype_t type, negtype;
+	dns_rdatatype_t rdtype, covers;
 
 	header = rbtiterator->current;
 	if (header == NULL)
@@ -5252,9 +5297,18 @@
 	LOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
 	type = header->type;
+	rdtype = RBTDB_RDATATYPE_BASE(header->type);
+	if (rdtype == 0) {
+		covers = RBTDB_RDATATYPE_EXT(header->type);
+		negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
+	} else 
+		negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
 	for (header = header->next; header != NULL; header = top_next) {
 		top_next = header->next;
-		if (header->type != type) {
+		/*
+		 * If not walking back up the down list.
+		 */
+		if (header->type != type && header->type != negtype) {
 			do {
 				if (header->serial <= serial &&
 				    !IGNORE(header)) {

bind-9.3.2-ch2009_rt15808.patch:
 masterdump.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bind-9.3.2-ch2009_rt15808.patch ---
--- bind-9.3.2/lib/dns/masterdump.c.ch2009_rt15808	2004-08-28 02:25:19.000000000 -0400
+++ bind-9.3.2/lib/dns/masterdump.c	2006-06-13 18:08:18.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.56.2.5.2.12 2004/08/28 06:25:19 marka Exp $ */
+/* $Id: masterdump.c,v 1.56.2.5.2.15 2006/03/10 00:17:21 marka Exp $ */
 
 #include <config.h>
 
@@ -1160,7 +1160,8 @@
 	}
 
 	if (dctx->nodes != 0 && result == ISC_R_SUCCESS) {
-		dns_dbiterator_pause(dctx->dbiter);
+		result = dns_dbiterator_pause(dctx->dbiter);
+		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 		result = DNS_R_CONTINUE;
 	} else if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
@@ -1197,9 +1198,8 @@
 		dns_dumpctx_attach(dctx, dctxp);
 		return (DNS_R_CONTINUE);
 	}
-	if (dctx != NULL)
-		dns_dumpctx_detach(&dctx);
 
+	dns_dumpctx_detach(&dctx);
 	return (result);
 }
 

bind-9.3.2-ch2013_rt15941.patch:
 tsig.c |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

--- NEW FILE bind-9.3.2-ch2013_rt15941.patch ---
--- bind-9.3.2/lib/dns/tsig.c.ch2013_rt15941	2005-03-16 22:58:31.000000000 -0500
+++ bind-9.3.2/lib/dns/tsig.c	2006-06-13 18:02:14.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.112.2.3.8.6 2005/03/17 03:58:31 marka Exp $
+ * $Id: tsig.c,v 1.112.2.3.8.10 2006/05/02 04:21:42 marka Exp $
  */
 
 #include <config.h>
@@ -363,7 +363,7 @@
 	isc_buffer_t databuf, sigbuf;
 	isc_buffer_t *dynbuf;
 	dns_name_t *owner;
-	dns_rdata_t *rdata;
+	dns_rdata_t *rdata = NULL;
 	dns_rdatalist_t *datalist;
 	dns_rdataset_t *dataset;
 	isc_region_t r;
@@ -555,13 +555,12 @@
 		tsig.signature = NULL;
 	}
 
-	rdata = NULL;
 	ret = dns_message_gettemprdata(msg, &rdata);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_signature;
 	ret = isc_buffer_allocate(msg->mctx, &dynbuf, 512);
 	if (ret != ISC_R_SUCCESS)
-		goto cleanup_signature;
+		goto cleanup_rdata;
 	ret = dns_rdata_fromstruct(rdata, dns_rdataclass_any,
 				   dns_rdatatype_tsig, &tsig, dynbuf);
 	if (ret != ISC_R_SUCCESS)
@@ -577,7 +576,7 @@
 	owner = NULL;
 	ret = dns_message_gettempname(msg, &owner);
 	if (ret != ISC_R_SUCCESS)
-		goto cleanup_dynbuf;
+		goto cleanup_rdata;
 	dns_name_init(owner, NULL);
 	ret = dns_name_dup(&key->name, msg->mctx, owner);
 	if (ret != ISC_R_SUCCESS)
@@ -587,16 +586,16 @@
 	ret = dns_message_gettemprdatalist(msg, &datalist);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_owner;
+	dataset = NULL;
+	ret = dns_message_gettemprdataset(msg, &dataset);
+	if (ret != ISC_R_SUCCESS)
+		goto cleanup_rdatalist;
 	datalist->rdclass = dns_rdataclass_any;
 	datalist->type = dns_rdatatype_tsig;
 	datalist->covers = 0;
 	datalist->ttl = 0;
 	ISC_LIST_INIT(datalist->rdata);
 	ISC_LIST_APPEND(datalist->rdata, rdata, link);
-	dataset = NULL;
-	ret = dns_message_gettemprdataset(msg, &dataset);
-	if (ret != ISC_R_SUCCESS)
-		goto cleanup_owner;
 	dns_rdataset_init(dataset);
 	RUNTIME_CHECK(dns_rdatalist_tordataset(datalist, dataset)
 		      == ISC_R_SUCCESS);
@@ -605,16 +604,19 @@
 
 	return (ISC_R_SUCCESS);
 
-cleanup_owner:
-	if (owner != NULL)
-		dns_message_puttempname(msg, &owner);
-cleanup_dynbuf:
-	if (dynbuf != NULL)
-		isc_buffer_free(&dynbuf);
-cleanup_signature:
+ cleanup_rdatalist:
+	dns_message_puttemprdatalist(msg, &datalist);
+ cleanup_owner:
+	dns_message_puttempname(msg, &owner);
+	goto cleanup_rdata;
+ cleanup_dynbuf:
+	isc_buffer_free(&dynbuf);
+ cleanup_rdata:
+	dns_message_puttemprdata(msg, &rdata);
+ cleanup_signature:
 	if (tsig.signature != NULL)
 		isc_mem_put(mctx, tsig.signature, sigsize);
-cleanup_context:
+ cleanup_context:
 	if (ctx != NULL)
 		dst_context_destroy(&ctx);
 	return (ret);
@@ -646,8 +648,11 @@
 
 	msg->verify_attempted = 1;
 
-	if (msg->tcp_continuation)
+	if (msg->tcp_continuation) {
+		if (tsigkey == NULL || msg->querytsig == NULL)
+			return (DNS_R_UNEXPECTEDTSIG);
 		return (tsig_verify_tcp(source, msg));
+	}
 
 	/*
 	 * There should be a TSIG record...

bind-9.3.2-ch2024_rt16027.patch:
 zone.c |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

--- NEW FILE bind-9.3.2-ch2024_rt16027.patch ---
--- bind-9.3.2/lib/dns/zone.c.ch2024_rt16027	2005-07-28 20:38:33.000000000 -0400
+++ bind-9.3.2/lib/dns/zone.c	2006-06-13 17:47:56.000000000 -0400
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.333.2.23.2.59 2005/07/29 00:38:33 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.23.2.64 2006/05/18 02:28:55 marka Exp $ */
 
 #include <config.h>
 
@@ -772,12 +772,10 @@
 
  nomem:
 	if (new != NULL) {
-		for (i = 0; i < dbargc; i++) {
-			if (zone->db_argv[i] != NULL)
+		for (i = 0; i < dbargc; i++)
+			if (new[i] != NULL)
 				isc_mem_free(zone->mctx, new[i]);
-			isc_mem_put(zone->mctx, new,
-				    dbargc * sizeof(*new));
-		}
+		isc_mem_put(zone->mctx, new, dbargc * sizeof(*new));
 	}
 	result = ISC_R_NOMEMORY;
 
@@ -998,7 +996,7 @@
 			result = isc_file_getmodtime(zone->masterfile,
 						     &filetime);
 			if (result == ISC_R_SUCCESS &&
-			    isc_time_compare(&filetime, &zone->loadtime) < 0) {
+			    isc_time_compare(&filetime, &zone->loadtime) <= 0) {
 				dns_zone_log(zone, ISC_LOG_DEBUG(1),
 					     "skipping load: master file older "
 					     "than last load");
@@ -1010,6 +1008,16 @@
 
 	INSIST(zone->db_argc >= 1);
 
+	/*
+	 * Built in zones don't need to be reloaded.
+	 */
+	if (zone->type == dns_zone_master &&
+	    strcmp(zone->db_argv[0], "_builtin") == 0 &&
+	    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
+		result = ISC_R_SUCCESS;
+		goto cleanup;
+	}
+
 	if ((zone->type == dns_zone_slave || zone->type == dns_zone_stub) &&
 	    (strcmp(zone->db_argv[0], "rbt") == 0 ||
 	     strcmp(zone->db_argv[0], "rbt64") == 0)) {
@@ -1210,10 +1218,12 @@
 				       zone_gotreadhandle, load,
 				       &zone->readio);
 		if (result != ISC_R_SUCCESS) {
-			tresult = dns_db_endload(load->db,
-						 &load->callbacks.add_private);
-			if (result == ISC_R_SUCCESS)
-				result = tresult;
+			/*
+			 * We can't report multiple errors so ignore
+			 * the result of dns_db_endload().
+			 */
+			(void)dns_db_endload(load->db,
+					     &load->callbacks.add_private);
 			goto cleanup;
 		} else
 			result = DNS_R_CONTINUE;
@@ -1284,14 +1294,12 @@
 	dns_zone_log(zone, ISC_LOG_DEBUG(2),
 		     "number of nodes in database: %u",
 		     dns_db_nodecount(db));
-	zone->loadtime = loadtime;
-
-	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
 
 	if (result == DNS_R_SEENINCLUDE)
 		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
 	else
 		DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
+
 	/*
 	 * Apply update log, if any, on initial load.
 	 */
@@ -1323,6 +1331,10 @@
 			needdump = ISC_TRUE;
 	}
 
+	zone->loadtime = loadtime;
+
+	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
+
 	/*
 	 * Obtain ns and soa counts for top of zone.
 	 */
@@ -2274,6 +2286,7 @@
 	isc_interval_t i;
 	isc_uint32_t oldflags;
 	unsigned int j;
+	isc_result_t result;
 
 	REQUIRE(DNS_ZONE_VALID(zone));
 
@@ -2307,7 +2320,11 @@
 	 */
 	isc_interval_set(&i, isc_random_jitter(zone->retry, zone->retry / 4),
 			 0);
-	isc_time_nowplusinterval(&zone->refreshtime, &i);
+	result = isc_time_nowplusinterval(&zone->refreshtime, &i);
+	if (result != ISC_R_SUCCESS)
+		dns_zone_log(zone, ISC_LOG_WARNING,
+			     "isc_time_nowplusinterval() failed: %s",
+			     dns_result_totext(result));
 
 	/*
 	 * When lacking user-specified timer values from the SOA,


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bind-chroot-admin.in	19 Apr 2006 00:19:58 -0000	1.8
+++ bind-chroot-admin.in	14 Jun 2006 05:26:43 -0000	1.9
@@ -50,6 +50,15 @@
     return 1;
 }
 
+function selinux_enabled()
+{
+    [ -e /etc/selinux/config ] && . /etc/selinux/config;
+    if [ -n "$SELINUX" ] && [ "$SELINUX" != 'disabled' ] ; then
+	return 0;
+    fi;
+    return 1;
+}
+
 function check_dirs()
 {
     if [ -z "$BIND_CHROOT_PREFIX" ]; then
@@ -89,7 +98,7 @@
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
     chown root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
     chmod 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
-    if [ -d /selinux ] && [ -e /selinux/enforce ] && [ -x /usr/bin/chcon ]; then       
+    if selinux_enabled && [ -x /usr/bin/chcon ]; then       
        for dev in random zero null; do
 	   /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
        done
@@ -250,7 +259,7 @@
     chmod 660 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
-	if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then
+	if selinux_enabled && [ -x /sbin/restorecon ]; then
 	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
 	   if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then 
 	      /usr/bin/chcon --reference=/etc/localtime ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- bind.spec	7 Jun 2006 21:08:50 -0000	1.108
+++ bind.spec	14 Jun 2006 05:26:43 -0000	1.109
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 24.FC6
+Release: 	26.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -89,6 +89,24 @@
 Patch30:	bind-9.3.2-bz187286_fix_host_cname.patch
 Patch31:	bind-9.3.2-bz173961.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
+Patch33:	bind-9.3.2-ch2024_rt16027.patch
+Patch34:        bind-9.3.2-ch2013_rt15941.patch
+Patch35:	bind-9.3.2-ch2009_rt15808.patch
+Patch36:	bind-9.3.2-ch1997_rt15818.patch
+Patch37:	bind-9.3.2-ch1994_rt15694.patch
+Patch38:	bind-9.3.2-ch1991_rt15813.patch
+Patch39:	bind-9.3.2-9_3_3_validator.patch
+Patch40:	bind-9.3.2-9_3_3_resolver.patch
+Patch41:	bind-9.3.2-9_3_3_dns.patch
+Patch42:	bind-9.3.2-9_3_3_isc.patch
+Patch43:        bind-9.3.2-9_3_3_bind.patch
+Patch44:	bind-9.3.2-9_3_3_isccfg.patch
+Patch45:	bind-9.3.2-9_3_3_lwres.patch
+Patch46:	bind-9.3.2-9_3_3_named.patch
+Patch47:	bind-9.3.2-9_3_3_dig.patch
+Patch48:	bind-9.3.2-9_3_3_dnssec.patch
+Patch49:	bind-9.3.2-9_3_3_nsupdate.patch
+Patch50:	bind-9.3.2-9_3_3_tests.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
@@ -97,7 +115,7 @@
 %if %{selinux}
 Requires(post):	policycoreutils
 %endif
-BuildRequires: 	gcc, glibc-devel >= 2.2.5-26,  glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, pkgconfig, tar
+BuildRequires: 	gcc, glibc-devel >= 2.2.5-26,  glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, autoconf, pkgconfig
 %if %{SDB}
 BuildRequires:  openldap-devel, postgresql-devel
 %endif
@@ -317,6 +335,24 @@
 %patch30 -p1 -b .bz187286_fix_host_cname
 %patch31 -p1 -b .bz173961
 %patch32 -p1 -b .prctl_set_dumpable
+%patch33 -p1 -b .ch2024_rt16027
+%patch34 -p1 -b .ch2013_rt15941
+%patch35 -p1 -b .ch2009_rt15808
+%patch36 -p1 -b .ch1997_rt15818
+%patch37 -p1 -b .ch1994_rt15694
+%patch38 -p1 -b .ch1991_rt15813
+%patch39 -p1 -b .9_3_3_validator
+%patch40 -p1 -b .9_3_3_resolver
+%patch41 -p1 -b .9_3_3_dns
+%patch42 -p1 -b .9_3_3_isc
+%patch43 -p1 -b .9_3_3_bind
+%patch44 -p1 -b .9_3_3_isccfg
+%patch45 -p1 -b .9_3_3_lwres
+%patch46 -p1 -b .9_3_3_named 
+%patch47 -p1 -b .9_3_3_dig
+%patch48 -p1 -b .9_3_3_dnssec
+%patch49 -p1 -b .9_3_3_nsupdate
+%patch50 -p1 -b .9_3_3_tests
 #
 # this must follow all dbus patches:
 %if %{SDB}
@@ -363,6 +399,7 @@
 %endif
 	CFLAGS="$CFLAGS" \
 ;
+if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi;
 make %{?_smp_mflags}
 
 
@@ -503,7 +540,7 @@
 %dir /var/named/slaves
 %dir /var/named/data
 %dir /var/run/named
-%defattr(0750,root,root,0750)
+%defattr(0754,root,root,0750)
 %config /etc/rc.d/init.d/named
 %defattr(0640,root,named,0750)
 %config(noreplace) /etc/sysconfig/named
@@ -806,6 +843,33 @@
 :;
 
 %changelog
+* Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-26.FC6
+- fix bugs 191093, 189789
+- backport selected fixes from upstream bind9 'v9_3_3b1' CVS version:
+  ( see http://www.isc.org/sw/bind9.3.php "Fixes" ): 
+  o change 2024 / bug 16027:
+    named emitted spurious "zone serial unchanged" messages on reload
+  o change 2013 / bug 15941:
+    handle unexpected TSIGs on unsigned AXFR/IXFR responses more gracefully
+  o change 2009 / bug 15808: coverity fixes
+  o change 1997 / bug 15818: 
+    named was failing to replace negative cache entries when a positive one
+    for the type was learnt
+  o change 1994 / bug 15694: OpenSSL 0.9.8 support
+  o change 1991 / bug 15813:
+    The configuration data, once read, should be treated as readonly.
+  o misc. validator fixes 
+  o misc. resolver fixes
+  o misc. dns fixes
+  o misc. isc fixes
+  o misc. libbind fixes
+  o misc. isccfg fix
+  o misc. lwres fix
+  o misc. named fixes
+  o misc. dig fixes
+  o misc. nsupdate fix
+  o misc. tests fixes
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 30:9.3.2-24.FC6
 - and actually put the devel symlinks in the right subpackage
 


Index: named.conf.sample
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.conf.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- named.conf.sample	30 Mar 2006 00:35:52 -0000	1.1
+++ named.conf.sample	14 Jun 2006 05:26:43 -0000	1.2
@@ -68,8 +68,8 @@
 /* This view will contain zones you want to serve only to "internal" clients
    that connect via your directly attached LAN interfaces - "localnets" .
  */
-	match-clients		{ !localnets; !localhost; };
-	match-destinations	{ !localnets; !localhost; };
+	match-clients		{ localnets; };
+	match-destinations	{ localnets; };
 	recursion yes;
 	// all views must contain the root hints zone:
 	include "/etc/named.root.hints";



From fedora-cvs-commits at redhat.com  Wed Jun 14 09:19:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 05:19:24 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.11,1.12
Message-ID: <200606140919.k5E9JO1h004316@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4270

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Wed Jun 14 2006 Alexander Larsson <alexl at redhat.com> - 0.5-4
- Rebuild again, hopefully fixing libbluetooth issue





Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nautilus-sendto.spec	12 Jun 2006 09:15:33 -0000	1.11
+++ nautilus-sendto.spec	14 Jun 2006 09:19:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.5
-Release: 	3
+Release: 	4
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -76,6 +76,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Alexander Larsson <alexl at redhat.com> - 0.5-4
+- Rebuild again, hopefully fixing libbluetooth issue
+
 * Mon Jun 12 2006 Alexander Larsson <alexl at redhat.com> - 0.5-3
 - Rebuild for new libbluetooth soname
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 09:35:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 05:35:29 -0400
Subject: rpms/kdewebdev/FC-5 kdewebdev.spec,1.31,1.32
Message-ID: <200606140935.k5E9ZQOu009028@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8977

Modified Files:
	kdewebdev.spec 
Log Message:
build -O0 on s390(x) (gcc workaround)




Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdewebdev.spec	13 Jun 2006 13:57:36 -0000	1.31
+++ kdewebdev.spec	14 Jun 2006 09:35:23 -0000	1.32
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -163,6 +163,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
+- build -O0 on s390(x) (gcc workaround)
+
 * Tue Jun 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 09:36:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 05:36:09 -0400
Subject: rpms/libbtctl/devel libbtctl.spec,1.38,1.39
Message-ID: <200606140936.k5E9a9Fr009165@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9134

Modified Files:
	libbtctl.spec 
Log Message:
rebuilt for openobex


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libbtctl.spec	11 Jun 2006 15:57:51 -0000	1.38
+++ libbtctl.spec	14 Jun 2006 09:36:06 -0000	1.39
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -105,6 +105,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 0.6.0-9
+- rebuilt for openobex
+
 * Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-8
 - Bump for new libbluetooth
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 09:52:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 05:52:04 -0400
Subject: rpms/kdelibs/FC-4 kdelibs-3.5.3-konqueror-khtml.patch, NONE,
	1.1 kdelibs.spec, 1.105, 1.106
Message-ID: <200606140952.k5E9q48v028153@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28095

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-konqueror-khtml.patch 
Log Message:
apply patch to fix crash in konqueror



kdelibs-3.5.3-konqueror-khtml.patch:
 dom_stringimpl.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdelibs-3.5.3-konqueror-khtml.patch ---
--- kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp.orig	2006-06-14 11:47:06.000000000 +0200
+++ kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp	2006-06-14 11:49:01.000000000 +0200
@@ -308,6 +308,11 @@
     str = str.simplifyWhiteSpace();
 
     len = str.contains(',') + 1;
+
+    // If we have no commas, we have no array. 
+    if( len == 1 ) 
+        return 0L; 
+ 
     khtml::Length* r = new khtml::Length[len];
 
     int i = 0;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- kdelibs.spec	1 Jun 2006 21:54:51 -0000	1.105
+++ kdelibs.spec	14 Jun 2006 09:52:01 -0000	1.106
@@ -22,7 +22,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 0.1.fc4
+Release: 0.2.fc4
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -52,6 +52,9 @@
 Patch37: kdelibs-3.5.2-aspell.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
+# upstream patches
+Patch100: kdelibs-3.5.3-konqueror-khtml.patch
+
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -177,6 +180,9 @@
 %patch37 -p1 -b .aspell
 %patch38 -p1 -b .cupsdconf2-group
 
+# upstream patches
+%patch100 -p1 -b .konqueror-khtml
+
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
    perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
@@ -383,6 +389,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc4
+- apply patch to fix crash in konqueror
+
 * Thu Jun 01 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
 - update to 3.5.3 
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 09:59:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 05:59:22 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.35,1.36
Message-ID: <200606140959.k5E9xMcN031032@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31001

Modified Files:
	gnome-bluetooth.spec 
Log Message:
bump


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-bluetooth.spec	11 Jun 2006 17:38:40 -0000	1.35
+++ gnome-bluetooth.spec	14 Jun 2006 09:59:20 -0000	1.36
@@ -1,11 +1,12 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
-Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
+#Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/0.7/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
@@ -19,6 +20,7 @@
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+Requires: bluez-utils
 ExcludeArch: s390 s390x
 
 Patch1: gnome-bluetooth-0.7.0-pydir.patch
@@ -27,7 +29,7 @@
 %description
 This package contains a Bonobo server to control Bluetooth devices,
 and a simple GUI to explore which devices are available
-(gnome-bluetooth-admin).  Also, an OBEX server is available,
+(gnome-bluetooth-manager).  Also, an OBEX server is available,
 gnome-obex-server.  This will receive files sent via Bluetooth to your PC,
 and save them in your home directory.
 
@@ -133,12 +135,18 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-10
+- bump for new openobex
+
 * Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-9
 - Missing automake, libtool, gettext BR
 
 * Sun Jun 11 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-6
 - Bump for new libbluetooth
 
+* Wed May 31 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-6
+- add dependency on bluez-utils, cosmetic tweaks (bug #190280)
+
 * Tue May 30 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-5
 - install schemata correctly (bug #193518)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:08:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:08:38 -0400
Subject: rpms/kdelibs/FC-5 kdelibs-3.5.3-konqueror-khtml.patch, NONE,
	1.1 kdelibs.spec, 1.132, 1.133
Message-ID: <200606141008.k5EA8c48032455@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32414

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-konqueror-khtml.patch 
Log Message:
apply patch to fix crash in konqueror



kdelibs-3.5.3-konqueror-khtml.patch:
 dom_stringimpl.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdelibs-3.5.3-konqueror-khtml.patch ---
--- kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp.orig	2006-06-14 11:47:06.000000000 +0200
+++ kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp	2006-06-14 11:49:01.000000000 +0200
@@ -308,6 +308,11 @@
     str = str.simplifyWhiteSpace();
 
     len = str.contains(',') + 1;
+
+    // If we have no commas, we have no array. 
+    if( len == 1 ) 
+        return 0L; 
+ 
     khtml::Length* r = new khtml::Length[len];
 
     int i = 0;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kdelibs.spec	7 Jun 2006 21:52:35 -0000	1.132
+++ kdelibs.spec	14 Jun 2006 10:08:35 -0000	1.133
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -54,6 +54,9 @@
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
+# upstream patches
+Patch100: kdelibs-3.5.3-konqueror-khtml.patch
+
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -185,6 +188,9 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
+# upstream patches
+%patch100 -p1 -b .konqueror-khtml
+
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
    perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
@@ -389,6 +395,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
+- apply patch to fix crash in konqueror
+
 * Wed May 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:20:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:20:53 -0400
Subject: rpms/udev/devel udev-rules.patch,1.15,1.16 udev.spec,1.171,1.172
Message-ID: <200606141020.k5EAKrjB027051@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27023

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
version 094

udev-rules.patch:
 0 files changed

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- udev-rules.patch	18 May 2006 15:38:32 -0000	1.15
+++ udev-rules.patch	14 Jun 2006 10:20:49 -0000	1.16
@@ -1,13 +0,0 @@
---- udev-092/etc/udev/redhat/51-hotplug.rules.rhrules	2006-05-12 15:25:17.000000000 +0200
-+++ udev-092/etc/udev/redhat/51-hotplug.rules	2006-05-18 17:34:07.000000000 +0200
-@@ -1,8 +1,8 @@
- # do not call hotplug.d and dev.d for "drivers" and "module" events
- SUBSYSTEM=="drivers",   GOTO="hotplug_end"
- SUBSYSTEM=="module",    GOTO="hotplug_end"
--ACTION="add",           GOTO="hotplug_comp"
--ACTION="remove",        GOTO="hotplug_comp"
-+ACTION=="add",           GOTO="hotplug_comp"
-+ACTION=="remove",        GOTO="hotplug_comp"
- 
- GOTO="hotplug_end"
- 


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- udev.spec	21 May 2006 21:06:55 -0000	1.171
+++ udev.spec	14 Jun 2006 10:20:50 -0000	1.172
@@ -4,8 +4,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 092
-Release: 2
+Version: 094
+Release: 1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -25,7 +25,6 @@
 Patch7: udev-089-nopie.patch
 Patch8: udev-089-last_modalias.patch
 Patch9: udev-091-lib64.patch
-Patch10: udev-092-pamtypo.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -70,7 +69,6 @@
 %patch7 -p1 -b .nopie
 %patch8 -p1 -b .last_modalias
 %patch9 -p1 -b .lib64
-%patch10 -p1 -b .pamtypo
 
 %build
 
@@ -329,6 +327,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 094-1
+- version 094
+
 * Sun May 21 2006 Peter Jones <pjones at redhat.com> - 092-2
 - Fix typo in pam-console rule
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:21:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:21:57 -0400
Subject: rpms/udev/devel .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 upstream,
	1.5, 1.6
Message-ID: <200606141021.k5EALvw3027091@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27075

Modified Files:
	.cvsignore sources upstream 
Log Message:
version 094


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	18 May 2006 15:38:32 -0000	1.36
+++ .cvsignore	14 Jun 2006 10:21:55 -0000	1.37
@@ -1 +1 @@
-udev-092.tar.bz2
+udev-094.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	18 May 2006 15:38:32 -0000	1.36
+++ sources	14 Jun 2006 10:21:55 -0000	1.37
@@ -1 +1 @@
-5e9ff419ac0132531990a7c5db80ef3e  udev-092.tar.bz2
+9e525da5c8cce9ed2c6d7812016df1f7  udev-094.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/upstream,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upstream	13 Apr 2006 08:46:43 -0000	1.5
+++ upstream	14 Jun 2006 10:21:55 -0000	1.6
@@ -1 +1 @@
-udev-089.tar.bz2
+udev-094.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:22:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:22:25 -0400
Subject: rpms/udev/devel udev-092-pamtypo.patch,1.1,NONE
Message-ID: <200606141022.k5EAMPXJ027117@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27105

Removed Files:
	udev-092-pamtypo.patch 
Log Message:
version 094


--- udev-092-pamtypo.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:24:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:24:03 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.23,1.24
Message-ID: <200606141024.k5EAO3dq027191@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27178

Modified Files:
	module-init-tools.spec 
Log Message:
- added patches for weak modules



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- module-init-tools.spec	6 Jun 2006 19:14:48 -0000	1.23
+++ module-init-tools.spec	14 Jun 2006 10:24:01 -0000	1.24
@@ -2,15 +2,18 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.2
+Release: 0.pre1.3
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
 Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2.sign
 Source2: modprobe.conf.dist
 Source3: blacklist-compat
+Source4: weak-modules
 Patch1: module-init-tools-allconf.patch
 Patch2: module-init-tools-noescape.patch
+Patch3: module-init-tools-weak_updates.patch
+Patch4: module-init-tools-dump_modversions.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modules modutils-devel modutils
@@ -28,6 +31,8 @@
 %setup -q -n module-init-tools-%{version}%{preversion}
 %patch1 -p1 -b .dist
 %patch2 -p0 -b .noescape
+%patch3 -p1 -b .weak
+%patch4 -p1 -b .dump
 
 %build
 export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -58,6 +63,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf.dist
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist-compat
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/sbin/weak-modules
 
 find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \;
 
@@ -92,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 3.3-0.pre1.3
+- added patches for weak modules
+
 * Tue Jun  6 2006 Stephen C. Tweedie <sct at redhat.com> - 3.3-0.pre1.2
 - Rebuild to pick up new nosegneg libc.a for insmod.static
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:26:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:26:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2279,1.2280
Message-ID: <200606141026.k5EAQ5Ox027269@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27255

Modified Files:
	kernel-2.6.spec 
Log Message:
remove %%requires xen


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2279
retrieving revision 1.2280
diff -u -r1.2279 -r1.2280
--- kernel-2.6.spec	14 Jun 2006 01:08:59 -0000	1.2279
+++ kernel-2.6.spec	14 Jun 2006 10:26:03 -0000	1.2280
@@ -586,7 +586,6 @@
 Provides: kernel = %{version}
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
 Prereq: %{kernel_prereq}
-Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:28:16 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-exports-access-list.patch, NONE,
	1.1 autofs.spec, 1.103, 1.104
Message-ID: <200606141028.k5EASG4m027294@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27279

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-exports-access-list.patch 
Log Message:
* Wed Jun 14 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-10
- add export access list matching to "hosts" lookup module (bz # 193585).


autofs-5.0.0_beta4-exports-access-list.patch:
 CHANGELOG        |    1 
 Makefile.rules   |    2 
 lib/rpc_subs.c   |  198 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 modules/Makefile |   11 ---
 4 files changed, 188 insertions(+), 24 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-exports-access-list.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c3bc17d..80ee4b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@
 - fix handling of master map entry update.
 - fix program map handling of iinvalid multi-mount offsets.
 - move autofs4 module loading back to init script.
+- add export access list matching to "hosts" lookup module.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/Makefile.rules b/Makefile.rules
index 31d2706..7796269 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -61,5 +61,5 @@ # Standard rules
 	$(CC) $(CFLAGS) -S $<
 
 .c.so:
-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB)
+	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
 	$(STRIP) $*.so
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index d87362b..143dbdd 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -712,32 +712,204 @@ void rpc_exports_free(exports list)
 	return;
 }
 
-static int rpc_export_allowed(groups grouplist)
+static int masked_match(const char *myname, const char *addr, const char *mask)
+{
+	struct hostent he;
+	struct hostent *phe = &he;
+	struct hostent *result;
+	char buf[HOST_ENT_BUF_SIZE], **haddr;
+	struct sockaddr_in saddr, maddr;
+	int h_errno, ret;
+
+	memset(buf, 0, HOST_ENT_BUF_SIZE);
+	memset(&he, 0, sizeof(struct hostent));
+
+	ret = gethostbyname_r(myname, phe,
+			buf, HOST_ENT_BUF_SIZE, &result, &h_errno);
+	if (ret || !result)
+		return 0;
+
+	ret = inet_aton(addr, &saddr.sin_addr);
+	if (!ret)
+		return 0;
+
+	if (strchr(mask, '.')) {
+		ret = inet_aton(mask, &maddr.sin_addr);
+		if (!ret)
+			return 0;
+	} else {
+		uint32_t m = -1;
+		int msize = atoi(mask);
+
+		m = m << (32 - msize);
+		maddr.sin_addr.s_addr = htonl(m);
+	}
+
+	for (haddr = phe->h_addr_list; *haddr; haddr++) {
+		uint32_t ca, ma, ha;
+
+		ca = (uint32_t) saddr.sin_addr.s_addr;
+		ma = (uint32_t) maddr.sin_addr.s_addr;
+		ha = (uint32_t) ((struct in_addr *) *haddr)->s_addr;
+
+		ret = ((ca & ma) == (ha & ma));
+		if (ret)
+			return 1;
+	}
+	return 0;
+}
+
+/*
+ * This function has been adapted from the match_patern function
+ * found in OpenSSH and is used in accordance with the copyright
+ * notice found their.
+ *
+ * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland.
+ */
+/*
+ * Returns true if the given string matches the pattern (which
+ * may contain ? and * as wildcards), and zero if it does not
+ * match.
+ */
+static int pattern_match(const char *s, const char *pattern)
+{
+	for (;;) {
+		/* If at end of pattern, accept if also at end of string. */
+		if (!*pattern)
+			return !*s;
+
+		if (*pattern == '*') {
+			/* Skip the asterisk. */
+			pattern++;
+
+			/* If at end of pattern, accept immediately. */
+			if (!*pattern)
+				return 1;
+
+			/* If next character in pattern is known, optimize. */
+			if (*pattern != '?' && *pattern != '*') {
+				/*
+				 * Look instances of the next character in
+				 * pattern, and try to match starting from
+				 * those.
+				 */
+				for (; *s; s++)
+					if (*s == *pattern &&
+					    pattern_match(s + 1, pattern + 1))
+						return 1;
+
+				/* Failed. */
+				return 0;
+			}
+			/*
+			 * Move ahead one character at a time and try to
+			 * match at each position.
+			 */
+			for (; *s; s++)
+				if (pattern_match(s, pattern))
+					return 1;
+			/* Failed. */
+			return 0;
+		}
+		/*
+		 * There must be at least one more character in the string.
+		 * If we are at the end, fail.
+		 */
+		if (!*s)
+			return 0;
+
+		/* Check if the next character of the string is acceptable. */
+		if (*pattern != '?' && *pattern != *s)
+			return 0;
+
+		/* Move to the next character, both in string and in pattern. */
+		s++;
+		pattern++;
+	}
+	/* NOTREACHED */
+}
+
+static int string_match(const char *myname, const char *pattern)
 {
-	groups grp = grouplist;
-	char myname[MAXHOSTNAMELEN + 1];
 	struct hostent he;
 	struct hostent *phe = &he;
 	struct hostent *result;
 	char buf[HOST_ENT_BUF_SIZE];
 	int ret;
 
+	memset(buf, 0, HOST_ENT_BUF_SIZE);
+	memset(&he, 0, sizeof(struct hostent));
+
+	ret = gethostbyname_r(myname, phe,
+			buf, HOST_ENT_BUF_SIZE, &result, &h_errno);
+	if (ret || !result)
+		return 0;
+
+	if (strchr(pattern, '*') || strchr(pattern, '?')) {
+		ret = pattern_match(myname, pattern);
+		if (!ret)
+			ret = pattern_match(phe->h_name, pattern);
+	} else {
+		if (strchr(pattern, '.'))
+			ret = !memcmp(phe->h_name, pattern, strlen(pattern));
+		else
+			ret = !memcmp(myname, pattern, strlen(pattern));
+	}
+	return ret;
+}
+
+static int host_match(char *pattern)
+{
+	static char *ypdomain = NULL;
+	static char myname[MAXHOSTNAMELEN + 1] = "\0";
+	struct in_addr tmp;
+	int ret = 0;
+
+	if (!*myname)
+		if (gethostname(myname, MAXHOSTNAMELEN))
+			return 0;
+
+	if (*pattern == '@') {
+		if (!ypdomain)
+			if (yp_get_default_domain(&ypdomain))
+				return 0;
+		ret = innetgr(pattern + 1, myname, (char *) 0, ypdomain);
+	} else if (inet_aton(pattern, &tmp) || strchr(pattern, '/')) {
+		int len = strlen(pattern) + 1;
+		char *addr, *mask;
+
+		addr = alloca(len);
+		if (!addr)
+			return 0;
+
+		memset(addr, 0, len);
+		memcpy(addr, pattern, len - 1);
+		mask = strchr(addr, '/');
+		if (mask) {
+			*mask++ = '\0';
+			ret = masked_match(myname, addr, mask);
+		} else
+			ret = masked_match(myname, addr, "32");
+	} else if (!strcmp(pattern, "gss/krb5")) {
+		/* Leave this to the GSS layer */
+		ret = 1;
+	} else
+		ret = string_match(myname, pattern);
+
+	return ret;
+}
+
+static int rpc_export_allowed(groups grouplist)
+{
+	groups grp = grouplist;
+
 	/* NULL group list => everyone */
 	if (!grp)
 		return 1;
 
-	if (gethostname(myname, MAXHOSTNAMELEN))
-		return 0;
-
 	while (grp) {
-		if (*grp->gr_name == '*')
+		if (host_match(grp->gr_name))
 			return 1;
-		ret = gethostbyname_r(grp->gr_name, phe,
-				buf, HOST_ENT_BUF_SIZE, &result, &h_errno);
-		if (!ret) {
-			if (!strcmp(myname, phe->h_name))
-				return 1;
-		}
 		grp = grp->gr_next;
 	}
 	return 0;
diff --git a/modules/Makefile b/modules/Makefile
index d72d43c..608e99c 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -77,15 +77,6 @@ endif
 #
 # Ad hoc compilation rules for modules which need auxilliary libraries
 #
-lookup_yp.so: lookup_yp.c
-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o lookup_yp.so lookup_yp.c $(AUTOFS_LIB) $(LIBNSL)
-	$(STRIP) lookup_yp.so
-
-lookup_nisplus.so: lookup_nisplus.c
-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o lookup_nisplus.so lookup_nisplus.c \
-		$(AUTOFS_LIB) $(LIBNSL)
-	$(STRIP) lookup_nisplus.so
-
 lookup_hesiod.so: lookup_hesiod.c
 	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
@@ -101,6 +92,6 @@ lookup_ldap.so: lookup_ldap.c $(SASL_OBJ
 
 mount_nfs.so: mount_nfs.c replicated.o
 	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
-		mount_nfs.c replicated.o $(AUTOFS_LIB)
+		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
 	$(STRIP) mount_nfs.so
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- autofs.spec	13 Jun 2006 22:00:52 -0000	1.103
+++ autofs.spec	14 Jun 2006 10:28:14 -0000	1.104
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 10
+%define release 11
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -28,6 +28,7 @@
 Patch14: autofs-5.0.0_beta4-map-update.patch
 Patch15: autofs-5.0.0_beta4-program-map-offset-handling.patch
 Patch16: autofs-5.0.0_beta4-module-load-to-init.patch
+Patch17: autofs-5.0.0_beta4-exports-access-list.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex, cyrus-sasl-devel
 Prereq: chkconfig
@@ -83,6 +84,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -138,6 +140,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jun 14 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-10
+- add export access list matching to "hosts" lookup module (bz # 193585).
+
 * Tue Jun 13 2006 Jeff Moyer <jmoyer at redhat.com> - 5.0.0_beta4-10
 - Add a BuildPrereq for cyrus-sasl-devel
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:43:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:43:18 -0400
Subject: rpms/kernel/devel/configs config-xen-xen0, 1.7,
	NONE config-xen-xen0-PAE, 1.2, NONE config-xen-xenU, 1.5,
	NONE config-xen-xenU-PAE, 1.3, NONE
Message-ID: <200606141043.k5EAhItw006132@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6080/configs

Removed Files:
	config-xen-xen0 config-xen-xen0-PAE config-xen-xenU 
	config-xen-xenU-PAE 
Log Message:
xen0/xenU kernels are history


--- config-xen-xen0 DELETED ---


--- config-xen-xen0-PAE DELETED ---


--- config-xen-xenU DELETED ---


--- config-xen-xenU-PAE DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 10:43:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 06:43:18 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2280,1.2281
Message-ID: <200606141043.k5EAhIEJ006124@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6080

Modified Files:
	kernel-2.6.spec 
Log Message:
xen0/xenU kernels are history


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2280
retrieving revision 1.2281
diff -u -r1.2280 -r1.2281
--- kernel-2.6.spec	14 Jun 2006 10:26:03 -0000	1.2280
+++ kernel-2.6.spec	14 Jun 2006 10:43:15 -0000	1.2281
@@ -230,15 +230,9 @@
 
 Source32: kernel-%{kversion}-ia64.config
 
-#Source33: kernel-%{kversion}-i686-xen0.config
-#Source34: kernel-%{kversion}-i686-xenU.config
+Source33: kernel-%{kversion}-i686-xen.config
+Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
-#Source36: kernel-%{kversion}-i686-xen0-PAE.config
-#Source37: kernel-%{kversion}-i686-xenU-PAE.config
-#Source38: kernel-%{kversion}-x86_64-xen0.config
-#Source39: kernel-%{kversion}-x86_64-xenU.config
-Source40: kernel-%{kversion}-i686-xen.config
-Source41: kernel-%{kversion}-x86_64-xen.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -613,152 +607,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package xen0
-Summary: The Linux kernel compiled for Xen guest0 VM operations
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0
-Prereq: %{kernel_prereq}
-Requires: xen
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# the hypervisor kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReqProv: no
-
-%description xen0
-This package includes a version of the Linux kernel which
-runs in Xen's guest0 VM and provides device services to
-the unprivileged guests.
-
-Install this package in your Xen guest0 environment.
-
-%package xen0-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0
-Provides: kernel-devel = %{rpmversion}-%{release}xen0
-Prereq: /usr/bin/find
-
-%description xen0-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
-
-%package xen0-PAE
-Summary: The Linux kernel compiled for Xen guest0 VM operations with PAE support
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
-Prereq: %{kernel_prereq}
-Requires: xen
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# the xen0-PAE kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReqProv: no
-
-%description xen0-PAE
-This package includes a version of the Linux kernel which runs in
-Xen's guest0 VM with PAE support and provides device services to the
-unprivileged guests.
-
-Install this package in your Xen guest0 environment.
-
-
-%package xen0-PAE-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xen0-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xen0-PAE
-Prereq: /usr/bin/find
-
-%description xen0-PAE-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
-%package xenU
-Summary: The Linux kernel compiled for unprivileged Xen guest VMs
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU
-Prereq: %{kernel_prereq}
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReqProv: no
-
-%description xenU
-This package includes a version of the Linux kernel which
-runs in Xen unprivileged guest VMs.  This should be installed
-both inside the unprivileged guest (for the modules) and in
-the guest0 domain.
-
-%package xenU-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU
-Provides: kernel-devel = %{rpmversion}-%{release}xenU
-Prereq: /usr/bin/find
-
-%description xenU-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
-%package xenU-PAE
-Summary: The Linux kernel compiled for unprivileged Xen guest VMs with PAE support
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
-Prereq: %{kernel_prereq}
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReqProv: no
-
-%description xenU-PAE
-This package includes a version of the Linux kernel which runs in Xen
-unprivileged guest VMs with PAE support.  This should be installed
-both inside the unprivileged guest (for the modules) and in the guest0
-domain.
-
-%package xenU-PAE-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xenU-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xenU-PAE
-Prereq: /usr/bin/find
-
-%description xenU-PAE-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
 
@@ -1443,8 +1291,7 @@
 
 %if %{includexen}
 %if %{buildxenPAE}
-BuildKernel vmlinuz vmlinuz xen0-PAE
-BuildKernel vmlinuz vmlinuz xenU-PAE
+BuildKernel vmlinuz vmlinuz xen-PAE
 %endif
 
 %if %{buildxen}
@@ -1577,58 +1424,6 @@
   popd > /dev/null
 fi
 
-%post xen0
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0
-/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen0
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xen0-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
-fi
-
-%post xenU
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU
-/sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --install %{KVERREL}xenU
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xenU-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
-fi
-
-%post xen0-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0-PAE
-/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xen0-PAE-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
-fi
-
-%post xenU-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU-PAE
-/sbin/new-kernel-pkg --package kernel-xenU-PAE --mkinitrd --depmod --install %{KVERREL}xenU-PAE
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xenU-PAE-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
-fi
-
 %post kdump
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
@@ -1661,22 +1456,6 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
-%preun xen0
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
-
-%preun xenU
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xenU
-
-%preun xen0-PAE
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0-PAE
-
-%preun xenU-PAE
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU-PAE
-
 
 ###
 ### file lists
@@ -1779,95 +1558,6 @@
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 %endif
 
-%if %{buildxenPAE}
-%files xen0
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0
-/boot/System.map-%{KVERREL}xen0
-/boot/symvers-%{KVERREL}xen0.gz
-/boot/symsets-%{KVERREL}xen0.tar.gz
-/boot/config-%{KVERREL}xen0
-/boot/xen.gz-%{KVERREL}
-/boot/xen-syms-%{KVERREL}
-%dir /lib/modules/%{KVERREL}xen0
-/lib/modules/%{KVERREL}xen0/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen0/build
-/lib/modules/%{KVERREL}xen0/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0/extra
-/lib/modules/%{KVERREL}xen0/updates
-/lib/modules/%{KVERREL}xen0/weak-updates
-
-%files xen0-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu}
-
-%files xenU
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU
-/boot/System.map-%{KVERREL}xenU
-/boot/symvers-%{KVERREL}xenU.gz
-/boot/symsets-%{KVERREL}xenU.tar.gz
-/boot/config-%{KVERREL}xenU
-%dir /lib/modules/%{KVERREL}xenU
-/lib/modules/%{KVERREL}xenU/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xenU/build
-/lib/modules/%{KVERREL}xenU/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xenU/extra
-/lib/modules/%{KVERREL}xenU/updates
-/lib/modules/%{KVERREL}xenU/weak-updates
-
-%files xenU-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
-
-%files xen0-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE
-/boot/System.map-%{KVERREL}xen0-PAE
-/boot/symvers-%{KVERREL}xen0-PAE.gz
-/boot/symsets-%{KVERREL}xen0-PAE.tar.gz
-/boot/config-%{KVERREL}xen0-PAE
-/boot/xen.gz-%{KVERREL}-PAE
-/boot/xen-syms-%{KVERREL}-PAE
-%dir /lib/modules/%{KVERREL}xen0-PAE
-/lib/modules/%{KVERREL}xen0-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen0-PAE/build
-/lib/modules/%{KVERREL}xen0-PAE/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0-PAE/extra
-/lib/modules/%{KVERREL}xen0-PAE/updates
-/lib/modules/%{KVERREL}xen0-PAE/weak-updates
-
-%files xen0-PAE-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-PAE-%{_target_cpu}
-
-%files xenU-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU-PAE
-/boot/System.map-%{KVERREL}xenU-PAE
-/boot/symvers-%{KVERREL}xenU-PAE.gz
-/boot/symsets-%{KVERREL}xenU-PAE.tar.gz
-/boot/config-%{KVERREL}xenU-PAE
-%dir /lib/modules/%{KVERREL}xenU-PAE
-/lib/modules/%{KVERREL}xenU-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xenU-PAE/build
-/lib/modules/%{KVERREL}xenU-PAE/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xenU-PAE/extra
-/lib/modules/%{KVERREL}xenU-PAE/updates
-/lib/modules/%{KVERREL}xenU-PAE/weak-updates
-
-%files xenU-PAE-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu}
-%endif
 %endif
 
 %if %{buildkdump}
@@ -1904,6 +1594,10 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Juan Quintela <quintela at troll.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+- remove xen0/xenU/xen0-PAE/xenU-PAE packages
+- remove %%requires xen from xen kernels
+
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - rename xen0 & xenU to single xen kernels.
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 11:29:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 07:29:33 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.34,1.35
Message-ID: <200606141129.k5EBTXZc016954@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16886

Modified Files:
	ltrace.spec 
Log Message:
- drop broken ppc support



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ltrace.spec	1 Jun 2006 17:42:51 -0000	1.34
+++ ltrace.spec	14 Jun 2006 11:29:30 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1.6
+Release: 1.7
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch0: ltrace-opt_x.patch
 Patch1: ltrace-testsuite.patch
@@ -10,7 +10,7 @@
 Patch4: ltrace-e_entry.patch
 License: GPL
 Group: Development/Debuggers
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
+ExclusiveArch: %{ix86} x86_64 ia64 ppc64 s390 s390x alpha sparc
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: elfutils-libelf-devel dejagnu
@@ -58,6 +58,9 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Wed Jun 14 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.7
+- drop broken ppc support
+
 * Thu Jun  1 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.6
 - e_entry patch: use elf's e_entry field instead of looking up _start
   symbol, which failed on stripped binaries.



From fedora-cvs-commits at redhat.com  Wed Jun 14 11:34:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 07:34:51 -0400
Subject: rpms/numactl/devel numactl.spec,1.30,1.31
Message-ID: <200606141134.k5EBYpH0017706@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17651

Modified Files:
	numactl.spec 
Log Message:
turning on ppc64 arch for numactl


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- numactl.spec	13 Jun 2006 14:58:47 -0000	1.30
+++ numactl.spec	14 Jun 2006 11:34:48 -0000	1.31
@@ -8,7 +8,7 @@
 Source0: 	ftp://ftp.suse.com/pub/people/ak/numa/numactl-%{version}.tar.gz 
 Buildroot:	%{_tmppath}/%{name}-buildroot
 
-ExcludeArch: ppc64 s390 s390x
+ExcludeArch: s390 s390x
 
 Patch1:	numactl-lib.patch
 Patch2: numactl-0.6.4-ppc.patch



From fedora-cvs-commits at redhat.com  Wed Jun 14 11:43:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 07:43:57 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.24, 1.25 sound-juicer.spec,
	1.54, 1.55 sources, 1.26, 1.27
Message-ID: <200606141143.k5EBhvdx019629@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19567

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	17 May 2006 13:52:38 -0000	1.24
+++ .cvsignore	14 Jun 2006 11:43:54 -0000	1.25
@@ -1 +1 @@
-sound-juicer-2.15.2.1.tar.bz2
+sound-juicer-2.15.3.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sound-juicer.spec	10 Jun 2006 05:31:37 -0000	1.54
+++ sound-juicer.spec	14 Jun 2006 11:43:54 -0000	1.55
@@ -6,14 +6,14 @@
 %define gconf_version 2.0.0
 %define gnome_media_version 2.11.91
 %define gnome_vfs_version 2.9.90
-%define nautilus_cd_burner_version 2.13.93
+%define nautilus_cd_burner_version 2.15.3
 %define hal_version 0.5.0
 %define scrollkeeper_version 0.3.5
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.15.2.1
-Release:	3
+Version:	2.15.3
+Release:	1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -107,7 +107,10 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
-* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2,15.2.1-3
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
+* Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2.1-3
 - More missing BuildRequires
 
 * Sat May 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2.1-2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	18 May 2006 11:45:34 -0000	1.26
+++ sources	14 Jun 2006 11:43:54 -0000	1.27
@@ -1 +1 @@
-993f0e4689b8ecd0da038338bae6b1d0  sound-juicer-2.15.2.1.tar.bz2
+050cc1db0c681d023b784a4c8a9c9738  sound-juicer-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:04:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:04:09 -0400
Subject: rpms/cdrtools/FC-4 cdrtools-2.01.01-rootstat.patch, NONE,
	1.1 cdrtools-2.0-silo.patch, 1.1, 1.2 cdrtools.spec, 1.34, 1.35
Message-ID: <200606141204.k5EC49Ub008508@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrtools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8481

Modified Files:
	cdrtools-2.0-silo.patch cdrtools.spec 
Added Files:
	cdrtools-2.01.01-rootstat.patch 
Log Message:
- attempt to fix bug #174667


cdrtools-2.01.01-rootstat.patch:
 tree.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE cdrtools-2.01.01-rootstat.patch ---
--- cdrtools-2.01.01/mkisofs/tree.c.readdir	2006-06-14 13:47:17.000000000 +0200
+++ cdrtools-2.01.01/mkisofs/tree.c	2006-06-14 13:47:21.000000000 +0200
@@ -1443,6 +1443,8 @@
 
 	/* We do this to make sure that the root entries are consistent */
 	if (this_dir == root && strcmp(short_name, "..") == 0) {
+	        /* for the case .. comes before . */
+	        stat_filter(root, &root_statbuf);
 		statbuf = root_statbuf;
 		lstatbuf = root_statbuf;
 	}

cdrtools-2.0-silo.patch:
 Makefile   |    2 
 defaults.h |    4 
 mkisofs.8  |   19 ++++
 mkisofs.c  |   46 ++++++++++-
 mkisofs.h  |   11 ++
 silo.c     |  255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 vms.c      |   10 +-
 write.c    |   47 +++++------
 8 files changed, 365 insertions(+), 29 deletions(-)

Index: cdrtools-2.0-silo.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-4/cdrtools-2.0-silo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdrtools-2.0-silo.patch	9 Sep 2004 03:45:40 -0000	1.1
+++ cdrtools-2.0-silo.patch	14 Jun 2006 12:04:05 -0000	1.2
@@ -248,7 +248,7 @@
 +    silo_info.id = 'L';
 +    silo_info.conf_part = 1;
 +    strncpy (silo_info.conf_file, silo_conf_file, 256);
-+    silo_info.conf_file[259] = '\0';
++    silo_info.conf_file[255] = '\0';
 +
 +    last_extent_written += 16;
 +    


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-4/cdrtools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cdrtools.spec	30 Sep 2005 10:22:52 -0000	1.34
+++ cdrtools.spec	14 Jun 2006 12:04:05 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.1
-Release: 9.0.FC4.1
+Release: 9.0.FC4.2
 %define tarversion 2.01
 License: GPL
 Group: Applications/System
@@ -28,6 +28,7 @@
 Patch30: cdrtools-2.0-O_EXCL.patch
 Patch31: mkisofs-padsize-123548.patch
 Patch41: cdrtools-2.01.1-gcc4.patch
+Patch42: cdrtools-2.01.01-rootstat.patch
 
 BuildRequires: perl, groff
 
@@ -113,6 +114,7 @@
 %patch30 -p1 -b .excl
 %patch31 -p1 -b .padsize
 %patch41 -p1 -b .gcc4
+%patch42 -p1 -b .rootstat
 
 # Turn off buggy CD_EXTRA code.
 #sed -e 's/define CD_EXTRA/undef CD_EXTRA/' < cdda2wav/toc.c > cdda2wav/toc.c.tmp
@@ -228,6 +230,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.1-9.0.FC4.2
+- attempt to fix bug #174667
+
 * Wed Aug 31 2005 Harald Hoyer <harald at redhat.com> 8:2.01.1-9.0.FC4.1
 - fixed mkisofs #166707 for gcc4
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:06:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:06:04 -0400
Subject: rpms/module-init-tools/devel
	module-init-tools-dump_modversions.patch, NONE,
	1.1 module-init-tools-weak_updates.patch, NONE,
	1.1 weak-modules, NONE, 1.1
Message-ID: <200606141206.k5EC64SV008713@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8686

Added Files:
	module-init-tools-dump_modversions.patch 
	module-init-tools-weak_updates.patch weak-modules 
Log Message:


module-init-tools-dump_modversions.patch:
 modprobe.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+)

--- NEW FILE module-init-tools-dump_modversions.patch ---
--- module-init-tools-3.3-pre1/modprobe.c.dump	2006-06-14 12:14:03.000000000 +0200
+++ module-init-tools-3.3-pre1/modprobe.c	2006-06-14 12:15:46.000000000 +0200
@@ -976,6 +976,67 @@
 	goto remove_rest;
 }
 
+struct modver32_info
+{
+       uint32_t crc;
+       char name[64 - sizeof(uint32_t)];
+};
+
+struct modver64_info
+{
+       uint64_t crc;
+       char name[64 - sizeof(uint64_t)];
+};
+
+const char *skip_dot(const char *str)
+{
+       /* For our purposes, .foo matches foo.  PPC64 needs this. */
+       if (str && str[0] == '.')
+               return str + 1;
+       return str;
+}
+
+void dump_modversions(const char *filename, errfn_t error)
+{
+       unsigned long size, secsize;
+       void *file = grab_file(filename, &size);
+       struct modver32_info *info32;
+       struct modver64_info *info64;
+       int n;
+
+       if (!file) {
+               error("%s: %s\n", filename, strerror(errno));
+               return;
+       }
+       switch (elf_ident(file, size)) {
+       case ELFCLASS32:
+               info32 = get_section32(file, size, "__versions", &secsize);
+               if (!info32)
+                       return;  /* Does not seem to be a kernel module */
+               if (secsize % sizeof(struct modver32_info))
+                       error("Wrong section size in %s\n", filename);
+               for (n = 0; n < secsize / sizeof(struct modver32_info); n++)
+                       printf("0x%08lx\t%s\n", (unsigned long)
+                              info32[n].crc, skip_dot(info32[n].name));
+               break;
+
+       case ELFCLASS64:
+               info64 = get_section64(file, size, "__versions", &secsize);
+               if (!info64)
+                       return;  /* Does not seem to be a kernel module */
+               if (secsize % sizeof(struct modver64_info))
+                       error("Wrong section size in %s\n", filename);
+               for (n = 0; n < secsize / sizeof(struct modver64_info); n++)
+                       printf("0x%08llx\t%s\n", (unsigned long long)
+                              info64[n].crc, skip_dot(info64[n].name));
+               break;
+
+       default:
+               error("%s: ELF class not recognized\n", filename);
+       }
+}
+
+
 /* Does path contain directory(s) subpath? */
 static int type_matches(const char *path, const char *subpath)
 {
@@ -1384,6 +1445,7 @@
 				   { "set-version", 1, NULL, 'S' },
 				   { "show-depends", 0, NULL, 'D' },
 				   { "first-time", 0, NULL, 3 },
+				   { "dump-modversions", 0, NULL, 4 },
 				   { "use-blacklist", 0, NULL, 'b' },
 				   { NULL, 0, NULL, 0 } };
 
@@ -1421,6 +1483,7 @@
 	int strip_modversion = 0;
 	int ignore_proc = 0;
 	int first_time = 0;
+	int dump_modver = 0;
 	int use_blacklist = 0;
 	unsigned int i, num_modules;
 	char *type = NULL;
@@ -1537,6 +1600,9 @@
 		case 3:
 			first_time = 1;
 			break;
+		case 4:
+			dump_modver = 1;
+			break;
 		default:
 			print_usage(argv[0]);
 		}
@@ -1602,6 +1668,11 @@
 		LIST_HEAD(list);
 		char *modulearg = argv[optind + i];
 
+		if (dump_modver) {
+			dump_modversions(modulearg, error);
+			continue;
+		}
+
 		/* Convert name we are looking for */
 		underscores(modulearg);
 

module-init-tools-weak_updates.patch:
 depmod.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

--- NEW FILE module-init-tools-weak_updates.patch ---
--- module-init-tools-3.3-pre1/depmod.c.weak	2006-06-14 12:16:08.000000000 +0200
+++ module-init-tools-3.3-pre1/depmod.c	2006-06-14 12:16:08.000000000 +0200
@@ -474,10 +474,26 @@
 				      const char *filename,
 				      struct module *next);
 
+static int is_weak_update(const char *dirname)
+{
+	char *p;
+
+	p = strstr(dirname, "weak-updates");
+	if (!p)
+		return 0;
+	return (p[strlen("weak-updates")] == '/' ||
+		p[strlen("weak-updates")] == '\0');
+}
+
 static int is_update(const char *dirname)
 {
 	char *p;
 
+	/* If it's a weak_update then we don't want to match on updates/"
+         */
+	if (is_weak_update(dirname))
+		return 0;
+
 	p = strstr(dirname, "updates");
 	if (!p)
 		return 0;
@@ -545,8 +561,11 @@
 			char subdir[strlen(dirname) + 1
 				   + strlen(dirent->d_name) + 1];
 			sprintf(subdir, "%s/%s", dirname, dirent->d_name);
-			/* Don't follow links, eg. build/ */
-			if (readlink(subdir, &dummy, 1) < 0) {
+			/* Don't follow links, eg. build/ (except under
+			 * extra/ to allow for weak-updates symlinks)
+                         */
+			if ((readlink(subdir, &dummy, 1) < 0) ||
+			    is_weak_update(subdir)) {
 				sub = opendir(subdir);
 				if (sub) {
 					next = grab_dir(subdir, sub, next,


--- NEW FILE weak-modules ---
#! /bin/bash

# weak-modules - derived from weak-updates by Andreas Gruenbacher

unset LANG LC_ALL LC_COLLATE

# Check if MODULE is compatible with kernel release KREL.
module_is_compatible() {
    declare module=$1 krel=$2 module_krel=$(krel_of_module "$module")

    if [ ! -e "$tmpdir/all-symvers-$krel-$module_krel" ]; then
        # Symbols exported by the "new" kernel
        if [ ! -e $tmpdir/symvers-$krel ]; then
            if [ -e /boot/symvers-$krel.gz ]; then
                zcat /boot/symvers-$krel.gz \
                | sed -r -ne 's:^0x0*([0-9a-f]+\t[0-9a-zA-Z_]+)\t.*:\1:p'
            fi > $tmpdir/symvers-$krel
        fi

        # Symbols that other add-on modules of the "old" kernel export
        # (and that this module may require)
        if [ ! -e "$tmpdir/extra-symvers-$module_krel" ]; then
            if [ -e /lib/modules/$module_krel/extra ]; then
                find /lib/modules/$module_krel/extra -name '*.ko' \
                | xargs nm \
                | sed -nre 's:^0*([0-9a-f]+) A __crc_(.*):\1 \2:p'
            fi > $tmpdir/extra-symvers-$module_krel
        fi

        sort -u $tmpdir/symvers-$krel $tmpdir/extra-symvers-$module_krel \
        > "$tmpdir/all-symvers-$krel-$module_krel"
    fi

    # If the module does not have modversions enabled, $tmpdir/modvers
    # will be empty.
    /sbin/modprobe --dump-modversions "$module" \
    | sed -r -e 's:^0x0*([0-9a-f]+\t.*):\1:' \
    | sort -u \
    > $tmpdir/modvers

    # Only include lines of the second file in the output that don't
    # match lines in the first file. (The default separator is
    # <space>, so we are matching the whole line.)
    join -j 1 -v 2 $tmpdir/all-symvers-$krel-$module_krel \
                   $tmpdir/modvers > $tmpdir/join

    if [ ! -s $tmpdir/modvers ]; then
        echo "Warning: Module ${module##*/} from kernel $module_krel has no" \
             "modversions, so it cannot be reused for kernel $krel" >&2
    elif [ -s $tmpdir/join ]; then
        [ -n "$verbose" ] &&
        echo "Module ${module##*/} from kernel $module_krel is not compatible" \
             "with kernel $krel in symbols:" $(sed -e 's:.* ::' $tmpdir/join)
    else
        [ -n "$verbose" ] &&
        echo "Module ${module##*/} from kernel $module_krel is compatible" \
             "with kernel $krel"
        return 0
    fi
    return 1
}

# Compute the kernel release of a module.
krel_of_module() {
    declare module=$1
    /sbin/modinfo -F vermagic "$module" | awk '{print $1}'
}

# Read a list of modules from standard input, convert the filenames into
# absolute names, and compute the kernel release of each module.
read_modules_list() {
    local IFS=$'\n'
    modules=($(cat))

    for ((n = 0; n < ${#modules[@]}; n++)); do
        if [ ${modules[n]:0:1} != '/' ]; then
            modules[n]="$PWD/${modules[n]}"
        fi
        if [ -f "${modules[n]}" ]; then
            module_krels[n]=$(krel_of_module ${modules[n]})
        else
            # Try to extract the kernel release from the path
            set -- "${modules[n]#/lib/modules/}"
            module_krels[n]=${1%%/*}
        fi
    done
}

doit() {
    [ -n "$verbose" ] && echo "$@"
    [ -n "$dry_run" ] || "$@"
}

usage() {
    echo "Usage: ${0##*/} [options] {--add-modules|--remove-modules}"
    echo "${0##*/} [options] {--add-kernel|--remove-kernel} {kernel-release}"
    cat <<'EOF'
--add-modules
        Add a list of modules read from standard input. Create
        symlinks in compatible kernel's weak-updates/ directory.
        The list of modules is read from standard input.

--remove-modules
        Remove compatibility symlinks from weak-updates/ directories
        for a list of modules.  The list of modules is read from
        standard input.

--add-kernel
        Add compatibility symlinks for all compatible modules to the
        specified or running kernel.

--remove-kernel
        Remove all compatibility symlinks for the specified or current
        kernel.

--verbose
        Print the commands executed.

-dry-run
        Do not create/remove any files.
EOF
    exit $1
}

[ -e /etc/sysconfig/kernel ] && source /etc/sysconfig/kernel

unset ${!changed_modules_*} ${!changed_initrd_*}

module_has_changed() {
    declare module=$1 krel=$2

    module=${module%.ko}
    module=${module##*/}

    eval "changed_modules_${krel//[^a-zA-Z0-9]/_}=$krel"
    case " $INITRD_MODULES " in
    *" $module "*)
        eval "changed_initrd_${krel//[^a-zA-Z0-9]/_}=$krel"
        ;;
    esac
}

options=`getopt -o h --long help,add-modules,remove-modules \
                     --long add-kernel,remove-kernel,dry-run,verbose -- "$@"`

[ $? -eq 0 ] || usage 1

eval set -- "$options"

while :; do
    case "$1" in
    --add-modules)
        add_modules=1
        ;;
    --remove-modules)
        remove_modules=1
        ;;
    --add-kernel)
        add_kernel=1
        ;;
    --remove-kernel)
        remove_kernel=1
        ;;
    --dry-run)
        dry_run=1
        ;;
    --verbose)
        verbose=1
        ;;
    -h|--help)
        usage 0
        ;;
    --)
        shift
        break
        ;;
    esac
    shift
done

if [ "$add_modules$remove_modules$add_kernel$remove_kernel" != 1 ]; then
    usage 1
fi
if [ -n "$add_kernel" -o -n "$remove_kernel" ]; then
    [ $# -gt 1 ] && usage 1
else
    [ $# -ne 0 ] && usage 1
fi

tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
trap "rm -rf $tmpdir" EXIT
trap "rm -rf $tmpdir" INT

if [ -n "$add_modules" ]; then
    read_modules_list || exit 1
    if [ ${#modules[@]} -gt 0 ]; then
        for krel in $(ls /lib/modules/); do
            [ -e "/boot/symvers-$krel.gz" ] || continue
            for ((n = 0; n < ${#modules[@]}; n++)); do
                module="${modules[n]}"
                module_krel="${module_krels[n]}"
                case "$module" in
                /lib/modules/$krel/*)
                    continue ;;
                esac
                subpath="${module#/lib/modules/$module_krel/extra}"
                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
                if [ -r "$weak_module" ]; then
                    weak_krel=$(krel_of_module "$weak_module")
                    if [ "$weak_krel" != "$module_krel" ] &&
                       [ "$(printf "%s\n" "$weak_krel" "$module_krel" \
                            | /usr/lib/rpm/redhat/rpmsort | head -n 1)" = \
                         "$module_krel" ]; then
                        # Keep modules from more recent kernels.
                        [ -n "$verbose" ] && echo \
"Keeping module ${module##*/} from kernel $weak_krel for kernel $krel"
                        continue
                    fi
                fi
                if module_is_compatible $module $krel; then
                    doit mkdir -p $(dirname $weak_module)
                    doit ln -sf $module $weak_module
                    module_has_changed $module $krel
                fi
            done
        done
    fi
elif [ -n "$remove_modules" ]; then
    read_modules_list || exit 1
    if [ ${#modules[@]} -gt 0 ]; then
        krels=($(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r))
        for krel in "${krels[@]}"; do
            [ -e "/boot/symvers-$krel.gz" ] || continue
            for ((n = 0; n < ${#modules[@]}; n++)); do
                module="${modules[n]}"
                module_krel="${module_krels[n]}"
                subpath="${module#/lib/modules/$module_krel/extra}"
                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
		if [ "$module" == "`readlink $weak_module`" ]; then
                    [ -n "$verbose" ] && echo \
"Removing compatible module ${module##*/} from kernel $krel"
                    doit rm -f "$weak_module"
                    for krel2 in "${krels[@]}"; do
                        [ -e "/boot/symvers-$krel2.gz" ] || continue
                        module="/lib/modules/$krel2/extra/$subpath"
                        [ -e "$module" ] || continue
                        if module_is_compatible "$module" "$krel2"; then
                            [ -n "$verbose" ] && echo \
"Adding compatible module ${module##*/} from kernel $krel2 instead"
                            doit ln -s "$module" "$weak_module"
                            break
                        fi
                    done
                    doit rmdir --parents --ignore-fail-on-non-empty \
                               "$(dirname "$weak_module")"
                    module_has_changed $module $krel
                fi
            done
        done
    fi
elif [ -n "$add_kernel" ]; then
    add_krel=${1:-$(uname -r)}
    if [ ! -e "/boot/symvers-$add_krel.gz" ]; then
        echo "Symvers dump file /boot/symvers-$add_krel.gz" \
             "not found" >&2
        exit 1
    fi
    for krel in $(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r); do
        [ "$add_krel" = "$krel" ] && continue
        [ -d /lib/modules/$krel/extra ] || continue
        for module in $(find /lib/modules/$krel/extra -name '*.ko'); do
            subpath="${module#/lib/modules/$krel/extra}"
            weak_module="/lib/modules/$add_krel/weak-updates/${subpath#/}"
            [ -e "$weak_module" ] && continue
            if module_is_compatible $module $add_krel; then
                doit mkdir -p $(dirname $weak_module)
                doit ln -sf $module $weak_module
            fi
        done
    done
elif [ -n "$remove_kernel" ]; then
    remove_krel=${1:-$(uname -r)}
    weak_modules="/lib/modules/$remove_krel/weak-updates"
    doit rm -rf "$weak_modules"
fi

for krel in ${!changed_modules_*}; do
    krel=${!krel}
    [ -e "/boot/System.map-$krel" ] || continue
    /sbin/depmod -ae -F /boot/System.map-$krel $krel
done

for krel in ${!changed_initrd_*}; do
    krel=${!krel}
    [ -e "/boot/System.map-$krel" ] || continue

    image=
    for x in vmlinuz image vmlinux linux bzImage; do
        if [ -f "/boot/$x-$krel" ]; then
            image="$x"
            break
        fi
    done
    if [ -n "$image" ]; then
        /sbin/mkinitrd -k "/boot/$image-$krel" -i "/boot/initrd-$krel"
    fi
done



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:10:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:10:56 -0400
Subject: rpms/pygtk2/devel .cvsignore, 1.26, 1.27 pygtk.spec, 1.50,
	1.51 sources, 1.26, 1.27
Message-ID: <200606141210.k5ECAufS009328@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9288

Modified Files:
	.cvsignore pygtk.spec sources 
Log Message:
2.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	10 May 2006 18:28:44 -0000	1.26
+++ .cvsignore	14 Jun 2006 12:10:50 -0000	1.27
@@ -1 +1 @@
-pygtk-2.9.0.tar.bz2
+pygtk-2.9.1.tar.bz2


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pygtk.spec	26 May 2006 15:29:24 -0000	1.50
+++ pygtk.spec	14 Jun 2006 12:10:50 -0000	1.51
@@ -2,14 +2,14 @@
 
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
-Version: 2.9.0
-Release: 3 
+Version: 2.9.1
+Release: 1 
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
 #Source2: acinclude.m4
 BuildRoot: %{_tmppath}/pygtk-root
-Requires: gtk2 >= 2.4.0
+Requires: gtk2 >= 2.8.0
 Requires: python2 >= 2.3
 Requires: python-numeric
 Requires: pycairo
@@ -110,6 +110,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-1
+- Update to 2.9.1
+
 * Fri May 26 2006 Jeremy Katz <katzj at redhat.com> - 2.9.0-3
 - BR should be pygobject2-devel, need to actually require pygobject2 at runtime
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	10 May 2006 18:28:44 -0000	1.26
+++ sources	14 Jun 2006 12:10:50 -0000	1.27
@@ -1 +1 @@
-d3bae52dd24dacca5fb51a960a186f37  pygtk-2.9.0.tar.bz2
+b020eed71960e612e35821a0f28e5a3b  pygtk-2.9.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:11:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:11:11 -0400
Subject: rpms/kernel/devel/configs config-xen-generic,1.19,1.20
Message-ID: <200606141211.k5ECBBRk009389@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv9341/configs

Modified Files:
	config-xen-generic 
Log Message:
create xen-PAE kernel (temporary until test2, not enabled by now)


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-xen-generic	13 Jun 2006 22:46:57 -0000	1.19
+++ config-xen-generic	14 Jun 2006 12:11:08 -0000	1.20
@@ -62,8 +62,6 @@
 #
 # CONFIG_EDD is not set
 # CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
 CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_REGPARM is not set
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:11:10 -0400
Subject: rpms/kernel/devel Makefile.config, 1.39, 1.40 kernel-2.6.spec,
	1.2281, 1.2282
Message-ID: <200606141211.k5ECBAfF009375@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9341

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
create xen-PAE kernel (temporary until test2, not enabled by now)


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.config	13 Jun 2006 22:46:56 -0000	1.39
+++ Makefile.config	14 Jun 2006 12:11:06 -0000	1.40
@@ -12,6 +12,7 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
+	$(CFG)-i686-xen-PAE.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
@@ -58,7 +59,10 @@
 temp-ia64-generic: configs/config-ia64-generic temp-generic
 	perl scripts/merge.pl $^ > $@
 
-temp-x86-xen-generic: configs/config-xen-generic temp-x86-generic
+temp-x86-xen-generic-temp: configs/config-xen-generic temp-x86-generic
+	perl scripts/merge.pl $^ > $@
+
+temp-x86-xen-generic: configs/config-xen-xen temp-x86-xen-generic-temp
 	perl scripts/merge.pl $^ > $@
 
 temp-x86_64-xen-generic-tmp: configs/config-xen-generic temp-x86_64-generic
@@ -121,7 +125,10 @@
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
 	perl scripts/merge.pl $^ ia64 > $@
 
-kernel-$(VERSION)-i686-xen.config: configs/config-xen-xen temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen.config: configs/config-i686 temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-xen-PAE.config: configs/config-i686-PAE temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2281
retrieving revision 1.2282
diff -u -r1.2281 -r1.2282
--- kernel-2.6.spec	14 Jun 2006 10:43:15 -0000	1.2281
+++ kernel-2.6.spec	14 Jun 2006 12:11:06 -0000	1.2282
@@ -233,6 +233,7 @@
 Source33: kernel-%{kversion}-i686-xen.config
 Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
+Source36: kernel-%{kversion}-i686-xen-PAE.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -607,6 +608,40 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
+%package xen-PAE
+Summary: The Linux kernel compiled for Xen VM operations with PAE support
+
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen-PAE
+Prereq: %{kernel_prereq}
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Conflicts: %{xen_conflicts}
+# the hypervisor kernel needs a newer mkinitrd than everything else right now
+Conflicts: mkinitrd <= 4.2.0
+# We can't let RPM do the dependencies automatic because it'll then pick up
+# a correct but undesirable perl dependency from the module headers which
+# isn't required for the kernel proper to function
+AutoReqProv: no
+
+%description xen-PAE
+This package includes a version of the Linux kernel which runs in Xen
+VM with PAE. It works for both priviledged and unpriviledged guests.
+
+%package xen-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-xen-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}xen-PAE
+Prereq: /usr/bin/find
+
+%description xen-PAE-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
 
@@ -1268,7 +1303,7 @@
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
   make clean
 %endif
-  make debug=y pae=y verbose=y crash_debug=y
+  make debug=y verbose=y crash_debug=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
@@ -1424,6 +1459,23 @@
   popd > /dev/null
 fi
 
+%post xen-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen-PAE
+if [ -e /proc/xen/xsd_kva ]; then 
+	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE
+else 
+	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install %{KVERREL}xen-PAE
+fi
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post xen-PAE-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-xen-PAE-%{_target_cpu} > /dev/null
+  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
+  popd > /dev/null
+fi
+
 %post kdump
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
@@ -1456,6 +1508,10 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
+%preun xen-PAE
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen-PAE
+
 
 ###
 ### file lists
@@ -1558,6 +1614,30 @@
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 %endif
 
+%if %{buildxenPAE}
+%files xen-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
+/boot/System.map-%{KVERREL}xen-PAE
+/boot/symvers-%{KVERREL}xen-PAE.gz
+/boot/symsets-%{KVERREL}xen-PAE.tar.gz
+/boot/config-%{KVERREL}xen-PAE
+/boot/xen.gz-%{KVERREL}-PAE
+/boot/xen-syms-%{KVERREL}-PAE
+%dir /lib/modules/%{KVERREL}xen-PAE
+/lib/modules/%{KVERREL}xen-PAE/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}xen-PAE/build
+/lib/modules/%{KVERREL}xen-PAE/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}xen-PAE/extra
+/lib/modules/%{KVERREL}xen-PAE/updates
+/lib/modules/%{KVERREL}xen-PAE/weak-updates
+
+%files xen-PAE_devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen-PAE-%{_target_cpu}
+%endif
 %endif
 
 %if %{buildkdump}
@@ -1594,8 +1674,10 @@
 %endif
 
 %changelog
-* Wed Jun 14 2006 Juan Quintela <quintela at troll.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+* Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - remove xen0/xenU/xen0-PAE/xenU-PAE packages
+- disable xen PAE kernel for i386 for now
+- create xen-PAE kernel
 - remove %%requires xen from xen kernels
 
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:24:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:24:26 -0400
Subject: rpms/evolution/devel evolution.spec,1.151,1.152
Message-ID: <200606141224.k5ECOQdj028340@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28261

Modified Files:
	evolution.spec 
Log Message:
dont use nm on s390



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- evolution.spec	14 Jun 2006 02:37:45 -0000	1.151
+++ evolution.spec	14 Jun 2006 12:24:23 -0000	1.152
@@ -24,7 +24,13 @@
 # note that nntp is non-functional in evo 1.3.x
 %define nntp_support 1
 %define exchange_support 1
+
+%ifnarch s390 s390x 
 %define nm_support 1
+%else
+%define nm_support 0
+%endif
+
 %define libnotify_support 1
 %define inline_audio_support 0
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:28:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:28:59 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.32,
	1.33 evolution-connector.spec, 1.61, 1.62 sources, 1.32, 1.33
Message-ID: <200606141228.k5ECSx3j030126@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30070

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:
2.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	18 May 2006 18:18:30 -0000	1.32
+++ .cvsignore	14 Jun 2006 12:28:57 -0000	1.33
@@ -1 +1 @@
-evolution-exchange-2.7.2.tar.bz2
+evolution-exchange-2.7.3.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- evolution-connector.spec	24 May 2006 18:07:29 -0000	1.61
+++ evolution-connector.spec	14 Jun 2006 12:28:57 -0000	1.62
@@ -17,8 +17,8 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.7.2
-Release: 2
+Version: 2.7.3
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -126,6 +126,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.3-1
+- Update to 2.7.3
+
 * Wed May 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.2-2
 - Add BuildRequires for gtk-doc (closes #192251).
 - Require specific versions of GNU Autotools packages for building.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	18 May 2006 18:18:31 -0000	1.32
+++ sources	14 Jun 2006 12:28:57 -0000	1.33
@@ -1 +1 @@
-a9081da7513ff1438821e8e739462cb6  evolution-exchange-2.7.2.tar.bz2
+5b87e7d205a32ee0577330fc05a7d630  evolution-exchange-2.7.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:43:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:43:40 -0400
Subject: rpms/gedit/devel gedit.spec,1.86,1.87
Message-ID: <200606141243.k5ECheF5032653@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32549

Modified Files:
	gedit.spec 
Log Message:
--disable-gtk-doc



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gedit.spec	13 Jun 2006 19:41:46 -0000	1.86
+++ gedit.spec	14 Jun 2006 12:43:38 -0000	1.87
@@ -109,7 +109,7 @@
 %patch3 -p1 -b .bgo-341055-workaround
 
 %build
-%configure --disable-scrollkeeper --enable-python
+%configure --disable-scrollkeeper --disable-gtk-doc --enable-python
 make
 
 %install



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:43:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:43:45 -0400
Subject: rpms/gnutls/devel gnutls-1.4.0-enable-psk.patch, NONE,
	1.1 gnutls-1.4.0-nosrp.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 gnutls.spec, 1.20, 1.21 sources, 1.8,
	1.9 gnutls-1.2.9-nosrp.patch, 1.1, NONE
Message-ID: <200606141243.k5EChjG6032712@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32674

Modified Files:
	.cvsignore gnutls.spec sources 
Added Files:
	gnutls-1.4.0-enable-psk.patch gnutls-1.4.0-nosrp.patch 
Removed Files:
	gnutls-1.2.9-nosrp.patch 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.0-1
- upgrade to new upstream version (#192070), rebuild
  of dependent packages required


gnutls-1.4.0-enable-psk.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnutls-1.4.0-enable-psk.patch ---
--- gnutls-1.4.0/configure.enable-psk	2006-06-14 13:03:22.000000000 +0200
+++ gnutls-1.4.0/configure	2006-06-14 14:01:30.000000000 +0200
@@ -9896,9 +9896,9 @@
 # Check whether --enable-psk-authentication or --disable-psk-authentication was given.
 if test "${enable_psk_authentication+set}" = set; then
   enableval="$enable_psk_authentication"
-  ac_enable_srp=no
+  ac_enable_psk=no
 fi;
-if test x$ac_enable_srp != xno; then
+if test x$ac_enable_psk != xno; then
  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 

gnutls-1.4.0-nosrp.patch:
 ex-client-srp.c |    5 ++++-
 ex-serv-srp.c   |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE gnutls-1.4.0-nosrp.patch ---
--- gnutls-1.2.9/doc/examples/ex-client-srp.c.nosrp	2005-08-10 11:13:30.000000000 +0200
+++ gnutls-1.2.9/doc/examples/ex-client-srp.c	2005-11-23 11:58:46.000000000 +0100
@@ -17,13 +17,16 @@
 #define SA struct sockaddr
 #define MSG "GET / HTTP/1.0\r\n\r\n"
 
+#if 0
 const int kx_priority[] = { GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS,
   GNUTLS_KX_SRP_RSA, 0
 };
+#endif
 
 int
 main (void)
 {
+#if 0
   int ret;
   int sd, ii;
   gnutls_session_t session;
@@ -122,6 +125,6 @@
   gnutls_certificate_free_credentials (cert_cred);
 
   gnutls_global_deinit ();
-
+#endif
   return 0;
 }
--- gnutls-1.2.9/doc/examples/ex-serv-srp.c.nosrp	2005-09-23 00:40:19.000000000 +0200
+++ gnutls-1.2.9/doc/examples/ex-serv-srp.c	2005-11-23 12:02:44.000000000 +0100
@@ -26,6 +26,7 @@
 #define MAX_BUF 1024
 #define PORT 5556		/* listen to 5556 port */
 
+#if 0
 /* These are global */
 gnutls_srp_server_credentials_t srp_cred;
 gnutls_certificate_credentials_t cert_cred;
@@ -54,10 +55,12 @@
 
   return session;
 }
+#endif
 
 int
 main (void)
 {
+#if 0
   int err, listen_sd, i;
   int sd, ret;
   struct sockaddr_in sa_serv;
@@ -170,7 +173,7 @@
   gnutls_certificate_free_credentials (cert_cred);
 
   gnutls_global_deinit ();
-
+#endif
   return 0;
 
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Feb 2006 08:10:43 -0000	1.8
+++ .cvsignore	14 Jun 2006 12:43:43 -0000	1.9
@@ -1 +1 @@
-gnutls-1.2.10-nosrp.tar.bz2
+gnutls-1.4.0-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnutls.spec	16 May 2006 15:43:52 -0000	1.20
+++ gnutls.spec	14 Jun 2006 12:43:43 -0000	1.21
@@ -1,10 +1,10 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
-Version: 1.2.10
-Release: 2
+Version: 1.4.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
-BuildRequires: libgcrypt-devel >= 1.2.2
+BuildRequires: libgcrypt-devel >= 1.2.2, gettext
 BuildRequires: zlib-devel, readline-devel, libtermcap-devel
 #BuildPrereq: libtasn1-devel
 #BuildPrereq: opencdk-devel
@@ -14,7 +14,8 @@
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
-Patch0: gnutls-1.2.9-nosrp.patch
+Patch0: gnutls-1.4.0-nosrp.patch
+Patch1: gnutls-1.4.0-enable-psk.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgcrypt >= 1.2.2
 
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nosrp
+%patch1 -p1 -b .enable-psk
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -72,6 +74,7 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%find_lang %{name}
 
 %check
 make check
@@ -93,7 +96,7 @@
    /sbin/install-info --delete %{_infodir}/gnutls.info.gz %{_infodir}/dir
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
@@ -111,10 +114,15 @@
 %files utils
 %defattr(-,root,root)
 %{_bindir}/certtool
+%{_bindir}/psktool
 %{_bindir}/gnutls*
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.0-1
+- upgrade to new upstream version (#192070), rebuild
+  of dependent packages required
+
 * Tue May 16 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.10-2
 - added missing buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Feb 2006 08:10:43 -0000	1.8
+++ sources	14 Jun 2006 12:43:43 -0000	1.9
@@ -1 +1 @@
-04ab0b4386d5996cf7c725f11ff8b801  gnutls-1.2.10-nosrp.tar.bz2
+89be8819c829f48a32bdf7a9f267e698  gnutls-1.4.0-nosrp.tar.bz2


--- gnutls-1.2.9-nosrp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:48:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:48:49 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.62,1.63
Message-ID: <200606141248.k5ECmn3g016812@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16738

Modified Files:
	evolution-connector.spec 
Log Message:
Build req fixes



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- evolution-connector.spec	14 Jun 2006 12:28:57 -0000	1.62
+++ evolution-connector.spec	14 Jun 2006 12:48:46 -0000	1.63
@@ -41,6 +41,7 @@
 BuildRequires: automake >= 1.9
 BuildRequires: intltool >= 0.35
 BuildRequires: libtool >= 1.5
+BuildRequires: gettext
 
 BuildRequires: evolution >= %{evolution_version}
 BuildRequires: evolution-devel >= %{evolution_version}



From fedora-cvs-commits at redhat.com  Wed Jun 14 12:54:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 08:54:38 -0400
Subject: rpms/gedit/devel gedit.spec,1.87,1.88
Message-ID: <200606141254.k5ECscmH019119@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19058

Modified Files:
	gedit.spec 
Log Message:
fix file lists



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gedit.spec	14 Jun 2006 12:43:38 -0000	1.87
+++ gedit.spec	14 Jun 2006 12:54:36 -0000	1.88
@@ -180,7 +180,7 @@
 %defattr(-, root, root)
 %{_includedir}/gedit-2.14
 %{_libdir}/pkgconfig/gedit-2.14.pc
-%{_datadir}/gtk-doc/gedit/
+%{_datadir}/gtk-doc/html/gedit/
 
 %changelog
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1



From fedora-cvs-commits at redhat.com  Wed Jun 14 13:08:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 09:08:01 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.33,
	1.34 evolution-connector.spec, 1.63, 1.64 sources, 1.33, 1.34
Message-ID: <200606141308.k5ED81xx021894@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21880

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:
add missing translations back



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	14 Jun 2006 12:28:57 -0000	1.33
+++ .cvsignore	14 Jun 2006 13:07:56 -0000	1.34
@@ -1 +1,2 @@
 evolution-exchange-2.7.3.tar.bz2
+evolution-exchange-2.7.2.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- evolution-connector.spec	14 Jun 2006 12:48:46 -0000	1.63
+++ evolution-connector.spec	14 Jun 2006 13:07:56 -0000	1.64
@@ -24,6 +24,8 @@
 Summary: Evolution plugin to interact with MS Exchange Server
 URL: http://www.gnome.org/projects/evolution/
 Source: evolution-exchange-%{version}.tar.bz2
+# 2.7.3 shipped without translations...
+Source1: evolution-exchange-2.7.2.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 ### Dependencies ###
@@ -70,6 +72,11 @@
 
 %prep
 %setup -q -n evolution-exchange-%{version}
+
+# 2.7.3 shipped without translations
+tar xjf %{SOURCE1}
+cp -f evolution-exchange-2.7.2/po/* po
+
 %patch100 -p1 -b .64bit-fix-acinclude.m4
 %patch101 -p1 -b .fix-marshaller
 %patch102 -p1 -b .fix-missing-declarations-2.5.91


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	14 Jun 2006 12:28:57 -0000	1.33
+++ sources	14 Jun 2006 13:07:56 -0000	1.34
@@ -1 +1,2 @@
 5b87e7d205a32ee0577330fc05a7d630  evolution-exchange-2.7.3.tar.bz2
+a9081da7513ff1438821e8e739462cb6  evolution-exchange-2.7.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 13:13:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 09:13:19 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.20,1.21
Message-ID: <200606141313.k5EDDJjs032704@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31313

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix asm-s390/posix_types.h

linux-2.6-header-cleanup-git.patch:
 drivers/s390/crypto/z90crypt.h                       |  185 ----------------
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-alpha/unistd.h                           |    7 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm/unistd.h                             |   10 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-arm26/unistd.h                           |   10 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-cris/unistd.h                            |    9 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/unistd.h                             |    7 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/unistd.h                           |    7 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/page.h                              |    5 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-i386/unistd.h                            |    7 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m32r/unistd.h                            |    5 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/unistd.h                            |    7 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-m68knommu/unistd.h                       |    7 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    7 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-parisc/unistd.h                          |    4 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    9 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    8 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/cmb.h                               |    2 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/posix_types.h                       |   44 ++-
 include/asm-s390/ptrace.h                            |    6 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    8 
 include/asm-s390/vtoc.h                              |   38 +--
 include/asm-s390/z90crypt.h                          |  212 +++++++++++++++++++
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/unistd.h                              |    7 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sh64/unistd.h                            |    7 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/unistd.h                           |    4 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-sparc64/unistd.h                         |    4 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/unistd.h                            |   12 -
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    9 
 include/asm-x86_64/page.h                            |    5 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-x86_64/unistd.h                          |    7 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/asm-xtensa/unistd.h                          |   21 -
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/affs_hardblocks.h                      |   72 +++---
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/compiler.h                             |   19 -
 include/linux/cpufreq.h                              |    1 
 include/linux/cramfs_fs.h                            |   34 +--
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/divert.h                               |   20 -
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf-em.h                               |   44 +++
 include/linux/elf.h                                  |   59 -----
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++--------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |   10 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 
 include/linux/i2o-dev.h                              |  167 +++++++-------
 include/linux/ide.h                                  |    1 
 include/linux/if_fddi.h                              |    2 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/input.h                                |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/joystick.h                             |   22 -
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +-
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/nbd.h                                  |   12 -
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter/xt_conntrack.h               |    2 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 +--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    5 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/ppp_defs.h                             |   14 -
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 ++++----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 --
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/ufs_fs.h                               |    1 
 include/linux/unistd.h                               |    2 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/sound/hdsp.h                                 |   12 -
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 906 files changed, 844 insertions(+), 1651 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-header-cleanup-git.patch	9 Jun 2006 17:12:12 -0000	1.20
+++ linux-2.6-header-cleanup-git.patch	14 Jun 2006 13:13:16 -0000	1.21
@@ -7147,6 +7147,63 @@
  #include <linux/threads.h>
  #include <linux/gfp.h>
  #include <linux/mm.h>
+diff --git a/include/asm-s390/posix_types.h b/include/asm-s390/posix_types.h
+index 61788de..b94c988 100644
+--- a/include/asm-s390/posix_types.h
++++ b/include/asm-s390/posix_types.h
+@@ -76,24 +76,36 @@ #endif                       /* !defined
+ } __kernel_fsid_t;
+ 
+ 
+-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+-
+-#ifndef _S390_BITOPS_H
+-#include <asm/bitops.h>
+-#endif
+-
+-#undef  __FD_SET
+-#define __FD_SET(fd,fdsetp)  set_bit((fd),(fdsetp)->fds_bits)
+-
+-#undef  __FD_CLR
+-#define __FD_CLR(fd,fdsetp)  clear_bit((fd),(fdsetp)->fds_bits)
+-
+-#undef  __FD_ISSET
+-#define __FD_ISSET(fd,fdsetp)  test_bit((fd),(fdsetp)->fds_bits)
++#ifdef __KERNEL__
++
++#undef __FD_SET
++static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
++{
++	unsigned long _tmp = fd / __NFDBITS;
++	unsigned long _rem = fd % __NFDBITS;
++	fdsetp->fds_bits[_tmp] |= (1UL<<_rem);
++}
++
++#undef __FD_CLR
++static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
++{
++	unsigned long _tmp = fd / __NFDBITS;
++	unsigned long _rem = fd % __NFDBITS;
++	fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem);
++}
++
++#undef __FD_ISSET
++static inline int __FD_ISSET(unsigned long fd, const __kernel_fd_set *fdsetp)
++{
++	unsigned long _tmp = fd / __NFDBITS;
++	unsigned long _rem = fd % __NFDBITS;
++	return (fdsetp->fds_bits[_tmp] & (1UL<<_rem)) != 0;
++}
+ 
+ #undef  __FD_ZERO
+-#define __FD_ZERO(fdsetp) (memset ((fdsetp), 0, sizeof(*(fd_set *)(fdsetp))))
++#define __FD_ZERO(fdsetp) \
++	((void) memset ((__ptr_t) (fdsetp), 0, sizeof (__kernel_fd_set)))
+ 
+-#endif     /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)*/
++#endif     /* __KERNEL__ */
+ 
+ #endif
 diff --git a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
 index a949cc0..4d75d77 100644
 --- a/include/asm-s390/ptrace.h



From fedora-cvs-commits at redhat.com  Wed Jun 14 13:21:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 09:21:33 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.64,1.65
Message-ID: <200606141321.k5EDLXfL015015@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15002

Modified Files:
	evolution-connector.spec 
Log Message:
fix file lists



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- evolution-connector.spec	14 Jun 2006 13:07:56 -0000	1.64
+++ evolution-connector.spec	14 Jun 2006 13:21:31 -0000	1.65
@@ -122,7 +122,7 @@
 %doc AUTHORS COPYING INSTALL NEWS docs/active-directory
 %doc docs/autoconfig docs/debug docs/forms
 %doc docs/http
-%{_bindir}/ximian-connector-setup-%{evo_major}
+%{_bindir}/exchange-connector-setup-%{evo_major}
 %{_libdir}/bonobo/servers/GNOME_Evolution_Exchange_Storage_%{evo_major}.server
 %{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelexchange.so
 %{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelexchange.la



From fedora-cvs-commits at redhat.com  Wed Jun 14 13:27:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 09:27:13 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.9,
	1.10 glibc-kernheaders.spec, 1.148, 1.149 sources, 1.50, 1.51
Message-ID: <200606141327.k5EDRDgq015106@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15088

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
fix s390 posix_types.h


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Jun 2006 00:02:38 -0000	1.9
+++ .cvsignore	14 Jun 2006 13:27:10 -0000	1.10
@@ -1 +1 @@
-glibc-kernheaders-2.6.16-1.2271_FC6.tar.bz2
+glibc-kernheaders-2.6.16-1.2282_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- glibc-kernheaders.spec	13 Jun 2006 00:02:39 -0000	1.148
+++ glibc-kernheaders.spec	14 Jun 2006 13:27:10 -0000	1.149
@@ -1,9 +1,9 @@
-%define KVER 2.6.16-1.2271_FC6
+%define KVER 2.6.16-1.2282_FC6
 
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 41
+Release: 42
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -109,6 +109,9 @@
 /usr/include/*
 
 %changelog
+* Wed Jun 14 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-42
+- Update to 2.6.16-1.2282_FC6; fix asm-s390/posix_types.h (was #194891)
+
 * Tue Jun 13 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-41
 - Update to 2.6.16-1.2271_FC6; add new IPv6 netfilter headers (#121257)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Jun 2006 00:02:39 -0000	1.50
+++ sources	14 Jun 2006 13:27:10 -0000	1.51
@@ -1 +1 @@
-4800e20798524fd81fb1bb7930cf48f1  glibc-kernheaders-2.6.16-1.2271_FC6.tar.bz2
+f11cc45ed03d85ebafef58d2f377818a  glibc-kernheaders-2.6.16-1.2282_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:08:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:08:13 -0400
Subject: rpms/libpfm/devel .cvsignore, 1.3, 1.4 libpfm.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200606141408.k5EE8Dxf014583@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14520

Modified Files:
	.cvsignore libpfm.spec sources 
Log Message:
Import libpfm-3.2-060613.tar.gz




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 May 2006 02:27:43 -0000	1.3
+++ .cvsignore	14 Jun 2006 14:08:10 -0000	1.4
@@ -1 +1 @@
-libpfm-3.2-060421.tar.gz
+libpfm-3.2-060613.tar.gz


Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libpfm.spec	5 May 2006 15:21:25 -0000	1.10
+++ libpfm.spec	14 Jun 2006 14:08:10 -0000	1.11
@@ -1,5 +1,5 @@
-%define DATE 060421
-%define libpfm_release 3
+%define DATE 060613
+%define libpfm_release 1
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.2
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>
+- Update to libpfm-3.2-060613.
+
 * Fri May 05 2006 Will Cohen <wcohen at redhat.com>
 - fno-strict-aliasing so ia64 builds.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 May 2006 02:27:43 -0000	1.3
+++ sources	14 Jun 2006 14:08:10 -0000	1.4
@@ -1 +1 @@
-61f99c3605c27c9276f1b3b7ebf9d30b  libpfm-3.2-060421.tar.gz
+400b7add3ae943a4539429007e86427d  libpfm-3.2-060613.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:13:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:13:24 -0400
Subject: rpms/libsoup/devel libsoup.spec,1.34,1.35
Message-ID: <200606141413.k5EEDNKG015786@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15756

Modified Files:
	libsoup.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.2.94-2
- rebuilt with new gnutls



Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libsoup.spec	13 Jun 2006 17:56:43 -0000	1.34
+++ libsoup.spec	14 Jun 2006 14:13:21 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
 Version: 2.2.94
-Release: 1
+Release: 2
 License: LGPL
 Group: Development/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.2.94-2
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.94-1
 - Update to 2.2.94
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:14:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:14:00 -0400
Subject: rpms/pfmon/devel .cvsignore, 1.3, 1.4 pfmon.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <200606141414.k5EEE0fW015968@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15890

Modified Files:
	.cvsignore pfmon.spec sources 
Log Message:
Import pfmon-3.2-060522.tar.gz




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 May 2006 02:43:55 -0000	1.3
+++ .cvsignore	14 Jun 2006 14:13:58 -0000	1.4
@@ -1 +1 @@
-pfmon-3.2-060426.tar.gz
+pfmon-3.2-060522.tar.gz


Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pfmon.spec	5 May 2006 20:10:14 -0000	1.10
+++ pfmon.spec	14 Jun 2006 14:13:58 -0000	1.11
@@ -1,5 +1,5 @@
-%define DATE 060426
-%define pfmon_release 2
+%define DATE 060522
+%define pfmon_release 1
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
@@ -11,7 +11,7 @@
 ExclusiveOS: linux
 AutoReqProv: no
 Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}-%{DATE}.tar.gz
-Patch1: pfmon-check_support.patch
+#Patch1: pfmon-check_support.patch
 Patch2: pfmon-nounwind.patch
 Requires: libpfm
 BuildPreReq: elfutils-devel
@@ -28,7 +28,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-%{DATE}
-%patch1 -p1 -b .check_support
+#%patch1 -p1 -b .check_support
 %patch2 -p1 -b .nounwind
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,6 +50,9 @@
 %attr(755,root,root) /usr/bin/pfmon_gen
 
 %changelog
+* Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>
+- Update to pfmon-3.2-060522.
+
 * Fri May 05 2006 Will Cohen <wcohen at redhat.com>
 - Do not use the unwind libraries.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 May 2006 02:43:55 -0000	1.3
+++ sources	14 Jun 2006 14:13:58 -0000	1.4
@@ -1 +1 @@
-0e10f365b23d920491a003cdb1cb8db3  pfmon-3.2-060426.tar.gz
+4378a9b91e36f3d58bb699a6cdf4643d  pfmon-3.2-060522.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:17:29 -0400
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.25,1.26
Message-ID: <200606141417.k5EEHT2H025979@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25722

Modified Files:
	xmlsec1.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.9-8
- rebuilt with new gnutls



Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xmlsec1.spec	8 Jun 2006 12:47:05 -0000	1.25
+++ xmlsec1.spec	14 Jun 2006 14:17:27 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 7
+Release: 8
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -234,6 +234,9 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.9-8
+- rebuilt with new gnutls
+
 * Thu Jun  8 2006 Daniel Veillard <veillard at redhat.com> - 1.2.9-7
 - oops libxmlsec1.la was still there, should fix #171410 and #154142
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:17:39 -0400
Subject: rpms/python-docs/FC-5 python-docs.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200606141417.k5EEHZ9a026062@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python-docs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26013

Modified Files:
	python-docs.spec sources 
Log Message:
Updating docs to 2.4.3


Index: python-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/python-docs/FC-5/python-docs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-docs.spec	9 Dec 2005 22:42:53 -0000	1.8
+++ python-docs.spec	14 Jun 2006 14:17:31 -0000	1.9
@@ -12,8 +12,8 @@
 
 Summary: Documentation for the Python programming language.
 Name: %{python}-docs
-Version: %{pybasever}.2
-Release: 1.1
+Version: %{pybasever}.3
+Release: 0.9.FC5
 License: PSF - see LICENSE
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -67,6 +67,12 @@
 %doc Misc/HISTORY Doc/html
 
 %changelog
+* Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> 2.4.3-0.9
+- built older version for FC5
+
+* Sat Apr  8 2006 Mihai Ibanescu <misa at redhat.com> 2.4.3-1
+- updated to 2.4.3
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-docs/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2005 13:35:35 -0000	1.4
+++ sources	14 Jun 2006 14:17:31 -0000	1.5
@@ -1 +1 @@
-98db1465629693fc434d4dc52db93838  Python-2.4.2.tar.bz2
+141c683447d5e76be1d2bd4829574f02  Python-2.4.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:17:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:17:56 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.33,1.34
Message-ID: <200606141417.k5EEHupB027495@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27266

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-4
- Require eclipse 3.2.0.


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- eclipse-changelog.spec	13 Jun 2006 21:13:04 -0000	1.33
+++ eclipse-changelog.spec	14 Jun 2006 14:17:53 -0000	1.34
@@ -21,12 +21,12 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        3
+Release:        4
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
-Requires:	eclipse-platform >= 1:3.1.2
-Requires:	eclipse-platform < 1:3.1.3
+Requires:	eclipse-platform >= 1:3.2.0
+Requires:	eclipse-platform < 1:3.2.1
 
 # Note that following the Eclipse Releng process we do not distribute a 
 # real .tar.gz file.  Instead, you must build it by hand.  The way to do 
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-4
+- Require eclipse 3.2.0.
+
 * Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-3
 - Rebuilding for new version of the SDK, with a versionless pde.build.
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:20:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:20:31 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.97,
	1.98
Message-ID: <200606141420.k5EEKVgQ032343@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32309

Modified Files:
	evolution-data-server.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.7.3-2
- rebuilt with new gnutls



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- evolution-data-server.spec	13 Jun 2006 19:57:35 -0000	1.97
+++ evolution-data-server.spec	14 Jun 2006 14:20:29 -0000	1.98
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.7.3
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -324,6 +324,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.7.3-2
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Matthisa Clasen  <mclasen at redhat.com> 1.7.3-1
 - Update to 1.7.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:21:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:21:19 -0400
Subject: rpms/glib-java/devel .cvsignore, 1.9, 1.10 glib-java.spec, 1.32,
	1.33 sources, 1.9, 1.10
Message-ID: <200606141421.k5EELJlO032508@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32399

Modified Files:
	.cvsignore glib-java.spec sources 
Log Message:
New version 0.2.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Apr 2006 19:25:49 -0000	1.9
+++ .cvsignore	14 Jun 2006 14:21:17 -0000	1.10
@@ -1 +1 @@
-glib-java-0.2.4.tar.gz
+glib-java-0.2.5.tar.gz


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- glib-java.spec	24 May 2006 13:42:13 -0000	1.32
+++ glib-java.spec	14 Jun 2006 14:21:17 -0000	1.33
@@ -14,8 +14,8 @@
 %define name_base glib-java
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
-Version:   0.2.4
-Release:   4
+Version:   0.2.5
+Release:   0
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL
@@ -27,7 +27,7 @@
 Requires: 	/sbin/ldconfig
 Requires: 	%{c_pkg_prefix}glib2 >= 2.7.0
 BuildRequires:  java-devel >= 1.4.2 %{c_pkg_prefix}glib2-devel >= 2.7.0
-BuildRequires:  gcc-java >= 3.3.3, docbook-utils
+BuildRequires:  gcc-java >= 4.1.1, docbook-utils
 BuildRequires: 	pkgconfig
 
 %description 
@@ -118,6 +118,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.5-0
+- New version.
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 0.2.4-4
 - Change mod time of all java source files for the src zip.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Apr 2006 19:25:49 -0000	1.9
+++ sources	14 Jun 2006 14:21:17 -0000	1.10
@@ -1 +1 @@
-12b6a077b927175c182109fc60d57b7f  glib-java-0.2.4.tar.gz
+485ce03efb290bf05666dc42c694a637  glib-java-0.2.5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:32:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:32:39 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.34,1.35
Message-ID: <200606141432.k5EEWds5003203@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3161

Modified Files:
	eclipse-changelog.spec 
Log Message:
Fix date


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eclipse-changelog.spec	14 Jun 2006 14:17:53 -0000	1.34
+++ eclipse-changelog.spec	14 Jun 2006 14:32:35 -0000	1.35
@@ -138,7 +138,7 @@
 %endif
 
 %changelog
-* Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-4
+* Wed Jun 14 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-4
 - Require eclipse 3.2.0.
 
 * Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-3



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:42:42 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.153,1.154
Message-ID: <200606141442.k5EEggTG004935@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4900

Modified Files:
	gtk2.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.9.3-2
- rebuilt with new gnutls



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gtk2.spec	13 Jun 2006 13:28:23 -0000	1.153
+++ gtk2.spec	14 Jun 2006 14:42:40 -0000	1.154
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -268,6 +268,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.9.3-2
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-1
 - Update to 2.9.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:43:30 -0400
Subject: rpms/totem/devel totem.spec,1.62,1.63
Message-ID: <200606141443.k5EEhUp1005121@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5065

Modified Files:
	totem.spec 
Log Message:
Fix a gstreamer problem



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- totem.spec	13 Jun 2006 16:25:42 -0000	1.62
+++ totem.spec	14 Jun 2006 14:43:28 -0000	1.63
@@ -76,6 +76,9 @@
 %patch1 -p1 -b .feature-help-removal
 
 %build
+# try to work around a problem where gst-inspect does 
+# not find playbin the first time around
+/usr/bin/gst-inspect-0.10 --print-all
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla 
 %configure --enable-gstreamer --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:44:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:44:43 -0400
Subject: rpms/totem/devel totem.spec,1.63,1.64
Message-ID: <200606141444.k5EEihed005592@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5514

Modified Files:
	totem.spec 
Log Message:
work around gstreamer borkage



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- totem.spec	14 Jun 2006 14:43:28 -0000	1.63
+++ totem.spec	14 Jun 2006 14:44:41 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.5.2
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -161,6 +161,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.2-2
+- Work around a gstreamer problem
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.2-1
 - Update to 1.5.2
 - BuildRequire hal



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:45:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:45:28 -0400
Subject: rpms/cups/devel cups.spec,1.216,1.217
Message-ID: <200606141445.k5EEjSFh005928@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5889

Modified Files:
	cups.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1:1.2.1-12
- rebuilt with new gnutls



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- cups.spec	13 Jun 2006 16:23:51 -0000	1.216
+++ cups.spec	14 Jun 2006 14:45:26 -0000	1.217
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 11
+Release: 12
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -392,6 +392,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1:1.2.1-12
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-11
 - Remove certs directory in %%post, not %%postun.
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:47:00 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.69,1.70
Message-ID: <200606141447.k5EEl0r0017410@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15497

Modified Files:
	gnome-media.spec 
Log Message:
Work around gstreamer borkage



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-media.spec	13 Jun 2006 18:12:40 -0000	1.69
+++ gnome-media.spec	14 Jun 2006 14:46:57 -0000	1.70
@@ -68,6 +68,7 @@
 %patch5 -p1 -b .hide-help-button
 
 %build
+/usr/bin/gst-inspect-0.10 --print-all
 %configure  --disable-scrollkeeper
 make #%{?_smp_mflags}
 
@@ -157,6 +158,7 @@
 %changelog
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
 - Rebuild against new nautilus-cd-burner
+- Work around a gstreamer problem
 
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - Fix missing BuildRequires



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:49:20 -0400
Subject: rpms/util-linux/devel util-linux-2.13-nfs4-posix_types.patch, NONE,
	1.1 util-linux.spec, 1.121, 1.122
Message-ID: <200606141449.k5EEnKdm022041@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21973

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-nfs4-posix_types.patch 
Log Message:
Remove unneeded header files from nfsmount.c


util-linux-2.13-nfs4-posix_types.patch:
 nfs4mount.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE util-linux-2.13-nfs4-posix_types.patch ---
--- util-linux-2.13-pre6/mount/nfs4mount.c.nohdr	2006-06-14 10:28:27.137166000 -0400
+++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-06-14 10:28:48.973307000 -0400
@@ -17,8 +17,6 @@
 
 #include "../config.h"	/* for HAVE_RPCSVC_NFS_PROT_H and HAVE_INET_ATON */
 
-#include <linux/posix_types.h>
-#include <asm/posix_types.h>
 #undef __FD_CLR
 #undef __FD_SET
 #undef __FD_ISSET


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- util-linux.spec	12 Jun 2006 16:04:59 -0000	1.121
+++ util-linux.spec	14 Jun 2006 14:49:17 -0000	1.122
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.25
+Release: 0.26
 License: distributable
 Group: System Environment/Base
 
@@ -213,6 +213,8 @@
 Patch242: util-linux-2.12a-raw-man-dd.patch
 # Don't use asm/page.h
 Patch243: util-linux-2.13-swap-page.patch
+# Don't use linux/posix_types.h or asm/posix_types.h
+Patch244: util-linux-2.13-nfs4-posix_types.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -307,6 +309,7 @@
 %patch241 -p1
 %patch242 -p1
 %patch243 -p1
+%patch244 -p1
 
 %build
 unset LINGUAS || :
@@ -692,6 +695,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Jun 14 2006 Steve Dickson <steved at redhat.com> 2.13-0.26
+- Remove unneeded header files from nfsmount.c
+
 * Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 2.13-0.25
 - fix #187014 - umount segfaults for normal user
 - fix #183446 - cal not UTF-8-aware



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:51:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:51:10 -0400
Subject: rpms/pfmon/devel pfmon.spec,1.11,1.12
Message-ID: <200606141451.k5EEpAox022764@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22653

Modified Files:
	pfmon.spec 
Log Message:
Correct build dependencies.




Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pfmon.spec	14 Jun 2006 14:13:58 -0000	1.11
+++ pfmon.spec	14 Jun 2006 14:51:08 -0000	1.12
@@ -1,5 +1,5 @@
 %define DATE 060522
-%define pfmon_release 1
+%define pfmon_release 2
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
@@ -15,8 +15,8 @@
 Patch2: pfmon-nounwind.patch
 Requires: libpfm
 BuildPreReq: elfutils-devel
-BuildPreReq: libpfm
-BuildPreReq: libpfm-devel
+BuildPreReq: libpfm >= 3.2-0.060613.1
+BuildPreReq: libpfm-devel >= 3.2-0.060613.1
 
 %description
 This package contains pfmon 3.x, a tool to monitor performance using
@@ -51,6 +51,9 @@
 
 %changelog
 * Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>
+- Correct BuildPreReq.
+
+* Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>
 - Update to pfmon-3.2-060522.
 
 * Fri May 05 2006 Will Cohen <wcohen at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:53:20 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.275, 1.276 anaconda.spec, 1.399,
	1.400 sources, 1.396, 1.397
Message-ID: <200606141453.k5EErKSI023663@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23622/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.37-1 on branch devel from anaconda-11.1.0.37-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- .cvsignore	14 Jun 2006 04:47:52 -0000	1.275
+++ .cvsignore	14 Jun 2006 14:53:18 -0000	1.276
@@ -1 +1 @@
-anaconda-11.1.0.36.tar.bz2
+anaconda-11.1.0.37.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- anaconda.spec	14 Jun 2006 04:47:52 -0000	1.399
+++ anaconda.spec	14 Jun 2006 14:53:18 -0000	1.400
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.36
+Version: 11.1.0.37
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.37-1
+- Remove the step ordering debug commit
+- Fix traceback due to new xen kernel names
+- Another attempt at s390
+- Include gptsync in install image so that mactels will boot
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.36-1
 - new xen kernel names
 - more trying to fix s390


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- sources	14 Jun 2006 04:47:52 -0000	1.396
+++ sources	14 Jun 2006 14:53:18 -0000	1.397
@@ -1 +1 @@
-b6b66056cc662f88bc6f29c54674c0d8  anaconda-11.1.0.36.tar.bz2
+b972d57bb5985e5d012b9b93f2b23ce0  anaconda-11.1.0.37.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 14:59:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 10:59:28 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2133,1.2133.2.1
Message-ID: <200606141459.k5EExSS2026256@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26223

Modified Files:
      Tag: private-kernel-2_6_16-1_2133_FC5-xen-PAE-branch
	kernel-2.6.spec 
Log Message:
enable PAE


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2133
retrieving revision 1.2133.2.1
diff -u -r1.2133 -r1.2133.2.1
--- kernel-2.6.spec	6 Jun 2006 04:35:22 -0000	1.2133
+++ kernel-2.6.spec	14 Jun 2006 14:59:26 -0000	1.2133.2.1
@@ -9,7 +9,7 @@
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
-%define buildxenPAE 0
+%define buildxenPAE 1
 %define builddoc 0
 %define buildkdump 1
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:02:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:02:13 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.55,1.56
Message-ID: <200606141502.k5EF2DcB026806@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26780

Modified Files:
	sound-juicer.spec 
Log Message:
Work around gstreamer borkage



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sound-juicer.spec	14 Jun 2006 11:43:54 -0000	1.55
+++ sound-juicer.spec	14 Jun 2006 15:02:05 -0000	1.56
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.15.3
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %setup -q
 
 %build
+# work around a gstreamer problem where it 
+# doesn't find plugins the first time around
+/usr/bin/gst-inspect-0.10 --print-all
 %configure --enable-hal --disable-scrollkeeper
 
 make AM_CFLAGS=-export-dynamic
@@ -107,6 +110,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
+- Work around a gstreamer problem
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:05:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:05:45 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2133.2.1,1.2133.2.2
Message-ID: <200606141505.k5EF5jr8027169@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27127

Modified Files:
      Tag: private-kernel-2_6_16-1_2133_FC5-xen-PAE-branch
	kernel-2.6.spec 
Log Message:
fix missing patch build error


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2133.2.1
retrieving revision 1.2133.2.2
diff -u -r1.2133.2.1 -r1.2133.2.2
--- kernel-2.6.spec	14 Jun 2006 14:59:26 -0000	1.2133.2.1
+++ kernel-2.6.spec	14 Jun 2006 15:05:31 -0000	1.2133.2.2
@@ -233,7 +233,7 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
-Patch209: linux-2.6-x86-smp-alternatives.patch
+#Patch209: linux-2.6-x86-smp-alternatives.patch
 Patch210: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
@@ -1696,6 +1696,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
+- comment 209 patch, as it don't exist anymore
+
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2133_FC5]
 - Add a PPC64 kdump kernel.
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:08:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:08:19 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2133.2.2,1.2133.2.3
Message-ID: <200606141508.k5EF8Jlm027602@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27566

Modified Files:
      Tag: private-kernel-2_6_16-1_2133_FC5-xen-PAE-branch
	kernel-2.6.spec 
Log Message:
add _xen_PAE to the tag name


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2133.2.2
retrieving revision 1.2133.2.3
diff -u -r1.2133.2.2 -r1.2133.2.3
--- kernel-2.6.spec	14 Jun 2006 15:05:31 -0000	1.2133.2.2
+++ kernel-2.6.spec	14 Jun 2006 15:08:16 -0000	1.2133.2.3
@@ -24,7 +24,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5_xen_PAE
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -1696,6 +1696,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Juan Quintela <quintela at troll.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5_xen_PAE
+- play with release tag
+
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - comment 209 patch, as it don't exist anymore
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:11:53 -0400
Subject: rpms/control-center/devel control-center.spec,1.144,1.145
Message-ID: <200606141511.k5EFBrfl028157@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27950

Modified Files:
	control-center.spec 
Log Message:
work around gstreamer borkage



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- control-center.spec	13 Jun 2006 19:06:20 -0000	1.144
+++ control-center.spec	14 Jun 2006 15:11:42 -0000	1.145
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.3
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -146,6 +146,10 @@
 aclocal
 automake
 
+# work around a gstreamer problem where it doesn't find
+# plugins the first time around
+/usr/bin/gst-inspect-0.10 --print-all
+
 # Add -Wno-error to silence gswitchit
 %configure --disable-gstreamer --enable-alsa CFLAGS="$RPM_OPT_FLAGS -Wno-error" --enable-aboutme --disable-scrollkeeper
 make
@@ -254,6 +258,9 @@
 %{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
+- Work around a gstreamer problem
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:29:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:29:47 -0400
Subject: rpms/cairo/devel cairo.spec,1.45,1.46
Message-ID: <200606141529.k5EFTl0X017051@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17001

Modified Files:
	cairo.spec 
Log Message:
1.1.8



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cairo.spec	16 May 2006 14:58:32 -0000	1.45
+++ cairo.spec	14 Jun 2006 15:29:44 -0000	1.46
@@ -3,8 +3,8 @@
 
 Summary:   A vector graphics library
 Name:      cairo
-Version:   1.1.6
-Release:   6
+Version:   1.1.8
+Release:   1
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -88,6 +88,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> 1.1.8-1
+- Update to 1.1.8
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 1.1.6-6
 - buildrequire libxml2-devel
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:39:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:39:04 -0400
Subject: rpms/cairo/devel .cvsignore,1.14,1.15 sources,1.14,1.15
Message-ID: <200606141539.k5EFd4tC017751@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17716

Modified Files:
	.cvsignore sources 
Log Message:
new source



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	5 May 2006 07:29:43 -0000	1.14
+++ .cvsignore	14 Jun 2006 15:39:01 -0000	1.15
@@ -1 +1 @@
-cairo-1.1.6.tar.gz
+cairo-1.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 May 2006 07:29:43 -0000	1.14
+++ sources	14 Jun 2006 15:39:01 -0000	1.15
@@ -1 +1 @@
-82820b5a7d0135d0393b20caaea5687e  cairo-1.1.6.tar.gz
+57e239099e5770f66072eaa35d1c505b  cairo-1.1.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:45:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:45:04 -0400
Subject: rpms/cairo/devel cairo.spec,1.46,1.47
Message-ID: <200606141545.k5EFj4jE019299@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19235

Modified Files:
	cairo.spec 
Log Message:
try again



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cairo.spec	14 Jun 2006 15:29:44 -0000	1.46
+++ cairo.spec	14 Jun 2006 15:45:01 -0000	1.47
@@ -24,9 +24,6 @@
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
-Patch0: cairo-1.1.4-work-with-older-poppler.patch
-Patch1: cairo-1.1.6-do-not-build-pdf2svg.patch
-
 %description 
 Cairo is a vector graphics library designed to provide high-quality
 display and print output. Currently supported output targets include
@@ -52,8 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .work-with-older-poppler
-%patch1 -p1 -b .do-not-build-pdf2svg
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:49:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:49:02 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.70,
	1.71 policy-20060608.patch, 1.5, 1.6 selinux-policy.spec,
	1.208, 1.209 sources, 1.74, 1.75
Message-ID: <200606141549.k5EFn2Y3002900@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2873

Modified Files:
	.cvsignore policy-20060608.patch selinux-policy.spec sources 
Log Message:
* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1
- Update from Upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	13 Jun 2006 18:26:00 -0000	1.70
+++ .cvsignore	14 Jun 2006 15:48:59 -0000	1.71
@@ -71,3 +71,4 @@
 serefpolicy-2.2.43.tgz
 serefpolicy-2.2.45.tgz
 serefpolicy-2.2.46.tgz
+serefpolicy-2.2.47.tgz

policy-20060608.patch:
 global_tunables               |    7 +++++++
 modules/admin/bootloader.te   |    2 +-
 modules/admin/consoletype.te  |    7 ++++++-
 modules/admin/netutils.te     |    1 +
 modules/admin/prelink.fc      |    3 +--
 modules/kernel/files.if       |   35 +++++++++++++++++++++++++++++++++++
 modules/kernel/kernel.if      |   38 ++++++++++++++++++++++++++++++++++++++
 modules/services/apache.te    |    9 +++++++++
 modules/services/automount.te |   13 ++++++++++++-
 modules/services/ntp.te       |    1 +
 modules/services/pegasus.if   |   31 +++++++++++++++++++++++++++++++
 modules/services/pegasus.te   |    5 ++---
 modules/system/hostname.te    |    5 ++++-
 modules/system/init.te        |    1 +
 modules/system/mount.te       |    1 +
 modules/system/selinuxutil.te |    2 ++
 modules/system/unconfined.fc  |    2 ++
 modules/system/userdomain.if  |    2 +-
 18 files changed, 155 insertions(+), 10 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policy-20060608.patch	13 Jun 2006 19:39:55 -0000	1.5
+++ policy-20060608.patch	14 Jun 2006 15:48:59 -0000	1.6
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.46/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.46/policy/global_tunables	2006-06-13 13:00:04.000000000 -0400
++++ serefpolicy-2.2.47/policy/global_tunables	2006-06-14 11:28:00.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,9 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.46/policy/modules/admin/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/admin/bootloader.te	2006-06-13 07:31:06.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-14 11:28:00.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -27,9 +27,9 @@
  allow bootloader_t self:fifo_file rw_file_perms;
  
  allow bootloader_t bootloader_etc_t:file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.46/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/admin/consoletype.te	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-14 11:28:00.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -44,9 +44,20 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.46/policy/modules/admin/prelink.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-14 11:48:02.000000000 -0400
+@@ -54,6 +54,7 @@
+ corenet_udp_sendrecv_all_ports(netutils_t)
+ corenet_tcp_connect_all_ports(netutils_t)
+ corenet_sendrecv_all_client_packets(netutils_t)
++corenet_udp_bind_generic_node(netutils_t)
+ 
+ fs_getattr_xattr_fs(netutils_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/admin/prelink.fc	2006-06-13 07:24:35.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-14 11:28:00.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -55,9 +66,9 @@
 -
  /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.46/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/kernel/files.if	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-14 11:28:00.000000000 -0400
 @@ -1931,6 +1931,21 @@
  ')
  
@@ -104,9 +115,9 @@
 +	allow $1 { file_type -security_file_type }:file mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.46/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/kernel/kernel.if	2006-06-13 10:46:36.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-14 11:28:00.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -149,9 +160,9 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.46/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/services/apache.te	2006-06-13 13:39:28.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-14 11:28:00.000000000 -0400
 @@ -293,6 +293,15 @@
  	miscfiles_manage_public_files(httpd_t)
  ') 
@@ -168,9 +179,42 @@
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.46/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-14 11:28:49.000000000 -0400
+@@ -28,7 +28,7 @@
+ # Local policy
+ #
+ 
+-allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
++allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override sys_admin };
+ dontaudit automount_t self:capability sys_tty_config;
+ allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
+ allow automount_t self:fifo_file rw_file_perms;
+@@ -64,9 +64,20 @@
+ kernel_read_system_state(automount_t)
+ kernel_read_network_state(automount_t)
+ kernel_list_proc(automount_t)
++kernel_dontaudit_search_xen_state(automount_t)
+ 
+ files_search_boot(automount_t)
+ 
++#
++# Automount is slowly adding all mount functionality internally
++#
++files_search_all(automount_t)
++files_mounton_all_mountpoints(automount_t)
++files_mount_all_file_type_fs(automount_t)
++files_unmount_all_file_type_fs(automount_t)
++fs_mount_all_fs(automount_t)
++fs_unmount_all_fs(automount_t)
++
+ corecmd_exec_sbin(automount_t)
+ corecmd_exec_bin(automount_t)
+ corecmd_exec_shell(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/services/ntp.te	2006-06-13 07:35:06.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-14 11:28:00.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -179,9 +223,9 @@
  
  corenet_non_ipsec_sendrecv(ntpd_t)
  corenet_tcp_sendrecv_all_if(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.46/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/services/pegasus.if	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-14 11:28:00.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -215,9 +259,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.46/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/services/pegasus.te	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-14 11:28:00.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -234,9 +278,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.46/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.46/policy/modules/system/hostname.te	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-14 11:28:00.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -249,9 +293,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.46/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/init.te	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-14 11:28:00.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -260,9 +304,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.46/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/mount.te	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-14 11:28:00.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -271,9 +315,9 @@
  	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.46/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/selinuxutil.te	2006-06-13 10:46:54.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-14 11:28:00.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -283,9 +327,9 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.46/policy/modules/system/unconfined.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/unconfined.fc	2006-06-13 15:38:45.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-14 11:28:00.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -293,9 +337,9 @@
 +/usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.46/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.46/policy/modules/system/userdomain.if	2006-06-13 07:15:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-14 11:28:00.000000000 -0400
 @@ -4145,7 +4145,7 @@
  	gen_require(`
  		type user_home_dir_t;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- selinux-policy.spec	13 Jun 2006 19:39:56 -0000	1.208
+++ selinux-policy.spec	14 Jun 2006 15:48:59 -0000	1.209
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.46
-Release: 2
+Version: 2.2.47
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -336,6 +336,9 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1
+- Update from Upstream
+
 * Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-2
 - Fix spec of realplay
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	13 Jun 2006 18:26:00 -0000	1.74
+++ sources	14 Jun 2006 15:48:59 -0000	1.75
@@ -1 +1 @@
-f2d0b4bf8b24ad899b08dcd4f347a044  serefpolicy-2.2.46.tgz
+f8f313db16a432e3d20b771ab1823346  serefpolicy-2.2.47.tgz



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:49:30 -0400
Subject: rpms/cairo/devel cairo.spec,1.47,1.48
Message-ID: <200606141549.k5EFnUtM003126@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3023

Modified Files:
	cairo.spec 
Log Message:
don't build pdf2svg



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cairo.spec	14 Jun 2006 15:45:01 -0000	1.47
+++ cairo.spec	14 Jun 2006 15:49:27 -0000	1.48
@@ -24,6 +24,8 @@
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
+Patch0: cairo-1.1.6-do-not-build-pdf2svg.patch 
+
 %description 
 Cairo is a vector graphics library designed to provide high-quality
 display and print output. Currently supported output targets include
@@ -49,6 +51,7 @@
 
 %prep
 %setup -q
+%patcho -p1 -b .do-not-build-pdf2svg
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:50:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:50:24 -0400
Subject: rpms/cairo/devel cairo.spec,1.48,1.49
Message-ID: <200606141550.k5EFoOb8003497@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3454

Modified Files:
	cairo.spec 
Log Message:
oops



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cairo.spec	14 Jun 2006 15:49:27 -0000	1.48
+++ cairo.spec	14 Jun 2006 15:50:22 -0000	1.49
@@ -51,7 +51,7 @@
 
 %prep
 %setup -q
-%patcho -p1 -b .do-not-build-pdf2svg
+%patch -p1 -b .do-not-build-pdf2svg
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \



From fedora-cvs-commits at redhat.com  Wed Jun 14 15:51:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 11:51:59 -0400
Subject: rpms/cairo/devel cairo.spec,1.49,1.50
Message-ID: <200606141551.k5EFpx7K004149@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4081

Modified Files:
	cairo.spec 
Log Message:
no longer needed



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cairo.spec	14 Jun 2006 15:50:22 -0000	1.49
+++ cairo.spec	14 Jun 2006 15:51:56 -0000	1.50
@@ -24,8 +24,6 @@
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
-Patch0: cairo-1.1.6-do-not-build-pdf2svg.patch 
-
 %description 
 Cairo is a vector graphics library designed to provide high-quality
 display and print output. Currently supported output targets include
@@ -51,7 +49,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .do-not-build-pdf2svg
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:27:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:27:29 -0400
Subject: rpms/samba/devel samba.spec,1.63,1.64
Message-ID: <200606141627.k5EGRTW9004925@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4913

Modified Files:
	samba.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.0.21c-3
- rebuilt with new gnutls



Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- samba.spec	30 Mar 2006 22:02:31 -0000	1.63
+++ samba.spec	14 Jun 2006 16:27:25 -0000	1.64
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.22
-Release: 2
+Release: 3
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -443,6 +443,9 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.0.21c-3
+- rebuilt with new gnutls
+
 * Fri Mar 17 2006 Jay Fenlason <fenlason at redhat.com> 2.0.21c-2
 - New upstream version.
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:29:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:29:14 -0400
Subject: rpms/system-config-lvm/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 system-config-lvm.spec, 1.22, 1.23
Message-ID: <200606141629.k5EGTEJq005011@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/system-config-lvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4987/devel

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.18-1.0.FC6 on branch devel from system-config-lvm-1.0.18-1.0.FC6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Feb 2006 16:28:30 -0000	1.20
+++ .cvsignore	14 Jun 2006 16:29:11 -0000	1.21
@@ -1 +1 @@
-system-config-lvm-1.0.13.tar.gz
+system-config-lvm-1.0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Feb 2006 16:28:30 -0000	1.20
+++ sources	14 Jun 2006 16:29:11 -0000	1.21
@@ -1 +1 @@
-9f717ee1b787ab5bbade50cf9e072bd5  system-config-lvm-1.0.13.tar.gz
+bbf1e453ecf232cdadbb5a1a2c28a63c  system-config-lvm-1.0.18.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- system-config-lvm.spec	6 Jun 2006 02:29:48 -0000	1.22
+++ system-config-lvm.spec	14 Jun 2006 16:29:11 -0000	1.23
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
-Version: 1.0.13
-Release: 2
+Version: 1.0.18
+Release: 1.0.FC6
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,7 +14,6 @@
 Requires: lvm2 >= 2.00.20
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
-BuildRequires: perl(XML::Parser)
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.
@@ -52,9 +51,15 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
-* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.0.13-2
-- Add missing BR of perl-XML-Parser
-
+* Thu Jun 01 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.18-1.0
+  - Version bump
+* Fri May 12 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.17-1.0
+  - Fixes for 175077, 171117, 175131, 176967, enable mirroring, 159455, 159456
+* Thu Feb 16 2006 Jim Parsons <jparsons at redhat.com> 1.0.16-1.0
+  - Disabled mirroring support in UI.
+* Mon Feb 14 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.14-1.0
+  - Fixes for bz180281, 159457, 180269. Mirroring support available with constants
+    in lvmui_constants file by setting MIRRORING_UI_SUPPORT to True
 * Fri Feb 10 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.13-1.0
   - Fix failure to display all unused space
 * Mon Feb 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.12-1.0



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:34:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:34:22 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.119,1.120
Message-ID: <200606141634.k5EGYMg5005127@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5114

Modified Files:
	ghostscript.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 8.15.2-7
- rebuilt with new gnutls



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ghostscript.spec	13 Jun 2006 13:58:06 -0000	1.119
+++ ghostscript.spec	14 Jun 2006 16:34:20 -0000	1.120
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 6
+Release: 7
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -264,6 +264,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 8.15.2-7
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-6
 - Undo svn sync.
 - Apply CJKV patch from svn164:165.



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:43:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:43:27 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.150,
	1.151
Message-ID: <200606141643.k5EGhRWD005252@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5239

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Wed Jun 14 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_85rh
- Require zip.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- java-1.4.2-gcj-compat.spec	12 Jun 2006 20:32:45 -0000	1.150
+++ java-1.4.2-gcj-compat.spec	14 Jun 2006 16:43:25 -0000	1.151
@@ -14,7 +14,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_84rh
+%define release 	40jpp_85rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 %define bcfullver	1.31
@@ -48,6 +48,7 @@
 BuildRequires:	eclipse-ecj
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
+Requires:	zip
 Requires:	jessie >= 1.0.1
 Requires:	gnu-crypto >= 0:2.1.0
 # SASL and JCE are provided by libgcj.
@@ -586,6 +587,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Wed Jun 14 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_85rh
+- Require zip.
+
 * Mon Jun 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_84rh
 - Remove bootstrap logic.
 - Fix ppc64 file system corruption workaround.



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:49:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:49:04 -0400
Subject: rpms/system-config-lvm/devel sources, 1.21,
	1.22 system-config-lvm.spec, 1.23, 1.24
Message-ID: <200606141649.k5EGn4Yi020017@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/system-config-lvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19993/devel

Modified Files:
	sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.18-1.1.FC6 on branch devel from system-config-lvm-1.0.18-1.1.FC6.src.rpm


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Jun 2006 16:29:11 -0000	1.21
+++ sources	14 Jun 2006 16:49:02 -0000	1.22
@@ -1 +1 @@
-bbf1e453ecf232cdadbb5a1a2c28a63c  system-config-lvm-1.0.18.tar.gz
+b5c3e31ea046441c38e850993331d3af  system-config-lvm-1.0.18.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- system-config-lvm.spec	14 Jun 2006 16:29:11 -0000	1.23
+++ system-config-lvm.spec	14 Jun 2006 16:49:02 -0000	1.24
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
 Version: 1.0.18
-Release: 1.0.FC6
+Release: 1.1.FC6
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,7 @@
 Requires: lvm2 >= 2.00.20
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
+BuildRequires: perl(XML::Parser)
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:49:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:49:44 -0400
Subject: rpms/samba/devel samba.spec,1.64,1.65
Message-ID: <200606141649.k5EGnifA020073@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20058

Modified Files:
	samba.spec 
Log Message:
- requires autoconf and libtool to build



Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- samba.spec	14 Jun 2006 16:27:25 -0000	1.64
+++ samba.spec	14 Jun 2006 16:49:42 -0000	1.65
@@ -51,6 +51,7 @@
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d 
 BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel
+BuildRequires: autoconf, libtool
 
 
 # Working around perl dependency problem from docs



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:54:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:54:26 -0400
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.163,1.164
Message-ID: <200606141654.k5EGsQQN020195@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20182

Modified Files:
	gnbd-kernel.spec 
Log Message:
Bumped kernel rev.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnbd-kernel.spec	5 Jun 2006 19:56:31 -0000	1.163
+++ gnbd-kernel.spec	14 Jun 2006 16:54:24 -0000	1.164
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 0
 %define buildxen 1
-%define kernel_version 2.6.16-1.2245_FC6
+%define kernel_version 2.6.16-1.2282_FC6
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.16
-Release: 2.2
+Release: 2.3
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:57:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:57:11 -0400
Subject: rpms/gnbd/devel .cvsignore, 1.3, 1.4 gnbd.spec, 1.17, 1.18 sources,
	1.9, 1.10
Message-ID: <200606141657.k5EGvBn1020369@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20341

Modified Files:
	.cvsignore gnbd.spec sources 
Log Message:
Building for fc6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnbd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 05:20:35 -0000	1.3
+++ .cvsignore	14 Jun 2006 16:57:09 -0000	1.4
@@ -1 +1 @@
-gnbd-1.0-pre1.tar.gz
+gnbd-1.1.0.tar.gz


Index: gnbd.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd/devel/gnbd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnbd.spec	7 Feb 2006 11:50:12 -0000	1.17
+++ gnbd.spec	14 Jun 2006 16:57:09 -0000	1.18
@@ -11,16 +11,14 @@
 ###############################################################################
 
 Name: gnbd
-Version: 1.0.2
-Release: 0.2.1
+Version: 1.1.0
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd - GFS's Network Block Device
-BuildRequires: magma-devel
 BuildRequires: gnbd-kernheaders >= 2.6.9
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
-Requires: magma
 Requires: gnbd-kernel-modules >= 2.6.11
 ExclusiveArch: i386 x86_64
 Source0: %{name}-%{version}.tar.gz
@@ -57,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jun 14 2006 Chris Feist <cfeist at redhat.com> - 1.1.0-0.fc6.0
+- Rebuilt for fc6
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-0.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnbd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Dec 2005 21:09:57 -0000	1.9
+++ sources	14 Jun 2006 16:57:09 -0000	1.10
@@ -1 +1 @@
-8da4316031669b21e1e85bbe1b05ebc8  gnbd-1.0.2.tar.gz
+cddf38992dcb922f4dc943dc2b42a31d  gnbd-1.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 16:59:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 12:59:25 -0400
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.164,1.165
Message-ID: <200606141659.k5EGxPZg020431@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20418

Modified Files:
	gnbd-kernel.spec 
Log Message:
Update kernel version.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnbd-kernel.spec	14 Jun 2006 16:54:24 -0000	1.164
+++ gnbd-kernel.spec	14 Jun 2006 16:59:23 -0000	1.165
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 0
 %define buildxen 1
-%define kernel_version 2.6.16-1.2282_FC6
+%define kernel_version 2.6.16-1.2273_FC6
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.16
-Release: 2.3
+Release: 2.4
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:07:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:07:02 -0400
Subject: rpms/gnbd-kernel/devel Makefile,1.4,1.5
Message-ID: <200606141707.k5EH72H0020665@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20652

Modified Files:
	Makefile 
Log Message:
Updated makefile for brew and fc6.


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	4 Mar 2005 15:19:01 -0000	1.4
+++ Makefile	14 Jun 2006 17:06:49 -0000	1.5
@@ -2,7 +2,6 @@
 # $Id$
 NAME := gnbd-kernel
 SPECFILE = $(firstword $(wildcard *.spec))
-BHC_FLAGS = -n
-COLLECTION = dist-fc4
+COLLECTION = dist-fc6
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:09:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:09:04 -0400
Subject: rpms/gnbd/devel Makefile,1.4,1.5
Message-ID: <200606141709.k5EH94Kq020710@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20687

Modified Files:
	Makefile 
Log Message:
Updated makefile for brew and fc6.


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/gnbd/devel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	20 Apr 2005 18:45:54 -0000	1.4
+++ Makefile	14 Jun 2006 17:09:01 -0000	1.5
@@ -2,7 +2,6 @@
 # $Id$
 NAME := gnbd
 SPECFILE = $(firstword $(wildcard *.spec))
-BHC_FLAGS = -n
-COLLECTION = dist-fc4
+COLLECTION = dist-fc6
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:18:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:18:38 -0400
Subject: rpms/gnbd/devel gnbd.spec,1.18,1.19
Message-ID: <200606141718.k5EHIcbn015413@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15390

Modified Files:
	gnbd.spec 
Log Message:
Require cman-devel.


Index: gnbd.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd/devel/gnbd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnbd.spec	14 Jun 2006 16:57:09 -0000	1.18
+++ gnbd.spec	14 Jun 2006 17:18:36 -0000	1.19
@@ -12,11 +12,12 @@
 
 Name: gnbd
 Version: 1.1.0
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd - GFS's Network Block Device
 BuildRequires: gnbd-kernheaders >= 2.6.9
+BuildRequires: cman-devel
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: gnbd-kernel-modules >= 2.6.11



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:28:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:28:42 -0400
Subject: rpms/system-config-lvm/devel sources, 1.22,
	1.23 system-config-lvm.spec, 1.24, 1.25
Message-ID: <200606141728.k5EHSgMQ019210@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/system-config-lvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19173/devel

Modified Files:
	sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.18-1.2.FC6 on branch devel from system-config-lvm-1.0.18-1.2.FC6.src.rpm


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	14 Jun 2006 16:49:02 -0000	1.22
+++ sources	14 Jun 2006 17:28:39 -0000	1.23
@@ -1 +1 @@
-b5c3e31ea046441c38e850993331d3af  system-config-lvm-1.0.18.tar.gz
+e82db0a496bf768f5a878542cf032802  system-config-lvm-1.0.18.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- system-config-lvm.spec	14 Jun 2006 16:49:02 -0000	1.24
+++ system-config-lvm.spec	14 Jun 2006 17:28:39 -0000	1.25
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
 Version: 1.0.18
-Release: 1.1.FC6
+Release: 1.2.FC6
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,7 +14,7 @@
 Requires: lvm2 >= 2.00.20
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
-BuildRequires: perl(XML::Parser)
+BuildRequires: perl(XML::Parser) gettext
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:28:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:28:55 -0400
Subject: rpms/cman/devel cman-2.0.0-grouplib.patch, NONE, 1.1 cman.spec, 1.32,
	1.33
Message-ID: <200606141728.k5EHStoE019347@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19318

Modified Files:
	cman.spec 
Added Files:
	cman-2.0.0-grouplib.patch 
Log Message:
Install group lib.

cman-2.0.0-grouplib.patch:
 0 files changed

--- NEW FILE cman-2.0.0-grouplib.patch ---


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cman.spec	13 Jun 2006 16:50:16 -0000	1.32
+++ cman.spec	14 Jun 2006 17:28:52 -0000	1.33
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.5
+Release: 0.fc6.6
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -27,6 +27,7 @@
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: cman-2.0.0-grouplib.patch
 
 %description
 cman - The Cluster Manager
@@ -41,7 +42,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch1 -p1 -b .norun
+%patch1 -p1 -b .grouplib
 
 %build
 TOPDIR=`pwd`



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:29:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:29:20 -0400
Subject: rpms/cman/devel Makefile,1.3,1.4
Message-ID: <200606141729.k5EHTK2r019588@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19566

Modified Files:
	Makefile 
Log Message:
Updated Makefile for fc6 and brew.


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	21 Dec 2004 21:55:15 -0000	1.3
+++ Makefile	14 Jun 2006 17:29:18 -0000	1.4
@@ -2,7 +2,6 @@
 # $Id$
 NAME := cman
 SPECFILE = $(firstword $(wildcard *.spec))
-BHC_FLAGS = -n
-COLLECTION = dist-fc4
+COLLECTION = dist-fc6
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:47:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:47:15 -0400
Subject: rpms/system-config-cluster/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 system-config-cluster.spec, 1.10, 1.11
Message-ID: <200606141747.k5EHlFjP030309@cvs.devel.redhat.com>

Author: jparsons

Update of /cvs/dist/rpms/system-config-cluster/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30209

Modified Files:
	.cvsignore sources system-config-cluster.spec 
Log Message:
rsa and drac/mc support, plus fixes for bz179559,180507,181725,182516,183217,185686,190361


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-cluster/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Jan 2006 15:36:46 -0000	1.9
+++ .cvsignore	14 Jun 2006 17:47:13 -0000	1.10
@@ -6,3 +6,5 @@
 system-config-cluster-0.9.69.tar.gz
 system-config-cluster-1.0.17.tar.gz
 system-config-cluster-1.0.24.tar.gz
+system-config-cluster-1.0.28.tar.gz
+system-config-cluster-1.0.29.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-cluster/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Jan 2006 15:36:46 -0000	1.9
+++ sources	14 Jun 2006 17:47:13 -0000	1.10
@@ -1 +1 @@
-e911292da2fd8dc91bafe32130068fc4  system-config-cluster-1.0.24.tar.gz
+d7292ef149e98036e659728e03fcce09  system-config-cluster-1.0.29.tar.gz


Index: system-config-cluster.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-cluster/devel/system-config-cluster.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- system-config-cluster.spec	6 Jun 2006 02:27:15 -0000	1.10
+++ system-config-cluster.spec	14 Jun 2006 17:47:13 -0000	1.11
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: system-config-cluster is a utility which allows you to manage cluster configuration in a graphical setting.
 Name: system-config-cluster
-Version: 1.0.24
-Release: 2
+Version: 1.0.29
+Release: 1.0
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,7 +13,7 @@
 Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
-BuildRequires: perl(XML::Parser)
+BuildRequires: perl(XML::Parser) gettext
 
 %description
 system-config-cluster is a utility which allows you to manage cluster configuuration in a graphical setting.
@@ -51,9 +51,16 @@
 %config %{_sysconfdir}/security/console.apps/system-config-cluster
 
 %changelog
-* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.0.24-2
-- Added missing buildreq for perl-XML-Parser
-
+* Wed Jun 14 2006 Jim Parsons <jparsons at redhat.com> 1.0.29-1
+  -  spec file fix, version bump 
+* Wed Jun 14 2006 Jim Parsons <jparsons at redhat.com> 1.0.28-1
+  -  Version bump for fedora 
+* Mon Jun 05 2006 Jim Parsons <jparsons at redhat.com> 1.0.27-1
+  - Fix for bz192134  
+* Tue May 16 2006 Jim Parsons <jparsons at redhat.com> 1.0.26-1
+  - Fixes for bz179559,180507,181725,182516,183217,185686,190361  
+* Wed Feb 08 2006 Jim Parsons <jparsons at redhat.com> 1.0.25-1
+  -  Added rsa and drac/mc support. Also auth type field for ipmi. 
 * Mon Jan 09 2006 Jim Parsons <jparsons at redhat.com> 1.0.24-1
   -  Build for fedora 
 * Tue Dec 20 2005 Jim Parsons <jparsons at redhat.com> 1.0.23-1
@@ -210,7 +217,7 @@
 * Tue Feb 01 2005 Jim Parsons <jparsons at redhat.com> 0.9.5-1
   - Many fixes and completions. Added check boxes for restricted
     and ordered failover domains. Added properties for fences.
-    Fixed bug in fence devices section. Added support for GuLM
+    Fixed bug in fence devices section. Added support for GULM
     in UI.
 * Tue Jan 11 2005 Jim Parsons <jparsons at redhat.com> 0.9.4-1
   - Added delete fence device functionality.



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:52:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:52:22 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.154,1.155
Message-ID: <200606141752.k5EHqMYk005680@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5626

Modified Files:
	gtk2.spec 
Log Message:
require cairo 1.1.8



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gtk2.spec	14 Jun 2006 14:42:40 -0000	1.154
+++ gtk2.spec	14 Jun 2006 17:52:20 -0000	1.155
@@ -6,7 +6,7 @@
 %define pango_version %{pango_base_version}-1
 %define atk_base_version 1.6.0
 %define atk_version %{atk_base_version}-1
-%define cairo_base_version 1.1.6
+%define cairo_base_version 1.1.8
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -268,6 +268,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-3
+- Require cairo 1.1.8
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.9.3-2
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 17:54:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 13:54:23 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-gl-include-inferiors.patch, 1.1, 1.2
Message-ID: <200606141754.k5EHsNJt006317@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6293

Modified Files:
	xorg-x11-server-1.1.0-gl-include-inferiors.patch 
Log Message:
Change GL include inferiors atom name to _COMPIZ_GL_INCLUDE_INFERIORS.

xorg-x11-server-1.1.0-gl-include-inferiors.patch:
 dri.c |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.1.0-gl-include-inferiors.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-gl-include-inferiors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-gl-include-inferiors.patch	13 Jun 2006 01:50:59 -0000	1.1
+++ xorg-x11-server-1.1.0-gl-include-inferiors.patch	14 Jun 2006 17:54:20 -0000	1.2
@@ -21,7 +21,7 @@
 +{
 +
 +  static Atom atom = BAD_RESOURCE;
-+  static char atom_name[] = "X-REDHAT-GL-INCLUDE-INFERIORS";
++  static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS";
 +  int i;
 +
 +  if (atom == BAD_RESOURCE) {



From fedora-cvs-commits at redhat.com  Wed Jun 14 18:05:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 14:05:25 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.155,1.156
Message-ID: <200606141805.k5EI5P8w008796@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8781

Modified Files:
	gtk2.spec 
Log Message:
arr, actually require cairo



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gtk2.spec	14 Jun 2006 17:52:20 -0000	1.155
+++ gtk2.spec	14 Jun 2006 18:05:21 -0000	1.156
@@ -38,6 +38,7 @@
 BuildRequires: gettext
 BuildRequires: gtk-doc
 BuildRequires: cups-devel
+BuildRequires: cairo-devel >= %{cairo_version}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gtk+-gtkbeta



From fedora-cvs-commits at redhat.com  Wed Jun 14 18:55:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 14:55:26 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.36,1.37
Message-ID: <200606141855.k5EItQHD015566@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15542

Modified Files:
	libglade-java.spec 
Log Message:
Remove date strings from javadocs for multilib compatibility.


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libglade-java.spec	13 Jun 2006 17:01:47 -0000	1.36
+++ libglade-java.spec	14 Jun 2006 18:55:24 -0000	1.37
@@ -12,7 +12,7 @@
 
 %define	name_base	libglade-java
 %define	version		2.12.3
-%define release 	2
+%define release 	3
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
@@ -70,6 +70,10 @@
 mkdir -p doc/api/
 make
 
+# need to remove date string for multilib
+rm doc/api/gjdoc.properties
+sed --in-place "s/, on.*GMT\./\./" doc/api/about.html
+
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
@@ -120,6 +124,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jun 14 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.3-3
+- Remove date strings from javadocs for multilib compatibility.
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.3-2
 - Change mod time of all java source files for the src zip.
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:04:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:04:47 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.276, 1.277 anaconda.spec, 1.400,
	1.401 sources, 1.397, 1.398
Message-ID: <200606141904.k5EJ4lwg017496@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17448/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.38-1 on branch devel from anaconda-11.1.0.38-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- .cvsignore	14 Jun 2006 14:53:18 -0000	1.276
+++ .cvsignore	14 Jun 2006 19:04:45 -0000	1.277
@@ -1 +1 @@
-anaconda-11.1.0.37.tar.bz2
+anaconda-11.1.0.38.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- anaconda.spec	14 Jun 2006 14:53:18 -0000	1.400
+++ anaconda.spec	14 Jun 2006 19:04:45 -0000	1.401
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.37
+Version: 11.1.0.38
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.38-1
+- and fix ppc boot.iso (pnasrat)
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.37-1
 - Remove the step ordering debug commit
 - Fix traceback due to new xen kernel names


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- sources	14 Jun 2006 14:53:18 -0000	1.397
+++ sources	14 Jun 2006 19:04:45 -0000	1.398
@@ -1 +1 @@
-b972d57bb5985e5d012b9b93f2b23ce0  anaconda-11.1.0.37.tar.bz2
+d5d4c234b5bc856bd73add487aea445d  anaconda-11.1.0.38.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:12:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:12:33 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.51,1.52
Message-ID: <200606141912.k5EJCX0A018575@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18525

Modified Files:
	pygtk.spec 
Log Message:
fix build reqs



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pygtk.spec	14 Jun 2006 12:10:50 -0000	1.51
+++ pygtk.spec	14 Jun 2006 19:12:20 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.1
-Release: 1 
+Release: 2 
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -24,6 +24,7 @@
 BuildRequires: python-numeric
 BuildRequires: pycairo-devel >= 0.5.0
 BuildRequires: pygobject2-devel >= 2.10.1 
+BuildRequires: libtool
 
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
@@ -110,6 +111,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
+- Fix missing BuildRequries
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-1
 - Update to 2.9.1
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:29:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:29:05 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.52,1.53
Message-ID: <200606141929.k5EJT5dr004065@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4014

Modified Files:
	pygtk.spec 
Log Message:
fix file lists



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pygtk.spec	14 Jun 2006 19:12:20 -0000	1.52
+++ pygtk.spec	14 Jun 2006 19:29:02 -0000	1.53
@@ -83,6 +83,7 @@
 %{_libdir}/python?.?/site-packages/gtk-2.0/atk.so
 %{_libdir}/python?.?/site-packages/gtk-2.0/pango.so
 %{_libdir}/python?.?/site-packages/gtk-2.0/gtk/_gtk.so
+%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/unixprint.so
 %{_libdir}/python?.?/site-packages/gtk-2.0/pangocairo.so
 
 %doc AUTHORS NEWS README MAPPING ChangeLog



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:29:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:29:23 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc6-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.454, 1.455 kernel-2.6.spec, 1.2282,
	1.2283 sources, 1.398, 1.399 upstream, 1.363,
	1.364 patch-2.6.17-rc6-git5.bz2.sign, 1.1, NONE
Message-ID: <200606141929.k5EJTND8004132@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4093

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc6-git7.bz2.sign 
Removed Files:
	patch-2.6.17-rc6-git5.bz2.sign 
Log Message:
git7



--- NEW FILE patch-2.6.17-rc6-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEkF3gyGugalF9Dw4RAsU2AKCPSJ12TRIjMfpc+5V80c835wLVIACfVfDo
V6HHIcdI8o0zNFbsdbMb+2Q=
=UlyT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- .cvsignore	13 Jun 2006 19:52:40 -0000	1.454
+++ .cvsignore	14 Jun 2006 19:29:19 -0000	1.455
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
 xen-20060610.tar.bz2
-patch-2.6.17-rc6-git5.bz2
+patch-2.6.17-rc6-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2282
retrieving revision 1.2283
diff -u -r1.2282 -r1.2283
--- kernel-2.6.spec	14 Jun 2006 12:11:06 -0000	1.2282
+++ kernel-2.6.spec	14 Jun 2006 19:29:19 -0000	1.2283
@@ -243,7 +243,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc6.bz2
-Patch2: patch-2.6.17-rc6-git5.bz2
+Patch2: patch-2.6.17-rc6-git7.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1674,6 +1674,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-rc6-git7
+
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - remove xen0/xenU/xen0-PAE/xenU-PAE packages
 - disable xen PAE kernel for i386 for now


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- sources	13 Jun 2006 19:52:40 -0000	1.398
+++ sources	14 Jun 2006 19:29:20 -0000	1.399
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-f5c9443aeb71ad5578d7e0b2951e9c3d  patch-2.6.17-rc6-git5.bz2
+0e62cac08ee7470cc8b6fa0b03b21856  patch-2.6.17-rc6-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- upstream	13 Jun 2006 19:52:40 -0000	1.363
+++ upstream	14 Jun 2006 19:29:20 -0000	1.364
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git5.bz2
+patch-2.6.17-rc6-git7.bz2


--- patch-2.6.17-rc6-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:33:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:33:39 -0400
Subject: rpms/kernel/devel linux-2.6-console-suspend.patch, NONE,
	1.1 kernel-2.6.spec, 1.2283, 1.2284
Message-ID: <200606141933.k5EJXdoW004779@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4742

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-console-suspend.patch 
Log Message:
console fixes for suspend


linux-2.6-console-suspend.patch:
 power/console.c |   32 +++++---------------------------
 printk.c        |   12 ++++++++++++
 2 files changed, 17 insertions(+), 27 deletions(-)

--- NEW FILE linux-2.6-console-suspend.patch ---
Return-Path: <torvalds at osdl.org>
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
	nwo.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=5.0 tests=AWL,BAYES_00,
	FORGED_RCVD_HELO,UNPARSEABLE_RELAY autolearn=ham version=3.1.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
	for <davej at localhost> (single-drop); Wed, 14 Jun 2006 15:03:49 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
	 Wed, 14 Jun 2006 15:03:37 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k5EJ3bh3020398
	for <davej at pobox.devel.redhat.com>; Wed, 14 Jun 2006 15:03:37 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5EJ3bGj030972
	for <davej at redhat.com>; Wed, 14 Jun 2006 15:03:37 -0400
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5EJ3U96030450
	for <davej at redhat.com>; Wed, 14 Jun 2006 15:03:31 -0400
Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k5EJ3Ogt004764
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <davej at redhat.com>; Wed, 14 Jun 2006 12:03:25 -0700
Received: from localhost (shell0.pdx.osdl.net [10.9.0.31])
	by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id k5EJ3Nag015488
	for <davej at redhat.com>; Wed, 14 Jun 2006 12:03:23 -0700
Date: Wed, 14 Jun 2006 12:03:23 -0700 (PDT)
From: Linus Torvalds <torvalds at osdl.org>
To: Dave Jones <davej at redhat.com>
Subject: Re: [linux-pm] [PATCH 2/2] Fix console handling during suspend/resume
In-Reply-To: <20060614185928.GA23238 at redhat.com>
Message-ID: <Pine.LNX.4.64.0606141200311.5498 at g5.osdl.org>
References: <Pine.LNX.4.64.0606131418580.5498 at g5.osdl.org>
 <Pine.LNX.4.64.0606131435400.5498 at g5.osdl.org> <20060614185928.GA23238 at redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-MIMEDefang-Filter: osdl$Revision: 1.135 $
X-Scanned-By: MIMEDefang 2.36
X-RedHat-Spam-Score: 0.05 
Status: RO
Content-Length: 3717
Lines: 138



diff-tree b7140c89071f39e98b154a17463796d4fe3f0aea (from 8325a64d97b5c8489dc1694a77c3e25918049998)
Author: Linus Torvalds <torvalds at macmini.osdl.org>
Date:   Thu Jun 8 15:29:09 2006 -0700

    Fix console handling during suspend/resume
    
    The old code was terminally broken, and would do extremely bad
    things if you used netconsole, for example. Like sending out packets
    when the device had already been suspended etc.
    
    The new version may not be perfect either, but it seems fundamentally
    like a better design.
    
    Signed-off-by: Linus Torvalds <torvalds at osdl.org>

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 623786d..6e039ca 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -9,42 +9,20 @@ #include <linux/kbd_kern.h>
 #include <linux/console.h>
 #include "power.h"
 
-#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
-#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
-
-static int orig_fgconsole, orig_kmsg;
+extern int console_suspended;
 
 int pm_prepare_console(void)
 {
 	acquire_console_sem();
-
-	orig_fgconsole = fg_console;
-
-	if (vc_allocate(SUSPEND_CONSOLE)) {
-	  /* we can't have a free VC for now. Too bad,
-	   * we don't want to mess the screen for now. */
-		release_console_sem();
-		return 1;
-	}
-
-	set_console(SUSPEND_CONSOLE);
-	release_console_sem();
-
-	if (vt_waitactive(SUSPEND_CONSOLE)) {
-		pr_debug("Suspend: Can't switch VCs.");
-		return 1;
-	}
-	orig_kmsg = kmsg_redirect;
-	kmsg_redirect = SUSPEND_CONSOLE;
+	console_suspended = 1;
+	system_state = SYSTEM_BOOTING;
 	return 0;
 }
 
 void pm_restore_console(void)
 {
-	acquire_console_sem();
-	set_console(orig_fgconsole);
+	console_suspended = 0;
+	system_state = SYSTEM_RUNNING;
 	release_console_sem();
-	kmsg_redirect = orig_kmsg;
 	return;
 }
-#endif
diff --git a/kernel/printk.c b/kernel/printk.c
index c056f33..8adb9ed 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -67,6 +67,7 @@ EXPORT_SYMBOL(oops_in_progress);
  * driver system.
  */
 static DECLARE_MUTEX(console_sem);
+static DECLARE_MUTEX(secondary_console_sem);
 struct console *console_drivers;
 /*
  * This is used for debugging the mess that is the VT code by
@@ -77,6 +78,7 @@ struct console *console_drivers;
  * locked without the console sempahore held
  */
 static int console_locked;
+int console_suspended;
 
 /*
  * logbuf_lock protects log_buf, log_start, log_end, con_start and logged_chars
@@ -707,6 +709,11 @@ int __init add_preferred_console(char *n
  */
 void acquire_console_sem(void)
 {
+	if (console_suspended) {
+		down(&secondary_console_sem);
+		return;
+	}
+
 	BUG_ON(in_interrupt());
 	down(&console_sem);
 	console_locked = 1;
@@ -750,6 +757,11 @@ void release_console_sem(void)
 	unsigned long _con_start, _log_end;
 	unsigned long wake_klogd = 0;
 
+	if (console_suspended) {
+		up(&secondary_console_sem);
+		return;
+	}
+
 	for ( ; ; ) {
 		spin_lock_irqsave(&logbuf_lock, flags);
 		wake_klogd |= log_start - log_end;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2283
retrieving revision 1.2284
diff -u -r1.2283 -r1.2284
--- kernel-2.6.spec	14 Jun 2006 19:29:19 -0000	1.2283
+++ kernel-2.6.spec	14 Jun 2006 19:33:28 -0000	1.2284
@@ -385,6 +385,7 @@
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1780: linux-2.6-powernow-k7-smp.patch
+Patch1790: linux-2.6-console-suspend.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -976,6 +977,8 @@
 %patch1770 -p1
 # Fix up powernow-k7 to work on SMP kernels.
 %patch1780 -p1
+# Console fixes for suspend/resume
+%patch1790 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1676,6 +1679,7 @@
 %changelog
 * Wed Jun 14 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git7
+- Console fixes for suspend/resume
 
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - remove xen0/xenU/xen0-PAE/xenU-PAE packages



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:34:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:34:21 -0400
Subject: rpms/libsoup/devel libsoup.spec,1.35,1.36
Message-ID: <200606141934.k5EJYLpS004857@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4807

Modified Files:
	libsoup.spec 
Log Message:
- the new gnutls was not picked up



Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libsoup.spec	14 Jun 2006 14:13:21 -0000	1.35
+++ libsoup.spec	14 Jun 2006 19:34:19 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
 Version: 2.2.94
-Release: 2
+Release: 3
 License: LGPL
 Group: Development/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
@@ -66,7 +66,7 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
-* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.2.94-2
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.2.94-3
 - rebuilt with new gnutls
 
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.94-1



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:45:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:45:32 -0400
Subject: rpms/gimp-print/devel gimp-print.spec,1.39,1.40
Message-ID: <200606141945.k5EJjTi3006378@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/gimp-print/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6352

Modified Files:
	gimp-print.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.2.7-20
- rebuilt with new gnutls
- dropped the openssl-devel buildrequires as gnutls linkage is pulled
  from cups-libs



Index: gimp-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gimp-print.spec	6 Jun 2006 14:33:32 -0000	1.39
+++ gimp-print.spec	14 Jun 2006 19:45:24 -0000	1.40
@@ -7,7 +7,7 @@
 Summary: A collection of high-quality printer drivers.
 Name: gimp-print
 Version: 4.2.7
-Release: 19
+Release: 20
 License: GPL
 Group: System Environment/Libraries
 URL: http://gimp-print.sourceforge.net/
@@ -30,7 +30,7 @@
 BuildRequires: gimp-devel >= 1:2.0, cups-devel, autoconf >= 2.59, libtool
 BuildRequires: gettext-devel, hardlink
 BuildRequires: libtiff-devel, libjpeg-devel
-BuildRequires: openssl-devel, ncurses-devel, readline-devel
+BuildRequires: ncurses-devel, readline-devel
 
 %description
 These drivers provide printing quality for UNIX/Linux in many cases equal
@@ -196,6 +196,11 @@
 exit 0
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.2.7-20
+- rebuilt with new gnutls
+- dropped the openssl-devel buildrequires as gnutls linkage is pulled
+  from cups-libs
+
 * Tue Jun 06 2006 Karsten Hopp <karsten at redhat.de> 4.2.7-19
 - buildrequires ncurses-devel, readline-devel. 
   Required for escputil



From fedora-cvs-commits at redhat.com  Wed Jun 14 19:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 15:59:40 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.63,1.64
Message-ID: <200606141959.k5EJxeuS023739@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23702

Modified Files:
	rhythmbox.spec 
Log Message:
rebuild



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- rhythmbox.spec	26 May 2006 16:07:55 -0000	1.63
+++ rhythmbox.spec	14 Jun 2006 19:59:37 -0000	1.64
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.4.1
-Release: 6 
+Release: 7 
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -54,6 +54,9 @@
 
 %build
 
+# work around a gstreamer bug
+/usr/bin/gst-inspect-0.10 --print-all
+
 %configure \
 	--with-bonobo \
 	--with-ipod \
@@ -126,6 +129,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4.1-7
+- Rebuild
+
 * Fri May 26 2006 Jeremy Katz <katzj at redhat.com> - 0.9.4.1-6
 - try to fix building on s390{,x}
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:02:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:02:16 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.38,1.39
Message-ID: <200606142002.k5EK2Gwu024151@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24121

Modified Files:
	libgnomeprint22.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.12.1-7
- rebuilt with new gnutls



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgnomeprint22.spec	13 Jun 2006 03:34:54 -0000	1.38
+++ libgnomeprint22.spec	14 Jun 2006 20:01:59 -0000	1.39
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	6
+Release:	7
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -136,6 +136,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.12.1-7
+- rebuilt with new gnutls
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-6
 - buildreq automake, not automake16
 - buildreq gettext, bison, flex



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:09:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:09:52 -0400
Subject: rpms/scim-bridge/devel .cvsignore, 1.3, 1.4 scim-bridge.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200606142009.k5EK9qJL025162@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/scim-bridge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25103

Modified Files:
	.cvsignore scim-bridge.spec sources 
Log Message:
0.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jun 2006 11:33:14 -0000	1.3
+++ .cvsignore	14 Jun 2006 20:09:49 -0000	1.4
@@ -1 +1 @@
-scim-bridge-0.2.0-20060614.tar.gz
+scim-bridge-0.2.0.tar.gz


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-bridge.spec	14 Jun 2006 11:54:49 -0000	1.4
+++ scim-bridge.spec	14 Jun 2006 20:09:49 -0000	1.5
@@ -1,26 +1,20 @@
 %define with_libstdc_preview 0
 
-%define snapshot 1
-%define snapdate 20060614
-
 Name:		scim-bridge
 Version:	0.2.0
-Release:	0.1.%{snapdate}
+Release:	1
 Summary:	SCIM Bridge Gtk IM module
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://shibatama.tea-nifty.com/blog/2006/02/scimbridge_has__e4eb.html 
-Source0:	http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}-%{snapdate}.tar.gz
+Source0:	http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 Source1:	xinput-scim-bridge
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	scim-devel
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
-%if %{snapshot}
-Buildrequires: autoconf, automake, libtool
-%endif
 Requires:	scim, scim-bridge-gtkimm = %{version}-%{release}
 
 %description
@@ -40,7 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{snapdate}
+%setup -q -n %{name}-%{version}
 ./bootstrap
 
 %build
@@ -94,6 +88,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Warren Togami <wtogami at redhat.com> - 0.2.0-1
+- 0.2.0
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-0.1.20060614
 - update source to snapshot of cvs head
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jun 2006 11:33:14 -0000	1.3
+++ sources	14 Jun 2006 20:09:49 -0000	1.4
@@ -1 +1 @@
-8d2b389c47f1470aa061c98139960df0  scim-bridge-0.2.0-20060614.tar.gz
+7a7362156a411f5dc3ccd0ec9b0e34cf  scim-bridge-0.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:15:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:15:27 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.39,1.40
Message-ID: <200606142015.k5EKFRjl026287@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26258

Modified Files:
	libgnomecups.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 0.2.2-6
- rebuilt with new gnutls



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libgnomecups.spec	10 Jun 2006 05:00:45 -0000	1.39
+++ libgnomecups.spec	14 Jun 2006 20:15:15 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release:  5 
+Release:  6
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 0.2.2-6
+- rebuilt with new gnutls
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.2-5
 - More BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:25:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:25:20 -0400
Subject: rpms/postgresql-jdbc/devel .cvsignore, 1.2, 1.3 postgresql-jdbc.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200606142025.k5EKPKUj010498@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10473

Modified Files:
	.cvsignore postgresql-jdbc.spec sources 
Log Message:
Update to build 8.1-407


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Feb 2006 21:10:22 -0000	1.2
+++ .cvsignore	14 Jun 2006 20:25:18 -0000	1.3
@@ -1 +1 @@
-postgresql-jdbc-8.1-405.src.tar.gz
+postgresql-jdbc-8.1-407.src.tar.gz


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postgresql-jdbc.spec	27 Mar 2006 21:41:47 -0000	1.2
+++ postgresql-jdbc.spec	14 Jun 2006 20:25:18 -0000	1.3
@@ -1,11 +1,11 @@
 %define section		devel
-%define upstreamver	8.1-405
+%define upstreamver	8.1-407
 %define gcj_support	1
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:	8.1.405
-Release:	2jpp
+Version:	8.1.407
+Release:	1jpp
 Epoch:		0
 License:	BSD
 Group:		Applications/Databases
@@ -99,6 +99,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Tom Lane <tgl at redhat.com> 8.1.407-1jpp
+- Update to build 8.1-407
+
 * Mon Mar 27 2006 Tom Lane <tgl at redhat.com> 8.1.405-2jpp
 - Back-patch upstream fix to support unspecified-type strings.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Feb 2006 21:10:22 -0000	1.2
+++ sources	14 Jun 2006 20:25:18 -0000	1.3
@@ -1 +1 @@
-707ecf9ef9a653cf8d80b498906cdfe9  postgresql-jdbc-8.1-405.src.tar.gz
+cf018801596effd04783f120682da353  postgresql-jdbc-8.1-407.src.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:25:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:25:29 -0400
Subject: rpms/scim-bridge/devel scim-bridge.spec,1.5,1.6
Message-ID: <200606142025.k5EKPTa0010617@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/scim-bridge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10530

Modified Files:
	scim-bridge.spec 
Log Message:
add buildreqs



Index: scim-bridge.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim-bridge.spec	14 Jun 2006 20:09:49 -0000	1.5
+++ scim-bridge.spec	14 Jun 2006 20:25:27 -0000	1.6
@@ -12,6 +12,7 @@
 Source1:	xinput-scim-bridge
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	scim-devel
+BuildRequires:  autoconf, automake, libtool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:31:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:31:57 -0400
Subject: rpms/yum-metadata-parser/devel yum-metadata-parser-1.0-files.patch,
	NONE, 1.1 yum-metadata-parser.spec, 1.2, 1.3
Message-ID: <200606142031.k5EKVv43012161@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum-metadata-parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12136

Modified Files:
	yum-metadata-parser.spec 
Added Files:
	yum-metadata-parser-1.0-files.patch 
Log Message:
Fix table order of files

yum-metadata-parser-1.0-files.patch:
 db.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE yum-metadata-parser-1.0-files.patch ---
--- yum-metadata-parser-1.0/db.c.files	2006-06-14 16:25:01.000000000 -0400
+++ yum-metadata-parser-1.0/db.c	2006-06-14 16:25:55.000000000 -0400
@@ -585,8 +585,8 @@
 {
     int rc;
 
-    sqlite3_bind_text (handle, 1, file->type, -1, SQLITE_STATIC);
-    sqlite3_bind_text (handle, 2, file->name, -1, SQLITE_STATIC);
+    sqlite3_bind_text (handle, 1, file->name, -1, SQLITE_STATIC);
+    sqlite3_bind_text (handle, 2, file->type, -1, SQLITE_STATIC);
     sqlite3_bind_int  (handle, 3, pkgKey);
 
     rc = sqlite3_step (handle);


Index: yum-metadata-parser.spec
===================================================================
RCS file: /cvs/dist/rpms/yum-metadata-parser/devel/yum-metadata-parser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yum-metadata-parser.spec	14 Jun 2006 03:32:21 -0000	1.2
+++ yum-metadata-parser.spec	14 Jun 2006 20:31:54 -0000	1.3
@@ -3,9 +3,10 @@
 Summary: A fast metadata parser for yum
 Name: yum-metadata-parser
 Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz
 Patch0: yum-metadata-parser-1.0-quiet.patch
+Patch1: yum-metadata-parser-1.0-files.patch
 License: GPL
 Group: Development/Libraries
 URL: http://linux.duke.edu/projects/yum/
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -42,6 +44,9 @@
 %{python_sitelib_platform}/sqlitecachec.pyo
 
 %changelog
+* Wed Jun 14 2006 Paul Nasrat <pnasrat at redhat.com> - 1.0-6
+- add patch to correct table order of primary:files
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 1.0-5
 - add patch to be quieter so that we don't break tree composes
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:31:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:31:58 -0400
Subject: rpms/ethereal/devel ethereal.spec,1.74,1.75
Message-ID: <200606142031.k5EKVwj9012176@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12137

Modified Files:
	ethereal.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.1.0-0.svn.4
- rebuilt with new gnutls



Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ethereal.spec	6 Jun 2006 11:38:17 -0000	1.74
+++ ethereal.spec	14 Jun 2006 20:31:55 -0000	1.75
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	1.1.0
-Release: 	0.svn.3
+Release: 	0.svn.4
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.1.0-0.svn.4
+- rebuilt with new gnutls
+
 * Tue Jun  6 2006 Radek Vokal <rvokal at redhat.com> 1.1.0-0.svn.2
 - fix ethereal crash when capture statistics window is closed (#190516)
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:38:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:38:23 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2284,1.2285
Message-ID: <200606142038.k5EKcNEZ013086@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13053

Modified Files:
	kernel-2.6.spec 
Log Message:
yawn


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2284
retrieving revision 1.2285
diff -u -r1.2284 -r1.2285
--- kernel-2.6.spec	14 Jun 2006 19:33:28 -0000	1.2284
+++ kernel-2.6.spec	14 Jun 2006 20:38:08 -0000	1.2285
@@ -173,7 +173,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1680,6 +1680,7 @@
 * Wed Jun 14 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-rc6-git7
 - Console fixes for suspend/resume
+- Drop support for PPC iseries & 31bit s390.
 
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - remove xen0/xenU/xen0-PAE/xenU-PAE packages



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:47:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:47:49 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2285,1.2286
Message-ID: <200606142047.k5EKlnAJ025748@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24454

Modified Files:
	kernel-2.6.spec 
Log Message:
test dual excludearch



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2285
retrieving revision 1.2286
diff -u -r1.2285 -r1.2286
--- kernel-2.6.spec	14 Jun 2006 20:38:08 -0000	1.2285
+++ kernel-2.6.spec	14 Jun 2006 20:47:45 -0000	1.2286
@@ -3,6 +3,8 @@
 # What parts do we want to build?  We must build at least one kernel.
 # These are the kernels that are built IF the architecture allows it.
 
+%define rhelbuild 0
+
 %define buildup 1
 %define buildsmp 0
 %define buildpae 0
@@ -173,7 +175,11 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
+%if %{rhelbuild}
+ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ia64 sparc sparc64 s390x
+%else
 ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x
+%endif
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Jun 14 20:47:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 16:47:55 -0400
Subject: rpms/yum/devel yum-2.9.0-exhandle.patch, NONE,
	1.1 yum-2.9.0-keyprompt.patch, NONE,
	1.1 yum-2.9.0-ugimport.patch, NONE, 1.1 yum.spec, 1.98, 1.99
Message-ID: <200606142047.k5EKltMT025926@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25840

Modified Files:
	yum.spec 
Added Files:
	yum-2.9.0-exhandle.patch yum-2.9.0-keyprompt.patch 
	yum-2.9.0-ugimport.patch 
Log Message:
Fixups and build

yum-2.9.0-exhandle.patch:
 packageSack.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE yum-2.9.0-exhandle.patch ---
--- ./yum/packageSack.py.exhandle	2006-06-14 16:42:34.000000000 -0400
+++ ./yum/packageSack.py	2006-06-14 16:42:48.000000000 -0400
@@ -231,9 +231,14 @@
         for sack in self.sacks.values():
             if hasattr(sack, methodName):
                 method = getattr(sack, methodName)
-                sackResult = apply(method, args)
+                try:
+                    sackResult = apply(method, args)
+                except PackageSackError:
+                    continue
+
                 if sackResult:
                     result.extend(sackResult)
+
         return result
 
     def _computeAggregateDictResult(self, methodName, *args):
@@ -241,7 +246,11 @@
         for sack in self.sacks.values():
             if hasattr(sack, methodName):
                 method = getattr(sack, methodName)
-                sackResult = apply(method, args)
+                try:
+                    sackResult = apply(method, args)
+                except PackageSackError:
+                    continue
+
                 if sackResult:
                     result.update(sackResult)
         return result

yum-2.9.0-keyprompt.patch:
 cli.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE yum-2.9.0-keyprompt.patch ---
--- ./cli.py.keyprompt	2006-06-14 16:46:42.000000000 -0400
+++ ./cli.py	2006-06-14 16:46:48.000000000 -0400
@@ -746,7 +746,7 @@
                 continue            
 
             elif result == 1:
-               if sys.stdin.isatty() and not self.conf.assumeyes:
+               if not sys.stdin.isatty() and not self.conf.assumeyes:
                   raise yum.Errors.YumBaseError, \
                         'Refusing to automatically import keys when running ' \
                         'unattended.\nUse "-y" to override.'

yum-2.9.0-ugimport.patch:
 __init__.py |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE yum-2.9.0-ugimport.patch ---
--- ./yum/__init__.py.ugimport	2006-06-14 16:40:36.000000000 -0400
+++ ./yum/__init__.py	2006-06-14 16:40:47.000000000 -0400
@@ -38,6 +38,7 @@
 import repos
 import misc
 import transactioninfo
+import urlgrabber
 from urlgrabber.grabber import URLGrabError
 import depsolve
 import plugins


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- yum.spec	14 Jun 2006 03:51:16 -0000	1.98
+++ yum.spec	14 Jun 2006 20:47:52 -0000	1.99
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.0
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
@@ -19,6 +19,9 @@
 Patch1: yum-2.9.0-filelist.patch
 Patch2: yum-2.9.0-exclude.patch
 Patch3: yum-updatesd-path.patch
+Patch4: yum-2.9.0-ugimport.patch
+Patch5: yum-2.9.0-keyprompt.patch
+Patch6: yum-2.9.0-exhandle.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
@@ -45,6 +48,9 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
 
 %build
 make
@@ -123,6 +129,9 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Wed Jun 14 2006 Paul Nasrat <pnasrat at redhat.com> - 2.9.0-5
+- Various fixups (key grab and importing, composite exception handling)
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 2.9.0-4
 - install yum-updatesd bits
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:00:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:00:59 -0400
Subject: rpms/sysklogd/devel sysklogd.spec,1.35,1.36
Message-ID: <200606142100.k5EL0xXd008224@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8211

Modified Files:
	sysklogd.spec 
Log Message:
fix bug 194494


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sysklogd.spec	23 Feb 2006 17:46:26 -0000	1.35
+++ sysklogd.spec	14 Jun 2006 21:00:56 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 36
+Release: 38
 License: GPL
 Group: System Environment/Daemons
 Source: sysklogd-%{version}rh.tar.gz
@@ -65,18 +65,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "$1" -eq 1 ]; then
+if [ "$1" -ge 1 ]; then
    /sbin/chkconfig --add syslog
-fi
-
-%preun
-if [ $1 = 0 ]; then
-   service syslog stop >/dev/null 2>&1
-   /sbin/chkconfig --del syslog
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
    for n in /var/log/{messages,secure,maillog,spooler}
    do
 	[ -f $n ] && continue
@@ -86,6 +76,12 @@
    service syslog condrestart > /dev/null 2>&1
 fi
 
+%preun
+if [ $1 = 0 ]; then
+   service syslog stop >/dev/null 2>&1
+   /sbin/chkconfig --del syslog
+fi
+
 %triggerpostun -- sysklogd < 1.3.31-17
 /sbin/chkconfig --add syslog
 
@@ -103,6 +99,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4.1-38
+- fix bug 194494 - move logfile touching back to %postun
+
 * Thu Feb 23 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4.1-36
 - fix bug 182605: only chkconfig --add in %post if $1 -eq 1
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:03:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:03:02 -0400
Subject: rpms/cairo-java/devel .cvsignore, 1.7, 1.8 cairo-java.spec, 1.29,
	1.30 sources, 1.9, 1.10
Message-ID: <200606142103.k5EL32Nt008340@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8324

Modified Files:
	.cvsignore cairo-java.spec sources 
Log Message:
Version 1.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Apr 2006 20:09:02 -0000	1.7
+++ .cvsignore	14 Jun 2006 21:03:00 -0000	1.8
@@ -1 +1 @@
-cairo-java-1.0.3.tar.gz
+cairo-java-1.0.4.tar.gz


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cairo-java.spec	13 Jun 2006 15:48:07 -0000	1.29
+++ cairo-java.spec	14 Jun 2006 21:03:00 -0000	1.30
@@ -11,8 +11,8 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	cairo-java
-%define	version		1.0.3
-%define release 	2
+%define	version		1.0.4
+%define release 	0
 # exclude while s390x is borked on beehive
 #ExcludeArch: s390x
 
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
+- New version.
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 1.0.3-2
 - Change mod time of all java source files for the src zip. 
 - Add BuildRequires java-gcj-compat-devel.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Apr 2006 20:09:03 -0000	1.9
+++ sources	14 Jun 2006 21:03:00 -0000	1.10
@@ -1 +1 @@
-b78cd6b58c8f3b55db4edb5477855525  cairo-java-1.0.3.tar.gz
+d9ef069c63ecfa44b44dc69c05e29658  cairo-java-1.0.4.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:09:05 -0400
Subject: rpms/kernel/devel
	capabilities-over-netlink-in-permissive-mode.patch, NONE,
	1.1.6.1 linux-2.6-audit-git.patch, NONE,
	1.1.30.1 linux-2.6-audit-pending.patch, NONE,
	1.1.18.1 linux-2.6-net-label.patch, NONE,
	1.1.6.1 kernel-2.6.spec, 1.2282, 1.2282.2.1
Message-ID: <200606142109.k5EL956W008463@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8419

Modified Files:
      Tag: private-lspp-36-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-36-branch
	capabilities-over-netlink-in-permissive-mode.patch 
	linux-2.6-audit-git.patch linux-2.6-audit-pending.patch 
	linux-2.6-net-label.patch 
Log Message:
lspp.36 kernel


capabilities-over-netlink-in-permissive-mode.patch:
 hooks.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE capabilities-over-netlink-in-permissive-mode.patch ---
>From dgoeddel at trustedcs.com Wed May 31 13:35:19 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 31 May 2006 13:35:52 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k4VHZqWc010601;
	Wed, 31 May 2006 13:35:52 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VHZp3j005299;
	Wed, 31 May 2006 13:35:51 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZk7i006383;
	Wed, 31 May 2006 13:35:46 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id E809472E6B; Wed, 31 May 2006 13:35:45 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k4VHZgTd027651 for <redhat-lspp at listman.util.phx.redhat.com>;
	Wed, 31 May 2006 13:35:42 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k4VHZfqq005281; Wed, 31 May 2006 13:35:41 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZZb3010500;
	Wed, 31 May 2006 13:35:35 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k4VHZRIl013520;
	Wed, 31 May 2006 13:35:27 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Wed May 31 13:35:21 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B447dd3d90000>; Wed, 31 May 2006 13:35:21 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id D34Q43ZG; Wed, 31 May 2006 13:35:20 -0400
Message-ID: <447DD3D7.4050200 at trustedcs.com>
Date: Wed, 31 May 2006 12:35:19 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Stephen Smalley <sds at epoch.ncsc.mil>,
 James Morris <jmorris at redhat.com>
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.82 
X-loop: redhat-lspp at redhat.com
Cc: redhat-lspp at redhat.com,
 "'SELinux List'" <SELinux at tycho.nsa.gov>
Subject: [redhat-lspp] [PATCH] fix masking of capabilities over netlink in
	permissive mode
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-Length: 5179
X-UID: 66725

I think I ran across the problem described in this thread:

http://www.redhat.com/archives/linux-audit/2006-May/msg00059.html

The process' effective capabilities are always being masked with the
allowed vector of the avc decision (for self against the capability
security class) in netlink's copy of the process capabilities (eff_cap).
The allowed vector takes on a slightly different role when SELinux
is not in enforcing mode - it starts to track used-but-not-normally-
permitted actions in the allowed vector.  That is what is causing
the first attempt to fail (the allowed vector has not been "inflated")
and the following attempts to succeed (the vector has been inflated in
response to its previous use).  Does my reasoning (and patch) seem to
be on track?




This patch removes the masking of capabilities passed over netlink
socket when SELinux is in enforcing mode.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>


diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 21dad41..c7650bb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3599,7 +3599,8 @@ static int selinux_netlink_send(struct s
 	avd.allowed = 0;
 	avc_has_perm_noaudit(tsec->sid, tsec->sid,
 				SECCLASS_CAPABILITY, ~0, &avd);
-	cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
+	if (selinux_enforcing)
+		cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
 
 	if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS)
 		err = selinux_nlmsg_perm(sk, skb);

-- 

Darrel

--
redhat-lspp mailing list
redhat-lspp at redhat.com
https://www.redhat.com/mailman/listinfo/redhat-lspp


linux-2.6-audit-git.patch:
 Documentation/filesystems/inotify.txt |  130 ++++
 fs/Kconfig                            |   24 
 fs/Makefile                           |    1 
 fs/exec.c                             |    6 
 fs/inotify.c                          |  991 +++++++++-------------------------
 fs/inotify_user.c                     |  719 ++++++++++++++++++++++++
 fs/proc/base.c                        |    5 
 include/linux/audit.h                 |   84 ++
 include/linux/fsnotify.h              |   29 
 include/linux/inotify.h               |  109 +++
 include/linux/sched.h                 |    2 
 init/Kconfig                          |    3 
 ipc/mqueue.c                          |   22 
 ipc/msg.c                             |    9 
 ipc/sem.c                             |    8 
 ipc/shm.c                             |    2 
 kernel/audit.c                        |  153 +++--
 kernel/audit.h                        |   58 +
 kernel/auditfilter.c                  |  895 +++++++++++++++++++++++++++---
 kernel/auditsc.c                      |  514 +++++++++++++++--
 kernel/signal.c                       |    2 
 kernel/sysctl.c                       |    4 
 kernel/user.c                         |    2 
 security/selinux/ss/services.c        |    2 
 24 files changed, 2811 insertions(+), 963 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/Documentation/filesystems/inotify.txt b/Documentation/filesystems/inotify.txt
index 6d50190..59a919f 100644
--- a/Documentation/filesystems/inotify.txt
+++ b/Documentation/filesystems/inotify.txt
@@ -69,17 +69,135 @@ Prototypes:
 	int inotify_rm_watch (int fd, __u32 mask);
 
 
-(iii) Internal Kernel Implementation
+(iii) Kernel Interface
 
-Each inotify instance is associated with an inotify_device structure.
+Inotify's kernel API consists a set of functions for managing watches and an
+event callback.
+
+To use the kernel API, you must first initialize an inotify instance with a set
+of inotify_operations.  You are given an opaque inotify_handle, which you use
+for any further calls to inotify.
+
+    struct inotify_handle *ih = inotify_init(my_event_handler);
+
+You must provide a function for processing events and a function for destroying
+the inotify watch.
+
+    void handle_event(struct inotify_watch *watch, u32 wd, u32 mask,
+    	              u32 cookie, const char *name, struct inode *inode)
+
+	watch - the pointer to the inotify_watch that triggered this call
+	wd - the watch descriptor
+	mask - describes the event that occurred
+	cookie - an identifier for synchronizing events
+	name - the dentry name for affected files in a directory-based event
+	inode - the affected inode in a directory-based event
+
+    void destroy_watch(struct inotify_watch *watch)
+
+You may add watches by providing a pre-allocated and initialized inotify_watch
+structure and specifying the inode to watch along with an inotify event mask.
+You must pin the inode during the call.  You will likely wish to embed the
+inotify_watch structure in a structure of your own which contains other
+information about the watch.  Once you add an inotify watch, it is immediately
+subject to removal depending on filesystem events.  You must grab a reference if
+you depend on the watch hanging around after the call.
+
+    inotify_init_watch(&my_watch->iwatch);
+    inotify_get_watch(&my_watch->iwatch);	// optional
+    s32 wd = inotify_add_watch(ih, &my_watch->iwatch, inode, mask);
+    inotify_put_watch(&my_watch->iwatch);	// optional
+
+You may use the watch descriptor (wd) or the address of the inotify_watch for
+other inotify operations.  You must not directly read or manipulate data in the
+inotify_watch.  Additionally, you must not call inotify_add_watch() more than
+once for a given inotify_watch structure, unless you have first called either
+inotify_rm_watch() or inotify_rm_wd().
+
+To determine if you have already registered a watch for a given inode, you may
+call inotify_find_watch(), which gives you both the wd and the watch pointer for
+the inotify_watch, or an error if the watch does not exist.
+
+    wd = inotify_find_watch(ih, inode, &watchp);
+
+You may use container_of() on the watch pointer to access your own data
+associated with a given watch.  When an existing watch is found,
+inotify_find_watch() bumps the refcount before releasing its locks.  You must
+put that reference with:
+
+    put_inotify_watch(watchp);
+
+Call inotify_find_update_watch() to update the event mask for an existing watch.
+inotify_find_update_watch() returns the wd of the updated watch, or an error if
+the watch does not exist.
+
+    wd = inotify_find_update_watch(ih, inode, mask);
+
+An existing watch may be removed by calling either inotify_rm_watch() or
+inotify_rm_wd().
+
+    int ret = inotify_rm_watch(ih, &my_watch->iwatch);
+    int ret = inotify_rm_wd(ih, wd);
+
+A watch may be removed while executing your event handler with the following:
+
+    inotify_remove_watch_locked(ih, iwatch);
+
+Call inotify_destroy() to remove all watches from your inotify instance and
+release it.  If there are no outstanding references, inotify_destroy() will call
+your destroy_watch op for each watch.
+
+    inotify_destroy(ih);
+
+When inotify removes a watch, it sends an IN_IGNORED event to your callback.
+You may use this event as an indication to free the watch memory.  Note that
+inotify may remove a watch due to filesystem events, as well as by your request.
+If you use IN_ONESHOT, inotify will remove the watch after the first event, at
+which point you may call the final inotify_put_watch.
+
+(iv) Kernel Interface Prototypes
+
+	struct inotify_handle *inotify_init(struct inotify_operations *ops);
+
+	inotify_init_watch(struct inotify_watch *watch);
+
+	s32 inotify_add_watch(struct inotify_handle *ih,
+		              struct inotify_watch *watch,
+			      struct inode *inode, u32 mask);
+
+	s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode,
+			       struct inotify_watch **watchp);
+
+	s32 inotify_find_update_watch(struct inotify_handle *ih,
+				      struct inode *inode, u32 mask);
+
+	int inotify_rm_wd(struct inotify_handle *ih, u32 wd);
+
+	int inotify_rm_watch(struct inotify_handle *ih,
+			     struct inotify_watch *watch);
+
+	void inotify_remove_watch_locked(struct inotify_handle *ih,
+					 struct inotify_watch *watch);
+
+	void inotify_destroy(struct inotify_handle *ih);
+
+	void get_inotify_watch(struct inotify_watch *watch);
+	void put_inotify_watch(struct inotify_watch *watch);
+
+
+(v) Internal Kernel Implementation
+
+Each inotify instance is represented by an inotify_handle structure.
+Inotify's userspace consumers also have an inotify_device which is
+associated with the inotify_handle, and on which events are queued.
 
 Each watch is associated with an inotify_watch structure.  Watches are chained
-off of each associated device and each associated inode.
+off of each associated inotify_handle and each associated inode.
 
-See fs/inotify.c for the locking and lifetime rules.
+See fs/inotify.c and fs/inotify_user.c for the locking and lifetime rules.
 
 
-(iv) Rationale
+(vi) Rationale
 
 Q: What is the design decision behind not tying the watch to the open fd of
    the watched object?
@@ -145,7 +263,7 @@ A: The poor user-space interface is the 
    file descriptor-based one that allows basic file I/O and poll/select.
    Obtaining the fd and managing the watches could have been done either via a
    device file or a family of new system calls.  We decided to implement a
-   family of system calls because that is the preffered approach for new kernel
+   family of system calls because that is the preferred approach for new kernel
    interfaces.  The only real difference was whether we wanted to use open(2)
    and ioctl(2) or a couple of new system calls.  System calls beat ioctls.
 
diff --git a/fs/Kconfig b/fs/Kconfig
index f9b5842..74f11a2 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -393,18 +393,30 @@ config INOTIFY
 	bool "Inotify file change notification support"
 	default y
 	---help---
-	  Say Y here to enable inotify support and the associated system
-	  calls.  Inotify is a file change notification system and a
-	  replacement for dnotify.  Inotify fixes numerous shortcomings in
-	  dnotify and introduces several new features.  It allows monitoring
-	  of both files and directories via a single open fd.  Other features
-	  include multiple file events, one-shot support, and unmount
+	  Say Y here to enable inotify support.  Inotify is a file change
+	  notification system and a replacement for dnotify.  Inotify fixes
+	  numerous shortcomings in dnotify and introduces several new features
+	  including multiple file events, one-shot support, and unmount
 	  notification.
 
 	  For more information, see Documentation/filesystems/inotify.txt
 
 	  If unsure, say Y.
 
+config INOTIFY_USER
+	bool "Inotify support for userspace"
+	depends on INOTIFY
+	default y
+	---help---
+	  Say Y here to enable inotify support for userspace, including the
+	  associated system calls.  Inotify allows monitoring of both files and
+	  directories via a single open fd.  Events are read from the file
+	  descriptor, which is also select()- and poll()-able.
+
+	  For more information, see Documentation/filesystems/inotify.txt
+
+	  If unsure, say Y.
+
 config QUOTA
 	bool "Quota support"
 	help
diff --git a/fs/Makefile b/fs/Makefile
index 078d3d1..d0ea6bf 100644
--- a/fs/Makefile
+++ b/fs/Makefile
[...4851 lines suppressed...]
+
+	if (!audit_enabled)
+		return 0;
+
+	if (likely(!context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->mqdes = mqdes;
+	ax->mqstat = *mqstat;
+
+	ax->d.type = AUDIT_MQ_GETSETATTR;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+/**
+ * audit_ipc_obj - record audit data for ipc object
+ * @ipcp: ipc permissions
+ *
+ * Returns 0 for success or NULL context or < 0 on error.
+ */
+int __audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{
+	struct audit_aux_data_ipcctl *ax;
+	struct audit_context *context = current->audit_context;
+
+	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
+	if (!ax)
+		return -ENOMEM;
+
 	ax->uid = ipcp->uid;
 	ax->gid = ipcp->gid;
 	ax->mode = ipcp->mode;
@@ -1207,14 +1539,11 @@ int audit_ipc_obj(struct kern_ipc_perm *
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
-int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp)
+int __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
 {
 	struct audit_aux_data_ipcctl *ax;
 	struct audit_context *context = current->audit_context;
 
-	if (likely(!context))
-		return 0;
-
 	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
 	if (!ax)
 		return -ENOMEM;
@@ -1223,7 +1552,6 @@ int audit_ipc_set_perm(unsigned long qby
 	ax->uid = uid;
 	ax->gid = gid;
 	ax->mode = mode;
-	selinux_get_ipc_sid(ipcp, &ax->osid);
 
 	ax->d.type = AUDIT_IPC_SET_PERM;
 	ax->d.next = context->aux;
@@ -1231,6 +1559,39 @@ int audit_ipc_set_perm(unsigned long qby
 	return 0;
 }
 
+int audit_bprm(struct linux_binprm *bprm)
+{
+	struct audit_aux_data_execve *ax;
+	struct audit_context *context = current->audit_context;
+	unsigned long p, next;
+	void *to;
+
+	if (likely(!audit_enabled || !context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
+				GFP_KERNEL);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->argc = bprm->argc;
+	ax->envc = bprm->envc;
+	for (p = bprm->p, to = ax->mem; p < MAX_ARG_PAGES*PAGE_SIZE; p = next) {
+		struct page *page = bprm->page[p / PAGE_SIZE];
+		void *kaddr = kmap(page);
+		next = (p + PAGE_SIZE) & ~(PAGE_SIZE - 1);
+		memcpy(to, kaddr + (p & (PAGE_SIZE - 1)), next - p);
+		to += next - p;
+		kunmap(page);
+	}
+
+	ax->d.type = AUDIT_EXECVE;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+
 /**
  * audit_socketcall - record audit data for sys_socketcall
  * @nargs: number of args
@@ -1325,19 +1686,20 @@ int audit_avc_path(struct dentry *dentry
  * If the audit subsystem is being terminated, record the task (pid)
  * and uid that is doing that.
  */
-void audit_signal_info(int sig, struct task_struct *t)
+void __audit_signal_info(int sig, struct task_struct *t)
 {
 	extern pid_t audit_sig_pid;
 	extern uid_t audit_sig_uid;
-
-	if (unlikely(audit_pid && t->tgid == audit_pid)) {
-		if (sig == SIGTERM || sig == SIGHUP) {
-			struct audit_context *ctx = current->audit_context;
-			audit_sig_pid = current->pid;
-			if (ctx)
-				audit_sig_uid = ctx->loginuid;
-			else
-				audit_sig_uid = current->uid;
-		}
+	extern u32 audit_sig_sid;
+
+	if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1) {
+		struct task_struct *tsk = current;
+		struct audit_context *ctx = tsk->audit_context;
+		audit_sig_pid = tsk->pid;
+		if (ctx)
+			audit_sig_uid = ctx->loginuid;
+		else
+			audit_sig_uid = tsk->uid;
+		selinux_get_task_sid(tsk, &audit_sig_sid);
 	}
 }
diff --git a/kernel/signal.c b/kernel/signal.c
index e5f8aea..1b3c921 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -23,12 +23,12 @@ #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/ptrace.h>
 #include <linux/signal.h>
-#include <linux/audit.h>
 #include <linux/capability.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
+#include "audit.h"	/* audit_signal_info() */
 
 /*
  * SLAB caches for signal bits.
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e82726f..0d656e6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -150,7 +150,7 @@ extern ctl_table random_table[];
 #ifdef CONFIG_UNIX98_PTYS
 extern ctl_table pty_table[];
 #endif
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 extern ctl_table inotify_table[];
 #endif
 
@@ -1028,7 +1028,7 @@ #ifdef CONFIG_MMU
 		.mode		= 0644,
 		.proc_handler	= &proc_doulongvec_minmax,
 	},
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 	{
 		.ctl_name	= FS_INOTIFY,
 		.procname	= "inotify",
diff --git a/kernel/user.c b/kernel/user.c
index 2116642..4b1eb74 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -140,7 +140,7 @@ struct user_struct * alloc_uid(uid_t uid
 		atomic_set(&new->processes, 0);
 		atomic_set(&new->files, 0);
 		atomic_set(&new->sigpending, 0);
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 		atomic_set(&new->inotify_watches, 0);
 		atomic_set(&new->inotify_devs, 0);
 #endif
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index c284dbb..e9548bc 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1980,7 +1980,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 		break;
 	case AUDIT_SE_SEN:
 	case AUDIT_SE_CLR:
-		level = (op == AUDIT_SE_SEN ?
+		level = (field == AUDIT_SE_SEN ?
 		         &ctxt->range.level[0] : &ctxt->range.level[1]);
 		switch (op) {
 		case AUDIT_EQUAL:

linux-2.6-audit-pending.patch:
 fs/namei.c               |    2 
 fs/open.c                |    4 -
 fs/xattr.c               |    4 -
 include/linux/audit.h    |   15 ++--
 include/linux/fsnotify.h |    3 
 kernel/audit.c           |   54 +++++++++++++++-
 kernel/audit.h           |    3 
 kernel/auditfilter.c     |   28 ++++----
 kernel/auditsc.c         |  154 ++++++++++++++++++++++++++---------------------
 9 files changed, 171 insertions(+), 96 deletions(-)

--- NEW FILE linux-2.6-audit-pending.patch ---
diff --git a/fs/namei.c b/fs/namei.c
index d6e2ee2..184fe4a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1127,7 +1127,7 @@ out:
 	if (likely(retval == 0)) {
 		if (unlikely(current->audit_context && nd && nd->dentry &&
 				nd->dentry->d_inode))
-		audit_inode(name, nd->dentry->d_inode, flags);
+		audit_inode(name, nd->dentry->d_inode);
 	}
 out_fail:
 	return retval;
diff --git a/fs/open.c b/fs/open.c
index 317b7c7..4f178ac 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -633,7 +633,7 @@ asmlinkage long sys_fchmod(unsigned int 
 	dentry = file->f_dentry;
 	inode = dentry->d_inode;
 
-	audit_inode(NULL, inode, 0);
+	audit_inode(NULL, inode);
 
 	err = -EROFS;
 	if (IS_RDONLY(inode))
@@ -786,7 +786,7 @@ asmlinkage long sys_fchown(unsigned int 
 	if (file) {
 		struct dentry * dentry;
 		dentry = file->f_dentry;
-		audit_inode(NULL, dentry->d_inode, 0);
+		audit_inode(NULL, dentry->d_inode);
 		error = chown_common(dentry, user, group);
 		fput(file);
 	}
diff --git a/fs/xattr.c b/fs/xattr.c
index e416190..c32f15b 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -242,7 +242,7 @@ sys_fsetxattr(int fd, char __user *name,
 	if (!f)
 		return error;
 	dentry = f->f_dentry;
-	audit_inode(NULL, dentry->d_inode, 0);
+	audit_inode(NULL, dentry->d_inode);
 	error = setxattr(dentry, name, value, size, flags);
 	fput(f);
 	return error;
@@ -469,7 +469,7 @@ sys_fremovexattr(int fd, char __user *na
 	if (!f)
 		return error;
 	dentry = f->f_dentry;
-	audit_inode(NULL, dentry->d_inode, 0);
+	audit_inode(NULL, dentry->d_inode);
 	error = removexattr(dentry, name);
 	fput(f);
 	return error;
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c783275..e1c1dbd 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -310,7 +310,7 @@ extern void audit_syscall_entry(int arch
 extern void audit_syscall_exit(int failed, long return_code);
 extern void __audit_getname(const char *name);
 extern void audit_putname(const char *name);
-extern void __audit_inode(const char *name, const struct inode *inode, unsigned flags);
+extern void __audit_inode(const char *name, const struct inode *inode);
 extern void __audit_inode_child(const char *dname, const struct inode *inode,
 				unsigned long pino);
 static inline void audit_getname(const char *name)
@@ -318,10 +318,9 @@ static inline void audit_getname(const c
 	if (unlikely(current->audit_context))
 		__audit_getname(name);
 }
-static inline void audit_inode(const char *name, const struct inode *inode,
-			       unsigned flags) {
+static inline void audit_inode(const char *name, const struct inode *inode) {
 	if (unlikely(current->audit_context))
-		__audit_inode(name, inode, flags);
+		__audit_inode(name, inode);
 }
 static inline void audit_inode_child(const char *dname, 
 				     const struct inode *inode, 
@@ -398,9 +397,9 @@ #define audit_syscall_entry(ta,a,b,c,d,e
 #define audit_syscall_exit(f,r) do { ; } while (0)
 #define audit_getname(n) do { ; } while (0)
 #define audit_putname(n) do { ; } while (0)
-#define __audit_inode(n,i,f) do { ; } while (0)
+#define __audit_inode(n,i) do { ; } while (0)
 #define __audit_inode_child(d,i,p) do { ; } while (0)
-#define audit_inode(n,i,f) do { ; } while (0)
+#define audit_inode(n,i) do { ; } while (0)
 #define audit_inode_child(d,i,p) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
 #define audit_get_loginuid(c) ({ -1; })
@@ -435,6 +434,9 @@ extern void		    audit_log_hex(struct au
 					  size_t len);
 extern const char *	    audit_log_untrustedstring(struct audit_buffer *ab,
 						      const char *string);
+extern const char *	    audit_log_n_untrustedstring(struct audit_buffer *ab,
+							size_t n,
+							const char *string);
 extern void		    audit_log_d_path(struct audit_buffer *ab,
 					     const char *prefix,
 					     struct dentry *dentry,
@@ -452,6 +454,7 @@ #define audit_log_format(b,f,...) do { ;
 #define audit_log_end(b) do { ; } while (0)
 #define audit_log_hex(a,b,l) do { ; } while (0)
 #define audit_log_untrustedstring(a,s) do { ; } while (0)
+#define audit_log_n_untrustedstring(a,n,s) do { ; } while (0)
 #define audit_log_d_path(b,p,d,v) do { ; } while (0)
 #endif
 #endif
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index a9d3044..cc5dec7 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -67,8 +67,7 @@ static inline void fsnotify_move(struct 
 	if (source) {
 		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL);
 	}
-	audit_inode_child(old_name, source, old_dir->i_ino);
-	audit_inode_child(new_name, target, new_dir->i_ino);
+	audit_inode_child(new_name, source, new_dir->i_ino);
 }
 
 /*
diff --git a/kernel/audit.c b/kernel/audit.c
index c12e2ae..60fb78b 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1049,20 +1049,53 @@ void audit_log_hex(struct audit_buffer *
 	skb_put(skb, len << 1); /* new string is twice the old string */
 }
 
+/*
+ * Format a string of no more than slen characters into the audit buffer,
+ * enclosed in quote marks.
+ */
+static void audit_log_n_string(struct audit_buffer *ab, size_t slen,
+			       const char *string)
+{
+	int avail, new_len;
+	unsigned char *ptr;
+	struct sk_buff *skb;
+
+	BUG_ON(!ab->skb);
+	skb = ab->skb;
+	avail = skb_tailroom(skb);
+	new_len = slen + 3;	/* enclosing quotes + null terminator */
+	if (new_len > avail) {
+		avail = audit_expand(ab, new_len);
+		if (!avail)
+			return;
+	}
+	ptr = skb->tail;
+	*ptr++ = '"';
+	memcpy(ptr, string, slen);
+	ptr += slen;
+	*ptr++ = '"';
+	*ptr = 0;
+	skb_put(skb, slen + 2);	/* don't include null terminator */
+}
+
 /**
- * audit_log_unstrustedstring - log a string that may contain random characters
+ * audit_log_n_unstrustedstring - log a string that may contain random characters
  * @ab: audit_buffer
+ * @len: lenth of string (not including trailing null)
  * @string: string to be logged
  *
  * This code will escape a string that is passed to it if the string
  * contains a control character, unprintable character, double quote mark,
  * or a space. Unescaped strings will start and end with a double quote mark.
  * Strings that are escaped are printed in hex (2 digits per char).
+ *
+ * The caller specifies the number of characters in the string to log, which may
+ * or may not be the entire string.
  */
-const char *audit_log_untrustedstring(struct audit_buffer *ab, const char *string)
+const char *audit_log_n_untrustedstring(struct audit_buffer *ab, size_t len,
+					const char *string)
 {
 	const unsigned char *p = string;
-	size_t len = strlen(string);
 
 	while (*p) {
 		if (*p == '"' || *p < 0x21 || *p > 0x7f) {
@@ -1071,10 +1104,23 @@ const char *audit_log_untrustedstring(st
 		}
 		p++;
 	}
-	audit_log_format(ab, "\"%s\"", string);
+	audit_log_n_string(ab, len, string);
 	return p + 1;
 }
 
+/**
+ * audit_log_unstrustedstring - log a string that may contain random characters
+ * @ab: audit_buffer
+ * @string: string to be logged
+ *
+ * Same as audit_log_n_unstrustedstring(), except that strlen is used to
+ * determine string length.
+ */
+const char *audit_log_untrustedstring(struct audit_buffer *ab, const char *string)
+{
+	return audit_log_n_untrustedstring(ab, strlen(string), string);
+}
+
 /* This is a helper-function to print the escaped d_path */
 void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
 		      struct dentry *dentry, struct vfsmount *vfsmnt)
diff --git a/kernel/audit.h b/kernel/audit.h
index f337845..38e62b7 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -104,7 +104,8 @@ static inline int audit_hash_ino(u32 ino
 }
 
 extern int audit_comparator(const u32 left, const u32 op, const u32 right);
-extern int audit_compare_dname_path(const char *dname, const char *path);
+extern int audit_compare_dname_path(const char *dname, const char *path,
+				    int *dirlen);
 extern struct sk_buff *	    audit_make_reply(int pid, int seq, int type,
 					     int done, int multi,
 					     void *payload, int size);
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 461f404..4c99d2c 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -109,7 +109,7 @@ static inline void audit_get_watch(struc
 	atomic_inc(&watch->count);
 }
 
-static inline void audit_put_watch(struct audit_watch *watch)
+static void audit_put_watch(struct audit_watch *watch)
 {
 	if (atomic_dec_and_test(&watch->count)) {
 		WARN_ON(watch->parent);
@@ -119,7 +119,7 @@ static inline void audit_put_watch(struc
 	}
 }
 
-static inline void audit_remove_watch(struct audit_watch *watch)
+static void audit_remove_watch(struct audit_watch *watch)
 {
 	list_del(&watch->wlist);
 	put_inotify_watch(&watch->parent->wdata);
@@ -151,7 +151,7 @@ static inline void audit_free_rule_rcu(s
 }
 
 /* Initialize a parent watch entry. */
-static inline struct audit_parent *audit_init_parent(struct nameidata *ndp)
+static struct audit_parent *audit_init_parent(struct nameidata *ndp)
 {
 	struct audit_parent *parent;
 	s32 wd;
@@ -177,7 +177,7 @@ static inline struct audit_parent *audit
 }
 
 /* Initialize a watch entry. */
-static inline struct audit_watch *audit_init_watch(char *path)
+static struct audit_watch *audit_init_watch(char *path)
 {
 	struct audit_watch *watch;
 
@@ -666,7 +666,7 @@ static int audit_compare_rule(struct aud
 
 /* Duplicate the given audit watch.  The new watch's rules list is initialized
  * to an empty list and wlist is undefined. */
-static inline struct audit_watch *audit_dupe_watch(struct audit_watch *old)
+static struct audit_watch *audit_dupe_watch(struct audit_watch *old)
 {
 	char *path;
 	struct audit_watch *new;
@@ -776,9 +776,9 @@ static struct audit_entry *audit_dupe_ru
 }
 
 /* Update inode info in audit rules based on filesystem event. */
-static inline void audit_update_watch(struct audit_parent *parent,
-				      const char *dname, dev_t dev,
-				      unsigned long ino, unsigned invalidating)
+static void audit_update_watch(struct audit_parent *parent,
+			       const char *dname, dev_t dev,
+			       unsigned long ino, unsigned invalidating)
 {
 	struct audit_watch *owatch, *nwatch, *nextw;
 	struct audit_krule *r, *nextr;
@@ -787,7 +787,7 @@ static inline void audit_update_watch(st
 
 	mutex_lock(&audit_filter_mutex);
 	list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) {
-		if (audit_compare_dname_path(dname, owatch->path))
+		if (audit_compare_dname_path(dname, owatch->path, NULL))
 			continue;
 
 		/* If the update involves invalidating rules, do the inode-based
@@ -842,7 +842,7 @@ add_watch_to_parent:
 }
 
 /* Remove all watches & rules associated with a parent that is going away. */
-static inline void audit_remove_parent_watches(struct audit_parent *parent)
+static void audit_remove_parent_watches(struct audit_parent *parent)
 {
 	struct audit_watch *w, *nextw;
 	struct audit_krule *r, *nextr;
@@ -948,7 +948,7 @@ static int audit_get_nd(char *path, stru
 }
 
 /* Release resources used for watch path information. */
-static inline void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw)
+static void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw)
 {
 	if (ndp) {
 		path_release(ndp);
@@ -1387,7 +1387,8 @@ int audit_comparator(const u32 left, con
 
 /* Compare given dentry name with last component in given path,
  * return of 0 indicates a match. */
-int audit_compare_dname_path(const char *dname, const char *path)
+int audit_compare_dname_path(const char *dname, const char *path,
+			     int *dirlen)
 {
 	int dlen, plen;
 	const char *p;
@@ -1416,6 +1417,9 @@ int audit_compare_dname_path(const char 
 			p++;
 	}
 
+	/* return length of path's directory component */
+	if (dirlen)
+		*dirlen = p - path;
 	return strncmp(p, dname, dlen);
 }
 
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8503401..a2ad392 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -82,6 +82,9 @@ #define AUDIT_NAMES    20
  * path_lookup. */
 #define AUDIT_NAMES_RESERVED 7
 
+/* Indicates that audit should log the full pathname. */
+#define AUDIT_NAME_FULL -1
+
 /* When fs/namei.c:getname() is called, we store the pointer in name and
  * we don't let putname() free it (instead we free all of the saved
  * pointers at syscall exit time).
@@ -89,8 +92,9 @@ #define AUDIT_NAMES_RESERVED 7
  * Further, in fs/namei.c:path_lookup() we store the inode and device. */
 struct audit_names {
 	const char	*name;
+	int		name_len;	/* number of name's characters to log */
+	unsigned	name_put;	/* call __putname() for this name */
 	unsigned long	ino;
-	unsigned long	pino;
 	dev_t		dev;
 	umode_t		mode;
 	uid_t		uid;
@@ -296,12 +300,10 @@ static int audit_filter_rules(struct tas
 			break;
 		case AUDIT_INODE:
 			if (name)
-				result = (name->ino == f->val ||
-					  name->pino == f->val);
+				result = (name->ino == f->val);
 			else if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(ctx->names[j].ino, f->op, f->val) ||
-					    audit_comparator(ctx->names[j].pino, f->op, f->val)) {
+					if (audit_comparator(ctx->names[j].ino, f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -311,8 +313,7 @@ static int audit_filter_rules(struct tas
 		case AUDIT_WATCH:
 			if (name && rule->watch->ino != (unsigned long)-1)
 				result = (name->dev == rule->watch->dev &&
-					  (name->ino == rule->watch->ino ||
-					   name->pino == rule->watch->ino));
+					  name->ino == rule->watch->ino);
 			break;
 		case AUDIT_LOGINUID:
 			result = 0;
@@ -526,7 +527,7 @@ #if AUDIT_DEBUG
 #endif
 
 	for (i = 0; i < context->name_count; i++) {
-		if (context->names[i].name)
+		if (context->names[i].name && context->names[i].name_put)
 			__putname(context->names[i].name);
 	}
 	context->name_count = 0;
@@ -850,8 +851,7 @@ static void audit_log_exit(struct audit_
 		}
 	}
 	for (i = 0; i < context->name_count; i++) {
-		unsigned long ino  = context->names[i].ino;
-		unsigned long pino = context->names[i].pino;
+		struct audit_names *n = &context->names[i];
 
 		ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH);
 		if (!ab)
@@ -859,33 +859,47 @@ static void audit_log_exit(struct audit_
 
 		audit_log_format(ab, "item=%d", i);
 
-		audit_log_format(ab, " name=");
-		if (context->names[i].name)
-			audit_log_untrustedstring(ab, context->names[i].name);
-		else
-			audit_log_format(ab, "(null)");
-
-		if (pino != (unsigned long)-1)
-			audit_log_format(ab, " parent=%lu",  pino);
-		if (ino != (unsigned long)-1)
-			audit_log_format(ab, " inode=%lu",  ino);
-		if ((pino != (unsigned long)-1) || (ino != (unsigned long)-1))
-			audit_log_format(ab, " dev=%02x:%02x mode=%#o" 
-					 " ouid=%u ogid=%u rdev=%02x:%02x", 
-					 MAJOR(context->names[i].dev), 
-					 MINOR(context->names[i].dev), 
-					 context->names[i].mode, 
-					 context->names[i].uid, 
-					 context->names[i].gid, 
-					 MAJOR(context->names[i].rdev), 
-					 MINOR(context->names[i].rdev));
-		if (context->names[i].osid != 0) {
+		if (n->name) {
+			switch(n->name_len) {
+			case AUDIT_NAME_FULL:
+				/* log the full path */
+				audit_log_format(ab, " name=");
+				audit_log_untrustedstring(ab, n->name);
+				break;
+			case 0:
+				/* name was specified as a relative path and the
+				 * directory component is the cwd */
+				audit_log_d_path(ab, "name=", context->pwd,
+						 context->pwdmnt);
+				break;
+			default:
+				/* log the name's directory component */
+				audit_log_format(ab, " name=");
+				audit_log_n_untrustedstring(ab, n->name_len,
+							    n->name);
+			}
+		} else
+			audit_log_format(ab, "name=(null)");
+
+		if (n->ino != (unsigned long)-1) {
+			audit_log_format(ab, " inode=%lu"
+					 " dev=%02x:%02x mode=%#o"
+					 " ouid=%u ogid=%u rdev=%02x:%02x",
+					 n->ino,
+					 MAJOR(n->dev),
+					 MINOR(n->dev),
+					 n->mode,
+					 n->uid,
+					 n->gid,
+					 MAJOR(n->rdev),
+					 MINOR(n->rdev));
+		}
+		if (n->osid != 0) {
 			char *ctx = NULL;
 			u32 len;
 			if (selinux_ctxid_to_string(
-				context->names[i].osid, &ctx, &len)) {
-				audit_log_format(ab, " osid=%u",
-						context->names[i].osid);
+				n->osid, &ctx, &len)) {
+				audit_log_format(ab, " osid=%u", n->osid);
 				call_panic = 2;
 			} else
 				audit_log_format(ab, " obj=%s", ctx);
@@ -1075,6 +1089,8 @@ #endif
 	}
 	BUG_ON(context->name_count >= AUDIT_NAMES);
 	context->names[context->name_count].name = name;
+	context->names[context->name_count].name_len = AUDIT_NAME_FULL;
+	context->names[context->name_count].name_put = 1;
 	context->names[context->name_count].ino  = (unsigned long)-1;
 	++context->name_count;
 	if (!context->pwd) {
@@ -1141,11 +1157,10 @@ static void audit_inode_context(int idx,
  * audit_inode - store the inode and device from a lookup
  * @name: name being audited
  * @inode: inode being audited
- * @flags: lookup flags (as used in path_lookup())
  *
  * Called from fs/namei.c:path_lookup().
  */
-void __audit_inode(const char *name, const struct inode *inode, unsigned flags)
+void __audit_inode(const char *name, const struct inode *inode)
 {
 	int idx;
 	struct audit_context *context = current->audit_context;
@@ -1171,20 +1186,13 @@ #if AUDIT_DEBUG
 		++context->ino_count;
 #endif
 	}
+	context->names[idx].ino   = inode->i_ino;
 	context->names[idx].dev	  = inode->i_sb->s_dev;
 	context->names[idx].mode  = inode->i_mode;
 	context->names[idx].uid   = inode->i_uid;
 	context->names[idx].gid   = inode->i_gid;
 	context->names[idx].rdev  = inode->i_rdev;
 	audit_inode_context(idx, inode);
-	if ((flags & LOOKUP_PARENT) && (strcmp(name, "/") != 0) && 
-	    (strcmp(name, ".") != 0)) {
-		context->names[idx].ino   = (unsigned long)-1;
-		context->names[idx].pino  = inode->i_ino;
-	} else {
-		context->names[idx].ino   = inode->i_ino;
-		context->names[idx].pino  = (unsigned long)-1;
-	}
 }
 
 /**
@@ -1206,34 +1214,40 @@ void __audit_inode_child(const char *dna
 {
 	int idx;
 	struct audit_context *context = current->audit_context;
+	const char *found_name = NULL;
+	int dirlen = 0;
 
 	if (!context->in_syscall)
 		return;
 
 	/* determine matching parent */
 	if (!dname)
-		goto no_match;
+		goto update_context;
 	for (idx = 0; idx < context->name_count; idx++)
-		if (context->names[idx].pino == pino) {
+		if (context->names[idx].ino == pino) {
 			const char *name = context->names[idx].name;
 
 			if (!name)
 				continue;
 
-			if (audit_compare_dname_path(dname, name) == 0)
-				goto update_context;
+			if (audit_compare_dname_path(dname, name, &dirlen) == 0) {
+				context->names[idx].name_len = dirlen;
+				found_name = name;
+				break;
+			}
 		}
 
-no_match:
-	/* catch-all in case match not found */
+update_context:
 	idx = context->name_count++;
-	context->names[idx].name  = NULL;
-	context->names[idx].pino  = pino;
 #if AUDIT_DEBUG
 	context->ino_count++;
 #endif
+	/* Re-use the name belonging to the slot for a matching parent directory.
+	 * All names for this context are relinquished in audit_free_names() */
+	context->names[idx].name = found_name;
+	context->names[idx].name_len = AUDIT_NAME_FULL;
+	context->names[idx].name_put = 0;	/* don't call __putname() */
 
-update_context:
 	if (inode) {
 		context->names[idx].ino   = inode->i_ino;
 		context->names[idx].dev	  = inode->i_sb->s_dev;
@@ -1242,7 +1256,8 @@ update_context:
 		context->names[idx].gid   = inode->i_gid;
 		context->names[idx].rdev  = inode->i_rdev;
 		audit_inode_context(idx, inode);
-	}
+	} else
+		context->names[idx].ino   = (unsigned long)-1;
 }
 
 /**
@@ -1275,18 +1290,23 @@ void auditsc_get_stamp(struct audit_cont
  */
 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
 {
-	if (task->audit_context) {
-		struct audit_buffer *ab;
-
-		ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);
-		if (ab) {
-			audit_log_format(ab, "login pid=%d uid=%u "
-				"old auid=%u new auid=%u",
-				task->pid, task->uid, 
-				task->audit_context->loginuid, loginuid);
-			audit_log_end(ab);
+	struct audit_context *context = task->audit_context;
+
+	if (context) {
+		/* Only log if audit is enabled */
+		if (context->in_syscall) {
+			struct audit_buffer *ab;
+
+			ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);
+			if (ab) {
+				audit_log_format(ab, "login pid=%d uid=%u "
+					"old auid=%u new auid=%u",
+					task->pid, task->uid, 
+					context->loginuid, loginuid);
+				audit_log_end(ab);
+			}
 		}
-		task->audit_context->loginuid = loginuid;
+		context->loginuid = loginuid;
 	}
 	return 0;
 }
@@ -1412,8 +1432,10 @@ int __audit_mq_timedreceive(mqd_t mqdes,
 		return -ENOMEM;
 
 	if (u_msg_prio != NULL) {
-		if (get_user(ax->msg_prio, u_msg_prio))
+		if (get_user(ax->msg_prio, u_msg_prio)) {
+			kfree(ax);
 			return -EFAULT;
+		}
 	} else
 		ax->msg_prio = 0;
 

linux-2.6-net-label.patch:
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   44 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 include/linux/ip.h                                        |    1 
 include/linux/netlink.h                                   |    1 
 include/net/cipso_ipv4.h                                  |  159 +
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  354 ++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/ah4.c                                            |    2 
 net/ipv4/cipso_ipv4.c                                     | 1749 ++++++++++++++
 net/ipv4/ip_options.c                                     |   19 
 net/netlabel/Kconfig                                      |   47 
 net/netlabel/Makefile                                     |   15 
 net/netlabel/netlabel_cipso_v4.c                          |  580 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  201 +
 net/netlabel/netlabel_domainhash.c                        |  629 +++++
 net/netlabel/netlabel_domainhash.h                        |   64 
 net/netlabel/netlabel_kapi.c                              |  420 +++
 net/netlabel/netlabel_mgmt.c                              |  677 +++++
 net/netlabel/netlabel_mgmt.h                              |  248 +
 net/netlabel/netlabel_unlabeled.c                         |  285 ++
 net/netlabel/netlabel_unlabeled.h                         |   83 
 net/netlabel/netlabel_user.c                              |  174 +
 net/netlabel/netlabel_user.h                              |   42 
 security/selinux/hooks.c                                  |   81 
 security/selinux/include/av_inherit.h                     |    1 
 security/selinux/include/av_perm_to_string.h              |    2 
 security/selinux/include/av_permissions.h                 |    1 
 security/selinux/include/flask.h                          |    1 
 security/selinux/include/security.h                       |    9 
 security/selinux/nlmsgtab.c                               |  159 -
 security/selinux/ss/ebitmap.c                             |  155 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  160 +
 security/selinux/ss/mls.h                                 |   25 
 security/selinux/ss/services.c                            |  415 +++
 security/selinux/xfrm.c                                   |   22 
 44 files changed, 7642 insertions(+), 90 deletions(-)

--- NEW FILE linux-2.6-net-label.patch ---
>From paul.moore at hp.com Tue Jun 13 13:19:29 2006
Return-Path: <paul.moore at hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 13 Jun 2006 13:19:46 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5DHJklQ024760
	for <sgrubb at boston.redhat.com>; Tue, 13 Jun 2006 13:19:46 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5DHJjvp003404;
	Tue, 13 Jun 2006 13:19:45 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5DHJbhR014102;
	Tue, 13 Jun 2006 13:19:37 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel9.hp.com (Postfix) with ESMTP id BC9063411C;
	Tue, 13 Jun 2006 13:19:31 -0400 (EDT)
Received: from [16.116.96.193] (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id B2A0D1D83F;
	Tue, 13 Jun 2006 17:19:30 +0000 (UTC)
Message-ID: <448EF3A1.8060500 at hp.com>
Date: Tue, 13 Jun 2006 13:19:29 -0400
From: Paul Moore <paul.moore at hp.com>
Organization: Hewlett Packard
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: redhat-lspp at redhat.com
Cc: Steve Grubb <sgrubb at redhat.com>
Subject: Updated NetLabel patch
X-Enigmail-Version: 0.92.0.0
Content-Type: multipart/mixed;
  boundary="------------060702020000000708020100"
X-RedHat-Spam-Score: -98.817 
X-UID: 68857
X-Length: 271297

This is a multi-part message in MIME format.
--------------060702020000000708020100
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Attached is an updated NetLabel patch from June 13th (today) against the
lspp.35 sources.  As before it has been quickly tested on x86, x86_64,
targeted/enforcing, and mls/permissive although not all hw/policy
combinations have been tested.  If you wish to configure NetLabel to use
CIPSO please grab the June 13th release of netlabel_tools which can be
found here:

 * http://free.linux.hp.com/~pmoore/projects/linux_cipso

The big changes since the last posting on June 6th are:

 * Demonstrated interop between TSOL v 8 (big thanks to Ted)
 * Relabeling of sockets on accept()
 * The addition of the "pass through" CIPSO mapping
 * Better NetLabel netlink error reporting to userspace
 * Verified CIPSO option is recognized as immutable by AH
   (not yet tested)

The patch stats:

 CREDITS                                                   |    7
 Documentation/00-INDEX                                    |    2
 Documentation/netlabel/00-INDEX                           |   10
 Documentation/netlabel/cipso_ipv4.txt                     |   48
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  791 ++++
 Documentation/netlabel/introduction.txt                   |   44
 Documentation/netlabel/lsm_interface.txt                  |   47
 include/linux/ip.h                                        |    1
 include/linux/netlink.h                                   |    1
 include/net/cipso_ipv4.h                                  |  159
 include/net/inet_sock.h                                   |    2
 include/net/netlabel.h                                    |  354 ++
 net/Kconfig                                               |    2
 net/Makefile                                              |    1
 net/ipv4/Makefile                                         |    1
 net/ipv4/ah4.c                                            |    2
 net/ipv4/cipso_ipv4.c                                     | 1749 ++++++
 net/ipv4/ip_options.c                                     |   19
 net/netlabel/Kconfig                                      |   47
 net/netlabel/Makefile                                     |   15
 net/netlabel/netlabel_cipso_v4.c                          |  580 +++
 net/netlabel/netlabel_cipso_v4.h                          |  201 +
 net/netlabel/netlabel_domainhash.c                        |  629 +++
 net/netlabel/netlabel_domainhash.h                        |   64
 net/netlabel/netlabel_kapi.c                              |  420 ++
 net/netlabel/netlabel_mgmt.c                              |  677 +++
 net/netlabel/netlabel_mgmt.h                              |  248 +
 net/netlabel/netlabel_unlabeled.c                         |  285 +
 net/netlabel/netlabel_unlabeled.h                         |   83
 net/netlabel/netlabel_user.c                              |  174
 net/netlabel/netlabel_user.h                              |   42
 security/selinux/hooks.c                                  |   81
 security/selinux/include/av_inherit.h                     |    1
 security/selinux/include/av_perm_to_string.h              |    2
 security/selinux/include/av_permissions.h                 |    1
 security/selinux/include/flask.h                          |    1
 security/selinux/include/security.h                       |    9
 security/selinux/nlmsgtab.c                               |  159
 security/selinux/ss/ebitmap.c                             |  155
 security/selinux/ss/ebitmap.h                             |    6
 security/selinux/ss/mls.c                                 |  160
 security/selinux/ss/mls.h                                 |   25
 security/selinux/ss/services.c                            |  415 ++
 security/selinux/xfrm.c                                   |   22
 44 files changed, 7652 insertions(+), 90 deletions(-)

I'll be posting a more "reviewer friendly" patchset in a week or so once
this has been out for a few days and I have had a chance to work on the
patch a bit more (discussed on Monday's concall).

-- 
paul moore
linux security @ hp

--------------060702020000000708020100
Content-Type: text/x-patch;
 name="netlabel_06132006.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="netlabel_06132006.diff"

diff -purN linux-2.6.16.i686/CREDITS linux-2.6.16.i686-netlabel_06132006/CREDITS
--- linux-2.6.16.i686/CREDITS	2006-06-13 10:47:07.000000000 -0400
+++ linux-2.6.16.i686-netlabel_06132006/CREDITS	2006-06-13 11:19:58.000000000 -0400
@@ -2383,6 +2383,13 @@ N: Thomas Molina
 E: tmolina at cablespeed.com
 D: bug fixes, documentation, minor hackery
 
+N: Paul Moore
+E: paul.moore at hp.com
+D: NetLabel author
+S: Hewlett-Packard
+S: 110 Spit Brook Road
+S: Nashua, NH 03062
+
 N: James Morris
 E: jmorris at namei.org
 W: http://namei.org/
diff -purN linux-2.6.16.i686/Documentation/00-INDEX linux-2.6.16.i686-netlabel_06132006/Documentation/00-INDEX
--- linux-2.6.16.i686/Documentation/00-INDEX	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.i686-netlabel_06132006/Documentation/00-INDEX	2006-06-13 11:19:58.000000000 -0400
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
diff -purN linux-2.6.16.i686/Documentation/netlabel/00-INDEX linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/00-INDEX
--- linux-2.6.16.i686/Documentation/netlabel/00-INDEX	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/00-INDEX	2006-06-13 11:19:58.000000000 -0400
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
diff -purN linux-2.6.16.i686/Documentation/netlabel/cipso_ipv4.txt linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/cipso_ipv4.txt
--- linux-2.6.16.i686/Documentation/netlabel/cipso_ipv4.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/cipso_ipv4.txt	2006-06-13 11:19:58.000000000 -0400
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
+labeled networking and is used in many trusted operating systems.
+
+ * Outbound Packet Processing
+
+The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
+adding the CIPSO label to the socket.  This causes all packets leaving the
+system through the socket to have the CIPSO IP option applied.  The socket's
+CIPSO label can be changed at any point in time, however, it is recommended
+that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
+label by using the NetLabel security module API; if the NetLabel "domain" is
+configured to use CIPSO for packet labeling then a CIPSO IP option will be
+generated and attached to the socket.
+
+ * Inbound Packet Processing
+
+The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
+IP layer without any special handling required by the LSM.  However, in order
[...7963 lines suppressed...]
+
+/**
+ * security_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
+ * @skb: the packet
+ * @base_sid: the SELinux SID to use as a context for MLS only attributes
+ * @sid: the SID
+ *
+ * Description:
+ * Call the NetLabel mechanism to get the security attributes of the given
+ * packet and use those attributes to determine the correct context/SID to
+ * assign to the packet.  Returns zero on success, negative values on failure.
+ *
+ */
+int security_netlbl_skbuff_getsid(struct sk_buff *skb, 
+				  const u32 base_sid,
+				  u32 *sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+
+	if (!ss_initialized)
+		return 0;
+
+	netlbl_secattr_init(&secattr);
+
+	ret_val = netlbl_skbuff_getattr(skb, &secattr);
+	if (ret_val == 0)
+		ret_val = security_netlbl_secattr_to_sid(skb,
+							 &secattr,
+							 base_sid,
+							 sid);
+
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return ret_val;
+}
+
+/**
+ * security_netlbl_socket_setsid - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sid: the SID to use as the basis for the label
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int security_netlbl_socket_setsid(const struct socket *sock, const u32 sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+	struct context *ctx;
+
+	if (!ss_initialized)
+		return 0;
+
+	ctx = sidtab_search(&sidtab, sid);
+	if (ctx != NULL) {
+		netlbl_secattr_init(&secattr);
+
+		if (security_context_export_type(ctx, 
+						 &secattr.domain,
+						 NULL) == 0)
+			secattr.set_domain = 1;
+		if (mls_export_lvl(ctx, &secattr.mls_lvl, NULL) == 0)
+			secattr.set_mls_lvl = 1;
+		if (mls_export_cat(ctx, 
+				   &secattr.mls_cat,
+				   &secattr.mls_cat_len,
+				   NULL,
+				   NULL) == 0)
+			secattr.set_mls_cat = 1;
+
+		ret_val = netlbl_socket_setattr(sock, &secattr);
+		netlbl_secattr_destroy(&secattr);
+	} else
+		ret_val = -ENOENT;
+
+	return ret_val;
+}
+
+/**
+ * security_netlbl_socket_accept - Handle the labeling of an accept()ed socket
+ * @sock: the original socket
+ * @newsock: the new accept()ed socket
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism based on the packets
+ * in the queue and the original socket's SID.  Returns zero values on success,
+ * negative values on failure.
+ *
+ */
+int security_netlbl_socket_accept(struct socket *sock, struct socket *newsock)
+{
+	int ret_val;
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct netlbl_lsm_secattr secattr;
+	u32 newsock_sid;
+	u16 sock_class;
+	u32 relabelto_perm;
+
+	if (!ss_initialized)
+		return 0;
+	netlbl_secattr_init(&secattr);
+
+	ret_val = netlbl_socket_getattr(newsock, &secattr);
+	if (ret_val != 0)
+		goto netlbl_socket_accept_return;
+	ret_val = security_netlbl_secattr_to_sid(NULL,
+						 &secattr,
+						 isec->sid,
+						 &newsock_sid);
+	if (ret_val != 0 || newsock_sid == SECINITSID_UNLABELED)
+		goto netlbl_socket_accept_return;
+
+	sock_class = isec->sclass;
+	switch (sock_class) {
+	case SECCLASS_UDP_SOCKET:
+		relabelto_perm = UDP_SOCKET__RELABELTO;
+		break;
+	case SECCLASS_TCP_SOCKET:
+		relabelto_perm = TCP_SOCKET__RELABELTO;
+		break;
+	default:
+		relabelto_perm = RAWIP_SOCKET__RELABELTO;
+	}
+
+	/* PM - should we have a "RELABELFROM" check too? */
+	/* PM - i suspect we should audit this socket relabel */
+	ret_val = avc_has_perm(isec->sid, 
+			       newsock_sid,
+			       sock_class,
+			       relabelto_perm,
+			       NULL);
+	if (ret_val != 0)
+		goto netlbl_socket_accept_return;
+
+	isec = SOCK_INODE(newsock)->i_security;
+	isec->sid = newsock_sid;
+
+netlbl_socket_accept_return:
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return security_netlbl_socket_setsid(newsock, isec->sid);
+}
+#endif /* CONFIG_NETLABEL */
+
 struct selinux_audit_rule {
 	u32 au_seqno;
 	struct context au_ctxt;
diff -purN linux-2.6.16.i686/security/selinux/xfrm.c linux-2.6.16.i686-netlabel_06132006/security/selinux/xfrm.c
--- linux-2.6.16.i686/security/selinux/xfrm.c	2006-06-13 10:46:59.000000000 -0400
+++ linux-2.6.16.i686-netlabel_06132006/security/selinux/xfrm.c	2006-06-13 11:20:00.000000000 -0400
@@ -295,13 +295,13 @@ u32 selinux_socket_getpeer_dgram(struct 
 /*
  * LSM hook that controls access to unlabelled packets.  If
  * a xfrm_state is authorizable (defined by macro) then it was
- * already authorized by the IPSec process.  If not, then
- * we need to check for unlabelled access since this may not have
- * gone thru the IPSec process.
+ * already authorized by the IPsec process.  Return zero when the
+ * packet has been approved by the IPsec process, negative values
+ * otherwise.
  */
 int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
 {
-	int i, rc = 0;
+	int i;
 	struct sec_path *sp;
 
 	sp = skb->sp;
@@ -317,21 +317,11 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_s
 			struct xfrm_state *x = sp->xvec[i];
 
 			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+				return 0;
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
-
-accept:
-	return 0;
-
-drop:
-	return rc;
+	return -ENOMSG;
 }
 
 /*

--------------060702020000000708020100--



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2282
retrieving revision 1.2282.2.1
diff -u -r1.2282 -r1.2282.2.1
--- kernel-2.6.spec	14 Jun 2006 12:11:06 -0000	1.2282
+++ kernel-2.6.spec	14 Jun 2006 21:08:59 -0000	1.2282.2.1
@@ -9,10 +9,10 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 0
 
 # Versions of various parts
@@ -27,7 +27,8 @@
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define tag %([ -r branch ] && cat branch |sed s/RHEL-5/EL/ | sed s/FC-6/FC6/ || echo FC6)
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+%define rhbsys  .lspp.36
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag%{rhbsys}
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage
@@ -446,6 +447,12 @@
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
 
+# Audit & lspp patches
+Patch20100: linux-2.6-audit-git.patch
+Patch20101: linux-2.6-audit-pending.patch
+Patch20102: capabilities-over-netlink-in-permissive-mode.patch
+Patch20103: linux-2.6-net-label.patch
+
 
 # END OF PATCH DEFINITIONS
 
@@ -1071,11 +1078,22 @@
 
 cp -f %{all_arch_configs} .
 
+# Audit patches
+%patch20100 -p1
+%patch20101 -p1
+%patch20102 -p1
+#%patch20103 -p1
+
 
 # now run oldconfig over all the config files
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_INOTIFY_USER=y" >> .config
+  echo "CONFIG_NETLABEL=y" >> .config
+  echo "CONFIG_NETLABEL_CIPSOV4=y" >> .config
+  echo "CONFIG_NETLABEL_UNLABELED=y" >> .config
+  echo "CONFIG_NETLABEL_UNLABELED_DEFAULT=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
@@ -1674,6 +1692,9 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.36
+
 * Wed Jun 14 2006 Juan Quintela <quintela at redhat.com>
 - remove xen0/xenU/xen0-PAE/xenU-PAE packages
 - disable xen PAE kernel for i386 for now



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:28:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:28:31 -0400
Subject: rpms/libvte-java/devel .cvsignore, 1.3, 1.4 libvte-java.spec, 1.16,
	1.17 sources, 1.3, 1.4
Message-ID: <200606142128.k5ELSVw3005689@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5661

Modified Files:
	.cvsignore libvte-java.spec sources 
Log Message:
Version 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Mar 2006 21:58:40 -0000	1.3
+++ .cvsignore	14 Jun 2006 21:28:28 -0000	1.4
@@ -1,2 +1 @@
-libvte-java-0.11.11.tar.gz
-libvte-java-0.11.11.0.20060301.rh1.tar.gz
+libvte-java-0.12.0.tar.bz2


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libvte-java.spec	13 Jun 2006 03:39:50 -0000	1.16
+++ libvte-java.spec	14 Jun 2006 21:28:28 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
-Version:   0.11.11.0.20060301.rh1
-Release:   4
+Version:   0.12.0
+Release:   0
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL
@@ -10,20 +10,16 @@
 
 
 Requires: 	/sbin/ldconfig
-Requires: 	glib-java >= 0.2.3.0.20060301.rh1
-Requires:	libgtk-java >= 2.8.3.0.20060301.rh1
-Requires:	vte >= 0.11.10
-Requires:       libgnomeui
-Requires:       libgnomecanvas
-BuildRequires:  java-devel >= 1.4.2, glib-java-devel >= 0.2
-BuildRequires:	libgtk-java-devel >= 2.8.0
-BuildRequires:  gcc-java >= 3.3.3, docbook-utils, vte-devel >= 0.11.10
+Requires: 	glib-java >= 0.2.4
+Requires:	libgtk-java >= 2.8.4
+Requires:	vte >= 0.12.1
+BuildRequires:  java-devel >= 1.4.2, glib-java-devel >= 0.2.4
+BuildRequires:	libgtk-java-devel >= 2.8.4
+BuildRequires:  gcc-java >= 4.1.1, docbook-utils, vte-devel >= 0.12.1
 BuildRequires: 	pkgconfig
-BuildRequires:  libgnomeui-devel
-BuildRequires:  libgnomecanvas-devel
 
 # libgtk-java is/was broken on s390x so we have to avoid it
-ExcludeArch:	s390x
+#ExcludeArch:	s390x
 %description 
 libvte-java is a Java wrapper library for the GNOME VTE library. Allowing access
 to the terminal widget from Java.
@@ -102,6 +98,12 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-0
+- New version.
+- Remove libgnomeui{,-devel} and libgnomecanvas{,-devel}; upstream have
+  removed them from configure.ac.
+- Try to build on s390x again.
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 0.11.11.0.20060301.rh1-4
 - Change mod time of all java source files for the src zip.
 - Add libgnomeui{,-devel} and libgnomecanvas{,-devel}.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2006 21:58:40 -0000	1.3
+++ sources	14 Jun 2006 21:28:28 -0000	1.4
@@ -1 +1 @@
-69c84e4c712c2fcd7e5c4ea4dbe70c6c  libvte-java-0.11.11.0.20060301.rh1.tar.gz
+e5e5e63bb2615a3df3fa38d80616b005  libvte-java-0.12.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:39:02 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.17,1.18
Message-ID: <200606142139.k5ELd2Yj007225@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7164

Modified Files:
	libvte-java.spec 
Log Message:
Oops, the tar is bzipped.


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libvte-java.spec	14 Jun 2006 21:28:28 -0000	1.17
+++ libvte-java.spec	14 Jun 2006 21:38:48 -0000	1.18
@@ -3,7 +3,7 @@
 Version:   0.12.0
 Release:   0
 URL:       http://java-gnome.sourceforge.net
-Source0:   %{name}-%{version}.tar.gz
+Source0:   %{name}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/libvte-java



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:39:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:39:47 -0400
Subject: rpms/nss/devel nss.spec,1.11,1.12
Message-ID: <200606142139.k5ELdleo007380@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7305

Modified Files:
	nss.spec 
Log Message:
Enable Elliptic Curve Cryptography (ECC)



Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nss.spec	26 May 2006 23:28:21 -0000	1.11
+++ nss.spec	14 Jun 2006 21:39:44 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.1
-Release:          1
+Release:          2
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -102,6 +102,9 @@
 export USE_64
 %endif
 
+NSS_ENABLE_ECC=1
+export NSS_ENABLE_ECC
+
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
 %{__make} -C ./mozilla/security/nss 
@@ -308,6 +311,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Kai Engert <kengert at redhat.com> - 3.11.1-2
+- Enable Elliptic Curve Cryptography (ECC)
+
 * Fri May 26 2006 Kai Engert <kengert at redhat.com> - 3.11.1-1
 - Update to 3.11.1
 - Include upstream patch to limit curves



From fedora-cvs-commits at redhat.com  Wed Jun 14 21:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 17:55:48 -0400
Subject: rpms/libgtk-java/devel .cvsignore, 1.18, 1.19 libgtk-java.spec, 1.55,
	1.56 sources, 1.18,
	1.19 libgtk-java-cellrendererproperties.patch, 1.2,
	NONE libgtk-java-treemodelsortfunctions.patch, 1.1,
	NONE libgtk-java-treerowreference.patch, 1.2, NONE
Message-ID: <200606142155.k5ELtm36027031@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27003

Modified Files:
	.cvsignore libgtk-java.spec sources 
Removed Files:
	libgtk-java-cellrendererproperties.patch 
	libgtk-java-treemodelsortfunctions.patch 
	libgtk-java-treerowreference.patch 
Log Message:
version 2.8.5


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	28 Apr 2006 21:18:53 -0000	1.18
+++ .cvsignore	14 Jun 2006 21:55:45 -0000	1.19
@@ -1 +1 @@
-libgtk-java-2.8.4.tar.gz
+libgtk-java-2.8.5.tar.gz


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libgtk-java.spec	13 Jun 2006 18:10:12 -0000	1.55
+++ libgtk-java.spec	14 Jun 2006 21:55:45 -0000	1.56
@@ -12,8 +12,8 @@
 
 
 %define	name_base 	libgtk-java
-%define	version		2.8.4
-%define release 	4
+%define	version		2.8.5
+%define release 	0
 
 
 Summary:	Java bindings for GTK+
@@ -25,10 +25,6 @@
 URL:		http://java-gnome.sourceforge.net
 Source:		%{name_base}-%{version}.tar.gz
 
-Patch1:		libgtk-java-treerowreference.patch
-Patch2:		libgtk-java-treemodelsortfunctions.patch
-Patch3:		libgtk-java-cellrendererproperties.patch
-
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
@@ -37,8 +33,7 @@
 BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.3
 BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
-BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
-BuildRequires:	autoconf automake libtool
+BuildRequires:  java-devel >= 1.4.2, gcc-java >= 4.1.1, docbook-utils
 
 # ExcludeArch: s390x
 
@@ -59,35 +54,8 @@
 
 %setup -q -n %{name_base}-%{version}
 
-%patch1
-%patch2
-%patch3
-
-# Patch1 added a *.c file, so we have to refresh Makefile.jni.
-find src/jni -name '[a-zA-Z]*.c' ! -name 'gtk_java.c' | sort |
-  while read f ; do
-    : Suppress the long trace.
-    set +x
-    b=`basename $f .c`
-    d=`dirname $f`
-    h=$d/$b.h
-    c=`echo $b | sed -e 's,_,.,g'`
-    cat <<EOF
-jni_gtk_source_files += $f
-$h: src/java/`echo $b | sed -e 's,_,/,g'`.class
-	\$(JAVAH) -o \$@ -classpath \$(CLASSPATH):src/java $c
-$d/$b.lo: $h
-CLEANFILES += $h
-EOF
-done > Makefile.jni
-
 
 %build 
-# Re-run automake, we have changed Makefile.jni:
-aclocal -I %{_datadir}/glib-java/macros
-autoconf
-automake
-
 # if either the C or Java packages has a prefix declared, then we will
 # add /opt/frysk/lib/pkgconfig to the pkgconfig path
 if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
@@ -157,6 +125,12 @@
 
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
+- New version.
+- Remove BuildRequires:	autoconf automake libtool
+- Removed patches for treerowreferences, treemodelsort functions,
+  and cellrenderer properties.
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.8.4-4
 - Change mod time of all java source files for the src zip.
 - Add BuildRequires libtool.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	28 Apr 2006 21:18:53 -0000	1.18
+++ sources	14 Jun 2006 21:55:45 -0000	1.19
@@ -1 +1 @@
-6fc73a343879ba3a13b9a827a67400fb  libgtk-java-2.8.4.tar.gz
+f8a6b4ecf25102f3268d328e1f6ddfa3  libgtk-java-2.8.5.tar.gz


--- libgtk-java-cellrendererproperties.patch DELETED ---


--- libgtk-java-treemodelsortfunctions.patch DELETED ---


--- libgtk-java-treerowreference.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:03:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:03:56 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.26,1.27
Message-ID: <200606142203.k5EM3uKi029096@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29061

Modified Files:
	rgmanager.spec 
Log Message:
Removed requirements on magma & ccs.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rgmanager.spec	13 Jun 2006 19:34:21 -0000	1.26
+++ rgmanager.spec	14 Jun 2006 22:03:38 -0000	1.27
@@ -12,12 +12,12 @@
 
 Name: rgmanager
 Version: 2.0.0
-Release: 0.fc6.3
+Release: 0.fc6.4
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
 Requires: chkconfig initscripts glibc ncurses libxml2 bash grep sed gawk
-Requires: magma ccs
+Requires: cman
 Requires: net-tools mount /sbin/findfs /bin/bash
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -70,7 +70,7 @@
 %config /etc/rc.d/init.d/rgmanager
 
 %changelog
-* Tue Jun 13 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.0
+* Tue Jun 13 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.4
 - Built for fc6
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.44-0.FC5.1.1



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:04:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:04:57 -0400
Subject: rpms/rgmanager/devel Makefile,1.2,1.3
Message-ID: <200606142204.k5EM4vRo029275@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29247

Modified Files:
	Makefile 
Log Message:
Updated Makefile for fc6.


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	21 Dec 2004 21:51:55 -0000	1.2
+++ Makefile	14 Jun 2006 22:04:54 -0000	1.3
@@ -2,7 +2,6 @@
 # $Id$
 NAME := rgmanager
 SPECFILE = $(firstword $(wildcard *.spec))
-BHC_FLAGS = -n
-COLLECTION = dist-fc4
+COLLECTION = dist-fc6
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:12:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:12:00 -0400
Subject: rpms/libglade-java/devel .cvsignore, 1.13, 1.14 libglade-java.spec,
	1.37, 1.38 sources, 1.14, 1.15
Message-ID: <200606142212.k5EMC0Vc030415@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30384

Modified Files:
	.cvsignore libglade-java.spec sources 
Log Message:
Version 2.12.4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 May 2006 18:03:28 -0000	1.13
+++ .cvsignore	14 Jun 2006 22:11:57 -0000	1.14
@@ -1 +1 @@
-libglade-java-2.12.3.tar.gz
+libglade-java-2.12.4.tar.gz


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libglade-java.spec	14 Jun 2006 18:55:24 -0000	1.37
+++ libglade-java.spec	14 Jun 2006 22:11:57 -0000	1.38
@@ -11,8 +11,8 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libglade-java
-%define	version		2.12.3
-%define release 	3
+%define	version		2.12.4
+%define release 	0
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
@@ -26,13 +26,12 @@
 
 Requires:	libglade2 >= 2.5.1
 Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
-Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.1.0.20060301.rh1
+Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.2
 Requires:       libgnomeui >= 2.11.0
 Requires:       libgnomecanvas >= 2.11.0
 BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
-BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.0
-BuildRequires:  libglade2-devel >= 2.5.0, gcc-java >= 3.3.3
-BuildRequires:	java-devel >= 1.4.2
+BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.2
+BuildRequires:  libglade2-devel >= 2.5.1, gcc-java >= 4.1.1
 BuildRequires:	java-devel >= 1.4.2
 BuildRequires:  libgnomeui-devel >= 2.11.0
 BuildRequires:  libgnomecanvas-devel >= 2.11.0 
@@ -124,6 +123,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
+- New version.
+
 * Wed Jun 14 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.3-3
 - Remove date strings from javadocs for multilib compatibility.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	2 May 2006 18:03:28 -0000	1.14
+++ sources	14 Jun 2006 22:11:57 -0000	1.15
@@ -1 +1 @@
-e3211ddd782638c9ddf684947fc54dcb  libglade-java-2.12.3.tar.gz
+e63c7d4efc3caf9af0fb9ad4d2fc32e9  libglade-java-2.12.4.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:15:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:15:29 -0400
Subject: rpms/libgnome-java/devel .cvsignore, 1.12, 1.13 libgnome-java.spec,
	1.33, 1.34 sources, 1.13, 1.14
Message-ID: <200606142215.k5EMFTZt031022@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30994

Modified Files:
	.cvsignore libgnome-java.spec sources 
Log Message:
Version 2.12.3


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	2 May 2006 19:50:39 -0000	1.12
+++ .cvsignore	14 Jun 2006 22:15:23 -0000	1.13
@@ -1 +1 @@
-libgnome-java-2.12.2.tar.gz
+libgnome-java-2.12.3.tar.gz


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgnome-java.spec	24 May 2006 13:58:33 -0000	1.33
+++ libgnome-java.spec	14 Jun 2006 22:15:23 -0000	1.34
@@ -11,8 +11,8 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libgnome-java
-%define	version		2.12.2
-%define release 	2
+%define	version		2.12.3
+%define release 	0
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
@@ -30,7 +30,7 @@
 Requires: 	glib-java >= 0.2.4
 BuildRequires:	libgnomeui-devel >= 2.11.0
 BuildRequires:	libgnomecanvas-devel >= 2.11.0
-BuildRequires:	gcc-java >= 3.3.3, docbook-utils
+BuildRequires:	gcc-java >= 4.1.1, docbook-utils
 BuildRequires:	libgtk-java-devel >= 2.8.4, java-devel >= 1.4.2
 BuildRequires:	glib-java-devel >= 0.2.4
 
@@ -112,6 +112,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
+- New version.
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.2-2
 - Change mod time of all java source files for the src zip.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 May 2006 19:50:39 -0000	1.13
+++ sources	14 Jun 2006 22:15:23 -0000	1.14
@@ -1 +1 @@
-f8b9f11bb30277855d1ec03ea2beeb55  libgnome-java-2.12.2.tar.gz
+3308b2ca4e509c693b93dcc57c287ebf  libgnome-java-2.12.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:21:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:21:47 -0400
Subject: rpms/kdebase/FC-4 post-3.5.0-kdebase-kdm.diff, NONE,
	1.1 kdebase.spec, 1.120, 1.121
Message-ID: <200606142221.k5EMLlWV013924@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13222

Modified Files:
	kdebase.spec 
Added Files:
	post-3.5.0-kdebase-kdm.diff 
Log Message:
- apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
  thanks to KDE security team


post-3.5.0-kdebase-kdm.diff:
 client.c |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE post-3.5.0-kdebase-kdm.diff ---
Index: kdm/backend/client.c
===================================================================
--- kdm/backend/client.c	(revision 547560)
+++ kdm/backend/client.c	(working copy)
@@ -1537,16 +1542,6 @@ ReadDmrc()
 
 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
 		return GE_Error;
-	if ((curdmrc = iniLoad( fname ))) {
-		free( fname );
-		return GE_Ok;
-	}
-
-	if (errno != EACCES) {
-		free( fname );
-		return GE_NoFile;
-	}
-
 	if (pipe( pfd ))
 		return GE_Error;
 	if ((pid = Fork()) < 0) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kdebase.spec	6 Jun 2006 19:44:10 -0000	1.120
+++ kdebase.spec	14 Jun 2006 22:21:44 -0000	1.121
@@ -21,7 +21,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 0.1.fc4
+Release: 0.2.fc4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -56,6 +56,10 @@
 Patch16: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch17: kdebase-3.5.2-kconf_update-klipper.patch
 
+# security fixes
+# Patch 100, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
+Patch100: post-3.3.0-kdebase-kdm.diff
+
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -139,6 +143,9 @@
 %patch16 -p1 -b .pam_krb5-bz#191049
 %patch17 -p1 -b .klipper
 
+# security fixes
+%patch100 -p0 -b .CVE-2006-2449
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -410,6 +417,10 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Thu Jun 15 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc4
+- apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
+  thanks to KDE security team
+
 * Tue Jun 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:22:56 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.277, 1.278 anaconda.spec, 1.401,
	1.402 sources, 1.398, 1.399
Message-ID: <200606142222.k5EMMu2t014711@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14672/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.39-1 on branch devel from anaconda-11.1.0.39-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- .cvsignore	14 Jun 2006 19:04:45 -0000	1.277
+++ .cvsignore	14 Jun 2006 22:22:39 -0000	1.278
@@ -1 +1 @@
-anaconda-11.1.0.38.tar.bz2
+anaconda-11.1.0.39.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- anaconda.spec	14 Jun 2006 19:04:45 -0000	1.401
+++ anaconda.spec	14 Jun 2006 22:22:39 -0000	1.402
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.38
+Version: 11.1.0.39
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.39-1
+- only select groups which exist
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.38-1
 - and fix ppc boot.iso (pnasrat)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- sources	14 Jun 2006 19:04:45 -0000	1.398
+++ sources	14 Jun 2006 22:22:39 -0000	1.399
@@ -1 +1 @@
-d5d4c234b5bc856bd73add487aea445d  anaconda-11.1.0.38.tar.bz2
+b0bd0fd5085d8e9164a38c1d16e5ddef  anaconda-11.1.0.39.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:32:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:32:42 -0400
Subject: rpms/kdebase/FC-5 post-3.5.0-kdebase-kdm.diff, NONE,
	1.1 kdebase.spec, 1.170, 1.171
Message-ID: <200606142232.k5EMWgnM016721@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16665

Modified Files:
	kdebase.spec 
Added Files:
	post-3.5.0-kdebase-kdm.diff 
Log Message:
- apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
  thanks to KDE security team


post-3.5.0-kdebase-kdm.diff:
 client.c |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE post-3.5.0-kdebase-kdm.diff ---
Index: kdm/backend/client.c
===================================================================
--- kdm/backend/client.c	(revision 547560)
+++ kdm/backend/client.c	(working copy)
@@ -1537,16 +1542,6 @@ ReadDmrc()
 
 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
 		return GE_Error;
-	if ((curdmrc = iniLoad( fname ))) {
-		free( fname );
-		return GE_Ok;
-	}
-
-	if (errno != EACCES) {
-		free( fname );
-		return GE_NoFile;
-	}
-
 	if (pipe( pfd ))
 		return GE_Error;
 	if ((pid = Fork()) < 0) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdebase.spec	8 Jun 2006 18:10:33 -0000	1.170
+++ kdebase.spec	14 Jun 2006 22:32:40 -0000	1.171
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -56,6 +56,10 @@
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 
+# security fixes
+# Patch 100, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
+Patch100: post-3.3.0-kdebase-kdm.diff
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -90,9 +94,7 @@
 BuildPrereq: pam-devel
 BuildPrereq: gettext
 BuildPrereq: perl
-BuildPrereq: automake
 BuildPrereq: openssl-devel
-BuildPrereq: pkgconfig
 BuildPrereq: imake
 BuildPrereq: dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5
@@ -107,6 +109,7 @@
 BuildPrereq: pkgconfig
 BuildPrereq: autoconf
 BuildPrereq: automake
+BuildPrereq: libtool
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
@@ -151,6 +154,9 @@
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 
+# security fixes
+%patch100 -p0 -b .CVE-2006-2449
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -521,6 +527,10 @@
 
 
 %changelog
+* Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5 
+- apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
+  thanks to KDE security team
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:38:36 -0400
Subject: rpms/sysklogd/devel sysklogd.spec,1.36,1.37
Message-ID: <200606142238.k5EMcaXw017892@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17867

Modified Files:
	sysklogd.spec 
Log Message:
add missing Requires 


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sysklogd.spec	14 Jun 2006 21:00:56 -0000	1.36
+++ sysklogd.spec	14 Jun 2006 22:38:34 -0000	1.37
@@ -1,13 +1,15 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 38
+Release: 39
 License: GPL
 Group: System Environment/Daemons
 Source: sysklogd-%{version}rh.tar.gz
 Prereq: fileutils /sbin/chkconfig /etc/init.d
 Conflicts: logrotate < 3.5.2
 Requires: bash >= 2.0
+Requires(post): /sbin/service
+Requires(preun): /sbin/service
 Provides: syslog
 BuildRoot: /var/tmp/syslog-root
 Patch0: sysklogd-1.4.1-siginterrupt.patch
@@ -73,12 +75,12 @@
 	touch $n
 	chmod 600 $n
    done
-   service syslog condrestart > /dev/null 2>&1
+   /sbin/service syslog condrestart > /dev/null 2>&1
 fi
 
 %preun
 if [ $1 = 0 ]; then
-   service syslog stop >/dev/null 2>&1
+   /sbin/service syslog stop >/dev/null 2>&1
    /sbin/chkconfig --del syslog
 fi
 
@@ -99,6 +101,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jun 14 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-39
+- Add Requires(post) and (postun) on /sbin/service (fixes scriptlet errors)
+
 * Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4.1-38
 - fix bug 194494 - move logfile touching back to %postun
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:44:17 -0400
Subject: rpms/kdebase/devel post-3.5.0-kdebase-kdm.diff, NONE,
	1.1 kdebase.spec, 1.187, 1.188
Message-ID: <200606142244.k5EMiHPW019937@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19876

Modified Files:
	kdebase.spec 
Added Files:
	post-3.5.0-kdebase-kdm.diff 
Log Message:
-  apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
  thanks to KDE security team



post-3.5.0-kdebase-kdm.diff:
 client.c |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE post-3.5.0-kdebase-kdm.diff ---
Index: kdm/backend/client.c
===================================================================
--- kdm/backend/client.c	(revision 547560)
+++ kdm/backend/client.c	(working copy)
@@ -1537,16 +1542,6 @@ ReadDmrc()
 
 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
 		return GE_Error;
-	if ((curdmrc = iniLoad( fname ))) {
-		free( fname );
-		return GE_Ok;
-	}
-
-	if (errno != EACCES) {
-		free( fname );
-		return GE_NoFile;
-	}
-
 	if (pipe( pfd ))
 		return GE_Error;
 	if ((pid = Fork()) < 0) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- kdebase.spec	9 Jun 2006 23:19:58 -0000	1.187
+++ kdebase.spec	14 Jun 2006 22:44:14 -0000	1.188
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 5
+Release: 6
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -63,6 +63,10 @@
 Patch102: kdebase-3.5.3-kscreensaver.patch
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
 
+# Security fixes
+# Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
+Patch300: post-3.3.0-kdebase-kdm.diff
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -84,11 +88,7 @@
 Requires: redhat-artwork >= 0.92
 %endif
 
-BuildPrereq: qt-devel >= %{qt_version}
 BuildPrereq: kdelibs-devel >= %{kde_version}
-%if %{arts}
-BuildPrereq: arts-devel >= %{arts_epoch}:%{arts_version}
-%endif
 BuildPrereq: libxml2-devel >= 2.6.5
 BuildPrereq: openmotif-devel
 BuildPrereq: cdparanoia-libs
@@ -96,10 +96,6 @@
 BuildPrereq: samba >= 2.2.3a-5
 BuildPrereq: pam-devel
 BuildPrereq: gettext
-BuildPrereq: perl
-BuildPrereq: automake
-BuildPrereq: openssl-devel
-BuildPrereq: pkgconfig
 BuildPrereq: imake
 BuildPrereq: dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5
@@ -161,6 +157,10 @@
 %patch102 -p1 -b .kscreensaver
 %patch103 -p1 -b .kxkb-kcmlayout
 
+# security fixes
+%patch300 -p0 -b .CVE-2006-2449
+
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -386,6 +386,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING README
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/ksysguarddrc
 /etc/kde
@@ -532,6 +533,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-6 
+- apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
+  thanks to KDE security team
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - add several upstream patches
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:50:33 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.3-kfind-largefile.patch, NONE,
	1.1 kdebase-3.5.3-kicker-panel.patch, NONE,
	1.1 kdebase-3.5.3-kscreensaver.patch, NONE,
	1.1 kdebase-3.5.3-kxkb-kcmlayout.patch, NONE, 1.1 kdebase.spec,
	1.171, 1.172
Message-ID: <200606142250.k5EMoXWm004537@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4381

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kfind-largefile.patch 
	kdebase-3.5.3-kicker-panel.patch 
	kdebase-3.5.3-kscreensaver.patch 
	kdebase-3.5.3-kxkb-kcmlayout.patch 
Log Message:
add some upstream patches


kdebase-3.5.3-kfind-largefile.patch:
 kftabdlg.cpp |   49 ++++++++++++++++++++++++-------------------------
 kquery.cpp   |   31 +++++++++++++++++++++++--------
 kquery.h     |    7 ++++---
 3 files changed, 51 insertions(+), 36 deletions(-)

--- NEW FILE kdebase-3.5.3-kfind-largefile.patch ---
--- kdebase-3.5.3/kfind/kftabdlg.cpp.me	2006-06-10 01:00:47.000000000 +0200
+++ kdebase-3.5.3/kfind/kftabdlg.cpp	2006-06-10 01:01:31.000000000 +0200
@@ -183,6 +183,7 @@
     sizeUnitBox ->insertItem( i18n("Bytes") );
     sizeUnitBox ->insertItem( i18n("KB") );
     sizeUnitBox ->insertItem( i18n("MB") );
+    sizeUnitBox ->insertItem( i18n("GB") );
     sizeUnitBox ->setCurrentItem(1);
 
     int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
@@ -574,7 +575,8 @@
 
 void KfindTabWidget::setQuery(KQuery *query)
 {
-	int size;
+  KIO::filesize_t size;
+  KIO::filesize_t sizeunit;
   bool itemAlreadyContained(false);
   // only start if we have valid dates
   if (!isDateValid()) return;
@@ -603,17 +605,25 @@
   switch (sizeUnitBox->currentItem())
   {
      case 0:
-         size = 1; //one byte
-			break;
+         sizeunit = 1; //one byte
+         break;
      case 2:
-         size = 1048576; //1M
-			break;
-		case 1:
-		default:
-			size=1024; //1k
-			break;
-  }
-  size = sizeEdit->value() * size;
+         sizeunit = 1048576; //1M
+         break;
+     case 3:
+         sizeunit = 1073741824; //1GB
+         break;
+     case 1: //fall to default case
+     default:
+         sizeunit = 1024; //1k
+         break;
+  }
+  size = sizeEdit->value() * sizeunit;
+
+// TODO: troeder: do we need this check since it is very unlikely-
+// to exceed ULLONG_MAX with INT_MAX * 1024^3.-
+// Or is there an arch where this can happen?
+#if 0
   if (size < 0)  // overflow
      if (KMessageBox::warningYesNo(this, i18n("Size is too big. Set maximum size value?"), i18n("Error"),i18n("Set"),i18n("Do Not Set"))
            == KMessageBox::Yes)
@@ -624,21 +634,10 @@
 		}
      else
         return;
+#endif
 
-  switch (sizeBox->currentItem())
-  {
-    case 1:
-      query->setSizeRange(size, -1);
-      break;
-    case 2:
-      query->setSizeRange(-1, size);
-      break;
-    case 3:
-      query->setSizeRange(size,size);
-      break;
-    default:
-      query->setSizeRange(-1, -1);
-  }
+  // set range mode and size value
+  query->setSizeRange(sizeBox->currentItem(),size,0);
 
   // dates
   QDateTime epoch;
--- kdebase-3.5.3/kfind/kquery.h.me	2006-06-10 01:01:11.000000000 +0200
+++ kdebase-3.5.3/kfind/kquery.h	2006-06-10 01:01:51.000000000 +0200
@@ -23,7 +23,7 @@
   KQuery(QObject *parent = 0, const char * name = 0);
   ~KQuery();
 
-  void setSizeRange( int min, int max );
+  void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 );
   void setTimeRange( time_t from, time_t to );
   void setRegExp( const QString &regexp, bool caseSensitive );
   void setRecursive( bool recursive );
@@ -65,8 +65,9 @@
   void checkEntries();
 
   int m_filetype;
-  int m_minsize;
-  int m_maxsize;
+  int m_sizemode;
+  KIO::filesize_t m_sizeboundary1;
+  KIO::filesize_t m_sizeboundary2;
   KURL m_url;
   time_t m_timeFrom;
   time_t m_timeTo;
--- kdebase-3.5.3/kfind/kquery.cpp.me	2006-06-10 01:01:00.000000000 +0200
+++ kdebase-3.5.3/kfind/kquery.cpp	2006-06-10 01:01:50.000000000 +0200
@@ -14,7 +14,7 @@
 
 KQuery::KQuery(QObject *parent, const char * name)
   : QObject(parent, name),
-    m_minsize(-1), m_maxsize(-1),
+    m_sizemode(0), m_sizeboundary1(0), m_sizeboundary2(0),
     m_timeFrom(0), m_timeTo(0),
     job(0), m_insideCheckEntries(false), m_result(0)
 {
@@ -178,10 +178,24 @@
     if (!matched)
       return;
 
-    // make sure the files are in the correct range
-    if (  ( m_minsize >= 0 && (int)file->size() < m_minsize ) ||
-          ( m_maxsize >= 0 && (int)file->size() > m_maxsize ) )
-      return;
+    switch( m_sizemode )
+    {
+        case 1: // "at least"
+            if ( file->size() < m_sizeboundary1 ) return;
+            break;
+        case 2: // "at most"
+            if ( file->size() > m_sizeboundary1 ) return;
+            break;
+        case 3: // "equal"
+            if ( file->size() != m_sizeboundary1 ) return;
+            break;
+        case 4: // "between"
+            if ( (file->size() < m_sizeboundary1) || (file->size() > m_sizeboundary2) ) return;
+            break;
+        case 0: // "none" -> fall to default
+        default:
+            break;
+    }
 
     // make sure it's in the correct date range
     // what about 0 times?
@@ -403,10 +417,11 @@
   m_filetype = filetype;
 }
 
-void KQuery::setSizeRange(int min, int max)
+void KQuery::setSizeRange(int mode, KIO::filesize_t value1, KIO::filesize_t value2)
 {
-  m_minsize = min;
-  m_maxsize = max;
+  m_sizemode = mode;
+  m_sizeboundary1 = value1;
+  m_sizeboundary2 = value2;
 }
 
 void KQuery::setTimeRange(time_t from, time_t to)

kdebase-3.5.3-kicker-panel.patch:
 panelbutton.cpp |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.3-kicker-panel.patch ---
--- kdebase-3.5.3/kicker/libkicker/panelbutton.cpp.orig	2006-06-10 00:46:06.000000000 +0200
+++ kdebase-3.5.3/kicker/libkicker/panelbutton.cpp	2006-06-10 00:46:21.000000000 +0200
@@ -631,7 +631,8 @@
     if (m_drawArrow && (m_highlight || active))
     {
         QStyle::PrimitiveElement e = QStyle::PE_ArrowUp;
-        QRect r(width() / 2 - 4, 0, 8, 8);
+        int arrowSize = style().pixelMetric(QStyle::PM_MenuButtonIndicator);
+        QRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
 
         switch (m_arrowDirection)
         {
@@ -640,27 +641,31 @@
                 break;
             case KPanelExtension::Bottom:
                 e = QStyle::PE_ArrowDown;
-                r.moveBy(0, height() - 8);
+                r.moveBy(0, height() - arrowSize);
                 break;
             case KPanelExtension::Right:
                 e = QStyle::PE_ArrowRight;
-                r.moveBy(width() - 8 , 0);
+                r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Left:
                 e = QStyle::PE_ArrowLeft;
+                r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Floating:
                 if (orientation() == Horizontal)
                 {
                     e = QStyle::PE_ArrowDown;
+                    r.moveBy(0, height() - arrowSize);
                 }
                 else if (QApplication::reverseLayout())
                 {
                     e = QStyle::PE_ArrowLeft;
+                    r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 }
                 else
                 {
                     e = QStyle::PE_ArrowRight;
+                    r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
                 }
                 break;
         }

kdebase-3.5.3-kscreensaver.patch:
 lockeng.cc   |   12 ++++++++----
 xautolock.cc |   11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-3.5.3-kscreensaver.patch ---
--- kdebase-3.5.3/kdesktop/lockeng.cc.orig	2006-06-10 00:11:36.000000000 +0200
+++ kdebase-3.5.3/kdesktop/lockeng.cc	2006-06-10 00:13:41.000000000 +0200
@@ -42,9 +42,6 @@
     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
                     &mXBlanking, &mXExposures);
 
-    // We'll handle blanking
-    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
-
     mState = Waiting;
     mXAutoLock = 0;
     mEnabled = false;
@@ -158,6 +155,9 @@
         mXAutoLock->setDPMS(mDPMS);
 	//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
 
+        // We'll handle blanking 
+        XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
+
         mXAutoLock->start();
 
         kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl;
@@ -170,6 +170,7 @@
 	    mXAutoLock = 0;
 	}
 
+	XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
         kdDebug(1204) << "Saver Engine disabled" << endl;
     }
 
@@ -291,7 +292,6 @@
     kdDebug(1204) << "SaverEngine: stopping lock" << endl;
     emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
 
-
     mLockProcess.kill();
 
     if (mXAutoLock)
@@ -300,6 +300,7 @@
     }
     processLockTransactions();
     mState = Waiting;
+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
 }
 
 void SaverEngine::lockProcessExited()
@@ -314,6 +315,7 @@
     }
     processLockTransactions();
     mState = Waiting;
+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
 }
 
 //---------------------------------------------------------------------------
@@ -322,6 +324,8 @@
 //
 void SaverEngine::idleTimeout()
 {
+    // disable X screensaver
+    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
     startLockProcess( DefaultLock );
 }
 
--- kdebase-3.5.3/kdesktop/xautolock.cc.orig	2006-06-10 00:11:55.000000000 +0200
+++ kdebase-3.5.3/kdesktop/xautolock.cc	2006-06-10 00:13:59.000000000 +0200
@@ -192,6 +192,7 @@
 
     bool activate = false;
 
+    kdDebug() << now << " " << mTrigger << endl;
     if (now >= mTrigger)
     {
         resetTrigger();
@@ -202,6 +203,8 @@
     BOOL on;
     CARD16 state;
     DPMSInfo( qt_xdisplay(), &state, &on );
+
+    kdDebug() << "DPMSInfo " << state << " " << on << endl;
     // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time
     // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
     // saving is active, simply always activate our saving too, otherwise
@@ -217,9 +220,11 @@
 #ifdef HAVE_XSCREENSAVER
     static XScreenSaverInfo* mitInfo = 0;
     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
-    XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo);
-    if (mitInfo->state == ScreenSaverDisabled)
-	activate = false;
+    if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) {
+        kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl;
+        if (mitInfo->state == ScreenSaverDisabled)
+	    activate = false;
+    }
 #endif
 
     if(mActive && activate)

kdebase-3.5.3-kxkb-kcmlayout.patch:
 kcmlayout.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdebase-3.5.3-kxkb-kcmlayout.patch ---
--- kdebase-3.5.3/kxkb/kcmlayout.cpp.orig	2006-06-10 00:53:38.000000000 +0200
+++ kdebase-3.5.3/kxkb/kcmlayout.cpp	2006-06-10 00:54:08.000000000 +0200
@@ -186,6 +186,7 @@
 	widget->comboModel->setCurrentText(i18n(modelName));
 
 	QValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts;
+	widget->listLayoutsDst->clear();
 // to optimize we should have gone from it.end to it.begin
 	QValueList<LayoutUnit>::ConstIterator it;
 	for (it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kdebase.spec	14 Jun 2006 22:32:40 -0000	1.171
+++ kdebase.spec	14 Jun 2006 22:50:31 -0000	1.172
@@ -25,7 +25,7 @@
 Url: http://www.kde.org
 Group: User Interface/Desktops
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: konsole.desktop
@@ -56,9 +56,15 @@
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 
+# upstream patches
+Patch100: kdebase-3.5.3-kfind-largefile.patch
+Patch101: kdebase-3.5.3-kicker-panel.patch
+Patch102: kdebase-3.5.3-kscreensaver.patch
+Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
+
 # security fixes
-# Patch 100, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch100: post-3.3.0-kdebase-kdm.diff
+# Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
+Patch300: post-3.3.0-kdebase-kdm.diff
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -81,11 +87,7 @@
 Requires: redhat-artwork >= 0.92
 %endif
 
-BuildPrereq: qt-devel >= %{qt_version}
 BuildPrereq: kdelibs-devel >= %{kde_version}
-%if %{arts}
-BuildPrereq: arts-devel >= %{arts_epoch}:%{arts_version}
-%endif
 BuildPrereq: libxml2-devel >= 2.6.5
 BuildPrereq: openmotif-devel
 BuildPrereq: cdparanoia-libs
@@ -93,8 +95,6 @@
 BuildPrereq: samba >= 2.2.3a-5
 BuildPrereq: pam-devel
 BuildPrereq: gettext
-BuildPrereq: perl
-BuildPrereq: openssl-devel
 BuildPrereq: imake
 BuildPrereq: dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5
@@ -106,10 +106,6 @@
 BuildPrereq: libXcomposite-devel
 BuildPrereq: libXrender-devel
 BuildPrereq: libXfixes-devel
-BuildPrereq: pkgconfig
-BuildPrereq: autoconf
-BuildPrereq: automake
-BuildPrereq: libtool
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
@@ -154,8 +150,14 @@
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 
+# upstream patches
+%patch100 -p1 -b .kfind-largefile
+%patch101 -p1 -b .kicker-panel
+%patch102 -p1 -b .kscreensaver
+%patch103 -p1 -b .kxkb-kcmlayout
+
 # security fixes
-%patch100 -p0 -b .CVE-2006-2449
+%patch300 -p0 -b .CVE-2006-2449
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -380,6 +382,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING README
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/ksysguarddrc
 /etc/kde



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:50:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:50:56 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2286,1.2287
Message-ID: <200606142250.k5EMouFi004732@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4667

Modified Files:
	kernel-2.6.spec 
Log Message:
dont build 586 on rhel



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2286
retrieving revision 1.2287
diff -u -r1.2286 -r1.2287
--- kernel-2.6.spec	14 Jun 2006 20:47:45 -0000	1.2286
+++ kernel-2.6.spec	14 Jun 2006 22:50:50 -0000	1.2287
@@ -38,7 +38,11 @@
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
 # groups of related archs
+%if %{rhelbuild}
+%define all_x86 i686
+%else
 %define all_x86 i586 i686
+%endif
 
 # Override generic defaults with per-arch defaults
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:55:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:55:06 -0400
Subject: rpms/kdebase/FC-4 kdebase-3.5.3-kfind-largefile.patch, NONE,
	1.1 kdebase-3.5.3-kicker-panel.patch, NONE,
	1.1 kdebase-3.5.3-kscreensaver.patch, NONE,
	1.1 kdebase-3.5.3-kxkb-kcmlayout.patch, NONE, 1.1 kdebase.spec,
	1.121, 1.122
Message-ID: <200606142255.k5EMt6Hj006372@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6278

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kfind-largefile.patch 
	kdebase-3.5.3-kicker-panel.patch 
	kdebase-3.5.3-kscreensaver.patch 
	kdebase-3.5.3-kxkb-kcmlayout.patch 
Log Message:
add some upstream patches


kdebase-3.5.3-kfind-largefile.patch:
 kftabdlg.cpp |   49 ++++++++++++++++++++++++-------------------------
 kquery.cpp   |   31 +++++++++++++++++++++++--------
 kquery.h     |    7 ++++---
 3 files changed, 51 insertions(+), 36 deletions(-)

--- NEW FILE kdebase-3.5.3-kfind-largefile.patch ---
--- kdebase-3.5.3/kfind/kftabdlg.cpp.me	2006-06-10 01:00:47.000000000 +0200
+++ kdebase-3.5.3/kfind/kftabdlg.cpp	2006-06-10 01:01:31.000000000 +0200
@@ -183,6 +183,7 @@
     sizeUnitBox ->insertItem( i18n("Bytes") );
     sizeUnitBox ->insertItem( i18n("KB") );
     sizeUnitBox ->insertItem( i18n("MB") );
+    sizeUnitBox ->insertItem( i18n("GB") );
     sizeUnitBox ->setCurrentItem(1);
 
     int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
@@ -574,7 +575,8 @@
 
 void KfindTabWidget::setQuery(KQuery *query)
 {
-	int size;
+  KIO::filesize_t size;
+  KIO::filesize_t sizeunit;
   bool itemAlreadyContained(false);
   // only start if we have valid dates
   if (!isDateValid()) return;
@@ -603,17 +605,25 @@
   switch (sizeUnitBox->currentItem())
   {
      case 0:
-         size = 1; //one byte
-			break;
+         sizeunit = 1; //one byte
+         break;
      case 2:
-         size = 1048576; //1M
-			break;
-		case 1:
-		default:
-			size=1024; //1k
-			break;
-  }
-  size = sizeEdit->value() * size;
+         sizeunit = 1048576; //1M
+         break;
+     case 3:
+         sizeunit = 1073741824; //1GB
+         break;
+     case 1: //fall to default case
+     default:
+         sizeunit = 1024; //1k
+         break;
+  }
+  size = sizeEdit->value() * sizeunit;
+
+// TODO: troeder: do we need this check since it is very unlikely-
+// to exceed ULLONG_MAX with INT_MAX * 1024^3.-
+// Or is there an arch where this can happen?
+#if 0
   if (size < 0)  // overflow
      if (KMessageBox::warningYesNo(this, i18n("Size is too big. Set maximum size value?"), i18n("Error"),i18n("Set"),i18n("Do Not Set"))
            == KMessageBox::Yes)
@@ -624,21 +634,10 @@
 		}
      else
         return;
+#endif
 
-  switch (sizeBox->currentItem())
-  {
-    case 1:
-      query->setSizeRange(size, -1);
-      break;
-    case 2:
-      query->setSizeRange(-1, size);
-      break;
-    case 3:
-      query->setSizeRange(size,size);
-      break;
-    default:
-      query->setSizeRange(-1, -1);
-  }
+  // set range mode and size value
+  query->setSizeRange(sizeBox->currentItem(),size,0);
 
   // dates
   QDateTime epoch;
--- kdebase-3.5.3/kfind/kquery.h.me	2006-06-10 01:01:11.000000000 +0200
+++ kdebase-3.5.3/kfind/kquery.h	2006-06-10 01:01:51.000000000 +0200
@@ -23,7 +23,7 @@
   KQuery(QObject *parent = 0, const char * name = 0);
   ~KQuery();
 
-  void setSizeRange( int min, int max );
+  void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 );
   void setTimeRange( time_t from, time_t to );
   void setRegExp( const QString &regexp, bool caseSensitive );
   void setRecursive( bool recursive );
@@ -65,8 +65,9 @@
   void checkEntries();
 
   int m_filetype;
-  int m_minsize;
-  int m_maxsize;
+  int m_sizemode;
+  KIO::filesize_t m_sizeboundary1;
+  KIO::filesize_t m_sizeboundary2;
   KURL m_url;
   time_t m_timeFrom;
   time_t m_timeTo;
--- kdebase-3.5.3/kfind/kquery.cpp.me	2006-06-10 01:01:00.000000000 +0200
+++ kdebase-3.5.3/kfind/kquery.cpp	2006-06-10 01:01:50.000000000 +0200
@@ -14,7 +14,7 @@
 
 KQuery::KQuery(QObject *parent, const char * name)
   : QObject(parent, name),
-    m_minsize(-1), m_maxsize(-1),
+    m_sizemode(0), m_sizeboundary1(0), m_sizeboundary2(0),
     m_timeFrom(0), m_timeTo(0),
     job(0), m_insideCheckEntries(false), m_result(0)
 {
@@ -178,10 +178,24 @@
     if (!matched)
       return;
 
-    // make sure the files are in the correct range
-    if (  ( m_minsize >= 0 && (int)file->size() < m_minsize ) ||
-          ( m_maxsize >= 0 && (int)file->size() > m_maxsize ) )
-      return;
+    switch( m_sizemode )
+    {
+        case 1: // "at least"
+            if ( file->size() < m_sizeboundary1 ) return;
+            break;
+        case 2: // "at most"
+            if ( file->size() > m_sizeboundary1 ) return;
+            break;
+        case 3: // "equal"
+            if ( file->size() != m_sizeboundary1 ) return;
+            break;
+        case 4: // "between"
+            if ( (file->size() < m_sizeboundary1) || (file->size() > m_sizeboundary2) ) return;
+            break;
+        case 0: // "none" -> fall to default
+        default:
+            break;
+    }
 
     // make sure it's in the correct date range
     // what about 0 times?
@@ -403,10 +417,11 @@
   m_filetype = filetype;
 }
 
-void KQuery::setSizeRange(int min, int max)
+void KQuery::setSizeRange(int mode, KIO::filesize_t value1, KIO::filesize_t value2)
 {
-  m_minsize = min;
-  m_maxsize = max;
+  m_sizemode = mode;
+  m_sizeboundary1 = value1;
+  m_sizeboundary2 = value2;
 }
 
 void KQuery::setTimeRange(time_t from, time_t to)

kdebase-3.5.3-kicker-panel.patch:
 panelbutton.cpp |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.3-kicker-panel.patch ---
--- kdebase-3.5.3/kicker/libkicker/panelbutton.cpp.orig	2006-06-10 00:46:06.000000000 +0200
+++ kdebase-3.5.3/kicker/libkicker/panelbutton.cpp	2006-06-10 00:46:21.000000000 +0200
@@ -631,7 +631,8 @@
     if (m_drawArrow && (m_highlight || active))
     {
         QStyle::PrimitiveElement e = QStyle::PE_ArrowUp;
-        QRect r(width() / 2 - 4, 0, 8, 8);
+        int arrowSize = style().pixelMetric(QStyle::PM_MenuButtonIndicator);
+        QRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
 
         switch (m_arrowDirection)
         {
@@ -640,27 +641,31 @@
                 break;
             case KPanelExtension::Bottom:
                 e = QStyle::PE_ArrowDown;
-                r.moveBy(0, height() - 8);
+                r.moveBy(0, height() - arrowSize);
                 break;
             case KPanelExtension::Right:
                 e = QStyle::PE_ArrowRight;
-                r.moveBy(width() - 8 , 0);
+                r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Left:
                 e = QStyle::PE_ArrowLeft;
+                r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Floating:
                 if (orientation() == Horizontal)
                 {
                     e = QStyle::PE_ArrowDown;
+                    r.moveBy(0, height() - arrowSize);
                 }
                 else if (QApplication::reverseLayout())
                 {
                     e = QStyle::PE_ArrowLeft;
+                    r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 }
                 else
                 {
                     e = QStyle::PE_ArrowRight;
+                    r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
                 }
                 break;
         }

kdebase-3.5.3-kscreensaver.patch:
 lockeng.cc   |   12 ++++++++----
 xautolock.cc |   11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-3.5.3-kscreensaver.patch ---
--- kdebase-3.5.3/kdesktop/lockeng.cc.orig	2006-06-10 00:11:36.000000000 +0200
+++ kdebase-3.5.3/kdesktop/lockeng.cc	2006-06-10 00:13:41.000000000 +0200
@@ -42,9 +42,6 @@
     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
                     &mXBlanking, &mXExposures);
 
-    // We'll handle blanking
-    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
-
     mState = Waiting;
     mXAutoLock = 0;
     mEnabled = false;
@@ -158,6 +155,9 @@
         mXAutoLock->setDPMS(mDPMS);
 	//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
 
+        // We'll handle blanking 
+        XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
+
         mXAutoLock->start();
 
         kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl;
@@ -170,6 +170,7 @@
 	    mXAutoLock = 0;
 	}
 
+	XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
         kdDebug(1204) << "Saver Engine disabled" << endl;
     }
 
@@ -291,7 +292,6 @@
     kdDebug(1204) << "SaverEngine: stopping lock" << endl;
     emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
 
-
     mLockProcess.kill();
 
     if (mXAutoLock)
@@ -300,6 +300,7 @@
     }
     processLockTransactions();
     mState = Waiting;
+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
 }
 
 void SaverEngine::lockProcessExited()
@@ -314,6 +315,7 @@
     }
     processLockTransactions();
     mState = Waiting;
+    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
 }
 
 //---------------------------------------------------------------------------
@@ -322,6 +324,8 @@
 //
 void SaverEngine::idleTimeout()
 {
+    // disable X screensaver
+    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
     startLockProcess( DefaultLock );
 }
 
--- kdebase-3.5.3/kdesktop/xautolock.cc.orig	2006-06-10 00:11:55.000000000 +0200
+++ kdebase-3.5.3/kdesktop/xautolock.cc	2006-06-10 00:13:59.000000000 +0200
@@ -192,6 +192,7 @@
 
     bool activate = false;
 
+    kdDebug() << now << " " << mTrigger << endl;
     if (now >= mTrigger)
     {
         resetTrigger();
@@ -202,6 +203,8 @@
     BOOL on;
     CARD16 state;
     DPMSInfo( qt_xdisplay(), &state, &on );
+
+    kdDebug() << "DPMSInfo " << state << " " << on << endl;
     // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time
     // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
     // saving is active, simply always activate our saving too, otherwise
@@ -217,9 +220,11 @@
 #ifdef HAVE_XSCREENSAVER
     static XScreenSaverInfo* mitInfo = 0;
     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
-    XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo);
-    if (mitInfo->state == ScreenSaverDisabled)
-	activate = false;
+    if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) {
+        kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl;
+        if (mitInfo->state == ScreenSaverDisabled)
+	    activate = false;
+    }
 #endif
 
     if(mActive && activate)

kdebase-3.5.3-kxkb-kcmlayout.patch:
 kcmlayout.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdebase-3.5.3-kxkb-kcmlayout.patch ---
--- kdebase-3.5.3/kxkb/kcmlayout.cpp.orig	2006-06-10 00:53:38.000000000 +0200
+++ kdebase-3.5.3/kxkb/kcmlayout.cpp	2006-06-10 00:54:08.000000000 +0200
@@ -186,6 +186,7 @@
 	widget->comboModel->setCurrentText(i18n(modelName));
 
 	QValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts;
+	widget->listLayoutsDst->clear();
 // to optimize we should have gone from it.end to it.begin
 	QValueList<LayoutUnit>::ConstIterator it;
 	for (it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdebase.spec	14 Jun 2006 22:21:44 -0000	1.121
+++ kdebase.spec	14 Jun 2006 22:55:04 -0000	1.122
@@ -56,9 +56,15 @@
 Patch16: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch17: kdebase-3.5.2-kconf_update-klipper.patch
 
+# upstream patches
+Patch100: kdebase-3.5.3-kfind-largefile.patch
+Patch101: kdebase-3.5.3-kicker-panel.patch
+Patch102: kdebase-3.5.3-kscreensaver.patch
+Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
+
 # security fixes
-# Patch 100, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch100: post-3.3.0-kdebase-kdm.diff
+# Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
+Patch300: post-3.3.0-kdebase-kdm.diff
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
@@ -143,8 +149,14 @@
 %patch16 -p1 -b .pam_krb5-bz#191049
 %patch17 -p1 -b .klipper
 
+# upstream patches
+%patch100 -p1 -b .kfind-largefile
+%patch101 -p1 -b .kicker-panel
+%patch102 -p1 -b .kscreensaver
+%patch103 -p1 -b .kxkb-kcmlayout
+
 # security fixes
-%patch100 -p0 -b .CVE-2006-2449
+%patch300 -p0 -b .CVE-2006-2449
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -358,6 +370,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING README
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/ksysguarddrc
 /etc/kde



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:57:41 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.172,1.173
Message-ID: <200606142257.k5EMvfnV007482@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7341

Modified Files:
	kdebase.spec 
Log Message:
correct patch



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kdebase.spec	14 Jun 2006 22:50:31 -0000	1.172
+++ kdebase.spec	14 Jun 2006 22:57:39 -0000	1.173
@@ -64,7 +64,7 @@
 
 # security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch300: post-3.3.0-kdebase-kdm.diff
+Patch300: post-3.5.0-kdebase-kdm.diff
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:58:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:58:19 -0400
Subject: rpms/kdebase/FC-4 kdebase.spec,1.122,1.123
Message-ID: <200606142258.k5EMwJxn007772@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7711

Modified Files:
	kdebase.spec 
Log Message:
correct patch



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdebase.spec	14 Jun 2006 22:55:04 -0000	1.122
+++ kdebase.spec	14 Jun 2006 22:58:16 -0000	1.123
@@ -64,7 +64,7 @@
 
 # security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch300: post-3.3.0-kdebase-kdm.diff
+Patch300: post-3.5.0-kdebase-kdm.diff
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:58:58 -0400
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.57,1.58
Message-ID: <200606142258.k5EMwvZo008076@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8048

Modified Files:
	desktop-printing.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 0.19-10
- rebuilt with new gnutls



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- desktop-printing.spec	9 Jun 2006 02:54:01 -0000	1.57
+++ desktop-printing.spec	14 Jun 2006 22:58:55 -0000	1.58
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 9
+Release: 10
 License: GPL
 Group: Applications/File
 # total lie
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 0.19-10
+- rebuilt with new gnutls
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.19-9
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jun 14 22:59:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 18:59:16 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.188,1.189
Message-ID: <200606142259.k5EMxGLU008199@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8136

Modified Files:
	kdebase.spec 
Log Message:
correct patch



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kdebase.spec	14 Jun 2006 22:44:14 -0000	1.188
+++ kdebase.spec	14 Jun 2006 22:59:13 -0000	1.189
@@ -65,7 +65,7 @@
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch300: post-3.3.0-kdebase-kdm.diff
+Patch300: post-3.5.0-kdebase-kdm.diff
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5



From fedora-cvs-commits at redhat.com  Wed Jun 14 23:03:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 19:03:44 -0400
Subject: rpms/xorg-x11-drv-nv/devel nv-1.1.1-nv34-tweaks.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.16, 1.17
Message-ID: <200606142303.k5EN3i5D008987@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8948

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-1.1.1-nv34-tweaks.patch 
Log Message:
- Fix the panel tweak for a Toshiba laptop.


nv-1.1.1-nv34-tweaks.patch:
 nv_dac.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE nv-1.1.1-nv34-tweaks.patch ---
--- xf86-video-nv-1.1.1/src/nv_dac.c.nv34-tweak	2006-06-14 14:26:46.000000000 -0400
+++ xf86-video-nv-1.1.1/src/nv_dac.c	2006-06-14 14:38:20.000000000 -0400
@@ -60,8 +60,14 @@
           we can do is experiment and apply hacks. */
 
        if(((pNv->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) {
-          /* At least one NV34 laptop needs this workaround. */
-          tweak = -1;
+          if (((pNv->PciInfo->subsysVendor & 0xffff) == 0x1179) &&
+              ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020)) {
+             /* Toshiba Tecra M2 */
+             tweak = 1;
+          } else {
+             /* At least one NV34 laptop needs this workaround. */
+             tweak = -1;
+          }
        }
 
        if((pNv->Chipset & 0xfff0) == 0x0310) {


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nv.spec	10 Jun 2006 08:01:50 -0000	1.16
+++ xorg-x11-drv-nv.spec	14 Jun 2006 23:03:31 -0000	1.17
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.1.1
-Release:   4
+Release:   5
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -22,12 +22,16 @@
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
+Patch0:    nv-1.1.1-nv34-tweaks.patch
+
 %description 
 X.Org X11 nv video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .nv34-tweak
+
 %build
 %configure --disable-static
 make
@@ -58,6 +62,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Jun 14 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-5
+- Fix the panel tweak for a Toshiba laptop.
+
 * Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-4
 - Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
   this specific chip ID, the fallback code appears to work in bug #(186343)



From fedora-cvs-commits at redhat.com  Wed Jun 14 23:14:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 19:14:28 -0400
Subject: rpms/frysk/devel frysk.spec, 1.37,
	1.38 frysk-Makefile-rules-noxmltest.patch, 1.1,
	NONE frysk-makefileam.patch, 1.1, NONE
Message-ID: <200606142314.k5ENEShY010739@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10704

Modified Files:
	frysk.spec 
Removed Files:
	frysk-Makefile-rules-noxmltest.patch frysk-makefileam.patch 
Log Message:
Version 0.0.1.2006.06.14


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- frysk.spec	18 May 2006 12:01:21 -0000	1.37
+++ frysk.spec	14 Jun 2006 23:14:25 -0000	1.38
@@ -1,29 +1,29 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.02.19.rh2
-Release:	0.FC5.3
+Version:	0.0.1.2006.06.14.rh1
+Release:	0
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
-Patch1:		frysk-Makefile-rules-noxmltest.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libgtk-java >= 2.8.3.0.20060301.rh1
-Requires:   	libglade-java >= 2.12.2.0.20060301.rh1
-Requires: 	libvte-java >= 0.11.11.0.20060301.rh1
+Requires:	libgtk-java >= 2.8.4
+Requires:   	libglade-java >= 2.12.3
+Requires: 	libvte-java >= 0.12.0
 BuildRequires:	junit >= 3.8.1
 BuildRequires:  antlr >= 2.7.4 
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	jdom >= 1.0
-BuildRequires:  libgtk-java-devel >= 2.8.3.0.20060301.rh1
-BuildRequires:	libglade-java-devel >= 2.12.2.0.20060301.rh1
-BuildRequires:  cairo-java-devel >= 1.0.2.0.20060301.rh1
+BuildRequires:  libgtk-java-devel >= 2.8.4
+BuildRequires:	libglade-java-devel >= 2.12.3
+BuildRequires:  cairo-java-devel >= 1.0.3
 BuildRequires:  cairo-devel >= 1.0.0
 BuildRequires:  gtk2-devel >= 2.8.0
-BuildRequires:	libvte-java-devel >= 0.11.11.0.20060301.rh1
-BuildRequires:  vte-devel >= 0.11.11
+BuildRequires:	libglade2-devel >= 2.5.1
+BuildRequires:	libvte-java-devel >= 0.12.0
+BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
 BuildRequires:  gmime
 
@@ -41,8 +41,7 @@
 %prep
 
 %setup -q -n %{name}-%{version}
-%patch1 -p0 -b .noxmltest
-./autogen.sh
+./bootstrap.sh
 
 %build 
 
@@ -60,6 +59,10 @@
 
 %configure
 
+# Build system can end up with corrupt xmllint files:
+touch frysk-gui/glade.catalog
+touch frysk-gui/glade.checked
+
 make %{?_smp_mflags}
 
 %install
@@ -94,6 +97,12 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
+- New upstream version.
+- Add BuildRequires: libglade2-devel >= 2.5.1
+- Refresh other BuildRequires.
+- Replace the noxmltest.patch patch by two touch commands.
+
 * Thu May 18 2006 Stepan Kasal <skasal at redhat.com>    - 0.0.1.2006.02.19.rh2-0.FC5.3
 - Add gmime to BuildRequires.
 


--- frysk-Makefile-rules-noxmltest.patch DELETED ---


--- frysk-makefileam.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 14 23:17:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 19:17:27 -0400
Subject: rpms/frysk/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <200606142317.k5ENHRW6026494@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26470

Modified Files:
	.cvsignore sources 
Log Message:
Version 0.0.1.2006.06.14.rh1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Mar 2006 21:14:47 -0000	1.11
+++ .cvsignore	14 Jun 2006 23:17:24 -0000	1.12
@@ -1 +1,2 @@
 frysk-0.0.1.2006.02.19.rh2.tar.bz2
+frysk-0.0.1.2006.06.14.rh1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Mar 2006 21:14:47 -0000	1.11
+++ sources	14 Jun 2006 23:17:24 -0000	1.12
@@ -1 +1,2 @@
 01dba74491b570ebbbfa7cc41ba9fe06  frysk-0.0.1.2006.02.19.rh2.tar.bz2
+e744c9fdc6f614069c262c0b9ab86737  frysk-0.0.1.2006.06.14.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 14 23:45:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 19:45:08 -0400
Subject: rpms/evolution/devel evolution.spec,1.152,1.153
Message-ID: <200606142345.k5ENj8Uf001526@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1486

Modified Files:
	evolution.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.7.3-2
- rebuilt with new gnutls



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- evolution.spec	14 Jun 2006 12:24:23 -0000	1.152
+++ evolution.spec	14 Jun 2006 23:45:06 -0000	1.153
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -658,6 +658,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.7.3-2
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Matthias Clasen  <mclasen at redhat.com> - 2.7.3-1
 - Update to 2.7.3
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 00:01:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 20:01:20 -0400
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.25,1.26
Message-ID: <200606150001.k5F01KQH030239@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/evolution-webcal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30196

Modified Files:
	evolution-webcal.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.7.1-4
- rebuilt with new gnutls



Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- evolution-webcal.spec	8 Jun 2006 17:18:41 -0000	1.25
+++ evolution-webcal.spec	15 Jun 2006 00:01:18 -0000	1.26
@@ -6,7 +6,7 @@
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.7.1
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.7.1-4
+- rebuilt with new gnutls
+
 * Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 2.7.1-3
 - Add missing BR perl-XML-Parser, gettext
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 00:06:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 20:06:33 -0400
Subject: rpms/frysk/devel frysk.spec,1.38,1.39
Message-ID: <200606150006.k5F06Xds030306@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30293

Modified Files:
	frysk.spec 
Log Message:
Add BuildRequires: autoconf automake


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- frysk.spec	14 Jun 2006 23:14:25 -0000	1.38
+++ frysk.spec	15 Jun 2006 00:06:31 -0000	1.39
@@ -26,6 +26,7 @@
 BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
 BuildRequires:  gmime
+BuildRequires:  autoconf automake
 
 # We can only build on i386 for now
 ExclusiveArch: %{ix86} x86_64
@@ -102,6 +103,7 @@
 - Add BuildRequires: libglade2-devel >= 2.5.1
 - Refresh other BuildRequires.
 - Replace the noxmltest.patch patch by two touch commands.
+- Add BuildRequires: autoconf automake
 
 * Thu May 18 2006 Stepan Kasal <skasal at redhat.com>    - 0.0.1.2006.02.19.rh2-0.FC5.3
 - Add gmime to BuildRequires.



From fedora-cvs-commits at redhat.com  Thu Jun 15 00:07:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 20:07:29 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.53,1.54
Message-ID: <200606150007.k5F07SOQ030355@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30342

Modified Files:
	bug-buddy.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.15.0-2
- rebuilt with new gnutls



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- bug-buddy.spec	13 Jun 2006 18:53:06 -0000	1.53
+++ bug-buddy.spec	15 Jun 2006 00:07:26 -0000	1.54
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.15.0
-Release: 1
+Release: 2
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -109,6 +109,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.15.0-2
+- rebuilt with new gnutls
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
 - Update to 2.15.0
 - Add more BuildRequires



From fedora-cvs-commits at redhat.com  Thu Jun 15 00:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 20:19:41 -0400
Subject: rpms/firefox/FC-5 firefox.spec,1.115,1.116
Message-ID: <200606150019.k5F0JfDZ012746@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/firefox/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12733

Modified Files:
	firefox.spec 
Log Message:
Force "gmake -j1" on ppc ppc64 s390 s390x



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- firefox.spec	12 Jun 2006 22:12:45 -0000	1.115
+++ firefox.spec	15 Jun 2006 00:19:39 -0000	1.116
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.4
-Release:        1.1.fc5
+Release:        1.2.fc5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -135,7 +135,14 @@
 %build
 
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
-MAKE="gmake %{?_smp_mflags}" make -f client.mk build
+
+%ifarch ppc ppc64 s390 s390x
+%define moz_make_flags -j1
+%else
+%define moz_make_flags %{?_smp_mflags}
+%endif
+
+MAKE="gmake %{moz_make_flags}" make -f client.mk build
 
 #---------------------------------------------------------------------
 
@@ -264,6 +271,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jun 14 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.2.fc5
+- Force "gmake -j1" on ppc ppc64 s390 s390x
+
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.1.fc5
 - Firefox 1.5.0.4
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 00:21:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 20:21:08 -0400
Subject: rpms/frysk/devel frysk.spec,1.39,1.40
Message-ID: <200606150021.k5F0L8ha012814@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12801

Modified Files:
	frysk.spec 
Log Message:
Add BuildRequires: gcc-java >= 4.1.1


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- frysk.spec	15 Jun 2006 00:06:31 -0000	1.39
+++ frysk.spec	15 Jun 2006 00:21:05 -0000	1.40
@@ -27,6 +27,7 @@
 BuildRequires:  xmlto
 BuildRequires:  gmime
 BuildRequires:  autoconf automake
+BuildRequires:  gcc-java >= 4.1.1
 
 # We can only build on i386 for now
 ExclusiveArch: %{ix86} x86_64
@@ -103,7 +104,7 @@
 - Add BuildRequires: libglade2-devel >= 2.5.1
 - Refresh other BuildRequires.
 - Replace the noxmltest.patch patch by two touch commands.
-- Add BuildRequires: autoconf automake
+- Add BuildRequires: autoconf automake, BuildRequires: gcc-java >= 4.1.1
 
 * Thu May 18 2006 Stepan Kasal <skasal at redhat.com>    - 0.0.1.2006.02.19.rh2-0.FC5.3
 - Add gmime to BuildRequires.



From fedora-cvs-commits at redhat.com  Thu Jun 15 01:11:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 21:11:48 -0400
Subject: rpms/control-center/devel control-center.spec,1.145,1.146
Message-ID: <200606150111.k5F1BmW9013268@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13245

Modified Files:
	control-center.spec 
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com>
- rebuilt with new gnutls
- require gstreamer-devel



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- control-center.spec	14 Jun 2006 15:11:42 -0000	1.145
+++ control-center.spec	15 Jun 2006 01:11:36 -0000	1.146
@@ -86,7 +86,7 @@
 BuildRequires: libxkbfile-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gnome-doc-utils
-BuildRequires: gstreamer
+BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base
 BuildRequires: libglade2-devel
 BuildRequires: libxml2-devel
@@ -258,6 +258,10 @@
 %{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com>
+- rebuilt with new gnutls
+- require gstreamer-devel
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
 - Work around a gstreamer problem
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 01:32:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 21:32:10 -0400
Subject: rpms/rhythmbox/devel rhythmbox-0.9.4.1-ncb.patch, NONE,
	1.1 rhythmbox.spec, 1.64, 1.65
Message-ID: <200606150132.k5F1WAFc001175@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1086

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.4.1-ncb.patch 
Log Message:
Add patches from gnome cvs that port rb to new nautilus-cd-burner API


rhythmbox-0.9.4.1-ncb.patch:
 metadata/sj-metadata-musicbrainz.c    |   55 ++++--
 player/rb-recorder-gst.c              |  279 ++++++++++++++++++++++++++--------
 shell/main.c                          |   19 ++
 shell/rb-removable-media-manager.c    |  114 +++++++++----
 sources/rb-playlist-source-recorder.c |   52 ++++--
 5 files changed, 386 insertions(+), 133 deletions(-)

--- NEW FILE rhythmbox-0.9.4.1-ncb.patch ---
===================================================================
RCS file: /cvs/gnome/rhythmbox/metadata/sj-metadata-musicbrainz.c,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -r1.3 -r1.6
--- rhythmbox/metadata/sj-metadata-musicbrainz.c	2006/03/05 05:27:16	1.3
+++ rhythmbox/metadata/sj-metadata-musicbrainz.c	2006/05/30 13:47:15	1.6
@@ -14,11 +14,14 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301  USA.
  */
 
+#include "config.h"
+
 #include <string.h>
+#include <stdio.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <glib/gerror.h>
@@ -29,17 +32,22 @@
 #include <gconf/gconf-client.h>
 #include <musicbrainz/queries.h>
 #include <musicbrainz/mb_c.h>
-#include <nautilus-burn-drive.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <nautilus-burn-drive.h>
+#ifndef NAUTILUS_BURN_CHECK_VERSION 	 
+#define NAUTILUS_BURN_CHECK_VERSION(a,b,c) FALSE 	 
+#endif
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+#include <nautilus-burn.h>
+#endif
+
 #include "sj-metadata-musicbrainz.h"
 #include "sj-structures.h"
 #include "sj-error.h"
 
-#define GCONF_MUSICBRAINZ_SERVER "/apps/sound-juicer" "/musicbrainz_server"
-
 struct SjMetadataMusicbrainzPrivate {
   GError *construct_error;
   musicbrainz_t mb;
@@ -58,6 +66,7 @@
 static void mb_list_albums (SjMetadata *metadata, GError **error);
 static char *mb_get_submit_url (SjMetadata *metadata);
 
+#define GCONF_MUSICBRAINZ_SERVER "/apps/sound-juicer/musicbrainz_server"
 #define GCONF_PROXY_USE_PROXY "/system/http_proxy/use_http_proxy"
 #define GCONF_PROXY_HOST "/system/http_proxy/host"
 #define GCONF_PROXY_PORT "/system/http_proxy/port"
@@ -130,9 +139,7 @@
 
   g_object_unref (gconf_client);
 
-  //mb_SetDepth (self->priv->mb, 1);
-
-  if (g_getenv("MUSICBRAINZ_DEBUG")) {
+  if (g_getenv ("MUSICBRAINZ_DEBUG")) {
     mb_SetDebug (self->priv->mb, TRUE);
   }
 }
@@ -420,12 +427,13 @@
 {
   SjMetadataMusicbrainzPrivate *priv;
   char data[256];
-  char *cdindex, *cachepath;
+  char *cdindex = NULL, *cachepath = NULL;
 
   g_assert (metadata != NULL);
 
   priv = SJ_METADATA_MUSICBRAINZ (metadata)->priv;
 
+#if WITH_CACHE
   /* Get the Table of Contents */
   if (!mb_Query (priv->mb, MBQ_GetCDTOC)) {
     mb_GetQueryError (priv->mb, data, sizeof (data));
@@ -442,9 +450,13 @@
   cdindex = g_strdup (data);
 
   cachepath = g_build_filename (g_get_home_dir (), ".gnome2", "sound-juicer", "cache", cdindex, NULL);
-  
+#endif
+
   if (!get_cached_rdf (priv->mb, cachepath)) {
-    if (!mb_QueryWithArgs (priv->mb, MBQ_GetCDInfoFromCDIndexId, (char*[]) {cdindex, NULL})) {
+    /* Don't re-use the CD Index as that doesn't send enough data to the server.
+       By doing this we also pass track lengths, which can be proxied to FreeDB
+       if required. */
+    if (!mb_Query (priv->mb, MBQ_GetCDInfo)) {
       mb_GetQueryError (priv->mb, data, sizeof (data));
       g_print (_("This CD could not be queried: %s\n"), data);
       goto done;
@@ -467,6 +479,9 @@
   char data[256];
   int num_albums, i, j;
   NautilusBurnMediaType type;
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+  NautilusBurnDrive *drive;
+#endif
 
   /* TODO: fire error signal */
   g_return_val_if_fail (metadata != NULL, NULL);
@@ -475,7 +490,18 @@
   g_return_val_if_fail (priv->cdrom != NULL, NULL);
   priv->error = NULL; /* TODO: hack */
 
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+  drive = nautilus_burn_drive_monitor_get_drive_for_device (nautilus_burn_get_drive_monitor (),
+                                                            priv->cdrom);
+  if (drive == NULL) {
+    return NULL;
+  }
+  type = nautilus_burn_drive_get_media_type (drive);
+  nautilus_burn_drive_unref (drive);
+#else
   type = nautilus_burn_drive_get_media_type_from_path (priv->cdrom);
+#endif
+
   if (type == NAUTILUS_BURN_MEDIA_TYPE_ERROR) {
     char *msg;
     SjError err;
@@ -521,7 +547,6 @@
       album->artist_id = g_strdup (data);
       if (g_ascii_strncasecmp (MBI_VARIOUS_ARTIST_ID, data, 64) == 0) {
         album->artist = g_strdup (_("Various"));
-        album->artist_sortname = g_strdup (album->artist);
       } else {
         if (data && mb_GetResultData1(priv->mb, MBE_AlbumGetArtistName, data, sizeof (data), 1)) {
           album->artist = g_strdup (data);
@@ -530,8 +555,6 @@
         }
         if (data && mb_GetResultData1(priv->mb, MBE_AlbumGetArtistSortName, data, sizeof (data), 1)) {
           album->artist_sortname = g_strdup (data);
-        } else {
-          album->artist_sortname = g_strdup (album->artist);
         }
       }
     }
@@ -614,7 +637,7 @@
 
     albums = g_list_append (albums, album);
 
-    mb_Select (priv->mb, MBS_Back);
+    mb_Select (priv->mb, MBS_Rewind);
   }
 
   /* For each album, we need to insert the duration data if necessary
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/rb-playlist-source-recorder.c,v
retrieving revision 1.25
retrieving revision 1.32
diff -u -r1.25 -r1.32
--- rhythmbox/sources/rb-playlist-source-recorder.c	2006/03/21 08:34:49	1.25
+++ rhythmbox/sources/rb-playlist-source-recorder.c	2006/06/07 06:24:53	1.32
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
  *  arch-tag: Implementation of playlist source recorder object
  *
  *  Copyright (C) 2002 Jorn Baayen <jorn at nl.linux.org>
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  */
 
@@ -38,6 +38,14 @@
 #include <nautilus-burn-drive.h>
 #include <nautilus-burn-drive-selection.h>
 
+#ifndef NAUTILUS_BURN_CHECK_VERSION 	 
+#define NAUTILUS_BURN_CHECK_VERSION(a,b,c) FALSE 	 
+#endif
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+#include <nautilus-burn.h>
+#endif
+
 #include "rb-file-helpers.h"
 #include "rb-glade-helpers.h"
 #include "rb-preferences.h"
@@ -297,8 +305,9 @@
 
 
         default_speed = eel_gconf_get_integer (CONF_STATE_BURN_SPEED);
-        default_speed_index = 0;
+        default_speed_index = -1;
 
+        i = 0;
         if (drive) {
                 const int *write_speeds;
 
@@ -306,7 +315,11 @@
 
                 for (i = 0; write_speeds [i] > 0; i++) {
 
+#ifdef NAUTILUS_BURN_DRIVE_CD_SPEED
+                        name = g_strdup_printf ("%d \303\227", NAUTILUS_BURN_DRIVE_CD_SPEED (write_speeds [i]));
+#else
                         name = g_strdup_printf ("%d \303\227", write_speeds [i]);
+#endif
 
                         if (write_speeds [i] == default_speed) {
                                 default_speed_index = i + 1;
@@ -320,8 +333,14 @@
                         g_free (name);
                 }
 
-                /* Disable speed if no items in list */
-                gtk_widget_set_sensitive (combobox, i > 0);
+        }
+
+        /* Disable speed if no items in list */
+        gtk_widget_set_sensitive (combobox, i > 0);
+
+        /* if the default speed was not set then make it the minimum for safety */
+        if (default_speed_index == -1) {
+                default_speed_index = i;
         }
 
         /* for now assume equivalence between index in comboxbox and speed */
@@ -612,9 +631,6 @@
         res = rb_recorder_burn (source->priv->recorder, speed, error);
         source->priv->burning = FALSE;
 
-        if (error && *error)
-                return RB_RECORDER_RESULT_ERROR;
-
         if (res == RB_RECORDER_RESULT_FINISHED) {
                 NautilusBurnDrive *drive;
                 gboolean           do_another;
@@ -639,6 +655,8 @@
                         return res;
                 }
                 set_message_text (source, _("Finished creating audio CD.\nCreate another copy?"));
+        } else if (res == RB_RECORDER_RESULT_ERROR) {
+                set_message_text (source, _("Writing failed.  Try again?"));  
         } else {
                 set_message_text (source, _("Writing cancelled.  Try again?"));  
         }
@@ -658,7 +676,7 @@
         char *desc = NULL;
 
         if (song->artist && song->title)
-                desc = g_strdup_printf ("%s - %s", song->artist, song->title);
+                desc = g_strdup_printf ("%s - %s", song->title, song->artist);
         else if (song->title)
                 desc = g_strdup (song->title);
         else if (song->artist)
@@ -701,8 +719,9 @@
 burn_cd_idle (RBPlaylistSourceRecorder *source)
 {
         GError *error = NULL;
+        int     res;
 
-        burn_cd (source, &error);
+        res = burn_cd (source, &error);
         if (error) {
                 error_dialog (source,
                               _("Audio recording error"),
@@ -866,12 +885,13 @@
 
         /* Act only on response IDs we recognize */
         if (!(response_id == GTK_RESPONSE_ACCEPT
-              || response_id == GTK_RESPONSE_CANCEL)) {
+              || response_id == GTK_RESPONSE_CANCEL
+	      || response_id == GTK_RESPONSE_DELETE_EVENT)) {
                 g_signal_stop_emission_by_name (dialog, "response");
                 return;
         }
 
-        if (response_id == GTK_RESPONSE_CANCEL) {
+        if (response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_DELETE_EVENT) {
                 if (source->priv->burning
                     && !source->priv->confirmed_exit) {
                         GtkWidget *interrupt_dialog;
@@ -1035,7 +1055,13 @@
         char                 *msg;
         NautilusBurnDrive    *drive;
 
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+        drive = nautilus_burn_drive_monitor_get_drive_for_device (nautilus_burn_get_drive_monitor (),
+                                                                  device);
+#else
         drive = nautilus_burn_drive_new_from_path (device);
+#endif
+
         type = nautilus_burn_drive_get_media_type (drive);
 
         msg = g_strdup_printf (_("This %s appears to have information already recorded on it."),
===================================================================
RCS file: /cvs/gnome/rhythmbox/player/rb-recorder-gst.c,v
retrieving revision 1.20
retrieving revision 1.26
diff -u -r1.20 -r1.26
--- rhythmbox/player/rb-recorder-gst.c	2006/04/09 11:02:16	1.20
+++ rhythmbox/player/rb-recorder-gst.c	2006/06/02 05:58:18	1.26
@@ -1,8 +1,8 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
  * arch-tag: Implementation of GStreamer recorder backend
  *
- * Copyright (C) 2004-2005 William Jon McCann <mccann at jhu.edu>
+ * Copyright (C) 2004-2006 William Jon McCann <mccann at jhu.edu>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -16,11 +16,12 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301  USA.
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
@@ -32,13 +33,22 @@
 
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <nautilus-burn-recorder.h>
 #include <gst/gst.h>
 #ifdef HAVE_GSTREAMER_0_8
 #include <gst/gconf/gconf.h>
 #include <gst/play/play.h>
 #endif
 
+#include <nautilus-burn-drive.h>
+#include <nautilus-burn-recorder.h>
+#ifndef NAUTILUS_BURN_CHECK_VERSION 	 
+#define NAUTILUS_BURN_CHECK_VERSION(a,b,c) FALSE 	 
+#endif
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+#include <nautilus-burn.h>
+#endif
+
 #include "rb-recorder.h"
 
 #include "rb-debug.h"
@@ -123,8 +133,9 @@
 rb_recorder_error_quark (void)
 {
         static GQuark quark = 0;
-        if (!quark)
+        if (! quark) {
                 quark = g_quark_from_static_string ("rb_recorder_error");
+        }
 
         return quark;
 }
@@ -221,10 +232,17 @@
         NautilusBurnDrive *drive  = NULL;
         GList             *drives = NULL;
 
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+        NautilusBurnDriveMonitor *monitor;
+        monitor = nautilus_burn_get_drive_monitor ();
+        drives = nautilus_burn_drive_monitor_get_recorder_drives (monitor);
+#else
         drives = nautilus_burn_drive_get_list (TRUE, FALSE);
+#endif
 
-        if (drives)
+        if (drives) {
                 drive = nautilus_burn_drive_ref ((NautilusBurnDrive*) drives->data);
+        }
 
         g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL);
         g_list_free (drives);
@@ -264,8 +282,9 @@
 {
         rb_debug ("Freeing rb_recorder pipeline");
 
-        if (recorder->priv->pipeline == NULL)
+        if (recorder->priv->pipeline == NULL) {
                 return;
+        }
 
         if (recorder->priv->tick_timeout_id > 0) {
                 g_source_remove (recorder->priv->tick_timeout_id);
@@ -322,8 +341,9 @@
 
         track->type = NAUTILUS_BURN_RECORDER_TRACK_TYPE_AUDIO;
         track->contents.audio.filename = filename;
-        if (cdtext)
+        if (cdtext) {
                 track->contents.audio.cdtext = g_strdup (cdtext);
+        }
 
         recorder->priv->tracks = g_list_append (recorder->priv->tracks, track);
 
@@ -337,8 +357,9 @@
 {
         rb_debug ("EOS");
 
-        if (recorder->priv->pipeline)
+        if (recorder->priv->pipeline) {
                 gst_element_set_state (recorder->priv->pipeline, GST_STATE_NULL);
+        }
 
         g_signal_emit (G_OBJECT (recorder), rb_recorder_signals [EOS], 0);
 }
@@ -352,8 +373,9 @@
                        signal->error);
 
         /* close if not already closing */
-        if (signal->object->priv->src_uri != NULL)
+        if (signal->object->priv->src_uri != NULL) {
                 rb_recorder_close (signal->object, NULL);
+        }
 
         g_object_unref (signal->object);
         g_error_free (signal->error);
@@ -406,8 +428,9 @@
 		       error);
 
 	/* close if not already closing */
-	if (recorder->priv->src_uri != NULL)
+	if (recorder->priv->src_uri != NULL) {
 		rb_recorder_close (recorder, NULL);
+        }
 
 	g_object_unref (recorder);
 	g_error_free (error);
@@ -470,15 +493,16 @@
 	/* Only link audio. */
 	caps = gst_pad_get_caps (pad);
 	str = gst_caps_get_structure (caps, 0);
-	if (!g_strrstr (gst_structure_get_name (str), "audio")) {
+	if (! g_strrstr (gst_structure_get_name (str), "audio")) {
 		gst_caps_unref (caps);
 		return;
 	}
 
 	gst_caps_unref (caps);
 #ifdef HAVE_GSTREAMER_0_10
-	if (gst_pad_link (pad, audio_pad))
+	if (gst_pad_link (pad, audio_pad)) {
 		recorder->priv->got_audio_pad = TRUE;
+        }
 #endif
 }
 
@@ -509,7 +533,7 @@
          */
 
         recorder->priv->pipeline = gst_pipeline_new ("pipeline");
-        if (!recorder->priv->pipeline) {
+        if (! recorder->priv->pipeline) {
                 g_set_error (error,
                              RB_RECORDER_ERROR,
                              RB_RECORDER_ERROR_GENERAL,
@@ -649,8 +673,10 @@
                                               ext - track->contents.audio.filename);
 
                 if (g_file_test (track->contents.audio.filename, G_FILE_TEST_EXISTS)
-                    && unlink (track->contents.audio.filename) != 0)
+                    && unlink (track->contents.audio.filename) != 0) {
                         g_warning (_("Unable to unlink '%s'"), track->contents.audio.filename);
+                }
+
                 if (lockfile) {
                         /* remove lockfile created by mkstemp */
                         if (unlink (lockfile) != 0)
@@ -670,8 +696,9 @@
 
         rb_recorder_close (recorder, NULL);
 
-        if (recorder->priv->recorder)
+        if (recorder->priv->recorder != NULL) {
                 nautilus_burn_recorder_cancel (recorder->priv->recorder, FALSE);
+        }
 
         g_list_foreach (recorder->priv->tracks,
                         (GFunc)recorder_track_free,
@@ -704,6 +731,7 @@
         return recorder;
 }
 
+#ifdef HAVE_GSTREAMER_0_8
 static gboolean
 tick_timeout_cb (RBRecorder *recorder)
 {
@@ -713,24 +741,13 @@
         double elapsed;
         double secs;
         GstFormat format = GST_FORMAT_BYTES;
-#ifdef HAVE_GSTREAMER_0_10
-	GstState  state;
-#endif
 
         g_return_val_if_fail (recorder != NULL, FALSE);
         g_return_val_if_fail (RB_IS_RECORDER (recorder), FALSE);
         g_return_val_if_fail (recorder->priv != NULL, FALSE);
         g_return_val_if_fail (recorder->priv->pipeline != NULL, FALSE);
 
-#ifdef HAVE_GSTREAMER_0_8
         if (gst_element_get_state (recorder->priv->pipeline) != GST_STATE_PLAYING) {
-#elif HAVE_GSTREAMER_0_10
-	if (!gst_element_get_state (recorder->priv->pipeline, &state,  NULL, 3 * GST_SECOND)) {
-		g_warning (_("Could not retrieve state from processing pipeline"));
-		return TRUE;
-	}
-	if (state != GST_STATE_PLAYING) {		
-#endif
                 recorder->priv->tick_timeout_id = 0;
                 if (recorder->priv->start_timer) {
                         g_timer_destroy (recorder->priv->start_timer);
@@ -739,16 +756,12 @@
                 return FALSE;
         }
 
-#ifdef  HAVE_GSTREAMER_0_8
         if (!gst_pad_query (recorder->priv->src_pad, GST_QUERY_POSITION, &format, &position)) {
                 g_warning (_("Could not get current track position"));
                 return TRUE;
         }
 
         if (!gst_pad_query (recorder->priv->src_pad, GST_QUERY_TOTAL, &format, &total)) {
-#elif HAVE_GSTREAMER_0_10
-		if (!gst_element_query_position (recorder->priv->src, &format, &position) || !gst_element_query_duration (recorder->priv->src, &format, &total)) {
-#endif
                 g_warning (_("Could not get current track position"));
                 return TRUE;
         }
@@ -764,10 +777,11 @@
 
         rate = (double)(position - recorder->priv->start_pos) / elapsed;
 
-        if (rate >= 1)
+        if (rate >= 1) {
                 secs = ceil ((total - position) / rate);
-        else
+        } else {
                 secs = -1;
+        }
 
         if (fraction != recorder->priv->progress) {
                 recorder->priv->progress = fraction;
@@ -777,14 +791,78 @@
                                fraction, (long)secs);
         }
 
-#ifdef HAVE_GSTREAMER_0_8
         /* Extra kick in the pants to keep things moving on a busy system */
         gst_bin_iterate (GST_BIN (recorder->priv->pipeline));
-#endif
 
         return TRUE;
 }
+#elif HAVE_GSTREAMER_0_10
+static gboolean
+tick_timeout_cb (RBRecorder *recorder)
+{
+        gint64 position, total;
+        double fraction;
+        double rate;
+        double elapsed;
+        double secs;
+        GstFormat format = GST_FORMAT_BYTES;
+	GstState  state;
+
+        g_return_val_if_fail (recorder != NULL, FALSE);
+        g_return_val_if_fail (RB_IS_RECORDER (recorder), FALSE);
+        g_return_val_if_fail (recorder->priv != NULL, FALSE);
+        g_return_val_if_fail (recorder->priv->pipeline != NULL, FALSE);
+
+	if (!gst_element_get_state (recorder->priv->pipeline, &state,  NULL, 3 * GST_SECOND)) {
+		g_warning (_("Could not retrieve state from processing pipeline"));
+		return TRUE;
+	}
+
+	if (state != GST_STATE_PLAYING) {		
+                recorder->priv->tick_timeout_id = 0;
+                if (recorder->priv->start_timer) {
+                        g_timer_destroy (recorder->priv->start_timer);
+                        recorder->priv->start_timer = NULL;
+                }
+                return FALSE;
+        }
+
+        if (!gst_element_query_position (recorder->priv->src, &format, &position) || !gst_element_query_duration (recorder->priv->src, &format, &total)) {
+                g_warning (_("Could not get current track position"));
+                return TRUE;
+        }
+
+        if (! recorder->priv->start_timer) {
+                recorder->priv->start_timer = g_timer_new ();
+                recorder->priv->start_pos = position;
+        }
+
+        fraction = (float)position / (float)total;
+
+        elapsed = g_timer_elapsed (recorder->priv->start_timer, NULL);
 
+        rate = (double)(position - recorder->priv->start_pos) / elapsed;
+
+        if (rate >= 1) {
+                secs = ceil ((total - position) / rate);
+        } else {
+                secs = -1;
+        }
+
+        if (fraction != recorder->priv->progress) {
+                recorder->priv->progress = fraction;
+                g_signal_emit (G_OBJECT (recorder),
+                               rb_recorder_signals [TRACK_PROGRESS_CHANGED],
+                               0,
+                               fraction, (long)secs);
+        }
+
+        return TRUE;
+}
+#endif
+
+
+#ifdef HAVE_GSTREAMER_0_8
 static gboolean
 rb_recorder_sync_pipeline (RBRecorder *recorder,
                            GError    **error)
@@ -797,46 +875,32 @@
         rb_debug ("Syncing pipeline");
         if (recorder->priv->playing) {
                 rb_debug ("Playing pipeline");
-#ifdef HAVE_GSTREAMER_0_8
                 if (gst_element_set_state (recorder->priv->pipeline, GST_STATE_PLAYING) == GST_STATE_FAILURE) {
-#elif HAVE_GSTREAMER_0_10
-                if (gst_element_set_state (recorder->priv->pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
-#endif
                         g_set_error (error,
                                      RB_RECORDER_ERROR,
                                      RB_RECORDER_ERROR_GENERAL,
                                      _("Could not start pipeline playing"));
                         return FALSE;
                 }
-#ifdef HAVE_GSTREAMER_0_8
+
                 recorder->priv->idle_id = g_idle_add ((GSourceFunc)gst_bin_iterate,
                                                       GST_BIN (recorder->priv->pipeline));
                 recorder->priv->tick_timeout_id = g_timeout_add (200,
                                                                  (GSourceFunc)tick_timeout_cb,
                                                                  recorder);
-#elif HAVE_GSTREAMER_0_10
-		recorder->priv->tick_timeout_id = 
-			g_timeout_add (200, (GSourceFunc)tick_timeout_cb, recorder);
-#endif
         } else {
                 rb_debug ("Pausing pipeline");
-#ifdef HAVE_GSTREAMER_0_8
                 if (gst_element_set_state (recorder->priv->pipeline, GST_STATE_PAUSED) == GST_STATE_FAILURE) {
-#elif HAVE_GSTREAMER_0_10
-                if (gst_element_set_state (recorder->priv->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
-#endif
                         g_set_error (error,
                                      RB_RECORDER_ERROR,
                                      RB_RECORDER_ERROR_GENERAL,
                                      _("Could not pause playback"));
                         return FALSE;
                 }
-#ifdef HAVE_GSTREAMER_0_8
                 if (recorder->priv->idle_id > 0) {
                         g_source_remove (recorder->priv->idle_id);
                         recorder->priv->idle_id = 0;
                 }
-#endif
                 if (recorder->priv->tick_timeout_id > 0) {
                         g_source_remove (recorder->priv->tick_timeout_id);
                         recorder->priv->tick_timeout_id = 0;
@@ -849,6 +913,51 @@
         return TRUE;
 }
 
+#elif HAVE_GSTREAMER_0_10
+
+static gboolean
+rb_recorder_sync_pipeline (RBRecorder *recorder,
+                           GError    **error)
+{
+        g_return_val_if_fail (recorder != NULL, FALSE);
+        g_return_val_if_fail (RB_IS_RECORDER (recorder), FALSE);
+        g_return_val_if_fail (recorder->priv != NULL, FALSE);
+        g_return_val_if_fail (recorder->priv->pipeline != NULL, FALSE);
+        
+        rb_debug ("Syncing pipeline");
+        if (recorder->priv->playing) {
+                rb_debug ("Playing pipeline");
+                if (gst_element_set_state (recorder->priv->pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
+                        g_set_error (error,
+                                     RB_RECORDER_ERROR,
+                                     RB_RECORDER_ERROR_GENERAL,
+                                     _("Could not start pipeline playing"));
+                        return FALSE;
+                }
+
+		recorder->priv->tick_timeout_id = g_timeout_add (200, (GSourceFunc)tick_timeout_cb, recorder);
+        } else {
+                rb_debug ("Pausing pipeline");
+                if (gst_element_set_state (recorder->priv->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
+                        g_set_error (error,
+                                     RB_RECORDER_ERROR,
+                                     RB_RECORDER_ERROR_GENERAL,
+                                     _("Could not pause playback"));
+                        return FALSE;
+                }
+                if (recorder->priv->tick_timeout_id > 0) {
+                        g_source_remove (recorder->priv->tick_timeout_id);
+                        recorder->priv->tick_timeout_id = 0;
+                        if (recorder->priv->start_timer) {
+                                g_timer_destroy (recorder->priv->start_timer);
+                                recorder->priv->start_timer = NULL;
+                        }
+                }
+        }
+        return TRUE;
+}
+#endif
+
 void
 rb_recorder_close (RBRecorder *recorder,
                    GError    **error)
@@ -868,8 +977,9 @@
         g_free (recorder->priv->dest_file);
         recorder->priv->dest_file = NULL;
 
-        if (recorder->priv->pipeline == NULL)
+        if (recorder->priv->pipeline == NULL) {
                 return;
+        }
 
         rb_recorder_gst_free_pipeline (recorder);
 }
@@ -932,8 +1042,9 @@
         }
 
         rb_recorder_construct (recorder, src_uri, error);
-        if (error && *error)
+        if (error && *error) {
                 return;
+        }
                 
 #ifdef HAVE_GSTREAMER_0_8
         if (recorder->priv->idle_id > 0) {
@@ -963,7 +1074,7 @@
 
         add_track (recorder, cdtext);
 
-        if (!rb_recorder_sync_pipeline (recorder, error)) {
+        if (! rb_recorder_sync_pipeline (recorder, error)) {
                 rb_recorder_close (recorder, NULL);
         }
 }
@@ -998,8 +1109,9 @@
         g_return_if_fail (RB_IS_RECORDER (recorder));
         g_return_if_fail (recorder->priv != NULL);
 
-        if (!recorder->priv->playing)
+        if (! recorder->priv->playing) {
                 return;
+        }
 
         recorder->priv->playing = FALSE;
 
@@ -1008,6 +1120,16 @@
         rb_recorder_sync_pipeline (recorder, NULL);
 }
 
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+static const char *
+nautilus_burn_drive_get_device (NautilusBurnDrive *drive)
+{
+	g_return_val_if_fail (drive != NULL, NULL);
+
+	return drive->device;
+}
+#endif
+
 char *
 rb_recorder_get_device (RBRecorder  *recorder,
                         GError     **error)
@@ -1017,8 +1139,9 @@
         g_return_val_if_fail (recorder != NULL, NULL);
         g_return_val_if_fail (RB_IS_RECORDER (recorder), NULL);
 
-        if (error)
+        if (error) {
                 *error = NULL;
+        }
 
         drive = recorder->priv->drive;
 
@@ -1030,7 +1153,7 @@
                 return NULL;
         }
 
-        return g_strdup (drive->device);
+        return g_strdup (nautilus_burn_drive_get_device (drive));
 }
 
 gboolean
@@ -1038,21 +1161,36 @@
                         const char  *device,
                         GError     **error)
 {
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+        NautilusBurnDriveMonitor *monitor;
+#else
         GList *drives;
         GList *tmp;
+#endif
+        int type;
 
         g_return_val_if_fail (recorder != NULL, FALSE);
         g_return_val_if_fail (RB_IS_RECORDER (recorder), FALSE);
         g_return_val_if_fail (device != NULL, FALSE);
 
-        if (error)
+        if (error) {
                 *error = NULL;
+        }
 
-        if (recorder->priv->drive) {
+        if (recorder->priv->drive != NULL) {
                 nautilus_burn_drive_unref (recorder->priv->drive);
                 recorder->priv->drive = NULL;
         }
 
+        type = 0;
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+        monitor = nautilus_burn_get_drive_monitor ();
+        recorder->priv->drive = nautilus_burn_drive_monitor_get_drive_for_device (monitor, device);
+        if (recorder->priv->drive != NULL) {
+                type = nautilus_burn_drive_get_drive_type (recorder->priv->drive);
+        }
+#else
         drives = nautilus_burn_drive_get_list (TRUE, FALSE);
 
         for (tmp = drives; tmp != NULL; tmp = tmp->next) {
@@ -1067,6 +1205,9 @@
         }
         g_list_free (drives);
 
+        type = recorder->priv->drive->type;
+#endif
+
         if (! recorder->priv->drive) {
                 g_set_error (error,
                              RB_RECORDER_ERROR,
@@ -1076,7 +1217,7 @@
                 return FALSE;
         }
 
-        if (! (recorder->priv->drive->type & NAUTILUS_BURN_DRIVE_TYPE_CD_RECORDER)) {
+        if (! (type & NAUTILUS_BURN_DRIVE_TYPE_CD_RECORDER)) {
                 g_set_error (error,
                              RB_RECORDER_ERROR,
                              RB_RECORDER_ERROR_GENERAL,
@@ -1224,7 +1365,7 @@
         drive = rb_recorder_get_default_drive ();
 
         if (drive) {
-                device = g_strdup (drive->device);
+                device = g_strdup (nautilus_burn_drive_get_device (drive));
                 nautilus_burn_drive_unref (drive);
         }
 
@@ -1251,7 +1392,12 @@
                 return -1;
         }
 
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+        size = nautilus_burn_drive_get_media_capacity (recorder->priv->drive);
+#else
         size = nautilus_burn_drive_get_media_size (recorder->priv->drive);
+#endif
+
         if (size > 0) {
 #ifdef NAUTILUS_BURN_DRIVE_SIZE_TO_TIME
                 secs = NAUTILUS_BURN_DRIVE_SIZE_TO_TIME (size);
@@ -1373,8 +1519,9 @@
         GList *l;
         gint64 total = 0;
 
-        if (!recorder->priv->tracks)
+        if (! recorder->priv->tracks) {
                 return -1;
+        }
 
         for (l = recorder->priv->tracks; l; l = l->next) {
                 NautilusBurnRecorderTrack *track = l->data;
@@ -1496,6 +1643,8 @@
                         msg = g_strdup (_("There was an error writing to the CD"));
                 }
 
+                rb_debug ("Recorder error: %s", msg);
+
                 g_set_error (error,
                              RB_RECORDER_ERROR,
                              RB_RECORDER_ERROR_GENERAL,
@@ -1510,5 +1659,7 @@
         g_object_unref (cdrecorder);
         recorder->priv->recorder = NULL;
 
+        rb_debug ("Recorder done: %d", result);
+
         return result;
 }
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-removable-media-manager.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rhythmbox/shell/rb-removable-media-manager.c	2006/05/25 07:20:48	1.26
+++ rhythmbox/shell/rb-removable-media-manager.c	2006/05/30 13:47:16	1.27
@@ -20,12 +20,22 @@
  *
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <string.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+
 #include <libgnomevfs/gnome-vfs.h>
+
 #include <nautilus-burn-drive.h>
-#include <string.h>
+#ifndef NAUTILUS_BURN_CHECK_VERSION 	 
+#define NAUTILUS_BURN_CHECK_VERSION(a,b,c) FALSE 	 
+#endif
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+#include <nautilus-burn.h>
+#endif
 
 #include "rb-removable-media-manager.h"
 #include "rb-library-source.h"
@@ -93,14 +103,6 @@
 
 typedef struct
 {
-	gboolean removed;
-	gboolean tray_opened;
-	RBRemovableMediaManager *manager;
-	NautilusBurnDrive *drive;
-} RbCdDriveInfo;
-
-typedef struct
-{
 	RBShell *shell;
 	gboolean disposed;
 
@@ -112,7 +114,9 @@
 
 	GList *sources;
 	GHashTable *volume_mapping;
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
 	GHashTable *cd_drive_mapping;
+#endif
 	GList *cur_volume_list;
 	gboolean scanned;
 
@@ -280,7 +284,9 @@
 	RBRemovableMediaManagerPrivate *priv = REMOVABLE_MEDIA_MANAGER_GET_PRIVATE (object);
 
 	g_hash_table_destroy (priv->volume_mapping);
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
 	g_hash_table_destroy (priv->cd_drive_mapping);
+#endif
 	g_async_queue_unref (priv->transfer_queue);
 	
 	G_OBJECT_CLASS (rb_removable_media_manager_parent_class)->finalize (object);
@@ -359,6 +365,15 @@
 			     NULL);
 }
 
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+typedef struct
+{
+	gboolean removed;
+	gboolean tray_opened;
+	RBRemovableMediaManager *manager;
+	NautilusBurnDrive *drive;
+} RbCdDriveInfo;
+
 #ifdef HAVE_BURN_DRIVE_DOOR
 static
 gboolean poll_tray_opened (RbCdDriveInfo *info)
@@ -427,6 +442,32 @@
 #endif
 }
 
+static NautilusBurnDrive *
+get_nautilus_burn_drive_for_path (const char *path)
+{
+#ifdef HAVE_BURN_DRIVE_NEW_FROM_PATH
+	return nautilus_burn_drive_new_from_path (path);
+#else
+	GList *drives, *l;
+	NautilusBurnDrive *path_drive = NULL;
+
+	drives = nautilus_burn_drive_get_list (FALSE, FALSE);
+	for (l = drives; l != NULL; l = g_list_next (l)) {
+		NautilusBurnDrive *drive = (NautilusBurnDrive*)l->data;
+
+		if (path_drive == NULL && strcmp (drive->device, path) == 0) {
+			path_drive = drive;
+		} else {
+			nautilus_burn_drive_unref (drive);
+		}
+	}
+	g_list_free (drives);
+
+	return path_drive;
+#endif
+}
+#endif /* NAUTILUS_BURN < 2.15.3 */
+
 static char *
 split_drive_from_cdda_uri (const char *uri)
 {
@@ -454,31 +495,6 @@
 	return temp;
 }
 
-static NautilusBurnDrive *
-get_nautilus_burn_drive_for_path (const char *path)
-{
-#ifdef HAVE_BURN_DRIVE_NEW_FROM_PATH
-	return nautilus_burn_drive_new_from_path (path);
-#else
-	GList *drives, *l;
-	NautilusBurnDrive *path_drive = NULL;
-
-	drives = nautilus_burn_drive_get_list (FALSE, FALSE);
-	for (l = drives; l != NULL; l = g_list_next (l)) {
-		NautilusBurnDrive *drive = (NautilusBurnDrive*)l->data;
-
-		if (path_drive == NULL && strcmp (drive->device, path) == 0) {
-			path_drive = drive;
-		} else {
-			nautilus_burn_drive_unref (drive);
-		}
-	}
-	g_list_free (drives);
-
-	return path_drive;
-#endif
-}
-
 static void
 rb_removable_media_manager_playing_uri_changed_cb (RBShellPlayer *player,
 						   const char *uri,
@@ -495,7 +511,7 @@
 	if (uri)
 		new_drive = split_drive_from_cdda_uri (uri);
 
-
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
 	/* if the drive we're playing from has changed, adjust the polling */
 	if (old_drive == NULL || new_drive == NULL || strcmp (old_drive, new_drive) != 0) {
 		if (old_drive) {
@@ -517,6 +533,7 @@
 			nautilus_burn_drive_unref (drive);
 		}
 	}
+#endif
 
 	g_free (priv->playing_uri);
 	priv->playing_uri = (uri) ? g_strdup (uri) : NULL;
@@ -528,7 +545,9 @@
 {
 	RBRemovableMediaManagerPrivate *priv = REMOVABLE_MEDIA_MANAGER_GET_PRIVATE (manager);
 	GnomeVFSVolumeMonitor *monitor = gnome_vfs_get_volume_monitor ();
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
 	GList *drives;
+#endif
 	GObject *shell_player;
 
 	/*
@@ -555,10 +574,12 @@
 	 * This needs to be done seperately from the above, because non-HAL systems don't
 	 * (currently) report audio cd insertions as mount events.
 	 */
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
 	priv->cd_drive_mapping = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify)end_cd_drive_monitor);
 	drives = nautilus_burn_drive_get_list (FALSE, FALSE);
 	g_list_foreach (drives, (GFunc)begin_cd_drive_monitor, manager);
 	g_list_free (drives);
+#endif
 
 	/* monitor the playing song, to disable cd drive polling */
 	shell_player = rb_shell_get_player (priv->shell);
@@ -798,6 +819,16 @@
 	rb_removable_media_manager_unmount_volume (manager, volume);
 }
 
+#if !NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+static const char *
+nautilus_burn_drive_get_device (NautilusBurnDrive *drive)
+{
+	g_return_val_if_fail (drive != NULL, NULL);
+
+	return drive->device;
+}
+#endif
+
 void
 rb_removable_media_manager_scan (RBRemovableMediaManager *manager)
 {
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-removable-media-manager.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rhythmbox/shell/rb-removable-media-manager.c	2006/05/25 07:20:48	1.26
+++ rhythmbox/shell/rb-removable-media-manager.c	2006/05/30 13:47:16	1.27
@@ -701,10 +732,15 @@
 	g_list_free (list);
 
 	/* scan cd drives */
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+	list = nautilus_burn_drive_monitor_get_drives (nautilus_burn_get_drive_monitor ());
+#else
 	list = nautilus_burn_drive_get_list (FALSE, FALSE);
+#endif
 	for  (it = list; it != NULL; it = g_list_next (it)) {
-		NautilusBurnDrive *drive = (NautilusBurnDrive*)it->data;
-		volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, drive->device);
+		NautilusBurnDrive *drive = (NautilusBurnDrive *)it->data;
+
+		volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, nautilus_burn_drive_get_device (drive));
 		if (volume) {
 			rb_removable_media_manager_mount_volume (manager, volume);
 			gnome_vfs_volume_unref (volume);
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/main.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- rhythmbox/shell/main.c	2006/05/29 00:29:30	1.97
+++ rhythmbox/shell/main.c	2006/05/30 13:47:16	1.98
@@ -73,6 +73,15 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #endif
 
+#include <nautilus-burn-drive.h>
+#ifndef NAUTILUS_BURN_CHECK_VERSION 	 
+#define NAUTILUS_BURN_CHECK_VERSION(a,b,c) FALSE 	 
+#endif
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+#include <nautilus-burn.h>
+#endif
+
 static gboolean debug           = FALSE;
 static char *debug_match        = NULL;
 static gboolean quit            = FALSE;
@@ -279,5 +288,9 @@
 		glade_gnome_init ();
 	
 		rb_stock_icons_init ();
-	
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+		nautilus_burn_init ();
+#endif
+
 		rb_shell = rb_shell_new (argc, argv, no_registration, no_update, dry_run, rhythmdb_file);
@@ -369,6 +382,10 @@
 		rb_refstring_system_shutdown ();
 
 		gnome_vfs_shutdown ();
+
+#if NAUTILUS_BURN_CHECK_VERSION(2,15,3)
+		nautilus_burn_shutdown ();
+#endif
 	}
 
 	g_strfreev (new_argv);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- rhythmbox.spec	14 Jun 2006 19:59:37 -0000	1.64
+++ rhythmbox.spec	15 Jun 2006 01:32:06 -0000	1.65
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.4.1
-Release: 7 
+Release: 8
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -40,6 +40,7 @@
 
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
 Patch3: rhythmbox-0.9.4.1-notify.patch
+Patch4: rhythmbox-0.9.4.1-ncb.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -51,6 +52,7 @@
 %setup -q
 %patch2 -p1 -b .use-icon-name
 %patch3 -p1 -b .notify
+%patch4 -p1 -b .ncb
 
 %build
 
@@ -129,6 +131,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Jun 14 2006 Bill Nottingham <notting at redhat.com> - 0.9.4.1-8
+- apply patch from CVS to port to nautilus-cd-burner 2.15.3
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4.1-7
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 01:49:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 21:49:38 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.65,1.66
Message-ID: <200606150149.k5F1nc5G020110@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20055

Modified Files:
	evolution-connector.spec 
Log Message:
rebuild



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- evolution-connector.spec	14 Jun 2006 13:21:31 -0000	1.65
+++ evolution-connector.spec	15 Jun 2006 01:49:35 -0000	1.66
@@ -18,7 +18,7 @@
 
 Name: evolution-connector
 Version: 2.7.3
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -134,6 +134,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.3-2
+- Rebuild 
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.3-1
 - Update to 2.7.3
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 02:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 22:29:10 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.80,1.81
Message-ID: <200606150229.k5F2TA5O013339@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13310

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-14
- Change selection atom to _COMPIZ_GL_INCLUDE_INFERIORS in
  xorg-x11-server-1.1.0-gl-include-inferiors.patch.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- xorg-x11-server.spec	14 Jun 2006 02:34:14 -0000	1.80
+++ xorg-x11-server.spec	15 Jun 2006 02:29:07 -0000	1.81
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   13
+Release:   14
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -566,6 +566,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-14
+- Change selection atom to _COMPIZ_GL_INCLUDE_INFERIORS in
+  xorg-x11-server-1.1.0-gl-include-inferiors.patch.
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 1.1.0-13
 - put back my -fPIC patch, libxf86config isn't built with fPIC otherwise
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 02:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 22:38:49 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.9,
	1.10
Message-ID: <200606150238.k5F2cnbc014404@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14384

Modified Files:
	gnome-python-desktop.spec 
Log Message:
fix build reqs



Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-python-desktop.spec	13 Jun 2006 14:05:17 -0000	1.9
+++ gnome-python-desktop.spec	15 Jun 2006 02:38:45 -0000	1.10
@@ -34,9 +34,9 @@
 BuildRequires: libwnck-devel >= %{libwnck_version}
 BuildRequires: libgtop2-devel >= %{libgtop_version}
 BuildRequires: totem-devel
-BuildRequires: gnome-media-devel >= %{gnome_media_version}
 Buildrequires: python-devel
 %ifnarch s390 s390x
+BuildRequires: gnome-media-devel >= %{gnome_media_version}
 BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
 %endif
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 02:59:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 22:59:42 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.10,
	1.11
Message-ID: <200606150259.k5F2xgi3004104@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4047

Modified Files:
	gnome-python-desktop.spec 
Log Message:
fix build reqs



Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-python-desktop.spec	15 Jun 2006 02:38:45 -0000	1.10
+++ gnome-python-desktop.spec	15 Jun 2006 02:59:39 -0000	1.11
@@ -24,9 +24,9 @@
 
 Requires: gnome-python2 >= %{gnome_python_version}
 Requires: python-abi = %{pyver}
-BuildRequires: glib2 >= %{glib_version}
-BuildRequires: gtk2 >= %{gtk_version}
-BuildRequires: pygtk2 >= %{gtk_version}
+BuildRequires: glib2-devel >= %{glib_version}
+BuildRequires: gtk2-devel >= %{gtk_version}
+BuildRequires: pygtk2-devel >= %{gtk_version}
 BuildRequires: gnome-python2 >= %{gnome_python_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: libgnomeprintui22-devel



From fedora-cvs-commits at redhat.com  Thu Jun 15 03:02:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 23:02:00 -0400
Subject: rpms/system-config-bind/devel .cvsignore, 1.27, 1.28 sources, 1.44,
	1.45 system-config-bind.spec, 1.53, 1.54
Message-ID: <200606150302.k5F320f7004447@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4410

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
Handle named.conf include statements within clauses;   Tooltip text not gettext-ized (part of fix for bug 195001)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	7 Jun 2006 19:41:50 -0000	1.27
+++ .cvsignore	15 Jun 2006 03:01:35 -0000	1.28
@@ -24,3 +24,4 @@
 system-config-bind-4.0.0-40_FC5.tar.gz
 system-config-bind-4.0.0-41_FC5.tar.gz
 system-config-bind-4.0.0-41_FC6.tar.gz
+system-config-bind-4.0.0-42_FC6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	7 Jun 2006 19:41:51 -0000	1.44
+++ sources	15 Jun 2006 03:01:35 -0000	1.45
@@ -1 +1 @@
-6f4d30301bda321454941c79ce2f9a32  system-config-bind-4.0.0-41_FC6.tar.gz
+f91cf8fa3fc6c349dd3aaf16baede334  system-config-bind-4.0.0-42_FC6.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- system-config-bind.spec	7 Jun 2006 19:41:51 -0000	1.53
+++ system-config-bind.spec	15 Jun 2006 03:01:35 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	41_FC6
+Release: 	42_FC6
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -91,6 +91,11 @@
 fi
 
 %changelog
+* Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-42
+- Handle named.conf 'include' statements within clauses 
+  e.g. 'view x { include "y"; }'
+- Tooltip text not gettext-ized (part of fix for bug 195001)
+
 * Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-41
 - fix bug 194058: freeze / unfreeze dynamic zones when saving
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 03:10:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 23:10:49 -0400
Subject: rpms/system-config-bind/FC-5 .cvsignore, 1.28, 1.29 sources, 1.46,
	1.47 system-config-bind.spec, 1.53, 1.54
Message-ID: <200606150310.k5F3AnWq005108@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5078

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
Handle named.conf include statements within clauses;   Tooltip text not gettext-ized (part of fix for bug 195001)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	7 Jun 2006 19:50:49 -0000	1.28
+++ .cvsignore	15 Jun 2006 03:10:46 -0000	1.29
@@ -24,3 +24,4 @@
 system-config-bind-4.0.0-40_FC5.tar.gz
 system-config-bind-4.0.0-41_FC5.tar.gz
 system-config-bind-4.0.0-41.fc5.tar.gz
+system-config-bind-4.0.0-42_FC5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	7 Jun 2006 19:50:49 -0000	1.46
+++ sources	15 Jun 2006 03:10:46 -0000	1.47
@@ -1,2 +1 @@
-7a303188ef125e654fc1834642bee75f  system-config-bind-4.0.0-41_FC5.tar.gz
-fe54e3653ee4570666afced79618b67c  system-config-bind-4.0.0-41.fc5.tar.gz
+f91cf8fa3fc6c349dd3aaf16baede334  system-config-bind-4.0.0-42_FC5.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-5/system-config-bind.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- system-config-bind.spec	7 Jun 2006 19:50:49 -0000	1.53
+++ system-config-bind.spec	15 Jun 2006 03:10:46 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	41.fc5
+Release: 	42_FC5
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -91,6 +91,11 @@
 fi
 
 %changelog
+* Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-42
+- Handle named.conf 'include' statements within clauses 
+  e.g. 'view x { include "y"; }'
+- Tooltip text not gettext-ized (part of fix for bug 195001)
+
 * Wed Jun 07 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-41
 - fix bug 194058: freeze / unfreeze dynamic zones when saving
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 03:19:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 23:19:28 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.11,
	1.12
Message-ID: <200606150319.k5F3JSJQ026231@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7758

Modified Files:
	gnome-python-desktop.spec 
Log Message:
 fix build reqs



Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-python-desktop.spec	15 Jun 2006 02:59:39 -0000	1.11
+++ gnome-python-desktop.spec	15 Jun 2006 03:19:25 -0000	1.12
@@ -34,7 +34,10 @@
 BuildRequires: libwnck-devel >= %{libwnck_version}
 BuildRequires: libgtop2-devel >= %{libgtop_version}
 BuildRequires: totem-devel
-Buildrequires: python-devel
+BuildRequires: python-devel
+BuildRequires: metacity >= %{metacity_version}
+BuildRequires: librsvg2-devel
+BuildRequires: gnome-desktop-devel
 %ifnarch s390 s390x
 BuildRequires: gnome-media-devel >= %{gnome_media_version}
 BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}



From fedora-cvs-commits at redhat.com  Thu Jun 15 03:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 23:39:26 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.117, 1.118 kudzu.spec, 1.133,
	1.134 sources, 1.131, 1.132
Message-ID: <200606150339.k5F3dQGk000923@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv884/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
auto-import kudzu-1.2.37-1 on branch devel from kudzu-1.2.37-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- .cvsignore	22 May 2006 20:39:39 -0000	1.117
+++ .cvsignore	15 Jun 2006 03:39:24 -0000	1.118
@@ -1 +1 @@
-kudzu-1.2.36.tar.gz
+kudzu-1.2.37.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kudzu.spec	24 May 2006 16:12:39 -0000	1.133
+++ kudzu.spec	15 Jun 2006 03:39:24 -0000	1.134
@@ -1,6 +1,6 @@
 Name: kudzu
-Version: 1.2.36
-Release: 2
+Version: 1.2.37
+Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -79,8 +79,8 @@
 %{_includedir}/kudzu
 
 %changelog
-* Wed May 24 2006 Bill Nottingham <notting at redhat.com> - 1.2.36-2
-- rebuild against new libpci
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 1.2.37-1
+- fix s390 segfault
 
 * Mon May 22 2006 Bill Nottingham <notting at redhat.com> - 1.2.36-1
 - add asix to usb whitelisting code


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- sources	22 May 2006 20:39:39 -0000	1.131
+++ sources	15 Jun 2006 03:39:24 -0000	1.132
@@ -1 +1 @@
-13d5e8367712192715ab428d6785b836  kudzu-1.2.36.tar.gz
+f8038808a94d8bbe08c5201a05ac9ad9  kudzu-1.2.37.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 03:46:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 14 Jun 2006 23:46:34 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.278, 1.279 anaconda.spec, 1.402,
	1.403 sources, 1.399, 1.400
Message-ID: <200606150346.k5F3kY4F021583@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20797/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.40-1 on branch devel from anaconda-11.1.0.40-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- .cvsignore	14 Jun 2006 22:22:39 -0000	1.278
+++ .cvsignore	15 Jun 2006 03:46:31 -0000	1.279
@@ -1 +1 @@
-anaconda-11.1.0.39.tar.bz2
+anaconda-11.1.0.40.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- anaconda.spec	14 Jun 2006 22:22:39 -0000	1.402
+++ anaconda.spec	15 Jun 2006 03:46:31 -0000	1.403
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.39
+Version: 11.1.0.40
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -17,7 +17,7 @@
 BuildPreReq: glib2-devel >= 2.11.1-5
 BuildPreReq: libdhcp-devel, libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
-Requires: kudzu > 1.2.0, yum >= 2.9.0, pirut >= 1.1.0
+Requires: kudzu > 1.2.37, yum >= 2.9.0, pirut >= 1.1.0
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
 Requires: device-mapper >= 1.01.05-3
@@ -47,6 +47,9 @@
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
+%ifarch s390 s390x
+Requires: openssh
+%endif
 Requires: /usr/bin/strip, xorg-x11-font-utils, netpbm-progs
 
 %description runtime
@@ -97,6 +100,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.40-1
+- add some more kernels to the pkgorder fun
+- don't try to switch cds if we've already got the right one inserted
+- libaudit for s390
+- need openssh installed when building s390 trees
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.39-1
 - only select groups which exist
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- sources	14 Jun 2006 22:22:39 -0000	1.399
+++ sources	15 Jun 2006 03:46:31 -0000	1.400
@@ -1 +1 @@
-b0bd0fd5085d8e9164a38c1d16e5ddef  anaconda-11.1.0.39.tar.bz2
+f576cd4d28e2c66f31f0dffdc0288aad  anaconda-11.1.0.40.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 08:18:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 04:18:14 -0400
Subject: rpms/elfutils/devel .cvsignore,1.27,1.28 sources,1.28,1.29
Message-ID: <200606150818.k5F8IEg8010456@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10431

Modified Files:
	.cvsignore sources 
Log Message:
New upstream tarball 0.121


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	5 Apr 2006 04:29:52 -0000	1.27
+++ .cvsignore	15 Jun 2006 08:18:11 -0000	1.28
@@ -1 +1 @@
-elfutils-0.120.tar.gz
+elfutils-0.121.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	5 Apr 2006 04:29:52 -0000	1.28
+++ sources	15 Jun 2006 08:18:11 -0000	1.29
@@ -1 +1 @@
-3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz
+5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 08:32:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 04:32:10 -0400
Subject: rpms/elfutils/devel Makefile, 1.13, 1.14 elfutils-portability.patch,
	1.21, 1.22 elfutils.spec, 1.65, 1.66
Message-ID: <200606150832.k5F8WAMS014807@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14762

Modified Files:
	Makefile elfutils-portability.patch elfutils.spec 
Log Message:
New upstream version 0.121


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	8 Dec 2005 01:48:13 -0000	1.13
+++ Makefile	15 Jun 2006 08:32:05 -0000	1.14
@@ -5,14 +5,14 @@
 
 include ../common/Makefile.common
 
-MONOTONE = monotone
+MONOTONE = mtn
 
 elfutils-portability.patch: elfutils-$(VERSION).tar.gz
 	@rm -rf elfutils-master elfutils-portable
 	$(MONOTONE) checkout -b com.redhat.elfutils elfutils-master
 	$(MONOTONE) checkout -b com.redhat.elfutils.portable elfutils-portable
-	cd elfutils-master; autoreconf; rm -rf autom4te.cache MT
-	cd elfutils-portable; autoreconf; rm -rf autom4te.cache MT
+	cd elfutils-master; autoreconf; rm -rf autom4te.cache _MTN
+	cd elfutils-portable; autoreconf; rm -rf autom4te.cache _MTN
 	diff -rpu elfutils-master elfutils-portable | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- elfutils-portability.patch	5 Apr 2006 04:39:39 -0000	1.21
+++ elfutils-portability.patch	15 Jun 2006 08:32:06 -0000	1.22
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -47,6 +47,11 @@
+@@ -56,6 +56,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +12,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -69,6 +74,9 @@
+@@ -78,6 +83,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -51,7 +51,7 @@
  libebl_%.map: Makefile
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
+@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am
+@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -136,7 +136,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.120'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -317,7 +317,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -105,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -103,6 +103,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -325,7 +325,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -140,6 +141,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -333,7 +333,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -182,9 +184,9 @@ sharedstatedir = @sharedstatedir@
+@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -378,7 +378,7 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -138,6 +138,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -386,7 +386,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -394,7 +394,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
+@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
@@ -431,7 +431,7 @@
  noinst_LIBRARIES = libcpu_i386.a
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -101,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -439,7 +439,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -447,7 +447,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -177,7 +179,7 @@ sbindir = @sbindir@
+@@ -175,7 +177,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -276,6 +276,11 @@
+@@ -290,6 +290,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -491,7 +491,7 @@
  
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -178,6 +178,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -499,7 +499,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -507,7 +507,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
+@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
@@ -522,7 +522,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -268,6 +268,11 @@
+@@ -286,6 +286,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,7 +553,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -561,7 +561,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -569,7 +569,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
+@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +583,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -400,6 +400,11 @@
+@@ -413,6 +413,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -614,7 +614,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -622,7 +622,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -166,6 +167,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -630,7 +630,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -208,9 +210,9 @@ sharedstatedir = @sharedstatedir@
+@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -644,7 +644,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -130,6 +130,11 @@
+@@ -136,6 +136,11 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -700,7 +700,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libelf/Makefile.in
 +++ elfutils/libelf/Makefile.in
-@@ -40,7 +40,7 @@ PRE_UNINSTALL = :
+@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -709,7 +709,7 @@
  @MUDFLAP_FALSE at noinst_PROGRAMS = $(am__EXEEXT_1)
  @MUDFLAP_TRUE at am_libelf_pic_a_OBJECTS =
  subdir = libelf
-@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -717,7 +717,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -725,7 +725,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -258,10 +260,10 @@ sharedstatedir = @sharedstatedir@
+@@ -256,10 +258,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
@@ -776,7 +776,15 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -261,6 +261,11 @@
+@@ -1,3 +1,7 @@
++2006-04-05  Roland McGrath  <roland at redhat.com>
++
++	* strings.c (MAP_POPULATE): Define to 0 if undefined.
++
+ 2006-06-12  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
+@@ -346,6 +350,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -824,7 +832,7 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -192,6 +192,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -832,7 +840,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -227,6 +228,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -840,7 +848,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -271,12 +273,12 @@ target_alias = @target_alias@
+@@ -269,12 +271,12 @@ target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \
  @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror) $(if \
@@ -855,6 +863,19 @@
  @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
  	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
+--- elfutils/src/strings.c
++++ elfutils/src/strings.c
+@@ -51,6 +51,10 @@
+ 
+ #include <system.h>
+ 
++#ifndef MAP_POPULATE
++# define MAP_POPULATE 0
++#endif
++
+ 
+ /* Prototypes of local functions.  */
+ static int read_fd (int fd, const char *fname, off64_t fdlen);
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
 @@ -52,6 +52,12 @@
@@ -941,7 +962,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -289,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -287,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -949,7 +970,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -324,6 +325,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -957,7 +978,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -365,10 +367,10 @@ sbindir = @sbindir@
+@@ -363,10 +365,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- elfutils.spec	25 May 2006 22:08:50 -0000	1.65
+++ elfutils.spec	15 Jun 2006 08:32:06 -0000	1.66
@@ -1,5 +1,5 @@
-%define version 0.120
-%define release 3
+%define version 0.121
+%define release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -214,6 +214,14 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Thu Jun 15 2006 Roland McGrath <roland at redhat.com> - 0.121-1
+- Update to 0.121
+  - libelf: bug fixes for rewriting existing files when using mmap (#187618).
+  - make all installed headers usable in C++ code (#193153).
+  - eu-readelf: better output format.
+  - eu-elflint: fix tests of dynamic section content.
+  - libdw, libdwfl: handle files without aranges info.
+
 * Thu May 25 2006 Jeremy Katz <katzj at redhat.com> - 0.120-3
 - rebuild to pick up -devel deps
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 09:40:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 05:40:47 -0400
Subject: rpms/mod_perl/devel mod_perl-2.0.2-multilib.patch, NONE,
	1.1 mod_perl.spec, 1.38, 1.39
Message-ID: <200606150940.k5F9elaZ027686@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27659

Modified Files:
	mod_perl.spec 
Added Files:
	mod_perl-2.0.2-multilib.patch 
Log Message:
* Thu Jun 15 2006 Joe Orton <jorton at redhat.com> 2.0.2-6
- fix multilib conflicts in -devel (#192733)


mod_perl-2.0.2-multilib.patch:
 TypeMap.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE mod_perl-2.0.2-multilib.patch ---

Generate the XS typemap files in sorted order; ensures that the
devel package contents do not differe across multilib platforms.

--- mod_perl-2.0.2/lib/ModPerl/TypeMap.pm.multilib
+++ mod_perl-2.0.2/lib/ModPerl/TypeMap.pm
@@ -440,12 +440,12 @@
         $code .= qq{\#include "$_"\n}
     }
 
-    for my $t (@{ $self->{struct} }) {
+    for my $t (sort {$a->[1] cmp $b->[1]} @{ $self->{struct} }) {
         next if $seen{ $t->[1] }++;
         $code .= "typedef $t->[0] * $t->[1];\n";
     }
 
-    for my $t (@{ $self->{typedef} }) {
+    for my $t (sort {$a->[1] cmp $b->[1]} @{ $self->{typedef} }) {
         next if $seen{ $t->[1] }++;
         $code .= "typedef $t->[0] $t->[1];\n";
     }
@@ -468,7 +468,9 @@
     my %seen;
     my $code = "";
 
-    while (my ($ctype, $ptype) = each %$map) {
+    for my $ctype (sort keys %$map) {
+        my $ptype = $map->{$ctype};
+
         next if $self->special($ptype);
         next if $ctype =~ /\s/;
         my $class = $ptype;


Index: mod_perl.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_perl.spec	11 Feb 2006 04:37:38 -0000	1.38
+++ mod_perl.spec	15 Jun 2006 09:40:43 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.2
-Release:        5.1
+Release:        6
 Summary:        An embedded Perl interpreter for the Apache Web server
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@
 Source2:        filter-requires.sh
 Source3:        reap-stale-servers.sh
 Source4:        testlock.sh
+Patch0:         mod_perl-2.0.2-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -47,7 +48,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-
+%patch0 -p1 -b .multilib
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
@@ -132,6 +133,9 @@
 
 
 %changelog
+* Thu Jun 15 2006 Joe Orton <jorton at redhat.com> 2.0.2-6
+- fix multilib conflicts in -devel (#192733)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-5.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 10:20:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 06:20:13 -0400
Subject: rpms/ttmkfdir/devel ttmkfdir-3.0.9-encoding-dir.patch, NONE,
	1.1 ttmkfdir.spec, 1.16, 1.17
Message-ID: <200606151020.k5FAKDG4017452@cvs.devel.redhat.com>

Author: lizhang

Update of /cvs/dist/rpms/ttmkfdir/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16552

Modified Files:
	ttmkfdir.spec 
Added Files:
	ttmkfdir-3.0.9-encoding-dir.patch 
Log Message:
- add ttmkfdir-3.0.9-encoding-dir.patch to fix bug #173705
- modify ttmkfdir-3.0.9/Makefile to delete the compiling flag of "ggdb"



ttmkfdir-3.0.9-encoding-dir.patch:
 Makefile     |    4 ++--
 ttmkfdir.cpp |   23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

--- NEW FILE ttmkfdir-3.0.9-encoding-dir.patch ---
--- ttmkfdir-3.0.9/Makefile.Origin	2006-06-15 17:58:26.000000000 +0800
+++ ttmkfdir-3.0.9/Makefile	2006-06-15 17:58:57.000000000 +0800
@@ -27,8 +27,8 @@
 OPTFLAGS=
 DEBUG=-ggdb
 CXX=g++
-CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) $(OPTFLAGS)
-LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -lz
+CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(OPTFLAGS)
+LDFLAGS=$(FREETYPE_LIB) -lz
 
 DESTDIR=
 PREFIX=/usr
--- ttmkfdir-3.0.9/ttmkfdir.cpp.Origin	2006-06-15 17:58:43.000000000 +0800
+++ ttmkfdir-3.0.9/ttmkfdir.cpp	2006-06-15 17:59:07.000000000 +0800
@@ -16,7 +16,7 @@
 
     cerr << "This Program is (C) Joerg Pommnitz, 2000" << endl;
     cerr << "Usage: " << program << " [OPTION]" << endl;
-    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\"" << endl;
+    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\" or \"/usr/share/X11/fonts/encodings/encodings.dir\"" << endl;
     cerr << "-o, --output\t\tname of the destination file, default is \"fonts.scale\"" << endl;
     cerr << "-d, --font-dir\t\tname of the TrueType font directory, default is \".\"" << endl;
     cerr << "-f, --default-foundry\tname of the default font foundry, default is \"misc\"" << endl;
@@ -32,7 +32,26 @@
 void
 ParseCommandline (int argc, char *argv[])
 {
-    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
+    FILE *tmp = fopen ("/usr/X11R6/lib/X11/fonts/encodings/encodings.dir", "r");
+    if (tmp)
+    {
+	cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
+	fclose (tmp);
+    }
+    else
+    {
+        tmp = fopen ("/usr/share/X11/fonts/encodings/encodings.dir", "r");
+	if (tmp)
+	{
+	    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/share/X11/fonts/encodings/encodings.dir"));
+	    fclose (tmp);
+	}
+	else
+	{
+	    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
+	}
+    }
+    
     cmdline::instance()->AddOption (new Commandline::Option ("output", 'o', "fonts.scale"));
     cmdline::instance()->AddOption (new Commandline::Option ("font-dir", 'd', "."));
     cmdline::instance()->AddOption (new Commandline::Option ("default-foundry", 'f', "misc"));


Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ttmkfdir.spec	11 Feb 2006 05:53:51 -0000	1.16
+++ ttmkfdir.spec	15 Jun 2006 10:20:11 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 19.2.1
+Release: 20.0
 Source0: %{name}-%{version}.tar.bz2
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
@@ -10,6 +10,7 @@
 Patch4: ttmkfdir-3.0.9-fix-crash.patch
 Patch5: ttmkfdir-3.0.9-warnings.patch
 Patch6: ttmkfdir-3.0.9-segfaults.patch
+Patch7: ttmkfdir-3.0.9-encoding-dir.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
@@ -34,6 +35,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -51,6 +53,10 @@
 %{_bindir}/ttmkfdir
 
 %changelog
+* Thu Jun 15 2006 Lingning Zhang <lizhang at redhat.com> - 3.0.9-20
+- add ttmkfdir-3.0.9-encoding-dir.patch to fix bug #173705
+- modify ttmkfdir-3.0.9/Makefile to delete the compiling flag of "ggdb"
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.9-19.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 10:36:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 06:36:08 -0400
Subject: rpms/gdb/devel gdb-6.3-ia32el-fix-waitpid-20060615.patch, NONE,
	1.1 gdb.spec, 1.183, 1.184
Message-ID: <200606151036.k5FAa895021782@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21650/devel

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-ia32el-fix-waitpid-20060615.patch 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Additional patch for BZ 175083, to cope with waitpid setting status
even when returning zero.


gdb-6.3-ia32el-fix-waitpid-20060615.patch:
 linux-nat.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE gdb-6.3-ia32el-fix-waitpid-20060615.patch ---
Index: gdb-6.3/gdb/linux-nat.c
===================================================================
--- gdb-6.3.orig/gdb/linux-nat.c	2006-06-15 07:27:02.000000000 -0300
+++ gdb-6.3/gdb/linux-nat.c	2006-06-15 07:27:06.000000000 -0300
@@ -157,12 +157,28 @@ static int
 my_waitpid (int pid, int *status, int flags)
 {
   int ret;
+  int old_status = status ? *status : 0;
+
   do
     {
       ret = waitpid (pid, status, flags);
     }
   while (ret == -1 && errno == EINTR);
 
+  if (ret == 0 && status != 0)
+    {
+      /* waitpid() running within ia32el (on multi-threaded processes
+	 only?) modifies status even when it returns zero, and this
+	 breaks the assumption in linux_nat_wait(), and perhaps
+	 elsewhere, that it remains unchanged in this case.  We
+	 restore the old value before returning zero, such that the
+	 assumption holds.  */
+      if (*status != 0 && *status != old_status)
+        warning ("waitpid: non-zero status %x for zero return value",
+                 *status);
+      *status = old_status;
+    }
+
   return ret;
 }
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gdb.spec	31 May 2006 07:15:55 -0000	1.183
+++ gdb.spec	15 Jun 2006 10:35:58 -0000	1.184
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.131.FC6
+Release: 1.132.FC6
 
 License: GPL
 Group: Development/Debuggers
@@ -281,12 +281,16 @@
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
-# Do not let errors related with debug registers break thread debugging.
-Patch177: gdb-6.3-catch-debug-registers-error-20060527.patch
-
 # Hard-code executable names in gstack, such that it can run with a
 # corrupted or missing PATH.
-Patch178: gdb-6.3-gstack-without-path-20060414.patch
+Patch177: gdb-6.3-gstack-without-path-20060414.patch
+
+# Do not let errors related with debug registers break thread debugging.
+Patch178: gdb-6.3-catch-debug-registers-error-20060527.patch
+
+# Copy with waitpid modifying status even when returning zero, as on
+# ia32el.
+Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 
@@ -395,6 +399,7 @@
 %patch176 -p1
 %patch177 -p1
 %patch178 -p1
+%patch179 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -563,6 +568,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
+- Additional patch for BZ 175083, to cope with waitpid setting status
+even when returning zero.
+
 * Wed May 31 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.131
 - Require gettext at build time.  (BZ193366)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 10:36:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 06:36:08 -0400
Subject: rpms/gdb/FC-5 gdb-6.3-ia32el-fix-waitpid-20060615.patch, NONE,
	1.1 gdb.spec, 1.183, 1.184
Message-ID: <200606151036.k5FAa8q9021759@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21650/FC-5

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-ia32el-fix-waitpid-20060615.patch 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Additional patch for BZ 175083, to cope with waitpid setting status
even when returning zero.


gdb-6.3-ia32el-fix-waitpid-20060615.patch:
 linux-nat.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE gdb-6.3-ia32el-fix-waitpid-20060615.patch ---
Index: gdb-6.3/gdb/linux-nat.c
===================================================================
--- gdb-6.3.orig/gdb/linux-nat.c	2006-06-15 07:27:02.000000000 -0300
+++ gdb-6.3/gdb/linux-nat.c	2006-06-15 07:27:06.000000000 -0300
@@ -157,12 +157,28 @@ static int
 my_waitpid (int pid, int *status, int flags)
 {
   int ret;
+  int old_status = status ? *status : 0;
+
   do
     {
       ret = waitpid (pid, status, flags);
     }
   while (ret == -1 && errno == EINTR);
 
+  if (ret == 0 && status != 0)
+    {
+      /* waitpid() running within ia32el (on multi-threaded processes
+	 only?) modifies status even when it returns zero, and this
+	 breaks the assumption in linux_nat_wait(), and perhaps
+	 elsewhere, that it remains unchanged in this case.  We
+	 restore the old value before returning zero, such that the
+	 assumption holds.  */
+      if (*status != 0 && *status != old_status)
+        warning ("waitpid: non-zero status %x for zero return value",
+                 *status);
+      *status = old_status;
+    }
+
   return ret;
 }
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gdb.spec	31 May 2006 07:15:55 -0000	1.183
+++ gdb.spec	15 Jun 2006 10:35:56 -0000	1.184
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.131.FC5
+Release: 1.132.FC5
 
 License: GPL
 Group: Development/Debuggers
@@ -281,12 +281,16 @@
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
-# Do not let errors related with debug registers break thread debugging.
-Patch177: gdb-6.3-catch-debug-registers-error-20060527.patch
-
 # Hard-code executable names in gstack, such that it can run with a
 # corrupted or missing PATH.
-Patch178: gdb-6.3-gstack-without-path-20060414.patch
+Patch177: gdb-6.3-gstack-without-path-20060414.patch
+
+# Do not let errors related with debug registers break thread debugging.
+Patch178: gdb-6.3-catch-debug-registers-error-20060527.patch
+
+# Copy with waitpid modifying status even when returning zero, as on
+# ia32el.
+Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 
@@ -395,6 +399,7 @@
 %patch176 -p1
 %patch177 -p1
 %patch178 -p1
+%patch179 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -563,6 +568,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
+- Additional patch for BZ 175083, to cope with waitpid setting status
+even when returning zero.
+
 * Wed May 31 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.131
 - Require gettext at build time.  (BZ193366)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 10:36:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 06:36:08 -0400
Subject: rpms/gdb/FC-4 gdb-6.3-ia32el-fix-waitpid-20060615.patch, NONE,
	1.1 gdb.spec, 1.180, 1.181
Message-ID: <200606151036.k5FAa8ED021742@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21650/FC-4

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-ia32el-fix-waitpid-20060615.patch 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Additional patch for BZ 175083, to cope with waitpid setting status
even when returning zero.


gdb-6.3-ia32el-fix-waitpid-20060615.patch:
 linux-nat.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE gdb-6.3-ia32el-fix-waitpid-20060615.patch ---
Index: gdb-6.3/gdb/linux-nat.c
===================================================================
--- gdb-6.3.orig/gdb/linux-nat.c	2006-06-15 07:27:02.000000000 -0300
+++ gdb-6.3/gdb/linux-nat.c	2006-06-15 07:27:06.000000000 -0300
@@ -157,12 +157,28 @@ static int
 my_waitpid (int pid, int *status, int flags)
 {
   int ret;
+  int old_status = status ? *status : 0;
+
   do
     {
       ret = waitpid (pid, status, flags);
     }
   while (ret == -1 && errno == EINTR);
 
+  if (ret == 0 && status != 0)
+    {
+      /* waitpid() running within ia32el (on multi-threaded processes
+	 only?) modifies status even when it returns zero, and this
+	 breaks the assumption in linux_nat_wait(), and perhaps
+	 elsewhere, that it remains unchanged in this case.  We
+	 restore the old value before returning zero, such that the
+	 assumption holds.  */
+      if (*status != 0 && *status != old_status)
+        warning ("waitpid: non-zero status %x for zero return value",
+                 *status);
+      *status = old_status;
+    }
+
   return ret;
 }
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- gdb.spec	31 May 2006 07:15:54 -0000	1.180
+++ gdb.spec	15 Jun 2006 10:35:56 -0000	1.181
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.131.FC4
+Release: 1.132.FC4
 
 License: GPL
 Group: Development/Debuggers
@@ -281,12 +281,16 @@
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
-# Do not let errors related with debug registers break thread debugging.
-Patch177: gdb-6.3-catch-debug-registers-error-20060527.patch
-
 # Hard-code executable names in gstack, such that it can run with a
 # corrupted or missing PATH.
-Patch178: gdb-6.3-gstack-without-path-20060414.patch
+Patch177: gdb-6.3-gstack-without-path-20060414.patch
+
+# Do not let errors related with debug registers break thread debugging.
+Patch178: gdb-6.3-catch-debug-registers-error-20060527.patch
+
+# Copy with waitpid modifying status even when returning zero, as on
+# ia32el.
+Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 
@@ -395,6 +399,7 @@
 %patch176 -p1
 %patch177 -p1
 %patch178 -p1
+%patch179 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -563,6 +568,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
+- Additional patch for BZ 175083, to cope with waitpid setting status
+even when returning zero.
+
 * Wed May 31 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.131
 - Require gettext at build time.  (BZ193366)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:12:15 -0400
Subject: rpms/cups/devel cups-str1776.patch,NONE,1.1 cups.spec,1.217,1.218
Message-ID: <200606151112.k5FBCF2X013079@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13048

Modified Files:
	cups.spec 
Added Files:
	cups-str1776.patch 
Log Message:
* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com>
- Fixed cupsd network default printer crash (STR #1776).


cups-str1776.patch:
 printers.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str1776.patch ---
--- cups-1.2.1/scheduler/printers.c.str1776	2006-06-15 11:49:30.000000000 +0100
+++ cups-1.2.1/scheduler/printers.c	2006-06-15 11:49:36.000000000 +0100
@@ -665,7 +665,7 @@
 	   dp = (cupsd_printer_t *)cupsArrayNext(Printers))
 	if (dp != p && (dp->type & CUPS_PRINTER_DEFAULT))
 	{
-	  DefaultPrinter = p;
+	  DefaultPrinter = dp;
 	  break;
 	}
     }


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- cups.spec	14 Jun 2006 14:45:26 -0000	1.217
+++ cups.spec	15 Jun 2006 11:12:12 -0000	1.218
@@ -34,6 +34,7 @@
 Patch12: cups-locale.patch
 Patch13: cups-str1758.patch
 Patch14: cups-str1736.patch
+Patch15: cups-str1776.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -127,6 +128,7 @@
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .str1758
 %patch14 -p1 -b .str1736
+%patch15 -p1 -b .str1776
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -392,6 +394,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed cupsd network default printer crash (STR #1776).
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1:1.2.1-12
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:12:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:12:36 -0400
Subject: rpms/cups/devel cups.spec,1.218,1.219
Message-ID: <200606151112.k5FBCa7G013170@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13132

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-13


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- cups.spec	15 Jun 2006 11:12:12 -0000	1.218
+++ cups.spec	15 Jun 2006 11:12:33 -0000	1.219
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 12
+Release: 13
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -394,7 +394,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-13
 - Fixed cupsd network default printer crash (STR #1776).
 
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1:1.2.1-12



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:14:07 -0400
Subject: rpms/cups/FC-5 cups.spec,1.193,1.194
Message-ID: <200606151114.k5FBE7Gt013752@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13697

Modified Files:
	cups.spec 
Log Message:
* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.10
- Fixed cupsd network default printer crash (STR #1776).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- cups.spec	13 Jun 2006 16:23:04 -0000	1.193
+++ cups.spec	15 Jun 2006 11:14:04 -0000	1.194
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.9
+Release: 1.10
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -43,6 +43,7 @@
 Patch20: cups-direct-usb.patch
 Patch21: cups-str1736.patch
 Patch22: cups-dest-cache-v2.patch
+Patch23: cups-str1776.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
@@ -146,6 +147,7 @@
 %patch20 -p1 -b .direct-usb
 %patch21 -p1 -b .str1736
 %patch22 -p1 -b .dest-cache-v2
+%patch23 -p1 -b .str1776
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
@@ -416,6 +418,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.10
+- Fixed cupsd network default printer crash (STR #1776).
+
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.9
 - Remove certs directory in %%post, not %%postun.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:15:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:15:08 -0400
Subject: rpms/cups/FC-5 cups-str1776.patch,NONE,1.1
Message-ID: <200606151115.k5FBF8o4014215@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14180

Added Files:
	cups-str1776.patch 
Log Message:
Add the patch.

cups-str1776.patch:
 printers.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str1776.patch ---
--- cups-1.2.1/scheduler/printers.c.str1776	2006-06-15 11:49:30.000000000 +0100
+++ cups-1.2.1/scheduler/printers.c	2006-06-15 11:49:36.000000000 +0100
@@ -665,7 +665,7 @@
 	   dp = (cupsd_printer_t *)cupsArrayNext(Printers))
 	if (dp != p && (dp->type & CUPS_PRINTER_DEFAULT))
 	{
-	  DefaultPrinter = p;
+	  DefaultPrinter = dp;
 	  break;
 	}
     }



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:24:24 -0400
Subject: rpms/gdb/devel gdb.spec,1.184,1.185
Message-ID: <200606151124.k5FBOOWA032241@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32097/devel

Modified Files:
	gdb.spec 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Require flex at build time.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gdb.spec	15 Jun 2006 10:35:58 -0000	1.184
+++ gdb.spec	15 Jun 2006 11:24:22 -0000	1.185
@@ -293,6 +293,7 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
+BuildRequires: flex
 
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
@@ -569,6 +570,7 @@
 
 %changelog
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
+- Require flex at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status
 even when returning zero.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:24:24 -0400
Subject: rpms/gdb/FC-5 gdb.spec,1.184,1.185
Message-ID: <200606151124.k5FBOOJ6032233@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32097/FC-5

Modified Files:
	gdb.spec 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Require flex at build time.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gdb.spec	15 Jun 2006 10:35:56 -0000	1.184
+++ gdb.spec	15 Jun 2006 11:24:22 -0000	1.185
@@ -293,6 +293,7 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
+BuildRequires: flex
 
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
@@ -569,6 +570,7 @@
 
 %changelog
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
+- Require flex at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status
 even when returning zero.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:34:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:34:44 -0400
Subject: rpms/gdb/devel gdb.spec,1.185,1.186
Message-ID: <200606151134.k5FBYiPv002401@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2324/devel

Modified Files:
	gdb.spec 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Require flex and bison at build time.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gdb.spec	15 Jun 2006 11:24:22 -0000	1.185
+++ gdb.spec	15 Jun 2006 11:34:42 -0000	1.186
@@ -293,7 +293,7 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex
+BuildRequires: flex bison
 
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
@@ -570,7 +570,7 @@
 
 %changelog
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
-- Require flex at build time.
+- Require flex and bison at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status
 even when returning zero.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 11:34:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 07:34:44 -0400
Subject: rpms/gdb/FC-5 gdb.spec,1.185,1.186
Message-ID: <200606151134.k5FBYiKF002393@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2324/FC-5

Modified Files:
	gdb.spec 
Log Message:
* Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
- Require flex and bison at build time.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gdb.spec	15 Jun 2006 11:24:22 -0000	1.185
+++ gdb.spec	15 Jun 2006 11:34:41 -0000	1.186
@@ -293,7 +293,7 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex
+BuildRequires: flex bison
 
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
@@ -570,7 +570,7 @@
 
 %changelog
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
-- Require flex at build time.
+- Require flex and bison at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status
 even when returning zero.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 12:14:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 08:14:37 -0400
Subject: rpms/firefox/devel firefox.spec,1.119,1.120
Message-ID: <200606151214.k5FCEbBU026830@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26731

Modified Files:
	firefox.spec 
Log Message:
Force "gmake -j1" on ppc ppc64 s390 s390x



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- firefox.spec	12 Jun 2006 22:14:18 -0000	1.119
+++ firefox.spec	15 Jun 2006 12:14:34 -0000	1.120
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.4
-Release:        2
+Release:        3
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -135,7 +135,14 @@
 %build
 
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
-MAKE="gmake %{?_smp_mflags}" make -f client.mk build
+
+%ifarch ppc ppc64 s390 s390x
+%define moz_make_flags -j1
+%else
+%define moz_make_flags %{?_smp_mflags}
+%endif
+
+MAKE="gmake %{moz_make_flags}" make -f client.mk build
 
 #---------------------------------------------------------------------
 
@@ -264,6 +271,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jun 15 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-3
+- Force "gmake -j1" on ppc ppc64 s390 s390x
+
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
 - Firefox 1.5.0.4
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 12:16:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 08:16:09 -0400
Subject: rpms/cups/devel cups-no-export-ssllibs.patch, NONE, 1.1 cups.spec,
	1.219, 1.220
Message-ID: <200606151216.k5FCG9Ju030990@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29941

Modified Files:
	cups.spec 
Added Files:
	cups-no-export-ssllibs.patch 
Log Message:
* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-14
- Don't export in SSLLIBS to cups-config.


cups-no-export-ssllibs.patch:
 config-scripts/cups-ssl.m4 |    2 +-
 configure                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-no-export-ssllibs.patch ---
--- cups-1.2.1/config-scripts/cups-ssl.m4.no-export-ssllibs	2006-06-15 13:12:59.000000000 +0100
+++ cups-1.2.1/config-scripts/cups-ssl.m4	2006-06-15 13:13:09.000000000 +0100
@@ -109,7 +109,7 @@
 AC_SUBST(SSLLIBS)
 AC_SUBST(ENCRYPTION_REQUIRED)
 
-EXPORT_SSLLIBS="$SSLLIBS"
+EXPORT_SSLLIBS=""
 AC_SUBST(EXPORT_SSLLIBS)
 
 
--- cups-1.2.1/configure.no-export-ssllibs	2006-06-15 13:13:42.000000000 +0100
+++ cups-1.2.1/configure	2006-06-15 13:13:48.000000000 +0100
@@ -12343,7 +12343,7 @@
 
 
 
-EXPORT_SSLLIBS="$SSLLIBS"
+EXPORT_SSLLIBS=""
 
 
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- cups.spec	15 Jun 2006 11:12:33 -0000	1.219
+++ cups.spec	15 Jun 2006 12:16:06 -0000	1.220
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 13
+Release: 14
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -35,6 +35,7 @@
 Patch13: cups-str1758.patch
 Patch14: cups-str1736.patch
 Patch15: cups-str1776.patch
+Patch16: cups-no-export-ssllibs.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -129,6 +130,7 @@
 %patch13 -p1 -b .str1758
 %patch14 -p1 -b .str1736
 %patch15 -p1 -b .str1776
+%patch16 -p1 -b .no-export-ssllibs
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -394,6 +396,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-14
+- Don't export in SSLLIBS to cups-config.
+
 * Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-13
 - Fixed cupsd network default printer crash (STR #1776).
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 12:51:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 08:51:34 -0400
Subject: rpms/ttcp/devel ttcp.spec,1.13,1.14
Message-ID: <200606151251.k5FCpY40009112@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ttcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9098

Modified Files:
	ttcp.spec 
Log Message:
- rebuilt


Index: ttcp.spec
===================================================================
RCS file: /cvs/dist/rpms/ttcp/devel/ttcp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ttcp.spec	11 Feb 2006 05:53:44 -0000	1.13
+++ ttcp.spec	15 Jun 2006 12:51:32 -0000	1.14
@@ -1,6 +1,6 @@
 Name: ttcp
 Version: 1.12
-Release: 13.2.1
+Release: 14
 Source0: ftp://ftp.sgi.com/sgi/src/ttcp/ttcp.c
 Source1: ftp://ftp.sgi.com/sgi/src/ttcp/ttcp.1
 Source2: ftp://ftp.sgi.com/sgi/src/ttcp/README
@@ -43,6 +43,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jun 15 2006 Radek Vokal <rvokal at redhat.com> 1.12-14
+- rebuilt
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 13:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 09:21:06 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.279, 1.280 anaconda.spec, 1.403,
	1.404 sources, 1.400, 1.401
Message-ID: <200606151321.k5FDL603004583@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4506/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.41-1 on branch devel from anaconda-11.1.0.41-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- .cvsignore	15 Jun 2006 03:46:31 -0000	1.279
+++ .cvsignore	15 Jun 2006 13:21:04 -0000	1.280
@@ -1 +1 @@
-anaconda-11.1.0.40.tar.bz2
+anaconda-11.1.0.41.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- anaconda.spec	15 Jun 2006 03:46:31 -0000	1.403
+++ anaconda.spec	15 Jun 2006 13:21:04 -0000	1.404
@@ -1,11 +1,11 @@
 Name: anaconda
-Version: 11.1.0.40
+Version: 11.1.0.41
 Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
 Source: anaconda-%{PACKAGE_VERSION}.tar.bz2
-BuildPreReq: kudzu-devel >= 1.2.0, pciutils-devel
+BuildPreReq: kudzu-devel >= 1.2.37, pciutils-devel
 BuildPreReq: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
 BuildPreReq: rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11
 BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
@@ -17,7 +17,7 @@
 BuildPreReq: glib2-devel >= 2.11.1-5
 BuildPreReq: libdhcp-devel, libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
-Requires: kudzu > 1.2.37, yum >= 2.9.0, pirut >= 1.1.0
+Requires: kudzu > 1.2.0, yum >= 2.9.0, pirut >= 1.1.0
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
 Requires: device-mapper >= 1.01.05-3
@@ -100,6 +100,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.41-1
+- fix dep problem
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.40-1
 - add some more kernels to the pkgorder fun
 - don't try to switch cds if we've already got the right one inserted


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- sources	15 Jun 2006 03:46:31 -0000	1.400
+++ sources	15 Jun 2006 13:21:04 -0000	1.401
@@ -1 +1 @@
-f576cd4d28e2c66f31f0dffdc0288aad  anaconda-11.1.0.40.tar.bz2
+6e38fccc42c9ed1ea1c62a871df5660b  anaconda-11.1.0.41.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:02:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:02:26 -0400
Subject: rpms/redhat-rpm-config/devel redhat-rpm-config.spec,1.28,1.29
Message-ID: <200606151402.k5FE2Qe9029555@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29454

Modified Files:
	redhat-rpm-config.spec 
Log Message:
Bumped version to fix a typo in KMP find-requires.ksyms



Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- redhat-rpm-config.spec	13 Jun 2006 02:57:59 -0000	1.28
+++ redhat-rpm-config.spec	15 Jun 2006 14:01:46 -0000	1.29
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.41
+Version: 8.0.42
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Jun 15 2006 Jon Masters <jcm at redhat.com> - 8.0.42-1
+- Fix a typo in KMP find-requires.
+
 * Tue Jun 13 2006 Jon Masters <jcm at redhat.com> - 8.0.41-1
 - Add support for KMP Fedora Extras packaging.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:12:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:12:55 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.56,
	1.57 booleans-targeted.conf, 1.8, 1.9 modules-targeted.conf,
	1.23, 1.24 selinux-policy.spec, 1.172, 1.173 sources, 1.60, 1.61
Message-ID: <200606151412.k5FECtts030415@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30352

Modified Files:
	.cvsignore booleans-targeted.conf modules-targeted.conf 
	selinux-policy.spec sources 
Log Message:
* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1.fc5
- Bump for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	28 May 2006 11:03:30 -0000	1.56
+++ .cvsignore	15 Jun 2006 14:12:52 -0000	1.57
@@ -68,3 +68,4 @@
 serefpolicy-2.2.40.tgz
 serefpolicy-2.2.42.tgz
 serefpolicy-2.2.43.tgz
+serefpolicy-2.2.47.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/booleans-targeted.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- booleans-targeted.conf	28 May 2006 11:03:47 -0000	1.8
+++ booleans-targeted.conf	15 Jun 2006 14:12:52 -0000	1.9
@@ -88,7 +88,7 @@
 
 # Run SSI execs in system CGI script domain.
 # 
-httpd_ssi_exec = false
+httpd_ssi_exec = true
 
 # Allow http daemon to communicate with the TTY
 # 


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/modules-targeted.conf,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- modules-targeted.conf	6 Jun 2006 21:35:57 -0000	1.23
+++ modules-targeted.conf	15 Jun 2006 14:12:52 -0000	1.24
@@ -1064,6 +1064,20 @@
 # 
 clamav = module
 
+# Layer: services
+# Module: razor
+#
+# A distributed, collaborative, spam detection and filtering network.
+# 
+razor = module
+
+# Layer: services
+# Module: dcc
+#
+# A distributed, collaborative, spam detection and filtering network.
+# 
+dcc = module
+
 # Layer: system
 # Module: setrans
 # Required in base
@@ -1078,3 +1092,6 @@
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
 openvpn = base
+
+
+


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- selinux-policy.spec	6 Jun 2006 21:35:58 -0000	1.172
+++ selinux-policy.spec	15 Jun 2006 14:12:52 -0000	1.173
@@ -15,12 +15,12 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.43
-Release: 4.fc5
+Version: 2.2.47
+Release: 1.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060505.patch
+patch: policy-20060608.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -326,6 +326,30 @@
 %endif
 
 %changelog
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1.fc5
+- Bump for FC5
+
+* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1
+- Update from Upstream
+
+* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-2
+- Fix spec of realplay
+
+* Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.46-1
+- Update to upstream
+
+* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-3
+- Fix semanage
+
+* Mon Jun 12 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-2
+- Allow useradd to create_home_dir in MLS environment
+
+* Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 2.2.45-1
+- Update from upstream
+
+* Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.44-1
+- Update from upstream
+
 * Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.43-4.fc5
 - Bump for fc5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	28 May 2006 11:03:47 -0000	1.60
+++ sources	15 Jun 2006 14:12:52 -0000	1.61
@@ -1 +1 @@
-5a7277ea5b4ff2bba68e180a20700d0a  serefpolicy-2.2.43.tgz
+f8f313db16a432e3d20b771ab1823346  serefpolicy-2.2.47.tgz



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:14:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:14:16 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.189,1.190
Message-ID: <200606151414.k5FEEGi1030691@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30621

Modified Files:
	kdebase.spec 
Log Message:
cleanup specfile



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- kdebase.spec	14 Jun 2006 22:59:13 -0000	1.189
+++ kdebase.spec	15 Jun 2006 14:14:13 -0000	1.190
@@ -25,7 +25,7 @@
 Url: http://www.kde.org
 Group: User Interface/Desktops
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: konsole.desktop
@@ -88,24 +88,42 @@
 Requires: redhat-artwork >= 0.92
 %endif
 
-BuildPrereq: kdelibs-devel >= %{kde_version}
-BuildPrereq: libxml2-devel >= 2.6.5
-BuildPrereq: openmotif-devel
-BuildPrereq: cdparanoia-libs
-BuildPrereq: cdparanoia-devel
-BuildPrereq: samba >= 2.2.3a-5
-BuildPrereq: pam-devel
-BuildPrereq: gettext
-BuildPrereq: imake
-BuildPrereq: dbus-devel >= 0.60
-BuildPrereq: hal-devel >= 0.5
-BuildPrereq: libxkbfile-devel
-BuildPrereq: libXdamage-devel
-BuildPrereq: libXcomposite-devel
-BuildPrereq: libXrender-devel
-BuildPrereq: libXfixes-devel
+BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: samba >= 2.2.3a-5
+BuildRequires: pam-devel
+BuildRequires: gettext
+BuildRequires: imake
+BuildRequires: perl
+BuildRequires: sed
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: pkgconfig
+BuildRequires: doxygen
+BuildRequires: cdparanoia-devel
+BuildRequires: dbus-devel >= 0.60
+BuildRequires: hal-devel >= 0.5
+BuildRequires: freetype-devel
+BuildRequires: openldap-devel
+BuildRequires: cyrus-sasl-devel
+BuildRequires: lm_sensors-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-font-utils
+BuildRequires: libfontenc-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXext-devel 
+BuildRequires: libXtst-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libxkbfile-devel
 %ifnarch s390 s390x
-BuildPrereq: libraw1394-devel
+BuildRequires: libraw1394-devel
 %endif
 
 %description
@@ -183,11 +201,7 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
-   --with-extra-libs=%{_libdir} \
    --with-xdmdir=%{_sysconfdir}/X11/xdm \
-   --with-motif-includes=%{_includedir} \
-   --with-motif-libraries=%{_libdir} \
    --with-pam=yes \
    --with-kdm-pam=kdm \
    --with-kcp-pam=kcheckpass \



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:16:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:16:41 -0400
Subject: rpms/autofs/devel autofs.spec,1.104,1.105
Message-ID: <200606151416.k5FEGfGa003288@cvs.devel.redhat.com>

Author: jmoyer

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31400

Modified Files:
	autofs.spec 
Log Message:
- Change BuildPrereq to BuildRequires as per the package guidelines.
- Add libxml2-devel to the BuildRequires, as it is needed for the LDAP
  authentication bits.




Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- autofs.spec	14 Jun 2006 10:28:14 -0000	1.104
+++ autofs.spec	15 Jun 2006 14:16:38 -0000	1.105
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 11
+%define release 12
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -30,7 +30,7 @@
 Patch16: autofs-5.0.0_beta4-module-load-to-init.patch
 Patch17: autofs-5.0.0_beta4-exports-access-list.patch
 Buildroot: /var/tmp/autofs-tmp
-BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex, cyrus-sasl-devel
+BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel
 Prereq: chkconfig
 Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps
 Obsoletes: autofs-ldap
@@ -140,7 +140,12 @@
 %{_libdir}/autofs/*
 
 %changelog
-* Wed Jun 14 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-10
+* Thu Jun 15 2006 Jeff Moyer <jmoyer at redhat.com> - 5.0.0_beta4-12
+- Change BuildPrereq to BuildRequires as per the package guidelines.
+- Add libxml2-devel to the BuildRequires, as it is needed for the LDAP
+  authentication bits.
+
+* Wed Jun 14 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-11
 - add export access list matching to "hosts" lookup module (bz # 193585).
 
 * Tue Jun 13 2006 Jeff Moyer <jmoyer at redhat.com> - 5.0.0_beta4-10



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:17:58 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060608.patch,NONE,1.1
Message-ID: <200606151417.k5FEHwYJ014279@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14230

Added Files:
	policy-20060608.patch 
Log Message:
* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1.fc5
- Bump for FC5


policy-20060608.patch:
 global_tunables               |    7 +++++++
 modules/admin/bootloader.te   |    2 +-
 modules/admin/consoletype.te  |    7 ++++++-
 modules/admin/netutils.te     |    1 +
 modules/admin/prelink.fc      |    3 +--
 modules/kernel/files.if       |   35 +++++++++++++++++++++++++++++++++++
 modules/kernel/kernel.if      |   38 ++++++++++++++++++++++++++++++++++++++
 modules/services/apache.te    |    9 +++++++++
 modules/services/automount.te |   13 ++++++++++++-
 modules/services/ntp.te       |    1 +
 modules/services/pegasus.if   |   31 +++++++++++++++++++++++++++++++
 modules/services/pegasus.te   |    5 ++---
 modules/system/hostname.te    |    5 ++++-
 modules/system/init.te        |    1 +
 modules/system/mount.te       |    1 +
 modules/system/selinuxutil.te |    2 ++
 modules/system/unconfined.fc  |    2 ++
 modules/system/userdomain.if  |    2 +-
 18 files changed, 155 insertions(+), 10 deletions(-)

--- NEW FILE policy-20060608.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
--- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
+++ serefpolicy-2.2.47/policy/global_tunables	2006-06-14 11:28:00.000000000 -0400
@@ -89,6 +89,13 @@
 
 ## <desc>
 ## <p>
+## Allow Apache to use mod_auth_pam
+## </p>
+## </desc>
+gen_tunable(allow_httpd_mod_auth_pam,false)
+
+## <desc>
+## <p>
 ## Allow java executable stack
 ## </p>
 ## </desc>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-14 11:28:00.000000000 -0400
@@ -49,7 +49,7 @@
 #
 
 allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
-allow bootloader_t self:process { sigkill sigstop signull signal };
+allow bootloader_t self:process { sigkill sigstop signull signal execmem };
 allow bootloader_t self:fifo_file rw_file_perms;
 
 allow bootloader_t bootloader_etc_t:file r_file_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-14 11:28:00.000000000 -0400
@@ -8,7 +8,12 @@
 
 type consoletype_t;
 type consoletype_exec_t;
-init_domain(consoletype_t,consoletype_exec_t)
+#dont transition from initrc
+#init_domain(consoletype_t,consoletype_exec_t)
+domain_type(consoletype_t)
+domain_entry_file(consoletype_t,consoletype_exec_t)
+role system_r types consoletype_t;
+
 mls_file_read_up(consoletype_t)
 mls_file_write_down(consoletype_t)
 role system_r types consoletype_t;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-14 11:48:02.000000000 -0400
@@ -54,6 +54,7 @@
 corenet_udp_sendrecv_all_ports(netutils_t)
 corenet_tcp_connect_all_ports(netutils_t)
 corenet_sendrecv_all_client_packets(netutils_t)
+corenet_udp_bind_generic_node(netutils_t)
 
 fs_getattr_xattr_fs(netutils_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
--- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-14 11:28:00.000000000 -0400
@@ -3,6 +3,5 @@
 
 /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
 
-/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
-
 /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
+/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-14 11:28:00.000000000 -0400
@@ -1931,6 +1931,21 @@
 ')
 
 ########################################
+#
+# files_unlink_boot_flag(domain)
+#
+# /halt, /.autofsck, etc
+#
+interface(`files_unlink_boot_flag',`
+	gen_require(`
+		type root_t;
+	')
+
+	allow $1 root_t:file unlink;
+')
+
+
+########################################
 ## <summary>
 ##	Read files in /etc that are dynamically
 ##	created on boot, such as mtab.
@@ -4379,3 +4394,23 @@
 
 	typeattribute $1 files_unconfined_type;
 ')
+
+########################################
+## <summary>
+##	Mount a filesystem on all files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`files_mounton_all_files',`
+	gen_require(`
+		attribute file_type, security_file_type;
+	')
+
+	allow $1 { file_type -security_file_type }:dir mounton;
+	allow $1 { file_type -security_file_type }:file mounton;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-14 11:28:00.000000000 -0400
@@ -2096,3 +2096,41 @@
 
 	typeattribute $1 kern_unconfined;
 ')
+
+########################################
+## <summary>
+##	Do not audit attempts to list sysctl_type directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_dontaudit_list_sysctls',`
+	gen_require(`
+		attribute sysctl_type;
+	')
+
+	dontaudit $1 sysctl_type:dir list_dir_perms;
+')
+
+
+########################################
+## <summary>
+##	Do not audit attempts to list proc_type file/directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_dontaudit_list_all_proc',`
+	gen_require(`
+		attribute proc_type;
+	')
+
+	dontaudit $1 proc_type:dir list_dir_perms;
+	dontaudit $1 proc_type:file getattr;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
--- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-14 11:28:00.000000000 -0400
@@ -293,6 +293,15 @@
 	miscfiles_manage_public_files(httpd_t)
 ') 
 
+ifdef(`TODO', `
+#
+# We need optionals to be able to be within booleans to make this work
+#
+tunable_policy(`allow_httpd_mod_auth_pam',`
+	auth_domtrans_chk_passwd(httpd_t)
+')
+')
+
 tunable_policy(`httpd_can_network_connect',`
 	corenet_tcp_connect_all_ports(httpd_t)
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
--- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-14 11:28:49.000000000 -0400
@@ -28,7 +28,7 @@
 # Local policy
 #
 
-allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
+allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override sys_admin };
 dontaudit automount_t self:capability sys_tty_config;
 allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
 allow automount_t self:fifo_file rw_file_perms;
@@ -64,9 +64,20 @@
 kernel_read_system_state(automount_t)
 kernel_read_network_state(automount_t)
 kernel_list_proc(automount_t)
+kernel_dontaudit_search_xen_state(automount_t)
 
 files_search_boot(automount_t)
 
+#
+# Automount is slowly adding all mount functionality internally
+#
+files_search_all(automount_t)
+files_mounton_all_mountpoints(automount_t)
+files_mount_all_file_type_fs(automount_t)
+files_unmount_all_file_type_fs(automount_t)
+fs_mount_all_fs(automount_t)
+fs_unmount_all_fs(automount_t)
+
 corecmd_exec_sbin(automount_t)
 corecmd_exec_bin(automount_t)
 corecmd_exec_shell(automount_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
--- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-14 11:28:00.000000000 -0400
@@ -62,6 +62,7 @@
 
 kernel_read_kernel_sysctls(ntpd_t)
 kernel_read_system_state(ntpd_t)
+kernel_read_network_state(ntpd_t)
 
 corenet_non_ipsec_sendrecv(ntpd_t)
 corenet_tcp_sendrecv_all_if(ntpd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
--- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-14 11:28:00.000000000 -0400
@@ -1 +1,32 @@
 ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run pegasus.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed to transition.
+##	</summary>
+## </param>
+#
+interface(`pegasus_domtrans',`
+	gen_require(`
+		type pegasus_t, pegasus_exec_t;
+	')
+
+	ifdef(`targeted_policy',`
+		if(pegasus_disable_trans) {
+			can_exec($1,pegasus_exec_t)
+		} else {
+			domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+		}
+	', `
+		domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+	')
+
+	allow $1 pegasus_t:fd use;
+	allow pegasus_t $1:fd use;
+	allow pegasus_t $1:fifo_file rw_file_perms;
+	allow pegasus_t $1:process sigchld;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-14 11:28:00.000000000 -0400
@@ -100,13 +100,12 @@
 
 auth_use_nsswitch(pegasus_t)
 auth_domtrans_chk_passwd(pegasus_t)
+auth_read_shadow(pegasus_t)
 
 domain_use_interactive_fds(pegasus_t)
 domain_read_all_domains_state(pegasus_t)
 
-files_read_etc_files(pegasus_t)
-files_list_var_lib(pegasus_t)
-files_read_var_lib_files(pegasus_t)
+files_read_all_files(pegasus_t)
 files_read_var_lib_symlinks(pegasus_t)
 
 hostname_exec(pegasus_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
--- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
+++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-14 11:28:00.000000000 -0400
@@ -8,7 +8,10 @@
 
 type hostname_t;
 type hostname_exec_t;
-init_system_domain(hostname_t,hostname_exec_t)
+
+#dont transition from initrc
+domain_type(hostname_t)
+domain_entry_file(hostname_t,hostname_exec_t)
 role system_r types hostname_t;
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
--- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-14 11:28:00.000000000 -0400
@@ -345,6 +345,7 @@
 files_mounton_isid_type_dirs(initrc_t)
 files_list_default(initrc_t)
 files_mounton_default(initrc_t)
+files_unlink_boot_flag(initrc_t)
 
 libs_rw_ld_so_cache(initrc_t)
 libs_use_ld_so(initrc_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
--- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-14 11:28:00.000000000 -0400
@@ -111,6 +111,7 @@
 	tunable_policy(`allow_mount_anyfile',`
 		auth_read_all_dirs_except_shadow(mount_t)
 		auth_read_all_files_except_shadow(mount_t)
+		files_mounton_all_files(mount_t)
 	')
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-14 11:28:00.000000000 -0400
@@ -352,6 +352,8 @@
 kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
 kernel_relabelfrom_unlabeled_pipes(restorecon_t)
 kernel_relabelfrom_unlabeled_sockets(restorecon_t)
+kernel_dontaudit_list_all_proc(restorecon_t)
+kernel_dontaudit_list_sysctls(restorecon_t)
 
 dev_relabel_all_dev_nodes(restorecon_t)
 # cjp: why is this needed?
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-14 11:28:00.000000000 -0400
@@ -7,4 +7,6 @@
 ifdef(`targeted_policy',`
 /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+/usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
+++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-14 11:28:00.000000000 -0400
@@ -4145,7 +4145,7 @@
 	gen_require(`
 		type user_home_dir_t;
 	')
-
+	allow $1 user_home_dir_t:dir manage_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:18:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:18:16 -0400
Subject: rpms/redhat-rpm-config/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21
Message-ID: <200606151418.k5FEIGZW014407@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14308

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	15 Jun 2006 14:12:39 -0000	1.20
+++ .cvsignore	15 Jun 2006 14:18:14 -0000	1.21
@@ -1,2 +1 @@
-redhat-rpm-config-8.0.41.tar.gz
 redhat-rpm-config-8.0.42.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	15 Jun 2006 14:12:39 -0000	1.20
+++ sources	15 Jun 2006 14:18:14 -0000	1.21
@@ -1,2 +1 @@
-29f1557705ce5651b39d869c71453dcd  redhat-rpm-config-8.0.41.tar.gz
 43732c8c0fe10a9c0e147c3c3d4eae68  redhat-rpm-config-8.0.42.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:23:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:23:16 -0400
Subject: rpms/libxklavier/devel .cvsignore, 1.8, 1.9 libxklavier.spec, 1.23,
	1.24 sources, 1.8, 1.9
Message-ID: <200606151423.k5FENGfR015509@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15482

Modified Files:
	.cvsignore libxklavier.spec sources 
Log Message:
2.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Mar 2006 17:50:41 -0000	1.8
+++ .cvsignore	15 Jun 2006 14:23:04 -0000	1.9
@@ -1 +1 @@
-libxklavier-2.2.tar.bz2
+libxklavier-2.91.tar.gz


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libxklavier.spec	8 Jun 2006 16:20:17 -0000	1.23
+++ libxklavier.spec	15 Jun 2006 14:23:04 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	2.2
-Release: 	3
+Version:	2.91
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -10,11 +10,12 @@
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
-Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.bz2
+BuildRequires: glib2-devel >= 2.6.0
+Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Patch0: libxklavier-1.14-werror.patch
-Patch1: libxklavier-2.1.0.2006.02.23-trap-x-error.patch
+#Patch0: libxklavier-1.14-werror.patch
+#Patch1: libxklavier-2.1.0.2006.02.23-trap-x-error.patch
 
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
@@ -32,8 +33,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .werror
-%patch1 -p1 -b .trap-x-error
+#%patch0 -p1 -b .werror
+#%patch1 -p1 -b .trap-x-error
 
 %build
 
@@ -68,8 +69,12 @@
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/*
+%{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.91-1
+- Update to 2.91
+
 * Thu Jun  8 2006 Jesse Keating <jkeating at redhat.com> - 2.2-3
 - Add missing BR libxml2-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Mar 2006 17:50:41 -0000	1.8
+++ sources	15 Jun 2006 14:23:04 -0000	1.9
@@ -1 +1 @@
-1c53646f35d77564f42d3f4342cd443f  libxklavier-2.2.tar.bz2
+53d9864d165c86edb6a67f7ebe140814  libxklavier-2.91.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:24:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:24:52 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.190,1.191
Message-ID: <200606151424.k5FEOq3a016159@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15932

Modified Files:
	kdebase.spec 
Log Message:
BR: lm_sensors-devel on alpha %{ix86} x86_64



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kdebase.spec	15 Jun 2006 14:14:13 -0000	1.190
+++ kdebase.spec	15 Jun 2006 14:24:49 -0000	1.191
@@ -106,7 +106,6 @@
 BuildRequires: freetype-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
-BuildRequires: lm_sensors-devel
 BuildRequires: libart_lgpl-devel
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-font-utils
@@ -125,6 +124,9 @@
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 %endif
+%ifarch alpha %{ix86} x86_64
+BuildRequires: lm_sensors-devel
+%endif
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:34:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:34:11 -0400
Subject: rpms/gtk2/FC-5 gtk2.spec,1.138,1.139
Message-ID: <200606151434.k5FEYBu8017930@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17831

Modified Files:
	gtk2.spec 
Log Message:
add missing build requires



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/gtk2.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gtk2.spec	13 Jun 2006 02:23:54 -0000	1.138
+++ gtk2.spec	15 Jun 2006 14:34:08 -0000	1.139
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -39,6 +39,11 @@
 BuildPrereq: /usr/bin/automake-1.7
 # needed for running aclocal
 BuildPrereq: gtk-doc
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXinerama-devel
 
 BuildRoot: %{_tmppath}/gtk-%{PACKAGE_VERSION}-root
 Obsoletes: gtk+-gtkbeta
@@ -266,6 +271,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Thu Jun 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.19-2
+- Add missing BuildRequires
+
 * Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.19-1
 - Update to 2.8.19
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:40:01 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.156,1.157
Message-ID: <200606151440.k5FEe18p018546@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18499

Modified Files:
	gtk2.spec 
Log Message:
fix missing build reqs



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gtk2.spec	14 Jun 2006 18:05:21 -0000	1.156
+++ gtk2.spec	15 Jun 2006 14:39:57 -0000	1.157
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -39,6 +39,11 @@
 BuildRequires: gtk-doc
 BuildRequires: cups-devel
 BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXinerama-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gtk+-gtkbeta
@@ -269,6 +274,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Thu Jun 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-4
+- Add more BuildRequires
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-3
 - Require cairo 1.1.8
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:45:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:45:21 -0400
Subject: rpms/selinux-policy/FC-5 policygentool, 1.5, 1.6 selinux-policy.spec,
	1.173, 1.174
Message-ID: <200606151445.k5FEjLaF019559@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19503

Modified Files:
	policygentool selinux-policy.spec 
Log Message:
* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2.fc5



Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policygentool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policygentool	24 May 2006 03:19:52 -0000	1.5
+++ policygentool	15 Jun 2006 14:45:19 -0000	1.6
@@ -38,7 +38,7 @@
 ## </param>
 #
 interface(`TEMPLATETYPE_domtrans',`
-	gen_requires(`
+	gen_require(`
 		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 	')
 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- selinux-policy.spec	15 Jun 2006 14:12:52 -0000	1.173
+++ selinux-policy.spec	15 Jun 2006 14:45:19 -0000	1.174
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.47
-Release: 1.fc5
+Release: 2.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -326,8 +326,10 @@
 %endif
 
 %changelog
-* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1.fc5
-- Bump for FC5
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2.fc5
+
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2
+- Fix policygentool gen_requires
 
 * Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1
 - Update from Upstream



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:45:43 -0400
Subject: rpms/selinux-policy/devel policygentool, 1.7,
	1.8 selinux-policy.spec, 1.209, 1.210
Message-ID: <200606151445.k5FEjhdG019966@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19792

Modified Files:
	policygentool selinux-policy.spec 
Log Message:
* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2
- Fix policygentool gen_requires



Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policygentool	9 May 2006 21:50:36 -0000	1.7
+++ policygentool	15 Jun 2006 14:45:39 -0000	1.8
@@ -38,7 +38,7 @@
 ## </param>
 #
 interface(`TEMPLATETYPE_domtrans',`
-	gen_requires(`
+	gen_require(`
 		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 	')
 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- selinux-policy.spec	14 Jun 2006 15:48:59 -0000	1.209
+++ selinux-policy.spec	15 Jun 2006 14:45:40 -0000	1.210
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.47
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -51,7 +51,6 @@
 %dir %{_sysconfdir}/selinux
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config
 %ghost %{_sysconfdir}/sysconfig/selinux
-
 %dir %{_usr}/share/selinux/devel
 %dir %{_usr}/share/selinux/devel/include
 %{_usr}/share/selinux/devel/include/*
@@ -336,6 +335,9 @@
 %endif
 
 %changelog
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2
+- Fix policygentool gen_requires
+
 * Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1
 - Update from Upstream
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 14:48:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 10:48:04 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.33,1.34
Message-ID: <200606151448.k5FEm4K3002627@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2596

Modified Files:
	OpenIPMI.spec 
Log Message:
bump for glib2


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- OpenIPMI.spec	16 May 2006 13:35:15 -0000	1.33
+++ OpenIPMI.spec	15 Jun 2006 14:48:02 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.6
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -164,6 +164,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> 2.0.6-2
+- Bump for new glib2
+
 * Tue May 16 2006 Phil Knirsch <pknirsch at redhat.com> 2.0.6-1
 - Fixed bug with type conversion in ipmitool (#191091)
 - Added python bindings 



From fedora-cvs-commits at redhat.com  Thu Jun 15 15:09:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 11:09:39 -0400
Subject: rpms/valgrind/devel valgrind-3.2.0-makefile.patch, NONE,
	1.1 valgrind-3.2.0-syscall-updates.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 sources, 1.9, 1.10 valgrind.spec, 1.33,
	1.34 valgrind-3.1.1-amd64-speedup.patch, 1.2,
	NONE valgrind-3.1.1-cfa-val-expr.patch, 1.1,
	NONE valgrind-3.1.1-glibc24.patch, 1.1,
	NONE valgrind-3.1.1-makefile.patch, 1.1,
	NONE valgrind-3.1.1-robust-list.patch, 1.1,
	NONE valgrind-3.1.1-syscall-updates-from-trunk.patch, 1.3,
	NONE valgrind-3.1.1-syscall-updates.patch, 1.2,
	NONE valgrind-3.1.1-syscall-updates2.patch, 1.1,
	NONE valgrind-3.1.1-valgrind_h.patch, 1.1, NONE
Message-ID: <200606151509.k5FF9dp1008145@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8091

Modified Files:
	.cvsignore sources valgrind.spec 
Added Files:
	valgrind-3.2.0-makefile.patch 
	valgrind-3.2.0-syscall-updates.patch 
Removed Files:
	valgrind-3.1.1-amd64-speedup.patch 
	valgrind-3.1.1-cfa-val-expr.patch valgrind-3.1.1-glibc24.patch 
	valgrind-3.1.1-makefile.patch valgrind-3.1.1-robust-list.patch 
	valgrind-3.1.1-syscall-updates-from-trunk.patch 
	valgrind-3.1.1-syscall-updates.patch 
	valgrind-3.1.1-syscall-updates2.patch 
	valgrind-3.1.1-valgrind_h.patch 
Log Message:
3.2.0-1

valgrind-3.2.0-makefile.patch:
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE valgrind-3.2.0-makefile.patch ---
--- valgrind-3.1.1/VEX/Makefile.jj	2006-02-20 10:17:16.000000000 -0500
+++ valgrind-3.1.1/VEX/Makefile	2006-05-26 12:38:20.000000000 -0400
@@ -63,10 +63,10 @@ PUB_INCLUDES = -Ipub
 PRIV_INCLUDES = -Ipriv
 
 
-ifndef $(CC)
+ifndef CC
    CC = gcc 
 endif 
-ifndef $(AR)
+ifndef AR
    AR = ar 
 endif
 

valgrind-3.2.0-syscall-updates.patch:
 syswrap-ppc32-linux.c |   30 +++++++++
 syswrap-ppc64-linux.c |  165 ++++++++++++++++++++++++++------------------------
 2 files changed, 119 insertions(+), 76 deletions(-)

--- NEW FILE valgrind-3.2.0-syscall-updates.patch ---
--- valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2006-04-13 21:09:00.000000000 -0400
+++ valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc32-linux.c	2006-06-15 10:09:38.000000000 -0400
@@ -386,6 +386,7 @@ DECL_TEMPLATE(ppc32_linux, sys_mmap);
 DECL_TEMPLATE(ppc32_linux, sys_mmap2);
 DECL_TEMPLATE(ppc32_linux, sys_stat64);
 DECL_TEMPLATE(ppc32_linux, sys_lstat64);
+DECL_TEMPLATE(ppc32_linux, sys_fstatat64);
 DECL_TEMPLATE(ppc32_linux, sys_fstat64);
 DECL_TEMPLATE(ppc32_linux, sys_ipc);
 DECL_TEMPLATE(ppc32_linux, sys_clone);
@@ -719,6 +720,20 @@ POST(sys_lstat64)
    }
 }
 
+PRE(sys_fstatat64)
+{
+   PRINT("sys_fstatat64 ( %d, %p(%s), %p )",ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "fstatat64",
+                 int, dfd, char *, file_name, struct stat64 *, buf);
+   PRE_MEM_RASCIIZ( "fstatat64(file_name)", ARG2 );
+   PRE_MEM_WRITE( "fstatat64(buf)", ARG3, sizeof(struct vki_stat64) );
+}
+
+POST(sys_fstatat64)
+{
+   POST_MEM_WRITE( ARG3, sizeof(struct vki_stat64) );
+}
+
 PRE(sys_fstat64)
 {
   PRINT("sys_fstat64 ( %d, %p )",ARG1,ARG2);
@@ -1798,6 +1813,21 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_inotify_init,  sys_inotify_init),               // 275
    LINX_(__NR_inotify_add_watch,  sys_inotify_add_watch),     // 276
    LINX_(__NR_inotify_rm_watch,   sys_inotify_rm_watch),      // 277
+
+   LINXY(__NR_openat,            sys_openat),            // 286
+   LINX_(__NR_mkdirat,           sys_mkdirat),           // 287
+   LINX_(__NR_mknodat,           sys_mknodat),           // 288
+   LINX_(__NR_fchownat,          sys_fchownat),          // 289
+   LINX_(__NR_futimesat,         sys_futimesat),         // 290
+   PLAXY(__NR_fstatat64,         sys_fstatat64),         // 291
+   LINX_(__NR_unlinkat,          sys_unlinkat),          // 292
+   LINX_(__NR_renameat,          sys_renameat),          // 293
+   LINX_(__NR_linkat,            sys_linkat),            // 294
+   LINX_(__NR_symlinkat,         sys_symlinkat),         // 295
+   LINX_(__NR_readlinkat,        sys_readlinkat),        // 296
+   LINX_(__NR_fchmodat,          sys_fchmodat),          // 297
+   LINX_(__NR_faccessat,         sys_faccessat),         // 298
+
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc64-linux.c.jj	2006-02-14 18:00:32.000000000 -0500
+++ valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc64-linux.c	2006-06-15 10:42:18.000000000 -0400
@@ -1174,7 +1174,7 @@ PRE(sys_rt_sigreturn)
 const SyscallTableEntry ML_(syscall_table)[] = {
 // _____(__NR_restart_syscall,   sys_restart_syscall),    //   0
    GENX_(__NR_exit,              sys_exit),               //   1
-// _____(__NR_fork,              sys_fork),               //   2
+   GENX_(__NR_fork,              sys_fork),               //   2
    GENXY(__NR_read,              sys_read),               //   3
    GENX_(__NR_write,             sys_write),              //   4
 
@@ -1182,25 +1182,25 @@ const SyscallTableEntry ML_(syscall_tabl
    GENXY(__NR_close,             sys_close),              //   6
    GENXY(__NR_waitpid,           sys_waitpid),            //   7
    GENXY(__NR_creat,             sys_creat),              //   8
-// _____(__NR_link,              sys_link),               //   9
+   GENX_(__NR_link,              sys_link),               //   9
 
    GENX_(__NR_unlink,            sys_unlink),             //  10
    GENX_(__NR_execve,            sys_execve),             //  11
    GENX_(__NR_chdir,             sys_chdir),              //  12
    GENXY(__NR_time,              sys_time),               //  13
-// _____(__NR_mknod,             sys_mknod),              //  14
+   GENX_(__NR_mknod,             sys_mknod),              //  14
 
    GENX_(__NR_chmod,             sys_chmod),              //  15
-// _____(__NR_lchown,            sys_lchown),             //  16
+   GENX_(__NR_lchown,            sys_lchown),             //  16
 // _____(__NR_break,             sys_break),              //  17
 // _____(__NR_oldstat,           sys_oldstat),            //  18
    LINX_(__NR_lseek,             sys_lseek),              //  19
 
    GENX_(__NR_getpid,            sys_getpid),             //  20
-// _____(__NR_mount,             sys_mount),              //  21
+   LINX_(__NR_mount,             sys_mount),              //  21
 // _____(__NR_umount,            sys_umount),             //  22
-// _____(__NR_setuid,            sys_setuid),             //  23
-// _____(__NR_getuid,            sys_getuid),             //  24
+   GENX_(__NR_setuid,            sys_setuid),             //  23
+   GENX_(__NR_getuid,            sys_getuid),             //  24
 
 // _____(__NR_stime,             sys_stime),              //  25
 // _____(__NR_ptrace,            sys_ptrace),             //  26
@@ -1217,7 +1217,7 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_ftime,             sys_ftime),              //  35
 // _____(__NR_sync,              sys_sync),               //  36
    GENX_(__NR_kill,              sys_kill),               //  37
-// _____(__NR_rename,            sys_rename),             //  38
+   GENX_(__NR_rename,            sys_rename),             //  38
    GENX_(__NR_mkdir,             sys_mkdir),              //  39
 
 // _____(__NR_rmdir,             sys_rmdir),              //  40
@@ -1227,37 +1227,37 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_prof,              sys_prof),               //  44
 
    GENX_(__NR_brk,               sys_brk),                //  45
-// _____(__NR_setgid,            sys_setgid),             //  46
-// _____(__NR_getgid,            sys_getgid),             //  47
+   GENX_(__NR_setgid,            sys_setgid),             //  46
+   GENX_(__NR_getgid,            sys_getgid),             //  47
 // _____(__NR_signal,            sys_signal),             //  48
    GENX_(__NR_geteuid,           sys_geteuid),            //  49
 
-// _____(__NR_getegid,           sys_getegid),            //  50
+   GENX_(__NR_getegid,           sys_getegid),            //  50
 // _____(__NR_acct,              sys_acct),               //  51
-// _____(__NR_umount2,           sys_umount2),            //  52
+   LINX_(__NR_umount2,           sys_umount),             //  52
 // _____(__NR_lock,              sys_lock),               //  53
    GENXY(__NR_ioctl,             sys_ioctl),              //  54
 
    GENXY(__NR_fcntl,             sys_fcntl),              //  55
 // _____(__NR_mpx,               sys_mpx),                //  56
-// _____(__NR_setpgid,           sys_setpgid),            //  57
+   GENX_(__NR_setpgid,           sys_setpgid),            //  57
 // _____(__NR_ulimit,            sys_ulimit),             //  58
 // _____(__NR_oldolduname,       sys_oldolduname),        //  59
 
-// _____(__NR_umask,             sys_umask),              //  60
-// _____(__NR_chroot,            sys_chroot),             //  61
+   GENX_(__NR_umask,             sys_umask),              //  60
+   GENX_(__NR_chroot,            sys_chroot),             //  61
 // _____(__NR_ustat,             sys_ustat),              //  62
    GENXY(__NR_dup2,              sys_dup2),               //  63
    GENX_(__NR_getppid,           sys_getppid),            //  64
 
-// _____(__NR_getpgrp,           sys_getpgrp),            //  65
-// _____(__NR_setsid,            sys_setsid),             //  66
+   GENX_(__NR_getpgrp,           sys_getpgrp),            //  65
+   GENX_(__NR_setsid,            sys_setsid),             //  66
 // _____(__NR_sigaction,         sys_sigaction),          //  67
 // _____(__NR_sgetmask,          sys_sgetmask),           //  68
 // _____(__NR_ssetmask,          sys_ssetmask),           //  69
 
-// _____(__NR_setreuid,          sys_setreuid),           //  70
-// _____(__NR_setregid,          sys_setregid),           //  71
+   GENX_(__NR_setreuid,          sys_setreuid),           //  70
+   GENX_(__NR_setregid,          sys_setregid),           //  71
 // _____(__NR_sigsuspend,        sys_sigsuspend),         //  72
 // _____(__NR_sigpending,        sys_sigpending),         //  73
 // _____(__NR_sethostname,       sys_sethostname),        //  74
@@ -1268,10 +1268,10 @@ const SyscallTableEntry ML_(syscall_tabl
    GENXY(__NR_gettimeofday,      sys_gettimeofday),       //  78
 // _____(__NR_settimeofday,      sys_settimeofday),       //  79
 
-// _____(__NR_getgroups,         sys_getgroups),          //  80
-// _____(__NR_setgroups,         sys_setgroups),          //  81
+   GENXY(__NR_getgroups,         sys_getgroups),          //  80
+   GENX_(__NR_setgroups,         sys_setgroups),          //  81
 // _____(__NR_select,            sys_select),             //  82
-// _____(__NR_symlink,           sys_symlink),            //  83
+   GENX_(__NR_symlink,           sys_symlink),            //  83
 // _____(__NR_oldlstat,          sys_oldlstat),           //  84
 
    GENX_(__NR_readlink,          sys_readlink),           //  85
@@ -1282,7 +1282,7 @@ const SyscallTableEntry ML_(syscall_tabl
 
    PLAX_(__NR_mmap,              sys_mmap),               //  90
    GENXY(__NR_munmap,            sys_munmap),             //  91
-// _____(__NR_truncate,          sys_truncate),           //  92
+   GENX_(__NR_truncate,          sys_truncate),           //  92
    GENX_(__NR_ftruncate,         sys_ftruncate),          //  93
 // _____(__NR_fchmod,            sys_fchmod),             //  94
 
@@ -1330,21 +1330,21 @@ const SyscallTableEntry ML_(syscall_tabl
 
 // _____(__NR_get_kernel_syms,   sys_get_kernel_syms),    // 130
 // _____(__NR_quotactl,          sys_quotactl),           // 131
-// _____(__NR_getpgid,           sys_getpgid),            // 132
-// _____(__NR_fchdir,            sys_fchdir),             // 133
+   GENX_(__NR_getpgid,           sys_getpgid),            // 132
+   GENX_(__NR_fchdir,            sys_fchdir),             // 133
 // _____(__NR_bdflush,           sys_bdflush),            // 134
 
 // _____(__NR_sysfs,             sys_sysfs),              // 135
-// _____(__NR_personality,       sys_personality),        // 136
+   LINX_(__NR_personality,       sys_personality),        // 136
 // _____(__NR_afs_syscall,       sys_afs_syscall),        // 137
-// _____(__NR_setfsuid,          sys_setfsuid),           // 138
-// _____(__NR_setfsgid,          sys_setfsgid),           // 139
+   LINX_(__NR_setfsuid,          sys_setfsuid),           // 138
+   LINX_(__NR_setfsgid,          sys_setfsgid),           // 139
 
    LINXY(__NR__llseek,           sys_llseek),             // 140
    GENXY(__NR_getdents,          sys_getdents),           // 141
-// _____(__NR__newselect,        sys__newselect),         // 142
-// _____(__NR_flock,             sys_flock),              // 143
-// _____(__NR_msync,             sys_msync),              // 144
+   GENX_(__NR__newselect,        sys_select),             // 142
+   GENX_(__NR_flock,             sys_flock),              // 143
+   GENX_(__NR_msync,             sys_msync),              // 144
 
    GENXY(__NR_readv,             sys_readv),              // 145
    GENX_(__NR_writev,            sys_writev),             // 146
@@ -1352,19 +1352,19 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_fdatasync,         sys_fdatasync),          // 148
    LINXY(__NR__sysctl,           sys_sysctl),             // 149
 
-// _____(__NR_mlock,             sys_mlock),              // 150
-// _____(__NR_munlock,           sys_munlock),            // 151
-// _____(__NR_mlockall,          sys_mlockall),           // 152
-// _____(__NR_munlockall,        sys_munlockall),         // 153
+   GENX_(__NR_mlock,             sys_mlock),              // 150
+   GENX_(__NR_munlock,           sys_munlock),            // 151
+   GENX_(__NR_mlockall,          sys_mlockall),           // 152
+   LINX_(__NR_munlockall,        sys_munlockall),         // 153
 // _____(__NR_sched_setparam,    sys_sched_setparam),     // 154
 
-// _____(__NR_sched_getparam,    sys_sched_getparam),     // 155
-// _____(__NR_sched_setscheduler,      sys_sched_setscheduler),     // 156
-// _____(__NR_sched_getscheduler,      sys_sched_getscheduler),     // 157
-// _____(__NR_sched_yield,             sys_sched_yield),            // 158
-// _____(__NR_sched_get_priority_max,  sys_sched_get_priority_max), // 159
+   LINXY(__NR_sched_getparam,         sys_sched_getparam),        // 155
+   LINX_(__NR_sched_setscheduler,     sys_sched_setscheduler),    // 156
+   LINX_(__NR_sched_getscheduler,     sys_sched_getscheduler),    // 157
+   LINX_(__NR_sched_yield,            sys_sched_yield),           // 158
+   LINX_(__NR_sched_get_priority_max, sys_sched_get_priority_max),// 159
 
-// _____(__NR_sched_get_priority_min,  sys_sched_get_priority_min), // 160
+   LINX_(__NR_sched_get_priority_min, sys_sched_get_priority_min),// 160
 // _____(__NR_sched_rr_get_interval,   sys_sched_rr_get_interval),  // 161
    GENXY(__NR_nanosleep,         sys_nanosleep),          // 162
    GENX_(__NR_mremap,            sys_mremap),             // 163
@@ -1395,7 +1395,7 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_capset,            sys_capset),             // 184
 
    GENXY(__NR_sigaltstack,       sys_sigaltstack),        // 185
-// _____(__NR_sendfile,          sys_sendfile),           // 186
+   LINXY(__NR_sendfile,          sys_sendfile),           // 186
 // _____(__NR_getpmsg,           sys_getpmsg),            // 187
 // _____(__NR_putpmsg,           sys_putpmsg),            // 188
    GENX_(__NR_vfork,             sys_fork),               // 189 treat as fork
@@ -1426,50 +1426,48 @@ const SyscallTableEntry ML_(syscall_tabl
 
 // _____(__NR_lsetxattr,         sys_lsetxattr),          // 210
 // _____(__NR_fsetxattr,         sys_fsetxattr),          // 211
-// _____(__NR_getxattr,          sys_getxattr),           // 212
-// _____(__NR_lgetxattr,         sys_lgetxattr),          // 213
-// _____(__NR_fgetxattr,         sys_fgetxattr),          // 214
-
-// _____(__NR_listxattr,         sys_listxattr),          // 215
-// _____(__NR_llistxattr,        sys_llistxattr),         // 216
-// _____(__NR_flistxattr,        sys_flistxattr),         // 217
-// _____(__NR_removexattr,       sys_removexattr),        // 218
-// _____(__NR_lremovexattr,      sys_lremovexattr),       // 219
+   LINXY(__NR_getxattr,          sys_getxattr),           // 212
+   LINXY(__NR_lgetxattr,         sys_lgetxattr),          // 213
+   LINXY(__NR_fgetxattr,         sys_fgetxattr),          // 214
+   LINXY(__NR_listxattr,         sys_listxattr),          // 215
+   LINXY(__NR_llistxattr,        sys_llistxattr),         // 216
+   LINXY(__NR_flistxattr,        sys_flistxattr),         // 217
+   LINX_(__NR_removexattr,       sys_removexattr),        // 218
+   LINX_(__NR_lremovexattr,      sys_lremovexattr),       // 219
+   LINX_(__NR_fremovexattr,      sys_fremovexattr),       // 220
 
-// _____(__NR_fremovexattr,      sys_fremovexattr),       // 220
    LINXY(__NR_futex,             sys_futex),              // 221
-// _____(__NR_sched_setaffinity, sys_sched_setaffinity),  // 222
-// _____(__NR_sched_getaffinity, sys_sched_getaffinity),  // 223
+   LINX_(__NR_sched_setaffinity, sys_sched_setaffinity),  // 222
+   LINXY(__NR_sched_getaffinity, sys_sched_getaffinity),  // 223
 // /* 224 currently unused */
 
 // _____(__NR_tuxcall,           sys_tuxcall),            // 225
 // /* #define __NR_sendfile64      226     32bit only */
-// _____(__NR_io_setup,          sys_io_setup),           // 227
-// _____(__NR_io_destroy,        sys_io_destroy),         // 228
-// _____(__NR_io_getevents,      sys_io_getevents),       // 229
-
-// _____(__NR_io_submit,         sys_io_submit),          // 230
-// _____(__NR_io_cancel,         sys_io_cancel),          // 231
+   LINX_(__NR_io_setup,          sys_io_setup),           // 227
+   LINX_(__NR_io_destroy,        sys_io_destroy),         // 228
+   LINXY(__NR_io_getevents,      sys_io_getevents),       // 229
+   LINX_(__NR_io_submit,         sys_io_submit),          // 230
+   LINXY(__NR_io_cancel,         sys_io_cancel),          // 231
    LINX_(__NR_set_tid_address,   sys_set_tid_address),    // 232
 // _____(__NR_fadvise64,         sys_fadvise64),          // 233
    LINX_(__NR_exit_group,        sys_exit_group),         // 234
 
 // _____(__NR_lookup_dcookie,    sys_lookup_dcookie),     // 235
-// _____(__NR_epoll_create,      sys_epoll_create),       // 236
-// _____(__NR_epoll_ctl,         sys_epoll_ctl),          // 237
-// _____(__NR_epoll_wait,        sys_epoll_wait),         // 238
+   LINXY(__NR_epoll_create,      sys_epoll_create),       // 236
+   LINX_(__NR_epoll_ctl,         sys_epoll_ctl),          // 237
+   LINXY(__NR_epoll_wait,        sys_epoll_wait),         // 238
 // _____(__NR_remap_file_pages,  sys_remap_file_pages),   // 239
 
-// _____(__NR_timer_create,      sys_timer_create),       // 240
-// _____(__NR_timer_settime,     sys_timer_settime),      // 241
-// _____(__NR_timer_gettime,     sys_timer_gettime),      // 242
-// _____(__NR_timer_getoverrun,  sys_timer_getoverrun),   // 243
-// _____(__NR_timer_delete,      sys_timer_delete),       // 244
-
-// _____(__NR_clock_settime,     sys_clock_settime),      // 245
-// _____(__NR_clock_gettime,     sys_clock_gettime),      // 246
-// _____(__NR_clock_getres,      sys_clock_getres),       // 247
-// _____(__NR_clock_nanosleep,   sys_clock_nanosleep),    // 248
+   LINXY(__NR_timer_create,      sys_timer_create),       // 240
+   LINXY(__NR_timer_settime,     sys_timer_settime),      // 241
+   LINXY(__NR_timer_gettime,     sys_timer_gettime),      // 242
+   LINX_(__NR_timer_getoverrun,  sys_timer_getoverrun),   // 243
+   LINX_(__NR_timer_delete,      sys_timer_delete),       // 244
+   LINX_(__NR_clock_settime,     sys_clock_settime),      // 245
+   LINXY(__NR_clock_gettime,     sys_clock_gettime),      // 246
+   LINXY(__NR_clock_getres,      sys_clock_getres),       // 247
+   LINXY(__NR_clock_nanosleep,   sys_clock_nanosleep),    // 248
+
 // _____(__NR_swapcontext,       sys_swapcontext),        // 249
 
    LINXY(__NR_tgkill,            sys_tgkill),             // 250
@@ -1502,9 +1500,24 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_ioprio_set,        sys_ioprio_set),         // 273
 // _____(__NR_ioprio_get,        sys_ioprio_get),         // 274
 
-// _____(__NR_inotify_init,      sys_inotify_init),       // 275
-// _____(__NR_inotify_add_watch, sys_inotify_add_watch),  // 276
-// _____(__NR_inotify_rm_watch,  sys_inotify_rm_watch)    // 277
+   LINX_(__NR_inotify_init,  sys_inotify_init),           // 275
+   LINX_(__NR_inotify_add_watch,  sys_inotify_add_watch), // 276
+   LINX_(__NR_inotify_rm_watch,   sys_inotify_rm_watch),  // 277
+
+   LINXY(__NR_openat,            sys_openat),             // 286
+   LINX_(__NR_mkdirat,           sys_mkdirat),            // 287
+   LINX_(__NR_mknodat,           sys_mknodat),            // 288
+   LINX_(__NR_fchownat,          sys_fchownat),           // 289
+   LINX_(__NR_futimesat,         sys_futimesat),          // 290
+   LINXY(__NR_newfstatat,        sys_newfstatat),         // 291
+   LINX_(__NR_unlinkat,          sys_unlinkat),           // 292
+   LINX_(__NR_renameat,          sys_renameat),           // 293
+   LINX_(__NR_linkat,            sys_linkat),             // 294
+   LINX_(__NR_symlinkat,         sys_symlinkat),          // 295
+   LINX_(__NR_readlinkat,        sys_readlinkat),         // 296
+   LINX_(__NR_fchmodat,          sys_fchmodat),           // 297
+   LINX_(__NR_faccessat,         sys_faccessat),          // 298
+
 };
 
 const UInt ML_(syscall_table_size) = 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Apr 2006 16:55:06 -0000	1.9
+++ .cvsignore	15 Jun 2006 15:09:25 -0000	1.10
@@ -1 +1 @@
-valgrind-3.1.1.tar.bz2
+valgrind-3.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Apr 2006 16:55:06 -0000	1.9
+++ sources	15 Jun 2006 15:09:25 -0000	1.10
@@ -1 +1 @@
-3bbfafedb59c19bf75977381ce2eb6d7  valgrind-3.1.1.tar.bz2
+c418026ce7c38a740ef17efe59509fcf  valgrind-3.2.0.tar.bz2


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- valgrind.spec	26 May 2006 16:40:44 -0000	1.33
+++ valgrind.spec	15 Jun 2006 15:09:25 -0000	1.34
@@ -1,27 +1,21 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
-Version: 3.1.1
-Release: 3
+Version: 3.2.0
+Release: 1
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Patch1: valgrind-3.1.1-valgrind_h.patch
-Patch2: valgrind-3.1.1-amd64-speedup.patch
-Patch3: valgrind-3.1.1-cfa-val-expr.patch
-Patch4: valgrind-3.1.1-glibc24.patch
-Patch5: valgrind-3.1.1-syscall-updates-from-trunk.patch
-Patch6: valgrind-3.1.1-syscall-updates.patch
-Patch7: valgrind-3.1.1-robust-list.patch
-Patch8: valgrind-3.1.1-syscall-updates2.patch
-Patch9: valgrind-3.1.1-makefile.patch
+Patch1: valgrind-3.2.0-syscall-updates.patch
+Patch2: valgrind-3.2.0-makefile.patch
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
 BuildRoot: %{_tmppath}/%{name}-root
-%ifarch x86_64
+Obsoletes: valgrind-callgrind
+%ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ppc64
 
 # Disable build root strip policy
 %define __spec_install_post /usr/lib/rpm/brp-compress || :
@@ -41,16 +35,9 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
-%ifarch x86_64
+%ifarch x86_64 ppc64
 # Ugly hack - libgcc 32-bit package might not be installed
 mkdir -p libgcc/32
 touch libgcc/32/libgcc_s.a
@@ -86,7 +73,7 @@
 EOF
 gcc $RPM_OPT_FLAGS -o close_fds close_fds.c
 
-for i in `find . -type f \( -name *-amd64-linux -o -name *-x86-linux -o -name *-ppc-linux \)`; do
+for i in `find . -type f \( -name *-amd64-linux -o -name *-x86-linux -o -name *-ppc*-linux \)`; do
   case "`file $i`" in
     *ELF*executable*statically\ linked*)
       objcopy -R .debug_loc -R .debug_frame -R .debug_ranges $i
@@ -112,6 +99,11 @@
 ln -sf ../../lib/valgrind/x86-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/x86-linux
 %endif
 
+%ifarch ppc64
+rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc-linux
+ln -sf ../../lib/valgrind/ppc-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc-linux
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -126,6 +118,10 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Thu Jun 15 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1
+- update to 3.2.0
+  - ppc64 support
+
 * Fri May 26 2006 Jakub Jelinek <jakub at redhat.com> 3.1.1-3
 - handle [sg]et_robust_list syscalls on i?86/x86_64
 - handle *at syscalls on ppc


--- valgrind-3.1.1-amd64-speedup.patch DELETED ---


--- valgrind-3.1.1-cfa-val-expr.patch DELETED ---


--- valgrind-3.1.1-glibc24.patch DELETED ---


--- valgrind-3.1.1-makefile.patch DELETED ---


--- valgrind-3.1.1-robust-list.patch DELETED ---


--- valgrind-3.1.1-syscall-updates-from-trunk.patch DELETED ---


--- valgrind-3.1.1-syscall-updates.patch DELETED ---


--- valgrind-3.1.1-syscall-updates2.patch DELETED ---


--- valgrind-3.1.1-valgrind_h.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 15 15:21:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 11:21:13 -0400
Subject: rpms/bash/devel bash-requires.patch, NONE, 1.1 bash.spec, 1.119,
	1.120 bash-2.05a-requires.patch, 1.3, NONE
Message-ID: <200606151521.k5FFLD44024664@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24611

Modified Files:
	bash.spec 
Added Files:
	bash-requires.patch 
Removed Files:
	bash-2.05a-requires.patch 
Log Message:
* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 3.1-15
- Updated requires patch to the ALT version.


bash-requires.patch:
 builtins.h            |    1 +
 builtins/mkbuiltins.c |   25 ++++++++++++++++++++++++-
 doc/bash.1            |    7 +++++++
 doc/bashref.texi      |    7 +++++++
 eval.c                |    3 ++-
 execute_cmd.c         |   14 ++++++++++++--
 execute_cmd.h         |    2 ++
 make_cmd.c            |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 shell.c               |   10 ++++++++++
 9 files changed, 115 insertions(+), 4 deletions(-)

--- NEW FILE bash-requires.patch ---
diff -upk.orig bash-3.1.orig/builtins/mkbuiltins.c bash-3.1/builtins/mkbuiltins.c
--- bash-3.1.orig/builtins/mkbuiltins.c	2005-09-10 16:22:12 +0000
+++ bash-3.1/builtins/mkbuiltins.c	2006-01-06 00:42:16 +0000
@@ -60,8 +60,13 @@ extern char *strcpy ();
 #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
 
 /* Flag values that builtins can have. */
+/*  These flags are for the C code generator, 
+    the C which is produced (./builtin.c)
+    includes the flags definitions found 
+    in ../builtins.h */
 #define BUILTIN_FLAG_SPECIAL	0x01
 #define BUILTIN_FLAG_ASSIGNMENT 0x02
+#define BUILTIN_FLAG_REQUIRES	0x04
 
 #define BASE_INDENT	4
 
@@ -145,9 +150,17 @@ char *assignment_builtins[] =
   (char *)NULL
 };
 
+/* The builtin commands that cause requirements on other files. */
+static char *requires_builtins[] =
+{
+  ".", "command", "exec", "source", "inlib",
+  (char *)NULL
+};
+
 /* Forward declarations. */
 static int is_special_builtin ();
 static int is_assignment_builtin ();
+static int is_requires_builtin ();
 
 #if !defined (HAVE_RENAME)
 static int rename ();
@@ -791,6 +804,8 @@ builtin_handler (self, defs, arg)
     new->flags |= BUILTIN_FLAG_SPECIAL;
   if (is_assignment_builtin (name))
     new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+  if (is_requires_builtin (name))
+    new->flags |= BUILTIN_FLAG_REQUIRES;
 
   array_add ((char *)new, defs->builtins);
   building_builtin = 1;
@@ -1208,10 +1223,11 @@ write_builtins (defs, structfile, extern
 		  else
 		    fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
 
-		  fprintf (structfile, "%s%s%s, %s_doc,\n",
+		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
 		    "BUILTIN_ENABLED | STATIC_BUILTIN",
 		    (builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
 		    (builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
+		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
 		    document_name (builtin));
 
 		  fprintf
@@ -1542,6 +1558,13 @@ is_assignment_builtin (name)
   return (_find_in_table (name, assignment_builtins));
 }
 
+static int
+is_requires_builtin (name)
+     char *name;
+{
+  return (_find_in_table (name, requires_builtins));
+}
+
 #if !defined (HAVE_RENAME)
 static int
 rename (from, to)
diff -upk.orig bash-3.1.orig/builtins.h bash-3.1/builtins.h
--- bash-3.1.orig/builtins.h	2004-12-30 18:59:05 +0000
+++ bash-3.1/builtins.h	2006-01-06 00:42:16 +0000
@@ -40,6 +40,7 @@
 #define STATIC_BUILTIN  0x4	/* This builtin is not dynamically loaded. */
 #define SPECIAL_BUILTIN 0x8	/* This is a Posix `special' builtin. */
 #define ASSIGNMENT_BUILTIN 0x10	/* This builtin takes assignment statements. */
+#define REQUIRES_BUILTIN 0x20	/* This builtin requires other files. */
 
 #define BASE_INDENT	4
 
diff -upk.orig bash-3.1.orig/doc/bash.1 bash-3.1/doc/bash.1
--- bash-3.1.orig/doc/bash.1	2006-01-06 00:41:57 +0000
+++ bash-3.1/doc/bash.1	2006-01-06 00:42:16 +0000
@@ -231,6 +231,13 @@ The shell becomes restricted (see
 .B "RESTRICTED SHELL"
 below).
 .TP
+.B \-\-rpm-requires
+Produce the list of files that are required for the 
+shell script to run.  This implies '-n' and is subject
+to the same limitations as compile time error checking checking;
+Backticks, [] tests,  and evals are not parsed so some 
+dependencies may be missed.
+.TP
 .B \-\-verbose
 Equivalent to  \fB\-v\fP.
 .TP
diff -upk.orig bash-3.1.orig/doc/bashref.texi bash-3.1/doc/bashref.texi
--- bash-3.1.orig/doc/bashref.texi	2006-01-06 00:41:57 +0000
+++ bash-3.1/doc/bashref.texi	2006-01-06 00:42:16 +0000
@@ -4898,6 +4898,13 @@ standard.  @xref{Bash POSIX Mode}, for a
 @item --restricted
 Make the shell a restricted shell (@pxref{The Restricted Shell}).
 
+ at item --rpm-requires
+Produce the list of files that are required for the 
+shell script to run.  This implies '-n' and is subject
+to the same limitations as compile time error checking checking;
+Backticks, [] tests,  and evals are not parsed so some 
+dependencies may be missed.
+
 @item --verbose
 Equivalent to @option{-v}.  Print shell input lines as they're read.
 
diff -upk.orig bash-3.1.orig/eval.c bash-3.1/eval.c
--- bash-3.1.orig/eval.c	2006-01-06 00:41:57 +0000
+++ bash-3.1/eval.c	2006-01-06 00:42:16 +0000
@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
 extern int need_here_doc;
 extern int current_command_number, current_command_line_count, line_number;
 extern int expand_aliases;
+extern int rpm_requires;
 
 static void send_pwd_to_eterm __P((void));
 static sighandler alrm_catcher __P((int));
@@ -131,7 +132,7 @@ reader_loop ()
 
       if (read_command () == 0)
 	{
-	  if (interactive_shell == 0 && read_but_dont_execute)
+	  if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires))
 	    {
 	      last_command_exit_value = EXECUTION_SUCCESS;
 	      dispose_command (global_command);
diff -upk.orig bash-3.1.orig/execute_cmd.c bash-3.1/execute_cmd.c
--- bash-3.1.orig/execute_cmd.c	2006-01-06 00:41:57 +0000
+++ bash-3.1/execute_cmd.c	2006-01-06 00:42:16 +0000
@@ -473,6 +473,8 @@ async_redirect_stdin ()
 
 #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
 
+extern int rpm_requires;
+
 /* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
    COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
    ASYNCHROUNOUS, if non-zero, says to do this command in the background.
@@ -498,7 +500,15 @@ execute_command_internal (command, async
   volatile int last_pid;
   volatile int save_line_number;
 
-  if (command == 0 || breaking || continuing || read_but_dont_execute)
+  if (command == 0 || breaking || continuing || (read_but_dont_execute && !rpm_requires))
+    return (EXECUTION_SUCCESS);
+
+  if (rpm_requires && command->type == cm_function_def)
+    return last_command_exit_value =
+      execute_intern_function (command->value.Function_def->name,
+			       command->value.Function_def->command);
+
+  if (read_but_dont_execute)
     return (EXECUTION_SUCCESS);
 
   run_pending_traps ();
@@ -3984,7 +3994,7 @@ execute_intern_function (name, function)
 
   if (check_identifier (name, posixly_correct) == 0)
     {
-      if (posixly_correct && interactive_shell == 0)
+      if (posixly_correct && interactive_shell == 0 && rpm_requires == 0)
 	{
 	  last_command_exit_value = EX_USAGE;
 	  jump_to_top_level (ERREXIT);
diff -upk.orig bash-3.1.orig/execute_cmd.h bash-3.1/execute_cmd.h
--- bash-3.1.orig/execute_cmd.h	2001-05-07 14:39:37 +0000
+++ bash-3.1/execute_cmd.h	2003-04-20 13:20:49 +0000
@@ -22,6 +22,8 @@
 #define _EXECUTE_CMD_H_
 
 #include "stdc.h"
+#include "variables.h"
+#include "command.h"
 
 extern struct fd_bitmap *new_fd_bitmap __P((int));
 extern void dispose_fd_bitmap __P((struct fd_bitmap *));
diff -upk.orig bash-3.1.orig/make_cmd.c bash-3.1/make_cmd.c
--- bash-3.1.orig/make_cmd.c	2006-01-06 00:41:57 +0000
+++ bash-3.1/make_cmd.c	2006-01-06 00:42:16 +0000
@@ -41,11 +41,15 @@ Foundation, 59 Temple Place, Suite 330, 
 #include "flags.h"
 #include "make_cmd.h"
 #include "dispose_cmd.h"
+#include "execute_cmd.h"
 #include "variables.h"
 #include "subst.h"
 #include "input.h"
 #include "ocache.h"
 #include "externs.h"
+#include "builtins.h"
+
+#include "builtins/common.h"
 
 #if defined (JOB_CONTROL)
 #include "jobs.h"
@@ -55,6 +59,10 @@ Foundation, 59 Temple Place, Suite 330, 
 
 extern int line_number, current_command_line_count;
 extern int last_command_exit_value;
+extern int rpm_requires;
+
+static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
+                     "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 /* Object caching */
 sh_obj_cache_t wdcache = {0, 0, 0};
@@ -784,6 +792,27 @@ make_subshell_command (command)
   return (make_command (cm_subshell, (SIMPLE_COM *)temp));
 }
 
+static void
+output_requirement (deptype, filename)
+const char *deptype;
+char *filename;
+{
+  if (strchr(filename, '$') || (filename[0] != '/' && strchr(filename, '/')))
+    return;
+
+  /* 
+      if the executable is called via variable substitution we can
+      not dermine what it is at compile time.  
+
+      if the executable consists only of characters not in the
+      alphabet we do not consider it a dependency just an artifact
+      of shell parsing (ex "exec < ${infile}").
+  */
+
+  if (strpbrk(filename, alphabet_set))
+    printf ("%s(%s)\n", deptype, filename);
+}
+
 /* Reverse the word list and redirection list in the simple command
    has just been parsed.  It seems simpler to do this here the one
    time then by any other method that I can think of. */
@@ -801,6 +830,27 @@ clean_simple_command (command)
 	REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
     }
 
+  if (rpm_requires && command->value.Simple->words)
+    {
+      char *cmd0;
+      char *cmd1;
+      struct builtin *b;
+
+      cmd0 = command->value.Simple->words->word->word;
+      b = builtin_address_internal (cmd0, 0);
+      cmd1 = 0;
+      if (command->value.Simple->words->next)
+        cmd1 = command->value.Simple->words->next->word->word;
+
+      if (b) {
+        if ( (b->flags & REQUIRES_BUILTIN) && cmd1)
+          output_requirement ("executable", cmd1);
+      } else {
+        if (!assignment(cmd0, 0))
+          output_requirement (find_function(cmd0) ? "function" : "executable", cmd0);
+      }
+    } /*rpm_requires*/
+
   return (command);
 }
 
diff -upk.orig bash-3.1.orig/shell.c bash-3.1/shell.c
--- bash-3.1.orig/shell.c	2006-01-06 00:41:57 +0000
+++ bash-3.1/shell.c	2006-01-06 00:42:16 +0000
@@ -175,6 +175,9 @@ int running_under_emacs;
 /* The name of the .(shell)rc file. */
 static char *bashrc_file = "~/.bashrc";
 
+/* Non-zero if we are finding the scripts requirements. */
+int rpm_requires;
+
 /* Non-zero means to act more like the Bourne shell on startup. */
 static int act_like_sh;
 
@@ -233,6 +236,7 @@ struct {
   { "posix", Int, &posixly_correct, (char **)0x0 },
   { "protected", Int, &protected_mode, (char **)0x0 },
   { "rcfile", Charp, (int *)0x0, &bashrc_file },
+  { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
 #if defined (RESTRICTED_SHELL)
   { "restricted", Int, &restricted, (char **)0x0 },
 #endif
@@ -460,6 +464,12 @@ main (argc, argv, env)
   if (dump_translatable_strings)
     read_but_dont_execute = 1;
 
+  if (rpm_requires)
+    {
+      read_but_dont_execute = 1;
+      initialize_shell_builtins ();
+    }
+
   if (running_setuid && privileged_mode == 0)
     disable_priv_mode ();
 


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- bash.spec	31 May 2006 13:30:00 -0000	1.119
+++ bash.spec	15 Jun 2006 15:21:10 -0000	1.120
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 14
+Release: 15
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -32,7 +32,7 @@
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
 Patch102: bash-2.03-profile.patch
-Patch103: bash-2.05a-requires.patch
+Patch103: bash-requires.patch
 Patch105: bash-aq.patch
 Patch106: bash-login.patch
 Patch107: bash-2.05a-interpreter.patch
@@ -234,6 +234,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 3.1-15
+- Updated requires patch to the ALT version.
+
 * Wed May 31 2006 Tim Waugh <twaugh at redhat.com> 3.1-14
 - More sighandler fixes, this time hypothetical.
 


--- bash-2.05a-requires.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 15 15:48:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 11:48:15 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.139,1.140
Message-ID: <200606151548.k5FFmF41013977@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13846

Modified Files:
	gnome-applets.spec 
Log Message:
rebuild against new libxklavier



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-applets.spec	8 Jun 2006 17:36:55 -0000	1.139
+++ gnome-applets.spec	15 Jun 2006 15:48:12 -0000	1.140
@@ -8,7 +8,7 @@
 %define libbonoboui_version 2.3.0
 %define gstreamer_plugins_version 0.10
 %define gstreamer_version 0.10
-%define libxklavier_version 1.13
+%define libxklavier_version 2.91
 %define libwnck_version 2.9.3
 %define libgnome_desktop_version 2.10.2
 %define gnome_utils_version 2.8.1
@@ -18,10 +18,10 @@
 
 %define po_package gnome-applets-2.0
 
-Summary:        Small applications for the GNOME panel.
+Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.14.2
-Release:  	4
+Release:  	5
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -223,6 +223,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Thu Jun 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
+- Rebuild against new libxklavier
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
 - Explicitly list the applets to be included
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 16:28:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 12:28:35 -0400
Subject: rpms/frysk/devel frysk_syscall.patch,NONE,1.1 frysk.spec,1.40,1.41
Message-ID: <200606151628.k5FGSZij012939@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12924

Modified Files:
	frysk.spec 
Added Files:
	frysk_syscall.patch 
Log Message:
- Patch for new linux/unistd.h.


frysk_syscall.patch:
 frysk-core/frysk/pkglibexecdir/funit-syscallint.c                 |    7 ++++
 frysk-core/frysk/pkglibexecdir/util.h                             |   15 ++++++++++
 frysk-core/prog/kill/detach.c                                     |   15 ++++++++++
 frysk-imports/tests/frysk2595/ptrace_after_exec.c                 |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c       |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c  |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c          |    7 ++++
 frysk-imports/tests/process/multi_child_exec.c                    |    8 +++++
 frysk-imports/tests/process/multi_child_parent_exec.c             |    8 +++++
 frysk-imports/tests/process/multi_parent_exec.c                   |    8 +++++
 frysk-imports/tests/process/single_exec.c                         |    8 +++++
 frysk-sys/frysk/sys/cni/Poll.cxx                                  |    8 +++++
 frysk-sys/frysk/sys/cni/Tid.cxx                                   |    8 +++++
 14 files changed, 120 insertions(+)

--- NEW FILE frysk_syscall.patch ---
Index: frysk-core/frysk/pkglibexecdir/funit-syscallint.c
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/pkglibexecdir/funit-syscallint.c,v
retrieving revision 1.4
diff -u -r1.4 funit-syscallint.c
--- frysk-core/frysk/pkglibexecdir/funit-syscallint.c	10 Feb 2006 19:31:11 -0000	1.4
+++ frysk-core/frysk/pkglibexecdir/funit-syscallint.c	15 Jun 2006 16:23:37 -0000
@@ -47,6 +47,13 @@
 
 int childPid;
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, pid_t, tid, int, sig);
 
 void handler (int sig) {
Index: frysk-core/frysk/pkglibexecdir/util.h
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/pkglibexecdir/util.h,v
retrieving revision 1.2
diff -u -r1.2 util.h
--- frysk-core/frysk/pkglibexecdir/util.h	15 Apr 2006 04:10:29 -0000	1.2
+++ frysk-core/frysk/pkglibexecdir/util.h	15 Jun 2006 16:23:37 -0000
@@ -41,8 +41,23 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <linux/unistd.h>
+#include <unistd.h>
 #include <stdlib.h>
 
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall0(pid_t, gettid);
 _syscall2(int, tkill, pid_t, tid, int, sig);
 
Index: frysk-core/prog/kill/detach.c
===================================================================
RCS file: /cvs/frysk/frysk-core/prog/kill/detach.c,v
retrieving revision 1.6
diff -u -r1.6 detach.c
--- frysk-core/prog/kill/detach.c	26 Jan 2006 18:53:28 -0000	1.6
+++ frysk-core/prog/kill/detach.c	15 Jun 2006 16:23:37 -0000
@@ -46,10 +46,25 @@
 #include <errno.h>
 #include <sys/select.h>
 #include <linux/unistd.h>
+#include <unistd.h>
 #include <limits.h>
 #include <pthread.h>
 #include <string.h>
 
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 
 // Simple sleep for roughly SECONDS and then exit.
 
Index: frysk-imports/tests/frysk2595/ptrace_after_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_exec.c,v
retrieving revision 1.2
diff -u -r1.2 ptrace_after_exec.c
--- frysk-imports/tests/frysk2595/ptrace_after_exec.c	22 Apr 2006 21:11:26 -0000	1.2
+++ frysk-imports/tests/frysk2595/ptrace_after_exec.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c,v
retrieving revision 1.2
diff -u -r1.2 ptrace_after_exec_of_thread.c
--- frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c	22 Apr 2006 21:11:26 -0000	1.2
+++ frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c,v
retrieving revision 1.4
diff -u -r1.4 ptrace_after_forked_thread_exits.c
--- frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c	25 Apr 2006 20:19:11 -0000	1.4
+++ frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c	15 Jun 2006 16:23:46 -0000
@@ -52,6 +52,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c,v
retrieving revision 1.3
diff -u -r1.3 ptrace_before_forked_thread_exits.c
--- frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c	25 Apr 2006 20:19:11 -0000	1.3
+++ frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pthread_barrier_t child_ready_for_ptrace;
Index: frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c,v
retrieving revision 1.3
diff -u -r1.3 ptrace_peek_wrong_thread.c
--- frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c	25 Apr 2006 20:19:11 -0000	1.3
+++ frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/process/multi_child_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_child_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_child_exec.c
--- frysk-imports/tests/process/multi_child_exec.c	8 Mar 2006 04:24:02 -0000	1.3
+++ frysk-imports/tests/process/multi_child_exec.c	15 Jun 2006 16:23:47 -0000
@@ -9,6 +9,14 @@
 #include <linux/unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid)
 
 #define NUM_THREADS 2
Index: frysk-imports/tests/process/multi_child_parent_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_child_parent_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_child_parent_exec.c
--- frysk-imports/tests/process/multi_child_parent_exec.c	8 Mar 2006 04:24:02 -0000	1.3
+++ frysk-imports/tests/process/multi_child_parent_exec.c	15 Jun 2006 16:23:47 -0000
@@ -10,6 +10,14 @@
 #include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid);
 
 #define NUM_THREADS 2
Index: frysk-imports/tests/process/multi_parent_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_parent_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_parent_exec.c
--- frysk-imports/tests/process/multi_parent_exec.c	8 Mar 2006 04:24:02 -0000	1.3
+++ frysk-imports/tests/process/multi_parent_exec.c	15 Jun 2006 16:23:47 -0000
@@ -9,6 +9,14 @@
 #include <linux/unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid)
 
 #define NUM_THREADS 2
Index: frysk-imports/tests/process/single_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/single_exec.c,v
retrieving revision 1.2
diff -u -r1.2 single_exec.c
--- frysk-imports/tests/process/single_exec.c	8 Feb 2006 22:02:58 -0000	1.2
+++ frysk-imports/tests/process/single_exec.c	15 Jun 2006 16:23:47 -0000
@@ -7,6 +7,14 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <linux/unistd.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid)
 
 int
Index: frysk-sys/frysk/sys/cni/Poll.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Poll.cxx,v
retrieving revision 1.9
diff -u -r1.9 Poll.cxx
--- frysk-sys/frysk/sys/cni/Poll.cxx	9 Apr 2006 17:40:08 -0000	1.9
+++ frysk-sys/frysk/sys/cni/Poll.cxx	15 Jun 2006 16:23:47 -0000
@@ -46,6 +46,14 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <linux/unistd.h>
+#include <unistd.h>
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
 
 _syscall2(int, tkill, pid_t, tid, int, sig);
 
Index: frysk-sys/frysk/sys/cni/Tid.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Tid.cxx,v
retrieving revision 1.1
diff -u -r1.1 Tid.cxx
--- frysk-sys/frysk/sys/cni/Tid.cxx	8 Oct 2005 15:37:53 -0000	1.1
+++ frysk-sys/frysk/sys/cni/Tid.cxx	15 Jun 2006 16:23:47 -0000
@@ -39,6 +39,14 @@
 
 #include <sys/types.h>
 #include <linux/unistd.h>
+#include <unistd.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
 
 _syscall0(pid_t,gettid)
 


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- frysk.spec	15 Jun 2006 00:21:05 -0000	1.40
+++ frysk.spec	15 Jun 2006 16:28:33 -0000	1.41
@@ -1,12 +1,14 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.06.14.rh1
-Release:	0
+Release:	1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
+Patch:		frysk_syscall.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgtk-java >= 2.8.4
@@ -43,7 +45,6 @@
 %prep
 
 %setup -q -n %{name}-%{version}
-./bootstrap.sh
 
 %build 
 
@@ -59,6 +60,7 @@
 export JAVA=${JAVA:-/usr/bin/gij}
 export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
+./bootstrap.sh
 %configure
 
 # Build system can end up with corrupt xmllint files:
@@ -99,6 +101,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
+- Patch for new linux/unistd.h.
+
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
 - New upstream version.
 - Add BuildRequires: libglade2-devel >= 2.5.1



From fedora-cvs-commits at redhat.com  Thu Jun 15 16:39:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 12:39:20 -0400
Subject: rpms/frysk/devel frysk.spec,1.41,1.42
Message-ID: <200606151639.k5FGdKCh013197@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13174

Modified Files:
	frysk.spec 
Log Message:
Apply the patch.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- frysk.spec	15 Jun 2006 16:28:33 -0000	1.41
+++ frysk.spec	15 Jun 2006 16:39:18 -0000	1.42
@@ -43,8 +43,8 @@
 process in the system.
 
 %prep
-
 %setup -q -n %{name}-%{version}
+%patch
 
 %build 
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 16:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 12:46:44 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2288,1.2289
Message-ID: <200606151646.k5FGkisH003283@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2892

Modified Files:
	kernel-2.6.spec 
Log Message:
fix provides


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2288
retrieving revision 1.2289
diff -u -r1.2288 -r1.2289
--- kernel-2.6.spec	15 Jun 2006 13:16:37 -0000	1.2288
+++ kernel-2.6.spec	15 Jun 2006 16:46:42 -0000	1.2289
@@ -194,10 +194,8 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-
-# KMP - We need this for the moment
-#AutoReqProv: no
-AutoReqProv: yes
+AutoReq: no
+AutoProv: yes
 
 
 #
@@ -460,7 +458,7 @@
 
 # END OF PATCH DEFINITIONS
 
-# Override find_provides to use a script that provides "ksym(symbol) = hash".
+# Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
 %define __find_provides %_sourcedir/find-provides %name
 
@@ -526,7 +524,8 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-AutoReqProv: no
+AutoReq: no
+AutoProv: yes
 
 %description PAE
 This package includes a version of the Linux kernel with support for up to
@@ -563,7 +562,8 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-AutoReqProv: no
+AutoReq: no
+AutoProv: yes
 
 %description smp
 This package includes a SMP version of the Linux kernel. It is
@@ -600,7 +600,8 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-AutoReqProv: no
+AutoReq: no
+AutoProv: yes
 
 %description xen
 This package includes a version of the Linux kernel which
@@ -634,7 +635,8 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-AutoReqProv: no
+AutoReq: no
+AutoProv: yes
 
 %description xen-PAE
 This package includes a version of the Linux kernel which runs in Xen
@@ -666,7 +668,8 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-AutoReqProv: no
+AutoReq: no
+AutoProv: yes
 
 %description kdump
 This package includes a kdump version of the Linux kernel. It is



From fedora-cvs-commits at redhat.com  Thu Jun 15 17:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 13:37:11 -0400
Subject: rpms/kernel/devel/configs config-generic,1.192,1.193
Message-ID: <200606151737.k5FHbBiq003496@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3470/configs

Modified Files:
	config-generic 
Log Message:
this is a boolean


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- config-generic	10 Jun 2006 00:23:22 -0000	1.192
+++ config-generic	15 Jun 2006 17:37:09 -0000	1.193
@@ -1680,7 +1680,7 @@
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=m
+CONFIG_VIDEO_V4L1_COMPAT=y
 # CONFIG_VIDEO_VIVI is not set
 
 #



From fedora-cvs-commits at redhat.com  Thu Jun 15 17:39:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 13:39:40 -0400
Subject: rpms/redhat-rpm-config/devel redhat-rpm-config.spec,1.29,1.30
Message-ID: <200606151739.k5FHdee8003888@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3724

Modified Files:
	redhat-rpm-config.spec 
Log Message:
Fix a bug I introduced in find-provides/find-requires. Will later add better
support for determining the name of the package in those scripts.




Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- redhat-rpm-config.spec	15 Jun 2006 14:01:46 -0000	1.29
+++ redhat-rpm-config.spec	15 Jun 2006 17:39:35 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.42
+Version: 8.0.43
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Jun 15 2006 Jon Masters <jcm at redhat.com> - 8.0.43-1
+- Workaround bug in find-requires/find-provides for kmods.
+
 * Thu Jun 15 2006 Jon Masters <jcm at redhat.com> - 8.0.42-1
 - Fix a typo in KMP find-requires.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 17:41:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 13:41:35 -0400
Subject: rpms/yum-metadata-parser/devel
	yum-metadata-parser-1.0-locationbase.patch, NONE,
	1.1 yum-metadata-parser.spec, 1.3, 1.4
Message-ID: <200606151741.k5FHfZWn004642@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum-metadata-parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4587

Modified Files:
	yum-metadata-parser.spec 
Added Files:
	yum-metadata-parser-1.0-locationbase.patch 
Log Message:
Fix cd installs by populating location_base

yum-metadata-parser-1.0-locationbase.patch:
 xml-parser.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE yum-metadata-parser-1.0-locationbase.patch ---
--- yum-metadata-parser-1.0/xml-parser.c.locationbase	2006-06-15 13:38:12.000000000 -0400
+++ yum-metadata-parser-1.0/xml-parser.c	2006-06-15 13:38:22.000000000 -0400
@@ -178,7 +178,9 @@
             value = attrs[++i];
 
             if (!strcmp (attr, "href"))
-                p->location_href = g_string_chunk_insert (p->chunk, value);;
+                p->location_href = g_string_chunk_insert (p->chunk, value);
+            else if (!strcmp (attr, "xml:base"))
+                p->location_base = g_string_chunk_insert (p->chunk, value);
         }
     }
 }


Index: yum-metadata-parser.spec
===================================================================
RCS file: /cvs/dist/rpms/yum-metadata-parser/devel/yum-metadata-parser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yum-metadata-parser.spec	14 Jun 2006 20:31:54 -0000	1.3
+++ yum-metadata-parser.spec	15 Jun 2006 17:41:33 -0000	1.4
@@ -3,10 +3,11 @@
 Summary: A fast metadata parser for yum
 Name: yum-metadata-parser
 Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz
 Patch0: yum-metadata-parser-1.0-quiet.patch
 Patch1: yum-metadata-parser-1.0-files.patch
+Patch2: yum-metadata-parser-1.0-locationbase.patch
 License: GPL
 Group: Development/Libraries
 URL: http://linux.duke.edu/projects/yum/
@@ -25,6 +26,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,9 @@
 %{python_sitelib_platform}/sqlitecachec.pyo
 
 %changelog
+* Thu Jun 15 2006 Paul Nasrat <pnasrat at redhat.com> - 1.0-7
+- add patch to correct population of packages.location_base
+
 * Wed Jun 14 2006 Paul Nasrat <pnasrat at redhat.com> - 1.0-6
 - add patch to correct table order of primary:files
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 17:45:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 13:45:39 -0400
Subject: rpms/redhat-rpm-config/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22
Message-ID: <200606151745.k5FHjdkV006320@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6221

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	15 Jun 2006 14:18:14 -0000	1.21
+++ .cvsignore	15 Jun 2006 17:45:37 -0000	1.22
@@ -1 +1 @@
-redhat-rpm-config-8.0.42.tar.gz
+redhat-rpm-config-8.0.43.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	15 Jun 2006 14:18:14 -0000	1.21
+++ sources	15 Jun 2006 17:45:37 -0000	1.22
@@ -1 +1 @@
-43732c8c0fe10a9c0e147c3c3d4eae68  redhat-rpm-config-8.0.42.tar.gz
+b4b4a4aaeb150a6727918761df0bc8f9  redhat-rpm-config-8.0.43.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 18:23:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 14:23:53 -0400
Subject: rpms/frysk/devel frysk-sscanf.patch,NONE,1.1 frysk.spec,1.42,1.43
Message-ID: <200606151823.k5FINrjO014067@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14035

Modified Files:
	frysk.spec 
Added Files:
	frysk-sscanf.patch 
Log Message:
Patch to avoid scanf("%a[..]").

frysk-sscanf.patch:
 line2addr.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE frysk-sscanf.patch ---
Index: ./frysk-imports/elfutils/tests/line2addr.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/tests/line2addr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 line2addr.c
--- ./frysk-imports/elfutils/tests/line2addr.c	8 May 2006 20:48:53 -0000	1.1.1.1
+++ ./frysk-imports/elfutils/tests/line2addr.c	15 Jun 2006 18:19:57 -0000
@@ -131,19 +131,18 @@
   for (; cnt < argc; ++cnt)
     {
       struct args a = { .arg = argv[cnt] };
+      char *c = strchr (a.arg, ':');
 
-      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
-	{
-	default:
-	case 0:
-	  printf ("ignored %s\n", argv[cnt]);
-	  continue;
-	case 1:
-	  a.line = 0;
-	  break;
-	case 2:
-	  break;
-	}
+      if (a.arg == NULL) {
+	printf ("ignored %s\n", a.arg);
+	continue;
+      } else if (c == NULL) {
+	a.file = strdup (a.arg);
+	a.line = 0;
+      } else {
+	a.file = strndup (a.arg, c - a.arg);
+	a.line = strtol (c + 1, NULL, 10);
+      }
 
       (void) dwfl_getdwarf (dwfl, &handle_module, &a, 0);
 


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- frysk.spec	15 Jun 2006 16:39:18 -0000	1.42
+++ frysk.spec	15 Jun 2006 18:23:50 -0000	1.43
@@ -7,7 +7,8 @@
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
-Patch:		frysk_syscall.patch
+Patch0:		frysk_syscall.patch
+Patch1:		frysk-sscanf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -44,7 +45,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch
+%patch0
+%patch1
 
 %build 
 
@@ -103,6 +105,7 @@
 %changelog
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.
+- Patch to avoid scanf("%a[..]").
 
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
 - New upstream version.



From fedora-cvs-commits at redhat.com  Thu Jun 15 18:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 14:33:41 -0400
Subject: rpms/kernel/FC-5/configs config-generic, 1.165,
	1.165.22.1 config-x86-generic, 1.41,
	1.41.4.1 config-x86_64-generic, 1.33, 1.33.36.1
Message-ID: <200606151833.k5FIXf3c016946@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv16894/configs

Modified Files:
      Tag: private-linville-jwltest-fc5-16-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.165
retrieving revision 1.165.22.1
diff -u -r1.165 -r1.165.22.1
--- config-generic	4 May 2006 00:47:13 -0000	1.165
+++ config-generic	15 Jun 2006 18:33:29 -0000	1.165.22.1
@@ -1051,6 +1051,10 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IPW3945_DEBUG is not set
+# CONFIG_IPW3945_MONITOR is not set
+# CONFIG_IPW3945_PROMISCUOUS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v
retrieving revision 1.41
retrieving revision 1.41.4.1
diff -u -r1.41 -r1.41.4.1
--- config-x86-generic	5 Jun 2006 18:44:48 -0000	1.41
+++ config-x86-generic	15 Jun 2006 18:33:29 -0000	1.41.4.1
@@ -240,6 +240,10 @@
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_DEBUG=y
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86_64-generic,v
retrieving revision 1.33
retrieving revision 1.33.36.1
diff -u -r1.33 -r1.33.36.1
--- config-x86_64-generic	3 Mar 2006 18:59:15 -0000	1.33
+++ config-x86_64-generic	15 Jun 2006 18:33:29 -0000	1.33.36.1
@@ -107,6 +107,10 @@
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_DEBUG=y
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Thu Jun 15 18:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 14:33:41 -0400
Subject: rpms/kernel/FC-5 jwltest-bcm43xx-wx-overflow.patch, NONE,
	1.1.8.1 jwltest-e1000-wol-shutdown.patch, NONE,
	1.1.4.1 jwltest-ieee80211-2_6_17-rc5.patch, NONE,
	1.1.2.1 jwltest-ipw2200-hwcrypto-off.patch, NONE,
	1.1.16.1 jwltest-ipw3945-1_0_5.patch, NONE,
	1.1.2.1 jwltest-sk98lin-neuter.patch, NONE,
	1.1.24.1 jwltest-tg3-3_50.patch, NONE,
	1.1.12.1 jwltest-via-rhine-carrier.patch, NONE,
	1.1.6.1 kernel-2.6.spec, 1.2133, 1.2133.4.1
Message-ID: <200606151833.k5FIXfZv016942@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16894

Modified Files:
      Tag: private-linville-jwltest-fc5-16-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc5-16-branch
	jwltest-bcm43xx-wx-overflow.patch 
	jwltest-e1000-wol-shutdown.patch 
	jwltest-ieee80211-2_6_17-rc5.patch 
	jwltest-ipw2200-hwcrypto-off.patch jwltest-ipw3945-1_0_5.patch 
	jwltest-sk98lin-neuter.patch jwltest-tg3-3_50.patch 
	jwltest-via-rhine-carrier.patch 
Log Message:


jwltest-bcm43xx-wx-overflow.patch:
 bcm43xx_wx.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

--- NEW FILE jwltest-bcm43xx-wx-overflow.patch ---
--- linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig	2006-03-06 16:59:32.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c	2006-03-06 16:59:38.000000000 -0500
@@ -858,12 +858,6 @@ static int bcm43xx_wx_sprom_write(struct
 	if (!capable(CAP_SYS_RAWIO))
 		goto out;
 
-	err = -ENOMEM;
-	sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
-			GFP_KERNEL);
-	if (!sprom)
-		goto out;
-
 	len = data->data.length;
 	extra[len - 1] = '\0';
 	input = strchr(extra, ':');
@@ -872,6 +866,19 @@ static int bcm43xx_wx_sprom_write(struct
 		len -= input - extra;
 	} else
 		input = extra;
+
+	if (len > BCM43xx_SPROM_SIZE * sizeof(*sprom)) {
+		err = -EINVAL;
+		goto out;
+	}
+
+	sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom),
+			GFP_KERNEL);
+	if (!sprom) {
+		err = -ENOMEM;
+		goto out;
+	}
+
 	err = hex2sprom(sprom, input, len);
 	if (err)
 		goto out_kfree;

jwltest-e1000-wol-shutdown.patch:
 e1000_main.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE jwltest-e1000-wol-shutdown.patch ---
--- linux-2.6.16.noarch/drivers/net/e1000/e1000_main.c.orig	2006-05-26 12:57:54.000000000 -0400
+++ linux-2.6.16.noarch/drivers/net/e1000/e1000_main.c	2006-05-26 12:59:59.000000000 -0400
@@ -259,6 +259,7 @@ static void e1000_restore_vlan(struct e1
 static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
 static int e1000_resume(struct pci_dev *pdev);
 #endif
+static void e1000_shutdown(struct pci_dev *pdev);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /* for netdump / net console */
@@ -282,8 +283,9 @@ static struct pci_driver e1000_driver = 
 	/* Power Managment Hooks */
 #ifdef CONFIG_PM
 	.suspend  = e1000_suspend,
-	.resume   = e1000_resume
+	.resume   = e1000_resume,
 #endif
+	.shutdown = e1000_shutdown
 };
 
 MODULE_AUTHOR("Intel Corporation, <linux.nics at intel.com>");
@@ -4693,6 +4695,12 @@ e1000_resume(struct pci_dev *pdev)
 	return 0;
 }
 #endif
+
+static void e1000_shutdown(struct pci_dev *pdev)
+{
+	e1000_suspend(pdev, PMSG_SUSPEND);
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /*
  * Polling 'interrupt' - used by things like netconsole to send skbs

jwltest-ieee80211-2_6_17-rc5.patch:
 include/net/ieee80211.h                         |  181 +++++++++++++++++++++++-
 include/net/ieee80211softmac.h                  |   48 +++++-
 include/net/ieee80211softmac_wx.h               |    5 
 net/ieee80211/ieee80211_module.c                |   18 ++
 net/ieee80211/ieee80211_rx.c                    |  173 ++++++++++++++++++++--
 net/ieee80211/ieee80211_tx.c                    |   25 ---
 net/ieee80211/ieee80211_wx.c                    |  113 ++++++++------
 net/ieee80211/softmac/Kconfig                   |    1 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  141 +++++++++++-------
 net/ieee80211/softmac/ieee80211softmac_auth.c   |   33 ++--
 net/ieee80211/softmac/ieee80211softmac_event.c  |   42 +++--
 net/ieee80211/softmac/ieee80211softmac_io.c     |  118 +++++++--------
 net/ieee80211/softmac/ieee80211softmac_module.c |  135 ++++++++++++++---
 net/ieee80211/softmac/ieee80211softmac_priv.h   |   16 --
 net/ieee80211/softmac/ieee80211softmac_scan.c   |   10 +
 net/ieee80211/softmac/ieee80211softmac_wx.c     |   85 +++++++++--
 16 files changed, 845 insertions(+), 299 deletions(-)

--- NEW FILE jwltest-ieee80211-2_6_17-rc5.patch ---
--- linux-2.6.16.noarch/include/net/ieee80211softmac_wx.h.orig	2006-06-15 14:23:27.000000000 -0400
+++ linux-2.6.16.noarch/include/net/ieee80211softmac_wx.h	2006-06-15 14:23:27.000000000 -0400
@@ -91,4 +91,9 @@ ieee80211softmac_wx_get_genie(struct net
 			      struct iw_request_info *info,
 			      union iwreq_data *wrqu,
 			      char *extra);
+extern int
+ieee80211softmac_wx_set_mlme(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu,
+			     char *extra);
 #endif /* _IEEE80211SOFTMAC_WX */
--- linux-2.6.16.noarch/include/net/ieee80211.h.orig	2006-06-15 14:23:27.000000000 -0400
+++ linux-2.6.16.noarch/include/net/ieee80211.h	2006-06-15 14:23:45.000000000 -0400
@@ -29,7 +29,7 @@
 #include <linux/kernel.h>	/* ARRAY_SIZE */
 #include <linux/wireless.h>
 
-#define IEEE80211_VERSION "git-1.1.7"
+#define IEEE80211_VERSION "git-1.1.13"
 
 #define IEEE80211_DATA_LEN		2304
 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
@@ -104,6 +104,9 @@
 #define IEEE80211_SCTL_FRAG		0x000F
 #define IEEE80211_SCTL_SEQ		0xFFF0
 
+/* QOS control */
+#define IEEE80211_QCTL_TID		0x000F
+
 /* debug macros */
 
 #ifdef CONFIG_IEEE80211_DEBUG
@@ -220,6 +223,7 @@ struct ieee80211_snap_hdr {
 /* Authentication algorithms */
 #define WLAN_AUTH_OPEN 0
 #define WLAN_AUTH_SHARED_KEY 1
+#define WLAN_AUTH_LEAP 2
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
 
@@ -299,6 +303,23 @@ enum ieee80211_reasoncode {
 	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
 };
 
+/* Action categories - 802.11h */
+enum ieee80211_actioncategories {
+	WLAN_ACTION_SPECTRUM_MGMT = 0,
+	/* Reserved 1-127  */
+	/* Error    128-255 */
+};
+
+/* Action details - 802.11h */
+enum ieee80211_actiondetails {
+	WLAN_ACTION_CATEGORY_MEASURE_REQUEST = 0,
+	WLAN_ACTION_CATEGORY_MEASURE_REPORT = 1,
+	WLAN_ACTION_CATEGORY_TPC_REQUEST = 2,
+	WLAN_ACTION_CATEGORY_TPC_REPORT = 3,
+	WLAN_ACTION_CATEGORY_CHANNEL_SWITCH = 4,
+	/* 5 - 255 Reserved */
+};
+
 #define IEEE80211_STATMASK_SIGNAL (1<<0)
 #define IEEE80211_STATMASK_RSSI (1<<1)
 #define IEEE80211_STATMASK_NOISE (1<<2)
@@ -377,6 +398,8 @@ struct ieee80211_rx_stats {
 	u8 mask;
 	u8 freq;
 	u16 len;
+	u64 tsf;
+	u32 beacon_time;
 };
 
 /* IEEE 802.11 requires that STA supports concurrent reception of at least
@@ -608,6 +631,28 @@ struct ieee80211_auth {
 	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
+struct ieee80211_channel_switch {
+	u8 id;
+	u8 len;
+	u8 mode;
+	u8 channel;
+	u8 count;
+} __attribute__ ((packed));
+
+struct ieee80211_action {
+	struct ieee80211_hdr_3addr header;
+	u8 category;
+	u8 action;
+	union {
+		struct ieee80211_action_exchange {
+			u8 token;
+			struct ieee80211_info_element info_element[0];
+		} exchange;
+		struct ieee80211_channel_switch channel_switch;
+
+	} format;
+} __attribute__ ((packed));
+
 struct ieee80211_disassoc {
 	struct ieee80211_hdr_3addr header;
 	__le16 reason;
@@ -692,7 +737,15 @@ struct ieee80211_txb {
 /* QoS structure */
 #define NETWORK_HAS_QOS_PARAMETERS      (1<<3)
 #define NETWORK_HAS_QOS_INFORMATION     (1<<4)
-#define NETWORK_HAS_QOS_MASK            (NETWORK_HAS_QOS_PARAMETERS | NETWORK_HAS_QOS_INFORMATION)
+#define NETWORK_HAS_QOS_MASK            (NETWORK_HAS_QOS_PARAMETERS | \
+					 NETWORK_HAS_QOS_INFORMATION)
+
+/* 802.11h */
+#define NETWORK_HAS_POWER_CONSTRAINT    (1<<5)
+#define NETWORK_HAS_CSA                 (1<<6)
+#define NETWORK_HAS_QUIET               (1<<7)
+#define NETWORK_HAS_IBSS_DFS            (1<<8)
+#define NETWORK_HAS_TPC_REPORT          (1<<9)
 
 #define QOS_QUEUE_NUM                   4
 #define QOS_OUI_LEN                     3
@@ -748,6 +801,91 @@ struct ieee80211_tim_parameters {
 
 /*******************************************************/
 
+enum {				/* ieee80211_basic_report.map */
+	IEEE80211_BASIC_MAP_BSS = (1 << 0),
+	IEEE80211_BASIC_MAP_OFDM = (1 << 1),
+	IEEE80211_BASIC_MAP_UNIDENTIFIED = (1 << 2),
+	IEEE80211_BASIC_MAP_RADAR = (1 << 3),
+	IEEE80211_BASIC_MAP_UNMEASURED = (1 << 4),
+	/* Bits 5-7 are reserved */
+
+};
+struct ieee80211_basic_report {
+	u8 channel;
+	__le64 start_time;
+	__le16 duration;
+	u8 map;
+} __attribute__ ((packed));
+
+enum {				/* ieee80211_measurement_request.mode */
+	/* Bit 0 is reserved */
+	IEEE80211_MEASUREMENT_ENABLE = (1 << 1),
+	IEEE80211_MEASUREMENT_REQUEST = (1 << 2),
+	IEEE80211_MEASUREMENT_REPORT = (1 << 3),
+	/* Bits 4-7 are reserved */
+};
+
+enum {
+	IEEE80211_REPORT_BASIC = 0,	/* required */
+	IEEE80211_REPORT_CCA = 1,	/* optional */
+	IEEE80211_REPORT_RPI = 2,	/* optional */
+	/* 3-255 reserved */
+};
+
+struct ieee80211_measurement_params {
+	u8 channel;
+	__le64 start_time;
+	__le16 duration;
+} __attribute__ ((packed));
+
+struct ieee80211_measurement_request {
+	struct ieee80211_info_element ie;
+	u8 token;
+	u8 mode;
+	u8 type;
+	struct ieee80211_measurement_params params[0];
+} __attribute__ ((packed));
+
+struct ieee80211_measurement_report {
+	struct ieee80211_info_element ie;
+	u8 token;
+	u8 mode;
+	u8 type;
+	union {
+		struct ieee80211_basic_report basic[0];
+	} u;
+} __attribute__ ((packed));
+
+struct ieee80211_tpc_report {
+	u8 transmit_power;
+	u8 link_margin;
+} __attribute__ ((packed));
+
+struct ieee80211_channel_map {
+	u8 channel;
+	u8 map;
+} __attribute__ ((packed));
+
+struct ieee80211_ibss_dfs {
+	struct ieee80211_info_element ie;
+	u8 owner[ETH_ALEN];
+	u8 recovery_interval;
+	struct ieee80211_channel_map channel_map[0];
+};
+
+struct ieee80211_csa {
+	u8 mode;
+	u8 channel;
[...1666 lines suppressed...]
-
-	iwe.cmd = IWEVCUSTOM;
-	iwe.u.data.length = p - custom;
-	if (iwe.u.data.length)
-		start = iwe_stream_add_point(start, stop, &iwe, custom);
+		/* Bit rate given in 500 kb/s units (+ 0x80) */
+		iwe.u.bitrate.value = ((rate & 0x7f) * 500000);
+		/* Add new value to event */
+		current_val = iwe_stream_add_value(start, current_val, stop, &iwe, IW_EV_PARAM_LEN);
+	}
+	/* Check if we added any rate */
+	if((current_val - start) > IW_EV_LCP_LEN)
+		start = current_val;
 
 	/* Add quality statistics */
 	iwe.cmd = IWEVQUAL;
@@ -149,9 +147,7 @@ static char *ipw2100_translate_scan(stru
 		iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID |
 		    IW_QUAL_LEVEL_INVALID;
 		iwe.u.qual.qual = 0;
-		iwe.u.qual.level = 0;
 	} else {
-		iwe.u.qual.level = network->stats.rssi;
 		if (ieee->perfect_rssi == ieee->worst_rssi)
 			iwe.u.qual.qual = 100;
 		else
@@ -179,6 +175,13 @@ static char *ipw2100_translate_scan(stru
 		iwe.u.qual.noise = network->stats.noise;
 	}
 
+	if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL)) {
+		iwe.u.qual.updated |= IW_QUAL_LEVEL_INVALID;
+		iwe.u.qual.level = 0;
+	} else {
+		iwe.u.qual.level = network->stats.signal;
+	}
+
 	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
 
 	iwe.cmd = IWEVCUSTOM;
@@ -188,33 +191,21 @@ static char *ipw2100_translate_scan(stru
 	if (iwe.u.data.length)
 		start = iwe_stream_add_point(start, stop, &iwe, custom);
 
+	memset(&iwe, 0, sizeof(iwe));
 	if (network->wpa_ie_len) {
-		char buf[MAX_WPA_IE_LEN * 2 + 30];
-
-		u8 *p = buf;
-		p += sprintf(p, "wpa_ie=");
-		for (i = 0; i < network->wpa_ie_len; i++) {
-			p += sprintf(p, "%02x", network->wpa_ie[i]);
-		}
-
-		memset(&iwe, 0, sizeof(iwe));
-		iwe.cmd = IWEVCUSTOM;
-		iwe.u.data.length = strlen(buf);
+		char buf[MAX_WPA_IE_LEN];
+		memcpy(buf, network->wpa_ie, network->wpa_ie_len);
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = network->wpa_ie_len;
 		start = iwe_stream_add_point(start, stop, &iwe, buf);
 	}
 
+	memset(&iwe, 0, sizeof(iwe));
 	if (network->rsn_ie_len) {
-		char buf[MAX_WPA_IE_LEN * 2 + 30];
-
-		u8 *p = buf;
-		p += sprintf(p, "rsn_ie=");
-		for (i = 0; i < network->rsn_ie_len; i++) {
-			p += sprintf(p, "%02x", network->rsn_ie[i]);
-		}
-
-		memset(&iwe, 0, sizeof(iwe));
-		iwe.cmd = IWEVCUSTOM;
-		iwe.u.data.length = strlen(buf);
+		char buf[MAX_WPA_IE_LEN];
+		memcpy(buf, network->rsn_ie, network->rsn_ie_len);
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = network->rsn_ie_len;
 		start = iwe_stream_add_point(start, stop, &iwe, buf);
 	}
 
@@ -229,6 +220,28 @@ static char *ipw2100_translate_scan(stru
 	if (iwe.u.data.length)
 		start = iwe_stream_add_point(start, stop, &iwe, custom);
 
+	/* Add spectrum management information */
+	iwe.cmd = -1;
+	p = custom;
+	p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Channel flags: ");
+
+	if (ieee80211_get_channel_flags(ieee, network->channel) &
+	    IEEE80211_CH_INVALID) {
+		iwe.cmd = IWEVCUSTOM;
+		p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), "INVALID ");
+	}
+
+	if (ieee80211_get_channel_flags(ieee, network->channel) &
+	    IEEE80211_CH_RADAR_DETECT) {
+		iwe.cmd = IWEVCUSTOM;
+		p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), "DFS ");
+	}
+
+	if (iwe.cmd == IWEVCUSTOM) {
+		iwe.u.data.length = p - custom;
+		start = iwe_stream_add_point(start, stop, &iwe, custom);
+	}
+
 	return start;
 }
 
@@ -259,7 +272,7 @@ int ieee80211_wx_get_scan(struct ieee802
 
 		if (ieee->scan_age == 0 ||
 		    time_after(network->last_scanned + ieee->scan_age, jiffies))
-			ev = ipw2100_translate_scan(ieee, ev, stop, network);
+			ev = ieee80211_translate_scan(ieee, ev, stop, network);
 		else
 			IEEE80211_DEBUG_SCAN("Not showing network '%s ("
 					     MAC_FMT ")' due to age (%dms).\n",
@@ -490,7 +503,7 @@ int ieee80211_wx_get_encode(struct ieee8
 	len = sec->key_sizes[key];
 	memcpy(keybuf, sec->keys[key], len);
 
-	erq->length = (len >= 0 ? len : 0);
+	erq->length = len;
 	erq->flags |= IW_ENCODE_ENABLED;
 
 	if (ieee->open_wep)
--- linux-2.6.16.noarch/net/ieee80211/ieee80211_tx.c.orig	2006-06-15 14:23:27.000000000 -0400
+++ linux-2.6.16.noarch/net/ieee80211/ieee80211_tx.c	2006-06-15 14:23:45.000000000 -0400
@@ -555,8 +555,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
 /* Incoming 802.11 strucure is converted to a TXB
  * a block of 802.11 fragment packets (stored as skbs) */
 int ieee80211_tx_frame(struct ieee80211_device *ieee,
-		       struct ieee80211_hdr *frame, int hdr_len, int total_len,
-		       int encrypt_mpdu)
+		       struct ieee80211_hdr *frame, int len)
 {
 	struct ieee80211_txb *txb = NULL;
 	unsigned long flags;
@@ -566,9 +565,6 @@ int ieee80211_tx_frame(struct ieee80211_
 
 	spin_lock_irqsave(&ieee->lock, flags);
 
-	if (encrypt_mpdu && !ieee->sec.encrypt)
-		encrypt_mpdu = 0;
-
 	/* If there is no driver handler to take the TXB, dont' bother
 	 * creating it... */
 	if (!ieee->hard_start_xmit) {
@@ -576,41 +572,32 @@ int ieee80211_tx_frame(struct ieee80211_
 		goto success;
 	}
 
-	if (unlikely(total_len < 24)) {
+	if (unlikely(len < 24)) {
 		printk(KERN_WARNING "%s: skb too small (%d).\n",
-		       ieee->dev->name, total_len);
+		       ieee->dev->name, len);
 		goto success;
 	}
 
-	if (encrypt_mpdu)
-		frame->frame_ctl |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-
 	/* When we allocate the TXB we allocate enough space for the reserve
 	 * and full fragment bytes (bytes_per_frag doesn't include prefix,
 	 * postfix, header, FCS, etc.) */
-	txb = ieee80211_alloc_txb(1, total_len, ieee->tx_headroom, GFP_ATOMIC);
+	txb = ieee80211_alloc_txb(1, len, ieee->tx_headroom, GFP_ATOMIC);
 	if (unlikely(!txb)) {
 		printk(KERN_WARNING "%s: Could not allocate TXB\n",
 		       ieee->dev->name);
 		goto failed;
 	}
 	txb->encrypted = 0;
-	txb->payload_size = total_len;
+	txb->payload_size = len;
 
 	skb_frag = txb->fragments[0];
 
-	memcpy(skb_put(skb_frag, total_len), frame, total_len);
+	memcpy(skb_put(skb_frag, len), frame, len);
 
 	if (ieee->config &
 	    (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
 		skb_put(skb_frag, 4);
 
-	/* To avoid overcomplicating things, we do the corner-case frame
-	 * encryption in software. The only real situation where encryption is
-	 * needed here is during software-based shared key authentication. */
-	if (encrypt_mpdu)
-		ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
-
       success:
 	spin_unlock_irqrestore(&ieee->lock, flags);
 

jwltest-ipw2200-hwcrypto-off.patch:
 ipw2200.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE jwltest-ipw2200-hwcrypto-off.patch ---
--- linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c.orig	2006-02-14 14:43:12.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c	2006-02-14 14:55:29.000000000 -0500
@@ -55,7 +55,7 @@ static int associate = 1;
 static int auto_create = 1;
 static int led = 0;
 static int disable = 0;
-static int hwcrypto = 1;
+static int hwcrypto = 0;
 static const char ipw_modes[] = {
 	'a', 'b', 'g', '?'
 };
@@ -7058,8 +7058,7 @@ static int ipw_associate_network(struct 
 		priv->assoc_request.auth_key = priv->ieee->sec.active_key;
 
 		if ((priv->capability & CAP_PRIVACY_ON) &&
-		    (priv->ieee->sec.level == SEC_LEVEL_1) &&
-		    !(priv->ieee->host_encrypt || priv->ieee->host_decrypt))
+		    (priv->ieee->sec.level == SEC_LEVEL_1))
 			ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP);
 	} else {
 		priv->assoc_request.auth_type = AUTH_OPEN;
@@ -11285,7 +11284,7 @@ MODULE_PARM_DESC(mode, "network mode (0=
 #endif
 
 module_param(hwcrypto, int, 0444);
-MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)");
+MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default off)");
 
 module_param(cmdlog, int, 0444);
 MODULE_PARM_DESC(cmdlog,

jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |  106 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16645 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20696 insertions(+)

--- NEW FILE jwltest-ipw3945-1_0_5.patch ---
--- linux-2.6.16.noarch/Documentation/networking/README.ipw3945.orig	2006-06-15 12:59:52.000000000 -0400
+++ linux-2.6.16.noarch/Documentation/networking/README.ipw3945	2006-06-15 12:59:58.000000000 -0400
@@ -0,0 +1,998 @@
+
+Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
+support of:
+
+Intel(R) PRO/Wireless 3945ABG Network Connection Adapter
+Intel(R) PRO/Wireless 3945BG Network Connection Adapter
+
+Note: The Intel(R) PRO/Wireless 3945ABG Network Connection driver for 
+Linux is a unified driver that works on both hardware adapters listed 
+above. In this document the Intel(R) PRO/Wireless 3945ABG Network Connection 
+driver for Linux will be used to reference the unified driver.
+
+Copyright (C) 2005 - 2006, Intel Corporation
+
+README.ipw3945
+
+Version: 1.0.5
+Date   : May 22, 2006
+
+
+Index
+-----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+1.   Introduction
+1.1. Overview of Features
+2.   Loading the Driver
+3.   Feature Details
+3.1. LEDs
+3.2. Association Details
+3.3. Roaming Details
+3.4. Scanning Details
+3.5. Antenna Selection and "Diversity"
+3.6. IEEE 802.11h Details 
+3.7. Tx Power 
+3.8. Security Details
+3.9. Power Management
+4.   Configuring the driver
+4.1. Command Line Parameters
+4.3. Sysfs Helper Files:
+5.   Wireless Tools Details
+5.1. iwlist
+5.2. iwpriv
+5.3. iwconfig
+6.   Support
+7.   License
+
+
+===============================================
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+===============================================
+
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+
+
+===============================================
+1.   Introduction
+===============================================
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 3945ABG driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.5) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ 802.11i (WPA/WPA2)
++ Wireless Extension support 
++ Full B and G rate support
++ Full A rate support (ABG only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
+
+The following features are currently enabled, but not officially
+supported:
+
++ QoS
++ Monitor mode (aka RFMon)
++ Associated RF promiscuous mode
++ Frame Rx simulation
+
+The distinction between officially supported and enabled is a reflection 
+of the amount of validation and interoperability testing that has been
+performed on a given feature. Note: in addition, the features may not have 
+all of the code in the driver to fully enable the feature.
+
+
+===============================================
+2. Loading the Driver
+===============================================
+
+See the INSTALL document for information on installing the driver.
+
+Once installed, a typical method for launching the driver and the 
+regulatory daemon is via the load script provided in the source package:
+
+	# ./load debug=0x43fff   <--- You need to be root for this
+
+NOTE:  You will not be able to rmmod the driver so long as the 
+ipw3945d daemon is running.  
+
+If you followed the steps of the INSTALL document to set up your
+modprobe.conf, you can load the module by simply running:
+
+	# modprobe ipw3945       <--- You need to be root for this
+
+If you did not configure your modprobe.conf to automatically launch the 
+regulatory daemon (see INSTALL), you must do so manually after loading 
+the module:
+
+	# /sbin/ipw3945d	<--- You need to be root for this
+
+If you want to unload the module (and kill the deamon as well), you can 
+simply use the unload script:
+
+	# ./unload               <--- You need to be root for this
+
+or likewise if you configured modprobe.conf:
+
+	# modprobe -r ipw3945       <--- You need to be root for this
+
+If you did not configure modprobe.conf to unload the regulatory daemon 
+and are not using the unload script, you need to kill the regulatory 
+daemon before you will be able to unload the module:
+
+	# /sbin/ipw3945d --kill	<--- You need to be root for this
+	# modprobe -r ipw3945
+
+
+===============================================
+3. Feature Details
+===============================================
+
+3.1. LEDs
+-----------------------------------------------
+
+The driver will attempt to control the wireless LED, if one is 
+configured in hardware.  There are typically two LEDs:
+
+	Activity -- used to indicate wireless activity
+	Link     -- used to indicate wireless link
[...20341 lines suppressed...]
+ * a command to appear. Currently set to 60s. */
+#define DAEMON_POLL_INTERVAL 60000
+
+#define DAEMON_BUF_SIZE 3000
+
+struct daemon_cmd_hdr {
+	u8 cmd;
+	u8 flags;
+	u8 token;
+	u8 reserved1;
+	u16 version;
+	u16 data_len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+struct daemon_cmd {
+	struct daemon_cmd_hdr hdr;
+	u8 data[DAEMON_BUF_SIZE];
+} __attribute__ ((packed));
+
+/*  driver <- daemon error response */
+struct daemon_error {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon synchronous command done */
+struct daemon_cmd_done {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon regulatory information
+ *
+ * The following is sent from the daemon to the driver
+ * to inform the driver of current channel capabilities and
+ * restrictions.
+ *
+ * Immediately after INIT is provided from the driver the
+ * daemon will send the full channel map.
+ *
+ * After a channel has been selected via rx_config, the
+ * daemon will send periodic updates when the channel limits
+ * change for a specific channel.
+ *
+ * NOTE:  The txpower field represents the current configured
+ * power as directed by either the user (sent to the daemon
+ * through the DAEMON_SYNC::DAEMON_SYNC_TXPOWER_LIMIT command)
+ * or as specified through the currently associated access
+ * point.  The max_txpower is the highest the channel is
+ * allowed to transmit.
+ *
+ */
+enum {
+	DAEMON_A_BAND = (1 << 0),	/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	DAEMON_IBSS_ALLOWED = (1 << 1),
+	DAEMON_ACTIVE_ALLOWED = (1 << 2),
+	DAEMON_RADAR_DETECT = (1 << 3),
+};
+struct daemon_channel_info {
+	u8 channel;
+	u8 flags;
+	s8 txpower;
+	s8 max_txpower;
+};
+struct daemon_regulatory_info {
+	u16 count;		/* Number of channels provided */
+	struct daemon_channel_info channel_info[0];
+} __attribute__ ((packed));
+
+/* driver <- daemon information request */
+struct daemon_request_info {
+	u8 request;
+} __attribute__ ((packed));
+
+/* driver <- daemon set state */
+struct daemon_set_state {
+	u8 state;
+} __attribute__ ((packed));
+
+/* driver -> daemon scan request */
+#define DAEMON_MIN_24GHZ_CHANNEL 1
+#define DAEMON_MAX_24GHZ_CHANNEL 14
+#define DAEMON_MIN_52GHZ_CHANNEL 34
+#define DAEMON_MAX_52GHZ_CHANNEL 165
+
+#define DAEMON_SCAN_FLAG_24GHZ  (1<<0)
+#define DAEMON_SCAN_FLAG_52GHZ  (1<<1)
+#define DAEMON_SCAN_FLAG_ACTIVE (1<<2)
+#define DAEMON_SCAN_FLAG_DIRECT (1<<3)
+
+#define DAEMON_MAX_CMD_SIZE 1024
+
+enum {
+	DAEMON_TXRATE_1 = 0xa,
+	DAEMON_TXRATE_2 = 0x14,
+	DAEMON_TXRATE_5_5 = 0x37,
+	DAEMON_TXRATE_6 = 0xd,
+	DAEMON_TXRATE_9 = 0xf,
+	DAEMON_TXRATE_11 = 0x6e,
+	DAEMON_TXRATE_12 = 0x5,
+	DAEMON_TXRATE_18 = 0x7,
+	DAEMON_TXRATE_24 = 0x9,
+	DAEMON_TXRATE_36 = 0xb,
+	DAEMON_TXRATE_48 = 0x1,
+	DAEMON_TXRATE_54 = 0x3,
+};
+
+struct daemon_scan_channel {
+	u8 channel;
+	u8 request_active;
+	u16 active_dwell;
+	u16 passive_dwell;
+} __attribute__ ((packed));
+
+struct daemon_ssid_ie {
+	u8 id;
+	u8 len;
+	u8 ssid[32];
+} __attribute__ ((packed));
+
+struct daemon_rx_config {
+	u8 dev_type;
+	u16 channel;
+	u32 flags;
+	u32 filter_flags;
+	u8 ofdm_basic_rates;
+	u8 cck_basic_rates;
+	u8 node_addr[6];
+	u8 bssid_addr[6];
+	u16 assoc_id;
+	u16 beacon_interval;
+} __attribute__ ((packed));
+
+#define DAEMON_MAX_SCAN_SIZE 1024
+struct daemon_scan_request {
+	u8 flags;		/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	u8 channel_count;
+	u16 probe_request_len;
+	u16 quiet_time;		/* dwell only this long on quiet chnl (active scan) */
+	u16 quiet_plcp_th;	/* quiet chnl is < this # pkts (typ. 1) */
+	u32 suspend_time;	/* pause scan this long when returning to svc chnl */
+	u32 max_out_time;	/* max msec to be out of associated (service) chnl */
+	u8 probe_request_rate;	/* rate to send probe request */
+	u32 filter_flags;
+	u32 rxon_flags;
+	struct daemon_ssid_ie direct_scan;
+	u8 data[0];
+	/*
+	   The channels start after the probe request payload and are of type:
+
+	   struct daemon_scan_channel channels[0];
+
+	   NOTE:  Only one band of channels can be scanned per pass.  You
+	   can not mix 2.4Ghz channels and 5.2Ghz channels and must
+	   request a scan multiple times (not concurrently)
+
+	 */
+} __attribute__ ((packed));
+
+/* driver -> daemon 11h frame */
+struct daemon_80211_frame {
+	u8 channel;
+	u8 reserved1;
+	u16 rssi;
+	u16 reserved2;
+	u64 tsf;
+	u32 beacon_time;
+	u16 frame_len;
+	u8 frame[0];
+} __attribute__ ((packed));
+
+struct daemon_sync_txpower_limit {
+	u8 channel;
+	s8 power;
+} __attribute__ ((packed));
+
+enum {
+	DAEMON_SYNC_UNINIT = 0,
+	DAEMON_SYNC_INIT,
+	DAEMON_SYNC_SCAN_COMPLETE,
+	DAEMON_SYNC_TXPOWER_LIMIT,
+	DAEMON_SYNC_MEASURE_REPORT,
+	DAEMON_SYNC_TX_STATUS,
+	DAEMON_SYNC_SUSPEND,
+	DAEMON_SYNC_RESUME,
+};
+
+/* driver  -> daemon */
+struct daemon_sync_cmd {
+	u16 state;
+	u16 len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+#endif

jwltest-sk98lin-neuter.patch:
 skge.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE jwltest-sk98lin-neuter.patch ---
--- linux-2.6.13/drivers/net/sk98lin/skge.c.orig	2005-10-20 15:19:17.000000000 -0400
+++ linux-2.6.13/drivers/net/sk98lin/skge.c	2005-10-20 15:19:25.000000000 -0400
@@ -5227,8 +5227,6 @@
 	{ 0 }
 };
 
-MODULE_DEVICE_TABLE(pci, skge_pci_tbl);
-
 static struct pci_driver skge_driver = {
 	.name		= "sk98lin",
 	.id_table	= skge_pci_tbl,

jwltest-tg3-3_50.patch:
 drivers/net/tg3.c       |  100 +++++++++++++++++++++++++++++++++++++++---------
 include/linux/pci_ids.h |    2 
 2 files changed, 84 insertions(+), 18 deletions(-)

--- NEW FILE jwltest-tg3-3_50.patch ---
--- linux-2.6.15.noarch/include/linux/pci_ids.h.orig	2006-02-16 15:56:23.000000000 -0500
+++ linux-2.6.15.noarch/include/linux/pci_ids.h	2006-02-16 15:56:17.000000000 -0500
@@ -1861,12 +1861,14 @@
 #define PCI_DEVICE_ID_TIGON3_5705M	0x165d
 #define PCI_DEVICE_ID_TIGON3_5705M_2	0x165e
 #define PCI_DEVICE_ID_TIGON3_5714	0x1668
+#define PCI_DEVICE_ID_TIGON3_5714S	0x1669
 #define PCI_DEVICE_ID_TIGON3_5780	0x166a
 #define PCI_DEVICE_ID_TIGON3_5780S	0x166b
 #define PCI_DEVICE_ID_TIGON3_5705F	0x166e
 #define PCI_DEVICE_ID_TIGON3_5750	0x1676
 #define PCI_DEVICE_ID_TIGON3_5751	0x1677
 #define PCI_DEVICE_ID_TIGON3_5715	0x1678
+#define PCI_DEVICE_ID_TIGON3_5715S	0x1679
 #define PCI_DEVICE_ID_TIGON3_5750M	0x167c
 #define PCI_DEVICE_ID_TIGON3_5751M	0x167d
 #define PCI_DEVICE_ID_TIGON3_5751F	0x167e
--- linux-2.6.15.noarch/drivers/net/tg3.c.orig	2006-02-16 15:55:22.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/tg3.c	2006-02-16 15:55:22.000000000 -0500
@@ -69,8 +69,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"3.49"
-#define DRV_MODULE_RELDATE	"Feb 2, 2006"
+#define DRV_MODULE_VERSION	"3.50"
+#define DRV_MODULE_RELDATE	"Feb 4, 2006"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -223,8 +223,12 @@ static struct pci_device_id tg3_pci_tbl[
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715S,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5780,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5780S,
@@ -1038,9 +1042,11 @@ static void tg3_frob_aux_power(struct tg
 		struct net_device *dev_peer;
 
 		dev_peer = pci_get_drvdata(tp->pdev_peer);
+		/* remove_one() may have been run on the peer. */
 		if (!dev_peer)
-			BUG();
-		tp_peer = netdev_priv(dev_peer);
+			tp_peer = tp;
+		else
+			tp_peer = netdev_priv(dev_peer);
 	}
 
 	if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 ||
@@ -1131,7 +1137,7 @@ static int tg3_halt_cpu(struct tg3 *, u3
 static int tg3_nvram_lock(struct tg3 *);
 static void tg3_nvram_unlock(struct tg3 *);
 
-static int tg3_set_power_state(struct tg3 *tp, int state)
+static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 {
 	u32 misc_host_ctrl;
 	u16 power_control, power_caps;
@@ -1150,7 +1156,7 @@ static int tg3_set_power_state(struct tg
 	power_control |= PCI_PM_CTRL_PME_STATUS;
 	power_control &= ~(PCI_PM_CTRL_STATE_MASK);
 	switch (state) {
-	case 0:
+	case PCI_D0:
 		power_control |= 0;
 		pci_write_config_word(tp->pdev,
 				      pm + PCI_PM_CTRL,
@@ -1163,15 +1169,15 @@ static int tg3_set_power_state(struct tg
 
 		return 0;
 
-	case 1:
+	case PCI_D1:
 		power_control |= 1;
 		break;
 
-	case 2:
+	case PCI_D2:
 		power_control |= 2;
 		break;
 
-	case 3:
+	case PCI_D3hot:
 		power_control |= 3;
 		break;
 
@@ -2680,6 +2686,12 @@ static int tg3_setup_fiber_mii_phy(struc
 
 	err |= tg3_readphy(tp, MII_BMSR, &bmsr);
 	err |= tg3_readphy(tp, MII_BMSR, &bmsr);
+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) {
+		if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP)
+			bmsr |= BMSR_LSTATUS;
+		else
+			bmsr &= ~BMSR_LSTATUS;
+	}
 
 	err |= tg3_readphy(tp, MII_BMCR, &bmcr);
 
@@ -2748,6 +2760,13 @@ static int tg3_setup_fiber_mii_phy(struc
 			bmcr = new_bmcr;
 			err |= tg3_readphy(tp, MII_BMSR, &bmsr);
 			err |= tg3_readphy(tp, MII_BMSR, &bmsr);
+			if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
+			    ASIC_REV_5714) {
+				if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP)
+					bmsr |= BMSR_LSTATUS;
+				else
+					bmsr &= ~BMSR_LSTATUS;
+			}
 			tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
 		}
 	}
@@ -5568,6 +5587,9 @@ static int tg3_reset_hw(struct tg3 *tp)
 		tg3_abort_hw(tp, 1);
 	}
 
+	if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+		tg3_phy_reset(tp);
+
 	err = tg3_chip_reset(tp);
 	if (err)
 		return err;
@@ -6080,6 +6102,17 @@ static int tg3_reset_hw(struct tg3 *tp)
 		tp->tg3_flags2 |= TG3_FLG2_HW_AUTONEG;
 	}
 
+	if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) &&
+	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) {
+		u32 tmp;
+
+		tmp = tr32(SERDES_RX_CTRL);
+		tw32(SERDES_RX_CTRL, tmp | SERDES_RX_SIG_DETECT);
+		tp->grc_local_ctrl &= ~GRC_LCLCTRL_USE_EXT_SIG_DETECT;
+		tp->grc_local_ctrl |= GRC_LCLCTRL_USE_SIG_DETECT;
+		tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
+	}
+
 	err = tg3_setup_phy(tp, 1);
 	if (err)
 		return err;
@@ -6158,7 +6191,7 @@ static int tg3_init_hw(struct tg3 *tp)
 	int err;
 
 	/* Force the chip into D0. */
-	err = tg3_set_power_state(tp, 0);
+	err = tg3_set_power_state(tp, PCI_D0);
 	if (err)
 		goto out;
 
@@ -6445,6 +6478,10 @@ static int tg3_open(struct net_device *d
 
 	tg3_full_lock(tp, 0);
 
+	err = tg3_set_power_state(tp, PCI_D0);
+	if (err)
+		return err;
+
 	tg3_disable_ints(tp);
 	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
 
@@ -6459,7 +6496,9 @@ static int tg3_open(struct net_device *d
 
 	if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
 	    (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_AX) &&
-	    (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX)) {
+	    (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX) &&
+	    !((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) &&
+	      (tp->pdev_peer == tp->pdev))) {
 		/* All MSI supporting chips should support tagged
 		 * status.  Assert that this is the case.
 		 */
@@ -6822,7 +6861,6 @@ static int tg3_close(struct net_device *
 	tp->tg3_flags &=
 		~(TG3_FLAG_INIT_COMPLETE |
 		  TG3_FLAG_GOT_SERDES_FLOWCTL);
-	netif_carrier_off(tp->dev);
 
 	tg3_full_unlock(tp);
 
@@ -6839,6 +6877,10 @@ static int tg3_close(struct net_device *
 
 	tg3_free_consistent(tp);
 
+	tg3_set_power_state(tp, PCI_D3hot);
+
+	netif_carrier_off(tp->dev);
+
 	return 0;
 }
 
@@ -7157,6 +7199,9 @@ static void tg3_get_regs(struct net_devi
 
 	memset(p, 0, TG3_REGDUMP_LEN);
 
+	if (tp->link_config.phy_is_low_power)
+		return;
+
 	tg3_full_lock(tp, 0);
 
 #define __GET_REG32(reg)	(*(p)++ = tr32(reg))
@@ -7231,6 +7276,9 @@ static int tg3_get_eeprom(struct net_dev
 	u8  *pd;
 	u32 i, offset, len, val, b_offset, b_count;
 
+	if (tp->link_config.phy_is_low_power)
+		return -EAGAIN;
+
 	offset = eeprom->offset;
 	len = eeprom->len;
 	eeprom->len = 0;
@@ -7292,6 +7340,9 @@ static int tg3_set_eeprom(struct net_dev
 	u32 offset, len, b_offset, odd_len, start, end;
 	u8 *buf;
 
+	if (tp->link_config.phy_is_low_power)
+		return -EAGAIN;
+
 	if (eeprom->magic != TG3_EEPROM_MAGIC)
 		return -EINVAL;
 
@@ -8212,6 +8263,9 @@ static void tg3_self_test(struct net_dev
 {
 	struct tg3 *tp = netdev_priv(dev);
 
+	if (tp->link_config.phy_is_low_power)
+		tg3_set_power_state(tp, PCI_D0);
+
 	memset(data, 0, sizeof(u64) * TG3_NUM_TEST);
 
 	if (tg3_test_nvram(tp) != 0) {
@@ -8269,6 +8323,9 @@ static void tg3_self_test(struct net_dev
 
 		tg3_full_unlock(tp);
 	}
+	if (tp->link_config.phy_is_low_power)
+		tg3_set_power_state(tp, PCI_D3hot);
+
 }
 
 static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -8288,6 +8345,9 @@ static int tg3_ioctl(struct net_device *
 		if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
 			break;			/* We have no PHY */
 
+		if (tp->link_config.phy_is_low_power)
+			return -EAGAIN;
+
 		spin_lock_bh(&tp->lock);
 		err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval);
 		spin_unlock_bh(&tp->lock);
@@ -8304,6 +8364,9 @@ static int tg3_ioctl(struct net_device *
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
 
+		if (tp->link_config.phy_is_low_power)
+			return -EAGAIN;
+
 		spin_lock_bh(&tp->lock);
 		err = tg3_writephy(tp, data->reg_num & 0x1f, data->val_in);
 		spin_unlock_bh(&tp->lock);
@@ -9718,7 +9781,7 @@ static int __devinit tg3_get_invariants(
 		tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE3;
 
 	/* Force the chip into D0. */
-	err = tg3_set_power_state(tp, 0);
+	err = tg3_set_power_state(tp, PCI_D0);
 	if (err) {
 		printk(KERN_ERR PFX "(%s) transition to D0 failed\n",
 		       pci_name(tp->pdev));
@@ -10771,11 +10834,12 @@ static int __devinit tg3_init_one(struct
 		tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE;
 	}
 
-	/* TSO is off by default, user can enable using ethtool.  */
-#if 0
-	if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)
+	/* TSO is on by default on chips that support hardware TSO.
+	 * Firmware TSO on older chips gives lower performance, so it
+	 * is off by default, but can be enabled using ethtool.
+	 */
+	if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
 		dev->features |= NETIF_F_TSO;
-#endif
 
 #endif
 
@@ -10968,7 +11032,7 @@ static int tg3_resume(struct pci_dev *pd
 
 	pci_restore_state(tp->pdev);
 
-	err = tg3_set_power_state(tp, 0);
+	err = tg3_set_power_state(tp, PCI_D0);
 	if (err)
 		return err;
 

jwltest-via-rhine-carrier.patch:
 via-rhine.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+)

--- NEW FILE jwltest-via-rhine-carrier.patch ---
--- linux-2.6.15.noarch/drivers/net/via-rhine.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/via-rhine.c	2006-05-19 11:25:23.000000000 -0400
@@ -1085,6 +1085,25 @@ static void rhine_check_media(struct net
 	else
 	    iowrite8(ioread8(ioaddr + ChipCmd1) & ~Cmd1FDuplex,
 		   ioaddr + ChipCmd1);
+	if (debug > 1)
+		printk(KERN_INFO "%s: force_media %d, carrier %d\n", dev->name,
+			rp->mii_if.force_media, netif_carrier_ok(dev));
+}
+
+/* Called after status of force_media possibly changed */
+void rhine_set_carrier(struct mii_if_info *mii)
+{
+	if (mii->force_media) {
+		/* autoneg is off: Link is always assumed to be up */
+		if (!netif_carrier_ok(mii->dev))
+			netif_carrier_on(mii->dev);
+	}
+	else	/* Let MMI library update carrier status */
+		rhine_check_media(mii->dev, 0);
+	if (debug > 1)
+		printk(KERN_INFO "%s: force_media %d, carrier %d\n",
+		       mii->dev->name, mii->force_media,
+		       netif_carrier_ok(mii->dev));
 }
 
 static void rhine_check_media_task(struct net_device *dev)
@@ -1782,6 +1801,7 @@ static int netdev_set_settings(struct ne
 	spin_lock_irq(&rp->lock);
 	rc = mii_ethtool_sset(&rp->mii_if, cmd);
 	spin_unlock_irq(&rp->lock);
+	rhine_set_carrier(&rp->mii_if);
 
 	return rc;
 }
@@ -1869,6 +1889,7 @@ static int netdev_ioctl(struct net_devic
 	spin_lock_irq(&rp->lock);
 	rc = generic_mii_ioctl(&rp->mii_if, if_mii(rq), cmd, NULL);
 	spin_unlock_irq(&rp->lock);
+	rhine_set_carrier(&rp->mii_if);
 
 	return rc;
 }


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2133
retrieving revision 1.2133.4.1
diff -u -r1.2133 -r1.2133.4.1
--- kernel-2.6.spec	6 Jun 2006 04:35:22 -0000	1.2133
+++ kernel-2.6.spec	15 Jun 2006 18:33:28 -0000	1.2133.4.1
@@ -24,7 +24,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5.jwltest.16
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -251,6 +251,7 @@
 Patch321: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -346,6 +347,10 @@
 Patch1302: linux-2.6-net-wireless-features.patch
 Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch
 Patch1304: linux-2.6-net-ipw2200-monitor.patch
+Patch1305: jwltest-sk98lin-neuter.patch
+Patch1306: jwltest-tg3-3_50.patch
+Patch1307: jwltest-via-rhine-carrier.patch
+Patch1308: jwltest-e1000-wol-shutdown.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -422,6 +427,11 @@
 Patch5006: linux-2.6-softmac-default-rate.patch
 Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch
 Patch5008: linux-2.6-softmac-assoc-events.patch
+Patch5009: jwltest-bcm43xx-wx-overflow.patch
+
+# IPW3945 wireless driver
+Patch5100: jwltest-ieee80211-2_6_17-rc5.patch
+Patch5101: jwltest-ipw3945-1_0_5.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -962,6 +972,14 @@
 %patch1303 -p1
 # add IPW2200_MONITOR config option
 %patch1304 -p1
+# neuter sk98lin (as far as userland is concerned)
+%patch1305 -p1
+# update tg3 to 3.50
+%patch1306 -p1
+# apply upstream fix for force_media w/ via-rhine
+%patch1307 -p1
+# e1000: setup WoL before shutdown
+%patch1308 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -1089,6 +1107,13 @@
 %patch5007 -p1
 # Send standard events on {dis,}association
 %patch5008 -p1
+# fix possible buffer overflow in wx handler
+%patch5009 -p1
+
+# Update ieee80211 to support ipw3945
+%patch5100 -p1
+# ...and add ipw3945 driver
+%patch5101 -p1
 
 #
 # final stuff



From fedora-cvs-commits at redhat.com  Thu Jun 15 18:34:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 14:34:15 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.173,1.174
Message-ID: <200606151834.k5FIYFcw017060@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17025

Modified Files:
	kdebase.spec 
Log Message:
fix BR




Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kdebase.spec	14 Jun 2006 22:57:39 -0000	1.173
+++ kdebase.spec	15 Jun 2006 18:34:12 -0000	1.174
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 0.2.fc5
+Release: 0.3.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -87,25 +87,45 @@
 Requires: redhat-artwork >= 0.92
 %endif
 
-BuildPrereq: kdelibs-devel >= %{kde_version}
-BuildPrereq: libxml2-devel >= 2.6.5
-BuildPrereq: openmotif-devel
-BuildPrereq: cdparanoia-libs
-BuildPrereq: cdparanoia-devel
-BuildPrereq: samba >= 2.2.3a-5
-BuildPrereq: pam-devel
-BuildPrereq: gettext
-BuildPrereq: imake
-BuildPrereq: dbus-devel >= 0.60
-BuildPrereq: hal-devel >= 0.5
-BuildPrereq: libxkbfile-devel
+BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: samba >= 2.2.3a-5
+BuildRequires: pam-devel
+BuildRequires: gettext
+BuildRequires: imake
+BuildRequires: perl
+BuildRequires: sed
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: pkgconfig
+BuildRequires: doxygen
+BuildRequires: cdparanoia-devel
+BuildRequires: dbus-devel >= 0.60
+BuildRequires: hal-devel >= 0.5
+BuildRequires: freetype-devel
+BuildRequires: openldap-devel
+BuildRequires: cyrus-sasl-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-font-utils
+BuildRequires: libfontenc-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXext-devel
+BuildRequires: libXtst-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libxkbfile-devel
 %ifnarch s390 s390x
-BuildPrereq: libraw1394-devel
+BuildRequires: libraw1394-devel
+%endif
+%ifarch alpha %{ix86} x86_64
+BuildRequires: lm_sensors-devel
 %endif
-BuildPrereq: libXdamage-devel
-BuildPrereq: libXcomposite-devel
-BuildPrereq: libXrender-devel
-BuildPrereq: libXfixes-devel
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
@@ -181,11 +201,7 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
-   --with-extra-libs=%{_libdir} \
    --with-xdmdir=%{_sysconfdir}/X11/xdm \
-   --with-motif-includes=%{_includedir} \
-   --with-motif-libraries=%{_libdir} \
    --with-pam=yes \
    --with-kdm-pam=kdm \
    --with-kcp-pam=kcheckpass \
@@ -530,6 +546,9 @@
 
 
 %changelog
+* Thu Jun 15 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
+- fix BR 
+
 * Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5 
 - apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
   thanks to KDE security team



From fedora-cvs-commits at redhat.com  Thu Jun 15 18:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 14:35:17 -0400
Subject: rpms/vte/devel .cvsignore, 1.40, 1.41 sources, 1.40, 1.41 vte.spec,
	1.82, 1.83
Message-ID: <200606151835.k5FIZHF2017132@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17098

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.13.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	17 May 2006 14:22:01 -0000	1.40
+++ .cvsignore	15 Jun 2006 18:35:10 -0000	1.41
@@ -1 +1 @@
-vte-0.13.1.tar.bz2
+vte-0.13.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	17 May 2006 14:22:01 -0000	1.40
+++ sources	15 Jun 2006 18:35:10 -0000	1.41
@@ -1 +1 @@
-5050661ce79f5741adf8726379266fd5  vte-0.13.1.tar.bz2
+aa21fbf815faa986ebea8f3189ac4f94  vte-0.13.2.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- vte.spec	9 Jun 2006 05:05:03 -0000	1.82
+++ vte.spec	15 Jun 2006 18:35:10 -0000	1.83
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.13.1
-Release: 4
+Version: 0.13.2
+Release: 1
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
@@ -16,7 +16,6 @@
 Prereq: initscripts 
 
 Patch0: vte-0.13.0-real-transparency.patch
-Patch1: vte-0.13.1-mock.patch
 
 %description
 VTE is a terminal emulator widget for use with GTK+ 2.0.
@@ -33,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .real-transparency
-#%patch1 -p1 -b .mock
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -106,6 +104,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jun 15 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.2-1
+- Update to 0.13.2
+
 * Sun May 28 2006 Stepan Kasal <skasal at redhat.com>    - 0.13.1-3
 - Fix the URL of Source:.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 18:57:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 14:57:58 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2289,1.2290
Message-ID: <200606151857.k5FIvwfI006059@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5853

Modified Files:
	kernel-2.6.spec 
Log Message:
rhelbuild cleanups 
add support back in for ppc and s390 (for internal use)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2289
retrieving revision 1.2290
diff -u -r1.2289 -r1.2290
--- kernel-2.6.spec	15 Jun 2006 16:46:42 -0000	1.2289
+++ kernel-2.6.spec	15 Jun 2006 18:57:56 -0000	1.2290
@@ -28,7 +28,10 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag %([ -r branch ] && cat branch |sed s/RHEL-5/EL/ | sed s/FC-6/FC6/ || echo FC6)
+%define tag FC6
+%if %{rhelbuild}
+%define tag EL
+%endif
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
 %define signmodules 0
 %define xen_version 20060610
@@ -179,11 +182,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-%if %{rhelbuild}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ia64 sparc sparc64 s390x
-%else
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x
-%endif
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1690,6 +1689,10 @@
 %endif
 
 %changelog
+* Thu Jun 15 2006 Don Zickus <dzickus at redhat.com>
+- rhelbuild clean ups
+- add back in support for ppc and s390 (needed internally only)
+
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> 
 - fix installation of -xen kernel on baremetal to be dom0 grub config
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:01:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:01:19 -0400
Subject: rpms/frysk/devel .cvsignore, 1.12, 1.13 frysk.spec, 1.43,
	1.44 sources, 1.12, 1.13
Message-ID: <200606151901.k5FJ1JJY006930@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6893

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
Refresh the tarball.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Jun 2006 23:17:24 -0000	1.12
+++ .cvsignore	15 Jun 2006 19:00:49 -0000	1.13
@@ -1,2 +1 @@
-frysk-0.0.1.2006.02.19.rh2.tar.bz2
-frysk-0.0.1.2006.06.14.rh1.tar.bz2
+frysk-0.0.1.2006.06.15.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- frysk.spec	15 Jun 2006 18:23:50 -0000	1.43
+++ frysk.spec	15 Jun 2006 19:00:49 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.14.rh1
-Release:	1
+Version:	0.0.1.2006.06.15.rh1
+Release:	0
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -103,11 +103,14 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-0
+- Refresh the tarball.
+
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.
 - Patch to avoid scanf("%a[..]").
 
-* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
+* Thu Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
 - New upstream version.
 - Add BuildRequires: libglade2-devel >= 2.5.1
 - Refresh other BuildRequires.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Jun 2006 23:17:24 -0000	1.12
+++ sources	15 Jun 2006 19:00:49 -0000	1.13
@@ -1,2 +1 @@
-01dba74491b570ebbbfa7cc41ba9fe06  frysk-0.0.1.2006.02.19.rh2.tar.bz2
-e744c9fdc6f614069c262c0b9ab86737  frysk-0.0.1.2006.06.14.rh1.tar.bz2
+f543e2ef5e207c514f790a4b9472c04e  frysk-0.0.1.2006.06.15.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:13:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:13:14 -0400
Subject: rpms/cman/devel cman.spec,1.33,1.34
Message-ID: <200606151913.k5FJDEHi007947@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7919

Modified Files:
	cman.spec 
Log Message:
Build for all archs.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cman.spec	14 Jun 2006 17:28:52 -0000	1.33
+++ cman.spec	15 Jun 2006 19:13:11 -0000	1.34
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.6
+Release: 0.fc6.7
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -23,7 +23,7 @@
 Conflicts: GFS-modules
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:15:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:15:16 -0400
Subject: rpms/kernel/FC-5 jwltest-ieee80211-2_6_17-rc5.patch, 1.1.2.1,
	1.1.2.2
Message-ID: <200606151915.k5FJFGVB008770@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8699

Modified Files:
      Tag: private-linville-jwltest-fc5-16-branch
	jwltest-ieee80211-2_6_17-rc5.patch 
Log Message:


jwltest-ieee80211-2_6_17-rc5.patch:
 include/net/ieee80211.h                         |  181 +++++++++++++++++++++++-
 include/net/ieee80211_crypt.h                   |    3 
 include/net/ieee80211softmac.h                  |   48 +++++-
 include/net/ieee80211softmac_wx.h               |    5 
 net/ieee80211/ieee80211_crypt.c                 |   11 -
 net/ieee80211/ieee80211_crypt_ccmp.c            |    8 -
 net/ieee80211/ieee80211_crypt_tkip.c            |   67 +++++---
 net/ieee80211/ieee80211_crypt_wep.c             |    5 
 net/ieee80211/ieee80211_geo.c                   |   48 +++++-
 net/ieee80211/ieee80211_module.c                |   18 ++
 net/ieee80211/ieee80211_rx.c                    |  173 ++++++++++++++++++++--
 net/ieee80211/ieee80211_tx.c                    |   93 ++++++++----
 net/ieee80211/ieee80211_wx.c                    |  113 ++++++++------
 net/ieee80211/softmac/Kconfig                   |    1 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  141 +++++++++++-------
 net/ieee80211/softmac/ieee80211softmac_auth.c   |   33 ++--
 net/ieee80211/softmac/ieee80211softmac_event.c  |   42 +++--
 net/ieee80211/softmac/ieee80211softmac_io.c     |  118 +++++++--------
 net/ieee80211/softmac/ieee80211softmac_module.c |  135 ++++++++++++++---
 net/ieee80211/softmac/ieee80211softmac_priv.h   |   16 --
 net/ieee80211/softmac/ieee80211softmac_scan.c   |   10 +
 net/ieee80211/softmac/ieee80211softmac_wx.c     |   85 +++++++++--
 22 files changed, 1004 insertions(+), 350 deletions(-)

Index: jwltest-ieee80211-2_6_17-rc5.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/Attic/jwltest-ieee80211-2_6_17-rc5.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- jwltest-ieee80211-2_6_17-rc5.patch	15 Jun 2006 18:33:28 -0000	1.1.2.1
+++ jwltest-ieee80211-2_6_17-rc5.patch	15 Jun 2006 19:15:14 -0000	1.1.2.2
@@ -1,5 +1,5 @@
---- linux-2.6.16.noarch/include/net/ieee80211softmac_wx.h.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/include/net/ieee80211softmac_wx.h	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/include/net/ieee80211softmac_wx.h.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/include/net/ieee80211softmac_wx.h	2006-06-15 15:02:16.000000000 -0400
 @@ -91,4 +91,9 @@ ieee80211softmac_wx_get_genie(struct net
  			      struct iw_request_info *info,
  			      union iwreq_data *wrqu,
@@ -10,8 +10,8 @@
 +			     union iwreq_data *wrqu,
 +			     char *extra);
  #endif /* _IEEE80211SOFTMAC_WX */
---- linux-2.6.16.noarch/include/net/ieee80211.h.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/include/net/ieee80211.h	2006-06-15 14:23:45.000000000 -0400
+--- linux-2.6.16.noarch/include/net/ieee80211.h.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/include/net/ieee80211.h	2006-06-15 15:02:48.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <linux/kernel.h>	/* ARRAY_SIZE */
  #include <linux/wireless.h>
@@ -299,8 +299,20 @@
  
  /* ieee80211_wx.c */
  extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
---- linux-2.6.16.noarch/include/net/ieee80211softmac.h.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/include/net/ieee80211softmac.h	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/include/net/ieee80211_crypt.h.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/include/net/ieee80211_crypt.h	2006-06-15 15:02:16.000000000 -0400
+@@ -47,7 +47,8 @@ struct ieee80211_crypto_ops {
+ 	/* deinitialize crypto context and free allocated private data */
+ 	void (*deinit) (void *priv);
+ 
+-	int (*build_iv) (struct sk_buff * skb, int hdr_len, void *priv);
++	int (*build_iv) (struct sk_buff * skb, int hdr_len,
++			 u8 *key, int keylen, void *priv);
+ 
+ 	/* encrypt/decrypt return < 0 on error or >= 0 on success. The return
+ 	 * value from decrypt_mpdu is passed as the keyidx value for
+--- linux-2.6.16.noarch/include/net/ieee80211softmac.h.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/include/net/ieee80211softmac.h	2006-06-15 15:02:16.000000000 -0400
 @@ -86,6 +86,9 @@ struct ieee80211softmac_assoc_info {
  	
  	/* BSSID we're trying to associate to */
@@ -406,8 +418,29 @@
  
  #define ieee80211softmac_notify(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_KERNEL);
  #define ieee80211softmac_notify_atomic(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_ATOMIC);
---- linux-2.6.16.noarch/net/ieee80211/ieee80211_module.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/ieee80211_module.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt_wep.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt_wep.c	2006-06-15 15:02:16.000000000 -0400
+@@ -76,7 +76,8 @@ static void prism2_wep_deinit(void *priv
+ }
+ 
+ /* Add WEP IV/key info to a frame that has at least 4 bytes of headroom */
+-static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len, void *priv)
++static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len,
++			       u8 *key, int keylen, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	u32 klen, len;
+@@ -131,7 +132,7 @@ static int prism2_wep_encrypt(struct sk_
+ 		return -1;
+ 	
+ 	/* add the IV to the frame */
+-	if (prism2_wep_build_iv(skb, hdr_len, priv))
++	if (prism2_wep_build_iv(skb, hdr_len, NULL, 0, priv))
+ 		return -1;
+ 	
+ 	/* Copy the IV into the first 3 bytes of the key */
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_module.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_module.c	2006-06-15 15:02:16.000000000 -0400
 @@ -82,10 +82,28 @@ static int ieee80211_networks_allocate(s
  	return 0;
  }
@@ -437,8 +470,8 @@
  	kfree(ieee->networks);
  	ieee->networks = NULL;
  }
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c	2006-06-15 14:23:45.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c	2006-06-15 15:02:48.000000000 -0400
 @@ -36,8 +36,6 @@ ieee80211softmac_auth_req(struct ieee802
  	struct ieee80211softmac_auth_queue_item *auth;
  	unsigned long flags;
@@ -539,8 +572,8 @@
 +	schedule_work(&mac->associnfo.work);
  	return 0;
  }
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2006-06-15 15:02:16.000000000 -0400
 @@ -26,6 +26,7 @@
  
  #include "ieee80211softmac_priv.h"
@@ -726,8 +759,8 @@
  }
  EXPORT_SYMBOL_GPL(ieee80211softmac_start);
  
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_priv.h.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_priv.h	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_priv.h.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_priv.h	2006-06-15 15:02:16.000000000 -0400
 @@ -75,15 +75,6 @@
  # define dprintk(f, x...)  do { /* nothing */ } while (0)
  #endif
@@ -773,8 +806,8 @@
  
  /* some helper functions */
  static inline int ieee80211softmac_scan_handlers_check_self(struct ieee80211softmac_device *sm)
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_io.c	2006-06-15 14:23:45.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_io.c	2006-06-15 15:02:48.000000000 -0400
 @@ -149,6 +149,56 @@ ieee80211softmac_hdr_3addr(struct ieee80
  	 * shouldn't the sequence number be in ieee80211? */
  }
@@ -918,8 +951,8 @@
 -	kfree(pkt);
 -	return 0;
 -}
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2006-06-15 15:02:16.000000000 -0400
 @@ -27,7 +27,8 @@
  #include "ieee80211softmac_priv.h"
  
@@ -1077,8 +1110,8 @@
 +	}
 +}
 +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_mlme);
---- linux-2.6.16.noarch/net/ieee80211/softmac/Kconfig.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/Kconfig	2006-06-15 14:23:45.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/Kconfig.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/Kconfig	2006-06-15 15:02:48.000000000 -0400
 @@ -1,6 +1,7 @@
  config IEEE80211_SOFTMAC
  	tristate "Software MAC add-on to the IEEE 802.11 networking stack"
@@ -1087,8 +1120,8 @@
  	---help---
  	This option enables the hardware independent software MAC addon
  	for the IEEE 802.11 networking stack.
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2006-06-15 15:02:16.000000000 -0400
 @@ -38,7 +38,7 @@ static void
  ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net)
  {
@@ -1379,8 +1412,8 @@
 +
  	return 0;
  }
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_scan.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_scan.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_scan.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_scan.c	2006-06-15 15:02:16.000000000 -0400
 @@ -47,6 +47,7 @@ ieee80211softmac_start_scan(struct ieee8
  	sm->scanning = 1;
  	spin_unlock_irqrestore(&sm->lock, flags);
@@ -1413,8 +1446,8 @@
  	ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL);
  }
  EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished);
---- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_event.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_event.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_event.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/softmac/ieee80211softmac_event.c	2006-06-15 15:02:16.000000000 -0400
 @@ -38,7 +38,8 @@
   * The event context is private and can only be used from
   * within this module. Its meaning varies with the event
@@ -1510,8 +1543,178 @@
  				schedule_work(&eventptr->work);
  			}
  		}
---- linux-2.6.16.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/ieee80211_rx.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt_tkip.c	2006-06-15 15:02:16.000000000 -0400
+@@ -80,10 +80,9 @@ static void *ieee80211_tkip_init(int key
+ {
+ 	struct ieee80211_tkip_data *priv;
+ 
+-	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
++	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
+ 	if (priv == NULL)
+ 		goto fail;
+-	memset(priv, 0, sizeof(*priv));
+ 
+ 	priv->key_idx = key_idx;
+ 
+@@ -271,34 +270,33 @@ static void tkip_mixing_phase2(u8 * WEPS
+ #endif
+ }
+ 
+-static u8 *ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len,
++			      u8 * rc4key, int keylen, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	int len;
+-	u8 *rc4key, *pos, *icv;
++	u8 *pos;
+ 	struct ieee80211_hdr_4addr *hdr;
+-	u32 crc;
+ 
+ 	hdr = (struct ieee80211_hdr_4addr *)skb->data;
+ 
+ 	if (skb_headroom(skb) < 8 || skb->len < hdr_len)
+-		return NULL;
++		return -1;
++
++	if (rc4key == NULL || keylen < 16)
++		return -1;
+ 
+ 	if (!tkey->tx_phase1_done) {
+ 		tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
+ 				   tkey->tx_iv32);
+ 		tkey->tx_phase1_done = 1;
+ 	}
+-	rc4key = kmalloc(16, GFP_ATOMIC);
+-	if (!rc4key)
+-		return NULL;
+ 	tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16);
+ 
+ 	len = skb->len - hdr_len;
+ 	pos = skb_push(skb, 8);
+ 	memmove(pos, pos + 8, hdr_len);
+ 	pos += hdr_len;
+-	icv = skb_put(skb, 4);
+ 
+ 	*pos++ = *rc4key;
+ 	*pos++ = *(rc4key + 1);
+@@ -309,28 +307,28 @@ static u8 *ieee80211_tkip_hdr(struct sk_
+ 	*pos++ = (tkey->tx_iv32 >> 16) & 0xff;
+ 	*pos++ = (tkey->tx_iv32 >> 24) & 0xff;
+ 
+-	crc = ~crc32_le(~0, pos, len);
+-	icv[0] = crc;
+-	icv[1] = crc >> 8;
+-	icv[2] = crc >> 16;
+-	icv[3] = crc >> 24;
++	tkey->tx_iv16++;
++	if (tkey->tx_iv16 == 0) {
++		tkey->tx_phase1_done = 0;
++		tkey->tx_iv32++;
++	}
+ 
+-	return rc4key;
++	return 8;
+ }
+ 
+ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	int len;
+-	const u8 *rc4key;
+-	u8 *pos;
++	u8 rc4key[16], *pos, *icv;
++	u32 crc;
+ 	struct scatterlist sg;
+ 
+ 	if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
+ 		if (net_ratelimit()) {
+ 			struct ieee80211_hdr_4addr *hdr =
+ 			    (struct ieee80211_hdr_4addr *)skb->data;
+-			printk(KERN_DEBUG "TKIP countermeasures: dropped "
++			printk(KERN_DEBUG ": TKIP countermeasures: dropped "
+ 			       "TX packet to " MAC_FMT "\n",
+ 			       MAC_ARG(hdr->addr1));
+ 		}
+@@ -343,22 +341,23 @@ static int ieee80211_tkip_encrypt(struct
+ 	len = skb->len - hdr_len;
+ 	pos = skb->data + hdr_len;
+ 
+-	rc4key = ieee80211_tkip_hdr(skb, hdr_len, priv);
+-	if (!rc4key)
++	if ((ieee80211_tkip_hdr(skb, hdr_len, rc4key, 16, priv)) < 0)
+ 		return -1;
+ 
++	icv = skb_put(skb, 4);
++
++	crc = ~crc32_le(~0, pos, len);
++	icv[0] = crc;
++	icv[1] = crc >> 8;
++	icv[2] = crc >> 16;
++	icv[3] = crc >> 24;
++
+ 	crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = len + 4;
+ 	crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4);
+ 
+-	tkey->tx_iv16++;
+-	if (tkey->tx_iv16 == 0) {
+-		tkey->tx_phase1_done = 0;
+-		tkey->tx_iv32++;
+-	}
+-
+ 	return 0;
+ }
+ 
+@@ -379,7 +378,7 @@ static int ieee80211_tkip_decrypt(struct
+ 
+ 	if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
+ 		if (net_ratelimit()) {
+-			printk(KERN_DEBUG "TKIP countermeasures: dropped "
++			printk(KERN_DEBUG ": TKIP countermeasures: dropped "
+ 			       "received packet from " MAC_FMT "\n",
+ 			       MAC_ARG(hdr->addr2));
+ 		}
+@@ -502,8 +501,11 @@ static int michael_mic(struct ieee80211_
+ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)
+ {
+ 	struct ieee80211_hdr_4addr *hdr11;
++	u16 stype;
+ 
+ 	hdr11 = (struct ieee80211_hdr_4addr *)skb->data;
++	stype  = WLAN_FC_GET_STYPE(le16_to_cpu(hdr11->frame_ctl));
++
+ 	switch (le16_to_cpu(hdr11->frame_ctl) &
+ 		(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
+ 	case IEEE80211_FCTL_TODS:
+@@ -524,7 +526,13 @@ static void michael_mic_hdr(struct sk_bu
+ 		break;
+ 	}
+ 
+-	hdr[12] = 0;		/* priority */
++	if (stype & IEEE80211_STYPE_QOS_DATA) {
++		const struct ieee80211_hdr_3addrqos *qoshdr =
++			(struct ieee80211_hdr_3addrqos *)skb->data;
++		hdr[12] = le16_to_cpu(qoshdr->qos_ctl) & IEEE80211_QCTL_TID;
++	} else
++		hdr[12] = 0;		/* priority */
++
+ 	hdr[13] = hdr[14] = hdr[15] = 0;	/* reserved */
+ }
+ 
+@@ -695,6 +703,7 @@ static struct ieee80211_crypto_ops ieee8
+ 	.name = "TKIP",
+ 	.init = ieee80211_tkip_init,
+ 	.deinit = ieee80211_tkip_deinit,
++	.build_iv = ieee80211_tkip_hdr,
+ 	.encrypt_mpdu = ieee80211_tkip_encrypt,
+ 	.decrypt_mpdu = ieee80211_tkip_decrypt,
+ 	.encrypt_msdu = ieee80211_michael_mic_add,
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_rx.c	2006-06-15 15:02:16.000000000 -0400
 @@ -370,7 +370,6 @@ int ieee80211_rx(struct ieee80211_device
  	/* Put this code here so that we avoid duplicating it in all
  	 * Rx paths. - Jean II */
@@ -1800,8 +2003,8 @@
  		break;
  	}
  }
---- linux-2.6.16.noarch/net/ieee80211/ieee80211_wx.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/ieee80211_wx.c	2006-06-15 14:23:27.000000000 -0400
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_wx.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_wx.c	2006-06-15 15:02:16.000000000 -0400
 @@ -42,7 +42,7 @@ static const char *ieee80211_modes[] = {
  };
  
@@ -1994,72 +2197,337 @@
  	erq->flags |= IW_ENCODE_ENABLED;
  
  	if (ieee->open_wep)
---- linux-2.6.16.noarch/net/ieee80211/ieee80211_tx.c.orig	2006-06-15 14:23:27.000000000 -0400
-+++ linux-2.6.16.noarch/net/ieee80211/ieee80211_tx.c	2006-06-15 14:23:45.000000000 -0400
-@@ -555,8 +555,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
- /* Incoming 802.11 strucure is converted to a TXB
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_tx.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_tx.c	2006-06-15 15:02:48.000000000 -0400
+@@ -56,7 +56,18 @@ Desc. | ctrl | dura |  DA/RA  |   TA    
+       `--------------------------------------------------|         |------'
+ Total: 28 non-data bytes                                 `----.----'
+                                                               |
+-       .- 'Frame data' expands to <---------------------------'
++       .- 'Frame data' expands, if WEP enabled, to <----------'
++       |
++       V
++      ,-----------------------.
++Bytes |  4  |   0-2296  |  4  |
++      |-----|-----------|-----|
++Desc. | IV  | Encrypted | ICV |
++      |     | Packet    |     |
++      `-----|           |-----'
++            `-----.-----'
++                  |
++       .- 'Encrypted Packet' expands to
+        |
+        V
+       ,---------------------------------------------------.
+@@ -65,18 +76,7 @@ Bytes |  1   |  1   |    1    |    3    
+ Desc. | SNAP | SNAP | Control |Eth Tunnel| Type | IP      |
+       | DSAP | SSAP |         |          |      | Packet  |
+       | 0xAA | 0xAA |0x03 (UI)|0x00-00-F8|      |         |
+-      `-----------------------------------------|         |
+-Total: 8 non-data bytes                         `----.----'
+-                                                     |
+-       .- 'IP Packet' expands, if WEP enabled, to <--'
+-       |
+-       V
+-      ,-----------------------.
+-Bytes |  4  |   0-2296  |  4  |
+-      |-----|-----------|-----|
+-Desc. | IV  | Encrypted | ICV |
+-      |     | IP Packet |     |
+-      `-----------------------'
++      `----------------------------------------------------
+ Total: 8 non-data bytes
+ 
+ 802.3 Ethernet Data Frame
+@@ -220,13 +220,43 @@ static struct ieee80211_txb *ieee80211_a
+ 	return txb;
+ }
+ 
++static int ieee80211_classify(struct sk_buff *skb)
++{
++	struct ethhdr *eth;
++	struct iphdr *ip;
++
++	eth = (struct ethhdr *)skb->data;
++	if (eth->h_proto != __constant_htons(ETH_P_IP))
++		return 0;
++
++	ip = skb->nh.iph;
++	switch (ip->tos & 0xfc) {
++	case 0x20:
++		return 2;
++	case 0x40:
++		return 1;
++	case 0x60:
++		return 3;
++	case 0x80:
++		return 4;
++	case 0xa0:
++		return 5;
++	case 0xc0:
++		return 6;
++	case 0xe0:
++		return 7;
++	default:
++		return 0;
++	}
++}
++
+ /* Incoming skb is converted to a txb which consists of
   * a block of 802.11 fragment packets (stored as skbs) */
- int ieee80211_tx_frame(struct ieee80211_device *ieee,
--		       struct ieee80211_hdr *frame, int hdr_len, int total_len,
--		       int encrypt_mpdu)
-+		       struct ieee80211_hdr *frame, int len)
+ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
  {
+ 	struct ieee80211_device *ieee = netdev_priv(dev);
  	struct ieee80211_txb *txb = NULL;
+-	struct ieee80211_hdr_3addr *frag_hdr;
++	struct ieee80211_hdr_3addrqos *frag_hdr;
+ 	int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size,
+ 	    rts_required;
+ 	unsigned long flags;
+@@ -234,9 +264,10 @@ int ieee80211_xmit(struct sk_buff *skb, 
+ 	int ether_type, encrypt, host_encrypt, host_encrypt_msdu, host_build_iv;
+ 	int bytes, fc, hdr_len;
+ 	struct sk_buff *skb_frag;
+-	struct ieee80211_hdr_3addr header = {	/* Ensure zero initialized */
++	struct ieee80211_hdr_3addrqos header = {/* Ensure zero initialized */
+ 		.duration_id = 0,
+-		.seq_ctl = 0
++		.seq_ctl = 0,
++		.qos_ctl = 0
+ 	};
+ 	u8 dest[ETH_ALEN], src[ETH_ALEN];
+ 	struct ieee80211_crypt_data *crypt;
+@@ -282,12 +313,6 @@ int ieee80211_xmit(struct sk_buff *skb, 
+ 	memcpy(dest, skb->data, ETH_ALEN);
+ 	memcpy(src, skb->data + ETH_ALEN, ETH_ALEN);
+ 
+-	/* Advance the SKB to the start of the payload */
+-	skb_pull(skb, sizeof(struct ethhdr));
+-
+-	/* Determine total amount of storage required for TXB packets */
+-	bytes = skb->len + SNAP_SIZE + sizeof(u16);
+-
+ 	if (host_encrypt || host_build_iv)
+ 		fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
+ 		    IEEE80211_FCTL_PROTECTED;
+@@ -306,9 +331,23 @@ int ieee80211_xmit(struct sk_buff *skb, 
+ 		memcpy(header.addr2, src, ETH_ALEN);
+ 		memcpy(header.addr3, ieee->bssid, ETH_ALEN);
+ 	}
+-	header.frame_ctl = cpu_to_le16(fc);
+ 	hdr_len = IEEE80211_3ADDR_LEN;
+ 
++	if (ieee->is_qos_active && ieee->is_qos_active(dev, skb)) {
++		fc |= IEEE80211_STYPE_QOS_DATA;
++		hdr_len += 2;
++
++		skb->priority = ieee80211_classify(skb);
++		header.qos_ctl |= skb->priority & IEEE80211_QCTL_TID;
++	}
++	header.frame_ctl = cpu_to_le16(fc);
++
++	/* Advance the SKB to the start of the payload */
++	skb_pull(skb, sizeof(struct ethhdr));
++
++	/* Determine total amount of storage required for TXB packets */
++	bytes = skb->len + SNAP_SIZE + sizeof(u16);
++
+ 	/* Encrypt msdu first on the whole data packet. */
+ 	if ((host_encrypt || host_encrypt_msdu) &&
+ 	    crypt && crypt->ops && crypt->ops->encrypt_msdu) {
+@@ -402,7 +441,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
+ 	if (rts_required) {
+ 		skb_frag = txb->fragments[0];
+ 		frag_hdr =
+-		    (struct ieee80211_hdr_3addr *)skb_put(skb_frag, hdr_len);
++		    (struct ieee80211_hdr_3addrqos *)skb_put(skb_frag, hdr_len);
+ 
+ 		/*
+ 		 * Set header frame_ctl to the RTS.
+@@ -433,7 +472,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
+ 				    crypt->ops->extra_mpdu_prefix_len);
+ 
+ 		frag_hdr =
+-		    (struct ieee80211_hdr_3addr *)skb_put(skb_frag, hdr_len);
++		    (struct ieee80211_hdr_3addrqos *)skb_put(skb_frag, hdr_len);
+ 		memcpy(frag_hdr, &header, hdr_len);
+ 
+ 		/* If this is not the last fragment, then add the MOREFRAGS
+@@ -470,7 +509,9 @@ int ieee80211_xmit(struct sk_buff *skb, 
+ 			atomic_inc(&crypt->refcnt);
+ 			if (crypt->ops->build_iv)
+ 				crypt->ops->build_iv(skb_frag, hdr_len,
+-						     crypt->priv);
++				      ieee->sec.keys[ieee->sec.active_key],
++				      ieee->sec.key_sizes[ieee->sec.active_key],
++				      crypt->priv);
+ 			atomic_dec(&crypt->refcnt);
+ 		}
+ 
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_geo.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_geo.c	2006-06-15 15:02:16.000000000 -0400
+@@ -50,7 +50,8 @@ int ieee80211_is_valid_channel(struct ie
+ 
+ 	/* Driver needs to initialize the geography map before using
+ 	 * these helper functions */
+-	BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);
++	if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
++		return 0;
+ 
+ 	if (ieee->freq_band & IEEE80211_24GHZ_BAND)
+ 		for (i = 0; i < ieee->geo.bg_channels; i++)
+@@ -58,13 +59,15 @@ int ieee80211_is_valid_channel(struct ie
+ 			 * this is a B only channel, we don't see it
+ 			 * as valid. */
+ 			if ((ieee->geo.bg[i].channel == channel) &&
++			    !(ieee->geo.bg[i].flags & IEEE80211_CH_INVALID) &&
+ 			    (!(ieee->mode & IEEE_G) ||
+ 			     !(ieee->geo.bg[i].flags & IEEE80211_CH_B_ONLY)))
+ 				return IEEE80211_24GHZ_BAND;
+ 
+ 	if (ieee->freq_band & IEEE80211_52GHZ_BAND)
+ 		for (i = 0; i < ieee->geo.a_channels; i++)
+-			if (ieee->geo.a[i].channel == channel)
++			if ((ieee->geo.a[i].channel == channel) &&
++			    !(ieee->geo.a[i].flags & IEEE80211_CH_INVALID))
+ 				return IEEE80211_52GHZ_BAND;
+ 
+ 	return 0;
+@@ -76,7 +79,8 @@ int ieee80211_channel_to_index(struct ie
+ 
+ 	/* Driver needs to initialize the geography map before using
+ 	 * these helper functions */
+-	BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);
++	if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
++		return -1;
+ 
+ 	if (ieee->freq_band & IEEE80211_24GHZ_BAND)
+ 		for (i = 0; i < ieee->geo.bg_channels; i++)
+@@ -97,7 +101,8 @@ u8 ieee80211_freq_to_channel(struct ieee
+ 
+ 	/* Driver needs to initialize the geography map before using
+ 	 * these helper functions */
+-	BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);
++	if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
++		return 0;
+ 
+ 	freq /= 100000;
+ 
+@@ -133,6 +138,41 @@ const struct ieee80211_geo *ieee80211_ge
+ 	return &ieee->geo;
+ }
+ 
++u8 ieee80211_get_channel_flags(struct ieee80211_device * ieee, u8 channel)
++{
++	int index = ieee80211_channel_to_index(ieee, channel);
++
++	if (index == -1)
++		return IEEE80211_CH_INVALID;
++
++	if (channel <= IEEE80211_24GHZ_CHANNELS)
++		return ieee->geo.bg[index].flags;
++
++	return ieee->geo.a[index].flags;
++}
++
++static const struct ieee80211_channel bad_channel = {
++	.channel = 0,
++	.flags = IEEE80211_CH_INVALID,
++	.max_power = 0,
++};
++
++const struct ieee80211_channel *ieee80211_get_channel(struct ieee80211_device
++						      *ieee, u8 channel)
++{
++	int index = ieee80211_channel_to_index(ieee, channel);
++
++	if (index == -1)
++		return &bad_channel;
++
++	if (channel <= IEEE80211_24GHZ_CHANNELS)
++		return &ieee->geo.bg[index];
++
++	return &ieee->geo.a[index];
++}
++
++EXPORT_SYMBOL(ieee80211_get_channel);
++EXPORT_SYMBOL(ieee80211_get_channel_flags);
+ EXPORT_SYMBOL(ieee80211_is_valid_channel);
+ EXPORT_SYMBOL(ieee80211_freq_to_channel);
+ EXPORT_SYMBOL(ieee80211_channel_to_index);
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt.c	2006-06-15 15:02:16.000000000 -0400
+@@ -18,7 +18,6 @@
+ #include <linux/string.h>
+ #include <net/ieee80211.h>
+ 
+-
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("HostAP crypto");
+ MODULE_LICENSE("GPL");
+@@ -33,11 +32,11 @@ static DEFINE_SPINLOCK(ieee80211_crypto_
+ 
+ void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
+ {
+- 	struct ieee80211_crypt_data *entry, *next;
++	struct ieee80211_crypt_data *entry, *next;
  	unsigned long flags;
-@@ -566,9 +565,6 @@ int ieee80211_tx_frame(struct ieee80211_
  
  	spin_lock_irqsave(&ieee->lock, flags);
+- 	list_for_each_entry_safe(entry, next, &ieee->crypt_deinit_list, list) {
++	list_for_each_entry_safe(entry, next, &ieee->crypt_deinit_list, list) {
+ 		if (atomic_read(&entry->refcnt) != 0 && !force)
+ 			continue;
  
--	if (encrypt_mpdu && !ieee->sec.encrypt)
--		encrypt_mpdu = 0;
--
- 	/* If there is no driver handler to take the TXB, dont' bother
- 	 * creating it... */
- 	if (!ieee->hard_start_xmit) {
-@@ -576,41 +572,32 @@ int ieee80211_tx_frame(struct ieee80211_
- 		goto success;
- 	}
- 
--	if (unlikely(total_len < 24)) {
-+	if (unlikely(len < 24)) {
- 		printk(KERN_WARNING "%s: skb too small (%d).\n",
--		       ieee->dev->name, total_len);
-+		       ieee->dev->name, len);
- 		goto success;
- 	}
- 
--	if (encrypt_mpdu)
--		frame->frame_ctl |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
--
- 	/* When we allocate the TXB we allocate enough space for the reserve
- 	 * and full fragment bytes (bytes_per_frag doesn't include prefix,
- 	 * postfix, header, FCS, etc.) */
--	txb = ieee80211_alloc_txb(1, total_len, ieee->tx_headroom, GFP_ATOMIC);
-+	txb = ieee80211_alloc_txb(1, len, ieee->tx_headroom, GFP_ATOMIC);
- 	if (unlikely(!txb)) {
- 		printk(KERN_WARNING "%s: Could not allocate TXB\n",
- 		       ieee->dev->name);
- 		goto failed;
- 	}
- 	txb->encrypted = 0;
--	txb->payload_size = total_len;
-+	txb->payload_size = len;
- 
- 	skb_frag = txb->fragments[0];
- 
--	memcpy(skb_put(skb_frag, total_len), frame, total_len);
-+	memcpy(skb_put(skb_frag, len), frame, len);
- 
- 	if (ieee->config &
- 	    (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
- 		skb_put(skb_frag, 4);
- 
--	/* To avoid overcomplicating things, we do the corner-case frame
--	 * encryption in software. The only real situation where encryption is
--	 * needed here is during software-based shared key authentication. */
--	if (encrypt_mpdu)
--		ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
--
-       success:
- 	spin_unlock_irqrestore(&ieee->lock, flags);
+@@ -141,9 +140,9 @@ int ieee80211_unregister_crypto_ops(stru
+ 	spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
+ 	return -EINVAL;
+ 
+- found:
++      found:
+ 	printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
+-			  "'%s'\n", ops->name);
++	       "'%s'\n", ops->name);
+ 	list_del(&alg->list);
+ 	spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
+ 	kfree(alg);
+@@ -163,7 +162,7 @@ struct ieee80211_crypto_ops *ieee80211_g
+ 	spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
+ 	return NULL;
+ 
+- found:
++      found:
+ 	spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
+ 	return alg->ops;
+ }
+--- linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt_ccmp.c.orig	2006-06-15 15:03:59.000000000 -0400
++++ linux-2.6.16.noarch/net/ieee80211/ieee80211_crypt_ccmp.c	2006-06-15 15:02:16.000000000 -0400
+@@ -190,7 +190,8 @@ static void ccmp_init_blocks(struct cryp
+ 	ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
+ }
+ 
+-static int ieee80211_ccmp_hdr(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_ccmp_hdr(struct sk_buff *skb, int hdr_len,
++			      u8 *aeskey, int keylen, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *key = priv;
+ 	int i;
+@@ -199,6 +200,9 @@ static int ieee80211_ccmp_hdr(struct sk_
+ 	if (skb_headroom(skb) < CCMP_HDR_LEN || skb->len < hdr_len)
+ 		return -1;
+ 
++	if (aeskey != NULL && keylen >= CCMP_TK_LEN)
++		memcpy(aeskey, key->key, CCMP_TK_LEN);
++
+ 	pos = skb_push(skb, CCMP_HDR_LEN);
+ 	memmove(pos, pos + CCMP_HDR_LEN, hdr_len);
+ 	pos += hdr_len;
+@@ -238,7 +242,7 @@ static int ieee80211_ccmp_encrypt(struct
+ 		return -1;
+ 
+ 	data_len = skb->len - hdr_len;
+-	len = ieee80211_ccmp_hdr(skb, hdr_len, priv);
++	len = ieee80211_ccmp_hdr(skb, hdr_len, NULL, 0, priv);
+ 	if (len < 0)
+ 		return -1;
  



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:19:41 -0400
Subject: rpms/cman/devel cman.spec,1.34,1.35
Message-ID: <200606151919.k5FJJfZY002154@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2141

Modified Files:
	cman.spec 
Log Message:
We don't need the kernel to build.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cman.spec	15 Jun 2006 19:13:11 -0000	1.34
+++ cman.spec	15 Jun 2006 19:19:39 -0000	1.35
@@ -12,11 +12,12 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.7
+Release: 0.fc6.8
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
-BuildRequires: kernel >= 2.6.16
+#BuildRequires: kernel >= 2.6.16
+BuildRequires: glibc-kernheaders
 BuildRequires: libxml-devel
 BuildRequires: libxml2-devel
 Conflicts: GFS <= 6.0



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:28:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:28:59 -0400
Subject: rpms/libgssapi/FC-5 .cvsignore, 1.4, 1.5 libgssapi.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200606151928.k5FJSx76002329@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2296

Modified Files:
	.cvsignore libgssapi.spec sources 
Log Message:
updated to libgssapi-0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2006 01:24:14 -0000	1.4
+++ .cvsignore	15 Jun 2006 19:28:57 -0000	1.5
@@ -1 +1,2 @@
 libgssapi-0.7.tar.gz
+libgssapi-0.9.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/FC-5/libgssapi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgssapi.spec	13 Feb 2006 01:26:52 -0000	1.8
+++ libgssapi.spec	15 Jun 2006 19:28:57 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
-Version: 0.7
-Release: 3
+Version: 0.9
+Release: 1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
-Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.7.tar.gz
+Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.9.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig
@@ -23,7 +23,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
-Patch0: libgssapi-0.7-gssapi_mech.patch
+Patch1: libgssapi-0.7-gssapi_mech.patch
 
 %description devel
 This package includes header files and libraries necessary for
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --prefix=%{buildroot}
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Thu Jun 15 2006 Steve Dickson <steved at redhat.com>
+- updated to libgssapi-0.9
+
 * Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
 - remove empty scripts
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2006 01:24:14 -0000	1.4
+++ sources	15 Jun 2006 19:28:57 -0000	1.5
@@ -1 +1,2 @@
 13979d132daf7dd5d3a591c08cd4979f  libgssapi-0.7.tar.gz
+6a71e2d1d0d865baee12f1a1aace0d6a  libgssapi-0.9.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:29:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:29:00 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2133.4.1,1.2133.4.2
Message-ID: <200606151929.k5FJT0fp002341@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2309

Modified Files:
      Tag: private-linville-jwltest-fc5-16-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2133.4.1
retrieving revision 1.2133.4.2
diff -u -r1.2133.4.1 -r1.2133.4.2
--- kernel-2.6.spec	15 Jun 2006 18:33:28 -0000	1.2133.4.1
+++ kernel-2.6.spec	15 Jun 2006 19:28:58 -0000	1.2133.4.2
@@ -233,7 +233,6 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
-Patch209: linux-2.6-x86-smp-alternatives.patch
 Patch210: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
@@ -774,8 +773,6 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
-# SMP alternatives
-#%patch209 -p1
 # x86-64 is noisy when syscalls are unimplemented.
 %patch210 -p1
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:29:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:29:02 -0400
Subject: rpms/yum/devel yum-2.9.0-compareevr.patch, NONE, 1.1 yum.spec, 1.99,
	1.100
Message-ID: <200606151929.k5FJT1jZ002351@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2295

Modified Files:
	yum.spec 
Added Files:
	yum-2.9.0-compareevr.patch 
Log Message:
Add patch to fix compareEVR traceback.


yum-2.9.0-compareevr.patch:
 misc.py |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE yum-2.9.0-compareevr.patch ---
diff -ruN yum-2.9.0/yum/misc.py yum-2.9.0.new/yum/misc.py
--- yum-2.9.0/yum/misc.py	2006-05-28 00:59:12.000000000 -0400
+++ yum-2.9.0.new/yum/misc.py	2006-06-15 14:49:01.000000000 -0400
@@ -14,6 +14,7 @@
 from stat import *
 
 import rpmUtils
+from rpmUtils.miscutils import compareEVR
 from Errors import MiscError
 
 ###########


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- yum.spec	14 Jun 2006 20:47:52 -0000	1.99
+++ yum.spec	15 Jun 2006 19:28:58 -0000	1.100
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.0
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch4: yum-2.9.0-ugimport.patch
 Patch5: yum-2.9.0-keyprompt.patch
 Patch6: yum-2.9.0-exhandle.patch
+Patch7: yum-2.9.0-compareevr.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
@@ -51,6 +52,7 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
+%patch7 -p1
 
 %build
 make
@@ -129,6 +131,9 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Thu Jun 15 2006 Chris Lumens <clumens at redhat.com> 2.9.0-6
+- Fix compareEVR traceback.
+
 * Wed Jun 14 2006 Paul Nasrat <pnasrat at redhat.com> - 2.9.0-5
 - Various fixups (key grab and importing, composite exception handling)
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:34:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:34:34 -0400
Subject: rpms/libgssapi/FC-5 libgssapi.spec,1.9,1.10
Message-ID: <200606151934.k5FJYYlB002586@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2566

Modified Files:
	libgssapi.spec 
Log Message:
Added FC5 to release 



Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/FC-5/libgssapi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgssapi.spec	15 Jun 2006 19:28:57 -0000	1.9
+++ libgssapi.spec	15 Jun 2006 19:34:31 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.9
-Release: 1
+Release: 1.FC5
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.9.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:38:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:38:41 -0400
Subject: rpms/pirut/devel .cvsignore, 1.24, 1.25 pirut.spec, 1.25,
	1.26 sources, 1.25, 1.26
Message-ID: <200606151938.k5FJcfQ7002684@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2670

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
add pygobject2 dep



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Jun 2006 04:40:42 -0000	1.24
+++ .cvsignore	15 Jun 2006 19:38:29 -0000	1.25
@@ -1 +1 @@
-pirut-1.1.2.tar.gz
+pirut-1.1.3.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pirut.spec	14 Jun 2006 04:40:42 -0000	1.25
+++ pirut.spec	15 Jun 2006 19:38:30 -0000	1.26
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.2
+Version: 1.1.3
 Release: 1
 License: GPL
 Group: Applications/System
@@ -10,7 +10,7 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0-4, comps-extras, rhpl
-Requires: gnome-python2-libegg, gnome-python2-gconf
+Requires: gnome-python2-libegg, gnome-python2-gconf, pygobject2
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Thu Jun 15 2006 Bill Nottingham <notting at redhat.com> - 1.1.3-1
+- add pygobject2 dep
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 1.1.1-1
 - add puplet
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Jun 2006 04:40:42 -0000	1.25
+++ sources	15 Jun 2006 19:38:30 -0000	1.26
@@ -1 +1 @@
-9d21544bf07e33171f9695d40a993b29  pirut-1.1.2.tar.gz
+6acac1ce02e2cdde9af76e8c5b24ec69  pirut-1.1.3.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:42:08 -0400
Subject: rpms/gfs2-utils/devel gfs2-utils.spec,1.1,1.2
Message-ID: <200606151942.k5FJg87S013654@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13621

Modified Files:
	gfs2-utils.spec 
Log Message:
Build for all archs.


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gfs2-utils.spec	14 Jun 2006 17:41:24 -0000	1.1
+++ gfs2-utils.spec	15 Jun 2006 19:42:06 -0000	1.2
@@ -12,12 +12,11 @@
 
 Name: gfs2-utils
 Version: 0.1.0
-Release: 1.fc6.3
+Release: 1.fc6.4
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
-#BuildRequires: iddev-devel
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires: ncurses



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:45:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:45:51 -0400
Subject: rpms/frysk/devel .cvsignore, 1.13, 1.14 frysk.spec, 1.44,
	1.45 sources, 1.13, 1.14
Message-ID: <200606151945.k5FJjpdC015071@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15039

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
Refresh the tarball again.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	15 Jun 2006 19:00:49 -0000	1.13
+++ .cvsignore	15 Jun 2006 19:45:49 -0000	1.14
@@ -1 +1 @@
-frysk-0.0.1.2006.06.15.rh1.tar.bz2
+frysk-0.0.1.2006.06.15.rh2.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- frysk.spec	15 Jun 2006 19:00:49 -0000	1.44
+++ frysk.spec	15 Jun 2006 19:45:49 -0000	1.45
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.15.rh1
+Version:	0.0.1.2006.06.15.rh2
 Release:	0
 License:	GPL
 Group:		Development/System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	15 Jun 2006 19:00:49 -0000	1.13
+++ sources	15 Jun 2006 19:45:49 -0000	1.14
@@ -1 +1 @@
-f543e2ef5e207c514f790a4b9472c04e  frysk-0.0.1.2006.06.15.rh1.tar.bz2
+b2f38849a6f62871e0d687f46882beb4  frysk-0.0.1.2006.06.15.rh2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:47:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:47:13 -0400
Subject: rpms/yum/devel yum.spec,1.100,1.101
Message-ID: <200606151947.k5FJlDCB026507@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22345

Modified Files:
	yum.spec 
Log Message:
require pygobject2



Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- yum.spec	15 Jun 2006 19:28:58 -0000	1.100
+++ yum.spec	15 Jun 2006 19:47:10 -0000	1.101
@@ -35,6 +35,7 @@
 Requires: python-elementtree
 Requires: yum-metadata-parser
 Requires: dbus-python
+Requires: pygobject2
 Prereq: /sbin/chkconfig, /sbin/service, coreutils
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -131,6 +132,9 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Thu Jun 15 2006 Bill Nottingham <notting at redhat.com> 2.9.0-7
+- require pygobject2 (for yum-updatesd)
+
 * Thu Jun 15 2006 Chris Lumens <clumens at redhat.com> 2.9.0-6
 - Fix compareEVR traceback.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 19:48:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 15:48:21 -0400
Subject: rpms/yum/devel yum.spec,1.101,1.102
Message-ID: <200606151948.k5FJmLuL030595@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30558

Modified Files:
	yum.spec 
Log Message:
bump



Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- yum.spec	15 Jun 2006 19:47:10 -0000	1.101
+++ yum.spec	15 Jun 2006 19:48:19 -0000	1.102
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.0
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:06:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:06:10 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.118, 1.119 kudzu.spec, 1.134,
	1.135 sources, 1.132, 1.133
Message-ID: <200606152006.k5FK6AJv003032@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2987/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
auto-import kudzu-1.2.38-1 on branch devel from kudzu-1.2.38-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- .cvsignore	15 Jun 2006 03:39:24 -0000	1.118
+++ .cvsignore	15 Jun 2006 20:05:55 -0000	1.119
@@ -1 +1 @@
-kudzu-1.2.37.tar.gz
+kudzu-1.2.38.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kudzu.spec	15 Jun 2006 03:39:24 -0000	1.134
+++ kudzu.spec	15 Jun 2006 20:05:55 -0000	1.135
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.37
+Version: 1.2.38
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 1.2.38-1
+- more s390 segfault fixing
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 1.2.37-1
 - fix s390 segfault
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- sources	15 Jun 2006 03:39:24 -0000	1.132
+++ sources	15 Jun 2006 20:05:55 -0000	1.133
@@ -1 +1 @@
-f8038808a94d8bbe08c5201a05ac9ad9  kudzu-1.2.37.tar.gz
+fe6ef43a355f5b8472b2aa62f37c152b  kudzu-1.2.38.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:12:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:12:39 -0400
Subject: rpms/frysk/devel .cvsignore, 1.14, 1.15 frysk.spec, 1.45,
	1.46 sources, 1.14, 1.15
Message-ID: <200606152012.k5FKCd1w003663@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3632

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
Refresh the tarball again.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	15 Jun 2006 19:45:49 -0000	1.14
+++ .cvsignore	15 Jun 2006 20:12:36 -0000	1.15
@@ -1 +1 @@
-frysk-0.0.1.2006.06.15.rh2.tar.bz2
+frysk-0.0.1.2006.06.15.rh3.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- frysk.spec	15 Jun 2006 19:45:49 -0000	1.45
+++ frysk.spec	15 Jun 2006 20:12:36 -0000	1.46
@@ -45,7 +45,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
+#%patch0
 %patch1
 
 %build 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	15 Jun 2006 19:45:49 -0000	1.14
+++ sources	15 Jun 2006 20:12:36 -0000	1.15
@@ -1 +1 @@
-b2f38849a6f62871e0d687f46882beb4  frysk-0.0.1.2006.06.15.rh2.tar.bz2
+ec3b3e3540c587b6ab164d0a38833654  frysk-0.0.1.2006.06.15.rh3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:13:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:13:09 -0400
Subject: rpms/frysk/devel frysk.spec,1.46,1.47
Message-ID: <200606152013.k5FKD9fG003807@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3785

Modified Files:
	frysk.spec 
Log Message:
Refresh the tarball again.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- frysk.spec	15 Jun 2006 20:12:36 -0000	1.46
+++ frysk.spec	15 Jun 2006 20:13:06 -0000	1.47
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.15.rh2
+Version:	0.0.1.2006.06.15.rh3
 Release:	0
 License:	GPL
 Group:		Development/System



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:25:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:25:30 -0400
Subject: rpms/cman/devel cman.spec,1.35,1.36
Message-ID: <200606152025.k5FKPUt3023073@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23035

Modified Files:
	cman.spec 
Log Message:
Bumped rev.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cman.spec	15 Jun 2006 19:19:39 -0000	1.35
+++ cman.spec	15 Jun 2006 20:25:27 -0000	1.36
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.8
+Release: 0.fc6.9
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:37:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:37:53 -0400
Subject: rpms/kernel/FC-5 linux-2.6-mptfusion-kdump.patch, NONE,
	1.1 kernel-2.6.spec, 1.2133, 1.2134
Message-ID: <200606152037.k5FKbr0q025410@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25333

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-mptfusion-kdump.patch 
Log Message:
Adding the mptfusion.patch to make kdump work for those devices



linux-2.6-mptfusion-kdump.patch:
 mptbase.c |   88 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 50 insertions(+), 38 deletions(-)

--- NEW FILE linux-2.6-mptfusion-kdump.patch ---
 drivers/message/fusion/mptbase.c |   88 ++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 38 deletions(-)

Index: linux-2.6.16.noarch/drivers/message/fusion/mptbase.c
===================================================================
--- linux-2.6.16.noarch.orig/drivers/message/fusion/mptbase.c
+++ linux-2.6.16.noarch/drivers/message/fusion/mptbase.c
@@ -1446,39 +1446,6 @@ mpt_attach(struct pci_dev *pdev, const s
 	/* Set lookup ptr. */
 	list_add_tail(&ioc->list, &ioc_list);
 
-	ioc->pci_irq = -1;
-	if (pdev->irq) {
-		if (mpt_msi_enable && !pci_enable_msi(pdev))
-			printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc->name);
-
-		r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc);
-
-		if (r < 0) {
-#ifndef __sparc__
-			printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n",
-					ioc->name, pdev->irq);
-#else
-			printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %s!\n",
-					ioc->name, __irq_itoa(pdev->irq));
-#endif
-			list_del(&ioc->list);
-			iounmap(mem);
-			kfree(ioc);
-			return -EBUSY;
-		}
-
-		ioc->pci_irq = pdev->irq;
-
-		pci_set_master(pdev);			/* ?? */
-		pci_set_drvdata(pdev, ioc);
-
-#ifndef __sparc__
-		dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq));
-#else
-		dprintk((KERN_INFO MYNAM ": %s installed at interrupt %s\n", ioc->name, __irq_itoa(pdev->irq)));
-#endif
-	}
-
 	/* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets.
 	 */
 	mpt_detect_bound_ports(ioc, pdev);
@@ -1487,11 +1454,7 @@ mpt_attach(struct pci_dev *pdev, const s
 		printk(KERN_WARNING MYNAM
 		  ": WARNING - %s did not initialize properly! (%d)\n",
 		  ioc->name, r);
-
 		list_del(&ioc->list);
-		free_irq(ioc->pci_irq, ioc);
-		if (mpt_msi_enable)
-			pci_disable_msi(pdev);
 		if (ioc->alt_ioc)
 			ioc->alt_ioc->alt_ioc = NULL;
 		iounmap(mem);
@@ -1704,6 +1667,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
 	int	 handlers;
 	int	 ret = 0;
 	int	 reset_alt_ioc_active = 0;
+	int	 irq_allocated = 0;
 
 	printk(KERN_INFO MYNAM ": Initiating %s %s\n",
 			ioc->name, reason==MPT_HOSTEVENT_IOC_BRINGUP ? "bringup" : "recovery");
@@ -1787,6 +1751,48 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
 		}
 	}
 
+	/*
+	 * Device is reset now. It must have de-asserted the interrupt line
+	 * (if it was asserted) and it should be safe to register for the
+	 * interrupt now.
+	 */
+	if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP)) {
+		ioc->pci_irq = -1;
+		if (ioc->pcidev->irq) {
+			if (mpt_msi_enable && !pci_enable_msi(ioc->pcidev))
+				printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n",
+					ioc->name);
+			rc = request_irq(ioc->pcidev->irq, mpt_interrupt,
+					SA_SHIRQ, ioc->name, ioc);
+			if (rc < 0) {
+#ifndef __sparc__
+				printk(MYIOC_s_ERR_FMT "Unable to allocate "
+					"interrupt %d!\n", ioc->name,
+					ioc->pcidev->irq);
+#else
+				printk(MYIOC_s_ERR_FMT "Unable to allocate "
+					"interrupt %s!\n", ioc->name,
+					__irq_itoa(ioc->pcidev->irq));
+#endif
+				if (mpt_msi_enable)
+					pci_disable_msi(ioc->pcidev);
+				return -EBUSY;
+			}
+			irq_allocated = 1;
+			ioc->pci_irq = ioc->pcidev->irq;
+			pci_set_master(ioc->pcidev);		/* ?? */
+			pci_set_drvdata(ioc->pcidev, ioc);
+#ifndef __sparc__
+			dprintk((KERN_INFO MYNAM ": %s installed at interrupt "
+				"%d\n", ioc->name, ioc->pcidev->irq));
+#else
+			dprintk((KERN_INFO MYNAM ": %s installed at interrupt "
+				"%s\n", ioc->name,
+				__irq_itoa(ioc->pcidev->irq)));
+#endif
+		}
+	}
+
 	/* Prime reply & request queues!
 	 * (mucho alloc's) Must be done prior to
 	 * init as upper addresses are needed for init.
@@ -1886,7 +1892,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
 				ret = mptbase_sas_persist_operation(ioc,
 				    MPI_SAS_OP_CLEAR_NOT_PRESENT);
 				if(ret != 0)
-					return -1;
+					goto out;
 			}
 
 			/* Find IM volumes
@@ -1967,6 +1973,12 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
 		/* FIXME?  Examine results here? */
 	}
 
+out:
+	if ((ret != 0) && irq_allocated) {
+		free_irq(ioc->pci_irq, ioc);
+		if (mpt_msi_enable)
+			pci_disable_msi(ioc->pcidev);
+	}
 	return ret;
 }
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2133
retrieving revision 1.2134
diff -u -r1.2133 -r1.2134
--- kernel-2.6.spec	6 Jun 2006 04:35:22 -0000	1.2133
+++ kernel-2.6.spec	15 Jun 2006 20:37:49 -0000	1.2134
@@ -379,6 +379,7 @@
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1780: linux-2.6-cpufreq-acpi-sticky.patch
 Patch1790: linux-2.6-usb-unusual-devices.patch
+Patch1791: linux-2.6-mptfusion-kdump.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -1019,6 +1020,8 @@
 %patch1780 -p1
 # unusual USB device quirks
 %patch1790 -p1
+# make kdump work with mptfusion
+%patch1791 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1696,6 +1699,9 @@
 %endif
 
 %changelog
+* Thu Jun 15 2006 Don Zickus <dzickus at redhat.com>
+- Fix mptfusion to work with kdump kernels
+
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2133_FC5]
 - Add a PPC64 kdump kernel.
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:48:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:48:55 -0400
Subject: rpms/frysk/devel .cvsignore, 1.15, 1.16 frysk.spec, 1.47,
	1.48 sources, 1.15, 1.16
Message-ID: <200606152048.k5FKmtnF011240@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11216

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
And again.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jun 2006 20:12:36 -0000	1.15
+++ .cvsignore	15 Jun 2006 20:48:53 -0000	1.16
@@ -1 +1 @@
-frysk-0.0.1.2006.06.15.rh3.tar.bz2
+frysk-0.0.1.2006.06.15.rh4.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- frysk.spec	15 Jun 2006 20:13:06 -0000	1.47
+++ frysk.spec	15 Jun 2006 20:48:53 -0000	1.48
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.15.rh3
+Version:	0.0.1.2006.06.15.rh4
 Release:	0
 License:	GPL
 Group:		Development/System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Jun 2006 20:12:36 -0000	1.15
+++ sources	15 Jun 2006 20:48:53 -0000	1.16
@@ -1 +1 @@
-ec3b3e3540c587b6ab164d0a38833654  frysk-0.0.1.2006.06.15.rh3.tar.bz2
+177ecac75e299933d845f3519ad2bee3  frysk-0.0.1.2006.06.15.rh4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:51:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:51:25 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.280, 1.281 anaconda.spec, 1.404,
	1.405 sources, 1.401, 1.402
Message-ID: <200606152051.k5FKpPnH012185@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12149/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.42-1 on branch devel from anaconda-11.1.0.42-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- .cvsignore	15 Jun 2006 13:21:04 -0000	1.280
+++ .cvsignore	15 Jun 2006 20:51:23 -0000	1.281
@@ -1 +1 @@
-anaconda-11.1.0.41.tar.bz2
+anaconda-11.1.0.42.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- anaconda.spec	15 Jun 2006 13:21:04 -0000	1.404
+++ anaconda.spec	15 Jun 2006 20:51:23 -0000	1.405
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.41
+Version: 11.1.0.42
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.42-1
+- Ensure all kernel packages end up in pkgorder
+- Fix syntax errors in zfcp code
+- Fix broadcast address calculation on 64bit machines
+- Fix network config on s390
+- Some minor iscsi tweaks
+
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.41-1
 - fix dep problem
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- sources	15 Jun 2006 13:21:04 -0000	1.401
+++ sources	15 Jun 2006 20:51:23 -0000	1.402
@@ -1 +1 @@
-6e38fccc42c9ed1ea1c62a871df5660b  anaconda-11.1.0.41.tar.bz2
+7f80083489c26362bd0a46a176bdfdc2  anaconda-11.1.0.42.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 20:57:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 16:57:19 -0400
Subject: rpms/frysk/devel frysk.spec,1.48,1.49
Message-ID: <200606152057.k5FKvJqe014495@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14452

Modified Files:
	frysk.spec 
Log Message:
Do not forget to apply patch0!


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- frysk.spec	15 Jun 2006 20:48:53 -0000	1.48
+++ frysk.spec	15 Jun 2006 20:57:17 -0000	1.49
@@ -45,7 +45,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch0
+%patch0
 %patch1
 
 %build 



From fedora-cvs-commits at redhat.com  Thu Jun 15 21:58:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 17:58:02 -0400
Subject: rpms/frysk/devel frysk-elf-cxx.patch,NONE,1.1 frysk.spec,1.49,1.50
Message-ID: <200606152158.k5FLw2j1025444@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25416

Modified Files:
	frysk.spec 
Added Files:
	frysk-elf-cxx.patch 
Log Message:
Patch to fix Elf.cxx on 64bit.

frysk-elf-cxx.patch:
 Elf.cxx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE frysk-elf-cxx.patch ---
Index: frysk-imports/lib/elf/cni/Elf.cxx
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/elf/cni/Elf.cxx,v
retrieving revision 1.8
diff -u -r1.8 Elf.cxx
--- frysk-imports/lib/elf/cni/Elf.cxx	5 Jun 2006 14:58:10 -0000	1.8
+++ frysk-imports/lib/elf/cni/Elf.cxx	15 Jun 2006 21:23:43 -0000
@@ -125,7 +125,7 @@
 
 jstring
 lib::elf::Elf::elf_getident (jlong ptr){
-	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) &ptr);
+	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) &((long)ptr));
 	return JvNewString((const jchar*) ident, strlen(ident));
 }
 
@@ -202,12 +202,12 @@
 
 jint
 lib::elf::Elf::elf_getshnum (jlong dst){
-	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) &dst);
+	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) &((long)dst));
 }
 
 jint
 lib::elf::Elf::elf_getshstrndx (jlong dst){
-	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) &dst);
+	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) &((long)dst));
 }
 
 jint
@@ -248,7 +248,7 @@
 
 jlong
 lib::elf::Elf::elf_getarsym (jlong ptr){
-	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) &ptr);
+	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) &((long)ptr));
 }
 
 jint
@@ -258,7 +258,7 @@
 
 jstring
 lib::elf::Elf::elf_rawfile (jlong ptr){
-	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) &ptr);
+	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) &((long)ptr));
 	return JvNewString((const jchar*) file, strlen(file));
 }
 


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- frysk.spec	15 Jun 2006 20:57:17 -0000	1.49
+++ frysk.spec	15 Jun 2006 21:57:59 -0000	1.50
@@ -9,6 +9,7 @@
 
 Patch0:		frysk_syscall.patch
 Patch1:		frysk-sscanf.patch
+Patch2:		frysk-elf-cxx.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -47,6 +48,7 @@
 %setup -q -n %{name}-%{version}
 %patch0
 %patch1
+%patch2
 
 %build 
 
@@ -105,6 +107,7 @@
 %changelog
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-0
 - Refresh the tarball.
+- Patch to fix Elf.cxx on 64bit.
 
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.



From fedora-cvs-commits at redhat.com  Thu Jun 15 21:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 17:58:36 -0400
Subject: rpms/pango/devel .cvsignore, 1.34, 1.35 pango.spec, 1.71,
	1.72 sources, 1.34, 1.35
Message-ID: <200606152158.k5FLwa6J025744@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25606

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
Update to 1.13.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	16 May 2006 17:12:23 -0000	1.34
+++ .cvsignore	15 Jun 2006 21:58:33 -0000	1.35
@@ -1 +1 @@
-pango-1.13.1.tar.bz2
+pango-1.13.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- pango.spec	21 May 2006 04:56:44 -0000	1.71
+++ pango.spec	15 Jun 2006 21:58:33 -0000	1.72
@@ -7,11 +7,11 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.13.1
-Release: 3
+Version: 1.13.2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.13/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Thu Jun 15 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.2-1
+- Update to 1.13.2
+
 * Sun May 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.13.1-3
 - Add missing BuildRequires (#191958)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	16 May 2006 17:12:23 -0000	1.34
+++ sources	15 Jun 2006 21:58:33 -0000	1.35
@@ -1 +1 @@
-ac8e2b8f64e184a6b2a0c796a597fc32  pango-1.13.1.tar.bz2
+28a6ea9d43c4cd398e7352032f775401  pango-1.13.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:10:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:10:14 -0400
Subject: rpms/pango/devel pango-split.patch, 1.1, NONE private-api.patch, 1.1,
	NONE
Message-ID: <200606152210.k5FMAENR027437@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27347

Removed Files:
	pango-split.patch private-api.patch 
Log Message:
Remove stale patches.



--- pango-split.patch DELETED ---


--- private-api.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:13:57 -0400
Subject: rpms/libnl/devel libnl-1.0-pre5-debuginfo.patch, NONE,
	1.1 libnl.spec, 1.13, 1.14
Message-ID: <200606152213.k5FMDvB7028110@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28081

Modified Files:
	libnl.spec 
Added Files:
	libnl-1.0-pre5-debuginfo.patch 
Log Message:
- fix debuginfo generation

libnl-1.0-pre5-debuginfo.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnl-1.0-pre5-debuginfo.patch ---
--- libnl-1.0-pre5/lib/Makefile.debuginfo	2006-06-15 18:11:21.000000000 -0400
+++ libnl-1.0-pre5/lib/Makefile	2006-06-15 18:11:28.000000000 -0400
@@ -64,7 +64,7 @@
 
 install:
 	mkdir -p $(DESTDIR)$(LIBDIR)/
-	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
+	install -m 0755 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
 	install -m 0644 $(OUT_AR) $(DESTDIR)$(LIBDIR)
 	rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \
 	$(LN) -s $(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB)


Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libnl.spec	27 May 2006 00:11:06 -0000	1.13
+++ libnl.spec	15 Jun 2006 22:13:54 -0000	1.14
@@ -5,7 +5,7 @@
 License: LGPL
 Name: libnl
 Version: 1.0
-Release: 0.9.%{preversion}
+Release: 0.10.%{preversion}
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz
 Source1: %{name}-1.pc
@@ -15,6 +15,7 @@
 Patch2: libnl-1.0-install-no-root.patch
 Patch3: libnl-1.0-pre5-static.patch
 Patch4: libnl-1.0-pre5-__u64_x86_64.patch
+Patch5: libnl-1.0-pre5-debuginfo.patch
 
 %description
 This package contains a convenience library to simplify
@@ -36,6 +37,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -68,6 +70,9 @@
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Thu Jun 15 2006 Peter Jones <pjones at redhat.com> 1.0-0.10.pre5
+- Fix debuginfo generation.
+
 * Fri May 26 2006 Jason Vas Dias <jvdias at redhat.com> 1.0-0.9.pre5
 - Allow build to succeed with new gcc / glibc-kernheaders
   (compile failed on __u64 redefinition on x86_64).



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:24:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:24:27 -0400
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-drv-mouse.spec, 1.13, 1.14
Message-ID: <200606152224.k5FMORtL013963@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13928/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
auto-import xorg-x11-drv-mouse-1.1.1-1 on branch devel from xorg-x11-drv-mouse-1.1.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 03:22:29 -0000	1.8
+++ .cvsignore	15 Jun 2006 22:24:24 -0000	1.9
@@ -1 +1 @@
-xf86-input-mouse-1.1.0.tar.bz2
+xf86-input-mouse-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 03:22:29 -0000	1.8
+++ sources	15 Jun 2006 22:24:24 -0000	1.9
@@ -1 +1 @@
-7004e6901eeb624759dfe271e88ecb0a  xf86-input-mouse-1.1.0.tar.bz2
+760dccf9578abb9b968fcb213a131506  xf86-input-mouse-1.1.1.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-mouse.spec	13 Jun 2006 15:06:01 -0000	1.13
+++ xorg-x11-drv-mouse.spec	15 Jun 2006 22:24:24 -0000	1.14
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.1.0
-Release:   3
+Version:   1.1.1
+Release:   1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -55,6 +55,9 @@
 %{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Thu Jun 15 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1
+
 * Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
 - Build on ppc64
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:26:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:26:11 -0400
Subject: rpms/frysk/devel frysk-elf-cxx.patch,1.1,1.2
Message-ID: <200606152226.k5FMQBYR028142@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14609

Modified Files:
	frysk-elf-cxx.patch 
Log Message:
Fix the patch.

frysk-elf-cxx.patch:
 Elf.cxx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: frysk-elf-cxx.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk-elf-cxx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frysk-elf-cxx.patch	15 Jun 2006 21:57:59 -0000	1.1
+++ frysk-elf-cxx.patch	15 Jun 2006 22:26:08 -0000	1.2
@@ -10,7 +10,7 @@
  jstring
  lib::elf::Elf::elf_getident (jlong ptr){
 -	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) &ptr);
-+	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) &((long)ptr));
++	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) (long) &ptr);
  	return JvNewString((const jchar*) ident, strlen(ident));
  }
  
@@ -19,13 +19,13 @@
  jint
  lib::elf::Elf::elf_getshnum (jlong dst){
 -	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) &dst);
-+	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) &((long)dst));
++	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) (long) &dst);
  }
  
  jint
  lib::elf::Elf::elf_getshstrndx (jlong dst){
 -	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) &dst);
-+	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) &((long)dst));
++	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) (long) &dst);
  }
  
  jint
@@ -34,7 +34,7 @@
  jlong
  lib::elf::Elf::elf_getarsym (jlong ptr){
 -	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) &ptr);
-+	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) &((long)ptr));
++	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) (long) &ptr);
  }
  
  jint
@@ -43,7 +43,7 @@
  jstring
  lib::elf::Elf::elf_rawfile (jlong ptr){
 -	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) &ptr);
-+	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) &((long)ptr));
++	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) (long) &ptr);
  	return JvNewString((const jchar*) file, strlen(file));
  }
  



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:26:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:26:17 -0400
Subject: rpms/beagle/devel beagle-0.2.1-spew.patch, 1.3, 1.4 beagle.spec,
	1.55, 1.56
Message-ID: <200606152226.k5FMQHDI001027@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14608

Modified Files:
	beagle-0.2.1-spew.patch beagle.spec 
Log Message:
- add bug spew when debugging is enabled (bug 195621)


beagle-0.2.1-spew.patch:
 BeagleDaemon.cs            |    2 +-
 IndexHelper/IndexHelper.cs |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: beagle-0.2.1-spew.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.1-spew.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beagle-0.2.1-spew.patch	1 Mar 2006 17:32:00 -0000	1.3
+++ beagle-0.2.1-spew.patch	15 Jun 2006 22:26:14 -0000	1.4
@@ -26,7 +26,7 @@
  					// debugging this code, after all...
  					//arg_debug ? LogLevel.Debug : LogLevel.Warn,
 -					LogLevel.Debug,
-+					LogLevel.Error,
++					arg_debug ? LogLevel.Debug : LogLevel.Error
  					arg_fg);
  
  			Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- beagle.spec	9 Jun 2006 14:12:18 -0000	1.55
+++ beagle.spec	15 Jun 2006 22:26:14 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.6
-Release:        5
+Release:        6
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -205,6 +205,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Thu Jun 16 2006 Ray Strode <rstrode at redhat.com> - 0.2.6-6
+- add bug spew when debugging is enabled (bug 195621)
+
 * Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.2.6-5
 - Disable on s390* as mono doesn't build on s390 atm
 - buildrequire gettext



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:31:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:31:15 -0400
Subject: rpms/beagle/FC-5 beagle-0.2.1-spew.patch, 1.3, 1.4 beagle.spec, 1.57,
	1.58
Message-ID: <200606152231.k5FMVFS2025530@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25514

Modified Files:
	beagle-0.2.1-spew.patch beagle.spec 
Log Message:
- turn on debug spew if debug spew is enabled (bug 195621)


beagle-0.2.1-spew.patch:
 BeagleDaemon.cs            |    2 +-
 IndexHelper/IndexHelper.cs |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: beagle-0.2.1-spew.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle-0.2.1-spew.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beagle-0.2.1-spew.patch	1 Mar 2006 17:32:00 -0000	1.3
+++ beagle-0.2.1-spew.patch	15 Jun 2006 22:30:54 -0000	1.4
@@ -26,7 +26,7 @@
  					// debugging this code, after all...
  					//arg_debug ? LogLevel.Debug : LogLevel.Warn,
 -					LogLevel.Debug,
-+					LogLevel.Error,
++					arg_debug ? LogLevel.Debug : LogLevel.Error,
  					arg_fg);
  
  			Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- beagle.spec	2 May 2006 09:23:16 -0000	1.57
+++ beagle.spec	15 Jun 2006 22:30:55 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.6
-Release:        1.fc5.1
+Release:        1.fc5.2
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -200,6 +200,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 0.2.6-1.fc5.2
+- turn on debug spew if debug spew is enabled (bug 195621)
+
 * Tue May  2 2006 Alexander Larsson <alexl at redhat.com> - 0.2.6-1.fc5.1
 - update to 0.2.6
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:48:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:48:10 -0400
Subject: rpms/evolution-sharp/FC-5 evolution-sharp.spec,1.17,1.18
Message-ID: <200606152248.k5FMmAmL008190@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-sharp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8177

Modified Files:
	evolution-sharp.spec 
Log Message:
- rebuild



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/FC-5/evolution-sharp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- evolution-sharp.spec	8 Jun 2006 01:14:10 -0000	1.17
+++ evolution-sharp.spec	15 Jun 2006 22:48:07 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        9.3
+Release:        9.4
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> 0.10.2-9.4
+- rebuild
+
 * Wed Jun 07 2006 Jesse Keating <jkeating at redhat.de> 0.10.2-9.3
 - Exclude s390(x) because evolution won't build there
 



From fedora-cvs-commits at redhat.com  Thu Jun 15 22:49:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 18:49:38 -0400
Subject: rpms/frysk/devel frysk-unistd.patch,NONE,1.1 frysk.spec,1.50,1.51
Message-ID: <200606152249.k5FMncIT008263@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8248

Modified Files:
	frysk.spec 
Added Files:
	frysk-unistd.patch 
Log Message:
One more #include <unistd.h> needed.

frysk-unistd.patch:
 Signal.cxx |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE frysk-unistd.patch ---
Index: frysk-sys/frysk/sys/cni/Signal.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Signal.cxx,v
retrieving revision 1.4
diff -u -r1.4 Signal.cxx
--- frysk-sys/frysk/sys/cni/Signal.cxx	10 Mar 2006 00:18:53 -0000	1.4
+++ frysk-sys/frysk/sys/cni/Signal.cxx	15 Jun 2006 22:48:04 -0000
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <linux/unistd.h>
+#include <unistd.h>
 #include <errno.h>
 
 #include <gcj/cni.h>


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- frysk.spec	15 Jun 2006 21:57:59 -0000	1.50
+++ frysk.spec	15 Jun 2006 22:49:36 -0000	1.51
@@ -10,6 +10,7 @@
 Patch0:		frysk_syscall.patch
 Patch1:		frysk-sscanf.patch
 Patch2:		frysk-elf-cxx.patch
+Patch3:		frysk-unistd.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -49,6 +50,7 @@
 %patch0
 %patch1
 %patch2
+%patch3
 
 %build 
 
@@ -108,6 +110,7 @@
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-0
 - Refresh the tarball.
 - Patch to fix Elf.cxx on 64bit.
+- Anoter patch required by new linux/unistd.h.
 
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.



From fedora-cvs-commits at redhat.com  Thu Jun 15 23:06:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 19:06:10 -0400
Subject: rpms/frysk/devel frysk.spec,1.51,1.52
Message-ID: <200606152306.k5FN6Aib008451@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8438

Modified Files:
	frysk.spec 
Log Message:
Add BuildRequires: ghostscript


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- frysk.spec	15 Jun 2006 22:49:36 -0000	1.51
+++ frysk.spec	15 Jun 2006 23:05:56 -0000	1.52
@@ -17,9 +17,9 @@
 Requires:	libgtk-java >= 2.8.4
 Requires:   	libglade-java >= 2.12.3
 Requires: 	libvte-java >= 0.12.0
+BuildRequires:  gcc-java >= 4.1.1
 BuildRequires:	junit >= 3.8.1
 BuildRequires:  antlr >= 2.7.4 
-BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	jdom >= 1.0
 BuildRequires:  libgtk-java-devel >= 2.8.4
 BuildRequires:	libglade-java-devel >= 2.12.3
@@ -31,8 +31,9 @@
 BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
 BuildRequires:  gmime
+BuildRequires:	transfig >= 3.2.0 
+BuildRequires:  ghostscript
 BuildRequires:  autoconf automake
-BuildRequires:  gcc-java >= 4.1.1
 
 # We can only build on i386 for now
 ExclusiveArch: %{ix86} x86_64
@@ -66,6 +67,8 @@
 export JAVA=${JAVA:-/usr/bin/gij}
 export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
+gcc --version
+
 ./bootstrap.sh
 %configure
 
@@ -111,6 +114,7 @@
 - Refresh the tarball.
 - Patch to fix Elf.cxx on 64bit.
 - Anoter patch required by new linux/unistd.h.
+- Add BuildRequires: ghostscript
 
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.



From fedora-cvs-commits at redhat.com  Thu Jun 15 23:22:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 19:22:55 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-fix-default-mouse-device.patch, NONE,
	1.1 xorg-x11-server-1.1.0-pci-driver-detection.patch, NONE,
	1.1 xorg-x11-server.spec, 1.81, 1.82
Message-ID: <200606152322.k5FNMtHU005211@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5141

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-fix-default-mouse-device.patch 
	xorg-x11-server-1.1.0-pci-driver-detection.patch 
Log Message:
- Add loader infrastructure for publishing PCI ID lists in the drivers, and
  autodetecting drivers based on that.  Currently unused since no drivers
  publish such a list yet.
- Fix mouse autoconfig to use /dev/input/mice instead of /dev/mouse.


xorg-x11-server-1.1.0-fix-default-mouse-device.patch:
 lnx_mouse.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-fix-default-mouse-device.patch ---
--- xorg-server-1.1.0/hw/xfree86/os-support/linux/lnx_mouse.c.mice	2006-06-15 18:23:09.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/os-support/linux/lnx_mouse.c	2006-06-15 18:23:31.000000000 -0400
@@ -29,7 +29,7 @@
     return "Auto";
 }
 
-#define DEFAULT_MOUSE_DEV		"/dev/mouse"
+#define DEFAULT_MOUSE_DEV		"/dev/input/mice"
 #define DEFAULT_PS2_DEV			"/dev/psaux"
 #define DEFAULT_GPM_DATA_DEV		"/dev/gpmdata"
 #define DEFAULT_GPM_CTL_DEV		"/dev/gpmdata"

xorg-x11-server-1.1.0-pci-driver-detection.patch:
 xf86AutoConfig.c |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 xf86Init.c       |    2 +
 xf86str.h        |   10 +++++
 3 files changed, 105 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-pci-driver-detection.patch ---
--- xorg-server-1.1.0/hw/xfree86/common/xf86Init.c.pci-loader	2006-06-15 16:52:55.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86Init.c	2006-06-15 17:04:29.000000000 -0400
@@ -460,6 +460,7 @@
 
     for (i = 0; i < xf86NumDrivers; i++) {
 	xorgHWFlags flags;
+	if (!xf86DriverList[i]) continue;
       /* The Identify function is mandatory, but if it isn't there continue */
 	if (xf86DriverList[i]->Identify != NULL)
 	    xf86DriverList[i]->Identify(0);
@@ -499,6 +500,7 @@
 
     for (i = 0; i < xf86NumDrivers; i++) {
 	xorgHWFlags flags;
+	if (!xf86DriverList[i]) continue;
 	if (!xorgHWAccess) {
 	    if (!xf86DriverList[i]->driverFunc
 		|| !xf86DriverList[i]->driverFunc(NULL,
--- xorg-server-1.1.0/hw/xfree86/common/xf86str.h.pci-loader	2006-06-14 19:10:23.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86str.h	2006-06-14 19:10:23.000000000 -0400
@@ -427,6 +427,16 @@
    pointer			extraOptions;
 } IDevRec, *IDevPtr;
 
+#define PCI_MATCH_ANY (~0)
+
+typedef struct {
+    int vendor_id;
+    int device_id;
+    int subvendor_id;
+    int subdevice_id;
+    /* XXX should pad this probably */
+} pciMatchRec, *pciMatchPtr;
+
 typedef struct {
     int			vendor;
     int			chipType;
--- xorg-server-1.1.0/hw/xfree86/common/xf86AutoConfig.c.pci-loader	2006-06-14 19:10:23.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86AutoConfig.c	2006-06-15 16:27:54.000000000 -0400
@@ -38,12 +38,14 @@
 #include <xorg-config.h>
 #endif
 
+#define IN_LOADER
 #include "xf86.h"
 #include "xf86Parser.h"
 #include "xf86tokens.h"
 #include "xf86Config.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
+#include "loaderProcs.h"
 
 /*
  * Sections for the default built-in configuration.
@@ -170,16 +172,105 @@
     AppendToList(s, &builtinConfig, &builtinLines);
 }
 
+#define DO_PCI_MATCH(a, b) (((a) == PCI_MATCH_ANY) || ((a) == (b)))
+
+static int
+xorgMatchPCIDevice(pciVideoPtr info, pciMatchPtr device_list)
+{
+    pciMatchPtr device;
+    for (device = device_list; device->vendor_id; device++)
+	if (DO_PCI_MATCH(device->vendor_id, info->vendor) &&
+	    DO_PCI_MATCH(device->device_id, info->chipType) &&
+	    DO_PCI_MATCH(device->subvendor_id, info->subsysVendor) &&
+	    DO_PCI_MATCH(device->subdevice_id, info->subsysCard))
+	    return 1;
+    return 0;
+}
+
+static char *
+detectVideoDriver(pciVideoPtr info)
+{
+    int i, errmaj, errmin, found = 0;
+    ModuleDescPtr mod;
+    char *driver = NULL, *sym;
+    pciMatchPtr device_list;
+    char **drivers = xf86DriverlistFromCompile();
+
+    for (driver = *drivers; *drivers; driver = (*drivers++)) {
+	if (!(mod = LoadDriver(driver, NULL, 0, NULL, &errmaj, &errmin))) {
+	    LoaderErrorMsg(NULL, driver, errmaj, errmin);
+	    continue;
+	}
+	if (!(sym = xcalloc(1, strlen(driver) + strlen("PCIDeviceList"))))
+	    continue; /* suck... */
+	if ((device_list = LoaderSymbol(sym)))
+	    found = xorgMatchPCIDevice(info, device_list);
+	xfree(sym);
+	/* UnloadDriver(mod); */
+	if (found) break;
+    }
+    /*
+     * This is amazingly broken.  You'd like to just UnloadDriver(mod) and
+     * have it DTRT, but since LoadDriver calls the Setup hook, which calls
+     * xf86AddDriver, you end up unloading drivers but leaving pointers to
+     * their address space dangling from xf86DriverList.
+     */
+    for (i = 0; i < xf86NumDrivers; i++)
+	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
+	    xf86DeleteDriver(i);
+    return (found ? driver : NULL);
+}
+
+/* this is partially factored, needs help to know which config to modify */
+char *
+xorgAutoConfigDriver(void)
+{
+    pciVideoPtr *pciptr, info;
+    char *driver = NULL;
+    char buf[1024];
+
+    /* Find the primary device, and get some information about it. */
+    if (xf86PciVideoInfo) {
+	for (pciptr = xf86PciVideoInfo; (info = *pciptr); pciptr++) {
+	    if (xf86IsPrimaryPci(info)) {
+		break;
+	    }
+	}
+	if (!info) {
+	    ErrorF("Primary device is not PCI\n");
+	    return NULL;
+	}
+    } else {
+	ErrorF("xf86PciVideoInfo is not set\n");
+	return NULL;
+    }
+
+    if ((driver = detectVideoDriver(info))) {
+	snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION_PRE,
+		 driver, 0, driver);
+	AppendToConfig(buf);
+	ErrorF("New driver is \"%s\"\n", driver);
+	AppendToConfig(BUILTIN_DEVICE_SECTION_POST);
+	snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION,
+		 driver, 0, driver, 0);
+	AppendToConfig(buf);
+    }
+
+    return driver;
+}
+
 Bool
 xf86AutoConfig(void)
 {
     const char **p;
     char buf[1024];
     pciVideoPtr *pciptr, info = NULL;
-    char *driver = NULL;
+    char *driver = NULL, *driver2 = NULL;
     FILE *gp = NULL;
     ConfigStatus ret;
 
+    driver2 = xorgAutoConfigDriver();
+
     /* Find the primary device, and get some information about it. */
     if (xf86PciVideoInfo) {
 	for (pciptr = xf86PciVideoInfo; (info = *pciptr); pciptr++) {
@@ -300,7 +391,7 @@
     AppendToConfig(BUILTIN_MODULE_SECTION);
     AppendToConfig(BUILTIN_MONITOR_SECTION);
 
-    if (driver) {
+    if (driver && !driver2) {
 	snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION_PRE,
 		 driver, 0, driver);
 	AppendToConfig(buf);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- xorg-x11-server.spec	15 Jun 2006 02:29:07 -0000	1.81
+++ xorg-x11-server.spec	15 Jun 2006 23:22:53 -0000	1.82
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   14
+Release:   15
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -38,6 +38,8 @@
 Patch3002:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
 Patch3003:  xorg-x11-server-1.1.0-edid-mode-injection-2.patch
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
+Patch3005:  xorg-x11-server-1.1.0-pci-driver-detection.patch
+Patch3006:  xorg-x11-server-1.1.0-fix-default-mouse-device.patch
 
 # INFO: We don't ship the X server on s390/s390x
 ExcludeArch: s390 s390x
@@ -281,6 +283,8 @@
 %patch3002 -p1 -b .cvt
 %patch3003 -p1 -b .edid2
 %patch3004 -p1 -b .targetrefresh
+%patch3005 -p1 -b .pci-loader
+%patch3006 -p1 -b .mice
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -566,6 +570,12 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Jun 15 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-15
+- Add loader infrastructure for publishing PCI ID lists in the drivers, and
+  autodetecting drivers based on that.  Currently unused since no drivers
+  publish such a list yet.
+- Fix mouse autoconfig to use /dev/input/mice instead of /dev/mouse.
+
 * Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-14
 - Change selection atom to _COMPIZ_GL_INCLUDE_INFERIORS in
   xorg-x11-server-1.1.0-gl-include-inferiors.patch.



From fedora-cvs-commits at redhat.com  Thu Jun 15 23:29:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 19:29:11 -0400
Subject: rpms/fedora-release/devel .cvsignore, 1.13, 1.14 fedora-release.spec,
	1.33, 1.34 sources, 1.24, 1.25
Message-ID: <200606152329.k5FNTBLN007653@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7628

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
update for 5.90


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 Mar 2006 23:51:45 -0000	1.13
+++ .cvsignore	15 Jun 2006 23:29:09 -0000	1.14
@@ -9,3 +9,5 @@
 fedora-release-5.89.tar.gz
 fedora-release-notes-5.80.tar.gz
 fedora-release-notes-5.89.tar.gz
+fedora-release-notes-5.90.tar.gz
+fedora-release-5.90.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fedora-release.spec	24 May 2006 20:08:17 -0000	1.33
+++ fedora-release.spec	15 Jun 2006 23:29:09 -0000	1.34
@@ -1,5 +1,5 @@
-%define release_version 5.89
-%define release_name Rawhide
+%define release_version 5.90
+%define release_name Test
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide
 %define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}}
@@ -7,7 +7,7 @@
 Summary: Fedora Core release file
 Name: fedora-release
 Version: %{real_release_version}
-Release: rawhide.2
+Release: 1
 License: GFDL
 Group: System Environment/Base
 Source: fedora-release-%{real_release_version}.tar.gz
@@ -124,6 +124,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 5.90-1
+- Update for 5.90
+
 * Wed May 24 2006 Jesse Keating <jkeating at redhat.com> - 5.89-rawhide.2
 - Update to get new devel repo file
 - merge minor changes from external cvs .spec file


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	24 May 2006 20:08:17 -0000	1.24
+++ sources	15 Jun 2006 23:29:09 -0000	1.25
@@ -1,2 +1,2 @@
-7104b3bf87a79693f5fe2d0e12dce946  fedora-release-notes-5.89.tar.gz
-9c980357f7a11ef08b2f191482ffb58e  fedora-release-5.89.tar.gz
+31b83e51bc7c5e75cdb73eb45241a20d  fedora-release-notes-5.90.tar.gz
+2736ad091ece91c43ebd7208a5858509  fedora-release-5.90.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 15 23:31:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 19:31:18 -0400
Subject: rpms/frysk/devel frysk-unistd.patch,1.1,1.2 frysk.spec,1.52,1.53
Message-ID: <200606152331.k5FNVIMh008109@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8080

Modified Files:
	frysk-unistd.patch frysk.spec 
Log Message:
- Add BuildRequires:  libgconf-java-devel
Update frysk-unistd.patch

frysk-unistd.patch:
 frysk-core/prog/kill/suspend.c     |    1 +
 frysk-sys/frysk/sys/cni/Signal.cxx |    1 +
 2 files changed, 2 insertions(+)

Index: frysk-unistd.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk-unistd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frysk-unistd.patch	15 Jun 2006 22:49:36 -0000	1.1
+++ frysk-unistd.patch	15 Jun 2006 23:30:29 -0000	1.2
@@ -13,3 +13,18 @@
  #include <errno.h>
  
  #include <gcj/cni.h>
+Index: frysk-core/prog/kill/suspend.c
+===================================================================
+RCS file: /cvs/frysk/frysk-core/prog/kill/suspend.c,v
+retrieving revision 1.6
+diff -u -r1.6 suspend.c
+--- frysk-core/prog/kill/suspend.c	26 Jan 2006 21:09:45 -0000	1.6
++++ frysk-core/prog/kill/suspend.c	15 Jun 2006 23:16:57 -0000
+@@ -45,6 +45,7 @@
+ #include <linux/unistd.h>
+ #include <limits.h>
+ #include <pthread.h>
++#include <unistd.h>
+ 
+ pthread_mutex_t start;
+ pthread_mutex_t stop;


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- frysk.spec	15 Jun 2006 23:05:56 -0000	1.52
+++ frysk.spec	15 Jun 2006 23:30:43 -0000	1.53
@@ -27,6 +27,7 @@
 BuildRequires:  cairo-devel >= 1.0.0
 BuildRequires:  gtk2-devel >= 2.8.0
 BuildRequires:	libglade2-devel >= 2.5.1
+BuildRequires:	libgconf-java-devel
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
@@ -110,6 +111,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-1
+- Add BuildRequires: libgconf-java-devel
+- Update frysk-unistd.patch
+
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-0
 - Refresh the tarball.
 - Patch to fix Elf.cxx on 64bit.



From fedora-cvs-commits at redhat.com  Thu Jun 15 23:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 19:39:02 -0400
Subject: rpms/frysk/devel frysk.spec,1.53,1.54
Message-ID: <200606152339.k5FNd2dR008473@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8451

Modified Files:
	frysk.spec 
Log Message:
Increment release.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- frysk.spec	15 Jun 2006 23:30:43 -0000	1.53
+++ frysk.spec	15 Jun 2006 23:38:59 -0000	1.54
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.06.15.rh4
-Release:	0
+Release:	1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk



From fedora-cvs-commits at redhat.com  Thu Jun 15 23:40:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 19:40:50 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.58,1.59
Message-ID: <200606152340.k5FNeoPQ008940@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv8776/configs

Modified Files:
	config-generic 
Log Message:
bump default nr uarts



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- config-generic	9 May 2006 21:08:24 -0000	1.58
+++ config-generic	15 Jun 2006 23:40:48 -0000	1.59
@@ -1504,7 +1504,7 @@
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:14:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:14:36 -0400
Subject: rpms/frysk/devel frysk.spec,1.54,1.55
Message-ID: <200606160014.k5G0Ea2O032378@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32354

Modified Files:
	frysk.spec 
Log Message:
- Suppress warnings caused by _FORTIFY_SOURCE=2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- frysk.spec	15 Jun 2006 23:38:59 -0000	1.54
+++ frysk.spec	16 Jun 2006 00:14:33 -0000	1.55
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.06.15.rh4
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -71,7 +71,10 @@
 gcc --version
 
 ./bootstrap.sh
-%configure
+
+# FIXME: Warninggs should be fixed, not suppressed:
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS/ -Wp,-D_FORTIFY_SOURCE=2 /}
+%configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 # Build system can end up with corrupt xmllint files:
 touch frysk-gui/glade.catalog
@@ -111,6 +114,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
+- Suppress warnings caused by _FORTIFY_SOURCE=2
+
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-1
 - Add BuildRequires: libgconf-java-devel
 - Update frysk-unistd.patch



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:22:19 -0400
Subject: rpms/frysk/devel frysk.spec,1.55,1.56
Message-ID: <200606160022.k5G0MJZS017428@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17395

Modified Files:
	frysk.spec 
Log Message:
Fix typo


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- frysk.spec	16 Jun 2006 00:14:33 -0000	1.55
+++ frysk.spec	16 Jun 2006 00:22:16 -0000	1.56
@@ -73,7 +73,7 @@
 ./bootstrap.sh
 
 # FIXME: Warninggs should be fixed, not suppressed:
-RPM_OPT_FLAGS=${RPM_OPT_FLAGS/ -Wp,-D_FORTIFY_SOURCE=2 /}
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 # Build system can end up with corrupt xmllint files:



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:42:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:42:28 -0400
Subject: rpms/frysk/devel frysk.spec,1.56,1.57
Message-ID: <200606160042.k5G0gSP3022219@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22193

Modified Files:
	frysk.spec 
Log Message:
Remove unwanted files.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- frysk.spec	16 Jun 2006 00:22:16 -0000	1.56
+++ frysk.spec	16 Jun 2006 00:42:26 -0000	1.57
@@ -87,6 +87,55 @@
 rm -rf %{buildroot}
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
+# FIXME: remove the unwanted files:
+unwanted='   /usr/bin/addr2line
+   usr/bin/elfcmp
+   usr/bin/elflint
+   usr/bin/findtextrel
+   usr/bin/ld
+   usr/bin/nm
+   usr/bin/objdump
+   usr/bin/ranlib
+   usr/bin/readelf
+   usr/bin/size
+   usr/bin/strings
+   usr/bin/strip
+   usr/include/dwarf.h
+   usr/include/elfutils/elf-knowledge.h
+   usr/include/elfutils/libasm.h
+   usr/include/elfutils/libdw.h
+   usr/include/elfutils/libdwfl.h
+   usr/include/elfutils/libebl.h
+   usr/include/gelf.h
+   usr/include/libelf.h
+   usr/include/nlist.h
+   usr/lib/elfutils/libebl_alpha-0.120.so
+   usr/lib/elfutils/libebl_alpha.so
+   usr/lib/elfutils/libebl_arm-0.120.so
+   usr/lib/elfutils/libebl_arm.so
+   usr/lib/elfutils/libebl_i386-0.120.so
+   usr/lib/elfutils/libebl_i386.so
+   usr/lib/elfutils/libebl_ia64-0.120.so
+   usr/lib/elfutils/libebl_ia64.so
+   usr/lib/elfutils/libebl_ppc-0.120.so
+   usr/lib/elfutils/libebl_ppc.so
+   usr/lib/elfutils/libebl_ppc64-0.120.so
+   usr/lib/elfutils/libebl_ppc64.so
+   usr/lib/elfutils/libebl_s390-0.120.so
+   usr/lib/elfutils/libebl_s390.so
+   usr/lib/elfutils/libebl_sh-0.120.so
+   usr/lib/elfutils/libebl_sh.so
+   usr/lib/elfutils/libebl_sparc-0.120.so
+   usr/lib/elfutils/libebl_sparc.so
+   usr/lib/elfutils/libebl_x86_64-0.120.so
+   usr/lib/elfutils/libebl_x86_64.so
+   usr/lib/libasm.a
+   usr/lib/libdw.a
+   usr/lib/libebl.a
+   usr/lib/libelf.a
+'
+(cd $RPM_BUILD_ROOT && rm $unwanted)
+
 # For moment, keep off menu (but if someone wants to enable it they
 # can).
 echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
@@ -116,6 +165,7 @@
 %changelog
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
 - Suppress warnings caused by _FORTIFY_SOURCE=2
+- Remove unwanted files.
 
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-1
 - Add BuildRequires: libgconf-java-devel



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:47:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:47:42 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.6, 1.7 libdhcp.spec, 1.21,
	1.22 sources, 1.17, 1.18
Message-ID: <200606160047.k5G0lgYE006444@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6419

Modified Files:
	.cvsignore libdhcp.spec sources 
Log Message:
- update to 1.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Jun 2006 14:58:02 -0000	1.6
+++ .cvsignore	16 Jun 2006 00:47:40 -0000	1.7
@@ -1,5 +1 @@
-libdhcp-1.0.tar.gz
-libdhcp-1.1.tar.gz
-libdhcp-1.2.tar.gz
-libdhcp-1.3.tar.gz
-libdhcp-1.4.tar.gz
+libdhcp-1.5.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libdhcp.spec	9 Jun 2006 14:58:02 -0000	1.21
+++ libdhcp.spec	16 Jun 2006 00:47:40 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.4
+Version: 	1.5
 Release: 	1
 License: 	GPL
 Group: 		Development/Libraries
@@ -75,6 +75,9 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Thu Jun 15 2006 Peter Jones <pjones at redhat.com> - 1.5-1
+- fix some bugs anaconda was hitting
+
 * Thu Jun 08 2006 Jason Vas Dias <jvdias at redhat.com> - 1.3-1
 - Ensure IPv6 module is loaded before invoking dhcpv6_client 
 - fix segfault on free() of uninitialized 'sdns' in dhcp_nic


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Jun 2006 14:58:02 -0000	1.17
+++ sources	16 Jun 2006 00:47:40 -0000	1.18
@@ -1 +1 @@
-0ee140271ea6efdf6b908891df4bcedf  libdhcp-1.4.tar.gz
+ff32df9fa3b0ce7c8119f67b5489094e  libdhcp-1.5.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:49:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:49:34 -0400
Subject: rpms/beagle/FC-5 beagle.spec,1.58,1.59
Message-ID: <200606160049.k5G0nYsp007196@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7170

Modified Files:
	beagle.spec 
Log Message:
exclude s390(x)


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- beagle.spec	15 Jun 2006 22:30:55 -0000	1.58
+++ beagle.spec	16 Jun 2006 00:49:31 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.6
-Release:        1.fc5.2
+Release:        1.fc5.3
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -26,6 +26,7 @@
 Requires: zip unzip sed grep poppler-utils
 Patch2: beagle-0.2.5-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
+ExcludeArch: s390, s390x
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -200,6 +201,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 0.2.6-1.fc5.3
+- disable building on s390(x), mono no worky there.
+
 * Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 0.2.6-1.fc5.2
 - turn on debug spew if debug spew is enabled (bug 195621)
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:53:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:53:57 -0400
Subject: rpms/beagle/FC-5 beagle.spec,1.59,1.60
Message-ID: <200606160053.k5G0rvi6008808@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8779

Modified Files:
	beagle.spec 
Log Message:
picky spec...


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- beagle.spec	16 Jun 2006 00:49:31 -0000	1.59
+++ beagle.spec	16 Jun 2006 00:53:54 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.6
-Release:        1.fc5.3
+Release:        1.fc5.4
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -26,7 +26,8 @@
 Requires: zip unzip sed grep poppler-utils
 Patch2: beagle-0.2.5-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
-ExcludeArch: s390, s390x
+ExcludeArch: s390
+ExcludeArch: s390x
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -201,7 +202,7 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
-* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 0.2.6-1.fc5.3
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 0.2.6-1.fc5.4
 - disable building on s390(x), mono no worky there.
 
 * Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 0.2.6-1.fc5.2



From fedora-cvs-commits at redhat.com  Fri Jun 16 00:58:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 20:58:23 -0400
Subject: rpms/frysk/devel frysk.spec,1.57,1.58
Message-ID: <200606160058.k5G0wNl3010542@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10445

Modified Files:
	frysk.spec 
Log Message:
Try a non-parallel build.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- frysk.spec	16 Jun 2006 00:42:26 -0000	1.57
+++ frysk.spec	16 Jun 2006 00:58:21 -0000	1.58
@@ -80,7 +80,8 @@
 touch frysk-gui/glade.catalog
 touch frysk-gui/glade.checked
 
-make %{?_smp_mflags}
+# FIXME:
+make #%{?_smp_mflags}
 
 %install
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 01:04:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 21:04:54 -0400
Subject: rpms/beagle/FC-5 beagle.spec,1.60,1.61
Message-ID: <200606160104.k5G14sBD011450@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11433

Modified Files:
	beagle.spec 
Log Message:
add missing brs


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- beagle.spec	16 Jun 2006 00:53:54 -0000	1.60
+++ beagle.spec	16 Jun 2006 01:04:51 -0000	1.61
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.6
-Release:        1.fc5.4
+Release:        1.fc5.5
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -21,6 +21,10 @@
 BuildRequires:  libgnome-devel
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:  librsvg2-devel >= 2.0
+BuildRequires:  pygtk2-devel
+BuildRequires:  python-devel
+BuildRequires:  libXt-devel
+BuildRequires:  gettext
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
@@ -202,8 +206,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
-* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 0.2.6-1.fc5.4
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 0.2.6-1.fc5.5
 - disable building on s390(x), mono no worky there.
+- Import missing BRs from fc6 package
 
 * Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 0.2.6-1.fc5.2
 - turn on debug spew if debug spew is enabled (bug 195621)



From fedora-cvs-commits at redhat.com  Fri Jun 16 01:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 21:15:56 -0400
Subject: rpms/frysk/devel frysk.spec,1.58,1.59
Message-ID: <200606160115.k5G1Fueg014544@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14350

Modified Files:
	frysk.spec 
Log Message:
Fix typo, try arallel build again.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- frysk.spec	16 Jun 2006 00:58:21 -0000	1.58
+++ frysk.spec	16 Jun 2006 01:15:53 -0000	1.59
@@ -80,8 +80,7 @@
 touch frysk-gui/glade.catalog
 touch frysk-gui/glade.checked
 
-# FIXME:
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 
@@ -89,7 +88,7 @@
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # FIXME: remove the unwanted files:
-unwanted='   /usr/bin/addr2line
+unwanted='usr/bin/addr2line
    usr/bin/elfcmp
    usr/bin/elflint
    usr/bin/findtextrel



From fedora-cvs-commits at redhat.com  Fri Jun 16 01:33:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 21:33:56 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.12,
	1.13
Message-ID: <200606160133.k5G1XuDX032222@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32172

Modified Files:
	gnome-python-desktop.spec 
Log Message:
bump for new nautilus-cd-burner


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-python-desktop.spec	15 Jun 2006 03:19:25 -0000	1.12
+++ gnome-python-desktop.spec	16 Jun 2006 01:33:36 -0000	1.13
@@ -15,7 +15,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.15.3
-Release: 1
+Release: 2
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2
@@ -239,6 +239,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomedesktop
 
 %changelog
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-2
+- Bump for new nautilus-cd-burner
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:00:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:00:50 -0400
Subject: rpms/frysk/devel frysk.spec,1.59,1.60
Message-ID: <200606160200.k5G20oWs028390@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28373

Modified Files:
	frysk.spec 
Log Message:
Add non-intermediate.patch


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- frysk.spec	16 Jun 2006 01:15:53 -0000	1.59
+++ frysk.spec	16 Jun 2006 02:00:45 -0000	1.60
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.06.15.rh4
-Release:	2
+Release:	3
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -11,6 +11,7 @@
 Patch1:		frysk-sscanf.patch
 Patch2:		frysk-elf-cxx.patch
 Patch3:		frysk-unistd.patch
+Patch4:		frysk-non-intermediate.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -53,6 +54,7 @@
 %patch1
 %patch2
 %patch3
+%patch4
 
 %build 
 
@@ -163,6 +165,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
+- Add the non-intermediate hack.
+
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
 - Suppress warnings caused by _FORTIFY_SOURCE=2
 - Remove unwanted files.



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:04:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:04:35 -0400
Subject: rpms/frysk/devel frysk-non-intermediate.patch,NONE,1.1
Message-ID: <200606160204.k5G24ZI2028578@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28558

Added Files:
	frysk-non-intermediate.patch 
Log Message:
Add non-intermediate.patch

frysk-non-intermediate.patch:
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE frysk-non-intermediate.patch ---
Index: frysk-imports/elfutils/backends/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/backends/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- frysk-imports/elfutils/backends/Makefile.am	8 May 2006 20:49:15 -0000	1.1.1.1
+++ frysk-imports/elfutils/backends/Makefile.am	16 Jun 2006 01:54:20 -0000
@@ -35,7 +35,6 @@
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 	   -I$(top_srcdir)/lib -I..
-PACKAGE_VERSION = @PACKAGE_VERSION@
 
 
 modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390
@@ -46,6 +45,8 @@
 noinst_LIBRARIES = $(libebl_pic)
 noinst_DATA = $(libebl_pic:_pic.a=.so)
 
+# Workaround a bug in GNU make:
+non-intermidate: $(libebl_pic:_pic.a=.map)
 
 if MUDFLAP
 libelf = ../libelf/libelf.a



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:09:09 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.34,1.35
Message-ID: <200606160209.k5G299RU028714@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28652

Modified Files:
	OpenIPMI.spec 
Log Message:
Add in dependency on glibc-kernheaders for <linux/compiler.h>



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- OpenIPMI.spec	15 Jun 2006 14:48:02 -0000	1.34
+++ OpenIPMI.spec	16 Jun 2006 02:08:56 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.6
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -16,6 +16,7 @@
 PreReq: chkconfig
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
 BuildPrereq: openssl-devel python-devel readline-devel
+BuildPrereq: glibc-kernheaders
 
 %description
 The Open IPMI project aims to develop an open code base to allow access to
@@ -164,6 +165,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Jun 16 2006 Jon Masters <jcm at redhat.com> 2.0.6-3
+- Fix a build requires (needs glibc-kernheaders)
+
 * Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> 2.0.6-2
 - Bump for new glib2
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:13:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:13:14 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.281, 1.282 anaconda.spec, 1.405,
	1.406 sources, 1.402, 1.403
Message-ID: <200606160213.k5G2DEJp007250@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7215/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.43-1 on branch devel from anaconda-11.1.0.43-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- .cvsignore	15 Jun 2006 20:51:23 -0000	1.281
+++ .cvsignore	16 Jun 2006 02:13:12 -0000	1.282
@@ -1 +1 @@
-anaconda-11.1.0.42.tar.bz2
+anaconda-11.1.0.43.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- anaconda.spec	15 Jun 2006 20:51:23 -0000	1.405
+++ anaconda.spec	16 Jun 2006 02:13:12 -0000	1.406
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.42
+Version: 11.1.0.43
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.43-1
+- Some s390 fixes
+- dmraid fixing (pjones)
+
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.42-1
 - Ensure all kernel packages end up in pkgorder
 - Fix syntax errors in zfcp code


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- sources	15 Jun 2006 20:51:23 -0000	1.402
+++ sources	16 Jun 2006 02:13:12 -0000	1.403
@@ -1 +1 @@
-7f80083489c26362bd0a46a176bdfdc2  anaconda-11.1.0.42.tar.bz2
+82d4fc14ad392c85792d6c88afb49513  anaconda-11.1.0.43.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:19:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:19:49 -0400
Subject: rpms/frysk/devel frysk.spec,1.60,1.61
Message-ID: <200606160219.k5G2JnRx024069@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24045

Modified Files:
	frysk.spec 
Log Message:
- Remove more unwanted files.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- frysk.spec	16 Jun 2006 02:00:45 -0000	1.60
+++ frysk.spec	16 Jun 2006 02:19:46 -0000	1.61
@@ -111,32 +111,32 @@
    usr/include/gelf.h
    usr/include/libelf.h
    usr/include/nlist.h
-   usr/lib/elfutils/libebl_alpha-0.120.so
-   usr/lib/elfutils/libebl_alpha.so
-   usr/lib/elfutils/libebl_arm-0.120.so
-   usr/lib/elfutils/libebl_arm.so
-   usr/lib/elfutils/libebl_i386-0.120.so
-   usr/lib/elfutils/libebl_i386.so
-   usr/lib/elfutils/libebl_ia64-0.120.so
-   usr/lib/elfutils/libebl_ia64.so
-   usr/lib/elfutils/libebl_ppc-0.120.so
-   usr/lib/elfutils/libebl_ppc.so
-   usr/lib/elfutils/libebl_ppc64-0.120.so
-   usr/lib/elfutils/libebl_ppc64.so
-   usr/lib/elfutils/libebl_s390-0.120.so
-   usr/lib/elfutils/libebl_s390.so
-   usr/lib/elfutils/libebl_sh-0.120.so
-   usr/lib/elfutils/libebl_sh.so
-   usr/lib/elfutils/libebl_sparc-0.120.so
-   usr/lib/elfutils/libebl_sparc.so
-   usr/lib/elfutils/libebl_x86_64-0.120.so
-   usr/lib/elfutils/libebl_x86_64.so
-   usr/lib/libasm.a
-   usr/lib/libdw.a
-   usr/lib/libebl.a
-   usr/lib/libelf.a
+   usr/lib{,64}/elfutils/libebl_alpha-0.120.so
+   usr/lib{,64}/elfutils/libebl_alpha.so
+   usr/lib{,64}/elfutils/libebl_arm-0.120.so
+   usr/lib{,64}/elfutils/libebl_arm.so
+   usr/lib{,64}/elfutils/libebl_i386-0.120.so
+   usr/lib{,64}/elfutils/libebl_i386.so
+   usr/lib{,64}/elfutils/libebl_ia64-0.120.so
+   usr/lib{,64}/elfutils/libebl_ia64.so
+   usr/lib{,64}/elfutils/libebl_ppc-0.120.so
+   usr/lib{,64}/elfutils/libebl_ppc.so
+   usr/lib{,64}/elfutils/libebl_ppc64-0.120.so
+   usr/lib{,64}/elfutils/libebl_ppc64.so
+   usr/lib{,64}/elfutils/libebl_s390-0.120.so
+   usr/lib{,64}/elfutils/libebl_s390.so
+   usr/lib{,64}/elfutils/libebl_sh-0.120.so
+   usr/lib{,64}/elfutils/libebl_sh.so
+   usr/lib{,64}/elfutils/libebl_sparc-0.120.so
+   usr/lib{,64}/elfutils/libebl_sparc.so
+   usr/lib{,64}/elfutils/libebl_x86_64-0.120.so
+   usr/lib{,64}/elfutils/libebl_x86_64.so
+   usr/lib{,64}/libasm.a
+   usr/lib{,64}/libdw.a
+   usr/lib{,64}/libebl.a
+   usr/lib{,64}/libelf.a
 '
-(cd $RPM_BUILD_ROOT && rm $unwanted)
+(cd $RPM_BUILD_ROOT && eval rm $unwanted)
 
 # For moment, keep off menu (but if someone wants to enable it they
 # can).
@@ -167,6 +167,7 @@
 %changelog
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
 - Add the non-intermediate hack.
+- Remove more unwanted files.
 
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
 - Suppress warnings caused by _FORTIFY_SOURCE=2



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:41:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:41:52 -0400
Subject: rpms/frysk/devel frysk.spec,1.61,1.62
Message-ID: <200606160241.k5G2fqRr029882@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29857

Modified Files:
	frysk.spec 
Log Message:
- Remove more unwanted files.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- frysk.spec	16 Jun 2006 02:19:46 -0000	1.61
+++ frysk.spec	16 Jun 2006 02:41:49 -0000	1.62
@@ -131,10 +131,7 @@
    usr/lib{,64}/elfutils/libebl_sparc.so
    usr/lib{,64}/elfutils/libebl_x86_64-0.120.so
    usr/lib{,64}/elfutils/libebl_x86_64.so
-   usr/lib{,64}/libasm.a
-   usr/lib{,64}/libdw.a
-   usr/lib{,64}/libebl.a
-   usr/lib{,64}/libelf.a
+   usr/lib{,64}/lib{asm,dw,ebl,elf}*
 '
 (cd $RPM_BUILD_ROOT && eval rm $unwanted)
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 02:47:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 22:47:45 -0400
Subject: rpms/pygtk2/devel pygtk-2.9.1-use-complete-include-path.patch, NONE,
	1.1 pygtk.spec, 1.53, 1.54
Message-ID: <200606160247.k5G2ljpS014225@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14135

Modified Files:
	pygtk.spec 
Added Files:
	pygtk-2.9.1-use-complete-include-path.patch 
Log Message:
- Use full include path for defs parser


pygtk-2.9.1-use-complete-include-path.patch:
 defsparser.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pygtk-2.9.1-use-complete-include-path.patch ---
--- pygtk-2.9.1/codegen/defsparser.py.use-complete-include-path	2006-06-15 22:44:32.000000000 -0400
+++ pygtk-2.9.1/codegen/defsparser.py	2006-06-15 22:45:09.000000000 -0400
@@ -11,7 +11,7 @@
     def include(self, input_filename):
         global include_path
         if os.path.isabs(input_filename):
-            filename = os.path.join(os.path.dirname(self.filename), input_filename)
+            filename = os.path.join(os.path.dirname(self.filename), os.path.dirname(input_filename))
             # set self.filename to the include name, to handle recursive includes
             oldfile = self.filename
             self.filename = filename
@@ -20,7 +20,7 @@
         else:
             inc_path = [os.path.dirname(self.filename)] + include_path
             for filename in [os.path.join(path_entry, input_filename)
-                             for path_entry in include_path]:
+                             for path_entry in inc_path]:
                 if not os.path.exists(filename):
                     continue
                 # set self.filename to the include name, to handle recursive includes


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pygtk.spec	14 Jun 2006 19:29:02 -0000	1.53
+++ pygtk.spec	16 Jun 2006 02:47:43 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.1
-Release: 2 
+Release: 3
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -26,6 +26,8 @@
 BuildRequires: pygobject2-devel >= 2.10.1 
 BuildRequires: libtool
 
+Patch0: pygtk-2.9.1-use-complete-include-path.patch
+
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
 widget set.  Just about anything you can write in C with GTK+ you can write
@@ -54,6 +56,7 @@
 
 %prep
 %setup -q -n pygtk-%{version}
+%patch0 -p1 -b .use-complete-include-path
 
 %build
 %configure --enable-thread --enable-numpy
@@ -112,6 +115,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 2.9.1-3
+- Use full include path for defs parser
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
 - Fix missing BuildRequries
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:10:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:10:47 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.6,
	1.7 policygentool, 1.8, 1.9 selinux-policy.spec, 1.210, 1.211
Message-ID: <200606160310.k5G3AlaX019594@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19551

Modified Files:
	policy-20060608.patch policygentool selinux-policy.spec 
Log Message:
* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-3
- Fix policygentool gen_requires


policy-20060608.patch:
 doc/example.if                       |    4 +--
 policy/global_tunables               |    7 +++++
 policy/modules/admin/bootloader.te   |    2 -
 policy/modules/admin/consoletype.te  |    7 ++++-
 policy/modules/admin/netutils.te     |    1 
 policy/modules/admin/prelink.fc      |    3 --
 policy/modules/kernel/files.if       |   35 +++++++++++++++++++++++++++
 policy/modules/kernel/kernel.if      |   38 +++++++++++++++++++++++++++++
 policy/modules/services/apache.fc    |    1 
 policy/modules/services/apache.if    |   24 ++++++++++++++++++
 policy/modules/services/apache.te    |   45 +++++++++++++++++++++++++++++------
 policy/modules/services/automount.te |   13 +++++++++-
 policy/modules/services/ntp.te       |    1 
 policy/modules/services/pegasus.if   |   31 ++++++++++++++++++++++++
 policy/modules/services/pegasus.te   |    5 +--
 policy/modules/services/ppp.te       |    1 
 policy/modules/services/tor.if       |    2 -
 policy/modules/system/authlogin.if   |    1 
 policy/modules/system/hostname.te    |    5 +++
 policy/modules/system/init.te        |    1 
 policy/modules/system/libraries.fc   |    2 -
 policy/modules/system/mount.te       |    1 
 policy/modules/system/selinuxutil.te |    2 +
 policy/modules/system/unconfined.fc  |    2 +
 policy/modules/system/userdomain.if  |    2 -
 policy/modules/system/xen.if         |    4 +--
 policy/modules/system/xen.te         |   12 +++++++--
 27 files changed, 227 insertions(+), 25 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policy-20060608.patch	14 Jun 2006 15:48:59 -0000	1.6
+++ policy-20060608.patch	16 Jun 2006 03:10:44 -0000	1.7
@@ -1,6 +1,27 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/example.if serefpolicy-2.2.47/doc/example.if
+--- nsaserefpolicy/doc/example.if	2006-02-01 10:22:19.000000000 -0500
++++ serefpolicy-2.2.47/doc/example.if	2006-06-15 21:54:22.000000000 -0400
+@@ -25,7 +25,7 @@
+ ## </param>
+ #
+ interface(`myapp_domtrans',`
+-	gen_requires(`
++	gen_require(`
+ 		type myapp_t, myapp_exec_t;
+ 	')
+ 
+@@ -46,7 +46,7 @@
+ ## </param>
+ #
+ interface(`myapp_read_log',`
+-	gen_requires(`
++	gen_require(`
+ 		type myapp_log_t;
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/global_tunables	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/global_tunables	2006-06-15 21:54:22.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -17,7 +38,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-15 21:54:22.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -29,7 +50,7 @@
  allow bootloader_t bootloader_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-15 21:54:22.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -46,7 +67,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-14 11:48:02.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-15 21:54:22.000000000 -0400
 @@ -54,6 +54,7 @@
  corenet_udp_sendrecv_all_ports(netutils_t)
  corenet_tcp_connect_all_ports(netutils_t)
@@ -57,7 +78,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-15 21:54:22.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -68,7 +89,7 @@
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-15 21:54:22.000000000 -0400
 @@ -1931,6 +1931,21 @@
  ')
  
@@ -117,7 +138,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-15 21:54:22.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -160,10 +181,67 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.47/policy/modules/services/apache.fc
+--- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.fc	2006-06-15 22:21:54.000000000 -0400
+@@ -78,3 +78,4 @@
+ /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+ /usr/share/selinux-policy([^/]*)?/html(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
++/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.47/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.if	2006-06-15 22:21:14.000000000 -0400
+@@ -955,3 +955,27 @@
+ 	allow $2 httpd_$1_content_t:file r_file_perms;
+ 	allow $2 httpd_$1_content_t:lnk_file { getattr read };
+ ')
++
++
++########################################
++## <summary>
++##	Execute a domain transition to run httpd_rotatelogs.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`apache_domtrans_rotatelogs',`
++	gen_require(`
++		type httpd_rotatelogs_t, httpd_rotatelogs_exec_t;
++	')
++
++	domain_auto_trans($1,httpd_rotatelogs_exec_t,httpd_rotatelogs_t)
++
++	allow $1 httpd_rotatelogs_t:fd use;
++	allow httpd_rotatelogs_t $1:fd use;
++	allow httpd_rotatelogs_t $1:fifo_file rw_file_perms;
++	allow httpd_rotatelogs_t $1:process sigchld;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-14 11:28:00.000000000 -0400
-@@ -293,6 +293,15 @@
++++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-15 22:23:20.000000000 -0400
+@@ -109,13 +109,10 @@
+ type squirrelmail_spool_t;
+ files_tmp_file(squirrelmail_spool_t)
+ 
+-# mod_jk2 creates /var/log/httpd/jk2.shm to communicate with tomcat
+-# This is a bug but it still exists in FC2
+-# cjp: probably can remove this
+-ifdef(`distro_redhat',`
+-	typealias httpd_log_t alias httpd_runtime_t;
+-	dontaudit httpd_t httpd_runtime_t:file ioctl;
+-')
++type httpd_rotatelogs_t;
++type httpd_rotatelogs_exec_t;
++domain_type(httpd_rotatelogs_t)
++init_daemon_domain(httpd_rotatelogs_t, httpd_rotatelogs_exec_t)
+ 
+ ifdef(`targeted_policy',`
+ 	typealias httpd_sys_content_t alias httpd_user_content_t;
+@@ -293,6 +290,15 @@
  	miscfiles_manage_public_files(httpd_t)
  ') 
  
@@ -179,9 +257,38 @@
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
+@@ -692,3 +698,28 @@
+ optional_policy(`
+ 	nscd_socket_use(httpd_unconfined_script_t)
+ ')
++
++########################################
++#
++# httpd_rotatelogs local policy
++#
++# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.
++
++# Some common macros (you might be able to remove some)
++files_read_etc_files(httpd_rotatelogs_t)
++libs_use_ld_so(httpd_rotatelogs_t)
++libs_use_shared_libs(httpd_rotatelogs_t)
++miscfiles_read_localization(httpd_rotatelogs_t)
++kernel_read_kernel_sysctls(httpd_rotatelogs_t)
++kernel_dontaudit_list_proc(httpd_rotatelogs_t)
++kernel_dontaudit_read_proc_symlinks(httpd_rotatelogs_t)
++term_dontaudit_use_generic_ptys(httpd_rotatelogs_t)
++
++allow httpd_rotatelogs_t httpd_log_t:dir rw_dir_perms;
++allow httpd_rotatelogs_t httpd_log_t:file create_file_perms;
++
++#
++# Should we add a boolean?
++#
++apache_domtrans_rotatelogs(httpd_sys_script_t)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-14 11:28:49.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-15 21:54:22.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -214,7 +321,7 @@
  corecmd_exec_shell(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-15 21:54:22.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -225,7 +332,7 @@
  corenet_tcp_sendrecv_all_if(ntpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-15 21:54:22.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -261,7 +368,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-15 21:54:22.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -278,9 +385,43 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.47/policy/modules/services/ppp.te
+--- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ppp.te	2006-06-15 21:55:46.000000000 -0400
+@@ -68,6 +68,7 @@
+ allow pppd_t self:tcp_socket create_stream_socket_perms;
+ allow pppd_t self:udp_socket { connect connected_socket_perms };
+ allow pppd_t self:packet_socket create_socket_perms;
++allow pppd_t self:process signal;
+ 
+ domain_auto_trans(pppd_t, pptp_exec_t, pptp_t)
+ allow pppd_t pptp_t:fd use;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-2.2.47/policy/modules/services/tor.if
+--- nsaserefpolicy/policy/modules/services/tor.if	2006-03-07 13:08:46.000000000 -0500
++++ serefpolicy-2.2.47/policy/modules/services/tor.if	2006-06-15 21:54:22.000000000 -0400
+@@ -11,7 +11,7 @@
+ ## </param>
+ #
+ interface(`tor_domtrans',`
+-	gen_requires(`
++	gen_require(`
+ 		type tor_t, tor_exec_t;
+ 	')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.47/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/authlogin.if	2006-06-15 22:39:05.000000000 -0400
+@@ -1292,6 +1292,7 @@
+ 
+ 	sysnet_dns_name_resolve($1)
+ 	sysnet_use_ldap($1)
++	miscfiles_read_certs($1)
+ 
+ 	optional_policy(`
+ 		nis_use_ypbind($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-15 21:54:22.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -295,7 +436,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-15 21:54:22.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -304,9 +445,21 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.47/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/libraries.fc	2006-06-15 21:55:03.000000000 -0400
+@@ -121,7 +121,7 @@
+ 
+ /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/xorg/modules/drivers/fglx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-15 21:54:22.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -317,7 +470,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-15 21:54:22.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -329,7 +482,7 @@
  # cjp: why is this needed?
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-15 21:54:22.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -339,7 +492,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-15 21:54:22.000000000 -0400
 @@ -4145,7 +4145,7 @@
  	gen_require(`
  		type user_home_dir_t;
@@ -349,3 +502,74 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.47/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/xen.if	2006-06-15 21:54:22.000000000 -0400
+@@ -11,7 +11,7 @@
+ ## </param>
+ #
+ interface(`xen_domtrans',`
+-	gen_requires(`
++	gen_require(`
+ 		type xend_t, xend_exec_t;
+ 	')
+ 
+@@ -118,7 +118,7 @@
+ ## </param>
+ #
+ interface(`xen_domtrans_xm',`
+-	gen_requires(`
++	gen_require(`
+ 		type xm_t, xm_exec_t;
+ 	')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.47/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/xen.te	2006-06-15 21:54:22.000000000 -0400
+@@ -68,7 +68,8 @@
+ # xend local policy
+ #
+ 
+-allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config };
++allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
++
+ allow xend_t self:process { signal sigkill };
+ # internal communication is often done using fifo and unix sockets.
+ allow xend_t self:fifo_file rw_file_perms;
+@@ -168,6 +169,8 @@
+ 
+ xen_stream_connect_xenstore(xend_t)
+ 
++netutils_domtrans(xend_t)
++
+ optional_policy(`
+ 	consoletype_domtrans(xend_t)
+ ')
+@@ -255,7 +258,8 @@
+ # xm local policy
+ #
+ 
+-allow xm_t self:capability { dac_override ipc_lock };
++allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
++
+ # internal communication is often done using fifo and unix sockets.
+ allow xm_t self:fifo_file { read write };
+ allow xm_t self:unix_stream_socket create_stream_socket_perms;
+@@ -265,6 +269,9 @@
+ allow xm_t xend_var_lib_t:file create_file_perms;
+ files_search_var_lib(xm_t)
+ 
++allow xm_t xen_image_t:dir rw_dir_perms;
++allow xm_t xen_image_t:file r_file_perms;
++
+ kernel_read_system_state(xm_t)
+ kernel_read_kernel_sysctls(xm_t)
+ kernel_read_xen_state(xm_t)
+@@ -284,6 +291,7 @@
+ term_use_all_terms(xm_t)
+ 
+ init_rw_script_stream_sockets(xm_t)
++init_use_fds(xm_t)
+ 
+ libs_use_ld_so(xm_t)
+ libs_use_shared_libs(xm_t)


Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policygentool	15 Jun 2006 14:45:39 -0000	1.8
+++ policygentool	16 Jun 2006 03:10:44 -0000	1.9
@@ -46,7 +46,7 @@
 
 	allow $1 TEMPLATETYPE_t:fd use;
 	allow TEMPLATETYPE_t $1:fd use;
-	allow TEMPLATETYPE_t:$1:fifo_file rw_file_perms;
+	allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
 	allow TEMPLATETYPE_t $1:process sigchld;
 ')
 """


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- selinux-policy.spec	15 Jun 2006 14:45:40 -0000	1.210
+++ selinux-policy.spec	16 Jun 2006 03:10:44 -0000	1.211
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.47
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -86,7 +86,7 @@
 touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \
-ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1/include \
+ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1 \
 %nil
 
 %define fileList() \
@@ -166,7 +166,6 @@
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=%3 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
-rm -f %{buildroot}%{_usr}/share/selinux/devel/include/include
 install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
 install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel %{buildroot}%{_usr}/share/selinux/devel/Makefile
 install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
@@ -187,6 +186,7 @@
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf
 cp -f ${RPM_SOURCE_DIR}/modules-strict.conf  ./policy/modules.conf 
 %installCmds strict strict-mcs y n
+ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/strict 
 %endif
 
 %if %{BUILD_MLS}
@@ -291,7 +291,6 @@
 %post mls 
 %rebuildpolicy mls
 %relabel mls
-ln -sf ../devel/include /usr/share/selinux/mls/include
 
 %files mls
 %fileList mls
@@ -318,7 +317,6 @@
 %post strict 
 %rebuildpolicy strict
 %relabel strict
-ln -sf ../devel/include /usr/share/selinux/strict/include
 
 %triggerpostun strict -- selinux-policy-strict <= 2.2.35-2
 cd /usr/share/selinux/strict
@@ -335,7 +333,7 @@
 %endif
 
 %changelog
-* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-3
 - Fix policygentool gen_requires
 
 * Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:11:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:11:05 -0400
Subject: rpms/selinux-policy/FC-5 modules-mls.conf, 1.16,
	1.17 policy-20060608.patch, 1.1, 1.2 policygentool, 1.6,
	1.7 selinux-policy.spec, 1.174, 1.175 policy-20060207.patch,
	1.54, NONE policy-20060323.patch, 1.2,
	NONE policy-20060411.patch, 1.3, NONE policy-20060505.patch,
	1.5, NONE
Message-ID: <200606160311.k5G3B5uG019700@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19624

Modified Files:
	modules-mls.conf policy-20060608.patch policygentool 
	selinux-policy.spec 
Removed Files:
	policy-20060207.patch policy-20060323.patch 
	policy-20060411.patch policy-20060505.patch 
Log Message:
* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-3.fc5
- Bump for fc5



Index: modules-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/modules-mls.conf,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modules-mls.conf	24 May 2006 03:19:52 -0000	1.16
+++ modules-mls.conf	16 Jun 2006 03:11:02 -0000	1.17
@@ -935,7 +935,7 @@
 #
 # The unconfined domain.
 # 
-unconfined = base
+unconfined = off
 
 # Layer: system
 # Module: miscfiles

policy-20060608.patch:
 doc/example.if                       |    4 +--
 policy/global_tunables               |    7 +++++
 policy/modules/admin/bootloader.te   |    2 -
 policy/modules/admin/consoletype.te  |    7 ++++-
 policy/modules/admin/netutils.te     |    1 
 policy/modules/admin/prelink.fc      |    3 --
 policy/modules/kernel/files.if       |   35 +++++++++++++++++++++++++++
 policy/modules/kernel/kernel.if      |   38 +++++++++++++++++++++++++++++
 policy/modules/services/apache.fc    |    1 
 policy/modules/services/apache.if    |   24 ++++++++++++++++++
 policy/modules/services/apache.te    |   45 +++++++++++++++++++++++++++++------
 policy/modules/services/automount.te |   13 +++++++++-
 policy/modules/services/ntp.te       |    1 
 policy/modules/services/pegasus.if   |   31 ++++++++++++++++++++++++
 policy/modules/services/pegasus.te   |    5 +--
 policy/modules/services/ppp.te       |    1 
 policy/modules/services/tor.if       |    2 -
 policy/modules/system/authlogin.if   |    1 
 policy/modules/system/hostname.te    |    5 +++
 policy/modules/system/init.te        |    1 
 policy/modules/system/libraries.fc   |    2 -
 policy/modules/system/mount.te       |    1 
 policy/modules/system/selinuxutil.te |    2 +
 policy/modules/system/unconfined.fc  |    2 +
 policy/modules/system/userdomain.if  |    2 -
 policy/modules/system/xen.if         |    4 +--
 policy/modules/system/xen.te         |   12 +++++++--
 27 files changed, 227 insertions(+), 25 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060608.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060608.patch	15 Jun 2006 14:17:55 -0000	1.1
+++ policy-20060608.patch	16 Jun 2006 03:11:03 -0000	1.2
@@ -1,6 +1,27 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/example.if serefpolicy-2.2.47/doc/example.if
+--- nsaserefpolicy/doc/example.if	2006-02-01 10:22:19.000000000 -0500
++++ serefpolicy-2.2.47/doc/example.if	2006-06-15 21:54:22.000000000 -0400
+@@ -25,7 +25,7 @@
+ ## </param>
+ #
+ interface(`myapp_domtrans',`
+-	gen_requires(`
++	gen_require(`
+ 		type myapp_t, myapp_exec_t;
+ 	')
+ 
+@@ -46,7 +46,7 @@
+ ## </param>
+ #
+ interface(`myapp_read_log',`
+-	gen_requires(`
++	gen_require(`
+ 		type myapp_log_t;
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/global_tunables	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/global_tunables	2006-06-15 21:54:22.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -17,7 +38,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-15 21:54:22.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -29,7 +50,7 @@
  allow bootloader_t bootloader_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-15 21:54:22.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -46,7 +67,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-14 11:48:02.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-15 21:54:22.000000000 -0400
 @@ -54,6 +54,7 @@
  corenet_udp_sendrecv_all_ports(netutils_t)
  corenet_tcp_connect_all_ports(netutils_t)
@@ -57,7 +78,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-15 21:54:22.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -68,7 +89,7 @@
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-15 21:54:22.000000000 -0400
 @@ -1931,6 +1931,21 @@
  ')
  
@@ -117,7 +138,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-15 21:54:22.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -160,10 +181,67 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.47/policy/modules/services/apache.fc
+--- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.fc	2006-06-15 22:21:54.000000000 -0400
+@@ -78,3 +78,4 @@
+ /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+ /usr/share/selinux-policy([^/]*)?/html(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
++/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.47/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.if	2006-06-15 22:21:14.000000000 -0400
+@@ -955,3 +955,27 @@
+ 	allow $2 httpd_$1_content_t:file r_file_perms;
+ 	allow $2 httpd_$1_content_t:lnk_file { getattr read };
+ ')
++
++
++########################################
++## <summary>
++##	Execute a domain transition to run httpd_rotatelogs.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`apache_domtrans_rotatelogs',`
++	gen_require(`
++		type httpd_rotatelogs_t, httpd_rotatelogs_exec_t;
++	')
++
++	domain_auto_trans($1,httpd_rotatelogs_exec_t,httpd_rotatelogs_t)
++
++	allow $1 httpd_rotatelogs_t:fd use;
++	allow httpd_rotatelogs_t $1:fd use;
++	allow httpd_rotatelogs_t $1:fifo_file rw_file_perms;
++	allow httpd_rotatelogs_t $1:process sigchld;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-14 11:28:00.000000000 -0400
-@@ -293,6 +293,15 @@
++++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-15 22:23:20.000000000 -0400
+@@ -109,13 +109,10 @@
+ type squirrelmail_spool_t;
+ files_tmp_file(squirrelmail_spool_t)
+ 
+-# mod_jk2 creates /var/log/httpd/jk2.shm to communicate with tomcat
+-# This is a bug but it still exists in FC2
+-# cjp: probably can remove this
+-ifdef(`distro_redhat',`
+-	typealias httpd_log_t alias httpd_runtime_t;
+-	dontaudit httpd_t httpd_runtime_t:file ioctl;
+-')
++type httpd_rotatelogs_t;
++type httpd_rotatelogs_exec_t;
++domain_type(httpd_rotatelogs_t)
++init_daemon_domain(httpd_rotatelogs_t, httpd_rotatelogs_exec_t)
+ 
+ ifdef(`targeted_policy',`
+ 	typealias httpd_sys_content_t alias httpd_user_content_t;
+@@ -293,6 +290,15 @@
  	miscfiles_manage_public_files(httpd_t)
  ') 
  
@@ -179,9 +257,38 @@
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
+@@ -692,3 +698,28 @@
+ optional_policy(`
+ 	nscd_socket_use(httpd_unconfined_script_t)
+ ')
++
++########################################
++#
++# httpd_rotatelogs local policy
++#
++# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.
++
++# Some common macros (you might be able to remove some)
++files_read_etc_files(httpd_rotatelogs_t)
++libs_use_ld_so(httpd_rotatelogs_t)
++libs_use_shared_libs(httpd_rotatelogs_t)
++miscfiles_read_localization(httpd_rotatelogs_t)
++kernel_read_kernel_sysctls(httpd_rotatelogs_t)
++kernel_dontaudit_list_proc(httpd_rotatelogs_t)
++kernel_dontaudit_read_proc_symlinks(httpd_rotatelogs_t)
++term_dontaudit_use_generic_ptys(httpd_rotatelogs_t)
++
++allow httpd_rotatelogs_t httpd_log_t:dir rw_dir_perms;
++allow httpd_rotatelogs_t httpd_log_t:file create_file_perms;
++
++#
++# Should we add a boolean?
++#
++apache_domtrans_rotatelogs(httpd_sys_script_t)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-14 11:28:49.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-15 21:54:22.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -214,7 +321,7 @@
  corecmd_exec_shell(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-15 21:54:22.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -225,7 +332,7 @@
  corenet_tcp_sendrecv_all_if(ntpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-15 21:54:22.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -261,7 +368,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-15 21:54:22.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -278,9 +385,43 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.47/policy/modules/services/ppp.te
+--- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ppp.te	2006-06-15 21:55:46.000000000 -0400
+@@ -68,6 +68,7 @@
+ allow pppd_t self:tcp_socket create_stream_socket_perms;
+ allow pppd_t self:udp_socket { connect connected_socket_perms };
+ allow pppd_t self:packet_socket create_socket_perms;
++allow pppd_t self:process signal;
+ 
+ domain_auto_trans(pppd_t, pptp_exec_t, pptp_t)
+ allow pppd_t pptp_t:fd use;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-2.2.47/policy/modules/services/tor.if
+--- nsaserefpolicy/policy/modules/services/tor.if	2006-03-07 13:08:46.000000000 -0500
++++ serefpolicy-2.2.47/policy/modules/services/tor.if	2006-06-15 21:54:22.000000000 -0400
+@@ -11,7 +11,7 @@
+ ## </param>
+ #
+ interface(`tor_domtrans',`
+-	gen_requires(`
++	gen_require(`
+ 		type tor_t, tor_exec_t;
+ 	')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.47/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/authlogin.if	2006-06-15 22:39:05.000000000 -0400
+@@ -1292,6 +1292,7 @@
+ 
+ 	sysnet_dns_name_resolve($1)
+ 	sysnet_use_ldap($1)
++	miscfiles_read_certs($1)
+ 
+ 	optional_policy(`
+ 		nis_use_ypbind($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-15 21:54:22.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -295,7 +436,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-15 21:54:22.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -304,9 +445,21 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.47/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/libraries.fc	2006-06-15 21:55:03.000000000 -0400
+@@ -121,7 +121,7 @@
+ 
+ /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/xorg/modules/drivers/fglx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-15 21:54:22.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -317,7 +470,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-15 21:54:22.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -329,7 +482,7 @@
  # cjp: why is this needed?
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-15 21:54:22.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -339,7 +492,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-14 11:28:00.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-15 21:54:22.000000000 -0400
 @@ -4145,7 +4145,7 @@
  	gen_require(`
  		type user_home_dir_t;
@@ -349,3 +502,74 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.47/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/xen.if	2006-06-15 21:54:22.000000000 -0400
+@@ -11,7 +11,7 @@
+ ## </param>
+ #
+ interface(`xen_domtrans',`
+-	gen_requires(`
++	gen_require(`
+ 		type xend_t, xend_exec_t;
+ 	')
+ 
+@@ -118,7 +118,7 @@
+ ## </param>
+ #
+ interface(`xen_domtrans_xm',`
+-	gen_requires(`
++	gen_require(`
+ 		type xm_t, xm_exec_t;
+ 	')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.47/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/xen.te	2006-06-15 21:54:22.000000000 -0400
+@@ -68,7 +68,8 @@
+ # xend local policy
+ #
+ 
+-allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config };
++allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
++
+ allow xend_t self:process { signal sigkill };
+ # internal communication is often done using fifo and unix sockets.
+ allow xend_t self:fifo_file rw_file_perms;
+@@ -168,6 +169,8 @@
+ 
+ xen_stream_connect_xenstore(xend_t)
+ 
++netutils_domtrans(xend_t)
++
+ optional_policy(`
+ 	consoletype_domtrans(xend_t)
+ ')
+@@ -255,7 +258,8 @@
+ # xm local policy
+ #
+ 
+-allow xm_t self:capability { dac_override ipc_lock };
++allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
++
+ # internal communication is often done using fifo and unix sockets.
+ allow xm_t self:fifo_file { read write };
+ allow xm_t self:unix_stream_socket create_stream_socket_perms;
+@@ -265,6 +269,9 @@
+ allow xm_t xend_var_lib_t:file create_file_perms;
+ files_search_var_lib(xm_t)
+ 
++allow xm_t xen_image_t:dir rw_dir_perms;
++allow xm_t xen_image_t:file r_file_perms;
++
+ kernel_read_system_state(xm_t)
+ kernel_read_kernel_sysctls(xm_t)
+ kernel_read_xen_state(xm_t)
+@@ -284,6 +291,7 @@
+ term_use_all_terms(xm_t)
+ 
+ init_rw_script_stream_sockets(xm_t)
++init_use_fds(xm_t)
+ 
+ libs_use_ld_so(xm_t)
+ libs_use_shared_libs(xm_t)


Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policygentool,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policygentool	15 Jun 2006 14:45:19 -0000	1.6
+++ policygentool	16 Jun 2006 03:11:03 -0000	1.7
@@ -46,7 +46,7 @@
 
 	allow $1 TEMPLATETYPE_t:fd use;
 	allow TEMPLATETYPE_t $1:fd use;
-	allow TEMPLATETYPE_t:$1:fifo_file rw_file_perms;
+	allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
 	allow TEMPLATETYPE_t $1:process sigchld;
 ')
 """


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- selinux-policy.spec	15 Jun 2006 14:45:19 -0000	1.174
+++ selinux-policy.spec	16 Jun 2006 03:11:03 -0000	1.175
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.47
-Release: 2.fc5
+Release: 3.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -86,7 +86,7 @@
 touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \
-ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1/include \
+ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1 \
 %nil
 
 %define fileList() \
@@ -166,7 +166,6 @@
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=%3 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
-rm -f %{buildroot}%{_usr}/share/selinux/devel/include/include
 install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
 install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel %{buildroot}%{_usr}/share/selinux/devel/Makefile
 install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
@@ -187,6 +186,7 @@
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf
 cp -f ${RPM_SOURCE_DIR}/modules-strict.conf  ./policy/modules.conf 
 %installCmds strict strict-mcs y n
+ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/strict 
 %endif
 
 %if %{BUILD_MLS}
@@ -280,7 +280,6 @@
 %post mls 
 %rebuildpolicy mls
 %relabel mls
-ln -sf ../devel/include /usr/share/selinux/mls/include
 
 %triggerpostun mls -- mls <= 2.0.7
 %{rebuildpolicy} mls 
@@ -310,7 +309,6 @@
 %post strict 
 %rebuildpolicy strict
 %relabel strict
-ln -sf ../devel/include /usr/share/selinux/strict/include
 
 %triggerpostun strict -- selinux-policy-strict <= 2.2.35-2
 cd /usr/share/selinux/strict
@@ -326,9 +324,10 @@
 %endif
 
 %changelog
-* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2.fc5
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-3.fc5
+- Bump for fc5
 
-* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-2
+* Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-3
 - Fix policygentool gen_requires
 
 * Tue Jun 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-1


--- policy-20060207.patch DELETED ---


--- policy-20060323.patch DELETED ---


--- policy-20060411.patch DELETED ---


--- policy-20060505.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:13:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:13:31 -0400
Subject: rpms/frysk/devel frysk.spec,1.62,1.63
Message-ID: <200606160313.k5G3DVmJ020477@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20446

Modified Files:
	frysk.spec 
Log Message:
- Link statically with libelf.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- frysk.spec	16 Jun 2006 02:41:49 -0000	1.62
+++ frysk.spec	16 Jun 2006 03:13:29 -0000	1.63
@@ -12,6 +12,7 @@
 Patch2:		frysk-elf-cxx.patch
 Patch3:		frysk-unistd.patch
 Patch4:		frysk-non-intermediate.patch
+Patch5:		frysk-static-link.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -55,6 +56,7 @@
 %patch2
 %patch3
 %patch4
+%patch5
 
 %build 
 
@@ -165,6 +167,7 @@
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
 - Add the non-intermediate hack.
 - Remove more unwanted files.
+- Add patch to link statically with libelf; remove elfutils libraries.
 
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
 - Suppress warnings caused by _FORTIFY_SOURCE=2



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:26:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:26:33 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.13,
	1.14
Message-ID: <200606160326.k5G3QXtX007515@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7448

Modified Files:
	gnome-python-desktop.spec 
Log Message:
add gnome-keyring subpackage


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-python-desktop.spec	16 Jun 2006 01:33:36 -0000	1.13
+++ gnome-python-desktop.spec	16 Jun 2006 03:26:31 -0000	1.14
@@ -15,7 +15,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.15.3
-Release: 2
+Release: 3
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2
@@ -155,6 +155,16 @@
 This module contains a wrapper that allows the use of gnome-desktop
 via Python.
 
+%package -n gnome-python2-gnomekeyring
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-keyring
+Summary: Python bindings for interacting with gnome-keyring
+Group: Development/Languages
+
+%description -n gnome-python2-gnomekeyring
+This module contains a wrapper that allows the use of gnome-keyring
+via Python.
+
 %prep
 %setup -q -n gnome-python-desktop-%{version}
 
@@ -238,7 +248,13 @@
 %files -n gnome-python2-gnomedesktop
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomedesktop
 
+%files -n gnome-python2-gnomekeyring
+%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
+
 %changelog
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-3
+- Create gnomekeyring subpackage
+
 * Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-2
 - Bump for new nautilus-cd-burner
 



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:29:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:29:22 -0400
Subject: rpms/frysk/devel frysk-static-link.patch,NONE,1.1
Message-ID: <200606160329.k5G3TM8G008651@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8626

Added Files:
	frysk-static-link.patch 
Log Message:
- Link statically with libelf.

frysk-static-link.patch:
 ChangeLog   |    5 +++++
 Makefile.am |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE frysk-static-link.patch ---
Index: ./frysk-gui/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-gui/ChangeLog,v
retrieving revision 1.66
diff -u -r1.66 ChangeLog
--- ./frysk-gui/ChangeLog	14 Jun 2006 22:57:01 -0000	1.66
+++ ./frysk-gui/ChangeLog	16 Jun 2006 02:56:56 -0000
@@ -1,3 +1,8 @@
+2006-06-15  Andrew Cagney  <cagney at redhat.com>
+
+	* Makefile.am (GEN_GCJ_LDADD): Specify static elfutil libraries,
+	re-order and add libebl/libebl.a.
+
 2006-06-15  Stepan Kasal  <kasal at ucw.cz>
 
 	* Makefile.am (noinst_PROGRAMS): remove .../frysk_suite.sh; shell
Index: ./frysk-gui/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-gui/Makefile.am,v
retrieving revision 1.53
diff -u -r1.53 Makefile.am
--- ./frysk-gui/Makefile.am	14 Jun 2006 22:57:01 -0000	1.53
+++ ./frysk-gui/Makefile.am	16 Jun 2006 02:56:56 -0000
@@ -69,9 +69,10 @@
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a 
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a 
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jline.a 
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
 GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
 GEN_GCJ_LDADD += ../frysk-gtk/libfrysk-ftk.a
 GEN_GCJ_LDADD += -L../frysk-gtk/EggTrayIcon
 GEN_GCJ_LDADD += -L../frysk-gtk/tlwidgets



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:34:41 -0400
Subject: rpms/frysk/devel frysk-static-link.patch,1.1,1.2
Message-ID: <200606160334.k5G3YfKN009101@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9070

Modified Files:
	frysk-static-link.patch 
Log Message:
- Link statically with libelf.

frysk-static-link.patch:
 frysk-core/Makefile.am    |    5 +++--
 frysk-gui/ChangeLog       |    5 +++++
 frysk-gui/Makefile.am     |    5 +++--
 frysk-imports/Makefile.am |    5 +++--
 frysk-sys/Makefile.am     |    5 +++--
 5 files changed, 17 insertions(+), 8 deletions(-)

Index: frysk-static-link.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk-static-link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frysk-static-link.patch	16 Jun 2006 03:29:20 -0000	1.1
+++ frysk-static-link.patch	16 Jun 2006 03:34:39 -0000	1.2
@@ -1,10 +1,30 @@
+Index: ./frysk-core/Makefile.am
+===================================================================
+RCS file: /cvs/frysk/frysk-core/Makefile.am,v
+retrieving revision 1.51
+diff -u -r1.51 Makefile.am
+--- ./frysk-core/Makefile.am	13 Jun 2006 13:44:37 -0000	1.51
++++ ./frysk-core/Makefile.am	16 Jun 2006 03:28:37 -0000
+@@ -78,9 +78,10 @@
+ GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
+ GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jdom.a
+ GEN_GCJ_LDADD += ../frysk-imports/libfrysk-cdtparser.a 
+-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
+-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
+ GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
++GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
++GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
++GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
+ GEN_GCJ_LDADD += -lopcodes
+ 
+ # XXX: This needs to be make less-architecture independant.
 Index: ./frysk-gui/ChangeLog
 ===================================================================
 RCS file: /cvs/frysk/frysk-gui/ChangeLog,v
 retrieving revision 1.66
 diff -u -r1.66 ChangeLog
 --- ./frysk-gui/ChangeLog	14 Jun 2006 22:57:01 -0000	1.66
-+++ ./frysk-gui/ChangeLog	16 Jun 2006 02:56:56 -0000
++++ ./frysk-gui/ChangeLog	16 Jun 2006 03:28:37 -0000
 @@ -1,3 +1,8 @@
 +2006-06-15  Andrew Cagney  <cagney at redhat.com>
 +
@@ -20,7 +40,7 @@
 retrieving revision 1.53
 diff -u -r1.53 Makefile.am
 --- ./frysk-gui/Makefile.am	14 Jun 2006 22:57:01 -0000	1.53
-+++ ./frysk-gui/Makefile.am	16 Jun 2006 02:56:56 -0000
++++ ./frysk-gui/Makefile.am	16 Jun 2006 03:28:37 -0000
 @@ -69,9 +69,10 @@
  GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a 
  GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a 
@@ -34,3 +54,42 @@
  GEN_GCJ_LDADD += ../frysk-gtk/libfrysk-ftk.a
  GEN_GCJ_LDADD += -L../frysk-gtk/EggTrayIcon
  GEN_GCJ_LDADD += -L../frysk-gtk/tlwidgets
+Index: ./frysk-imports/Makefile.am
+===================================================================
+RCS file: /cvs/frysk/frysk-imports/Makefile.am,v
+retrieving revision 1.53
+diff -u -r1.53 Makefile.am
+--- ./frysk-imports/Makefile.am	15 Jun 2006 18:50:50 -0000	1.53
++++ ./frysk-imports/Makefile.am	16 Jun 2006 03:28:37 -0000
+@@ -62,9 +62,10 @@
+ GEN_CLASSPATH += junit.jar
+ GEN_GCJ_LDADD += libfrysk-jargs.a
+ GEN_GCJ_LDADD += libfrysk-junit.a
+-GEN_GCJ_LDADD += -Lelfutils/libelf -lelf
+-GEN_GCJ_LDADD += -Lelfutils/libdw -ldw
+ GEN_GCJ_LDADD += ./elfutils/libdwfl/libdwfl.a
++GEN_GCJ_LDADD += ./elfutils/libdw/libdw.a
++GEN_GCJ_LDADD += ./elfutils/libebl/libebl.a
++GEN_GCJ_LDADD += ./elfutils/libelf/libelf.a
+ GEN_GCJ_LDADD += -lopcodes
+ 
+ all-local: lib/elf/tests/test-core lib/elf/tests/helloworld.o
+Index: ./frysk-sys/Makefile.am
+===================================================================
+RCS file: /cvs/frysk/frysk-sys/Makefile.am,v
+retrieving revision 1.20
+diff -u -r1.20 Makefile.am
+--- ./frysk-sys/Makefile.am	13 Jun 2006 13:44:37 -0000	1.20
++++ ./frysk-sys/Makefile.am	16 Jun 2006 03:28:39 -0000
+@@ -51,7 +51,8 @@
+ GEN_GCJ_LDADD += ../frysk-imports/libfrysk-imports.a
+ GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a
+ GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
+-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
+-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
+ GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
++GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
++GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
++GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
+ GEN_GCJ_LDADD += -lopcodes
+



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:39:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:39:55 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.14,
	1.15
Message-ID: <200606160339.k5G3dtnH009698@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9666

Modified Files:
	gnome-python-desktop.spec 
Log Message:
ifblock around the cd stuff


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-python-desktop.spec	16 Jun 2006 03:26:31 -0000	1.14
+++ gnome-python-desktop.spec	16 Jun 2006 03:39:52 -0000	1.15
@@ -15,7 +15,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.15.3
-Release: 3
+Release: 4
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2
@@ -104,7 +104,7 @@
 This module contains a wrapper that allows the use of libgtop via
 Python.
 
-
+%ifnarch s390 s390x
 %package -n gnome-python2-nautilus-cd-burner
 Requires: %{name} = %{version}-%{release}
 Summary: Python bindings for interacting with nautilus-cd-burner
@@ -114,7 +114,7 @@
 %description -n gnome-python2-nautilus-cd-burner
 This module contains a wrapper that allows the use of nautilus-cd-burner
 via Python.
-
+%endif
 
 %package -n gnome-python2-metacity
 Requires: %{name} = %{version}-%{release}
@@ -223,11 +223,13 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gtop.so
 
 
+%ifnarch s390 s390x
 %files -n gnome-python2-nautilus-cd-burner
 %defattr(-,root,root,-)
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/nautilusburn.so
 %defattr(644,root,root,755)
 %doc ../gnome-python-desktop-%{version}/examples/nautilusburn/*
+%endif
 
 
 %files -n gnome-python2-metacity
@@ -252,8 +254,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
 
 %changelog
-* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-3
+* Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-4
 - Create gnomekeyring subpackage
+- block out the nautilus-cd stuff
 
 * Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-2
 - Bump for new nautilus-cd-burner



From fedora-cvs-commits at redhat.com  Fri Jun 16 03:40:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 15 Jun 2006 23:40:53 -0400
Subject: rpms/frysk/devel frysk.spec,1.63,1.64
Message-ID: <200606160340.k5G3erul010045@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9998

Modified Files:
	frysk.spec 
Log Message:
- Link statically with libelf.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- frysk.spec	16 Jun 2006 03:13:29 -0000	1.63
+++ frysk.spec	16 Jun 2006 03:40:50 -0000	1.64
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.06.15.rh4
-Release:	3
+Release:	4
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk



From fedora-cvs-commits at redhat.com  Fri Jun 16 06:46:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 02:46:59 -0400
Subject: rpms/nfs-utils-lib/FC-5 nfs-utils-lib.spec, 1.6,
	1.7 libnfsidmap-0.12-set_debug.patch, 1.2, NONE
Message-ID: <200606160646.k5G6kx8d004066@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32600

Modified Files:
	nfs-utils-lib.spec 
Removed Files:
	libnfsidmap-0.12-set_debug.patch 
Log Message:
Updated libnfsidmap and  librpcsecgss



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/nfs-utils-lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nfs-utils-lib.spec	11 Feb 2006 04:46:03 -0000	1.6
+++ nfs-utils-lib.spec	16 Jun 2006 06:46:56 -0000	1.7
@@ -1,13 +1,13 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 3.1
+Release: 4
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
-%define idmapvers 0.12
+%define idmapvers 0.16
 %define libnfsidmap libnfsidmap-%{idmapvers}
-%define rpcsecgssvers 0.7
+%define rpcsecgssvers 0.13
 %define librpcsecgss librpcsecgss-%{rpcsecgssvers}
 %define libs %{librpcsecgss} %{libnfsidmap}
 
@@ -22,8 +22,6 @@
 Requires(pre): /sbin/ldconfig
 PreReq: libgssapi
 
-Patch1: libnfsidmap-0.12-set_debug.patch
-
 %description
 Support libaries that are needed by the commands and 
 daemons the nfs-utils rpm.
@@ -41,8 +39,6 @@
 %prep
 %setup -c -q -a1
 
-%patch1 -p1
-
 %build
 top=`pwd`
 for dir in %{libs} ; do
@@ -103,6 +99,7 @@
 %{_defaultdocdir}/%{libnfsidmap}/ChangeLog
 %{_defaultdocdir}/%{libnfsidmap}/NEWS
 %{_defaultdocdir}/%{libnfsidmap}/README
+%{_libdir}/pkgconfig/libnfsidmap.pc
 %{_mandir}/man3/nfs4_uid_to_name.3.gz
 
 %files devel
@@ -111,23 +108,16 @@
 %{_libdir}/librpcsecgss.so
 %{_includedir}/rpcsecgss/rpc/auth.h
 %{_includedir}/rpcsecgss/rpc/auth_gss.h
-%{_includedir}/rpcsecgss/rpc/auth_unix.h
-%{_includedir}/rpcsecgss/rpc/clnt.h
-%{_includedir}/rpcsecgss/rpc/pmap_clnt.h
-%{_includedir}/rpcsecgss/rpc/pmap_prot.h
-%{_includedir}/rpcsecgss/rpc/pmap_rmt.h
-%{_includedir}/rpcsecgss/rpc/rpc.h
-%{_includedir}/rpcsecgss/rpc/rpc_des.h
-%{_includedir}/rpcsecgss/rpc/rpc_msg.h
 %{_includedir}/rpcsecgss/rpc/svc.h
 %{_includedir}/rpcsecgss/rpc/svc_auth.h
-%{_includedir}/rpcsecgss/rpc/types.h
-%{_includedir}/rpcsecgss/rpc/xdr.h
 %{_includedir}/nfsidmap.h
 %{_libdir}/libnfsidmap.so
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Fri Jun 16 2006 Steve Dickson <steved at redhat.com> 1.0.8-4
+Updated libnfsidmap and  librpcsecgss
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-3.1
 - bump again for double-long bug on ppc(64)
 


--- libnfsidmap-0.12-set_debug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 16 07:13:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 03:13:06 -0400
Subject: rpms/nfs-utils-lib/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200606160713.k5G7D6QS011554@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11527

Modified Files:
	.cvsignore sources 
Log Message:
upload files



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 22:45:21 -0000	1.2
+++ .cvsignore	16 Jun 2006 07:13:03 -0000	1.3
@@ -1,2 +1,3 @@
 libnfsidmap-0.12.tar.gz
 librpcsecgss-0.7.tar.gz
+libnfsidmap-0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 22:45:21 -0000	1.2
+++ sources	16 Jun 2006 07:13:03 -0000	1.3
@@ -1,2 +1,2 @@
-5459409f04b8d6f92b99e84a0f6382b1  libnfsidmap-0.12.tar.gz
 08d07cb462555c00cfba6708112a646a  librpcsecgss-0.7.tar.gz
+ab167a7449c029bd9f26e8275cc95c7b  libnfsidmap-0.16.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 16 07:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 03:16:38 -0400
Subject: rpms/nfs-utils-lib/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200606160716.k5G7GcWB019609@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17921

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jun 2006 07:13:03 -0000	1.3
+++ .cvsignore	16 Jun 2006 07:16:35 -0000	1.4
@@ -1,3 +1,4 @@
 libnfsidmap-0.12.tar.gz
 librpcsecgss-0.7.tar.gz
 libnfsidmap-0.16.tar.gz
+librpcsecgss-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2006 07:13:03 -0000	1.3
+++ sources	16 Jun 2006 07:16:35 -0000	1.4
@@ -1,2 +1,2 @@
-08d07cb462555c00cfba6708112a646a  librpcsecgss-0.7.tar.gz
 ab167a7449c029bd9f26e8275cc95c7b  libnfsidmap-0.16.tar.gz
+024143270490e0e252832c9f64499645  librpcsecgss-0.13.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 16 09:28:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 05:28:57 -0400
Subject: rpms/valgrind/devel valgrind-3.2.0-syscall-updates.patch, 1.1,
	1.2 valgrind.spec, 1.34, 1.35
Message-ID: <200606160928.k5G9SvGP005778@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5750

Modified Files:
	valgrind-3.2.0-syscall-updates.patch valgrind.spec 
Log Message:
3.2.0-2

valgrind-3.2.0-syscall-updates.patch:
 syswrap-ppc32-linux.c |   30 ++++++++
 syswrap-ppc64-linux.c |  181 ++++++++++++++++++++++++++------------------------
 2 files changed, 127 insertions(+), 84 deletions(-)

Index: valgrind-3.2.0-syscall-updates.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-3.2.0-syscall-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valgrind-3.2.0-syscall-updates.patch	15 Jun 2006 15:09:25 -0000	1.1
+++ valgrind-3.2.0-syscall-updates.patch	16 Jun 2006 09:28:54 -0000	1.2
@@ -51,8 +51,8 @@
  };
  
  const UInt ML_(syscall_table_size) = 
---- valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc64-linux.c.jj	2006-02-14 18:00:32.000000000 -0500
-+++ valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc64-linux.c	2006-06-15 10:42:18.000000000 -0400
+--- valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc64-linux.c.jj	2006-06-15 16:13:31.000000000 +0200
++++ valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc64-linux.c	2006-06-16 11:20:58.000000000 +0200
 @@ -1174,7 +1174,7 @@ PRE(sys_rt_sigreturn)
  const SyscallTableEntry ML_(syscall_table)[] = {
  // _____(__NR_restart_syscall,   sys_restart_syscall),    //   0
@@ -94,7 +94,7 @@
  
  // _____(__NR_stime,             sys_stime),              //  25
  // _____(__NR_ptrace,            sys_ptrace),             //  26
-@@ -1217,7 +1217,7 @@ const SyscallTableEntry ML_(syscall_tabl
+@@ -1217,47 +1217,47 @@ const SyscallTableEntry ML_(syscall_tabl
  // _____(__NR_ftime,             sys_ftime),              //  35
  // _____(__NR_sync,              sys_sync),               //  36
     GENX_(__NR_kill,              sys_kill),               //  37
@@ -103,7 +103,10 @@
     GENX_(__NR_mkdir,             sys_mkdir),              //  39
  
  // _____(__NR_rmdir,             sys_rmdir),              //  40
-@@ -1227,37 +1227,37 @@ const SyscallTableEntry ML_(syscall_tabl
+    GENXY(__NR_dup,               sys_dup),                //  41
+    LINXY(__NR_pipe,              sys_pipe),               //  42
+-// _____(__NR_times,             sys_times),              //  43
++   GENXY(__NR_times,             sys_times),              // 43
  // _____(__NR_prof,              sys_prof),               //  44
  
     GENX_(__NR_brk,               sys_brk),                //  45
@@ -166,16 +169,46 @@
  // _____(__NR_oldlstat,          sys_oldlstat),           //  84
  
     GENX_(__NR_readlink,          sys_readlink),           //  85
-@@ -1282,7 +1282,7 @@ const SyscallTableEntry ML_(syscall_tabl
+@@ -1282,11 +1282,11 @@ const SyscallTableEntry ML_(syscall_tabl
  
     PLAX_(__NR_mmap,              sys_mmap),               //  90
     GENXY(__NR_munmap,            sys_munmap),             //  91
 -// _____(__NR_truncate,          sys_truncate),           //  92
 +   GENX_(__NR_truncate,          sys_truncate),           //  92
     GENX_(__NR_ftruncate,         sys_ftruncate),          //  93
- // _____(__NR_fchmod,            sys_fchmod),             //  94
+-// _____(__NR_fchmod,            sys_fchmod),             //  94
+-
+-// _____(__NR_fchown,            sys_fchown),             //  95
++   GENX_(__NR_fchmod,            sys_fchmod),             //  94
++   
++   GENX_(__NR_fchown,            sys_fchown),             //  95
+ // _____(__NR_getpriority,       sys_getpriority),        //  96
+ // _____(__NR_setpriority,       sys_setpriority),        //  97
+ // _____(__NR_profil,            sys_profil),             //  98
+@@ -1296,11 +1296,11 @@ const SyscallTableEntry ML_(syscall_tabl
+ // _____(__NR_ioperm,            sys_ioperm),             // 101
+    PLAXY(__NR_socketcall,        sys_socketcall),         // 102
+ // _____(__NR_syslog,            sys_syslog),             // 103
+-// _____(__NR_setitimer,         sys_setitimer),          // 104
++   GENXY(__NR_setitimer,         sys_setitimer),          // 104
+ 
+ // _____(__NR_getitimer,         sys_getitimer),          // 105
+    GENXY(__NR_stat,              sys_newstat),            // 106
+-// _____(__NR_lstat,             sys_lstat),              // 107
++   GENXY(__NR_lstat,             sys_newlstat),           // 107
+    GENXY(__NR_fstat,             sys_newfstat),           // 108
+ // _____(__NR_olduname,          sys_olduname),           // 109
+ 
+@@ -1313,7 +1313,7 @@ const SyscallTableEntry ML_(syscall_tabl
+ // _____(__NR_swapoff,           sys_swapoff),            // 115
+ // _____(__NR_sysinfo,           sys_sysinfo),            // 116
+    PLAXY(__NR_ipc,               sys_ipc),                // 117
+-// _____(__NR_fsync,             sys_fsync),              // 118
++   GENX_(__NR_fsync,             sys_fsync),              // 118
+ // _____(__NR_sigreturn,         sys_sigreturn),          // 119
  
-@@ -1330,21 +1330,21 @@ const SyscallTableEntry ML_(syscall_tabl
+    PLAX_(__NR_clone,             sys_clone),              // 120
+@@ -1330,41 +1330,41 @@ const SyscallTableEntry ML_(syscall_tabl
  
  // _____(__NR_get_kernel_syms,   sys_get_kernel_syms),    // 130
  // _____(__NR_quotactl,          sys_quotactl),           // 131
@@ -205,8 +238,9 @@
  
     GENXY(__NR_readv,             sys_readv),              // 145
     GENX_(__NR_writev,            sys_writev),             // 146
-@@ -1352,19 +1352,19 @@ const SyscallTableEntry ML_(syscall_tabl
- // _____(__NR_fdatasync,         sys_fdatasync),          // 148
+ // _____(__NR_getsid,            sys_getsid),             // 147
+-// _____(__NR_fdatasync,         sys_fdatasync),          // 148
++   GENX_(__NR_fdatasync,         sys_fdatasync),          // 148
     LINXY(__NR__sysctl,           sys_sysctl),             // 149
  
 -// _____(__NR_mlock,             sys_mlock),              // 150


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- valgrind.spec	15 Jun 2006 15:09:25 -0000	1.34
+++ valgrind.spec	16 Jun 2006 09:28:54 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.2.0
-Release: 1
+Release: 2
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.2.0-syscall-updates.patch
@@ -100,8 +100,8 @@
 %endif
 
 %ifarch ppc64
-rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc-linux
-ln -sf ../../lib/valgrind/ppc-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc-linux
+rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc32-linux
+ln -sf ../../lib/valgrind/ppc32-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc32-linux
 %endif
 
 %clean
@@ -118,6 +118,10 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Fri Jun 16 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-2
+- fix ppc64 symlink to 32-bit valgrind libdir
+- handle a few extra ppc64 syscalls
+
 * Thu Jun 15 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1
 - update to 3.2.0
   - ppc64 support



From fedora-cvs-commits at redhat.com  Fri Jun 16 10:02:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 06:02:50 -0400
Subject: rpms/valgrind/devel valgrind-3.2.0-syscall-updates.patch, 1.2,
	1.3 valgrind.spec, 1.35, 1.36
Message-ID: <200606161002.k5GA2opH029396@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29376

Modified Files:
	valgrind-3.2.0-syscall-updates.patch valgrind.spec 
Log Message:
3.2.0-3

valgrind-3.2.0-syscall-updates.patch:
 m_syswrap/syswrap-ppc32-linux.c |   31 ++++++
 m_syswrap/syswrap-ppc64-linux.c |  183 +++++++++++++++++++++-------------------
 vki_unistd-ppc32-linux.h        |    4 
 vki_unistd-ppc64-linux.h        |    3 
 4 files changed, 135 insertions(+), 86 deletions(-)

Index: valgrind-3.2.0-syscall-updates.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-3.2.0-syscall-updates.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- valgrind-3.2.0-syscall-updates.patch	16 Jun 2006 09:28:54 -0000	1.2
+++ valgrind-3.2.0-syscall-updates.patch	16 Jun 2006 10:02:47 -0000	1.3
@@ -1,3 +1,27 @@
+--- valgrind-3.2.0/coregrind/vki_unistd-ppc32-linux.h.jj	2006-05-26 17:26:35.000000000 +0200
++++ valgrind-3.2.0/coregrind/vki_unistd-ppc32-linux.h	2006-06-16 11:40:49.000000000 +0200
+@@ -335,7 +335,9 @@
+ #define __NR_readlinkat		296
+ #define __NR_fchmodat		297
+ #define __NR_faccessat		298
++#define __NR_get_robust_list	299
++#define __NR_set_robust_list	300
+ 
+-#define __NR_syscalls		299
++#define __NR_syscalls		301
+ 
+ #endif /* __VKI_UNISTD_PPC32_LINUX_H */
+--- valgrind-3.2.0/coregrind/vki_unistd-ppc64-linux.h.jj	2006-05-26 17:26:35.000000000 +0200
++++ valgrind-3.2.0/coregrind/vki_unistd-ppc64-linux.h	2006-06-16 11:41:13.000000000 +0200
+@@ -328,6 +328,7 @@
+ #define __NR_readlinkat		296
+ #define __NR_fchmodat		297
+ #define __NR_faccessat		298
+-
++#define __NR_get_robust_list	299
++#define __NR_set_robust_list	300
+ 
+ #endif /* __VKI_UNISTD_PPC64_LINUX_H */
 --- valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2006-04-13 21:09:00.000000000 -0400
 +++ valgrind-3.2.0/coregrind/m_syswrap/syswrap-ppc32-linux.c	2006-06-15 10:09:38.000000000 -0400
 @@ -386,6 +386,7 @@ DECL_TEMPLATE(ppc32_linux, sys_mmap);
@@ -29,7 +53,7 @@
  PRE(sys_fstat64)
  {
    PRINT("sys_fstat64 ( %d, %p )",ARG1,ARG2);
-@@ -1798,6 +1813,21 @@ const SyscallTableEntry ML_(syscall_tabl
+@@ -1798,6 +1813,22 @@ const SyscallTableEntry ML_(syscall_tabl
     LINX_(__NR_inotify_init,  sys_inotify_init),               // 275
     LINX_(__NR_inotify_add_watch,  sys_inotify_add_watch),     // 276
     LINX_(__NR_inotify_rm_watch,   sys_inotify_rm_watch),      // 277
@@ -47,7 +71,8 @@
 +   LINX_(__NR_readlinkat,        sys_readlinkat),        // 296
 +   LINX_(__NR_fchmodat,          sys_fchmodat),          // 297
 +   LINX_(__NR_faccessat,         sys_faccessat),         // 298
-+
++   LINX_(__NR_set_robust_list,   sys_set_robust_list),   // 299
++   LINXY(__NR_get_robust_list,   sys_get_robust_list),   // 300
  };
  
  const UInt ML_(syscall_table_size) = 
@@ -358,7 +383,7 @@
  // _____(__NR_swapcontext,       sys_swapcontext),        // 249
  
     LINXY(__NR_tgkill,            sys_tgkill),             // 250
-@@ -1502,9 +1500,24 @@ const SyscallTableEntry ML_(syscall_tabl
+@@ -1502,9 +1500,26 @@ const SyscallTableEntry ML_(syscall_tabl
  // _____(__NR_ioprio_set,        sys_ioprio_set),         // 273
  // _____(__NR_ioprio_get,        sys_ioprio_get),         // 274
  
@@ -382,6 +407,8 @@
 +   LINX_(__NR_readlinkat,        sys_readlinkat),         // 296
 +   LINX_(__NR_fchmodat,          sys_fchmodat),           // 297
 +   LINX_(__NR_faccessat,         sys_faccessat),          // 298
++   LINX_(__NR_set_robust_list,   sys_set_robust_list),    // 299
++   LINXY(__NR_get_robust_list,   sys_get_robust_list),    // 300
 +
  };
  


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- valgrind.spec	16 Jun 2006 09:28:54 -0000	1.35
+++ valgrind.spec	16 Jun 2006 10:02:47 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.2.0
-Release: 2
+Release: 3
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.2.0-syscall-updates.patch
@@ -118,6 +118,9 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Fri Jun 16 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-3
+- handle [sg]et_robust_list syscall on ppc{32,64}
+
 * Fri Jun 16 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-2
 - fix ppc64 symlink to 32-bit valgrind libdir
 - handle a few extra ppc64 syscalls



From fedora-cvs-commits at redhat.com  Fri Jun 16 11:37:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 07:37:51 -0400
Subject: rpms/hplip/devel hplip-compile.patch, 1.4, 1.5 .cvsignore, 1.10,
	1.11 hplip.spec, 1.83, 1.84 sources, 1.10,
	1.11 hplip-0.9.11-2.patch, 1.1, NONE
Message-ID: <200606161137.k5GBbpsL004927@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4910

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-compile.patch 
Removed Files:
	hplip-0.9.11-2.patch 
Log Message:
* Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-2
- 1.6.6.


hplip-compile.patch:
 usbext.h |    1 -
 1 files changed, 1 deletion(-)

Index: hplip-compile.patch
===================================================================
RCS file: hplip-compile.patch
diff -N hplip-compile.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-compile.patch	16 Jun 2006 11:37:49 -0000	1.5
@@ -0,0 +1,10 @@
+--- hplip-1.6.6/io/hpiod/usbext.h.compile	2006-06-16 12:18:21.000000000 +0100
++++ hplip-1.6.6/io/hpiod/usbext.h	2006-06-16 12:18:29.000000000 +0100
+@@ -34,7 +34,6 @@
+ 
+ #if (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)
+ #else
+-#include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ 
+ #ifdef __cplusplus


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 May 2006 12:36:11 -0000	1.10
+++ .cvsignore	16 Jun 2006 11:37:49 -0000	1.11
@@ -7,3 +7,4 @@
 hplip-0.9.9.tar.gz
 hplip-0.9.10.tar.gz
 hplip-0.9.11.tar.gz
+hplip-1.6.6.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- hplip.spec	12 Jun 2006 15:45:20 -0000	1.83
+++ hplip.spec	16 Jun 2006 11:37:49 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.11
-Release: 6
+Version: 1.6.6
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -10,11 +10,11 @@
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch0: hplip-0.9.11-2.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
+Patch5: hplip-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -61,7 +61,6 @@
 %prep
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
-%patch0 -p1 -b .0.9.11-2
 
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
@@ -75,6 +74,9 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
+# Work around missing linux/compiler.h.
+%patch5 -p1 -b .compile
+
 autoconf # for patch4
 
 %build
@@ -173,6 +175,9 @@
 fi
 
 %changelog
+* Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-2
+- 1.6.6.
+
 * Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.9.11-6
 - Build requires autoconf (bug #194682).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 May 2006 12:36:11 -0000	1.10
+++ sources	16 Jun 2006 11:37:49 -0000	1.11
@@ -1 +1 @@
-5cf362c972d5b1733af4fb8e2ade92e4  hplip-0.9.11.tar.gz
+292fbcc25b79d273d7280760ce797666  hplip-1.6.6.tar.gz


--- hplip-0.9.11-2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 16 11:41:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 07:41:46 -0400
Subject: rpms/hplip/FC-5 hplip-compile.patch, 1.4, 1.5 .cvsignore, 1.9,
	1.10 hplip.spec, 1.72, 1.73 sources, 1.10,
	1.11 hplip-0.9.11-2.patch, 1.1, NONE
Message-ID: <200606161141.k5GBfkKW015818@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15785

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-compile.patch 
Removed Files:
	hplip-0.9.11-2.patch 
Log Message:
* Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-1.1
- 1.6.6.


hplip-compile.patch:
 usbext.h |    1 -
 1 files changed, 1 deletion(-)

Index: hplip-compile.patch
===================================================================
RCS file: hplip-compile.patch
diff -N hplip-compile.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-compile.patch	16 Jun 2006 11:41:43 -0000	1.5
@@ -0,0 +1,10 @@
+--- hplip-1.6.6/io/hpiod/usbext.h.compile	2006-06-16 12:18:21.000000000 +0100
++++ hplip-1.6.6/io/hpiod/usbext.h	2006-06-16 12:18:29.000000000 +0100
+@@ -34,7 +34,6 @@
+ 
+ #if (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)
+ #else
+-#include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ 
+ #ifdef __cplusplus


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 May 2006 17:32:58 -0000	1.9
+++ .cvsignore	16 Jun 2006 11:41:43 -0000	1.10
@@ -6,3 +6,4 @@
 hplip-0.9.8.tar.gz
 hplip-0.9.9.tar.gz
 hplip-0.9.11.tar.gz
+hplip-1.6.6.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- hplip.spec	26 May 2006 12:35:20 -0000	1.72
+++ hplip.spec	16 Jun 2006 11:41:43 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.11
-Release: 1.2
+Version: 1.6.6
+Release: 1.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -10,11 +10,11 @@
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch0: hplip-0.9.11-2.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
+Patch5: hplip-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -61,9 +61,6 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Patchlevel 2.
-%patch0 -p1 -b .0.9.11-2
-
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
@@ -76,6 +73,9 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
+# Work around missing linux/compiler.h.
+%patch5 -p1 -b .compile
+
 autoconf # for patch4
 
 %build
@@ -188,6 +188,9 @@
 fi
 
 %changelog
+* Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-1.1
+- 1.6.6.
+
 * Fri May 26 2006 Tim Waugh <twaugh at redhat.com> 0.9.11-1.2
 - Patchlevel 2.
 - Include doc files (bug #192790).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 May 2006 17:32:58 -0000	1.10
+++ sources	16 Jun 2006 11:41:43 -0000	1.11
@@ -1 +1 @@
-5cf362c972d5b1733af4fb8e2ade92e4  hplip-0.9.11.tar.gz
+292fbcc25b79d273d7280760ce797666  hplip-1.6.6.tar.gz


--- hplip-0.9.11-2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 16 12:52:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 08:52:48 -0400
Subject: rpms/scim-chewing/devel .cvsignore, 1.3, 1.4 scim-chewing.spec, 1.14,
	1.15 sources, 1.3, 1.4
Message-ID: <200606161252.k5GCqmTn014700@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14542

Modified Files:
	.cvsignore scim-chewing.spec sources 
Log Message:
Update to  0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 May 2006 06:13:11 -0000	1.3
+++ .cvsignore	16 Jun 2006 12:52:45 -0000	1.4
@@ -1 +1 @@
-scim-chewing-0.3.0.tar.gz
+scim-chewing-0.3.1.tar.gz


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-chewing.spec	6 Jun 2006 08:56:26 -0000	1.14
+++ scim-chewing.spec	16 Jun 2006 12:52:45 -0000	1.15
@@ -1,8 +1,8 @@
 %define with_libstdc_preview 0
 
 Name:		scim-chewing
-Version:	0.3.0
-Release:	8%{?dist}
+Version:	0.3.1
+Release:	1%{?dist}
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Jun 16 2006 Darshan Santani <dsantani at redhat.com> 
+- Update to 0.3.1
+
 * Tue Jun 06 2006 Darshan Santani <dsantani at redhat.com>
 - Changed the BuildRequires to include gettext
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 May 2006 06:13:11 -0000	1.3
+++ sources	16 Jun 2006 12:52:45 -0000	1.4
@@ -1 +1 @@
-fd0d1faca7ce21d6966a2e4bbf68e542  scim-chewing-0.3.0.tar.gz
+7231e143e408b96f8374be9026ce6184  scim-chewing-0.3.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 16 13:16:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 09:16:41 -0400
Subject: rpms/openobex/devel .cvsignore, 1.5, 1.6 openobex.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200606161316.k5GDGfTR025121@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24421

Modified Files:
	.cvsignore openobex.spec sources 
Log Message:
version 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 13:51:51 -0000	1.5
+++ .cvsignore	16 Jun 2006 13:16:38 -0000	1.6
@@ -1 +1 @@
-openobex-1.2.tar.gz
+openobex-1.3.tar.gz


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openobex.spec	13 Jun 2006 14:00:47 -0000	1.16
+++ openobex.spec	16 Jun 2006 13:16:38 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
-Version: 1.2
-Release: 2
+Version: 1.3
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -42,9 +42,9 @@
 
 %setup -q
 %patch -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
-%patch4 -p1 -b .push
+#%patch4 -p1 -b .push
 sed -i -e 's#includedir=@includedir@#includedir=@includedir@/openobex#g' openobex.pc.in
 
 %build
@@ -86,11 +86,14 @@
 %{_bindir}/ircp
 %{_bindir}/obex_tcp
 %{_bindir}/obex_test
-%{_bindir}/obex_push
-%{_mandir}/man1/obex_push.1*
+#%{_bindir}/obex_push
+#%{_mandir}/man1/obex_push.1*
 
 
 %changelog
+* Fri Jun 16 2006 Harald Hoyer <harald at redhat.com> - 1.3-1
+- version 1.3
+
 * Tue Jun 13 2006 Harald Hoyer <harald at redhat.com> - 1.2-2
 - more build requirements
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2006 13:51:51 -0000	1.5
+++ sources	16 Jun 2006 13:16:38 -0000	1.6
@@ -1 +1 @@
-c92746ae7bd69255c2c41f51e9349c65  openobex-1.2.tar.gz
+feaa5dfe5151c0e70e8f868fa4648a43  openobex-1.3.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 16 13:46:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 09:46:12 -0400
Subject: rpms/scim-chewing/devel scim-chewing.spec,1.15,1.16
Message-ID: <200606161346.k5GDkCVd014997@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9168

Modified Files:
	scim-chewing.spec 
Log Message:
Added intltool to BuildRequires 



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-chewing.spec	16 Jun 2006 12:52:45 -0000	1.15
+++ scim-chewing.spec	16 Jun 2006 13:46:09 -0000	1.16
@@ -10,7 +10,7 @@
 Group:		System Environment/Libraries
 Source:		http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}
-BuildRequires:	scim-devel, libchewing-devel >= 0.3.0, gettext
+BuildRequires:	scim-devel, libchewing-devel >= 0.3.0, gettext,  intltool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -65,6 +65,7 @@
 %changelog
 * Fri Jun 16 2006 Darshan Santani <dsantani at redhat.com> 
 - Update to 0.3.1
+- Changed BuildRequires to include intltool
 
 * Tue Jun 06 2006 Darshan Santani <dsantani at redhat.com>
 - Changed the BuildRequires to include gettext



From fedora-cvs-commits at redhat.com  Fri Jun 16 20:05:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 16:05:35 -0400
Subject: rpms/nfs-utils-lib/FC-5 nfs-utils-lib.spec,1.7,1.8
Message-ID: <200606162005.k5GK5ZKK007056@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6919

Modified Files:
	nfs-utils-lib.spec 
Log Message:
added the libgssapi >= 0.9 requirement 



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/nfs-utils-lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nfs-utils-lib.spec	16 Jun 2006 06:46:56 -0000	1.7
+++ nfs-utils-lib.spec	16 Jun 2006 20:05:01 -0000	1.8
@@ -17,10 +17,10 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext
-BuildRequires: libgssapi-devel
+BuildRequires: libgssapi-devel >= 0.9
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: libgssapi
+PreReq: libgssapi >= 0.9
 
 %description
 Support libaries that are needed by the commands and 



From fedora-cvs-commits at redhat.com  Fri Jun 16 20:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 16:49:39 -0400
Subject: rpms/nfs-utils-lib/FC-5 nfs-utils-lib.spec,1.8,1.9
Message-ID: <200606162049.k5GKndf1032526@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32330

Modified Files:
	nfs-utils-lib.spec 
Log Message:
Changed PreReq: libgssapi >= 0.9 to Requires: libgssapi >= 0.9



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/nfs-utils-lib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nfs-utils-lib.spec	16 Jun 2006 20:05:01 -0000	1.8
+++ nfs-utils-lib.spec	16 Jun 2006 20:49:37 -0000	1.9
@@ -20,7 +20,7 @@
 BuildRequires: libgssapi-devel >= 0.9
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: libgssapi >= 0.9
+Requires: libgssapi >= 0.9
 
 %description
 Support libaries that are needed by the commands and 



From fedora-cvs-commits at redhat.com  Sat Jun 17 00:10:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 20:10:06 -0400
Subject: rpms/kernel/FC-5 linux-2.6.16-usb-bug185409.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2134, 1.2134.2.1
Message-ID: <200606170010.k5H0A6Mb024700@cvs.devel.redhat.com>

Author: zaitcev

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24621

Modified Files:
      Tag: private-zaitcev-bz185409
	kernel-2.6.spec 
Added Files:
      Tag: private-zaitcev-bz185409
	linux-2.6.16-usb-bug185409.patch 
Log Message:
Branch for a bug test.


linux-2.6.16-usb-bug185409.patch:
 usb-serial.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6.16-usb-bug185409.patch ---
--- linux-2.6.16-1.2122_FC5/drivers/usb/serial/usb-serial.c	2006-03-19 21:53:29.000000000 -0800
+++ linux-2.6.16-1.2122_FC5-v/drivers/usb/serial/usb-serial.c	2006-06-16 00:22:43.000000000 -0700
@@ -159,6 +159,8 @@ static void destroy_serial(struct kref *
 			kfree(port->bulk_out_buffer);
 			kfree(port->interrupt_in_buffer);
 			kfree(port->interrupt_out_buffer);
+			flush_scheduled_work();		/* port->work */
+			kfree(port);
 		}
 	}
 
@@ -189,11 +191,15 @@ static int serial_open (struct tty_struc
 
 	portNumber = tty->index - serial->minor;
 	port = serial->port[portNumber];
-	if (!port)
-		return -ENODEV;
+	if (!port) {
+		retval = -ENODEV;
+		goto bailout_kref_put;
+	}
 
-	if (down_interruptible(&port->sem))
-		return -ERESTARTSYS;
+	if (down_interruptible(&port->sem)) {
+		retval = -ERESTARTSYS;
+		goto bailout_kref_put;
+	}
 	 
 	++port->open_count;
 
@@ -209,7 +215,7 @@ static int serial_open (struct tty_struc
 		 * safe because we are called with BKL held */
 		if (!try_module_get(serial->type->driver.owner)) {
 			retval = -ENODEV;
-			goto bailout_kref_put;
+			goto bailout_mutex_unlock;
 		}
 
 		/* only call the device specific open if this 
@@ -224,10 +230,11 @@ static int serial_open (struct tty_struc
 
 bailout_module_put:
 	module_put(serial->type->driver.owner);
-bailout_kref_put:
-	kref_put(&serial->kref, destroy_serial);
+bailout_mutex_unlock:
 	port->open_count = 0;
 	up(&port->sem);
+bailout_kref_put:
+	kref_put(&serial->kref, destroy_serial);
 	return retval;
 }
 
@@ -555,6 +562,7 @@ static void port_release(struct device *
 	kfree(port->bulk_out_buffer);
 	kfree(port->interrupt_in_buffer);
 	kfree(port->interrupt_out_buffer);
+	flush_scheduled_work();		/* port->work */
 	kfree(port);
 }
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2134
retrieving revision 1.2134.2.1
diff -u -r1.2134 -r1.2134.2.1
--- kernel-2.6.spec	15 Jun 2006 20:37:49 -0000	1.2134
+++ kernel-2.6.spec	17 Jun 2006 00:10:03 -0000	1.2134.2.1
@@ -24,7 +24,8 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
+#define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
+%define release 1.2134_FC5.bz185409.1
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -161,7 +162,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64
+ExclusiveArch: noarch i686
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -380,6 +382,7 @@
 Patch1780: linux-2.6-cpufreq-acpi-sticky.patch
 Patch1790: linux-2.6-usb-unusual-devices.patch
 Patch1791: linux-2.6-mptfusion-kdump.patch
+Patch1792: linux-2.6.16-usb-bug185409.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -1022,6 +1025,8 @@
 %patch1790 -p1
 # make kdump work with mptfusion
 %patch1791 -p1
+# test patch for visor crashing on sync
+%patch1792 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1699,6 +1704,10 @@
 %endif
 
 %changelog
+* Fri Jun 16 2006 Pete Zaitcev <zaitcev at redhat.com>
+- Add a test patch for visor crash on sync, 185409.
+- Bump to
+
 * Thu Jun 15 2006 Don Zickus <dzickus at redhat.com>
 - Fix mptfusion to work with kdump kernels
 



From fedora-cvs-commits at redhat.com  Sat Jun 17 00:46:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 20:46:39 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2134.2.1,1.2134.2.2
Message-ID: <200606170046.k5H0kdt9027815@cvs.devel.redhat.com>

Author: zaitcev

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24365

Modified Files:
      Tag: private-zaitcev-bz185409
	kernel-2.6.spec 
Log Message:
Let's try to work around breakage with smp-alternatives.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2134.2.1
retrieving revision 1.2134.2.2
diff -u -r1.2134.2.1 -r1.2134.2.2
--- kernel-2.6.spec	17 Jun 2006 00:10:03 -0000	1.2134.2.1
+++ kernel-2.6.spec	17 Jun 2006 00:46:36 -0000	1.2134.2.2
@@ -8,7 +8,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
@@ -25,7 +25,7 @@
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 #define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
-%define release 1.2134_FC5.bz185409.1
+%define release 1.2134_FC5.bz185409.2
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -235,7 +235,7 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
-Patch209: linux-2.6-x86-smp-alternatives.patch
+#Patch209: linux-2.6-x86-smp-alternatives.patch
 Patch210: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
@@ -1706,7 +1706,7 @@
 %changelog
 * Fri Jun 16 2006 Pete Zaitcev <zaitcev at redhat.com>
 - Add a test patch for visor crash on sync, 185409.
-- Bump to
+- Bump to 2.6.16-1.2134_FC5.bz185409.2
 
 * Thu Jun 15 2006 Don Zickus <dzickus at redhat.com>
 - Fix mptfusion to work with kdump kernels



From fedora-cvs-commits at redhat.com  Sat Jun 17 01:09:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 21:09:08 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2134,1.2135
Message-ID: <200606170109.k5H198qk006371@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6342

Modified Files:
	kernel-2.6.spec 
Log Message:
remove dead patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2134
retrieving revision 1.2135
diff -u -r1.2134 -r1.2135
--- kernel-2.6.spec	15 Jun 2006 20:37:49 -0000	1.2134
+++ kernel-2.6.spec	17 Jun 2006 01:09:03 -0000	1.2135
@@ -233,7 +233,6 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
-Patch209: linux-2.6-x86-smp-alternatives.patch
 Patch210: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
@@ -765,8 +764,6 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
-# SMP alternatives
-#%patch209 -p1
 # x86-64 is noisy when syscalls are unimplemented.
 %patch210 -p1
 



From fedora-cvs-commits at redhat.com  Sat Jun 17 01:49:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 21:49:26 -0400
Subject: rpms/systemtap/FC-4 .cvsignore, 1.19,
	1.20 elfutils-portability.patch, 1.14, 1.15 sources, 1.21,
	1.22 systemtap.spec, 1.22, 1.23
Message-ID: <200606170149.k5H1nQPI014752@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14718

Modified Files:
	.cvsignore elfutils-portability.patch sources systemtap.spec 
Log Message:
New snapshot tarball 0.5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 May 2006 00:13:57 -0000	1.19
+++ .cvsignore	17 Jun 2006 01:49:23 -0000	1.20
@@ -1,2 +1,2 @@
-systemtap-0.5.7.tar.gz
-elfutils-0.120.tar.gz
+systemtap-0.5.8.tar.gz
+elfutils-0.121.tar.gz

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/elfutils-portability.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- elfutils-portability.patch	5 May 2006 22:32:53 -0000	1.14
+++ elfutils-portability.patch	17 Jun 2006 01:49:23 -0000	1.15
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -47,6 +47,11 @@
+@@ -56,6 +56,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +12,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -69,6 +74,9 @@
+@@ -78,6 +83,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -51,7 +51,7 @@
  libebl_%.map: Makefile
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
+@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am
+@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -136,7 +136,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.120'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -317,7 +317,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -105,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -103,6 +103,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -325,7 +325,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -140,6 +141,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -333,7 +333,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -182,9 +184,9 @@ sharedstatedir = @sharedstatedir@
+@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -378,7 +378,7 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -138,6 +138,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -386,7 +386,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -394,7 +394,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
+@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
@@ -431,7 +431,7 @@
  noinst_LIBRARIES = libcpu_i386.a
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -101,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -439,7 +439,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -447,7 +447,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -177,7 +179,7 @@ sbindir = @sbindir@
+@@ -175,7 +177,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -276,6 +276,11 @@
+@@ -290,6 +290,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -491,7 +491,7 @@
  
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -178,6 +178,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -499,7 +499,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -507,7 +507,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
+@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
@@ -522,7 +522,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -268,6 +268,11 @@
+@@ -286,6 +286,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,7 +553,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -561,7 +561,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -569,7 +569,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
+@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +583,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -400,6 +400,11 @@
+@@ -413,6 +413,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -614,7 +614,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -622,7 +622,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -166,6 +167,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -630,7 +630,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -208,9 +210,9 @@ sharedstatedir = @sharedstatedir@
+@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -644,7 +644,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -130,6 +130,11 @@
+@@ -136,6 +136,11 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -700,7 +700,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libelf/Makefile.in
 +++ elfutils/libelf/Makefile.in
-@@ -40,7 +40,7 @@ PRE_UNINSTALL = :
+@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -709,7 +709,7 @@
  @MUDFLAP_FALSE at noinst_PROGRAMS = $(am__EXEEXT_1)
  @MUDFLAP_TRUE at am_libelf_pic_a_OBJECTS =
  subdir = libelf
-@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -717,7 +717,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -725,7 +725,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -258,10 +260,10 @@ sharedstatedir = @sharedstatedir@
+@@ -256,10 +258,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
@@ -776,7 +776,15 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -261,6 +261,11 @@
+@@ -1,3 +1,7 @@
++2006-04-05  Roland McGrath  <roland at redhat.com>
++
++	* strings.c (MAP_POPULATE): Define to 0 if undefined.
++
+ 2006-06-12  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
+@@ -346,6 +350,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -824,7 +832,7 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -192,6 +192,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -832,7 +840,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -227,6 +228,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -840,7 +848,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -271,12 +273,12 @@ target_alias = @target_alias@
+@@ -269,12 +271,12 @@ target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \
  @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror) $(if \
@@ -855,6 +863,19 @@
  @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
  	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
+--- elfutils/src/strings.c
++++ elfutils/src/strings.c
+@@ -51,6 +51,10 @@
+ 
+ #include <system.h>
+ 
++#ifndef MAP_POPULATE
++# define MAP_POPULATE 0
++#endif
++
+ 
+ /* Prototypes of local functions.  */
+ static int read_fd (int fd, const char *fname, off64_t fdlen);
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
 @@ -52,6 +52,12 @@
@@ -941,7 +962,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -289,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -287,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -949,7 +970,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -324,6 +325,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -957,7 +978,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -365,10 +367,10 @@ sbindir = @sbindir@
+@@ -363,10 +365,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	6 May 2006 00:13:57 -0000	1.21
+++ sources	17 Jun 2006 01:49:23 -0000	1.22
@@ -1,2 +1,2 @@
-8a330ed87b3404a21ee771d5c2db6c82  systemtap-0.5.7.tar.gz
-3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz
+39c190623047141a804692e747ed7b20  systemtap-0.5.8.tar.gz
+5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/systemtap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- systemtap.spec	6 May 2006 00:13:57 -0000	1.22
+++ systemtap.spec	17 Jun 2006 01:49:23 -0000	1.23
@@ -1,8 +1,8 @@
-%define bundled_elfutils 1
-%define elfutils_version 0.120
+%define bundled_elfutils 0
+%define elfutils_version 0.121
 
 Name: systemtap
-Version: 0.5.7
+Version: 0.5.8
 Release: 1
 Summary: Instrumentation System
 Group: Development/System
@@ -13,6 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-root
 
 Requires: kernel >= 2.6.9-11
+BuildRequires: glib2-devel >= 2.0.0
+Requires: glib2 >= 2.0.0
 # Requires: kernel-devel
 # or is that kernel-smp-devel?  kernel-hugemem-devel?
 Requires: gcc make
@@ -83,6 +85,7 @@
 %doc README AUTHORS NEWS COPYING
 
 %{_bindir}/stap
+%{_bindir}/lket-b2a
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_libexecdir}/systemtap/*
@@ -100,6 +103,9 @@
 
 
 %changelog
+* Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-1
+- PRs 2627, 2520, 2228, 2645
+
 * Fri May  5 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.7-1
 - PRs 2511 2453 2307 1813 1944 2497 2538 2476 2568 1341 2058 2220 2437
   1326 2014 2599 2427 2438 2465 1930 2149 2610 2293 2634 2506 2433



From fedora-cvs-commits at redhat.com  Sat Jun 17 01:54:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 21:54:38 -0400
Subject: rpms/systemtap/FC-4 sources,1.22,1.23 systemtap.spec,1.23,1.24
Message-ID: <200606170154.k5H1scYM014692@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9556

Modified Files:
	sources systemtap.spec 
Log Message:
Respun new snapshot tarball 0.5.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Jun 2006 01:49:23 -0000	1.22
+++ sources	17 Jun 2006 01:54:35 -0000	1.23
@@ -1,2 +1,2 @@
-39c190623047141a804692e747ed7b20  systemtap-0.5.8.tar.gz
+9f06c069faf89454b65a0faf9b544975  systemtap-0.5.8.tar.gz
 5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/systemtap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- systemtap.spec	17 Jun 2006 01:49:23 -0000	1.23
+++ systemtap.spec	17 Jun 2006 01:54:35 -0000	1.24
@@ -1,4 +1,5 @@
-%define bundled_elfutils 0
+# Yo!  DO NOT THE FOLLOWING LINE.
+%define bundled_elfutils 1
 %define elfutils_version 0.121
 
 Name: systemtap



From fedora-cvs-commits at redhat.com  Sat Jun 17 01:56:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 16 Jun 2006 21:56:45 -0400
Subject: rpms/systemtap/FC-5 elfutils-portability.patch, 1.8, 1.9 sources,
	1.15, 1.16 systemtap.spec, 1.23, 1.24
Message-ID: <200606170156.k5H1uj0c027072@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27058

Modified Files:
	elfutils-portability.patch sources systemtap.spec 
Log Message:
Automatic update to 0.5.8

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-5/elfutils-portability.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- elfutils-portability.patch	5 May 2006 23:10:38 -0000	1.8
+++ elfutils-portability.patch	17 Jun 2006 01:56:43 -0000	1.9
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -47,6 +47,11 @@
+@@ -56,6 +56,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +12,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -69,6 +74,9 @@
+@@ -78,6 +83,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -51,7 +51,7 @@
  libebl_%.map: Makefile
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
+@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am
+@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -136,7 +136,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.120'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -317,7 +317,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -105,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -103,6 +103,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -325,7 +325,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -140,6 +141,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -333,7 +333,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -182,9 +184,9 @@ sharedstatedir = @sharedstatedir@
+@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -378,7 +378,7 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -138,6 +138,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -386,7 +386,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -394,7 +394,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
+@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
@@ -431,7 +431,7 @@
  noinst_LIBRARIES = libcpu_i386.a
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -101,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -439,7 +439,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -447,7 +447,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -177,7 +179,7 @@ sbindir = @sbindir@
+@@ -175,7 +177,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -276,6 +276,11 @@
+@@ -290,6 +290,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -491,7 +491,7 @@
  
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -178,6 +178,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -499,7 +499,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -507,7 +507,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
+@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
@@ -522,7 +522,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -268,6 +268,11 @@
+@@ -286,6 +286,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,7 +553,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -561,7 +561,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -569,7 +569,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
+@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +583,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -400,6 +400,11 @@
+@@ -413,6 +413,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -614,7 +614,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -622,7 +622,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -166,6 +167,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -630,7 +630,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -208,9 +210,9 @@ sharedstatedir = @sharedstatedir@
+@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -644,7 +644,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -130,6 +130,11 @@
+@@ -136,6 +136,11 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -700,7 +700,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libelf/Makefile.in
 +++ elfutils/libelf/Makefile.in
-@@ -40,7 +40,7 @@ PRE_UNINSTALL = :
+@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -709,7 +709,7 @@
  @MUDFLAP_FALSE at noinst_PROGRAMS = $(am__EXEEXT_1)
  @MUDFLAP_TRUE at am_libelf_pic_a_OBJECTS =
  subdir = libelf
-@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -717,7 +717,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -725,7 +725,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -258,10 +260,10 @@ sharedstatedir = @sharedstatedir@
+@@ -256,10 +258,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
@@ -776,7 +776,15 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -261,6 +261,11 @@
+@@ -1,3 +1,7 @@
++2006-04-05  Roland McGrath  <roland at redhat.com>
++
++	* strings.c (MAP_POPULATE): Define to 0 if undefined.
++
+ 2006-06-12  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
+@@ -346,6 +350,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -824,7 +832,7 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -192,6 +192,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -832,7 +840,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -227,6 +228,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -840,7 +848,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -271,12 +273,12 @@ target_alias = @target_alias@
+@@ -269,12 +271,12 @@ target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \
  @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror) $(if \
@@ -855,6 +863,19 @@
  @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
  	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
+--- elfutils/src/strings.c
++++ elfutils/src/strings.c
+@@ -51,6 +51,10 @@
+ 
+ #include <system.h>
+ 
++#ifndef MAP_POPULATE
++# define MAP_POPULATE 0
++#endif
++
+ 
+ /* Prototypes of local functions.  */
+ static int read_fd (int fd, const char *fname, off64_t fdlen);
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
 @@ -52,6 +52,12 @@
@@ -941,7 +962,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -289,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -287,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -949,7 +970,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -324,6 +325,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -957,7 +978,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -365,10 +367,10 @@ sbindir = @sbindir@
+@@ -363,10 +365,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 May 2006 23:10:38 -0000	1.15
+++ sources	17 Jun 2006 01:56:43 -0000	1.16
@@ -1,2 +1,2 @@
-82e8987abc752e4c23f7df076c786ed0  systemtap-0.5.6.tar.gz
-3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz
+9f06c069faf89454b65a0faf9b544975  systemtap-0.5.8.tar.gz
+5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-5/systemtap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- systemtap.spec	5 May 2006 23:10:38 -0000	1.23
+++ systemtap.spec	17 Jun 2006 01:56:43 -0000	1.24
@@ -1,8 +1,9 @@
+# Yo!  DO NOT THE FOLLOWING LINE.
 %define bundled_elfutils 1
-%define elfutils_version 0.120
+%define elfutils_version 0.121
 
 Name: systemtap
-Version: 0.5.6
+Version: 0.5.8
 Release: 0.FC5
 Summary: Instrumentation System
 Group: Development/System
@@ -13,6 +14,8 @@
 BuildRoot: %{_tmppath}/%{name}-root
 
 Requires: kernel >= 2.6.9-11
+BuildRequires: glib2-devel >= 2.0.0
+Requires: glib2 >= 2.0.0
 # Requires: kernel-devel
 # or is that kernel-smp-devel?  kernel-hugemem-devel?
 Requires: gcc make
@@ -83,6 +86,7 @@
 %doc README AUTHORS NEWS COPYING
 
 %{_bindir}/stap
+%{_bindir}/lket-b2a
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_libexecdir}/systemtap/*
@@ -100,10 +104,13 @@
 
 
 %changelog
-* Fri May  5 2006 Frank Eigler <fche at redhat.com> - 0.5.6-0.FC5
+* Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-0.FC5
 - Rebuilt for FC-5
 
-* Fri May  5 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.6-1
+* Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-1
+- PRs 2627, 2520, 2228, 2645
+
+* Fri May  5 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.7-1
 - PRs 2511 2453 2307 1813 1944 2497 2538 2476 2568 1341 2058 2220 2437
   1326 2014 2599 2427 2438 2465 1930 2149 2610 2293 2634 2506 2433
 



From fedora-cvs-commits at redhat.com  Sat Jun 17 08:02:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 04:02:01 -0400
Subject: rpms/gdm/FC-5 .cvsignore, 1.25, 1.26 gdm.spec, 1.151, 1.152 sources,
	1.29, 1.30
Message-ID: <200606170802.k5H820VX032200@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32145

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
- Update to 2.14.9
- Fixes autologin problem (bug 195014).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	8 Jun 2006 21:12:30 -0000	1.25
+++ .cvsignore	17 Jun 2006 08:01:50 -0000	1.26
@@ -1 +1 @@
-gdm-2.14.8.tar.bz2
+gdm-2.14.9.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- gdm.spec	8 Jun 2006 21:12:30 -0000	1.151
+++ gdm.spec	17 Jun 2006 08:01:50 -0000	1.152
@@ -14,7 +14,7 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.8
+Version: 2.14.9
 Release: 1
 Epoch: 1
 License: LGPL/GPL
@@ -24,7 +24,6 @@
 Source1: gdm-allow-login.init
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
-Source4: gdmthemetester.in
 
 Patch1: gdm-2.14.1-change-defaults.patch
 Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
@@ -123,15 +122,6 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=338079
-if [ -f gui/greeter/gdmthemetester.in ]
-then
-  echo "gdmthemetester.in is back. Get rid of Source4" 1>&2
-  exit
-fi
-
-cp -f %{SOURCE4} gui/greeter
-
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
 
@@ -325,6 +315,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.9-1
+- Update to 2.14.9
+- Fixes autologin problem (bug 195014).
+
 * Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.8-1
 - Update to 2.14.8
 - Fixes CVE-2006-2452 (bug 343476).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Jun 2006 21:12:30 -0000	1.29
+++ sources	17 Jun 2006 08:01:51 -0000	1.30
@@ -1 +1 @@
-03ecfced7b4331542b35746f3b4b92a4  gdm-2.14.8.tar.bz2
+7e46bc3b0a5b08e79f1f2f1b869caf40  gdm-2.14.9.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:05:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:05:48 -0400
Subject: rpms/glib-java/FC-5 .cvsignore, 1.8, 1.9 glib-java.spec, 1.27,
	1.28 sources, 1.8, 1.9
Message-ID: <200606171605.k5HG5m6B010637@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10612

Modified Files:
	.cvsignore glib-java.spec sources 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Mar 2006 21:13:05 -0000	1.8
+++ .cvsignore	17 Jun 2006 16:05:39 -0000	1.9
@@ -1,3 +1 @@
-glib-java-0.2.2.tar.gz
-glib-java-0.2.3.tar.gz
-glib-java-0.2.3.0.20060301.rh1.tar.gz
+glib-java-0.2.5.tar.gz


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- glib-java.spec	1 Mar 2006 21:13:05 -0000	1.27
+++ glib-java.spec	17 Jun 2006 16:05:40 -0000	1.28
@@ -14,8 +14,8 @@
 %define name_base glib-java
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
-Version:   0.2.3.0.20060301.rh1
-Release:   1
+Version:   0.2.5
+Release:   0.FC5
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL
@@ -27,7 +27,7 @@
 Requires: 	/sbin/ldconfig
 Requires: 	%{c_pkg_prefix}glib2 >= 2.7.0
 BuildRequires:  java-devel >= 1.4.2 %{c_pkg_prefix}glib2-devel >= 2.7.0
-BuildRequires:  gcc-java >= 3.3.3, docbook-utils
+BuildRequires:  gcc-java >= 4.1.1, docbook-utils
 BuildRequires: 	pkgconfig
 
 %description 
@@ -71,7 +71,8 @@
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/^lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 
@@ -117,6 +118,22 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.5-0
+- New version.
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 0.2.4-4
+- Change mod time of all java source files for the src zip.
+
+* Thu May 18 2006 Ben Konrath <bkonrath at redhat.com> - 0.2.4-3
+- Ensure Config.java has the same mod time accross rebuilds (needed for 
+  multilib). 
+
+* Wed May 10 2006 Ben Konrath <bkonrath at redhat.com> - 0.2.4-2
+- Add -X option when zipping up the sources. This is needed for multilib.
+
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.4-1
+- New version.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 0.2.3.0.20060301.rh1-1
 - Imported new tarball to address bg #183538.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Mar 2006 21:13:05 -0000	1.8
+++ sources	17 Jun 2006 16:05:40 -0000	1.9
@@ -1 +1 @@
-6b81b808b4fb5e4fca9831277e607697  glib-java-0.2.3.0.20060301.rh1.tar.gz
+485ce03efb290bf05666dc42c694a637  glib-java-0.2.5.tar.gz



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:13:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:13:24 -0400
Subject: rpms/cairo-java/FC-5 .cvsignore, 1.6, 1.7 cairo-java.spec, 1.25,
	1.26 sources, 1.8, 1.9
Message-ID: <200606171613.k5HGDOEA012732@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12706

Modified Files:
	.cvsignore cairo-java.spec sources 
Log Message:
Update.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Mar 2006 21:19:34 -0000	1.6
+++ .cvsignore	17 Jun 2006 16:13:21 -0000	1.7
@@ -1,2 +1 @@
-cairo-java-1.0.2.tar.gz
-cairo-java-1.0.2.0.20060301.rh1.tar.gz
+cairo-java-1.0.4.tar.gz


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/cairo-java.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cairo-java.spec	1 Mar 2006 21:24:39 -0000	1.25
+++ cairo-java.spec	17 Jun 2006 16:13:21 -0000	1.26
@@ -11,8 +11,8 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	cairo-java
-%define	version		1.0.2.0.20060301.rh1
-%define release 	0
+%define	version		1.0.4
+%define release 	0.FC5
 # exclude while s390x is borked on beehive
 #ExcludeArch: s390x
 
@@ -27,12 +27,13 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	%{java_pkg_prefix}gtk2 >= 2.8.0
-Requires: 	%{java_pkg_prefix}cairo >= 1.0.0 
-Requires: 	%{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1
-BuildRequires:	%{java_pkg_prefix}glib-java >= 0.2
+Requires: 	%{java_pkg_prefix}cairo >= 1.0.0
+Requires: 	%{java_pkg_prefix}glib-java >= 0.2.4
+BuildRequires:	%{java_pkg_prefix}glib-java >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0, gcc-java >= 3.3.3
 BuildRequires:	docbook-utils
 BuildRequires:	java-1.4.2-gcj-compat >= 1.4.2
+BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2
 
 %description
 Cairo-java is a language binding that allows developers to write Cairo
@@ -66,7 +67,8 @@
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/^lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 
@@ -113,6 +115,20 @@
 
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
+- New version.
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 1.0.3-2
+- Change mod time of all java source files for the src zip. 
+- Add BuildRequires java-gcj-compat-devel.
+
+* Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 1.0.3-1
+- Add -X to src zip and ensure Config.java has the same mod time across 
+  platforms - needed for multilib. 
+
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 1.0.3-0
+- New version.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 1.0.2.0.20060301.rh1-0
 - Increased version of required glib-java to 0.2.3.0.20060301.rh1.
 - Imported new tarball to address bg #183538.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Mar 2006 21:19:34 -0000	1.8
+++ sources	17 Jun 2006 16:13:21 -0000	1.9
@@ -1 +1 @@
-0840da879f8a6fa4437023fec1d95635  cairo-java-1.0.2.0.20060301.rh1.tar.gz
+d9ef069c63ecfa44b44dc69c05e29658  cairo-java-1.0.4.tar.gz



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:17:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:17:26 -0400
Subject: rpms/cairo-java/FC-5 cairo-java.spec,1.26,1.27
Message-ID: <200606171617.k5HGHQ9l028850@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28821

Modified Files:
	cairo-java.spec 
Log Message:
.


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/cairo-java.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cairo-java.spec	17 Jun 2006 16:13:21 -0000	1.26
+++ cairo-java.spec	17 Jun 2006 16:17:23 -0000	1.27
@@ -11,15 +11,11 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	cairo-java
-%define	version		1.0.4
-%define release 	0.FC5
-# exclude while s390x is borked on beehive
-#ExcludeArch: s390x
 
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	1.0.4
+Release: 	0.FC5
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:19:58 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.30,1.31
Message-ID: <200606171619.k5HGJw1d029868@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29841

Modified Files:
	cairo-java.spec 
Log Message:
Simplify spec file.


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cairo-java.spec	14 Jun 2006 21:03:00 -0000	1.30
+++ cairo-java.spec	17 Jun 2006 16:19:55 -0000	1.31
@@ -11,15 +11,11 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	cairo-java
-%define	version		1.0.4
-%define release 	0
-# exclude while s390x is borked on beehive
-#ExcludeArch: s390x
 
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	1.0.4
+Release: 	0
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:20:56 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.33,1.34
Message-ID: <200606171620.k5HGKuxZ007526@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6548

Modified Files:
	glib-java.spec 
Log Message:
.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- glib-java.spec	14 Jun 2006 14:21:17 -0000	1.33
+++ glib-java.spec	17 Jun 2006 16:20:50 -0000	1.34
@@ -21,8 +21,6 @@
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/glib-java
-# try to make build
-#ExcludeArch: s390x
 
 Requires: 	/sbin/ldconfig
 Requires: 	%{c_pkg_prefix}glib2 >= 2.7.0



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:46:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:46:51 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.34,1.35
Message-ID: <200606171646.k5HGkpLC032269@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32111

Modified Files:
	glib-java.spec 
Log Message:
.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- glib-java.spec	17 Jun 2006 16:20:50 -0000	1.34
+++ glib-java.spec	17 Jun 2006 16:46:48 -0000	1.35
@@ -17,7 +17,8 @@
 Version:   0.2.5
 Release:   0
 URL:       http://java-gnome.sourceforge.net
-Source0:   %{name_base}-%{version}.tar.gz
+# FIXME: should be .bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.gz
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/glib-java



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:54:14 -0400
Subject: rpms/cairo-java/devel .cvsignore, 1.8, 1.9 cairo-java.spec, 1.31,
	1.32 sources, 1.10, 1.11
Message-ID: <200606171654.k5HGsEhs006365@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6336

Modified Files:
	.cvsignore cairo-java.spec sources 
Log Message:
- Use *.tar.bz2, not *.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jun 2006 21:03:00 -0000	1.8
+++ .cvsignore	17 Jun 2006 16:54:12 -0000	1.9
@@ -1 +1 @@
-cairo-java-1.0.4.tar.gz
+cairo-java-1.0.4.tar.bz2


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cairo-java.spec	17 Jun 2006 16:19:55 -0000	1.31
+++ cairo-java.spec	17 Jun 2006 16:54:12 -0000	1.32
@@ -19,7 +19,7 @@
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/1.0/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	%{java_pkg_prefix}gtk2 >= 2.8.0
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
+- Use *.tar.bz2, not *.gz.
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	14 Jun 2006 21:03:00 -0000	1.10
+++ sources	17 Jun 2006 16:54:12 -0000	1.11
@@ -1 +1 @@
-d9ef069c63ecfa44b44dc69c05e29658  cairo-java-1.0.4.tar.gz
+a10528654e52b5f22d7e80d74029be98  cairo-java-1.0.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:55:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:55:01 -0400
Subject: rpms/cairo-java/FC-5 .cvsignore, 1.7, 1.8 cairo-java.spec, 1.27,
	1.28 sources, 1.9, 1.10
Message-ID: <200606171655.k5HGt1ni006681@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6659

Modified Files:
	.cvsignore cairo-java.spec sources 
Log Message:
- Use *.tar.bz2, not *.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jun 2006 16:13:21 -0000	1.7
+++ .cvsignore	17 Jun 2006 16:54:58 -0000	1.8
@@ -1 +1 @@
-cairo-java-1.0.4.tar.gz
+cairo-java-1.0.4.tar.bz2


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/cairo-java.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cairo-java.spec	17 Jun 2006 16:17:23 -0000	1.27
+++ cairo-java.spec	17 Jun 2006 16:54:58 -0000	1.28
@@ -19,7 +19,7 @@
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/1.0/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	%{java_pkg_prefix}gtk2 >= 2.8.0
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
+- Use *.tar.bz2, not *.gz.
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Jun 2006 16:13:21 -0000	1.9
+++ sources	17 Jun 2006 16:54:58 -0000	1.10
@@ -1 +1 @@
-d9ef069c63ecfa44b44dc69c05e29658  cairo-java-1.0.4.tar.gz
+a10528654e52b5f22d7e80d74029be98  cairo-java-1.0.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 16:58:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 12:58:57 -0400
Subject: rpms/glib-java/devel .cvsignore, 1.10, 1.11 glib-java.spec, 1.35,
	1.36 sources, 1.10, 1.11
Message-ID: <200606171658.k5HGwvZR008236@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8211

Modified Files:
	.cvsignore glib-java.spec sources 
Log Message:
- Use .tar.bz2, not .tar.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Jun 2006 14:21:17 -0000	1.10
+++ .cvsignore	17 Jun 2006 16:58:54 -0000	1.11
@@ -1 +1 @@
-glib-java-0.2.5.tar.gz
+glib-java-0.2.5.tar.bz2


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- glib-java.spec	17 Jun 2006 16:46:48 -0000	1.35
+++ glib-java.spec	17 Jun 2006 16:58:54 -0000	1.36
@@ -17,8 +17,7 @@
 Version:   0.2.5
 Release:   0
 URL:       http://java-gnome.sourceforge.net
-# FIXME: should be .bz2
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.gz
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/glib-java
@@ -117,6 +116,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-0
+- Use .tar.bz2, not .tar.gz.
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.5-0
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	14 Jun 2006 14:21:17 -0000	1.10
+++ sources	17 Jun 2006 16:58:54 -0000	1.11
@@ -1 +1 @@
-485ce03efb290bf05666dc42c694a637  glib-java-0.2.5.tar.gz
+83d49e96f6bc806aead66b83be542ef0  glib-java-0.2.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 17:05:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 13:05:17 -0400
Subject: rpms/libgtk-java/devel .cvsignore, 1.19, 1.20 libgtk-java.spec, 1.56,
	1.57 sources, 1.19, 1.20
Message-ID: <200606171705.k5HH5G66009060@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9011

Modified Files:
	.cvsignore libgtk-java.spec sources 
Log Message:
- Use .tar.bz2, not .tar.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	14 Jun 2006 21:55:45 -0000	1.19
+++ .cvsignore	17 Jun 2006 17:04:49 -0000	1.20
@@ -1 +1 @@
-libgtk-java-2.8.5.tar.gz
+libgtk-java-2.8.5.tar.bz2


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libgtk-java.spec	14 Jun 2006 21:55:45 -0000	1.56
+++ libgtk-java.spec	17 Jun 2006 17:05:02 -0000	1.57
@@ -10,20 +10,16 @@
 %{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
-
 %define	name_base 	libgtk-java
-%define	version		2.8.5
-%define release 	0
-
 
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	2.8.5
+Release: 	0
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.8/%{name_base}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
@@ -125,6 +121,9 @@
 
 
 %changelog
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
+- Use .tar.bz2, not .tar.gz.
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
 - New version.
 - Remove BuildRequires:	autoconf automake libtool


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Jun 2006 21:55:45 -0000	1.19
+++ sources	17 Jun 2006 17:05:02 -0000	1.20
@@ -1 +1 @@
-f8a6b4ecf25102f3268d328e1f6ddfa3  libgtk-java-2.8.5.tar.gz
+5d363e03e22000b89a8facb9d6042da3  libgtk-java-2.8.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 18:11:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 14:11:44 -0400
Subject: rpms/glib-java/FC-5 glib-java.spec,1.28,1.29
Message-ID: <200606171811.k5HIBiFk024338@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24314

Modified Files:
	glib-java.spec 
Log Message:
Oh brew!


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- glib-java.spec	17 Jun 2006 16:05:40 -0000	1.28
+++ glib-java.spec	17 Jun 2006 18:11:42 -0000	1.29
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0.FC5
+Release:   0.FC5-build
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL



From fedora-cvs-commits at redhat.com  Sat Jun 17 18:12:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 14:12:18 -0400
Subject: rpms/glib-java/FC-5 glib-java.spec,1.29,1.30
Message-ID: <200606171812.k5HICIOq024589@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24564

Modified Files:
	glib-java.spec 
Log Message:
Oh me!


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- glib-java.spec	17 Jun 2006 18:11:42 -0000	1.29
+++ glib-java.spec	17 Jun 2006 18:12:16 -0000	1.30
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0.FC5-build
+Release:   0.FC5.build
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL



From fedora-cvs-commits at redhat.com  Sat Jun 17 18:59:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 14:59:29 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.193,
	1.194 config-x86-generic, 1.52, 1.53
Message-ID: <200606171859.k5HIxTXD012528@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv12491/configs

Modified Files:
	config-generic config-x86-generic 
Log Message:
Add mtd and geode git trees for OLPC


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- config-generic	15 Jun 2006 17:37:09 -0000	1.193
+++ config-generic	17 Jun 2006 18:59:27 -0000	1.194
@@ -203,6 +203,8 @@
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_ONENAND is not set
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND_CS553X=m
 
 CONFIG_MTD_REDBOOT_PARTS=m
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -217,6 +219,7 @@
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
 
 #
 # Parallel port support


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- config-x86-generic	11 May 2006 00:59:59 -0000	1.52
+++ config-x86-generic	17 Jun 2006 18:59:27 -0000	1.53
@@ -193,6 +193,7 @@
 CONFIG_NVRAM=y
 CONFIG_IBM_ASM=m
 CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 



From fedora-cvs-commits at redhat.com  Sat Jun 17 18:59:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 14:59:29 -0400
Subject: rpms/kernel/devel linux-2.6-geode-git.patch, NONE,
	1.1 linux-2.6-mtd-git.patch, NONE, 1.1 kernel-2.6.spec, 1.2290,
	1.2291
Message-ID: <200606171859.k5HIxTx3012513@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12491

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-geode-git.patch linux-2.6-mtd-git.patch 
Log Message:
Add mtd and geode git trees for OLPC

linux-2.6-geode-git.patch:
 arch/i386/Kconfig                       |    9 
 arch/i386/boot/setup.S                  |    5 
 drivers/crypto/Kconfig                  |    9 
 drivers/crypto/Makefile                 |    1 
 drivers/crypto/geode-aes.c              |  395 ++++++++++++++++++++++++++++++++
 drivers/crypto/geode-aes.h              |   42 +++
 drivers/i2c/busses/scx200_acb.c         |  203 ++++++++++++----
 drivers/video/Kconfig                   |    6 
 drivers/video/console/Kconfig           |    4 
 drivers/video/geode/Kconfig             |   20 +
 drivers/video/geode/display_gx.c        |   22 +
 drivers/video/geode/display_gx.h        |    3 
 drivers/video/geode/gxfb_core.c         |    8 
 drivers/video/geode/video_gx.c          |   24 +
 drivers/video/geode/video_gx.h          |    7 
 include/linux/pci_ids.h                 |    5 
 sound/pci/Kconfig                       |    9 
 sound/pci/ac97/ac97_codec.c             |    9 
 sound/pci/cs5535audio/Makefile          |    4 
 sound/pci/cs5535audio/cs5535audio.c     |   31 ++
 sound/pci/cs5535audio/cs5535audio.h     |    8 
 sound/pci/cs5535audio/cs5535audio_pcm.c |   24 +
 sound/pci/cs5535audio/cs5535audio_pm.c  |  123 +++++++++
 23 files changed, 893 insertions(+), 78 deletions(-)

--- NEW FILE linux-2.6-geode-git.patch ---
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8dfa305..b6abc74 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -708,6 +708,15 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
+config VGA_NOPROBE
+       bool "Don't probe VGA at boot" if EMBEDDED
+       default n
+       help
+         Saying Y here will cause the kernel to not probe VGA at boot time.
+         This will break everything that depends on the probed screen
+         data.  Say N here unless you are absolutely sure this is what you
+         want.
+
 source kernel/Kconfig.hz
 
 config KEXEC
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
index ca668d9..9c06c84 100644
--- a/arch/i386/boot/setup.S
+++ b/arch/i386/boot/setup.S
@@ -395,10 +395,13 @@ # Set the keyboard repeat rate to the ma
 	xorw	%bx, %bx
 	int	$0x16
 
+#ifndef CONFIG_VGA_NOPROBE
+
 # Check for video adapter and its parameters and allow the
 # user to browse video modes.
 	call	video				# NOTE: we need %ds pointing
 						# to bootsector
+#endif
 
 # Get hd0 data...
 	xorw	%ax, %ax
@@ -1007,9 +1010,11 @@ gdt_48:
 	.word	gdt_end - gdt - 1		# gdt limit
 	.word	0, 0				# gdt base (filled in later)
 
+#ifndef CONFIG_VGA_NOPROBE
 # Include video setup & detection code
 
 #include "video.S"
+#endif
 
 # Setup signature -- must be last
 setup_sig1:	.word	SIG1
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 4263935..efc5c72 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -20,4 +20,13 @@ config CRYPTO_DEV_PADLOCK_AES
 	help
 	  Use VIA PadLock for AES algorithm.
 
+config CRYPTO_DEV_GEODE
+	tristate "Support for the Geode LX AES engine"
+	depends on CRYPTO && X86_32
+	help
+	  Say 'Y' here to use the AMD Geode LX processor on-board AES
+	  engine for the CryptoAPI AES alogrithm.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called geode-aes.
 endmenu
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 45426ca..9093ed0 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,5 +1,6 @@
 
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
+obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
 
 padlock-objs-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
new file mode 100644
index 0000000..90ccec4
--- /dev/null
+++ b/drivers/crypto/geode-aes.c
@@ -0,0 +1,395 @@
+/* CryptoAPI interface for the Geode LX hardware AES encryption module
+ * Copyright (C) 2004-2006, Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/crypto.h>
+
+#include <asm/io.h>
+#include <asm/delay.h>
+
+#include "geode-aes.h"
+
+/* Register definitions */
+
+#define AES_CTRLA_REG  0x0000
+
+#define AES_CTRL_START     0x01
+#define AES_CTRL_DECRYPT   0x00
+#define AES_CTRL_ENCRYPT   0x02
+#define AES_CTRL_WRKEY     0x04
+#define AES_CTRL_DCA       0x08
+#define AES_CTRL_SCA       0x10
+#define AES_CTRL_CBC       0x20
+
+#define AES_INTR_REG  0x0008
+
+#define AES_INTRA_PENDING (1 << 16)
+#define AES_INTRB_PENDING (1 << 17)
+
+#define AES_INTR_PENDING  (AES_INTRA_PENDING | AES_INTRB_PENDING)
+#define AES_INTR_MASK     0x07
+
+#define AES_SOURCEA_REG   0x0010
+#define AES_DSTA_REG      0x0014
+#define AES_LENA_REG      0x0018
+#define AES_WRITEKEY0_REG 0x0030
+#define AES_WRITEIV0_REG  0x0040
+
+/* Useful macros */
+
+#define SET_KEY(key) _writefield(AES_WRITEKEY0_REG, key)
+#define SET_IV(iv)   _writefield(AES_WRITEIV0_REG, iv)
+#define GET_IV(iv)   _readfield(AES_WRITEIV0_REG, iv)
+
+/* Static structures */
+
+static void __iomem * _iobase;
+static DEFINE_MUTEX(emutex);
+
+static inline void AWRITE(unsigned long val, unsigned short reg) {
+#ifdef DEBUG
+	printk("[AES] W [%x]=%x\n", reg, val);
+#endif
+	iowrite32(val, _iobase + reg);
+}
+
+static inline unsigned int AREAD(unsigned short reg) {
+	unsigned int val = ioread32(_iobase + reg);
+#ifdef DEBUG
+	printk("[AES] R [%x]=%x\n", reg, val);
+#endif
+	return val;
+}
+
+/* Write a 128 bit field (either a writable key or IV) */
+static inline void
+_writefield(u32 offset, void *value)
+{
+	int i;
+	for(i = 0; i < 4; i++)
+		AWRITE(((u32 *) value)[i], offset + (i * 4));
+}
+
+/* Read a 128 bit field (either a writable key or IV) */
+static inline void
+_readfield(u32 offset, void *value)
+{
+	int i;
+	for(i = 0; i < 4; i++)
+		((u32 *) value)[i] = AREAD(offset + (i * 4));
+}
+
+static void
+_crypt(void *src, void *dst, int len, u32 flags)
+{
+	u32 status;
+
+	AWRITE(__pa(src), AES_SOURCEA_REG);
+	AWRITE(__pa(dst), AES_DSTA_REG);
+	AWRITE(len,  AES_LENA_REG);
+
+	/* Start the operation */
+	AWRITE(AES_CTRL_START | flags, AES_CTRLA_REG);
+
+	/* According to the silicon developers, the status will only
+	 * fail to clear on an catastrophic failure, so an infinite
+	 * loop is valid here
+	 */
+
+	do
+		status = AREAD(AES_INTR_REG);
+	while(!(status & AES_INTRA_PENDING));
+
+	/* Clear the event */
+	AWRITE((status & 0xFF) | AES_INTRA_PENDING, AES_INTR_REG);
+}
+
+unsigned int
+geode_aes_crypt(struct geode_aes_op *op)
+{
+	u32 flags = 0;
+
+	if (op->len == 0 || op->src == op->dst)
+		return 0;
+
+	if (mutex_lock_interruptible(&emutex))
+		return 0;
+
+	if (op->mode == AES_MODE_CBC) {
+		flags |= AES_CTRL_CBC;
+		SET_IV(op->iv);
+	}
+
+	if (op->flags & AES_FLAGS_USRKEY) {
+		flags |= AES_CTRL_WRKEY;
+		SET_KEY(op->key);
+	}
+
+	if (op->flags & AES_FLAGS_COHERENT)
+		flags |= (AES_CTRL_DCA | AES_CTRL_SCA);
+
+	if (op->dir == AES_DIR_ENCRYPT)
+		flags |= AES_CTRL_ENCRYPT;
+
+	_crypt(op->src, op->dst, op->len, flags);
+
+	if (op->mode == AES_MODE_CBC)
+		GET_IV(op->iv);
+
+	mutex_unlock(&emutex);
+	return op->len;
+}
+
+/* CRYPTO-API Functions */
+
+static int
+geode_aes_setkey(void *data, const u8 *key, unsigned int len, u32 *flags)
+{
+
+	struct geode_aes_op *op = (struct geode_aes_op *) data;
+
+	if (len != AES_KEY_LENGTH) {
+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+		return -EINVAL;
+	}
+
+	memcpy(op->key, key, len);
+	return 0;
+}
+
+static void
+geode_aes_encrypt(void *ctx, u8 *out, const u8 *in)
+{
+	struct geode_aes_op *op = (struct geode_aes_op *) ctx;
+
+	if ((out == NULL) || (in == NULL))
+		return;
+
+	op->src = (void *) in;
+	op->dst = (void *) out;
+	op->mode = AES_MODE_CBC;
+	op->flags = 0;
+	op->len = AES_MIN_BLOCK_SIZE;
+	op->dir = AES_DIR_ENCRYPT;
+
+	geode_aes_crypt(op);
+}
+
+
+static void
+geode_aes_decrypt(void *ctx, u8 *out, const u8 *in)
+{
+	struct geode_aes_op *op = (struct geode_aes_op *) ctx;
+
+	if ((out == NULL) || (in == NULL))
+		return;
+
+	op->src = (void *) in;
+	op->dst = (void *) out;
+	op->mode = AES_MODE_CBC;
+	op->flags = 0;
+	op->len = AES_MIN_BLOCK_SIZE;
+	op->dir = AES_DIR_DECRYPT;
+
+	geode_aes_crypt(op);
+}
+
+static unsigned int
+geode_aes_encrypt_ecb(const struct cipher_desc *desc, u8 *out,
+		      const u8 *in, unsigned int nbytes)
+{
+	struct geode_aes_op *op = crypto_tfm_ctx(desc->tfm);
+
+	op->src = (void *) in;
+	op->dst = (void *) out;
+	op->mode = AES_MODE_ECB;
+	op->flags = 0;
+	op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+	op->dir = AES_DIR_ENCRYPT;
+
+	return geode_aes_crypt(op);
+}
+
+static unsigned int
+geode_aes_decrypt_ecb(const struct cipher_desc *desc, u8 *out,
+		      const u8 *in, unsigned int nbytes)
+{
+	struct geode_aes_op *op = crypto_tfm_ctx(desc->tfm);
+
+	op->src = (void *) in;
+	op->dst = (void *) out;
+	op->mode = AES_MODE_ECB;
+	op->flags = 0;
+	op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+	op->dir = AES_DIR_DECRYPT;
+
+	return geode_aes_crypt(op);
+}
+
+static unsigned int
+geode_aes_encrypt_cbc(const struct cipher_desc *desc, u8 *out,
+		      const u8 *in, unsigned int nbytes)
+{
+	struct geode_aes_op *op = crypto_tfm_ctx(desc->tfm);
+	unsigned int ret;
+
+	op->src = (void *) in;
+	op->dst = (void *) out;
+	op->mode = AES_MODE_CBC;
+	op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+	op->dir = AES_DIR_ENCRYPT;
+
+	memcpy(op->iv, desc->info, AES_IV_LENGTH);
+
+	ret = geode_aes_crypt(op);
+
+	memcpy(desc->info, op->iv, AES_IV_LENGTH);
+	return ret;
+}
+
+static unsigned int
+geode_aes_decrypt_cbc(const struct cipher_desc *desc, u8 *out,
+		      const u8 *in, unsigned int nbytes)
+{
+	struct geode_aes_op *op = crypto_tfm_ctx(desc->tfm);
+	unsigned int ret;
+
+	op->src = (void *) in;
+	op->dst = (void *) out;
+	op->mode = AES_MODE_CBC;
+	op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+	op->dir = AES_DIR_DECRYPT;
+
+	memcpy(op->iv, desc->info, AES_IV_LENGTH);
+
+	ret = geode_aes_crypt(op);
+
+	memcpy(desc->info, op->iv, AES_IV_LENGTH);
+	return ret;
+}
+
+static struct crypto_alg geode_aes_crypto = {
+	.cra_name               =       "aes",
+	.cra_driver_name	=       "geode-aes",
+	.cra_priority           =       110,
+	.cra_alignmask          =       15,
+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
+	.cra_blocksize		=	AES_MIN_BLOCK_SIZE,
+	.cra_ctxsize		=	sizeof(struct geode_aes_op),
+	.cra_module		=	THIS_MODULE,
+	.cra_list		=	LIST_HEAD_INIT(geode_aes_crypto.cra_list),
+	.cra_u			=	{
+		.cipher = {
+			.cia_min_keysize	=  AES_KEY_LENGTH,
+			.cia_max_keysize	=  AES_KEY_LENGTH,
+			.cia_setkey		=  geode_aes_setkey,
+			.cia_encrypt		=  geode_aes_encrypt,
+			.cia_decrypt		=  geode_aes_decrypt,
+			.cia_encrypt_ecb	=  geode_aes_encrypt_ecb,
+			.cia_decrypt_ecb	=  geode_aes_decrypt_ecb,
+			.cia_encrypt_cbc	=  geode_aes_encrypt_cbc,
+			.cia_decrypt_cbc	=  geode_aes_decrypt_cbc,
+		}
+	}
+};
+
+static void
+geode_aes_remove(struct pci_dev *dev)
+{
+	crypto_unregister_alg(&geode_aes_crypto);
+
+	pci_iounmap(dev, _iobase);
+	_iobase = NULL;
+
+	pci_release_regions(dev);
+	pci_disable_device(dev);
+
+	mutex_destroy(&emutex);
+}
+
+
+static int
+geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+	int ret;
+
+	if ((ret = pci_enable_device(dev)))
+		return ret;
+
+	if ((ret = pci_request_regions(dev, "geode-aes")))
+		goto eenable;
+
+	_iobase = pci_iomap(dev, 0, 0);
+
+	if (_iobase == NULL) {
+		ret = -ENOMEM;
+		goto erequest;
+	}
+
+	/* Clear any pending activity */
+	AWRITE(AES_INTR_PENDING | AES_INTR_MASK, AES_INTR_REG);
+
+	mutex_init(&emutex);
+
+	ret = crypto_register_alg(&geode_aes_crypto);
+
+	if (ret == 0) {
+	  printk(KERN_NOTICE "geode-aes: GEODE AES engine enabled.\n");
+	  return 0;
+	}
+
+	crypto_unregister_alg(&geode_aes_crypto);
+
+	pci_iounmap(dev, _iobase);
+
+ erequest:
+	pci_release_regions(dev);
+
+ eenable:
+	pci_disable_device(dev);
+
+	return ret;
+}
+
+struct pci_device_id geode_aes_tbl[] = {
+	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES, PCI_ANY_ID, PCI_ANY_ID} ,
+	{ 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, geode_aes_tbl);
+
+static struct pci_driver geode_aes_driver = {
+	name:      "Geode LX AES",
+	id_table:  geode_aes_tbl,
+	probe:     geode_aes_probe,
+	remove:    __devexit_p(geode_aes_remove)
+};
+
+static int __devinit
+geode_aes_init(void)
+{
+	return pci_module_init(&geode_aes_driver);
+}
+
+static void __devexit
+geode_aes_exit(void)
+{
+	pci_unregister_driver(&geode_aes_driver);
+}
+
+MODULE_AUTHOR("Advanced Micro Devices, Inc.");
+MODULE_DESCRIPTION("Geode LX Hardware AES driver");
+MODULE_LICENSE("GPL");
+
+module_init(geode_aes_init);
+module_exit(geode_aes_exit);
diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
new file mode 100644
index 0000000..97f9eee
--- /dev/null
+++ b/drivers/crypto/geode-aes.h
@@ -0,0 +1,42 @@
+/* Copyright (C) 2003-2006, Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _GEODE_AES_H_
+#define _GEODE_AES_H_
+
+#define AES_KEY_LENGTH 16
+#define AES_IV_LENGTH  16
+
+#define AES_MIN_BLOCK_SIZE 16
+
+#define AES_MODE_ECB 0
+#define AES_MODE_CBC 1
+
+#define AES_DIR_DECRYPT 0
+#define AES_DIR_ENCRYPT 1
+
+#define AES_FLAGS_USRKEY   (1 << 0)
+#define AES_FLAGS_COHERENT (1 << 1)
+
+struct geode_aes_op {
+
+  void *src;
+  void *dst;
+
+  u32 mode;
+  u32 dir;
+  u32 flags;
+  int len;
+
+  u8 key[AES_KEY_LENGTH];
+  u8 iv[AES_IV_LENGTH];
+};
+
+unsigned int geode_aes_crypt(struct geode_aes_op *);
+
+#endif
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 766cc96..9b4e2e4 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -33,7 +33,6 @@ #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <asm/io.h>
-#include <asm/msr.h>
 
 #include <linux/scx200.h>
 
@@ -85,6 +84,10 @@ struct scx200_acb_iface {
 	u8 *ptr;
 	char needs_reset;
 	unsigned len;
+
+	/* PCI device info */
+	struct pci_dev *pdev;
+	int bar;
 };
 
 /* Register Definitions */
@@ -417,17 +420,16 @@ static int scx200_acb_probe(struct scx20
 	return 0;
 }
 
-static int  __init scx200_acb_create(const char *text, int base, int index)
+static __init struct scx200_acb_iface *scx200_create_iface(const char *text,
+		int index)
 {
 	struct scx200_acb_iface *iface;
 	struct i2c_adapter *adapter;
-	int rc;
 
 	iface = kzalloc(sizeof(*iface), GFP_KERNEL);
 	if (!iface) {
 		printk(KERN_ERR NAME ": can't allocate memory\n");
-		rc = -ENOMEM;
-		goto errout;
+		return NULL;
 	}
 
 	adapter = &iface->adapter;
@@ -440,26 +442,27 @@ static int  __init scx200_acb_create(con
 
 	mutex_init(&iface->mutex);
 
-	if (!request_region(base, 8, adapter->name)) {
-		printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n",
-			base, base + 8-1);
-		rc = -EBUSY;
-		goto errout_free;
-	}
-	iface->base = base;
+	return iface;
+}
+
+static int __init scx200_acb_create(struct scx200_acb_iface *iface)
+{
+	struct i2c_adapter *adapter;
+	int rc;
+
+	adapter = &iface->adapter;
 
 	rc = scx200_acb_probe(iface);
 	if (rc) {
 		printk(KERN_WARNING NAME ": probe failed\n");
-		goto errout_release;
+		return rc;
 	}
 
 	scx200_acb_reset(iface);
 
 	if (i2c_add_adapter(adapter) < 0) {
 		printk(KERN_ERR NAME ": failed to register\n");
-		rc = -ENODEV;
-		goto errout_release;
+		return -ENODEV;
 	}
 
 	down(&scx200_acb_list_mutex);
@@ -468,68 +471,155 @@ static int  __init scx200_acb_create(con
 	up(&scx200_acb_list_mutex);
 
 	return 0;
+}
+
+static __init int scx200_create_pci(const char *text, struct pci_dev *pdev,
+		int bar)
+{
+	struct scx200_acb_iface *iface;
+	int rc;
+
+	iface = scx200_create_iface(text, 0);
+
+	if (iface == NULL)
+		return -ENOMEM;
+
+	iface->pdev = pdev;
+	iface->bar = bar;
+
+	pci_enable_device_bars(iface->pdev, 1 << iface->bar);
+
+	rc = pci_request_region(iface->pdev, iface->bar, iface->adapter.name);
+
+	if (rc != 0) {
+		printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n",
+				iface->bar);
+		goto errout_free;
+	}
+
+	iface->base = pci_resource_start(iface->pdev, iface->bar);
+	rc = scx200_acb_create(iface);
+
+	if (rc == 0)
+		return 0;
+
+	pci_release_region(iface->pdev, iface->bar);
+	pci_dev_put(iface->pdev);
 
- errout_release:
-	release_region(iface->base, 8);
  errout_free:
 	kfree(iface);
- errout:
 	return rc;
 }
 
-static struct pci_device_id scx200[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
-	{ },
-};
+static int __init scx200_create_isa(const char *text, unsigned long base,
+		int index)
+{
+	struct scx200_acb_iface *iface;
+	int rc;
+
+	iface = scx200_create_iface(text, index);
+
+	if (iface == NULL)
+		return -ENOMEM;
+
+	if (request_region(base, 8, iface->adapter.name) == 0) {
+		printk(KERN_ERR NAME ": can't allocate io 0x%lx-0x%lx\n",
+		       base, base + 8 - 1);
+		rc = -EBUSY;
+		goto errout_free;
+	}
+
+	iface->base = base;
+	rc = scx200_acb_create(iface);
+
+	if (rc == 0)
+		return 0;
+
+	release_region(base, 8);
+ errout_free:
+	kfree(iface);
+	return rc;
+}
 
-static struct pci_device_id divil_pci[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
-	{ } /* NULL entry */
+/* Driver data is an index into the scx200_pci_data structure that indicates
+ * the name and the BAR where the I/O address resource is located.  ISA
+ * devices are flagged with a bar value of -1 */
+
+static struct pci_device_id scx200_pci[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE),
+	  .driver_data = 0 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE),
+	  .driver_data = 0 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA),
+	  .driver_data = 1 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA),
+	  .driver_data = 2 }
 };
 
-#define MSR_LBAR_SMB		0x5140000B
+static struct {
+	char *name;
+	int bar;
+} scx200_data[] = {
+	{ "SCx200", -1 },
+	{ "CS5535",  0 },
+	{ "CS5536",  0 }
+};
 
-static __init int scx200_add_cs553x(void)
+static __init int scx200_scan_pci(void)
 {
-	u32	low, hi;
-	u32	smb_base;
-
-	/* Grab & reserve the SMB I/O range */
-	rdmsr(MSR_LBAR_SMB, low, hi);
+	int data, dev;
+	int rc = -ENODEV;
+	struct pci_dev *pdev;
+
+	for(dev = 0; dev < ARRAY_SIZE(scx200_pci); dev++) {
+		pdev = pci_get_device(scx200_pci[dev].vendor,
+				scx200_pci[dev].device, NULL);
+
+		if (pdev == NULL)
+			continue;
+
+		data = scx200_pci[dev].driver_data;
+
+		/* if .bar is greater or equal to zero, this is a
+		 * PCI device - otherwise, we assume
+		   that the ports are ISA based
+		*/
+
+		if (scx200_data[data].bar >= 0)
+			rc = scx200_create_pci(scx200_data[data].name, pdev,
+					scx200_data[data].bar);
+		else {
+			int i;
+
+			for (i = 0; i < MAX_DEVICES; ++i) {
+				if (base[i] == 0)
+					continue;
+
+				rc = scx200_create_isa(scx200_data[data].name,
+						base[i],
+						i);
+			}
+		}
 
-	/* Check the IO mask and whether SMB is enabled */
-	if (hi != 0x0000F001) {
-		printk(KERN_WARNING NAME ": SMBus not enabled\n");
-		return -ENODEV;
+		break;
 	}
 
-	/* SMBus IO size is 8 bytes */
-	smb_base = low & 0x0000FFF8;
-
-	return scx200_acb_create("CS5535", smb_base, 0);
+	return rc;
 }
 
 static int __init scx200_acb_init(void)
 {
-	int i;
-	int	rc = -ENODEV;
+	int rc;
 
 	pr_debug(NAME ": NatSemi SCx200 ACCESS.bus Driver\n");
 
-	/* Verify that this really is a SCx200 processor */
-	if (pci_dev_present(scx200)) {
-		for (i = 0; i < MAX_DEVICES; ++i) {
-			if (base[i] > 0)
-				rc = scx200_acb_create("SCx200", base[i], i);
-		}
-	} else if (pci_dev_present(divil_pci))
-		rc = scx200_add_cs553x();
+	rc = scx200_scan_pci();
 
 	/* If at least one bus was created, init must succeed */
+
 	if (scx200_acb_list)
 		return 0;
+
 	return rc;
 }
 
@@ -543,7 +633,14 @@ static void __exit scx200_acb_cleanup(vo
 		up(&scx200_acb_list_mutex);
 
 		i2c_del_adapter(&iface->adapter);
-		release_region(iface->base, 8);
+
+		if (iface->pdev) {
+			pci_release_region(iface->pdev, iface->bar);
+			pci_dev_put(iface->pdev);
+		}
+		else
+			release_region(iface->base, 8);
+
 		kfree(iface);
 		down(&scx200_acb_list_mutex);
 	}
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4587087..e65a492 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -473,7 +473,7 @@ config FB_TGA
 
 config FB_VESA
 	bool "VESA VGA graphics support"
-	depends on (FB = y) && X86
+	depends on (FB = y) && X86 && !VGA_NOPROBE
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -743,7 +743,7 @@ config FB_I810_I2C
 
 config FB_INTEL
 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-	depends on FB && EXPERIMENTAL && PCI && X86_32
+	depends on FB && EXPERIMENTAL && PCI && X86_32 && !VGA_NOPROBE
 	select AGP
 	select AGP_INTEL
 	select FB_MODE_HELPERS
@@ -1050,7 +1050,7 @@ config FB_SAVAGE_ACCEL
 
 config FB_SIS
 	tristate "SiS/XGI display support"
-	depends on FB && PCI
+	depends on FB && PCI && !VGA_NOPROBE
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 4444bef..0be8e3b 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -5,8 +5,8 @@ #
 menu "Console display driver support"
 
 config VGA_CONSOLE
-	bool "VGA text console" if EMBEDDED || !X86
-	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE
+	bool "VGA text console" if (EMBEDDED || !X86)
+	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !VGA_NOPROBE
 	default y
 	help
 	  Saying Y here will allow you to use Linux in text mode through a
diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index 4e173ef..5704879 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -23,6 +23,26 @@ config FB_GEODE_GX
 
 	  If unsure, say N.
 
+config FB_GEODE_GX_SET_FBSIZE
+	bool "Manually specify the Geode GX framebuffer size"
+	depends on FB_GEODE_GX
+	default n
+	---help---
+	  If you want to manually specify the size of your GX framebuffer,
+	  say Y here, otherwise say N to dynamically probe it.
+	  
+	  Say N unless you know what you are doing.
+
+config FB_GEODE_GX_FBSIZE
+	hex "Size of the GX framebuffer, in bytes"
+	depends on FB_GEODE_GX_SET_FBSIZE
+	default "0x1600000"
+	---help---
+	  Specify the size of the GX framebuffer.  Normally, you will
+	  want this to be MB aligned.  Common values are 0x80000 (8MB)
+	  and 0x1600000 (16MB).  Don't change this unless you know what
+	  you are doing
+
 config FB_GEODE_GX1
 	tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)"
 	depends on FB && FB_GEODE && EXPERIMENTAL
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
index 825c340..7faf62a 100644
--- a/drivers/video/geode/display_gx.c
+++ b/drivers/video/geode/display_gx.c
@@ -21,11 +21,26 @@ #include <asm/delay.h>
 #include "geodefb.h"
 #include "display_gx.h"
 
-int gx_frame_buffer_size(void)
+#ifdef CONFIG_FB_GEODE_GX_SET_FBSIZE
+unsigned int gx_frame_buffer_size(void) {
+	return CONFIG_FB_GEODE_GX_FBSIZE;
+}
+#else
+unsigned int gx_frame_buffer_size(void)
 {
-	/* Assuming 16 MiB. */
-	return 16*1024*1024;
+	unsigned int val;
+
+	/* FB size is reported by a virtual register */
+	/* Virtual register class = 0x02 */
+	/* VG_MEM_SIZE(512Kb units) = 0x00 */
+
+	outw(0xFC53, 0xAC1C);
+	outw(0x0200, 0xAC1C);
+
+	val = (unsigned int)(inw(0xAC1E)) & 0xFFl;
+	return (val << 19);
 }
+#endif
 
 int gx_line_delta(int xres, int bpp)
 {
@@ -81,6 +96,7 @@ static void gx_set_mode(struct fb_info *
 	writel(((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2,
 	       par->dc_regs + DC_LINE_SIZE);
 
+
 	/* Enable graphics and video data and unmask address lines. */
 	dcfg |= DC_DCFG_GDEN | DC_DCFG_VDEN | DC_DCFG_A20M | DC_DCFG_A18M;
 
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
index 86c6233..e962c76 100644
--- a/drivers/video/geode/display_gx.h
+++ b/drivers/video/geode/display_gx.h
@@ -11,7 +11,7 @@
 #ifndef __DISPLAY_GX_H__
 #define __DISPLAY_GX_H__
 
-int gx_frame_buffer_size(void);
+unsigned int gx_frame_buffer_size(void);
 int gx_line_delta(int xres, int bpp);
 
 extern struct geode_dc_ops gx_dc_ops;
@@ -93,4 +93,5 @@ #define DC_V_SYNC_TIMING   0x58
 #define DC_PAL_ADDRESS 0x70
 #define DC_PAL_DATA    0x74
 
+#define DC_GLIU0_MEM_OFFSET 0x84
 #endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 89c34b1..61cecbe 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -241,6 +241,12 @@ static int __init gxfb_map_video_memory(
 	if (!info->screen_base)
 		return -ENOMEM;
 
+	/* Set the 16MB aligned base address of the graphics memory region
+	 * in the display controller */
+
+	writel(info->fix.smem_start & 0xFF000000,
+			par->dc_regs + DC_GLIU0_MEM_OFFSET);
+
 	dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
 		 info->fix.smem_len / 1024, info->fix.smem_start);
 
@@ -384,7 +390,7 @@ static void gxfb_remove(struct pci_dev *
 }
 
 static struct pci_device_id gxfb_id_table[] = {
-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_VIDEO,
+	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO,
 	  PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
 	  0xff0000, 0 },
 	{ 0, }
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 2b2a788..616ce33 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -178,7 +178,21 @@ static void gx_set_dclk_frequency(struct
 static void gx_configure_display(struct fb_info *info)
 {
 	struct geodefb_par *par = info->par;
-	u32 dcfg, fp_pm;
+	u32 dcfg, fp_pm, misc;
+
+	/* Set up the MISC register */
+
+	misc = readl(par->vid_regs + GX_MISC);
+
+	/* Power up the DAC */
+	misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+
+	/* Disable gamma correction */
+	misc |= GX_MISC_GAM_EN;
+
+	writel(misc, par->vid_regs + GX_MISC);
+
+	/* Write the display configuration */
 
 	dcfg = readl(par->vid_regs + GX_DCFG);
 
@@ -199,9 +213,17 @@ static void gx_configure_display(struct 
 	if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
 		dcfg |= GX_DCFG_CRT_VSYNC_POL;
 
+	/* Enable the display logic */
+	/* Set up the DACS to blank normally */
+
+	dcfg |= GX_DCFG_CRT_EN | GX_DCFG_DAC_BL_EN;
+
+	/* Enable the external DAC VREF? */
+
 	writel(dcfg, par->vid_regs + GX_DCFG);
 
 	/* Power on flat panel. */
+
 	fp_pm = readl(par->vid_regs + GX_FP_PM);
 	fp_pm |= GX_FP_PM_P;
 	writel(fp_pm, par->vid_regs + GX_FP_PM);
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
index 2d9211f..238181a 100644
--- a/drivers/video/geode/video_gx.h
+++ b/drivers/video/geode/video_gx.h
@@ -28,6 +28,13 @@ #  define GX_DCFG_VG_CK			0x00100000
 #  define GX_DCFG_GV_GAM		0x00200000
 #  define GX_DCFG_DAC_VREF		0x04000000
 
+/* Geode GX MISC video configuration */
+
+#define GX_MISC 0x50
+#define GX_MISC_GAM_EN     0x00000001
+#define GX_MISC_DAC_PWRDN  0x00000400
+#define GX_MISC_A_PWRDN    0x00000800
+
 /* Geode GX flat panel display control registers */
 #define GX_FP_PM 0x410
 #  define GX_FP_PM_P 0x01000000
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 590dc6d..289a4f8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -387,7 +387,7 @@ #define PCI_DEVICE_ID_NS_CS5535_ISA	0x00
 #define PCI_DEVICE_ID_NS_CS5535_IDE	0x002d
 #define PCI_DEVICE_ID_NS_CS5535_AUDIO	0x002e
 #define PCI_DEVICE_ID_NS_CS5535_USB	0x002f
-#define PCI_DEVICE_ID_NS_CS5535_VIDEO	0x0030
+#define PCI_DEVICE_ID_NS_GX_VIDEO	0x0030
 #define PCI_DEVICE_ID_NS_SATURN		0x0035
 #define PCI_DEVICE_ID_NS_SCx200_BRIDGE	0x0500
 #define PCI_DEVICE_ID_NS_SCx200_SMI	0x0501
@@ -400,8 +400,7 @@ #define PCI_DEVICE_ID_NS_SC1100_SMI	0x05
 #define PCI_DEVICE_ID_NS_SC1100_XBUS	0x0515
 #define PCI_DEVICE_ID_NS_87410		0xd001
 
-#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
-#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+#define PCI_DEVICE_ID_NS_GX_HOST_BRIDGE  0x0028
 
 #define PCI_VENDOR_ID_TSENG		0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2	0x3202
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index a208180..d37346b 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -216,14 +216,19 @@ config SND_CS46XX_NEW_DSP
 	  This works better than the old code, so say Y.
 
 config SND_CS5535AUDIO
-	tristate "CS5535 Audio"
+	tristate "CS5535/CS5536 Audio"
 	depends on SND && X86 && !X86_64
 	select SND_PCM
 	select SND_AC97_CODEC
 	help
 	  Say Y here to include support for audio on CS5535 chips. It is
 	  referred to as NS CS5535 IO or AMD CS5535 IO companion in
-	  various literature.
+	  various literature. This driver also supports the CS5536 audio
+	  device. However, for both chips, on certain boards, you may
+	  need to use ac97_quirk=hp_only if your board has physically 
+	  mapped headphone out to master output. If that works for you,
+	  send lspci -vvv output to the mailing list so that your board
+	  can be identified in the quirks list.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-cs5535audio.
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index d052007..e1ed471 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1226,7 +1226,8 @@ static int snd_ac97_mixer_build(struct s
 	ac97->regs[AC97_CENTER_LFE_MASTER] = 0x8080;
 
 	/* build center controls */
-	if (snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) {
+	if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) 
+		&& !(ac97->flags & AC97_AD_MULTI)) {
 		if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_center[0], ac97))) < 0)
 			return err;
 		if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&snd_ac97_controls_center[1], ac97))) < 0)
@@ -1238,7 +1239,8 @@ static int snd_ac97_mixer_build(struct s
 	}
 
 	/* build LFE controls */
-	if (snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER+1)) {
+	if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER+1))
+		&& !(ac97->flags & AC97_AD_MULTI)) {
 		if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_lfe[0], ac97))) < 0)
 			return err;
 		if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&snd_ac97_controls_lfe[1], ac97))) < 0)
@@ -1250,7 +1252,8 @@ static int snd_ac97_mixer_build(struct s
 	}
 
 	/* build surround controls */
-	if (snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) {
+	if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) 
+		&& !(ac97->flags & AC97_AD_MULTI)) {
 		/* Surround Master (0x38) is with stereo mutes */
 		if ((err = snd_ac97_cmix_new_stereo(card, "Surround Playback", AC97_SURROUND_MASTER, 1, ac97)) < 0)
 			return err;
diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile
index 08d8ee6..2911a8a 100644
--- a/sound/pci/cs5535audio/Makefile
+++ b/sound/pci/cs5535audio/Makefile
@@ -4,5 +4,9 @@ #
 
 snd-cs5535audio-objs := cs5535audio.o cs5535audio_pcm.o
 
+ifdef CONFIG_PM
+snd-cs5535audio-objs += cs5535audio_pm.o
+endif
+
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 2c1213a..41f02f0 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -1,5 +1,5 @@
 /*
- * Driver for audio on multifunction CS5535 companion device
+ * Driver for audio on multifunction CS5535/6 companion device
  * Copyright (C) Jaya Kumar
  *
  * Based on Jaroslav Kysela and Takashi Iwai's examples.
@@ -40,16 +40,29 @@ #include "cs5535audio.h"
 
 #define DRIVER_NAME "cs5535audio"
 
+static char *ac97_quirk;
+module_param(ac97_quirk, charp, 0444);
+MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds.");
+
+static struct ac97_quirk ac97_quirks[] __devinitdata = {
+#if 0 /* Not yet confirmed if all 5536 boards are HP only */
+	{
+		.subvendor = PCI_VENDOR_ID_AMD, 
+		.subdevice = PCI_DEVICE_ID_AMD_CS5536_AUDIO, 
+		.name = "AMD RDK",     
+		.type = AC97_TUNE_HP_ONLY
+	},
+#endif
+	{}
+};
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 static struct pci_device_id snd_cs5535audio_ids[] __devinitdata = {
-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
-	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) },
 	{}
 };
 
@@ -148,6 +161,8 @@ static int snd_cs5535audio_mixer(struct 
 		return err;
 	}
 
+	snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);
+
 	return 0;
 }
 
@@ -347,6 +362,8 @@ static int __devinit snd_cs5535audio_pro
 	if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
 		goto probefail_out;
 
+	card->private_data = cs5535au;
+
 	if ((err = snd_cs5535audio_mixer(cs5535au)) < 0)
 		goto probefail_out;
 
@@ -383,6 +400,10 @@ static struct pci_driver driver = {
 	.id_table = snd_cs5535audio_ids,
 	.probe = snd_cs5535audio_probe,
 	.remove = __devexit_p(snd_cs5535audio_remove),
+#ifdef CONFIG_PM
+	.suspend = snd_cs5535audio_suspend,
+	.resume = snd_cs5535audio_resume,
+#endif
 };
 
 static int __init alsa_card_cs5535audio_init(void)
diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 5e55a1a..4fd1f31 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -74,6 +74,8 @@ #define STS_NEW				0x00020000
 #define PRM_RDY_STS			0x00800000
 #define ACC_CODEC_CNTL_WR_CMD		(~0x80000000)
 #define ACC_CODEC_CNTL_RD_CMD		0x80000000
+#define ACC_CODEC_CNTL_LNK_SHUTDOWN	0x00040000
+#define ACC_CODEC_CNTL_LNK_WRM_RST	0x00020000
 #define PRD_JMP				0x2000
 #define PRD_EOP				0x4000
 #define PRD_EOT				0x8000
@@ -88,6 +90,7 @@ struct cs5535audio_dma_ops {
 	void (*disable_dma)(struct cs5535audio *cs5535au);
 	void (*pause_dma)(struct cs5535audio *cs5535au);
 	void (*setup_prd)(struct cs5535audio *cs5535au, u32 prd_addr);
+	u32 (*read_prd)(struct cs5535audio *cs5535au);
 	u32 (*read_dma_pntr)(struct cs5535audio *cs5535au);
 };
 
@@ -103,11 +106,14 @@ struct cs5535audio_dma {
 	struct snd_pcm_substream *substream;
 	unsigned int buf_addr, buf_bytes;
 	unsigned int period_bytes, periods;
+	int suspended;
+	u32 saved_prd;
 };
 
 struct cs5535audio {
 	struct snd_card *card;
 	struct snd_ac97 *ac97;
+	struct snd_pcm *pcm;
 	int irq;
 	struct pci_dev *pci;
 	unsigned long port;
@@ -117,6 +123,8 @@ struct cs5535audio {
 	struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];
 };
 
+int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);
+int snd_cs5535audio_resume(struct pci_dev *pci);
 int __devinit snd_cs5535audio_pcm(struct cs5535audio *cs5535audio);
 
 #endif /* __SOUND_CS5535AUDIO_H */
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index 60bb82b..f0a4869 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -43,7 +43,8 @@ static struct snd_pcm_hardware snd_cs553
 		 		SNDRV_PCM_INFO_BLOCK_TRANSFER |
 		 		SNDRV_PCM_INFO_MMAP_VALID |
 		 		SNDRV_PCM_INFO_PAUSE |
-				SNDRV_PCM_INFO_SYNC_START
+				SNDRV_PCM_INFO_SYNC_START |
+				SNDRV_PCM_INFO_RESUME
 				),
 	.formats =		(
 				SNDRV_PCM_FMTBIT_S16_LE
@@ -193,6 +194,11 @@ static void cs5535audio_playback_setup_p
 	cs_writel(cs5535au, ACC_BM0_PRD, prd_addr);
 }
 
+static u32 cs5535audio_playback_read_prd(struct cs5535audio *cs5535au)
+{
+	return cs_readl(cs5535au, ACC_BM0_PRD);
+}
+
 static u32 cs5535audio_playback_read_dma_pntr(struct cs5535audio *cs5535au)
 {
 	return cs_readl(cs5535au, ACC_BM0_PNTR);
@@ -219,6 +225,11 @@ static void cs5535audio_capture_setup_pr
 	cs_writel(cs5535au, ACC_BM1_PRD, prd_addr);
 }
 
+static u32 cs5535audio_capture_read_prd(struct cs5535audio *cs5535au)
+{
+	return cs_readl(cs5535au, ACC_BM1_PRD);
+}
+
 static u32 cs5535audio_capture_read_dma_pntr(struct cs5535audio *cs5535au)
 {
 	return cs_readl(cs5535au, ACC_BM1_PNTR);
@@ -285,9 +296,17 @@ static int snd_cs5535audio_trigger(struc
 	case SNDRV_PCM_TRIGGER_START:
 		dma->ops->enable_dma(cs5535au);
 		break;
+	case SNDRV_PCM_TRIGGER_RESUME:
+		dma->ops->enable_dma(cs5535au);
+		dma->suspended = 0;
+		break;
 	case SNDRV_PCM_TRIGGER_STOP:
 		dma->ops->disable_dma(cs5535au);
 		break;
+	case SNDRV_PCM_TRIGGER_SUSPEND:
+		dma->ops->disable_dma(cs5535au);
+		dma->suspended = 1;
+		break;
 	default:
 		snd_printk(KERN_ERR "unhandled trigger\n");
 		err = -EINVAL;
@@ -375,6 +394,7 @@ static struct cs5535audio_dma_ops snd_cs
         .enable_dma = cs5535audio_playback_enable_dma,
         .disable_dma = cs5535audio_playback_disable_dma,
         .setup_prd = cs5535audio_playback_setup_prd,
+        .read_prd = cs5535audio_playback_read_prd,
         .pause_dma = cs5535audio_playback_pause_dma,
         .read_dma_pntr = cs5535audio_playback_read_dma_pntr,
 };
@@ -384,6 +404,7 @@ static struct cs5535audio_dma_ops snd_cs
         .enable_dma = cs5535audio_capture_enable_dma,
         .disable_dma = cs5535audio_capture_disable_dma,
         .setup_prd = cs5535audio_capture_setup_prd,
+        .read_prd = cs5535audio_capture_read_prd,
         .pause_dma = cs5535audio_capture_pause_dma,
         .read_dma_pntr = cs5535audio_capture_read_dma_pntr,
 };
@@ -413,6 +434,7 @@ int __devinit snd_cs5535audio_pcm(struct
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
 					snd_dma_pci_data(cs5535au->pci),
 					64*1024, 128*1024);
+	cs5535au->pcm = pcm;
 
 	return 0;
 }
diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c
new file mode 100644
index 0000000..aad0e69
--- /dev/null
+++ b/sound/pci/cs5535audio/cs5535audio_pm.c
@@ -0,0 +1,123 @@
+/*
+ * Power management for audio on multifunction CS5535 companion device
+ * Copyright (C) Jaya Kumar
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <sound/driver.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/initval.h>
+#include <sound/asoundef.h>
+#include <sound/pcm.h>
+#include <sound/ac97_codec.h>
+#include "cs5535audio.h"
+
+static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au)
+{
+	/* 
+	we depend on snd_ac97_suspend to tell the
+	AC97 codec to shutdown. the amd spec suggests
+	that the LNK_SHUTDOWN be done at the same time
+	that the codec power-down is issued. instead,
+	we do it just after rather than at the same 
+	time. excluding codec specific build_ops->suspend
+	ac97 powerdown hits:
+	0x8000 EAPD 
+	0x4000 Headphone amplifier 
+	0x0300 ADC & DAC 
+	0x0400 Analog Mixer powerdown (Vref on) 
+	I am not sure if this is the best that we can do.
+	The remainder to be investigated are:
+	- analog mixer (vref off) 0x0800
+	- AC-link powerdown 0x1000
+	- codec internal clock 0x2000
+	*/
+
+	/* set LNK_SHUTDOWN to shutdown AC link */
+	cs_writel(cs5535au, ACC_CODEC_CNTL, ACC_CODEC_CNTL_LNK_SHUTDOWN);
+
+}
+
+int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state)
+{
+	struct snd_card *card = pci_get_drvdata(pci);
+	struct cs5535audio *cs5535au = card->private_data;
+	int i;
+
+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+	for (i = 0; i < NUM_CS5535AUDIO_DMAS; i++) {
+		struct cs5535audio_dma *dma = &cs5535au->dmas[i];
+		if (dma && dma->substream && !dma->suspended) 
+			dma->saved_prd = dma->ops->read_prd(cs5535au);
+	}
+	snd_pcm_suspend_all(cs5535au->pcm);
+	snd_ac97_suspend(cs5535au->ac97);
+	/* save important regs, then disable aclink in hw */
+	snd_cs5535audio_stop_hardware(cs5535au);
+	pci_disable_device(pci);
+	pci_save_state(pci);
+
+	return 0;
+}
+
+int snd_cs5535audio_resume(struct pci_dev *pci)
+{
+	struct snd_card *card = pci_get_drvdata(pci);
+	struct cs5535audio *cs5535au = card->private_data;
+	u32 tmp;
+	int timeout;
+	int i;
+
+	pci_restore_state(pci);
+	pci_enable_device(pci);
+	pci_set_master(pci);
+
+	/* set LNK_WRM_RST to reset AC link */
+	cs_writel(cs5535au, ACC_CODEC_CNTL, ACC_CODEC_CNTL_LNK_WRM_RST);
+
+	timeout = 50;
+	do {
+		tmp = cs_readl(cs5535au, ACC_CODEC_STATUS);
+		if (tmp & PRM_RDY_STS)
+			break;
+		udelay(1);
+	} while (--timeout);
+
+	if (!timeout)
+		snd_printk(KERN_ERR "Failure getting AC Link ready\n");
+
+	/* we depend on ac97 to perform the codec power up */
+	snd_ac97_resume(cs5535au->ac97);
+	/* set up rate regs, dma. actual initiation is done in trig */
+	for (i = 0; i < NUM_CS5535AUDIO_DMAS; i++) {
+		struct cs5535audio_dma *dma = &cs5535au->dmas[i];
+		if (dma && dma->substream && dma->suspended) {
+			dma->substream->ops->prepare(dma->substream);
+			dma->ops->setup_prd(cs5535au, dma->saved_prd);
+		}
+	}
+		
+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+
+	return 0;
+}
+

linux-2.6-mtd-git.patch:
 b/MAINTAINERS                         |    4 
 b/drivers/mtd/Kconfig                 |    4 
 b/drivers/mtd/chips/Kconfig           |    1 
 b/drivers/mtd/chips/Makefile          |    7 
 b/drivers/mtd/chips/amd_flash.c       |    8 
 b/drivers/mtd/chips/cfi_cmdset_0001.c |  474 +----
 b/drivers/mtd/chips/cfi_cmdset_0002.c |   22 
 b/drivers/mtd/chips/cfi_cmdset_0020.c |   22 
 b/drivers/mtd/chips/cfi_probe.c       |    8 
 b/drivers/mtd/chips/gen_probe.c       |   45 
 b/drivers/mtd/chips/map_ram.c         |    2 
 b/drivers/mtd/chips/map_rom.c         |    4 
 b/drivers/mtd/chips/sharp.c           |    1 
 b/drivers/mtd/devices/Kconfig         |    6 
 b/drivers/mtd/devices/Makefile        |    7 
 b/drivers/mtd/devices/block2mtd.c     |   27 
 b/drivers/mtd/devices/doc2000.c       |  129 -
 b/drivers/mtd/devices/doc2001.c       |   60 
 b/drivers/mtd/devices/doc2001plus.c   |   60 
 b/drivers/mtd/devices/docprobe.c      |   26 
 b/drivers/mtd/devices/lart.c          |    1 
 b/drivers/mtd/devices/m25p80.c        |    1 
 b/drivers/mtd/devices/ms02-nv.c       |    2 
 b/drivers/mtd/devices/mtdram.c        |    1 
 b/drivers/mtd/devices/phram.c         |   16 
 b/drivers/mtd/devices/slram.c         |    3 
 b/drivers/mtd/inftlcore.c             |  192 +-
 b/drivers/mtd/inftlmount.c            |   60 
 b/drivers/mtd/maps/Kconfig            |   11 
 b/drivers/mtd/maps/cfi_flagadm.c      |    4 
 b/drivers/mtd/maps/dbox2-flash.c      |    2 
 b/drivers/mtd/maps/mtx-1_flash.c      |    2 
 b/drivers/mtd/maps/nettel.c           |    4 
 b/drivers/mtd/maps/pcmciamtd.c        |    1 
 b/drivers/mtd/maps/physmap.c          |  255 ++
 b/drivers/mtd/mtdblock.c              |   16 
 b/drivers/mtd/mtdblock_ro.c           |    4 
 b/drivers/mtd/mtdchar.c               |  327 ++-
 b/drivers/mtd/mtdconcat.c             |  335 ++-
 b/drivers/mtd/mtdcore.c               |   33 
 b/drivers/mtd/mtdpart.c               |  171 -
 b/drivers/mtd/nand/Kconfig            |   47 
 b/drivers/mtd/nand/Makefile           |    4 
 b/drivers/mtd/nand/ams-delta.c        |  237 ++
 b/drivers/mtd/nand/au1550nd.c         |  321 ++-
 b/drivers/mtd/nand/autcpu12.c         |  125 -
 b/drivers/mtd/nand/cs553x_nand.c      |  353 +++
 b/drivers/mtd/nand/diskonchip.c       |  528 ++---
 b/drivers/mtd/nand/edb7312.c          |   97 -
 b/drivers/mtd/nand/h1910.c            |   98 -
 b/drivers/mtd/nand/nand_base.c        | 3094 +++++++++++++++-------------------
 b/drivers/mtd/nand/nand_bbt.c         |  502 +++--
 b/drivers/mtd/nand/nand_ecc.c         |  227 --
 b/drivers/mtd/nand/nand_ids.c         |  177 +
 b/drivers/mtd/nand/nandsim.c          |   95 -
 b/drivers/mtd/nand/ndfc.c             |  316 +++
 b/drivers/mtd/nand/ppchameleonevb.c   |  256 +-
 b/drivers/mtd/nand/rtc_from4.c        |  351 +--
 b/drivers/mtd/nand/s3c2410.c          |  163 -
 b/drivers/mtd/nand/sharpsl.c          |  146 -
 b/drivers/mtd/nand/spia.c             |  101 -
 b/drivers/mtd/nand/toto.c             |  121 -
 b/drivers/mtd/nand/ts7250.c           |  206 ++
 b/drivers/mtd/nftlcore.c              |  221 +-
 b/drivers/mtd/nftlmount.c             |   91 -
 b/drivers/mtd/onenand/Kconfig         |   14 
 b/drivers/mtd/onenand/onenand_base.c  |  718 +++++--
 b/drivers/mtd/onenand/onenand_bbt.c   |    9 
 b/drivers/mtd/redboot.c               |   18 
 b/drivers/mtd/rfd_ftl.c               |   48 
 b/fs/Kconfig                          |   38 
 b/fs/jffs/intrep.c                    |   15 
 b/fs/jffs2/Makefile                   |    3 
 b/fs/jffs2/README.Locking             |   21 
 b/fs/jffs2/acl.c                      |  485 +++++
 b/fs/jffs2/acl.h                      |   45 
 b/fs/jffs2/build.c                    |    2 
 b/fs/jffs2/compr.c                    |    2 
 b/fs/jffs2/compr.h                    |    4 
 b/fs/jffs2/debug.c                    |   14 
 b/fs/jffs2/debug.h                    |    6 
 b/fs/jffs2/dir.c                      |  121 -
 b/fs/jffs2/erase.c                    |   56 
 b/fs/jffs2/file.c                     |   35 
 b/fs/jffs2/fs.c                       |   63 
 b/fs/jffs2/gc.c                       |  131 -
 b/fs/jffs2/jffs2_fs_i.h               |   55 
 b/fs/jffs2/jffs2_fs_sb.h              |  133 +
 b/fs/jffs2/malloc.c                   |  127 +
 b/fs/jffs2/nodelist.c                 |  183 +-
 b/fs/jffs2/nodelist.h                 |  189 +-
 b/fs/jffs2/nodemgmt.c                 |  170 -
 b/fs/jffs2/os-linux.h                 |   23 
 b/fs/jffs2/readinode.c                |    6 
 b/fs/jffs2/scan.c                     |  442 +++-
 b/fs/jffs2/security.c                 |   82 
 b/fs/jffs2/summary.c                  |  484 +++--
 b/fs/jffs2/summary.h                  |   64 
 b/fs/jffs2/super.c                    |   20 
 b/fs/jffs2/symlink.c                  |    7 
 b/fs/jffs2/wbuf.c                     |  968 +++++-----
 b/fs/jffs2/write.c                    |  147 -
 b/fs/jffs2/xattr.c                    | 1238 +++++++++++++
 b/fs/jffs2/xattr.h                    |  116 +
 b/fs/jffs2/xattr_trusted.c            |   52 
 b/fs/jffs2/xattr_user.c               |   52 
 b/include/linux/jffs2.h               |   56 
 b/include/linux/module.h              |    9 
 b/include/linux/mtd/inftl.h           |    2 
 b/include/linux/mtd/mtd.h             |   97 -
 b/include/linux/mtd/nand.h            |  344 ++-
 b/include/linux/mtd/ndfc.h            |   67 
 b/include/linux/mtd/nftl.h            |    2 
 b/include/linux/mtd/onenand.h         |   11 
 b/include/linux/mtd/onenand_regs.h    |    8 
 b/include/linux/mtd/partitions.h      |    2 
 b/include/linux/mtd/physmap.h         |   29 
 b/include/mtd/mtd-abi.h               |   90 
 b/include/mtd/mtd-user.h              |    1 
 b/init/Kconfig                        |    3 
 b/init/do_mounts.c                    |    4 
 b/kernel/Makefile                     |    1 
 fs/jffs2/histo.h                      |    3 
 include/linux/jffs2_fs_i.h            |   50 
 include/linux/jffs2_fs_sb.h           |  122 -
 kernel/intermodule.c                  |  184 --
 126 files changed, 10917 insertions(+), 6809 deletions(-)

--- NEW FILE linux-2.6-mtd-git.patch ---
diff --git a/MAINTAINERS b/MAINTAINERS
index 246153d..e564e4e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1800,12 +1800,12 @@ S:     linux-scsi at vger.kernel.org
 W:     http://megaraid.lsilogic.com
 S:     Maintained
 
-MEMORY TECHNOLOGY DEVICES
+MEMORY TECHNOLOGY DEVICES (MTD)
 P:	David Woodhouse
 M:	dwmw2 at infradead.org
 W:	http://www.linux-mtd.infradead.org/
 L:	linux-mtd at lists.infradead.org
-T:	git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git
+T:	git git://git.infradead.org/mtd-2.6.git
 S:	Maintained
 
 MICROTEK X6 SCANNER
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index f6b775e..5ac265d 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -78,7 +78,7 @@ config MTD_REDBOOT_DIRECTORY_BLOCK
 	  option.
 
 	  The option specifies which Flash sectors holds the RedBoot
-	  partition table.  A zero or positive value gives an absolete
+	  partition table.  A zero or positive value gives an absolute
 	  erase block number. A negative value specifies a number of
 	  sectors before the end of the device.
 
@@ -103,7 +103,7 @@ config MTD_CMDLINE_PARTS
 	bool "Command line partition table parsing"
 	depends on MTD_PARTITIONS = "y"
 	---help---
-	  Allow generic configuration of the MTD paritition tables via the kernel
+	  Allow generic configuration of the MTD partition tables via the kernel
 	  command line. Multiple flash resources are supported for hardware where
 	  different kinds of flash memory are available.
 
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index a7ec595..6d8f30d 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -30,7 +30,6 @@ config MTD_JEDECPROBE
 
 config MTD_GEN_PROBE
 	tristate
-	select OBSOLETE_INTERMODULE
 
 config MTD_CFI_ADV_OPTIONS
 	bool "Flash chip driver advanced configuration options"
diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile
index 8afe309..75bc1c2 100644
--- a/drivers/mtd/chips/Makefile
+++ b/drivers/mtd/chips/Makefile
@@ -3,13 +3,6 @@ # linux/drivers/chips/Makefile
 #
 # $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $
 
-#                       *** BIG UGLY NOTE ***
-#
-# The removal of get_module_symbol() and replacement with
-# inter_module_register() et al has introduced a link order dependency
-# here where previously there was none.  We now have to ensure that
-# the CFI command set drivers are linked before gen_probe.o
-
 obj-$(CONFIG_MTD)		+= chipreg.o
 obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o
 obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o
diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 5711561..16eaca6 100644
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -97,7 +97,6 @@ struct amd_flash_private {
 	int interleave;
 	int numchips;
 	unsigned long chipshift;
-//	const char *im_name;
 	struct flchip chips[0];
 };
 
@@ -131,12 +130,6 @@ static struct mtd_chip_driver amd_flash_
 	.module = THIS_MODULE
 };
 
-
-
-static const char im_name[] = "amd_flash";
-
-
-
 static inline __u32 wide_read(struct map_info *map, __u32 addr)
 {
 	if (map->buswidth == 1) {
@@ -737,6 +730,7 @@ static struct mtd_info *amd_flash_probe(
 		offset += dev_size;
 	}
 	mtd->type = MTD_NORFLASH;
+	mtd->writesize = 1;
 	mtd->flags = MTD_CAP_NORFLASH;
 	mtd->name = map->name;
 	mtd->erase = amd_flash_erase;
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 1c074d6..0d43581 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -331,13 +331,6 @@ read_pri_intelext(struct map_info *map, 
 	return extp;
 }
 
-/* This routine is made available to other mtd code via
- * inter_module_register.  It must only be accessed through
- * inter_module_get which will bump the use count of this module.  The
- * addresses passed back in cfi are valid as long as the use count of
- * this module is non-zero, i.e. between inter_module_get and
- * inter_module_put.  Keith Owens <kaos at ocs.com.au> 29 Oct 2000.
- */
 struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
 {
 	struct cfi_private *cfi = map->fldrv_priv;
@@ -406,7 +399,7 @@ #endif
 	for (i=0; i< cfi->numchips; i++) {
 		cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;
 		cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;
-		cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;
+		cfi->chips[i].erase_time = 1000<<cfi->cfiq->BlockEraseTimeoutTyp;
 		cfi->chips[i].ref_point_counter = 0;
 		init_waitqueue_head(&(cfi->chips[i].wq));
 	}
@@ -415,6 +408,11 @@ #endif
 
 	return cfi_intelext_setup(mtd);
 }
+struct mtd_info *cfi_cmdset_0003(struct map_info *map, int primary) __attribute__((alias("cfi_cmdset_0001")));
+struct mtd_info *cfi_cmdset_0200(struct map_info *map, int primary) __attribute__((alias("cfi_cmdset_0001")));
+EXPORT_SYMBOL_GPL(cfi_cmdset_0001);
+EXPORT_SYMBOL_GPL(cfi_cmdset_0003);
+EXPORT_SYMBOL_GPL(cfi_cmdset_0200);
 
 static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
 {
@@ -547,12 +545,12 @@ static int cfi_intelext_partition_fixup(
 		if (extp->MinorVersion >= '4') {
 			struct cfi_intelext_programming_regioninfo *prinfo;
 			prinfo = (struct cfi_intelext_programming_regioninfo *)&extp->extra[offs];
-			MTD_PROGREGION_SIZE(mtd) = cfi->interleave << prinfo->ProgRegShift;
+			mtd->writesize = cfi->interleave << prinfo->ProgRegShift;
 			MTD_PROGREGION_CTRLMODE_VALID(mtd) = cfi->interleave * prinfo->ControlValid;
 			MTD_PROGREGION_CTRLMODE_INVALID(mtd) = cfi->interleave * prinfo->ControlInvalid;
-			mtd->flags |= MTD_PROGRAM_REGIONS;
+			mtd->flags &= ~MTD_BIT_WRITEABLE;
 			printk(KERN_DEBUG "%s: program region size/ctrl_valid/ctrl_inval = %d/%d/%d\n",
-			       map->name, MTD_PROGREGION_SIZE(mtd),
+			       map->name, mtd->writesize,
 			       MTD_PROGREGION_CTRLMODE_VALID(mtd),
 			       MTD_PROGREGION_CTRLMODE_INVALID(mtd));
 		}
@@ -896,26 +894,33 @@ static void __xipram xip_enable(struct m
 
 /*
  * When a delay is required for the flash operation to complete, the
- * xip_udelay() function is polling for both the given timeout and pending
- * (but still masked) hardware interrupts.  Whenever there is an interrupt
- * pending then the flash erase or write operation is suspended, array mode
- * restored and interrupts unmasked.  Task scheduling might also happen at that
- * point.  The CPU eventually returns from the interrupt or the call to
- * schedule() and the suspended flash operation is resumed for the remaining
- * of the delay period.
+ * xip_wait_for_operation() function is polling for both the given timeout
+ * and pending (but still masked) hardware interrupts.  Whenever there is an
+ * interrupt pending then the flash erase or write operation is suspended,
+ * array mode restored and interrupts unmasked.  Task scheduling might also
+ * happen at that point.  The CPU eventually returns from the interrupt or
+ * the call to schedule() and the suspended flash operation is resumed for
+ * the remaining of the delay period.
  *
  * Warning: this function _will_ fool interrupt latency tracing tools.
  */
 
-static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
-				unsigned long adr, int usec)
+static int __xipram xip_wait_for_operation(
+		struct map_info *map, struct flchip *chip,
+		unsigned long adr, int *chip_op_time )
 {
 	struct cfi_private *cfi = map->fldrv_priv;
 	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
 	map_word status, OK = CMD(0x80);
-	unsigned long suspended, start = xip_currtime();
+	unsigned long usec, suspended, start, done;
 	flstate_t oldstate, newstate;
 
+       	start = xip_currtime();
+	usec = *chip_op_time * 8;
+	if (usec == 0)
+		usec = 500000;
+	done = 0;
[...27037 lines suppressed...]
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_SMP) += cpu.o spinlock.o
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_MODULE_SIG) += module-verify-sig.o
-obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_PM) += power/
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
diff --git a/kernel/intermodule.c b/kernel/intermodule.c
deleted file mode 100644
index 55b1e5b..0000000
--- a/kernel/intermodule.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Deprecated, do not use.  Moved from module.c to here. --RR */
-
-/* Written by Keith Owens <kaos at ocs.com.au> Oct 2000 */
-#include <linux/module.h>
-#include <linux/kmod.h>
-#include <linux/spinlock.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-
-/* inter_module functions are always available, even when the kernel is
- * compiled without modules.  Consumers of inter_module_xxx routines
- * will always work, even when both are built into the kernel, this
- * approach removes lots of #ifdefs in mainline code.
- */
-
-static struct list_head ime_list = LIST_HEAD_INIT(ime_list);
-static DEFINE_SPINLOCK(ime_lock);
-static int kmalloc_failed;
-
-struct inter_module_entry {
-	struct list_head list;
-	const char *im_name;
-	struct module *owner;
-	const void *userdata;
-};
-
-/**
- * inter_module_register - register a new set of inter module data.
- * @im_name: an arbitrary string to identify the data, must be unique
- * @owner: module that is registering the data, always use THIS_MODULE
- * @userdata: pointer to arbitrary userdata to be registered
- *
- * Description: Check that the im_name has not already been registered,
- * complain if it has.  For new data, add it to the inter_module_entry
- * list.
- */
-void inter_module_register(const char *im_name, struct module *owner, const void *userdata)
-{
-	struct list_head *tmp;
-	struct inter_module_entry *ime, *ime_new;
-
-	if (!(ime_new = kzalloc(sizeof(*ime), GFP_KERNEL))) {
-		/* Overloaded kernel, not fatal */
-		printk(KERN_ERR
-			"Aiee, inter_module_register: cannot kmalloc entry for '%s'\n",
-			im_name);
-		kmalloc_failed = 1;
-		return;
-	}
-	ime_new->im_name = im_name;
-	ime_new->owner = owner;
-	ime_new->userdata = userdata;
-
-	spin_lock(&ime_lock);
-	list_for_each(tmp, &ime_list) {
-		ime = list_entry(tmp, struct inter_module_entry, list);
-		if (strcmp(ime->im_name, im_name) == 0) {
-			spin_unlock(&ime_lock);
-			kfree(ime_new);
-			/* Program logic error, fatal */
-			printk(KERN_ERR "inter_module_register: duplicate im_name '%s'", im_name);
-			BUG();
-		}
-	}
-	list_add(&(ime_new->list), &ime_list);
-	spin_unlock(&ime_lock);
-}
-
-/**
- * inter_module_unregister - unregister a set of inter module data.
- * @im_name: an arbitrary string to identify the data, must be unique
- *
- * Description: Check that the im_name has been registered, complain if
- * it has not.  For existing data, remove it from the
- * inter_module_entry list.
- */
-void inter_module_unregister(const char *im_name)
-{
-	struct list_head *tmp;
-	struct inter_module_entry *ime;
-
-	spin_lock(&ime_lock);
-	list_for_each(tmp, &ime_list) {
-		ime = list_entry(tmp, struct inter_module_entry, list);
-		if (strcmp(ime->im_name, im_name) == 0) {
-			list_del(&(ime->list));
-			spin_unlock(&ime_lock);
-			kfree(ime);
-			return;
-		}
-	}
-	spin_unlock(&ime_lock);
-	if (kmalloc_failed) {
-		printk(KERN_ERR
-			"inter_module_unregister: no entry for '%s', "
-			"probably caused by previous kmalloc failure\n",
-			im_name);
-		return;
-	}
-	else {
-		/* Program logic error, fatal */
-		printk(KERN_ERR "inter_module_unregister: no entry for '%s'", im_name);
-		BUG();
-	}
-}
-
-/**
- * inter_module_get - return arbitrary userdata from another module.
- * @im_name: an arbitrary string to identify the data, must be unique
- *
- * Description: If the im_name has not been registered, return NULL.
- * Try to increment the use count on the owning module, if that fails
- * then return NULL.  Otherwise return the userdata.
- */
-static const void *inter_module_get(const char *im_name)
-{
-	struct list_head *tmp;
-	struct inter_module_entry *ime;
-	const void *result = NULL;
-
-	spin_lock(&ime_lock);
-	list_for_each(tmp, &ime_list) {
-		ime = list_entry(tmp, struct inter_module_entry, list);
-		if (strcmp(ime->im_name, im_name) == 0) {
-			if (try_module_get(ime->owner))
-				result = ime->userdata;
-			break;
-		}
-	}
-	spin_unlock(&ime_lock);
-	return(result);
-}
-
-/**
- * inter_module_get_request - im get with automatic request_module.
- * @im_name: an arbitrary string to identify the data, must be unique
- * @modname: module that is expected to register im_name
- *
- * Description: If inter_module_get fails, do request_module then retry.
- */
-const void *inter_module_get_request(const char *im_name, const char *modname)
-{
-	const void *result = inter_module_get(im_name);
-	if (!result) {
-		request_module("%s", modname);
-		result = inter_module_get(im_name);
-	}
-	return(result);
-}
-
-/**
- * inter_module_put - release use of data from another module.
- * @im_name: an arbitrary string to identify the data, must be unique
- *
- * Description: If the im_name has not been registered, complain,
- * otherwise decrement the use count on the owning module.
- */
-void inter_module_put(const char *im_name)
-{
-	struct list_head *tmp;
-	struct inter_module_entry *ime;
-
-	spin_lock(&ime_lock);
-	list_for_each(tmp, &ime_list) {
-		ime = list_entry(tmp, struct inter_module_entry, list);
-		if (strcmp(ime->im_name, im_name) == 0) {
-			if (ime->owner)
-				module_put(ime->owner);
-			spin_unlock(&ime_lock);
-			return;
-		}
-	}
-	spin_unlock(&ime_lock);
-	printk(KERN_ERR "inter_module_put: no entry for '%s'", im_name);
-	BUG();
-}
-
-EXPORT_SYMBOL(inter_module_register);
-EXPORT_SYMBOL(inter_module_unregister);
-EXPORT_SYMBOL(inter_module_get_request);
-EXPORT_SYMBOL(inter_module_put);
-
-MODULE_LICENSE("GPL");
-


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2290
retrieving revision 1.2291
diff -u -r1.2290 -r1.2291
--- kernel-2.6.spec	15 Jun 2006 18:57:56 -0000	1.2290
+++ kernel-2.6.spec	17 Jun 2006 18:59:26 -0000	1.2291
@@ -273,6 +273,7 @@
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
 Patch208: linux-2.6-x86_64-noisy-syscalls.patch
+Patch209: linux-2.6-geode-git.patch
 
 # 300 - 399   ppc(64)
 Patch302: linux-2.6-offb-find-fb.patch
@@ -425,6 +426,9 @@
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 Patch2302: linux-2.6-cpufreq-acpi-sticky.patch
 
+# MTD / JFFS2
+Patch2400: linux-2.6-mtd-git.patch
+
 # KGDB
 Patch9000: kgdb-core-lite.patch
 Patch9001: kgdb-core-lite-add-reboot-command.patch
@@ -776,6 +780,8 @@
 %patch207 -p1
 # Hush noisy unimplemented 32bit syscalls
 %patch208 -p1
+# Jordan Crouse's Geode git tree.
+%patch209 -p1
 
 #
 # ppc64
@@ -1037,6 +1043,9 @@
 # Make acpi-cpufreq sticky.
 %patch2302 -p1
 
+# MTD and JFFS2 updates
+%patch2400 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1689,9 +1698,12 @@
 %endif
 
 %changelog
+* Sat Jun 17 2006 David Woodhouse <dwmw2 at redhat.com>
+- Add Geode and MTD git trees (for OLPC)
+
 * Thu Jun 15 2006 Don Zickus <dzickus at redhat.com>
 - rhelbuild clean ups
-- add back in support for ppc and s390 (needed internally only)
+- add back in support for iSeries and s390 (needed internally only)
 
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> 
 - fix installation of -xen kernel on baremetal to be dom0 grub config



From fedora-cvs-commits at redhat.com  Sat Jun 17 19:05:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 15:05:07 -0400
Subject: rpms/glib-java/FC-5 glib-java.spec,1.30,1.31
Message-ID: <200606171905.k5HJ57le012645@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12633

Modified Files:
	glib-java.spec 
Log Message:
Go back.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- glib-java.spec	17 Jun 2006 18:12:16 -0000	1.30
+++ glib-java.spec	17 Jun 2006 19:05:03 -0000	1.31
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0.FC5.build
+Release:   0.FC5
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL



From fedora-cvs-commits at redhat.com  Sat Jun 17 19:49:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 15:49:25 -0400
Subject: rpms/glib-java/FC-5 glib-java.spec,1.31,1.32
Message-ID: <200606171949.k5HJnPfN032290@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32260

Modified Files:
	glib-java.spec 
Log Message:
Another attempt to work around brew limitations.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- glib-java.spec	17 Jun 2006 19:05:03 -0000	1.31
+++ glib-java.spec	17 Jun 2006 19:49:23 -0000	1.32
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0.FC5
+Release:   0.FC5.build2
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL



From fedora-cvs-commits at redhat.com  Sat Jun 17 21:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 17:12:11 -0400
Subject: rpms/libgtk-java/FC-5 .cvsignore, 1.17, 1.18 libgtk-java.spec, 1.47,
	1.48 sources, 1.17, 1.18 GdkCairoFix.patch, 1.1,
	NONE libgtk-java-cellrendererproperties.patch, 1.1,
	NONE libgtk-java-glib-timer-gc.patch, 1.2,
	NONE libgtk-java-treemodelsortfunctions.patch, 1.1,
	NONE libgtk-java-treerowreference.patch, 1.1, NONE
Message-ID: <200606172112.k5HLCB1x020031@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19996

Modified Files:
	.cvsignore libgtk-java.spec sources 
Removed Files:
	GdkCairoFix.patch libgtk-java-cellrendererproperties.patch 
	libgtk-java-glib-timer-gc.patch 
	libgtk-java-treemodelsortfunctions.patch 
	libgtk-java-treerowreference.patch 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Mar 2006 21:35:17 -0000	1.17
+++ .cvsignore	17 Jun 2006 21:12:08 -0000	1.18
@@ -1,3 +1 @@
-libgtk-java-2.8.2.tar.gz
-libgtk-java-2.8.3.tar.gz
-libgtk-java-2.8.3.0.20060301.rh1.tar.gz
+libgtk-java-2.8.5.tar.bz2


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/libgtk-java.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgtk-java.spec	9 May 2006 20:31:07 -0000	1.47
+++ libgtk-java.spec	17 Jun 2006 21:12:08 -0000	1.48
@@ -10,37 +10,28 @@
 %{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
-
 %define	name_base 	libgtk-java
-%define	version		2.8.3.0.20060301.rh1
-%define release 	2
-
 
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	2.8.5
+Release: 	0.FC5
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.8/%{name_base}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
-Requires:	%{java_pkg_prefix}cairo-java >= 1.0.2.0.20060301.rh1
-Requires:       %{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1
-BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.0
-BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.3
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.3
+Requires:       %{java_pkg_prefix}glib-java >= 0.2.4
+BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.3
+BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
-BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
-
-# patch that fixes occaision NPE in GdkCairo
-Patch0: GdkCairoFix.patch
-# fixes: http://sourceware.org/bugzilla/show_bug.cgi?id=2333
-Patch10: libgtk-java-glib-timer-gc.patch
+BuildRequires:  java-devel >= 1.4.2, gcc-java >= 4.1.1, docbook-utils
 
-ExcludeArch: s390x
+# ExcludeArch: s390x
 
 %description
 libgtk-java is a language binding that allows developers to write GTK
@@ -58,8 +49,7 @@
 %prep
 
 %setup -q -n %{name_base}-%{version}
-%patch0
-%patch10
+
 
 %build 
 # if either the C or Java packages has a prefix declared, then we will
@@ -77,7 +67,8 @@
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 pushd doc
@@ -105,7 +96,7 @@
 
 %post
 /sbin/ldconfig
-libgtk-java-glib-timer-gc.patch
+
 %postun
 /sbin/ldconfig
 
@@ -130,9 +121,41 @@
 
 
 %changelog
-* Tue May 09 2006 Adam jocksch <ajocksch at redhat.com> - 2.8.3.020060301.rh1-2
-- Added patches for treerowreferences, cellrendererproperties, and
-treemodelsort functions. Spec file unchanged.
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
+- Use .tar.bz2, not .tar.gz.
+
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
+- New version.
+- Remove BuildRequires:	autoconf automake libtool
+- Removed patches for treerowreferences, treemodelsort functions,
+  and cellrenderer properties.
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.8.4-4
+- Change mod time of all java source files for the src zip.
+- Add BuildRequires libtool.
+
+* Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 2.8.4-3
+- Add -X to src zip and ensure Config.java has the same mod time across
+  platforms - needed for multilib.
+
+* Thu May 11 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-2
+- Fix a typo in the Makefile.jni snippet.
+- Re-run autotools.
+
+* Wed May 10 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-1
+- Incorporated the three patches to the spec file.
+- Removed Makefile.jni from the cellrenderer patch.
+- Fixed the treerowreferences patch according to Adam's advice.
+
+* Tue May 09 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.4-0
+- Committed patches for treerowreferences, treemodelsort functions,
+and cellrenderer properties, no changes to spec file.
+
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
+- New version, which integrates both patches.
+- Remove the patches.
+- Fix typo in %post.
+- Try to build on s390x again.
 
 * Wed Mar 15 2006 Phil Muldoon <pmuldoon at redhat.com> - 2.8.3.020060301.rh1-2
 - Added libgtk-java-glib-timer-gc.patch to fix double free on Timer GC
@@ -152,7 +175,7 @@
 * Mon Jan 30 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.3-1
 - updated tarball to libgtk-java-2.8.3.tar.gz.
 
-* Thu Dec 22 2005 Andrw Cagney <cagney at redhat.com> - 2.8.2-0
+* Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> - 2.8.2-0
                   Adam Jocksch <ajocksch at redhat.com>
 - import libgtk-java-2.8.2.tar.gz
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Mar 2006 21:35:17 -0000	1.17
+++ sources	17 Jun 2006 21:12:08 -0000	1.18
@@ -1 +1 @@
-629c1c2b5f8398154a04a081539ad21f  libgtk-java-2.8.3.0.20060301.rh1.tar.gz
+5d363e03e22000b89a8facb9d6042da3  libgtk-java-2.8.5.tar.bz2


--- GdkCairoFix.patch DELETED ---


--- libgtk-java-cellrendererproperties.patch DELETED ---


--- libgtk-java-glib-timer-gc.patch DELETED ---


--- libgtk-java-treemodelsortfunctions.patch DELETED ---


--- libgtk-java-treerowreference.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:16:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:16:13 -0400
Subject: rpms/kernel/devel/configs config-generic,1.194,1.195
Message-ID: <200606172216.k5HMGD7U025053@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv23106

Modified Files:
	config-generic 
Log Message:
Drop old DiskOnChip drivers in favour of new ones



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- config-generic	17 Jun 2006 18:59:27 -0000	1.194
+++ config-generic	17 Jun 2006 22:16:10 -0000	1.195
@@ -188,12 +188,12 @@
 #
 # Disk-On-Chip Device Drivers
 #
-CONFIG_MTD_DOC2000=m
+# CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCPROBE is not set
 # CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
+# CONFIG_MTD_DOCPROBE_ADDRESS is not set
 
 #
 # NAND Flash Device Drivers
@@ -214,12 +214,11 @@
 # CONFIG_MTD_XIP is not set
 # CONFIG_MTD_ICHXROM is not set
 # CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_PLATRAM is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
 
 #
 # Parallel port support
@@ -2342,6 +2341,10 @@
 # CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:22:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:22:43 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.18,1.19
Message-ID: <200606172222.k5HMMhqa004517@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4487

Modified Files:
	libvte-java.spec 
Log Message:
Add source URL.


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libvte-java.spec	14 Jun 2006 21:38:48 -0000	1.18
+++ libvte-java.spec	17 Jun 2006 22:22:40 -0000	1.19
@@ -3,7 +3,7 @@
 Version:   0.12.0
 Release:   0
 URL:       http://java-gnome.sourceforge.net
-Source0:   %{name}-%{version}.tar.bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/libvte-java



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:24:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:24:44 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.19,1.20
Message-ID: <200606172224.k5HMOiQu005323@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5296

Modified Files:
	libvte-java.spec 
Log Message:
.


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libvte-java.spec	17 Jun 2006 22:22:40 -0000	1.19
+++ libvte-java.spec	17 Jun 2006 22:24:42 -0000	1.20
@@ -18,8 +18,6 @@
 BuildRequires:  gcc-java >= 4.1.1, docbook-utils, vte-devel >= 0.12.1
 BuildRequires: 	pkgconfig
 
-# libgtk-java is/was broken on s390x so we have to avoid it
-#ExcludeArch:	s390x
 %description 
 libvte-java is a Java wrapper library for the GNOME VTE library. Allowing access
 to the terminal widget from Java.



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:25:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:25:02 -0400
Subject: rpms/libvte-java/FC-5 .cvsignore, 1.3, 1.4 libvte-java.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <200606172225.k5HMP20p005459@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5426

Modified Files:
	.cvsignore libvte-java.spec sources 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Mar 2006 21:58:40 -0000	1.3
+++ .cvsignore	17 Jun 2006 22:25:00 -0000	1.4
@@ -1,2 +1 @@
-libvte-java-0.11.11.tar.gz
-libvte-java-0.11.11.0.20060301.rh1.tar.gz
+libvte-java-0.12.0.tar.bz2


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/libvte-java.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libvte-java.spec	1 Mar 2006 22:16:12 -0000	1.12
+++ libvte-java.spec	17 Jun 2006 22:25:00 -0000	1.13
@@ -1,25 +1,23 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
-Version:   0.11.11.0.20060301.rh1
-Release:   1.2
+Version:   0.12.0
+Release:   0.FC5
 URL:       http://java-gnome.sourceforge.net
-Source0:   %{name}-%{version}.tar.gz
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/libvte-java
 
 
 Requires: 	/sbin/ldconfig
-Requires: 	glib-java >= 0.2.3.0.20060301.rh1
-Requires:	libgtk-java >= 2.8.3.0.20060301.rh1
-Requires:	vte >= 0.11.10
-BuildRequires:  java-devel >= 1.4.2, glib-java-devel >= 0.2
-BuildRequires:	libgtk-java-devel >= 2.8.0
-BuildRequires:  gcc-java >= 3.3.3, docbook-utils, vte-devel >= 0.11.10
+Requires: 	glib-java >= 0.2.4
+Requires:	libgtk-java >= 2.8.4
+Requires:	vte >= 0.12.1
+BuildRequires:  java-devel >= 1.4.2, glib-java-devel >= 0.2.4
+BuildRequires:	libgtk-java-devel >= 2.8.4
+BuildRequires:  gcc-java >= 4.1.1, docbook-utils, vte-devel >= 0.12.1
 BuildRequires: 	pkgconfig
 
-# libgtk-java is/was broken on s390x so we have to avoid it
-ExcludeArch:	s390x
 %description 
 libvte-java is a Java wrapper library for the GNOME VTE library. Allowing access
 to the terminal widget from Java.
@@ -55,7 +53,8 @@
 jarname=$(echo -n %{name} | cut -d - -f 1 | sed "s/^lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 
@@ -97,6 +96,23 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-0
+- New version.
+- Remove libgnomeui{,-devel} and libgnomecanvas{,-devel}; upstream have
+  removed them from configure.ac.
+- Try to build on s390x again.
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 0.11.11.0.20060301.rh1-4
+- Change mod time of all java source files for the src zip.
+- Add libgnomeui{,-devel} and libgnomecanvas{,-devel}.
+
+* Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> -  0.11.11.0.20060301.rh1-3
+- Add -X to src zip and ensure Config.java has the same mod time across
+  platforms - needed for multilib.
+
+* Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.11.11.0.20060301.rh1-2
+- Rebuild
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 0.11.11.0.20060301.rh1-1.1
 - Fixed typo in Requires.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2006 21:58:40 -0000	1.3
+++ sources	17 Jun 2006 22:25:00 -0000	1.4
@@ -1 +1 @@
-69c84e4c712c2fcd7e5c4ea4dbe70c6c  libvte-java-0.11.11.0.20060301.rh1.tar.gz
+e5e5e63bb2615a3df3fa38d80616b005  libvte-java-0.12.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:27:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:27:51 -0400
Subject: rpms/libgnome-java/devel .cvsignore, 1.13, 1.14 libgnome-java.spec,
	1.34, 1.35 sources, 1.14, 1.15
Message-ID: <200606172227.k5HMRp5E006597@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6565

Modified Files:
	.cvsignore libgnome-java.spec sources 
Log Message:
- Use .tar.bz2, not tar.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Jun 2006 22:15:23 -0000	1.13
+++ .cvsignore	17 Jun 2006 22:27:49 -0000	1.14
@@ -1 +1 @@
-libgnome-java-2.12.3.tar.gz
+libgnome-java-2.12.3.tar.bz2


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgnome-java.spec	14 Jun 2006 22:15:23 -0000	1.34
+++ libgnome-java.spec	17 Jun 2006 22:27:49 -0000	1.35
@@ -11,17 +11,15 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libgnome-java
-%define	version		2.12.3
-%define release 	0
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
-Version:	%{version}
-Release: 	%{release}
+Version:	2.12.3
+Release: 	0
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgnomeui >= 2.11.0
@@ -34,9 +32,6 @@
 BuildRequires:	libgtk-java-devel >= 2.8.4, java-devel >= 1.4.2
 BuildRequires:	glib-java-devel >= 0.2.4
 
-# exclude while 390x is borked on beehive
-#ExcludeArch: s390x
-
 %description
 libgnome-java is a language binding that allows developers to write
 GNOME applications in Java.  It is part of Java-GNOME.
@@ -112,6 +107,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
+- Use .tar.bz2, not tar.gz.
+
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	14 Jun 2006 22:15:23 -0000	1.14
+++ sources	17 Jun 2006 22:27:49 -0000	1.15
@@ -1 +1 @@
-3308b2ca4e509c693b93dcc57c287ebf  libgnome-java-2.12.3.tar.gz
+38cf6c95d7882ffcaffd3ec7c05ff10a  libgnome-java-2.12.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:28:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:28:44 -0400
Subject: rpms/libgnome-java/FC-5 .cvsignore, 1.11, 1.12 libgnome-java.spec,
	1.30, 1.31 sources, 1.12, 1.13
Message-ID: <200606172228.k5HMSiWe006957@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6932

Modified Files:
	.cvsignore libgnome-java.spec sources 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Mar 2006 21:41:20 -0000	1.11
+++ .cvsignore	17 Jun 2006 22:28:42 -0000	1.12
@@ -1,2 +1 @@
-libgnome-java-2.12.1.tar.gz
-libgnome-java-2.12.1.0.20060301.rh1.tar.gz
+libgnome-java-2.12.3.tar.bz2


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/libgnome-java.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgnome-java.spec	1 Mar 2006 21:41:20 -0000	1.30
+++ libgnome-java.spec	17 Jun 2006 22:28:42 -0000	1.31
@@ -11,28 +11,26 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libgnome-java
-%define	version		2.12.1.0.20060301.rh1
-%define release 	0
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
-Version:	%{version}
-Release: 	%{release}
+Version:	2.12.3
+Release: 	0.FC5
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libgnome >= 2.10.0
-Requires:	libgtk-java >= 2.8.3.0.20060301.rh1
-Requires: 	glib-java >= 0.2.3.0.20060301.rh1
-BuildRequires:  libgnome-devel >= 2.10.0, gcc-java >= 3.3.3, docbook-utils
-BuildRequires:  libgtk-java-devel >= 2.8.0, java-devel >= 1.4.2
-BuildRequires:	glib-java-devel >= 0.2
-
-# exclude while 390x is borked on beehive
-ExcludeArch: s390x
+Requires:	libgnomeui >= 2.11.0
+Requires:	libgnomecanvas >= 2.11.0
+Requires:	libgtk-java >= 2.8.4
+Requires: 	glib-java >= 0.2.4
+BuildRequires:	libgnomeui-devel >= 2.11.0
+BuildRequires:	libgnomecanvas-devel >= 2.11.0
+BuildRequires:	gcc-java >= 4.1.1, docbook-utils
+BuildRequires:	libgtk-java-devel >= 2.8.4, java-devel >= 1.4.2
+BuildRequires:	glib-java-devel >= 0.2.4
 
 %description
 libgnome-java is a language binding that allows developers to write
@@ -65,7 +63,8 @@
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 %install
@@ -108,6 +107,24 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
+- Use .tar.bz2, not tar.gz.
+
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
+- New version.
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.2-2
+- Change mod time of all java source files for the src zip.
+
+* Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.2-1
+- Add -X to src zip and ensure Config.java has the same mod time across
+  platforms - needed for multilib.
+
+* Tue May  2 2006 Stepan Kasal <skasal at redhat.com>    - 2.12.2-0
+- New upstream version.
+- Fix the (Build)Requires according to the configure.ac.
+- Try to build on s390x again.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 2.12.1.0.20060301.rh1-0
 - Imported new tarball to address bug 183538, updated dependancies.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Mar 2006 21:41:20 -0000	1.12
+++ sources	17 Jun 2006 22:28:42 -0000	1.13
@@ -1 +1 @@
-8bdee0a6e5c28dd18b3eb38cdc8a356a  libgnome-java-2.12.1.0.20060301.rh1.tar.gz
+38cf6c95d7882ffcaffd3ec7c05ff10a  libgnome-java-2.12.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:37:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:37:44 -0400
Subject: rpms/libglade-java/devel .cvsignore, 1.14, 1.15 libglade-java.spec,
	1.38, 1.39 sources, 1.15, 1.16
Message-ID: <200606172237.k5HMbiiE008404@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8371

Modified Files:
	.cvsignore libglade-java.spec sources 
Log Message:
- Use .tar.bz2 instead of .tar.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	14 Jun 2006 22:11:57 -0000	1.14
+++ .cvsignore	17 Jun 2006 22:37:41 -0000	1.15
@@ -1 +1 @@
-libglade-java-2.12.4.tar.gz
+libglade-java-2.12.4.tar.bz2


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libglade-java.spec	14 Jun 2006 22:11:57 -0000	1.38
+++ libglade-java.spec	17 Jun 2006 22:37:41 -0000	1.39
@@ -11,17 +11,15 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libglade-java
-%define	version		2.12.4
-%define release 	0
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	2.12.4
+Release: 	0
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libglade2 >= 2.5.1
@@ -37,9 +35,6 @@
 BuildRequires:  libgnomecanvas-devel >= 2.11.0 
 BuildRequires:  docbook-utils
 
-# exclude while beehive s390x is borked
-#ExcludeArch: s390x
-
 %description
 libglade-java is a language binding that allows developers to write
 Java applications that use libglade.  It is part of Java-GNOME.
@@ -123,6 +118,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
+- Use .tar.bz2 instead of .tar.gz.
+
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Jun 2006 22:11:57 -0000	1.15
+++ sources	17 Jun 2006 22:37:42 -0000	1.16
@@ -1 +1 @@
-e63c7d4efc3caf9af0fb9ad4d2fc32e9  libglade-java-2.12.4.tar.gz
+2427ad75063ea45a8b580615b7553bde  libglade-java-2.12.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 22:38:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 18:38:52 -0400
Subject: rpms/libglade-java/FC-5 .cvsignore, 1.12, 1.13 libglade-java.spec,
	1.31, 1.32 sources, 1.13, 1.14
Message-ID: <200606172238.k5HMcqQ8008803@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8776

Modified Files:
	.cvsignore libglade-java.spec sources 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Mar 2006 21:51:35 -0000	1.12
+++ .cvsignore	17 Jun 2006 22:38:50 -0000	1.13
@@ -1,3 +1 @@
-libglade-java-2.12.1.tar.gz
-libglade-java-2.12.2.tar.gz
-libglade-java-2.12.2.0.20060301.rh1.tar.gz
+libglade-java-2.12.4.tar.bz2


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/libglade-java.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libglade-java.spec	1 Mar 2006 22:14:05 -0000	1.31
+++ libglade-java.spec	17 Jun 2006 22:38:50 -0000	1.32
@@ -11,29 +11,29 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libglade-java
-%define	version		2.12.2.0.20060301.rh1
-%define release 	1
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	2.12.4
+Release: 	0.FC5
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libglade2 >= 2.5.0
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.3.0.20060301.rh1
-Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.1.0.20060301.rh1
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.3
-BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.0
-BuildRequires:  libglade2-devel >= 2.5.0, gcc-java >= 3.3.3
+Requires:	libglade2 >= 2.5.1
+Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
+Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.2
+Requires:       libgnomeui >= 2.11.0
+Requires:       libgnomecanvas >= 2.11.0
+BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
+BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.2
+BuildRequires:  libglade2-devel >= 2.5.1, gcc-java >= 4.1.1
 BuildRequires:	java-devel >= 1.4.2
-
-# exclude while beehive s390x is borekd
-ExcludeArch: s390x
+BuildRequires:  libgnomeui-devel >= 2.11.0
+BuildRequires:  libgnomecanvas-devel >= 2.11.0 
+BuildRequires:  docbook-utils
 
 %description
 libglade-java is a language binding that allows developers to write
@@ -64,12 +64,17 @@
 mkdir -p doc/api/
 make
 
+# need to remove date string for multilib
+rm doc/api/gjdoc.properties
+sed --in-place "s/, on.*GMT\./\./" doc/api/about.html
+
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 %install
@@ -113,6 +118,26 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
+- Use .tar.bz2 instead of .tar.gz.
+
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
+- New version.
+
+* Wed Jun 14 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.3-3
+- Remove date strings from javadocs for multilib compatibility.
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.3-2
+- Change mod time of all java source files for the src zip.
+
+* Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.3-1
+- Add -X to src zip and ensure Config.java has the same mod time across
+  platforms - needed for multilib.
+
+* Sat Apr 29 2006 Stepan Kasal <skasal at redhat.com>    - 2.12.3-0
+- New version.
+- Try to build on s390x again.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 2.12.2.0.20060301.rh1-1
 - Bumped release, fixed typo in Requires.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Mar 2006 21:51:35 -0000	1.13
+++ sources	17 Jun 2006 22:38:50 -0000	1.14
@@ -1 +1 @@
-b396f44662ed22cde1f5a22220e663c0  libglade-java-2.12.2.0.20060301.rh1.tar.gz
+2427ad75063ea45a8b580615b7553bde  libglade-java-2.12.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jun 17 23:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 17 Jun 2006 19:46:44 -0400
Subject: rpms/frysk/FC-5 frysk-elf-cxx.patch, NONE,
	1.1 frysk-non-intermediate.patch, NONE, 1.1 frysk-sscanf.patch,
	NONE, 1.1 frysk-static-link.patch, NONE,
	1.1 frysk-unistd.patch, NONE, 1.1 frysk_syscall.patch, NONE,
	1.1 frysk.spec, 1.37, 1.38 sources, 1.11,
	1.12 frysk-Makefile-rules-noxmltest.patch, 1.1,
	NONE frysk-makefileam.patch, 1.1, NONE
Message-ID: <200606172346.k5HNkivH004276@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3878

Modified Files:
	frysk.spec sources 
Added Files:
	frysk-elf-cxx.patch frysk-non-intermediate.patch 
	frysk-sscanf.patch frysk-static-link.patch frysk-unistd.patch 
	frysk_syscall.patch 
Removed Files:
	frysk-Makefile-rules-noxmltest.patch frysk-makefileam.patch 
Log Message:
New version.

frysk-elf-cxx.patch:
 Elf.cxx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE frysk-elf-cxx.patch ---
Index: frysk-imports/lib/elf/cni/Elf.cxx
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/elf/cni/Elf.cxx,v
retrieving revision 1.8
diff -u -r1.8 Elf.cxx
--- frysk-imports/lib/elf/cni/Elf.cxx	5 Jun 2006 14:58:10 -0000	1.8
+++ frysk-imports/lib/elf/cni/Elf.cxx	15 Jun 2006 21:23:43 -0000
@@ -125,7 +125,7 @@
 
 jstring
 lib::elf::Elf::elf_getident (jlong ptr){
-	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) &ptr);
+	char* ident = ::elf_getident((::Elf*) pointer, (size_t*) (long) &ptr);
 	return JvNewString((const jchar*) ident, strlen(ident));
 }
 
@@ -202,12 +202,12 @@
 
 jint
 lib::elf::Elf::elf_getshnum (jlong dst){
-	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) &dst);
+	return ::elf_getshnum((::Elf*) this->pointer, (size_t*) (long) &dst);
 }
 
 jint
 lib::elf::Elf::elf_getshstrndx (jlong dst){
-	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) &dst);
+	return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) (long) &dst);
 }
 
 jint
@@ -248,7 +248,7 @@
 
 jlong
 lib::elf::Elf::elf_getarsym (jlong ptr){
-	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) &ptr);
+	return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) (long) &ptr);
 }
 
 jint
@@ -258,7 +258,7 @@
 
 jstring
 lib::elf::Elf::elf_rawfile (jlong ptr){
-	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) &ptr);
+	char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) (long) &ptr);
 	return JvNewString((const jchar*) file, strlen(file));
 }
 

frysk-non-intermediate.patch:
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE frysk-non-intermediate.patch ---
Index: frysk-imports/elfutils/backends/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/backends/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- frysk-imports/elfutils/backends/Makefile.am	8 May 2006 20:49:15 -0000	1.1.1.1
+++ frysk-imports/elfutils/backends/Makefile.am	16 Jun 2006 01:54:20 -0000
@@ -35,7 +35,6 @@
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 	   -I$(top_srcdir)/lib -I..
-PACKAGE_VERSION = @PACKAGE_VERSION@
 
 
 modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390
@@ -46,6 +45,8 @@
 noinst_LIBRARIES = $(libebl_pic)
 noinst_DATA = $(libebl_pic:_pic.a=.so)
 
+# Workaround a bug in GNU make:
+non-intermidate: $(libebl_pic:_pic.a=.map)
 
 if MUDFLAP
 libelf = ../libelf/libelf.a

frysk-sscanf.patch:
 line2addr.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE frysk-sscanf.patch ---
Index: ./frysk-imports/elfutils/tests/line2addr.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/tests/line2addr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 line2addr.c
--- ./frysk-imports/elfutils/tests/line2addr.c	8 May 2006 20:48:53 -0000	1.1.1.1
+++ ./frysk-imports/elfutils/tests/line2addr.c	15 Jun 2006 18:19:57 -0000
@@ -131,19 +131,18 @@
   for (; cnt < argc; ++cnt)
     {
       struct args a = { .arg = argv[cnt] };
+      char *c = strchr (a.arg, ':');
 
-      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
-	{
-	default:
-	case 0:
-	  printf ("ignored %s\n", argv[cnt]);
-	  continue;
-	case 1:
-	  a.line = 0;
-	  break;
-	case 2:
-	  break;
-	}
+      if (a.arg == NULL) {
+	printf ("ignored %s\n", a.arg);
+	continue;
+      } else if (c == NULL) {
+	a.file = strdup (a.arg);
+	a.line = 0;
+      } else {
+	a.file = strndup (a.arg, c - a.arg);
+	a.line = strtol (c + 1, NULL, 10);
+      }
 
       (void) dwfl_getdwarf (dwfl, &handle_module, &a, 0);
 

frysk-static-link.patch:
 frysk-core/Makefile.am    |    5 +++--
 frysk-gui/ChangeLog       |    5 +++++
 frysk-gui/Makefile.am     |    5 +++--
 frysk-imports/Makefile.am |    5 +++--
 frysk-sys/Makefile.am     |    5 +++--
 5 files changed, 17 insertions(+), 8 deletions(-)

--- NEW FILE frysk-static-link.patch ---
Index: ./frysk-core/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-core/Makefile.am,v
retrieving revision 1.51
diff -u -r1.51 Makefile.am
--- ./frysk-core/Makefile.am	13 Jun 2006 13:44:37 -0000	1.51
+++ ./frysk-core/Makefile.am	16 Jun 2006 03:28:37 -0000
@@ -78,9 +78,10 @@
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jdom.a
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-cdtparser.a 
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
 GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
 GEN_GCJ_LDADD += -lopcodes
 
 # XXX: This needs to be make less-architecture independant.
Index: ./frysk-gui/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-gui/ChangeLog,v
retrieving revision 1.66
diff -u -r1.66 ChangeLog
--- ./frysk-gui/ChangeLog	14 Jun 2006 22:57:01 -0000	1.66
+++ ./frysk-gui/ChangeLog	16 Jun 2006 03:28:37 -0000
@@ -1,3 +1,8 @@
+2006-06-15  Andrew Cagney  <cagney at redhat.com>
+
+	* Makefile.am (GEN_GCJ_LDADD): Specify static elfutil libraries,
+	re-order and add libebl/libebl.a.
+
 2006-06-15  Stepan Kasal  <kasal at ucw.cz>
 
 	* Makefile.am (noinst_PROGRAMS): remove .../frysk_suite.sh; shell
Index: ./frysk-gui/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-gui/Makefile.am,v
retrieving revision 1.53
diff -u -r1.53 Makefile.am
--- ./frysk-gui/Makefile.am	14 Jun 2006 22:57:01 -0000	1.53
+++ ./frysk-gui/Makefile.am	16 Jun 2006 03:28:37 -0000
@@ -69,9 +69,10 @@
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a 
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a 
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jline.a 
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
 GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
 GEN_GCJ_LDADD += ../frysk-gtk/libfrysk-ftk.a
 GEN_GCJ_LDADD += -L../frysk-gtk/EggTrayIcon
 GEN_GCJ_LDADD += -L../frysk-gtk/tlwidgets
Index: ./frysk-imports/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/Makefile.am,v
retrieving revision 1.53
diff -u -r1.53 Makefile.am
--- ./frysk-imports/Makefile.am	15 Jun 2006 18:50:50 -0000	1.53
+++ ./frysk-imports/Makefile.am	16 Jun 2006 03:28:37 -0000
@@ -62,9 +62,10 @@
 GEN_CLASSPATH += junit.jar
 GEN_GCJ_LDADD += libfrysk-jargs.a
 GEN_GCJ_LDADD += libfrysk-junit.a
-GEN_GCJ_LDADD += -Lelfutils/libelf -lelf
-GEN_GCJ_LDADD += -Lelfutils/libdw -ldw
 GEN_GCJ_LDADD += ./elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ./elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ./elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ./elfutils/libelf/libelf.a
 GEN_GCJ_LDADD += -lopcodes
 
 all-local: lib/elf/tests/test-core lib/elf/tests/helloworld.o
Index: ./frysk-sys/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-sys/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- ./frysk-sys/Makefile.am	13 Jun 2006 13:44:37 -0000	1.20
+++ ./frysk-sys/Makefile.am	16 Jun 2006 03:28:39 -0000
@@ -51,7 +51,8 @@
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-imports.a
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a
 GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
 GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
 GEN_GCJ_LDADD += -lopcodes


frysk-unistd.patch:
 frysk-core/prog/kill/suspend.c     |    1 +
 frysk-sys/frysk/sys/cni/Signal.cxx |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE frysk-unistd.patch ---
Index: frysk-sys/frysk/sys/cni/Signal.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Signal.cxx,v
retrieving revision 1.4
diff -u -r1.4 Signal.cxx
--- frysk-sys/frysk/sys/cni/Signal.cxx	10 Mar 2006 00:18:53 -0000	1.4
+++ frysk-sys/frysk/sys/cni/Signal.cxx	15 Jun 2006 22:48:04 -0000
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <linux/unistd.h>
+#include <unistd.h>
 #include <errno.h>
 
 #include <gcj/cni.h>
Index: frysk-core/prog/kill/suspend.c
===================================================================
RCS file: /cvs/frysk/frysk-core/prog/kill/suspend.c,v
retrieving revision 1.6
diff -u -r1.6 suspend.c
--- frysk-core/prog/kill/suspend.c	26 Jan 2006 21:09:45 -0000	1.6
+++ frysk-core/prog/kill/suspend.c	15 Jun 2006 23:16:57 -0000
@@ -45,6 +45,7 @@
 #include <linux/unistd.h>
 #include <limits.h>
 #include <pthread.h>
+#include <unistd.h>
 
 pthread_mutex_t start;
 pthread_mutex_t stop;

frysk_syscall.patch:
 frysk-core/frysk/pkglibexecdir/funit-syscallint.c                 |    7 ++++
 frysk-core/frysk/pkglibexecdir/util.h                             |   15 ++++++++++
 frysk-core/prog/kill/detach.c                                     |   15 ++++++++++
 frysk-imports/tests/frysk2595/ptrace_after_exec.c                 |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c       |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c  |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c |    7 ++++
 frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c          |    7 ++++
 frysk-imports/tests/process/multi_child_exec.c                    |    8 +++++
 frysk-imports/tests/process/multi_child_parent_exec.c             |    8 +++++
 frysk-imports/tests/process/multi_parent_exec.c                   |    8 +++++
 frysk-imports/tests/process/single_exec.c                         |    8 +++++
 frysk-sys/frysk/sys/cni/Poll.cxx                                  |    8 +++++
 frysk-sys/frysk/sys/cni/Tid.cxx                                   |    8 +++++
 14 files changed, 120 insertions(+)

--- NEW FILE frysk_syscall.patch ---
Index: frysk-core/frysk/pkglibexecdir/funit-syscallint.c
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/pkglibexecdir/funit-syscallint.c,v
retrieving revision 1.4
diff -u -r1.4 funit-syscallint.c
--- frysk-core/frysk/pkglibexecdir/funit-syscallint.c	10 Feb 2006 19:31:11 -0000	1.4
+++ frysk-core/frysk/pkglibexecdir/funit-syscallint.c	15 Jun 2006 16:23:37 -0000
@@ -47,6 +47,13 @@
 
 int childPid;
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, pid_t, tid, int, sig);
 
 void handler (int sig) {
Index: frysk-core/frysk/pkglibexecdir/util.h
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/pkglibexecdir/util.h,v
retrieving revision 1.2
diff -u -r1.2 util.h
--- frysk-core/frysk/pkglibexecdir/util.h	15 Apr 2006 04:10:29 -0000	1.2
+++ frysk-core/frysk/pkglibexecdir/util.h	15 Jun 2006 16:23:37 -0000
@@ -41,8 +41,23 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <linux/unistd.h>
+#include <unistd.h>
 #include <stdlib.h>
 
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall0(pid_t, gettid);
 _syscall2(int, tkill, pid_t, tid, int, sig);
 
Index: frysk-core/prog/kill/detach.c
===================================================================
RCS file: /cvs/frysk/frysk-core/prog/kill/detach.c,v
retrieving revision 1.6
diff -u -r1.6 detach.c
--- frysk-core/prog/kill/detach.c	26 Jan 2006 18:53:28 -0000	1.6
+++ frysk-core/prog/kill/detach.c	15 Jun 2006 16:23:37 -0000
@@ -46,10 +46,25 @@
 #include <errno.h>
 #include <sys/select.h>
 #include <linux/unistd.h>
+#include <unistd.h>
 #include <limits.h>
 #include <pthread.h>
 #include <string.h>
 
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 
 // Simple sleep for roughly SECONDS and then exit.
 
Index: frysk-imports/tests/frysk2595/ptrace_after_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_exec.c,v
retrieving revision 1.2
diff -u -r1.2 ptrace_after_exec.c
--- frysk-imports/tests/frysk2595/ptrace_after_exec.c	22 Apr 2006 21:11:26 -0000	1.2
+++ frysk-imports/tests/frysk2595/ptrace_after_exec.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c,v
retrieving revision 1.2
diff -u -r1.2 ptrace_after_exec_of_thread.c
--- frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c	22 Apr 2006 21:11:26 -0000	1.2
+++ frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c,v
retrieving revision 1.4
diff -u -r1.4 ptrace_after_forked_thread_exits.c
--- frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c	25 Apr 2006 20:19:11 -0000	1.4
+++ frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c	15 Jun 2006 16:23:46 -0000
@@ -52,6 +52,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c,v
retrieving revision 1.3
diff -u -r1.3 ptrace_before_forked_thread_exits.c
--- frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c	25 Apr 2006 20:19:11 -0000	1.3
+++ frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pthread_barrier_t child_ready_for_ptrace;
Index: frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c,v
retrieving revision 1.3
diff -u -r1.3 ptrace_peek_wrong_thread.c
--- frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c	25 Apr 2006 20:19:11 -0000	1.3
+++ frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c	15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
 
 #define __REENTRANT
 
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
+
 _syscall2(int, tkill, int, tid, int, sig);
 
 pid_t c_pid;
Index: frysk-imports/tests/process/multi_child_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_child_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_child_exec.c
--- frysk-imports/tests/process/multi_child_exec.c	8 Mar 2006 04:24:02 -0000	1.3
+++ frysk-imports/tests/process/multi_child_exec.c	15 Jun 2006 16:23:47 -0000
@@ -9,6 +9,14 @@
 #include <linux/unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid)
 
 #define NUM_THREADS 2
Index: frysk-imports/tests/process/multi_child_parent_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_child_parent_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_child_parent_exec.c
--- frysk-imports/tests/process/multi_child_parent_exec.c	8 Mar 2006 04:24:02 -0000	1.3
+++ frysk-imports/tests/process/multi_child_parent_exec.c	15 Jun 2006 16:23:47 -0000
@@ -10,6 +10,14 @@
 #include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid);
 
 #define NUM_THREADS 2
Index: frysk-imports/tests/process/multi_parent_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_parent_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_parent_exec.c
--- frysk-imports/tests/process/multi_parent_exec.c	8 Mar 2006 04:24:02 -0000	1.3
+++ frysk-imports/tests/process/multi_parent_exec.c	15 Jun 2006 16:23:47 -0000
@@ -9,6 +9,14 @@
 #include <linux/unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid)
 
 #define NUM_THREADS 2
Index: frysk-imports/tests/process/single_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/single_exec.c,v
retrieving revision 1.2
diff -u -r1.2 single_exec.c
--- frysk-imports/tests/process/single_exec.c	8 Feb 2006 22:02:58 -0000	1.2
+++ frysk-imports/tests/process/single_exec.c	15 Jun 2006 16:23:47 -0000
@@ -7,6 +7,14 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <linux/unistd.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
+
 _syscall0(pid_t,gettid)
 
 int
Index: frysk-sys/frysk/sys/cni/Poll.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Poll.cxx,v
retrieving revision 1.9
diff -u -r1.9 Poll.cxx
--- frysk-sys/frysk/sys/cni/Poll.cxx	9 Apr 2006 17:40:08 -0000	1.9
+++ frysk-sys/frysk/sys/cni/Poll.cxx	15 Jun 2006 16:23:47 -0000
@@ -46,6 +46,14 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <linux/unistd.h>
+#include <unistd.h>
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+        return syscall(__NR_##name, arg1, arg2);\
+}
 
 _syscall2(int, tkill, pid_t, tid, int, sig);
 
Index: frysk-sys/frysk/sys/cni/Tid.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Tid.cxx,v
retrieving revision 1.1
diff -u -r1.1 Tid.cxx
--- frysk-sys/frysk/sys/cni/Tid.cxx	8 Oct 2005 15:37:53 -0000	1.1
+++ frysk-sys/frysk/sys/cni/Tid.cxx	15 Jun 2006 16:23:47 -0000
@@ -39,6 +39,14 @@
 
 #include <sys/types.h>
 #include <linux/unistd.h>
+#include <unistd.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+        return syscall(__NR_##name);\
+}
 
 _syscall0(pid_t,gettid)
 


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/frysk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- frysk.spec	18 May 2006 12:01:20 -0000	1.37
+++ frysk.spec	17 Jun 2006 23:46:42 -0000	1.38
@@ -1,31 +1,42 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.02.19.rh2
-Release:	0.FC5.3
+Version:	0.0.1.2006.06.15.rh4
+Release:	0.FC5
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
-Patch1:		frysk-Makefile-rules-noxmltest.patch
+
+Patch0:		frysk_syscall.patch
+Patch1:		frysk-sscanf.patch
+Patch2:		frysk-elf-cxx.patch
+Patch3:		frysk-unistd.patch
+Patch4:		frysk-non-intermediate.patch
+Patch5:		frysk-static-link.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libgtk-java >= 2.8.3.0.20060301.rh1
-Requires:   	libglade-java >= 2.12.2.0.20060301.rh1
-Requires: 	libvte-java >= 0.11.11.0.20060301.rh1
+Requires:	libgtk-java >= 2.8.4
+Requires:   	libglade-java >= 2.12.3
+Requires: 	libvte-java >= 0.12.0
+BuildRequires:  gcc-java >= 4.1.1
 BuildRequires:	junit >= 3.8.1
 BuildRequires:  antlr >= 2.7.4 
-BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	jdom >= 1.0
-BuildRequires:  libgtk-java-devel >= 2.8.3.0.20060301.rh1
-BuildRequires:	libglade-java-devel >= 2.12.2.0.20060301.rh1
-BuildRequires:  cairo-java-devel >= 1.0.2.0.20060301.rh1
+BuildRequires:  libgtk-java-devel >= 2.8.4
+BuildRequires:	libglade-java-devel >= 2.12.3
+BuildRequires:  cairo-java-devel >= 1.0.3
 BuildRequires:  cairo-devel >= 1.0.0
 BuildRequires:  gtk2-devel >= 2.8.0
-BuildRequires:	libvte-java-devel >= 0.11.11.0.20060301.rh1
-BuildRequires:  vte-devel >= 0.11.11
+BuildRequires:	libglade2-devel >= 2.5.1
+BuildRequires:	libgconf-java-devel
+BuildRequires:	libvte-java-devel >= 0.12.0
+BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
 BuildRequires:  gmime
+BuildRequires:	transfig >= 3.2.0 
+BuildRequires:  ghostscript
+BuildRequires:  autoconf automake
 
 # We can only build on i386 for now
 ExclusiveArch: %{ix86} x86_64
@@ -39,10 +50,13 @@
 process in the system.
 
 %prep
-
 %setup -q -n %{name}-%{version}
-%patch1 -p0 -b .noxmltest
-./autogen.sh
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
 
 %build 
 
@@ -58,7 +72,17 @@
 export JAVA=${JAVA:-/usr/bin/gij}
 export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
-%configure
+gcc --version
+
+./bootstrap.sh
+
+# FIXME: Warninggs should be fixed, not suppressed:
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
+%configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
+
+# Build system can end up with corrupt xmllint files:
+touch frysk-gui/glade.catalog
+touch frysk-gui/glade.checked
 
 make %{?_smp_mflags}
 
@@ -67,6 +91,52 @@
 rm -rf %{buildroot}
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
+# FIXME: remove the unwanted files:
+unwanted='usr/bin/addr2line
+   usr/bin/elfcmp
+   usr/bin/elflint
+   usr/bin/findtextrel
+   usr/bin/ld
+   usr/bin/nm
+   usr/bin/objdump
+   usr/bin/ranlib
+   usr/bin/readelf
+   usr/bin/size
+   usr/bin/strings
+   usr/bin/strip
+   usr/include/dwarf.h
+   usr/include/elfutils/elf-knowledge.h
+   usr/include/elfutils/libasm.h
+   usr/include/elfutils/libdw.h
+   usr/include/elfutils/libdwfl.h
+   usr/include/elfutils/libebl.h
+   usr/include/gelf.h
+   usr/include/libelf.h
+   usr/include/nlist.h
+   usr/lib{,64}/elfutils/libebl_alpha-0.120.so
+   usr/lib{,64}/elfutils/libebl_alpha.so
+   usr/lib{,64}/elfutils/libebl_arm-0.120.so
+   usr/lib{,64}/elfutils/libebl_arm.so
+   usr/lib{,64}/elfutils/libebl_i386-0.120.so
+   usr/lib{,64}/elfutils/libebl_i386.so
+   usr/lib{,64}/elfutils/libebl_ia64-0.120.so
+   usr/lib{,64}/elfutils/libebl_ia64.so
+   usr/lib{,64}/elfutils/libebl_ppc-0.120.so
+   usr/lib{,64}/elfutils/libebl_ppc.so
+   usr/lib{,64}/elfutils/libebl_ppc64-0.120.so
+   usr/lib{,64}/elfutils/libebl_ppc64.so
+   usr/lib{,64}/elfutils/libebl_s390-0.120.so
+   usr/lib{,64}/elfutils/libebl_s390.so
+   usr/lib{,64}/elfutils/libebl_sh-0.120.so
+   usr/lib{,64}/elfutils/libebl_sh.so
+   usr/lib{,64}/elfutils/libebl_sparc-0.120.so
+   usr/lib{,64}/elfutils/libebl_sparc.so
+   usr/lib{,64}/elfutils/libebl_x86_64-0.120.so
+   usr/lib{,64}/elfutils/libebl_x86_64.so
+   usr/lib{,64}/lib{asm,dw,ebl,elf}*
+'
+(cd $RPM_BUILD_ROOT && eval rm $unwanted)
+
 # For moment, keep off menu (but if someone wants to enable it they
 # can).
 echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
@@ -94,6 +164,36 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
+- Add the non-intermediate hack.
+- Remove more unwanted files.
+- Add patch to link statically with libelf; remove elfutils libraries.
+
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
+- Suppress warnings caused by _FORTIFY_SOURCE=2
+- Remove unwanted files.
+
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-1
+- Add BuildRequires: libgconf-java-devel
+- Update frysk-unistd.patch
+
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-0
+- Refresh the tarball.
+- Patch to fix Elf.cxx on 64bit.
+- Anoter patch required by new linux/unistd.h.
+- Add BuildRequires: ghostscript
+
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
+- Patch for new linux/unistd.h.
+- Patch to avoid scanf("%a[..]").
+
+* Thu Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
+- New upstream version.
+- Add BuildRequires: libglade2-devel >= 2.5.1
+- Refresh other BuildRequires.
+- Replace the noxmltest.patch patch by two touch commands.
+- Add BuildRequires: autoconf automake, BuildRequires: gcc-java >= 4.1.1
+
 * Thu May 18 2006 Stepan Kasal <skasal at redhat.com>    - 0.0.1.2006.02.19.rh2-0.FC5.3
 - Add gmime to BuildRequires.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Mar 2006 21:14:47 -0000	1.11
+++ sources	17 Jun 2006 23:46:42 -0000	1.12
@@ -1 +1 @@
-01dba74491b570ebbbfa7cc41ba9fe06  frysk-0.0.1.2006.02.19.rh2.tar.bz2
+177ecac75e299933d845f3519ad2bee3  frysk-0.0.1.2006.06.15.rh4.tar.bz2


--- frysk-Makefile-rules-noxmltest.patch DELETED ---


--- frysk-makefileam.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 18 04:25:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 18 Jun 2006 00:25:02 -0400
Subject: rpms/kernel/devel linux-2.6.17.tar.bz2.sign, NONE, 1.1 .cvsignore,
	1.455, 1.456 kernel-2.6.spec, 1.2291, 1.2292 sources, 1.399,
	1.400 upstream, 1.364, 1.365 linux-2.6.16.tar.bz2.sign, 1.1,
	NONE patch-2.6.17-rc6-git7.bz2.sign, 1.1,
	NONE patch-2.6.17-rc6.bz2.sign, 1.1, NONE
Message-ID: <200606180425.k5I4P2ra024195@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24150

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6.17.tar.bz2.sign 
Removed Files:
	linux-2.6.16.tar.bz2.sign patch-2.6.17-rc6-git7.bz2.sign 
	patch-2.6.17-rc6.bz2.sign 
Log Message:
2.6.17



--- NEW FILE linux-2.6.17.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBElLc9yGugalF9Dw4RAsplAJ9Vhjp8IgkMBdGdiYygXtYBcKZ6GwCffyTu
+gY8wsoFmSdAU6UiqakOcyo=
=hcew
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- .cvsignore	14 Jun 2006 19:29:19 -0000	1.455
+++ .cvsignore	18 Jun 2006 04:24:51 -0000	1.456
@@ -1,7 +1,5 @@
 kernel-2.6.*.config
 temp-*
-kernel-2.6.16
-linux-2.6.16.tar.bz2
-patch-2.6.17-rc6.bz2
+kernel-2.6.17
 xen-20060610.tar.bz2
-patch-2.6.17-rc6-git7.bz2
+linux-2.6.17.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2291
retrieving revision 1.2292
diff -u -r1.2291 -r1.2292
--- kernel-2.6.spec	17 Jun 2006 18:59:26 -0000	1.2291
+++ kernel-2.6.spec	18 Jun 2006 04:24:51 -0000	1.2292
@@ -25,7 +25,7 @@
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 16
+%define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define tag FC6
@@ -249,8 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-rc6.bz2
-Patch2: patch-2.6.17-rc6-git7.bz2
+#Patch1: patch-2.6.17-rc6.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -740,8 +739,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1698,6 +1696,9 @@
 %endif
 
 %changelog
+* Sun Jun 18 2006 Dave Jones <davej at redhat.com>
+- 2.6.17
+
 * Sat Jun 17 2006 David Woodhouse <dwmw2 at redhat.com>
 - Add Geode and MTD git trees (for OLPC)
 
@@ -1705,7 +1706,7 @@
 - rhelbuild clean ups
 - add back in support for iSeries and s390 (needed internally only)
 
-* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> 
+* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com>
 - fix installation of -xen kernel on baremetal to be dom0 grub config
 
 * Wed Jun 14 2006 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- sources	14 Jun 2006 19:29:20 -0000	1.399
+++ sources	18 Jun 2006 04:24:53 -0000	1.400
@@ -1,4 +1,2 @@
-9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-e9e67a364bdc5d52e0fe22a222bf675e  patch-2.6.17-rc6.bz2
+37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-0e62cac08ee7470cc8b6fa0b03b21856  patch-2.6.17-rc6-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- upstream	14 Jun 2006 19:29:20 -0000	1.364
+++ upstream	18 Jun 2006 04:24:53 -0000	1.365
@@ -1,3 +1 @@
-linux-2.6.16.tar.bz2
-patch-2.6.17-rc6.bz2
-patch-2.6.17-rc6-git7.bz2
+linux-2.6.17.tar.bz2


--- linux-2.6.16.tar.bz2.sign DELETED ---


--- patch-2.6.17-rc6-git7.bz2.sign DELETED ---


--- patch-2.6.17-rc6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 18 04:35:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 18 Jun 2006 00:35:39 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2292,1.2293
Message-ID: <200606180435.k5I4ZdSn025715@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25658

Modified Files:
	kernel-2.6.spec 
Log Message:
brew exposed a race condition.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2292
retrieving revision 1.2293
diff -u -r1.2292 -r1.2293
--- kernel-2.6.spec	18 Jun 2006 04:24:51 -0000	1.2292
+++ kernel-2.6.spec	18 Jun 2006 04:35:30 -0000	1.2293
@@ -1112,7 +1112,7 @@
 
 # get rid of unwanted files resulting from patch fuzz
 cd ..
-find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null &
+find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
 
 
 ###



From fedora-cvs-commits at redhat.com  Sun Jun 18 04:45:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 18 Jun 2006 00:45:16 -0400
Subject: rpms/kernel/FC-5/configs config-generic, 1.165, 1.166 config-i586,
	1.13, 1.14 config-ia64-generic, 1.21,
	1.22 config-powerpc64-generic, 1.3,
	1.4 config-powerpc64-iseries, 1.10, 1.11 config-rhel-generic,
	1.4, 1.5 config-s390-generic, 1.12, 1.13 config-x86-generic,
	1.41, 1.42 config-x86_64-generic, 1.33,
	1.34 config-xen-generic, 1.14, 1.15 config-xen-x86_64, 1.2,
	1.3 config-xen-xen0, 1.5, 1.6
Message-ID: <200606180445.k5I4jFd3027704@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv27529/configs

Modified Files:
	config-generic config-i586 config-ia64-generic 
	config-powerpc64-generic config-powerpc64-iseries 
	config-rhel-generic config-s390-generic config-x86-generic 
	config-x86_64-generic config-xen-generic config-xen-x86_64 
	config-xen-xen0 
Log Message:
Rebase to 2.6.17



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- config-generic	4 May 2006 00:47:13 -0000	1.165
+++ config-generic	18 Jun 2006 04:45:12 -0000	1.166
@@ -58,7 +58,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
@@ -87,15 +87,19 @@
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_WBSD=y
+CONFIG_MMC_SDHCI=m
 
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_IPATH_CORE=m
+CONFIG_INFINIBAND_IPATH=m
 
 #
 # Executable file formats
@@ -197,7 +201,7 @@
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NAND_IDS=m
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_ONENAND is not set
 
 CONFIG_MTD_REDBOOT_PARTS=m
@@ -281,8 +285,8 @@
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_ATIIXP=y
 CONFIG_LBD=y
-# CONFIG_DCSSBLK is not set
-
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_LSF=y
 
 #
 # ATA/ATAPI/MFM/RLL support
@@ -452,6 +456,7 @@
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
@@ -492,6 +497,7 @@
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5=m
+CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID6=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_MULTIPATH=m
@@ -618,14 +624,18 @@
 CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
 
-
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_DECNET is not set
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_DECNET_ROUTE_FWMARK=y
+# CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
@@ -642,13 +652,16 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -665,18 +678,19 @@
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_POLICY=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -713,21 +727,23 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
@@ -788,6 +804,7 @@
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
+CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
@@ -928,7 +945,6 @@
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
-# CONFIG_AT1700 is not set
 # CONFIG_HP100 is not set
 CONFIG_LNE390=m
 CONFIG_NE3210=m
@@ -1072,6 +1088,7 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
@@ -1136,6 +1153,7 @@
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
 CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_LITELINK_DONGLE=m
@@ -1283,6 +1301,12 @@
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
 
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GIGASET_UNDOCREQ is not set
+
 #
 # Telephony Support
 #
@@ -1530,15 +1554,17 @@
 
 CONFIG_RTC_X1205_I2C=m
 
-CONFIG_W1=m 
-CONFIG_W1_MATROX=m 
-CONFIG_W1_DS9490=m 
-CONFIG_W1_DS9490_BRIDGE=m 
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
-CONFIG_W1_DS2433=m
+CONFIG_W1=m
 CONFIG_W1_DS2433_CRC=y
 
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS9490=m
+CONFIG_W1_MASTER_DS9490_BRIDGE=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2433=m
+
 #
 # Mice
 #
@@ -1589,6 +1615,20 @@
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
+CONFIG_RTC_CLASS=m
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_SYSFS=m
+CONFIG_RTC_INTF_PROC=m
+CONFIG_RTC_INTF_DEV=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_RS5C372=m
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_SA1100 is not set
+# CONFIG_RTC_DRV_TEST is not set
 CONFIG_DTLK=m
 CONFIG_R3964=m
 # CONFIG_APPLICOM is not set
@@ -1638,6 +1678,9 @@
 #
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_VIDEO_VIVI is not set
 
 #
 # Video For Linux
@@ -1653,7 +1696,10 @@
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_CX25840=m
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
@@ -1669,18 +1715,23 @@
 CONFIG_VIDEO_SAA5246A=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZORAN_BUZ=m
 CONFIG_VIDEO_ZORAN_DC10=m
 CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_W9966=m
 CONFIG_TUNER_3036=m
 
 #
@@ -1764,6 +1815,11 @@
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA10021=m
+
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_VIDEOBUF=m
@@ -1831,11 +1887,14 @@
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_CYBLA=m
+# CONFIG_FB_FIRMWARE_EDID is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -1860,6 +1919,7 @@
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=m
+CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQUENCER_OSS=y
@@ -1867,6 +1927,7 @@
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_RTCTIMER=m
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
@@ -1936,6 +1997,10 @@
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSPM=m
+CONFIG_SND_ADLIB=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_RIPTIDE=m
 
 #
 # ALSA USB devices
@@ -2095,6 +2160,7 @@
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRPRIME=m
 CONFIG_USB_SERIAL_ANYDATA=m
+CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -2104,6 +2170,7 @@
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
@@ -2126,6 +2193,7 @@
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
@@ -2157,16 +2225,15 @@
 CONFIG_USB_ETH=m
 # CONFIG_USB_GADGETFS is not set
 CONFIG_USB_W9968CF=m
+CONFIG_USB_ZC0301=m
 CONFIG_USB_PWC=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_MTOUCH=m
 CONFIG_USB_ATI_REMOTE=m
 CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
-CONFIG_USB_EGALAX=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_PHIDGETKIT=m
@@ -2175,7 +2242,6 @@
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ACECAD=m
-CONFIG_USB_ITMTOUCH=m
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
@@ -2184,6 +2250,9 @@
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
 
+CONFIG_USB_TOUCHSCREEN=m
+
+
 #
 # File systems
 #
@@ -2191,7 +2260,7 @@
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT2_FS_XIP=y
 CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -2253,7 +2322,6 @@
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
 CONFIG_DEBUG_FS=y
-CONFIG_RELAYFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -2411,9 +2479,9 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_VM=y
 
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value
@@ -2424,6 +2492,12 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 
+CONFIG_KGDB=y
+# CONFIG_KGDB_CONSOLE is not set
+CONFIG_KGDBOE=m
+# CONFIG_KGDB_SIMPLE_SERIAL is not set
+CONFIG_KGDB_8250_CONF_STRING=""
+
 #
 # Security options
 #
@@ -2502,7 +2576,7 @@
 CONFIG_NETDUMP=m
 CONFIG_DISKDUMP=m
 
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 
 CONFIG_TUX=m
 CONFIG_TUX_EXTCGI=y
@@ -2510,6 +2584,7 @@
 # CONFIG_TUX_DEBUG is not set
 
 CONFIG_CPUSETS=y
+CONFIG_RELAY=y
 # CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 
@@ -2565,7 +2640,6 @@
 # CONFIG_ULTRA is not set
 # CONFIG_SMC9194 is not set
 # CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NI5010 is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
 # CONFIG_AT1700 is not set
@@ -2582,7 +2656,6 @@
 # CONFIG_ETH16I is not set
 # CONFIG_ZNET is not set
 # CONFIG_SEEQ8005 is not set
-
 # CONFIG_AC3200 is not set
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
@@ -2672,5 +2745,9 @@
 # FIXME: This needs to be made to depend on PPC
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
+CONFIG_UNWIND_INFO=y
 # CONFIG_FORCED_INLINING is not set
 
+CONFIG_MIGRATION=y
+# CONFIG_NEW_LEDS is not set
+


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-i586	12 Jun 2006 14:38:06 -0000	1.13
+++ config-i586	18 Jun 2006 04:45:12 -0000	1.14
@@ -27,11 +27,11 @@
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_GAMEPORT is not set
-# CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_STALDRV is not set
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_SONYPI is not set
@@ -41,9 +41,13 @@
 # CONFIG_IBM_ASM is not set
 # CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
+# CONFIG_KPROBES is not set
 # CONFIG_AGP_ATI is not set
 # CONFIG_AGP_AMD is not set
 # CONFIG_AGP_AMD64 is not set
 # CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+
+# CONFIG_X86_UP_APIC is not set
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-ia64-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-ia64-generic	28 Feb 2006 20:16:29 -0000	1.21
+++ config-ia64-generic	18 Jun 2006 04:45:12 -0000	1.22
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
- 
+
 #
 # Processor type and features
 #
@@ -11,7 +11,6 @@
 # CONFIG_ARCH_XEN is not set
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 # CONFIG_XEN_VT is not set
-# CONFIG_XEN_VT is not set
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_TIME_INTERPOLATION=y
@@ -36,13 +35,14 @@
 # CONFIG_MMTIMER is not set
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=1024
 # CONFIG_IA32_SUPPORT is not set
 # CONFIG_COMPAT is not set
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
 CONFIG_EFI_VARS=y
 CONFIG_SERIAL_8250_ACPI=y
+CONFIG_SERIAL_8250_RUNTIME_UARTS=16
 CONFIG_EFI_PCDP=y
 #
 # Block devices
@@ -95,11 +95,11 @@
 #
 # CONFIG_MTD is not set
 
-# 
+#
 # SGI
-# 
+#
 CONFIG_SGI_SNSC=y
-# CONFIG_IA64_SGI_SN_XP is not set
+CONFIG_IA64_SGI_SN_XP=y
 
 #
 # SCSI low-level drivers
@@ -129,7 +129,8 @@
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
 # CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
@@ -167,4 +168,10 @@
 CONFIG_SERIAL_SGI_IOC3=m
 CONFIG_SGI_IOC3=m
 
+# CONFIG_PERMIT_BSP_REMOVE is not set
+# CONFIG_FORCE_CPEI_RETARGET is not set
+
+CONFIG_NODES_SHIFT=8
+
+# CONFIG_BCM43XX is not set
 


Index: config-powerpc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc64-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc64-generic	21 Nov 2005 15:40:53 -0000	1.3
+++ config-powerpc64-generic	18 Jun 2006 04:45:12 -0000	1.4
@@ -1,4 +1,5 @@
 CONFIG_PPC64=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_NR_CPUS=128
 CONFIG_BLK_DEV_SL82C105=y
 # CONFIG_FB_PLATINUM is not set


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc64-iseries,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-powerpc64-iseries	13 Jan 2006 03:02:22 -0000	1.10
+++ config-powerpc64-iseries	18 Jun 2006 04:45:12 -0000	1.11
@@ -46,7 +46,6 @@
 # CONFIG_ATM_FIRESTREAM is not set
 # CONFIG_SCHED_SMT is not set
 # CONFIG_XMON is not set
-# CONFIG_ROCKETPORT is not set
 # CONFIG_WINDFARM is not set
 CONFIG_LPARCFG=y
 CONFIG_HOTPLUG_PCI=y


Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-rhel-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-rhel-generic	17 Nov 2005 22:48:01 -0000	1.4
+++ config-rhel-generic	18 Jun 2006 04:45:12 -0000	1.5
@@ -16,7 +16,6 @@
 # CONFIG_EL2 is not set
 # CONFIG_ELPLUS is not set
 # CONFIG_WD80x3 is not set
-# CONFIG_IRDA is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_DVB is not set
 # CONFIG_SND_AD1816A is not set
@@ -134,7 +133,6 @@
 # CONFIG_TUNER_3036 is not set
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_ZORAN_BUZ is not set
 # CONFIG_VIDEO_ZORAN_DC10 is not set
 # CONFIG_VIDEO_ZORAN_DC30 is not set
@@ -165,7 +163,6 @@
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
 # CONFIG_LANCE is not set
-# CONFIG_ELPLUS is not set
 # CONFIG_EL16 is not set
 # CONFIG_EL3 is not set
 # CONFIG_3C515 is not set
@@ -175,7 +172,6 @@
 # CONFIG_NET_SB1000 is not set
 # CONFIG_DEPCA is not set
 # CONFIG_ATP is not set
-# CONFIG_FB_NEOMAGIC is not set
 # CONFIG_INFTL is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
@@ -192,4 +188,5 @@
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_I2C_PCA_ISA is not set
-CONFIG_RAW_DRIVER=y
+# CONFIG_DECNET is not set
+


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-s390-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-s390-generic	13 Mar 2006 21:05:33 -0000	1.12
+++ config-s390-generic	18 Jun 2006 04:45:12 -0000	1.13
@@ -24,11 +24,9 @@
 # CONFIG_PROCESS_DEBUG is not set
 CONFIG_PFAULT=y
 # CONFIG_SHARED_KERNEL is not set
-CONFIG_CMM=y
-# CONFIG_CMM_PROC is not set
+CONFIG_CMM=m
+CONFIG_CMM_PROC=y
 CONFIG_VIRT_TIMER=y
-CONFIG_DASD_EER=m
-CONFIG_DASD_CMB=m
 CONFIG_NETIUCV=m
 CONFIG_SMSGIUCV=m
 
@@ -42,12 +40,15 @@
 #
 # S/390 block device drivers
 #
+CONFIG_DCSSBLK=m
 CONFIG_BLK_DEV_XPRAM=m
 CONFIG_DASD=m
-# CONFIG_DASD_PROFILE is not set
+CONFIG_DASD_PROFILE=y
 CONFIG_DASD_ECKD=m
 CONFIG_DASD_FBA=m
 CONFIG_DASD_DIAG=m
+CONFIG_DASD_EER=y
+CONFIG_DASD_CMB=m
 
 #
 # S/390 character device drivers
@@ -64,13 +65,14 @@
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=y
 CONFIG_S390_TAPE=m
+CONFIG_S390_TAPE_3590=m
 
 CONFIG_APPLDATA_BASE=y
-CONFIG_APPLDATA_MEM=y
-CONFIG_APPLDATA_OS=y
-CONFIG_APPLDATA_NET_SUM=y
+CONFIG_APPLDATA_MEM=m
+CONFIG_APPLDATA_OS=m
+CONFIG_APPLDATA_NET_SUM=m
 CONFIG_TN3270_TTY=y
-# CONFIG_TN3270_FS is not set
+CONFIG_TN3270_FS=m
 
 
 #
@@ -105,8 +107,7 @@
 CONFIG_CTC=m
 CONFIG_IUCV=m
 CONFIG_QETH=m
-#  IPv6 support in qeth is disabled until the generate_eui64 is resolved.
-# CONFIG_QETH_IPV6 is not set
+CONFIG_QETH_IPV6=y
 CONFIG_QETH_VLAN=y
 CONFIG_QETH_PERF_STATS=y
 CONFIG_CCWGROUP=m
@@ -149,7 +150,7 @@
 # S390 specific stack options; needs gcc 3.5 so off for now
 #
 CONFIG_PACK_STACK=y
-# CONFIG_CHECK_STACK is not set
+CONFIG_CHECK_STACK=y
 # CONFIG_WARN_STACK is not set
 # CONFIG_SMALL_STACK is not set
 
@@ -162,7 +163,7 @@
 
 CONFIG_VIRT_CPU_ACCOUNTING=y
 
-CONFIG_CLAW=m
+# CONFIG_CLAW is not set
 
 CONFIG_VMCP=m
 
@@ -176,3 +177,8 @@
 # CONFIG_DEBUG_SLAB is not set
 
 # CONFIG_BOOT_DELAY is not set
+
+CONFIG_STACK_GUARD=256
+CONFIG_CMM_IUCV=y
+
+# CONFIG_DETECT_SOFTLOCKUP is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-x86-generic	5 Jun 2006 18:44:48 -0000	1.41
+++ config-x86-generic	18 Jun 2006 04:45:12 -0000	1.42
@@ -3,14 +3,17 @@
 #
 # Processor type and features
 #
-CONFIG_X86_PC=y
+#
+# Enable summit and co via the generic arch
+#
+# CONFIG_X86_PC is not set
+CONFIG_X86_GENERICARCH=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -49,8 +52,6 @@
 CONFIG_HPET_EMULATE_RTC=y
 # CONFIG_HPET_RTC_IRQ is not set
 # CONFIG_HPET_MMAP is not set
-# CONFIG_SMP_ALTERNATIVES is not set
-CONFIG_NR_CPUS=8
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y
@@ -65,21 +66,20 @@
 CONFIG_X86_CPUID=m
 CONFIG_EDD=m
 # CONFIG_NUMA is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_APIC_DEFAULT_OFF=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_PM_TIMER=y
 
-# CONFIG_EFI is not set
-CONFIG_REGPARM=y
+CONFIG_EFI=y
+CONFIG_EFI_VARS=y
+CONFIG_EFI_PCDP=y
+CONFIG_EFI_RTC=y
 
+CONFIG_REGPARM=y
 
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -89,6 +89,7 @@
 #
 # x86 specific drivers
 #
+CONFIG_ROCKETPORT=m
 CONFIG_SYNCLINK_CS=m
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
@@ -188,8 +189,8 @@
 
 #
 # various x86 specific drivers
-# 
-CONFIG_NVRAM=m
+#
+CONFIG_NVRAM=y
 CONFIG_IBM_ASM=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
@@ -206,6 +207,7 @@
 CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_STACK_BACKTRACE_COLS=2
 CONFIG_4KSTACKS=y
 CONFIG_KPROBES=y
 
@@ -221,8 +223,9 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m 
+CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_ACPI_IBM_DOCK=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -240,6 +243,7 @@
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW_QOS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 
@@ -262,11 +266,10 @@
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_ISA=m
 CONFIG_I2C_VOODOO3=m
 
 # CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_PHYSICAL_START=0x100000
+CONFIG_PHYSICAL_START=0x400000
 
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
@@ -283,5 +286,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 
+CONFIG_SCHED_MC=y
+
 CONFIG_SND_ES18XX=m
-CONFIG_SND_CS4231=m
+
+CONFIG_TCG_INFINEON=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86_64-generic,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- config-x86_64-generic	3 Mar 2006 18:59:15 -0000	1.33
+++ config-x86_64-generic	18 Jun 2006 04:45:12 -0000	1.34
@@ -78,6 +78,8 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_IBM_DOCK=y
+CONFIG_ACPI_HOTPLUG_MEMORY=m
 
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -107,6 +109,7 @@
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW_QOS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
@@ -140,7 +143,7 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_NVRAM=m
+CONFIG_NVRAM=y
 
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
@@ -152,3 +155,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 
+CONFIG_REORDER=y
+
+CONFIG_SCHED_MC=y
+
+CONFIG_TCG_INFINEON=m


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-xen-generic	27 Apr 2006 07:33:05 -0000	1.14
+++ config-xen-generic	18 Jun 2006 04:45:12 -0000	1.15
@@ -19,12 +19,13 @@
 # CONFIG_XEN_PCIDEV_FRONTEND is not set
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_NETDEV_LOOPBACK=y
+CONFIG_XEN_BACKEND=y
 
 #
 # X86 Processor Configuration
 #
 CONFIG_X86_XEN=y
-# CONFIG_X86_PC is not set
+# CONFIG_X86_GENERICARCH is not set
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -78,7 +79,11 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
 # CONFIG_KPROBES is not set
+# CONFIG_UNWIND_INFO is not set
+
+# FIXME: Why?
 # CONFIG_DEBUG_RODATA is not set
+# FIXME: Why?
 # CONFIG_DEBUG_SLAB_LEAK is not set
 
 #
@@ -115,4 +120,12 @@
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH is not set
 CONFIG_XEN_SYSFS=y
-CONFIG_XEN_BACKEND=y
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+CONFIG_PCI_GODIRECT=y
+# CONFIG_PCI_GOXEN_FE is not set
+# CONFIG_PCI_GOANY is not set
+CONFIG_PCI_DIRECT=y
+CONFIG_PCIEPORTBUS=y
+# CONFIG_TCG_TPM is not set


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-x86_64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-x86_64	13 Feb 2006 21:17:48 -0000	1.2
+++ config-xen-x86_64	18 Jun 2006 04:45:12 -0000	1.3
@@ -12,3 +12,6 @@
 
 CONFIG_NR_CPUS=8
 # CONFIG_EARLY_PRINTK is not set
+
+CONFIG_PCI=y
+# CONFIG_PCI_MMCONFIG is not set


Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-xen0,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-xen-xen0	7 Mar 2006 19:37:17 -0000	1.5
+++ config-xen-xen0	18 Jun 2006 04:45:12 -0000	1.6
@@ -15,8 +15,7 @@
 #
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
+# CONFIG_PCI_GOANY is not set
 
 # Microcode driver in Xen won't work as a module - should be upgraded
 CONFIG_MICROCODE=y
@@ -73,3 +72,8 @@
 #
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_PCI=y
+CONFIG_PCI_GODIRECT=y
+# CONFIG_PCI_GOXEN_FE is not set
+CONFIG_PCI_DIRECT=y
+CONFIG_PCIEPORTBUS=y



From fedora-cvs-commits at redhat.com  Sun Jun 18 04:45:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 18 Jun 2006 00:45:15 -0400
Subject: rpms/kernel/FC-5 linux-2.6-ac97_unregister_controls_ad18xx.patch,
 NONE, 1.1 linux-2.6-autofs-invalidate.patch, NONE,
 1.1 linux-2.6-console-suspend.patch, NONE,
 1.1 linux-2.6-defaults-phys-start.patch, NONE,
 1.1 linux-2.6-defaults-unicode-vt.patch, NONE,
 1.1 linux-2.6-header-cleanup-git.patch, NONE,
 1.1 linux-2.6-header-install-git.patch, NONE,
 1.1 linux-2.6-iscsi-update-to-2-6-18-upstream.patch, NONE,
 1.1 linux-2.6-offb-find-fb.patch, NONE, 1.1 linux-2.6-powernow-k7-smp.patch,
 NONE, 1.1 linux-2.6-proc-self-maps-fix.patch, NONE,
 1.1 linux-2.6-sata-ahci-suspend.patch, NONE,
 1.1 linux-2.6-serial-resume.patch, NONE, 1.1 linux-2.6-warn-c-p-a.patch,
 NONE, 1.1 linux-2.6-x86-tune-generic.patch, NONE,
 1.1 linux-2.6.17.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.403,
 1.404 kernel-2.6.spec, 1.2135, 1.2136 linux-2.6-build-nonintconfig.patch,
 1.4, 1.5 linux-2.6-crash-driver.patch, 1.1, 1.2 linux-2.6-debug-Wundef.patch,
 1.2, 1.3 linux-2.6-debug-disable-builtins.patch, 1.1,
 1.2 linux-2.6-debug-latency-tracing.patch, 1.10, 1.11 linu!
 x-2.6-debug-list_head.patch, 1.3, 1.4 linux-2.6-debug-oops-pause.patch, 1.11,
 1.12 linux-2.6-debug-periodic-slab-check.patch, 1.3,
 1.4 linux-2.6-debug-singlebiterror.patch, 1.7,
 1.8 linux-2.6-debug-sysfs-crash-debugging.patch, 1.3,
 1.4 linux-2.6-debug-taint-vm.patch, 1.7, 1.8 linux-2.6-devmem-xen.patch, 1.1,
 1.2 linux-2.6-devmem.patch, 1.5, 1.6 linux-2.6-execshield-xen.patch, 1.4,
 1.5 linux-2.6-execshield.patch, 1.13, 1.14 linux-2.6-hvc-console.patch, 1.3,
 1.4 linux-2.6-optimise-spinlock-debug.patch, 1.2,
 1.3 linux-2.6-radeon-backlight.patch, 1.15,
 1.16 linux-2.6-random-patches.patch, 1.3,
 1.4 linux-2.6-sata-promise-pata-ports.patch, 1.1,
 1.2 linux-2.6-sched-up-migration-cost.patch, 1.1, 1.2 linux-2.6-tux.patch,
 1.12, 1.13 linux-2.6-xen-compile-fixes.patch, 1.3,
 1.4 linux-2.6-xen-move-vdso-fixmap.patch, 1.2,
 1.3 linux-2.6-xen-vsyscall_base.patch, 1.2, 1.3 linux-2.6-xen.patch, 1.13,
 1.14 sources, 1.344, 1.345 upstream, 1.314, 1.315 xen-sched-sedf.patch, 1.1,
 1.2 linux-2.6.16.tar.bz2.sign, 1.1, NONE patch-2.6.16.20.bz2.sign, !
 1.1,NONE
Message-ID: <200606180445.k5I4jF18027691@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27529

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-build-nonintconfig.patch 
	linux-2.6-crash-driver.patch linux-2.6-debug-Wundef.patch 
	linux-2.6-debug-disable-builtins.patch 
	linux-2.6-debug-latency-tracing.patch 
	linux-2.6-debug-list_head.patch 
	linux-2.6-debug-oops-pause.patch 
	linux-2.6-debug-periodic-slab-check.patch 
	linux-2.6-debug-singlebiterror.patch 
	linux-2.6-debug-sysfs-crash-debugging.patch 
	linux-2.6-debug-taint-vm.patch linux-2.6-devmem-xen.patch 
	linux-2.6-devmem.patch linux-2.6-execshield-xen.patch 
	linux-2.6-execshield.patch linux-2.6-hvc-console.patch 
	linux-2.6-optimise-spinlock-debug.patch 
	linux-2.6-radeon-backlight.patch 
	linux-2.6-random-patches.patch 
	linux-2.6-sata-promise-pata-ports.patch 
	linux-2.6-sched-up-migration-cost.patch linux-2.6-tux.patch 
	linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen-move-vdso-fixmap.patch 
	linux-2.6-xen-vsyscall_base.patch linux-2.6-xen.patch sources 
	upstream xen-sched-sedf.patch 
Added Files:
	linux-2.6-ac97_unregister_controls_ad18xx.patch 
	linux-2.6-autofs-invalidate.patch 
	linux-2.6-console-suspend.patch 
	linux-2.6-defaults-phys-start.patch 
	linux-2.6-defaults-unicode-vt.patch 
	linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
	linux-2.6-iscsi-update-to-2-6-18-upstream.patch 
	linux-2.6-offb-find-fb.patch linux-2.6-powernow-k7-smp.patch 
	linux-2.6-proc-self-maps-fix.patch 
	linux-2.6-sata-ahci-suspend.patch 
	linux-2.6-serial-resume.patch linux-2.6-warn-c-p-a.patch 
	linux-2.6-x86-tune-generic.patch linux-2.6.17.tar.bz2.sign 
Removed Files:
	linux-2.6.16.tar.bz2.sign patch-2.6.16.20.bz2.sign 
Log Message:
Rebase to 2.6.17


linux-2.6-ac97_unregister_controls_ad18xx.patch:
 ac97_codec.c |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-ac97_unregister_controls_ad18xx.patch ---
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index d052007..fcb00c2 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1204,6 +1204,20 @@ #define snd_ac97_cmute_new(card, name, r
 
 static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97);
 
+static void snd_ctl_elem_remove(struct snd_card *card,
+				struct snd_kcontrol *kcontrol)
+{
+	struct snd_kcontrol *kct;
+	struct snd_ctl_elem_id id = kcontrol->id;
+
+	down_write(&card->controls_rwsem);
+
+	if ((kct = snd_ctl_find_id(card, &id)))
+		snd_ctl_remove(card, kct);
+
+	up_write(&card->controls_rwsem);
+}
+
 static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
 {
 	struct snd_card *card = ac97->bus->card;
@@ -1347,23 +1361,35 @@ static int snd_ac97_mixer_build(struct s
 			init_val = 0x9f9f;
 		else
 			init_val = 0x9f1f;
-		for (idx = 0; idx < 2; idx++)
-			if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_pcm[idx], ac97))) < 0)
+		for (idx = 0; idx < 2; idx++) {
+			struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_pcm[idx], ac97);
+			snd_ctl_elem_remove(card, kctrl);
+			if ((err = snd_ctl_add(card, kctrl)) < 0)
 				return err;
+			}
 		ac97->spec.ad18xx.pcmreg[0] = init_val;
 		if (ac97->scaps & AC97_SCAP_SURROUND_DAC) {
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_surround[idx], ac97))) < 0)
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_surround[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
+			}
 			ac97->spec.ad18xx.pcmreg[1] = init_val;
 		}
 		if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC) {
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_center[idx], ac97))) < 0)
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_center[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_lfe[idx], ac97))) < 0)
+			}
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_lfe[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
+			}
 			ac97->spec.ad18xx.pcmreg[2] = init_val;
 		}
 		snd_ac97_write_cache(ac97, AC97_PCM, init_val);

linux-2.6-autofs-invalidate.patch:
 expire.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-autofs-invalidate.patch ---

From: Ian Kent <raven at themaw.net>
To: Andrew Morton <akpm at osdl.org>
Cc: autofs mailing list <autofs at linux.kernel.org>, Kernel Mailing List
<linux-kernel at vger.kernel.org>, linux-fsdevel
<linux-fsdevel at vger.kernel.org>
Subject: [PATCH] autofs4 - need to invalidate children on tree mount expire
Date: Mon, 12 Jun 2006 14:52:45 +0800 (WST)

Hi Andrew,

I've found a case where invalid dentrys in a mount tree, waiting to be 
cleaned up by d_invalidate, prevent the expected expire.

In this case dentrys created during a lookup for which a mount fails or 
has no entry in the mount map contribute to the d_count of the parent 
dentry. These dentrys may not be invalidated prior to comparing the 
interanl usage count of valid autofs dentrys against the dentry d_count 
which makes a mount tree appear busy so it doesn't expire.

Signed-off-by: Ian Kent <raven at themaw.net>

--

--- linux-2.6.17-rc6-mm2/fs/autofs4/expire.c.need-invalidate-on-tree-expire	2006-06-12 14:24:21.000000000 +0800
+++ linux-2.6.17-rc6-mm2/fs/autofs4/expire.c	2006-06-12 14:24:36.000000000 +0800
@@ -174,6 +174,12 @@ static int autofs4_tree_busy(struct vfsm
 			struct autofs_info *ino = autofs4_dentry_ino(p);
 			unsigned int ino_count = atomic_read(&ino->count);
 
+			/*
+			 * Clean stale dentries below that have not been
+			 * invalidated after a mount fail during lookup
+			 */
+			d_invalidate(p);
+
 			/* allow for dget above and top is already dgot */
 			if (p == top)
 				ino_count += 2;


linux-2.6-console-suspend.patch:
 power/console.c |   32 +++++---------------------------
 printk.c        |   12 ++++++++++++
 2 files changed, 17 insertions(+), 27 deletions(-)

--- NEW FILE linux-2.6-console-suspend.patch ---
Return-Path: <torvalds at osdl.org>
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
	nwo.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=5.0 tests=AWL,BAYES_00,
	FORGED_RCVD_HELO,UNPARSEABLE_RELAY autolearn=ham version=3.1.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
	for <davej at localhost> (single-drop); Wed, 14 Jun 2006 15:03:49 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
	 Wed, 14 Jun 2006 15:03:37 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k5EJ3bh3020398
	for <davej at pobox.devel.redhat.com>; Wed, 14 Jun 2006 15:03:37 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5EJ3bGj030972
	for <davej at redhat.com>; Wed, 14 Jun 2006 15:03:37 -0400
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5EJ3U96030450
	for <davej at redhat.com>; Wed, 14 Jun 2006 15:03:31 -0400
Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k5EJ3Ogt004764
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <davej at redhat.com>; Wed, 14 Jun 2006 12:03:25 -0700
Received: from localhost (shell0.pdx.osdl.net [10.9.0.31])
	by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id k5EJ3Nag015488
	for <davej at redhat.com>; Wed, 14 Jun 2006 12:03:23 -0700
Date: Wed, 14 Jun 2006 12:03:23 -0700 (PDT)
From: Linus Torvalds <torvalds at osdl.org>
To: Dave Jones <davej at redhat.com>
Subject: Re: [linux-pm] [PATCH 2/2] Fix console handling during suspend/resume
In-Reply-To: <20060614185928.GA23238 at redhat.com>
Message-ID: <Pine.LNX.4.64.0606141200311.5498 at g5.osdl.org>
References: <Pine.LNX.4.64.0606131418580.5498 at g5.osdl.org>
 <Pine.LNX.4.64.0606131435400.5498 at g5.osdl.org> <20060614185928.GA23238 at redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-MIMEDefang-Filter: osdl$Revision: 1.135 $
X-Scanned-By: MIMEDefang 2.36
X-RedHat-Spam-Score: 0.05 
Status: RO
Content-Length: 3717
Lines: 138



diff-tree b7140c89071f39e98b154a17463796d4fe3f0aea (from 8325a64d97b5c8489dc1694a77c3e25918049998)
Author: Linus Torvalds <torvalds at macmini.osdl.org>
Date:   Thu Jun 8 15:29:09 2006 -0700

    Fix console handling during suspend/resume
    
    The old code was terminally broken, and would do extremely bad
    things if you used netconsole, for example. Like sending out packets
    when the device had already been suspended etc.
    
    The new version may not be perfect either, but it seems fundamentally
    like a better design.
    
    Signed-off-by: Linus Torvalds <torvalds at osdl.org>

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 623786d..6e039ca 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -9,42 +9,20 @@ #include <linux/kbd_kern.h>
 #include <linux/console.h>
 #include "power.h"
 
-#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
-#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
-
-static int orig_fgconsole, orig_kmsg;
+extern int console_suspended;
 
 int pm_prepare_console(void)
 {
 	acquire_console_sem();
-
-	orig_fgconsole = fg_console;
-
-	if (vc_allocate(SUSPEND_CONSOLE)) {
-	  /* we can't have a free VC for now. Too bad,
-	   * we don't want to mess the screen for now. */
-		release_console_sem();
-		return 1;
-	}
-
-	set_console(SUSPEND_CONSOLE);
-	release_console_sem();
-
-	if (vt_waitactive(SUSPEND_CONSOLE)) {
-		pr_debug("Suspend: Can't switch VCs.");
-		return 1;
-	}
-	orig_kmsg = kmsg_redirect;
-	kmsg_redirect = SUSPEND_CONSOLE;
+	console_suspended = 1;
+	system_state = SYSTEM_BOOTING;
 	return 0;
 }
 
 void pm_restore_console(void)
 {
-	acquire_console_sem();
-	set_console(orig_fgconsole);
+	console_suspended = 0;
+	system_state = SYSTEM_RUNNING;
 	release_console_sem();
-	kmsg_redirect = orig_kmsg;
 	return;
 }
-#endif
diff --git a/kernel/printk.c b/kernel/printk.c
index c056f33..8adb9ed 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -67,6 +67,7 @@ EXPORT_SYMBOL(oops_in_progress);
  * driver system.
  */
 static DECLARE_MUTEX(console_sem);
+static DECLARE_MUTEX(secondary_console_sem);
 struct console *console_drivers;
 /*
  * This is used for debugging the mess that is the VT code by
@@ -77,6 +78,7 @@ struct console *console_drivers;
  * locked without the console sempahore held
  */
 static int console_locked;
+int console_suspended;
 
 /*
  * logbuf_lock protects log_buf, log_start, log_end, con_start and logged_chars
@@ -707,6 +709,11 @@ int __init add_preferred_console(char *n
  */
 void acquire_console_sem(void)
 {
+	if (console_suspended) {
+		down(&secondary_console_sem);
+		return;
+	}
+
 	BUG_ON(in_interrupt());
 	down(&console_sem);
 	console_locked = 1;
@@ -750,6 +757,11 @@ void release_console_sem(void)
 	unsigned long _con_start, _log_end;
 	unsigned long wake_klogd = 0;
 
+	if (console_suspended) {
+		up(&secondary_console_sem);
+		return;
+	}
+
 	for ( ; ; ) {
 		spin_lock_irqsave(&logbuf_lock, flags);
 		wake_klogd |= log_start - log_end;


linux-2.6-defaults-phys-start.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-phys-start.patch ---

http://www.lkml.org/lkml/2006/2/23/189

--- linux-2.6.16.noarch/arch/i386/Kconfig~	2006-04-04 15:30:43.000000000 -0500
+++ linux-2.6.16.noarch/arch/i386/Kconfig	2006-04-04 15:30:55.000000000 -0500
@@ -729,7 +729,7 @@ config CRASH_DUMP
 	  Generate crash dump after being started by kexec.
 
 config PHYSICAL_START
-	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+	hex "Physical address where the kernel is loaded"
 
 	default "0x1000000" if CRASH_DUMP
 	default "0x100000"

linux-2.6-defaults-unicode-vt.patch:
 keyboard.c |    2 +-
 vt.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-defaults-unicode-vt.patch ---

Unicode by default. Join the 20th century.

--- linux-2.6.11/drivers/char/vt.c.foo	2005-06-06 22:53:13.000000000 -0400
+++ linux-2.6.11/drivers/char/vt.c	2005-06-06 22:53:42.000000000 -0400
@@ -1443,7 +1443,7 @@
 	vc->vc_charset		= 0;
 	vc->vc_need_wrap	= 0;
 	vc->vc_report_mouse	= 0;
-	vc->vc_utf		= 0;
+	vc->vc_utf		= 1;
 	vc->vc_utf_count	= 0;
 
 	vc->vc_disp_ctrl	= 0;
--- linux-2.6.11/drivers/char/keyboard.c.foo	2005-06-06 23:35:07.000000000 -0400
+++ linux-2.6.11/drivers/char/keyboard.c	2005-06-06 23:36:28.000000000 -0400
@@ -1241,7 +1241,7 @@
         kbd0.lockstate = KBD_DEFLOCK;
         kbd0.slockstate = 0;
         kbd0.modeflags = KBD_DEFMODE;
-        kbd0.kbdmode = VC_XLATE;
+        kbd0.kbdmode = VC_UNICODE;
 
         for (i = 0 ; i < MAX_NR_CONSOLES ; i++)
                 kbd_table[i] = kbd0;

linux-2.6-header-cleanup-git.patch:
 drivers/s390/crypto/z90crypt.h                       |  185 ----------------
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-alpha/unistd.h                           |    7 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm/unistd.h                             |   10 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-arm26/unistd.h                           |   10 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-cris/unistd.h                            |    9 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/unistd.h                             |    7 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/unistd.h                           |    7 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/page.h                              |    5 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-i386/unistd.h                            |    7 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m32r/unistd.h                            |    5 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/unistd.h                            |    7 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-m68knommu/unistd.h                       |    7 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    7 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-parisc/unistd.h                          |    4 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    9 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    8 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/cmb.h                               |    2 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/ptrace.h                            |    6 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    8 
 include/asm-s390/vtoc.h                              |   38 +--
 include/asm-s390/z90crypt.h                          |  212 +++++++++++++++++++
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/unistd.h                              |    7 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sh64/unistd.h                            |    7 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/unistd.h                           |    4 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-sparc64/unistd.h                         |    4 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/unistd.h                            |   12 -
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    9 
 include/asm-x86_64/page.h                            |    5 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-x86_64/unistd.h                          |    7 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/asm-xtensa/unistd.h                          |   21 -
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/affs_hardblocks.h                      |   72 +++---
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/compiler.h                             |   19 -
 include/linux/cpufreq.h                              |    1 
 include/linux/cramfs_fs.h                            |   34 +--
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/divert.h                               |   20 -
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf-em.h                               |   44 +++
 include/linux/elf.h                                  |   59 -----
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++--------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |   10 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 
 include/linux/i2o-dev.h                              |  167 +++++++-------
 include/linux/ide.h                                  |    1 
 include/linux/if_fddi.h                              |    2 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/input.h                                |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/joystick.h                             |   22 -
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +-
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/nbd.h                                  |   12 -
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter/xt_conntrack.h               |    2 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 +--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    5 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/ppp_defs.h                             |   14 -
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 ++++----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 --
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/ufs_fs.h                               |    1 
 include/linux/unistd.h                               |    2 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/sound/hdsp.h                                 |   12 -
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 905 files changed, 816 insertions(+), 1635 deletions(-)

--- NEW FILE linux-2.6-header-cleanup-git.patch ---
diff --git a/drivers/s390/crypto/z90crypt.h b/drivers/s390/crypto/z90crypt.h
index 5e6b1f5..0ca1d12 100644
--- a/drivers/s390/crypto/z90crypt.h
+++ b/drivers/s390/crypto/z90crypt.h
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/s390/crypto/z90crypt.h
  *
- *  z90crypt 1.3.3
+ *  z90crypt 1.3.3 (kernel-private header)
  *
  *  Copyright (C)  2001, 2005 IBM Corporation
  *  Author(s): Robert Burroughs (burrough at us.ibm.com)
@@ -27,188 +27,7 @@
 #ifndef _Z90CRYPT_H_
 #define _Z90CRYPT_H_
 
-#include <linux/ioctl.h>
-
-#define z90crypt_VERSION 1
-#define z90crypt_RELEASE 3	// 2 = PCIXCC, 3 = rewrite for coding standards
-#define z90crypt_VARIANT 3	// 3 = CEX2A support
-
-/**
- * struct ica_rsa_modexpo
- *
- * Requirements:
- * - outputdatalength is at least as large as inputdatalength.
- * - All key parts are right justified in their fields, padded on
- *   the left with zeroes.
- * - length(b_key) = inputdatalength
- * - length(n_modulus) = inputdatalength
- */
-struct ica_rsa_modexpo {
-	char __user *	inputdata;
-	unsigned int	inputdatalength;
-	char __user *	outputdata;
-	unsigned int	outputdatalength;
-	char __user *	b_key;
-	char __user *	n_modulus;
-};
-
-/**
- * struct ica_rsa_modexpo_crt
- *
- * Requirements:
- * - inputdatalength is even.
- * - outputdatalength is at least as large as inputdatalength.
- * - All key parts are right justified in their fields, padded on
- *   the left with zeroes.
- * - length(bp_key)	= inputdatalength/2 + 8
- * - length(bq_key)	= inputdatalength/2
- * - length(np_key)	= inputdatalength/2 + 8
- * - length(nq_key)	= inputdatalength/2
- * - length(u_mult_inv) = inputdatalength/2 + 8
- */
-struct ica_rsa_modexpo_crt {
-	char __user *	inputdata;
-	unsigned int	inputdatalength;
-	char __user *	outputdata;
-	unsigned int	outputdatalength;
-	char __user *	bp_key;
-	char __user *	bq_key;
-	char __user *	np_prime;
-	char __user *	nq_prime;
-	char __user *	u_mult_inv;
-};
-
-#define Z90_IOCTL_MAGIC 'z'  // NOTE:  Need to allocate from linux folks
-
-/**
- * Interface notes:
- *
- * The ioctl()s which are implemented (along with relevant details)
- * are:
- *
- *   ICARSAMODEXPO
- *     Perform an RSA operation using a Modulus-Exponent pair
- *     This takes an ica_rsa_modexpo struct as its arg.
- *
- *     NOTE: please refer to the comments preceding this structure
- *           for the implementation details for the contents of the
- *           block
- *
- *   ICARSACRT
- *     Perform an RSA operation using a Chinese-Remainder Theorem key
- *     This takes an ica_rsa_modexpo_crt struct as its arg.
- *
- *     NOTE: please refer to the comments preceding this structure
- *           for the implementation details for the contents of the
- *           block
- *
- *   Z90STAT_TOTALCOUNT
- *     Return an integer count of all device types together.
- *
- *   Z90STAT_PCICACOUNT
- *     Return an integer count of all PCICAs.
- *
- *   Z90STAT_PCICCCOUNT
- *     Return an integer count of all PCICCs.
- *
- *   Z90STAT_PCIXCCMCL2COUNT
- *     Return an integer count of all MCL2 PCIXCCs.
- *
- *   Z90STAT_PCIXCCMCL3COUNT
- *     Return an integer count of all MCL3 PCIXCCs.
- *
- *   Z90STAT_CEX2CCOUNT
- *     Return an integer count of all CEX2Cs.
- *
- *   Z90STAT_CEX2ACOUNT
- *     Return an integer count of all CEX2As.
- *
- *   Z90STAT_REQUESTQ_COUNT
- *     Return an integer count of the number of entries waiting to be
- *     sent to a device.
- *
- *   Z90STAT_PENDINGQ_COUNT
- *     Return an integer count of the number of entries sent to a
- *     device awaiting the reply.
- *
- *   Z90STAT_TOTALOPEN_COUNT
- *     Return an integer count of the number of open file handles.
- *
- *   Z90STAT_DOMAIN_INDEX
- *     Return the integer value of the Cryptographic Domain.
- *
- *   Z90STAT_STATUS_MASK
- *     Return an 64 element array of unsigned chars for the status of
- *     all devices.
- *       0x01: PCICA
- *       0x02: PCICC
- *       0x03: PCIXCC_MCL2
- *       0x04: PCIXCC_MCL3
- *       0x05: CEX2C
- *       0x06: CEX2A
- *       0x0d: device is disabled via the proc filesystem
- *
- *   Z90STAT_QDEPTH_MASK
- *     Return an 64 element array of unsigned chars for the queue
- *     depth of all devices.
- *
- *   Z90STAT_PERDEV_REQCNT
- *     Return an 64 element array of unsigned integers for the number
- *     of successfully completed requests per device since the device
- *     was detected and made available.
- *
- *   ICAZ90STATUS (deprecated)
- *     Return some device driver status in a ica_z90_status struct
- *     This takes an ica_z90_status struct as its arg.
- *
- *     NOTE: this ioctl() is deprecated, and has been replaced with
- *           single ioctl()s for each type of status being requested
- *
- *   Z90STAT_PCIXCCCOUNT (deprecated)
- *     Return an integer count of all PCIXCCs (MCL2 + MCL3).
- *     This is DEPRECATED now that MCL3 PCIXCCs are treated differently from
- *     MCL2 PCIXCCs.
- *
- *   Z90QUIESCE (not recommended)
- *     Quiesce the driver.  This is intended to stop all new
- *     requests from being processed.  Its use is NOT recommended,
- *     except in circumstances where there is no other way to stop
- *     callers from accessing the driver.  Its original use was to
- *     allow the driver to be "drained" of work in preparation for
- *     a system shutdown.
- *
- *     NOTE: once issued, this ban on new work cannot be undone
- *           except by unloading and reloading the driver.
- */
-
-/**
- * Supported ioctl calls
- */
-#define ICARSAMODEXPO	_IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0)
-#define ICARSACRT	_IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0)
-
-/* DEPRECATED status calls (bound for removal at some point) */
-#define ICAZ90STATUS	_IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status)
-#define Z90STAT_PCIXCCCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x43, int)
-
-/* unrelated to ICA callers */
-#define Z90QUIESCE	_IO(Z90_IOCTL_MAGIC, 0x11)
-
-/* New status calls */
-#define Z90STAT_TOTALCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x40, int)
-#define Z90STAT_PCICACOUNT	_IOR(Z90_IOCTL_MAGIC, 0x41, int)
-#define Z90STAT_PCICCCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x42, int)
-#define Z90STAT_PCIXCCMCL2COUNT	_IOR(Z90_IOCTL_MAGIC, 0x4b, int)
-#define Z90STAT_PCIXCCMCL3COUNT	_IOR(Z90_IOCTL_MAGIC, 0x4c, int)
-#define Z90STAT_CEX2CCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x4d, int)
-#define Z90STAT_CEX2ACOUNT	_IOR(Z90_IOCTL_MAGIC, 0x4e, int)
-#define Z90STAT_REQUESTQ_COUNT	_IOR(Z90_IOCTL_MAGIC, 0x44, int)
-#define Z90STAT_PENDINGQ_COUNT	_IOR(Z90_IOCTL_MAGIC, 0x45, int)
-#define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int)
-#define Z90STAT_DOMAIN_INDEX	_IOR(Z90_IOCTL_MAGIC, 0x47, int)
-#define Z90STAT_STATUS_MASK	_IOR(Z90_IOCTL_MAGIC, 0x48, char[64])
-#define Z90STAT_QDEPTH_MASK	_IOR(Z90_IOCTL_MAGIC, 0x49, char[64])
-#define Z90STAT_PERDEV_REQCNT	_IOR(Z90_IOCTL_MAGIC, 0x4a, int[64])
[...13233 lines suppressed...]
@@ -4,7 +4,6 @@ #define __NET_PKT_ACT_H
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 6dc5970..bcaee39 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -24,7 +24,6 @@
 #ifndef _PROTOCOL_H
 #define _PROTOCOL_H
 
-#include <linux/config.h>
 #include <linux/in6.h>
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 #include <linux/ipv6.h>
diff --git a/include/net/raw.h b/include/net/raw.h
index e67b28a..481b201 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -17,7 +17,6 @@
 #ifndef _RAW_H
 #define _RAW_H
 
-#include <linux/config.h>
 
 #include <net/protocol.h>
 
diff --git a/include/net/red.h b/include/net/red.h
index 2ed4358..5ccdbb3 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -1,7 +1,6 @@
 #ifndef __NET_SCHED_RED_H
 #define __NET_SCHED_RED_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <net/pkt_sched.h>
 #include <net/inet_ecn.h>
diff --git a/include/net/route.h b/include/net/route.h
index 98c915a..c4a0686 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -24,7 +24,6 @@
 #ifndef _ROUTE_H
 #define _ROUTE_H
 
-#include <linux/config.h>
 #include <net/dst.h>
 #include <net/inetpeer.h>
 #include <net/flow.h>
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 7b6ec99..b0e9108 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -1,7 +1,6 @@
 #ifndef __NET_SCHED_GENERIC_H
 #define __NET_SCHED_GENERIC_H
 
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
 #include <linux/rcupdate.h>
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index aa6033c..a9663b4 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -63,7 +63,6 @@ #define __net_sctp_h__
  */
 
 
-#include <linux/config.h>
 
 #ifdef TEST_FRAME
 #undef CONFIG_PROC_FS
diff --git a/include/net/sock.h b/include/net/sock.h
index c9fad6f..d27e748 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -40,7 +40,6 @@
 #ifndef _SOCK_H
 #define _SOCK_H
 
-#include <linux/config.h>
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/cache.h>
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 3c989db..9e88dcd 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -21,7 +21,6 @@ #define _TCP_H
 #define TCP_DEBUG 1
 #define FASTRETRANS_DEBUG 1
 
-#include <linux/config.h>
 #include <linux/list.h>
 #include <linux/tcp.h>
 #include <linux/slab.h>
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 5e0a01a..ede6398 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -15,7 +15,6 @@
 #ifndef _LINUX_SS_H
 #define _LINUX_SS_H
 
-#include <linux/config.h>
 #include <linux/device.h>
 #include <linux/sched.h>	/* task_struct, completion */
 #include <linux/mutex.h>
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 5626225..6d28b03 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -27,7 +27,6 @@
 #ifndef SCSI_TRANSPORT_FC_H
 #define SCSI_TRANSPORT_FC_H
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <scsi/scsi.h>
 
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index 5e1d619..302680c 100644
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -20,7 +20,6 @@
 #ifndef SCSI_TRANSPORT_SPI_H
 #define SCSI_TRANSPORT_SPI_H
 
-#include <linux/config.h>
 #include <linux/transport_class.h>
 #include <linux/mutex.h>
 
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 89c6a73..3c522e5 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -26,7 +26,6 @@ #ifdef ALSA_BUILD
 #include "config.h"
 #endif
 
-#include <linux/config.h>
 
 /* number of supported soundcards */
 #ifdef CONFIG_SND_DYNAMIC_MINORS
diff --git a/include/sound/hdsp.h b/include/sound/hdsp.h
index 25e1951..dec6b1d 100644
--- a/include/sound/hdsp.h
+++ b/include/sound/hdsp.h
@@ -30,13 +30,13 @@ enum HDSP_IO_Type {
 };
 
 struct hdsp_peak_rms {
-	u32 input_peaks[26];
-	u32 playback_peaks[26];
-	u32 output_peaks[28];
-	u64 input_rms[26];
-	u64 playback_rms[26];
+	__u32 input_peaks[26];
+	__u32 playback_peaks[26];
+	__u32 output_peaks[28];
+	__u64 input_rms[26];
+	__u64 playback_rms[26];
 	/* These are only used for H96xx cards */
-	u64 output_rms[26];
+	__u64 output_rms[26];
 };
 
 #define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdsp_peak_rms)
diff --git a/include/video/edid.h b/include/video/edid.h
index b913f19..f6a42d6 100644
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -3,7 +3,6 @@ #define __linux_video_edid_h__
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifdef CONFIG_X86
 struct edid_info {
diff --git a/include/video/vga.h b/include/video/vga.h
index 700d6c8..b49a512 100644
--- a/include/video/vga.h
+++ b/include/video/vga.h
@@ -17,7 +17,6 @@
 #ifndef __linux_video_vga_h__
 #define __linux_video_vga_h__
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #ifndef CONFIG_AMIGA

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 +
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 +
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 +++
 include/asm-m68knommu/Kbuild          |   12 ++
 include/asm-mips/Kbuild               |   15 +++
 include/asm-parisc/Kbuild             |    8 +
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 +
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 ++
 include/asm-sparc64/Kbuild            |   16 +++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 ++
 include/linux/Kbuild                  |   63 +++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    6 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  158 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 534 insertions(+)

--- NEW FILE linux-2.6-header-install-git.patch ---
diff --git a/Makefile b/Makefile
index a940eae..504d4d1 100644
--- a/Makefile
+++ b/Makefile
@@ -858,6 +858,21 @@ depend dep:
 	@echo '*** Warning: make $@ is unnecessary now.'
 
 # ---------------------------------------------------------------------------
+# Kernel headers
+INSTALL_HDR_PATH=$(MODLIB)/abi
+export INSTALL_HDR_PATH
+
+PHONY += headers_install
+headers_install: include/linux/version.h
+	$(Q)unifdef -Ux /dev/null
+	$(Q)rm -rf $(INSTALL_HDR_PATH)/include
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
+
+PHONY += headers_check
+headers_check: headers_install
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1
+
+# ---------------------------------------------------------------------------
 # Modules
 
 ifdef CONFIG_MODULES
@@ -1029,6 +1044,8 @@ help:
 	@echo  '  cscope	  - Generate cscope index'
 	@echo  '  kernelrelease	  - Output the release version string'
 	@echo  '  kernelversion	  - Output the version stored in Makefile'
+	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'
+	@echo  '                    (default: /usr/include)'
 	@echo  ''
 	@echo  'Static analysers'
 	@echo  '  checkstack      - Generate a list of stack hogs'
diff --git a/include/Kbuild b/include/Kbuild
new file mode 100644
index 0000000..cb25348
--- /dev/null
+++ b/include/Kbuild
@@ -0,0 +1,2 @@
+header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/
+header-y += asm-$(ARCH)/ 
diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild
new file mode 100644
index 0000000..57ff88a
--- /dev/null
+++ b/include/asm-alpha/Kbuild
@@ -0,0 +1,9 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += 8253pit.h agp.h agp_backend.h compiler.h console.h core_apecs.h \
+	core_cia.h core_irongate.h core_lca.h core_marvel.h core_mcpcia.h \
+	core_polaris.h core_t2.h core_titan.h core_tsunami.h core_wildfire.h \
+	err_common.h err_ev6.h err_ev7.h floppy.h fpu.h gct.h gentrap.h \
+	hdreg.h hw_irq.h hwrpb.h init.h jensen.h md.h numnodes.h pal.h \
+	parport.h pci.h reg.h regdef.h segment.h serial.h sfp-machine.h \
+	spinlock.h suspend.h sysinfo.h ucontext.h vga.h
diff --git a/include/asm-arm/Kbuild b/include/asm-arm/Kbuild
new file mode 100644
index 0000000..fad30e6
--- /dev/null
+++ b/include/asm-arm/Kbuild
@@ -0,0 +1,7 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += apm.h assembler.h cpu-multi32.h cpu-single.h domain.h ecard.h \
+	fiq.h floppy.h fpstate.h hardware.h hdreg.h ipc.h leds.h limits.h \
+	locks.h memory.h numnodes.h nwflash.h parport.h procinfo.h \
+	segment.h semaphore-helper.h serial.h sizes.h spinlock.h suspend.h \
+	therm.h traps.h ucontext.h vga.h
diff --git a/include/asm-arm26/Kbuild b/include/asm-arm26/Kbuild
new file mode 100644
index 0000000..8590f0b
--- /dev/null
+++ b/include/asm-arm26/Kbuild
@@ -0,0 +1,8 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += assembler.h calls.h constants.h ecard.h fiq.h floppy.h fpstate.h \
+	hardware.h hdreg.h ian_char.h ioc.h ipc.h irqchip.h leds.h limits.h \
+	linux_logo.h locks.h mach-types.h map.h memory.h oldlatches.h \
+	parport.h proc-fns.h procinfo.h segment.h semaphore-helper.h \
+	serial.h sizes.h spinlock.h suspend.h sysirq.h ucontext.h \
+	uncompress.h
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
new file mode 100644
index 0000000..8480c8a
--- /dev/null
+++ b/include/asm-cris/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += axisflashmap.h eshlibld.h ethernet.h etraxgpio.h etraxi2c.h \
+	fasttimer.h ipc.h rs485.h segment.h semaphore-helper.h ucontext.h
+
+header-y += arch-v10/
diff --git a/include/asm-cris/arch-v10/Kbuild b/include/asm-cris/arch-v10/Kbuild
new file mode 100644
index 0000000..1837529
--- /dev/null
+++ b/include/asm-cris/arch-v10/Kbuild
@@ -0,0 +1,3 @@
+header-y += bitops.h cache.h checksum.h dma.h elf.h io.h irq.h mmu.h \
+	offset.h processor.h ptrace.h sv_addr_ag.h svinto.h system.h \
+	timex.h unistd.h user.h
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
new file mode 100644
index 0000000..70594b2
--- /dev/null
+++ b/include/asm-generic/Kbuild
@@ -0,0 +1,3 @@
+header-y += atomic.h errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h \
+	signal.h statfs.h
+unifdef-y := resource.h siginfo.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
new file mode 100644
index 0000000..d8d0bce
--- /dev/null
+++ b/include/asm-generic/Kbuild.asm
@@ -0,0 +1,11 @@
+unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h	\
+	ioctls.h ipcbuf.h irq.h mman.h msgbuf.h param.h poll.h		\
+	posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h	\
+	sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h	\
+	statfs.h termbits.h termios.h timex.h types.h unistd.h user.h
+
+# These really shouldn't be exported
+unifdef-y += atomic.h io.h
+
+# These probably shouldn't be exported
+unifdef-y += elf.h page.h
diff --git a/include/asm-h8300/Kbuild b/include/asm-h8300/Kbuild
new file mode 100644
index 0000000..a45477a
--- /dev/null
+++ b/include/asm-h8300/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += cachectl.h dbg.h flat.h fpu.h gpio.h h8300_ne.h hdreg.h \
+	hw_irq.h init.h ipc.h keyboard.h linux_logo.h md.h \
+	page_offset.h segment.h semaphore-helper.h sh_bios.h shm.h \
+	spinlock.h target_time.h traps.h ucontext.h
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
new file mode 100644
index 0000000..c064a8e
--- /dev/null
+++ b/include/asm-i386/Kbuild
@@ -0,0 +1,5 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += boot.h cpufeature.h debugreg.h ldt.h setup.h ucontext.h
+
+unifdef-y += mtrr.h vm86.h
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
new file mode 100644
index 0000000..85d6f80
--- /dev/null
+++ b/include/asm-ia64/Kbuild
@@ -0,0 +1,7 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h		\
+	 intel_intrin.h intrinsics.h perfmon_default_smpl.h	\
+	 ptrace_offsets.h rse.h setup.h ucontext.h
+
+unifdef-y += perfmon.h
diff --git a/include/asm-m32r/Kbuild b/include/asm-m32r/Kbuild
new file mode 100644
index 0000000..d3f0f99
--- /dev/null
+++ b/include/asm-m32r/Kbuild
@@ -0,0 +1,7 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += addrspace.h assembler.h bugs.h cachectl.h current.h delay.h \
+	div64.h flat.h hdreg.h hw_irq.h ipc.h kmap_types.h m32102.h \
+	m32102peri.h m32r.h m32r_mp_fpga.h mc146818rtc.h mmzone.h \
+	numnodes.h pgtable-2level.h rtc.h scatterlist.h segment.h serial.h \
+	setup.h smp.h spinlock.h string.h syscall.h ucontext.h vga.h
diff --git a/include/asm-m68k/Kbuild b/include/asm-m68k/Kbuild
new file mode 100644
index 0000000..48881b3
--- /dev/null
+++ b/include/asm-m68k/Kbuild
@@ -0,0 +1,17 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += adb.h adb_iop.h adb_mouse.h amigahw.h amigaints.h amigayle.h \
+	amipcmcia.h apollodma.h apollohw.h atafd.h atafdreg.h \
+	atari_SCCserial.h atari_SLM.h atari_acsi.h atari_joystick.h \
+	atari_stdma.h atari_stram.h atarihw.h atariints.h atarikb.h \
+	blinken.h bvme6000hw.h cachectl.h contregs.h dsp56k.h dvma.h \
+	entry.h fbio.h floppy.h fpu.h hdreg.h hw_irq.h hwtest.h \
+	idprom.h init.h intersil.h ipc.h kbio.h mac_asc.h mac_baboon.h\
+	mac_iop.h mac_mouse.h mac_oss.h mac_psc.h mac_via.h machdep.h \
+	machines.h machw.h macintosh.h macints.h math-emu.h md.h \
+	motorola_pgalloc.h movs.h mvme147hw.h mvme16xhw.h nubus.h \
+	openprom.h oplib.h page_offset.h parport.h q40_master.h \
+	q40ints.h sbus.h segment.h semaphore-helper.h serial.h shm.h \
+	spinlock.h sun3-head.h sun3_pgalloc.h sun3ints.h sun3mmu.h \
+	sun3x.h sun3xflop.h sun3xprom.h suspend.h swim_iop.h traps.h \
+	ucontext.h vuid_event.h
diff --git a/include/asm-m68knommu/Kbuild b/include/asm-m68knommu/Kbuild
new file mode 100644
index 0000000..d91668d
--- /dev/null
+++ b/include/asm-m68knommu/Kbuild
@@ -0,0 +1,12 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h anchor.h \
+	asm-offsets.h bootstd.h cachectl.h coldfire.h commproc.h dbg.h \
+	elia.h entry.h flat.h fpu.h hdreg.h hwtest.h init.h io_hw_swap.h \
+	ipc.h keyboard.h m5206sim.h m5249sim.h m5272sim.h m5282sim.h \
+	m5307sim.h m5407sim.h m68360.h m68360_enet.h m68360_pram.h \
+	m68360_quicc.h m68360_regs.h machdep.h math-emu.h mcfdma.h \
+	mcfmbus.h mcfne.h mcfpci.h mcfpit.h mcfsim.h mcfsmc.h mcftimer.h \
+	mcfuart.h mcfwdebug.h md.h movs.h nap.h nettel.h openprom.h \
+	oplib.h page_offset.h quicc_simple.h segment.h semaphore-helper.h \
+	semp3.h shglcore.h shglports.h shm.h spinlock.h traps.h ucontext.h
diff --git a/include/asm-mips/Kbuild b/include/asm-mips/Kbuild
new file mode 100644
index 0000000..e19ec09
--- /dev/null
+++ b/include/asm-mips/Kbuild
@@ -0,0 +1,15 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += 8253pit.h addrspace.h asm.h asmmacro-32.h asmmacro-64.h \
+	asmmacro.h bcache.h branch.h break.h cachectl.h cacheops.h \
+	compat.h compiler.h cpu.h cpu-info.h ddb5074.h debug.h \
+	ds1286.h fixmap.h floppy.h fpregdef.h fpu_emulator.h \
+	gdb-stub.h gfx.h gt64120.h hdreg.h hw_irq.h i8259.h init.h \
+	inst.h interrupt.h inventory.h ipc.h irq_cpu.h \
+	isadep.h it8712.h jazz.h jazzdma.h m48t35.h mipsprom.h \
+	mipsregs.h msc01_ic.h ng1.h ng1hw.h nile4.h paccess.h parport.h \
+	pci_channel.h pgtable-32.h pgtable-64.h pgtable-bits.h prctl.h \
+	r4kcache.h reboot.h regdef.h riscos-syscall.h segment.h \
+	serial.h sgialib.h sgiarcs.h sgidefs.h sim.h sni.h spinlock.h \
+	stackframe.h suspend.h sysmips.h tlbdebug.h traps.h \
+	tx3912.h ucontext.h vga.h war.h watch.h wbflush.h
diff --git a/include/asm-parisc/Kbuild b/include/asm-parisc/Kbuild
new file mode 100644
index 0000000..b94e3f9
--- /dev/null
+++ b/include/asm-parisc/Kbuild
@@ -0,0 +1,8 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += asmregs.h assembly.h bootdata.h compat.h eisa_bus.h \
+	eisa_eeprom.h fixmap.h floppy.h grfioctl.h hardware.h hdreg.h \
+	hw_irq.h iosapic.h led.h machdep.h parisc-device.h parport.h \
+	parport_gsc.h pdc.h pdc_chassis.h pdcpat.h perf.h psw.h real.h \
+	rt_sigframe.h segment.h semaphore-helper.h serial.h som.h \
+	spinlock.h superio.h ucontext.h unwind.h
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
new file mode 100644
index 0000000..ac61d7e
--- /dev/null
+++ b/include/asm-powerpc/Kbuild
@@ -0,0 +1,10 @@
+include include/asm-generic/Kbuild.asm
+
+unifdef-y += a.out.h asm-compat.h bootx.h byteorder.h cputable.h elf.h	\
+	nvram.h param.h posix_types.h ptrace.h seccomp.h signal.h	\
+	termios.h types.h unistd.h
+
+header-y += auxvec.h ioctls.h mman.h sembuf.h siginfo.h stat.h errno.h	\
+	ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h	\
+	poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h	\
+	resource.h sigcontext.h statfs.h
diff --git a/include/asm-ppc/Kbuild b/include/asm-ppc/Kbuild
new file mode 100644
index 0000000..58af928
--- /dev/null
+++ b/include/asm-ppc/Kbuild
@@ -0,0 +1,8 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += agp.h amigayle.h amipcmcia.h ans-lcd.h bootx.h bseip.h \
+	commproc.h cputable.h floppy.h gg2.h gt64260.h gt64260_defs.h \
+	harrier.h hdreg.h heathrow.h hw_irq.h i8259.h ipc.h keylargo.h \
+	m48t35.h machdep.h macio.h mk48t59.h nvram.h ocp_ids.h of_device.h\
+	ohare.h open_pic.h parport.h ppc_asm.h ppcboot.h reg.h \
+	segment.h spinlock.h todc.h traps.h ucontext.h vga.h xparameters.h
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
new file mode 100644
index 0000000..ed8955f
--- /dev/null
+++ b/include/asm-s390/Kbuild
@@ -0,0 +1,4 @@
+include include/asm-generic/Kbuild.asm
+
+unifdef-y += cmb.h debug.h
+header-y += dasd.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h
diff --git a/include/asm-sh/Kbuild b/include/asm-sh/Kbuild
new file mode 100644
index 0000000..7e77613
--- /dev/null
+++ b/include/asm-sh/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += addrspace.h floppy.h freq.h hdreg.h hw_irq.h init.h ipc.h \
+	irq-sh73180.h \
+	keyboard.h numnodes.h pgtable-2level.h semaphore-helper.h \
+	serial.h sh_bios.h spinlock.h ubc.h ucontext.h watchdog.h
diff --git a/include/asm-sh64/Kbuild b/include/asm-sh64/Kbuild
new file mode 100644
index 0000000..642b9db
--- /dev/null
+++ b/include/asm-sh64/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += bugs.h cayman.h current.h delay.h hardware.h hdreg.h \
+	hw_irq.h ipc.h kmap_types.h mc146818rtc.h platform.h registers.h \
+	scatterlist.h segment.h semaphore-helper.h serial.h smp.h \
+	spinlock.h string.h ucontext.h
diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
new file mode 100644
index 0000000..cecdc61
--- /dev/null
+++ b/include/asm-sparc/Kbuild
@@ -0,0 +1,13 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += apc.h asi.h asmmacro.h auxio.h bitext.h bpp.h \
+	bsderrno.h btfixup.h clock.h contregs.h cpudata.h cypress.h \
+	ebus.h ecc.h eeprom.h fbio.h floppy.h head.h hw_irq.h \
+	idprom.h io-unit.h iommu.h ipc.h jsflash.h \
+	kdebug.h machines.h mbus.h memreg.h mostek.h mpmbox.h msi.h \
+	mxcc.h obio.h openprom.h openpromio.h oplib.h pbm.h pcic.h \
+	pconf.h perfctr.h pgtsrmmu.h pgtsun4.h pgtsun4c.h psr.h reg.h \
+	ross.h sbi.h sbus.h sfp-machine.h smpprim.h \
+	solerrno.h spinlock.h sun4paddr.h sun4prom.h sunbpp.h svr4.h \
+	swift.h sysen.h timer.h traps.h tsunami.h turbosparc.h \
+	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
new file mode 100644
index 0000000..5edf764
--- /dev/null
+++ b/include/asm-sparc64/Kbuild
@@ -0,0 +1,16 @@
+include include/asm-generic/Kbuild.asm
+
+ALTARCH := sparc
+ARCHDEF := defined __sparc__ && defined __arch64__ 
+ALTARCHDEF := defined __sparc__ && !defined __arch64__
+
+header-y += agp.h apb.h asi.h auxio.h bbc.h bpp.h bsderrno.h \
+	chafsr.h chmctrl.h compat.h const.h cpudata.h dcr.h dcu.h \
+	display7seg.h ebus.h envctrl.h estate.h fbio.h fhc.h floppy.h \
+	fpumacro.h head.h hw_irq.h idprom.h iommu.h \
+	ipc.h isa.h kdebug.h lsu.h mostek.h ns87303.h \
+	openprom.h openpromio.h oplib.h parport.h pbm.h pconf.h \
+	perfctr.h pil.h psrcompat.h pstate.h reg.h sbus.h \
+	sfp-machine.h solerrno.h spinlock.h spitfire.h starfire.h \
+	sunbpp.h svr4.h timer.h ttable.h uctx.h upa.h utrap.h vga.h \
+	visasm.h watchdog.h
diff --git a/include/asm-um/Kbuild b/include/asm-um/Kbuild
new file mode 100644
index 0000000..e8f61cb
--- /dev/null
+++ b/include/asm-um/Kbuild
@@ -0,0 +1,14 @@
+header-y += a.out.h arch-signal-i386.h archparam-i386.h archparam-ppc.h \
+	atomic.h bitops.h boot.h bug.h byteorder.h cache.h cacheflush.h \
+	checksum.h cobalt.h desc.h dma.h elf.h errno.h fcntl.h fixmap.h \
+	floppy.h hardirq.h hdreg.h hw_irq.h init.h io.h ioctl.h ioctls.h \
+	ipc.h ipcbuf.h irq.h irq_vectors.h keyboard.h linkage.h locks.h \
+	mca_dma.h mman.h mmu.h mmu_context.h msgbuf.h mtrr.h namei.h \
+	page.h page_offset.h param.h pgalloc.h poll.h posix_types.h \
+	processor-generic.h processor-i386.h processor-ppc.h \
+	ptrace-generic.h ptrace-i386.h rwlock.h segment.h semaphore.h \
+	sembuf.h serial.h shmbuf.h shmparam.h sigcontext-generic.h \
+	sigcontext-i386.h sigcontext-ppc.h siginfo.h socket.h sockios.h \
+	spinlock.h stat.h suspend.h system-generic.h system-i386.h \
+	system-ppc.h termbits.h termios.h timex.h tlbflush.h types.h \
+	ucontext.h unaligned.h unistd.h user.h vga.h
diff --git a/include/asm-v850/Kbuild b/include/asm-v850/Kbuild
new file mode 100644
index 0000000..fe2930b
--- /dev/null
+++ b/include/asm-v850/Kbuild
@@ -0,0 +1,10 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += anna.h as85ep1.h asm.h clinkage.h entry.h flat.h fpga85e2c.h \
+	gbus_int.h highres_timer.h hw_irq.h ipc.h ma.h ma1.h machdep.h \
+	macrology.h me2.h rte_cb.h rte_ma1_cb.h rte_mb_a_pci.h \
+	rte_me2_cb.h rte_nb85e_cb.h segment.h serial.h sim.h sim85e2.h \
+	sim85e2c.h sim85e2s.h simsyscall.h teg.h ucontext.h \
+	v850e.h v850e2.h v850e2_cache.h v850e_cache.h v850e_intc.h \
+	v850e_timer_c.h v850e_timer_d.h v850e_uart.h v850e_uarta.h \
+	v850e_uartb.h v850e_utils.h
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
new file mode 100644
index 0000000..dc4d101
--- /dev/null
+++ b/include/asm-x86_64/Kbuild
@@ -0,0 +1,11 @@
+include include/asm-generic/Kbuild.asm
+
+ALTARCH := i386
+ARCHDEF := defined __x86_64__
+ALTARCHDEF := defined __i386__
+
+header-y += boot.h bootsetup.h cpufeature.h debugreg.h ldt.h \
+	 msr.h prctl.h setup.h sigcontext32.h ucontext.h \
+	 vsyscall32.h
+
+unifdef-y += mce.h mtrr.h vsyscall.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
new file mode 100644
index 0000000..5c95aa4
--- /dev/null
+++ b/include/linux/Kbuild
@@ -0,0 +1,63 @@
+header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/	\
+	netfilter/ netfilter_arp/ netfilter_bridge/ netfilter_ipv4/	\
+	netfilter_ipv6/
+
+header-y += affs_fs.h affs_hardblocks.h aio_abi.h a.out.h arcfb.h	\
+	atmapi.h atmbr2684.h atmclip.h atm_eni.h atm_he.h		\
+	atm_idt77105.h atmioc.h atmlec.h atmmpc.h atm_nicstar.h		\
+	atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h	\
+	awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h		\
+	bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h		\
+	consolemap.h cycx_cfm.h devfs_fs.h dm-ioctl.h dn.h dqblk_v1.h	\
+	dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h	\
+	fadvise.h fd.h fdreg.h ftape-header-segment.h ftape-vendors.h	\
+	fuse.h futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h	\
+	hpfs_fs.h hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h		\
+	if_arcnet.h if_arp.h if_bonding.h if_cablemodem.h if_fc.h	\
+	if_fddi.h if.h if_hippi.h if_infiniband.h if_packet.h		\
+	if_plip.h if_ppp.h if_slip.h if_strip.h if_tunnel.h in6.h	\
+	in_route.h ioctl.h ip.h ipmi_msgdefs.h ip_mp_alg.h ipsec.h	\
+	ipx.h irda.h isdn_divertif.h iso_fs.h ite_gpio.h ixjuser.h	\
+	jffs2.h keyctl.h limits.h major.h matroxfb.h meye.h minix_fs.h	\
+	mmtimer.h mqueue.h mtio.h ncp_no.h netfilter_arp.h netrom.h	\
+	nfs2.h nfs4_mount.h nfs_mount.h openprom_fs.h param.h		\
+	pci_ids.h pci_regs.h personality.h pfkeyv2.h pg.h pkt_cls.h	\
+	pkt_sched.h posix_types.h ppdev.h prctl.h ps2esdi.h qic117.h	\
+	qnxtypes.h quotaio_v1.h quotaio_v2.h radeonfb.h raw.h		\
+	resource.h rose.h sctp.h smbno.h snmp.h sockios.h som.h		\
+	sound.h stddef.h synclink.h telephony.h termios.h ticable.h	\
+	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h utime.h	\
+	utsname.h video_decoder.h video_encoder.h videotext.h vt.h	\
+	wavefront.h wireless.h xattr.h x25.h zorro_ids.h
+
+unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h	\
+	atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h	\
+	capability.h capi.h cciss_ioctl.h cdrom.h cm4000_cs.h		\
+	cn_proc.h coda.h connector.h cramfs_fs.h cuda.h cyclades.h	\
+	dccp.h dirent.h divert.h elfcore.h errno.h errqueue.h		\
+	ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h		\
+	filter.h flat.h fs.h ftape.h gameport.h generic_serial.h	\
+	genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h	\
+	i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h	\
+	if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h		\
+	if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h	\
+	inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h		\
+	ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h		\
+	joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h	\
+	llc.h loop.h lp.h mempolicy.h mii.h mman.h mroute.h msdos_fs.h	\
+	msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h		\
+	netfilter_bridge.h netfilter_decnet.h netfilter.h		\
+	netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h	\
+	netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h	\
+	n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h	\
+	pmu.h poll.h ppp_defs.h ppp-comp.h ptrace.h qnx4_fs.h quota.h	\
+	random.h reboot.h reiserfs_fs.h reiserfs_xattr.h romfs_fs.h	\
+	route.h rtc.h rtnetlink.h scc.h sched.h sdla.h			\
+	selinux_netlink.h sem.h serial_core.h serial.h serio.h shm.h	\
+	signal.h smb_fs.h smb.h smb_mount.h socket.h sonet.h sonypi.h	\
+	soundcard.h stat.h sysctl.h tcp.h time.h timex.h tty.h types.h	\
+	udf_fs_i.h udp.h uinput.h uio.h unistd.h usb_ch9.h		\
+	usbdevice_fs.h user.h videodev2.h videodev.h wait.h		\
+	wanrouter.h watchdog.h xfrm.h zftape.h
+
+objhdr-y := version.h
diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
new file mode 100644
index 0000000..84a57d4
--- /dev/null
+++ b/include/linux/byteorder/Kbuild
@@ -0,0 +1,2 @@
+unifdef-y += generic.h swabb.h swab.h
+header-y += big_endian.h little_endian.h pdp_endian.h
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
new file mode 100644
index 0000000..63973af
--- /dev/null
+++ b/include/linux/dvb/Kbuild
@@ -0,0 +1,2 @@
+header-y += ca.h frontend.h net.h osd.h version.h
+unifdef-y := audio.h dmx.h video.h
diff --git a/include/linux/hdlc/Kbuild b/include/linux/hdlc/Kbuild
new file mode 100644
index 0000000..1fb2644
--- /dev/null
+++ b/include/linux/hdlc/Kbuild
@@ -0,0 +1 @@
+header-y += ioctl.h
diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild
new file mode 100644
index 0000000..c1727c8
--- /dev/null
+++ b/include/linux/isdn/Kbuild
@@ -0,0 +1 @@
+header-y += capicmd.h tpam.h
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
new file mode 100644
index 0000000..d06311a
--- /dev/null
+++ b/include/linux/netfilter/Kbuild
@@ -0,0 +1,11 @@
+header-y := nf_conntrack_sctp.h nf_conntrack_tuple_common.h		\
+	    nfnetlink_conntrack.h nfnetlink_log.h nfnetlink_queue.h	\
+	    xt_CLASSIFY.h xt_comment.h xt_connbytes.h xt_connmark.h	\
+	    xt_CONNMARK.h xt_conntrack.h xt_dccp.h xt_esp.h		\
+	    xt_helper.h xt_length.h xt_limit.h xt_mac.h xt_mark.h	\
+	    xt_MARK.h xt_multiport.h xt_NFQUEUE.h xt_pkttype.h		\
+	    xt_policy.h xt_realm.h xt_sctp.h xt_state.h xt_string.h	\
+	    xt_tcpmss.h xt_tcpudp.h
+
+unifdef-y := nf_conntrack_common.h nf_conntrack_ftp.h		\
+	nf_conntrack_tcp.h nfnetlink.h x_tables.h xt_physdev.h
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
new file mode 100644
index 0000000..198ec5e
--- /dev/null
+++ b/include/linux/netfilter_arp/Kbuild
@@ -0,0 +1,2 @@
+header-y := arpt_mangle.h
+unifdef-y := arp_tables.h
diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
new file mode 100644
index 0000000..5b1aba6
--- /dev/null
+++ b/include/linux/netfilter_bridge/Kbuild
@@ -0,0 +1,4 @@
+header-y += ebt_among.h ebt_arp.h ebt_arpreply.h ebt_ip.h ebt_limit.h	\
+	ebt_log.h ebt_mark_m.h ebt_mark_t.h ebt_nat.h ebt_pkttype.h	\
+	ebt_redirect.h ebt_stp.h ebt_ulog.h ebt_vlan.h
+unifdef-y := ebtables.h ebt_802_3.h
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
new file mode 100644
index 0000000..04e4d27
--- /dev/null
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -0,0 +1,21 @@
+
+header-y := ip_conntrack_helper.h ip_conntrack_helper_h323_asn1.h	\
+	    ip_conntrack_helper_h323_types.h ip_conntrack_protocol.h	\
+	    ip_conntrack_sctp.h ip_conntrack_tcp.h ip_conntrack_tftp.h	\
+	    ip_nat_pptp.h ipt_addrtype.h ipt_ah.h	\
+	    ipt_CLASSIFY.h ipt_CLUSTERIP.h ipt_comment.h		\
+	    ipt_connbytes.h ipt_connmark.h ipt_CONNMARK.h		\
+	    ipt_conntrack.h ipt_dccp.h ipt_dscp.h ipt_DSCP.h ipt_ecn.h	\
+	    ipt_ECN.h ipt_esp.h ipt_hashlimit.h ipt_helper.h		\
+	    ipt_iprange.h ipt_length.h ipt_limit.h ipt_LOG.h ipt_mac.h	\
+	    ipt_mark.h ipt_MARK.h ipt_multiport.h ipt_NFQUEUE.h		\
+	    ipt_owner.h ipt_physdev.h ipt_pkttype.h ipt_policy.h	\
+	    ipt_realm.h ipt_recent.h ipt_REJECT.h ipt_SAME.h		\
+	    ipt_sctp.h ipt_state.h ipt_string.h ipt_tcpmss.h		\
+	    ipt_TCPMSS.h ipt_tos.h ipt_TOS.h ipt_ttl.h ipt_TTL.h	\
+	    ipt_ULOG.h
+
+unifdef-y := ip_conntrack.h ip_conntrack_h323.h ip_conntrack_irc.h	\
+	ip_conntrack_pptp.h ip_conntrack_proto_gre.h			\
+	ip_conntrack_tuple.h ip_nat.h ip_nat_rule.h ip_queue.h		\
+	ip_tables.h
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
new file mode 100644
index 0000000..913ddbf
--- /dev/null
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -0,0 +1,6 @@
+header-y += ip6t_HL.h ip6t_LOG.h ip6t_MARK.h ip6t_REJECT.h ip6t_ah.h	\
+	ip6t_esp.h ip6t_frag.h ip6t_hl.h ip6t_ipv6header.h		\
+	ip6t_length.h ip6t_limit.h ip6t_mac.h ip6t_mark.h		\
+	ip6t_multiport.h ip6t_opts.h ip6t_owner.h ip6t_policy.h		\
+	ip6t_physdev.h ip6t_rt.h
+unifdef-y := ip6_tables.h
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
new file mode 100644
index 0000000..c8c5456
--- /dev/null
+++ b/include/linux/nfsd/Kbuild
@@ -0,0 +1,2 @@
+unifdef-y := const.h export.h stats.h syscall.h nfsfh.h debug.h auth.h
+
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild
new file mode 100644
index 0000000..73fa27a
--- /dev/null
+++ b/include/linux/raid/Kbuild
@@ -0,0 +1 @@
+header-y += md_p.h md_u.h
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
new file mode 100644
index 0000000..0d1d768
--- /dev/null
+++ b/include/linux/sunrpc/Kbuild
@@ -0,0 +1 @@
+unifdef-y := debug.h
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
new file mode 100644
index 0000000..5251a50
--- /dev/null
+++ b/include/linux/tc_act/Kbuild
@@ -0,0 +1 @@
+header-y += tc_gact.h tc_ipt.h tc_mirred.h tc_pedit.h
diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
new file mode 100644
index 0000000..381e930
--- /dev/null
+++ b/include/linux/tc_ematch/Kbuild
@@ -0,0 +1 @@
+headers-y := tc_em_cmp.h tc_em_meta.h tc_em_nbyte.h tc_em_text.h
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
new file mode 100644
index 0000000..e1da2a5
--- /dev/null
+++ b/include/mtd/Kbuild
@@ -0,0 +1,2 @@
+unifdef-y := mtd-abi.h
+header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
diff --git a/include/rdma/Kbuild b/include/rdma/Kbuild
new file mode 100644
index 0000000..eb710ba
--- /dev/null
+++ b/include/rdma/Kbuild
@@ -0,0 +1 @@
+header-y := ib_user_mad.h
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
new file mode 100644
index 0000000..14a033d
--- /dev/null
+++ b/include/scsi/Kbuild
@@ -0,0 +1,2 @@
+header-y += scsi.h
+unifdef-y := scsi_ioctl.h sg.h
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
new file mode 100644
index 0000000..3a5a3df
--- /dev/null
+++ b/include/sound/Kbuild
@@ -0,0 +1,2 @@
+header-y := asound_fm.h hdsp.h hdspm.h sfnt_info.h sscape_ioctl.h
+unifdef-y := asequencer.h asound.h emu10k1.h sb16_csp.h 
diff --git a/include/video/Kbuild b/include/video/Kbuild
new file mode 100644
index 0000000..76a6073
--- /dev/null
+++ b/include/video/Kbuild
@@ -0,0 +1 @@
+unifdef-y := sisfb.h
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
new file mode 100644
index 0000000..aa9990a
--- /dev/null
+++ b/scripts/Makefile.headersinst
@@ -0,0 +1,158 @@
+# ==========================================================================
+# Installing headers
+#
+# header-y files will be installed verbatim
+# unifdef-y are the files where unifdef will be run before installing files
+# objhdr-y are generated files that will be installed verbatim
+#
+# ==========================================================================
+
+UNIFDEF := unifdef -U__KERNEL__
+
+# Eliminate the contents of (and inclusions of) compiler.h
+HDRSED  := sed 	-e "s/ inline / __inline__ /g" \
+		-e "s/[[:space:]]__user[[:space:]]\+/ /g" \
+		-e "s/(__user[[:space:]]\+/ (/g" \
+		-e "s/[[:space:]]__force[[:space:]]\+/ /g" \
+		-e "s/(__force[[:space:]]\+/ (/g" \
+		-e "s/[[:space:]]__iomem[[:space:]]\+/ /g" \
+		-e "s/(__iomem[[:space:]]\+/ (/g" \
+		-e "s/[[:space:]]__attribute_const__[[:space:]]\+/\ /g" \
+		-e "s/[[:space:]]__attribute_const__$$//" \
+		-e "/^\#include <linux\/compiler.h>/d"
+
+_dst := $(if $(dst),$(dst),$(obj))
+
+.PHONY: __headersinst
+__headersinst:
+
+
+ifeq (,$(patsubst include/asm/%,,$(obj)/))
+# For producing the generated stuff in include/asm for biarch builds, include
+# both sets of Kbuild files; we'll generate anything which is mentioned in
+# _either_ arch, and recurse into subdirectories which are mentioned in either
+# arch. Since some directories may exist in one but not the other, we must
+# use '-include'.
+GENASM := 1
+archasm	   := $(subst include/asm,asm-$(ARCH),$(obj))
+altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj))
+-include $(srctree)/include/$(archasm)/Kbuild
+-include $(srctree)/include/$(altarchasm)/Kbuild
+else
+include $(srctree)/$(obj)/Kbuild
+endif
+
+include scripts/Kbuild.include
+
+# If this is include/asm-$(ARCH) and there's no $(ALTARCH), then
+# override $(_dst) so that we install to include/asm directly.
+ifeq ($(obj)$(ALTARCH),include/asm-$(ARCH))
+     _dst := include/asm
+endif
+
+header-y	:= $(sort $(header-y))
+unifdef-y	:= $(sort $(unifdef-y))
+subdir-y	:= $(patsubst %/,%,$(filter %/, $(header-y)))
+header-y	:= $(filter-out %/, $(header-y))
+header-y	:= $(filter-out $(unifdef-y),$(header-y))
+
+ifdef ALTARCH
+ifeq ($(obj),include/asm-$(ARCH))
+altarch-y	:= altarch-dir
+endif
+endif
+
+# Make the definitions visible for recursive make invocations
+export ALTARCH
+export ARCHDEF
+export ALTARCHDEF
+
+quiet_cmd_o_hdr_install   = INSTALL $(_dst)/$@
+      cmd_o_hdr_install   = cp $(objtree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
+
+quiet_cmd_headers_install = INSTALL $(_dst)/$@
+      cmd_headers_install = $(HDRSED) $(srctree)/$(obj)/$@		\
+			    > $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+quiet_cmd_unifdef	  = UNIFDEF $(_dst)/$@
+      cmd_unifdef	  = $(UNIFDEF) $(srctree)/$(obj)/$@ | $(HDRSED)	\
+                            > $(INSTALL_HDR_PATH)/$(_dst)/$@ || :
+
+quiet_cmd_check		  = CHECK   $(_dst)/$@
+      cmd_check		  = $(srctree)/scripts/hdrcheck.sh		\
+                              $(INSTALL_HDR_PATH)/include		\
+			      $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+quiet_cmd_mkdir		  = MKDIR   $@
+      cmd_mkdir		  = mkdir -p $(INSTALL_HDR_PATH)/$@
+
+quiet_cmd_gen		  = GEN     $(_dst)/$@
+      cmd_gen		  = \
+STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_`;				\
+(echo "/* File autogenerated by 'make headers_install' */" ;		\
+echo "\#ifndef $$STUBDEF" ;						\
+echo "\#define $$STUBDEF" ;						\
+echo "\# if $(ARCHDEF)" ;						\
+if [ -r $(srctree)/include/$(archasm)/$@ ]; then			\
+	echo "\#  include <$(archasm)/$@>" ;				\
+else									\
+	echo "\#  error $(archasm)/$@ does not exist in"		\
+			"the $(ARCH) architecture" ;			\
+fi ;									\
+echo "\# elif $(ALTARCHDEF)" ;						\
+if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then			\
+	echo "\#  include <$(altarchasm)/$@>" ;				\
+else									\
+	echo "\#  error $(altarchasm)/$@ does not exist in"		\
+			"the $(ALTARCH) architecture" ;			\
+fi ;									\
+echo "\# else" ;							\
+echo "\#  warning This machine appears to be"				\
+		 "neither $(ARCH) nor $(ALTARCH)." ;			\
+echo "\# endif" ;							\
+echo "\#endif /* $$STUBDEF */" ;					\
+) > $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y) $(objhdr-y)
+
+.PHONY: $(header-y) $(unifdef-y) $(subdir-y)
+
+ifdef HDRCHECK
+# Rules for checking headers
+$(objhdr-y) $(header-y) $(unifdef-y):
+	$(call cmd,check)
+else
+# Rules for installing headers
+
+$(objhdr-y) $(subdir-y) $(header-y) $(unifdef-y): $(_dst)
+
+.PHONY: $(_dst)
+$(_dst):
+	$(call cmd,mkdir)
+
+ifdef GENASM
+$(objhdr-y) $(header-y) $(unifdef-y):
+	$(call cmd,gen)
+
+else
+$(objhdr-y):
+	$(call cmd,o_hdr_install)
+
+$(header-y):
+	$(call cmd,headers_install)
+
+$(unifdef-y):
+	$(call cmd,unifdef)
+endif
+endif
+
+hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
+
+.PHONY: altarch-dir
+altarch-dir:
+	$(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
+	$(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm
+
+# Recursion
+$(subdir-y):
+	$(Q)$(MAKE) $(hdrinst)=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
new file mode 100755
index 0000000..b3bb683
--- /dev/null
+++ b/scripts/hdrcheck.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for FILE in `grep '^#include <' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do
+    if [ ! -r $1/$FILE ]; then
+	echo $2 requires $FILE, which does not exist
+	exit 1
+    fi
+done

linux-2.6-iscsi-update-to-2-6-18-upstream.patch:
 drivers/scsi/Makefile               |    2 
 drivers/scsi/iscsi_tcp.c            | 3012 +++++++++++-------------------------
 drivers/scsi/iscsi_tcp.h            |  190 --
 drivers/scsi/libiscsi.c             | 1702 ++++++++++++++++++++
 drivers/scsi/scsi_transport_iscsi.c |  703 +++++---
 include/scsi/iscsi_if.h             |  128 +
 include/scsi/iscsi_proto.h          |    2 
 include/scsi/libiscsi.h             |  282 +++
 include/scsi/scsi_transport_iscsi.h |  119 +
 9 files changed, 3655 insertions(+), 2485 deletions(-)

--- NEW FILE linux-2.6-iscsi-update-to-2-6-18-upstream.patch ---
diff -Naurp linux-2.6.16.x86_64/drivers/scsi/iscsi_tcp.c linux-2.6.16.x86_64.work/drivers/scsi/iscsi_tcp.c
--- linux-2.6.16.x86_64/drivers/scsi/iscsi_tcp.c	2006-05-30 04:38:18.000000000 -0500
+++ linux-2.6.16.x86_64.work/drivers/scsi/iscsi_tcp.c	2006-05-30 04:39:36.000000000 -0500
@@ -3,7 +3,8 @@
  *
  * Copyright (C) 2004 Dmitry Yusupov
  * Copyright (C) 2004 Alex Aizman
- * Copyright (C) 2005 Mike Christie
+ * Copyright (C) 2005 - 2006 Mike Christie
+ * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
  * maintained by open-iscsi at googlegroups.com
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,37 +37,28 @@
 #include <linux/mutex.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_request.h>
-#include <scsi/scsi_tcq.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_transport_iscsi.h>
 
 #include "iscsi_tcp.h"
 
+#define ISCSI_TCP_VERSION "1.0-595"
+
 MODULE_AUTHOR("Dmitry Yusupov <dmitry_yus at yahoo.com>, "
 	      "Alex Aizman <itn780 at yahoo.com>");
 MODULE_DESCRIPTION("iSCSI/TCP data-path");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("0:4.445");
+MODULE_VERSION(ISCSI_TCP_VERSION);
 /* #define DEBUG_TCP */
-/* #define DEBUG_SCSI */
 #define DEBUG_ASSERT
 
 #ifdef DEBUG_TCP
-#define debug_tcp(fmt...) printk(KERN_DEBUG "tcp: " fmt)
+#define debug_tcp(fmt...) printk(KERN_INFO "tcp: " fmt)
 #else
 #define debug_tcp(fmt...)
 #endif
 
-#ifdef DEBUG_SCSI
-#define debug_scsi(fmt...) printk(KERN_DEBUG "scsi: " fmt)
-#else
-#define debug_scsi(fmt...)
-#endif
-
 #ifndef DEBUG_ASSERT
 #ifdef BUG_ON
 #undef BUG_ON
@@ -74,22 +66,9 @@ MODULE_VERSION("0:4.445");
 #define BUG_ON(expr)
 #endif
 
-#define INVALID_SN_DELTA	0xffff
-
 static unsigned int iscsi_max_lun = 512;
 module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);
 
-/* global data */
-static kmem_cache_t *taskcache;
-
-static inline void
-iscsi_buf_init_virt(struct iscsi_buf *ibuf, char *vbuf, int size)
-{
-	sg_init_one(&ibuf->sg, (u8 *)vbuf, size);
-	ibuf->sent = 0;
-	ibuf->use_sendmsg = 0;
-}
-
 static inline void
 iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)
 {
@@ -130,68 +109,39 @@ static inline void
 iscsi_hdr_digest(struct iscsi_conn *conn, struct iscsi_buf *buf,
 		 u8* crc)
 {
-	crypto_digest_digest(conn->tx_tfm, &buf->sg, 1, crc);
-	buf->sg.length += sizeof(uint32_t);
-}
-
-static void
-iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
-{
-	struct iscsi_session *session = conn->session;
-	unsigned long flags;
+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
 
-	spin_lock_irqsave(&session->lock, flags);
-	if (session->conn_cnt == 1 || session->leadconn == conn)
-		session->state = ISCSI_STATE_FAILED;
-	spin_unlock_irqrestore(&session->lock, flags);
-	set_bit(SUSPEND_BIT, &conn->suspend_tx);
-	set_bit(SUSPEND_BIT, &conn->suspend_rx);
-	iscsi_conn_error(conn->cls_conn, err);
+	crypto_digest_digest(tcp_conn->tx_tfm, &buf->sg, 1, crc);
+	buf->sg.length += sizeof(uint32_t);
 }
 
 static inline int
-iscsi_check_assign_cmdsn(struct iscsi_session *session, struct iscsi_nopin *hdr)
+iscsi_hdr_extract(struct iscsi_tcp_conn *tcp_conn)
 {
-	uint32_t max_cmdsn = be32_to_cpu(hdr->max_cmdsn);
-	uint32_t exp_cmdsn = be32_to_cpu(hdr->exp_cmdsn);
-
-	if (max_cmdsn < exp_cmdsn -1 &&
-	    max_cmdsn > exp_cmdsn - INVALID_SN_DELTA)
-		return ISCSI_ERR_MAX_CMDSN;
-	if (max_cmdsn > session->max_cmdsn ||
-	    max_cmdsn < session->max_cmdsn - INVALID_SN_DELTA)
-		session->max_cmdsn = max_cmdsn;
-	if (exp_cmdsn > session->exp_cmdsn ||
-	    exp_cmdsn < session->exp_cmdsn - INVALID_SN_DELTA)
-		session->exp_cmdsn = exp_cmdsn;
-
-	return 0;
-}
+	struct sk_buff *skb = tcp_conn->in.skb;
 
-static inline int
-iscsi_hdr_extract(struct iscsi_conn *conn)
-{
-	struct sk_buff *skb = conn->in.skb;
+	tcp_conn->in.zero_copy_hdr = 0;
 
-	if (conn->in.copy >= conn->hdr_size &&
-	    conn->in_progress == IN_PROGRESS_WAIT_HEADER) {
+	if (tcp_conn->in.copy >= tcp_conn->hdr_size &&
+	    tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER) {
 		/*
 		 * Zero-copy PDU Header: using connection context
 		 * to store header pointer.
 		 */
 		if (skb_shinfo(skb)->frag_list == NULL &&
-		    !skb_shinfo(skb)->nr_frags)
-			conn->in.hdr = (struct iscsi_hdr *)
-				((char*)skb->data + conn->in.offset);
-		else {
+		    !skb_shinfo(skb)->nr_frags) {
+			tcp_conn->in.hdr = (struct iscsi_hdr *)
+				((char*)skb->data + tcp_conn->in.offset);
+			tcp_conn->in.zero_copy_hdr = 1;
+		} else {
 			/* ignoring return code since we checked
 			 * in.copy before */
-			skb_copy_bits(skb, conn->in.offset,
-				&conn->hdr, conn->hdr_size);
-			conn->in.hdr = &conn->hdr;
+			skb_copy_bits(skb, tcp_conn->in.offset,
+				&tcp_conn->hdr, tcp_conn->hdr_size);
+			tcp_conn->in.hdr = &tcp_conn->hdr;
 		}
-		conn->in.offset += conn->hdr_size;
-		conn->in.copy -= conn->hdr_size;
+		tcp_conn->in.offset += tcp_conn->hdr_size;
+		tcp_conn->in.copy -= tcp_conn->hdr_size;
 	} else {
 		int hdr_remains;
 		int copylen;
@@ -201,118 +151,51 @@ iscsi_hdr_extract(struct iscsi_conn *con
 		 * copying it... This'll happen quite rarely.
 		 */
 
-		if (conn->in_progress == IN_PROGRESS_WAIT_HEADER)
-			conn->in.hdr_offset = 0;
+		if (tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER)
+			tcp_conn->in.hdr_offset = 0;
 
-		hdr_remains = conn->hdr_size - conn->in.hdr_offset;
+		hdr_remains = tcp_conn->hdr_size - tcp_conn->in.hdr_offset;
 		BUG_ON(hdr_remains <= 0);
 
-		copylen = min(conn->in.copy, hdr_remains);
-		skb_copy_bits(skb, conn->in.offset,
-			(char*)&conn->hdr + conn->in.hdr_offset, copylen);
+		copylen = min(tcp_conn->in.copy, hdr_remains);
+		skb_copy_bits(skb, tcp_conn->in.offset,
+			(char*)&tcp_conn->hdr + tcp_conn->in.hdr_offset,
+			copylen);
 
 		debug_tcp("PDU gather offset %d bytes %d in.offset %d "
-		       "in.copy %d\n", conn->in.hdr_offset, copylen,
-		       conn->in.offset, conn->in.copy);
+		       "in.copy %d\n", tcp_conn->in.hdr_offset, copylen,
+		       tcp_conn->in.offset, tcp_conn->in.copy);
 
-		conn->in.offset += copylen;
-		conn->in.copy -= copylen;
+		tcp_conn->in.offset += copylen;
+		tcp_conn->in.copy -= copylen;
 		if (copylen < hdr_remains)  {
-			conn->in_progress = IN_PROGRESS_HEADER_GATHER;
-			conn->in.hdr_offset += copylen;
[...7706 lines suppressed...]
  *
@@ -27,9 +27,13 @@
 #include <scsi/iscsi_if.h>
 
 struct scsi_transport_template;
+struct iscsi_transport;
 struct Scsi_Host;
 struct mempool_zone;
 struct iscsi_cls_conn;
+struct iscsi_conn;
+struct iscsi_cmd_task;
+struct iscsi_mgmt_task;
 
 /**
  * struct iscsi_transport - iSCSI Transport template
@@ -46,6 +50,24 @@ struct iscsi_cls_conn;
  * @start_conn:		set connection to be operational
  * @stop_conn:		suspend/recover/terminate connection
  * @send_pdu:		send iSCSI PDU, Login, Logout, NOP-Out, Reject, Text.
+ * @session_recovery_timedout: notify LLD a block during recovery timed out
+ * @suspend_conn_recv:	susepend the recv side of the connection
+ * @termincate_conn:	destroy socket connection. Called with mutex lock.
+ * @init_cmd_task:	Initialize a iscsi_cmd_task and any internal structs.
+ *			Called from queuecommand with session lock held.
+ * @init_mgmt_task:	Initialize a iscsi_mgmt_task and any internal structs.
+ *			Called from iscsi_conn_send_generic with xmitmutex.
+ * @xmit_cmd_task:	Requests LLD to transfer cmd task. Returns 0 or the
+ *			the number of bytes transferred on success, and -Exyz
+ *			value on error.
+ * @xmit_mgmt_task:	Requests LLD to transfer mgmt task. Returns 0 or the
+ *			the number of bytes transferred on success, and -Exyz
+ *			value on error.
+ * @cleanup_cmd_task:	requests LLD to fail cmd task. Called with xmitmutex
+ *			and session->lock after the connection has been
+ *			suspended and terminated during recovery. If called
+ *			from abort task then connection is not suspended
+ *			or terminated but sk_callback_lock is held
  *
  * Template API provided by iSCSI Transport
  */
@@ -53,38 +75,58 @@ struct iscsi_transport {
 	struct module *owner;
 	char *name;
 	unsigned int caps;
+	/* LLD sets this to indicate what values it can export to sysfs */
+	unsigned int param_mask;
 	struct scsi_host_template *host_template;
-	/* LLD session/scsi_host data size */
-	int hostdata_size;
-	/* LLD iscsi_host data size */
-	int ihostdata_size;
 	/* LLD connection data size */
 	int conndata_size;
+	/* LLD session data size */
+	int sessiondata_size;
 	int max_lun;
 	unsigned int max_conn;
 	unsigned int max_cmd_len;
-	struct iscsi_cls_session *(*create_session)
-		(struct scsi_transport_template *t, uint32_t sn, uint32_t *sid);
+	struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it,
+		struct scsi_transport_template *t, uint32_t sn, uint32_t *hn);
 	void (*destroy_session) (struct iscsi_cls_session *session);
 	struct iscsi_cls_conn *(*create_conn) (struct iscsi_cls_session *sess,
 				uint32_t cid);
 	int (*bind_conn) (struct iscsi_cls_session *session,
 			  struct iscsi_cls_conn *cls_conn,
-			  uint32_t transport_fd, int is_leading);
+			  uint64_t transport_eph, int is_leading);
 	int (*start_conn) (struct iscsi_cls_conn *conn);
 	void (*stop_conn) (struct iscsi_cls_conn *conn, int flag);
 	void (*destroy_conn) (struct iscsi_cls_conn *conn);
 	int (*set_param) (struct iscsi_cls_conn *conn, enum iscsi_param param,
 			  uint32_t value);
 	int (*get_conn_param) (struct iscsi_cls_conn *conn,
-			       enum iscsi_param param,
-			       uint32_t *value);
+			       enum iscsi_param param, uint32_t *value);
 	int (*get_session_param) (struct iscsi_cls_session *session,
 				  enum iscsi_param param, uint32_t *value);
+	int (*get_conn_str_param) (struct iscsi_cls_conn *conn,
+				   enum iscsi_param param, char *buf);
+	int (*get_session_str_param) (struct iscsi_cls_session *session,
+				      enum iscsi_param param, char *buf);
 	int (*send_pdu) (struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
 			 char *data, uint32_t data_size);
 	void (*get_stats) (struct iscsi_cls_conn *conn,
 			   struct iscsi_stats *stats);
+	void (*suspend_conn_recv) (struct iscsi_conn *conn);
+	void (*terminate_conn) (struct iscsi_conn *conn);
+	void (*init_cmd_task) (struct iscsi_cmd_task *ctask);
+	void (*init_mgmt_task) (struct iscsi_conn *conn,
+				struct iscsi_mgmt_task *mtask,
+				char *data, uint32_t data_size);
+	int (*xmit_cmd_task) (struct iscsi_conn *conn,
+			      struct iscsi_cmd_task *ctask);
+	void (*cleanup_cmd_task) (struct iscsi_conn *conn,
+				  struct iscsi_cmd_task *ctask);
+	int (*xmit_mgmt_task) (struct iscsi_conn *conn,
+			       struct iscsi_mgmt_task *mtask);
+	void (*session_recovery_timedout) (struct iscsi_cls_session *session);
+	int (*ep_connect) (struct sockaddr *dst_addr, int non_blocking,
+			   uint64_t *ep_handle);
+	int (*ep_poll) (uint64_t ep_handle, int timeout_ms);
+	void (*ep_disconnect) (uint64_t ep_handle);
 };
 
 /*
@@ -100,10 +142,26 @@ extern void iscsi_conn_error(struct iscs
 extern int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
 			  char *data, uint32_t data_size);
 
+
+/* Connection's states */
+#define ISCSI_CONN_INITIAL_STAGE	0
+#define ISCSI_CONN_STARTED		1
+#define ISCSI_CONN_STOPPED		2
+#define ISCSI_CONN_CLEANUP_WAIT		3
+
 struct iscsi_cls_conn {
 	struct list_head conn_list;	/* item in connlist */
 	void *dd_data;			/* LLD private data */
 	struct iscsi_transport *transport;
+	uint32_t cid;			/* connection id */
+
+	/* portal/group values we got during discovery */
+	char *persistent_address;
+	int persistent_port;
+	/* portal/group values we are currently using */
+	char *address;
+	int port;
+
 	int active;			/* must be accessed with the connlock */
 	struct device dev;		/* sysfs transport/container device */
 	struct mempool_zone *z_error;
@@ -114,9 +172,32 @@ struct iscsi_cls_conn {
 #define iscsi_dev_to_conn(_dev) \
 	container_of(_dev, struct iscsi_cls_conn, dev)
 
+/* Session's states */
+#define ISCSI_STATE_FREE		1
+#define ISCSI_STATE_LOGGED_IN		2
+#define ISCSI_STATE_FAILED		3
+#define ISCSI_STATE_TERMINATE		4
+#define ISCSI_STATE_IN_RECOVERY		5
+#define ISCSI_STATE_RECOVERY_FAILED	6
+
 struct iscsi_cls_session {
 	struct list_head sess_list;		/* item in session_list */
+	struct list_head host_list;
 	struct iscsi_transport *transport;
+
+	/* iSCSI values used as unique id by userspace. */
+	char *targetname;
+	int tpgt;
+
+	/* recovery fields */
+	int recovery_tmo;
+	struct work_struct recovery_work;
+
+	int target_id;
+	int channel;
+
+	int sid;				/* session id */
+	void *dd_data;				/* LLD private data */
 	struct device dev;	/* sysfs transport/container device */
 };
 
@@ -126,22 +207,22 @@ struct iscsi_cls_session {
 #define iscsi_session_to_shost(_session) \
 	dev_to_shost(_session->dev.parent)
 
+struct iscsi_host {
+	int next_target_id;
+	struct list_head sessions;
+	struct mutex mutex;
+};
+
 /*
  * session and connection functions that can be used by HW iSCSI LLDs
  */
 extern struct iscsi_cls_session *iscsi_create_session(struct Scsi_Host *shost,
-				struct iscsi_transport *t);
+				struct iscsi_transport *t, int channel);
 extern int iscsi_destroy_session(struct iscsi_cls_session *session);
 extern struct iscsi_cls_conn *iscsi_create_conn(struct iscsi_cls_session *sess,
 					    uint32_t cid);
 extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
-
-/*
- * session functions used by software iscsi
- */
-extern struct Scsi_Host *
-iscsi_transport_create_session(struct scsi_transport_template *scsit,
-                               struct iscsi_transport *transport);
-extern int iscsi_transport_destroy_session(struct Scsi_Host *shost);
+extern void iscsi_unblock_session(struct iscsi_cls_session *session);
+extern void iscsi_block_session(struct iscsi_cls_session *session);
 
 #endif

linux-2.6-offb-find-fb.patch:
 offb.c |  105 +++++++++++++++++++++++++++++------------------------------------
 1 files changed, 47 insertions(+), 58 deletions(-)

--- NEW FILE linux-2.6-offb-find-fb.patch ---
>From benh at kernel.crashing.org Fri Mar 31 22:27:35 2006
Return-path: <benh at kernel.crashing.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Fri, 31 Mar 2006 22:27:35 +0100
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FPR9b-00074r-6a for dwmw2 at baythorne.infradead.org; Fri, 31 Mar 2006
	22:27:35 +0100
Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by
	pentafluge.infradead.org with esmtps (Exim 4.60 #1 (Red Hat Linux)) id
	1FPR9X-0004DG-1Y for dwmw2 at infradead.org; Fri, 31 Mar 2006 22:27:34 +0100
Received: from localhost.localdomain (localhost [127.0.0.1]) by
	gate.crashing.org (8.12.8/8.12.8) with ESMTP id k2VLNnWP031196 for
	<dwmw2 at infradead.org>; Fri, 31 Mar 2006 15:23:50 -0600
Subject: offb crap
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
To: David Woodhouse <dwmw2 at infradead.org>
Content-Type: text/plain
Date: Sat, 01 Apr 2006 08:24:51 +1100
Message-Id: <1143840291.24876.16.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.6.0 
X-Spam-Score: -2.8 (--)
X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org
	summary: Content analysis details:   (-2.8 points, 5.0 required) pts rule
	name              description ---- ----------------------
	-------------------------------------------------- -2.8 ALL_TRUSTED        
	   Did not pass through any untrusted hosts
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

Index: linux-work/drivers/video/offb.c
===================================================================
--- linux-work.orig/drivers/video/offb.c	2006-01-11 13:30:27.000000000 +1100
+++ linux-work/drivers/video/offb.c	2006-01-11 14:11:01.000000000 +1100
@@ -321,8 +321,9 @@
 	int *pp, i;
 	unsigned int len;
 	int width = 640, height = 480, depth = 8, pitch;
-	unsigned int flags, rsize, *up;
-	u64 address = OF_BAD_ADDR;
+	unsigned  flags, rsize, *up, addr_prop = 0;
+	unsigned long max_size = 0;
+	u64 rstart, address = OF_BAD_ADDR;
 	u32 *addrp;
 	u64 asize;
 
@@ -343,69 +344,57 @@
 	} else
 		pitch = width;
 
-       rsize = (unsigned long)pitch * (unsigned long)height *
-               (unsigned long)(depth / 8);
+	rsize = (unsigned long)pitch * (unsigned long)height *
+		(unsigned long)(depth / 8);
 
-       /* Try to match device to a PCI device in order to get a properly
-	* translated address rather then trying to decode the open firmware
-	* stuff in various incorrect ways
-	*/
-#ifdef CONFIG_PCI
-       /* First try to locate the PCI device if any */
-       {
-               struct pci_dev *pdev = NULL;
-
-	       for_each_pci_dev(pdev) {
-                       if (dp == pci_device_to_OF_node(pdev))
-                               break;
-	       }
-               if (pdev) {
-                       for (i = 0; i < 6 && address == OF_BAD_ADDR; i++) {
-                               if ((pci_resource_flags(pdev, i) &
-				    IORESOURCE_MEM) &&
-				   (pci_resource_len(pdev, i) >= rsize))
-                                       address = pci_resource_start(pdev, i);
-                       }
-		       pci_dev_put(pdev);
-               }
-        }
-#endif /* CONFIG_PCI */
-
-       /* This one is dodgy, we may drop it ... */
-       if (address == OF_BAD_ADDR &&
-	   (up = (unsigned *) get_property(dp, "address", &len)) != NULL &&
-	   len == sizeof(unsigned int))
-	       address = (u64) * up;
-
-       if (address == OF_BAD_ADDR) {
-	       for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
-			    != NULL; i++) {
-		       if (!(flags & IORESOURCE_MEM))
-			       continue;
-		       if (asize >= pitch * height * depth / 8)
-			       break;
-	       }
-		if (addrp == NULL) {
-			printk(KERN_ERR
-			       "no framebuffer address found for %s\n",
-			       dp->full_name);
-			return;
+	/* Ok, now we try to figure out the address of the framebuffer.
+	 *
+	 * Unfortunately, Open Firmware doesn't provide a standard way to do
+	 * so. All we can do is a dodgy heuristic that happens to work in
+	 * practice. On most machines, the "address" property contains what
+	 * we need, though not on Matrox cards found in IBM machines. What I've
+	 * found that appears to give good results is to go through the PCI
+	 * ranges and pick one that is both big enough and if possible encloses
+	 * the "address" property. If none match, we pick the biggest
+	 */
+	up = (unsigned int *) get_property(dp, "address", &len);
+	if (up && len == sizeof(unsigned int))
+		addr_prop = *up;
+
+	for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
+		     != NULL; i++) {
+		int match_addrp = 0;
+
+		if (!(flags & IORESOURCE_MEM))
+			continue;
+		if (asize < rsize)
+			continue;
+		rstart = of_translate_address(dp, addrp);
+		if (rstart == OF_BAD_ADDR)
+			continue;
+		if (addr_prop && (rstart <= addr_prop) &&
+		    ((rstart + rsize) > addr_prop))
+			match_addrp = 1;
+		if (match_addrp) {
+			address = addr_prop;
+			break;
 		}
-		address = of_translate_address(dp, addrp);
-		if (address == OF_BAD_ADDR) {
-			printk(KERN_ERR
-			       "can't translate framebuffer address for %s\n",
-			       dp->full_name);
-			return;
+		if (rsize > max_size) {
+			max_size = rsize;
+			address = OF_BAD_ADDR;
 		}
-
+		if (address == OF_BAD_ADDR)
+			address = rstart;
+	}
+	if (address == OF_BAD_ADDR && addr_prop)
+		address = (u_long)addr_prop;
+	if (address != OF_BAD_ADDR) {
 		/* kludge for valkyrie */
 		if (strcmp(dp->name, "valkyrie") == 0)
 			address += 0x1000;
+		offb_init_fb(dp->name, dp->full_name, width, height, depth,
+			     pitch, address, dp);
 	}
-	offb_init_fb(dp->name, dp->full_name, width, height, depth,
-		     pitch, address, dp);
-
 }
 
 static void __init offb_init_fb(const char *name, const char *full_name,



linux-2.6-powernow-k7-smp.patch:
 powernow-k7.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-powernow-k7-smp.patch ---
--- linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/powernow-k7.c~	2006-06-05 13:50:27.000000000 -0400
+++ linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/powernow-k7.c	2006-06-05 13:54:32.000000000 -0400
@@ -582,9 +582,7 @@ static int __init powernow_cpu_init (str
 	rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val);
 
 	/* recalibrate cpu_khz */
-	result = recalibrate_cpu_khz();
-	if (result)
-		return result;
+	recalibrate_cpu_khz();
 
 	fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];
 	if (!fsb) {

linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                    |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                |    2 ++
 b/fs/proc/task_mmu.c                |    3 +--
 b/include/linux/proc_fs.h           |    0 
 b/include/linux/ptrace.h            |    1 +
 b/kernel/ptrace.c                   |    4 ++--
 linux-2.6.16.noarch/kernel/ptrace.c |    2 +-
 7 files changed, 27 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-proc-self-maps-fix.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165351

diff --git a/fs/proc/base.c b/fs/proc/base.c
index a3a3eec..3f262cd 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -408,6 +408,26 @@ static int proc_task_root_link(struct in
 	 (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \
 	 security_ptrace(current,task) == 0))
 
+struct mm_struct *mm_for_maps(struct task_struct *task)
+{
+	struct mm_struct *mm = get_task_mm(task);
+	if (!mm)
+		return NULL;
+	down_read(&mm->mmap_sem);
+	task_lock(task);
+	if (task->mm != mm)
+		goto out;
+	if (task->mm != current->mm && __ptrace_may_attach(task))
+		goto out;
+	task_unlock(task);
+	return mm;
+out:
+	task_unlock(task);
+	up_read(&mm->mmap_sem);
+	mmput(mm);
+	return NULL;
+}
+
 static int proc_pid_environ(struct task_struct *task, char * buffer)
 {
 	int res = 0;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 0502f17..cd172ce 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -16,6 +16,8 @@ struct vmalloc_info {
 	unsigned long	largest_chunk;
 };
 
+extern struct mm_struct *mm_for_maps(struct task_struct *);
+
 #ifdef CONFIG_MMU
 #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
 extern void get_vmalloc_info(struct vmalloc_info *vmi);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 91b7c15..3777557 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -311,12 +311,11 @@ static void *m_start(struct seq_file *m,
 	if (last_addr == -1UL)
 		return NULL;
 
-	mm = get_task_mm(task);
+	mm = mm_for_maps(task);
 	if (!mm)
 		return NULL;
 
 	tail_vma = get_gate_vma(task);
-	down_read(&mm->mmap_sem);
 
 	/* Start with last addr hint */
 	if (last_addr && (vma = find_vma(mm, last_addr))) {
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 0d36750..578c28e 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -94,6 +94,7 @@ extern void __ptrace_link(struct task_st
 extern void __ptrace_unlink(struct task_struct *child);
 extern void ptrace_untrace(struct task_struct *child);
 extern int ptrace_may_attach(struct task_struct *task);
+extern int __ptrace_may_attach(struct task_struct *task);
 
 static inline void ptrace_link(struct task_struct *child,
 			       struct task_struct *new_parent)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 0eeb7e6..443f77e 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -121,7 +121,7 @@ int ptrace_check_attach(struct task_stru
 	return ret;
 }
 
-static int may_attach(struct task_struct *task)
+int __ptrace_may_attach(struct task_struct *task)
 {
 	if (!task->mm)
 		return -EPERM;
@@ -143,7 +143,7 @@ int ptrace_may_attach(struct task_struct
 {
 	int err;
 	task_lock(task);
-	err = may_attach(task);
+	err = __ptrace_may_attach(task);
 	task_unlock(task);
 	return !err;
 }

--- linux-2.6.16.noarch/kernel/ptrace.c~	2006-04-10 14:36:15.000000000 -0500
+++ linux-2.6.16.noarch/kernel/ptrace.c	2006-04-10 14:36:30.000000000 -0500
@@ -160,7 +160,7 @@ int ptrace_attach(struct task_struct *ta
 	/* the same process cannot be attached many times */
 	if (task->ptrace & PT_PTRACED)
 		goto bad;
-	retval = may_attach(task);
+	retval = __ptrace_may_attach(task);
 	if (retval)
 		goto bad;
 

linux-2.6-sata-ahci-suspend.patch:
 ahci.c |  529 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 472 insertions(+), 57 deletions(-)

--- NEW FILE linux-2.6-sata-ahci-suspend.patch ---
I ported the AHCI suspend/resume patch at
http://www.spinnaker.de/linux/c1320/sata-resume-2.6.16.5.patch to
libata-dev #upstream.
This patch provides the support for AHCI suspend/resume. The patch
works very well on Napa SDV in our lab.

Your comments and bug report are welcome.

Thanks,
Forrest


Signed-off-by: Zhao, Forrest <forrest.zhao at intel.com>

--

--- linux-2.6.16.i686/drivers/scsi/ahci.c.orig	2006-05-04 14:58:34.000000000 -0400
+++ linux-2.6.16.i686/drivers/scsi/ahci.c	2006-05-04 15:02:37.000000000 -0400
@@ -44,6 +44,7 @@
 #include <linux/device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 
@@ -88,7 +89,9 @@
 
 	/* HOST_CAP bits */
 	HOST_CAP_64		= (1 << 31), /* PCI DAC (64-bit DMA) support */
+	HOST_CAP_SSS		= (1 << 27), /* Staggered Spin-up */
 	HOST_CAP_CLO		= (1 << 24), /* Command List Override support */
+	HOST_CAP_SSC		= (1 << 14), /* Slumber capable */
 
 	/* registers for each SATA port */
 	PORT_LST_ADDR		= 0x00, /* command list DMA addr */
@@ -139,6 +142,7 @@
 
 	/* PORT_CMD bits */
 	PORT_CMD_ATAPI		= (1 << 24), /* Device is ATAPI */
+	PORT_CMD_CPD		= (1 << 20), /* Cold presence detection */
 	PORT_CMD_LIST_ON	= (1 << 15), /* cmd list DMA engine running */
 	PORT_CMD_FIS_ON		= (1 << 14), /* FIS DMA engine running */
 	PORT_CMD_FIS_RX		= (1 << 4), /* Enable FIS receive DMA engine */
@@ -147,6 +151,7 @@
 	PORT_CMD_SPIN_UP	= (1 << 1), /* Spin up device */
 	PORT_CMD_START		= (1 << 0), /* Enable port DMA engine */
 
+	PORT_CMD_ICC_MASK	= (0xf << 28), /* i/f ICC state mask */
 	PORT_CMD_ICC_ACTIVE	= (0x1 << 28), /* Put i/f in active state */
 	PORT_CMD_ICC_PARTIAL	= (0x2 << 28), /* Put i/f in partial state */
 	PORT_CMD_ICC_SLUMBER	= (0x6 << 28), /* Put i/f in slumber state */
@@ -174,6 +179,7 @@
 	unsigned long		flags;
 	u32			cap;	/* cache of HOST_CAP register */
 	u32			port_map; /* cache of HOST_PORTS_IMPL reg */
+	u32			dev_map; /* connected devices */
 };
 
 struct ahci_port_priv {
@@ -191,15 +197,30 @@
 static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);
 static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
+static int ahci_start_engine(void __iomem *port_mmio);
+static int ahci_stop_engine(void __iomem *port_mmio);
+static int ahci_stop_fis_rx(void __iomem *port_mmio);
+static void ahci_start_fis_rx(void __iomem *port_mmio,
+			     struct ahci_port_priv *pp,
+			     struct ahci_host_priv *hpriv);
 static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes);
 static void ahci_irq_clear(struct ata_port *ap);
 static void ahci_eng_timeout(struct ata_port *ap);
 static int ahci_port_start(struct ata_port *ap);
 static void ahci_port_stop(struct ata_port *ap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
+static int ahci_port_resume(struct ata_port *ap);
+static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
+static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static void ahci_port_disable(struct ata_port *ap);
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
+static int ahci_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state);
+static int ahci_scsi_device_resume(struct scsi_device *sdev);
+static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t state);
+static int ahci_pci_device_resume(struct pci_dev *pdev);
 static void ahci_remove_one (struct pci_dev *pdev);
 
 static struct scsi_host_template ahci_sht = {
@@ -217,10 +238,12 @@
 	.dma_boundary		= AHCI_DMA_BOUNDARY,
 	.slave_configure	= ata_scsi_slave_config,
 	.bios_param		= ata_std_bios_param,
+	.resume			= ahci_scsi_device_resume,
+	.suspend		= ahci_scsi_device_suspend,
 };
 
 static const struct ata_port_operations ahci_ops = {
-	.port_disable		= ata_port_disable,
+	.port_disable		= ahci_port_disable,
 
 	.check_status		= ahci_check_status,
 	.check_altstatus	= ahci_check_status,
@@ -305,6 +328,8 @@
 	.id_table		= ahci_pci_tbl,
 	.probe			= ahci_init_one,
 	.remove			= ahci_remove_one,
+	.suspend		= ahci_pci_device_suspend,
+	.resume			= ahci_pci_device_resume,
 };
 
 
@@ -378,21 +403,23 @@
 
 	ap->private_data = pp;
 
-	if (hpriv->cap & HOST_CAP_64)
-		writel((pp->cmd_slot_dma >> 16) >> 16, port_mmio + PORT_LST_ADDR_HI);
-	writel(pp->cmd_slot_dma & 0xffffffff, port_mmio + PORT_LST_ADDR);
-	readl(port_mmio + PORT_LST_ADDR); /* flush */
-
-	if (hpriv->cap & HOST_CAP_64)
-		writel((pp->rx_fis_dma >> 16) >> 16, port_mmio + PORT_FIS_ADDR_HI);
-	writel(pp->rx_fis_dma & 0xffffffff, port_mmio + PORT_FIS_ADDR);
-	readl(port_mmio + PORT_FIS_ADDR); /* flush */
-
-	writel(PORT_CMD_ICC_ACTIVE | PORT_CMD_FIS_RX |
-	       PORT_CMD_POWER_ON | PORT_CMD_SPIN_UP |
-	       PORT_CMD_START, port_mmio + PORT_CMD);
-	readl(port_mmio + PORT_CMD); /* flush */
-
+	/*
+	 * Driver is setup; initialize the HBA
+	 */
+	ahci_start_fis_rx(port_mmio, pp, hpriv);
+	rc = ahci_port_spinup(port_mmio, hpriv->cap);
+	if (rc)
+		printk(KERN_WARNING "ata%d: could not spinup device (%d)\n",
+		       ap->id, rc);
+ 
+	/*
+	 * Do not enable DMA here; according to the spec
+	 * (section 10.1.1) we should first enable FIS reception,
+	 * then check if the port is enabled before we try to 
+	 * switch on DMA.
+	 * And as the port check is done during probe
+	 * we really shouldn't be doing it here.
+	 */
 	return 0;
 }
 
@@ -401,19 +428,8 @@
 {
 	struct device *dev = ap->host_set->dev;
 	struct ahci_port_priv *pp = ap->private_data;
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
-	u32 tmp;
-
-	tmp = readl(port_mmio + PORT_CMD);
-	tmp &= ~(PORT_CMD_START | PORT_CMD_FIS_RX);
-	writel(tmp, port_mmio + PORT_CMD);
-	readl(port_mmio + PORT_CMD); /* flush */
 
-	/* spec says 500 msecs for each PORT_CMD_{START,FIS_RX} bit, so
-	 * this is slightly incorrect.
-	 */
-	msleep(500);
+	ahci_port_suspend(ap, PMSG_SUSPEND);
 
 	ap->private_data = NULL;
 	dma_free_coherent(dev, AHCI_PORT_PRIV_DMA_SZ,
@@ -422,6 +438,106 @@
 	kfree(pp);
 }
 
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+	int rc;
+
+	/*
+	 * Disable DMA
+	 */
+	rc = ahci_stop_engine(port_mmio);
+	if (rc) {
+		printk(KERN_WARNING "ata%u: DMA engine busy\n", ap->id);
+		return rc;
+	}
+
+	/*
+	 * Disable FIS reception
+	 */
+	rc = ahci_stop_fis_rx(port_mmio);
+	if (rc)
+		printk(KERN_WARNING "ata%d: FIS RX still running (rc %d)\n",
+		       ap->id, rc);
+
+	/*
+	 * Put device into slumber mode
+	 */
+	if (!rc && state.event != PM_EVENT_FREEZE)
+		ahci_port_standby(port_mmio, hpriv->cap);
+
+	return rc;
+}
+
+static int ahci_port_resume(struct ata_port *ap)
+{
+	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+	struct ahci_port_priv *pp = ap->private_data;
+	int rc;
+	u32 tmp;
+
+	/*
+	 * Enable FIS reception
+	 */
+	ahci_start_fis_rx(port_mmio, pp, hpriv);
+
+	rc = ahci_port_spinup(port_mmio, hpriv->cap);
+	if (rc)
+		printk(KERN_WARNING "ata%d: could not spinup device (%d)\n",
+		       ap->id, rc);
+
+	/*
+	 * Clear error status
+	 */
+	tmp = readl(port_mmio + PORT_SCR_ERR);
+	writel(tmp, port_mmio + PORT_SCR_ERR);
+	/*
+	 * Clear interrupt status
+	 */
+	tmp = readl(mmio + HOST_CTL);
+	if (!(tmp & HOST_IRQ_EN)) {
+		u32 irq_stat;
+
+		/* ack any pending irq events for this port */
+		irq_stat = readl(port_mmio + PORT_IRQ_STAT);
+		if (irq_stat)
+			writel(irq_stat, port_mmio + PORT_IRQ_STAT);
+
+		/* set irq mask (enables interrupts) */
+		writel(DEF_PORT_IRQ, port_mmio + PORT_IRQ_MASK);
+
+		if ((hpriv->dev_map >> (ap->port_no + 1)) == 0) {
+			/*
+			 * Enable interrupts if this was the last port
+			 */
+			printk(KERN_WARNING "ata%d: enabling interrupts\n",
+			       ap->id);
+
+			irq_stat = readl(mmio + HOST_IRQ_STAT);
+			if (irq_stat)
+				writel(irq_stat, mmio + HOST_IRQ_STAT);
+
+			tmp |= HOST_IRQ_EN;
+			writel(tmp, mmio + HOST_CTL);
+			(void) readl(mmio + HOST_CTL);
+		}
+	}
+
+	/*
+	 * Enable DMA
+	 */
+	rc = ahci_start_engine(port_mmio);
+	if (rc)
+		printk(KERN_WARNING "ata%d: cannot start DMA engine (rc %d)\n",
+		       ap->id, rc);
+
+	return rc;
+}
+
 static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
 {
 	unsigned int sc_reg;
@@ -456,19 +572,22 @@
 	writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
 }
 
-static int ahci_stop_engine(struct ata_port *ap)
+static int ahci_stop_engine(void __iomem *port_mmio)
 {
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	int work;
 	u32 tmp;
 
 	tmp = readl(port_mmio + PORT_CMD);
+	/* Check if the HBA is idle */
+	if ((tmp & (PORT_CMD_START | PORT_CMD_LIST_ON)) == 0)
+		return 0;
+
+	/* Setting HBA to idle */
 	tmp &= ~PORT_CMD_START;
 	writel(tmp, port_mmio + PORT_CMD);
 
-	/* wait for engine to stop.  TODO: this could be
-	 * as long as 500 msec
+	/*
+	 * wait for engine to become idle
 	 */
 	work = 1000;
 	while (work-- > 0) {
@@ -481,16 +600,233 @@
 	return -EIO;
 }
 
-static void ahci_start_engine(struct ata_port *ap)
+static int ahci_start_engine(void __iomem *port_mmio)
 {
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	u32 tmp;
+	int work = 1000;
 
+	/*
+	 * Get current status
+	 */
 	tmp = readl(port_mmio + PORT_CMD);
+
+	/*
+	 * AHCI rev 1.1 section 10.3.1:
+	 * Software shall not set PxCMD.ST to '1' until it verifies
+	 * that PxCMD.CR is '0' and has set PxCMD.FRE to '1'
+	 */
+	if ((tmp & PORT_CMD_FIS_RX) == 0)
+		return -EPERM;
+
+	/*
+	 * wait for engine to become idle.
+	 */
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_LIST_ON) == 0)
+			break;
+		udelay(10);
+	}
+
+	if (!work) {
+		/*
+		 * We need to do a port reset / HBA reset here
+		 */
+		return -EBUSY;
+	}
+
+	/*
+	 * Start DMA
+	 */
 	tmp |= PORT_CMD_START;
 	writel(tmp, port_mmio + PORT_CMD);
 	readl(port_mmio + PORT_CMD); /* flush */
+
+	return 0;
+}
+
+static int ahci_stop_fis_rx(void __iomem *port_mmio)
+{
+	u32 tmp;
+	int work = 1000;
+
+	/*
+	 * Get current status
+	 */
+	tmp = readl(port_mmio + PORT_CMD);
+
+	/* Check if FIS RX is already disabled */
+	if ((tmp & PORT_CMD_FIS_RX) == 0)
+		return 0;
+
+	/*
+	 * AHCI Rev 1.1 section 10.3.2
+	 * Software shall not clear PxCMD.FRE while
+	 * PxCMD.ST or PxCMD.CR is set to '1'
+	 */
+	if (tmp & (PORT_CMD_LIST_ON | PORT_CMD_START)) {
+		return -EPERM;
+	}
+
+	/*
+	 * Disable FIS reception
+	 *
+	 * AHCI Rev 1.1 Section 10.1.2:
+	 * If PxCMD.FRE is set to '1', software should clear it
+	 * to '0' and wait at least 500 milliseconds for PxCMD.FR
+	 * to return '0' when read. If PxCMD.FR does not clear
+	 * '0' correctly, then software may attempt a port reset
+	 * of a full HBA reset to recover.
+	 */
+	tmp &= ~(PORT_CMD_FIS_RX);
+	writel(tmp, port_mmio + PORT_CMD);
+
+	mdelay(500);
+	work = 1000;
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_FIS_ON) == 0)
+			return 0;
+		udelay(10);
+	}
+
+	return -EBUSY;
+}
+
+static void ahci_start_fis_rx(void __iomem *port_mmio,
+                             struct ahci_port_priv *pp,
+                             struct ahci_host_priv *hpriv)
+{
+	u32 tmp;
+
+	/*
+	 * Set FIS registers
+	 */
+	if (hpriv->cap & HOST_CAP_64)
+		writel((pp->cmd_slot_dma >> 16) >> 16, port_mmio + PORT_LST_ADDR_HI);
+	writel(pp->cmd_slot_dma & 0xffffffff, port_mmio + PORT_LST_ADDR);
+	readl(port_mmio + PORT_LST_ADDR); /* flush */
+
+	if (hpriv->cap & HOST_CAP_64)
+		writel((pp->rx_fis_dma >> 16) >> 16, port_mmio + PORT_FIS_ADDR_HI);
+	writel(pp->rx_fis_dma & 0xffffffff, port_mmio + PORT_FIS_ADDR);
+	readl(port_mmio + PORT_FIS_ADDR); /* flush */
+
+	/*
+	 * Enable FIS reception
+	 */
+	tmp = readl(port_mmio + PORT_CMD);
+	tmp |= PORT_CMD_FIS_RX;
+	writel(tmp, port_mmio + PORT_CMD);
+	readl(port_mmio + PORT_CMD); /* flush */
+}
+
+static int ahci_port_standby(void __iomem *port_mmio, u32 cap)
+{
+	u32 tmp, scontrol, sstatus;
+
+	tmp = readl(port_mmio + PORT_CMD);
+	/*
+	 * AHCI Rev1.1 Section 5.3.2.3:
+	 * Software is only allowed to program the PxCMD.FRE,
+	 * PxCMD.POD, PxSCTL.DET, and PxCMD.SUD register bits
+	 * when PxCMD.ST is set to '0'
+	 */
+	if (tmp & PORT_CMD_START)
+		return -EBUSY;
+
+	if (cap & HOST_CAP_SSC) {
+		/*
+		 * Enable transitions to slumber mode
+		 */
+		scontrol = readl(port_mmio + PORT_SCR_CTL);
+		if ((scontrol & 0x0f00) > 0x100) {
+			scontrol &= ~0xf00;
+			writel(scontrol, port_mmio + PORT_SCR_CTL);
+		}
+		/*
+		 * Put device into slumber mode
+		 */
+		tmp |= PORT_CMD_ICC_SLUMBER;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+
+		/*
+		 * Actually, we should wait for the device to
+		 * enter slumber mode by checking
+		 * sstatus & 0xf00 == 6
+		 */
+		sstatus = readl(port_mmio + PORT_SCR_STAT);
+	}
+
+	/*
+	 * Put device into listen mode
+	 */
+	scontrol = readl(port_mmio + PORT_SCR_CTL);
+	scontrol &= ~0xf;
+	writel(scontrol, port_mmio + PORT_SCR_CTL);
+
+	tmp = readl(port_mmio + PORT_CMD);
+	if (cap & HOST_CAP_SSS) {
+		/*
+		 * Spin down the device for staggered spin-up support
+		 */
+		tmp &= ~PORT_CMD_SPIN_UP;
+		writel(tmp, port_mmio + PORT_CMD);
+		readl(port_mmio + PORT_CMD); /* flush */
+	}
+
+	return 0;
+}
+
+static int ahci_port_spinup(void __iomem *port_mmio, u32 cap)
+{
+	u32 tmp;
+
+	tmp = readl(port_mmio + PORT_CMD);
+	/*
+	 * AHCI Rev1.1 Section 5.3.2.3:
+	 * Software is only allowed to program the PxCMD.FRE,
+	 * PxCMD.POD, PxSCTL.DET, and PxCMD.SUD register bits
+	 * when PxCMD.ST is set to '0'
+	 */
+	if (tmp & PORT_CMD_START)
+		return -EBUSY;
+
+	/*
+	 * Power on device if supported
+	 */
+	if (tmp & PORT_CMD_CPD) {
+		tmp |= PORT_CMD_POWER_ON;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+	}
+
+	/*
+	 * Spin up device
+	 */
+	if (cap & HOST_CAP_SSS) {
+		tmp |= PORT_CMD_SPIN_UP;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+	}
+
+	if ((tmp & PORT_CMD_ICC_MASK) != PORT_CMD_ICC_ACTIVE) {
+		tmp |= PORT_CMD_ICC_ACTIVE;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+	}
+
+	return 0;
+}
+
+static void ahci_port_disable(struct ata_port *ap)
+{
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+
+	ata_port_disable(ap);
+
+	hpriv->dev_map &= ~(1 << ap->port_no);
 }
 
 static unsigned int ahci_dev_classify(struct ata_port *ap)
@@ -549,7 +885,7 @@
 	DPRINTK("ENTER\n");
 
 	/* prepare for SRST (AHCI-1.1 10.4.1) */
-	rc = ahci_stop_engine(ap);
+	rc = ahci_stop_engine(port_mmio);
 	if (rc) {
 		reason = "failed to stop engine";
 		goto fail_restart;
@@ -580,7 +916,7 @@
 	}
 
 	/* restart engine */
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
 
 	ata_tf_init(ap, &tf, 0);
 	fis = pp->cmd_tbl;
@@ -638,7 +974,7 @@
 	return 0;
 
  fail_restart:
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
  fail:
 	if (verbose)
 		printk(KERN_ERR "ata%u: softreset failed (%s)\n",
@@ -651,12 +987,15 @@
 static int ahci_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
 {
 	int rc;
+ 	void __iomem *mmio = ap->host_set->mmio_base;
+ 	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+
 
 	DPRINTK("ENTER\n");
 
-	ahci_stop_engine(ap);
+	ahci_stop_engine(port_mmio);
 	rc = sata_std_hardreset(ap, verbose, class);
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
 
 	if (rc == 0)
 		*class = ahci_dev_classify(ap);
@@ -670,6 +1009,7 @@
 static void ahci_postreset(struct ata_port *ap, unsigned int *class)
 {
 	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
 	u32 new_tmp, tmp;
 
 	ata_std_postreset(ap, class);
@@ -684,6 +1024,9 @@
 		writel(new_tmp, port_mmio + PORT_CMD);
 		readl(port_mmio + PORT_CMD); /* flush */
 	}
+
+	if (*class != ATA_DEV_NONE)
+		hpriv->dev_map |= (1 << ap->port_no);
 }
 
 static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes)
@@ -792,7 +1135,7 @@
 			readl(port_mmio + PORT_SCR_ERR));
 
 	/* stop DMA */
-	ahci_stop_engine(ap);
+	ahci_stop_engine(port_mmio);
 
 	/* clear SATA phy error, if any */
 	tmp = readl(port_mmio + PORT_SCR_ERR);
@@ -811,7 +1154,7 @@
 	}
 
 	/* re-start DMA */
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
 }
 
 static void ahci_eng_timeout(struct ata_port *ap)
@@ -835,6 +1178,71 @@
 	ata_eh_qc_complete(qc);
 }
 
+int ahci_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
+{
+	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+	struct ata_device *dev = &ap->device[sdev->id];
+	int rc;
+
+	rc = ata_device_suspend(ap, dev, state);
+
+	if (!rc)
+		rc = ahci_port_suspend(ap, state);
+
+	return rc;
+}
+
+int ahci_scsi_device_resume(struct scsi_device *sdev)
+{
+	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+	struct ata_device *dev = &ap->device[sdev->id];
+
+	ahci_port_resume(ap);
+
+	return ata_device_resume(ap, dev);
+}
+
+int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+	struct device *dev = pci_dev_to_dev(pdev);
+	struct ata_host_set *host_set = dev_get_drvdata(dev);
+	void __iomem *mmio = host_set->mmio_base;
+	u32 tmp;
+
+	/*
+	 * AHCI spec rev1.1 section 8.3.3:
+	 * Software must disable interrupts prior to
+	 * requesting a transition of the HBA to
+	 * D3 state.
+	 */
+	tmp = readl(mmio + HOST_CTL);
+	tmp &= ~HOST_IRQ_EN;
+	writel(tmp, mmio + HOST_CTL);
+	tmp = readl(mmio + HOST_CTL); /* flush */
+
+	return ata_pci_device_suspend(pdev, state);
+}
+
+int ahci_pci_device_resume(struct pci_dev *pdev)
+{
+	struct device *dev = pci_dev_to_dev(pdev);
+	struct ata_host_set *host_set = dev_get_drvdata(dev);
+	void __iomem *mmio = host_set->mmio_base;
+	u32 tmp;
+
+	/*
+	 * Enabling AHCI mode
+	 */
+	tmp = readl(mmio + HOST_CTL);
+	if (!(tmp & HOST_AHCI_EN)) {
+		tmp |= HOST_AHCI_EN;
+		writel(tmp, mmio + HOST_CTL);
+		tmp = readl(mmio + HOST_CTL);
+	}
+
+	return ata_pci_device_resume(pdev);
+}
+
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
 {
 	void __iomem *mmio = ap->host_set->mmio_base;
@@ -1015,6 +1423,7 @@
 
 	hpriv->cap = readl(mmio + HOST_CAP);
 	hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);
+	hpriv->dev_map = 0;
 	probe_ent->n_ports = (hpriv->cap & 0x1f) + 1;
 
 	VPRINTK("cap 0x%x  port_map 0x%x  n_ports %d\n",
@@ -1060,23 +1469,29 @@
 				(unsigned long) mmio, i);
 
 		/* make sure port is not active */
-		tmp = readl(port_mmio + PORT_CMD);
-		VPRINTK("PORT_CMD 0x%x\n", tmp);
-		if (tmp & (PORT_CMD_LIST_ON | PORT_CMD_FIS_ON |
-			   PORT_CMD_FIS_RX | PORT_CMD_START)) {
-			tmp &= ~(PORT_CMD_LIST_ON | PORT_CMD_FIS_ON |
-				 PORT_CMD_FIS_RX | PORT_CMD_START);
-			writel(tmp, port_mmio + PORT_CMD);
-			readl(port_mmio + PORT_CMD); /* flush */
-
-			/* spec says 500 msecs for each bit, so
-			 * this is slightly incorrect.
-			 */
-			msleep(500);
-		}
+		rc = ahci_stop_engine(port_mmio);
+		if (rc)
+			printk(KERN_WARNING "ata%u: DMA engine busy (rc %d)\n",
+			       i, rc);
+
+		rc = ahci_stop_fis_rx(port_mmio);
+		if (rc)
+			printk(KERN_WARNING "ata%u: FIS RX not stopped (rc %d)\n",
+			       i, rc);
+
+		/*
+		 * Actually, this is wrong again.
+		 * AHCI spec says that we first should
+		 * enable FIS reception before sending
+		 * SPIN_UP to the device ...
+		 */
 
 		writel(PORT_CMD_SPIN_UP, port_mmio + PORT_CMD);
 
+		/*
+		 * Wait for the communications link to establish
+		 */
+
 		j = 0;
 		while (j < 100) {
 			msleep(10);

linux-2.6-serial-resume.patch:
 drivers/char/tty_io.c        |   13 +++++++++++++
 drivers/serial/serial_core.c |   12 ++++++------
 include/linux/tty.h          |    2 ++
 3 files changed, 21 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-serial-resume.patch ---

On Fri, Jun 09, 2006 at 09:42:34AM +0100, Russell King wrote:
> The only sane solution is for the tty layer to be adjusted to allow
> suspend/resume support for consoles.

And for those who can't work out how to do that, here's something which
_probably_ does it.  Would folk mind testing it out please?

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1674,6 +1674,19 @@ release_mem_out:
 }
 
 /*
+ * Get a copy of the termios structure for the driver/index
+ */
+void tty_get_termios(struct tty_driver *driver, int idx, struct termios *tio)
+{
+	lock_kernel();
+	if (driver->termios[idx])
+		*tio = *driver->termios[idx];
+	else
+		*tio = driver->init_termios;
+	unlock_kernel();
+}
+
+/*
  * Releases memory associated with a tty structure, and clears out the
  * driver table slots.
  */
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1968,16 +1968,16 @@ int uart_resume_port(struct uart_driver 
 		struct termios termios;
 
 		/*
-		 * First try to use the console cflag setting.
+		 * Get the termios for this line
 		 */
-		memset(&termios, 0, sizeof(struct termios));
-		termios.c_cflag = port->cons->cflag;
+		tty_get_termios(drv->tty_driver, port->line, &termios);
 
 		/*
-		 * If that's unset, use the tty termios setting.
+		 * If the console cflag is still set, subsitute that
+		 * for the termios cflag.
 		 */
-		if (state->info && state->info->tty && termios.c_cflag == 0)
-			termios = *state->info->tty->termios;
+		if (port->cons->cflag)
+			termios.c_cflag = port->cons->cflag;
 
 		port->ops->set_termios(port, &termios, NULL);
 		console_start(port->cons);
diff --git a/include/linux/tty.h b/include/linux/tty.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -297,6 +297,8 @@ extern int tty_read_raw_data(struct tty_
 			     int buflen);
 extern void tty_write_message(struct tty_struct *tty, char *msg);
 
+extern void tty_get_termios(struct tty_driver *drv, int idx, struct termios *tio);
+
 extern int is_orphaned_pgrp(int pgrp);
 extern int is_ignored(int sig);
 extern int tty_signal(int sig, struct tty_struct *tty);



linux-2.6-warn-c-p-a.patch:
 pageattr.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE linux-2.6-warn-c-p-a.patch ---

--- linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c.org	2006-05-04 09:23:56.000000000 +0200
+++ linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c	2006-05-04 09:27:21.000000000 +0200
@@ -9,6 +9,7 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/kernel.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
@@ -18,6 +19,7 @@
 static DEFINE_SPINLOCK(cpa_lock);
 static struct list_head df_list = LIST_HEAD_INIT(df_list);
 
+extern char __start_rodata, __end_rodata;
 
 pte_t *lookup_address(unsigned long address) 
 { 
@@ -127,10 +129,16 @@
 	pte_t *kpte; 
 	unsigned long address;
 	struct page *kpte_page;
+	static int once = 0;
 
 	BUG_ON(PageHighMem(page));
 	address = (unsigned long)page_address(page);
 
+	if (address >= __start_rodata && address <= __end_rodata && prot != __PAGE_KERNEL_RO && once++ == 0) {
+		printk(KERN_ERR "Possible trojan or rootkit detected!\n");
+		add_taint(TAINT_MACHINE_CHECK);
+	}
+
 	kpte = lookup_address(address);
 	if (!kpte)
 		return -EINVAL;


linux-2.6-x86-tune-generic.patch:
 Makefile.cpu |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-x86-tune-generic.patch ---
--- linux-2.6.15/arch/i386/Makefile.cpu~	2006-01-09 11:39:04.000000000 -0500
+++ linux-2.6.15/arch/i386/Makefile.cpu	2006-01-09 11:39:36.000000000 -0500
@@ -15,7 +15,7 @@ cflags-$(CONFIG_M486)		+= -march=i486
 cflags-$(CONFIG_M586)		+= -march=i586
 cflags-$(CONFIG_M586TSC)	+= -march=i586
 cflags-$(CONFIG_M586MMX)	+= -march=pentium-mmx
-cflags-$(CONFIG_M686)		+= -march=i686
+cflags-$(CONFIG_M686)		+= -march=i686 $(call tune,generic)
 cflags-$(CONFIG_MPENTIUMII)	+= -march=i686 $(call tune,pentium2)
 cflags-$(CONFIG_MPENTIUMIII)	+= -march=i686 $(call tune,pentium3)
 cflags-$(CONFIG_MPENTIUMM)	+= -march=i686 $(call tune,pentium3)


--- NEW FILE linux-2.6.17.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBElLc9yGugalF9Dw4RAsplAJ9Vhjp8IgkMBdGdiYygXtYBcKZ6GwCffyTu
+gY8wsoFmSdAU6UiqakOcyo=
=hcew
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- .cvsignore	5 Jun 2006 18:27:59 -0000	1.403
+++ .cvsignore	18 Jun 2006 04:45:01 -0000	1.404
@@ -1,6 +1,5 @@
 kernel-2.6.*.config
 temp-*
-kernel-2.6.16
-linux-2.6.16.tar.bz2
-xen-20060510.tar.bz2
-patch-2.6.16.20.bz2
+kernel-2.6.17
+xen-20060610.tar.bz2
+linux-2.6.17.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2135
retrieving revision 1.2136
diff -u -r1.2135 -r1.2136
--- kernel-2.6.spec	17 Jun 2006 01:09:03 -0000	1.2135
+++ kernel-2.6.spec	18 Jun 2006 04:45:01 -0000	1.2136
@@ -4,7 +4,7 @@
 # These are the kernels that are built IF the architecture allows it.
 
 %define buildup 1
-%define buildsmp 1
+%define buildsmp 0
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
@@ -21,11 +21,12 @@
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 16
+%define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
 %define signmodules 0
+%define xen_version 20060610
 %define make_target bzImage
 %define kernel_image x86
 
@@ -34,12 +35,11 @@
 # groups of related archs
 %define all_x86 i586 i686
 
-# Override generic defaults with per-arch defaults 
+# Override generic defaults with per-arch defaults
 
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
@@ -66,15 +66,17 @@
 %define signmodules 1
 %endif
 
+%ifarch i686
+%define buildsmp 1
+%endif
+
 %ifarch x86_64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
 %ifarch ppc64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -83,7 +85,6 @@
 %endif
 
 %ifarch ppc64iseries
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -92,24 +93,30 @@
 %endif
 
 %ifarch s390
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image arch/s390/boot/image
 %endif
 
 %ifarch s390x
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image arch/s390/boot/image
 %endif
 
 %ifarch sparc
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
-%define buildsmp 0
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch sparc64
+%define buildsmp 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch ppc
@@ -117,13 +124,15 @@
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
+%define buildsmp 1
 %endif
 
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
-%define buildsmp 0
 %define image_install_path boot/efi/EFI/redhat
 %define signmodules 1
+%define make_target compressed
+%define kernel_image vmlinux.gz
 %endif
 
 #
@@ -137,10 +146,10 @@
 #
 %define kernel_dot_org_conflicts  ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2
 
-# 
-# Then a series of requirements that are distribution specific, either 
-# because we add patches for something, or the older versions have 
-# problems with the newer kernel or lack certain things that make 
+#
+# Then a series of requirements that are distribution specific, either
+# because we add patches for something, or the older versions have
+# problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
 %define package_conflicts kudzu < 1.2.5, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14
@@ -172,7 +181,11 @@
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
-AutoReqProv: no
+
+# KMP - We need this for the moment
+#AutoReqProv: no
+AutoReqProv: yes
+
 
 #
 # List the packages used during the kernel build
@@ -184,7 +197,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060510.tar.bz2
+Source1: xen-%{xen_version}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -194,38 +207,43 @@
 Source21: kernel-%{kversion}-i586-smp.config
 Source22: kernel-%{kversion}-i686.config
 Source23: kernel-%{kversion}-i686-smp.config
-Source24: kernel-%{kversion}-x86_64.config
-Source25: kernel-%{kversion}-ppc64.config
-Source26: kernel-%{kversion}-ppc64iseries.config
-Source27: kernel-%{kversion}-ppc64-kdump.config
-Source28: kernel-%{kversion}-s390.config
-Source29: kernel-%{kversion}-s390x.config
-Source30: kernel-%{kversion}-ppc.config
-Source31: kernel-%{kversion}-ppc-smp.config
-Source32: kernel-%{kversion}-ia64.config
-Source33: kernel-%{kversion}-i686-xen0.config
-Source34: kernel-%{kversion}-i686-xenU.config
-Source35: kernel-%{kversion}-i686-kdump.config
-Source36: kernel-%{kversion}-x86_64-kdump.config
-#Source37: kernel-%{kversion}-sparc.config
-#Source38: kernel-%{kversion}-sparc64.config
-#Source39: kernel-%{kversion}-sparc64-smp.config
-Source40: kernel-%{kversion}-i686-xen0-PAE.config
-Source41: kernel-%{kversion}-i686-xenU-PAE.config
-Source42: kernel-%{kversion}-x86_64-xen0.config
-Source43: kernel-%{kversion}-x86_64-xenU.config
+Source24: kernel-%{kversion}-i686-kdump.config
+
+Source25: kernel-%{kversion}-x86_64.config
+Source26: kernel-%{kversion}-x86_64-kdump.config
+
+Source27: kernel-%{kversion}-ppc.config
+Source28: kernel-%{kversion}-ppc-smp.config
+Source29: kernel-%{kversion}-ppc64.config
+Source30: kernel-%{kversion}-ppc64iseries.config
+Source31: kernel-%{kversion}-ppc64-kdump.config
+
+Source32: kernel-%{kversion}-s390.config
+Source33: kernel-%{kversion}-s390x.config
+
+Source34: kernel-%{kversion}-ia64.config
+
+Source35: kernel-%{kversion}-i686-xen0.config
+Source36: kernel-%{kversion}-i686-xenU.config
+Source37: kernel-%{kversion}-i686-xen0-PAE.config
+Source38: kernel-%{kversion}-i686-xenU-PAE.config
+Source39: kernel-%{kversion}-x86_64-xen0.config
+Source40: kernel-%{kversion}-x86_64-xenU.config
+
+#Source66: kernel-%{kversion}-sparc.config
+#Source67: kernel-%{kversion}-sparc64.config
+#Source68: kernel-%{kversion}-sparc64-smp.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.20.bz2
+#Patch1: patch-2.6.17-rc6.bz2
 
 # Patches 100 through 500 are meant for architecture patches
-Patch100: linux-2.6-bzimage.patch
 
 # 200 - 299   x86(-64)
 
-Patch200: linux-2.6-x86-tune-p4.patch
+Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
 Patch202: linux-2.6-intel-cache-build.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
@@ -233,31 +251,21 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
-Patch210: linux-2.6-x86_64-noisy-syscalls.patch
+Patch208: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
-Patch301: linux-2.6-cell-numa-init.patch
-Patch302: linux-2.6-cell-is-cbea.patch
+Patch302: linux-2.6-offb-find-fb.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
-Patch310: linux-2.6-cell-spiderpic-no-devtree.patch
-Patch313: linux-2.6-hvc-rtas-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
-Patch318: linux-2.6-ppc32-check-legacy-io.patch
-Patch319: linux-2.6-g5-therm-shutdown.patch
-Patch320: linux-2.6-ppc-clear-ipis-on-kdump.patch
-Patch321: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
+Patch318: linux-2.6-ppc-clear-ipis-on-kdump.patch
+Patch319: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
-# 690 - 699 xen patches already split in their system
-Patch690: linux-2.6-xen-i386-mach-io-check-nmi.patch
-Patch691: linux-2.6-xen-net-csum.patch
-Patch692: linux-2.6-xen-pmd-shared.patch
-Patch693: linux-2.6-xen-smp-alts.patch
 # 700 - 799 Xen
 Patch700: linux-2.6-xen.patch
 Patch701: linux-2.6-xen-compile-fixes.patch
@@ -265,8 +273,6 @@
 Patch703: linux-2.6-xen-move-vdso-fixmap.patch
 Patch704: linux-2.6-xen-vsyscall_base.patch
 Patch706: linux-2.6-xen_remap_vma_flags.patch
-Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
-Patch710: linux-2.6-xen-uptodate-2.6.16.15.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -279,7 +285,7 @@
 Patch810: linux-2.6-execshield.patch
 Patch811: linux-2.6-execshield-xen.patch
 Patch812: linux-2.6-xen-vdso-note.patch
-Patch813: linux-2.6-vdso-xen.patch
+Patch813: linux-2.6-warn-c-p-a.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
@@ -299,16 +305,13 @@
 Patch1011: linux-2.6-debug-slab-backtrace.patch
 Patch1012: linux-2.6-debug-list_head.patch
 Patch1013: linux-2.6-debug-taint-vm.patch
-Patch1014: linux-2.6-debug-slab-leaks.patch
 Patch1015: linux-2.6-debug-singlebiterror.patch
 Patch1016: linux-2.6-debug-spinlock-taint.patch
 Patch1017: linux-2.6-debug-spinlock-panic.patch
 Patch1018: linux-2.6-debug-Wundef.patch
 Patch1019: linux-2.6-debug-disable-builtins.patch
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1021: linux-2.6-debug-reference-discarded-return-result.patch
 Patch1022: linux-2.6-debug-panic-stackdump.patch
-Patch1024: linux-2.6-debug-dual-line-backtrace.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1026: linux-2.6-debug-no-quiet.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
@@ -318,7 +321,6 @@
 Patch1031: linux-2.6-debug-periodic-slab-check.patch
 Patch1032: linux-2.6-debug-boot-delay.patch
 Patch1033: linux-2.6-debug-must_check.patch
-Patch1034: linux-2.6-debug-pm-pci.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -326,70 +328,52 @@
 
 # Provide read only /dev/crash driver.
 Patch1060: linux-2.6-crash-driver.patch
-Patch1061: linux-2.6-crash-xen.patch
 
 Patch1070: linux-2.6-sleepon.patch
 
 # SCSI bits.
-Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
+Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
-Patch1204: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
-Patch1302: linux-2.6-net-wireless-features.patch
-Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch
 Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
 
-# Netdump and Diskdump bits.
-Patch1500: linux-2.6-crashdump-common.patch
-Patch1501: linux-2.6-netdump.patch
-Patch1502: linux-2.6-netconsole.patch
-Patch1503: linux-2.6-diskdump.patch
-Patch1504: linux-2.6-crashdump-reboot-exports.patch
-Patch1505: linux-2.6-dump_smp_call_function.patch
-
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-ide-tune-locking.patch
-Patch1641: linux-2.6-ide-cd-shutup.patch
-Patch1650: linux-2.6-autofs-pathlookup.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
-Patch1680: linux-2.6-pwc-powerup-by-default.patch
-Patch1690: linux-2.6-smsc-ircc2-pnp.patch
+Patch1680: linux-2.6-usb-unusual-devices.patch
+Patch1690: linux-2.6-autofs-invalidate.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
-Patch1730: linux-2.6-signal-trampolines-unwind-info.patch
+Patch1720: linux-2.6-proc-self-maps-fix.patch
+Patch1730: linux-2.6-ac97_unregister_controls_ad18xx.patch
 Patch1740: linux-2.6-softlockup-disable.patch
-Patch1750: linux-2.6-drm-cripple-r300.patch
+Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1780: linux-2.6-cpufreq-acpi-sticky.patch
-Patch1790: linux-2.6-usb-unusual-devices.patch
-Patch1791: linux-2.6-mptfusion-kdump.patch
+Patch1780: linux-2.6-powernow-k7-smp.patch
+Patch1790: linux-2.6-console-suspend.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
-Patch1802: linux-2.6-selinux-disable-attributes-no-policy.patch
-Patch1803: linux-2.6-selinux-selinuxfs-hard-link-count.patch
-Patch1804: linux-2.6-audit-new-msg-types.patch
 
 # Warn about usage of various obsolete functionality that may go away.
-Patch1900: linux-2.6-obsolete-idescsi-warning.patch
-Patch1901: linux-2.6-obsolete-oss-warning.patch
+Patch1900: linux-2.6-obsolete-oss-warning.patch
 
 # no external module should use these symbols.
 Patch1910: linux-2.6-unexport-symbols.patch
@@ -401,27 +385,19 @@
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-max-symlinks.patch
 Patch2101: linux-2.6-defaults-fat-utf8.patch
-Patch2102: linux-2.6-defaults-enable-sata-atapi.patch
-Patch2103: linux-2.6-defaults-firmware-loader-timeout.patch
+Patch2102: linux-2.6-defaults-firmware-loader-timeout.patch
+Patch2103: linux-2.6-defaults-phys-start.patch
+Patch2104: linux-2.6-defaults-unicode-vt.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-sata-silence-dumb-msg.patch
+Patch2202: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
-
-# Broadcom wireless driver
-Patch5000: linux-2.6-softmac-git.patch
-Patch5001: linux-2.6-bcm43xx-git.patch
-Patch5002: linux-2.6-bcm43xx-neuter.patch
-Patch5003: linux-2.6-softmac-scan-channel.patch
-Patch5004: linux-2.6-softmac-scan-dwell-time.patch
-Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch
-Patch5006: linux-2.6-softmac-default-rate.patch
-Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch
-Patch5008: linux-2.6-softmac-assoc-events.patch
+Patch2302: linux-2.6-cpufreq-acpi-sticky.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -447,7 +423,7 @@
 Obsoletes: kernel-smp
 %endif
 
-%description 
+%description
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
 of the operating system:  memory allocation, process allocation, device
@@ -472,12 +448,11 @@
 %description doc
 This package contains documentation files from the kernel
 source. Various bits of information about the Linux kernel and the
-device drivers shipped with it are documented in these files. 
+device drivers shipped with it are documented in these files.
 
 You'll want to install this package if you need a reference to the
 options that can be passed to Linux kernel modules at load time.
 
-
 %package smp
 Summary: The Linux kernel compiled for SMP machines.
 
@@ -510,7 +485,7 @@
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
 Provides: kernel-devel = %{rpmversion}-%{release}smp
 AutoReqProv: no
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description smp-devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -528,7 +503,7 @@
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
 # the hypervisor kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0 
+Conflicts: mkinitrd <= 4.2.0
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
@@ -548,7 +523,7 @@
 Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0
 Provides: kernel-devel = %{rpmversion}-%{release}xen0
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description xen0-devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -567,7 +542,7 @@
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
 # the xen0-PAE kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0 
+Conflicts: mkinitrd <= 4.2.0
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
@@ -588,7 +563,7 @@
 Provides: kernel-xen0-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
 Provides: kernel-devel = %{rpmversion}-%{release}xen0-PAE
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description xen0-PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -622,7 +597,7 @@
 Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU
 Provides: kernel-devel = %{rpmversion}-%{release}xenU
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description xenU-devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -656,7 +631,7 @@
 Provides: kernel-xenU-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
 Provides: kernel-devel = %{rpmversion}-%{release}xenU-PAE
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description xenU-PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -689,7 +664,7 @@
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}kdump
 Provides: kernel-devel = %{rpmversion}-%{release}kdump
 AutoReqProv: no
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description kdump-devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -697,36 +672,53 @@
 
 
 %prep
+# First we unpack the kernel tarball.
+# If this isn't the first make prep, we use links to the existing clean tarball
+# which speeds things up quite a bit.
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
   rm -f pax_global_header
-%setup -q -n %{name}-%{version} -c -a1
-  cp %{SOURCE2} .
+%setup -q -n %{name}-%{version} -c
   mv linux-%{kversion} vanilla
-  mv xen xen-vanilla
-  cp %{SOURCE2} .
 else
   # We already have a vanilla dir.
   cd kernel-%{kversion}
   if [ -d linux-%{kversion}.%{_target_cpu} ]; then
+     # Just in case we ctrl-c'd a prep already
+     rm -rf deleteme
+     # Move away the stale away, and delete in background.
      mv linux-%{kversion}.%{_target_cpu} deleteme
      rm -rf deleteme &
   fi
-  if [ -d xen ]; then
-     mv xen deleteme2
-     rm -rf deleteme2 &
-  fi
 fi
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
-cp -rl xen-vanilla xen
+
+# Now do the same procedure with the Xen tarball.
+%if %{includexen}
+if [ -d xen ]; then
+  # Just in case we ctrl-c'd a prep already
+  rm -rf deleteme2
+  # Move away the stale away, and delete in background.
+  mv xen deleteme2
+  rm -rf deleteme2 &
+fi
+
+if [ ! -d xen-%{xen_version} ]; then
+  # Ok, first time we do a make prep
+%setup -D -T -q -n %{name}-%{version} -a1
+  cp %{SOURCE2} .
+  mv xen xen-%{xen_version}
+fi
+cp -rl xen-%{xen_version} xen
 
 # Any necessary hypervisor patches go here
-%patch20000 -p1
+%patch20000 -p0
+%endif
 
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-%patch1 -p1
+#%patch1 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -739,7 +731,6 @@
 #
 # Architecture patches
 #
-%patch100 -p1
 
 #
 # x86(-64)
@@ -764,48 +755,29 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
-# x86-64 is noisy when syscalls are unimplemented.
-%patch210 -p1
+# Hush noisy unimplemented 32bit syscalls
+%patch208 -p1
 
 #
 # ppc64
 #
-# Arnd says don't call cell_spumem_init() till he fixes it.
-%patch301 -p1
-# IBM will use 'IBM,CBEA' for future Cell systems
+# Find OF framebuffer more reliably
 %patch302 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
 # Make HVC console generic; support simulator console device using it.
-%patch306 -p1
-# Hardcode PIC addresses for Cell spiderpic
-%patch310 -p1
-# RTAS console support
-%patch313 -p1
+#%patch306 -p1
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 # No input layer on iseries
 %patch317 -p1
-# check_legacy_ioport() on ppc32
 %patch318 -p1
-# Avoid thermal shutdown on some G5 machines
 %patch319 -p1
-#
-%patch320 -p1
-#
-%patch321 -p1
 
 #
 # Xen
 #
 %if %{includexen}
-# Base Xen patch from linux-2.6-merge.hg
-%patch690 -p1
-# Conflict with non-xen kernels
-#%patch691 -p1
-%patch692 -p1
-%patch693 -p1
-
 #
 # Apply the main xen patch...
 #
@@ -813,15 +785,16 @@
 #
 # ... and back out all the ia64-specific sections, as they currently prevent
 # non-xen builds from working.
+# Now also with tpm
 #
-for f in `find arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
     g=`dirname $f`/`basename $f .p.xen`; \
     mv "$f" "$g"; \
     if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
 done
 # Delete the rest of the backup files, they just confuse the build later
 find -name "*.p.xen" | xargs rm -f
-    
+
 #
 # Xen includes a patch which moves the vsyscall fixmap into a user-space VA,
 # freeing user-space from reliance on an absolute fixmap area and so allowing
@@ -837,8 +810,6 @@
 %patch702 -p1
 %patch704 -p1
 %patch706 -p1
-%patch709 -p1
-%patch710 -p1
 
 %endif
 
@@ -857,14 +828,15 @@
 
 # Exec shield 
 %patch810 -p1
+#%patch813 -p1
 
 # Xen exec-shield bits
 %if %{includexen}
 %patch811 -p1
 %patch812 -p1
-#%patch813 -p1
 %endif
 
+
 #
 # GPG signed kernel modules
 #
@@ -883,49 +855,43 @@
 #
 
 
+
 # Various low-impact patches to aid debugging.
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
-%patch1014 -p1
 %patch1015 -p1
 %patch1016 -p1
 %patch1017 -p1
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1021 -p1
 %patch1022 -p1
-%patch1024 -p1
 %patch1025 -p1
 # Disable the 'quiet' boot switch for better bug reports.
-#%patch1026 -p1
+%patch1026 -p1
 # Slab leak detector.
 #%patch1027 -p1
-%patch1028 -p1
+# Pause on oops.
+#%patch1028 -p1
 #%patch1029 -p1
 #%patch1030 -p1
-%patch1031 -p1
+#%patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
-%patch1034 -p1
 
 #
-# Make /dev/mem a need-to-know function 
+# Make /dev/mem a need-to-know function
 #
 %patch1050 -p1
 %if %{includexen}
-#TODO! --sct @@@
-#%patch1051 -p1
+%patch1051 -p1
 %endif
 
 #
 # /dev/crash driver for the crashdump analysis tool
 #
 %patch1060 -p1
-%if %{includexen}
-%patch1061 -p1
-%endif
 
 #
 # Most^WAll users of sleep_on are broken; fix a bunch
@@ -935,10 +901,11 @@
 #
 # SCSI Bits.
 #
-# Enable Advansys driver
-%patch1101 -p1
 # Add a pci table to advansys driver.
 %patch1102 -p1
+# iSCSI driver update that can be dropped when kernel is rebased
+# against a kernel that has the SCSI updates for 2.6.18
+%patch1103 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -948,30 +915,16 @@
 %patch1201 -p1
 # Fix badness.
 %patch1203 -p1
-# NFSD: writes should not clobber utimes() calls
-%patch1204 -p1
 
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
-# Goodies for wireless drivers to make NetworkManager work
-%patch1302 -p1
-# ipw2200 hwcrypto=0 by default to avoid firmware restarts
-%patch1303 -p1
 # add IPW2200_MONITOR config option
 %patch1304 -p1
 
 # Squashfs
 %patch1400 -p1
 
-# netdump bits
-%patch1500 -p1
-%patch1501 -p1
-%patch1502 -p1
-%patch1503 -p1
-%patch1504 -p1
-%patch1505 -p1
-
 #
 # Various SELinux fixes from 2.6.10rc
 #
@@ -987,53 +940,42 @@
 %patch1630 -p1
 # Fix IDE locking bug.
 %patch1640 -p1
-# Silence noisy CD drive spew
-%patch1641 -p1
-# autofs4 looks up wrong path element when ghosting is enabled
-%patch1650 -p1
-# 
+#
 %patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
-# Power up PWC driver by default.
+# Add some USB devices to the unusual quirk list.
 %patch1680 -p1
-# PNP support for smsc-ircc2
+# autofs4 - need to invalidate children on tree mount expire
 %patch1690 -p1
 # Silence debug messages in w1
 %patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
-# Mark unwind info for signal trampolines in vDSOs
+# setuid /proc/self/maps fix.
+%patch1720 -p1
+# OLPC ac97 fix.
 %patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
-# Disable R300 and above DRI as it's unstable.
+# serial/tty resume fixing.
 %patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
 %patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
-# Make acpi-cpufreq sticky.
+# Fix up powernow-k7 to work on SMP kernels.
 %patch1780 -p1
-# unusual USB device quirks
+# Console fixes for suspend/resume
 %patch1790 -p1
-# make kdump work with mptfusion
-%patch1791 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
-# Disable setting of security attributes on new inodes when no policy is loaded
-%patch1802 -p1
-# Fix incorrect hardlink count in selinuxfs
-%patch1803 -p1
-# Add some more audit message types.
-%patch1804 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
-%patch1901 -p1
 # Remove kernel-internal functionality that nothing external should use.
 %patch1910 -p1
 
@@ -1050,50 +992,38 @@
 %patch2100 -p1
 # Use UTF-8 by default on VFAT.
 %patch2101 -p1
-# Enable SATA ATAPI by default.
-%patch2102 -p1
 # Increase timeout on firmware loader.
+%patch2102 -p1
+# Change PHYSICAL_START
 %patch2103 -p1
+# Use unicode VT's by default.
+%patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
 # Silence silly SATA printk.
 %patch2201 -p1
+# Fix AHCI Suspend.
+%patch2202 -p1
 
+# ACPI patches
 # Silence more ACPI debug spew from suspend.
 %patch2300 -p1
 # acpi-ecdt-uid-hack
 %patch2301 -p1
-
+# Make acpi-cpufreq sticky.
+%patch2302 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
 #
 
-# Import softmac code from wireless-2.6 tree
-%patch5000 -p1
-# ... and bcm43xx driver too
-%patch5001 -p1
-# temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry
-%patch5002 -p1
-# Go back to the original channel when we finish scanning.
-%patch5003 -p1
-# When scanning, spend only 20ms on each channel not 500ms.
-%patch5004 -p1
-# Attempt to associate when the link is brought up
-%patch5005 -p1
-# Default to 11Mbps not 54Mbps, since we don't back down automatically yet.
-%patch5006 -p1
-# bcm43xx dies if we attempt to set the channel while it's down.
-%patch5007 -p1
-# Send standard events on {dis,}association
-%patch5008 -p1
-
 #
 # final stuff
 #
 
+
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
@@ -1102,7 +1032,6 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
-
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1114,12 +1043,12 @@
 
 # now run oldconfig over all the config files
 for i in *.config
-do 
-  mv $i .config 
+do
+  mv $i .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
-  cat .config >> configs/$i 
+  cat .config >> configs/$i
 done
 
 # make sure the kernel has the sublevel we know it has. This looks weird
@@ -1129,7 +1058,9 @@
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile
 
 # get rid of unwanted files resulting from patch fuzz
-find . -name "*.orig" -o -name "*~" -exec rm -f {} \; >/dev/null &
+cd ..
+find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
+
 
 ###
 ### build
@@ -1139,8 +1070,8 @@
 # Create gpg keys for signing the modules
 #
 
-gpg --homedir . --batch --gen-key %{SOURCE11}  
-gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub 
+gpg --homedir . --batch --gen-key %{SOURCE11}
+gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
 make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
 linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
 
@@ -1202,13 +1133,13 @@
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
- 
+
     # And save the headers/makefiles etc for building modules against
     #
     # This all looks scary, but the end result is supposed to be:
     # * all arch relevant include/ files
     # * all Makefile/Kconfig files
-    # * all script/ files 
+    # * all script/ files
 
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source
@@ -1219,7 +1150,7 @@
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
     # first copy everything
     cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build 
-    cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+	cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     # then drop all but the needed Makefiles/Kconfig files
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts
@@ -1260,7 +1191,7 @@
     # external modules can be built
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
-    cd .. 
+    cd ..
 
     #
     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
@@ -1275,10 +1206,10 @@
     # gpg sign the modules
 %if %{signmodules}
     gcc -o scripts/modsign/mod-extract scripts/modsign/mod-extract.c -Wall
-    KEYFLAGS="--no-default-keyring --homedir .." 
-    KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" 
-    KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" 
-    export KEYFLAGS 
+    KEYFLAGS="--no-default-keyring --homedir .."
+    KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec"
+    KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub"
+    export KEYFLAGS
 
     for i in `cat modnames`
     do
@@ -1294,7 +1225,7 @@
     # detect missing or incorrect license tags
     for i in `cat modnames`
     do
-      echo -n "$i " 
+      echo -n "$i "
       /sbin/modinfo -l $i >> modinfo
     done
     cat modinfo |\
@@ -1302,7 +1233,7 @@
       grep -v "^Dual BSD/GPL" |\
       grep -v "^Dual MPL/GPL" |\
       grep -v "^GPL and additional rights" |\
-      grep -v "^GPL v2" && exit 1 
+      grep -v "^GPL v2" && exit 1
     rm -f modinfo
     rm -f modnames
     # remove files that will be auto generated by depmod at rpm -i time
@@ -1412,7 +1343,7 @@
 
 # load the loop module for upgrades...in case the old modules get removed we have
 # loopback in the kernel so that mkinitrd will work.
-%pre 
+%pre
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 exit 0
 
@@ -1420,7 +1351,7 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 exit 0
 
-%post 
+%post
 if [ `uname -i` == "x86_64" ]; then
   if [ -f /etc/sysconfig/kernel ]; then
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
@@ -1513,7 +1444,7 @@
   popd > /dev/null
 fi
 
-%preun 
+%preun
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
 
@@ -1696,8 +1627,8 @@
 %endif
 
 %changelog
-* Thu Jun 15 2006 Don Zickus <dzickus at redhat.com>
-- Fix mptfusion to work with kdump kernels
+* Sun Jun 18 2006 Dave Jones <davej at redhat.com>
+- 2.6.17
 
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2133_FC5]
 - Add a PPC64 kdump kernel.

linux-2.6-build-nonintconfig.patch:
 linux-2.6.14/scripts/kconfig/confdata.c      |    8 +++-----
 linux-2.6.16.noarch/scripts/kconfig/Makefile |    3 +++
 linux-800/scripts/kconfig/conf.c             |   26 +++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 8 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-build-nonintconfig.patch	13 Feb 2006 18:04:43 -0000	1.4
+++ linux-2.6-build-nonintconfig.patch	18 Jun 2006 04:45:03 -0000	1.5
@@ -85,20 +85,18 @@
 -	return 0;
 +	return return_value;
  }
-diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/Makefile linux-800/scripts/kconfig/Makefile
---- linux-600/scripts/kconfig/Makefile
-+++ linux-800/scripts/kconfig/Makefile
-@@ -23,6 +23,10 @@ oldconfig: $(obj)/conf
+--- linux-2.6.16.noarch/scripts/kconfig/Makefile~	2006-03-25 15:55:18.000000000 -0500
++++ linux-2.6.16.noarch/scripts/kconfig/Makefile	2006-03-25 15:55:47.000000000 -0500
+@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf
  silentoldconfig: $(obj)/conf
  	$< -s arch/$(ARCH)/Kconfig
  
 +nonint_oldconfig: scripts/kconfig/conf
 +	./scripts/kconfig/conf -b arch/$(ARCH)/Kconfig
 +
-+
- .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
- 
- randconfig: $(obj)/conf
+ update-po-config: $(obj)/kxgettext
+ 	xgettext --default-domain=linux \
+           --add-comments --keyword=_ --keyword=N_ \
 --- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-10 14:55:46.000000000 -0500
 +++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-10 14:56:01.000000000 -0500
 @@ -149,7 +149,7 @@ int conf_read_simple(const char *name)

linux-2.6-crash-driver.patch:
 linux-1060/arch/i386/mm/init.c            |    2 
 linux-1060/arch/ia64/kernel/ia64_ksyms.c  |    3 
 linux-1060/arch/x86_64/mm/init.c          |    3 
 linux-1060/drivers/char/Kconfig           |    2 
 linux-1060/drivers/char/crash.c           |  129 ++++++++++++++++++++++++++++++
 linux-1060/include/asm-i386/crash.h       |   75 +++++++++++++++++
 linux-1060/include/asm-ia64/crash.h       |   90 ++++++++++++++++++++
 linux-1060/include/asm-x86_64/crash.h     |   75 +++++++++++++++++
 linux-2.6.16.noarch/drivers/char/Makefile |    1 
 9 files changed, 380 insertions(+)

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-crash-driver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-crash-driver.patch	15 Oct 2005 01:13:22 -0000	1.1
+++ linux-2.6-crash-driver.patch	18 Jun 2006 04:45:03 -0000	1.2
@@ -188,15 +188,14 @@
  
  config LEGACY_PTY_COUNT
  	int "Maximum number of legacy PTY in use"
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Makefile linux-1060/drivers/char/Makefile
---- linux-1050/drivers/char/Makefile
-+++ linux-1060/drivers/char/Makefile
-@@ -88,6 +88,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/
- obj-$(CONFIG_IPMI_HANDLER) += ipmi/
+--- linux-2.6.16.noarch/drivers/char/Makefile~	2006-03-25 18:50:42.000000000 -0500
++++ linux-2.6.16.noarch/drivers/char/Makefile	2006-03-25 18:50:59.000000000 -0500
+@@ -95,6 +95,7 @@ obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
+ 
+ obj-$(CONFIG_HANGCHECK_TIMER)	+= hangcheck-timer.o
+ obj-$(CONFIG_TCG_TPM)		+= tpm/
++obj-$(CONFIG_CRASH)		+= crash.o
  
- obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-+obj-$(CONFIG_CRASH) += crash.o
- obj-$(CONFIG_TCG_TPM) += tpm/
  # Files generated that shall be removed upon make clean
  clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h

linux-2.6-debug-Wundef.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-debug-Wundef.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-Wundef.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-Wundef.patch	12 Feb 2006 20:28:24 -0000	1.2
+++ linux-2.6-debug-Wundef.patch	18 Jun 2006 04:45:03 -0000	1.3
@@ -6,12 +6,12 @@
 
 --- linux-2.6/Makefile~	2005-05-28 18:48:02.000000000 -0400
 +++ linux-2.6/Makefile	2005-05-28 18:48:27.000000000 -0400
-@@ -203,7 +203,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+@@ -306,7 +306,7 @@ LINUXINCLUDE    := -Iinclude \
+ CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
- HOSTCC  	= gcc
- HOSTCXX  	= g++
--HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef -Werror-implicit-function-declaration
- HOSTCXXFLAGS	= -O2
+ CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+-	  	   -fno-strict-aliasing -fno-common
++	  	   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
+ AFLAGS		:= -D__ASSEMBLY__
  
- # 	Decide whether to build built-in, modular, or both.
+ # Read KERNELRELEASE from .kernelrelease (if it exists)

linux-2.6-debug-disable-builtins.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-debug-disable-builtins.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-disable-builtins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-disable-builtins.patch	18 Aug 2005 18:28:13 -0000	1.1
+++ linux-2.6-debug-disable-builtins.patch	18 Jun 2006 04:45:03 -0000	1.2
@@ -1,4 +1,4 @@
-Disable built-ins and also more m32 work
+Disable built-ins
 
 diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/Makefile linux-10000/arch/i386/Makefile
 --- linux-3022/arch/i386/Makefile

linux-2.6-debug-latency-tracing.patch:
 Makefile                           |   10 
 arch/arm/boot/compressed/head.S    |   13 
 arch/arm/boot/compressed/misc.c    |    1 
 arch/arm/kernel/entry-common.S     |  109 +
 arch/arm/kernel/fiq.c              |    4 
 arch/arm/kernel/irq.c              |    4 
 arch/arm/kernel/traps.c            |    2 
 arch/arm/mm/copypage-v4mc.c        |    4 
 arch/arm/mm/copypage-xscale.c      |    4 
 arch/arm/mm/fault.c                |   14 
 arch/arm26/boot/compressed/misc.c  |    1 
 arch/i386/Kconfig                  |    2 
 arch/i386/boot/compressed/misc.c   |    9 
 arch/i386/kernel/Makefile          |    1 
 arch/i386/kernel/entry.S           |   41 
 arch/i386/kernel/irq.c             |    8 
 arch/i386/kernel/mcount-wrapper.S  |   27 
 arch/i386/kernel/traps.c           |    1 
 arch/i386/mm/fault.c               |    1 
 arch/ppc/boot/Makefile             |    9 
 arch/ppc/boot/lib/Makefile         |   48 
 arch/ppc/kernel/entry.S            |   82 +
 arch/x86_64/boot/compressed/misc.c |    1 
 arch/x86_64/kernel/entry.S         |   48 
 arch/x86_64/kernel/vsyscall.c      |    2 
 arch/x86_64/mm/fault.c             |    1 
 fs/proc/proc_misc.c                |   17 
 include/asm-arm/pgalloc.h          |    4 
 include/asm-arm/timex.h            |   10 
 include/asm-arm/unistd.h           |    4 
 include/asm-i386/system.h          |    8 
 include/asm-x86_64/system.h        |   15 
 include/asm-x86_64/unistd.h        |    2 
 include/linux/interrupt.h          |   10 
 include/linux/kernel.h             |    2 
 include/linux/latency_hist.h       |   32 
 include/linux/linkage.h            |    2 
 include/linux/preempt.h            |   20 
 include/linux/sched.h              |   86 +
 kernel/Makefile                    |    3 
 kernel/latency.c                   | 2465 +++++++++++++++++++++++++++++++++++++
 kernel/latency_hist.c              |  267 ++++
 kernel/sched.c                     |  101 +
 kernel/sysctl.c                    |   77 +
 kernel/time.c                      |   19 
 lib/Kconfig.debug                  |  152 ++
 lib/inflate.c                      |   44 
 lib/zlib_inflate/inftrees.c        |   45 
 48 files changed, 3734 insertions(+), 98 deletions(-)

Index: linux-2.6-debug-latency-tracing.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-latency-tracing.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-debug-latency-tracing.patch	13 Mar 2006 22:17:56 -0000	1.10
+++ linux-2.6-debug-latency-tracing.patch	18 Jun 2006 04:45:03 -0000	1.11
@@ -1,393 +1,8 @@
-
-this patch reduces the ~2500+ worst-case stack footprint of zlib to 
-~500 bytes, by making the largest arrays static and by introducing a
-spinlock to protect access to them.
-
-Signed-off-by: Ingo Molnar <mingo at elte.hu>
-
- arch/arm/boot/compressed/misc.c    |    1 
- arch/arm26/boot/compressed/misc.c  |    1 
- arch/i386/boot/compressed/misc.c   |    1 
- arch/x86_64/boot/compressed/misc.c |    1 
- lib/inflate.c                      |   44 +++++++++++++++++++++++++++---------
- lib/zlib_inflate/inftrees.c        |   45 ++++++++++++++++++++++++++++---------
- 6 files changed, 72 insertions(+), 21 deletions(-)
-
-Index: linux/arch/arm/boot/compressed/misc.c
-===================================================================
---- linux.orig/arch/arm/boot/compressed/misc.c
-+++ linux/arch/arm/boot/compressed/misc.c
-@@ -199,6 +199,7 @@ static ulg free_mem_ptr_end;
- 
- #define HEAP_SIZE 0x2000
- 
-+#define ZLIB_INFLATE_NO_INFLATE_LOCK
- #include "../../../../lib/inflate.c"
- 
- #ifndef STANDALONE_DEBUG
-Index: linux/arch/arm26/boot/compressed/misc.c
-===================================================================
---- linux.orig/arch/arm26/boot/compressed/misc.c
-+++ linux/arch/arm26/boot/compressed/misc.c
-@@ -184,6 +184,7 @@ static ulg free_mem_ptr_end;
- 
- #define HEAP_SIZE 0x2000
- 
-+#define ZLIB_INFLATE_NO_INFLATE_LOCK
- #include "../../../../lib/inflate.c"
- 
- #ifndef STANDALONE_DEBUG
-Index: linux/arch/i386/boot/compressed/misc.c
-===================================================================
---- linux.orig/arch/i386/boot/compressed/misc.c
-+++ linux/arch/i386/boot/compressed/misc.c
-@@ -125,6 +125,7 @@ static int lines, cols;
- static void * xquad_portio = NULL;
- #endif
- 
-+#define ZLIB_INFLATE_NO_INFLATE_LOCK
- #include "../../../../lib/inflate.c"
- 
- static void *malloc(int size)
-Index: linux/arch/x86_64/boot/compressed/misc.c
-===================================================================
---- linux.orig/arch/x86_64/boot/compressed/misc.c
-+++ linux/arch/x86_64/boot/compressed/misc.c
-@@ -114,6 +114,7 @@ static char *vidmem = (char *)0xb8000;
- static int vidport;
- static int lines, cols;
- 
-+#define ZLIB_INFLATE_NO_INFLATE_LOCK
- #include "../../../../lib/inflate.c"
- 
- static void *malloc(int size)
-Index: linux/lib/inflate.c
-===================================================================
---- linux.orig/lib/inflate.c
-+++ linux/lib/inflate.c
-@@ -141,6 +141,25 @@ struct huft {
-   } v;
- };
- 
-+/*
-+ * turn off the inflate_lock for the bootloader code, it is
-+ * single-threaded and has no need for (nor access to) the
-+ * kernel's locking primitives:
-+ */
-+#ifdef ZLIB_INFLATE_NO_INFLATE_LOCK
-+# undef DEFINE_SPINLOCK
-+# undef spin_lock
-+# undef spin_unlock
-+# define DEFINE_SPINLOCK(x)	int x
-+# define spin_lock(x)		(void)(x)
-+# define spin_unlock(x)		(void)(x)
-+#endif
-+
-+/*
-+ * lock protecting static variables of huft_build() and other inflate
-+ * functions, to reduce their insane stack footprint.
-+ */
-+static DEFINE_SPINLOCK(inflate_lock);
- 
- /* Function prototypes */
- STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, 
-@@ -304,7 +323,7 @@ STATIC int INIT huft_build(
-   register struct huft *q;      /* points to current table */
-   struct huft r;                /* table entry for structure assignment */
-   struct huft *u[BMAX];         /* table stack */
--  unsigned v[N_MAX];            /* values in order of bit length */
-+  static unsigned v[N_MAX];     /* values in order of bit length */
-   register int w;               /* bits before this table == (l * h) */
-   unsigned x[BMAX+1];           /* bit offsets, then code stack */
-   unsigned *xp;                 /* pointer into x */
-@@ -705,7 +724,7 @@ STATIC int noinline INIT inflate_fixed(v
-   struct huft *td;      /* distance code table */
-   int bl;               /* lookup bits for tl */
-   int bd;               /* lookup bits for td */
--  unsigned l[288];      /* length list for huft_build */
-+  static unsigned l[288];      /* length list for huft_build */
- 
- DEBG("<fix");
- 
-@@ -767,9 +786,9 @@ STATIC int noinline INIT inflate_dynamic
-   unsigned nl;          /* number of literal/length codes */
-   unsigned nd;          /* number of distance codes */
- #ifdef PKZIP_BUG_WORKAROUND
--  unsigned ll[288+32];  /* literal/length and distance code lengths */
-+  static unsigned ll[288+32];  /* literal/length and distance code lengths */
- #else
--  unsigned ll[286+30];  /* literal/length and distance code lengths */
-+  static unsigned ll[286+30];  /* literal/length and distance code lengths */
- #endif
-   register ulg b;       /* bit buffer */
-   register unsigned k;  /* number of bits in bit buffer */
-@@ -940,6 +959,7 @@ STATIC int INIT inflate_block(
-   unsigned t;           /* block type */
-   register ulg b;       /* bit buffer */
-   register unsigned k;  /* number of bits in bit buffer */
-+  unsigned ret;         /* return code */
- 
-   DEBG("<blk");
- 
-@@ -965,17 +985,19 @@ STATIC int INIT inflate_block(
-   bk = k;
- 
-   /* inflate that block type */
--  if (t == 2)
--    return inflate_dynamic();
--  if (t == 0)
--    return inflate_stored();
--  if (t == 1)
--    return inflate_fixed();
-+  ret = 2;
-+  spin_lock(&inflate_lock);
-+  switch (t) {
-+	case 2: ret = inflate_dynamic(); break;
-+	case 0: ret = inflate_stored();  break;
-+	case 1: ret = inflate_fixed();   break;
-+  }
-+  spin_unlock(&inflate_lock);
- 
-   DEBG(">");
- 
-   /* bad block type */
--  return 2;
-+  return ret;
- 
-  underrun:
-   return 4;			/* Input underrun */
-Index: linux/lib/zlib_inflate/inftrees.c
-===================================================================
---- linux.orig/lib/zlib_inflate/inftrees.c
-+++ linux/lib/zlib_inflate/inftrees.c
-@@ -4,11 +4,19 @@
-  */
- 
- #include <linux/zutil.h>
-+#include <linux/spinlock.h>
- #include "inftrees.h"
- #include "infutil.h"
- 
- static const char inflate_copyright[] __attribute_used__ =
-    " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
-+
-+/*
-+ * lock protecting static variables of huft_build() and other inflate
-+ * functions, to reduce their insane stack footprint.
-+ */
-+static DEFINE_SPINLOCK(inflate_lock);
-+
- /*
-   If you use the zlib library in a product, an acknowledgment is welcome
-   in the documentation of your product. If for some reason you cannot
-@@ -107,7 +115,7 @@ static int huft_build(
- {
- 
-   uInt a;                       /* counter for codes of length k */
--  uInt c[BMAX+1];               /* bit length count table */
-+  static uInt c[BMAX+1];        /* bit length count table */
-   uInt f;                       /* i repeats in table every f entries */
-   int g;                        /* maximum code length */
-   int h;                        /* table level */
-@@ -118,10 +126,10 @@ static int huft_build(
-   uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
-   register uInt *p;             /* pointer into c[], b[], or v[] */
-   inflate_huft *q;              /* points to current table */
--  struct inflate_huft_s r;      /* table entry for structure assignment */
--  inflate_huft *u[BMAX];        /* table stack */
-+  static struct inflate_huft_s r; /* table entry for structure assignment */
-+  static inflate_huft *u[BMAX]; /* table stack */
-   register int w;               /* bits before this table == (l * h) */
--  uInt x[BMAX+1];               /* bit offsets, then code stack */
-+  static uInt x[BMAX+1];        /* bit offsets, then code stack */
-   uInt *xp;                     /* pointer into x */
-   int y;                        /* number of dummy codes added */
-   uInt z;                       /* number of entries in current table */
-@@ -300,9 +308,13 @@ int zlib_inflate_trees_bits(
-   int r;
-   uInt hn = 0;          /* hufts used in space */
-   uInt *v;              /* work area for huft_build */
--  
-+
-   v = WS(z)->tree_work_area_1;
-+
-+  spin_lock(&inflate_lock);
-   r = huft_build(c, 19, 19, NULL, NULL, tb, bb, hp, &hn, v);
-+  spin_unlock(&inflate_lock);
-+
-   if (r == Z_DATA_ERROR)
-     z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-   else if (r == Z_BUF_ERROR || *bb == 0)
-@@ -333,7 +345,10 @@ int zlib_inflate_trees_dynamic(
-   v = WS(z)->tree_work_area_2;
- 
-   /* build literal/length tree */
-+  spin_lock(&inflate_lock);
-   r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
-+  spin_unlock(&inflate_lock);
-+
-   if (r != Z_OK || *bl == 0)
-   {
-     if (r == Z_DATA_ERROR)
-@@ -347,7 +362,10 @@ int zlib_inflate_trees_dynamic(
-   }
- 
-   /* build distance tree */
-+  spin_lock(&inflate_lock);
-   r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
-+  spin_unlock(&inflate_lock);
-+
-   if (r != Z_OK || (*bd == 0 && nl > 257))
-   {
-     if (r == Z_DATA_ERROR)
-@@ -383,9 +401,11 @@ int zlib_inflate_trees_fixed(
- 	z_streamp z              /* for memory allocation */
- )
- {
--  int i;                /* temporary variable */
--  unsigned l[288];      /* length list for huft_build */
--  uInt *v;              /* work area for huft_build */
-+  int i;                       /* temporary variable */
-+  static unsigned l[288];      /* length list for huft_build */
-+  uInt *v;                     /* work area for huft_build */
-+
-+  spin_lock(&inflate_lock);
- 
-   /* set up literal table */
-   for (i = 0; i < 144; i++)
-@@ -398,15 +418,20 @@ int zlib_inflate_trees_fixed(
-     l[i] = 8;
-   *bl = 9;
-   v = WS(z)->tree_work_area_1;
--  if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp,  &i, v)) != 0)
-+  if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp,  &i, v)) != 0) {
-+    spin_unlock(&inflate_lock);
-     return i;
-+  }
- 
-   /* set up distance table */
-   for (i = 0; i < 30; i++)      /* make an incomplete code set */
-     l[i] = 5;
-   *bd = 5;
--  if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1)
-+  if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) {
-+    spin_unlock(&inflate_lock);
-     return i;
-+  }
- 
-+  spin_unlock(&inflate_lock);
-   return Z_OK;
- }
- arch/ppc/boot/lib/Makefile |   48 ++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 39 insertions(+), 9 deletions(-)
-
-Index: linux/arch/ppc/boot/lib/Makefile
-===================================================================
---- linux.orig/arch/ppc/boot/lib/Makefile
-+++ linux/arch/ppc/boot/lib/Makefile
-@@ -5,19 +5,49 @@
- CFLAGS_kbd.o	:= -Idrivers/char
- CFLAGS_vreset.o := -I$(srctree)/arch/ppc/boot/include
- 
--zlib  := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c
--	 
--lib-y += $(zlib:.c=.o) div64.o
--lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o
--
-+zlib       := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c
-+zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h
-+zliblinuxheader := zlib.h zconf.h zutil.h
-+
-+$(addprefix $(obj)/,$(zlib)): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
-+
-+src-boot := div64.S
-+src-boot += $(zlib)
-+#src-boot := $(addprefix $(obj)/, $(src-boot))
-+obj-boot := $(addsuffix .o, $(basename $(src-boot)))
- 
--# zlib files needs header from their original place
--EXTRA_CFLAGS += -Ilib/zlib_inflate
-+BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj) $(CFLAGS)
- 
- quiet_cmd_copy_zlib = COPY    $@
--      cmd_copy_zlib = cat $< > $@
-+      cmd_copy_zlib = sed "s at __attribute_used__@@;s at .include.<linux/module.h>@@;s at .include.<linux/spinlock.h>@@;s at .*spin.*lock.*@@;s at .*SPINLOCK.*@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
-+
-+quiet_cmd_copy_zlibheader = COPY    $@
-+      cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
-+# stddef.h for NULL
-+quiet_cmd_copy_zliblinuxheader = COPY    $@
-+      cmd_copy_zliblinuxheader = sed "s at .include.<linux/string.h>@@;s at .include.<linux/errno.h>@@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
- 
- $(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
- 	$(call cmd,copy_zlib)
- 
--clean-files := $(zlib)
-+$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
-+	$(call cmd,copy_zlibheader)
-+
-+$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
-+	$(call cmd,copy_zliblinuxheader)
-+
-+clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)
-+
-+quiet_cmd_bootcc = BOOTCC  $@
-+      cmd_bootcc = $(CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
-+
-+quiet_cmd_bootas = BOOTAS  $@
-+      cmd_bootas = $(CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
-+
-+$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
-+	$(call if_changed_dep,bootcc)
-+$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
-+	$(call if_changed_dep,bootas)
-+
-+lib-y += $(obj-boot)
-+lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o
- Makefile                          |   10 
- arch/arm/boot/compressed/head.S   |   13 
- arch/arm/kernel/calls.S           |    6 
- arch/arm/kernel/entry-common.S    |  111 +
- arch/arm/kernel/fiq.c             |    4 
- arch/arm/kernel/irq.c             |    4 
- arch/arm/kernel/traps.c           |    2 
- arch/arm/mm/copypage-v4mc.c       |    4 
- arch/arm/mm/copypage-xscale.c     |    4 
- arch/arm/mm/fault.c               |   14 
- arch/i386/Kconfig                 |    2 
- arch/i386/boot/compressed/misc.c  |    8 
- arch/i386/kernel/Makefile         |    1 
- arch/i386/kernel/entry.S          |   41 
- arch/i386/kernel/irq.c            |    8 
- arch/i386/kernel/mcount-wrapper.S |   27 
- arch/ppc/boot/Makefile            |    9 
- arch/ppc/kernel/entry.S           |   82 +
- arch/x86_64/kernel/entry.S        |   48 
- arch/x86_64/kernel/vsyscall.c     |    2 
- fs/proc/proc_misc.c               |   17 
- include/asm-arm/pgalloc.h         |    4 
- include/asm-arm/timex.h           |   10 
- include/asm-arm/unistd.h          |    3 
- include/asm-i386/system.h         |    8 
- include/linux/interrupt.h         |   10 
- include/linux/latency_hist.h      |   32 
- include/linux/linkage.h           |    2 
- include/linux/preempt.h           |   20 
- include/linux/sched.h             |   86 +
- kernel/Makefile                   |    3 
- kernel/latency.c                  | 2390 ++++++++++++++++++++++++++++++++++++++
- kernel/latency_hist.c             |  267 ++++
- kernel/sched.c                    |  103 +
- kernel/sysctl.c                   |   77 +
- kernel/time.c                     |   19 
- lib/Kconfig.debug                 |  149 ++
- 37 files changed, 3530 insertions(+), 70 deletions(-)
-
 Index: linux-latency-tracing.q/Makefile
 ===================================================================
 --- linux-latency-tracing.q.orig/Makefile
 +++ linux-latency-tracing.q/Makefile
-@@ -519,10 +519,14 @@ CFLAGS		+= $(call add-align,CONFIG_CC_AL
+@@ -511,10 +511,14 @@ CFLAGS		+= $(call add-align,CONFIG_CC_AL
  CFLAGS		+= $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
  CFLAGS		+= $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)
  
@@ -409,7 +24,7 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/arm/boot/compressed/head.S
 +++ linux-latency-tracing.q/arch/arm/boot/compressed/head.S
-@@ -710,6 +710,19 @@ memdump:	mov	r12, r0
+@@ -714,6 +714,19 @@ memdump:	mov	r12, r0
  		mov	pc, r10
  #endif
  
@@ -429,28 +44,18 @@
  reloc_end:
  
  		.align
-Index: linux-latency-tracing.q/arch/arm/kernel/calls.S
+Index: linux-latency-tracing.q/arch/arm/boot/compressed/misc.c
 ===================================================================
---- linux-latency-tracing.q.orig/arch/arm/kernel/calls.S
-+++ linux-latency-tracing.q/arch/arm/kernel/calls.S
-@@ -7,11 +7,8 @@
-  * it under the terms of the GNU General Public License version 2 as
-  * published by the Free Software Foundation.
-  *
-- *  This file is included twice in entry-common.S
-+ *  NR_syscalls now defined in include/asm-arm/unistd.h - tglx
-  */
--#ifndef NR_syscalls
--#define NR_syscalls 328
--#else
- 
- __syscall_start:
- /* 0 */		.long	sys_restart_syscall
-@@ -341,4 +338,3 @@ __syscall_end:
- 		.rept	NR_syscalls - (__syscall_end - __syscall_start) / 4
- 			.long	sys_ni_syscall
- 		.endr
--#endif
+--- linux-latency-tracing.q.orig/arch/arm/boot/compressed/misc.c
++++ linux-latency-tracing.q/arch/arm/boot/compressed/misc.c
+@@ -199,6 +199,7 @@ static ulg free_mem_ptr_end;
+ 
+ #define HEAP_SIZE 0x2000
+ 
++#define ZLIB_INFLATE_NO_INFLATE_LOCK
+ #include "../../../../lib/inflate.c"
+ 
+ #ifndef STANDALONE_DEBUG
 Index: linux-latency-tracing.q/arch/arm/kernel/entry-common.S
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/arm/kernel/entry-common.S
@@ -464,20 +69,10 @@
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
-@@ -87,8 +89,6 @@ ENTRY(ret_from_fork)
- 	b	ret_slow_syscall
- 	
+@@ -389,5 +391,112 @@ ENTRY(sys_oabi_call_table)
+ #undef ABI
+ #undef OBSOLETE
  
--#include "calls.S"
--
- /*=============================================================================
-  * SWI handler
-  *-----------------------------------------------------------------------------
-@@ -271,3 +271,110 @@ sys_mmap2:
- 		str	r5, [sp, #4]
- 		b	do_mmap2
- #endif
-+
 +#ifdef CONFIG_FRAME_POINTER
 +
 +#ifdef CONFIG_MCOUNT
@@ -584,6 +179,9 @@
 +	mov	pc, lr
 +
 +#endif
++
+ #endif
+ 
 Index: linux-latency-tracing.q/arch/arm/kernel/fiq.c
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/arm/kernel/fiq.c
@@ -748,11 +346,23 @@
  do_PrefetchAbort(unsigned long addr, struct pt_regs *regs)
  {
  	do_translation_fault(addr, 0, regs);
+Index: linux-latency-tracing.q/arch/arm26/boot/compressed/misc.c
+===================================================================
+--- linux-latency-tracing.q.orig/arch/arm26/boot/compressed/misc.c
++++ linux-latency-tracing.q/arch/arm26/boot/compressed/misc.c
+@@ -184,6 +184,7 @@ static ulg free_mem_ptr_end;
+ 
+ #define HEAP_SIZE 0x2000
+ 
++#define ZLIB_INFLATE_NO_INFLATE_LOCK
+ #include "../../../../lib/inflate.c"
+ 
+ #ifndef STANDALONE_DEBUG
 Index: linux-latency-tracing.q/arch/i386/Kconfig
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/i386/Kconfig
 +++ linux-latency-tracing.q/arch/i386/Kconfig
-@@ -619,7 +619,7 @@ config BOOT_IOREMAP
+@@ -661,7 +661,7 @@ config BOOT_IOREMAP
  
  config REGPARM
  	bool "Use register arguments (EXPERIMENTAL)"
@@ -787,6 +397,14 @@
  static unsigned int low_buffer_end, low_buffer_size;
  static int high_loaded =0;
  static uch *high_buffer_start /* = (uch *)(((ulg)&end) + HEAP_SIZE)*/;
+@@ -125,6 +131,7 @@ static int lines, cols;
+ static void * xquad_portio = NULL;
+ #endif
+ 
++#define ZLIB_INFLATE_NO_INFLATE_LOCK
+ #include "../../../../lib/inflate.c"
+ 
+ static void *malloc(int size)
 Index: linux-latency-tracing.q/arch/i386/kernel/Makefile
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/i386/kernel/Makefile
@@ -857,7 +475,7 @@
  	RESTORE_REGS
  	addl $4, %esp
  1:	iret
-@@ -351,6 +377,11 @@ syscall_trace_entry:
+@@ -353,6 +379,11 @@ syscall_trace_entry:
  syscall_exit_work:
  	testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl
  	jz work_pending
@@ -869,7 +487,7 @@
  	sti				# could let do_syscall_trace() call
  					# schedule() instead
  	movl %esp, %eax
-@@ -412,9 +443,16 @@ ENTRY(irq_entries_start)
+@@ -414,9 +445,16 @@ ENTRY(irq_entries_start)
  vector=vector+1
  .endr
  
@@ -886,7 +504,7 @@
  	movl %esp,%eax
  	call do_IRQ
  	jmp ret_from_intr
-@@ -423,6 +461,7 @@ common_interrupt:
+@@ -425,6 +463,7 @@ common_interrupt:
  ENTRY(name)				\
  	pushl $nr-256;			\
  	SAVE_ALL			\
@@ -894,7 +512,7 @@
  	movl %esp,%eax;			\
  	call smp_/**/name;		\
  	jmp ret_from_intr;
-@@ -552,7 +591,7 @@ nmi_stack_correct:
+@@ -554,7 +593,7 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -962,6 +580,30 @@
 +out:
 +	ret
 +
+Index: linux-latency-tracing.q/arch/i386/kernel/traps.c
+===================================================================
+--- linux-latency-tracing.q.orig/arch/i386/kernel/traps.c
++++ linux-latency-tracing.q/arch/i386/kernel/traps.c
+@@ -169,6 +169,7 @@ static void show_trace_log_lvl(struct ta
+ 		printk(log_lvl);
+ 		printk(" =======================\n");
+ 	}
++	print_traces(task);
+ }
+ 
+ void show_trace(struct task_struct *task, unsigned long * stack)
+Index: linux-latency-tracing.q/arch/i386/mm/fault.c
+===================================================================
+--- linux-latency-tracing.q.orig/arch/i386/mm/fault.c
++++ linux-latency-tracing.q/arch/i386/mm/fault.c
+@@ -39,6 +39,7 @@ void bust_spinlocks(int yes)
+ 	int loglevel_save = console_loglevel;
+ 
+ 	if (yes) {
++		stop_trace();
+ 		oops_in_progress = 1;
+ 		return;
+ 	}
 Index: linux-latency-tracing.q/arch/ppc/boot/Makefile
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/ppc/boot/Makefile
@@ -982,11 +624,74 @@
  HOSTCFLAGS	+= -Iarch/$(ARCH)/boot/include
  
  BOOT_TARGETS	= zImage zImage.initrd znetboot znetboot.initrd
+Index: linux-latency-tracing.q/arch/ppc/boot/lib/Makefile
+===================================================================
+--- linux-latency-tracing.q.orig/arch/ppc/boot/lib/Makefile
++++ linux-latency-tracing.q/arch/ppc/boot/lib/Makefile
+@@ -5,19 +5,49 @@
+ CFLAGS_kbd.o	:= -Idrivers/char
+ CFLAGS_vreset.o := -I$(srctree)/arch/ppc/boot/include
+ 
+-zlib  := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c
+-	 
+-lib-y += $(zlib:.c=.o) div64.o
+-lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o
+-
++zlib       := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c
++zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h
++zliblinuxheader := zlib.h zconf.h zutil.h
++
++$(addprefix $(obj)/,$(zlib)): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
++
++src-boot := div64.S
++src-boot += $(zlib)
++#src-boot := $(addprefix $(obj)/, $(src-boot))
++obj-boot := $(addsuffix .o, $(basename $(src-boot)))
+ 
+-# zlib files needs header from their original place
+-EXTRA_CFLAGS += -Ilib/zlib_inflate
++BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj) $(CFLAGS)
+ 
+ quiet_cmd_copy_zlib = COPY    $@
+-      cmd_copy_zlib = cat $< > $@
++      cmd_copy_zlib = sed "s at __attribute_used__@@;s at .include.<linux/module.h>@@;s at .include.<linux/spinlock.h>@@;s at .*spin.*lock.*@@;s at .*SPINLOCK.*@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
++
++quiet_cmd_copy_zlibheader = COPY    $@
++      cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
++# stddef.h for NULL
++quiet_cmd_copy_zliblinuxheader = COPY    $@
++      cmd_copy_zliblinuxheader = sed "s at .include.<linux/string.h>@@;s at .include.<linux/errno.h>@@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
+ 
+ $(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
+ 	$(call cmd,copy_zlib)
+ 
+-clean-files := $(zlib)
++$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
++	$(call cmd,copy_zlibheader)
++
++$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
++	$(call cmd,copy_zliblinuxheader)
++
++clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)
++
++quiet_cmd_bootcc = BOOTCC  $@
++      cmd_bootcc = $(CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
++
++quiet_cmd_bootas = BOOTAS  $@
++      cmd_bootas = $(CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
++
++$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
++	$(call if_changed_dep,bootcc)
++$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
++	$(call if_changed_dep,bootas)
++
++lib-y += $(obj-boot)
++lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o
 Index: linux-latency-tracing.q/arch/ppc/kernel/entry.S
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/ppc/kernel/entry.S
 +++ linux-latency-tracing.q/arch/ppc/kernel/entry.S
-@@ -1000,3 +1000,85 @@ machine_check_in_rtas:
+@@ -978,3 +978,85 @@ machine_check_in_rtas:
  	/* XXX load up BATs and panic */
  
  #endif /* CONFIG_PPC_OF */
@@ -1072,11 +777,23 @@
 +	bctr
 +
 +#endif /* CONFIG_MCOUNT */
+Index: linux-latency-tracing.q/arch/x86_64/boot/compressed/misc.c
+===================================================================
+--- linux-latency-tracing.q.orig/arch/x86_64/boot/compressed/misc.c
++++ linux-latency-tracing.q/arch/x86_64/boot/compressed/misc.c
+@@ -114,6 +114,7 @@ static char *vidmem = (char *)0xb8000;
+ static int vidport;
+ static int lines, cols;
+ 
++#define ZLIB_INFLATE_NO_INFLATE_LOCK
+ #include "../../../../lib/inflate.c"
+ 
+ static void *malloc(int size)
 Index: linux-latency-tracing.q/arch/x86_64/kernel/entry.S
 ===================================================================
 --- linux-latency-tracing.q.orig/arch/x86_64/kernel/entry.S
 +++ linux-latency-tracing.q/arch/x86_64/kernel/entry.S
-@@ -48,6 +48,15 @@
+@@ -49,6 +49,15 @@
  #define retint_kernel retint_restore_args
  #endif	
  	
@@ -1092,7 +809,7 @@
  /*
   * C code is not supposed to know about undefined top of stack. Every time 
   * a C function with an pt_regs argument is called from the SYSCALL based 
-@@ -593,6 +602,7 @@ retint_kernel:	
+@@ -600,6 +609,7 @@ retint_kernel:	
  	bt   $9,EFLAGS-ARGOFFSET(%rsp)	/* interrupts off? */
  	jnc  retint_restore_args
  	call preempt_schedule_irq
@@ -1100,8 +817,8 @@
  	jmp exit_intr
  #endif	
  	CFI_ENDPROC
-@@ -1041,3 +1051,41 @@ ENTRY(call_softirq)
- 	CFI_ADJUST_CFA_OFFSET -8
+@@ -1059,3 +1069,41 @@ ENTRY(call_softirq)
+ 	decl %gs:pda_irqcount
  	ret
  	CFI_ENDPROC
 +
@@ -1152,14 +869,26 @@
  
 -#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
 +#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr))) notrace
- #define force_inline __attribute__((always_inline)) inline
  
  int __sysctl_vsyscall __section_sysctl_vsyscall = 1;
+ seqlock_t __xtime_lock __section_xtime_lock = SEQLOCK_UNLOCKED;
+Index: linux-latency-tracing.q/arch/x86_64/mm/fault.c
+===================================================================
+--- linux-latency-tracing.q.orig/arch/x86_64/mm/fault.c
++++ linux-latency-tracing.q/arch/x86_64/mm/fault.c
+@@ -45,6 +45,7 @@ void bust_spinlocks(int yes)
+ {
+ 	int loglevel_save = console_loglevel;
+ 	if (yes) {
++		stop_trace();
+ 		oops_in_progress = 1;
+ 	} else {
+ #ifdef CONFIG_VT
 Index: linux-latency-tracing.q/fs/proc/proc_misc.c
 ===================================================================
 --- linux-latency-tracing.q.orig/fs/proc/proc_misc.c
 +++ linux-latency-tracing.q/fs/proc/proc_misc.c
-@@ -531,6 +531,20 @@ static int execdomains_read_proc(char *p
+@@ -673,6 +673,20 @@ static int execdomains_read_proc(char *p
  	return proc_calc_metrics(page, start, off, count, eof, len);
  }
  
@@ -1180,7 +909,7 @@
  #ifdef CONFIG_MAGIC_SYSRQ
  /*
   * writing 'C' to /proc/sysrq-trigger is like sysrq-C
-@@ -611,6 +625,9 @@ void __init proc_misc_init(void)
+@@ -755,6 +769,9 @@ void __init proc_misc_init(void)
  #ifdef CONFIG_SCHEDSTATS
  	create_seq_entry("schedstat", 0, &proc_schedstat_operations);
  #endif
@@ -1239,11 +968,12 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/include/asm-arm/unistd.h
 +++ linux-latency-tracing.q/include/asm-arm/unistd.h
-@@ -526,6 +526,9 @@ type name(type1 arg1, type2 arg2, type3 
- #define __ARCH_WANT_SYS_SIGPENDING
- #define __ARCH_WANT_SYS_SIGPROCMASK
- #define __ARCH_WANT_SYS_RT_SIGACTION
+@@ -533,6 +533,10 @@ type name(type1 arg1, type2 arg2, type3 
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_SYS_SOCKETCALL
+ #endif
 +
++// FIXME: check this number ...
 +#define NR_syscalls	328
 +
  #endif
@@ -1253,7 +983,7 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/include/asm-i386/system.h
 +++ linux-latency-tracing.q/include/asm-i386/system.h
-@@ -531,13 +531,17 @@ struct alt_instr { 
+@@ -528,13 +528,17 @@ struct alt_instr { 
  /* used when interrupts are already enabled or to shutdown the processor */
  #define halt()			__asm__ __volatile__("hlt": : :"memory")
  
@@ -1273,6 +1003,61 @@
  /* For spinlocks etc */
  #define local_irq_save(x)	__asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory")
  
+Index: linux-latency-tracing.q/include/asm-x86_64/system.h
+===================================================================
+--- linux-latency-tracing.q.orig/include/asm-x86_64/system.h
++++ linux-latency-tracing.q/include/asm-x86_64/system.h
+@@ -341,10 +341,8 @@ static inline unsigned long __cmpxchg(vo
+ #define local_irq_disable()	do { unsigned long flags; local_save_flags(flags); local_irq_restore((flags & ~(1 << 9)) | (1 << 18)); } while (0)
+ #define local_irq_enable()	do { unsigned long flags; local_save_flags(flags); local_irq_restore((flags | (1 << 9)) & ~(1 << 18)); } while (0)
+ 
+-#define irqs_disabled()					\
++#define irqs_disabled_flags(flags)			\
+ ({							\
+-	unsigned long flags;				\
+-	local_save_flags(flags);			\
+ 	(flags & (1<<18)) || !(flags & (1<<9));		\
+ })
+ 
+@@ -354,10 +352,8 @@ static inline unsigned long __cmpxchg(vo
+ #define local_irq_disable() 	__asm__ __volatile__("cli": : :"memory")
+ #define local_irq_enable()	__asm__ __volatile__("sti": : :"memory")
+ 
+-#define irqs_disabled()			\
++#define irqs_disabled_flags(flags)	\
+ ({					\
+-	unsigned long flags;		\
+-	local_save_flags(flags);	\
+ 	!(flags & (1<<9));		\
+ })
+ 
+@@ -365,6 +361,13 @@ static inline unsigned long __cmpxchg(vo
+ #define local_irq_save(x) 	do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0)
+ #endif
+ 
++#define irqs_disabled()			\
++({					\
++	unsigned long flags;		\
++	local_save_flags(flags);	\
++	irqs_disabled_flags(flags);	\
++})
++
+ /* used in the idle loop; sti takes one instruction cycle to complete */
+ #define safe_halt()		__asm__ __volatile__("sti; hlt": : :"memory")
+ /* used when interrupts are already enabled or to shutdown the processor */
+Index: linux-latency-tracing.q/include/asm-x86_64/unistd.h
+===================================================================
+--- linux-latency-tracing.q.orig/include/asm-x86_64/unistd.h
++++ linux-latency-tracing.q/include/asm-x86_64/unistd.h
+@@ -11,6 +11,8 @@
+  * Note: holes are not allowed.
+  */
+ 
++#define NR_syscalls (__NR_syscall_max+1)
++
+ /* at least 8 syscall per cacheline */
+ #define __NR_read                                0
+ __SYSCALL(__NR_read, sys_read)
 Index: linux-latency-tracing.q/include/linux/interrupt.h
 ===================================================================
 --- linux-latency-tracing.q.orig/include/linux/interrupt.h
@@ -1292,6 +1077,19 @@
 +#endif
 +
  #endif
+Index: linux-latency-tracing.q/include/linux/kernel.h
+===================================================================
+--- linux-latency-tracing.q.orig/include/linux/kernel.h
++++ linux-latency-tracing.q/include/linux/kernel.h
+@@ -132,6 +132,8 @@ asmlinkage int vprintk(const char *fmt, 
+ 	__attribute__ ((format (printf, 1, 0)));
+ asmlinkage int printk(const char * fmt, ...)
+ 	__attribute__ ((format (printf, 1, 2)));
++extern void early_printk(const char *fmt, ...)
++	__attribute__ ((format (printf, 1, 2)));
+ #else
+ static inline int vprintk(const char *s, va_list args)
+ 	__attribute__ ((format (printf, 1, 0)));
 Index: linux-latency-tracing.q/include/linux/latency_hist.h
 ===================================================================
 --- /dev/null
@@ -1380,7 +1178,7 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/include/linux/sched.h
 +++ linux-latency-tracing.q/include/linux/sched.h
-@@ -39,6 +39,84 @@
+@@ -40,6 +40,84 @@
  
  struct exec_domain;
  
@@ -1419,7 +1217,7 @@
 +#ifdef CONFIG_LATENCY_TRACE
 +  extern int mcount_enabled, trace_enabled, trace_user_triggered,
 +		trace_user_trigger_irq, trace_freerunning, trace_verbose,
-+		trace_print_at_crash, trace_all_cpus;
++		trace_print_at_crash, trace_all_cpus, print_functions;
 +  extern void notrace trace_special(unsigned long v1, unsigned long v2, unsigned long v3);
 +  extern void notrace trace_special_pid(int pid, unsigned long v1, unsigned long v2);
 +  extern void notrace trace_special_u64(unsigned long long v1, unsigned long v2);
@@ -1465,9 +1263,9 @@
  /*
   * cloning flags:
   */
-@@ -820,6 +898,13 @@ struct task_struct {
- /* Protection of proc_dentry: nesting proc_lock, dcache_lock, write_lock_irq(&tasklist_lock); */
- 	spinlock_t proc_lock;
+@@ -833,6 +911,13 @@ struct task_struct {
+ 	struct mutex_waiter *blocked_on;
+ #endif
  
 +#define MAX_PREEMPT_TRACE 16
 +
@@ -1479,7 +1277,7 @@
  /* journalling filesystem info */
  	void *journal_info;
  
-@@ -1349,6 +1434,7 @@ static inline unsigned int task_cpu(cons
+@@ -1355,6 +1440,7 @@ static inline unsigned int task_cpu(cons
  
  static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
  {
@@ -1491,25 +1289,25 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/kernel/Makefile
 +++ linux-latency-tracing.q/kernel/Makefile
-@@ -9,6 +9,9 @@ obj-y     = sched.o fork.o exec_domain.o
- 	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
- 	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o
- 
+@@ -29,6 +29,9 @@ obj-$(CONFIG_STOP_MACHINE) += stop_machi
+ obj-$(CONFIG_AUDIT) += audit.o
+ obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
+ obj-$(CONFIG_KPROBES) += kprobes.o
 +obj-$(CONFIG_DEBUG_PREEMPT) += latency.o
 +obj-$(CONFIG_LATENCY_TIMING) += latency.o
 +obj-$(CONFIG_LATENCY_HIST) += latency_hist.o
- obj-$(CONFIG_FUTEX) += futex.o
- obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
- obj-$(CONFIG_SMP) += cpu.o spinlock.o
+ obj-$(CONFIG_SYSFS) += ksysfs.o
+ obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
+ obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
 Index: linux-latency-tracing.q/kernel/latency.c
 ===================================================================
 --- /dev/null
 +++ linux-latency-tracing.q/kernel/latency.c
-@@ -0,0 +1,2390 @@
+@@ -0,0 +1,2465 @@
 +/*
 + *  kernel/latency.c
 + *
-+ *  Copyright (C) 2004, 2005 Ingo Molnar
++ *  Copyright (C) 2004-2006 Ingo Molnar
 + *  Copyright (C) 2004 William Lee Irwin III
 + */
 +
@@ -1535,6 +1333,7 @@
 +
 +#ifndef CONFIG_PREEMPT_RT
 +# define DEFINE_RAW_SPINLOCK		DEFINE_SPINLOCK
++# define RAW_SPIN_LOCK_UNLOCKED		SPIN_LOCK_UNLOCKED
 +# define raw_spinlock_t			spinlock_t
 +# define raw_irqs_disabled		irqs_disabled
 +# define irqs_off			irqs_disabled
@@ -1563,11 +1362,7 @@
 +} ____cacheline_aligned_in_smp;
 +
 +static __cacheline_aligned_in_smp struct sch_struct sch =
-+#ifdef CONFIG_PREEMPT_RT
 +		{ trace_lock: RAW_SPIN_LOCK_UNLOCKED };
-+#else
-+		{ trace_lock: SPIN_LOCK_UNLOCKED };
-+#endif
 +
 +int wakeup_timing = 1;
 +#endif
@@ -1579,9 +1374,9 @@
 + * we clear it after bootup.
 + */
 +#ifdef CONFIG_LATENCY_HIST
-+cycles_t preempt_max_latency = (cycles_t)0UL;
++static cycles_t preempt_max_latency = (cycles_t)0UL;
 +#else
-+cycles_t preempt_max_latency = (cycles_t)ULONG_MAX;
++static cycles_t preempt_max_latency = (cycles_t)ULONG_MAX;
 +#endif
 +
 +static cycles_t preempt_thresh;
@@ -1772,6 +1567,7 @@
 +int trace_print_at_crash = 0;
 +int trace_verbose = 0;
 +int trace_all_cpus = 0;
++int print_functions = 0;
 +
 +/*
 + * user-triggered via gettimeofday(0,1)/gettimeofday(0,0)
@@ -1934,10 +1730,17 @@
 +
 +static notrace void __print_worst_stack(void)
 +{
++	unsigned long fill_ratio;
 +	printk("----------------------------->\n");
-+	printk("| new stack-footprint maximum: %s/%d, %ld bytes (out of %ld bytes).\n",
++	printk("| new stack fill maximum: %s/%d, %ld bytes (out of %ld bytes).\n",
 +		worst_stack_comm, worst_stack_pid,
 +		MAX_STACK-worst_stack_left, (long)MAX_STACK);
++	fill_ratio = (MAX_STACK-worst_stack_left)*100/(long)MAX_STACK;
++	printk("| Stack fill ratio: %02ld%%", fill_ratio);
++	if (fill_ratio >= 90)
++		printk(" - BUG: that's quite high, please report this!\n");
++	else
++		printk(" - that's still OK, no need to report this.\n");
 +	printk("------------|\n");
 +
 +	show_stackframe();
@@ -2002,10 +1805,76 @@
 +			print_worst_stack();
 +			tr->stack_check++;
 +		}
-+out:
-+	atomic_dec(&tr->disabled);
-+}
++out:
++	atomic_dec(&tr->disabled);
++}
++
++#endif
++
++#ifdef CONFIG_EARLY_PRINTK
++static void notrace early_printk_name(unsigned long eip)
++{
++	char namebuf[KSYM_NAME_LEN+1];
++	unsigned long size, offset;
++	const char *sym_name;
++	char *modname;
++
++	sym_name = kallsyms_lookup(eip, &size, &offset, &modname, namebuf);
++	if (sym_name)
++		early_printk("%s <%08lx>", sym_name, eip);
++	else
++		early_printk("<%08lx>", eip);
++}
++
++static DEFINE_RAW_SPINLOCK(early_print_lock);
++
++static void notrace early_print_entry(struct trace_entry *entry)
++{
++	int hardirq, softirq;
++
++	spin_lock(&early_print_lock);
++	early_printk("%-5d ", entry->pid);
++
++	early_printk("%d%c%c",
++		entry->cpu,
++		(entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' :
++		(entry->flags & TRACE_FLAG_IRQS_HARD_OFF) ? 'D' : '.',
++ 		(entry->flags & TRACE_FLAG_NEED_RESCHED) ? 'n' : '.');
++
++	hardirq = entry->flags & TRACE_FLAG_HARDIRQ;
++	softirq = entry->flags & TRACE_FLAG_SOFTIRQ;
++	if (hardirq && softirq)
++		early_printk("H");
++	else {
++		if (hardirq)
++			early_printk("h");
++		else {
++			if (softirq)
++				early_printk("s");
++			else
++				early_printk(".");
++		}
++	}
 +
++	early_printk(":%d: ", entry->preempt_count);
++
++	if (entry->type == TRACE_FN) {
++		early_printk_name(entry->u.fn.eip);
++		early_printk("  <= (");
++		early_printk_name(entry->u.fn.parent_eip);
++		early_printk(")\n");
++	} else {
++		/* special entries: */
++		early_printk_name(entry->u.special.eip);
++		early_printk(": <%08lx> <%08lx> <%08lx>\n",
++			entry->u.special.v1,
++			entry->u.special.v2,
++			entry->u.special.v3);
++	}
++	spin_unlock(&early_print_lock);
++}
++#else
++#  define early_print_entry(x) do { } while(0)
 +#endif
 +
 +static void notrace
@@ -2022,7 +1891,7 @@
 +#ifdef CONFIG_DEBUG_PREEMPT
 +//	WARN_ON(!atomic_read(&tr->disabled));
 +#endif
-+	if (!tr->critical_start && !trace_user_triggered && !trace_all_cpus && !trace_print_at_crash)
++	if (!tr->critical_start && !trace_user_triggered && !trace_all_cpus && !trace_print_at_crash && !print_functions)
 +		goto out;
 +	/*
 +	 * Allocate the next index. Make sure an NMI (or interrupt)
@@ -2035,7 +1904,8 @@
 +	idx_next = idx + 1;
 +	timestamp = get_cycles();
 +
-+	if (unlikely(trace_freerunning && (idx_next >= MAX_TRACE)))
++	if (unlikely((trace_freerunning || print_functions) &&
++						(idx_next >= MAX_TRACE)))
 +		idx_next = 0;
 +	if (unlikely(idx_next >= MAX_TRACE)) {
 +		atomic_inc(&tr->overrun);
@@ -2046,7 +1916,7 @@
 +		goto again;
 +#else
 +# ifdef CONFIG_SMP
-+#  error CMPXHG missing
++#  error CMPXCHG missing
 +# else
 +	/* No worry, we are protected by the atomic_incr(&tr->disabled)
 +	 * in __trace further down
@@ -2074,6 +1944,8 @@
 +	case TRACE_FN:
 +		entry->u.fn.eip = eip;
 +		entry->u.fn.parent_eip = parent_eip;
++		if (unlikely(print_functions && !in_interrupt()))
++			early_print_entry(entry);
 +		break;
 +	case TRACE_SPECIAL:
 +	case TRACE_SPECIAL_PID:
@@ -2082,6 +1954,8 @@
 +		entry->u.special.v1 = v1;
 +		entry->u.special.v2 = v2;
 +		entry->u.special.v3 = v3;
++		if (unlikely(print_functions && !in_interrupt()))
++			early_print_entry(entry);
 +		break;
 +	case TRACE_SYSCALL:
 +		entry->u.syscall.nr = eip;
@@ -2125,7 +1999,7 @@
 +	 * is waiting to become runnable:
 +	 */
 +#ifdef CONFIG_WAKEUP_TIMING
-+	if (wakeup_timing && !trace_all_cpus && !trace_print_at_crash) {
++	if (wakeup_timing && !trace_all_cpus && !trace_print_at_crash && !print_functions) {
 +		if (!sch.tr || cpu != sch.cpu)
 +			goto out;
 +		tr = sch.tr;
@@ -2159,14 +2033,14 @@
 +	___trace(TRACE_SPECIAL, CALLER_ADDR0, 0, v1, v2, v3);
 +}
 +
-+EXPORT_SYMBOL_GPL(trace_special);
++EXPORT_SYMBOL(trace_special);
 +
 +void notrace trace_special_pid(int pid, unsigned long v1, unsigned long v2)
 +{
 +	___trace(TRACE_SPECIAL_PID, CALLER_ADDR0, 0, pid, v1, v2);
 +}
 +
-+EXPORT_SYMBOL_GPL(trace_special_pid);
++EXPORT_SYMBOL(trace_special_pid);
 +
 +void notrace trace_special_u64(unsigned long long v1, unsigned long v2)
 +{
@@ -2174,7 +2048,7 @@
 +		 (unsigned long) (v1 >> 32), (unsigned long) (v1 & 0xFFFFFFFF), v2);
 +}
 +
-+EXPORT_SYMBOL_GPL(trace_special_u64);
++EXPORT_SYMBOL(trace_special_u64);
 +
 +/*
 + * Non-inlined function:
@@ -2186,7 +2060,7 @@
 +
 +extern void mcount(void);
 +
-+EXPORT_SYMBOL_GPL(mcount);
++EXPORT_SYMBOL(mcount);
 +
 +void notrace __mcount(void)
 +{
@@ -2527,7 +2401,18 @@
 +			"rt",
 +#endif
 +			0, 0,
-+			0, 0);
++#ifdef CONFIG_PREEMPT_SOFTIRQS
++			softirq_preemption
++#else
++			0
++#endif
++			,
++#ifdef CONFIG_PREEMPT_HARDIRQS
++ hardirq_preemption
++#else
++			0
++#endif
++		);
 +#ifdef CONFIG_SMP
 +		seq_printf(m, " #P:%d)\n", num_online_cpus());
 +#else
@@ -2880,7 +2765,7 @@
 +	max_tr.cpu = tr->cpu;
 +	save = max_tr.traces + tr->cpu;
 +
-+	if ((wakeup_timing || trace_user_triggered || trace_print_at_crash) &&
++	if ((wakeup_timing || trace_user_triggered || trace_print_at_crash || print_functions) &&
 +				trace_all_cpus) {
 +		all_cpus = 1;
 +		for_each_online_cpu(cpu)
@@ -3077,7 +2962,7 @@
 +		atomic_dec(&tr->disabled);
 +	}
 +}
-+EXPORT_SYMBOL_GPL(touch_critical_timing);
++EXPORT_SYMBOL(touch_critical_timing);
 +
 +void notrace stop_critical_timing(void)
 +{
@@ -3085,7 +2970,7 @@
 +
 +	tr->critical_start = 0;
 +}
-+EXPORT_SYMBOL_GPL(stop_critical_timing);
++EXPORT_SYMBOL(stop_critical_timing);
 +
 +static inline void notrace
 +__start_critical_timing(unsigned long eip, unsigned long parent_eip, int latency_type)
@@ -3137,6 +3022,7 @@
 +
 +#ifdef CONFIG_CRITICAL_IRQSOFF_TIMING
 +
++/* FIXME: do we have to save flags here? */
 +void notrace trace_irqs_off_lowlevel(void)
 +{
 +	unsigned long flags;
@@ -3157,7 +3043,7 @@
 +		__start_critical_timing(CALLER_ADDR0, CALLER_ADDR1, INTERRUPT_LATENCY);
 +}
 +
-+EXPORT_SYMBOL_GPL(trace_irqs_off);
++EXPORT_SYMBOL(trace_irqs_off);
 +
 +void notrace trace_irqs_on(void)
 +{
@@ -3167,11 +3053,9 @@
 +
 +	if (!irqs_off_preempt_count() && raw_irqs_disabled_flags(flags))
 +		__stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
-+
-+	__raw_local_irq_restore(flags);
 +}
 +
-+EXPORT_SYMBOL_GPL(trace_irqs_on);
++EXPORT_SYMBOL(trace_irqs_on);
 +
 +#endif
 +
@@ -3192,7 +3076,7 @@
 +	return parent_eip;
 +}
 +
-+void notrace add_preempt_count_ti(struct thread_info *ti, unsigned int val)
++void notrace add_preempt_count(unsigned int val)
 +{
 +	unsigned long eip = CALLER_ADDR0;
 +	unsigned long parent_eip = get_parent_eip();
@@ -3201,17 +3085,17 @@
 +	/*
 +	 * Underflow?
 +	 */
-+	BUG_ON(((int)ti->preempt_count < 0));
++	BUG_ON(((int)preempt_count() < 0));
 +	/*
 +	 * Spinlock count overflowing soon?
 +	 */
-+	BUG_ON((ti->preempt_count & PREEMPT_MASK) >= PREEMPT_MASK-10);
++	BUG_ON((preempt_count() & PREEMPT_MASK) >= PREEMPT_MASK-10);
 +#endif
 +
-+	ti->preempt_count += val;
++	preempt_count() += val;
 +#ifdef CONFIG_PREEMPT_TRACE
 +	if (val <= 10) {
-+		unsigned int idx = ti->preempt_count & PREEMPT_MASK;
++		unsigned int idx = preempt_count() & PREEMPT_MASK;
 +		if (idx < MAX_PREEMPT_TRACE) {
 +			current->preempt_trace_eip[idx] = eip;
 +			current->preempt_trace_parent_eip[idx] = parent_eip;
@@ -3233,27 +3117,20 @@
 +#endif
 +	(void)eip, (void)parent_eip;
 +}
-+EXPORT_SYMBOL_GPL(add_preempt_count_ti);
-+
-+void notrace add_preempt_count(unsigned int val)
-+{
-+	add_preempt_count_ti(current_thread_info(), val);
-+}
++EXPORT_SYMBOL(add_preempt_count);
 +
-+EXPORT_SYMBOL_GPL(add_preempt_count);
-+
-+void notrace sub_preempt_count_ti(struct thread_info *ti, unsigned int val)
++void notrace sub_preempt_count(unsigned int val)
 +{
 +#ifdef CONFIG_DEBUG_PREEMPT
 +	/*
 +	 * Underflow?
 +	 */
-+	BUG_ON(unlikely(val > ti->preempt_count));
++	BUG_ON(unlikely(val > preempt_count()));
 +
 +	/*
 +	 * Is the spinlock portion underflowing?
 +	 */
-+	BUG_ON((val < PREEMPT_MASK) && !(ti->preempt_count & PREEMPT_MASK));
++	BUG_ON((val < PREEMPT_MASK) && !(preempt_count() & PREEMPT_MASK));
 +#endif
 +
 +#ifdef CONFIG_CRITICAL_PREEMPT_TIMING
@@ -3265,21 +3142,14 @@
 +
 +		if (!raw_irqs_disabled_flags(flags))
 +#endif
-+			if (ti->preempt_count == val)
++			if (preempt_count() == val)
 +				__stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
 +	}
 +#endif
-+	ti->preempt_count -= val;
-+}
-+
-+EXPORT_SYMBOL_GPL(sub_preempt_count_ti);
-+
-+void notrace sub_preempt_count(unsigned int val)
-+{
-+	sub_preempt_count_ti(current_thread_info(), val);
++	preempt_count() -= val;
 +}
 +
-+EXPORT_SYMBOL_GPL(sub_preempt_count);
++EXPORT_SYMBOL(sub_preempt_count);
 +
 +void notrace mask_preempt_count(unsigned int mask)
 +{
@@ -3303,7 +3173,7 @@
 +#endif
 +	(void) eip, (void) parent_eip;
 +}
-+EXPORT_SYMBOL_GPL(mask_preempt_count);
++EXPORT_SYMBOL(mask_preempt_count);
 +
 +void notrace unmask_preempt_count(unsigned int mask)
 +{
@@ -3322,7 +3192,7 @@
 +#endif
 +	preempt_count() &= ~mask;
 +}
-+EXPORT_SYMBOL_GPL(unmask_preempt_count);
++EXPORT_SYMBOL(unmask_preempt_count);
 +
 +
 +#endif
@@ -3430,7 +3300,7 @@
 +		return;
 +
 +	spin_lock(&sch.trace_lock);
-+	if (sch.task && (sch.task->prio >= p->prio))
++	if (sch.task && (sch.task->prio <= p->prio))
 +		goto out_unlock;
 +
 +	/*
@@ -3531,7 +3401,7 @@
 +	unsigned long flags;
 +	int cpu;
 +
-+	if (!trace_user_triggered || trace_print_at_crash)
++	if (!trace_user_triggered || trace_print_at_crash || print_functions)
 +		return -EINVAL;
 +
 +	/*
@@ -3583,8 +3453,7 @@
 +	struct cpu_trace *tr;
 +	cycles_t delta;
 +
-+
-+	if (!trace_user_triggered || trace_print_at_crash)
++	if (!trace_user_triggered || trace_print_at_crash || print_functions)
 +		return -EINVAL;
 +
 +	preempt_disable();
@@ -3663,7 +3532,7 @@
 +	return 0;
 +}
 +
-+EXPORT_SYMBOL_GPL(user_trace_stop);
++EXPORT_SYMBOL(user_trace_stop);
 +
 +void stop_trace(void)
 +{
@@ -3671,14 +3540,15 @@
 +		trace_enabled = -1;
 +}
 +
++EXPORT_SYMBOL(stop_trace);
++
 +static void print_entry(struct trace_entry *entry, struct trace_entry *entry0,
 +			struct trace_entry *next_entry)
 +{
-+	unsigned long abs_usecs, rel_usecs;
++	unsigned long abs_usecs;
 +	int hardirq, softirq;
 +
 +	abs_usecs = cycles_to_usecs(entry->timestamp - entry0->timestamp);
-+	rel_usecs = cycles_to_usecs(next_entry->timestamp - entry->timestamp);
 +
 +	printk("%-5d ", entry->pid);
 +
@@ -3820,6 +3690,9 @@
 +#if defined(CONFIG_PREEMPT_TRACE) || defined(CONFIG_LATENCY_TRACE)
 +void print_traces(struct task_struct *task)
 +{
++	if (!task)
++		task = current;
++
 +#ifdef CONFIG_PREEMPT_TRACE
 +	print_preempt_trace(task);
 +#endif
@@ -4172,9 +4045,9 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/kernel/sched.c
 +++ linux-latency-tracing.q/kernel/sched.c
-@@ -715,11 +715,18 @@ static inline void dec_nr_running(task_t
+@@ -661,11 +661,18 @@ static int effective_prio(task_t *p)
+ 	return prio;
  }
- #endif
  
 +static inline void trace_start_sched_wakeup(task_t *p, runqueue_t *rq)
 +{
@@ -4189,17 +4062,17 @@
  {
 +	trace_special_pid(p->pid, p->prio, rq->nr_running);
  	enqueue_task(p, rq->active);
- 	inc_nr_running(p, rq);
+ 	rq->nr_running++;
  }
-@@ -731,6 +738,7 @@ static inline void __activate_idle_task(
+@@ -677,6 +684,7 @@ static inline void __activate_idle_task(
  {
  	enqueue_task_head(p, rq->active);
- 	inc_nr_running(p, rq);
+ 	rq->nr_running++;
 +	WARN_ON(rt_task(p));
  }
  
  static int recalc_task_prio(task_t *p, unsigned long long now)
-@@ -1381,8 +1389,10 @@ out_activate:
+@@ -1297,8 +1305,10 @@ out_activate:
  	 * to be considered on this CPU.)
  	 */
  	if (!sync || cpu != this_cpu) {
@@ -4211,7 +4084,7 @@
  	}
  	success = 1;
  
-@@ -1396,15 +1406,19 @@ out:
+@@ -1312,15 +1322,19 @@ out:
  
  int fastcall wake_up_process(task_t *p)
  {
@@ -4233,15 +4106,15 @@
  }
  
  /*
-@@ -1512,6 +1526,7 @@ void fastcall wake_up_new_task(task_t *p
- 				inc_nr_running(p, rq);
+@@ -1428,6 +1442,7 @@ void fastcall wake_up_new_task(task_t *p
+ 				rq->nr_running++;
  			}
  			set_need_resched();
 +			trace_start_sched_wakeup(p, rq);
  		} else
  			/* Run child last */
  			__activate_task(p, rq);
-@@ -1633,6 +1648,7 @@ static inline void finish_task_switch(ru
+@@ -1549,6 +1564,7 @@ static inline void finish_task_switch(ru
  	prev_task_flags = prev->flags;
  	finish_arch_switch(prev);
  	finish_lock_switch(rq, prev);
@@ -4249,7 +4122,7 @@
  	if (mm)
  		mmdrop(mm);
  	if (unlikely(prev_task_flags & PF_DEAD))
-@@ -1679,6 +1695,8 @@ task_t * context_switch(runqueue_t *rq, 
+@@ -1595,6 +1611,8 @@ task_t * context_switch(runqueue_t *rq, 
  		rq->prev_mm = oldmm;
  	}
  
@@ -4258,13 +4131,7 @@
  	/* Here we just switch the register state and the stack. */
  	switch_to(prev, next, prev);
  
-@@ -2795,13 +2813,13 @@ static inline unsigned long smt_slice(ta
- 	return p->time_slice * (100 - sd->per_cpu_gain) / 100;
- }
- 
--static inline int dependent_sleeper(int this_cpu, runqueue_t *this_rq)
-+static int dependent_sleeper(int this_cpu, runqueue_t *this_rq)
- {
+@@ -2716,8 +2734,8 @@ static int dependent_sleeper(int this_cp
  	struct sched_domain *tmp, *sd = NULL;
  	cpumask_t sibling_map;
  	prio_array_t *array;
@@ -4275,7 +4142,7 @@
  
  	for_each_domain(this_cpu, tmp)
  		if (tmp->flags & SD_SHARE_CPUPOWER)
-@@ -2863,6 +2881,12 @@ static inline int dependent_sleeper(int 
+@@ -2779,6 +2797,12 @@ static int dependent_sleeper(int this_cp
  				!TASK_PREEMPTS_CURR(p, smt_rq) &&
  				smt_slice(smt_curr, sd) > task_timeslice(p))
  					ret = 1;
@@ -4288,7 +4155,7 @@
  
  check_smt_task:
  		if ((!smt_curr->mm && smt_curr != smt_rq->idle) ||
-@@ -2893,6 +2917,9 @@ check_smt_task:
+@@ -2809,6 +2833,9 @@ check_smt_task:
  out_unlock:
  	for_each_cpu_mask(i, sibling_map)
  		spin_unlock(&cpu_rq(i)->lock);
@@ -4298,12 +4165,12 @@
  	return ret;
  }
  #else
-@@ -2906,35 +2933,44 @@ static inline int dependent_sleeper(int 
+@@ -2822,35 +2849,44 @@ static inline int dependent_sleeper(int 
  }
  #endif
  
 -#if defined(CONFIG_PREEMPT) && defined(CONFIG_DEBUG_PREEMPT)
-+#if defined(CONFIG_LATENCY_TRACE) && defined(CONFIG_DEBUG_MUTEXES)
++#if defined(CONFIG_LATENCY_TRACE) && defined(CONFIG_DEBUG_RT_MUTEXES)
  
 -void fastcall add_preempt_count(int val)
 +static void trace_array(prio_array_t *array)
@@ -4366,15 +4233,15 @@
  
  #endif
  
-@@ -2958,6 +2994,7 @@ asmlinkage void __sched schedule(void)
- 	 * Otherwise, whine if we are scheduling when we should not be.
+@@ -2875,6 +2911,7 @@ asmlinkage void __sched schedule(void)
  	 */
  	if (likely(!current->exit_state)) {
-+		stop_trace();
  		if (unlikely(in_atomic())) {
++			stop_trace();
  			printk(KERN_ERR "scheduling while atomic: "
  				"%s/0x%08x/%d\n",
-@@ -3097,6 +3134,8 @@ switch_tasks:
+ 				current->comm, preempt_count(), current->pid);
+@@ -3013,6 +3050,8 @@ switch_tasks:
  		prev->sleep_avg = 0;
  	prev->timestamp = prev->last_ran = now;
  
@@ -4383,7 +4250,7 @@
  	sched_info_switch(prev, next);
  	if (likely(prev != next)) {
  		next->timestamp = now;
-@@ -3107,14 +3146,17 @@ switch_tasks:
+@@ -3023,14 +3062,17 @@ switch_tasks:
  		prepare_task_switch(rq, next);
  		prev = context_switch(rq, prev, next);
  		barrier();
@@ -4402,7 +4269,7 @@
  
  	prev = current;
  	if (unlikely(reacquire_kernel_lock(prev) < 0))
-@@ -5660,6 +5702,7 @@ void __might_sleep(char *file, int line)
+@@ -6075,6 +6117,7 @@ void __might_sleep(char *file, int line)
  		if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
  			return;
  		prev_jiffy = jiffies;
@@ -4414,15 +4281,15 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/kernel/sysctl.c
 +++ linux-latency-tracing.q/kernel/sysctl.c
-@@ -42,6 +42,7 @@
+@@ -44,6 +44,7 @@
  #include <linux/limits.h>
  #include <linux/dcache.h>
  #include <linux/syscalls.h>
 +#include <linux/profile.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/acpi.h>
  
- #include <asm/uaccess.h>
- #include <asm/processor.h>
-@@ -278,6 +279,82 @@ static ctl_table kern_table[] = {
+@@ -283,6 +284,82 @@ static ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= &proc_dointvec,
  	},
@@ -4509,7 +4376,7 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/kernel/time.c
 +++ linux-latency-tracing.q/kernel/time.c
-@@ -97,8 +97,23 @@ asmlinkage long sys_stime(time_t __user 
+@@ -98,8 +98,23 @@ asmlinkage long sys_stime(time_t __user 
  
  #endif /* __ARCH_WANT_SYS_TIME */
  
@@ -4533,7 +4400,7 @@
  	if (likely(tv != NULL)) {
  		struct timeval ktv;
  		do_gettimeofday(&ktv);
-@@ -184,6 +199,10 @@ asmlinkage long sys_settimeofday(struct 
+@@ -188,6 +203,10 @@ asmlinkage long sys_settimeofday(struct 
  	struct timespec	new_ts;
  	struct timezone new_tz;
  
@@ -4548,13 +4415,14 @@
 ===================================================================
 --- linux-latency-tracing.q.orig/lib/Kconfig.debug
 +++ linux-latency-tracing.q/lib/Kconfig.debug
-@@ -111,6 +111,146 @@ config DEBUG_SPINLOCK_SLEEP
+@@ -119,6 +119,149 @@ config DEBUG_SPINLOCK_SLEEP
  	  If you say Y here, various routines which may sleep will become very
  	  noisy if they are called with a spinlock held.
  
 +config WAKEUP_TIMING
 +	bool "Wakeup latency timing"
 +	default y
++	depends on !X86_32 || X86_GENERIC || X86_TSC
 +	help
 +	  This option measures the time spent from a highprio thread being
 +	  woken up to it getting scheduled on a CPU, with microsecond
@@ -4583,12 +4451,13 @@
 +config PREEMPT_TRACE
 +	bool
 +	default y
++	depends on !X86_32 || X86_GENERIC || X86_TSC
 +	depends on DEBUG_PREEMPT
 +
 +config CRITICAL_PREEMPT_TIMING
 +	bool "Non-preemptible critical section latency timing"
 +	default n
-+	depends on PREEMPT
++	depends on PREEMPT && (!X86_32 || X86_GENERIC || X86_TSC)
 +	help
 +	  This option measures the time spent in preempt-off critical
 +	  sections, with microsecond accuracy.
@@ -4622,6 +4491,7 @@
 +config CRITICAL_IRQSOFF_TIMING
 +	bool "Interrupts-off critical section latency timing"
 +	default n
++	depends on !X86_32 || X86_GENERIC || X86_TSC
 +	help
 +	  This option measures the time spent in irqs-off critical
 +	  sections, with microsecond accuracy.
@@ -4675,7 +4545,7 @@
 +config LATENCY_TRACE
 +	bool "Latency tracing"
 +	default n
-+	depends on LATENCY_TIMING
++	depends on LATENCY_TIMING && (!X86_32 || X86_GENERIC || X86_TSC)
 +	help
 +	  This option enables a kernel tracing mechanism that will track
 +	  precise function-call granularity kernel execution during
@@ -4695,7 +4565,7 @@
  config DEBUG_KOBJECT
  	bool "kobject debugging"
  	depends on DEBUG_KERNEL
-@@ -176,9 +316,9 @@ config DEBUG_VM
+@@ -185,9 +328,9 @@ config DEBUG_VM
  
  	  If unsure, say N.
  
@@ -4707,9 +4577,9 @@
  	default y if DEBUG_INFO && UML
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
-@@ -186,6 +326,11 @@ config FRAME_POINTER
- 	  some architectures or if you use external debuggers.
- 	  If you don't debug the kernel, you can say N.
+@@ -209,6 +352,11 @@ config FORCED_INLINING
+ 	  become the default in the future, until then this option is there to
+ 	  test gcc for this.
  
 +config FRAME_POINTER
 +	bool
@@ -4719,72 +4589,220 @@
  config RCU_TORTURE_TEST
  	tristate "torture tests for RCU"
  	depends on DEBUG_KERNEL
- init/main.c |    9 +++++++++
- 1 files changed, 9 insertions(+)
-
-Index: linux-latency-tracing.q/init/main.c
-===================================================================
---- linux-latency-tracing.q.orig/init/main.c
-+++ linux-latency-tracing.q/init/main.c
-@@ -108,6 +108,8 @@ extern void tc_init(void);
- enum system_states system_state;
- EXPORT_SYMBOL(system_state);
+Index: linux-latency-tracing.q/lib/inflate.c
+===================================================================
+--- linux-latency-tracing.q.orig/lib/inflate.c
++++ linux-latency-tracing.q/lib/inflate.c
+@@ -141,6 +141,25 @@ struct huft {
+   } v;
+ };
  
-+extern cycles_t preempt_max_latency;
++/*
++ * turn off the inflate_lock for the bootloader code, it is
++ * single-threaded and has no need for (nor access to) the
++ * kernel's locking primitives:
++ */
++#ifdef ZLIB_INFLATE_NO_INFLATE_LOCK
++# undef DEFINE_SPINLOCK
++# undef spin_lock
++# undef spin_unlock
++# define DEFINE_SPINLOCK(x)	int x
++# define spin_lock(x)		(void)(x)
++# define spin_unlock(x)		(void)(x)
++#endif
 +
- /*
-  * Boot command-line arguments
++/*
++ * lock protecting static variables of huft_build() and other inflate
++ * functions, to reduce their insane stack footprint.
++ */
++static DEFINE_SPINLOCK(inflate_lock);
+ 
+ /* Function prototypes */
+ STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, 
+@@ -304,7 +323,7 @@ STATIC int INIT huft_build(
+   register struct huft *q;      /* points to current table */
+   struct huft r;                /* table entry for structure assignment */
+   struct huft *u[BMAX];         /* table stack */
+-  unsigned v[N_MAX];            /* values in order of bit length */
++  static unsigned v[N_MAX];     /* values in order of bit length */
+   register int w;               /* bits before this table == (l * h) */
+   unsigned x[BMAX+1];           /* bit offsets, then code stack */
+   unsigned *xp;                 /* pointer into x */
+@@ -705,7 +724,7 @@ STATIC int noinline INIT inflate_fixed(v
+   struct huft *td;      /* distance code table */
+   int bl;               /* lookup bits for tl */
+   int bd;               /* lookup bits for td */
+-  unsigned l[288];      /* length list for huft_build */
++  static unsigned l[288];      /* length list for huft_build */
+ 
+ DEBG("<fix");
+ 
+@@ -767,9 +786,9 @@ STATIC int noinline INIT inflate_dynamic
+   unsigned nl;          /* number of literal/length codes */
+   unsigned nd;          /* number of distance codes */
+ #ifdef PKZIP_BUG_WORKAROUND
+-  unsigned ll[288+32];  /* literal/length and distance code lengths */
++  static unsigned ll[288+32];  /* literal/length and distance code lengths */
+ #else
+-  unsigned ll[286+30];  /* literal/length and distance code lengths */
++  static unsigned ll[286+30];  /* literal/length and distance code lengths */
+ #endif
+   register ulg b;       /* bit buffer */
+   register unsigned k;  /* number of bits in bit buffer */
+@@ -940,6 +959,7 @@ STATIC int INIT inflate_block(
+   unsigned t;           /* block type */
+   register ulg b;       /* bit buffer */
+   register unsigned k;  /* number of bits in bit buffer */
++  unsigned ret;         /* return code */
+ 
+   DEBG("<blk");
+ 
+@@ -965,17 +985,19 @@ STATIC int INIT inflate_block(
+   bk = k;
+ 
+   /* inflate that block type */
+-  if (t == 2)
+-    return inflate_dynamic();
+-  if (t == 0)
+-    return inflate_stored();
+-  if (t == 1)
+-    return inflate_fixed();
++  ret = 2;
++  spin_lock(&inflate_lock);
++  switch (t) {
++	case 2: ret = inflate_dynamic(); break;
++	case 0: ret = inflate_stored();  break;
++	case 1: ret = inflate_fixed();   break;
++  }
++  spin_unlock(&inflate_lock);
+ 
+   DEBG(">");
+ 
+   /* bad block type */
+-  return 2;
++  return ret;
+ 
+  underrun:
+   return 4;			/* Input underrun */
+Index: linux-latency-tracing.q/lib/zlib_inflate/inftrees.c
+===================================================================
+--- linux-latency-tracing.q.orig/lib/zlib_inflate/inftrees.c
++++ linux-latency-tracing.q/lib/zlib_inflate/inftrees.c
+@@ -4,11 +4,19 @@
   */
-@@ -544,6 +546,13 @@ asmlinkage void __init start_kernel(void
  
- 	acpi_early_init(); /* before LAPIC and SMP init */
+ #include <linux/zutil.h>
++#include <linux/spinlock.h>
+ #include "inftrees.h"
+ #include "infutil.h"
  
-+#ifdef CONFIG_LATENCY_TIMING
-+	/*
-+	 * Start tracing now - the bootup traces arent too interesting:
-+	 */
-+	preempt_max_latency = 1000;
-+#endif
+ static const char inflate_copyright[] __attribute_used__ =
+    " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
 +
- 	/* Do the rest non-__init'ed, we're now alive */
- 	rest_init();
- }
- kernel/latency.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: linux-latency-tracing.q/kernel/latency.c
-===================================================================
---- linux-latency-tracing.q.orig/kernel/latency.c
-+++ linux-latency-tracing.q/kernel/latency.c
-@@ -316,8 +316,8 @@ static void notrace printk_name(unsigned
- static unsigned long *worst_stack_bp;
- #endif
- static DEFINE_RAW_SPINLOCK(worst_stack_lock);
--unsigned long worst_stack_left = THREAD_SIZE;
--static unsigned long worst_stack_printed = THREAD_SIZE;
-+unsigned long worst_stack_left = THREAD_SIZE/2;
-+static unsigned long worst_stack_printed = THREAD_SIZE/2;
- static char worst_stack_comm[TASK_COMM_LEN+1];
- static int worst_stack_pid;
- static unsigned long worst_stack_sp;
---- linux-2.6.14/kernel/latency.c~	2005-12-29 21:03:11.000000000 -0500
-+++ linux-2.6.14/kernel/latency.c	2005-12-29 21:03:51.000000000 -0500
-@@ -24,6 +24,8 @@
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
- #include <asm/rtc.h>
-+#include <asm/system.h>
-+#include <asm/unistd.h>
++/*
++ * lock protecting static variables of huft_build() and other inflate
++ * functions, to reduce their insane stack footprint.
++ */
++static DEFINE_SPINLOCK(inflate_lock);
++
+ /*
+   If you use the zlib library in a product, an acknowledgment is welcome
+   in the documentation of your product. If for some reason you cannot
+@@ -107,7 +115,7 @@ static int huft_build(
+ {
+ 
+   uInt a;                       /* counter for codes of length k */
+-  uInt c[BMAX+1];               /* bit length count table */
++  static uInt c[BMAX+1];        /* bit length count table */
+   uInt f;                       /* i repeats in table every f entries */
+   int g;                        /* maximum code length */
+   int h;                        /* table level */
+@@ -118,10 +126,10 @@ static int huft_build(
+   uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
+   register uInt *p;             /* pointer into c[], b[], or v[] */
+   inflate_huft *q;              /* points to current table */
+-  struct inflate_huft_s r;      /* table entry for structure assignment */
+-  inflate_huft *u[BMAX];        /* table stack */
++  static struct inflate_huft_s r; /* table entry for structure assignment */
++  static inflate_huft *u[BMAX]; /* table stack */
+   register int w;               /* bits before this table == (l * h) */
+-  uInt x[BMAX+1];               /* bit offsets, then code stack */
++  static uInt x[BMAX+1];        /* bit offsets, then code stack */
+   uInt *xp;                     /* pointer into x */
+   int y;                        /* number of dummy codes added */
+   uInt z;                       /* number of entries in current table */
+@@ -300,9 +308,13 @@ int zlib_inflate_trees_bits(
+   int r;
+   uInt hn = 0;          /* hufts used in space */
+   uInt *v;              /* work area for huft_build */
+-  
++
+   v = WS(z)->tree_work_area_1;
++
++  spin_lock(&inflate_lock);
+   r = huft_build(c, 19, 19, NULL, NULL, tb, bb, hp, &hn, v);
++  spin_unlock(&inflate_lock);
++
+   if (r == Z_DATA_ERROR)
+     z->msg = (char*)"oversubscribed dynamic bit lengths tree";
+   else if (r == Z_BUF_ERROR || *bb == 0)
+@@ -333,7 +345,10 @@ int zlib_inflate_trees_dynamic(
+   v = WS(z)->tree_work_area_2;
+ 
+   /* build literal/length tree */
++  spin_lock(&inflate_lock);
+   r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
++  spin_unlock(&inflate_lock);
++
+   if (r != Z_OK || *bl == 0)
+   {
+     if (r == Z_DATA_ERROR)
+@@ -347,7 +362,10 @@ int zlib_inflate_trees_dynamic(
+   }
+ 
+   /* build distance tree */
++  spin_lock(&inflate_lock);
+   r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
++  spin_unlock(&inflate_lock);
++
+   if (r != Z_OK || (*bd == 0 && nl > 257))
+   {
+     if (r == Z_DATA_ERROR)
+@@ -383,9 +401,11 @@ int zlib_inflate_trees_fixed(
+ 	z_streamp z              /* for memory allocation */
+ )
+ {
+-  int i;                /* temporary variable */
+-  unsigned l[288];      /* length list for huft_build */
+-  uInt *v;              /* work area for huft_build */
++  int i;                       /* temporary variable */
++  static unsigned l[288];      /* length list for huft_build */
++  uInt *v;                     /* work area for huft_build */
++
++  spin_lock(&inflate_lock);
+ 
+   /* set up literal table */
+   for (i = 0; i < 144; i++)
+@@ -398,15 +418,20 @@ int zlib_inflate_trees_fixed(
+     l[i] = 8;
+   *bl = 9;
+   v = WS(z)->tree_work_area_1;
+-  if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp,  &i, v)) != 0)
++  if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp,  &i, v)) != 0) {
++    spin_unlock(&inflate_lock);
+     return i;
++  }
  
- #ifndef CONFIG_PREEMPT_RT
- # define DEFINE_RAW_SPINLOCK		DEFINE_SPINLOCK
---- linux-2.6.14/include/asm-x86_64/unistd.h~	2005-12-29 21:12:32.000000000 -0500
-+++ linux-2.6.14/include/asm-x86_64/unistd.h	2005-12-29 21:13:05.000000000 -0500
-@@ -581,6 +581,7 @@ __SYSCALL(__NR_inotify_add_watch, sys_in
- __SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
- 
- #define __NR_syscall_max __NR_inotify_rm_watch
-+#define NR_syscalls 256
- #ifndef __NO_STUBS
+   /* set up distance table */
+   for (i = 0; i < 30; i++)      /* make an incomplete code set */
+     l[i] = 5;
+   *bd = 5;
+-  if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1)
++  if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) {
++    spin_unlock(&inflate_lock);
+     return i;
++  }
  
- /* user-visible error numbers are in the range -1 - -4095 */
++  spin_unlock(&inflate_lock);
+   return Z_OK;
+ }

linux-2.6-debug-list_head.patch:
 b/fs/select.c                     |    4 +++-
 b/include/linux/wait.h            |    2 +-
 b/kernel/wait.c                   |   26 ++++++++++++++++++++++++--
 linux-2.6.12/include/linux/list.h |   22 ++++++++++++++++++++++
 4 files changed, 50 insertions(+), 4 deletions(-)

Index: linux-2.6-debug-list_head.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-list_head.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-list_head.patch	28 May 2006 23:35:47 -0000	1.3
+++ linux-2.6-debug-list_head.patch	18 Jun 2006 04:45:03 -0000	1.4
@@ -49,6 +49,13 @@
 
 
 
+It _may_ give more information about exactly which wait-queue (or rather, 
+what the poll function that was related to that wait-queue) seems to be 
+corrupted. 
+
+		Linus
+
+---
 diff --git a/fs/select.c b/fs/select.c
 index a8109ba..8cd6dc3 100644
 --- a/fs/select.c
@@ -61,16 +68,16 @@
  
  #include <asm/uaccess.h>
  
-@@ -78,7 +78,8 @@ void poll_freewait(struct poll_wqueues *
- 		entry = p->entry;
- 		do {
- 			entry--;
--			remove_wait_queue(entry->wait_address,&entry->wait);
-+			if (remove_wait_queue(entry->wait_address,&entry->wait) < 0)
-+				print_symbol("bad poll-entry for %s", (unsigned long) entry->filp->f_op->poll);
- 			fput(entry->filp);
- 		} while (entry > p->entries);
- 		old = p;
+@@ -65,7 +66,8 @@ EXPORT_SYMBOL(poll_initwait);
+ 
+ static void free_poll_entry(struct poll_table_entry *entry)
+ {
+-	remove_wait_queue(entry->wait_address,&entry->wait);
++	if (remove_wait_queue(entry->wait_address,&entry->wait) < 0)
++		print_symbol("bad poll-entry for %s", (unsigned long) entry->filp->f_op->poll);
+ 	fput(entry->filp);
+ }
+ 
 diff --git a/include/linux/wait.h b/include/linux/wait.h
 index d285182..4c1d74e 100644
 --- a/include/linux/wait.h

linux-2.6-debug-oops-pause.patch:
 traps.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-debug-oops-pause.patch	21 May 2006 16:40:58 -0000	1.11
+++ linux-2.6-debug-oops-pause.patch	18 Jun 2006 04:45:03 -0000	1.12
@@ -47,9 +47,9 @@
  			       unsigned long *stack, char *log_lvl)
  {
 @@ -190,6 +212,7 @@ static void show_trace_log_lvl(struct ta
+ 		if (!stack)
  			break;
- 		printk(log_lvl);
- 		printk(" =======================\n");
+ 		printk("%s =======================\n", log_lvl);
 +		//pause_for_two_minutes();
  	}
  }

linux-2.6-debug-periodic-slab-check.patch:
 slab.c |  132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 129 insertions(+), 3 deletions(-)

Index: linux-2.6-debug-periodic-slab-check.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-periodic-slab-check.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-periodic-slab-check.patch	2 Feb 2006 23:36:23 -0000	1.3
+++ linux-2.6-debug-periodic-slab-check.patch	18 Jun 2006 04:45:03 -0000	1.4
@@ -65,7 +65,7 @@
  		printk(KERN_ERR "slab: double free detected in cache "
  		       "'%s', objp %p\n", cachep->name, objp);
  		BUG();
-@@ -3266,6 +3277,116 @@ static int alloc_kmemlist(struct kmem_ca
+@@ -3266,6 +3277,114 @@ static int alloc_kmemlist(struct kmem_ca
  	return err;
  }
  
@@ -166,8 +166,6 @@
 +{
 +	int node;
 +
-+	check_spinlock_acquired(cache);
-+
 +	for_each_online_node(node) {
 +		struct kmem_list3 *lists = cache->nodelists[node];
 +
@@ -182,9 +180,9 @@
  struct ccupdate_struct {
  	struct kmem_cache *cachep;
  	struct array_cache *new[NR_CPUS];
-@@ -3446,6 +3567,13 @@ static void cache_reap(void *unused)
- 		drain_array_locked(searchp, cpu_cache_get(searchp), 0,
- 				   numa_node_id());
+@@ -3739,6 +3739,13 @@ static void cache_reap(void *unused)
+ 
+ 		drain_array(searchp, l3, cpu_cache_get(searchp), 0, node);
  
 +#if DEBUG
 +		if (time_before(searchp->next_verify, jiffies)) {
@@ -193,7 +191,6 @@
 +		}
 +#endif
 +
- 		if (time_after(l3->next_reap, jiffies))
- 			goto next_unlock;
- 
-
+ 		/*
+ 		 * These are racy checks but it does not matter
+ 		 * if we skip one check or scan twice.

linux-2.6-debug-singlebiterror.patch:
 slab.c |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-debug-singlebiterror.patch	3 Feb 2006 18:42:24 -0000	1.7
+++ linux-2.6-debug-singlebiterror.patch	18 Jun 2006 04:45:03 -0000	1.8
@@ -13,25 +13,22 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.15/mm/slab.c~	2006-01-09 13:25:17.000000000 -0500
-+++ linux-2.6.15/mm/slab.c	2006-01-09 13:26:01.000000000 -0500
-@@ -1313,8 +1313,13 @@ static void poison_obj(kmem_cache_t *cac
+--- linux-2.6.16.noarch/mm/slab.c~	2006-03-22 18:29:27.000000000 -0500
++++ linux-2.6.16.noarch/mm/slab.c	2006-03-22 18:30:58.000000000 -0500
+@@ -1516,10 +1516,33 @@ static void poison_obj(struct kmem_cache
  static void dump_line(char *data, int offset, int limit)
  {
  	int i;
 +	unsigned char total=0, bad_count=0;
  	printk(KERN_ERR "%03x:", offset);
- 	for (i = 0; i < limit; i++) {
+-	for (i = 0; i < limit; i++)
++	for (i = 0; i < limit; i++) {
 +		if (data[offset+i] != POISON_FREE) {
 +			total += data[offset+i];
 +			++bad_count;
 +		}
  		printk(" %02x", (unsigned char)data[offset + i]);
- 	}
- 	printk("\n");
-@@ -1019,6 +1023,23 @@ static void dump_line(char *data, int of
- 		}
- 	}
++	}
  	printk("\n");
 +	if (bad_count == 1) {
 +		switch (total) {

linux-2.6-debug-sysfs-crash-debugging.patch:
 devel-akpm/arch/i386/kernel/traps.c     |    5 +++++
 devel-akpm/fs/sysfs/file.c              |    7 +++++++
 linux-2.6.14/arch/x86_64/kernel/traps.c |    5 +++++
 3 files changed, 17 insertions(+)

Index: linux-2.6-debug-sysfs-crash-debugging.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-sysfs-crash-debugging.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-sysfs-crash-debugging.patch	12 Jan 2006 23:52:50 -0000	1.3
+++ linux-2.6-debug-sysfs-crash-debugging.patch	18 Jun 2006 04:45:03 -0000	1.4
@@ -18,12 +18,11 @@
 diff -puN fs/sysfs/file.c~sysfs-crash-debugging fs/sysfs/file.c
 --- devel/fs/sysfs/file.c~sysfs-crash-debugging	2005-11-22 22:31:16.000000000 -0800
 +++ devel-akpm/fs/sysfs/file.c	2005-11-22 22:31:16.000000000 -0800
-@@ -6,6 +6,8 @@
- #include <linux/fsnotify.h>
+@@ -7,6 +7,7 @@
  #include <linux/kobject.h>
  #include <linux/namei.h>
+ #include <linux/poll.h>
 +#include <linux/limits.h>
-+
  #include <asm/uaccess.h>
  #include <asm/semaphore.h>
  
@@ -54,16 +53,16 @@
  int register_die_notifier(struct notifier_block *nb)
  {
  	int err = 0;
-@@ -346,6 +346,9 @@ void die(const char * str, struct pt_reg
+@@ -388,6 +388,9 @@ void die(const char * str, struct pt_reg
  #endif
  		if (nl)
  			printk("\n");
 +#ifdef CONFIG_SYSFS
 +		printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file);
 +#endif
- 	notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
- 		show_registers(regs);
- 		try_crashdump(regs);
+ 		if (notify_die(DIE_OOPS, str, regs, err,
+ 					current->thread.trap_no, SIGSEGV) !=
+ 				NOTIFY_STOP)
 --- linux-2.6.14/arch/x86_64/kernel/traps.c~	2005-12-02 18:38:28.000000000 -0500
 +++ linux-2.6.14/arch/x86_64/kernel/traps.c	2005-12-02 18:38:57.000000000 -0500
 @@ -75,6 +75,8 @@ asmlinkage void call_debug(void);

linux-2.6-debug-taint-vm.patch:
 linux-2.6.15/mm/page_alloc.c                  |    4 ++--
 linux-2.6.16.noarch/include/asm-generic/bug.h |    8 ++++++--
 linux-2.6.16.noarch/mm/slab.c                 |    4 ++--
 linux-2000/kernel/panic.c                     |    1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-debug-taint-vm.patch	15 Mar 2006 22:25:23 -0000	1.7
+++ linux-2.6-debug-taint-vm.patch	18 Jun 2006 04:45:03 -0000	1.8
@@ -1,5 +1,5 @@
---- linux-2.6.11/include/asm-generic/bug.h~	2005-05-09 18:00:44.000000000 -0400
-+++ linux-2.6.11/include/asm-generic/bug.h	2005-05-09 18:01:23.000000000 -0400
+--- linux-2.6.16.noarch/include/asm-generic/bug.h~	2006-03-24 15:32:04.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-generic/bug.h	2006-03-24 15:33:29.000000000 -0500
 @@ -4,10 +4,14 @@
  #include <linux/compiler.h>
  #include <linux/config.h>
@@ -11,17 +11,17 @@
  #ifdef CONFIG_BUG
  #ifndef HAVE_ARCH_BUG
  #define BUG() do { \
--	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-+	printk("kernel BUG at %s:%d! (%s)\n", __FILE__, __LINE__, print_tainted()); \
+-	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
++	printk("BUG: failure at %s:%d/%s()! (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
  	panic("BUG!"); \
  } while (0)
  #endif
-@@ -25,7 +29,7 @@
+@@ -19,7 +23,7 @@
  #ifndef HAVE_ARCH_WARN_ON
  #define WARN_ON(condition) do { \
  	if (unlikely((condition)!=0)) { \
--		printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
-+		printk("Badness in %s at %s:%d (%s)\n", __FUNCTION__, __FILE__, __LINE__, print_tainted()); \
+-		printk("BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \
++		printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
  		dump_stack(); \
  	} \
  } while (0)
@@ -53,16 +53,16 @@
  	dump_stack();
  	page->flags &= ~(1 << PG_lru	|
  			1 << PG_private |
---- linux-2.6.15/mm/slab.c~	2006-01-09 13:19:33.000000000 -0500
-+++ linux-2.6.15/mm/slab.c	2006-01-09 13:19:55.000000000 -0500
-@@ -1371,8 +1371,8 @@ static void check_poison_obj(kmem_cache_
+--- linux-2.6.16.noarch/mm/slab.c~	2006-03-22 18:25:29.000000000 -0500
++++ linux-2.6.16.noarch/mm/slab.c	2006-03-22 18:25:53.000000000 -0500
+@@ -1573,8 +1573,8 @@ static void check_poison_obj(struct kmem
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
--				       "Slab corruption: start=%p, len=%d\n",
--				       realobj, size);
-+				       "Slab corruption: (%s) start=%p, len=%d\n",
-+				       print_tainted(), realobj, size);
+-					"Slab corruption: start=%p, len=%d\n",
+-					realobj, size);
++					"Slab corruption: (%s) start=%p, len=%d\n",
++					print_tainted(), realobj, size);
  				print_objinfo(cachep, objp, 0);
  				dump_stack();
  			}

linux-2.6-devmem-xen.patch:
 arch/i386/mm/init-xen.c                |   11 +++++++++++
 arch/x86_64/mm/init-xen.c              |   26 ++++++++++++++++++++++++++
 include/asm-i386/mach-xen/asm/page.h   |    1 +
 include/asm-x86_64/mach-xen/asm/page.h |    4 ++++
 4 files changed, 42 insertions(+)

Index: linux-2.6-devmem-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-devmem-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-devmem-xen.patch	15 Oct 2005 01:07:29 -0000	1.1
+++ linux-2.6-devmem-xen.patch	18 Jun 2006 04:45:03 -0000	1.2
@@ -1,31 +1,89 @@
---- linux-2.6.8/include/asm-xen/asm-i386/page.h.devmem	2004-10-15 15:24:02.000000000 -0400
-+++ linux-2.6.8/include/asm-xen/asm-i386/page.h	2004-10-15 15:24:31.000000000 -0400
-@@ -207,6 +207,8 @@ static __inline__ int get_order(unsigned
- #define virt_to_machine(_a)	(phys_to_machine(__pa(_a)))
- #define machine_to_virt(_m)	(__va(machine_to_phys(_m)))
+diff -uNp linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig linux-2.6.16.noarch/arch/i386/mm/init-xen.c
+--- linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig	2006-04-13 19:37:24.000000000 +0200
++++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c	2006-04-13 19:39:38.000000000 +0200
+@@ -280,6 +280,17 @@ int page_is_ram(unsigned long pagenr)
  
-+#define devmem_is_allowed(x) 1
+ #endif
+ 
++int devmem_is_allowed(unsigned long pagenr)
++{
++   if (pagenr <= 256)
++       return 1;
++   if (!page_is_ram(pagenr))
++       return 1;
++   return 0;
++}
 +
- #endif /* __KERNEL__ */
++EXPORT_SYMBOL_GPL(page_is_ram);
++
+ #ifdef CONFIG_HIGHMEM
+ pte_t *kmap_pte;
+ pgprot_t kmap_prot;
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
+--- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c	2006-04-13 14:19:58.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c	2006-04-13 16:16:23.000000000 +0200
+@@ -847,6 +847,10 @@ void __init clear_kernel_mapping(unsigne
+ 	__flush_tlb_all();
+ } 
+ 
++static inline int page_is_ram (unsigned long pagenr)
++{
++	return 1;
++}
+ /*
+  * Memory hotplug specific functions
+  * These are only for non-NUMA machines right now.
+@@ -891,6 +895,28 @@ EXPORT_SYMBOL_GPL(remove_memory);
  
- #endif /* _I386_PAGE_H */
---- linux-2.6.11/include/asm-xen/asm-i386/io.h.rc4	2005-05-16 16:30:29.000000000 -0400
-+++ linux-2.6.11/include/asm-xen/asm-i386/io.h	2005-05-16 16:31:41.000000000 -0400
-@@ -50,6 +50,17 @@
- #include <linux/vmalloc.h>
- #include <asm/fixmap.h>
+ #endif
  
 +/*
-+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
-+ * access
++ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
++ * valid. The argument is a physical page number.
++ *
++ *
++ * On x86-64, access has to be given to the first megabyte of ram because that area
++ * contains bios code and data regions used by X and dosemu and similar apps.
++ * Access has to be given to non-kernel-ram areas as well, these contain the PCI
++ * mmio resources as well as potential bios/acpi data regions.
 + */
-+#define xlate_dev_mem_ptr(p)    __va(p)
++int devmem_is_allowed(unsigned long pagenr)
++{
++	if (pagenr <= 256)
++		return 1;
++	if (!page_is_ram(pagenr))
++		return 1;
++	return 0;
++}
 +
-+/*
-+ * Convert a virtual cached pointer to an uncached pointer
-+ */
-+#define xlate_dev_kmem_ptr(p)   p
 +
- /**
-  *	virt_to_phys	-	map virtual addresses to physical
-  *	@address: address to remap
++EXPORT_SYMBOL_GPL(devmem_is_allowed);
++
+ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
+ 			 kcore_vsyscall;
+ 
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h
+--- linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h	2006-04-13 14:19:59.000000000 +0200
++++ linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h	2006-04-13 16:19:23.000000000 +0200
+@@ -276,6 +276,7 @@ extern unsigned int __VMALLOC_RESERVE;
+ 
+ extern int sysctl_legacy_va_layout;
+ 
++extern int devmem_is_allowed(unsigned long pagenr);
+ extern int page_is_ram(unsigned long pagenr);
+ 
+ #endif /* __ASSEMBLY__ */
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h
+--- linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h	2006-04-13 14:19:58.000000000 +0200
++++ linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h	2006-04-13 16:20:50.000000000 +0200
+@@ -309,6 +309,10 @@ static inline pgd_t __pgd(unsigned long 
+ 
+ #define __HAVE_ARCH_GATE_AREA 1	
+ 
++#ifndef __ASSEMBLY__
++extern int devmem_is_allowed(unsigned long pagenr);
++#endif
++
+ #endif /* __KERNEL__ */
+ 
+ #include <asm-generic/memory_model.h>

linux-2.6-devmem.patch:
 arch/powerpc/mm/mem.c                        |   14 ++
 linux-1050/arch/i386/mm/init.c               |   19 +++
 linux-1050/arch/ia64/mm/init.c               |    7 +
 linux-1050/arch/s390/mm/init.c               |    5 
 linux-1050/arch/x86_64/mm/init.c             |   20 +++
 linux-1050/drivers/char/mem.c                |  143 ++++-----------------------
 linux-1050/fs/proc/kcore.c                   |    2 
 linux-1050/include/asm-arm/page.h            |    2 
 linux-1050/include/asm-arm26/page.h          |    2 
 linux-1050/include/asm-cris/page.h           |    2 
 linux-1050/include/asm-h8300/page.h          |    2 
 linux-1050/include/asm-i386/page.h           |    4 
 linux-1050/include/asm-ia64/page.h           |    2 
 linux-1050/include/asm-m68k/page.h           |    2 
 linux-1050/include/asm-m68knommu/page.h      |    2 
 linux-1050/include/asm-mips/page.h           |    2 
 linux-1050/include/asm-parisc/page.h         |    2 
 linux-1050/include/asm-s390/page.h           |    2 
 linux-1050/include/asm-sh/page.h             |    2 
 linux-1050/include/asm-sh64/page.h           |    2 
 linux-1050/include/asm-sparc/page.h          |    2 
 linux-1050/include/asm-sparc64/page.h        |    2 
 linux-1050/include/asm-um/page.h             |    1 
 linux-1050/include/asm-v850/page.h           |    2 
 linux-1050/include/asm-x86_64/page.h         |    4 
 linux-2.6.13/arch/x86_64/mm/init.c           |   22 ++++
 linux-2.6.14/include/asm-powerpc/page.h      |    2 
 linux-2.6.16.noarch/include/asm-alpha/page.h |    1 
 linux-2.6.16.noarch/include/asm-ppc/page.h   |    2 
 29 files changed, 154 insertions(+), 122 deletions(-)

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-devmem.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-devmem.patch	13 Jan 2006 15:50:35 -0000	1.5
+++ linux-2.6-devmem.patch	18 Jun 2006 04:45:03 -0000	1.6
@@ -55,8 +55,8 @@
  #include <asm/vdso.h>
  
  #include "mmu_decl.h"
-@@ -722,6 +722,19 @@ void __init mem_init(void)
- 	max_mapnr = num_physpages;
+@@ -352,6 +352,19 @@ void __init mem_init(void)
+ 	max_mapnr = max_pfn;
  	totalram_pages += free_all_bootmem();
  #endif
 +
@@ -72,9 +72,9 @@
 +	}
 +#endif
 +
- 	for_each_pgdat(pgdat) {
+ 	for_each_online_pgdat(pgdat) {
  		for (i = 0; i < pgdat->node_spanned_pages; i++) {
- 			page = pgdat->node_mem_map + i;
+ 			if (!pfn_valid(pgdat->node_start_pfn + i))
 diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/s390/mm/init.c linux-1050/arch/s390/mm/init.c
 --- linux-1020/arch/s390/mm/init.c
 +++ linux-1050/arch/s390/mm/init.c
@@ -173,7 +173,7 @@
  	read = 0;
  	virtr = 0;
  	if (p < (unsigned long) high_memory) {
-@@ -345,128 +367,6 @@ static ssize_t read_kmem(struct file *fi
+@@ -432,67 +432,6 @@ static ssize_t read_kmem(struct file *fi
  }
  
  
@@ -221,11 +221,9 @@
 -
 -		copied = copy_from_user(ptr, buf, sz);
 -		if (copied) {
--			ssize_t ret;
--
--			ret = written + (sz - copied);
--			if (ret)
--				return ret;
+-			written += sz - copied;
+-			if (written)
+-				break;
 -			return -EFAULT;
 -		}
 -		buf += sz;
@@ -240,6 +238,13 @@
 -}
 -
 -
+ /*
+  * This function writes to the *virtual* memory as seen by the kernel.
+  */
+@@ -432,64 +432,6 @@ static ssize_t read_kmem(struct file *fi
+ }
+ 
+ 
 -/*
 - * This function writes to the *virtual* memory as seen by the kernel.
 - */
@@ -279,11 +284,10 @@
 -			if (len) {
 -				written = copy_from_user(kbuf, buf, len);
 -				if (written) {
--					ssize_t ret;
--
+-					if (wrote + virtr)
+-						break;
 -					free_page((unsigned long)kbuf);
--					ret = wrote + virtr + (len - written);
--					return ret ? ret : -EFAULT;
+-					return -EFAULT;
 -				}
 -			}
 -			len = vwrite(kbuf, (char *)p, len);
@@ -330,17 +334,16 @@
  }
  
  static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
-diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-alpha/page.h linux-1050/include/asm-alpha/page.h
---- linux-1020/include/asm-alpha/page.h
-+++ linux-1050/include/asm-alpha/page.h
-@@ -110,6 +110,7 @@ extern __inline__ int get_order(unsigned
+--- linux-2.6.16.noarch/include/asm-alpha/page.h~	2006-03-28 10:15:44.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-alpha/page.h	2006-03-28 10:15:55.000000000 -0500
+@@ -93,6 +93,7 @@ typedef unsigned long pgprot_t;
+ 
  #define VM_DATA_DEFAULT_FLAGS		(VM_READ | VM_WRITE | VM_EXEC | \
  					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
 +#define devmem_is_allowed(x) 1
  #endif /* __KERNEL__ */
  
- #endif /* _ALPHA_PAGE_H */
+ #include <asm-generic/memory_model.h>
 diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-arm/page.h linux-1050/include/asm-arm/page.h
 --- linux-1020/include/asm-arm/page.h
 +++ linux-1050/include/asm-arm/page.h
@@ -466,15 +469,15 @@
  #endif /* __KERNEL__ */
  
  #endif /* _PARISC_PAGE_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ppc/page.h linux-1050/include/asm-ppc/page.h
---- linux-1020/include/asm-ppc/page.h
-+++ linux-1050/include/asm-ppc/page.h
-@@ -163,5 +163,7 @@ extern __inline__ int get_order(unsigned
- #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
- 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+--- linux-2.6.16.noarch/include/asm-ppc/page.h~	2006-03-28 10:16:25.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-ppc/page.h	2006-03-28 10:16:35.000000000 -0500
+@@ -174,6 +174,8 @@ extern __inline__ int get_order(unsigned
+ /* We do define AT_SYSINFO_EHDR but don't use the gate mecanism */
+ #define __HAVE_ARCH_GATE_AREA		1
  
 +#define devmem_is_allowed(x) 1
 +
+ #include <asm-generic/memory_model.h>
  #endif /* __KERNEL__ */
  #endif /* _PPC_PAGE_H */
 --- linux-2.6.14/include/asm-powerpc/page.h~	2005-11-15 12:12:43.000000000 -0500

linux-2.6-execshield-xen.patch:
 arch/i386/kernel/entry-xen.S                                |    8 -
 arch/i386/kernel/process-xen.c                              |   58 +++++++
 arch/i386/kernel/smp-xen.c                                  |    2 
 arch/i386/kernel/traps-xen.c                                |   92 +++++++++++-
 arch/i386/mm/init-xen.c                                     |    6 
 linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h |    2 
 linux-2.6.16.i686/arch/i386/kernel/sysenter.c               |    2 
 linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c        |   23 ---
 8 files changed, 164 insertions(+), 29 deletions(-)

Index: linux-2.6-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-execshield-xen.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-execshield-xen.patch	21 Mar 2006 21:49:03 -0000	1.4
+++ linux-2.6-execshield-xen.patch	18 Jun 2006 04:45:03 -0000	1.5
@@ -227,18 +227,6 @@
 index f243508..4c8c7ac 100644
 --- a/arch/i386/mm/init-xen.c
 +++ b/arch/i386/mm/init-xen.c
-@@ -274,7 +274,10 @@ int page_is_ram(unsigned long pagenr)
- #else /* CONFIG_XEN */
- 
- #define page_kills_ppro(p)	0
--#define page_is_ram(p)		1
-+int page_is_ram(unsigned long pagenr)
-+{
-+	return 1;
-+}
- 
- #endif
- 
 @@ -469,7 +472,7 @@ u64 __supported_pte_mask __read_mostly =
   * Control non executable mappings.
   *
@@ -267,10 +255,10 @@
  
  	pagetable_init();
  
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c
---- linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c	2006-02-10 20:25:28.000000000 +0100
-+++ linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c	2006-02-10 21:27:22.000000000 +0100
-@@ -51,7 +51,7 @@ Control non executable mappings for 64bi
+diff -uNp linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c.orig linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c
+--- linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c.orig	2006-04-13 14:02:32.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c	2006-04-13 14:05:07.000000000 +0200
+@@ -55,7 +55,7 @@ Control non executable mappings for 64bi
  on	Enable(default)
  off	Disable
  */ 
@@ -279,15 +267,13 @@
  {
  	if (!strncmp(str, "on", 2)) {
                  __supported_pte_mask |= _PAGE_NX; 
-@@ -60,28 +60,7 @@ int __init nonx_setup(char *str)
- 		do_not_nx = 1;
- 		__supported_pte_mask &= ~_PAGE_NX;
+@@ -66,27 +66,6 @@ int __init nonx_setup(char *str)
          }
--	return 0;
--} 
+ 	return 1;
+ } 
 -__setup("noexec=", nonx_setup);	/* parsed early actually */
 -
--int force_personality32 = READ_IMPLIES_EXEC;
+-int force_personality32 = 0; 
 -
 -/* noexec32=on|off
 -Control non executable heap for 32bit processes.
@@ -302,12 +288,13 @@
 -		force_personality32 &= ~READ_IMPLIES_EXEC;
 -	else if (!strcmp(str, "off"))
 -		force_personality32 |= READ_IMPLIES_EXEC;
--	return 0;
- }
+-	return 1;
+-}
 -__setup("noexec32=", nonx32_setup);
- 
+-
  /*
   * Great future plan:
+  * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
 diff -uNp linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h
 --- linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig	2006-02-23 16:50:14.000000000 +0100
 +++ linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-02-23 16:59:04.000000000 +0100

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/arch/i386/kernel/sysenter.c |  123 ++++++++--------
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux/arch/i386/kernel/asm-offsets.c            |    1 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/entry.S                  |    8 -
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/signal.c                 |    4 
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S      |    6 
 linux/arch/i386/kernel/vsyscall.lds.S           |    4 
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  151 +++++++++++++++----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   34 +++-
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/elf.h                    |   50 ++++--
 linux/include/asm-i386/mmu.h                    |    6 
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-i386/thread_info.h            |    1 
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 52 files changed, 919 insertions(+), 215 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-execshield.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-execshield.patch	10 May 2006 00:04:25 -0000	1.13
+++ linux-2.6-execshield.patch	18 Jun 2006 04:45:03 -0000	1.14
@@ -164,44 +164,102 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-Index: linux/arch/i386/kernel/sysenter.c
-===================================================================
---- linux.orig/arch/i386/kernel/sysenter.c
-+++ linux/arch/i386/kernel/sysenter.c
-@@ -13,7 +13,9 @@
- #include <linux/gfp.h>
+diff -uNp linux-2.6.16.noarch/arch/i386/kernel/sysenter.c.orig linux-2.6.16.noarch/arch/i386/kernel/sysenter.c
+--- linux-2.6.16.noarch/arch/i386/kernel/sysenter.c.orig	2006-04-25 14:25:11.000000000 +0200
++++ linux-2.6.16.noarch/arch/i386/kernel/sysenter.c	2006-04-25 14:50:26.000000000 +0200
+@@ -14,7 +14,9 @@
  #include <linux/string.h>
  #include <linux/elf.h>
+ #include <linux/mm.h>
 +#include <linux/mman.h>
  
 +#include <asm/a.out.h>
  #include <asm/cpufeature.h>
  #include <asm/msr.h>
  #include <asm/pgtable.h>
-@@ -46,11 +48,13 @@ void enable_sep_cpu(void)
+@@ -52,11 +54,13 @@ void enable_sep_cpu(void)
+  */
  extern const char vsyscall_int80_start, vsyscall_int80_end;
  extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
- 
+-static void *syscall_page;
 +static struct page *sysenter_pages[2];
-+
+ 
  int __init sysenter_setup(void)
  {
- 	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
- 
--	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
+-	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
++	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
++
 +	sysenter_pages[0] = virt_to_page(page);
  
- 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
- 		memcpy(page,
-@@ -65,3 +69,78 @@ int __init sysenter_setup(void)
+ #ifdef CONFIG_XEN
+ 	if (boot_cpu_has(X86_FEATURE_SEP)) {
+@@ -71,73 +75,82 @@ int __init sysenter_setup(void)
+ #endif
+ 
+ 	if (boot_cpu_has(X86_FEATURE_SEP)) {
+-		memcpy(syscall_page,
++		memcpy(page,
+ 		       &vsyscall_sysenter_start,
+ 		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
+ 		return 0;
+ 	}
+ 
+-	memcpy(syscall_page,
++	memcpy(page,
+ 	       &vsyscall_int80_start,
+ 	       &vsyscall_int80_end - &vsyscall_int80_start);
  
  	return 0;
  }
-+
+ 
+-static struct page*
+-syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
+-{
+-	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
+-	get_page(p);
+-	return p;
+-}
+-
+-/* Prevent VMA merging */
+-static void syscall_vma_close(struct vm_area_struct *vma)
+-{
+-}
 +extern void SYSENTER_RETURN_OFFSET;
 +
 +unsigned int vdso_enabled = 1;
-+
+ 
+-static struct vm_operations_struct syscall_vm_ops = {
+-	.close = syscall_vma_close,
+-	.nopage = syscall_nopage,
+-};
+-
+-/* Setup a VMA at program startup for the vsyscall page */
+-int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+-{
+-	struct vm_area_struct *vma;
+-	struct mm_struct *mm = current->mm;
+-	int ret;
+-
+-	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+-	if (!vma)
+-		return -ENOMEM;
+-
+-	memset(vma, 0, sizeof(struct vm_area_struct));
+-	/* Could randomize here */
+-	vma->vm_start = VSYSCALL_BASE;
+-	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
+-	/* MAYWRITE to allow gdb to COW and set breakpoints */
+-	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
+-	vma->vm_flags |= mm->def_flags;
+-	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
+-	vma->vm_ops = &syscall_vm_ops;
+-	vma->vm_mm = mm;
+-
+-	down_write(&mm->mmap_sem);
+-	if ((ret = insert_vm_struct(mm, vma))) {
+-		up_write(&mm->mmap_sem);
+-		kmem_cache_free(vm_area_cachep, vma);
+-		return ret;
 +/*
 + * This is called from binfmt_elf, we create the special vma for the
 + * vDSO and insert it into the mm struct tree.
@@ -227,7 +285,10 @@
 +	if (0==exec_shield) { /* off; %cs limit off */
 +		addr = STACK_TOP;  /* minimal interference with anybody */
 +		flags = MAP_PRIVATE | MAP_FIXED;
-+	}
+ 	}
+-	mm->total_vm++;
+-	up_write(&mm->mmap_sem);
+-	return 0;
 +	else if ((3<<2) & exec_shield) { /* vdso just below .text */
 +		addr = (((2<<2) & exec_shield) && interp_map_address) ?
 +			interp_map_address : start_code;
@@ -256,22 +317,26 @@
 +	}
 +	up_write(&current->mm->mmap_sem);
 +	return err;
-+}
-+
+ }
+ 
+-struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
 +int in_gate_area_no_task(unsigned long addr)
-+{
-+	return 0;
-+}
-+
-+int in_gate_area(struct task_struct *task, unsigned long addr)
-+{
+ {
+-	return NULL;
 +	return 0;
-+}
-+
+ }
+ 
+ int in_gate_area(struct task_struct *task, unsigned long addr)
+@@ -145,7 +158,7 @@ int in_gate_area(struct task_struct *tas
+ 	return 0;
+ }
+ 
+-int in_gate_area_no_task(unsigned long addr)
 +struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+{
+ {
+-	return 0;
 +	return NULL;
-+}
+ }
 Index: linux/arch/i386/kernel/traps.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/traps.c
@@ -608,15 +673,15 @@
  {
  	if (!strncmp(str, "on", 2)) {
                  __supported_pte_mask |= _PAGE_NX; 
-@@ -55,28 +55,7 @@ int __init nonx_setup(char *str)
+@@ -55,28 +55,7 @@ void __init nonx_setup(const char *str)
  		do_not_nx = 1;
  		__supported_pte_mask &= ~_PAGE_NX;
          }
--	return 0;
+-	return 1;
 -} 
 -__setup("noexec=", nonx_setup);	/* parsed early actually */
 -
--int force_personality32 = READ_IMPLIES_EXEC;
+-int force_personality32 = 0; 
 -
 -/* noexec32=on|off
 -Control non executable heap for 32bit processes.
@@ -631,7 +696,7 @@
 -		force_personality32 &= ~READ_IMPLIES_EXEC;
 -	else if (!strcmp(str, "off"))
 -		force_personality32 |= READ_IMPLIES_EXEC;
--	return 0;
+-	return 1;
  }
 -__setup("noexec32=", nonx32_setup);
  
@@ -1269,7 +1334,7 @@
 +}
 +
 +#define load_user_cs_desc(cpu, mm) \
-+    	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
 +
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
@@ -2144,15 +2209,15 @@
  	pgprot_t newprot;
  	pgoff_t pgoff;
  	int error;
-@@ -166,6 +167,8 @@ success:
+@@ -167,6 +167,8 @@ success:
  	 */
  	vma->vm_flags = newflags;
  	vma->vm_page_prot = newprot;
 +	if (oldflags & VM_EXEC)
 +		arch_remove_exec_range(current->mm, old_end);
- 	change_protection(vma, start, end, newprot);
- 	vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);
- 	vm_stat_account(mm, newflags, vma->vm_file, nrpages);
+ 	if (is_vm_hugetlb_page(vma))
+ 		hugetlb_change_protection(vma, start, end, newprot);
+ 	else
 Index: linux/mm/mremap.c
 ===================================================================
 --- linux.orig/mm/mremap.c

linux-2.6-hvc-console.patch:
 linux-2.6.14/drivers/char/hvc_fss.c    |  150 +++++++++++++++++++++++++++++++++
 linux-2.6.16.ppc/drivers/char/Kconfig  |    9 +
 linux-2.6.16.ppc/drivers/char/Makefile |    1 
 3 files changed, 160 insertions(+)

Index: linux-2.6-hvc-console.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-hvc-console.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-hvc-console.patch	10 Jan 2006 01:45:59 -0000	1.3
+++ linux-2.6-hvc-console.patch	18 Jun 2006 04:45:04 -0000	1.4
@@ -1,157 +1,7 @@
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c
---- linux-2.6.14.cons/drivers/char/hvc_console.c	2005-12-07 16:33:35.000000000 +0100
-+++ linux-2.6.14/drivers/char/hvc_console.c	2005-12-07 16:33:56.000000000 +0100
-@@ -40,7 +40,7 @@
- #include <linux/spinlock.h>
- #include <linux/delay.h>
- #include <asm/uaccess.h>
--#include <asm/hvconsole.h>
-+#include "hvc_console.h"
- 
- #define HVC_MAJOR	229
- #define HVC_MINOR	0
-@@ -61,11 +61,6 @@
-  */
- #define HVC_ALLOC_TTY_ADAPTERS	8
- 
--#define N_OUTBUF	16
--#define N_INBUF		16
--
--#define __ALIGNED__	__attribute__((__aligned__(8)))
--
- static struct tty_driver *hvc_driver;
- static struct task_struct *hvc_task;
- 
-@@ -76,22 +71,6 @@
- static int sysrq_pressed;
- #endif
- 
--struct hvc_struct {
--	spinlock_t lock;
--	int index;
--	struct tty_struct *tty;
--	unsigned int count;
--	int do_wakeup;
--	char outbuf[N_OUTBUF] __ALIGNED__;
--	int n_outbuf;
--	uint32_t vtermno;
--	struct hv_ops *ops;
--	int irq_requested;
--	int irq;
--	struct list_head next;
--	struct kobject kobj; /* ref count & hvc_struct lifetime */
--};
--
- /* dynamic list of hvc_struct instances */
- static struct list_head hvc_structs = LIST_HEAD_INIT(hvc_structs);
- 
-@@ -136,7 +115,6 @@
- 	return hp;
- }
- 
--
- /*
-  * Initial console vtermnos for console API usage prior to full console
-  * initialization.  Any vty adapter outside this range will not have usable
-@@ -154,6 +132,7 @@
- 
- void hvc_console_print(struct console *co, const char *b, unsigned count)
- {
-+	/* This [16] should probably use a #define */
- 	char c[16] __ALIGNED__;
- 	unsigned i = 0, n = 0;
- 	int r, donecr = 0, index = co->index;
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.h linux-2.6.14/drivers/char/hvc_console.h
---- linux-2.6.14.cons/drivers/char/hvc_console.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.14/drivers/char/hvc_console.h	2005-12-07 16:33:56.000000000 +0100
-@@ -0,0 +1,83 @@
-+/*
-+ * hvc_console.h
-+ * Copyright (C) 2005 IBM Corporation
-+ *
-+ * Author(s):
-+ * 	Ryan S. Arnold <rsa at us.ibm.com>
-+ *
-+ * hvc_console header information:
-+ *      moved here from include/asm-ppc64/hvconsole.h
-+ *      and drivers/char/hvc_console.c
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ */
-+
-+#ifndef HVC_CONSOLE_H
-+#define HVC_CONSOLE_H
-+
-+#include <linux/spinlock.h>
-+#include <linux/list.h>
-+#include <linux/kobject.h>
-+
-+/*
-+ * This is the max number of console adapters that can/will be found as
-+ * console devices on first stage console init.  Any number beyond this range
-+ * can't be used as a console device but is still a valid tty device.
-+ */
-+#define MAX_NR_HVC_CONSOLES	16
-+
-+/*
-+ * This is a design shortcoming, the number '16' is a vio required buffer
-+ * size.  This should be changeable per architecture, but hvc_struct relies
-+ * upon it and that struct is used by all hvc_console backend drivers.  This
-+ * needs to be fixed.
-+ */
-+#define N_OUTBUF	16
-+#define N_INBUF		16
-+
-+#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
-+
-+/* implemented by a low level driver */
-+struct hv_ops {
-+	int (*get_chars)(uint32_t vtermno, char *buf, int count);
-+	int (*put_chars)(uint32_t vtermno, const char *buf, int count);
-+};
-+
-+struct hvc_struct {
-+	spinlock_t lock;
-+	int index;
-+	struct tty_struct *tty;
-+	unsigned int count;
-+	int do_wakeup;
-+	char outbuf[N_OUTBUF] __ALIGNED__;
-+	int n_outbuf;
-+	uint32_t vtermno;
-+	struct hv_ops *ops;
-+	int irq_requested;
-+	int irq;
-+	struct list_head next;
-+	struct kobject kobj; /* ref count & hvc_struct lifetime */
-+};
-+
-+/* Register a vterm and a slot index for use as a console (console_init) */
-+extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
-+
-+/* register a vterm for hvc tty operation (module_init or hotplug add) */
-+extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
-+						 struct hv_ops *ops);
-+/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
-+extern int __devexit hvc_remove(struct hvc_struct *hp);
-+
-+#endif // HVC_CONSOLE_H
 diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_fss.c linux-2.6.14/drivers/char/hvc_fss.c
 --- linux-2.6.14.cons/drivers/char/hvc_fss.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.14/drivers/char/hvc_fss.c	2005-12-07 16:34:02.000000000 +0100
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,150 @@
 +/*
 + * IBM Full System Simulator driver interface to hvc_console.c
 + *
@@ -188,6 +38,7 @@
 +#include <linux/init.h>
 +#include <linux/err.h>
 +#include <asm/irq.h>
++#include <asm/processor.h>
 +#include "hvc_console.h"
 +
 +static uint32_t hvc_fss_vtermno = 0;
@@ -301,26 +152,23 @@
 +	return 0;
 +}
 +console_initcall(hvc_fss_console_init);
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Kconfig linux-2.6.14/drivers/char/Kconfig
---- linux-2.6.14.cons/drivers/char/Kconfig	2005-12-07 16:33:33.000000000 +0100
-+++ linux-2.6.14/drivers/char/Kconfig	2005-12-07 16:33:58.000000000 +0100
-@@ -552,14 +552,27 @@
- 
- 	  If unsure, say N.
- 
-+config HVC_DRIVER
-+	bool
-+	depends on PPC_PSERIES || PPC_CELL || PPC_RTAS
-+
- config HVC_CONSOLE
- 	bool "pSeries Hypervisor Virtual Console support"
- 	depends on PPC_PSERIES
-+	select HVC_DRIVER
+--- linux-2.6.16.ppc/drivers/char/Makefile~	2006-03-31 20:44:59.000000000 +0100
++++ linux-2.6.16.ppc/drivers/char/Makefile	2006-03-31 21:28:29.000000000 +0100
+@@ -44,6 +44,7 @@ obj-$(CONFIG_RIO)		+= rio/ generic_seria
+ obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
+ obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
+ obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o
++obj-$(CONFIG_HVC_FSS)		+= hvc_fss.o
+ obj-$(CONFIG_RAW_DRIVER)	+= raw.o
+ obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
+ obj-$(CONFIG_MMTIMER)		+= mmtimer.o
+--- linux-2.6.16.ppc/drivers/char/Kconfig~	2006-03-31 20:44:59.000000000 +0100
++++ linux-2.6.16.ppc/drivers/char/Kconfig	2006-03-31 21:29:05.000000000 +0100
+@@ -588,6 +588,15 @@ config HVC_RTAS
  	help
- 	  pSeries machines when partitioned support a hypervisor virtual
- 	  console. This driver allows each pSeries partition to have a console
- 	  which is accessed via the HMC.
+ 	  IBM Console device driver which makes use of RTAS
  
++
 +config HVC_FSS
 +	bool "IBM Full System Simulator Console support"
 +	depends on MAMBO
@@ -332,66 +180,3 @@
  config HVCS
  	tristate "IBM Hypervisor Virtual Console Server support"
  	depends on PPC_PSERIES
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Makefile linux-2.6.14/drivers/char/Makefile
---- linux-2.6.14.cons/drivers/char/Makefile	2005-12-07 16:33:33.000000000 +0100
-+++ linux-2.6.14/drivers/char/Makefile	2005-12-07 16:33:58.000000000 +0100
-@@ -40,11 +40,13 @@
- obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
- obj-$(CONFIG_SX)		+= sx.o generic_serial.o
- obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
--obj-$(CONFIG_HVC_CONSOLE)	+= hvc_console.o hvc_vio.o hvsi.o
-+obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
-+obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
-+obj-$(CONFIG_HVC_FSS)		+= hvc_fss.o
- obj-$(CONFIG_RAW_DRIVER)	+= raw.o
- obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
- obj-$(CONFIG_MMTIMER)		+= mmtimer.o
--obj-$(CONFIG_VIOCONS) += viocons.o
-+obj-$(CONFIG_VIOCONS)		+= viocons.o
- obj-$(CONFIG_VIOTAPE)		+= viotape.o
- obj-$(CONFIG_HVCS)		+= hvcs.o
- obj-$(CONFIG_SGI_MBCS)		+= mbcs.o
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h
---- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h	2005-12-07 16:33:35.000000000 +0100
-+++ linux-2.6.14/include/asm-powerpc/hvconsole.h	2005-12-07 16:33:56.000000000 +0100
-@@ -22,30 +22,9 @@
- #ifndef _PPC64_HVCONSOLE_H
- #define _PPC64_HVCONSOLE_H
- #ifdef __KERNEL__
- 
--/*
-- * This is the max number of console adapters that can/will be found as
-- * console devices on first stage console init.  Any number beyond this range
-- * can't be used as a console device but is still a valid tty device.
-- */
--#define MAX_NR_HVC_CONSOLES	16
--
--/* implemented by a low level driver */
--struct hv_ops {
--	int (*get_chars)(uint32_t vtermno, char *buf, int count);
--	int (*put_chars)(uint32_t vtermno, const char *buf, int count);
--};
- extern int hvc_get_chars(uint32_t vtermno, char *buf, int count);
- extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count);
- 
--struct hvc_struct;
--
--/* Register a vterm and a slot index for use as a console (console_init) */
--extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
--/* register a vterm for hvc tty operation (module_init or hotplug add) */
--extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
--						 struct hv_ops *ops);
--/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
--extern int __devexit hvc_remove(struct hvc_struct *hp);
- #endif /* __KERNEL__ */
- #endif /* _PPC64_HVCONSOLE_H */
---- linux-2.6.14/drivers/char/hvc_vio.c~	2005-12-07 17:46:48.000000000 +0100
-+++ linux-2.6.14/drivers/char/hvc_vio.c	2005-12-07 18:03:23.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <asm/hvconsole.h>
- #include <asm/vio.h>
- #include <asm/prom.h>
-+#include "hvc_console.h"
- 
- char hvc_driver_name[] = "hvc_console";
- 

linux-2.6-optimise-spinlock-debug.patch:
 spinlock_debug.c |    3 ---
 1 files changed, 3 deletions(-)

Index: linux-2.6-optimise-spinlock-debug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-optimise-spinlock-debug.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-optimise-spinlock-debug.patch	21 Mar 2006 22:03:57 -0000	1.2
+++ linux-2.6-optimise-spinlock-debug.patch	18 Jun 2006 04:45:04 -0000	1.3
@@ -1,42 +1,27 @@
 
 --- linux-2.6.16/lib/spinlock_debug.c~	2006-03-20 16:31:13.000000000 -0500
 +++ linux-2.6.16/lib/spinlock_debug.c	2006-03-20 16:31:24.000000000 -0500
-@@ -9,8 +9,9 @@
- #include <linux/config.h>
- #include <linux/spinlock.h>
- #include <linux/interrupt.h>
- #include <linux/delay.h>
- #include <linux/module.h>
-+#include <asm/processor.h>
- 
- int nopanic;
- static int __init nopanic_setup(char *str)
---- linux-2.6.16/lib/spinlock_debug.c~	2006-03-20 16:29:56.000000000 -0500
-+++ linux-2.6.16/lib/spinlock_debug.c	2006-03-20 16:30:52.000000000 -0500
-@@ -88,7 +88,7 @@ static void __spin_lock_debug(spinlock_t
+@@ -88,7 +88,6 @@ static void __spin_lock_debug(spinlock_t
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_spin_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {
-@@ -160,7 +160,7 @@ static void __read_lock_debug(rwlock_t *
+@@ -160,7 +160,6 @@ static void __read_lock_debug(rwlock_t *
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_read_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {
-@@ -233,7 +233,7 @@ static void __write_lock_debug(rwlock_t 
+@@ -233,7 +233,6 @@ static void __write_lock_debug(rwlock_t 
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_write_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {

linux-2.6-radeon-backlight.patch:
 radeon_base.c         |   11 +++++++
 radeon_pm.c           |   51 ++++++++++++++++++++++++++++++++
 radeon_pm_whitelist.h |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-radeon-backlight.patch	1 Mar 2006 19:15:24 -0000	1.15
+++ linux-2.6-radeon-backlight.patch	18 Jun 2006 04:45:04 -0000	1.16
@@ -1,6 +1,6 @@
 --- linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h.backlight	2006-03-01 13:22:58.000000000 -0500
 +++ linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h	2006-03-01 13:56:54.000000000 -0500
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,78 @@
 +#define E(_vendor, _product, _ident, _reporter)				\
 +{	/* _reporter */							\
 +	.ident = _ident,						\
@@ -19,6 +19,8 @@
 +E("IBM", "2366JBG", "IBM ThinkPad T30", "Thomas M Steenholdt <tmus at tmus.dk>"),
 +E("IBM", "2366MU9", "IBM ThinkPad T30", "Phillip Jones <philljones at us.ibm.com>"),
 +E("IBM", "2366QU5", "IBM ThinkPad T30", "ChazeFroy <chazefroy at gmail.com>"),
++/* brads's 2366QU8 works, but dmidecode shows bogus data */
++E("IBM", "2366QU8", "IBM ThinkPad T30", "Brad Smith <brads at redhat.com>"),
 +E("IBM", "23729CU", "IBM ThinkPad T40", "George Avrunin <avrunin at math.umass.edu>"),
 +E("IBM", "237314U", "IBM ThinkPad T40", "Dmitriy Zavin <dzavin at yahoo.com>"),
 +E("IBM", "23731FG", "IBM ThinkPad T41", "Aivo Prykk <aivo.prykk at mail.ee>"),

linux-2.6-random-patches.patch:
 char/watchdog/machzwd.c        |    3 +--
 media/dvb/ttpci/av7110.c       |    2 +-
 media/dvb/ttpci/budget-ci.c    |    2 +-
 media/dvb/ttpci/budget-patch.c |    2 +-
 media/dvb/ttpci/budget.c       |    5 +----
 5 files changed, 5 insertions(+), 9 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-random-patches.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-random-patches.patch	17 Feb 2006 07:42:45 -0000	1.3
+++ linux-2.6-random-patches.patch	18 Jun 2006 04:45:04 -0000	1.4
@@ -1,36 +1,4 @@
 
-Missing newline.
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/media/video/cpia.c~	2006-02-01 22:36:07.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/media/video/cpia.c	2006-02-01 22:36:24.000000000 -0500
-@@ -4042,7 +4042,7 @@ static int __init cpia_init(void)
- 	       "allowed, it is disabled by default now. Users should fix the "
- 	       "applications in case they don't work without conversion "
- 	       "reenabled by setting the 'colorspace_conv' module "
--	       "parameter to 1");
-+	       "parameter to 1\n");
- 
- #ifdef CONFIG_PROC_FS
- 	proc_cpia_create();
-
-Doubletalk printk's an extraneous \n
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/char/dtlk.c~	2006-02-01 22:17:38.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/char/dtlk.c	2006-02-01 22:19:16.000000000 -0500
-@@ -490,7 +490,7 @@ for (i = 0; i < 10; i++)			\
- 		release_region(dtlk_portlist[i], DTLK_IO_EXTENT);
- 	}
- 
--	printk(KERN_INFO "\nDoubleTalk PC - not found\n");
-+	printk(KERN_INFO "DoubleTalk PC - not found\n");
- 	return -ENODEV;
- }
- 
-
 --- linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c~	2006-01-31 20:22:02.000000000 -0500
 +++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c	2006-01-31 20:24:27.000000000 -0500
 @@ -2956,7 +2956,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
@@ -101,51 +69,15 @@
  		return -ENODEV;
  	}
 
-Fix printk output.
 
-sc1200wdt: build 20020303<3>sc1200wdt: io parameter must be specified
+#--- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
+#+++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
+#@@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a
+# {
+# 	if (ap->flags & ATA_FLAG_SUSPENDED) {
+# 		ap->flags &= ~ATA_FLAG_SUSPENDED;
+#+		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+# 		ata_set_mode(ap);
+# 	}
+# 	if (!ata_dev_present(dev))
 
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c~	2006-02-01 22:24:11.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c	2006-02-01 22:24:43.000000000 -0500
-@@ -377,7 +377,7 @@ static int __init sc1200wdt_init(void)
- {
- 	int ret;
- 
--	printk(banner);
-+	printk("%s\n", banner);
- 
- 	spin_lock_init(&sc1200wdt_lock);
- 	sema_init(&open_sem, 1);
-
-Before:
-
-swsusp: Saving Highmem
-................................<7>swsusp: critical section:
-swsusp: Need to copy 60938 pages
-
-After:
-swsusp: Saving Highmem................................
-swsusp: critical section:
-swsusp: Need to copy 60938 pages
-
---- linux-2.6.15/kernel/power/snapshot.c~	2006-01-17 01:19:43.000000000 -0500
-+++ linux-2.6.15/kernel/power/snapshot.c	2006-01-17 01:21:46.000000000 -0500
-@@ -113,6 +113,7 @@ static int save_highmem_zone(struct zone
- 		kunmap_atomic(kaddr, KM_USER0);
- 		highmem_copy = save;
- 	}
-+	printk("\n");
- 	return 0;
- }
- 
-@@ -121,7 +122,7 @@ int save_highmem(void)
- 	struct zone *zone;
- 	int res = 0;
- 
--	pr_debug("swsusp: Saving Highmem\n");
-+	pr_debug("swsusp: Saving Highmem");
- 	for_each_zone (zone) {
- 		if (is_highmem(zone))
- 			res = save_highmem_zone(zone);

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/libata-core.c  |    1 
 drivers/scsi/sata_promise.c |   52 ++++++++++++++++++++++++++++++++++++++------
 include/linux/libata.h      |    1 
 3 files changed, 48 insertions(+), 6 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sata-promise-pata-ports.patch	2 Mar 2006 04:47:18 -0000	1.1
+++ linux-2.6-sata-promise-pata-ports.patch	18 Jun 2006 04:45:04 -0000	1.2
@@ -22,7 +22,7 @@
 diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
 --- a/drivers/scsi/sata_promise.c	2006-02-08 10:08:08.000000000 -0700
 +++ b/drivers/scsi/sata_promise.c	2006-02-08 11:26:47.000000000 -0700
-@@ -165,7 +165,7 @@
+@@ -172,7 +172,7 @@
  	/* board_2037x */
  	{
  		.sht		= &pdc_ata_sht,
@@ -31,7 +31,7 @@
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
  		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
-@@ -322,15 +322,34 @@
+@@ -360,15 +360,34 @@
  
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {
@@ -70,7 +70,7 @@
  
  	pdc_reset_port(ap);
  	ata_port_probe(ap);
-@@ -646,6 +665,7 @@
+@@ -673,6 +692,7 @@
  	unsigned int board_idx = (unsigned int) ent->driver_data;
  	int pci_dev_busy = 0;
  	int rc;
@@ -78,7 +78,7 @@
  
  	if (!printed_version++)
  		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
-@@ -705,6 +725,9 @@
+@@ -741,6 +761,9 @@
  	probe_ent->port[0].scr_addr = base + 0x400;
  	probe_ent->port[1].scr_addr = base + 0x500;
  
@@ -88,7 +88,7 @@
  	/* notice 4-port boards */
  	switch (board_idx) {
  	case board_20319:
-@@ -715,9 +738,23 @@
+@@ -755,13 +778,27 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -96,6 +96,10 @@
 +		probe_ent->port_flags[2] = ATA_FLAG_SATA;	/* pata fix */
 +		probe_ent->port_flags[3] = ATA_FLAG_SATA;	/* pata fix */
  		break;
+	case board_2057x:
+		/* Override hotplug offset for SATAII150 */
+		hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
+		/* Fall through */
  	case board_2037x:
 -		probe_ent->n_ports = 2;
 +/*		probe_ent->n_ports = 2; */			/* pata fix */
@@ -113,7 +117,7 @@
  		break;
  	case board_20771:
  		probe_ent->n_ports = 2;
-@@ -730,6 +767,9 @@
+@@ -774,6 +811,9 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -126,11 +130,12 @@
 diff -Nru a/include/linux/libata.h b/include/linux/libata.h
 --- a/include/linux/libata.h	2006-02-08 11:40:54.000000000 -0700
 +++ b/include/linux/libata.h	2006-02-08 11:45:02.000000000 -0700
-@@ -237,6 +237,7 @@
+@@ -281,6 +281,7 @@
  	unsigned long		irq;
  	unsigned int		irq_flags;
  	unsigned long		host_flags;
 +	unsigned long		port_flags[ATA_MAX_PORTS];	/* pata fix */
+	unsigned long		host_set_flags;
  	void __iomem		*mmio_base;
  	void			*private_data;
  };

linux-2.6-sched-up-migration-cost.patch:
 sched.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Index: linux-2.6-sched-up-migration-cost.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-sched-up-migration-cost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sched-up-migration-cost.patch	12 Feb 2006 23:59:49 -0000	1.1
+++ linux-2.6-sched-up-migration-cost.patch	18 Jun 2006 04:45:04 -0000	1.2
@@ -1,12 +1,24 @@
---- linux-2.6/kernel/sched.c~	2006-02-10 17:15:29.000000000 -0500
-+++ linux-2.6/kernel/sched.c	2006-02-10 17:18:19.000000000 -0500
-@@ -5459,7 +5459,8 @@ static void calibrate_migration_costs(co
+--- linux-2.6.16.noarch/kernel/sched.c~	2006-04-24 19:30:13.000000000 -0400
++++ linux-2.6.16.noarch/kernel/sched.c	2006-04-24 19:32:49.000000000 -0400
+@@ -5518,13 +5518,15 @@ static void calibrate_migration_costs(co
  #endif
  		);
  	if (system_state == SYSTEM_BOOTING) {
 -		printk("migration_cost=");
-+		if (num_online_cpus() > 1)
+-		for (distance = 0; distance <= max_distance; distance++) {
+-			if (distance)
+-				printk(",");
+-			printk("%ld", (long)migration_cost[distance] / 1000);
++		if (num_online_cpus() > 1) {
 +			printk("migration_cost=");
- 		for (distance = 0; distance <= max_distance; distance++) {
- 			if (distance)
- 				printk(",");
++			for (distance = 0; distance <= max_distance; distance++) {
++				if (distance)
++					printk(",");
++				printk("%ld", (long)migration_cost[distance] / 1000);
++			}
++			printk("\n");
+ 		}
+-		printk("\n");
+ 	}
+ 	j1 = jiffies;
+ 	if (migration_debug)

linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    3 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12697 insertions(+), 32 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-tux.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-tux.patch	13 Mar 2006 22:17:56 -0000	1.12
+++ linux-2.6-tux.patch	18 Jun 2006 04:45:04 -0000	1.13
@@ -1,8 +1,7 @@
-
-Index: linux/arch/alpha/kernel/systbls.S
+Index: linux-tux.q/arch/alpha/kernel/systbls.S
 ===================================================================
---- linux.orig/arch/alpha/kernel/systbls.S
-+++ linux/arch/alpha/kernel/systbls.S
+--- linux-tux.q.orig/arch/alpha/kernel/systbls.S
++++ linux-tux.q/arch/alpha/kernel/systbls.S
 @@ -240,7 +240,15 @@ sys_call_table:
  	.quad alpha_ni_syscall
  	.quad alpha_ni_syscall			/* 220 */
@@ -19,10 +18,10 @@
  	.quad alpha_ni_syscall
  	.quad alpha_ni_syscall
  	.quad alpha_ni_syscall			/* 225 */
-Index: linux/arch/i386/kernel/syscall_table.S
+Index: linux-tux.q/arch/i386/kernel/syscall_table.S
 ===================================================================
---- linux.orig/arch/i386/kernel/syscall_table.S
-+++ linux/arch/i386/kernel/syscall_table.S
+--- linux-tux.q.orig/arch/i386/kernel/syscall_table.S
++++ linux-tux.q/arch/i386/kernel/syscall_table.S
 @@ -221,7 +221,15 @@ ENTRY(sys_call_table)
  	.long sys_madvise
  	.long sys_getdents64	/* 220 */
@@ -40,11 +39,11 @@
  	.long sys_ni_syscall
  	.long sys_gettid
  	.long sys_readahead	/* 225 */
-Index: linux/arch/ia64/kernel/entry.S
+Index: linux-tux.q/arch/ia64/kernel/entry.S
 ===================================================================
---- linux.orig/arch/ia64/kernel/entry.S
-+++ linux/arch/ia64/kernel/entry.S
-@@ -1440,7 +1440,15 @@ sys_call_table:
+--- linux-tux.q.orig/arch/ia64/kernel/entry.S
++++ linux-tux.q/arch/ia64/kernel/entry.S
+@@ -1442,7 +1442,15 @@ sys_call_table:
  	data8 sys_syslog
  	data8 sys_setitimer
  	data8 sys_getitimer
@@ -60,11 +59,11 @@
  	data8 sys_ni_syscall					/* was: ia64_oldlstat */
  	data8 sys_ni_syscall					/* was: ia64_oldfstat */
  	data8 sys_vhangup
-Index: linux/arch/ia64/kernel/ia64_ksyms.c
+Index: linux-tux.q/arch/ia64/kernel/ia64_ksyms.c
 ===================================================================
---- linux.orig/arch/ia64/kernel/ia64_ksyms.c
-+++ linux/arch/ia64/kernel/ia64_ksyms.c
-@@ -59,6 +59,11 @@ EXPORT_SYMBOL(__strlen_user);
+--- linux-tux.q.orig/arch/ia64/kernel/ia64_ksyms.c
++++ linux-tux.q/arch/ia64/kernel/ia64_ksyms.c
+@@ -44,6 +44,11 @@ EXPORT_SYMBOL(__strlen_user);
  EXPORT_SYMBOL(__strncpy_from_user);
  EXPORT_SYMBOL(__strnlen_user);
  
@@ -76,11 +75,11 @@
  /* from arch/ia64/lib */
  extern void __divsi3(void);
  extern void __udivsi3(void);
-Index: linux/arch/x86_64/ia32/ia32entry.S
+Index: linux-tux.q/arch/x86_64/ia32/ia32entry.S
 ===================================================================
---- linux.orig/arch/x86_64/ia32/ia32entry.S
-+++ linux/arch/x86_64/ia32/ia32entry.S
-@@ -571,7 +571,15 @@ ia32_sys_call_table:
+--- linux-tux.q.orig/arch/x86_64/ia32/ia32entry.S
++++ linux-tux.q/arch/x86_64/ia32/ia32entry.S
+@@ -599,7 +599,15 @@ ia32_sys_call_table:
  	.quad sys_madvise
  	.quad compat_sys_getdents64	/* 220 getdents64 */
  	.quad compat_sys_fcntl64	
@@ -97,10 +96,10 @@
  	.quad quiet_ni_syscall    	/* security */
  	.quad sys_gettid	
  	.quad sys_readahead	/* 225 */
-Index: linux/fs/dcache.c
+Index: linux-tux.q/fs/dcache.c
 ===================================================================
---- linux.orig/fs/dcache.c
-+++ linux/fs/dcache.c
+--- linux-tux.q.orig/fs/dcache.c
++++ linux-tux.q/fs/dcache.c
 @@ -86,6 +86,10 @@ static void d_free(struct dentry *dentry
  {
  	if (dentry->d_op && dentry->d_op->d_release)
@@ -118,9 +117,9 @@
  	dentry->d_fsdata = NULL;
 +	dentry->d_extra_attributes = NULL;
  	dentry->d_mounted = 0;
+ #ifdef CONFIG_PROFILING
  	dentry->d_cookie = NULL;
- 	INIT_HLIST_NODE(&dentry->d_hash);
-@@ -1310,6 +1315,16 @@ already_unhashed:
+@@ -1317,6 +1322,16 @@ already_unhashed:
  	/* Unhash the target: dput() will then get rid of it */
  	__d_drop(target);
  
@@ -137,7 +136,7 @@
  	list_del(&dentry->d_u.d_child);
  	list_del(&target->d_u.d_child);
  
-@@ -1353,7 +1368,7 @@ already_unhashed:
+@@ -1360,7 +1375,7 @@ already_unhashed:
   *
   * "buflen" should be positive. Caller holds the dcache_lock.
   */
@@ -146,7 +145,7 @@
  			struct dentry *root, struct vfsmount *rootmnt,
  			char *buffer, int buflen)
  {
-@@ -1421,6 +1436,8 @@ Elong:
+@@ -1428,6 +1443,8 @@ Elong:
  	return ERR_PTR(-ENAMETOOLONG);
  }
  
@@ -155,7 +154,7 @@
  /* write full pathname into buffer and return start of pathname */
  char * d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
  				char *buf, int buflen)
-@@ -1663,6 +1680,23 @@ static void __init dcache_init_early(voi
+@@ -1670,6 +1687,23 @@ static void __init dcache_init_early(voi
  		INIT_HLIST_HEAD(&dentry_hashtable[loop]);
  }
  
@@ -179,11 +178,11 @@
  static void __init dcache_init(unsigned long mempages)
  {
  	int loop;
-Index: linux/fs/exec.c
+Index: linux-tux.q/fs/exec.c
 ===================================================================
---- linux.orig/fs/exec.c
-+++ linux/fs/exec.c
-@@ -1440,6 +1440,8 @@ int do_coredump(long signr, int exit_cod
+--- linux-tux.q.orig/fs/exec.c
++++ linux-tux.q/fs/exec.c
+@@ -1446,6 +1446,8 @@ int do_coredump(long signr, int exit_cod
  	binfmt = current->binfmt;
  	if (!binfmt || !binfmt->core_dump)
  		goto fail;
@@ -192,11 +191,11 @@
  	down_write(&mm->mmap_sem);
  	if (!mm->dumpable) {
  		up_write(&mm->mmap_sem);
-Index: linux/fs/fcntl.c
+Index: linux-tux.q/fs/fcntl.c
 ===================================================================
---- linux.orig/fs/fcntl.c
-+++ linux/fs/fcntl.c
-@@ -111,7 +111,7 @@ out:
+--- linux-tux.q.orig/fs/fcntl.c
++++ linux-tux.q/fs/fcntl.c
+@@ -112,7 +112,7 @@ out:
  	return error;
  }
  
@@ -205,7 +204,7 @@
  {
  	struct files_struct * files = current->files;
  	struct fdtable *fdt;
-@@ -134,6 +134,8 @@ static int dupfd(struct file *file, unsi
+@@ -135,6 +135,8 @@ static int dupfd(struct file *file, unsi
  	return fd;
  }
  
@@ -214,11 +213,11 @@
  asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
  {
  	int err = -EBADF;
-Index: linux/fs/namei.c
+Index: linux-tux.q/fs/namei.c
 ===================================================================
---- linux.orig/fs/namei.c
-+++ linux/fs/namei.c
-@@ -732,7 +732,7 @@ static inline void follow_dotdot(struct 
+--- linux-tux.q.orig/fs/namei.c
++++ linux-tux.q/fs/namei.c
+@@ -735,7 +735,7 @@ static __always_inline void follow_dotdo
   *  It _is_ time-critical.
   */
  static int do_lookup(struct nameidata *nd, struct qstr *name,
@@ -227,7 +226,7 @@
  {
  	struct vfsmount *mnt = nd->mnt;
  	struct dentry *dentry = __d_lookup(nd->dentry, name);
-@@ -748,12 +748,16 @@ done:
+@@ -751,12 +751,16 @@ done:
  	return 0;
  
  need_lookup:
@@ -244,7 +243,7 @@
  	if (dentry->d_op->d_revalidate(dentry, nd))
  		goto done;
  	if (d_invalidate(dentry))
-@@ -777,9 +781,11 @@ static fastcall int __link_path_walk(con
+@@ -780,9 +784,11 @@ static fastcall int __link_path_walk(con
  {
  	struct path next;
  	struct inode *inode;
@@ -258,7 +257,7 @@
  	while (*name=='/')
  		name++;
  	if (!*name)
-@@ -848,7 +854,7 @@ static fastcall int __link_path_walk(con
+@@ -851,7 +857,7 @@ static fastcall int __link_path_walk(con
  				break;
  		}
  		/* This does the actual lookups.. */
@@ -267,7 +266,7 @@
  		if (err)
  			break;
  
-@@ -902,7 +908,7 @@ last_component:
+@@ -906,7 +912,7 @@ last_component:
  			if (err < 0)
  				break;
  		}
@@ -276,7 +275,7 @@
  		if (err)
  			break;
  		inode = next.dentry->d_inode;
-@@ -1354,6 +1360,8 @@ static inline int lookup_flags(unsigned 
+@@ -1406,6 +1412,8 @@ static inline int lookup_flags(unsigned 
  	
  	if (f & O_DIRECTORY)
  		retval |= LOOKUP_DIRECTORY;
@@ -285,11 +284,11 @@
  
  	return retval;
  }
-Index: linux/fs/namespace.c
+Index: linux-tux.q/fs/namespace.c
 ===================================================================
---- linux.orig/fs/namespace.c
-+++ linux/fs/namespace.c
-@@ -1465,6 +1465,8 @@ void set_fs_root(struct fs_struct *fs, s
+--- linux-tux.q.orig/fs/namespace.c
++++ linux-tux.q/fs/namespace.c
+@@ -1491,6 +1491,8 @@ void set_fs_root(struct fs_struct *fs, s
  	}
  }
  
@@ -298,11 +297,11 @@
  /*
   * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.
   * It can block. Requires the big lock held.
-Index: linux/fs/open.c
+Index: linux-tux.q/fs/open.c
 ===================================================================
---- linux.orig/fs/open.c
-+++ linux/fs/open.c
-@@ -543,6 +543,8 @@ out:
+--- linux-tux.q.orig/fs/open.c
++++ linux-tux.q/fs/open.c
+@@ -555,6 +555,8 @@ out:
  	return error;
  }
  
@@ -311,7 +310,7 @@
  asmlinkage long sys_fchdir(unsigned int fd)
  {
  	struct file *file;
-@@ -599,6 +601,8 @@ out:
+@@ -611,6 +613,8 @@ out:
  	return error;
  }
  
@@ -320,10 +319,10 @@
  asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
  {
  	struct inode * inode;
-Index: linux/fs/pipe.c
+Index: linux-tux.q/fs/pipe.c
 ===================================================================
---- linux.orig/fs/pipe.c
-+++ linux/fs/pipe.c
+--- linux-tux.q.orig/fs/pipe.c
++++ linux-tux.q/fs/pipe.c
 @@ -798,6 +798,8 @@ no_files:
  	return error;	
  }
@@ -333,10 +332,10 @@
  /*
   * pipefs should _never_ be mounted by userland - too much of security hassle,
   * no real gain from having the whole whorehouse mounted. So we don't need
-Index: linux/fs/read_write.c
+Index: linux-tux.q/fs/read_write.c
 ===================================================================
---- linux.orig/fs/read_write.c
-+++ linux/fs/read_write.c
+--- linux-tux.q.orig/fs/read_write.c
++++ linux-tux.q/fs/read_write.c
 @@ -374,6 +374,8 @@ asmlinkage ssize_t sys_write(unsigned in
  	return ret;
  }
@@ -346,10 +345,10 @@
  asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf,
  			     size_t count, loff_t pos)
  {
-Index: linux/include/asm-alpha/fcntl.h
+Index: linux-tux.q/include/asm-alpha/fcntl.h
 ===================================================================
---- linux.orig/include/asm-alpha/fcntl.h
-+++ linux/include/asm-alpha/fcntl.h
+--- linux-tux.q.orig/include/asm-alpha/fcntl.h
++++ linux-tux.q/include/asm-alpha/fcntl.h
 @@ -14,6 +14,7 @@
  #define O_DIRECTORY	0100000	/* must be a directory */
  #define O_NOFOLLOW	0200000 /* don't follow links */
@@ -358,10 +357,10 @@
  #define O_DIRECT	02000000 /* direct disk access - should check with OSF/1 */
  #define O_NOATIME	04000000
  
-Index: linux/include/asm-generic/fcntl.h
+Index: linux-tux.q/include/asm-generic/fcntl.h
 ===================================================================
---- linux.orig/include/asm-generic/fcntl.h
-+++ linux/include/asm-generic/fcntl.h
+--- linux-tux.q.orig/include/asm-generic/fcntl.h
++++ linux-tux.q/include/asm-generic/fcntl.h
 @@ -49,6 +49,10 @@
  #ifndef O_NOATIME
  #define O_NOATIME	01000000
@@ -373,19 +372,19 @@
  #ifndef O_NDELAY
  #define O_NDELAY	O_NONBLOCK
  #endif
-Index: linux/include/asm-i386/unistd.h
+Index: linux-tux.q/include/asm-i386/unistd.h
 ===================================================================
---- linux.orig/include/asm-i386/unistd.h
-+++ linux/include/asm-i386/unistd.h
-@@ -303,6 +303,7 @@
+--- linux-tux.q.orig/include/asm-i386/unistd.h
++++ linux-tux.q/include/asm-i386/unistd.h
+@@ -319,6 +319,7 @@
  
- #define NR_syscalls 295
+ #define NR_syscalls 311
  
 +#ifndef __KERNEL_SYSCALLS_NO_ERRNO__
  /*
   * user-visible error numbers are in the range -1 - -128: see
   * <asm-i386/errno.h>
-@@ -316,6 +317,10 @@ do { \
+@@ -332,6 +333,10 @@ do { \
  	return (type) (res); \
  } while (0)
  
@@ -396,10 +395,10 @@
  /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
  #define _syscall0(type,name) \
  type name(void) \
-Index: linux/include/asm-ia64/unistd.h
+Index: linux-tux.q/include/asm-ia64/unistd.h
 ===================================================================
---- linux.orig/include/asm-ia64/unistd.h
-+++ linux/include/asm-ia64/unistd.h
+--- linux-tux.q.orig/include/asm-ia64/unistd.h
++++ linux-tux.q/include/asm-ia64/unistd.h
 @@ -109,7 +109,7 @@
  #define __NR_syslog			1117
  #define __NR_setitimer			1118
@@ -409,10 +408,10 @@
  /* 1121 was __NR_old_lstat */
  /* 1122 was __NR_old_fstat */
  #define __NR_vhangup			1123
-Index: linux/include/asm-sparc/fcntl.h
+Index: linux-tux.q/include/asm-sparc/fcntl.h
 ===================================================================
---- linux.orig/include/asm-sparc/fcntl.h
-+++ linux/include/asm-sparc/fcntl.h
+--- linux-tux.q.orig/include/asm-sparc/fcntl.h
++++ linux-tux.q/include/asm-sparc/fcntl.h
 @@ -14,6 +14,7 @@
  #define O_NDELAY	(0x0004 | O_NONBLOCK)
  #define O_NOCTTY	0x8000	/* not fcntl */
@@ -421,10 +420,10 @@
  #define O_DIRECT        0x100000 /* direct disk access hint */
  #define O_NOATIME	0x200000
  
-Index: linux/include/asm-sparc64/fcntl.h
+Index: linux-tux.q/include/asm-sparc64/fcntl.h
 ===================================================================
---- linux.orig/include/asm-sparc64/fcntl.h
-+++ linux/include/asm-sparc64/fcntl.h
+--- linux-tux.q.orig/include/asm-sparc64/fcntl.h
++++ linux-tux.q/include/asm-sparc64/fcntl.h
 @@ -14,6 +14,7 @@
  #define O_NONBLOCK	0x4000
  #define O_NOCTTY	0x8000	/* not fcntl */
@@ -433,10 +432,10 @@
  #define O_DIRECT        0x100000 /* direct disk access hint */
  #define O_NOATIME	0x200000
  
-Index: linux/include/asm-x86_64/unistd.h
+Index: linux-tux.q/include/asm-x86_64/unistd.h
 ===================================================================
---- linux.orig/include/asm-x86_64/unistd.h
-+++ linux/include/asm-x86_64/unistd.h
+--- linux-tux.q.orig/include/asm-x86_64/unistd.h
++++ linux-tux.q/include/asm-x86_64/unistd.h
 @@ -425,7 +425,15 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall)
  __SYSCALL(__NR_afs_syscall, sys_ni_syscall)
  
@@ -454,22 +453,20 @@
  
  #define __NR_security			185
  __SYSCALL(__NR_security, sys_ni_syscall)
-Index: linux/include/linux/buffer_head.h
-===================================================================
---- linux.orig/include/linux/buffer_head.h
-+++ linux/include/linux/buffer_head.h
-@@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in
+--- linux-2.6.16.noarch/include/linux/buffer_head.h~	2006-03-27 13:32:25.000000000 -0500
++++ linux-2.6.16.noarch/include/linux/buffer_head.h	2006-03-27 13:32:30.000000000 -0500
+@@ -204,6 +204,7 @@ int generic_cont_expand(struct inode *in
  int generic_cont_expand_simple(struct inode *inode, loff_t size);
  int block_commit_write(struct page *page, unsigned from, unsigned to);
- int block_sync_page(struct page *);
+ void block_sync_page(struct page *);
 +void flush_inode_pages (struct inode * inode);
  sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
  int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
  int block_truncate_page(struct address_space *, loff_t, get_block_t *);
-Index: linux/include/linux/dcache.h
+Index: linux-tux.q/include/linux/dcache.h
 ===================================================================
---- linux.orig/include/linux/dcache.h
-+++ linux/include/linux/dcache.h
+--- linux-tux.q.orig/include/linux/dcache.h
++++ linux-tux.q/include/linux/dcache.h
 @@ -107,6 +107,7 @@ struct dentry {
  	struct dentry_operations *d_op;
  	struct super_block *d_sb;	/* The root of the dentry tree */
@@ -478,7 +475,7 @@
  #ifdef CONFIG_PROFILING
  	struct dcookie_struct *d_cookie; /* cookie, if any */
  #endif
-@@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe
+@@ -217,6 +218,7 @@ extern void shrink_dcache_sb(struct supe
  extern void shrink_dcache_parent(struct dentry *);
  extern void shrink_dcache_anon(struct hlist_head *);
  extern int d_invalidate(struct dentry *);
@@ -486,7 +483,7 @@
  
  /* only used at mount-time */
  extern struct dentry * d_alloc_root(struct inode *);
-@@ -276,8 +278,12 @@ extern struct dentry * __d_lookup(struct
+@@ -277,8 +279,12 @@ extern struct dentry * __d_lookup(struct
  /* validate "insecure" dentry pointer */
  extern int d_validate(struct dentry *, struct dentry *);
  
@@ -500,10 +497,10 @@
  /* Allocation counts.. */
  
  /**
-Index: linux/include/linux/errno.h
+Index: linux-tux.q/include/linux/errno.h
 ===================================================================
---- linux.orig/include/linux/errno.h
-+++ linux/include/linux/errno.h
+--- linux-tux.q.orig/include/linux/errno.h
++++ linux-tux.q/include/linux/errno.h
 @@ -24,6 +24,9 @@
  #define EIOCBQUEUED	529	/* iocb queued, will get completion event */
  #define EIOCBRETRY	530	/* iocb queued, will trigger a retry */
@@ -514,31 +511,31 @@
  #endif
  
  #endif
-Index: linux/include/linux/file.h
+Index: linux-tux.q/include/linux/file.h
 ===================================================================
---- linux.orig/include/linux/file.h
-+++ linux/include/linux/file.h
-@@ -95,4 +95,6 @@ struct task_struct;
+--- linux-tux.q.orig/include/linux/file.h
++++ linux-tux.q/include/linux/file.h
+@@ -93,4 +93,6 @@ struct task_struct;
  struct files_struct *get_files_struct(struct task_struct *);
  void FASTCALL(put_files_struct(struct files_struct *fs));
  
 +extern int dupfd(struct file *file, unsigned int start);
 +
  #endif /* __LINUX_FILE_H */
-Index: linux/include/linux/fs.h
+Index: linux-tux.q/include/linux/fs.h
 ===================================================================
---- linux.orig/include/linux/fs.h
-+++ linux/include/linux/fs.h
-@@ -1570,7 +1570,7 @@ ssize_t generic_file_write_nolock(struct
+--- linux-tux.q.orig/include/linux/fs.h
++++ linux-tux.q/include/linux/fs.h
+@@ -1610,7 +1610,7 @@ ssize_t generic_file_write_nolock(struct
  extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
  extern void do_generic_mapping_read(struct address_space *mapping,
  				    struct file_ra_state *, struct file *,
 -				    loff_t *, read_descriptor_t *, read_actor_t);
 +				    loff_t *, read_descriptor_t *, read_actor_t, int);
- extern void
- file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
- extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
-@@ -1602,14 +1602,15 @@ static inline int xip_truncate_page(stru
+ 
+ /* fs/splice.c */
+ extern ssize_t generic_file_splice_read(struct file *, loff_t *,
+@@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru
  
  static inline void do_generic_file_read(struct file * filp, loff_t *ppos,
  					read_descriptor_t * desc,
@@ -556,10 +553,10 @@
  }
  
  ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
-Index: linux/include/linux/kmod.h
+Index: linux-tux.q/include/linux/kmod.h
 ===================================================================
---- linux.orig/include/linux/kmod.h
-+++ linux/include/linux/kmod.h
+--- linux-tux.q.orig/include/linux/kmod.h
++++ linux-tux.q/include/linux/kmod.h
 @@ -47,5 +47,7 @@ call_usermodehelper(char *path, char **a
  }
  
@@ -568,10 +565,10 @@
 +				 struct key *ring);
  
  #endif /* __LINUX_KMOD_H__ */
-Index: linux/include/linux/namei.h
+Index: linux-tux.q/include/linux/namei.h
 ===================================================================
---- linux.orig/include/linux/namei.h
-+++ linux/include/linux/namei.h
+--- linux-tux.q.orig/include/linux/namei.h
++++ linux-tux.q/include/linux/namei.h
 @@ -48,6 +48,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
  #define LOOKUP_PARENT		16
  #define LOOKUP_NOALT		32
@@ -581,10 +578,10 @@
  /*
   * Intent data
   */
-Index: linux/include/linux/net.h
+Index: linux-tux.q/include/linux/net.h
 ===================================================================
---- linux.orig/include/linux/net.h
-+++ linux/include/linux/net.h
+--- linux-tux.q.orig/include/linux/net.h
++++ linux-tux.q/include/linux/net.h
 @@ -183,6 +183,7 @@ extern int	     sock_create_kern(int fam
  				      struct socket **res);
  extern int	     sock_create_lite(int family, int type, int proto,
@@ -593,11 +590,11 @@
  extern void	     sock_release(struct socket *sock);
  extern int   	     sock_sendmsg(struct socket *sock, struct msghdr *msg,
  				  size_t len);
-Index: linux/include/linux/sched.h
+Index: linux-tux.q/include/linux/sched.h
 ===================================================================
---- linux.orig/include/linux/sched.h
-+++ linux/include/linux/sched.h
-@@ -804,6 +804,11 @@ struct task_struct {
+--- linux-tux.q.orig/include/linux/sched.h
++++ linux-tux.q/include/linux/sched.h
+@@ -815,6 +815,11 @@ struct task_struct {
  	int (*notifier)(void *priv);
  	void *notifier_data;
  	sigset_t *notifier_mask;
@@ -609,10 +606,10 @@
  	
  	void *security;
  	struct audit_context *audit_context;
-Index: linux/include/linux/skbuff.h
+Index: linux-tux.q/include/linux/skbuff.h
 ===================================================================
---- linux.orig/include/linux/skbuff.h
-+++ linux/include/linux/skbuff.h
+--- linux-tux.q.orig/include/linux/skbuff.h
++++ linux-tux.q/include/linux/skbuff.h
 @@ -1328,6 +1328,8 @@ static inline unsigned int skb_checksum_
  		__skb_checksum_complete(skb);
  }
@@ -622,35 +619,32 @@
  #ifdef CONFIG_NETFILTER
  static inline void nf_conntrack_put(struct nf_conntrack *nfct)
  {
-Index: linux/include/linux/socket.h
+Index: linux-tux.q/include/linux/socket.h
 ===================================================================
---- linux.orig/include/linux/socket.h
-+++ linux/include/linux/socket.h
-@@ -298,6 +298,11 @@ extern int move_addr_to_user(void *kaddr
+--- linux-tux.q.orig/include/linux/socket.h
++++ linux-tux.q/include/linux/socket.h
+@@ -301,6 +301,10 @@ extern int move_addr_to_user(void *kaddr
  extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr);
  extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
  
 +struct socket;
-+struct file * sock_map_file(struct socket *sock);
 +extern int sock_map_fd(struct socket *sock);
 +extern struct socket *sockfd_lookup(int fd, int *err);
 +
  #endif
  #endif /* not kernel and not glibc */
  #endif /* _LINUX_SOCKET_H */
-Index: linux/include/linux/sysctl.h
-===================================================================
---- linux.orig/include/linux/sysctl.h
-+++ linux/include/linux/sysctl.h
-@@ -207,6 +207,7 @@ enum
- 	NET_SCTP=17,
+--- linux-2.6.16.noarch/include/linux/sysctl.h~	2006-03-21 15:04:07.000000000 -0500
++++ linux-2.6.16.noarch/include/linux/sysctl.h	2006-03-21 15:04:27.000000000 -0500
+@@ -215,6 +215,7 @@ enum
  	NET_LLC=18,
  	NET_NETFILTER=19,
-+	NET_TUX=20,
+ 	NET_DCCP=20,
++	NET_TUX=21,
  };
  
  /* /proc/sys/kernel/random */
-@@ -731,6 +732,55 @@ enum {
+@@ -735,6 +736,55 @@ enum {
  	NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
  };
  
@@ -706,10 +700,10 @@
  /* CTL_PROC names: */
  
  /* CTL_FS names: */
-Index: linux/include/net/sock.h
+Index: linux-tux.q/include/net/sock.h
 ===================================================================
---- linux.orig/include/net/sock.h
-+++ linux/include/net/sock.h
+--- linux-tux.q.orig/include/net/sock.h
++++ linux-tux.q/include/net/sock.h
 @@ -62,7 +62,7 @@
   */
  
@@ -753,10 +747,10 @@
  					  const gfp_t priority);
  
  extern struct sk_buff		*sock_wmalloc(struct sock *sk,
-Index: linux/include/net/tcp.h
+Index: linux-tux.q/include/net/tcp.h
 ===================================================================
---- linux.orig/include/net/tcp.h
-+++ linux/include/net/tcp.h
+--- linux-tux.q.orig/include/net/tcp.h
++++ linux-tux.q/include/net/tcp.h
 @@ -263,6 +263,8 @@ extern void			tcp_shutdown (struct sock 
  
  extern int			tcp_v4_rcv(struct sk_buff *skb);
@@ -774,10 +768,10 @@
  
  /* tcp_input.c */
  extern void tcp_cwnd_application_limited(struct sock *sk);
-Index: linux/include/net/tux.h
+Index: linux-tux.q/include/net/tux.h
 ===================================================================
 --- /dev/null
-+++ linux/include/net/tux.h
++++ linux-tux.q/include/net/tux.h
 @@ -0,0 +1,804 @@
 +#ifndef _NET_TUX_H
 +#define _NET_TUX_H
@@ -1583,10 +1577,10 @@
 +extern void free_tux_request_slabs(void);
 +
 +#endif
-Index: linux/include/net/tux_u.h
+Index: linux-tux.q/include/net/tux_u.h
 ===================================================================
 --- /dev/null
-+++ linux/include/net/tux_u.h
++++ linux-tux.q/include/net/tux_u.h
 @@ -0,0 +1,163 @@
 +#ifndef _NET_TUX_U_H
 +#define _NET_TUX_U_H
@@ -1751,12 +1745,12 @@
 +} ftp_command_t;
 +
 +#endif
-Index: linux/kernel/exit.c
+Index: linux-tux.q/kernel/exit.c
 ===================================================================
---- linux.orig/kernel/exit.c
-+++ linux/kernel/exit.c
-@@ -844,6 +844,13 @@ fastcall NORET_TYPE void do_exit(long co
-  		del_timer_sync(&tsk->signal->real_timer);
+--- linux-tux.q.orig/kernel/exit.c
++++ linux-tux.q/kernel/exit.c
+@@ -851,6 +851,13 @@ fastcall NORET_TYPE void do_exit(long co
+  		hrtimer_cancel(&tsk->signal->real_timer);
  		exit_itimers(tsk->signal);
  		acct_process(code);
 +		if (current->tux_info) {
@@ -1769,11 +1763,11 @@
  	}
  	exit_mm(tsk);
  
-Index: linux/kernel/fork.c
+Index: linux-tux.q/kernel/fork.c
 ===================================================================
---- linux.orig/kernel/fork.c
-+++ linux/kernel/fork.c
-@@ -901,6 +901,7 @@ static task_t *copy_process(unsigned lon
+--- linux-tux.q.orig/kernel/fork.c
++++ linux-tux.q/kernel/fork.c
+@@ -944,6 +944,7 @@ static task_t *copy_process(unsigned lon
  	p = dup_task_struct(current);
  	if (!p)
  		goto fork_out;
@@ -1781,10 +1775,10 @@
  
  	retval = -EAGAIN;
  	if (atomic_read(&p->user->processes) >=
-Index: linux/kernel/kmod.c
+Index: linux-tux.q/kernel/kmod.c
 ===================================================================
---- linux.orig/kernel/kmod.c
-+++ linux/kernel/kmod.c
+--- linux-tux.q.orig/kernel/kmod.c
++++ linux-tux.q/kernel/kmod.c
 @@ -128,14 +128,14 @@ struct subprocess_info {
  /*
   * This is the task which runs the usermode application
@@ -1835,11 +1829,11 @@
  
  	/* Exec failed? */
  	sub_info->retval = retval;
-Index: linux/kernel/signal.c
+Index: linux-tux.q/kernel/signal.c
 ===================================================================
---- linux.orig/kernel/signal.c
-+++ linux/kernel/signal.c
-@@ -440,6 +440,7 @@ flush_signal_handlers(struct task_struct
+--- linux-tux.q.orig/kernel/signal.c
++++ linux-tux.q/kernel/signal.c
+@@ -441,6 +441,7 @@ flush_signal_handlers(struct task_struct
  	}
  }
  
@@ -1847,11 +1841,11 @@
  
  /* Notify the system that a driver wants to block all signals for this
   * process, and wants to be notified if any signals at all were to be
-Index: linux/mm/filemap.c
+Index: linux-tux.q/mm/filemap.c
 ===================================================================
---- linux.orig/mm/filemap.c
-+++ linux/mm/filemap.c
-@@ -733,7 +733,8 @@ void do_generic_mapping_read(struct addr
+--- linux-tux.q.orig/mm/filemap.c
++++ linux-tux.q/mm/filemap.c
+@@ -735,7 +735,8 @@ void do_generic_mapping_read(struct addr
  			     struct file *filp,
  			     loff_t *ppos,
  			     read_descriptor_t *desc,
@@ -1861,7 +1855,7 @@
  {
  	struct inode *inode = mapping->host;
  	unsigned long index;
-@@ -783,11 +784,21 @@ void do_generic_mapping_read(struct addr
+@@ -785,11 +786,21 @@ void do_generic_mapping_read(struct addr
  find_page:
  		page = find_get_page(mapping, index);
  		if (unlikely(page == NULL)) {
@@ -1884,7 +1878,7 @@
  page_ok:
  
  		/* If users can be writing to this page using arbitrary
-@@ -1048,7 +1059,7 @@ __generic_file_aio_read(struct kiocb *io
+@@ -1050,7 +1061,7 @@ __generic_file_aio_read(struct kiocb *io
  			if (desc.count == 0)
  				continue;
  			desc.error = 0;
@@ -1893,7 +1887,7 @@
  			retval += desc.written;
  			if (desc.error) {
  				retval = retval ?: desc.error;
-@@ -1122,7 +1133,7 @@ ssize_t generic_file_sendfile(struct fil
+@@ -1124,7 +1135,7 @@ ssize_t generic_file_sendfile(struct fil
  	desc.arg.data = target;
  	desc.error = 0;
  
@@ -1902,10 +1896,10 @@
  	if (desc.written)
  		return desc.written;
  	return desc.error;
-Index: linux/mm/truncate.c
+Index: linux-tux.q/mm/truncate.c
 ===================================================================
---- linux.orig/mm/truncate.c
-+++ linux/mm/truncate.c
+--- linux-tux.q.orig/mm/truncate.c
++++ linux-tux.q/mm/truncate.c
 @@ -253,6 +253,8 @@ unlock:
  	return ret;
  }
@@ -1915,11 +1909,11 @@
  unsigned long invalidate_inode_pages(struct address_space *mapping)
  {
  	return invalidate_mapping_pages(mapping, 0, ~0UL);
-Index: linux/net/Kconfig
+Index: linux-tux.q/net/Kconfig
 ===================================================================
---- linux.orig/net/Kconfig
-+++ linux/net/Kconfig
-@@ -215,6 +215,7 @@ source "net/ax25/Kconfig"
+--- linux-tux.q.orig/net/Kconfig
++++ linux-tux.q/net/Kconfig
+@@ -223,6 +223,7 @@ source "net/ax25/Kconfig"
  source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
  source "net/ieee80211/Kconfig"
@@ -1927,10 +1921,10 @@
  
  endif   # if NET
  endmenu # Networking
-Index: linux/net/Makefile
+Index: linux-tux.q/net/Makefile
 ===================================================================
---- linux.orig/net/Makefile
-+++ linux/net/Makefile
+--- linux-tux.q.orig/net/Makefile
++++ linux-tux.q/net/Makefile
 @@ -22,6 +22,7 @@ obj-$(CONFIG_UNIX)		+= unix/
  ifneq ($(CONFIG_IPV6),)
  obj-y				+= ipv6/
@@ -1939,11 +1933,11 @@
  obj-$(CONFIG_PACKET)		+= packet/
  obj-$(CONFIG_NET_KEY)		+= key/
  obj-$(CONFIG_NET_SCHED)		+= sched/
-Index: linux/net/core/sock.c
+Index: linux-tux.q/net/core/sock.c
 ===================================================================
---- linux.orig/net/core/sock.c
-+++ linux/net/core/sock.c
-@@ -704,7 +704,7 @@ void sk_free(struct sock *sk)
+--- linux-tux.q.orig/net/core/sock.c
++++ linux-tux.q/net/core/sock.c
+@@ -705,7 +705,7 @@ void sk_free(struct sock *sk)
  	module_put(owner);
  }
  
@@ -1952,7 +1946,7 @@
  {
  	struct sock *newsk = sk_alloc(sk->sk_family, priority, sk->sk_prot, 0);
  
-@@ -741,6 +741,9 @@ struct sock *sk_clone(const struct sock 
+@@ -742,6 +742,9 @@ struct sock *sk_clone(const struct sock 
  		if (filter != NULL)
  			sk_filter_charge(newsk, filter);
  
@@ -1962,10 +1956,10 @@
  		if (unlikely(xfrm_sk_clone_policy(newsk))) {
  			/* It is still raw copy of parent, so invalidate
  			 * destructor and make plain sk_free() */
-Index: linux/net/ipv4/tcp.c
+Index: linux-tux.q/net/ipv4/tcp.c
 ===================================================================
---- linux.orig/net/ipv4/tcp.c
-+++ linux/net/ipv4/tcp.c
+--- linux-tux.q.orig/net/ipv4/tcp.c
++++ linux-tux.q/net/ipv4/tcp.c
 @@ -936,7 +936,7 @@ static int tcp_recv_urg(struct sock *sk,
   * calculation of whether or not we must ACK for the sake of
   * a window update.
@@ -1980,11 +1974,11 @@
  EXPORT_SYMBOL(tcp_shutdown);
  EXPORT_SYMBOL(tcp_statistics);
 +EXPORT_SYMBOL_GPL(cleanup_rbuf);
-Index: linux/net/ipv4/tcp_input.c
+Index: linux-tux.q/net/ipv4/tcp_input.c
 ===================================================================
---- linux.orig/net/ipv4/tcp_input.c
-+++ linux/net/ipv4/tcp_input.c
-@@ -3473,6 +3473,7 @@ static int tcp_prune_queue(struct sock *
+--- linux-tux.q.orig/net/ipv4/tcp_input.c
++++ linux-tux.q/net/ipv4/tcp_input.c
+@@ -3474,6 +3474,7 @@ static int tcp_prune_queue(struct sock *
  	return -1;
  }
  
@@ -1992,10 +1986,10 @@
  
  /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto.
   * As additional protections, we do not touch cwnd in retransmission phases,
-Index: linux/net/ipv4/tcp_output.c
+Index: linux-tux.q/net/ipv4/tcp_output.c
 ===================================================================
---- linux.orig/net/ipv4/tcp_output.c
-+++ linux/net/ipv4/tcp_output.c
+--- linux-tux.q.orig/net/ipv4/tcp_output.c
++++ linux-tux.q/net/ipv4/tcp_output.c
 @@ -791,6 +791,8 @@ unsigned int tcp_current_mss(struct sock
  	return mss_now;
  }
@@ -2005,7 +1999,7 @@
  /* Congestion window validation. (RFC2861) */
  
  static void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp)
-@@ -1156,6 +1158,7 @@ void __tcp_push_pending_frames(struct so
+@@ -1160,6 +1162,7 @@ void __tcp_push_pending_frames(struct so
  			tcp_check_probe_timer(sk, tp);
  	}
  }
@@ -2013,18 +2007,16 @@
  
  /* Send _single_ skb sitting at the send head. This function requires
   * true push pending frames to setup probe timer etc.
-Index: linux/net/socket.c
-===================================================================
---- linux.orig/net/socket.c
-+++ linux/net/socket.c
+--- linux-2.6.16.noarch/net/socket.c~	2006-03-21 15:05:05.000000000 -0500
++++ linux-2.6.16.noarch/net/socket.c	2006-03-21 15:05:17.000000000 -0500
 @@ -68,6 +68,7 @@
  #include <linux/netdevice.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
 +#include <net/tux.h>
+ #include <linux/mutex.h>
  #include <linux/wanrouter.h>
  #include <linux/if_bridge.h>
- #include <linux/if_frad.h>
 @@ -123,7 +124,7 @@ static ssize_t sock_sendpage(struct file
   *	in the operation structures but are done directly via the socketcall() multiplexor.
   */
@@ -2034,163 +2026,6 @@
  	.owner =	THIS_MODULE,
  	.llseek =	no_llseek,
  	.aio_read =	sock_aio_read,
-@@ -348,72 +349,6 @@ static struct dentry_operations sockfs_d
- 	.d_delete =	sockfs_delete_dentry,
- };
- 
--/*
-- *	Obtains the first available file descriptor and sets it up for use.
-- *
-- *	This function creates file structure and maps it to fd space
-- *	of current process. On success it returns file descriptor
-- *	and file struct implicitly stored in sock->file.
-- *	Note that another thread may close file descriptor before we return
-- *	from this function. We use the fact that now we do not refer
-- *	to socket after mapping. If one day we will need it, this
-- *	function will increment ref. count on file by 1.
-- *
-- *	In any case returned fd MAY BE not valid!
-- *	This race condition is unavoidable
-- *	with shared fd spaces, we cannot solve it inside kernel,
-- *	but we take care of internal coherence yet.
-- */
--
--int sock_map_fd(struct socket *sock)
--{
--	int fd;
--	struct qstr this;
--	char name[32];
--
--	/*
--	 *	Find a file descriptor suitable for return to the user. 
--	 */
--
--	fd = get_unused_fd();
--	if (fd >= 0) {
--		struct file *file = get_empty_filp();
--
--		if (!file) {
--			put_unused_fd(fd);
--			fd = -ENFILE;
--			goto out;
--		}
--
--		this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
--		this.name = name;
--		this.hash = SOCK_INODE(sock)->i_ino;
--
--		file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
--		if (!file->f_dentry) {
--			put_filp(file);
--			put_unused_fd(fd);
--			fd = -ENOMEM;
--			goto out;
--		}
--		file->f_dentry->d_op = &sockfs_dentry_operations;
--		d_add(file->f_dentry, SOCK_INODE(sock));
--		file->f_vfsmnt = mntget(sock_mnt);
--		file->f_mapping = file->f_dentry->d_inode->i_mapping;
--
--		sock->file = file;
--		file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
--		file->f_mode = FMODE_READ | FMODE_WRITE;
--		file->f_flags = O_RDWR;
--		file->f_pos = 0;
--		file->private_data = sock;
--		fd_install(fd, file);
--	}
--
--out:
--	return fd;
--}
--
- /**
-  *	sockfd_lookup	- 	Go from a file number to its socket slot
-  *	@fd: file handle
-@@ -457,6 +392,83 @@ struct socket *sockfd_lookup(int fd, int
- 	return sock;
- }
- 
-+struct file * sock_map_file(struct socket *sock)
-+{
-+	struct file *file;
-+	struct qstr this;
-+	char name[32];
-+
-+	file = get_empty_filp();
-+
-+	if (!file)
-+		return ERR_PTR(-ENFILE);
-+
-+	this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
-+	this.name = name;
-+	this.hash = SOCK_INODE(sock)->i_ino;
-+
-+	file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
-+	if (!file->f_dentry) {
-+		put_filp(file);
-+		return ERR_PTR(-ENOMEM);
-+	}
-+	file->f_dentry->d_op = &sockfs_dentry_operations;
-+	d_add(file->f_dentry, SOCK_INODE(sock));
-+	file->f_vfsmnt = mntget(sock_mnt);
-+	file->f_mapping = file->f_dentry->d_inode->i_mapping;
-+
-+	if (sock->file)
-+		BUG();
-+	sock->file = file;
-+	file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
-+	file->f_mode = FMODE_READ | FMODE_WRITE;
-+	file->f_flags = O_RDWR;
-+	file->f_pos = 0;
-+	file->private_data = sock;
-+
-+	return file;
-+}
-+
-+/*
-+ *	Obtains the first available file descriptor and sets it up for use.
-+ *
-+ *	This function creates file structure and maps it to fd space
-+ *	of current process. On success it returns file descriptor
-+ *	and file struct implicitly stored in sock->file.
-+ *	Note that another thread may close file descriptor before we return
-+ *	from this function. We use the fact that now we do not refer
-+ *	to socket after mapping. If one day we will need it, this
-+ *	function will increment ref. count on file by 1.
-+ *
-+ *	In any case returned fd MAY BE not valid!
-+ *	This race condition is unavoidable
-+ *	with shared fd spaces, we cannot solve it inside kernel,
-+ *	but we take care of internal coherence yet.
-+ */
-+
-+int sock_map_fd(struct socket *sock)
-+{
-+	int fd;
-+	struct file *file;
-+
-+	/*
-+	 *	Find a file descriptor suitable for return to the user.
-+	 */
-+
-+	fd = get_unused_fd();
-+	if (fd < 0)
-+		return fd;
-+
-+	file = sock_map_file(sock);
-+	if (IS_ERR(file)) {
-+		put_unused_fd(fd);
-+		return PTR_ERR(file);
-+	}
-+	fd_install(fd, file);
-+
-+	return fd;
-+}
-+
- /**
-  *	sock_alloc	-	allocate a socket
-  *	
 @@ -465,7 +477,7 @@ struct socket *sockfd_lookup(int fd, int
   *	NULL is returned.
   */
@@ -2270,10 +2105,10 @@
  #ifdef CONFIG_PROC_FS
  void socket_seq_show(struct seq_file *seq)
  {
-Index: linux/net/tux/Kconfig
+Index: linux-tux.q/net/tux/Kconfig
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/Kconfig
++++ linux-tux.q/net/tux/Kconfig
 @@ -0,0 +1,25 @@
 +
 +config TUX
@@ -2300,10 +2135,10 @@
 +
 +endmenu
 +
-Index: linux/net/tux/Makefile
+Index: linux-tux.q/net/tux/Makefile
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/Makefile
++++ linux-tux.q/net/tux/Makefile
 @@ -0,0 +1,12 @@
 +#
 +# Makefile for TUX
@@ -2317,10 +2152,10 @@
 +
 +tux-$(subst m,y,$(CONFIG_TUX_EXTCGI)) += cgi.o extcgi.o
 +
-Index: linux/net/tux/abuf.c
+Index: linux-tux.q/net/tux/abuf.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/abuf.c
++++ linux-tux.q/net/tux/abuf.c
 @@ -0,0 +1,190 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -2512,10 +2347,10 @@
 +	send_abuf(req, size, flags);
 +	add_req_to_workqueue(req);
 +}
-Index: linux/net/tux/accept.c
+Index: linux-tux.q/net/tux/accept.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/accept.c
++++ linux-tux.q/net/tux/accept.c
 @@ -0,0 +1,863 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3380,10 +3215,10 @@
 +	goto out;
 +}
 +
-Index: linux/net/tux/cachemiss.c
+Index: linux-tux.q/net/tux/cachemiss.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/cachemiss.c
++++ linux-tux.q/net/tux/cachemiss.c
 @@ -0,0 +1,265 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3650,10 +3485,10 @@
 +	return 0;
 +}
 +
-Index: linux/net/tux/cgi.c
+Index: linux-tux.q/net/tux/cgi.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/cgi.c
++++ linux-tux.q/net/tux/cgi.c
 @@ -0,0 +1,171 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3826,10 +3661,10 @@
 +	}
 +	return pid;
 +}
-Index: linux/net/tux/directory.c
+Index: linux-tux.q/net/tux/directory.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/directory.c
++++ linux-tux.q/net/tux/directory.c
 @@ -0,0 +1,302 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -4133,10 +3968,10 @@
 +	add_req_to_workqueue(req);
 +}
 +
-Index: linux/net/tux/extcgi.c
+Index: linux-tux.q/net/tux/extcgi.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/extcgi.c
++++ linux-tux.q/net/tux/extcgi.c
 @@ -0,0 +1,329 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -4467,10 +4302,10 @@
 +
 +#define EXTCGI_INVALID EXTCGI_INVALID_HEADER EXTCGI_INVALID_BODY
 +
-Index: linux/net/tux/gzip.c
+Index: linux-tux.q/net/tux/gzip.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/gzip.c
++++ linux-tux.q/net/tux/gzip.c
 @@ -0,0 +1,40 @@
 +/*	$Id$	*/
 +
@@ -4512,10 +4347,10 @@
 +	return left;
 +}
 +
-Index: linux/net/tux/input.c
+Index: linux-tux.q/net/tux/input.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/input.c
++++ linux-tux.q/net/tux/input.c
 @@ -0,0 +1,641 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -5158,10 +4993,10 @@
 +	return count;
 +}
 +
-Index: linux/net/tux/logger.c
+Index: linux-tux.q/net/tux/logger.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/logger.c
++++ linux-tux.q/net/tux/logger.c
 @@ -0,0 +1,837 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -6000,10 +5835,10 @@
 +
 +	Dprintk("logger thread stopped!\n");
 +}
-Index: linux/net/tux/main.c
+Index: linux-tux.q/net/tux/main.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/main.c
++++ linux-tux.q/net/tux/main.c
 @@ -0,0 +1,1417 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -6863,12 +6698,12 @@
 +		GOTO_ERR_no_unlock;
 +	mimetype[ret] = 0;
 +	Dprintk("got MIME type: %s.\n", mimetype);
-+        ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
-+        if (ret >= 0)
-+        	expires[ret] = 0;
++       ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
++       if (ret >= 0)
++		expires[ret] = 0;
 +	else
 +		expires[0] = 0;
-+        Dprintk("got expires header: %s.\n", expires);
++       Dprintk("got expires header: %s.\n", expires);
 +
 +	add_mimetype(extension, mimetype, expires);
 +	ret = 0;
@@ -7006,8 +6841,8 @@
 +			TUX_BUG();
 +
 +	if (!capable(CAP_SYS_ADMIN)
-+		 	&& (action != TUX_ACTION_CONTINUE_REQ) &&
-+		 		(action != TUX_ACTION_STOPTHREAD))
++			&& (action != TUX_ACTION_CONTINUE_REQ) &&
++				(action != TUX_ACTION_STOPTHREAD))
 +		goto userspace_actions;
 +
 +	switch (action) {
@@ -7422,10 +7257,10 @@
 +
 +MODULE_LICENSE("GPL");
 +
-Index: linux/net/tux/mod.c
+Index: linux-tux.q/net/tux/mod.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/mod.c
++++ linux-tux.q/net/tux/mod.c
 @@ -0,0 +1,262 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -7689,10 +7524,10 @@
 +	return ret;
 +}
 +
-Index: linux/net/tux/output.c
+Index: linux-tux.q/net/tux/output.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/output.c
++++ linux-tux.q/net/tux/output.c
 @@ -0,0 +1,352 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -8046,10 +7881,10 @@
 +	return 0;
 +}
 +
-Index: linux/net/tux/parser.h
+Index: linux-tux.q/net/tux/parser.h
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/parser.h
++++ linux-tux.q/net/tux/parser.h
 @@ -0,0 +1,102 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -8153,10 +7988,10 @@
 +		GOTO_REDIR;			\
 +} while (0)
 +
-Index: linux/net/tux/postpone.c
+Index: linux-tux.q/net/tux/postpone.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/postpone.c
++++ linux-tux.q/net/tux/postpone.c
 @@ -0,0 +1,77 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -8235,10 +8070,10 @@
 +	return err;
 +}
 +
-Index: linux/net/tux/proc.c
+Index: linux-tux.q/net/tux/proc.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/proc.c
++++ linux-tux.q/net/tux/proc.c
 @@ -0,0 +1,1149 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -9389,10 +9224,10 @@
 +}
 +
 +
-Index: linux/net/tux/proto_ftp.c
+Index: linux-tux.q/net/tux/proto_ftp.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/proto_ftp.c
++++ linux-tux.q/net/tux/proto_ftp.c
 @@ -0,0 +1,1555 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -9471,7 +9306,7 @@
 +		req, bytes, ftp_bytes_sent, ftp_bandwidth);
 +}
 +
-+#define update_bandwidth(req,bytes) 				\
++#define update_bandwidth(req,bytes)				\
 +	do {							\
 +		if (unlikely(tux_ftp_login_message))		\
 +			__update_bandwidth(req, bytes);		\
@@ -10721,7 +10556,7 @@
 +		icsk = inet_csk(data_sock->sk);
 +
 +		tp->nonagle = 2;
-+	       	Dprintk("PASV bind() ret: %d.\n", err);
++		Dprintk("PASV bind() ret: %d.\n", err);
 +		if (err < 0) {
 +			req_err(req);
 +			sock_release(data_sock);
@@ -10799,7 +10634,7 @@
 +				(struct sockaddr*)&addr, sizeof(addr));
 +		current->cap_effective = saved_cap;
 +
-+	       	Dprintk("ACTIVE bind() ret: %d.\n", err);
++		Dprintk("ACTIVE bind() ret: %d.\n", err);
 +		if (err) {
 +			sock_release(data_sock);
 +			req_err(req);
@@ -10949,10 +10784,10 @@
 +	name: "ftp",
 +};
 +
-Index: linux/net/tux/proto_http.c
+Index: linux-tux.q/net/tux/proto_http.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/proto_http.c
++++ linux-tux.q/net/tux/proto_http.c
 @@ -0,0 +1,2197 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -11347,7 +11182,7 @@
 +				GOTO_REDIR;
 +		}
 +
-+#define PARSE_STR_FIELD(char,field,str,len) 				\
++#define PARSE_STR_FIELD(char,field,str,len)				\
 +	if (PARSE_TOKEN(curr,field,left)) {				\
 +		req->str = curr;					\
 +		SKIP_LINE(curr,left);					\
@@ -13151,10 +12986,10 @@
 +	name: "http",
 +};
 +
-Index: linux/net/tux/redirect.c
+Index: linux-tux.q/net/tux/redirect.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/redirect.c
++++ linux-tux.q/net/tux/redirect.c
 @@ -0,0 +1,172 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -13191,7 +13026,7 @@
 +
 +static struct request_sock_ops tux_req =
 +{
-+ 	.destructor = &nop_destructor,
++	.destructor = &nop_destructor,
 +};
 +
 +static int redirect_sock (tux_req_t *req, const int port)
@@ -13328,10 +13163,10 @@
 +{
 +	kmem_cache_destroy(tux_req.slab);
 +}
-Index: linux/net/tux/times.c
+Index: linux-tux.q/net/tux/times.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/times.c
++++ linux-tux.q/net/tux/times.c
 @@ -0,0 +1,392 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -13496,13 +13331,13 @@
 +	s++;
 +	if ((s[0]!='G')||(s[1]!='M')||(s[2]!='T'))
 +	{
-+  		return 0; /* No GMT */
-+  	}
++		return 0; /* No GMT */
++	}
 +
 +	if (Y<TUX_YEAROFFSET) Y = TUX_YEAROFFSET;
 +	if (Y>TUX_YEAROFFSET+9) Y = TUX_YEAROFFSET+9;
 +
-+	Temp = 	TimeDays[Y-TUX_YEAROFFSET][M];
++	Temp = TimeDays[Y-TUX_YEAROFFSET][M];
 +	Temp += D*86400+H*3600+Min*60+S;
 +
 +	return Temp;
@@ -13687,7 +13522,7 @@
 +			/* Wed Jun  9 01:29:59 1993 */
 +
 +			if (str_len < 24)
-+                        	return -1;
++				return -1;
 +
 +			mon = make_month(str+4);
 +			mday = make_num(str+8);
@@ -13725,10 +13560,10 @@
 +
 +	return mktime(year, mon, mday, hour, min, sec);
 +}
-Index: linux/net/tux/times.h
+Index: linux-tux.q/net/tux/times.h
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/times.h
++++ linux-tux.q/net/tux/times.h
 @@ -0,0 +1,26 @@
 +static time_t TimeDays[10][13] = {
 + { 852073200,	854751600,	857170800,	859849200,	862441200,	865119600,	867711600,	870390000,	873068400,	875660400,	878338800,	880930800,	883609200 } ,
@@ -13756,10 +13591,10 @@
 +};
 +#define TUX_YEAROFFSET   1997
 +#define TUX_NUMYEARS     10
-Index: linux/net/tux/userspace.c
+Index: linux-tux.q/net/tux/userspace.c
 ===================================================================
 --- /dev/null
-+++ linux/net/tux/userspace.c
++++ linux-tux.q/net/tux/userspace.c
 @@ -0,0 +1,27 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -13788,4 +13623,3 @@
 + *
 + ****************************************************************/
 +
-

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h         |    7 +++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 14 files changed, 47 insertions(+), 10 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-compile-fixes.patch	11 May 2006 22:02:37 -0000	1.3
+++ linux-2.6-xen-compile-fixes.patch	18 Jun 2006 04:45:05 -0000	1.4
@@ -1,14 +1,3 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mm/init-xen.c linux-2.6.15.xen/arch/i386/mm/init-xen.c
---- linux-2.6.15.orig/arch/i386/mm/init-xen.c	2006-02-22 15:56:24.000000000 +0100
-+++ linux-2.6.15.xen/arch/i386/mm/init-xen.c	2006-02-22 18:56:27.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <asm/system.h>
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-+#include <asm-i386/mach-xen/asm/swiotlb.h>
- #include <asm/dma.h>
- #include <asm/fixmap.h>
- #include <asm/e820.h>
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c
 --- linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c	2006-02-22 15:56:20.000000000 +0100
 +++ linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c	2006-02-22 18:32:50.000000000 +0100
@@ -170,19 +159,6 @@
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/Makefile linux-2.6.15.xen/arch/i386/kernel/Makefile
---- linux-2.6.15.orig/arch/i386/kernel/Makefile	2006-02-22 15:56:20.000000000 +0100
-+++ linux-2.6.15.xen/arch/i386/kernel/Makefile	2006-02-22 17:08:31.000000000 +0100
-@@ -83,8 +83,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
- 
- SYSCFLAGS_vsyscall-syms.o = -r
- $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
--			$(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \
--			$(obj)/$(vsyscall_note) FORCE
-+			$(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE
- 	$(call if_changed,syscall)
- 
- ifdef CONFIG_XEN
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/smp-xen.c linux-2.6.15.xen/arch/i386/kernel/smp-xen.c
 --- linux-2.6.15.orig/arch/i386/kernel/smp-xen.c	2006-02-22 15:56:21.000000000 +0100
 +++ linux-2.6.15.xen/arch/i386/kernel/smp-xen.c	2006-02-22 18:29:12.000000000 +0100
@@ -194,16 +170,6 @@
  #if 0
  #include <mach_apic.h>
  #endif
---- linux-2.6.15.ia64/fs/Kconfig~	2006-02-24 14:14:42.000000000 -0500
-+++ linux-2.6.15.ia64/fs/Kconfig	2006-02-24 14:38:17.000000000 -0500
-@@ -841,7 +841,6 @@
- config HUGETLBFS
- 	bool "HugeTLB file system support"
- 	depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
--	depends !XEN
- 
- config HUGETLB_PAGE
- 	def_bool HUGETLBFS
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c
 --- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c	2006-02-28 22:47:11.000000000 +0100
 +++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c	2006-02-28 22:37:45.000000000 +0100
@@ -231,34 +197,21 @@
  	return 0;
  }
  
---- linux-2.6.16.orig/net/core/dev.c	2006-05-10 16:52:15.000000000 +0200
-+++ linux-2.6.16.noarch/net/core/dev.c	2006-05-10 22:13:26.000000000 +0200
-@@ -1252,8 +1252,6 @@ inline int skb_checksum_setup(struct sk_
- out:
- 	return -EPROTO;
+diff linux-2.6.16.nowork/include/asm-x86_64/ipi.h linux-2.6.16.noarch/include/asm-x86_64/ipi.h
+--- linux-2.6.16.nowork/include/asm-x86_64/ipi.h	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16.noarch/include/asm-x86_64/ipi.h	2006-04-14 21:46:59.000000000 +0200
+@@ -49,6 +49,7 @@ static inline int __prepare_ICR2 (unsign
+ 	return SET_APIC_DEST_FIELD(mask);
  }
--#else
--inline int skb_checksum_setup(struct sk_buff *skb) {}
- #endif
  
- 
-@@ -1306,9 +1304,10 @@ int dev_queue_xmit(struct sk_buff *skb)
-  	/* If a checksum-deferred packet is forwarded to a device that needs a
-  	 * checksum, correct the pointers and force checksumming.
-  	 */
-+#ifdef CONFIG_XEN
-  	if(skb_checksum_setup(skb))
-  		goto out_kfree_skb;
--  
++#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
+ static inline void __send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)
+ {
+ 	/*
+@@ -113,5 +114,6 @@ static inline void send_IPI_mask_sequenc
+ 	}
+ 	local_irq_restore(flags);
+ }
 +#endif
- 	/* If packet is not checksummed and device does not support
- 	 * checksumming for this protocol, complete checksumming here.
- 	 */
-@@ -3362,7 +3361,6 @@ EXPORT_SYMBOL(unregister_netdevice_notif
- EXPORT_SYMBOL(net_enable_timestamp);
- EXPORT_SYMBOL(net_disable_timestamp);
- EXPORT_SYMBOL(dev_get_flags);
--EXPORT_SYMBOL(skb_checksum_setup);
  
- #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
- EXPORT_SYMBOL(br_handle_frame_hook);
+ #endif /* __ASM_IPI_H */

linux-2.6-xen-move-vdso-fixmap.patch:
 arch/i386/mm/pgtable-xen.c             |    1 -
 include/asm-i386/a.out.h               |    2 +-
 include/asm-i386/elf.h                 |    7 ++++++-
 include/asm-i386/fixmap.h              |    9 ---------
 include/asm-i386/mach-xen/asm/fixmap.h |    9 ---------
 include/asm-i386/mach-xen/asm/page.h   |    2 ++
 include/asm-i386/page.h                |    2 ++
 7 files changed, 11 insertions(+), 21 deletions(-)

Index: linux-2.6-xen-move-vdso-fixmap.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-move-vdso-fixmap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-move-vdso-fixmap.patch	6 Mar 2006 16:31:48 -0000	1.2
+++ linux-2.6-xen-move-vdso-fixmap.patch	18 Jun 2006 04:45:05 -0000	1.3
@@ -1,3 +1,6 @@
+
+This has been heavily hand edited (Juan Quintela)
+
 # HG changeset patch
 # User cl349 at firebug.cl.cam.ac.uk
 # Node ID 822a27d28afeab1ffdf8ca8e8e8a11de5e7c7aec
@@ -8,131 +11,6 @@
 From: Gerd Hoffmann <kraxel at suse.de>
 Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>
 
-diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c
---- a/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Thu Feb 23 15:22:17 2006 +0000
-+++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Thu Feb 23 15:22:19 2006 +0000
-@@ -13,6 +13,7 @@
- #include <asm/fixmap.h>
- #include <asm/processor.h>
- #include <asm/thread_info.h>
-+#include <asm/elf.h>
- 
- #define DEFINE(sym, val) \
-         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -70,5 +71,5 @@ void foo(void)
- #endif
- 
- 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
--	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
-+	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
- }
-diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c
---- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Thu Feb 23 15:22:17 2006 +0000
-+++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Thu Feb 23 15:22:19 2006 +0000
-@@ -13,6 +13,7 @@
- #include <linux/gfp.h>
- #include <linux/string.h>
- #include <linux/elf.h>
-+#include <linux/mm.h>
- 
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
-@@ -47,25 +48,90 @@ void enable_sep_cpu(void)
-  */
- extern const char vsyscall_int80_start, vsyscall_int80_end;
- extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
-+static void *syscall_page;
- 
- int __init sysenter_setup(void)
- {
--	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
--
--	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
-+	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
- 
- #ifdef CONFIG_X86_SYSENTER
- 	if (boot_cpu_has(X86_FEATURE_SEP)) {
--		memcpy(page,
-+		memcpy(syscall_page,
- 		       &vsyscall_sysenter_start,
- 		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
- 		return 0;
- 	}
- #endif
- 
--	memcpy(page,
-+	memcpy(syscall_page,
- 	       &vsyscall_int80_start,
- 	       &vsyscall_int80_end - &vsyscall_int80_start);
- 
- 	return 0;
- }
-+
-+static struct page*
-+syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
-+{
-+	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
-+	get_page(p);
-+	return p;
-+}
-+
-+/* Prevent VMA merging */
-+static void syscall_vma_close(struct vm_area_struct *vma)
-+{
-+}
-+
-+static struct vm_operations_struct syscall_vm_ops = {
-+	.close = syscall_vma_close,
-+	.nopage = syscall_nopage,
-+};
-+
-+/* Setup a VMA at program startup for the vsyscall page */
-+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
-+{
-+	struct vm_area_struct *vma;
-+	struct mm_struct *mm = current->mm;
-+	int ret;
-+
-+	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
-+	if (!vma)
-+		return -ENOMEM;
-+
-+	memset(vma, 0, sizeof(struct vm_area_struct));
-+	/* Could randomize here */
-+	vma->vm_start = VSYSCALL_BASE;
-+	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
-+	/* MAYWRITE to allow gdb to COW and set breakpoints */
-+	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
-+	vma->vm_flags |= mm->def_flags;
-+	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
-+	vma->vm_ops = &syscall_vm_ops;
-+	vma->vm_mm = mm;
-+
-+	down_write(&mm->mmap_sem);
-+	if ((ret = insert_vm_struct(mm, vma))) {
-+		up_write(&mm->mmap_sem);
-+		kmem_cache_free(vm_area_cachep, vma);
-+		return ret;
-+	}
-+	mm->total_vm++;
-+	up_write(&mm->mmap_sem);
-+	return 0;
-+}
-+
-+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+{
-+	return NULL;
-+}
-+
-+int in_gate_area(struct task_struct *task, unsigned long addr)
-+{
-+	return 0;
-+}
-+
-+int in_gate_area_no_task(unsigned long addr)
-+{
-+	return 0;
-+}
 diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c
 --- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c	Thu Feb 23 15:22:17 2006 +0000
 +++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c	Thu Feb 23 15:22:19 2006 +0000

linux-2.6-xen-vsyscall_base.patch:
 asm-offsets.c |    1 -
 1 files changed, 1 deletion(-)

Index: linux-2.6-xen-vsyscall_base.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-vsyscall_base.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-vsyscall_base.patch	6 Mar 2006 16:31:49 -0000	1.2
+++ linux-2.6-xen-vsyscall_base.patch	18 Jun 2006 04:45:05 -0000	1.3
@@ -14,5 +14,5 @@
  #endif
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
--	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+-	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   54 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 257 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-xen.patch	11 May 2006 22:02:56 -0000	1.13
+++ linux-2.6-xen.patch	18 Jun 2006 04:45:05 -0000	1.14
@@ -1,6 +1,6 @@
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/boot-xen/Makefile linux-2.6.16-xen/arch/i386/boot-xen/Makefile
---- ref-linux-2.6.16/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/boot-xen/Makefile	2006-05-10 13:01:34.000000000 +0200
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
+--- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ merge/arch/i386/boot-xen/Makefile	2006-05-30 12:42:43.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,10 +23,10 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/Kconfig linux-2.6.16-xen/arch/i386/Kconfig
---- ref-linux-2.6.16/arch/i386/Kconfig	2006-05-10 13:22:17.000000000 +0200
-+++ linux-2.6.16-xen/arch/i386/Kconfig	2006-05-10 13:01:34.000000000 +0200
-@@ -58,6 +58,15 @@ config X86_PC
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
+--- ../upstream/hg/linux-2.6/arch/i386/Kconfig	2006-05-27 02:37:47.000000000 +0200
++++ merge/arch/i386/Kconfig	2006-05-30 12:42:43.000000000 +0200
+@@ -91,6 +91,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
  
@@ -42,7 +42,7 @@
  config X86_ELAN
  	bool "AMD Elan"
  	help
-@@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -193,6 +202,7 @@ source "arch/i386/Kconfig.cpu"
  
  config HPET_TIMER
  	bool "HPET Timer Support"
@@ -50,7 +50,7 @@
  	help
  	  This enables the use of the HPET for the kernel's internal timer.
  	  HPET is the next generation timer replacing legacy 8254s.
-@@ -231,7 +241,7 @@ config NR_CPUS
+@@ -223,7 +233,7 @@ config NR_CPUS
  
  config SCHED_SMT
  	bool "SMT (Hyperthreading) scheduler support"
@@ -59,7 +59,16 @@
  	default off
  	help
  	  SMT scheduler support improves the CPU scheduler's decision making
-@@ -243,7 +253,7 @@ source "kernel/Kconfig.preempt"
+@@ -233,7 +243,7 @@ config SCHED_SMT
+ 
+ config SCHED_MC
+ 	bool "Multi-core scheduler support"
+-	depends on SMP
++	depends on SMP && !X86_XEN
+ 	default y
+ 	help
+ 	  Multi-core scheduler support improves the CPU scheduler's decision
+@@ -244,7 +254,7 @@ source "kernel/Kconfig.preempt"
  
  config X86_UP_APIC
  	bool "Local APIC support on uniprocessors"
@@ -68,7 +77,7 @@
  	help
  	  A local APIC (Advanced Programmable Interrupt Controller) is an
  	  integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -268,12 +278,12 @@ config X86_UP_IOAPIC
+@@ -269,12 +279,12 @@ config X86_UP_IOAPIC
  
  config X86_LOCAL_APIC
  	bool
@@ -83,7 +92,7 @@
  	default y
  
  config X86_VISWS_APIC
-@@ -281,9 +291,14 @@ config X86_VISWS_APIC
+@@ -282,9 +292,14 @@ config X86_VISWS_APIC
  	depends on X86_VISWS
  	default y
  
@@ -99,7 +108,7 @@
  	---help---
  	  Machine Check Exception support allows the processor to notify the
  	  kernel if it detects a problem (e.g. overheating, component failure).
-@@ -373,6 +388,7 @@ config X86_REBOOTFIXUPS
+@@ -374,6 +389,7 @@ config X86_REBOOTFIXUPS
  
  config MICROCODE
  	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -107,7 +116,7 @@
  	---help---
  	  If you say Y here and also to "/dev file system support" in the
  	  'File systems' section, you will be able to update the microcode on
-@@ -390,6 +406,7 @@ config MICROCODE
+@@ -391,6 +407,7 @@ config MICROCODE
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -115,7 +124,7 @@
  	help
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -405,6 +422,10 @@ config X86_CPUID
+@@ -406,6 +423,10 @@ config X86_CPUID
  	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
  	  /dev/cpu/31/cpuid.
  
@@ -126,7 +135,7 @@
  source "drivers/firmware/Kconfig"
  
  choice
-@@ -573,7 +594,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -578,7 +599,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -135,7 +144,7 @@
  	help
  	  The VM uses one page table entry for each page of physical memory.
  	  For systems with a lot of RAM, this can be wasteful of precious
-@@ -582,6 +603,7 @@ config HIGHPTE
+@@ -587,6 +608,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -143,7 +152,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -607,6 +629,8 @@ config MATH_EMULATION
+@@ -612,6 +634,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -152,7 +161,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -641,7 +665,7 @@ config MTRR
+@@ -646,7 +670,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support (EXPERIMENTAL)"
@@ -161,7 +170,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -659,7 +683,7 @@ config EFI
+@@ -664,7 +688,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -170,7 +179,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -702,7 +726,7 @@ source kernel/Kconfig.hz
+@@ -712,7 +736,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -179,15 +188,7 @@
  	help
  	  kexec is a system call that implements the ability to shutdown your
  	  current kernel, and to start another kernel.  It is like a reboot
-@@ -756,6 +780,7 @@ config HOTPLUG_CPU
- config DOUBLEFAULT
- 	default y
- 	bool "Enable doublefault exception handler" if EMBEDDED
-+	depends on !X86_NO_TSS
- 	help
-           This option allows trapping of rare doublefault exceptions that
-           would otherwise cause a system to silently reboot. Disabling this
-@@ -766,18 +791,20 @@ endmenu
+@@ -767,18 +791,20 @@ endmenu
  
  
  menu "Power management options (ACPI, APM)"
@@ -211,7 +212,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -962,6 +989,7 @@ choice
+@@ -963,6 +989,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -219,7 +220,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -969,6 +997,13 @@ config PCI_GOMMCONFIG
+@@ -970,6 +997,13 @@ config PCI_GOMMCONFIG
[...44254 lines suppressed...]
  }
@@ -82577,7 +86701,7 @@
  
  /**
   *	alloc_skb_from_cache	-	allocate a network buffer
-@@ -203,14 +205,18 @@ nodata:
+@@ -211,14 +213,18 @@ nodata:
   */
  struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
  				     unsigned int size,
@@ -82599,7 +86723,7 @@
  	if (!skb)
  		goto out;
  
-@@ -227,16 +233,29 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -235,16 +241,29 @@ struct sk_buff *alloc_skb_from_cache(kme
  	skb->data = data;
  	skb->tail = data;
  	skb->end  = data + size;
@@ -82635,7 +86759,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -408,6 +427,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -434,6 +453,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;
@@ -82646,17 +86770,87 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/scripts/Makefile.xen linux-2.6.16-xen/scripts/Makefile.xen
---- ref-linux-2.6.16/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/scripts/Makefile.xen	2006-05-10 13:01:40.000000000 +0200
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-01-16 01:22:34.000000000 +0100
++++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-05-30 12:44:05.000000000 +0200
+@@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
+ 	if (hdrsize < sizeof(*hdr))
+ 		return 1;
+ 
+-	hdr->check = ip_nat_cheat_check(~oldip, newip,
++#ifdef CONFIG_XEN
++	if ((*pskb)->proto_csum_blank) {
++		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
++	} else
++#endif
++	{
++		hdr->check = ip_nat_cheat_check(~oldip, newip,
+ 					ip_nat_cheat_check(oldport ^ 0xFFFF,
+ 							   newport,
+ 							   hdr->check));
++	}
+ 	return 1;
+ }
+ 
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-01-16 01:22:34.000000000 +0100
++++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-05-30 12:44:05.000000000 +0200
+@@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
+ 		newport = tuple->dst.u.udp.port;
+ 		portptr = &hdr->dest;
+ 	}
+-	if (hdr->check) /* 0 is a special case meaning no checksum */
+-		hdr->check = ip_nat_cheat_check(~oldip, newip,
++	if (hdr->check) { /* 0 is a special case meaning no checksum */
++#ifdef CONFIG_XEN
++		if ((*pskb)->proto_csum_blank) {
++			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
++		} else
++#endif
++		{
++			hdr->check = ip_nat_cheat_check(~oldip, newip,
+ 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
+ 							   newport,
+ 							   hdr->check));
++		}
++	}
+ 	*portptr = newport;
+ 	return 1;
+ }
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
+--- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-05-13 02:59:54.000000000 +0200
++++ merge/net/ipv4/xfrm4_output.c	2006-05-30 12:44:06.000000000 +0200
+@@ -17,6 +17,8 @@
+ #include <net/xfrm.h>
+ #include <net/icmp.h>
+ 
++extern int skb_checksum_setup(struct sk_buff *skb);
++
+ /* Add encapsulation header.
+  *
+  * In transport mode, the IP header will be moved forward to make space
+@@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
+ 	struct xfrm_state *x = dst->xfrm;
+ 	int err;
+ 	
++	err = skb_checksum_setup(skb);
++	if (err)
++		goto error_nolock;
++
+ 	if (skb->ip_summed == CHECKSUM_HW) {
+ 		err = skb_checksum_help(skb, 0);
+ 		if (err)
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
+--- ../upstream/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ merge/scripts/Makefile.xen	2006-05-30 12:44:09.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)
 +cherrypickxen = $(foreach var, $(1), \
 +		$(shell o=$(var); \
-+			c=$${o/%.o/-xen.c}; \
-+			s=$${o/%.o/-xen.S}; \
-+			oxen=$${o/%.o/-xen.o}; \
++			c=$${o%.o}-xen.c; \
++			s=$${o%.o}-xen.S; \
++			oxen=$${o%.o}-xen.o; \
 +			[ -f $(srctree)/$(src)/$${c} ] || \
 +			   [ -f $(srctree)/$(src)/$${s} ] \
 +				&& echo $$oxen \
@@ -82664,77 +86858,3 @@
 +	  )
 +# filterxen($1 = allobj, $2 = noobjs)
 +filterxen = $(filter-out $(2), $(1))
-diff -uNp linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig linux-2.6.16.noarch/arch/x86_64/ia32/Makefile
---- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig	2006-05-10 13:33:51.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-05-10 14:03:16.000000000 +0200
-@@ -23,9 +23,25 @@ quiet_cmd_syscall = SYSCALL $@
- 			   -Wl,-soname=linux-gate.so.1 -o $@ \
- 			   -Wl,-T,$(filter-out FORCE,$^)
- 
-+$(obj)/vsyscall-int80.so \
- $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
- $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
- 	$(call if_changed,syscall)
- 
--AFLAGS_vsyscall-sysenter.o = -m32 -Wa,-32
--AFLAGS_vsyscall-syscall.o = -m32 -Wa,-32
-+AFLAGS_vsyscall-sysenter.o = -m32 -Wa,-32 -Iarch/i386/kernel
-+AFLAGS_vsyscall-syscall.o = -m32 -Wa,-32 -Iarch/i386/kernel
-+
-+ifdef CONFIG_XEN
-+AFLAGS_vsyscall-int80.o = -m32 -Wa,-32 -Iarch/i386/kernel
-+CFLAGS_syscall32-xen.o += -DUSE_INT80
-+AFLAGS_syscall32_syscall-xen.o += -DUSE_INT80
-+
-+$(obj)/syscall32_syscall-xen.o: \
-+	$(foreach F,int80 sysenter syscall,$(obj)/vsyscall-$F.so)
-+
-+targets := $(foreach F,int80 sysenter syscall,vsyscall-$F.o vsyscall-$F.so)
-+
-+include $(srctree)/scripts/Makefile.xen
-+
-+obj-y := $(call cherrypickxen, $(obj-y))
-+endif
-diff -uNp linux-2.6.16.noarch/arch/i386/kernel/vm86.c.orig linux-2.6.16.noarch/arch/i386/kernel/vm86.c
---- linux-2.6.16.noarch/arch/i386/kernel/vm86.c.orig	2006-05-10 13:33:51.000000000 +0200
-+++ linux-2.6.16.noarch/arch/i386/kernel/vm86.c	2006-05-10 14:01:24.000000000 +0200
-@@ -98,7 +98,9 @@
- struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs));
- struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
- {
-+#ifndef CONFIG_X86_NO_TSS
- 	struct tss_struct *tss;
-+#endif
- 	struct pt_regs *ret;
- 	unsigned long tmp;
- 
-@@ -123,7 +125,9 @@ struct pt_regs * fastcall save_v86_state
- 		do_exit(SIGSEGV);
- 	}
- 
-+#ifndef CONFIG_X86_NO_TSS
- 	tss = &per_cpu(init_tss, get_cpu());
-+#endif
- 	current->thread.esp0 = current->thread.saved_esp0;
- 	current->thread.sysenter_cs = __KERNEL_CS;
- 	load_esp0(tss, &current->thread);
-@@ -252,7 +256,9 @@ out:
- 
- static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
- {
-+#ifndef CONFIG_X86_NO_TSS
- 	struct tss_struct *tss;
-+#endif
- 	long eax;
- /*
-  * make sure the vm86() system call doesn't try to do anything silly
-@@ -297,7 +303,9 @@ static void do_sys_vm86(struct kernel_vm
- 	savesegment(fs, tsk->thread.saved_fs);
- 	savesegment(gs, tsk->thread.saved_gs);
- 
-+#ifndef CONFIG_X86_NO_TSS
- 	tss = &per_cpu(init_tss, get_cpu());
-+#endif
- 	tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
- 	if (cpu_has_sep)
- 		tsk->thread.sysenter_cs = 0;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- sources	5 Jun 2006 18:27:59 -0000	1.344
+++ sources	18 Jun 2006 04:45:08 -0000	1.345
@@ -1,3 +1,2 @@
-9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-1200119be7ce232efec3636f0b27d051  xen-20060510.tar.bz2
-391e7410fb03a533d40d1a1620465ad7  patch-2.6.16.20.bz2
+7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
+37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- upstream	5 Jun 2006 18:27:18 -0000	1.314
+++ upstream	18 Jun 2006 04:45:08 -0000	1.315
@@ -1,2 +1 @@
-linux-2.6.16.tar.bz2
-patch-2.6.16.20.bz2
+linux-2.6.17.tar.bz2

xen-sched-sedf.patch:
 sched_sedf.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Index: xen-sched-sedf.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/xen-sched-sedf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-sched-sedf.patch	13 Mar 2006 17:13:59 -0000	1.1
+++ xen-sched-sedf.patch	18 Jun 2006 04:45:09 -0000	1.2
@@ -1,20 +1,23 @@
 Signed-off-by: James Morris <jmorris at redhat.com>
 
---- xen-3.0.1/xen/common/sched_sedf.c	2006-03-01 17:39:01.000000000 -0500
-+++ xen-3.0.1.w/xen/common/sched_sedf.c	2006-03-13 02:29:18.000000000 -0500
-@@ -374,9 +374,15 @@
+diff -pur xen/common/sched_sedf.c xen.w/common/sched_sedf.c
+--- xen/common/sched_sedf.c	2006-04-02 00:00:27.000000000 -0500
++++ xen.w/common/sched_sedf.c	2006-04-02 00:34:11.000000000 -0500
+@@ -374,9 +374,15 @@ static void sedf_add_task(struct vcpu *d
      if ( d->domain->domain_id == 0 )
      {
          /*set dom0 to something useful to boot the machine*/
+-        inf->period    = MILLISECS(20);
+-        inf->slice     = MILLISECS(15);
 +        /*
-+         * jmorris at redhat.com: workaround to stop soft cpu lockups
-+         * in guests, per
-+         * http://lists.xensource.com/archives/html/xen-devel/2006-02/msg00721.html
++         * Simulate manual workaround for bz #181856, which assigns
++         * the lowest slice weight value for dom0 + extra time.
 +         */
-         inf->period    = MILLISECS(20);
-         inf->slice     = MILLISECS(15);
++        inf->period    = WEIGHT_PERIOD;
++        inf->slice     = 0;
          inf->latency   = 0;
 +        inf->extraweight = 1;
++        inf->weight    = 0;
          inf->deadl_abs = 0;
          inf->status     = EXTRA_AWARE | SEDF_ASLEEP;
      }


--- linux-2.6.16.tar.bz2.sign DELETED ---


--- patch-2.6.16.20.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 18 04:51:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 18 Jun 2006 00:51:21 -0400
Subject: rpms/kernel/FC-5
 linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, 1.1,
 NONE linux-2.6-audit-new-msg-types.patch, 1.2,
 NONE linux-2.6-autofs-pathlookup.patch, 1.1,
 NONE linux-2.6-bcm43xx-assoc-on-startup.patch, 1.1,
 NONE linux-2.6-bcm43xx-git.patch, 1.3, NONE linux-2.6-bcm43xx-neuter.patch,
 1.1, NONE linux-2.6-bcm43xx-set-chan-lockup.patch, 1.1,
 NONE linux-2.6-bzimage.patch, 1.4, NONE linux-2.6-cell-is-cbea.patch, 1.2,
 NONE linux-2.6-cell-numa-init.patch, 1.1,
 NONE linux-2.6-cell-spiderpic-no-devtree.patch, 1.1,
 NONE linux-2.6-crash-xen.patch, 1.2, NONE linux-2.6-crashdump-common.patch,
 1.19, NONE linux-2.6-crashdump-reboot-exports.patch, 1.4,
 NONE linux-2.6-debug-dual-line-backtrace.patch, 1.3,
 NONE linux-2.6-debug-pm-pci.patch, 1.1,
 NONE linux-2.6-debug-reference-discarded-return-result.patch, 1.1,
 NONE linux-2.6-debug-slab-leaks.patch, 1.2,
 NONE linux-2.6-defaults-enable-sata-atapi.patch, 1.1,
 NONE linux-2.6-diskdump.patch, 1.5, NONE linux-2.6-drm-cripple-r300.patch,
 1.2, NONE linux-2.6-dump_smp_call_!
 function.patch, 1.6, NONE linux-2.6-g5-therm-shutdown.patch, 1.1,
 NONE linux-2.6-header-cleanup-git.patch, 1.1,
 NONE linux-2.6-header-install-git.patch, 1.1,
 NONE linux-2.6-hvc-rtas-console.patch, 1.1,
 NONE linux-2.6-ide-cd-shutup.patch, 1.1,
 NONE linux-2.6-mptfusion-kdump.patch, 1.1,
 NONE linux-2.6-net-ipw2200-hwcrypto.patch, 1.1,
 NONE linux-2.6-net-wireless-features.patch, 1.2,
 NONE linux-2.6-netconsole.patch, 1.1, NONE linux-2.6-netdump.patch, 1.4,
 NONE linux-2.6-obsolete-idescsi-warning.patch, 1.1,
 NONE linux-2.6-percpu-NR_CPUS-hotplug-fix.patch, 1.2,
 NONE linux-2.6-powermac-pfunc-noise.patch, 1.1,
 NONE linux-2.6-ppc32-check-legacy-io.patch, 1.1,
 NONE linux-2.6-pwc-powerup-by-default.patch, 1.1,
 NONE linux-2.6-scsi-advansys-enabler.patch, 1.1,
 NONE linux-2.6-selinux-disable-attributes-no-policy.patch, 1.1,
 NONE linux-2.6-selinux-selinuxfs-hard-link-count.patch, 1.2,
 NONE linux-2.6-signal-trampolines-unwind-info.patch, 1.1,
 NONE linux-2.6-smsc-ircc2-pnp.patch, 1.1,
 NONE linux-2.6-softmac-assoc-events.patch, 1.1, N!
 ONE linux-2.6-softmac-default-rate.patch,1.1,NONE linux-2.6-so!
 ftmac-gi
Message-ID: <200606180451.k5I4pLY5011785@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11675

Removed Files:
	linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch 
	linux-2.6-audit-new-msg-types.patch 
	linux-2.6-autofs-pathlookup.patch 
	linux-2.6-bcm43xx-assoc-on-startup.patch 
	linux-2.6-bcm43xx-git.patch linux-2.6-bcm43xx-neuter.patch 
	linux-2.6-bcm43xx-set-chan-lockup.patch 
	linux-2.6-bzimage.patch linux-2.6-cell-is-cbea.patch 
	linux-2.6-cell-numa-init.patch 
	linux-2.6-cell-spiderpic-no-devtree.patch 
	linux-2.6-crash-xen.patch linux-2.6-crashdump-common.patch 
	linux-2.6-crashdump-reboot-exports.patch 
	linux-2.6-debug-dual-line-backtrace.patch 
	linux-2.6-debug-pm-pci.patch 
	linux-2.6-debug-reference-discarded-return-result.patch 
	linux-2.6-debug-slab-leaks.patch 
	linux-2.6-defaults-enable-sata-atapi.patch 
	linux-2.6-diskdump.patch linux-2.6-drm-cripple-r300.patch 
	linux-2.6-dump_smp_call_function.patch 
	linux-2.6-g5-therm-shutdown.patch 
	linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
	linux-2.6-hvc-rtas-console.patch linux-2.6-ide-cd-shutup.patch 
	linux-2.6-mptfusion-kdump.patch 
	linux-2.6-net-ipw2200-hwcrypto.patch 
	linux-2.6-net-wireless-features.patch 
	linux-2.6-netconsole.patch linux-2.6-netdump.patch 
	linux-2.6-obsolete-idescsi-warning.patch 
	linux-2.6-percpu-NR_CPUS-hotplug-fix.patch 
	linux-2.6-powermac-pfunc-noise.patch 
	linux-2.6-ppc32-check-legacy-io.patch 
	linux-2.6-pwc-powerup-by-default.patch 
	linux-2.6-scsi-advansys-enabler.patch 
	linux-2.6-selinux-disable-attributes-no-policy.patch 
	linux-2.6-selinux-selinuxfs-hard-link-count.patch 
	linux-2.6-signal-trampolines-unwind-info.patch 
	linux-2.6-smsc-ircc2-pnp.patch 
	linux-2.6-softmac-assoc-events.patch 
	linux-2.6-softmac-default-rate.patch 
	linux-2.6-softmac-git.patch 
	linux-2.6-softmac-scan-channel.patch 
	linux-2.6-softmac-scan-dwell-time.patch 
	linux-2.6-vdso-xen.patch linux-2.6-x86-tune-p4.patch 
	linux-2.6-xen-disable_ati_timer_quirk.patch 
	linux-2.6-xen-i386-mach-io-check-nmi.patch 
	linux-2.6-xen-net-csum.patch linux-2.6-xen-pmd-shared.patch 
	linux-2.6-xen-smp-alts.patch 
	linux-2.6-xen-uptodate-2.6.16.15.patch 
Log Message:
Remove dead patches.



--- linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch DELETED ---


--- linux-2.6-audit-new-msg-types.patch DELETED ---


--- linux-2.6-autofs-pathlookup.patch DELETED ---


--- linux-2.6-bcm43xx-assoc-on-startup.patch DELETED ---


--- linux-2.6-bcm43xx-git.patch DELETED ---


--- linux-2.6-bcm43xx-neuter.patch DELETED ---


--- linux-2.6-bcm43xx-set-chan-lockup.patch DELETED ---


--- linux-2.6-bzimage.patch DELETED ---


--- linux-2.6-cell-is-cbea.patch DELETED ---


--- linux-2.6-cell-numa-init.patch DELETED ---


--- linux-2.6-cell-spiderpic-no-devtree.patch DELETED ---


--- linux-2.6-crash-xen.patch DELETED ---


--- linux-2.6-crashdump-common.patch DELETED ---


--- linux-2.6-crashdump-reboot-exports.patch DELETED ---


--- linux-2.6-debug-dual-line-backtrace.patch DELETED ---


--- linux-2.6-debug-pm-pci.patch DELETED ---


--- linux-2.6-debug-reference-discarded-return-result.patch DELETED ---


--- linux-2.6-debug-slab-leaks.patch DELETED ---


--- linux-2.6-defaults-enable-sata-atapi.patch DELETED ---


--- linux-2.6-diskdump.patch DELETED ---


--- linux-2.6-drm-cripple-r300.patch DELETED ---


--- linux-2.6-dump_smp_call_function.patch DELETED ---


--- linux-2.6-g5-therm-shutdown.patch DELETED ---


--- linux-2.6-header-cleanup-git.patch DELETED ---


--- linux-2.6-header-install-git.patch DELETED ---


--- linux-2.6-hvc-rtas-console.patch DELETED ---


--- linux-2.6-ide-cd-shutup.patch DELETED ---


--- linux-2.6-mptfusion-kdump.patch DELETED ---


--- linux-2.6-net-ipw2200-hwcrypto.patch DELETED ---


--- linux-2.6-net-wireless-features.patch DELETED ---


--- linux-2.6-netconsole.patch DELETED ---


--- linux-2.6-netdump.patch DELETED ---


--- linux-2.6-obsolete-idescsi-warning.patch DELETED ---


--- linux-2.6-percpu-NR_CPUS-hotplug-fix.patch DELETED ---


--- linux-2.6-powermac-pfunc-noise.patch DELETED ---


--- linux-2.6-ppc32-check-legacy-io.patch DELETED ---


--- linux-2.6-pwc-powerup-by-default.patch DELETED ---


--- linux-2.6-scsi-advansys-enabler.patch DELETED ---


--- linux-2.6-selinux-disable-attributes-no-policy.patch DELETED ---


--- linux-2.6-selinux-selinuxfs-hard-link-count.patch DELETED ---


--- linux-2.6-signal-trampolines-unwind-info.patch DELETED ---


--- linux-2.6-smsc-ircc2-pnp.patch DELETED ---


--- linux-2.6-softmac-assoc-events.patch DELETED ---


--- linux-2.6-softmac-default-rate.patch DELETED ---


--- linux-2.6-softmac-git.patch DELETED ---


--- linux-2.6-softmac-scan-channel.patch DELETED ---


--- linux-2.6-softmac-scan-dwell-time.patch DELETED ---


--- linux-2.6-vdso-xen.patch DELETED ---


--- linux-2.6-x86-tune-p4.patch DELETED ---


--- linux-2.6-xen-disable_ati_timer_quirk.patch DELETED ---


--- linux-2.6-xen-i386-mach-io-check-nmi.patch DELETED ---


--- linux-2.6-xen-net-csum.patch DELETED ---


--- linux-2.6-xen-pmd-shared.patch DELETED ---


--- linux-2.6-xen-smp-alts.patch DELETED ---


--- linux-2.6-xen-uptodate-2.6.16.15.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 19 00:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 18 Jun 2006 20:39:10 -0400
Subject: rpms/kernel/FC-5 linux-2.6-x86-alternatives-smp-only.patch, NONE,
	1.1 kernel-2.6.spec, 1.2136, 1.2137
Message-ID: <200606190039.k5J0dAHe027733@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27702

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86-alternatives-smp-only.patch 
Log Message:
Only print info about SMP alternatives on SMP kernels.

linux-2.6-x86-alternatives-smp-only.patch:
 arch/i386/kernel/Makefile |    3 ++-
 include/asm-i386/bugs.h   |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-x86-alternatives-smp-only.patch ---
On UP kernels, it's silly to print out info about SMP alternatives..

 SMP alternatives: switching to UP code
 Freeing SMP alternatives: 0k freed

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.17.noarch/include/asm-i386/bugs.h~	2006-06-18 20:32:01.000000000 -0400
+++ linux-2.6.17.noarch/include/asm-i386/bugs.h	2006-06-18 20:32:19.000000000 -0400
@@ -191,5 +191,7 @@ static void __init check_bugs(void)
 	check_hlt();
 	check_popad();
 	system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
-	alternative_instructions(); 
+#ifdef CONFIG_SMP
+	alternative_instructions();
+#endif
 }
--- linux-2.6.17.noarch/arch/i386/kernel/Makefile~	2006-06-18 20:32:26.000000000 -0400
+++ linux-2.6.17.noarch/arch/i386/kernel/Makefile	2006-06-18 20:33:04.000000000 -0400
@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
 		pci-dma.o i386_ksyms.o i387.o bootflag.o \
-		quirks.o i8237.o topology.o alternative.o
+		quirks.o i8237.o topology.o
 
 obj-y				+= cpu/
 obj-y				+= timers/
@@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
 obj-$(CONFIG_VM86)		+= vm86.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+obj-$(CONFIG_SMP)		+= alternative.o
 
 EXTRA_AFLAGS   := -traditional
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2136
retrieving revision 1.2137
diff -u -r1.2136 -r1.2137
--- kernel-2.6.spec	18 Jun 2006 04:45:01 -0000	1.2136
+++ kernel-2.6.spec	19 Jun 2006 00:39:07 -0000	1.2137
@@ -252,6 +252,7 @@
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
 Patch208: linux-2.6-x86_64-noisy-syscalls.patch
+Patch210: linux-2.6-x86-alternatives-smp-only.patch
 
 # 300 - 399   ppc(64)
 Patch302: linux-2.6-offb-find-fb.patch
@@ -757,6 +758,8 @@
 %patch207 -p1
 # Hush noisy unimplemented 32bit syscalls
 %patch208 -p1
+# Only print info about SMP alternatives on SMP kernels.
+%patch210 -p1
 
 #
 # ppc64
@@ -1629,6 +1632,7 @@
 %changelog
 * Sun Jun 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17
+- Only print info about SMP alternatives on SMP kernels.
 
 * Tue Jun  6 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2133_FC5]
 - Add a PPC64 kdump kernel.



From fedora-cvs-commits at redhat.com  Mon Jun 19 07:13:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 03:13:45 -0400
Subject: rpms/autofs/FC-5 autofs-4.1.4-discard-bg-nofg-options.patch, NONE,
	1.1 autofs-4.1.4-no-first-message.patch, NONE, 1.1 autofs.spec,
	1.80, 1.81
Message-ID: <200606190713.k5J7DjRi016930@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16812

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-discard-bg-nofg-options.patch 
	autofs-4.1.4-no-first-message.patch 
Log Message:
* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-27
- Change LDAP message severity from crit to degug (bz# 183893).
- Add patch to ignore the "bg" and "fg" mount options as they
  aren't relevant for autofs mounts (bz# 184386).


autofs-4.1.4-discard-bg-nofg-options.patch:
 parse_sun.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE autofs-4.1.4-discard-bg-nofg-options.patch ---
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 43d6717..da5f63f 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -589,6 +589,9 @@ static int sun_mount(struct autofs_point
 				nonstrict = 0;
 			} else if (strncmp("nonstrict", cp, 9) == 0) {
 				nonstrict = 1;
+			} else if (strncmp("bg", cp, 2) == 0 ||
+				   strncmp("nofg", cp, 4) == 0) {
+				continue;
 			} else {
 				memcpy(np, cp, comma - cp + 1);
 				np += comma - cp + 1;

autofs-4.1.4-no-first-message.patch:
 lookup_ldap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE autofs-4.1.4-no-first-message.patch ---
--- autofs-4.1.4_beta2/modules/lookup_ldap.c.no-first-message	2005-06-27 23:41:03.000000000 +0800
+++ autofs-4.1.4_beta2/modules/lookup_ldap.c	2005-06-27 23:42:38.000000000 +0800
@@ -429,7 +429,7 @@ static int lookup_one(const char *root, 
 
 	e = ldap_first_entry(ldap, result);
 	if (!e) {
-		crit(MODPREFIX "got answer, but no first entry for %s", query);
+		debug(MODPREFIX "got answer, but no first entry for %s", query);
 		ldap_msgfree(result);
 		ldap_unbind(ldap);
 		return CHE_MISSING;
@@ -537,7 +537,7 @@ static int lookup_wild(const char *root,
 
 	e = ldap_first_entry(ldap, result);
 	if (!e) {
-		crit(MODPREFIX "got answer, but no first entry for %s", query);
+		debug(MODPREFIX "got answer, but no first entry for %s", query);
 		ldap_msgfree(result);
 		ldap_unbind(ldap);
 		return CHE_MISSING;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- autofs.spec	30 May 2006 04:10:45 -0000	1.80
+++ autofs.spec	19 Jun 2006 07:13:42 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 25
+%define release 27
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -39,6 +39,8 @@
 Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 Patch27: autofs-4.1.4-auto.smb-cifs.patch
 Patch28: autofs-4.1.4-get_best_mount-white-space.patch
+Patch29: autofs-4.1.4-discard-bg-nofg-options.patch
+Patch30:  autofs-4.1.4-no-first-message.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -106,6 +108,8 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -159,6 +163,11 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-27
+- Change LDAP message severity from crit to degug (bz# 183893).
+- Add patch to ignore the "bg" and "fg" mount options as they
+  aren't relevant for autofs mounts (bz# 184386).
+
 * Tue May 30 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-25
 - add patch to fix white space handling in get_best_mount
   function (bz #163999).



From fedora-cvs-commits at redhat.com  Mon Jun 19 07:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 03:46:27 -0400
Subject: rpms/ruby/FC-5 ruby.spec,1.59,1.60
Message-ID: <200606190746.k5J7kRTu017342@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16554

Modified Files:
	ruby.spec 
Log Message:
* Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-6.fc5
- fixed the wrong file list again. moved tcltk library into ruby-tcltk.
  (#194537)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ruby.spec	8 Jun 2006 08:03:07 -0000	1.59
+++ ruby.spec	19 Jun 2006 07:46:24 -0000	1.60
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	5.fc5
+Release:	6.fc5
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -321,11 +321,7 @@
 
 # for ruby-tcltk.rpm
 cp /dev/null ruby-tcltk.files
-for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/.ext/ -type f -name '*.so'`
-do
-  egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
-done
-for f in `find %{name}-%{version}/ext/tcltklib/lib -type f; find %{name}-%{version}/.ext -type f -name '*.so'`
+for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/ext/tk -type f -name '*.so'`
 do
   egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
 done
@@ -450,6 +446,10 @@
 %endif
 
 %changelog
+* Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-6.fc5
+- fixed the wrong file list again. moved tcltk library into ruby-tcltk.
+  (#194537)
+
 * Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5.fc5
 - ruby-deprecated-search-path.patch: applied to add more search path
   for backward compatibility.



From fedora-cvs-commits at redhat.com  Mon Jun 19 08:42:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 04:42:45 -0400
Subject: rpms/ruby/FC-5 ruby.spec,1.60,1.61
Message-ID: <200606190842.k5J8gjjO021807@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21774

Modified Files:
	ruby.spec 
Log Message:
correct bug#


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ruby.spec	19 Jun 2006 07:46:24 -0000	1.60
+++ ruby.spec	19 Jun 2006 08:42:39 -0000	1.61
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	6.fc5
+Release:	7.fc5
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -446,9 +446,9 @@
 %endif
 
 %changelog
-* Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-6.fc5
+* Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-7.fc5
 - fixed the wrong file list again. moved tcltk library into ruby-tcltk.
-  (#194537)
+  (#195872)
 
 * Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5.fc5
 - ruby-deprecated-search-path.patch: applied to add more search path



From fedora-cvs-commits at redhat.com  Mon Jun 19 08:43:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 04:43:41 -0400
Subject: rpms/autofs/FC-5 autofs-4.1.4-bad-key-len-fix.patch, NONE,
	1.1 autofs.spec, 1.81, 1.82
Message-ID: <200606190843.k5J8hfAL022050@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21994

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-bad-key-len-fix.patch 
Log Message:
* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-27
- Change LDAP message severity from crit to degug (bz# 183893).
- Add patch to ignore the "bg" and "fg" mount options as they
  aren't relevant for autofs mounts (bz# 184386).
- Add patch to fix key and mapent lenght check.


autofs-4.1.4-bad-key-len-fix.patch:
 lookup_file.c |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

--- NEW FILE autofs-4.1.4-bad-key-len-fix.patch ---
--- autofs-4.1.4/modules/lookup_file.c.bad-key-len-fix	2006-06-19 04:12:20.000000000 -0400
+++ autofs-4.1.4/modules/lookup_file.c	2006-06-19 04:33:55.000000000 -0400
@@ -99,7 +99,7 @@
 static int read_one(FILE *f, char *key, char *mapent)
 {
 	char *kptr, *p;
-	int mapent_len;
+	int mapent_len, key_len;
 	int ch, nch;
 	LOOKUP_STATE state;
 	FOUND_STATE getting, gotten;
@@ -107,7 +107,7 @@
 
 	kptr = key;
 	p = NULL;
-	mapent_len = 0;
+	mapent_len = key_len = 0;
 	state = st_begin;
 	memset(key, 0, KEY_MAX_LEN + 1);
 	memset(mapent, 0, MAPENT_MAX_LEN + 1);
@@ -147,9 +147,11 @@
 				else if (ch == '*') {
 					state = st_star;
 					*(kptr++) = ch;
+					key_len++;
 				} else {
 					state = st_compare;
 					*(kptr++) = ch;
+					key_len++;
 				}
 			} else if (escape == esc_char);
 			else
@@ -157,18 +159,24 @@
 			break;
 
 		case st_compare:
-			if (kptr - key > KEY_MAX_LEN) {
-				state = st_badent;
-				break;
-			}
 			if (ch == '\n')
 				state = st_begin;
 			else if (isspace(ch) && !escape) {
 				getting = got_real;
 				state = st_entspc;
 			} else if (escape == esc_char);
-			else
-				*(kptr++) = ch;
+			else {
+				if (key_len == KEY_MAX_LEN) {
+					state = st_badent;
+					error(MODPREFIX "Map key \"%s...\" "
+					      "is too long.  The maximum key "
+					      "length is %d", key,
+					      KEY_MAX_LEN);
+				} else {
+					*(kptr++) = ch;
+					key_len++;
+				}
+			}
 			break;
 
 		case st_star:
@@ -211,6 +219,12 @@
 				   (gotten == got_real || gotten == getting))
 				   	goto got_it;
 				ungetc(nch, f);
+			} else {
+				error(MODPREFIX "Map entry \"%s...\" for key "
+				      "\"%s\" is too long.  The maximum entry"
+				      " size is %d", mapent, key,
+				      MAPENT_MAX_LEN);
+				state = st_badent
 			}
 			break;
 		}
@@ -225,7 +239,7 @@
 	      next:
 		kptr = key;
 		p = NULL;
-		mapent_len = 0;
+		mapent_len = key_len = 0;
 		memset(key, 0, KEY_MAX_LEN + 1);
 		memset(mapent, 0, MAPENT_MAX_LEN + 1);
 		getting = gotten = got_nothing;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- autofs.spec	19 Jun 2006 07:13:42 -0000	1.81
+++ autofs.spec	19 Jun 2006 08:43:38 -0000	1.82
@@ -40,7 +40,8 @@
 Patch27: autofs-4.1.4-auto.smb-cifs.patch
 Patch28: autofs-4.1.4-get_best_mount-white-space.patch
 Patch29: autofs-4.1.4-discard-bg-nofg-options.patch
-Patch30:  autofs-4.1.4-no-first-message.patch
+Patch30: autofs-4.1.4-no-first-message.patch
+Patch31: autofs-4.1.4-bad-key-len-fix.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -110,6 +111,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -167,6 +169,7 @@
 - Change LDAP message severity from crit to degug (bz# 183893).
 - Add patch to ignore the "bg" and "fg" mount options as they
   aren't relevant for autofs mounts (bz# 184386).
+- Add patch to fix key and mapent lenght check.
 
 * Tue May 30 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-25
 - add patch to fix white space handling in get_best_mount



From fedora-cvs-commits at redhat.com  Mon Jun 19 08:49:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 04:49:54 -0400
Subject: rpms/autofs/FC-5 autofs-4.1.4-bad-key-len-fix.patch, 1.1,
	1.2 autofs.spec, 1.82, 1.83
Message-ID: <200606190849.k5J8ns5g006299@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6148

Modified Files:
	autofs-4.1.4-bad-key-len-fix.patch autofs.spec 
Log Message:
- fix bad key len patch.


autofs-4.1.4-bad-key-len-fix.patch:
 lookup_file.c |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

Index: autofs-4.1.4-bad-key-len-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs-4.1.4-bad-key-len-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-4.1.4-bad-key-len-fix.patch	19 Jun 2006 08:43:38 -0000	1.1
+++ autofs-4.1.4-bad-key-len-fix.patch	19 Jun 2006 08:49:51 -0000	1.2
@@ -1,5 +1,5 @@
---- autofs-4.1.4/modules/lookup_file.c.bad-key-len-fix	2006-06-19 04:12:20.000000000 -0400
-+++ autofs-4.1.4/modules/lookup_file.c	2006-06-19 04:33:55.000000000 -0400
+--- autofs-4.1.4/modules/lookup_file.c.bad-key-len-fix	2006-06-19 04:46:40.000000000 -0400
++++ autofs-4.1.4/modules/lookup_file.c	2006-06-19 04:47:51.000000000 -0400
 @@ -99,7 +99,7 @@
  static int read_one(FILE *f, char *key, char *mapent)
  {
@@ -70,7 +70,7 @@
 +				      "\"%s\" is too long.  The maximum entry"
 +				      " size is %d", mapent, key,
 +				      MAPENT_MAX_LEN);
-+				state = st_badent
++				state = st_badent;
  			}
  			break;
  		}


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- autofs.spec	19 Jun 2006 08:43:38 -0000	1.82
+++ autofs.spec	19 Jun 2006 08:49:51 -0000	1.83
@@ -111,7 +111,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
+%patch31 -p1 -b .bad-key-len-fix
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -169,7 +169,7 @@
 - Change LDAP message severity from crit to degug (bz# 183893).
 - Add patch to ignore the "bg" and "fg" mount options as they
   aren't relevant for autofs mounts (bz# 184386).
-- Add patch to fix key and mapent lenght check.
+- Add patch to fix key and mapent length check.
 
 * Tue May 30 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-25
 - add patch to fix white space handling in get_best_mount



From fedora-cvs-commits at redhat.com  Mon Jun 19 08:50:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 04:50:08 -0400
Subject: rpms/scim-pinyin/FC-5 scim-pinyin.spec,1.14,1.15
Message-ID: <200606190850.k5J8o83F006408@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6287

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: rebuilt



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/FC-5/scim-pinyin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-pinyin.spec	14 Jun 2006 03:48:30 -0000	1.14
+++ scim-pinyin.spec	19 Jun 2006 08:50:06 -0000	1.15
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Jun 19 2006 Qian Shen <qshen at redhat.com>
+- rebuilt
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 08:56:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 04:56:06 -0400
Subject: rpms/scim-pinyin/FC-5 scim-pinyin.spec,1.15,1.16
Message-ID: <200606190856.k5J8u69u008827@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8713

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: update the release number



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/FC-5/scim-pinyin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-pinyin.spec	19 Jun 2006 08:50:06 -0000	1.15
+++ scim-pinyin.spec	19 Jun 2006 08:56:04 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        4%{?dist}.4
+Release:        4%{?dist}.5
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL



From fedora-cvs-commits at redhat.com  Mon Jun 19 08:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 04:57:56 -0400
Subject: rpms/autofs/FC-4 autofs-4.1.4-bad-key-len-fix.patch, NONE,
	1.1 autofs-4.1.4-discard-bg-nofg-options.patch, NONE,
	1.1 autofs-4.1.4-no-first-message.patch, NONE, 1.1 autofs.spec,
	1.70, 1.71
Message-ID: <200606190857.k5J8vua9009612@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9540

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-bad-key-len-fix.patch 
	autofs-4.1.4-discard-bg-nofg-options.patch 
	autofs-4.1.4-no-first-message.patch 
Log Message:
* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-26
- Change LDAP message severity from crit to degug (bz# 183893).
- Add patch to ignore the "bg" and "fg" mount options as they
  aren't relevant for autofs mounts (bz# 184386).
- Add patch to fix key and mapent length check.


autofs-4.1.4-bad-key-len-fix.patch:
 lookup_file.c |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

--- NEW FILE autofs-4.1.4-bad-key-len-fix.patch ---
--- autofs-4.1.4/modules/lookup_file.c.bad-key-len-fix	2006-06-19 04:46:40.000000000 -0400
+++ autofs-4.1.4/modules/lookup_file.c	2006-06-19 04:47:51.000000000 -0400
@@ -99,7 +99,7 @@
 static int read_one(FILE *f, char *key, char *mapent)
 {
 	char *kptr, *p;
-	int mapent_len;
+	int mapent_len, key_len;
 	int ch, nch;
 	LOOKUP_STATE state;
 	FOUND_STATE getting, gotten;
@@ -107,7 +107,7 @@
 
 	kptr = key;
 	p = NULL;
-	mapent_len = 0;
+	mapent_len = key_len = 0;
 	state = st_begin;
 	memset(key, 0, KEY_MAX_LEN + 1);
 	memset(mapent, 0, MAPENT_MAX_LEN + 1);
@@ -147,9 +147,11 @@
 				else if (ch == '*') {
 					state = st_star;
 					*(kptr++) = ch;
+					key_len++;
 				} else {
 					state = st_compare;
 					*(kptr++) = ch;
+					key_len++;
 				}
 			} else if (escape == esc_char);
 			else
@@ -157,18 +159,24 @@
 			break;
 
 		case st_compare:
-			if (kptr - key > KEY_MAX_LEN) {
-				state = st_badent;
-				break;
-			}
 			if (ch == '\n')
 				state = st_begin;
 			else if (isspace(ch) && !escape) {
 				getting = got_real;
 				state = st_entspc;
 			} else if (escape == esc_char);
-			else
-				*(kptr++) = ch;
+			else {
+				if (key_len == KEY_MAX_LEN) {
+					state = st_badent;
+					error(MODPREFIX "Map key \"%s...\" "
+					      "is too long.  The maximum key "
+					      "length is %d", key,
+					      KEY_MAX_LEN);
+				} else {
+					*(kptr++) = ch;
+					key_len++;
+				}
+			}
 			break;
 
 		case st_star:
@@ -211,6 +219,12 @@
 				   (gotten == got_real || gotten == getting))
 				   	goto got_it;
 				ungetc(nch, f);
+			} else {
+				error(MODPREFIX "Map entry \"%s...\" for key "
+				      "\"%s\" is too long.  The maximum entry"
+				      " size is %d", mapent, key,
+				      MAPENT_MAX_LEN);
+				state = st_badent;
 			}
 			break;
 		}
@@ -225,7 +239,7 @@
 	      next:
 		kptr = key;
 		p = NULL;
-		mapent_len = 0;
+		mapent_len = key_len = 0;
 		memset(key, 0, KEY_MAX_LEN + 1);
 		memset(mapent, 0, MAPENT_MAX_LEN + 1);
 		getting = gotten = got_nothing;

autofs-4.1.4-discard-bg-nofg-options.patch:
 parse_sun.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE autofs-4.1.4-discard-bg-nofg-options.patch ---
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 43d6717..da5f63f 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -589,6 +589,9 @@ static int sun_mount(struct autofs_point
 				nonstrict = 0;
 			} else if (strncmp("nonstrict", cp, 9) == 0) {
 				nonstrict = 1;
+			} else if (strncmp("bg", cp, 2) == 0 ||
+				   strncmp("nofg", cp, 4) == 0) {
+				continue;
 			} else {
 				memcpy(np, cp, comma - cp + 1);
 				np += comma - cp + 1;

autofs-4.1.4-no-first-message.patch:
 lookup_ldap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE autofs-4.1.4-no-first-message.patch ---
--- autofs-4.1.4_beta2/modules/lookup_ldap.c.no-first-message	2005-06-27 23:41:03.000000000 +0800
+++ autofs-4.1.4_beta2/modules/lookup_ldap.c	2005-06-27 23:42:38.000000000 +0800
@@ -429,7 +429,7 @@ static int lookup_one(const char *root, 
 
 	e = ldap_first_entry(ldap, result);
 	if (!e) {
-		crit(MODPREFIX "got answer, but no first entry for %s", query);
+		debug(MODPREFIX "got answer, but no first entry for %s", query);
 		ldap_msgfree(result);
 		ldap_unbind(ldap);
 		return CHE_MISSING;
@@ -537,7 +537,7 @@ static int lookup_wild(const char *root,
 
 	e = ldap_first_entry(ldap, result);
 	if (!e) {
-		crit(MODPREFIX "got answer, but no first entry for %s", query);
+		debug(MODPREFIX "got answer, but no first entry for %s", query);
 		ldap_msgfree(result);
 		ldap_unbind(ldap);
 		return CHE_MISSING;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-4/autofs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- autofs.spec	30 May 2006 04:05:52 -0000	1.70
+++ autofs.spec	19 Jun 2006 08:57:53 -0000	1.71
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 24
+%define release 26
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -39,6 +39,9 @@
 Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 Patch27: autofs-4.1.4-auto.smb-cifs.patch
 Patch28: autofs-4.1.4-get_best_mount-white-space.patch
+Patch29: autofs-4.1.4-discard-bg-nofg-options.patch
+Patch30: autofs-4.1.4-no-first-message.patch
+Patch31: autofs-4.1.4-bad-key-len-fix.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -106,6 +109,9 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -159,6 +165,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-26
+- Change LDAP message severity from crit to degug (bz# 183893).
+- Add patch to ignore the "bg" and "fg" mount options as they
+  aren't relevant for autofs mounts (bz# 184386).
+- Add patch to fix key and mapent length check.
+
 * Tue May 30 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-24
 - add patch to fix white space handling in get_best_mount
   function (bz #163999).



From fedora-cvs-commits at redhat.com  Mon Jun 19 12:41:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 08:41:24 -0400
Subject: rpms/kdepim/FC-5 kdepim.spec,1.88,1.89
Message-ID: <200606191241.k5JCfOqL007644@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7594

Modified Files:
	kdepim.spec 
Log Message:
BR: cyrus-sasl-devel, #195500



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdepim.spec	9 Jun 2006 18:49:50 -0000	1.88
+++ kdepim.spec	19 Jun 2006 12:41:21 -0000	1.89
@@ -11,14 +11,13 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
-Prefix: /usr
 Epoch: 6
 Group: Applications/Productivity
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -45,15 +44,17 @@
 BuildRequires: flex
 BuildRequires: desktop-file-utils
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
-BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: zlib-devel
 BuildRequires: libart_lgpl-devel
 BuildRequires: audiofile-devel
+BuildRequires: cyrus-sasl-devel
+BuildRequires: lockdev-devel
 %if %{arts}
 BuildRequires: arts-devel >= %{arts_version}
 %endif
-%ifarch %{ix86} alpha ppc x86_64
+%ifnarch s390 s390x
 BuildRequires: pilot-link-devel >= 0.11
+BuildRequires: bluez-libs-devel
 %endif
 %if %{make_cvs}
 BuildRequires: autoconf automake libtool
@@ -62,40 +63,6 @@
 %description
 A PIM (Personal Information Manager) for KDE.
 
-%package pilot
-Summary: KDE support for synchronizing data with a Palm(tm) or compatible PDA
-Group: Applications/Productivity
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description pilot
-KDE support for synchronizing data with a Palm(tm) or compatible PDA.
-
-%package cellphone
-Summary: KDE support for synchronizing data with cellphones
-Group: Applications/Productivity
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description cellphone
-KDE support for synchronizing data with cellphones.
-Install %{name}-cellphone if you want to use %{name} and have a cellphone.
-
-%package -n karm
-Summary: Time tracking tool
-Group: Applications/Productivity
-
-%description -n karm
-KArm - Punjambi language for "work" - tracks time spent on various tasks.
-It is useful for tracking hours to be billed to different clients.
-
-%package -n knotes
-Summary: Post-It notes on the desktop
-Group: Applications/Productivity
-
-%description -n knotes
-KNotes allows you to place Post-It notes on your desktop.
-In addition to serving as a reminder, KNotes can mail and print your notes,
-and accept drag and drop even from remote sites.
-
 %package devel
 Summary: Development files for kdepim
 Group: Development/Libraries
@@ -126,10 +93,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="%{optflags}"
-export KDEDIR=%{prefix}
-export CFLAGS="$FLAGS "
-export CXXFLAGS="$FLAGS "
 
 cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src
 
@@ -154,8 +117,9 @@
 %if %{final}
    --enable-final \
 %endif
-   --with-qt-libraries=$QTDIR/lib \
-   --includedir=%{_includedir}/kde
+   --includedir=%{_includedir}/kde \
+   --with-sasl \
+   --with-gpg=%{_bindir}/gpg
 
 make %{?_smp_mflags}
 
@@ -179,9 +143,21 @@
    fi
 done
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -212,6 +188,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
+- BR: cyrus-sasl-devel, #195500 
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 14:12:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 10:12:18 -0400
Subject: rpms/irda-utils/devel irda-utils-0.9.17-makefile.patch, NONE,
	1.1 irda-utils-0.9.17-rootonly.patch, NONE,
	1.1 irda-utils-0.9.17-smcdisable.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 irda-utils.spec, 1.23, 1.24 sources, 1.6,
	1.7 irda-utils-0.9.16-glib2.patch, 1.1,
	NONE irda-utils-0.9.16-rootonly.patch, 1.1, NONE
Message-ID: <200606191412.k5JECIDE009724@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/irda-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9585

Modified Files:
	.cvsignore irda-utils.spec sources 
Added Files:
	irda-utils-0.9.17-makefile.patch 
	irda-utils-0.9.17-rootonly.patch 
	irda-utils-0.9.17-smcdisable.patch 
Removed Files:
	irda-utils-0.9.16-glib2.patch irda-utils-0.9.16-rootonly.patch 
Log Message:
- update to 0.9.17
- makefile fixes
- disable smcinit
- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted


irda-utils-0.9.17-makefile.patch:
 Makefile          |    5 +++--
 irdadump/Makefile |    9 +++++----
 irnetd/Makefile   |    2 +-
 psion/Makefile    |    4 ++--
 smcinit/smcinit.c |    2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE irda-utils-0.9.17-makefile.patch ---
--- irda-utils-0.9.17/irdadump/Makefile.rh3	2006-03-09 07:25:23.000000000 +0100
+++ irda-utils-0.9.17/irdadump/Makefile	2006-06-01 14:47:25.000000000 +0200
@@ -8,8 +8,8 @@
 
 RM_CMD = $(ECMD)$(RM) *.BAK *.bak *.o ,* *~ *.a
 
-INCLUDES  = $(SYS_INCLUDES) -I../include/
-LIBRARIES = $(SYS_LIBRARIES)
+INCLUDES  = $(SYS_INCLUDES) -I../include/ -I. `pkg-config --cflags glib-2.0`
+LIBRARIES = $(SYS_LIBRARIES) `pkg-config --cflags --libs glib-2.0`
 LIBPATH   = $(SYS_LIBPATH)
 
 #
@@ -27,7 +27,7 @@
 LIBIRDADUMP_TARGET = lib_irdadump.a
 IRDADUMP_TARGET = irdadump
 
-all: lib_irdadump.a irdadump
+all:  irdadump  lib_irdadump.a
 
 
 lib_irdadump.a: $(LIBIRDADUMP_OBJS)
@@ -40,7 +40,8 @@
 
 irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
 	$(prn_cc_o)
-	$(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+	$(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+	#$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
 
 
 .c.o:
--- irda-utils-0.9.17/irnetd/Makefile.rh3	2006-03-09 07:25:19.000000000 +0100
+++ irda-utils-0.9.17/irnetd/Makefile	2006-06-01 14:47:25.000000000 +0200
@@ -55,7 +55,7 @@
 
 install: irnetd
 	$(prn_install)
-	$(ECMD) install irnetd /usr/sbin/
+	$(ECMD) install irnetd $(ROOT)/usr/sbin/
 
 
 clean:
--- irda-utils-0.9.17/Makefile.rh3	2006-03-09 07:25:27.000000000 +0100
+++ irda-utils-0.9.17/Makefile	2006-06-01 14:48:21.000000000 +0200
@@ -28,10 +28,11 @@
 TARGET = test
 
 DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit
-CFLAGS= -O2 -W -Wall
+CFLAGS = -O2 -W -Wall
+INCLUDES = -I/usr/include/glib-2.0 -I./include -I.
 
 all:
-	@-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+	@-(set -e ; for d in $(DIRS) ; do $(MAKE) $(INCLUDES) $(MAKE_OUTPUT) -C $$d $@ ; done)
 
 
 install:
--- irda-utils-0.9.17/psion/Makefile.rh3	2006-03-09 07:25:19.000000000 +0100
+++ irda-utils-0.9.17/psion/Makefile	2006-06-01 14:47:25.000000000 +0200
@@ -5,6 +5,7 @@
 PSION_SRC= irpsion5.c
 PSION_OBJS= irpsion5.o
 PSION_TARGETS= irpsion5
+CFLAGS= -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
 
 all: $(PSION_TARGETS)
 
@@ -22,7 +23,6 @@
 	$(ECMD)install $(PSION_TARGETS) $(ROOT)/usr/bin
 
 
-CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
 irpsion5: 
 	$(prn_cc_o)
-	$(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
\ Kein Zeilenumbruch am Dateiende.
+	$(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@
--- irda-utils-0.9.17/smcinit/smcinit.c.rh3	2006-03-09 07:25:24.000000000 +0100
+++ irda-utils-0.9.17/smcinit/smcinit.c	2006-06-01 14:47:25.000000000 +0200
@@ -262,7 +262,7 @@
 	 */
 	struct pci_access *acc;
 	struct pci_dev *dev;
-	word twobyte;
+	u16 twobyte;
 	int i = 0, chip = 0;
 	int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma;
 	unsigned int *address, SMC_BASE = 0;

irda-utils-0.9.17-rootonly.patch:
 main.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE irda-utils-0.9.17-rootonly.patch ---
--- irda-utils-0.9.17/irdadump/main.c.root	2006-06-01 12:53:34.000000000 +0200
+++ irda-utils-0.9.17/irdadump/main.c	2006-06-01 12:54:03.000000000 +0200
@@ -72,6 +72,11 @@
 	char *readfilename = NULL;
 	int fd, c;
 
+    if(geteuid()) {
+        puts("You need to be root to run this utility.\n");
+        return 1;
+    }
+
 	while ((c = getopt(argc, argv, "bc:di:lpr:s:tvw:x?")) != -1) {
 		switch (c) {
 		case 'b': /* Dumb bytes */

irda-utils-0.9.17-smcdisable.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE irda-utils-0.9.17-smcdisable.patch ---
--- irda-utils-0.9.17/Makefile.smcdisable	2006-06-01 14:49:01.000000000 +0200
+++ irda-utils-0.9.17/Makefile	2006-06-01 14:48:52.000000000 +0200
@@ -27,7 +27,7 @@
 
 TARGET = test
 
-DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit
+DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump
 CFLAGS = -O2 -W -Wall
 INCLUDES = -I/usr/include/glib-2.0 -I./include -I.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 06:25:58 -0000	1.6
+++ .cvsignore	19 Jun 2006 14:12:16 -0000	1.7
@@ -1 +1,2 @@
 irda-utils-0.9.16.tar.gz
+irda-utils-0.9.17-manpages.tgz


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- irda-utils.spec	3 Apr 2006 09:14:19 -0000	1.23
+++ irda-utils.spec	19 Jun 2006 14:12:16 -0000	1.24
@@ -1,23 +1,29 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
-Version: 0.9.16
-Release: 8
-Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz
+Version: 0.9.17
+Release: 1
+# Download-URL: 
+#  http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download
+Source: irda-utils-%{version}.tar.gz
+# Temporary, until upstream releases a tarball with fixed manpages. These 
+# have been extracted from irda-utils-0.9.17-pre3
+Source1: irda-utils-%{version}-manpages.tgz
 Patch1: irda-utils-0.9.14-chkconfig.patch
 Patch2: irda-utils-0.9.14-typo.patch
 Patch3: irda-utils-0.9.13-i18n.patch
-Patch4: irda-utils-0.9.16-rootonly.patch
+Patch4: irda-utils-0.9.17-rootonly.patch
 Patch5: irda-utils-0.9.15-rh1.patch
 Patch6: irda-utils-0.9.16-rh2.patch
-Patch7: irda-utils-0.9.16-glib2.patch
-Patch8: irda-utils-0.9.16-io.patch
+Patch7: irda-utils-0.9.16-io.patch
+Patch8: irda-utils-0.9.17-makefile.patch
+Patch9: irda-utils-0.9.17-smcdisable.patch
 Url: http://irda.sourceforge.net/
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
 Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4
 ExcludeArch: s390 s390x
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel, libtool, automake, docbook-utils
 
 %description
 IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -38,14 +44,17 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .chkconfig
-%patch2 -p1 -b .typo
-%patch3 -p1 -b .i18n
-%patch4 -p1 -b .root
-%patch5 -p1 -b .rh1
-%patch6 -p1 -b .rh2
-%patch7 -p1 -b .glib2
-%patch8 -p1 -b .io
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1 -b .rh3
+%patch9 -p1
+echo $PWD
+tar xvf %{SOURCE1}
 
 %build
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS"
@@ -65,7 +74,7 @@
 mv etc/modules.conf.irda etc/modprobe.conf.irda
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add irda
@@ -89,6 +98,12 @@
 %doc tekram/README.tekram
 
 %changelog
+* Mon Jun 19 2006 Karsten Hopp <karsten at redhat.de> 0.9.17-1
+- update to 0.9.17
+- makefile fixes
+- disable smcinit
+- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted
+
 * Mon Apr 03 2006 Karsten Hopp <karsten at redhat.de> 0.9.16-8
 - don't use asm/io.h directly (Bastien Nocera #186875)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 06:25:58 -0000	1.6
+++ sources	19 Jun 2006 14:12:16 -0000	1.7
@@ -1 +1,2 @@
-2ff18f0571b5a331be7cd22fc3decd41  irda-utils-0.9.16.tar.gz
+65f9be306d2367996e27264ef0b70bd4  irda-utils-0.9.17.tar.gz
+77686ddf12ee1ec1b4f1a48586d6a9d3  irda-utils-0.9.17-manpages.tgz


--- irda-utils-0.9.16-glib2.patch DELETED ---


--- irda-utils-0.9.16-rootonly.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 19 14:15:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 10:15:35 -0400
Subject: rpms/irda-utils/devel .cvsignore,1.7,1.8
Message-ID: <200606191415.k5JEFZ5J011128@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/irda-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11063

Modified Files:
	.cvsignore 
Log Message:
upload new tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jun 2006 14:12:16 -0000	1.7
+++ .cvsignore	19 Jun 2006 14:15:32 -0000	1.8
@@ -1,2 +1,2 @@
-irda-utils-0.9.16.tar.gz
+irda-utils-0.9.17.tar.gz
 irda-utils-0.9.17-manpages.tgz



From fedora-cvs-commits at redhat.com  Mon Jun 19 14:36:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 10:36:45 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.203,
	1.204 policycoreutils.spec, 1.285, 1.286
Message-ID: <200606191436.k5JEajxe031955@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31898

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-2
- Allow setsebool to use on/off
- Update translations


policycoreutils-rhat.patch:
 po/hi.po              |   33 +++----
 po/mr.po              |   86 +++++++++++-------
 po/ms.po              |  232 ++++++++++++++++++++++++++++++++------------------
 setsebool/setsebool.8 |    3 
 setsebool/setsebool.c |    6 -
 5 files changed, 225 insertions(+), 135 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- policycoreutils-rhat.patch	16 Jun 2006 19:27:55 -0000	1.203
+++ policycoreutils-rhat.patch	19 Jun 2006 14:36:40 -0000	1.204
@@ -1,6 +1,88 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.14/po/hi.po
+--- nsapolicycoreutils/po/hi.po	2006-06-16 15:08:24.000000000 -0400
++++ policycoreutils-1.30.14/po/hi.po	2006-06-19 10:34:57.000000000 -0400
+@@ -7,15 +7,15 @@
+ msgstr ""
+ "Project-Id-Version: hi\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2006-06-16 09:51-0400\n"
+-"PO-Revision-Date: 2006-05-09 15:25+0530\n"
++"POT-Creation-Date: 2006-05-26 13:48-0400\n"
++"PO-Revision-Date: 2006-06-19 11:09+0530\n"
+ "Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
+ "Language-Team: Hindi <fedora-trans-hi at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: KBabel 1.9.1\n"
+-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+ "\n"
+ 
+ #: ../load_policy/load_policy.c:22
+@@ -361,42 +361,40 @@
+ msgstr "chcat -l +CompanyConfidential juser"
+ 
+ #: ../semanage/semanage:122
+-#, fuzzy
+ msgid "Requires 2 or more arguments"
+-msgstr "?????????????????? ?????? ?????????????????? ???????????????"
++msgstr "2 ?????????????????? ???????????? ???????????????"
+ 
+ #: ../semanage/semanage:127
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s not defined"
+-msgstr "??????????????? %s/%s ???????????????????????? ???????????? ??????"
++msgstr "%s ???????????????????????? ????????????"
+ 
+ #: ../semanage/semanage:151
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s not valid for %s objects\n"
+-msgstr "%s ?????? ????????? ?????????????????? ???????????? ??????\n"
++msgstr "%s ????????? ???????????? ?????? %s ??????????????? ?????? ????????????\n"
+ 
+ #: ../semanage/semanage:178 ../semanage/semanage:186
+-#, fuzzy
+ msgid "range not supported on Non MLS machines"
+-msgstr "?????????-MLS ???????????? ?????? ?????????????????? ????????????????????? ????????????"
++msgstr "?????????-MLS ???????????? ?????? ??????????????? ????????????????????? ????????????"
+ 
+ #: ../semanage/semanage:244
+ msgid "You must specify a role"
+-msgstr ""
++msgstr "?????? ???????????? ?????? ?????????????????? ??????????????????????????? ????????????"
+ 
+ #: ../semanage/semanage:246
+ msgid "You must specify a prefix"
+-msgstr ""
++msgstr "?????? ???????????? ?????? ?????????????????? ??????????????????????????? ????????????"
+ 
+ #: ../semanage/semanage:295
+-#, fuzzy, c-format
++#, c-format
+ msgid "Options Error %s "
+-msgstr "?????????????????? ??????????????????: %s "
++msgstr "?????????????????? ?????????????????? %s"
+ 
+ #: ../semanage/semanage:299
+-#, fuzzy, c-format
++#, c-format
+ msgid "Invalid value %s"
+-msgstr "???????????? ???????????? '%s' "
++msgstr "???????????? ????????? %s"
+ 
+ #: ../semanage/seobject.py:124
+ msgid "translations not supported on non-MLS machines"
+@@ -971,3 +969,4 @@
+ #, c-format
+ msgid "Options Error: %s "
+ msgstr "?????????????????? ??????????????????: %s "
++
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.30.14/po/mr.po
 --- nsapolicycoreutils/po/mr.po	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/po/mr.po	2006-06-16 15:22:02.000000000 -0400
++++ policycoreutils-1.30.14/po/mr.po	2006-06-19 10:31:00.000000000 -0400
 @@ -1,20 +1,21 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -238,7 +320,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.14/po/ms.po
 --- nsapolicycoreutils/po/ms.po	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/po/ms.po	2006-06-16 15:22:28.000000000 -0400
++++ policycoreutils-1.30.14/po/ms.po	2006-06-19 10:31:00.000000000 -0400
 @@ -7,8 +7,8 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -787,3 +869,34 @@
  msgid "Options Error: %s "
  msgstr "Ralat Pilihan: %s"
 +
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8
+--- nsapolicycoreutils/setsebool/setsebool.8	2006-05-15 09:42:58.000000000 -0400
++++ policycoreutils-1.30.14/setsebool/setsebool.8	2006-06-19 10:32:36.000000000 -0400
+@@ -9,8 +9,7 @@
+ .SH "DESCRIPTION"
+ .B setsebool 
+ sets the current state of a particular SELinux boolean or a list of booleans 
+-to a given value. The value may be 1 or true to enable the boolean, or 0 or 
+-false to disable it. 
++to a given value. The value may be 1 or true or on to enable the boolean, or 0 or false or off to disable it. 
+ 
+ Without the -P option, only the current boolean value is 
+ affected; the boot-time default settings 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.30.14/setsebool/setsebool.c
+--- nsapolicycoreutils/setsebool/setsebool.c	2006-06-16 15:08:24.000000000 -0400
++++ policycoreutils-1.30.14/setsebool/setsebool.c	2006-06-19 10:32:04.000000000 -0400
+@@ -197,10 +197,12 @@
+ 		*value_ptr = 0;
+ 		value_ptr++;
+ 		if (strcmp(value_ptr, "1") == 0 || 
+-				strcasecmp(value_ptr, "true") == 0)
++		    strcasecmp(value_ptr, "true") == 0 ||
++		    strcasecmp(value_ptr, "on") == 0)
+ 			value = 1;
+ 		else if (strcmp(value_ptr, "0") == 0 || 
+-				strcasecmp(value_ptr, "false") == 0)
++			 strcasecmp(value_ptr, "false") == 0 ||
++			 strcasecmp(value_ptr, "off") == 0)
+ 			value = 0;
+ 		else {
+ 			fprintf(stderr, "setsebool: illegal value "


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- policycoreutils.spec	16 Jun 2006 19:27:55 -0000	1.285
+++ policycoreutils.spec	19 Jun 2006 14:36:43 -0000	1.286
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.14
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -111,6 +111,10 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-2
+- Allow setsebool to use on/off
+- Update translations
+
 * Fri Jun 16 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-1
 - Update to upstream
 	* Merged fix for setsebool error path from Serge Hallyn.



From fedora-cvs-commits at redhat.com  Mon Jun 19 15:08:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 11:08:25 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.67,1.68
Message-ID: <200606191508.k5JF8P0k023808@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23727

Modified Files:
	rhythmbox.spec 
Log Message:
fix file lists



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- rhythmbox.spec	19 Jun 2006 13:21:54 -0000	1.67
+++ rhythmbox.spec	19 Jun 2006 15:08:22 -0000	1.68
@@ -26,7 +26,7 @@
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gettext, scrollkeeper
 BuildRequires: totem-devel >= 1.1.5
-BuildRequires: gnome-vfs2 >= 2.7.4
+BuildRequires: gnome-vfs2-devel >= 2.7.4
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: dbus-devel >= 0.60
@@ -120,7 +120,6 @@
 %{_datadir}/omf/rhythmbox/*
 %{_datadir}/idl/Rhythmbox.idl
 %{_datadir}/mime-info/rhythmbox.keys
-%{_libdir}/bonobo/servers/*.server
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
 %{_libdir}/pkgconfig/rhythmbox.pc
 %{_libdir}/rhythmbox/plugins



From fedora-cvs-commits at redhat.com  Mon Jun 19 15:29:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 11:29:04 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.68,1.69
Message-ID: <200606191529.k5JFT4be018660@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18647

Modified Files:
	rhythmbox.spec 
Log Message:
remove bonobo



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- rhythmbox.spec	19 Jun 2006 15:08:22 -0000	1.68
+++ rhythmbox.spec	19 Jun 2006 15:29:01 -0000	1.69
@@ -56,7 +56,6 @@
 /usr/bin/gst-inspect-0.10 --print-all
 
 %configure \
-	--with-bonobo \
 	--with-ipod \
 	--with-dbus \
 	--with-mdns=avahi \



From fedora-cvs-commits at redhat.com  Mon Jun 19 15:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 11:57:41 -0400
Subject: rpms/cman/devel cman.spec,1.36,1.37
Message-ID: <200606191557.k5JFvfqe018045@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18013

Modified Files:
	cman.spec 
Log Message:
Bumped rev for rebuild.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cman.spec	15 Jun 2006 20:25:27 -0000	1.36
+++ cman.spec	19 Jun 2006 15:57:39 -0000	1.37
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 2.0.0
-Release: 0.fc6.9
+Release: 0.fc6.10
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Mon Jun 19 15:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 11:57:43 -0400
Subject: rpms/nfs-utils-lib/FC-5 nfs-utils-lib.spec,1.9,1.10
Message-ID: <200606191557.k5JFvhBP018059@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17858

Modified Files:
	nfs-utils-lib.spec 
Log Message:
Added openldap to BuildRequires and Requires 



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/nfs-utils-lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nfs-utils-lib.spec	16 Jun 2006 20:49:37 -0000	1.9
+++ nfs-utils-lib.spec	19 Jun 2006 15:57:40 -0000	1.10
@@ -17,10 +17,10 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext
-BuildRequires: libgssapi-devel >= 0.9
+BuildRequires: libgssapi-devel >= 0.9, openldap-devel
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-Requires: libgssapi >= 0.9
+Requires: libgssapi >= 0.9, openldap
 
 %description
 Support libaries that are needed by the commands and 



From fedora-cvs-commits at redhat.com  Mon Jun 19 16:10:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 12:10:10 -0400
Subject: rpms/sendmail/devel sendmail-8.13.7-pid.patch, NONE, 1.1 .cvsignore,
	1.17, 1.18 sendmail.spec, 1.67, 1.68 sources, 1.17, 1.18
Message-ID: <200606191610.k5JGAAdA020305@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20168

Modified Files:
	.cvsignore sendmail.spec sources 
Added Files:
	sendmail-8.13.7-pid.patch 
Log Message:
i[tw]
- new version 8.13.7 (#195282)
- fixes CVE-2006-1173 (VU#146718): possible denial of service issue caused by
  malformed multipart messages (#195776)


sendmail-8.13.7-pid.patch:
 submit.mc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE sendmail-8.13.7-pid.patch ---
--- sendmail-8.13.7/cf/cf/submit.mc.pid	2006-04-05 07:54:41.000000000 +0200
+++ sendmail-8.13.7/cf/cf/submit.mc	2006-06-19 18:07:11.000000000 +0200
@@ -15,12 +15,16 @@
 #
 
 divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $')
+include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
+VERSIONID(`linux setup')dnl
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
 define(`confTIME_ZONE', `USE_TZ')dnl
 define(`confDONT_INIT_GROUPS', `True')dnl
+define(`confPID_FILE', `/var/run/sm-client.pid')dnl
+dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
+FEATURE(`use_ct_file')dnl
 dnl
 dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
 FEATURE(`msp', `[127.0.0.1]')dnl


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Mar 2006 17:34:16 -0000	1.17
+++ .cvsignore	19 Jun 2006 16:10:07 -0000	1.18
@@ -4,3 +4,4 @@
 sendmail.8.13.4.tar.gz
 sendmail.8.13.5.tar.gz
 sendmail.8.13.6.tar.gz
+sendmail.8.13.7.tar.gz


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sendmail.spec	22 Mar 2006 17:37:38 -0000	1.67
+++ sendmail.spec	19 Jun 2006 16:10:07 -0000	1.68
@@ -17,7 +17,7 @@
 
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
-Version: 8.13.6
+Version: 8.13.7
 Release: 1
 License: Sendmail
 Group: System Environment/Daemons
@@ -37,7 +37,7 @@
 Patch3: sendmail-8.12.2-makemapman.patch
 Patch4: sendmail-8.13.2-smrsh-paths.patch
 Patch5: sendmail-8.12.2-movefiles.patch
-Patch7: sendmail-8.13.0-pid.patch
+Patch7: sendmail-8.13.7-pid.patch
 Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.13.6-dynamic.patch
@@ -47,6 +47,7 @@
 BuildRequires: db4-devel
 BuildRequires: hesiod-devel
 BuildRequires: groff
+BuildRequires: m4
 PreReq: /usr/sbin/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
@@ -577,6 +578,11 @@
 %{_docdir}/sendmail
 
 %changelog
+* Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-1
+- new version 8.13.7 (#195282)
+- fixes CVE-2006-1173 (VU#146718): possible denial of service issue caused by
+  malformed multipart messages (#195776)
+
 * Wed Mar 22 2006 Thomas Woerner <twoerner at redhat.com> 8.13.6-1
 - new version 8.13.6 (fixes VU#834865)
 - dropped libmilter-sigwait patch (fixed in 8.13.6)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Mar 2006 17:34:35 -0000	1.17
+++ sources	19 Jun 2006 16:10:07 -0000	1.18
@@ -1,2 +1 @@
-f4550d8dcc55771f4a81e999c7d6df20  sendmail.8.13.5.tar.gz
-484cca51f74b5e562b3cf119ceb2f900  sendmail.8.13.6.tar.gz
+5327e065cb0c1919122c8cecbeddbc28  sendmail.8.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 16:19:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 12:19:20 -0400
Subject: rpms/sendmail/devel sendmail-redhat.mc, 1.14, 1.15 sendmail.spec,
	1.68, 1.69
Message-ID: <200606191619.k5JGJKd4005835@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5710

Modified Files:
	sendmail-redhat.mc sendmail.spec 
Log Message:
[tw]
- dropped reference to Red Hat Linux in sendmail-redhat.mc (#176679)




Index: sendmail-redhat.mc
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail-redhat.mc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendmail-redhat.mc	17 Feb 2006 16:57:15 -0000	1.14
+++ sendmail-redhat.mc	19 Jun 2006 16:19:17 -0000	1.15
@@ -8,7 +8,7 @@
 dnl #     make -C /etc/mail
 dnl #
 include(`@@PATH@@/m4/cf.m4')dnl
-VERSIONID(`setup for Red Hat Linux')dnl
+VERSIONID(`setup for linux')dnl
 OSTYPE(`linux')dnl
 dnl #
 dnl # default logging level is 9, you might want to set it higher to


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sendmail.spec	19 Jun 2006 16:10:07 -0000	1.68
+++ sendmail.spec	19 Jun 2006 16:19:17 -0000	1.69
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.7
-Release: 1
+Release: 2
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -578,6 +578,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2
+- dropped reference to Red Hat Linux in sendmail-redhat.mc (#176679)
+
 * Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-1
 - new version 8.13.7 (#195282)
 - fixes CVE-2006-1173 (VU#146718): possible denial of service issue caused by



From fedora-cvs-commits at redhat.com  Mon Jun 19 16:25:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 12:25:41 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.27,1.28
Message-ID: <200606191625.k5JGPfR6008315@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8283

Modified Files:
	rgmanager.spec 
Log Message:
Remove ExclusiveArch.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rgmanager.spec	14 Jun 2006 22:03:38 -0000	1.27
+++ rgmanager.spec	19 Jun 2006 16:25:39 -0000	1.28
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.0
-Release: 0.fc6.4
+Release: 0.fc6.5
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
@@ -25,7 +25,7 @@
 Obsoletes: clumanager
 BuildRequires: glibc-devel ncurses-devel libxml2-devel /bin/grep
 BuildRequires: cman-devel
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
 Source: %{name}-%{version}.tar.gz
 Patch1: rgmanager-1.9.31-norun.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot



From fedora-cvs-commits at redhat.com  Mon Jun 19 16:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 12:32:16 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.69,1.70
Message-ID: <200606191632.k5JGWGZH010185@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10139

Modified Files:
	rhythmbox.spec 
Log Message:
fix file lists



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- rhythmbox.spec	19 Jun 2006 15:29:01 -0000	1.69
+++ rhythmbox.spec	19 Jun 2006 16:32:02 -0000	1.70
@@ -71,10 +71,6 @@
 rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so
 rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*.{a,la}
 
-for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
-    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
-done
-
 %find_lang %name
 
 # Default internet radio stations use mp3
@@ -113,14 +109,11 @@
 %{_sysconfdir}/gconf/schemas/rhythmbox.schemas
 %{_datadir}/rhythmbox/*
 %{_datadir}/applications/rhythmbox.desktop
-%{_datadir}/pixmaps/rhythmbox.png
 %{_datadir}/application-registry/*
 %{_datadir}/gnome/help/rhythmbox
 %{_datadir}/omf/rhythmbox/*
-%{_datadir}/idl/Rhythmbox.idl
 %{_datadir}/mime-info/rhythmbox.keys
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
-%{_libdir}/pkgconfig/rhythmbox.pc
 %{_libdir}/rhythmbox/plugins
 %{_libexecdir}/rhythmbox-metadata
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 16:47:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 12:47:30 -0400
Subject: rpms/gnucash/devel .cvsignore, 1.19, 1.20 gnucash.spec, 1.45,
	1.46 sources, 1.21, 1.22
Message-ID: <200606191647.k5JGlU0Q029164@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29122

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
update to 1.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 Jun 2006 19:29:00 -0000	1.19
+++ .cvsignore	19 Jun 2006 16:47:28 -0000	1.20
@@ -1,2 +1,3 @@
 gnucash-1.9.7.tar.gz
 gnucash-docs-1.9.0.tar.gz
+gnucash-1.9.8.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnucash.spec	6 Jun 2006 21:36:50 -0000	1.45
+++ gnucash.spec	19 Jun 2006 16:47:28 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.7
+Version: 1.9.8
 %if %{buildsvn}
 Release: 1.svn%{svnrev}.1
 %else
@@ -151,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Jun 19 2006 Bill Nottingham <notting at redhat.com> - 1.9.8-1
+- update to 1.9.8
+
 * Tue Jun  6 2006 Bill Nottingham <notting at redhat.com> - 1.9.7-1
 - update to 1.9.7
 - use official docs tarball, not svn snapshot


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	6 Jun 2006 19:29:00 -0000	1.21
+++ sources	19 Jun 2006 16:47:28 -0000	1.22
@@ -1,2 +1,2 @@
-2f1ee116eedee29a867e90c638564701  gnucash-1.9.7.tar.gz
 d50b193f8a89dcff56cf11c95e838d2e  gnucash-docs-1.9.0.tar.gz
+e2d5c4e5068150efb216ebed4fbf6a04  gnucash-1.9.8.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:02:39 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.71, 1.72 sources,
	1.74, 1.75 system-config-printer.spec, 1.29, 1.30
Message-ID: <200606191702.k5JH2d0C001869@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1835

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Mon Jun 19 2006 Tim Waugh <twaugh at redhat.com> 0.7.13-1
- 0.7.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	9 Jun 2006 09:58:39 -0000	1.71
+++ .cvsignore	19 Jun 2006 17:02:33 -0000	1.72
@@ -51,3 +51,4 @@
 system-config-printer-0.7.10.tar.bz2
 system-config-printer-0.7.11.tar.bz2
 system-config-printer-0.7.12.tar.bz2
+system-config-printer-0.7.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	9 Jun 2006 09:58:39 -0000	1.74
+++ sources	19 Jun 2006 17:02:33 -0000	1.75
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-950a4102202b7045b5b80da4fdbaecf0  system-config-printer-0.7.12.tar.bz2
+a77a70a4146d454905c73dd138e72bae  system-config-printer-0.7.13.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- system-config-printer.spec	9 Jun 2006 09:58:39 -0000	1.29
+++ system-config-printer.spec	19 Jun 2006 17:02:33 -0000	1.30
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.12
+Version: 0.7.13
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -45,30 +45,29 @@
 %setup -q -a 1
 
 %build
+%configure
+
 pushd pycups-%{pycups_version}
 make
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%makeinstall
+
 pushd pycups-%{pycups_version}
 make install DESTDIR=%buildroot
 popd
 
-mkdir -p %buildroot%{_datadir}/%{name}
 mkdir -p %buildroot%{_bindir}
-mkdir -p %buildroot%{_sbindir}
 mkdir -p %buildroot%{_sysconfdir}/pam.d
 mkdir -p %buildroot%{_sysconfdir}/security/console.apps
-install -m0755 *.py %buildroot%{_datadir}/%{name}/
-install -m0644 *.glade %buildroot%{_datadir}/%{name}/
-install -m0755 %{name} %buildroot%{_sbindir}/
 install -m0644 %{SOURCE2} %buildroot%{_sysconfdir}/pam.d/%{name}
 install -m0644 %{SOURCE3} %buildroot%{_sysconfdir}/security/console.apps/%{name}
 ln -s consolehelper %buildroot%{_bindir}/%{name}
 
 # Desktop file installation.
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor redhat \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
   --add-category X-Red-Hat-Base                        \
@@ -106,6 +105,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Mon Jun 19 2006 Tim Waugh <twaugh at redhat.com> 0.7.13-1
+- 0.7.13.
+
 * Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com> 0.7.12-1
 - 0.7.12.
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:08:30 -0400
Subject: rpms/nss/FC-5 nss-limit-suite-b.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 nss.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <200606191708.k5JH8Uuw002596@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/nss/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2501

Modified Files:
	.cvsignore nss.spec sources 
Added Files:
	nss-limit-suite-b.patch 
Log Message:
- Update to 3.11.1
- Include upstream patch to limit curves


nss-limit-suite-b.patch:
 coreconf/config.mk             |    4 
 nss/cmd/bltest/blapitest.c     |    7 
 nss/cmd/selfserv/selfserv.c    |    6 
 nss/lib/cryptohi/secsign.c     |    9 
 nss/lib/freebl/ecl/ecl-curve.h |  630 +++--------------------------------------
 nss/lib/freebl/ecl/ecl.c       |    6 
 nss/lib/freebl/ecl/ecl_curve.c |    3 
 nss/lib/freebl/manifest.mn     |    8 
 nss/lib/pkcs7/p7decode.c       |    4 
 nss/lib/smime/cmssiginfo.c     |    4 
 nss/lib/ssl/ssl3ecc.c          |    6 
 nss/lib/ssl/sslimpl.h          |    4 
 12 files changed, 107 insertions(+), 584 deletions(-)

--- NEW FILE nss-limit-suite-b.patch ---
Index: mozilla/security/coreconf/config.mk
diff -u mozilla/security/coreconf/config.mk:1.17.28.1 mozilla/security/coreconf/config.mk:1.17.28.2
--- mozilla/security/coreconf/config.mk:1.17.28.1	Sat Jan 21 19:01:27 2006
+++ mozilla/security/coreconf/config.mk	Fri Apr 28 03:36:22 2006
@@ -177,3 +177,7 @@
 ifdef NSS_ENABLE_ECC
 DEFINES += -DNSS_ENABLE_ECC
 endif
+
+ifdef NSS_ECC_MORE_THAN_SUITE_B
+DEFINES += -DNSS_ECC_MORE_THAN_SUITE_B
+endif
Index: mozilla/security/nss/cmd/selfserv/selfserv.c
diff -u mozilla/security/nss/cmd/selfserv/selfserv.c:1.68.2.5 mozilla/security/nss/cmd/selfserv/selfserv.c:1.68.2.6
--- mozilla/security/nss/cmd/selfserv/selfserv.c:1.68.2.5	Sat Apr 22 05:19:47 2006
+++ mozilla/security/nss/cmd/selfserv/selfserv.c	Fri Apr 28 03:35:33 2006
@@ -1806,7 +1806,11 @@
 	exit(0);
     }
 
-    if ((nickName == NULL) && (fNickName == NULL)) {
+    if ((nickName == NULL) && (fNickName == NULL) 
+#ifdef NSS_ENABLE_ECC
+						&& (ecNickName == NULL)
+#endif
+    ) {
 	fprintf(stderr, "Required arg '-n' (rsa nickname) not supplied.\n");
 	fprintf(stderr, "Run '%s -h' for usage information.\n", progName);
         exit(6);
Index: mozilla/security/nss/cmd/bltest/blapitest.c
diff -u mozilla/security/nss/cmd/bltest/blapitest.c:1.46.2.1 mozilla/security/nss/cmd/bltest/blapitest.c:1.46.2.2
--- mozilla/security/nss/cmd/bltest/blapitest.c:1.46.2.1	Wed Feb 22 22:18:50 2006
+++ mozilla/security/nss/cmd/bltest/blapitest.c	Fri Apr 28 03:35:32 2006
@@ -2499,9 +2499,12 @@
       case bltestECDSA:
           if (td)
               fprintf(stdout, "%12s", "ec_curve");
-          else
+          else {
+	      ECCurveName curveName = info->params.ecdsa.eckey->ecParams.name;
               fprintf(stdout, "%12s",
-                      ecCurve_map[info->params.ecdsa.eckey->ecParams.name]->text);
+                      ecCurve_map[curveName]? ecCurve_map[curveName]->text:
+					      "Unsupported curve");
+	  }
           break;
 #endif
       case bltestMD2:
Index: mozilla/security/nss/lib/ssl/sslimpl.h
diff -u mozilla/security/nss/lib/ssl/sslimpl.h:1.42.2.6 mozilla/security/nss/lib/ssl/sslimpl.h:1.42.2.7
--- mozilla/security/nss/lib/ssl/sslimpl.h:1.42.2.6	Sun Apr 23 03:05:42 2006
+++ mozilla/security/nss/lib/ssl/sslimpl.h	Fri Apr 28 03:35:32 2006
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslimpl.h,v 1.42.2.6 2006/04/23 03:05:42 nelson%bolyard.com Exp $ */
+/* $Id: sslimpl.h,v 1.42.2.7 2006/04/28 03:35:32 rrelyea%redhat.com Exp $ */
 
 #ifndef __sslimpl_h_
 #define __sslimpl_h_
@@ -180,7 +180,7 @@
 #define NUM_MIXERS                      9
 
 /* Mask of the 25 named curves we support. */
-#ifdef NSS_ECC_ONLY_SUITE_B
+#ifndef NSS_ECC_MORE_THAN_SUITE_B
 #define SSL3_SUPPORTED_CURVES_MASK 0x3800000	/* only 3 curves, suite B*/
 #else
 #define SSL3_SUPPORTED_CURVES_MASK 0x3fffffe
Index: mozilla/security/nss/lib/ssl/ssl3ecc.c
diff -u mozilla/security/nss/lib/ssl/ssl3ecc.c:1.3.2.5 mozilla/security/nss/lib/ssl/ssl3ecc.c:1.3.2.6
--- mozilla/security/nss/lib/ssl/ssl3ecc.c:1.3.2.5	Sun Apr 23 03:05:42 2006
+++ mozilla/security/nss/lib/ssl/ssl3ecc.c	Fri Apr 28 03:35:32 2006
@@ -40,7 +40,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* ECC code moved here from ssl3con.c */
-/* $Id: ssl3ecc.c,v 1.3.2.5 2006/04/23 03:05:42 nelson%bolyard.com Exp $ */
+/* $Id: ssl3ecc.c,v 1.3.2.6 2006/04/28 03:35:32 rrelyea%redhat.com Exp $ */
 
 #include "nssrenam.h"
 #include "nss.h"
@@ -1030,9 +1030,9 @@
 
 #define BE(n) 0, n
 
-#ifdef NSS_ECC_ONLY_SUITE_B
+#ifndef NSS_ECC_MORE_THAN_SUITE_B
 /* Prefabricated TLS client hello extension, Elliptic Curves List,
- * offers only 3 curves, the Suite B curves, 23-35 
+ * offers only 3 curves, the Suite B curves, 23-25 
  */
 static const PRUint8 EClist[12] = {
     BE(10),         /* Extension type */
Index: mozilla/security/nss/lib/smime/cmssiginfo.c
diff -u mozilla/security/nss/lib/smime/cmssiginfo.c:1.29 mozilla/security/nss/lib/smime/cmssiginfo.c:1.29.2.1
--- mozilla/security/nss/lib/smime/cmssiginfo.c:1.29	Fri Sep  2 01:24:56 2005
+++ mozilla/security/nss/lib/smime/cmssiginfo.c	Fri Apr 28 03:35:31 2006
@@ -38,7 +38,7 @@
 /*
  * CMS signerInfo methods.
  *
- * $Id: cmssiginfo.c,v 1.29 2005/09/02 01:24:56 wtchang%redhat.com Exp $
+ * $Id: cmssiginfo.c,v 1.29.2.1 2006/04/28 03:35:31 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -386,7 +386,9 @@
     case SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST:
     case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION:
     case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION:
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
     case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
+#endif
 	/* ok */
 	break;
     case SEC_OID_UNKNOWN:
Index: mozilla/security/nss/lib/pkcs7/p7decode.c
diff -u mozilla/security/nss/lib/pkcs7/p7decode.c:1.20 mozilla/security/nss/lib/pkcs7/p7decode.c:1.20.2.1
--- mozilla/security/nss/lib/pkcs7/p7decode.c:1.20	Mon Oct  3 22:01:56 2005
+++ mozilla/security/nss/lib/pkcs7/p7decode.c	Fri Apr 28 03:35:30 2006
@@ -38,7 +38,7 @@
 /*
  * PKCS7 decoding, verification.
  *
- * $Id: p7decode.c,v 1.20 2005/10/03 22:01:56 relyea%netscape.com Exp $
+ * $Id: p7decode.c,v 1.20.2.1 2006/04/28 03:35:30 rrelyea%redhat.com Exp $
  */
 
 #include "nssrenam.h"
@@ -1665,7 +1665,9 @@
     algiddata = SECOID_FindOID (&(signerinfo->digestEncAlg.algorithm));
     if (algiddata == NULL ||
 	((algiddata->offset != SEC_OID_PKCS1_RSA_ENCRYPTION) &&
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
 	 (algiddata->offset != SEC_OID_ANSIX962_EC_PUBLIC_KEY) &&
+#endif
 	 (algiddata->offset != SEC_OID_ANSIX9_DSA_SIGNATURE))) {
 	PORT_SetError (SEC_ERROR_PKCS7_BAD_SIGNATURE);
 	goto done;
Index: mozilla/security/nss/lib/freebl/ecl/ecl_curve.c
diff -u mozilla/security/nss/lib/freebl/ecl/ecl_curve.c:1.2 mozilla/security/nss/lib/freebl/ecl/ecl_curve.c:1.2.28.1
--- mozilla/security/nss/lib/freebl/ecl/ecl_curve.c:1.2	Sun Apr 25 15:03:09 2004
+++ mozilla/security/nss/lib/freebl/ecl/ecl_curve.c	Fri Apr 28 03:35:30 2006
@@ -91,7 +91,8 @@
 ECCurveParams *
 EC_GetNamedCurveParams(const ECCurveName name)
 {
-	if ((name <= ECCurve_noName) || (ECCurve_pastLastCurve <= name)) {
+	if ((name <= ECCurve_noName) || (ECCurve_pastLastCurve <= name) ||
+					(ecCurve_map[name] == NULL)) {
 		return NULL;
 	} else {
 		return ECCurveParams_dup(ecCurve_map[name]);
Index: mozilla/security/nss/lib/freebl/ecl/ecl.c
diff -u mozilla/security/nss/lib/freebl/ecl/ecl.c:1.5.2.2 mozilla/security/nss/lib/freebl/ecl/ecl.c:1.5.2.3
--- mozilla/security/nss/lib/freebl/ecl/ecl.c:1.5.2.2	Fri Mar 31 00:26:49 2006
+++ mozilla/security/nss/lib/freebl/ecl/ecl.c	Fri Apr 28 03:35:30 2006
@@ -164,6 +164,7 @@
 	return group;
 }
 
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
 /* Construct a generic ECGroup for elliptic curves over binary polynomial
  * fields. */
 ECGroup *
@@ -205,6 +206,7 @@
 	}
 	return group;
 }
+#endif
 
 /* Construct ECGroup from hex parameters and name, if any. Called by
  * ECGroup_fromHex and ECGroup_fromName. */
@@ -246,6 +248,7 @@
 
 	/* determine which optimizations (if any) to use */
 	if (params->field == ECField_GFp) {
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
 	    switch (name) {
 #ifdef ECL_USE_FP
 		case ECCurve_SECG_PRIME_160R1:
@@ -302,10 +305,12 @@
 			break;
 		default:
 			/* use generic arithmetic */
+#endif
 			group =
 				ECGroup_consGFp_mont(&irr, &curvea, &curveb, &genx, &geny,
 									 &order, params->cofactor);
 			if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
 		}
 	} else if (params->field == ECField_GF2m) {
 		group = ECGroup_consGF2m(&irr, NULL, &curvea, &curveb, &genx, &geny, &order, params->cofactor);
@@ -321,6 +326,7 @@
 		           (name == ECCurve_NIST_B233)) {
 			MP_CHECKOK(ec_group_set_gf2m233(group, name));
 		}
+#endif
 	}
 
 	/* set name, if any */
Index: mozilla/security/nss/lib/freebl/ecl/ecl-curve.h
diff -u mozilla/security/nss/lib/freebl/ecl/ecl-curve.h:1.2.28.2 mozilla/security/nss/lib/freebl/ecl/ecl-curve.h:1.2.28.3
--- mozilla/security/nss/lib/freebl/ecl/ecl-curve.h:1.2.28.2	Mon Feb 27 23:26:00 2006
+++ mozilla/security/nss/lib/freebl/ecl/ecl-curve.h	Fri Apr 28 03:35:30 2006
@@ -42,25 +42,6 @@
 #ifndef __ecl_curve_h_
 #define __ecl_curve_h_
 
-/* NIST prime curves */
-static const ECCurveParams ecCurve_NIST_P192 = {
-	"NIST-P192", ECField_GFp, 192,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-	"64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
-	"188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-	"07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
-	"FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", 1
-};
-static const ECCurveParams ecCurve_NIST_P224 = {
-	"NIST-P224", ECField_GFp, 224,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-	"B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-	"B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-	"BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", 1
-};
 static const ECCurveParams ecCurve_NIST_P256 = {
 	"NIST-P256", ECField_GFp, 256,
 	"FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
@@ -70,6 +51,7 @@
 	"4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5",
 	"FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551", 1
 };
+
 static const ECCurveParams ecCurve_NIST_P384 = {
 	"NIST-P384", ECField_GFp, 384,
 	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF",
@@ -80,6 +62,7 @@
 	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973",
 	1
 };
+
 static const ECCurveParams ecCurve_NIST_P521 = {
 	"NIST-P521", ECField_GFp, 521,
 	"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
@@ -91,558 +74,67 @@
 	1
 };
 
-/* NIST binary curves */
-static const ECCurveParams ecCurve_NIST_K163 = {
-	"NIST-K163", ECField_GF2m, 163,
-	"0800000000000000000000000000000000000000C9",
-	"000000000000000000000000000000000000000001",
-	"000000000000000000000000000000000000000001",
-	"02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
-	"0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-	"04000000000000000000020108A2E0CC0D99F8A5EF", 2
-};
-static const ECCurveParams ecCurve_NIST_B163 = {
-	"NIST-B163", ECField_GF2m, 163,
-	"0800000000000000000000000000000000000000C9",
-	"000000000000000000000000000000000000000001",
-	"020A601907B8C953CA1481EB10512F78744A3205FD",
-	"03F0EBA16286A2D57EA0991168D4994637E8343E36",
-	"00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-	"040000000000000000000292FE77E70C12A4234C33", 2
-};
-static const ECCurveParams ecCurve_NIST_K233 = {
-	"NIST-K233", ECField_GF2m, 233,
-	"020000000000000000000000000000000000000004000000000000000001",
-	"000000000000000000000000000000000000000000000000000000000000",
-	"000000000000000000000000000000000000000000000000000000000001",
-	"017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
-	"01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-	"008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", 4
-};
-static const ECCurveParams ecCurve_NIST_B233 = {
-	"NIST-B233", ECField_GF2m, 233,
-	"020000000000000000000000000000000000000004000000000000000001",
-	"000000000000000000000000000000000000000000000000000000000001",
-	"0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-	"00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
-	"01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-	"01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 2
-};
-static const ECCurveParams ecCurve_NIST_K283 = {
-	"NIST-K283", ECField_GF2m, 283,
-	"0800000000000000000000000000000000000000000000000000000000000000000010A1",
-	"000000000000000000000000000000000000000000000000000000000000000000000000",
-	"000000000000000000000000000000000000000000000000000000000000000000000001",
-	"0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
-	"01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
-	"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-	4
-};
-static const ECCurveParams ecCurve_NIST_B283 = {
-	"NIST-B283", ECField_GF2m, 283,
-	"0800000000000000000000000000000000000000000000000000000000000000000010A1",
-	"000000000000000000000000000000000000000000000000000000000000000000000001",
-	"027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-	"05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
-	"03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
-	"03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-	2
-};
-static const ECCurveParams ecCurve_NIST_K409 = {
-	"NIST-K409", ECField_GF2m, 409,
-	"02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-	"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-	"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-	"0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
-	"01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
-	"007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-	4
-};
-static const ECCurveParams ecCurve_NIST_B409 = {
-	"NIST-B409", ECField_GF2m, 409,
-	"02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-	"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-	"0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-	"015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
-	"0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
-	"010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-	2
-};
-static const ECCurveParams ecCurve_NIST_K571 = {
-	"NIST-K571", ECField_GF2m, 571,
-	"080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-	"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-	"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-	"026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
-	"0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
-	"020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-	4
-};
-static const ECCurveParams ecCurve_NIST_B571 = {
-	"NIST-B571", ECField_GF2m, 571,
-	"080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-	"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-	"02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-	"0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
-	"037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
-	"03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-	2
-};
-
-/* ANSI X9.62 prime curves */
-static const ECCurveParams ecCurve_X9_62_PRIME_192V2 = {
-	"X9.62 P-192V2", ECField_GFp, 192,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-	"CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
-	"EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
-	"6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
-	"FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31", 1
-};
-static const ECCurveParams ecCurve_X9_62_PRIME_192V3 = {
-	"X9.62 P-192V3", ECField_GFp, 192,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-	"22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
-	"7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
-	"38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
-	"FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13", 1
-};
-static const ECCurveParams ecCurve_X9_62_PRIME_239V1 = {
-	"X9.62 P-239V1", ECField_GFp, 239,
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-	"6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
-	"0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
-	"7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B", 1
-};
-static const ECCurveParams ecCurve_X9_62_PRIME_239V2 = {
-	"X9.62 P-239V2", ECField_GFp, 239,
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-	"617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
-	"38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
-	"5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
-	"7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063", 1
-};
-static const ECCurveParams ecCurve_X9_62_PRIME_239V3 = {
-	"X9.62 P-239V3", ECField_GFp, 239,
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-	"255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
-	"6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
-	"1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
-	"7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551", 1
-};
-
-/* ANSI X9.62 binary curves */
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V1 = {
-	"X9.62 C2-PNB163V1", ECField_GF2m, 163,
-	"080000000000000000000000000000000000000107",
-	"072546B5435234A422E0789675F432C89435DE5242",
-	"00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
-	"07AF69989546103D79329FCC3D74880F33BBE803CB",
-	"01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
-	"0400000000000000000001E60FC8821CC74DAEAFC1", 2
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V2 = {
-	"X9.62 C2-PNB163V2", ECField_GF2m, 163,
-	"080000000000000000000000000000000000000107",
-	"0108B39E77C4B108BED981ED0E890E117C511CF072",
-	"0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
-	"0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
-	"079F684DDF6684C5CD258B3890021B2386DFD19FC5",
-	"03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 2
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V3 = {
-	"X9.62 C2-PNB163V3", ECField_GF2m, 163,
-	"080000000000000000000000000000000000000107",
-	"07A526C63D3E25A256A007699F5447E32AE456B50E",
-	"03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
-	"02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
-	"05B935590C155E17EA48EB3FF3718B893DF59A05D0",
-	"03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 2
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB176V1 = {
-	"X9.62 C2-PNB176V1", ECField_GF2m, 176,
-	"0100000000000000000000000000000000080000000007",
-	"E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
-	"5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
-	"8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
-	"6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
-	"00010092537397ECA4F6145799D62B0A19CE06FE26AD", 0xFF6E
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V1 = {
-	"X9.62 C2-TNB191V1", ECField_GF2m, 191,
-	"800000000000000000000000000000000000000000000201",
-	"2866537B676752636A68F56554E12640276B649EF7526267",
-	"2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
-	"36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
-	"765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
-	"40000000000000000000000004A20E90C39067C893BBB9A5", 2
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V2 = {
-	"X9.62 C2-TNB191V2", ECField_GF2m, 191,
-	"800000000000000000000000000000000000000000000201",
-	"401028774D7777C7B7666D1366EA432071274F89FF01E718",
-	"0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
-	"3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
-	"17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
-	"20000000000000000000000050508CB89F652824E06B8173", 4
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V3 = {
-	"X9.62 C2-TNB191V3", ECField_GF2m, 191,
-	"800000000000000000000000000000000000000000000201",
-	"6C01074756099122221056911C77D77E77A777E7E7E77FCB",
-	"71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
-	"375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
-	"545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
-	"155555555555555555555555610C0B196812BFB6288A3EA3", 6
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB208W1 = {
-	"X9.62 C2-PNB208W1", ECField_GF2m, 208,
-	"010000000000000000000000000000000800000000000000000007",
-	"0000000000000000000000000000000000000000000000000000",
-	"C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
-	"89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
-	"0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
-	"000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 0xFE48
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V1 = {
-	"X9.62 C2-TNB239V1", ECField_GF2m, 239,
-	"800000000000000000000000000000000000000000000000001000000001",
-	"32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
-	"790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
-	"57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
-	"61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
-	"2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 4
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V2 = {
-	"X9.62 C2-TNB239V2", ECField_GF2m, 239,
-	"800000000000000000000000000000000000000000000000001000000001",
-	"4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
-	"5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
-	"28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
-	"5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
-	"1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 6
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V3 = {
-	"X9.62 C2-TNB239V3", ECField_GF2m, 239,
-	"800000000000000000000000000000000000000000000000001000000001",
-	"01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
-	"6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
-	"70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
-	"2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
-	"0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 0xA
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB272W1 = {
-	"X9.62 C2-PNB272W1", ECField_GF2m, 272,
-	"010000000000000000000000000000000000000000000000000000010000000000000B",
-	"91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
-	"7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
-	"6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
-	"10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
-	"000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
-	0xFF06
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB304W1 = {
-	"X9.62 C2-PNB304W1", ECField_GF2m, 304,
-	"010000000000000000000000000000000000000000000000000000000000000000000000000807",
-	"FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
-	"BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
-	"197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
-	"E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
-	"000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
-	0xFE2E
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB359V1 = {
-	"X9.62 C2-TNB359V1", ECField_GF2m, 359,
-	"800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
-	"5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
-	"2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
-	"3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
-	"53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
-	"01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
-	0x4C
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_PNB368W1 = {
-	"X9.62 C2-PNB368W1", ECField_GF2m, 368,
-	"0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
-	"E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
-	"FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
-	"1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
-	"7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
-	"00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
-	0xFF70
-};
-static const ECCurveParams ecCurve_X9_62_CHAR2_TNB431R1 = {
-	"X9.62 C2-TNB431R1", ECField_GF2m, 431,
-	"800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
-	"1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
-	"10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
-	"120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
-	"20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
-	"0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
-	0x2760
-};
-
-/* SEC2 prime curves */
-static const ECCurveParams ecCurve_SECG_PRIME_112R1 = {
-	"SECP-112R1", ECField_GFp, 112,
-	"DB7C2ABF62E35E668076BEAD208B",
-	"DB7C2ABF62E35E668076BEAD2088",
-	"659EF8BA043916EEDE8911702B22",
-	"09487239995A5EE76B55F9C2F098",
-	"A89CE5AF8724C0A23E0E0FF77500",
-	"DB7C2ABF62E35E7628DFAC6561C5", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_112R2 = {
-	"SECP-112R2", ECField_GFp, 112,
-	"DB7C2ABF62E35E668076BEAD208B",
-	"6127C24C05F38A0AAAF65C0EF02C",
-	"51DEF1815DB5ED74FCC34C85D709",
-	"4BA30AB5E892B4E1649DD0928643",
-	"adcd46f5882e3747def36e956e97",
-	"36DF0AAFD8B8D7597CA10520D04B", 4
-};
-static const ECCurveParams ecCurve_SECG_PRIME_128R1 = {
-	"SECP-128R1", ECField_GFp, 128,
-	"FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-	"FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
-	"E87579C11079F43DD824993C2CEE5ED3",
-	"161FF7528B899B2D0C28607CA52C5B86",
-	"CF5AC8395BAFEB13C02DA292DDED7A83",
-	"FFFFFFFE0000000075A30D1B9038A115", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_128R2 = {
-	"SECP-128R2", ECField_GFp, 128,
-	"FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-	"D6031998D1B3BBFEBF59CC9BBFF9AEE1",
-	"5EEEFCA380D02919DC2C6558BB6D8A5D",
-	"7B6AA5D85E572983E6FB32A7CDEBC140",
-	"27B6916A894D3AEE7106FE805FC34B44",
-	"3FFFFFFF7FFFFFFFBE0024720613B5A3", 4
-};
-static const ECCurveParams ecCurve_SECG_PRIME_160K1 = {
-	"SECP-160K1", ECField_GFp, 160,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-	"0000000000000000000000000000000000000000",
-	"0000000000000000000000000000000000000007",
-	"3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
-	"938CF935318FDCED6BC28286531733C3F03C4FEE",
-	"0100000000000000000001B8FA16DFAB9ACA16B6B3", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_160R1 = {
-	"SECP-160R1", ECField_GFp, 160,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
-	"1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
-	"4A96B5688EF573284664698968C38BB913CBFC82",
-	"23A628553168947D59DCC912042351377AC5FB32",
-	"0100000000000000000001F4C8F927AED3CA752257", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_160R2 = {
-	"SECP-160R2", ECField_GFp, 160,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
-	"B4E134D3FB59EB8BAB57274904664D5AF50388BA",
-	"52DCB034293A117E1F4FF11B30F7199D3144CE6D",
-	"FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
-	"0100000000000000000000351EE786A818F3A1A16B", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_192K1 = {
-	"SECP-192K1", ECField_GFp, 192,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-	"000000000000000000000000000000000000000000000000",
-	"000000000000000000000000000000000000000000000003",
-	"DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
-	"9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
-	"FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_224K1 = {
-	"SECP-224K1", ECField_GFp, 224,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-	"00000000000000000000000000000000000000000000000000000000",
-	"00000000000000000000000000000000000000000000000000000005",
-	"A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
-	"7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
-	"010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", 1
-};
-static const ECCurveParams ecCurve_SECG_PRIME_256K1 = {
-	"SECP-256K1", ECField_GFp, 256,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-	"0000000000000000000000000000000000000000000000000000000000000000",
-	"0000000000000000000000000000000000000000000000000000000000000007",
-	"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
-	"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 1
-};
-
-/* SEC2 binary curves */
-static const ECCurveParams ecCurve_SECG_CHAR2_113R1 = {
-	"SECT-113R1", ECField_GF2m, 113,
-	"020000000000000000000000000201",
-	"003088250CA6E7C7FE649CE85820F7",
-	"00E8BEE4D3E2260744188BE0E9C723",
-	"009D73616F35F4AB1407D73562C10F",
-	"00A52830277958EE84D1315ED31886",
-	"0100000000000000D9CCEC8A39E56F", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_113R2 = {
-	"SECT-113R2", ECField_GF2m, 113,
-	"020000000000000000000000000201",
-	"00689918DBEC7E5A0DD6DFC0AA55C7",
-	"0095E9A9EC9B297BD4BF36E059184F",
-	"01A57A6A7B26CA5EF52FCDB8164797",
-	"00B3ADC94ED1FE674C06E695BABA1D",
-	"010000000000000108789B2496AF93", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_131R1 = {
-	"SECT-131R1", ECField_GF2m, 131,
-	"080000000000000000000000000000010D",
-	"07A11B09A76B562144418FF3FF8C2570B8",
-	"0217C05610884B63B9C6C7291678F9D341",
-	"0081BAF91FDF9833C40F9C181343638399",
-	"078C6E7EA38C001F73C8134B1B4EF9E150",
-	"0400000000000000023123953A9464B54D", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_131R2 = {
-	"SECT-131R2", ECField_GF2m, 131,
-	"080000000000000000000000000000010D",
-	"03E5A88919D7CAFCBF415F07C2176573B2",
-	"04B8266A46C55657AC734CE38F018F2192",
-	"0356DCD8F2F95031AD652D23951BB366A8",
-	"0648F06D867940A5366D9E265DE9EB240F",
-	"0400000000000000016954A233049BA98F", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_163R1 = {
-	"SECT-163R1", ECField_GF2m, 163,
-	"0800000000000000000000000000000000000000C9",
-	"07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
-	"0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
-	"0369979697AB43897789566789567F787A7876A654",
-	"00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
-	"03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_193R1 = {
-	"SECT-193R1", ECField_GF2m, 193,
-	"02000000000000000000000000000000000000000000008001",
-	"0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
-	"00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
-	"01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
-	"0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
-	"01000000000000000000000000C7F34A778F443ACC920EBA49", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_193R2 = {
-	"SECT-193R2", ECField_GF2m, 193,
-	"02000000000000000000000000000000000000000000008001",
-	"0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
-	"00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
-	"00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
-	"01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
-	"010000000000000000000000015AAB561B005413CCD4EE99D5", 2
-};
-static const ECCurveParams ecCurve_SECG_CHAR2_239K1 = {
-	"SECT-239K1", ECField_GF2m, 239,
-	"800000000000000000004000000000000000000000000000000000000001",
-	"000000000000000000000000000000000000000000000000000000000000",
-	"000000000000000000000000000000000000000000000000000000000001",
-	"29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
-	"76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
-	"2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", 4
-};
-
-/* WTLS curves */
-static const ECCurveParams ecCurve_WTLS_1 = {
-	"WTLS-1", ECField_GF2m, 113,
-	"020000000000000000000000000201",
-	"000000000000000000000000000001",
-	"000000000000000000000000000001",
-	"01667979A40BA497E5D5C270780617",
-	"00F44B4AF1ECC2630E08785CEBCC15",
-	"00FFFFFFFFFFFFFFFDBF91AF6DEA73", 2
-};
-static const ECCurveParams ecCurve_WTLS_8 = {
-	"WTLS-8", ECField_GFp, 112,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFDE7",
-	"0000000000000000000000000000",
-	"0000000000000000000000000003",
-	"0000000000000000000000000001",
-	"0000000000000000000000000002",
-	"0100000000000001ECEA551AD837E9", 1
-};
-static const ECCurveParams ecCurve_WTLS_9 = {
-	"WTLS-9", ECField_GFp, 160,
-	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F",
-	"0000000000000000000000000000000000000000",
-	"0000000000000000000000000000000000000003",
-	"0000000000000000000000000000000000000001",
-	"0000000000000000000000000000000000000002",
-	"0100000000000000000001CDC98AE0E2DE574ABF33", 1
-};
-
 /* mapping between ECCurveName enum and pointers to ECCurveParams */
 static const ECCurveParams *ecCurve_map[] = {
-	NULL,						/* ECCurve_noName */
-	&ecCurve_NIST_P192,			/* ECCurve_NIST_P192 */
-	&ecCurve_NIST_P224,			/* ECCurve_NIST_P224 */
-	&ecCurve_NIST_P256,			/* ECCurve_NIST_P256 */
-	&ecCurve_NIST_P384,			/* ECCurve_NIST_P384 */
-	&ecCurve_NIST_P521,			/* ECCurve_NIST_P521 */
-	&ecCurve_NIST_K163,			/* ECCurve_NIST_K163 */
-	&ecCurve_NIST_B163,			/* ECCurve_NIST_B163 */
-	&ecCurve_NIST_K233,			/* ECCurve_NIST_K233 */
-	&ecCurve_NIST_B233,			/* ECCurve_NIST_B233 */
-	&ecCurve_NIST_K283,			/* ECCurve_NIST_K283 */
-	&ecCurve_NIST_B283,			/* ECCurve_NIST_B283 */
-	&ecCurve_NIST_K409,			/* ECCurve_NIST_K409 */
-	&ecCurve_NIST_B409,			/* ECCurve_NIST_B409 */
-	&ecCurve_NIST_K571,			/* ECCurve_NIST_K571 */
-	&ecCurve_NIST_B571,			/* ECCurve_NIST_B571 */
-	&ecCurve_X9_62_PRIME_192V2,	/* ECCurve_X9_62_PRIME_192V2 */
-	&ecCurve_X9_62_PRIME_192V3,	/* ECCurve_X9_62_PRIME_192V3 */
-	&ecCurve_X9_62_PRIME_239V1,	/* ECCurve_X9_62_PRIME_239V1 */
-	&ecCurve_X9_62_PRIME_239V2,	/* ECCurve_X9_62_PRIME_239V2 */
-	&ecCurve_X9_62_PRIME_239V3,	/* ECCurve_X9_62_PRIME_239V3 */
-	&ecCurve_X9_62_CHAR2_PNB163V1,	/* ECCurve_X9_62_CHAR2_PNB163V1 */
-	&ecCurve_X9_62_CHAR2_PNB163V2,	/* ECCurve_X9_62_CHAR2_PNB163V2 */
-	&ecCurve_X9_62_CHAR2_PNB163V3,	/* ECCurve_X9_62_CHAR2_PNB163V3 */
-	&ecCurve_X9_62_CHAR2_PNB176V1,	/* ECCurve_X9_62_CHAR2_PNB176V1 */
-	&ecCurve_X9_62_CHAR2_TNB191V1,	/* ECCurve_X9_62_CHAR2_TNB191V1 */
-	&ecCurve_X9_62_CHAR2_TNB191V2,	/* ECCurve_X9_62_CHAR2_TNB191V2 */
-	&ecCurve_X9_62_CHAR2_TNB191V3,	/* ECCurve_X9_62_CHAR2_TNB191V3 */
-	&ecCurve_X9_62_CHAR2_PNB208W1,	/* ECCurve_X9_62_CHAR2_PNB208W1 */
-	&ecCurve_X9_62_CHAR2_TNB239V1,	/* ECCurve_X9_62_CHAR2_TNB239V1 */
-	&ecCurve_X9_62_CHAR2_TNB239V2,	/* ECCurve_X9_62_CHAR2_TNB239V2 */
-	&ecCurve_X9_62_CHAR2_TNB239V3,	/* ECCurve_X9_62_CHAR2_TNB239V3 */
-	&ecCurve_X9_62_CHAR2_PNB272W1,	/* ECCurve_X9_62_CHAR2_PNB272W1 */
-	&ecCurve_X9_62_CHAR2_PNB304W1,	/* ECCurve_X9_62_CHAR2_PNB304W1 */
-	&ecCurve_X9_62_CHAR2_TNB359V1,	/* ECCurve_X9_62_CHAR2_TNB359V1 */
-	&ecCurve_X9_62_CHAR2_PNB368W1,	/* ECCurve_X9_62_CHAR2_PNB368W1 */
-	&ecCurve_X9_62_CHAR2_TNB431R1,	/* ECCurve_X9_62_CHAR2_TNB431R1 */
-	&ecCurve_SECG_PRIME_112R1,	/* ECCurve_SECG_PRIME_112R1 */
-	&ecCurve_SECG_PRIME_112R2,	/* ECCurve_SECG_PRIME_112R2 */
-	&ecCurve_SECG_PRIME_128R1,	/* ECCurve_SECG_PRIME_128R1 */
-	&ecCurve_SECG_PRIME_128R2,	/* ECCurve_SECG_PRIME_128R2 */
-	&ecCurve_SECG_PRIME_160K1,	/* ECCurve_SECG_PRIME_160K1 */
-	&ecCurve_SECG_PRIME_160R1,	/* ECCurve_SECG_PRIME_160R1 */
-	&ecCurve_SECG_PRIME_160R2,	/* ECCurve_SECG_PRIME_160R2 */
-	&ecCurve_SECG_PRIME_192K1,	/* ECCurve_SECG_PRIME_192K1 */
-	&ecCurve_SECG_PRIME_224K1,	/* ECCurve_SECG_PRIME_224K1 */
-	&ecCurve_SECG_PRIME_256K1,	/* ECCurve_SECG_PRIME_256K1 */
-	&ecCurve_SECG_CHAR2_113R1,	/* ECCurve_SECG_CHAR2_113R1 */
-	&ecCurve_SECG_CHAR2_113R2,	/* ECCurve_SECG_CHAR2_113R2 */
-	&ecCurve_SECG_CHAR2_131R1,	/* ECCurve_SECG_CHAR2_131R1 */
-	&ecCurve_SECG_CHAR2_131R2,	/* ECCurve_SECG_CHAR2_131R2 */
-	&ecCurve_SECG_CHAR2_163R1,	/* ECCurve_SECG_CHAR2_163R1 */
-	&ecCurve_SECG_CHAR2_193R1,	/* ECCurve_SECG_CHAR2_193R1 */
-	&ecCurve_SECG_CHAR2_193R2,	/* ECCurve_SECG_CHAR2_193R2 */
-	&ecCurve_SECG_CHAR2_239K1,	/* ECCurve_SECG_CHAR2_239K1 */
-	&ecCurve_WTLS_1,			/* ECCurve_WTLS_1 */
-	&ecCurve_WTLS_8,			/* ECCurve_WTLS_8 */
-	&ecCurve_WTLS_9,			/* ECCurve_WTLS_9 */
-	NULL						/* ECCurve_pastLastCurve */
+	NULL,			/* ECCurve_noName */
+	NULL,			/* ECCurve_NIST_P192 */
+	NULL,			/* ECCurve_NIST_P224 */
+	&ecCurve_NIST_P256,	/* ECCurve_NIST_P256 */
+	&ecCurve_NIST_P384,	/* ECCurve_NIST_P384 */
+	&ecCurve_NIST_P521,	/* ECCurve_NIST_P521 */
+	NULL,			/* ECCurve_NIST_K163 */
+	NULL,			/* ECCurve_NIST_B163 */
+	NULL,			/* ECCurve_NIST_K233 */
+	NULL,			/* ECCurve_NIST_B233 */
+	NULL,			/* ECCurve_NIST_K283 */
+	NULL,			/* ECCurve_NIST_B283 */
+	NULL,			/* ECCurve_NIST_K409 */
+	NULL,			/* ECCurve_NIST_B409 */
+	NULL,			/* ECCurve_NIST_K571 */
+	NULL,			/* ECCurve_NIST_B571 */
+	NULL,			/* ECCurve_X9_62_PRIME_192V2 */
+	NULL,			/* ECCurve_X9_62_PRIME_192V3 */
+	NULL,			/* ECCurve_X9_62_PRIME_239V1 */
+	NULL,			/* ECCurve_X9_62_PRIME_239V2 */
+	NULL,			/* ECCurve_X9_62_PRIME_239V3 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB163V1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB163V2 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB163V3 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB176V1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB191V1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB191V2 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB191V3 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB208W1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB239V1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB239V2 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB239V3 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB272W1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB304W1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB359V1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_PNB368W1 */
+	NULL,			/* ECCurve_X9_62_CHAR2_TNB431R1 */
+	NULL,			/* ECCurve_SECG_PRIME_112R1 */
+	NULL,			/* ECCurve_SECG_PRIME_112R2 */
+	NULL,			/* ECCurve_SECG_PRIME_128R1 */
+	NULL,			/* ECCurve_SECG_PRIME_128R2 */
+	NULL,			/* ECCurve_SECG_PRIME_160K1 */
+	NULL,			/* ECCurve_SECG_PRIME_160R1 */
+	NULL,			/* ECCurve_SECG_PRIME_160R2 */
+	NULL,			/* ECCurve_SECG_PRIME_192K1 */
+	NULL,			/* ECCurve_SECG_PRIME_224K1 */
+	NULL,			/* ECCurve_SECG_PRIME_256K1 */
+	NULL,			/* ECCurve_SECG_CHAR2_113R1 */
+	NULL,			/* ECCurve_SECG_CHAR2_113R2 */
+	NULL,			/* ECCurve_SECG_CHAR2_131R1 */
+	NULL,			/* ECCurve_SECG_CHAR2_131R2 */
+	NULL,			/* ECCurve_SECG_CHAR2_163R1 */
+	NULL,			/* ECCurve_SECG_CHAR2_193R1 */
+	NULL,			/* ECCurve_SECG_CHAR2_193R2 */
+	NULL,			/* ECCurve_SECG_CHAR2_239K1 */
+	NULL,			/* ECCurve_WTLS_1 */
+	NULL,			/* ECCurve_WTLS_8 */
+	NULL,			/* ECCurve_WTLS_9 */
+	NULL			/* ECCurve_pastLastCurve */
 };
 
 #endif
Index: mozilla/security/nss/lib/freebl/manifest.mn
diff -u mozilla/security/nss/lib/freebl/manifest.mn:1.44.2.1 mozilla/security/nss/lib/freebl/manifest.mn:1.44.2.2
--- mozilla/security/nss/lib/freebl/manifest.mn:1.44.2.1	Fri Mar 31 00:26:40 2006
+++ mozilla/security/nss/lib/freebl/manifest.mn	Fri Apr 28 03:35:29 2006
@@ -104,11 +104,13 @@
 ECL_HDRS = ecl-exp.h ecl.h ec2.h ecp.h ecl-priv.h
 ifdef NSS_ENABLE_ECC
 ECL_SRCS = ecl.c ecl_curve.c ecl_mult.c ecl_gf.c \
-	ec2_aff.c ec2_mont.c ec2_proj.c \
-	ec2_163.c ec2_193.c ec2_233.c \
 	ecp_aff.c ecp_jac.c ecp_mont.c \
-	ecp_192.c ecp_224.c ecp_256.c ecp_384.c ecp_521.c \
 	ec_naf.c ecp_jm.c
+ifdef NSS_ECC_MORE_THAN_SUITE_B
+ECL_SRCS += ec2_aff.c ec2_mont.c ec2_proj.c \
+	ec2_163.c ec2_193.c ec2_233.c \
+	ecp_192.c ecp_224.c ecp_256.c ecp_384.c ecp_521.c 
+endif
 else
 ECL_SRCS = $(NULL)
 endif
Index: mozilla/security/nss/lib/cryptohi/secsign.c
diff -u mozilla/security/nss/lib/cryptohi/secsign.c:1.14.2.2 mozilla/security/nss/lib/cryptohi/secsign.c:1.14.2.3
--- mozilla/security/nss/lib/cryptohi/secsign.c:1.14.2.2	Thu Mar  2 00:12:26 2006
+++ mozilla/security/nss/lib/cryptohi/secsign.c	Fri Apr 28 03:35:29 2006
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: secsign.c,v 1.14.2.2 2006/03/02 00:12:26 wtchang%redhat.com Exp $ */
+/* $Id: secsign.c,v 1.14.2.3 2006/04/28 03:35:29 rrelyea%redhat.com Exp $ */
 
 #include <stdio.h>
 #include "cryptohi.h"
@@ -157,6 +157,13 @@
 	return 0;
     }
 
+#ifndef NSS_ECC_MORE_THAN_SUITE_B
+    if (key->keyType == ecKey) {
+	PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
+	return 0;
+    }
+#endif
+
     cx = (SGNContext*) PORT_ZAlloc(sizeof(SGNContext));
     if (cx) {
 	cx->hashalg = hashalg;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nss/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2005 06:48:37 -0000	1.3
+++ .cvsignore	19 Jun 2006 17:08:27 -0000	1.4
@@ -1,2 +1 @@
-nss-3.11.cvs.tar.bz2
-nss-3.11.tar.gz
+nss-3.11.1.tar.gz


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/FC-5/nss.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nss.spec	15 Feb 2006 07:14:13 -0000	1.10
+++ nss.spec	19 Jun 2006 17:08:27 -0000	1.11
@@ -2,8 +2,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.11
-Release:          4
+Version:          3.11.1
+Release:          1.fc5
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -19,8 +19,7 @@
 Source1:          nss.pc.in
 Source2:          nss-config.in
 
-Patch1:           nss-3.11-zdefs.patch
-Patch2:           nss-bug180726.patch
+Patch1:           nss-limit-suite-b.patch
 
 
 %description
@@ -72,7 +71,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -310,6 +308,10 @@
 
 
 %changelog
+* Mon Jun 19 2006 Kai Engert <kengert at redhat.com> - 3.11.1-1.fc5
+- Update to 3.11.1
+- Include upstream patch to limit curves
+
 * Wed Feb 15 2006 Kai Engert <kengert at redhat.com> - 3.11-4
 - add --noexecstack when compiling assembler on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nss/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2005 06:48:37 -0000	1.3
+++ sources	19 Jun 2006 17:08:27 -0000	1.4
@@ -1 +1 @@
-9be73bd73e361e5e36edf77f456fa20a  nss-3.11.tar.gz
+5cb32527df232a62a7aed61336c8c373  nss-3.11.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:16:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:16:22 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.13,1.14
Message-ID: <200606191716.k5JHGMIQ012831@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11540

Modified Files:
	libdrm.spec 
Log Message:
* Mon Jun 09 2006 Mike A. Harris <mharris at redhat.com> 2.0.1-4
- Added "Exclusivearch: ix86, x86_64, ia64, ppc, alpha, sparc, sparc64" to
  restrict build to DRI-enabled architectures.



Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libdrm.spec	9 Jun 2006 00:17:49 -0000	1.13
+++ libdrm.spec	19 Jun 2006 17:16:20 -0000	1.14
@@ -1,13 +1,15 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
 Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 
@@ -38,8 +40,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# NOTE: We intentionally don't ship *.la files
+find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,19 +78,23 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Mon Jun 09 2006 Mike A. Harris <mharris at redhat.com> 2.0.1-4
+- Added "Exclusivearch: ix86, x86_64, ia64, ppc, alpha, sparc, sparc64" to
+  restrict build to DRI-enabled architectures.
+
 * Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 2.0.1-3
 - Remove package ownership of mandir/libdir/etc.
 
 * Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 2.0.1-2
 - Bump for fc5 build.
 
-* Thu Mar 30 2006 Adam Jackson <ajackson at redhat.com> - 2.0.1-1
+* Thu Mar 30 2006 Adam Jackson <ajackson at redhat.com> 2.0.1-1
 - Bump to libdrm 2.0.1 from upstream.
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 2.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 2.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 11 2006 Mike A. Harris <mharris at redhat.com> 2.0-2
@@ -101,7 +107,7 @@
 - Updated libdrm to version 2.0 from dri.sf.net.  This is an ABI incompatible
   release, meaning everything linked to it needs to be recompiled.
 
-* Tue Nov  1 2005 Mike A. Harris <mharris at redhat.com> 1.0.5-1
+* Tue Nov 01 2005 Mike A. Harris <mharris at redhat.com> 1.0.5-1
 - Updated libdrm to version 1.0.5 from dri.sf.net upstream to work around
   mesa unichrome dri driver compile failure.
 
@@ -111,7 +117,7 @@
   r128_drv.h, radeon_drv.h, savage_drv.h, sis_drv.h, sis_ds.h, tdfx_drv.h,
   via_drv.h, via_ds.h, via_mm.h, via_verifier.h from file manifest.
 
-* Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.3-3
+* Tue Oct 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.3-3
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Add missing "BuildRequires: libX11-devel, pkgconfig"
 
@@ -119,5 +125,5 @@
 - Add missing documentation to doc macro
 - Fix spec file project URL
 
-* Sat Sep 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.3-1
+* Sat Sep 03 2005 Mike A. Harris <mharris at redhat.com> 1.0.3-1
 - Initial build.



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:21:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:21:44 -0400
Subject: rpms/nfs-utils/FC-5 .cvsignore, 1.13,
	1.14 nfs-utils-1.0.8-compile.patch, 1.1, 1.2 nfs-utils.spec,
	1.86, 1.87 sources, 1.14,
	1.15 nfs-utils-1.0.7-mountd-stat64.patch, 1.1,
	NONE nfs-utils-1.0.7-rquotad-curblocks.patch, 1.1,
	NONE nfs-utils-1.0.8-rc2-Makefileam.patch, 1.1,
	NONE nfs-utils-1.0.8-rc2-innetgr.patch, 1.1,
	NONE nfs-utils-1.0.8-rc2-nfs4_setdebug.patch, 1.1, NONE
Message-ID: <200606191721.k5JHLiNj022206@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22046

Modified Files:
	.cvsignore nfs-utils-1.0.8-compile.patch nfs-utils.spec 
	sources 
Removed Files:
	nfs-utils-1.0.7-mountd-stat64.patch 
	nfs-utils-1.0.7-rquotad-curblocks.patch 
	nfs-utils-1.0.8-rc2-Makefileam.patch 
	nfs-utils-1.0.8-rc2-innetgr.patch 
	nfs-utils-1.0.8-rc2-nfs4_setdebug.patch 
Log Message:
Updated to nfs-utils-1.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Jan 2006 20:17:59 -0000	1.13
+++ .cvsignore	19 Jun 2006 17:21:41 -0000	1.14
@@ -3,3 +3,4 @@
 libgssapi-0.7.tar.gz
 libnfsidmap-0.12.tar.gz
 nfs.doc.tar.gz
+nfs-utils-1.0.8.tar.gz

nfs-utils-1.0.8-compile.patch:
 Makefile.am          |    1 -
 aclocal/kerberos5.m4 |    2 ++
 configure.in         |    3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

Index: nfs-utils-1.0.8-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils-1.0.8-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.0.8-compile.patch	9 Jan 2006 20:22:16 -0000	1.1
+++ nfs-utils-1.0.8-compile.patch	19 Jun 2006 17:21:41 -0000	1.2
@@ -1,6 +1,6 @@
---- nfs-utils-1.0.8-rc2/aclocal/kerberos5.m4.orig	2005-12-19 23:12:43.000000000 -0500
-+++ nfs-utils-1.0.8-rc2/aclocal/kerberos5.m4	2006-01-06 14:35:59.523950000 -0500
-@@ -34,6 +34,8 @@ AC_DEFUN([AC_KERBEROS_V5],[
+--- nfs-utils-1.0.8/aclocal/kerberos5.m4.compile	2006-03-26 18:50:45.000000000 -0500
++++ nfs-utils-1.0.8/aclocal/kerberos5.m4	2006-06-15 13:24:20.009600000 -0400
+@@ -36,6 +36,8 @@ AC_DEFUN([AC_KERBEROS_V5],[
        AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
        if test -f $dir/include/gssapi/gssapi_krb5.h -a \
                  \( -f $dir/lib/libgssapi_krb5.a -o \
@@ -9,15 +9,18 @@
                     -f $dir/lib/libgssapi_krb5.so \) ; then
           AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
           KRBDIR="$dir"
---- nfs-utils-1.0.8-rc2/Makefile.am.orig	2006-01-06 14:35:35.649376000 -0500
-+++ nfs-utils-1.0.8-rc2/Makefile.am	2006-01-06 14:35:59.529951000 -0500
-@@ -47,4 +47,3 @@ install-data-hook:
- 	mkdir -p $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak
- 	touch $(DESTDIR)/$(statedir)/state
- 	chmod go-rwx $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state
--	chown $(statduser) $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state
---- nfs-utils-1.0.8-rc2/configure.in.orig	2005-12-20 01:04:18.000000000 -0500
-+++ nfs-utils-1.0.8-rc2/configure.in	2006-01-06 14:37:32.827182000 -0500
+--- nfs-utils-1.0.8/Makefile.am.compile	2006-03-27 19:53:30.000000000 -0500
++++ nfs-utils-1.0.8/Makefile.am	2006-06-15 13:24:50.567291000 -0400
+@@ -47,7 +47,6 @@ install-data-hook:
+ 	mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+ 	touch $(DESTDIR)$(statedir)/state
+ 	chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+-	chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+ 
+ uninstall-hook:
+ 	rm $(DESTDIR)$(statedir)/xtab
+--- nfs-utils-1.0.8/configure.in.compile	2006-04-11 22:55:51.000000000 -0400
++++ nfs-utils-1.0.8/configure.in	2006-06-15 13:24:20.053601000 -0400
 @@ -110,6 +110,9 @@ AC_ARG_ENABLE(rquotad,
  # Check whether user wants TCP wrappers support
  AC_TCP_WRAPPERS


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- nfs-utils.spec	20 Mar 2006 13:30:05 -0000	1.86
+++ nfs-utils.spec	19 Jun 2006 17:21:41 -0000	1.87
@@ -1,12 +1,12 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 1.0.8.rc2
-Release: 5.FC5
+Version: 1.0.8
+Release: 1.FC5
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8-rc2.tar.gz
+Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
 Source10: nfs.init
@@ -18,12 +18,7 @@
 Patch50: nfs-utils-1.0.5-statdpath.patch
 Patch51: nfs-utils-1.0.6-mountd.patch
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
-Patch53: nfs-utils-1.0.7-rquotad-curblocks.patch
-Patch54: nfs-utils-1.0.7-mountd-stat64.patch
-Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch
-Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch
-Patch57: nfs-utils-1.0.8-rc2-innetgr.patch
-Patch58: nfs-utils-1.0.8-rc2-nfs4_setdebug.patch
+Patch53: nfs-utils-1.0.7-nfsd-ctlbits.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -61,16 +56,11 @@
 clients which are mounted on that host.
 
 %prep
-%setup -q -n nfs-utils-1.0.8-rc2 -a1
+%setup -q 
 %patch50 -p1 -b .statdpath
 %patch51 -p1 -b .mountd
 %patch52 -p1 -b .conf
-%patch53 -p1 -b .curblocks
-%patch54 -p1 -b .stat64
-%patch55 -p1 -b .ctlbits
-%patch56 -p1 -b .makeam
-%patch57 -p1 -b .innetgr
-%patch58 -p1 -b .setdebug
+%patch53 -p1 -b .ctlbits
 
 # Do the magic to get things to compile
 %patch100 -p1 -b .compile
@@ -206,7 +196,7 @@
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) /var/lib/nfs/state
-%doc nfs/*.html nfs/*.ps linux-nfs/*
+%doc linux-nfs/*
 /sbin/rpcdebug
 /sbin/rpc.lockd
 /sbin/rpc.statd
@@ -219,10 +209,15 @@
 /usr/sbin/rpc.idmapd
 /usr/sbin/rpc.gssd
 /usr/sbin/rpc.svcgssd
+/usr/sbin/gss_clnt_send_err
+/usr/sbin/gss_destroy_creds
 %{_mandir}/*/*
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Fri Jun 16 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8-1
+- Updated to nfs-utils-1.0.8
+
 * Mon Mar 20 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8.rc2-5.FC5
 - Fixed typo in nfs initscript (bz 158866)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2006 20:17:59 -0000	1.14
+++ sources	19 Jun 2006 17:21:41 -0000	1.15
@@ -1,2 +1,2 @@
-d0ce78b60ea88995350c9c3b4e4f9f5f  nfs-utils-1.0.8-rc2.tar.gz
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
+74fc2dd04b40c9d619ca41d3787ef8db  nfs-utils-1.0.8.tar.gz


--- nfs-utils-1.0.7-mountd-stat64.patch DELETED ---


--- nfs-utils-1.0.7-rquotad-curblocks.patch DELETED ---


--- nfs-utils-1.0.8-rc2-Makefileam.patch DELETED ---


--- nfs-utils-1.0.8-rc2-innetgr.patch DELETED ---


--- nfs-utils-1.0.8-rc2-nfs4_setdebug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:21:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:21:59 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.70,1.71
Message-ID: <200606191721.k5JHLxrh022315@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21945

Modified Files:
	rhythmbox.spec 
Log Message:
fix file lists, III



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- rhythmbox.spec	19 Jun 2006 16:32:02 -0000	1.70
+++ rhythmbox.spec	19 Jun 2006 17:21:57 -0000	1.71
@@ -89,6 +89,10 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/rhythmbox.schemas >/dev/null
 update-desktop-database -q
 scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -101,6 +105,11 @@
 /sbin/ldconfig
 update-desktop-database -q
 scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -114,6 +123,7 @@
 %{_datadir}/omf/rhythmbox/*
 %{_datadir}/mime-info/rhythmbox.keys
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
+%{_datadir}/icons/hicolor/48x48/apps/rhythmbox.png
 %{_libdir}/rhythmbox/plugins
 %{_libexecdir}/rhythmbox-metadata
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:35:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:35:30 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.87,1.88
Message-ID: <200606191735.k5JHZUYt026202@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26129

Modified Files:
	nfs-utils.spec 
Log Message:
reworked some BuildRequires:



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- nfs-utils.spec	19 Jun 2006 17:21:41 -0000	1.87
+++ nfs-utils.spec	19 Jun 2006 17:35:27 -0000	1.88
@@ -36,14 +36,12 @@
 License: GPL
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
-Requires: modutils >= 2.4.26-9
-BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel
-BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
+Requires: modutils >= 2.4.26-9, nfs-utils-lib
+BuildRequires: krb5-libs >= 1.4, autoconf >= 2.57, openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
-BuildRequires: libevent-devel libgssapi-devel
+BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel >= 1.0.8-4
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
-PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi
 
 %description
 The nfs-utils package provides a daemon for the kernel NFS server and



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:36:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:36:54 -0400
Subject: rpms/mesa/devel mesa.spec,1.62,1.63
Message-ID: <200606191736.k5JHasuX026416@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26396

Modified Files:
	mesa.spec 
Log Message:
* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 6.5-10
- Bump libdrm-devel dep to trigger new ExclusiveArch test with the new package.
- Use Fedora Extras style BuildRoot tag.
- Added "Requires(post): /sbin/ldconfig" and postun to all runtime lib packages.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- mesa.spec	13 Jun 2006 00:02:01 -0000	1.62
+++ mesa.spec	19 Jun 2006 17:36:51 -0000	1.63
@@ -53,11 +53,12 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 9
+Release: 10
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
 # MesaDemos is included here just for glxinfo and glxgears, as they were
 # previously supplied in X.Org sources, whereas the rest of the demos were not.
@@ -67,6 +68,7 @@
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
+
 Patch0: mesa-6.5-build-config.patch
 Patch1: mesa-6.3.2-fix-installmesa.patch
 Patch2: mesa-6.4-multilib-fix.patch
@@ -78,6 +80,7 @@
 Patch8: mesa-6.5-fix-pbuffer-dispatch.patch
 # General patches from upstream go here:
 
+
 # Red Hat custom patches, feature development
 Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
@@ -85,7 +88,7 @@
 
 BuildRequires: pkgconfig
 %if %{with_dri}
-BuildRequires: libdrm-devel >= 2.0.1-1
+BuildRequires: libdrm-devel >= 2.0.1-4
 %endif
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel
@@ -106,6 +109,9 @@
 Summary: Mesa libGL runtime libraries and DRI drivers.
 Group: System Environment/Libraries
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Provides: libGL
 
 # libGL used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -144,6 +150,9 @@
 Summary: Mesa libGLU runtime library
 Group: System Environment/Libraries
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Provides: libGLU
 
 # libGLU used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -182,6 +191,9 @@
 Summary: Mesa libGLw runtime library
 Group: System Environment/Libraries
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Provides: libGLw
 
 # libGLw used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -438,7 +450,12 @@
 %{_bindir}/glxinfo
 
 %changelog
-* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-9
+* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 6.5-10
+- Bump libdrm-devel dep to trigger new ExclusiveArch test with the new package.
+- Use Fedora Extras style BuildRoot tag.
+- Added "Requires(post): /sbin/ldconfig" and postun to all runtime lib packages.
+
+* Mon Jun 12 2006 Kristian H??sberg <krh at redhat.com> 6.5-9
 - Add mesa-6.5-fix-pbuffer-dispatch.patch to fix pbuffer marshalling code.
 
 * Mon May 29 2006 Kristian H??gsberg <krh at redhat.com> 6.5-8



From fedora-cvs-commits at redhat.com  Mon Jun 19 17:49:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 13:49:47 -0400
Subject: rpms/fedora-release/devel .cvsignore, 1.14, 1.15 fedora-release.spec,
	1.34, 1.35 sources, 1.25, 1.26
Message-ID: <200606191749.k5JHnlMk013038@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12874

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
New release-notes content.
Fixed up spec file a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	15 Jun 2006 23:29:09 -0000	1.14
+++ .cvsignore	19 Jun 2006 17:49:44 -0000	1.15
@@ -1,13 +1 @@
-fedora-release-notes-4.90.tar.gz
-fedora-release-4.90.tar.gz
-fedora-release-4.91.tar.gz
-fedora-release-notes-4.91.tar.gz
-fedora-release-notes-4.92.tar.gz
-fedora-release-4.92.tar.gz
-fedora-release-5.tar.gz
-fedora-release-notes-5.tar.gz
-fedora-release-5.89.tar.gz
-fedora-release-notes-5.80.tar.gz
-fedora-release-notes-5.89.tar.gz
-fedora-release-notes-5.90.tar.gz
 fedora-release-5.90.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fedora-release.spec	15 Jun 2006 23:29:09 -0000	1.34
+++ fedora-release.spec	19 Jun 2006 17:49:44 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: Fedora Core release file
 Name: fedora-release
 Version: %{real_release_version}
-Release: 1
+Release: 2
 License: GFDL
 Group: System Environment/Base
 Source: fedora-release-%{real_release_version}.tar.gz
@@ -64,9 +64,7 @@
   $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
 install -m 644 index.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html
 
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/sysconfig/rhn
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-install -m 644 sources $RPM_BUILD_ROOT/etc/sysconfig/rhn/sources
 for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
@@ -107,9 +105,7 @@
 %defattr(-,root,root)
 %attr(0644,root,root) /etc/fedora-release
 /etc/redhat-release
-%dir /etc/sysconfig/rhn
 %dir /etc/yum.repos.d
-%config(noreplace) /etc/sysconfig/rhn/sources
 %config(noreplace) /etc/yum.repos.d/*
 %doc eula.txt GPL 
 %doc about
@@ -124,6 +120,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Jun 19 2006 Jesse Keating <jkeating at redhat.com> - 5.90-2
+- Cleanups
+
 * Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 5.90-1
 - Update for 5.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	15 Jun 2006 23:29:09 -0000	1.25
+++ sources	19 Jun 2006 17:49:44 -0000	1.26
@@ -1,2 +1 @@
-31b83e51bc7c5e75cdb73eb45241a20d  fedora-release-notes-5.90.tar.gz
 2736ad091ece91c43ebd7208a5858509  fedora-release-5.90.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 18:15:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 14:15:15 -0400
Subject: rpms/fedora-release/devel sources,1.26,1.27
Message-ID: <200606191815.k5JIFFXx025690@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25677

Modified Files:
	sources 
Log Message:
Added the release-notes file



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	19 Jun 2006 17:49:44 -0000	1.26
+++ sources	19 Jun 2006 18:15:13 -0000	1.27
@@ -1 +1,2 @@
 2736ad091ece91c43ebd7208a5858509  fedora-release-5.90.tar.gz
+5cbca2b54653efee1d014e572b133e1f  fedora-release-notes-5.90.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 19:03:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 15:03:09 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.64,1.65
Message-ID: <200606191903.k5JJ39jS009473@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9446

Modified Files:
	tomcat5.spec 
Log Message:

Re-enable ppc64, s390 and s390x architectures now that eclipse is built there.




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- tomcat5.spec	6 Mar 2006 22:54:44 -0000	1.64
+++ tomcat5.spec	19 Jun 2006 19:03:03 -0000	1.65
@@ -26,7 +26,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.15
-Release: 1jpp_6fc
+Release: 1jpp_7fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -58,9 +58,6 @@
 Patch16: %{name}-%{majversion}-jspc-classpath.patch
 Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch
 
-# eclipse excludes these and we need eclipse-ecj
-ExcludeArch: ppc64 s390 s390x
-
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
 
 Requires: jpackage-utils >= 0:1.6.0
@@ -999,6 +996,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Sat Jun 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:5.5.15-1jpp_7fc
+- Re-enable ppc64, s390 and s390x architectures now that eclipse is built there
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:5.5.15-1jpp_6fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 19:07:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 15:07:22 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-cw-crash-fix.patch,
	NONE, 1.1 xorg-x11-server-1.1.0-edid-mode-injection-3.patch,
	NONE, 1.1 xorg-x11-server-1.1.0-hush-crash-message.patch, NONE,
	1.1 xorg-x11-server-1.1.0-pci-scan-fixes.patch, NONE,
	1.1 xorg-x11-server.spec, 1.85, 1.86
Message-ID: <200606191907.k5JJ7MMh009938@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9896

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-cw-crash-fix.patch 
	xorg-x11-server-1.1.0-edid-mode-injection-3.patch 
	xorg-x11-server-1.1.0-hush-crash-message.patch 
	xorg-x11-server-1.1.0-pci-scan-fixes.patch 
Log Message:
- Disable filling in monitor gamma info from EDID momentarily, since drivers
  will use that field to set the card's gamma ramp.
- Backport some stuff from git: cw crash fix, faster pci scanning, and a
  log message cleanup.


xorg-x11-server-1.1.0-cw-crash-fix.patch:
 cw_ops.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE xorg-x11-server-1.1.0-cw-crash-fix.patch ---
--- xorg-server-1.1.0/miext/cw/cw_ops.c.cw-crash	2006-02-10 17:00:29.000000000 -0500
+++ xorg-server-1.1.0/miext/cw/cw_ops.c	2006-06-19 14:11:54.000000000 -0400
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 
 #include "gcstruct.h"
+#include "pixmapstr.h"
 #include "cw.h"
 
 #define SETUP_BACKING_DST(_pDst, _pGC) \
@@ -43,6 +44,9 @@
 	&src_off_y)
 
 #define PROLOGUE(pGC) do { \
+    if (pBackingGC->serialNumber != pBackingDst->serialNumber) { \
+	ValidateGC(pBackingDst, pBackingGC); \
+    } \
     pGC->funcs = pGCPrivate->wrapFuncs;\
     pGC->ops = pGCPrivate->wrapOps;\
 } while (0)

xorg-x11-server-1.1.0-edid-mode-injection-3.patch:
 ddcProperty.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-edid-mode-injection-3.patch ---
--- xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c.edid3	2006-06-16 14:50:06.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c	2006-06-16 14:51:38.000000000 -0400
@@ -303,7 +303,11 @@
 
     Monitor->DDC = DDC;
 
-    if (DDC->features.gamma > 0.0) {
+    /*
+     * Don't want to fill this in yet, drivers will (wrongly!) set their
+     * gamma ramp based on this info.
+     */
+    if (0 && DDC->features.gamma > 0.0) {
         Monitor->gamma.red = DDC->features.gamma;
         Monitor->gamma.green = DDC->features.gamma;
         Monitor->gamma.blue = DDC->features.gamma;

xorg-x11-server-1.1.0-hush-crash-message.patch:
 xf86Events.c |   11 -----------
 1 files changed, 11 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-hush-crash-message.patch ---
--- xorg-server-1.1.0/hw/xfree86/common/xf86Events.c.crash-message	2006-03-25 14:52:03.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/common/xf86Events.c	2006-06-19 14:32:16.000000000 -0400
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.159 2003/11/22 04:22:11 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -48,9 +47,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-/* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Events.c,v 1.22 2006/03/25 19:52:03 ajax Exp $ */
-
 /* [JCH-96/01/21] Extended std reverse map to four buttons. */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -1482,13 +1478,6 @@
 #ifdef XF86BIGFONT
   XF86BigfontCleanup();
 #endif
-#if defined(XFree86LOADER)
-  if (xf86Initialising)
-      LoaderCheckUnresolved(LD_RESOLV_IFDONE);
-  ErrorF("\n"
-	 "   *** If unresolved symbols were reported above, they might not\n"
-	 "   *** be the reason for the server aborting.\n");
-#endif
 
   xorg_backtrace();
     

xorg-x11-server-1.1.0-pci-scan-fixes.patch:
 bus/Pci.c       |    6 -
 bus/Pci.h       |    2 
 bus/linuxPci.c  |   51 ++++++---
 linux/lnx_pci.c |  317 ++++++++++++++++++++++++++------------------------------
 4 files changed, 189 insertions(+), 187 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-pci-scan-fixes.patch ---
--- xorg-server-1.1.0/hw/xfree86/os-support/bus/Pci.h.pci-scan	2006-06-19 14:43:59.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/os-support/bus/Pci.h	2006-06-19 14:44:37.000000000 -0400
@@ -439,6 +439,8 @@
 extern int    pciFuncNum;
 extern PCITAG pciDeviceTag;
 
+extern int    xf86MaxPciDevs;
+
 extern pciBusInfo_t  *pciBusInfo[];
 
 #endif /* _PCI_H */
--- xorg-server-1.1.0/hw/xfree86/os-support/bus/linuxPci.c.pci-scan	2006-05-16 16:45:20.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/os-support/bus/linuxPci.c	2006-06-19 14:43:36.000000000 -0400
@@ -108,6 +108,9 @@
 /* bridge      */	NULL
 };
 
+/* from lnx_pci.c. */
+extern int lnxPciInit(void);
+
 void
 linuxPciInit()
 {
@@ -123,6 +126,7 @@
 	pciFindFirstFP = pciGenFindFirst;
 	pciFindNextFP  = pciGenFindNext;
 	pciSetOSBIOSPtr(linuxPciHandleBIOS);
+        xf86MaxPciDevs = lnxPciInit();
 }
 
 static int
@@ -130,32 +134,45 @@
 {
 	static int	lbus,ldev,lfunc,fd = -1,is_write = 0;
 	int		bus, dev, func;
-	char		file[32];
+	char		file[64];
 	struct stat	ignored;
+	static int is26 = -1;
 
 	bus  = PCI_BUS_FROM_TAG(tag);
 	dev  = PCI_DEV_FROM_TAG(tag);
 	func = PCI_FUNC_FROM_TAG(tag);
+	if (is26 == -1) {
+		if (stat("/sys/bus/pci",&ignored) < 0)
+			is26 = 0;
+		else
+			is26 = 1;
+	}
+	
 	if (fd == -1 || (write && (!is_write))
 	    || bus != lbus || dev != ldev || func != lfunc) {
 		if (fd != -1)
 			close(fd);
-		if (bus < 256) {
-		        sprintf(file,"/proc/bus/pci/%02x",bus);
-			if (stat(file, &ignored) < 0)
-				sprintf(file, "/proc/bus/pci/0000:%02x/%02x.%1x",
-					bus, dev, func);
-			else
-				sprintf(file, "/proc/bus/pci/%02x/%02x.%1x",
-					bus, dev, func);
-		} else {
-		        sprintf(file,"/proc/bus/pci/%04x",bus);
-			if (stat(file, &ignored) < 0)
-				sprintf(file, "/proc/bus/pci/0000:%04x/%02x.%1x",
-					bus, dev, func);
-			else
-				sprintf(file, "/proc/bus/pci/%04x/%02x.%1x",
-					bus, dev, func);
+		if (is26)
+			sprintf(file,"/sys/bus/pci/devices/0000:%02x:%02x.%01x/config",
+				bus, dev, func);
+		else {
+			if (bus < 256) {
+				sprintf(file,"/proc/bus/pci/%02x",bus);
+				if (stat(file, &ignored) < 0)
+					sprintf(file, "/proc/bus/pci/0000:%02x/%02x.%1x",
+						bus, dev, func);
+				else
+					sprintf(file, "/proc/bus/pci/%02x/%02x.%1x",
+						bus, dev, func);
+			} else {
+				sprintf(file,"/proc/bus/pci/%04x",bus);
+				if (stat(file, &ignored) < 0)
+					sprintf(file, "/proc/bus/pci/0000:%04x/%02x.%1x",
+						bus, dev, func);
+				else
+					sprintf(file, "/proc/bus/pci/%04x/%02x.%1x",
+						bus, dev, func);
+			}
 		}
 		if (write) {
 		    fd = open(file,O_RDWR);
--- xorg-server-1.1.0/hw/xfree86/os-support/bus/Pci.c.pci-scan	2006-05-18 19:51:34.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/os-support/bus/Pci.c	2006-06-19 14:43:36.000000000 -0400
@@ -238,6 +238,8 @@
 
 static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len);
 
+int xf86MaxPciDevs = MAX_PCI_DEVICES;
+
 /*
  * Platform specific PCI function pointers.
  *
@@ -938,7 +940,7 @@
     xf86MsgVerb(X_INFO, 2, "PCI: PCI scan (all values are in hex)\n");
 #endif
 
-    while (idx < MAX_PCI_DEVICES && tag != PCI_NOT_FOUND) {
+    while (idx < xf86MaxPciDevs && tag != PCI_NOT_FOUND) {
 	devp = xcalloc(1, sizeof(pciDevice));
 	if (!devp) {
 	    xf86Msg(X_ERROR,
@@ -1001,6 +1003,8 @@
 #endif
 
 	pci_devp[idx++] = devp;
+        if (idx == xf86MaxPciDevs)
+            break;
 	tag = pciFindNext();
 
 #ifdef DEBUGPCI
--- xorg-server-1.1.0/hw/xfree86/os-support/linux/lnx_pci.c.pci-scan	2006-05-18 19:51:34.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/os-support/linux/lnx_pci.c	2006-06-19 14:43:36.000000000 -0400
@@ -23,70 +23,113 @@
 #define PCIADDR_FMT		"%lx"
 #endif
 
-FILE *xf86OSLinuxPCIFile = NULL;
+int lnxPciInit(void);
+
+struct pci_dev {
+    unsigned int bus;
+    unsigned int devfn;
+    PCIADDR_TYPE offset[7];
+    PCIADDR_TYPE size[7];
+    struct pci_dev *next;
+};
+
+struct pci_dev *xf86OSLinuxPCIDevs = NULL;
+int xf86OSLinuxNumPciDevs = 0;
+
+static struct pci_dev *xf86OSLinuxGetPciDevs(void) {
+    char c[0x200];
+    FILE *file = NULL;
+    struct pci_dev *tmp, *ret = NULL;
+    unsigned int num;
+    char *res;
+    
+    file = fopen("/proc/bus/pci/devices", "r");
+    if (!file) return NULL;
+
+    xf86OSLinuxNumPciDevs = 0;
+    
+    do {
+        res = fgets(c, 0x1ff, file);
+        if (res) {
+            tmp = xcalloc(sizeof(struct pci_dev),1);
+            num = sscanf(res,
+                /*bus+dev vendorid deviceid irq */
+                "%02x%02x\t%*04x%*04x\t%*x"
+                /* 7 PCI resource base addresses */
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                /* 7 PCI resource sizes, and then optionally a driver name */
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT
+                "\t" PCIADDR_FMT,
+                &tmp->bus,&tmp->devfn,&tmp->offset[0],&tmp->offset[1],&tmp->offset[2],&tmp->offset[3],
+                &tmp->offset[4],&tmp->offset[5],&tmp->offset[6], &tmp->size[0], &tmp->size[1], &tmp->size[2],
+                &tmp->size[3], &tmp->size[4], &tmp->size[5], &tmp->size[6]);
+            if (num != 16) {  /* apparantly not 2.3 style */
+                xfree(tmp);
+                fclose(file);
+                return NULL;
+            }
+            if (ret) {
+                tmp->next = ret;
+            }
+            ret = tmp;
+            xf86OSLinuxNumPciDevs++;
+        }
+    } while (res);
+    fclose(file);
+    return ret;
+}
+
+/* not to be confused with linuxPciInit (i.e. ARCH_PCI_INIT), found in
+ * os-support/bus/linuxPci.c. */
+int lnxPciInit(void) {
+    if (!xf86OSLinuxPCIDevs)
+        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
+    return xf86OSLinuxNumPciDevs;
+}
 
 Bool
 xf86GetPciSizeFromOS(PCITAG tag, int index, int* bits)
 {
-    char c[0x200];
-    char *res;
-    unsigned int bus, devfn, dev, fn;
-    unsigned PCIADDR_TYPE size[7];
-    unsigned int num;
+    unsigned int dev, fn;
     signed PCIADDR_TYPE Size;
+    struct pci_dev *device;
 
     if (index > 7)
-	return FALSE;
+        return FALSE;
     
-    if (!xf86OSLinuxPCIFile && \
-        !(xf86OSLinuxPCIFile = fopen("/proc/bus/pci/devices","r")))
-	return FALSE;
-    do {
-	res = fgets(c,0x1ff,xf86OSLinuxPCIFile);
-	if (res) {
-	    num = sscanf(res,
-			 /*bus+dev vendorid deviceid irq */
-			 "%02x%02x\t%*04x%*04x\t%*x"
-			 /* 7 PCI resource base addresses */
-			 "\t" PCIADDR_IGNORE_FMT
-			 "\t" PCIADDR_IGNORE_FMT
-			 "\t" PCIADDR_IGNORE_FMT
-			 "\t" PCIADDR_IGNORE_FMT
-			 "\t" PCIADDR_IGNORE_FMT
-			 "\t" PCIADDR_IGNORE_FMT
-			 "\t" PCIADDR_IGNORE_FMT
-			 /* 7 PCI resource sizes, and then optionally a driver name */
-			 "\t" PCIADDR_FMT
-			 "\t" PCIADDR_FMT
-			 "\t" PCIADDR_FMT
-			 "\t" PCIADDR_FMT
-			 "\t" PCIADDR_FMT
-			 "\t" PCIADDR_FMT
-			 "\t" PCIADDR_FMT,
-			 &bus,&devfn,&size[0],&size[1],&size[2],&size[3],
-			 &size[4],&size[5],&size[6]);
-	    if (num != 9) {  /* apparantly not 2.3 style */ 
-		fseek(xf86OSLinuxPCIFile, 0L, SEEK_SET);
-		return FALSE;
-	    }
-	    dev = devfn >> 3;
-	    fn = devfn & 0x7;
-	    if (tag == pciTag(bus,dev,fn)) {
-		*bits = 0;
-		if (size[index] != 0) {
-		    Size = size[index] - ((PCIADDR_TYPE) 1);
-		    while (Size & ((PCIADDR_TYPE) 0x01)) {
-			Size = Size >> ((PCIADDR_TYPE) 1);
-			(*bits)++;
-		    }
-		}
-		fseek(xf86OSLinuxPCIFile, 0L, SEEK_SET);
-		return TRUE;
-	    }
-	}
-    } while (res);
+    if (!xf86OSLinuxPCIDevs) {
+        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
+    }
+    if (!xf86OSLinuxPCIDevs)
+        return FALSE;
+    
+    for (device = xf86OSLinuxPCIDevs; device; device = device->next) {
+        dev = device->devfn >> 3;
+	fn = device->devfn & 0x7;
+        if (tag == pciTag(device->bus,dev,fn)) {
+            *bits = 0;
+            if (device->size[index] != 0) {
+                Size = device->size[index] - ((PCIADDR_TYPE) 1);
+                while (Size & ((PCIADDR_TYPE) 0x01)) {
+                    Size = Size >> ((PCIADDR_TYPE) 1);
+                    (*bits)++;
+                }
+            }
+            return TRUE;
+        }
+    }
 
-    fseek(xf86OSLinuxPCIFile, 0L, SEEK_SET);
     return FALSE;
 }
 
@@ -96,59 +139,28 @@
 Bool
 xf86GetPciOffsetFromOS(PCITAG tag, int index, unsigned long* bases)
 {
-    FILE *file;
-    char c[0x200];
-    char *res;
-    unsigned int bus, devfn, dev, fn;
-    unsigned PCIADDR_TYPE offset[7];
-    unsigned int num;
+    unsigned int dev, fn;
+    struct pci_dev *device;
 
     if (index > 7)
         return FALSE;
 
-    if (!(file = fopen("/proc/bus/pci/devices","r")))
+    if (!xf86OSLinuxPCIDevs) {
+        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
+    }
+    if (!xf86OSLinuxPCIDevs)
         return FALSE;
-    do {
-        res = fgets(c,0x1ff,file);
-        if (res) {
-            num = sscanf(res,
-                         /*bus+dev vendorid deviceid irq */
-                         "%02x%02x\t%*04x%*04x\t%*x"
-                         /* 7 PCI resource base addresses */
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         /* 7 PCI resource sizes, and then optionally a driver name */
-                         "\t" PCIADDR_IGNORE_FMT
-                         "\t" PCIADDR_IGNORE_FMT
-                         "\t" PCIADDR_IGNORE_FMT
-                         "\t" PCIADDR_IGNORE_FMT
-                         "\t" PCIADDR_IGNORE_FMT
-                         "\t" PCIADDR_IGNORE_FMT
-                         "\t" PCIADDR_IGNORE_FMT,
-                         &bus,&devfn,&offset[0],&offset[1],&offset[2],&offset[3],
-                         &offset[4],&offset[5],&offset[6]);
-            if (num != 9) {  /* apparantly not 2.3 style */
-                fclose(file);
-                return FALSE;
-            }
 
-            dev = devfn >> 3;
-            fn = devfn & 0x7;
-            if (tag == pciTag(bus,dev,fn)) {
-                /* return the offset for the index requested */
-                *bases = offset[index];
-                fclose(file);
-                return TRUE;
-            }
+    for (device = xf86OSLinuxPCIDevs; device; device = device->next) {
+        dev = device->devfn >> 3;
+        fn = device->devfn & 0x7;
+        if (tag == pciTag(device->bus,dev,fn)) {
+            /* return the offset for the index requested */
+            *bases = device->offset[index];
+            return TRUE;
         }
-    } while (res);
+    }
 
-    fclose(file);
     return FALSE;
 }
 
@@ -156,81 +168,48 @@
 unsigned long
 xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base)
 {
-    FILE *file;
-    char c[0x200];
-    char *res;
-    unsigned int bus, devfn, dev, fn;
-    unsigned PCIADDR_TYPE offset[7];
-    unsigned PCIADDR_TYPE size[7];
-    unsigned int num;
+    unsigned int dev, fn;
     unsigned int ndx;
+    struct pci_dev *device;
 
-    if (!(file = fopen("/proc/bus/pci/devices","r")))
-        return 0;
-    do {
-        res = fgets(c,0x1ff,file);
-        if (res) {
-            num = sscanf(res,
-                         /*bus+dev vendorid deviceid irq */
-                         "%02x%02x\t%*04x%*04x\t%*x"
-                         /* 7 PCI resource base addresses */
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         /* 7 PCI resource sizes, and then optionally a driver name */
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT
-                         "\t" PCIADDR_FMT,
-                         &bus,&devfn,&offset[0],&offset[1],&offset[2],&offset[3],
-                         &offset[4],&offset[5],&offset[6], &size[0], &size[1], &size[2],
-		         &size[3], &size[4], &size[5], &size[6]);
-            if (num != 16) {  /* apparantly not 2.3 style */
-                fclose(file);
-                return 0;
-            }
+    if (!xf86OSLinuxPCIDevs) {
+        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
+    }
+    if (!xf86OSLinuxPCIDevs) {
+        return FALSE;
+    }
 
-            dev = devfn >> 3;
-            fn = devfn & 0x7;
-            if (tag == pciTag(bus,dev,fn)) {
-                /* ok now look through all the BAR values of this device */
-		pciConfigPtr pDev = xf86GetPciConfigFromTag(tag);
-
-                for (ndx=0; ndx<7; ndx++) {
-                    unsigned long savePtr, flagMask;
-		    if (ndx == 6) 
-			savePtr = pDev->pci_baserom;
-		    else /* this the ROM bar */
-			savePtr = (&pDev->pci_base0)[ndx];
-                    /* Ignore unset base addresses. The kernel may
-                     * have reported non-zero size and address even
-                     * if they are disabled (e.g. disabled ROM BAR).
-                     */
-                    if (savePtr == 0)
-                        continue;
-                    /* Remove memory attribute bits, different for IO
-                     * and memory ranges. */
-                    flagMask = (savePtr & 0x1) ? ~0x3UL : ~0xFUL;
-                    savePtr &= flagMask;
-
-                    /* find the index of the incoming base */
-                    if (base >= savePtr && base < (savePtr + size[ndx])) {
-                        fclose(file);
-                        return (offset[ndx] & flagMask) + (base - savePtr);
-                    }
+    for (device = xf86OSLinuxPCIDevs; device; device = device->next) {
+        dev = device->devfn >> 3;
+        fn = device->devfn & 0x7;
+        if (tag == pciTag(device->bus, dev, fn)) {
+            /* ok now look through all the BAR values of this device */
+            pciConfigPtr pDev = xf86GetPciConfigFromTag(tag);
+
+            for (ndx=0; ndx<7; ndx++) {
+                unsigned long savePtr, flagMask;
+                if (ndx == 6) 
+                    savePtr = pDev->pci_baserom;
+                else /* this the ROM bar */
+                    savePtr = (&pDev->pci_base0)[ndx];
+                /* Ignore unset base addresses. The kernel may
+                 * have reported non-zero size and address even
+                 * if they are disabled (e.g. disabled ROM BAR).
+                 */
+                if (savePtr == 0)
+                    continue;
+                /* Remove memory attribute bits, different for IO
+                 * and memory ranges. */
+                flagMask = (savePtr & 0x1) ? ~0x3UL : ~0xFUL;
+                savePtr &= flagMask;
+
+                /* find the index of the incoming base */
+                if (base >= savePtr && base < (savePtr + device->size[ndx])) {
+                    return (device->offset[ndx] & flagMask) + (base - savePtr);
                 }
             }
         }
-    } while (res);
+    };
 
-    fclose(file);
     return 0;
-
 }


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- xorg-x11-server.spec	16 Jun 2006 19:36:32 -0000	1.85
+++ xorg-x11-server.spec	19 Jun 2006 19:07:15 -0000	1.86
@@ -22,15 +22,22 @@
 Patch6:    xserver-1.0.1-randr-sdk.patch
 Patch7:	   xorg-x11-server-1.1.0-ppc64-build-fix.patch
 
-Patch50: xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
 Patch101:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 
+# Red Hat specific tweaking, not intended for upstream
+# XXX move these to the end of the list
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
+Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
+
+# Backports of post-1.1 stuff.
+Patch2000:  xorg-x11-server-1.1.0-cw-crash-fix.patch
+Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
+Patch2002:  xorg-x11-server-1.1.0-hush-crash-message.patch
 
 # autoconfiguration feature patches
 #Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
@@ -40,6 +47,7 @@
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
 Patch3005:  xorg-x11-server-1.1.0-pci-driver-detection.patch
 Patch3006:  xorg-x11-server-1.1.0-fix-default-mouse-device.patch
+Patch3007:  xorg-x11-server-1.1.0-edid-mode-injection-3.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -280,7 +288,6 @@
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .ppc64
-%patch50 -p1 -b .fpic
 
 %patch100 -p0 -b .spiffiffity
 %patch101 -p0 -b .gl-include-inferiors
@@ -288,8 +295,11 @@
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
+%patch1003 -p1 -b .fpic
 
-#%patch2000 -p1 -b .autoconfig
+%patch2000 -p1 -b .cw-crash
+%patch2001 -p1 -b .pci-scan
+%patch2002 -p1 -b .crash-message
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .cvt
@@ -297,6 +307,7 @@
 %patch3004 -p1 -b .targetrefresh
 %patch3005 -p1 -b .pci-loader
 %patch3006 -p1 -b .mice
+%patch3007 -p1 -b .edid3
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -590,6 +601,12 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 19 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-17
+- Disable filling in monitor gamma info from EDID momentarily, since drivers
+  will use that field to set the card's gamma ramp.
+- Backport some stuff from git: cw crash fix, faster pci scanning, and a
+  log message cleanup.
+
 * Fri Jun 16 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-16
 - Enable spec support for s390, s390x, alpha, sparc, and sparc64 architectures.
 - Add with_hw_servers conditional to disable hardware servers on s390/s390x.



From fedora-cvs-commits at redhat.com  Mon Jun 19 19:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 15:23:30 -0400
Subject: rpms/xorg-x11-drv-via/devel via.xinf, 1.1, 1.2 xorg-x11-drv-via.spec,
	1.14, 1.15
Message-ID: <200606191923.k5JJNUJO030065@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-via/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30024

Modified Files:
	via.xinf xorg-x11-drv-via.spec 
Log Message:
* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 0.2.1-4
- Updated via.xinf to fix numerous errors an inaccuracies (#195806)
- Conditionalized DRI support by adding with_dri macro.



Index: via.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/via.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- via.xinf	3 Feb 2006 13:40:52 -0000	1.1
+++ via.xinf	19 Jun 2006 19:23:28 -0000	1.2
@@ -1,6 +1,27 @@
-alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* via
+# NOTE: This file was last updated June 19, 2006.  It has been synchronized
+# to match the support present and enabled in the upstream X.Org X11R7.1
+# via driver release "xf86-video-via-0.2.1.tar.bz2", and to resolve
+# the following issue:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195806
+
+# NOTE: Comments in via 0.2.1 driver source indicate this device does not
+# exist in the wild, so it has been disabled for now.
+#alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* via
+
+# 1106:3108 - K8M800 (PCI_CHIP_VT3204)
+alias pcivideo:v00001106d00003108sv*sd*bc*sc*i* via
+
+# 1106:3118 - PM800/PM880/CN400 (PCI_CHIP_VT3259)
+alias pcivideo:v00001106d00003118sv*sd*bc*sc*i* via
+
+# 1106:3122 - CLE266 (PCI_CHIP_CLE3122)
 alias pcivideo:v00001106d00003122sv*sd*bc*sc*i* via
-alias pcivideo:v00001106d00003204sv*sd*bc*sc*i* via
-alias pcivideo:v00001106d00003205sv*sd*bc*sc*i* via
-alias pcivideo:v00001106d00007204sv*sd*bc*sc*i* via
+
+# 1106:7205 - KM400/KN400 (PCI_CHIP_VT3205)
 alias pcivideo:v00001106d00007205sv*sd*bc*sc*i* via
+
+# NOTE: This PCI ID is present in the 0.2.1 driver, but not part of the
+# ViaChipset array, so we disable it.  Further investigation yields a commit
+# message:  "Xv VM800 support (Ivor Hewitt). Not enabled yet pending more testing."
+# http://webcvs.freedesktop.org/xorg/driver/xf86-video-via/src/via_id.h?view=markup
+# 1106:3344 - VM800 (PCI_CHIP_VT3314)
+#alias pcivideo:v00001106d00003344sv*sd*bc*sc*i* via


Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-via.spec	26 May 2006 15:45:46 -0000	1.14
+++ xorg-x11-drv-via.spec	19 Jun 2006 19:23:28 -0000	1.15
@@ -6,10 +6,16 @@
 
 %define with_xvmc 1
 
+%ifarch %{ix86} x86_64
+%define with_dri 1
+%else
+%define with_dri 0
+%endif
+
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.2.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -25,9 +31,10 @@
 %if %{with_xvmc}
 BuildRequires: libXvMC-devel
 %endif
+%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.0-1
-
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+%endif
+Requires:  xorg-x11-server-Xorg >= 1.1.0-2
 
 %description 
 X.Org X11 via video driver.
@@ -46,7 +53,13 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static \
+%if %{with_dri}
+           --enable-dri
+%else
+           --disable-dri
+%endif
+
 make
 
 %install
@@ -87,6 +100,10 @@
 %endif
 
 %changelog
+* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 0.2.1-4
+- Updated via.xinf to fix numerous errors an inaccuracies (#195806)
+- Conditionalized DRI support by adding with_dri macro.
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 0.2.1-3
 - Updated sdk dependency to pick up proto-devel automatically. (#192167)
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 20:09:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 16:09:37 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.86,1.87
Message-ID: <200606192009.k5JK9bSj024256@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24209

Modified Files:
	xorg-x11-server.spec 
Log Message:
janitorial cleanup


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- xorg-x11-server.spec	19 Jun 2006 19:07:15 -0000	1.86
+++ xorg-x11-server.spec	19 Jun 2006 20:09:35 -0000	1.87
@@ -55,13 +55,11 @@
 
 %ifarch %{ix86} x86_64 ppc ppc64 ia64 alpha sparc sparc64
 %define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
-# --enable-xephyr
 %define with_hw_servers 1
 %define with_dmx_server 1
 %endif
 %ifarch s390 s390x
 %define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
-# --enable-xephyr
 %define with_hw_servers 0
 %define with_dmx_server 0
 %endif



From fedora-cvs-commits at redhat.com  Mon Jun 19 20:25:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 16:25:07 -0400
Subject: rpms/mcstrans/devel .cvsignore, 1.8, 1.9 mcstrans.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200606192025.k5JKP7oD012147@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/mcstrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12116

Modified Files:
	.cvsignore mcstrans.spec sources 
Log Message:
* Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 0.1.7-1
- Apply sgrubb patch to only call getpeercon on translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jun 2006 20:00:39 -0000	1.8
+++ .cvsignore	19 Jun 2006 20:25:05 -0000	1.9
@@ -5,3 +5,4 @@
 mcstrans-0.1.4.tgz
 mcstrans-0.1.5.tgz
 mcstrans-0.1.6.tgz
+mcstrans-0.1.7.tgz


Index: mcstrans.spec
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mcstrans.spec	6 Jun 2006 20:00:39 -0000	1.13
+++ mcstrans.spec	19 Jun 2006 20:25:05 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 0.1.6
+Version: 0.1.7
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -67,6 +67,9 @@
 %{_sysconfdir}/rc.d/init.d/mcstrans
 
 %changelog
+* Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 0.1.7-1
+- Apply sgrubb patch to only call getpeercon on translations
+
 * Tue Jun 6 2006 Dan Walsh <dwalsh at redhat.com> 0.1.6-1
 - Exit gracefully when selinux is not enabled
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Jun 2006 20:00:39 -0000	1.8
+++ sources	19 Jun 2006 20:25:05 -0000	1.9
@@ -1 +1 @@
-59c9934968c13bfc4d3e319868ab3a1b  mcstrans-0.1.6.tgz
+92f128d7c906f74e1350e15bcabe0821  mcstrans-0.1.7.tgz



From fedora-cvs-commits at redhat.com  Mon Jun 19 20:58:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 16:58:38 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.2-perturb.patch, NONE,
	1.1 binutils-2.17.50.0.2-tls_common.patch, NONE,
	1.1 binutils.spec, 1.82, 1.83
Message-ID: <200606192058.k5JKwcsD014934@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14919

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.17.50.0.2-perturb.patch 
	binutils-2.17.50.0.2-tls_common.patch 
Log Message:
2.17.50.0.2-3

binutils-2.17.50.0.2-perturb.patch:
 bfd.c |    2 ++
 elf.c |    1 +
 2 files changed, 3 insertions(+)

--- NEW FILE binutils-2.17.50.0.2-perturb.patch ---
Hi!

MALLOC_PERTURB_=<some_nonzero_value> causes linker failures and running ld
under valgrind reports the same.  The following patch initializes the 3
fields that weren't being cleared, although later on ld relied on it.

Ok to commit?

2006-06-19  Jakub Jelinek  <jakub at redhat.com>

	* bfd.c (bfd_record_phdr): Clear p_align and p_align_valid fields.
	* elf.c (_bfd_elf_link_hash_table_init): Clear hplt field.

--- bfd/bfd.c.jj	2006-06-15 14:31:01.000000000 +0200
+++ bfd/bfd.c	2006-06-19 10:47:58.000000000 +0200
@@ -1336,6 +1336,8 @@ bfd_record_phdr (bfd *abfd,
   m->includes_filehdr = includes_filehdr;
   m->includes_phdrs = includes_phdrs;
   m->count = count;
+  m->p_align_valid = FALSE;
+  m->p_align = 0;
   if (count > 0)
     memcpy (m->sections, secs, count * sizeof (asection *));
 
--- bfd/elf.c.jj	2006-06-19 10:57:51.000000000 +0200
+++ bfd/elf.c	2006-06-19 10:57:51.000000000 +0200
@@ -1579,6 +1579,7 @@ _bfd_elf_link_hash_table_init
   table->bucketcount = 0;
   table->needed = NULL;
   table->hgot = NULL;
+  table->hplt = NULL;
   table->merge_info = NULL;
   memset (&table->stab_info, 0, sizeof (table->stab_info));
   memset (&table->eh_info, 0, sizeof (table->eh_info));

	Jakub

binutils-2.17.50.0.2-tls_common.patch:
 bfd/elflink.c                      |    3 +
 ld/testsuite/ld-elf/tls_common.exp |   70 +++++++++++++++++++++++++++++++++++++
 ld/testsuite/ld-elf/tls_common.s   |   11 +++++
 3 files changed, 83 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.2-tls_common.patch ---
2006-06-16  Jakub Jelinek  <jakub at redhat.com>

	* elflink.c (elf_link_add_object_symbols): Don't create .tcommon
	section for relocatable link.

	* ld-elf/tls_common.exp: New test.
	* ld-elf/tls_common.s: New file.

--- bfd/elflink.c.jj	2006-06-15 14:31:01.000000000 +0200
+++ bfd/elflink.c	2006-06-15 14:40:51.000000000 +0200
@@ -3621,7 +3621,8 @@ elf_link_add_object_symbols (bfd *abfd, 
 	goto error_free_vers;
 
       if (isym->st_shndx == SHN_COMMON
-	  && ELF_ST_TYPE (isym->st_info) == STT_TLS)
+	  && ELF_ST_TYPE (isym->st_info) == STT_TLS
+	  && !info->relocatable)
 	{
 	  asection *tcomm = bfd_get_section_by_name (abfd, ".tcommon");
 
--- ld/testsuite/ld-elf/tls_common.exp.jj	2006-06-16 16:34:55.000000000 +0200
+++ ld/testsuite/ld-elf/tls_common.exp	2006-06-16 17:15:38.000000000 +0200
@@ -0,0 +1,70 @@
+# Expect script for .tls_common tests
+#   Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Written by Jakub Jelinek (jakub at redhat.com)
+#
+
+# Make sure that binutils can correctly handle ld output in ELF.
+
+# Run on Linux only.
+if { ![istarget *-*-linux*] } {
+    return
+}
+
+if { [istarget *-*-linux*aout*]
+     || [istarget *-*-linux*oldld*] } {
+    return
+}
+
+global as
+global ld
+global READELF
+global srcdir
+global subdir
+global link_output
+
+if { ![ld_assemble $as $srcdir/$subdir/tls_common.s tmpdir/tls_common.o ] } {
+    unresolved "tls_common"
+    return
+}
+
+if { ![ld_simple_link $ld tmpdir/tls_common1.o "-r tmpdir/tls_common.o"] } {
+    fail "tls_common"
+    return
+}
+
+if { ![ld_simple_link $ld tmpdir/tls_common "tmpdir/tls_common1.o"] } {
+    if { [string match "*not supported*" $link_output]
+	 || [string match "*unrecognized option*" $link_output] } {
+	unsupported "$ld_options is not supported by this target"
+    } elseif { [string match "*Warning*alignment*of common symbol*" $link_output] } {
+	fail "tls_common"
+    } else {
+	unresolved "tls_common"
+    }
+    return
+} 
+
+send_log "$READELF -l --wide tmpdir/tls_common\n"
+catch "exec $READELF -l --wide tmpdir/tls_common" readelf_output
+if ![string match "*TLS*0x000000 0x000004 R *" $readelf_output] then {
+    send_log "$readelf_output\n"
+    fail "tls_common"
+    return
+}
+
+pass "tls_common"
--- ld/testsuite/ld-elf/tls_common.s.jj	2006-06-16 16:34:34.000000000 +0200
+++ ld/testsuite/ld-elf/tls_common.s	2006-06-16 16:34:30.000000000 +0200
@@ -0,0 +1,11 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.byte 0
+	.tls_common	foo,4,4


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- binutils.spec	5 Jun 2006 09:08:22 -0000	1.82
+++ binutils.spec	19 Jun 2006 20:58:36 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.2
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -17,6 +17,8 @@
 Patch8: binutils-2.17.50.0.2-install-info.patch
 Patch9: binutils-2.17.50.0.2-kept-section.patch
 Patch10: binutils-2.17.50.0.2-bz2721.patch
+Patch11: binutils-2.17.50.0.2-perturb.patch
+Patch12: binutils-2.17.50.0.2-tls_common.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -57,6 +59,8 @@
 %patch8 -p0 -b .install-info~
 %patch9 -p0 -b .kept-section~
 %patch10 -p0 -b .bz2721~
+%patch11 -p0 -b .perturb~
+%patch12 -p0 -b .tls_common~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -167,6 +171,10 @@
 %{_infodir}/*info*
 
 %changelog
+* Mon Jun 19 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-3
+- fix two places in ld that misbehaved with MALLOC_PERTURB_=N
+- fix .tls_common handling in relocatable linking
+
 * Mon Jun  5 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-2
 - fix --as-needed (Alan Modra, #193689, BZ#2721)
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 20:58:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 16:58:57 -0400
Subject: rpms/fedora-release/devel fedora-release.spec, 1.35, 1.36 sources,
	1.27, 1.28
Message-ID: <200606192058.k5JKwvwF015002@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14980

Modified Files:
	fedora-release.spec sources 
Log Message:
New tarball which has the updated spec



Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fedora-release.spec	19 Jun 2006 17:49:44 -0000	1.35
+++ fedora-release.spec	19 Jun 2006 20:58:55 -0000	1.36
@@ -7,7 +7,7 @@
 Summary: Fedora Core release file
 Name: fedora-release
 Version: %{real_release_version}
-Release: 2
+Release: 3
 License: GFDL
 Group: System Environment/Base
 Source: fedora-release-%{real_release_version}.tar.gz
@@ -120,7 +120,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Mon Jun 19 2006 Jesse Keating <jkeating at redhat.com> - 5.90-2
+* Mon Jun 19 2006 Jesse Keating <jkeating at redhat.com> - 5.90-3
 - Cleanups
 
 * Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 5.90-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	19 Jun 2006 18:15:13 -0000	1.27
+++ sources	19 Jun 2006 20:58:55 -0000	1.28
@@ -1,2 +1,2 @@
-2736ad091ece91c43ebd7208a5858509  fedora-release-5.90.tar.gz
+b688647c2945d4982b16e404aa6a3fff  fedora-release-5.90.tar.gz
 5cbca2b54653efee1d014e572b133e1f  fedora-release-notes-5.90.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 21:02:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 17:02:42 -0400
Subject: rpms/gcc/devel gcc41-libgomp-critical.patch, NONE,
	1.1 gcc41-merge-all-constants.patch, NONE, 1.1 .cvsignore,
	1.156, 1.157 gcc41.spec, 1.74, 1.75 sources, 1.158,
	1.159 gcc41-fortran-merge-glitch.patch, 1.3,
	NONE gcc41-pr27959.patch, 1.1, NONE
Message-ID: <200606192102.k5JL2gx8015179@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15157

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-libgomp-critical.patch gcc41-merge-all-constants.patch 
Removed Files:
	gcc41-fortran-merge-glitch.patch gcc41-pr27959.patch 
Log Message:
4.1.1-4

gcc41-libgomp-critical.patch:
 critical.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-libgomp-critical.patch ---
2006-06-19  Jakub Jelinek  <jakub at redhat.com>

	* critical.c (GOMP_critical_name_start): Fix *pptr initialization
	when gomp_mutex_t is larger than pointer and HAVE_SYNC_BUILTINS is
	defined.

--- libgomp/critical.c.jj	2006-01-27 08:31:16.000000000 +0100
+++ libgomp/critical.c	2006-06-19 17:56:16.000000000 +0200
@@ -72,12 +72,14 @@ GOMP_critical_name_start (void **pptr)
 	  gomp_mutex_t *nlock = gomp_malloc (sizeof (gomp_mutex_t));
 	  gomp_mutex_init (nlock);
 
-	  plock = __sync_val_compare_and_swap (pptr, plock, nlock);
-	  if (plock != nlock)
+	  plock = __sync_val_compare_and_swap (pptr, NULL, nlock);
+	  if (plock != NULL)
 	    {
 	      gomp_mutex_destroy (nlock);
 	      free (nlock);
 	    }
+	  else
+	    plock = nlock;
 #else
 	  gomp_mutex_lock (&create_lock_lock);
 	  plock = *pptr;

gcc41-merge-all-constants.patch:
 testsuite/gcc.dg/merge-all-constants-1.c |    8 ++++++++
 varasm.c                                 |    9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE gcc41-merge-all-constants.patch ---
2006-06-19  Jakub Jelinek  <jakub at redhat.com>

	* varasm.c (mergeable_string_section): Check for embedded NULs and
	NUL termination in the first int_size_in_bytes (TREE_TYPE (decl))
	rather than TREE_STRING_LENGTH bytes.

	* gcc.dg/merge-all-constants-1.c: New test.

--- gcc/varasm.c.jj	2006-06-19 12:49:52.000000000 +0200
+++ gcc/varasm.c	2006-06-19 12:50:13.000000000 +0200
@@ -655,16 +655,20 @@ mergeable_string_section (tree decl ATTR
 			  unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED,
 			  unsigned int flags ATTRIBUTE_UNUSED)
 {
+  HOST_WIDE_INT len;
+
   if (HAVE_GAS_SHF_MERGE && flag_merge_constants
       && TREE_CODE (decl) == STRING_CST
       && TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE
       && align <= 256
-      && TREE_STRING_LENGTH (decl) >= int_size_in_bytes (TREE_TYPE (decl)))
+      && (len = int_size_in_bytes (TREE_TYPE (decl))) > 0
+      && TREE_STRING_LENGTH (decl) >= len)
     {
       enum machine_mode mode;
       unsigned int modesize;
       const char *str;
-      int i, j, len, unit;
+      HOST_WIDE_INT i;
+      int j, unit;
       char name[30];
 
       mode = TYPE_MODE (TREE_TYPE (TREE_TYPE (decl)));
@@ -676,7 +680,6 @@ mergeable_string_section (tree decl ATTR
 	    align = modesize;
 
 	  str = TREE_STRING_POINTER (decl);
-	  len = TREE_STRING_LENGTH (decl);
 	  unit = GET_MODE_SIZE (mode);
 
 	  /* Check for embedded NUL characters.  */
--- gcc/testsuite/gcc.dg/merge-all-constants-1.c.jj	2006-06-19 13:02:37.000000000 +0200
+++ gcc/testsuite/gcc.dg/merge-all-constants-1.c	2006-06-19 13:05:23.000000000 +0200
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-w -O2 -fmerge-all-constants" } */
+
+const char str1[36] = "0123456789abcdefghijklmnopqrstuvwxyz";
+const char str2[38] = "0123456789abcdefghijklmnopqrstuvwxyz";
+const char str3[10] = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+/* { dg-final { scan-assembler-not "\.rodata\.str" } } */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	12 Jun 2006 12:29:39 -0000	1.156
+++ .cvsignore	19 Jun 2006 21:02:26 -0000	1.157
@@ -1 +1 @@
-gcc-4.1.1-20060612.tar.bz2
+gcc-4.1.1-20060619.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gcc41.spec	13 Jun 2006 20:12:36 -0000	1.74
+++ gcc41.spec	19 Jun 2006 21:02:26 -0000	1.75
@@ -1,6 +1,6 @@
-%define DATE 20060612
+%define DATE 20060619
 %define gcc_version 4.1.1
-%define gcc_release 3
+%define gcc_release 4
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -123,8 +123,8 @@
 Patch22: gcc41-pr26881.patch
 Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
-Patch25: gcc41-fortran-merge-glitch.patch
-Patch26: gcc41-pr27959.patch
+Patch25: gcc41-libgomp-critical.patch
+Patch26: gcc41-merge-all-constants.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -427,8 +427,8 @@
 %patch22 -p0 -b .pr26881~
 %patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .fortran-merge-glitch~
-%patch26 -p0 -b .pr27959~
+%patch25 -p0 -b .libgomp-critical~
+%patch26 -p0 -b .merge-all-constants~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1470,6 +1470,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Jun 19 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-4
+- update from gcc-4_1-branch (-r114555:114766)
+  - PRs bootstrap/22541, c++/21210, c++/26559, c++/27227, c++/27648,
+	c++/27665, c++/27666, c++/27689, c++/27884, c++/27933, c++/27951,
+	fortran/27786, java/28024, middle-end/27733, middle-end/27802,
+	target/27858, tree-optimization/27830
+- merge gomp changes from the trunk (-r114642:114643)
+  - PR libgomp/28008
+- fix -fmerge-all-constants
+- fix #pragma omp critical handling if not --enable-linux-futex
+
 * Tue Jun 13 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-3
 - add BuildRequires for elfutils-devel on ia64
 - fix a reload bug visible on s390x (Andreas Krebbel, #193912,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- sources	12 Jun 2006 12:29:39 -0000	1.158
+++ sources	19 Jun 2006 21:02:26 -0000	1.159
@@ -1 +1 @@
-2c8d223d158721bcc926b014998d3f3f  gcc-4.1.1-20060612.tar.bz2
+2f40477c2c31cfe5832a96eb006a9f93  gcc-4.1.1-20060619.tar.bz2


--- gcc41-fortran-merge-glitch.patch DELETED ---


--- gcc41-pr27959.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 19 21:08:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 17:08:31 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.151,
	1.152
Message-ID: <200606192108.k5JL8V9L015249@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15237

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Jun 19 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_86rh
- Provide jdbc-stdext.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- java-1.4.2-gcj-compat.spec	14 Jun 2006 16:43:25 -0000	1.151
+++ java-1.4.2-gcj-compat.spec	19 Jun 2006 21:08:23 -0000	1.152
@@ -14,7 +14,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_85rh
+%define release 	40jpp_86rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 %define bcfullver	1.31
@@ -65,7 +65,7 @@
 Provides:	java-%{origin} = %{epoch}:%{version}-%{release}
 Provides:	java = %{javaver}
 Provides:	jaxp_parser_impl
-Provides:	jndi, jdbc-stdext, jaas, jsse
+Provides:	jndi, jdbc-stdext = 0:2.0, jaas, jsse
 Provides:	java-gcj-compat = %{jgcver}
 # SASL and JCE are provided by libgcj.
 Provides:	java-sasl
@@ -587,6 +587,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Mon Jun 19 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_86rh
+- Provide jdbc-stdext.
+
 * Wed Jun 14 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_85rh
 - Require zip.
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 21:22:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 17:22:29 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-loader-diet.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.87, 1.88
Message-ID: <200606192122.k5JLMTdc030435@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30280

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-loader-diet.patch 
Log Message:
Backport loader debloating.


xorg-x11-server-1.1.0-loader-diet.patch:
 configure.ac                    |    6 
 hw/xfree86/Makefile.am          |    2 
 hw/xfree86/common/xf86Globals.c |    7 
 hw/xfree86/loader/Makefile.am   |   29 -
 hw/xfree86/loader/dlloader.c    |  107 ++---
 hw/xfree86/loader/dlloader.h    |    8 
 hw/xfree86/loader/loader.c      |  808 ----------------------------------------
 hw/xfree86/loader/loader.h      |  196 ---------
 hw/xfree86/loader/loaderProcs.h |    7 
 hw/xfree86/loader/loadext.c     |    5 
 hw/xfree86/loader/loadfont.c    |    2 
 hw/xfree86/loader/loadmod.c     |   84 +---
 hw/xfree86/loader/os.c          |    4 
 include/xorg-config.h.in        |    6 
 include/xorg-server.h.in        |    6 
 15 files changed, 96 insertions(+), 1181 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-loader-diet.patch ---
--- xorg-server-1.1.0/include/xorg-server.h.in.loader-diet	2005-12-02 01:02:44.000000000 -0500
+++ xorg-server-1.1.0/include/xorg-server.h.in	2006-06-19 16:48:07.000000000 -0400
@@ -28,12 +28,6 @@
 /* Use OsVendorInit */
 #undef DDXOSINIT
 
-/* Prefer dlloader modules to elfloader */
-#undef DLOPEN_HACK
-
-/* Building with libdl */
-#undef DLOPEN_SUPPORT
-
 /* Build DPMS extension */
 #undef DPMSExtension
 
--- xorg-server-1.1.0/include/xorg-config.h.in.loader-diet	2006-03-15 16:25:38.000000000 -0500
+++ xorg-server-1.1.0/include/xorg-config.h.in	2006-06-19 16:48:07.000000000 -0400
@@ -30,12 +30,6 @@
 /* URL to go to for support. */
 #undef __VENDORDWEBSUPPORT__
 
-/* Prefer dlloader modules to elfloader */
-#undef DLOPEN_HACK
-
-/* Use libdl-based loader. */
-#undef DLOPEN_SUPPORT
-
 /* Built-in output drivers. */
 #undef DRIVERS
 
--- xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c.loader-diet	2006-05-09 14:04:29.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c	2006-06-19 16:48:07.000000000 -0400
@@ -247,10 +247,3 @@
 _X_EXPORT Bool xf86inSuspend = FALSE;
 Bool xorgHWAccess = FALSE;
 PciBusId xf86IsolateDevice;
-
-#ifdef DLOPEN_HACK
-/*
- * This stuff is a hack to allow dlopen() modules to work.  It is intended
- * only to be used when using dlopen() modules for debugging purposes.
- */
-#endif
--- xorg-server-1.1.0/hw/xfree86/loader/loadmod.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/loadmod.c	2006-06-19 16:48:07.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v 1.73 2003/11/03 05:11:51 tsi Exp $ */
-
 /*
- *
  * Copyright 1995-1998 by Metro Link, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -73,7 +70,7 @@
 #include <dirent.h>
 #include <limits.h>
 
-extern int check_unresolved_sema;
+#define TestFree(a) if (a) { xfree (a); a = NULL; }
 
 typedef struct _pattern {
     const char *pattern;
@@ -93,7 +90,7 @@
 				  const XF86ModReqInfo *, int *, int *,
 				  int flags);
 
-ModuleVersions LoaderVersionInfo = {
+const ModuleVersions LoaderVersionInfo = {
     XORG_VERSION_CURRENT,
     ABI_ANSIC_VERSION,
     ABI_VIDEODRV_VERSION,
@@ -102,17 +99,6 @@
     ABI_FONT_VERSION
 };
 
-#if 0
-void
-LoaderFixups(void)
-{
-    /* Need to call LRS here because the frame buffers get loaded last,
-     * and the drivers depend on them. */
-
-    LoaderResolveSymbols();
-}
-#endif
-
 static void
 FreeStringList(char **paths)
 {
@@ -225,15 +211,15 @@
 /*
  * Standard set of module name patterns to check, in order of preference
  * These are regular expressions (suitable for use with POSIX regex(3)).
+ *
+ * This list assumes that you're an ELFish platform and therefore your
+ * shared libraries are named something.so.  If we're ever nuts enough
+ * to port this DDX to, say, Darwin, we'll need to fix this.
  */
 static PatternRec stdPatterns[] = {
     {"^lib(.*)\\.so$",},
-    {"^lib(.*)\\.a$",},
     {"(.*)_drv\\.so$",},
-    {"(.*)_drv\\.o$",},
     {"(.*)\\.so$",},
-    {"(.*)\\.a$",},
-    {"(.*)\\.o$",},
     {NULL,}
 };
 
@@ -413,11 +399,6 @@
     int dirlen;
     const char **subdirs = NULL;
     const char **s;
-#ifdef DLOPEN_HACK
-    const char suffix[3][3] = { "so", "a", "o" };
-#else
-    const char suffix[3][3] = { "a", "o", "so" };
-#endif
 
 #ifndef __EMX__
     dirpath = (char *)dir;
@@ -437,7 +418,6 @@
 	    continue;
 	strcpy(buf, dirpath);
 	strcat(buf, *s);
-	/*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf); */
         if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
 	    int i;
 	
@@ -445,28 +425,23 @@
                 buf[dirlen++] = '/';
             }
 	    
-	    for (i = 0; i < 3 && !name; i++) {
-                snprintf(tmpBuf, PATH_MAX, "%slib%s.%s", buf, module,
-                         suffix[i]);
-                if (stat(tmpBuf, &stat_buf) == 0) {
-                    name = tmpBuf;
-                    break;
-                }
-                snprintf(tmpBuf, PATH_MAX, "%s%s_drv.%s", buf, module,
-                         suffix[i]);
-                if (stat(tmpBuf, &stat_buf) == 0) {
-                    name = tmpBuf;
-                    break;
-                }
-                snprintf(tmpBuf, PATH_MAX, "%s%s.%s", buf, module,
-                         suffix[i]);
-                if (stat(tmpBuf, &stat_buf) == 0) {
-                    name = tmpBuf;
-                    break;
-                }
-	    }
-	    if (name)
-		break;
+            snprintf(tmpBuf, PATH_MAX, "%slib%s.so", buf, module);
+            if (stat(tmpBuf, &stat_buf) == 0) {
+                name = tmpBuf;
+                break;
+            }
+
+            snprintf(tmpBuf, PATH_MAX, "%s%s_drv.so", buf, module);
+            if (stat(tmpBuf, &stat_buf) == 0) {
+                name = tmpBuf;
+                break;
+            }
+
+            snprintf(tmpBuf, PATH_MAX, "%s%s.so", buf, module);
+            if (stat(tmpBuf, &stat_buf) == 0) {
+                name = tmpBuf;
+                break;
+            }
         }
     }
     FreeSubdirs(subdirs);
@@ -740,19 +715,11 @@
 	    /* XXX Maybe this should be the other way around? */
 	    if (min > reqmin) {
 		xf86MsgVerb(X_WARNING, 2, "module ABI minor version (%d) "
-			    "is new than that available (%d)\n", min, reqmin);
+			    "is newer than that available (%d)\n", min, reqmin);
 		return FALSE;
 	    }
 	}
     }
-#ifdef NOTYET
-    if (data->checksum) {
-	/* verify the checksum field */
-	/* TO BE DONE */
-    } else {
-	ErrorF("\t*** Checksum field is 0 - this module is untrusted!\n");
-    }
-#endif
     return TRUE;
 }
 
@@ -879,7 +846,6 @@
     int noncanonical = 0;
     char *m = NULL;
 
-    /*xf86Msg(X_INFO,"OS2DIAG: LoadModule: %s\n",module); */
     xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
 
     patterns = InitPatterns(patternlist);
@@ -1318,7 +1284,7 @@
 	msg = "module-specific error";
 	break;
     default:
-	msg = "uknown error";
+	msg = "unknown error";
     }
     if (name)
 	xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
--- xorg-server-1.1.0/hw/xfree86/loader/os.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/os.c	2006-06-19 16:48:07.000000000 -0400
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
-
 /*
  * Copyright (c) 1999-2002 by The XFree86 Project, Inc.
  *
@@ -38,6 +36,7 @@
  * loader and by OS-specific modules.
  */
 
+#ifndef OSNAME
 #if defined(__linux__)
 #define OSNAME "linux"
 #elif defined(__FreeBSD__)
@@ -67,6 +66,7 @@
 #else
 #define OSNAME "unknown"
 #endif
+#endif
 
 /* Return the OS name, and run-time OS version */
 
--- xorg-server-1.1.0/hw/xfree86/loader/Makefile.am.loader-diet	2005-12-02 01:02:41.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/Makefile.am	2006-06-19 16:48:07.000000000 -0400
@@ -1,10 +1,6 @@
 noinst_LIBRARIES = libloader.a
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
-           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
-           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
-           -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \
-           -I$(srcdir)/../dixmods/extmod -I$(srcdir)/../../../miext/cw \
-           -I$(srcdir)/../../../miext/damage
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser
 
 #AM_LDFLAGS = -r
 AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
@@ -13,22 +9,10 @@
 SPARC_SOURCES = SparcMulDiv.S
 endif
 
-sdk_HEADERS = \
-	elf.h
-
 EXTRA_DIST = \
-	aout.h \
-	aoutloader.h \
-	ar.h \
-	coff.h \
-	coffloader.h \
 	dlloader.h \
-	elf.h \
-	elfloader.h \
-	hash.h \
 	loader.h \
 	loaderProcs.h \
-	sym.h \
 	SparcMulDiv.S
 
 libloader_a_SOURCES = \
@@ -37,15 +21,6 @@
 	loadext.c \
         loadmod.c \
 	loadfont.c \
-        aoutloader.c \
         dlloader.c \
-        elfloader.c \
-        coffloader.c \
 	os.c \
-	dixsym.c \
-	extsym.c \
-	fontsym.c \
-	misym.c \
-	xf86sym.c \
-	hash.c \
 	$(SPARC_SOURCES)
--- xorg-server-1.1.0/hw/xfree86/loader/loader.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/loader.h	2006-06-19 16:48:07.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.h,v 1.28 2003/11/06 18:38:14 tsi Exp $ */
-
 /*
- *
  * Copyright 1995-1998 by Metro Link, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -56,163 +53,19 @@
 #ifndef _LOADER_H
 #define _LOADER_H
 
-#include "sym.h"
-
 #if defined(Lynx) && defined(sun)
 #define const /**/
 #endif
-#if (defined(__i386__) || defined(__ix86)) && !defined(i386)
-#define i386
-#endif
 #include <X11/Xosdefs.h>
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
-/* For LOOKUP definition */
-#include "sym.h"
-#define LD_UNKNOWN	-1
-#define LD_ARCHIVE	0
-#define LD_ELFOBJECT	1
-#define LD_COFFOBJECT	2
-#define LD_XCOFFOBJECT	3
-#define LD_AOUTOBJECT   4
-#define LD_AOUTDLOBJECT	5
-#define LD_ELFDLOBJECT	6
-#define LD_PROCESSED_ARCHIVE -1
-/* #define UNINIT_SECTION */
-#define HANDLE_IN_HASH_ENTRY
 
 /* LoadModule proc flags; LD_FLAG_GLOBAL adds symbols to global
  * namespace, default is to keep symbols local to module. */
 #define LD_FLAG_GLOBAL 1
 
-/*
- * COFF Section nmumbers
- */
-#define N_TEXT       1
-#define N_DATA       2
-#define N_BSS        3
-#define N_COMMENT    4
-#define TestFree(a) if (a) { xfree (a); a = NULL; }
-#define HASHDIV 10
-#define HASHSIZE (1<<HASHDIV)
-typedef struct _elf_reloc *ELFRelocPtr;
-typedef struct _elf_COMMON *ELFCommonPtr;
-typedef struct _coff_reloc *COFFRelocPtr;
-typedef struct _coff_COMMON *COFFCommonPtr;
-typedef struct AOUT_RELOC *AOUTRelocPtr;
-typedef struct AOUT_COMMON *AOUTCommonPtr;
-
-typedef struct _LoaderReloc {
-    int modtype;
-    struct _LoaderReloc *next;
-    COFFRelocPtr coff_reloc;
-    ELFRelocPtr elf_reloc;
-    AOUTRelocPtr aout_reloc;
-} LoaderRelocRec, *LoaderRelocPtr;
-
-typedef struct _loader_item *itemPtr;
-typedef struct _loader_item {
-    char *name;
-    void *address;
-    itemPtr next;
-    int handle;
-    int module;
-    itemPtr exports;
-#if defined(__powerpc__)
-    /*
-     * PowerPC file formats require special routines in some circumstances
-     * to assist in the linking process. See the specific loader for
-     * more details.
-     */
-    union {
-	unsigned short plt[8];	/* ELF */
-	unsigned short glink[14];	/* XCOFF */
-    } code;
-#endif
-} itemRec;
-
-/* The following structures provide an interface to GDB (note that GDB
-   has copies of the definitions - if you change anything here make
-   sure that the changes are also made to GDB */
-
-typedef struct {
-    char *name;			/* Name of this symbol */
-    unsigned int namelen;	/* Name of this module */
-    void *addr;			/* Start address of the .text section */
-} LDRCommon, *LDRCommonPtr;
-
-typedef struct x_LDRModuleRec {
-    unsigned int version;	/* Version of this struct */
-    char *name;			/* Name of this module */
-    unsigned int namelen;	/* Length of name */
-    void *text;			/* Start address of the .text section */
-    void *data;			/* Start address of the .data section */
-    void *rodata;		/* Start address of the .rodata section */
-    void *bss;			/* Start address of the .bss section */
-    LDRCommonPtr commons;	/* List of commmon symbols */
-    int commonslen;		/* Number of common symbols */
-    struct x_LDRModuleRec *next;	/* Next module record in chain */
-} LDRModuleRec, *LDRModulePtr;
-
-extern char DebuggerPresent;
-extern LDRModulePtr ModList;
-extern LDRCommonPtr ldrCommons;
-extern int nCommons;
-
-/*
- * The loader uses loader specific alloc/calloc/free functions that
- * are mapped to either to the regular Xserver functions, or in a couple
- * of special cases, mapped to the C library functions.
- */
-#if !defined(PowerMAX_OS) && !(defined(linux) && (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__))) && 0
-#define xf86loadermalloc(size) xalloc(size)
-#define xf86loaderrealloc(ptr,size) xrealloc(ptr,size)
-#define xf86loadercalloc(num,size) xcalloc(num,size)
-#define xf86loaderfree(ptr) xfree(ptr)
-#define xf86loaderstrdup(ptr) xstrdup(ptr)
-#else
-/*
- * On Some OSes, xalloc() et al uses mmap to allocate space for large
- * allocation. This has the effect of placing the text section of some
- * modules very far away from the rest which are placed on the heap.
- * Certain relocations are limited in the size of the offsets that can be
- * handled, and this seperation causes these relocation to overflow. This
- * is fixed by just using the C library allocation functions for the loader
- * to ensure that all text sections are located on the heap. OSes that have
- * this problem are:
- *	PowerMAX_OS/PPC
- * 	Linux/Alpha
- * 	Linux/PPC
- *	Linux/IA-64
- */
-#define xf86loadermalloc(size) malloc(size)
-#define xf86loaderrealloc(ptr,size) realloc(ptr,size)
-#define xf86loadercalloc(num,size) calloc(num,size)
-#define xf86loaderfree(ptr) free(ptr)
-#define xf86loaderstrdup(ptr) strdup(ptr)
-#endif
-
 typedef struct _loader *loaderPtr;
 
-/*
- * _loader_funcs hold the entry points for a module format.
- */
-
-typedef void *(*LoadModuleProcPtr) (loaderPtr modrec, int fd, LOOKUP **, int flags);
-typedef void (*ResolveSymbolsProcPtr) (void *);
-typedef int (*CheckForUnresolvedProcPtr) (void *);
-typedef char *(*AddressToSectionProcPtr) (void *, unsigned long);
-typedef void (*LoaderUnloadProcPtr) (void *);
-
-typedef struct _loader_funcs {
-    LoadModuleProcPtr LoadModule;
-    ResolveSymbolsProcPtr ResolveSymbols;
-    CheckForUnresolvedProcPtr CheckForUnresolved;
-    AddressToSectionProcPtr AddressToSection;
-    LoaderUnloadProcPtr LoaderUnload;
-    LoaderRelocRec pRelocs;	/* type specific relocations */
-} loader_funcs;
-
 /* Each module loaded has a loaderRec */
 typedef struct _loader {
     int handle;			/* Unique id used to remove symbols from
@@ -221,7 +74,6 @@
     char *name;
     char *cname;
     void *private;		/* format specific data */
-    loader_funcs *funcs;	/* funcs for operating on this module */
     loaderPtr next;
 } loaderRec;
 
@@ -234,64 +86,22 @@
     int extensionVersion;
     int fontVersion;
 } ModuleVersions;
-extern ModuleVersions LoaderVersionInfo;
+extern const ModuleVersions LoaderVersionInfo;
 
 extern unsigned long LoaderOptions;
 
 /* Internal Functions */
-
-void LoaderAddSymbols(int, int, LOOKUP *);
-void LoaderDefaultFunc(void);
 void LoaderDuplicateSymbol(const char *, const int);
-
-#if 0
-void LoaderFixups(void);
-#endif
-void LoaderResolve(void);
-int LoaderResolveSymbols(void);
 int _LoaderHandleUnresolved(char *, char *);
-void LoaderHashAdd(itemPtr);
-itemPtr LoaderHashDelete(const char *);
-itemPtr LoaderHashFind(const char *);
-void LoaderHashTraverse(void *, int (*)(void *, itemPtr));
-void LoaderPrintAddress(const char *);
-void LoaderPrintItem(itemPtr);
-void LoaderPrintSymbol(unsigned long);
-void LoaderDumpSymbols(void);
 char *_LoaderModuleToName(int);
-int _LoaderAddressToSection(const unsigned long, const char **,
-			    const char **);
 int LoaderOpen(const char *, const char *, int, int *, int *, int *, int);
 int LoaderHandleOpen(int);
 
-/*
- * File interface functions
- */
-void *_LoaderFileToMem(int fd, unsigned long offset, int size, char *label);
-void _LoaderFreeFileMem(void *addr, int size);
-int _LoaderFileRead(int fd, unsigned int offset, void *addr, int size);
-
-/*
- * Relocation list manipulation routines
- */
-LoaderRelocPtr _LoaderGetRelocations(void *);
-
-/*
- * object to name lookup routines
- */
+/* object to name lookup routines */
 char *_LoaderHandleToName(int handle);
 char *_LoaderHandleToCanonicalName(int handle);
 
-/*
- * Entry points for the different loader types
- */
-#include "aoutloader.h"
-#include "coffloader.h"
-#include "elfloader.h"
+/* Loader backends. */
 #include "dlloader.h"
-/* LD_ARCHIVE */
-void *ARCHIVELoadModule(loaderPtr, int, LOOKUP **, int flags);
-
-extern void _loader_debug_state(void);
 
 #endif /* _LOADER_H */
--- xorg-server-1.1.0/hw/xfree86/loader/loader.c.loader-diet	2006-03-28 02:21:50.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/loader.c	2006-06-19 16:48:07.000000000 -0400
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.71 2003/11/06 18:38:13 tsi Exp $ */
-
 /*
  * Copyright 1995-1998 by Metro Link, Inc.
  *
@@ -69,12 +67,8 @@
 #include <malloc.h>
 #endif
 #include <stdarg.h>
-#include "ar.h"
-#include "elf.h"
-#include "coff.h"
 
 #include "os.h"
-#include "sym.h"
 #include "loader.h"
 #include "loaderProcs.h"
 #include "xf86.h"
@@ -82,31 +76,11 @@
 
 #include "compiler.h"
 
-extern LOOKUP miLookupTab[];
-extern LOOKUP xfree86LookupTab[];
-extern LOOKUP dixLookupTab[];
-extern LOOKUP fontLookupTab[];
-extern LOOKUP extLookupTab[];
-
-/*
-#define DEBUG
-#define DEBUGAR
-#define DEBUGLIST
-#define DEBUGMEM
-*/
-
-int check_unresolved_sema = 0;
-
 #if defined(Lynx) && defined(sun)
 /* Cross build machine doesn;t have strerror() */
 #define strerror(err) "strerror unsupported"
 #endif
 
-#ifdef __UNIXOS2__
-void *os2ldcalloc(size_t, size_t);
-#endif
-
-#ifdef HANDLE_IN_HASH_ENTRY
 /*
  * handles are used to identify files that are loaded. Even archives
  * are counted as a single file.
@@ -116,7 +90,6 @@
 #define HANDLE_USED 1
 static char freeHandles[MAX_HANDLE];
 static int refCount[MAX_HANDLE];
-#endif
 
 #if defined(__sparc__) && defined(__GNUC__) && !defined(__FreeBSD__)
 # define SYMFUNCDOT(func) { "." #func, (funcptr)&__sparc_dot_ ## func },
@@ -136,26 +109,6 @@
 DEFFUNCDOT(umul)
 DEFFUNCDOT(div)
 DEFFUNCDOT(udiv)
-#ifdef linux
-static LOOKUP SparcV89LookupTab[] = {
-    SYMFUNCDOT89(rem)
-    SYMFUNCDOT89(urem)
-    SYMFUNCDOT89(mul)
-    SYMFUNCDOT89(umul)
-    SYMFUNCDOT89(div)
-    SYMFUNCDOT89(udiv)
-    {0, 0}
-};
-#endif
-static LOOKUP SparcLookupTab[] = {
-    SYMFUNCDOT(rem)
-    SYMFUNCDOT(urem)
-    SYMFUNCDOT(mul)
-    SYMFUNCDOT(umul)
-    SYMFUNCDOT(div)
-    SYMFUNCDOT(udiv)
-    {0, 0}
-};
 
 #ifdef linux
 #if defined(__GNUC__) && defined(__GLIBC__)
@@ -223,22 +176,6 @@
  */
 static int moduleseq = 0;
 
-/*
- * GDB Interface
- * =============
- *
- * Linked list of loaded modules - gdb will traverse this to determine
- * whether it needs to add the symbols for the loaded module.
- */
-LDRModulePtr ModList = 0;
-
-/* Flag which gdb sets to let us know we're being debugged */
-char DebuggerPresent = 0;
-
-/* List of common symbols */
-LDRCommonPtr ldrCommons;
-int nCommons;
-
 typedef struct {
     int num;
     const char **list;
@@ -256,120 +193,18 @@
 static int fatalReqSym = 0;
 
 /* Prototypes for static functions. */
-static int _GetModuleType(int, long);
 static loaderPtr _LoaderListPush(void);
 static loaderPtr _LoaderListPop(int);
- /*ARGSUSED*/ static void
-ARCHIVEResolveSymbols(void *unused)
-{
-}
- /*ARGSUSED*/ static int
-ARCHIVECheckForUnresolved(void *v)
-{
-    return 0;
-}
- /*ARGSUSED*/ static char *
-ARCHIVEAddressToSection(void *modptr, unsigned long address)
-{
-    return NULL;
-}
- /*ARGSUSED*/ static void
-ARCHIVEUnload(void *unused2)
-{
-}
-
-/*
- * Array containing entry points for different formats.
- */
-
-static loader_funcs funcs[] = {
-    /* LD_ARCHIVE */
-    {ARCHIVELoadModule,
-     ARCHIVEResolveSymbols,
-     ARCHIVECheckForUnresolved,
-     ARCHIVEAddressToSection,
-     ARCHIVEUnload, {0, 0, 0, 0, 0}},
-    /* LD_ELFOBJECT */
-    {ELFLoadModule,
-     ELFResolveSymbols,
-     ELFCheckForUnresolved,
-     ELFAddressToSection,
-     ELFUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_COFFOBJECT */
-    {COFFLoadModule,
-     COFFResolveSymbols,
-     COFFCheckForUnresolved,
-     COFFAddressToSection,
-     COFFUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_XCOFFOBJECT */
-    {COFFLoadModule,
-     COFFResolveSymbols,
-     COFFCheckForUnresolved,
-     COFFAddressToSection,
-     COFFUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_AOUTOBJECT */
-    {AOUTLoadModule,
-     AOUTResolveSymbols,
-     AOUTCheckForUnresolved,
-     AOUTAddressToSection,
-     AOUTUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_AOUTDLOBJECT */
-#ifdef DLOPEN_SUPPORT
-    {DLLoadModule,
-     DLResolveSymbols,
-     DLCheckForUnresolved,
-     ARCHIVEAddressToSection,
-     DLUnloadModule, {0, 0, 0, 0, 0}},
-#else
-    {AOUTLoadModule,
-     AOUTResolveSymbols,
-     AOUTCheckForUnresolved,
-     AOUTAddressToSection,
-     AOUTUnloadModule, {0, 0, 0, 0, 0}},
-#endif
-    /* LD_ELFDLOBJECT */
-#ifdef DLOPEN_SUPPORT
-    {DLLoadModule,
-     DLResolveSymbols,
-     DLCheckForUnresolved,
-     ARCHIVEAddressToSection,
-     DLUnloadModule, {0, 0, 0, 0, 0}},
-#else
-    {ELFLoadModule,
-     ELFResolveSymbols,
-     ELFCheckForUnresolved,
-     ELFAddressToSection,
-     ELFUnloadModule, {0, 0, 0, 0, 0}},
-#endif
-};
-
-int numloaders = sizeof(funcs) / sizeof(loader_funcs);
 
 void
 LoaderInit(void)
 {
     const char *osname = NULL;
 
-#ifdef DLOPEN_SUPPORT
     char *ld_bind_now = getenv("LD_BIND_NOW");
     if (ld_bind_now && *ld_bind_now) {
         xf86Msg(X_ERROR, "LD_BIND_NOW is set, dlloader will NOT work!\n");
     }
-#endif
-
-    LoaderAddSymbols(-1, -1, miLookupTab);
-    LoaderAddSymbols(-1, -1, xfree86LookupTab);
-    LoaderAddSymbols(-1, -1, dixLookupTab);
-    LoaderAddSymbols(-1, -1, fontLookupTab);
-    LoaderAddSymbols(-1, -1, extLookupTab);
-#if defined(__sparc__) && !defined(__FreeBSD__)
-#ifdef linux
-    if (sparcUseHWMulDiv())
-	LoaderAddSymbols(-1, -1, SparcV89LookupTab);
-    else
-#endif
-	LoaderAddSymbols(-1, -1, SparcLookupTab);
-#endif
 
     xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
     xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
@@ -392,16 +227,6 @@
     if (osname)
 	xf86MsgVerb(X_INFO, 2, "Loader running on %s\n", osname);
 
-#if defined(linux) && \
-    (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
-     || ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
-    /*
-     * The glibc malloc uses mmap for large allocations anyway. This breaks
-     * some relocation types because the offset overflow. See loader.h for more
-     * details. We need to turn off this behavior here.
-     */
-    mallopt(M_MMAP_MAX, 0);
-#endif
 #if defined(__UNIXWARE__) && !defined(__GNUC__)
     /* For UnixWare we need to load the C Runtime libraries which are
      * normally auto-linked by the compiler. Otherwise we are bound to
@@ -424,250 +249,12 @@
 #endif
 }
 
-/*
- * Determine what type of object is being loaded.
- * This function is responsible for restoring the offset.
- * The fd and offset are used here so that when Archive processing
- * is enabled, individual elements of an archive can be evaluated
- * so the correct loader_funcs can be determined.
- */
-static int
-_GetModuleType(int fd, long offset)
-{
-    unsigned char buf[256];	/* long enough for the largest magic type */
-
-    if (read(fd, buf, sizeof(buf)) < 0) {
-	return -1;
-    }
-#ifdef DEBUG
-    ErrorF("Checking module type %10s\n", buf);
-    ErrorF("Checking module type %x %x %x %x\n", buf[0], buf[1], buf[2],
-	   buf[3]);
-#endif
-
-    lseek(fd, offset, SEEK_SET);
-
-    if (strncmp((char *)buf, ARMAG, SARMAG) == 0) {
-	return LD_ARCHIVE;
-    }
-#if defined(AIAMAG)
-    /* LynxOS PPC style archives */
-    if (strncmp((char *)buf, AIAMAG, SAIAMAG) == 0) {
-	return LD_ARCHIVE;
-    }
-#endif
-
-    if (strncmp((char *)buf, ELFMAG, SELFMAG) == 0) {
-	if (*((Elf32_Half *) (buf + ELFDLOFF)) == ELFDLMAG) {
-	    return LD_ELFDLOBJECT;
-	} else {
-	    return LD_ELFOBJECT;
-	}
-    }
-
-    if (buf[0] == 0x4c && buf[1] == 0x01) {
-	/* I386MAGIC */
-	return LD_COFFOBJECT;
-    }
-    if (buf[0] == 0x01 && buf[1] == 0xdf) {
-	/* XCOFFMAGIC */
-	return LD_COFFOBJECT;
-    }
-    if (buf[0] == 0x0d && buf[1] == 0x01) {
-	/* ZCOFFMAGIC (LynxOS) */
-	return LD_COFFOBJECT;
-    }
-    if (buf[0] == 0x00 && buf[1] == 0x86 && buf[2] == 0x01 && buf[3] == 0x07) {
-	/* AOUTMAGIC */
-	return LD_AOUTOBJECT;
-    }
-    if (buf[0] == 0x07 && buf[1] == 0x01
-	&& (buf[2] == 0x64 || buf[2] == 0x86)) {
-	/* AOUTMAGIC, (Linux OMAGIC, old impure format, also used by OS/2 */
-	return LD_AOUTOBJECT;
-    }
-    if (buf[0] == 0x07 && buf[1] == 0x01 && buf[2] == 0x00 && buf[3] == 0x00) {
-	/* AOUTMAGIC, BSDI */
-	return LD_AOUTOBJECT;
-    }
-    if ((buf[0] == 0xc0 && buf[1] == 0x86) ||	/* big endian form */
-	(buf[3] == 0xc0 && buf[2] == 0x86)) {	/* little endian form */
-	/* i386 shared object */
-	return LD_AOUTDLOBJECT;
-    }
-
-    return LD_UNKNOWN;
-}
-
-static int offsetbias = 0;	/* offset into archive */
-
-/*
- * _LoaderFileToMem() loads the contents of a file into memory using
- * the most efficient method for a platform.
- */
-void *
-_LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
-{
-#ifdef UseMMAP
-    unsigned long ret;
-
-# ifdef MmapPageAlign
-    unsigned long pagesize;
-    unsigned long new_size;
-    unsigned long new_off;
-    unsigned long new_off_bias;
-# endif
-# define MMAP_PROT	(PROT_READ|PROT_WRITE|PROT_EXEC)
-
-# ifdef DEBUGMEM
-    ErrorF("_LoaderFileToMem(%d,%u(%u),%d,%s)", fd, offset, offsetbias, size,
-	   label);
-# endif
-# ifdef MmapPageAlign
-    pagesize = getpagesize();
-    new_size = (size + pagesize - 1) / pagesize;
-    new_size *= pagesize;
-    new_off = (offset + offsetbias) / pagesize;
-    new_off *= pagesize;
-    new_off_bias = (offset + offsetbias) - new_off;
-    if ((new_off_bias + size) > new_size)
-	new_size += pagesize;
-    ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE
-#  ifdef __amd64__
-			      | MAP_32BIT
-#  endif
-			      , fd, new_off);
-    if (ret == -1)
-	FatalError("mmap() failed: %s\n", strerror(errno));
-    return (void *)(ret + new_off_bias);
-# else
-    ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE
-#  ifdef __amd64__
-			      | MAP_32BIT
-#  endif
-			      , fd, offset + offsetbias);
-    if (ret == -1)
-	FatalError("mmap() failed: %s\n", strerror(errno));
-    return (void *)ret;
-# endif
-#else
-    char *ptr;
-
-# ifdef DEBUGMEM
-    ErrorF("_LoaderFileToMem(%d,%u(%u),%d,%s)", fd, offset, offsetbias, size,
-	   label);
-# endif
-
-    if (size == 0) {
-# ifdef DEBUGMEM
-	ErrorF("=NULL\n", ptr);
-# endif
-	return NULL;
-    }
-# ifndef __UNIXOS2__
-    if ((ptr = xf86loadercalloc(size, 1)) == NULL)
-	FatalError("_LoaderFileToMem() malloc failed\n");
-# else
-    if ((ptr = os2ldcalloc(size, 1)) == NULL)
-	FatalError("_LoaderFileToMem() malloc failed\n");
-# endif
-# if defined(linux) && defined(__ia64__)
-    {
-	unsigned long page_size = getpagesize();
-	unsigned long round;
-
-	round = (unsigned long)ptr & (page_size - 1);
-	mprotect(ptr - round,
-		 (size + round + page_size - 1) & ~(page_size - 1),
-		 PROT_READ | PROT_WRITE | PROT_EXEC);
-    }
-# endif
-
-    if (lseek(fd, offset + offsetbias, SEEK_SET) < 0)
-	FatalError("\n_LoaderFileToMem() lseek() failed: %s\n",
-		   strerror(errno));
-
-    if (read(fd, ptr, size) != size)
-	FatalError("\n_LoaderFileToMem() read() failed: %s\n",
-		   strerror(errno));
-
-# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \
-    || defined(__FreeBSD__)) && defined(__powerpc__)
-    /*
-     * Keep the instruction cache in sync with changes in the
-     * main memory.
-     */
-    {
-	int i;
-
-	for (i = 0; i < size; i += 16)
-	    ppc_flush_icache(ptr + i);
-	ppc_flush_icache(ptr + size - 1);
-    }
-# endif
-
-# ifdef DEBUGMEM
-    ErrorF("=%lx\n", ptr);
-# endif
-
-    return (void *)ptr;
-#endif
-}
-
-/*
- * _LoaderFreeFileMem() free the memory in which a file was loaded.
- */
-void
-_LoaderFreeFileMem(void *addr, int size)
-{
-#if defined (UseMMAP) && defined (MmapPageAlign)
-    unsigned long pagesize = getpagesize();
-    memType i_addr = (memType) addr;
-    unsigned long new_size;
-#endif
-#ifdef DEBUGMEM
-    ErrorF("_LoaderFreeFileMem(%x,%d)\n", addr, size);
-#endif
-#ifdef UseMMAP
-# if defined (MmapPageAlign)
-    i_addr /= pagesize;
-    i_addr *= pagesize;
-    new_size = (size + pagesize - 1) / pagesize;
-    new_size *= pagesize;
-    if (((memType) addr - i_addr + size) > new_size)
-	new_size += pagesize;
-    munmap((void *)i_addr, new_size);
-# else
-    munmap((void *)addr, size);
-# endif
-#else
-    if (size == 0)
-	return;
-
-    xf86loaderfree(addr);
-#endif
-
-    return;
-}
-
-int
-_LoaderFileRead(int fd, unsigned int offset, void *buf, int size)
-{
-    if (lseek(fd, offset + offsetbias, SEEK_SET) < 0)
-	FatalError("_LoaderFileRead() lseek() failed: %s\n", strerror(errno));
-
-    if (read(fd, buf, size) != size)
-	FatalError("_LoaderFileRead() read() failed: %s\n", strerror(errno));
-
-    return size;
-}
-
 static loaderPtr listHead = (loaderPtr) 0;
 
 static loaderPtr
 _LoaderListPush()
 {
-    loaderPtr item = xf86loadercalloc(1, sizeof(struct _loader));
+    loaderPtr item = calloc(1, sizeof(struct _loader));
 
     item->next = listHead;
     listHead = item;
@@ -789,28 +376,6 @@
 }
 
 /*
- * _LoaderAddressToSection() will return the name of the file & section
- * that contains the given address.
- */
-int
-_LoaderAddressToSection(const unsigned long address, const char **module,
-			const char **section)
-{
-    loaderPtr item = listHead;
-
-    while (item) {
-	if ((*section =
-	     item->funcs->AddressToSection(item->private, address)) != NULL) {
-	    *module = _LoaderModuleToName(item->module);
-	    return 1;
-	}
-	item = item->next;
-    }
-
-    return 0;
-}
-
-/*
  * Add a list of symbols to the referenced list.
  */
 
@@ -969,283 +534,15 @@
     return (fatalsym);
 }
 
-/*
- * Handle an archive.
- */
-void *
-ARCHIVELoadModule(loaderPtr modrec, int arfd, LOOKUP ** ppLookup, int flags)
-{
-    loaderPtr tmp = NULL;
-    void *ret = NULL;
-    unsigned char magic[SARMAG];
-    struct ar_hdr hdr;
-
-#if defined(__powerpc__) && defined(Lynx)
-    struct fl_hdr fhdr;
-    char name[255];
-    int namlen;
-#endif
-    unsigned int size;
-    unsigned int offset;
-    int arnamesize, modnamesize;
-    char *slash, *longname;
-    char *nametable = NULL;
-    int nametablelen = 0;
-    LOOKUP *lookup_ret, *p;
-    LOOKUP *myLookup = NULL;	/* Does realloc behave if ptr == 0? */
-    int modtype;
-    int i;
-    int numsyms = 0;
-
-    /* lookup_ret = xf86loadermalloc(sizeof (LOOKUP *)); */
-
-    arnamesize = strlen(modrec->name);
-
-#if !(defined(__powerpc__) && defined(Lynx))
-    read(arfd, magic, SARMAG);
-
-    if (strncmp((const char *)magic, ARMAG, SARMAG) != 0) {
-	ErrorF("ARCHIVELoadModule: wrong magic!!\n");
-	return NULL;
-    }
-#else
-    read(arfd, &fhdr, FL_HSZ);
-
-    if (strncmp(fhdr.fl_magic, AIAMAG, SAIAMAG) != 0) {
-	ErrorF("ARCHIVELoadModule: wrong magic!!\n");
-	return NULL;
-    }
-#endif /* __powerpc__ && Lynx */
-
-#ifdef DEBUGAR
-    ErrorF("Looking for archive members starting at offset %o\n", offset);
-#endif
-
-    while (read(arfd, &hdr, sizeof(struct ar_hdr))) {
-
-	longname = NULL;
-	sscanf(hdr.ar_size, "%u", &size);
-#if defined(__powerpc__) && defined(Lynx)
-	sscanf(hdr.ar_namlen, "%d", &namlen);
-	name[0] = hdr.ar_name[0];
-	name[1] = hdr.ar_name[1];
-	read(arfd, &name[2], namlen);
-	name[namlen] = '\0';
-	offset = lseek(arfd, 0, SEEK_CUR);
-	if (offset & 0x1)	/* odd value */
-	    offset = lseek(arfd, 1, SEEK_CUR);	/* make it an even boundary */
-#endif
-	offset = lseek(arfd, 0, SEEK_CUR);
-
-	/* Check for a Symbol Table */
-	if ((hdr.ar_name[0] == '/' && hdr.ar_name[1] == ' ') ||
-#if defined(__powerpc__) && defined(Lynx)
-	    namlen == 0 ||
-#endif
-	    strncmp(hdr.ar_name, "__.SYMDEF", 9) == 0) {
-	    /* If the file name is NULL, then it is a symbol table */
-#ifdef DEBUGAR
-	    ErrorF("Symbol Table Member '%16.16s', size %d, offset %d\n",
-		   hdr.ar_name, size, offset);
-	    ErrorF("Symbol table size %d\n", size);
-#endif
-	    offset = lseek(arfd, offset + size, SEEK_SET);
-	    if (offset & 0x1)	/* odd value */
-		offset = lseek(arfd, 1, SEEK_CUR);	/* make it an even boundary */
-	    continue;
-	}
-
-	/* Check for a String Table */
-	if (hdr.ar_name[0] == '/' && hdr.ar_name[1] == '/') {
-	    /* If the file name is '/', then it is a string table */
-#ifdef DEBUGAR
-	    ErrorF("String Table Member '%16.16s', size %d, offset %d\n",
-		   hdr.ar_name, size, offset);
-	    ErrorF("String table size %d\n", size);
-#endif
-	    nametablelen = size;
-	    nametable = (char *)xf86loadermalloc(nametablelen);
-	    read(arfd, nametable, size);
-	    offset = lseek(arfd, 0, SEEK_CUR);
-	    /* offset=lseek(arfd,offset+size,SEEK_SET); */
-	    if (offset & 0x1)	/* odd value */
-		offset = lseek(arfd, 1, SEEK_CUR);	/* make it an even boundary */
-	    continue;
-	}
-
-	if (hdr.ar_name[0] == '/') {
-	    /*  SYS V r4 style long member name */
-	    int nameoffset = atol(&hdr.ar_name[1]);
-	    char *membername;
-
-	    if (!nametable) {
-		ErrorF("Missing string table whilst processing %s\n",
-		       modrec->name);
-		offsetbias = 0;
-		return NULL;
-	    }
-	    if (nameoffset > nametablelen) {
-		ErrorF("Invalid string table offset (%s) whilst processing %s\n", hdr.ar_name, modrec->name);
-		offsetbias = 0;
-		xf86loaderfree(nametable);
-		return NULL;
-	    }
-	    membername = nametable + nameoffset;
-	    slash = strchr(membername, '/');
-	    if (slash)
-		*slash = '\0';
-	    longname = xf86loadermalloc(arnamesize + strlen(membername) + 2);
-	    strcpy(longname, modrec->name);
-	    strcat(longname, ":");
-	    strcat(longname, membername);
-	} else if (hdr.ar_name[0] == '#' && hdr.ar_name[1] == '1' &&
-		   hdr.ar_name[2] == '/') {
-	    /* BSD 4.4 style long member name */
-	    if (sscanf(hdr.ar_name + 3, "%d", &modnamesize) != 1) {
-		ErrorF("Bad archive member %s\n", hdr.ar_name);
-		offsetbias = 0;
-		return NULL;
-	    }
-	    /* allocate space for fully qualified name */
-	    longname = xf86loadermalloc(arnamesize + modnamesize + 2);
-	    strcpy(longname, modrec->name);
-	    strcat(longname, ":");
-	    i = read(arfd, longname + modnamesize + 1, modnamesize);
-	    if (i != modnamesize) {
-		ErrorF("Bad archive member %s\n", hdr.ar_name);
-		xf86loaderfree(longname);
-		offsetbias = 0;
-		return NULL;
-	    }
-	    longname[i] = '\0';
-	    offset += i;
-	    size -= i;
-	} else {
-	    /* Regular archive member */
-#ifdef DEBUGAR
-	    ErrorF("Member '%16.16s', size %d, offset %x\n",
-#if !(defined(__powerpc__) && defined(Lynx))
-		   hdr.ar_name,
-#else
-		   name,
-#endif
-		   size, offset);
-#endif
-
-	    slash = strchr(hdr.ar_name, '/');
-	    if (slash == NULL) {
-		/* BSD format without trailing slash */
-		slash = strchr(hdr.ar_name, ' ');
-	    }
-	    /* SM: Make sure we do not overwrite other parts of struct */
-
-	    if ((slash - hdr.ar_name) > sizeof(hdr.ar_name))
-		slash = hdr.ar_name + sizeof(hdr.ar_name) - 1;
-	    *slash = '\000';
-	}
-	if ((modtype = _GetModuleType(arfd, offset)) < 0) {
-	    ErrorF("%s is an unrecognized module type\n", hdr.ar_name);
-	    offsetbias = 0;
-	    if (nametable)
-		xf86loaderfree(nametable);
-	    return NULL;
-	}
-
-	tmp = _LoaderListPush();
-
-	tmp->handle = modrec->handle;
-	tmp->module = moduleseq++;
-	tmp->cname = xf86loadermalloc(strlen(modrec->cname) + 1);
-	strcpy(tmp->cname, modrec->cname);
-	tmp->funcs = &funcs[modtype];
-	if (longname == NULL) {
-	    modnamesize = strlen(hdr.ar_name);
-	    tmp->name =
-		    (char *)xf86loadermalloc(arnamesize + modnamesize + 2);
-	    strcpy(tmp->name, modrec->name);
-	    strcat(tmp->name, ":");
-	    strcat(tmp->name, hdr.ar_name);
-
-	} else {
-	    tmp->name = longname;
-	}
-	offsetbias = offset;
-
-	if ((tmp->private = funcs[modtype].LoadModule(tmp, arfd, &lookup_ret, LD_FLAG_GLOBAL))
-	    == NULL) {
-	    ErrorF("Failed to load %s\n", hdr.ar_name);
-	    offsetbias = 0;
-	    if (nametable)
-		xf86loaderfree(nametable);
-	    return NULL;
-	}
-
-	offset = lseek(arfd, offset + size, SEEK_SET);
-	if (offset & 0x1)	/* odd value */
-	    lseek(arfd, 1, SEEK_CUR);	/* make it an even boundary */
-
-	if (tmp->private == (void *)-1L) {
-	    xf86Msg(X_INFO, "Skipping \"%s\":  "
-		    "object file contains no symbols\n",
-		    tmp->name);
-	    continue;
-	} else
-	    ret = tmp->private;
-
-	/* Add the lookup table returned from funcs.LoadModule to the
-	 * one we're going to return.
-	 */
-	for (i = 0, p = lookup_ret; p && p->symName; i++, p++) ;
-	if (i) {
-	    myLookup = xf86loaderrealloc(myLookup, (numsyms + i + 1)
-					 * sizeof(LOOKUP));
-	    if (!myLookup)
-		continue;	/* Oh well! */
-
-	    memcpy(&(myLookup[numsyms]), lookup_ret, i * sizeof(LOOKUP));
-	    numsyms += i;
-	    myLookup[numsyms].symName = 0;
-	}
-	xf86loaderfree(lookup_ret);
-    }
-    /* xf86loaderfree(lookup_ret); */
-    offsetbias = 0;
-
-    *ppLookup = myLookup;
-    if (nametable)
-	xf86loaderfree(nametable);
-
-    return ret;
-}
-
-/*
- * Relocation list manipulation routines
- */
-
-/*
- * _LoaderGetRelocations() Return the list of outstanding relocations
- */
-LoaderRelocPtr
-_LoaderGetRelocations(void *mod)
-{
-    loader_funcs *formatrec = (loader_funcs *) mod;
-
-    return &(formatrec->pRelocs);
-}
-
-
-/*
- * Public Interface to the loader.
- */
+/* Public Interface to the loader. */
 
 int
 LoaderOpen(const char *module, const char *cname, int handle,
 	   int *errmaj, int *errmin, int *wasLoaded, int flags)
 {
     loaderPtr tmp;
-    int new_handle, modtype;
+    int new_handle;
     int fd;
-    LOOKUP *pLookup;
 
 #if defined(DEBUG)
     ErrorF("LoaderOpen(%s)\n", module);
@@ -1311,26 +608,15 @@
 	return -1;
     }
 
-    if ((modtype = _GetModuleType(fd, 0)) < 0) {
-	xf86Msg(X_ERROR, "%s is an unrecognized module type\n", module);
-	freeHandles[new_handle] = HANDLE_FREE;
-	if (errmaj)
-	    *errmaj = LDR_UNKTYPE;
-	if (errmin)
-	    *errmin = LDR_UNKTYPE;
-	return -1;
-    }
-
     tmp = _LoaderListPush();
-    tmp->name = xf86loadermalloc(strlen(module) + 1);
+    tmp->name = malloc(strlen(module) + 1);
     strcpy(tmp->name, module);
-    tmp->cname = xf86loadermalloc(strlen(cname) + 1);
+    tmp->cname = malloc(strlen(cname) + 1);
     strcpy(tmp->cname, cname);
     tmp->handle = new_handle;
     tmp->module = moduleseq++;
-    tmp->funcs = &funcs[modtype];
 
-    if ((tmp->private = funcs[modtype].LoadModule(tmp, fd, &pLookup, flags)) == NULL) {
+    if ((tmp->private = DLLoadModule(tmp, fd, flags)) == NULL) {
 	xf86Msg(X_ERROR, "Failed to load %s\n", module);
 	_LoaderListPop(new_handle);
 	freeHandles[new_handle] = HANDLE_FREE;
@@ -1341,11 +627,6 @@
 	return -1;
     }
 
-    if (tmp->private != (void *)-1L) {
-	LoaderAddSymbols(new_handle, tmp->module, pLookup);
-	xf86loaderfree(pLookup);
-    }
-
     close(fd);
 
     return new_handle;
@@ -1367,54 +648,13 @@
 _X_EXPORT void *
 LoaderSymbol(const char *sym)
 {
-    int i;
-    itemPtr item = NULL;
-
-    for (i = 0; i < numloaders; i++)
-	funcs[i].ResolveSymbols(&funcs[i]);
-
-    item = (itemPtr) LoaderHashFind(sym);
-
-    if (item)
-	return item->address;
-    else
-#ifdef DLOPEN_SUPPORT
-	return (DLFindSymbol(sym));
-#else
-	return NULL;
-#endif
-}
-
-int
-LoaderResolveSymbols(void)
-{
-    int i;
-
-    for (i = 0; i < numloaders; i++)
-	funcs[i].ResolveSymbols(&funcs[i]);
-    return 0;
+    return (DLFindSymbol(sym));
 }
 
 _X_EXPORT int
 LoaderCheckUnresolved(int delay_flag)
 {
-    int i, ret = 0;
-    LoaderResolveOptions delayFlag = (LoaderResolveOptions)delay_flag;
-
-    LoaderResolveSymbols();
-
-    if (delayFlag == LD_RESOLV_NOW) {
-	if (check_unresolved_sema > 0)
-	    check_unresolved_sema--;
-	else
-	    xf86Msg(X_WARNING, "LoaderCheckUnresolved: not enough "
-		    "MAGIC_DONT_CHECK_UNRESOLVED\n");
-    }
-
-    if (!check_unresolved_sema || delayFlag == LD_RESOLV_FORCE)
-	for (i = 0; i < numloaders; i++)
-	    if (funcs[i].CheckForUnresolved(&funcs[i]))
-		ret = 1;
+    int ret = 0;
 
     if (fatalReqSym)
 	FatalError("Some required symbols were unresolved\n");
@@ -1422,24 +662,6 @@
     return ret;
 }
 
-void xf86LoaderTrap(void);
-
-void
-xf86LoaderTrap(void)
-{
-}
-
-_X_EXPORT void
-LoaderDefaultFunc(void)
-{
-    ErrorF("\n\n\tThis should not happen!\n"
-	   "\tAn unresolved function was called!\n");
-
-    xf86LoaderTrap();
-
-    FatalError("\n");
-}
-
 int
 LoaderUnload(int handle)
 {
@@ -1463,10 +685,10 @@
 	    /* It is not a member of an archive */
 	    xf86Msg(X_INFO, "Unloading %s\n", tmp->name);
 	}
-	tmp->funcs->LoaderUnload(tmp->private);
-	xf86loaderfree(tmp->name);
-	xf86loaderfree(tmp->cname);
-	xf86loaderfree(tmp);
+	DLUnloadModule(tmp->private);
+	free(tmp->name);
+	free(tmp->cname);
+	free(tmp);
     }
 
     freeHandles[handle] = HANDLE_FREE;
@@ -1483,12 +705,6 @@
     FatalError("Module load failure\n");
 }
 
-/* GDB Sync function */
-void
-_loader_debug_state()
-{
-}
-
 unsigned long LoaderOptions = 0;
 
 void
--- xorg-server-1.1.0/hw/xfree86/loader/dlloader.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.h	2006-06-19 16:48:07.000000000 -0400
@@ -19,19 +19,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
 #ifndef _DLLOADER_H
 #define _DLLOADER_H
-extern void *DLLoadModule(loaderPtr, int, LOOKUP **, int flags);
-extern void DLResolveSymbols(void *);
-extern int DLCheckForUnresolved(void *);
+
+extern void *DLLoadModule(loaderPtr, int, int flags);
 extern void DLUnloadModule(void *);
 extern void *DLFindSymbol(const char *name);
-extern void *DLFindSymbolLocal(pointer module, const char *name);
 
 #endif
--- xorg-server-1.1.0/hw/xfree86/loader/loadext.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/loadext.c	2006-06-19 16:48:07.000000000 -0400
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.8 2003/10/15 16:29:04 dawes Exp $ */
 /*
  * Copyright (c) 2000 by The XFree86 Project, Inc.
  *
@@ -37,6 +36,10 @@
 #include "misc.h"
 #include "xf86.h"
 
+/*
+ * This should be static, but miinitext wants it.  FIXME: make extension
+ * initialization not completely terrible.
+ */
 ExtensionModule *ExtensionModuleList = NULL;
 static int numExtensionModules = 0;
 
--- xorg-server-1.1.0/hw/xfree86/loader/loadfont.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/loadfont.c	2006-06-19 16:48:07.000000000 -0400
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadfont.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
 /*
  * Copyright (c) 1998 by The XFree86 Project, Inc.
  *
@@ -37,6 +36,7 @@
 #include "misc.h"
 #include "xf86.h"
 
+/* XXX this should be static, but xorgcfg needs it, nngh */
 FontModule *FontModuleList = NULL;
 static int numFontModules = 0;
 
--- xorg-server-1.1.0/hw/xfree86/loader/dlloader.c.loader-diet	2006-03-11 19:11:34.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.c	2006-06-19 16:48:07.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.c,v 1.13 2003/10/15 16:29:02 dawes Exp $ */
-
 /*
- *
  * Copyright (c) 1997 The XFree86 Project, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software
@@ -23,7 +20,18 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.  */
+ * SOFTWARE.
+ */
+
+/*
+ * Once upon a time, X had multiple loader backends, three of which were
+ * essentially libdl reimplementations.  This was nonsense so we chucked
+ * it, but we still retain the factorization between loader API and
+ * platform implementation.  This file is the libdl implementation, and
+ * currently the only backend.  If you find yourself porting to a platform
+ * without working libdl - hpux, win32, some forsaken a.out host, etc. -
+ * make a new backend rather than hacking up this file.
+ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -36,82 +44,67 @@
 #include <X11/Xos.h>
 #include "os.h"
 
-#include "sym.h"
 #include "loader.h"
 #include "dlloader.h"
 
-#ifdef DL_LAZY
+#if defined(DL_LAZY)
 #define DLOPEN_LAZY DL_LAZY
-#else
-#ifdef RTLD_LAZY
+#elif defined(RTLD_LAZY)
 #define DLOPEN_LAZY RTLD_LAZY
-#else
-#ifdef __FreeBSD__
+#elif defined(__FreeBSD__)
 #define DLOPEN_LAZY 1
 #else
 #define DLOPEN_LAZY 0
 #endif
-#endif
-#endif
-#ifdef LD_GLOBAL
+
+#if defined(LD_GLOBAL)
 #define DLOPEN_GLOBAL LD_GLOBAL
-#else
-#ifdef RTLD_GLOBAL
+#elif defined(RTLD_GLOBAL)
 #define DLOPEN_GLOBAL RTLD_GLOBAL
 #else
 #define DLOPEN_GLOBAL 0
 #endif
-#endif
 
 #if defined(CSRG_BASED) && !defined(__ELF__)
-#define NEED_UNDERSCORE_FOR_DLLSYM
+#define DLSYM_PREFIX "_"
+#else
+#define DLSYM_PREFIX ""
 #endif
 
-/*
- * This structure contains all of the information about a module
- * that has been loaded.
- */
 typedef struct {
     int handle;
     void *dlhandle;
     int flags;
 } DLModuleRec, *DLModulePtr;
 
-/* 
- * a list of loaded modules XXX can be improved
- */
+/* Hooray, yet another open coded linked list! FIXME */
 typedef struct DLModuleList {
     DLModulePtr module;
     struct DLModuleList *next;
 } DLModuleList;
 
-DLModuleList *dlModuleList = NULL;
+static DLModuleList *dlModuleList = NULL;
 
-void *
+static void *
 DLFindSymbolLocal(pointer module, const char *name)
 {
     DLModulePtr dlfile = module;
     void *p;
     char *n;
 
-#ifdef NEED_UNDERSCORE_FOR_DLLSYM
-    static const char symPrefix[] = "_";
-#else
-    static const char symPrefix[] = "";
-#endif
+    static const char symPrefix[] = DLSYM_PREFIX;
 
-    n = xf86loadermalloc(strlen(symPrefix) + strlen(name) + 1);
-    sprintf(n, "%s%s", symPrefix, name);
+    n = malloc(strlen(symPrefix) + strlen(name) + 1);
+    if (strlen(symPrefix))
+	sprintf(n, "%s%s", symPrefix, name);
+    else
+	sprintf(n, "%s", name);
     p = dlsym(dlfile->dlhandle, n);
-    xf86loaderfree(n);
+    free(n);
 
     return p;
 }
 
-
-/*
- * Search a symbol in the module list
- */
 void *
 DLFindSymbol(const char *name)
 {
@@ -127,75 +120,59 @@
     return NULL;
 }
 
-/*
- * public interface
- */
 void *
-DLLoadModule(loaderPtr modrec, int fd, LOOKUP ** ppLookup, int flags)
+DLLoadModule(loaderPtr modrec, int fd, int flags)
 {
     DLModulePtr dlfile;
     DLModuleList *l;
     int dlopen_flags;
 
-    if ((dlfile = xf86loadercalloc(1, sizeof(DLModuleRec))) == NULL) {
-	ErrorF("Unable  to allocate DLModuleRec\n");
+    if ((dlfile = calloc(1, sizeof(DLModuleRec))) == NULL) {
+	ErrorF("Unable to allocate DLModuleRec\n");
 	return NULL;
     }
     dlfile->handle = modrec->handle;
     if (flags & LD_FLAG_GLOBAL)
-      dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL;
+	dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL;
     else
-      dlopen_flags = DLOPEN_LAZY;
+	dlopen_flags = DLOPEN_LAZY;
     dlfile->dlhandle = dlopen(modrec->name, dlopen_flags);
     if (dlfile->dlhandle == NULL) {
 	ErrorF("dlopen: %s\n", dlerror());
-	xf86loaderfree(dlfile);
+	free(dlfile);
 	return NULL;
     }
 
-    l = xf86loadermalloc(sizeof(DLModuleList));
+    l = malloc(sizeof(DLModuleList));
     l->module = dlfile;
     l->next = dlModuleList;
     dlModuleList = l;
-    *ppLookup = NULL;
 
     return (void *)dlfile;
 }
 
 void
-DLResolveSymbols(void *mod)
-{
-    return;
-}
-
-int
-DLCheckForUnresolved(void *mod)
-{
-    return 0;
-}
-
-void
 DLUnloadModule(void *modptr)
 {
     DLModulePtr dlfile = (DLModulePtr) modptr;
     DLModuleList *l, *p;
 
-    /*  remove it from dlModuleList */
+    /* remove it from dlModuleList. */
     if (dlModuleList->module == modptr) {
 	l = dlModuleList;
 	dlModuleList = l->next;
-	xf86loaderfree(l);
+	free(l);
     } else {
 	p = dlModuleList;
 	for (l = dlModuleList->next; l != NULL; l = l->next) {
 	    if (l->module == modptr) {
 		p->next = l->next;
-		xf86loaderfree(l);
+		free(l);
 		break;
 	    }
 	    p = l;
 	}
     }
     dlclose(dlfile->dlhandle);
-    xf86loaderfree(modptr);
+    free(modptr);
 }
--- xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
+++ xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h	2006-06-19 16:48:07.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loaderProcs.h,v 1.21 2003/10/15 16:29:04 dawes Exp $ */
-
 /*
- *
  * Copyright 1995-1998 by Metro Link, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -78,9 +75,7 @@
     const XF86ModuleVersionInfo *VersionInfo;
 } ModuleDesc, *ModuleDescPtr;
 
-/*
- * Extenal API for the loader 
- */
+/* External API for the loader */
 
 void LoaderInit(void);
 
--- xorg-server-1.1.0/hw/xfree86/Makefile.am.loader-diet	2006-05-09 14:04:29.000000000 -0400
+++ xorg-server-1.1.0/hw/xfree86/Makefile.am	2006-06-19 16:48:07.000000000 -0400
@@ -36,11 +36,11 @@
 XORG_LIBS = \
             @XORG_CORE_LIBS@ \
             common/libinit.a \
-            loader/libloader.a \
             libosandcommon.la \
             parser/libxf86config.a \
             dummylib/libdummy.a \
 	    dixmods/libdixmods.la \
+            loader/libloader.a \
             @XORG_LIBS@
 
 Xorg_LDADD = $(XORG_LIBS) \
--- xorg-server-1.1.0/configure.ac.loader-diet	2006-05-22 13:18:49.000000000 -0400
+++ xorg-server-1.1.0/configure.ac	2006-06-19 16:48:34.000000000 -0400
@@ -1041,7 +1041,7 @@
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $XPSTUBS_LIB $OS_LIB"
 
 	AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
 
@@ -1250,10 +1250,6 @@
 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-	# XXX HACK!  if anyone cares about elfloader in 7.0 you need to
-	# XXX do something smarter here.
-	AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])
-	AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
 	AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
 	AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
 	AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- xorg-x11-server.spec	19 Jun 2006 20:09:35 -0000	1.87
+++ xorg-x11-server.spec	19 Jun 2006 21:22:27 -0000	1.88
@@ -38,6 +38,7 @@
 Patch2000:  xorg-x11-server-1.1.0-cw-crash-fix.patch
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2002:  xorg-x11-server-1.1.0-hush-crash-message.patch
+Patch2003:  xorg-x11-server-1.1.0-loader-diet.patch
 
 # autoconfiguration feature patches
 #Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
@@ -298,6 +299,7 @@
 %patch2000 -p1 -b .cw-crash
 %patch2001 -p1 -b .pci-scan
 %patch2002 -p1 -b .crash-message
+%patch2003 -p1 -b .loader-diet
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .cvt
@@ -602,8 +604,8 @@
 * Mon Jun 19 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-17
 - Disable filling in monitor gamma info from EDID momentarily, since drivers
   will use that field to set the card's gamma ramp.
-- Backport some stuff from git: cw crash fix, faster pci scanning, and a
-  log message cleanup.
+- Backport some stuff from git: cw crash fix, faster pci scanning, some
+  log message cleanup, and a massive debloating of the loader.
 
 * Fri Jun 16 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-16
 - Enable spec support for s390, s390x, alpha, sparc, and sparc64 architectures.



From fedora-cvs-commits at redhat.com  Mon Jun 19 21:24:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 17:24:27 -0400
Subject: rpms/yum/devel yum-2.9.0-resolvedeps.patch, NONE, 1.1 yum.spec,
	1.102, 1.103
Message-ID: <200606192124.k5JLORiX030531@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30513

Modified Files:
	yum.spec 
Added Files:
	yum-2.9.0-resolvedeps.patch 
Log Message:
Fix resolvedeps

yum-2.9.0-resolvedeps.patch:
 sqlitesack.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE yum-2.9.0-resolvedeps.patch ---
--- yum-2.9.0/yum/sqlitesack.py.resolvedeps	2006-06-19 17:23:04.000000000 -0400
+++ yum-2.9.0/yum/sqlitesack.py	2006-06-19 17:23:14.000000000 -0400
@@ -344,7 +344,7 @@
                     (filelist.dirname LIKE '%%%s%%' \
                     OR (filelist.dirname LIKE '%%%s%%' AND\
                     filelist.filenames LIKE '%%%s%%'))\
-                    AND (filelist.pkgKey = packages.pkgKey)" % (name,dir,filename))
+                    AND (filelist.pkgKey = packages.pkgKey)" % (name,dirname,filename))
             else: 
                 cur.execute("select packages.pkgId as pkgId,\
                     filelist.dirname as dirname,\


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- yum.spec	15 Jun 2006 19:48:19 -0000	1.102
+++ yum.spec	19 Jun 2006 21:24:25 -0000	1.103
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.0
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
@@ -23,6 +23,7 @@
 Patch5: yum-2.9.0-keyprompt.patch
 Patch6: yum-2.9.0-exhandle.patch
 Patch7: yum-2.9.0-compareevr.patch
+Patch8: yum-2.9.0-resolvedeps.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
@@ -54,6 +55,7 @@
 %patch5 -p0
 %patch6 -p0
 %patch7 -p1
+%patch8 -p1
 
 %build
 make
@@ -132,6 +134,9 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Mon Jun 19 2006 Paul Nasrat <pnasrat at redhat.com> - 2.9.0-8
+- Fix resolvedeps
+
 * Thu Jun 15 2006 Bill Nottingham <notting at redhat.com> 2.9.0-7
 - require pygobject2 (for yum-updatesd)
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 21:26:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 17:26:12 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.22,
	1.23 gnome-screensaver.spec, 1.80, 1.81 sources, 1.25, 1.26
Message-ID: <200606192126.k5JLQCVm030614@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30597

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
- rename widget in glade file to allow unlocking to work
  again (bug 195317)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Jun 2006 15:31:47 -0000	1.22
+++ .cvsignore	19 Jun 2006 21:26:10 -0000	1.23
@@ -1,15 +1,2 @@
-gnome-screensaver-0.0.20.tar.bz2
-gnome-screensaver-0.0.22.tar.bz2
-fedoralogo-floaters-lock-dialog.tar.gz
-gnome-screensaver-0.0.23.tar.bz2
-gnome-screensaver-0.0.24.tar.bz2
-gnome-screensaver-2.13.5.tar.bz2
-gnome-screensaver-2.13.90.tar.bz2
-gnome-screensaver-2.13.91.tar.bz2
-gnome-screensaver-2.13.92.tar.bz2
-gnome-screensaver-2.14.0.tar.bz2
-gnome-screensaver-2.14.1.tar.bz2
-gnome-screensaver-2.15.1.tar.bz2
-lock-dialog-fedoralogo-floaters.tar.gz
-gnome-screensaver-2.15.2.tar.bz2
 gnome-screensaver-2.15.3.tar.bz2
+lock-dialog-fedoralogo-floaters.tar.gz


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gnome-screensaver.spec	13 Jun 2006 15:31:47 -0000	1.80
+++ gnome-screensaver.spec	19 Jun 2006 21:26:10 -0000	1.81
@@ -12,7 +12,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.3
-Release: 1 
+Release: 2
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -160,6 +160,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Jun 19 2006 Ray Strode <rstrode at redhat.com> 2.15.3-2
+- rename widget in glade file to allow unlocking to work
+  again (bug 195317)
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
 - Update to 2.15.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Jun 2006 15:31:47 -0000	1.25
+++ sources	19 Jun 2006 21:26:10 -0000	1.26
@@ -1,2 +1,2 @@
-b8d23b049231d57dec24cad4cfdeee5d  lock-dialog-fedoralogo-floaters.tar.gz
 d2e0550ef59b8701e08d45955330404f  gnome-screensaver-2.15.3.tar.bz2
+b8d23b049231d57dec24cad4cfdeee5d  lock-dialog-fedoralogo-floaters.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 19 21:58:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 17:58:42 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.88,1.89
Message-ID: <200606192158.k5JLwgT5029569@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29457

Modified Files:
	nfs-utils.spec 
Log Message:
added pkgconfig to requires



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- nfs-utils.spec	19 Jun 2006 17:35:27 -0000	1.88
+++ nfs-utils.spec	19 Jun 2006 21:58:39 -0000	1.89
@@ -36,7 +36,7 @@
 License: GPL
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
-Requires: modutils >= 2.4.26-9, nfs-utils-lib
+Requires: modutils >= 2.4.26-9, nfs-utils-lib, pkgconfig
 BuildRequires: krb5-libs >= 1.4, autoconf >= 2.57, openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
 BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel >= 1.0.8-4



From fedora-cvs-commits at redhat.com  Mon Jun 19 23:33:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 19:33:16 -0400
Subject: rpms/kernel/devel
	capabilities-over-netlink-in-permissive-mode.patch, NONE,
	1.1.8.1 linux-2.6-audit-git.patch, NONE,
	1.1.32.1 linux-2.6-audit-pending.patch, NONE,
	1.1.20.1 linux-2.6-net-label.patch, NONE,
	1.1.8.1 kernel-2.6.spec, 1.2293, 1.2293.2.1
Message-ID: <200606192333.k5JNXGZK000469@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32732

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	capabilities-over-netlink-in-permissive-mode.patch 
	linux-2.6-audit-git.patch linux-2.6-audit-pending.patch 
	linux-2.6-net-label.patch 
Log Message:
* Mon Jun 19 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.37



capabilities-over-netlink-in-permissive-mode.patch:
 hooks.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE capabilities-over-netlink-in-permissive-mode.patch ---
>From dgoeddel at trustedcs.com Wed May 31 13:35:19 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 31 May 2006 13:35:52 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k4VHZqWc010601;
	Wed, 31 May 2006 13:35:52 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VHZp3j005299;
	Wed, 31 May 2006 13:35:51 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZk7i006383;
	Wed, 31 May 2006 13:35:46 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id E809472E6B; Wed, 31 May 2006 13:35:45 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k4VHZgTd027651 for <redhat-lspp at listman.util.phx.redhat.com>;
	Wed, 31 May 2006 13:35:42 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k4VHZfqq005281; Wed, 31 May 2006 13:35:41 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k4VHZZb3010500;
	Wed, 31 May 2006 13:35:35 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k4VHZRIl013520;
	Wed, 31 May 2006 13:35:27 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Wed May 31 13:35:21 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B447dd3d90000>; Wed, 31 May 2006 13:35:21 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id D34Q43ZG; Wed, 31 May 2006 13:35:20 -0400
Message-ID: <447DD3D7.4050200 at trustedcs.com>
Date: Wed, 31 May 2006 12:35:19 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Stephen Smalley <sds at epoch.ncsc.mil>,
 James Morris <jmorris at redhat.com>
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.82 
X-loop: redhat-lspp at redhat.com
Cc: redhat-lspp at redhat.com,
 "'SELinux List'" <SELinux at tycho.nsa.gov>
Subject: [redhat-lspp] [PATCH] fix masking of capabilities over netlink in
	permissive mode
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-Length: 5179
X-UID: 66725

I think I ran across the problem described in this thread:

http://www.redhat.com/archives/linux-audit/2006-May/msg00059.html

The process' effective capabilities are always being masked with the
allowed vector of the avc decision (for self against the capability
security class) in netlink's copy of the process capabilities (eff_cap).
The allowed vector takes on a slightly different role when SELinux
is not in enforcing mode - it starts to track used-but-not-normally-
permitted actions in the allowed vector.  That is what is causing
the first attempt to fail (the allowed vector has not been "inflated")
and the following attempts to succeed (the vector has been inflated in
response to its previous use).  Does my reasoning (and patch) seem to
be on track?




This patch removes the masking of capabilities passed over netlink
socket when SELinux is in enforcing mode.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>


diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 21dad41..c7650bb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3599,7 +3599,8 @@ static int selinux_netlink_send(struct s
 	avd.allowed = 0;
 	avc_has_perm_noaudit(tsec->sid, tsec->sid,
 				SECCLASS_CAPABILITY, ~0, &avd);
-	cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
+	if (selinux_enforcing)
+		cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
 
 	if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS)
 		err = selinux_nlmsg_perm(sk, skb);

-- 

Darrel

--
redhat-lspp mailing list
redhat-lspp at redhat.com
https://www.redhat.com/mailman/listinfo/redhat-lspp


linux-2.6-audit-git.patch:
 Documentation/filesystems/inotify.txt |  130 ++++
 fs/Kconfig                            |   24 
 fs/Makefile                           |    1 
 fs/exec.c                             |    6 
 fs/inotify.c                          |  991 +++++++++-------------------------
 fs/inotify_user.c                     |  719 ++++++++++++++++++++++++
 fs/namei.c                            |    2 
 fs/open.c                             |    4 
 fs/proc/base.c                        |    5 
 fs/xattr.c                            |    4 
 include/linux/audit.h                 |   99 ++-
 include/linux/fsnotify.h              |   32 -
 include/linux/inotify.h               |  109 +++
 include/linux/sched.h                 |    2 
 init/Kconfig                          |    3 
 ipc/mqueue.c                          |   22 
 ipc/msg.c                             |    9 
 ipc/sem.c                             |    8 
 ipc/shm.c                             |    2 
 kernel/audit.c                        |  205 +++++--
 kernel/audit.h                        |   61 +-
 kernel/auditfilter.c                  |  899 ++++++++++++++++++++++++++++--
 kernel/auditsc.c                      |  648 +++++++++++++++++-----
 kernel/signal.c                       |    2 
 kernel/sysctl.c                       |    4 
 kernel/user.c                         |    2 
 security/selinux/ss/services.c        |    2 
 27 files changed, 2961 insertions(+), 1034 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/Documentation/filesystems/inotify.txt b/Documentation/filesystems/inotify.txt
index 6d50190..59a919f 100644
--- a/Documentation/filesystems/inotify.txt
+++ b/Documentation/filesystems/inotify.txt
@@ -69,17 +69,135 @@ Prototypes:
 	int inotify_rm_watch (int fd, __u32 mask);
 
 
-(iii) Internal Kernel Implementation
+(iii) Kernel Interface
 
-Each inotify instance is associated with an inotify_device structure.
+Inotify's kernel API consists a set of functions for managing watches and an
+event callback.
+
+To use the kernel API, you must first initialize an inotify instance with a set
+of inotify_operations.  You are given an opaque inotify_handle, which you use
+for any further calls to inotify.
+
+    struct inotify_handle *ih = inotify_init(my_event_handler);
+
+You must provide a function for processing events and a function for destroying
+the inotify watch.
+
+    void handle_event(struct inotify_watch *watch, u32 wd, u32 mask,
+    	              u32 cookie, const char *name, struct inode *inode)
+
+	watch - the pointer to the inotify_watch that triggered this call
+	wd - the watch descriptor
+	mask - describes the event that occurred
+	cookie - an identifier for synchronizing events
+	name - the dentry name for affected files in a directory-based event
+	inode - the affected inode in a directory-based event
+
+    void destroy_watch(struct inotify_watch *watch)
+
+You may add watches by providing a pre-allocated and initialized inotify_watch
+structure and specifying the inode to watch along with an inotify event mask.
+You must pin the inode during the call.  You will likely wish to embed the
+inotify_watch structure in a structure of your own which contains other
+information about the watch.  Once you add an inotify watch, it is immediately
+subject to removal depending on filesystem events.  You must grab a reference if
+you depend on the watch hanging around after the call.
+
+    inotify_init_watch(&my_watch->iwatch);
+    inotify_get_watch(&my_watch->iwatch);	// optional
+    s32 wd = inotify_add_watch(ih, &my_watch->iwatch, inode, mask);
+    inotify_put_watch(&my_watch->iwatch);	// optional
+
+You may use the watch descriptor (wd) or the address of the inotify_watch for
+other inotify operations.  You must not directly read or manipulate data in the
+inotify_watch.  Additionally, you must not call inotify_add_watch() more than
+once for a given inotify_watch structure, unless you have first called either
+inotify_rm_watch() or inotify_rm_wd().
+
+To determine if you have already registered a watch for a given inode, you may
+call inotify_find_watch(), which gives you both the wd and the watch pointer for
+the inotify_watch, or an error if the watch does not exist.
+
+    wd = inotify_find_watch(ih, inode, &watchp);
+
+You may use container_of() on the watch pointer to access your own data
+associated with a given watch.  When an existing watch is found,
+inotify_find_watch() bumps the refcount before releasing its locks.  You must
+put that reference with:
+
+    put_inotify_watch(watchp);
+
+Call inotify_find_update_watch() to update the event mask for an existing watch.
+inotify_find_update_watch() returns the wd of the updated watch, or an error if
+the watch does not exist.
+
+    wd = inotify_find_update_watch(ih, inode, mask);
+
+An existing watch may be removed by calling either inotify_rm_watch() or
+inotify_rm_wd().
+
+    int ret = inotify_rm_watch(ih, &my_watch->iwatch);
+    int ret = inotify_rm_wd(ih, wd);
+
+A watch may be removed while executing your event handler with the following:
+
+    inotify_remove_watch_locked(ih, iwatch);
+
+Call inotify_destroy() to remove all watches from your inotify instance and
+release it.  If there are no outstanding references, inotify_destroy() will call
+your destroy_watch op for each watch.
+
+    inotify_destroy(ih);
+
+When inotify removes a watch, it sends an IN_IGNORED event to your callback.
+You may use this event as an indication to free the watch memory.  Note that
+inotify may remove a watch due to filesystem events, as well as by your request.
+If you use IN_ONESHOT, inotify will remove the watch after the first event, at
+which point you may call the final inotify_put_watch.
+
+(iv) Kernel Interface Prototypes
+
+	struct inotify_handle *inotify_init(struct inotify_operations *ops);
+
+	inotify_init_watch(struct inotify_watch *watch);
+
+	s32 inotify_add_watch(struct inotify_handle *ih,
+		              struct inotify_watch *watch,
+			      struct inode *inode, u32 mask);
+
+	s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode,
+			       struct inotify_watch **watchp);
+
+	s32 inotify_find_update_watch(struct inotify_handle *ih,
+				      struct inode *inode, u32 mask);
+
+	int inotify_rm_wd(struct inotify_handle *ih, u32 wd);
+
+	int inotify_rm_watch(struct inotify_handle *ih,
+			     struct inotify_watch *watch);
+
+	void inotify_remove_watch_locked(struct inotify_handle *ih,
+					 struct inotify_watch *watch);
+
+	void inotify_destroy(struct inotify_handle *ih);
+
+	void get_inotify_watch(struct inotify_watch *watch);
+	void put_inotify_watch(struct inotify_watch *watch);
+
+
+(v) Internal Kernel Implementation
+
+Each inotify instance is represented by an inotify_handle structure.
+Inotify's userspace consumers also have an inotify_device which is
+associated with the inotify_handle, and on which events are queued.
 
 Each watch is associated with an inotify_watch structure.  Watches are chained
-off of each associated device and each associated inode.
+off of each associated inotify_handle and each associated inode.
 
-See fs/inotify.c for the locking and lifetime rules.
+See fs/inotify.c and fs/inotify_user.c for the locking and lifetime rules.
 
 
-(iv) Rationale
+(vi) Rationale
 
 Q: What is the design decision behind not tying the watch to the open fd of
    the watched object?
@@ -145,7 +263,7 @@ A: The poor user-space interface is the 
    file descriptor-based one that allows basic file I/O and poll/select.
    Obtaining the fd and managing the watches could have been done either via a
    device file or a family of new system calls.  We decided to implement a
-   family of system calls because that is the preffered approach for new kernel
+   family of system calls because that is the preferred approach for new kernel
    interfaces.  The only real difference was whether we wanted to use open(2)
    and ioctl(2) or a couple of new system calls.  System calls beat ioctls.
 
diff --git a/fs/Kconfig b/fs/Kconfig
index f9b5842..74f11a2 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -393,18 +393,30 @@ config INOTIFY
 	bool "Inotify file change notification support"
 	default y
 	---help---
-	  Say Y here to enable inotify support and the associated system
-	  calls.  Inotify is a file change notification system and a
-	  replacement for dnotify.  Inotify fixes numerous shortcomings in
-	  dnotify and introduces several new features.  It allows monitoring
-	  of both files and directories via a single open fd.  Other features
-	  include multiple file events, one-shot support, and unmount
+	  Say Y here to enable inotify support.  Inotify is a file change
+	  notification system and a replacement for dnotify.  Inotify fixes
+	  numerous shortcomings in dnotify and introduces several new features
+	  including multiple file events, one-shot support, and unmount
 	  notification.
 
 	  For more information, see Documentation/filesystems/inotify.txt
 
 	  If unsure, say Y.
 
+config INOTIFY_USER
+	bool "Inotify support for userspace"
+	depends on INOTIFY
+	default y
+	---help---
+	  Say Y here to enable inotify support for userspace, including the
+	  associated system calls.  Inotify allows monitoring of both files and
+	  directories via a single open fd.  Events are read from the file
+	  descriptor, which is also select()- and poll()-able.
+
+	  For more information, see Documentation/filesystems/inotify.txt
+
+	  If unsure, say Y.
+
 config QUOTA
 	bool "Quota support"
 	help
diff --git a/fs/Makefile b/fs/Makefile
index 078d3d1..d0ea6bf 100644
--- a/fs/Makefile
+++ b/fs/Makefile
[...5229 lines suppressed...]
 
+	if (!audit_enabled)
+		return 0;
+
 	if (likely(!context))
 		return 0;
 
@@ -1187,6 +1517,30 @@ int audit_ipc_obj(struct kern_ipc_perm *
 	if (!ax)
 		return -ENOMEM;
 
+	ax->mqdes = mqdes;
+	ax->mqstat = *mqstat;
+
+	ax->d.type = AUDIT_MQ_GETSETATTR;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+/**
+ * audit_ipc_obj - record audit data for ipc object
+ * @ipcp: ipc permissions
+ *
+ * Returns 0 for success or NULL context or < 0 on error.
+ */
+int __audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{
+	struct audit_aux_data_ipcctl *ax;
+	struct audit_context *context = current->audit_context;
+
+	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
+	if (!ax)
+		return -ENOMEM;
+
 	ax->uid = ipcp->uid;
 	ax->gid = ipcp->gid;
 	ax->mode = ipcp->mode;
@@ -1207,14 +1561,11 @@ int audit_ipc_obj(struct kern_ipc_perm *
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
-int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp)
+int __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
 {
 	struct audit_aux_data_ipcctl *ax;
 	struct audit_context *context = current->audit_context;
 
-	if (likely(!context))
-		return 0;
-
 	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
 	if (!ax)
 		return -ENOMEM;
@@ -1223,7 +1574,6 @@ int audit_ipc_set_perm(unsigned long qby
 	ax->uid = uid;
 	ax->gid = gid;
 	ax->mode = mode;
-	selinux_get_ipc_sid(ipcp, &ax->osid);
 
 	ax->d.type = AUDIT_IPC_SET_PERM;
 	ax->d.next = context->aux;
@@ -1231,6 +1581,39 @@ int audit_ipc_set_perm(unsigned long qby
 	return 0;
 }
 
+int audit_bprm(struct linux_binprm *bprm)
+{
+	struct audit_aux_data_execve *ax;
+	struct audit_context *context = current->audit_context;
+	unsigned long p, next;
+	void *to;
+
+	if (likely(!audit_enabled || !context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
+				GFP_KERNEL);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->argc = bprm->argc;
+	ax->envc = bprm->envc;
+	for (p = bprm->p, to = ax->mem; p < MAX_ARG_PAGES*PAGE_SIZE; p = next) {
+		struct page *page = bprm->page[p / PAGE_SIZE];
+		void *kaddr = kmap(page);
+		next = (p + PAGE_SIZE) & ~(PAGE_SIZE - 1);
+		memcpy(to, kaddr + (p & (PAGE_SIZE - 1)), next - p);
+		to += next - p;
+		kunmap(page);
+	}
+
+	ax->d.type = AUDIT_EXECVE;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+
 /**
  * audit_socketcall - record audit data for sys_socketcall
  * @nargs: number of args
@@ -1325,19 +1708,20 @@ int audit_avc_path(struct dentry *dentry
  * If the audit subsystem is being terminated, record the task (pid)
  * and uid that is doing that.
  */
-void audit_signal_info(int sig, struct task_struct *t)
+void __audit_signal_info(int sig, struct task_struct *t)
 {
 	extern pid_t audit_sig_pid;
 	extern uid_t audit_sig_uid;
-
-	if (unlikely(audit_pid && t->tgid == audit_pid)) {
-		if (sig == SIGTERM || sig == SIGHUP) {
-			struct audit_context *ctx = current->audit_context;
-			audit_sig_pid = current->pid;
-			if (ctx)
-				audit_sig_uid = ctx->loginuid;
-			else
-				audit_sig_uid = current->uid;
-		}
+	extern u32 audit_sig_sid;
+
+	if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1) {
+		struct task_struct *tsk = current;
+		struct audit_context *ctx = tsk->audit_context;
+		audit_sig_pid = tsk->pid;
+		if (ctx)
+			audit_sig_uid = ctx->loginuid;
+		else
+			audit_sig_uid = tsk->uid;
+		selinux_get_task_sid(tsk, &audit_sig_sid);
 	}
 }
diff --git a/kernel/signal.c b/kernel/signal.c
index e5f8aea..1b3c921 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -23,12 +23,12 @@ #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/ptrace.h>
 #include <linux/signal.h>
-#include <linux/audit.h>
 #include <linux/capability.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
+#include "audit.h"	/* audit_signal_info() */
 
 /*
  * SLAB caches for signal bits.
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e82726f..0d656e6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -150,7 +150,7 @@ extern ctl_table random_table[];
 #ifdef CONFIG_UNIX98_PTYS
 extern ctl_table pty_table[];
 #endif
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 extern ctl_table inotify_table[];
 #endif
 
@@ -1028,7 +1028,7 @@ #ifdef CONFIG_MMU
 		.mode		= 0644,
 		.proc_handler	= &proc_doulongvec_minmax,
 	},
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 	{
 		.ctl_name	= FS_INOTIFY,
 		.procname	= "inotify",
diff --git a/kernel/user.c b/kernel/user.c
index 2116642..4b1eb74 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -140,7 +140,7 @@ struct user_struct * alloc_uid(uid_t uid
 		atomic_set(&new->processes, 0);
 		atomic_set(&new->files, 0);
 		atomic_set(&new->sigpending, 0);
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 		atomic_set(&new->inotify_watches, 0);
 		atomic_set(&new->inotify_devs, 0);
 #endif
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index c284dbb..e9548bc 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1980,7 +1980,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 		break;
 	case AUDIT_SE_SEN:
 	case AUDIT_SE_CLR:
-		level = (op == AUDIT_SE_SEN ?
+		level = (field == AUDIT_SE_SEN ?
 		         &ctxt->range.level[0] : &ctxt->range.level[1]);
 		switch (op) {
 		case AUDIT_EQUAL:

linux-2.6-audit-pending.patch:
 include/linux/audit.h |    3 +
 kernel/audit.h        |    1 
 kernel/auditfilter.c  |   95 +++++++++++++++++++++++++++++++-------------------
 kernel/auditsc.c      |   15 +++++++
 4 files changed, 78 insertions(+), 36 deletions(-)

--- NEW FILE linux-2.6-audit-pending.patch ---
diff --git a/include/linux/audit.h b/include/linux/audit.h
index e1c1dbd..f7883ec 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -123,6 +123,7 @@ #define AUDIT_ALWAYS   2	/* Generate aud
 /* Rule structure sizes -- if these change, different AUDIT_ADD and
  * AUDIT_LIST commands must be implemented. */
 #define AUDIT_MAX_FIELDS   64
+#define AUDIT_MAX_KEY_LEN  32
 #define AUDIT_BITMASK_SIZE 64
 #define AUDIT_WORD(nr) ((__u32)((nr)/32))
 #define AUDIT_BIT(nr)  (1 << ((nr) - AUDIT_WORD(nr)*32))
@@ -172,6 +173,8 @@ #define AUDIT_ARG1      (AUDIT_ARG0+1)
 #define AUDIT_ARG2      (AUDIT_ARG0+2)
 #define AUDIT_ARG3      (AUDIT_ARG0+3)
 
+#define AUDIT_FILTERKEY	210
+
 #define AUDIT_NEGATE			0x80000000
 
 /* These are the supported operators.
diff --git a/kernel/audit.h b/kernel/audit.h
index 8323e41..6aa33b8 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -81,6 +81,7 @@ struct audit_krule {
 	u32			mask[AUDIT_BITMASK_SIZE];
 	u32			buflen; /* for data alloc on list rules */
 	u32			field_count;
+	char			*filterkey; /* ties events to rules */
 	struct audit_field	*fields;
 	struct audit_field	*inode_f; /* quick access to an inode field */
 	struct audit_watch	*watch;	/* associated watch */
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 4c99d2c..e98db08 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -141,6 +141,7 @@ static inline void audit_free_rule(struc
 			selinux_audit_rule_free(f->se_rule);
 		}
 	kfree(e->rule.fields);
+	kfree(e->rule.filterkey);
 	kfree(e);
 }
 
@@ -511,6 +512,16 @@ static struct audit_entry *audit_data_to
 			if (err)
 				goto exit_free;
 			break;
+		case AUDIT_FILTERKEY:
+			err = -EINVAL;
+			if (entry->rule.filterkey || f->val > AUDIT_MAX_KEY_LEN)
+				goto exit_free;
+			str = audit_unpack_string(&bufp, &remain, f->val);
+			if (IS_ERR(str))
+				goto exit_free;
+			entry->rule.buflen += f->val;
+			entry->rule.filterkey = str;
+			break;
 		default:
 			goto exit_free;
 		}
@@ -612,6 +623,10 @@ static struct audit_rule_data *audit_kru
 			data->buflen += data->values[i] =
 				audit_pack_string(&bufp, krule->watch->path);
 			break;
+		case AUDIT_FILTERKEY:
+			data->buflen += data->values[i] =
+				audit_pack_string(&bufp, krule->filterkey);
+			break;
 		default:
 			data->values[i] = f->val;
 		}
@@ -651,6 +666,11 @@ static int audit_compare_rule(struct aud
 			if (strcmp(a->watch->path, b->watch->path))
 				return 1;
 			break;
+		case AUDIT_FILTERKEY:
+			/* both filterkeys exist based on above type compare */
+			if (strcmp(a->filterkey, b->filterkey))
+				return 1;
+			break;
 		default:
 			if (a->fields[i].val != b->fields[i].val)
 				return 1;
@@ -730,6 +750,7 @@ static struct audit_entry *audit_dupe_ru
 	u32 fcount = old->field_count;
 	struct audit_entry *entry;
 	struct audit_krule *new;
+	char *fk;
 	int i, err = 0;
 
 	entry = audit_init_entry(fcount);
@@ -760,6 +781,13 @@ static struct audit_entry *audit_dupe_ru
 		case AUDIT_SE_CLR:
 			err = audit_dupe_selinux_field(&new->fields[i],
 						       &old->fields[i]);
+			break;
+		case AUDIT_FILTERKEY:
+			fk = kstrdup(old->filterkey, GFP_KERNEL);
+			if (unlikely(!fk))
+				err = -ENOMEM;
+			else
+				new->filterkey = fk;
 		}
 		if (err) {
 			audit_free_rule(entry);
@@ -1245,6 +1273,34 @@ static void audit_list_rules(int pid, in
 		skb_queue_tail(q, skb);
 }
 
+/* Log rule additions and removals */
+static void audit_log_rule_change(uid_t loginuid, u32 sid, char *action,
+				  struct audit_krule *rule, int res)
+{
+	struct audit_buffer *ab;
+
+	ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE);
+	if (!ab)
+		return;
+	audit_log_format(ab, "auid=%u", loginuid);
+	if (sid) {
+		char *ctx = NULL;
+		u32 len;
+		if (selinux_ctxid_to_string(sid, &ctx, &len))
+			audit_log_format(ab, " ssid=%u", sid);
+		else
+			audit_log_format(ab, " subj=%s", ctx);
+		kfree(ctx);
+	}
+	audit_log_format(ab, " %s rule key=", action);
+	if (rule->filterkey)
+		audit_log_untrustedstring(ab, rule->filterkey);
+	else
+		audit_log_format(ab, "(null)");
+	audit_log_format(ab, " list=%d res=%d", rule->listnr, res);
+	audit_log_end(ab);
+}
+
 /**
  * audit_receive_filter - apply all rules to the specified message type
  * @type: audit message type
@@ -1304,24 +1360,7 @@ int audit_receive_filter(int type, int p
 
 		err = audit_add_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-
-		if (sid) {
-			char *ctx = NULL;
-			u32 len;
-			if (selinux_ctxid_to_string(sid, &ctx, &len)) {
-				/* Maybe call audit_panic? */
-				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				 "auid=%u ssid=%u add rule to list=%d res=%d",
-				 loginuid, sid, entry->rule.listnr, !err);
-			} else
-				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				 "auid=%u subj=%s add rule to list=%d res=%d",
-				 loginuid, ctx, entry->rule.listnr, !err);
-			kfree(ctx);
-		} else
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				"auid=%u add rule to list=%d res=%d",
-				loginuid, entry->rule.listnr, !err);
+		audit_log_rule_change(loginuid, sid, "add", &entry->rule, !err);
 
 		if (err)
 			audit_free_rule(entry);
@@ -1337,24 +1376,8 @@ int audit_receive_filter(int type, int p
 
 		err = audit_del_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-
-		if (sid) {
-			char *ctx = NULL;
-			u32 len;
-			if (selinux_ctxid_to_string(sid, &ctx, &len)) {
-				/* Maybe call audit_panic? */
-				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-					"auid=%u ssid=%u remove rule from list=%d res=%d",
-					 loginuid, sid, entry->rule.listnr, !err);
-			} else
-				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-					"auid=%u subj=%s remove rule from list=%d res=%d",
-					 loginuid, ctx, entry->rule.listnr, !err);
-			kfree(ctx);
-		} else
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				"auid=%u remove rule from list=%d res=%d",
-				loginuid, entry->rule.listnr, !err);
+		audit_log_rule_change(loginuid, sid, "remove", &entry->rule,
+				      !err);
 
 		audit_free_rule(entry);
 		break;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 1c43dba..b32ccfa 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -186,6 +186,7 @@ struct audit_context {
 	int		    auditable;  /* 1 if record should be written */
 	int		    name_count;
 	struct audit_names  names[AUDIT_NAMES];
+	char *		    filterkey;	/* key for rule that triggered record */
 	struct dentry *	    pwd;
 	struct vfsmount *   pwdmnt;
 	struct audit_context *previous; /* For nested syscalls */
@@ -348,11 +349,17 @@ static int audit_filter_rules(struct tas
 			if (ctx)
 				result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val);
 			break;
+		case AUDIT_FILTERKEY:
+			/* ignore this field for filtering */
+			result = 1;
+			break;
 		}
 
 		if (!result)
 			return 0;
 	}
+	if (rule->filterkey)
+		ctx->filterkey = kstrdup(rule->filterkey, GFP_ATOMIC);
 	switch (rule->action) {
 	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;
 	case AUDIT_ALWAYS:   *state = AUDIT_RECORD_CONTEXT; break;
@@ -627,6 +634,7 @@ static inline void audit_free_context(st
 		}
 		audit_free_names(context);
 		audit_free_aux(context);
+		kfree(context->filterkey);
 		kfree(context);
 		context  = previous;
 	} while (context);
@@ -736,6 +744,11 @@ static void audit_log_exit(struct audit_
 		  context->euid, context->suid, context->fsuid,
 		  context->egid, context->sgid, context->fsgid, tty);
 	audit_log_task_info(ab, tsk);
+	if (context->filterkey) {
+		audit_log_format(ab, " key=");
+		audit_log_untrustedstring(ab, context->filterkey);
+	} else
+		audit_log_format(ab, " key=(null)");
 	audit_log_end(ab);
 
 	for (aux = context->aux; aux; aux = aux->next) {
@@ -1061,6 +1074,8 @@ void audit_syscall_exit(int valid, long 
 	} else {
 		audit_free_names(context);
 		audit_free_aux(context);
+		kfree(context->filterkey);
+		context->filterkey = NULL;
 		tsk->audit_context = context;
 	}
 }

linux-2.6-net-label.patch:
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   44 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 include/linux/ip.h                                        |    1 
 include/linux/netlink.h                                   |    1 
 include/net/cipso_ipv4.h                                  |  159 +
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  354 ++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/ah4.c                                            |    2 
 net/ipv4/cipso_ipv4.c                                     | 1749 ++++++++++++++
 net/ipv4/ip_options.c                                     |   19 
 net/netlabel/Kconfig                                      |   47 
 net/netlabel/Makefile                                     |   15 
 net/netlabel/netlabel_cipso_v4.c                          |  580 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  201 +
 net/netlabel/netlabel_domainhash.c                        |  629 +++++
 net/netlabel/netlabel_domainhash.h                        |   64 
 net/netlabel/netlabel_kapi.c                              |  420 +++
 net/netlabel/netlabel_mgmt.c                              |  677 +++++
 net/netlabel/netlabel_mgmt.h                              |  248 +
 net/netlabel/netlabel_unlabeled.c                         |  285 ++
 net/netlabel/netlabel_unlabeled.h                         |   83 
 net/netlabel/netlabel_user.c                              |  174 +
 net/netlabel/netlabel_user.h                              |   42 
 security/selinux/hooks.c                                  |   81 
 security/selinux/include/av_inherit.h                     |    1 
 security/selinux/include/av_perm_to_string.h              |    2 
 security/selinux/include/av_permissions.h                 |    1 
 security/selinux/include/flask.h                          |    1 
 security/selinux/include/security.h                       |    9 
 security/selinux/nlmsgtab.c                               |  159 -
 security/selinux/ss/ebitmap.c                             |  155 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  160 +
 security/selinux/ss/mls.h                                 |   25 
 security/selinux/ss/services.c                            |  415 +++
 security/selinux/xfrm.c                                   |   22 
 44 files changed, 7642 insertions(+), 90 deletions(-)

--- NEW FILE linux-2.6-net-label.patch ---
>From paul.moore at hp.com Tue Jun 13 13:19:29 2006
Return-Path: <paul.moore at hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 13 Jun 2006 13:19:46 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5DHJklQ024760
	for <sgrubb at boston.redhat.com>; Tue, 13 Jun 2006 13:19:46 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5DHJjvp003404;
	Tue, 13 Jun 2006 13:19:45 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5DHJbhR014102;
	Tue, 13 Jun 2006 13:19:37 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel9.hp.com (Postfix) with ESMTP id BC9063411C;
	Tue, 13 Jun 2006 13:19:31 -0400 (EDT)
Received: from [16.116.96.193] (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id B2A0D1D83F;
	Tue, 13 Jun 2006 17:19:30 +0000 (UTC)
Message-ID: <448EF3A1.8060500 at hp.com>
Date: Tue, 13 Jun 2006 13:19:29 -0400
From: Paul Moore <paul.moore at hp.com>
Organization: Hewlett Packard
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: redhat-lspp at redhat.com
Cc: Steve Grubb <sgrubb at redhat.com>
Subject: Updated NetLabel patch
X-Enigmail-Version: 0.92.0.0
Content-Type: multipart/mixed;
  boundary="------------060702020000000708020100"
X-RedHat-Spam-Score: -98.817 
X-UID: 68857
X-Length: 271297

This is a multi-part message in MIME format.
--------------060702020000000708020100
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Attached is an updated NetLabel patch from June 13th (today) against the
lspp.35 sources.  As before it has been quickly tested on x86, x86_64,
targeted/enforcing, and mls/permissive although not all hw/policy
combinations have been tested.  If you wish to configure NetLabel to use
CIPSO please grab the June 13th release of netlabel_tools which can be
found here:

 * http://free.linux.hp.com/~pmoore/projects/linux_cipso

The big changes since the last posting on June 6th are:

 * Demonstrated interop between TSOL v 8 (big thanks to Ted)
 * Relabeling of sockets on accept()
 * The addition of the "pass through" CIPSO mapping
 * Better NetLabel netlink error reporting to userspace
 * Verified CIPSO option is recognized as immutable by AH
   (not yet tested)

The patch stats:

 CREDITS                                                   |    7
 Documentation/00-INDEX                                    |    2
 Documentation/netlabel/00-INDEX                           |   10
 Documentation/netlabel/cipso_ipv4.txt                     |   48
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  791 ++++
 Documentation/netlabel/introduction.txt                   |   44
 Documentation/netlabel/lsm_interface.txt                  |   47
 include/linux/ip.h                                        |    1
 include/linux/netlink.h                                   |    1
 include/net/cipso_ipv4.h                                  |  159
 include/net/inet_sock.h                                   |    2
 include/net/netlabel.h                                    |  354 ++
 net/Kconfig                                               |    2
 net/Makefile                                              |    1
 net/ipv4/Makefile                                         |    1
 net/ipv4/ah4.c                                            |    2
 net/ipv4/cipso_ipv4.c                                     | 1749 ++++++
 net/ipv4/ip_options.c                                     |   19
 net/netlabel/Kconfig                                      |   47
 net/netlabel/Makefile                                     |   15
 net/netlabel/netlabel_cipso_v4.c                          |  580 +++
 net/netlabel/netlabel_cipso_v4.h                          |  201 +
 net/netlabel/netlabel_domainhash.c                        |  629 +++
 net/netlabel/netlabel_domainhash.h                        |   64
 net/netlabel/netlabel_kapi.c                              |  420 ++
 net/netlabel/netlabel_mgmt.c                              |  677 +++
 net/netlabel/netlabel_mgmt.h                              |  248 +
 net/netlabel/netlabel_unlabeled.c                         |  285 +
 net/netlabel/netlabel_unlabeled.h                         |   83
 net/netlabel/netlabel_user.c                              |  174
 net/netlabel/netlabel_user.h                              |   42
 security/selinux/hooks.c                                  |   81
 security/selinux/include/av_inherit.h                     |    1
 security/selinux/include/av_perm_to_string.h              |    2
 security/selinux/include/av_permissions.h                 |    1
 security/selinux/include/flask.h                          |    1
 security/selinux/include/security.h                       |    9
 security/selinux/nlmsgtab.c                               |  159
 security/selinux/ss/ebitmap.c                             |  155
 security/selinux/ss/ebitmap.h                             |    6
 security/selinux/ss/mls.c                                 |  160
 security/selinux/ss/mls.h                                 |   25
 security/selinux/ss/services.c                            |  415 ++
 security/selinux/xfrm.c                                   |   22
 44 files changed, 7652 insertions(+), 90 deletions(-)

I'll be posting a more "reviewer friendly" patchset in a week or so once
this has been out for a few days and I have had a chance to work on the
patch a bit more (discussed on Monday's concall).

-- 
paul moore
linux security @ hp

--------------060702020000000708020100
Content-Type: text/x-patch;
 name="netlabel_06132006.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="netlabel_06132006.diff"

diff -purN linux-2.6.16.i686/CREDITS linux-2.6.16.i686-netlabel_06132006/CREDITS
--- linux-2.6.16.i686/CREDITS	2006-06-13 10:47:07.000000000 -0400
+++ linux-2.6.16.i686-netlabel_06132006/CREDITS	2006-06-13 11:19:58.000000000 -0400
@@ -2383,6 +2383,13 @@ N: Thomas Molina
 E: tmolina at cablespeed.com
 D: bug fixes, documentation, minor hackery
 
+N: Paul Moore
+E: paul.moore at hp.com
+D: NetLabel author
+S: Hewlett-Packard
+S: 110 Spit Brook Road
+S: Nashua, NH 03062
+
 N: James Morris
 E: jmorris at namei.org
 W: http://namei.org/
diff -purN linux-2.6.16.i686/Documentation/00-INDEX linux-2.6.16.i686-netlabel_06132006/Documentation/00-INDEX
--- linux-2.6.16.i686/Documentation/00-INDEX	2006-03-20 00:53:29.000000000 -0500
+++ linux-2.6.16.i686-netlabel_06132006/Documentation/00-INDEX	2006-06-13 11:19:58.000000000 -0400
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
diff -purN linux-2.6.16.i686/Documentation/netlabel/00-INDEX linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/00-INDEX
--- linux-2.6.16.i686/Documentation/netlabel/00-INDEX	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/00-INDEX	2006-06-13 11:19:58.000000000 -0400
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
diff -purN linux-2.6.16.i686/Documentation/netlabel/cipso_ipv4.txt linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/cipso_ipv4.txt
--- linux-2.6.16.i686/Documentation/netlabel/cipso_ipv4.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.16.i686-netlabel_06132006/Documentation/netlabel/cipso_ipv4.txt	2006-06-13 11:19:58.000000000 -0400
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
+labeled networking and is used in many trusted operating systems.
+
+ * Outbound Packet Processing
+
+The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
+adding the CIPSO label to the socket.  This causes all packets leaving the
+system through the socket to have the CIPSO IP option applied.  The socket's
+CIPSO label can be changed at any point in time, however, it is recommended
+that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
+label by using the NetLabel security module API; if the NetLabel "domain" is
+configured to use CIPSO for packet labeling then a CIPSO IP option will be
+generated and attached to the socket.
+
+ * Inbound Packet Processing
+
+The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
+IP layer without any special handling required by the LSM.  However, in order
[...7963 lines suppressed...]
+
+/**
+ * security_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
+ * @skb: the packet
+ * @base_sid: the SELinux SID to use as a context for MLS only attributes
+ * @sid: the SID
+ *
+ * Description:
+ * Call the NetLabel mechanism to get the security attributes of the given
+ * packet and use those attributes to determine the correct context/SID to
+ * assign to the packet.  Returns zero on success, negative values on failure.
+ *
+ */
+int security_netlbl_skbuff_getsid(struct sk_buff *skb, 
+				  const u32 base_sid,
+				  u32 *sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+
+	if (!ss_initialized)
+		return 0;
+
+	netlbl_secattr_init(&secattr);
+
+	ret_val = netlbl_skbuff_getattr(skb, &secattr);
+	if (ret_val == 0)
+		ret_val = security_netlbl_secattr_to_sid(skb,
+							 &secattr,
+							 base_sid,
+							 sid);
+
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return ret_val;
+}
+
+/**
+ * security_netlbl_socket_setsid - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sid: the SID to use as the basis for the label
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int security_netlbl_socket_setsid(const struct socket *sock, const u32 sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+	struct context *ctx;
+
+	if (!ss_initialized)
+		return 0;
+
+	ctx = sidtab_search(&sidtab, sid);
+	if (ctx != NULL) {
+		netlbl_secattr_init(&secattr);
+
+		if (security_context_export_type(ctx, 
+						 &secattr.domain,
+						 NULL) == 0)
+			secattr.set_domain = 1;
+		if (mls_export_lvl(ctx, &secattr.mls_lvl, NULL) == 0)
+			secattr.set_mls_lvl = 1;
+		if (mls_export_cat(ctx, 
+				   &secattr.mls_cat,
+				   &secattr.mls_cat_len,
+				   NULL,
+				   NULL) == 0)
+			secattr.set_mls_cat = 1;
+
+		ret_val = netlbl_socket_setattr(sock, &secattr);
+		netlbl_secattr_destroy(&secattr);
+	} else
+		ret_val = -ENOENT;
+
+	return ret_val;
+}
+
+/**
+ * security_netlbl_socket_accept - Handle the labeling of an accept()ed socket
+ * @sock: the original socket
+ * @newsock: the new accept()ed socket
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism based on the packets
+ * in the queue and the original socket's SID.  Returns zero values on success,
+ * negative values on failure.
+ *
+ */
+int security_netlbl_socket_accept(struct socket *sock, struct socket *newsock)
+{
+	int ret_val;
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct netlbl_lsm_secattr secattr;
+	u32 newsock_sid;
+	u16 sock_class;
+	u32 relabelto_perm;
+
+	if (!ss_initialized)
+		return 0;
+	netlbl_secattr_init(&secattr);
+
+	ret_val = netlbl_socket_getattr(newsock, &secattr);
+	if (ret_val != 0)
+		goto netlbl_socket_accept_return;
+	ret_val = security_netlbl_secattr_to_sid(NULL,
+						 &secattr,
+						 isec->sid,
+						 &newsock_sid);
+	if (ret_val != 0 || newsock_sid == SECINITSID_UNLABELED)
+		goto netlbl_socket_accept_return;
+
+	sock_class = isec->sclass;
+	switch (sock_class) {
+	case SECCLASS_UDP_SOCKET:
+		relabelto_perm = UDP_SOCKET__RELABELTO;
+		break;
+	case SECCLASS_TCP_SOCKET:
+		relabelto_perm = TCP_SOCKET__RELABELTO;
+		break;
+	default:
+		relabelto_perm = RAWIP_SOCKET__RELABELTO;
+	}
+
+	/* PM - should we have a "RELABELFROM" check too? */
+	/* PM - i suspect we should audit this socket relabel */
+	ret_val = avc_has_perm(isec->sid, 
+			       newsock_sid,
+			       sock_class,
+			       relabelto_perm,
+			       NULL);
+	if (ret_val != 0)
+		goto netlbl_socket_accept_return;
+
+	isec = SOCK_INODE(newsock)->i_security;
+	isec->sid = newsock_sid;
+
+netlbl_socket_accept_return:
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return security_netlbl_socket_setsid(newsock, isec->sid);
+}
+#endif /* CONFIG_NETLABEL */
+
 struct selinux_audit_rule {
 	u32 au_seqno;
 	struct context au_ctxt;
diff -purN linux-2.6.16.i686/security/selinux/xfrm.c linux-2.6.16.i686-netlabel_06132006/security/selinux/xfrm.c
--- linux-2.6.16.i686/security/selinux/xfrm.c	2006-06-13 10:46:59.000000000 -0400
+++ linux-2.6.16.i686-netlabel_06132006/security/selinux/xfrm.c	2006-06-13 11:20:00.000000000 -0400
@@ -295,13 +295,13 @@ u32 selinux_socket_getpeer_dgram(struct 
 /*
  * LSM hook that controls access to unlabelled packets.  If
  * a xfrm_state is authorizable (defined by macro) then it was
- * already authorized by the IPSec process.  If not, then
- * we need to check for unlabelled access since this may not have
- * gone thru the IPSec process.
+ * already authorized by the IPsec process.  Return zero when the
+ * packet has been approved by the IPsec process, negative values
+ * otherwise.
  */
 int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
 {
-	int i, rc = 0;
+	int i;
 	struct sec_path *sp;
 
 	sp = skb->sp;
@@ -317,21 +317,11 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_s
 			struct xfrm_state *x = sp->xvec[i];
 
 			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+				return 0;
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
-
-accept:
-	return 0;
-
-drop:
-	return rc;
+	return -ENOMSG;
 }
 
 /*

--------------060702020000000708020100--



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293
retrieving revision 1.2293.2.1
diff -u -r1.2293 -r1.2293.2.1
--- kernel-2.6.spec	18 Jun 2006 04:35:30 -0000	1.2293
+++ kernel-2.6.spec	19 Jun 2006 23:33:11 -0000	1.2293.2.1
@@ -11,10 +11,10 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 0
 
 # Versions of various parts
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6
+%define tag FC6.lspp.37
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -457,6 +457,12 @@
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
 
+# Audit & lspp patches
+Patch20100: linux-2.6-audit-git.patch
+Patch20101: linux-2.6-audit-pending.patch
+Patch20102: capabilities-over-netlink-in-permissive-mode.patch
+Patch20103: linux-2.6-net-label.patch
+
 
 # END OF PATCH DEFINITIONS
 
@@ -1093,11 +1099,22 @@
 
 cp -f %{all_arch_configs} .
 
+# Audit patches
+%patch20100 -p1
+%patch20101 -p1
+%patch20102 -p1
+#%patch20103 -p1
+
 
 # now run oldconfig over all the config files
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_INOTIFY_USER=y" >> .config
+  echo "CONFIG_NETLABEL=y" >> .config
+  echo "CONFIG_NETLABEL_CIPSOV4=y" >> .config
+  echo "CONFIG_NETLABEL_UNLABELED=y" >> .config
+  echo "CONFIG_NETLABEL_UNLABELED_DEFAULT=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
@@ -1696,6 +1713,9 @@
 %endif
 
 %changelog
+* Mon Jun 19 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.37
+
 * Sun Jun 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 23:33:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 19:33:18 -0400
Subject: rpms/kernel/devel/configs config-generic,1.195,1.195.2.1
Message-ID: <200606192333.k5JNXIEq000498@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv32732/configs

Modified Files:
      Tag: private-lspp-37-branch
	config-generic 
Log Message:
* Mon Jun 19 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.37




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.195
retrieving revision 1.195.2.1
diff -u -r1.195 -r1.195.2.1
--- config-generic	17 Jun 2006 22:16:10 -0000	1.195
+++ config-generic	19 Jun 2006 23:33:14 -0000	1.195.2.1
@@ -2493,7 +2493,7 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
 



From fedora-cvs-commits at redhat.com  Mon Jun 19 23:51:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 19:51:36 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-loader-diet.patch,
	1.1, 1.2 xorg-x11-server.spec, 1.88, 1.89
Message-ID: <200606192351.k5JNpaa6019073@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18976

Modified Files:
	xorg-x11-server-1.1.0-loader-diet.patch xorg-x11-server.spec 
Log Message:
Bump to -17, disable the loader work since it's broken.


xorg-x11-server-1.1.0-loader-diet.patch:
 configure.ac                    |    6 
 hw/xfree86/Makefile.am          |    2 
 hw/xfree86/common/xf86Globals.c |    7 
 hw/xfree86/loader/Makefile.am   |   33 -
 hw/xfree86/loader/dlloader.c    |  107 ++---
 hw/xfree86/loader/dlloader.h    |    8 
 hw/xfree86/loader/loader.c      |  808 ----------------------------------------
 hw/xfree86/loader/loader.h      |  196 ---------
 hw/xfree86/loader/loaderProcs.h |    7 
 hw/xfree86/loader/loadext.c     |    5 
 hw/xfree86/loader/loadfont.c    |    4 
 hw/xfree86/loader/loadmod.c     |   84 +---
 hw/xfree86/loader/os.c          |    4 
 include/xorg-config.h.in        |    6 
 include/xorg-server.h.in        |    6 
 15 files changed, 101 insertions(+), 1182 deletions(-)

Index: xorg-x11-server-1.1.0-loader-diet.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-loader-diet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-loader-diet.patch	19 Jun 2006 21:22:27 -0000	1.1
+++ xorg-x11-server-1.1.0-loader-diet.patch	19 Jun 2006 23:51:32 -0000	1.2
@@ -1,20 +1,27 @@
---- xorg-server-1.1.0/include/xorg-server.h.in.loader-diet	2005-12-02 01:02:44.000000000 -0500
-+++ xorg-server-1.1.0/include/xorg-server.h.in	2006-06-19 16:48:07.000000000 -0400
-@@ -28,12 +28,6 @@
- /* Use OsVendorInit */
- #undef DDXOSINIT
+--- xorg-server-1.1.0/configure.ac.loader-diet	2006-05-22 13:18:49.000000000 -0400
++++ xorg-server-1.1.0/configure.ac	2006-06-19 18:56:30.000000000 -0400
+@@ -1041,7 +1041,7 @@
+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+ 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
+ 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
+-	XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
++	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $XPSTUBS_LIB $OS_LIB"
  
--/* Prefer dlloader modules to elfloader */
--#undef DLOPEN_HACK
--
--/* Building with libdl */
--#undef DLOPEN_SUPPORT
--
- /* Build DPMS extension */
- #undef DPMSExtension
+ 	AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
  
+@@ -1250,10 +1250,6 @@
+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+-	# XXX HACK!  if anyone cares about elfloader in 7.0 you need to
+-	# XXX do something smarter here.
+-	AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])
+-	AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
+ 	AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
+ 	AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
+ 	AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])
 --- xorg-server-1.1.0/include/xorg-config.h.in.loader-diet	2006-03-15 16:25:38.000000000 -0500
-+++ xorg-server-1.1.0/include/xorg-config.h.in	2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/include/xorg-config.h.in	2006-06-19 18:56:30.000000000 -0400
 @@ -30,12 +30,6 @@
  /* URL to go to for support. */
  #undef __VENDORDWEBSUPPORT__
@@ -28,21 +35,23 @@
  /* Built-in output drivers. */
  #undef DRIVERS
  
---- xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c.loader-diet	2006-05-09 14:04:29.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c	2006-06-19 16:48:07.000000000 -0400
-@@ -247,10 +247,3 @@
- _X_EXPORT Bool xf86inSuspend = FALSE;
- Bool xorgHWAccess = FALSE;
- PciBusId xf86IsolateDevice;
+--- xorg-server-1.1.0/include/xorg-server.h.in.loader-diet	2005-12-02 01:02:44.000000000 -0500
++++ xorg-server-1.1.0/include/xorg-server.h.in	2006-06-19 18:56:30.000000000 -0400
+@@ -28,12 +28,6 @@
+ /* Use OsVendorInit */
+ #undef DDXOSINIT
+ 
+-/* Prefer dlloader modules to elfloader */
+-#undef DLOPEN_HACK
 -
--#ifdef DLOPEN_HACK
--/*
-- * This stuff is a hack to allow dlopen() modules to work.  It is intended
-- * only to be used when using dlopen() modules for debugging purposes.
-- */
--#endif
+-/* Building with libdl */
+-#undef DLOPEN_SUPPORT
+-
+ /* Build DPMS extension */
+ #undef DPMSExtension
+ 
 --- xorg-server-1.1.0/hw/xfree86/loader/loadmod.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loadmod.c	2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/loadmod.c	2006-06-19 18:56:30.000000000 -0400
 @@ -1,7 +1,4 @@
 -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v 1.73 2003/11/03 05:11:51 tsi Exp $ */
 -
@@ -211,86 +220,53 @@
      }
      if (name)
  	xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
---- xorg-server-1.1.0/hw/xfree86/loader/os.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/os.c	2006-06-19 16:48:07.000000000 -0400
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
+--- xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h	2006-06-19 18:56:30.000000000 -0400
+@@ -1,7 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loaderProcs.h,v 1.21 2003/10/15 16:29:04 dawes Exp $ */
 -
  /*
-  * Copyright (c) 1999-2002 by The XFree86 Project, Inc.
+- *
+  * Copyright 1995-1998 by Metro Link, Inc.
   *
-@@ -38,6 +36,7 @@
-  * loader and by OS-specific modules.
-  */
+  * Permission to use, copy, modify, distribute, and sell this software and its
+@@ -78,9 +75,7 @@
+     const XF86ModuleVersionInfo *VersionInfo;
+ } ModuleDesc, *ModuleDescPtr;
  
-+#ifndef OSNAME
- #if defined(__linux__)
- #define OSNAME "linux"
- #elif defined(__FreeBSD__)
-@@ -67,6 +66,7 @@
- #else
- #define OSNAME "unknown"
- #endif
-+#endif
+-/*
+- * Extenal API for the loader 
+- */
++/* External API for the loader */
  
- /* Return the OS name, and run-time OS version */
+ void LoaderInit(void);
  
---- xorg-server-1.1.0/hw/xfree86/loader/Makefile.am.loader-diet	2005-12-02 01:02:41.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/Makefile.am	2006-06-19 16:48:07.000000000 -0400
-@@ -1,10 +1,6 @@
- noinst_LIBRARIES = libloader.a
--INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
--           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
--           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
--           -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \
--           -I$(srcdir)/../dixmods/extmod -I$(srcdir)/../../../miext/cw \
--           -I$(srcdir)/../../../miext/damage
-+
-+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser
+--- xorg-server-1.1.0/hw/xfree86/loader/loadfont.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/loadfont.c	2006-06-19 18:56:30.000000000 -0400
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadfont.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
+ /*
+  * Copyright (c) 1998 by The XFree86 Project, Inc.
+  *
+@@ -37,6 +36,7 @@
+ #include "misc.h"
+ #include "xf86.h"
  
- #AM_LDFLAGS = -r
- AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
-@@ -13,22 +9,10 @@
- SPARC_SOURCES = SparcMulDiv.S
- endif
++/* XXX this should be static, but xorgcfg needs it, nngh */
+ FontModule *FontModuleList = NULL;
+ static int numFontModules = 0;
  
--sdk_HEADERS = \
--	elf.h
--
- EXTRA_DIST = \
--	aout.h \
--	aoutloader.h \
--	ar.h \
--	coff.h \
--	coffloader.h \
- 	dlloader.h \
--	elf.h \
--	elfloader.h \
--	hash.h \
- 	loader.h \
- 	loaderProcs.h \
--	sym.h \
- 	SparcMulDiv.S
+@@ -62,7 +62,7 @@
+     }
+ }
  
- libloader_a_SOURCES = \
-@@ -37,15 +21,6 @@
- 	loadext.c \
-         loadmod.c \
- 	loadfont.c \
--        aoutloader.c \
-         dlloader.c \
--        elfloader.c \
--        coffloader.c \
- 	os.c \
--	dixsym.c \
--	extsym.c \
--	fontsym.c \
--	misym.c \
--	xf86sym.c \
--	hash.c \
- 	$(SPARC_SOURCES)
+-_X_EXPORT void
++_X_EXPORT __attribute__((used)) void
+ LoadFont(FontModule * f)
+ {
+     FontModule *newfont;
 --- xorg-server-1.1.0/hw/xfree86/loader/loader.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loader.h	2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/loader.h	2006-06-19 18:56:30.000000000 -0400
 @@ -1,7 +1,4 @@
 -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.h,v 1.28 2003/11/06 18:38:14 tsi Exp $ */
 -
@@ -539,8 +515,66 @@
 -extern void _loader_debug_state(void);
  
  #endif /* _LOADER_H */
+--- xorg-server-1.1.0/hw/xfree86/loader/Makefile.am.loader-diet	2005-12-02 01:02:41.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/Makefile.am	2006-06-19 19:13:41.000000000 -0400
+@@ -1,10 +1,6 @@
+ noinst_LIBRARIES = libloader.a
+-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
+-           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
+-           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
+-           -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \
+-           -I$(srcdir)/../dixmods/extmod -I$(srcdir)/../../../miext/cw \
+-           -I$(srcdir)/../../../miext/damage
++
++INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser
+ 
+ #AM_LDFLAGS = -r
+ AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+@@ -13,22 +9,10 @@
+ SPARC_SOURCES = SparcMulDiv.S
+ endif
+ 
+-sdk_HEADERS = \
+-	elf.h
+-
+ EXTRA_DIST = \
+-	aout.h \
+-	aoutloader.h \
+-	ar.h \
+-	coff.h \
+-	coffloader.h \
+ 	dlloader.h \
+-	elf.h \
+-	elfloader.h \
+-	hash.h \
+ 	loader.h \
+ 	loaderProcs.h \
+-	sym.h \
+ 	SparcMulDiv.S
+ 
+ libloader_a_SOURCES = \
+@@ -37,15 +21,10 @@
+ 	loadext.c \
+         loadmod.c \
+ 	loadfont.c \
+-        aoutloader.c \
+         dlloader.c \
+-        elfloader.c \
+-        coffloader.c \
+ 	os.c \
+-	dixsym.c \
+-	extsym.c \
+-	fontsym.c \
+-	misym.c \
+-	xf86sym.c \
+-	hash.c \
+ 	$(SPARC_SOURCES)
++
++all: libloader.o
++libloader.o: $(libloader_a_OBJECTS)
++	ld -r $@ $<
 --- xorg-server-1.1.0/hw/xfree86/loader/loader.c.loader-diet	2006-03-28 02:21:50.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loader.c	2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/loader.c	2006-06-19 18:56:30.000000000 -0400
 @@ -1,5 +1,3 @@
 -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.71 2003/11/06 18:38:13 tsi Exp $ */
 -
@@ -1507,65 +1541,8 @@
  unsigned long LoaderOptions = 0;
  
  void
---- xorg-server-1.1.0/hw/xfree86/loader/dlloader.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.h	2006-06-19 16:48:07.000000000 -0400
-@@ -19,19 +19,15 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
--
- #ifdef HAVE_XORG_CONFIG_H
- #include <xorg-config.h>
- #endif
- 
- #ifndef _DLLOADER_H
- #define _DLLOADER_H
--extern void *DLLoadModule(loaderPtr, int, LOOKUP **, int flags);
--extern void DLResolveSymbols(void *);
--extern int DLCheckForUnresolved(void *);
-+
-+extern void *DLLoadModule(loaderPtr, int, int flags);
- extern void DLUnloadModule(void *);
- extern void *DLFindSymbol(const char *name);
--extern void *DLFindSymbolLocal(pointer module, const char *name);
- 
- #endif
---- xorg-server-1.1.0/hw/xfree86/loader/loadext.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loadext.c	2006-06-19 16:48:07.000000000 -0400
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.8 2003/10/15 16:29:04 dawes Exp $ */
- /*
-  * Copyright (c) 2000 by The XFree86 Project, Inc.
-  *
-@@ -37,6 +36,10 @@
- #include "misc.h"
- #include "xf86.h"
- 
-+/*
-+ * This should be static, but miinitext wants it.  FIXME: make extension
-+ * initialization not completely terrible.
-+ */
- ExtensionModule *ExtensionModuleList = NULL;
- static int numExtensionModules = 0;
- 
---- xorg-server-1.1.0/hw/xfree86/loader/loadfont.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loadfont.c	2006-06-19 16:48:07.000000000 -0400
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadfont.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
- /*
-  * Copyright (c) 1998 by The XFree86 Project, Inc.
-  *
-@@ -37,6 +36,7 @@
- #include "misc.h"
- #include "xf86.h"
- 
-+/* XXX this should be static, but xorgcfg needs it, nngh */
- FontModule *FontModuleList = NULL;
- static int numFontModules = 0;
- 
 --- xorg-server-1.1.0/hw/xfree86/loader/dlloader.c.loader-diet	2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.c	2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.c	2006-06-19 18:56:30.000000000 -0400
 @@ -1,7 +1,4 @@
 -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.c,v 1.13 2003/10/15 16:29:02 dawes Exp $ */
 -
@@ -1783,29 +1760,87 @@
 -    xf86loaderfree(modptr);
 +    free(modptr);
  }
---- xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h	2006-06-19 16:48:07.000000000 -0400
-@@ -1,7 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loaderProcs.h,v 1.21 2003/10/15 16:29:04 dawes Exp $ */
+--- xorg-server-1.1.0/hw/xfree86/loader/dlloader.h.loader-diet	2006-03-11 19:11:34.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.h	2006-06-19 18:56:30.000000000 -0400
+@@ -19,19 +19,15 @@
+  * PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
 -
+ #ifdef HAVE_XORG_CONFIG_H
+ #include <xorg-config.h>
+ #endif
+ 
+ #ifndef _DLLOADER_H
+ #define _DLLOADER_H
+-extern void *DLLoadModule(loaderPtr, int, LOOKUP **, int flags);
+-extern void DLResolveSymbols(void *);
+-extern int DLCheckForUnresolved(void *);
++
++extern void *DLLoadModule(loaderPtr, int, int flags);
+ extern void DLUnloadModule(void *);
+ extern void *DLFindSymbol(const char *name);
+-extern void *DLFindSymbolLocal(pointer module, const char *name);
+ 
+ #endif
+--- xorg-server-1.1.0/hw/xfree86/loader/loadext.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/loadext.c	2006-06-19 18:56:30.000000000 -0400
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.8 2003/10/15 16:29:04 dawes Exp $ */
  /*
-- *
-  * Copyright 1995-1998 by Metro Link, Inc.
+  * Copyright (c) 2000 by The XFree86 Project, Inc.
   *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -78,9 +75,7 @@
-     const XF86ModuleVersionInfo *VersionInfo;
- } ModuleDesc, *ModuleDescPtr;
+@@ -37,6 +36,10 @@
+ #include "misc.h"
+ #include "xf86.h"
  
--/*
-- * Extenal API for the loader 
-- */
-+/* External API for the loader */
++/*
++ * This should be static, but miinitext wants it.  FIXME: make extension
++ * initialization not completely terrible.
++ */
+ ExtensionModule *ExtensionModuleList = NULL;
+ static int numExtensionModules = 0;
  
- void LoaderInit(void);
+--- xorg-server-1.1.0/hw/xfree86/loader/os.c.loader-diet	2006-03-25 14:52:04.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/os.c	2006-06-19 18:56:30.000000000 -0400
+@@ -1,5 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
+-
+ /*
+  * Copyright (c) 1999-2002 by The XFree86 Project, Inc.
+  *
+@@ -38,6 +36,7 @@
+  * loader and by OS-specific modules.
+  */
  
++#ifndef OSNAME
+ #if defined(__linux__)
+ #define OSNAME "linux"
+ #elif defined(__FreeBSD__)
+@@ -67,6 +66,7 @@
+ #else
+ #define OSNAME "unknown"
+ #endif
++#endif
+ 
+ /* Return the OS name, and run-time OS version */
+ 
+--- xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c.loader-diet	2006-05-09 14:04:29.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c	2006-06-19 18:56:30.000000000 -0400
+@@ -247,10 +247,3 @@
+ _X_EXPORT Bool xf86inSuspend = FALSE;
+ Bool xorgHWAccess = FALSE;
+ PciBusId xf86IsolateDevice;
+-
+-#ifdef DLOPEN_HACK
+-/*
+- * This stuff is a hack to allow dlopen() modules to work.  It is intended
+- * only to be used when using dlopen() modules for debugging purposes.
+- */
+-#endif
 --- xorg-server-1.1.0/hw/xfree86/Makefile.am.loader-diet	2006-05-09 14:04:29.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/Makefile.am	2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/Makefile.am	2006-06-19 18:56:30.000000000 -0400
 @@ -36,11 +36,11 @@
  XORG_LIBS = \
              @XORG_CORE_LIBS@ \
@@ -1815,29 +1850,7 @@
              parser/libxf86config.a \
              dummylib/libdummy.a \
  	    dixmods/libdixmods.la \
-+            loader/libloader.a \
++            loader/libloader.o \
              @XORG_LIBS@
  
  Xorg_LDADD = $(XORG_LIBS) \
---- xorg-server-1.1.0/configure.ac.loader-diet	2006-05-22 13:18:49.000000000 -0400
-+++ xorg-server-1.1.0/configure.ac	2006-06-19 16:48:34.000000000 -0400
-@@ -1041,7 +1041,7 @@
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
- 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
- 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
--	XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
-+	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $XPSTUBS_LIB $OS_LIB"
- 
- 	AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
- 
-@@ -1250,10 +1250,6 @@
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
--	# XXX HACK!  if anyone cares about elfloader in 7.0 you need to
--	# XXX do something smarter here.
--	AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])
--	AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
- 	AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
- 	AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
- 	AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- xorg-x11-server.spec	19 Jun 2006 21:22:27 -0000	1.88
+++ xorg-x11-server.spec	19 Jun 2006 23:51:32 -0000	1.89
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   16
+Release:   17
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -38,7 +38,7 @@
 Patch2000:  xorg-x11-server-1.1.0-cw-crash-fix.patch
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2002:  xorg-x11-server-1.1.0-hush-crash-message.patch
-Patch2003:  xorg-x11-server-1.1.0-loader-diet.patch
+#Patch2003:  xorg-x11-server-1.1.0-loader-diet.patch
 
 # autoconfiguration feature patches
 #Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
@@ -299,7 +299,7 @@
 %patch2000 -p1 -b .cw-crash
 %patch2001 -p1 -b .pci-scan
 %patch2002 -p1 -b .crash-message
-%patch2003 -p1 -b .loader-diet
+#%patch2003 -p1 -b .loader-diet
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .cvt
@@ -605,7 +605,7 @@
 - Disable filling in monitor gamma info from EDID momentarily, since drivers
   will use that field to set the card's gamma ramp.
 - Backport some stuff from git: cw crash fix, faster pci scanning, some
-  log message cleanup, and a massive debloating of the loader.
+  log message cleanup.
 
 * Fri Jun 16 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-16
 - Enable spec support for s390, s390x, alpha, sparc, and sparc64 architectures.



From fedora-cvs-commits at redhat.com  Tue Jun 20 00:04:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 20:04:36 -0400
Subject: rpms/gnome-panel/devel transparent-systray.patch, NONE,
	1.1 gnome-panel.spec, 1.129, 1.130
Message-ID: <200606200004.k5K04amP022794@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22737

Modified Files:
	gnome-panel.spec 
Added Files:
	transparent-systray.patch 
Log Message:
Add support for transparent backgrouns in the notification area


transparent-systray.patch:
 eggtraymanager.c |   33 +++++++++++++++++++++++++++++++++
 main.c           |   40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

--- NEW FILE transparent-systray.patch ---
--- gnome-panel-2.14.2/applets/notification_area/eggtraymanager.c.transparent-systray	2006-06-19 19:13:52.000000000 -0400
+++ gnome-panel-2.14.2/applets/notification_area/eggtraymanager.c	2006-06-19 19:14:10.000000000 -0400
@@ -291,6 +291,37 @@
   return FALSE;
 }
 
+static gboolean
+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+{
+  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+			 event->area.width, event->area.height);
+  return FALSE;
+}
+
+static void
+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
+			gpointer user_data)
+{
+  g_print("make transparent again\n");
+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+}
+
+static void
+make_transparent (GtkWidget *widget, gpointer user_data)
+{
+  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
+    return;
+
+  gtk_widget_set_app_paintable (widget, TRUE);
+  gtk_widget_set_double_buffered (widget, FALSE);
+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+  g_signal_connect (widget, "expose_event",
+		    G_CALLBACK (transparent_expose_event), NULL);
+  g_signal_connect_after (widget, "style_set",
+			  G_CALLBACK (make_transparent_again), NULL);
+}
+
 static void
 egg_tray_manager_handle_dock_request (EggTrayManager       *manager,
 				      XClientMessageEvent  *xevent)
@@ -306,6 +337,8 @@
     }
   
   socket = gtk_socket_new ();
+  g_signal_connect (socket, "realize",
+		    G_CALLBACK (make_transparent), NULL);
   
   /* We need to set the child window here
    * so that the client can call _get functions
--- gnome-panel-2.14.2/applets/notification_area/main.c.transparent-systray	2006-06-19 19:14:01.000000000 -0400
+++ gnome-panel-2.14.2/applets/notification_area/main.c	2006-06-19 19:14:10.000000000 -0400
@@ -163,14 +163,24 @@
   tray = all_trays->data;
 
   gtk_box_pack_end (GTK_BOX (tray->box), icon, FALSE, FALSE, 0);
-  
+
+  gtk_widget_hide (tray->box);
   gtk_widget_show (icon);
+  gtk_widget_show (tray->box);
 }
 
 static void
 tray_removed (EggTrayManager *manager, GtkWidget *icon, void *data)
 {
+  SystemTray *tray;
+
+  if (all_trays == NULL)
+    return;
+  
+  tray = all_trays->data;
 
+  gtk_widget_hide (tray->box);
+  gtk_widget_show (tray->box);
 }
 
 static void
@@ -211,8 +221,31 @@
       gtk_widget_set_size_request (tray->box, -1, MIN_BOX_SIZE);
       break;
     }
+
+  /* Force the icons to redraw their backgrounds.
+   * gtk_widget_queue_draw() doesn't work across process boundaries,
+   * so we do this instead.
+   */
+  gtk_widget_hide (tray->box);
+  gtk_widget_show (tray->box);
+}
+
+static void
+applet_change_background (PanelApplet               *applet,
+                          PanelAppletBackgroundType  type,
+                          GdkColor                  *color,
+                          GdkPixmap                 *pixmap,
+			  SystemTray                *tray)
+{
+  /* Force the icons to redraw their backgrounds.
+   * gtk_widget_queue_draw() doesn't work across process boundaries,
+   * so we do this instead.
+   */
+  gtk_widget_hide (tray->box);
+  gtk_widget_show (tray->box);
 }
 
+
 static void
 applet_change_orientation (PanelApplet       *applet,
                            PanelAppletOrient  orient,
@@ -338,6 +371,11 @@
                     G_CALLBACK (applet_change_orientation),
                     tray);
 
+  g_signal_connect (G_OBJECT (tray->applet),
+                    "change_background",
+                    G_CALLBACK (applet_change_background),
+                    tray);
+
   g_signal_connect (tray->applet,
                     "destroy",
                     G_CALLBACK (applet_destroy),


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-panel.spec	14 Jun 2006 04:09:01 -0000	1.129
+++ gnome-panel.spec	20 Jun 2006 00:04:31 -0000	1.130
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 4
+Release: 5
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -78,6 +78,8 @@
 Patch8: gnome-panel-2.13.90-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
+# support transparent background in the notification area
+Patch11: transparent-systray.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -109,6 +111,7 @@
 %patch8 -p1 -b .use-beagle
 %patch9 -p1 -b .ignore-unknown-options
 %patch10 -p1 -b .remove-duplicate-entry
+%patch11 -p1 -b .transparent-systray
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -224,6 +227,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
+- Add a patch to support transparent backgrounds in the
+  notification area
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
 - Update to new gnome-power-manager interface
 - Conflict with gnome-power-manager < 2.15.3



From fedora-cvs-commits at redhat.com  Tue Jun 20 00:07:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 20:07:39 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.89,1.90
Message-ID: <200606200007.k5K07dE0023366@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23322

Modified Files:
	xorg-x11-server.spec 
Log Message:
A broken configure check is requiring libXt, so put the dep outside the with_dmx_server section for now


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- xorg-x11-server.spec	19 Jun 2006 23:51:32 -0000	1.89
+++ xorg-x11-server.spec	20 Jun 2006 00:07:34 -0000	1.90
@@ -105,6 +105,10 @@
 BuildRequires: libXtst-devel
 # libXdmcp-devel needed for Xdmx, and Xnest
 BuildRequires: libXdmcp-devel
+# FIXME: Should be wrapped in with_dmx_server - for Xdmxconfig, probably
+# should only be needed for DMX builds, but the build explodes with a
+# bogus configure check failure if this is missing.
+BuildRequires: libXt-devel
 
 
 %if %{with_dmx_server}
@@ -120,8 +124,8 @@
 BuildRequires: libXrender-devel
 # libXi-devel needed for Xdmx
 BuildRequires: libXi-devel
-# For Xdmxconfig 
-BuildRequires: libXt-devel libXpm-devel libXaw-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXaw-devel
 %endif
 
 BuildRequires: freetype-devel >= 2.1.9-1



From fedora-cvs-commits at redhat.com  Tue Jun 20 00:41:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 20:41:18 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.89,1.90
Message-ID: <200606200041.k5K0fIvg018461@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18448

Modified Files:
	nfs-utils.spec 
Log Message:
Reworked the Buildreqs



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- nfs-utils.spec	19 Jun 2006 21:58:39 -0000	1.89
+++ nfs-utils.spec	20 Jun 2006 00:41:15 -0000	1.90
@@ -38,8 +38,7 @@
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9, nfs-utils-lib, pkgconfig
 BuildRequires: krb5-libs >= 1.4, autoconf >= 2.57, openldap-devel >= 2.2
-BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
-BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel >= 1.0.8-4
+BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 00:56:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 20:56:53 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.90,1.91
Message-ID: <200606200056.k5K0ursp000841@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv824

Modified Files:
	nfs-utils.spec 
Log Message:
Added pkgconfig to BuildRequires



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- nfs-utils.spec	20 Jun 2006 00:41:15 -0000	1.90
+++ nfs-utils.spec	20 Jun 2006 00:56:49 -0000	1.91
@@ -39,6 +39,7 @@
 Requires: modutils >= 2.4.26-9, nfs-utils-lib, pkgconfig
 BuildRequires: krb5-libs >= 1.4, autoconf >= 2.57, openldap-devel >= 2.2
 BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel
+BuildRequires: pkgconfig
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 01:05:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 21:05:27 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-convolution-filter-fix.patch, NONE,
	1.1 xorg-x11-server-1.1.0-tfp-damage.patch, NONE,
	1.1 xorg-server-1.0.99.2-spiffiffity.patch, 1.2,
	1.3 xorg-x11-server.spec, 1.90, 1.91
Message-ID: <200606200105.k5K15RKq001011@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv996

Modified Files:
	xorg-server-1.0.99.2-spiffiffity.patch xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-convolution-filter-fix.patch 
	xorg-x11-server-1.1.0-tfp-damage.patch 
Log Message:
* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-18
- Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and
  xorg-x11-server-1.1.0-tfp-damage.patch backported to make compiz go
  faster and make compiz shadows work.


xorg-x11-server-1.1.0-convolution-filter-fix.patch:
 fbcompose.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-convolution-filter-fix.patch ---
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -3647,8 +3647,8 @@ static void fbFetchTransformed(PicturePt
         xFixed *params = pict->filter_params;
         INT32 cwidth = xFixedToInt(params[0]);
         INT32 cheight = xFixedToInt(params[1]);
-        int xoff = params[0] >> 1;
-        int yoff = params[1] >> 1;
+        int xoff = (params[0] - xFixed1) >> 1;
+	int yoff = (params[1] - xFixed1) >> 1;
         params += 2;
         for (i = 0; i < width; ++i) {
 	    if (!mask || mask[i] & maskBits)
@@ -3695,6 +3695,11 @@ static void fbFetchTransformed(PicturePt
                     }
                 }
 
+		satot >>= 16;
+		srtot >>= 16;
+		sgtot >>= 16;
+		sbtot >>= 16;
+
                 if (satot < 0) satot = 0; else if (satot > 0xff) satot = 0xff;
                 if (srtot < 0) srtot = 0; else if (srtot > 0xff) srtot = 0xff;
                 if (sgtot < 0) sgtot = 0; else if (sgtot > 0xff) sgtot = 0xff;

xorg-x11-server-1.1.0-tfp-damage.patch:
 glxcmds.c     |    1 +
 glxdrawable.h |    4 +++-
 glxdri.c      |   52 ++++++++++++++++++++++++++++++++++++++++------------
 glxext.c      |    4 ++++
 4 files changed, 48 insertions(+), 13 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-tfp-damage.patch ---
? GL/glx/glxinterface.h
? doc/Xserver.1x
Index: GL/glx/glxcmds.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxcmds.c,v
retrieving revision 1.10.2.5
diff -u -p -r1.10.2.5 glxcmds.c
--- GL/glx/glxcmds.c	6 Mar 2006 00:11:40 -0000	1.10.2.5
+++ GL/glx/glxcmds.c	6 Mar 2006 00:38:37 -0000
@@ -1245,6 +1245,7 @@ int DoCreateGLXPixmap(__GLXclientState *
     pGlxPixmap->pGlxScreen = pGlxScreen;
     pGlxPixmap->pScreen = pScreen;
     pGlxPixmap->idExists = True;
+    pGlxPixmap->pDamage = NULL;
     pGlxPixmap->refcnt = 0;
 
     pGlxPixmap->modes = modes;
Index: GL/glx/glxdrawable.h
===================================================================
RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxdrawable.h,v
retrieving revision 1.4.10.1
diff -u -p -r1.4.10.1 glxdrawable.h
--- GL/glx/glxdrawable.h	24 Feb 2006 05:49:33 -0000	1.4.10.1
+++ GL/glx/glxdrawable.h	6 Mar 2006 00:38:37 -0000
@@ -41,6 +41,8 @@
 **
 */
 
+#include <damage.h>
+
 typedef struct {
 
     DrawablePtr pDraw;
@@ -49,7 +51,7 @@ typedef struct {
     ScreenPtr pScreen;
     Bool idExists;
     int refcnt;
-
+    DamagePtr pDamage;
 } __GLXpixmap;
 
 struct __GLXdrawable {
Index: GL/glx/glxdri.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/GL/glx/Attic/glxdri.c,v
retrieving revision 1.1.2.11
diff -u -p -r1.1.2.11 glxdri.c
--- GL/glx/glxdri.c	6 Mar 2006 00:11:40 -0000	1.1.2.11
+++ GL/glx/glxdri.c	6 Mar 2006 00:38:37 -0000
@@ -334,13 +334,36 @@ __glXDRIbindTexImage(__GLXcontext *baseC
 		     int buffer,
 		     __GLXpixmap *glxPixmap)
 {
+    RegionPtr	pRegion;
     PixmapPtr	pixmap;
-    int		bpp;
-    Bool	npot;
+    int		bpp, xoff, yoff, width, height;
+    GLenum	target, format, type;
 
     pixmap = (PixmapPtr) glxPixmap->pDraw;
-    bpp = pixmap->drawable.depth >= 24 ? 4 : 2; /* XXX 24bpp packed, 8, etc */
-    
+    if (!glxPixmap->pDamage) {
+        glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,
+					  TRUE, glxPixmap->pScreen, NULL);
+	if (!glxPixmap->pDamage)
+            return BadAlloc;
+
+	DamageRegister ((DrawablePtr) pixmap, glxPixmap->pDamage);
+    } else {
+	pRegion = DamageRegion(glxPixmap->pDamage);
+	if (REGION_NIL(pRegion))
+	    return Success;
+    }
+
+    /* XXX 24bpp packed, 8, etc */
+    if (pixmap->drawable.depth >= 24) {
+	bpp = 4;
+	format = GL_BGRA;
+	type = GL_UNSIGNED_BYTE;
+    } else {
+	bpp = 2;
+	format = GL_RGB;
+	type = GL_UNSIGNED_SHORT_5_6_5;
+    }
+
     CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
                                        pixmap->devKind / bpp) );
     CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
@@ -351,22 +374,27 @@ __glXDRIbindTexImage(__GLXcontext *baseC
     if (pixmap->drawable.depth == 24)
         glxFillAlphaChannel(pixmap);
 
-    npot = !(glxCountBits(pixmap->drawable.width) == 1 &&
-             glxCountBits(pixmap->drawable.height) == 1) /* ||
-             strstr(CALL_GetString(GL_EXTENSIONS,
-                    "GL_ARB_texture_non_power_of_two")) */ ;
-    
+    if (!(glxCountBits(pixmap->drawable.width) == 1 &&
+	  glxCountBits(pixmap->drawable.height) == 1)
+	/* || strstr(CALL_GetString(GL_EXTENSIONS,
+	             "GL_ARB_texture_non_power_of_two")) */)
+	target = GL_TEXTURE_RECTANGLE_ARB;
+    else
+	target = GL_TEXTURE_2D;
+
     CALL_TexImage2D( GET_DISPATCH(),
-		     ( npot ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D,
+		     ( target,
 		       0,
 		       bpp == 4 ? 4 : 3,
 		       pixmap->drawable.width,
 		       pixmap->drawable.height,
 		       0,
-		       bpp == 4 ? GL_BGRA : GL_RGB,
-		       bpp == 4 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5,
+		       format,
+		       type,
 		       pixmap->devPrivate.ptr ) );
 
+    DamageEmpty(glxPixmap->pDamage);
+
     return Success;
 }
 
Index: GL/glx/glxext.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxext.c,v
retrieving revision 1.6.10.3
diff -u -p -r1.6.10.3 glxext.c
--- GL/glx/glxext.c	6 Mar 2006 00:11:40 -0000	1.6.10.3
+++ GL/glx/glxext.c	6 Mar 2006 00:38:37 -0000
@@ -140,6 +140,10 @@ static int PixmapGone(__GLXpixmap *pGlxP
 
     pGlxPixmap->idExists = False;
     if (!pGlxPixmap->refcnt) {
+	if (pGlxPixmap->pDamage) {
+	    DamageUnregister (pGlxPixmap->pDraw, pGlxPixmap->pDamage);
+	    DamageDestroy(pGlxPixmap->pDamage);
+	}
 	/*
 	** The DestroyPixmap routine should decrement the refcount and free
 	** only if it's zero.

xorg-server-1.0.99.2-spiffiffity.patch:
 compalloc.c  |    2 ++
 compwindow.c |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: xorg-server-1.0.99.2-spiffiffity.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-server-1.0.99.2-spiffiffity.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-server-1.0.99.2-spiffiffity.patch	14 Apr 2006 03:21:31 -0000	1.2
+++ xorg-server-1.0.99.2-spiffiffity.patch	20 Jun 2006 01:05:12 -0000	1.3
@@ -1,3 +1,10 @@
+This patch does two things: the first chunk against compalloc.c
+disables backfilling of windows created with bg=none, which otherwise
+would force a framebuffer readback.  The second chunk of the patch
+against compwindow.c disables damage notifications on move for
+manually redirected windows.  The automatic compositor needs damage
+notification on move, but a compositing manager doesn't.
+
 --- ./composite/compalloc.c.spiffiffity	2006-03-13 16:59:55.000000000 -0500
 +++ ./composite/compalloc.c	2006-04-12 16:37:50.000000000 -0400
 @@ -478,6 +478,7 @@


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- xorg-x11-server.spec	20 Jun 2006 00:07:34 -0000	1.90
+++ xorg-x11-server.spec	20 Jun 2006 01:05:12 -0000	1.91
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   17
+Release:   18
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -22,10 +22,11 @@
 Patch6:    xserver-1.0.1-randr-sdk.patch
 Patch7:	   xorg-x11-server-1.1.0-ppc64-build-fix.patch
 
-
-# Spiffiffity feature/optimization patches.
+# Spiffiffity/compiz feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
 Patch101:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
+Patch102:  xorg-x11-server-1.1.0-convolution-filter-fix.patch
+Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -294,6 +295,8 @@
 
 %patch100 -p0 -b .spiffiffity
 %patch101 -p0 -b .gl-include-inferiors
+%patch102 -p1 -b .convolution-filter-fix
+%patch103 -p0 -b .tfp-damage
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -605,6 +608,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-18
+- Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and
+  xorg-x11-server-1.1.0-tfp-damage.patch backported to make compiz go
+  faster and make compiz shadows work.
+
 * Mon Jun 19 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-17
 - Disable filling in monitor gamma info from EDID momentarily, since drivers
   will use that field to set the card's gamma ramp.



From fedora-cvs-commits at redhat.com  Tue Jun 20 01:06:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 21:06:55 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.91,1.92
Message-ID: <200606200106.k5K16tR3001084@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1065

Modified Files:
	nfs-utils.spec 
Log Message:
Added the nfs-utils-lib-devel >= 1.0.8-4 buildreq



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- nfs-utils.spec	20 Jun 2006 00:56:49 -0000	1.91
+++ nfs-utils.spec	20 Jun 2006 01:06:50 -0000	1.92
@@ -38,7 +38,7 @@
 Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9, nfs-utils-lib, pkgconfig
 BuildRequires: krb5-libs >= 1.4, autoconf >= 2.57, openldap-devel >= 2.2
-BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel
+BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel >= 1.0.8-4
 BuildRequires: pkgconfig
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin



From fedora-cvs-commits at redhat.com  Tue Jun 20 01:48:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 21:48:44 -0400
Subject: rpms/vte/devel vte-0.11.18-paste.patch, 1.1,
	NONE vte-0.12.0-real-transparency.patch, 1.1,
	NONE vte-0.13.1-mock.patch, 1.1, NONE
Message-ID: <200606200148.k5K1miPd014498@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13375

Removed Files:
	vte-0.11.18-paste.patch vte-0.12.0-real-transparency.patch 
	vte-0.13.1-mock.patch 
Log Message:
Remove upstreamed patches.



--- vte-0.11.18-paste.patch DELETED ---


--- vte-0.12.0-real-transparency.patch DELETED ---


--- vte-0.13.1-mock.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 01:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 21:52:32 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal-2.13.0-revert-98715.patch,
	1.1, NONE gnome-terminal-2.13.90-invisible-char.patch, 1.1,
	NONE gnome-terminal-2.13.90-link.patch, 1.1,
	NONE gnome-terminal-2.14.1-about.patch, 1.2, NONE
Message-ID: <200606200152.k5K1qWqo017564@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17514

Removed Files:
	gnome-terminal-2.13.0-revert-98715.patch 
	gnome-terminal-2.13.90-invisible-char.patch 
	gnome-terminal-2.13.90-link.patch 
	gnome-terminal-2.14.1-about.patch 
Log Message:
Remove unused patches.



--- gnome-terminal-2.13.0-revert-98715.patch DELETED ---


--- gnome-terminal-2.13.90-invisible-char.patch DELETED ---


--- gnome-terminal-2.13.90-link.patch DELETED ---


--- gnome-terminal-2.14.1-about.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 02:02:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 22:02:17 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.91,1.92
Message-ID: <200606200202.k5K22HBM020160@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20116

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-19
- Add with_xnest_server conditional and disable on s390, since Xnest
  fails to build on there (Xlib doesn't get added to the link line).



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xorg-x11-server.spec	20 Jun 2006 01:05:12 -0000	1.91
+++ xorg-x11-server.spec	20 Jun 2006 02:02:09 -0000	1.92
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   18
+Release:   19
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -59,11 +59,13 @@
 %define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
 %define with_hw_servers 1
 %define with_dmx_server 1
+%define with_xnest_server 1
 %endif
 %ifarch s390 s390x
-%define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
+%define xservers --disable-xorg --disable-dmx --enable-xvfb --disable-xnest --enable-kdrive --enable-xephyr
 %define with_hw_servers 0
 %define with_dmx_server 0
+%define with_xnest_server 0
 %endif
 
 # NOTE: The developer utils are intended for low level video driver hackers,
@@ -185,8 +187,9 @@
 graphical user interfaces (GUIs) such as GNOME and KDE are designed
 upon.
 %endif
-# ----- Xnest -------------------------------------------------------
 
+# ----- Xnest -------------------------------------------------------
+%if %{with_xnest_server}
 %package Xnest
 Summary: A nested server.
 Group: User Interface/X
@@ -203,6 +206,7 @@
 but it is an X server itself in which you can run other software.  It
 is a very useful tool for developers who wish to test their
 applications without running them on their real X server.
+%endif
 
 # ----- Xdmx --------------------------------------------------------
 %if %{with_dmx_server}
@@ -546,11 +550,13 @@
 
 # ----- Xnest -------------------------------------------------------
 
+%if %{with_xnest_server}
 %files Xnest
 %defattr(-,root,root,-)
 %{_bindir}/Xnest
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/Xnest.1x*
+%endif
 
 # ----- Xdmx --------------------------------------------------------
 
@@ -608,6 +614,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-19
+- Add with_xnest_server conditional and disable on s390, since Xnest
+  fails to build on there (Xlib doesn't get added to the link line).
+
 * Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-18
 - Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and
   xorg-x11-server-1.1.0-tfp-damage.patch backported to make compiz go



From fedora-cvs-commits at redhat.com  Tue Jun 20 02:07:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 22:07:29 -0400
Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.19,1.20
Message-ID: <200606200207.k5K27TP3020989@cvs.devel.redhat.com>

Author: lizhang

Update of /cvs/dist/rpms/ttmkfdir/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20864

Modified Files:
	ttmkfdir.spec 
Log Message:
add "BuildRequires: libtool" in ttmkfdir.spec



Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ttmkfdir.spec	19 Jun 2006 10:37:59 -0000	1.19
+++ ttmkfdir.spec	20 Jun 2006 02:07:25 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 20.1
+Release: 20.2
 Source0: %{name}-%{version}.tar.bz2
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
@@ -16,6 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: zlib-devel flex
+BuildRequires: libtool
 
 # ttmkfdir used to be in the following packages at one point
 Conflicts: XFree86-font-utils < 4.2.99.2-0.20021126.3
@@ -53,6 +54,9 @@
 %{_bindir}/ttmkfdir
 
 %changelog
+* Tue Jun 20 2006 Lingning Zhang <lizhang at redhat.com> - 3.0.9-20.2
+- add "BuildRequires: libtool" in ttmkfdir.spec
+
 * Mon Jun 19 2006 Lingning Zhang <lizhang at redhat.com> - 3.0.9-20.1
 - remove the modifying part of ttmkfdir-3.0.9/Makefile, recover the old Makefile
 - modify ttmkfdir-3.0.9-encoding-dir.patch about Makefile



From fedora-cvs-commits at redhat.com  Tue Jun 20 02:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 22:21:06 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.92,1.93
Message-ID: <200606200221.k5K2L61o006207@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6173

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-19
- Add with_xnest_server conditional and disable on s390, since Xnest
  fails to build on there (Xlib doesn't get added to the link line).
- Add -f to removal of xorgconfig and others which may or may not be built.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- xorg-x11-server.spec	20 Jun 2006 02:02:09 -0000	1.92
+++ xorg-x11-server.spec	20 Jun 2006 02:21:01 -0000	1.93
@@ -378,12 +378,12 @@
 
 # FIXME: Remove unwanted files/dirs
 {
-    rm $RPM_BUILD_ROOT%{_bindir}/xorgconfig
-    rm $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1*
-    rm $RPM_BUILD_ROOT%{_libdir}/X11/Cards
-    rm $RPM_BUILD_ROOT%{_libdir}/X11/Options
-    rm $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample
-    rm $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg
+    rm -f $RPM_BUILD_ROOT%{_bindir}/xorgconfig
+    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1*
+    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Cards
+    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options
+    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample
+    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg
 %if ! %{with_developer_utils}
     rm -f $RPM_BUILD_ROOT%{_bindir}/inb
     rm -f $RPM_BUILD_ROOT%{_bindir}/inl
@@ -617,6 +617,7 @@
 * Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-19
 - Add with_xnest_server conditional and disable on s390, since Xnest
   fails to build on there (Xlib doesn't get added to the link line).
+- Add -f to removal of xorgconfig and others which may or may not be built.
 
 * Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-18
 - Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and



From fedora-cvs-commits at redhat.com  Tue Jun 20 02:54:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 22:54:05 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.93,1.94
Message-ID: <200606200254.k5K2s5mY028590@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28547

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-20
- Remove with_xnest_server conditional, and fix more BuildRequires to pull
  in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- xorg-x11-server.spec	20 Jun 2006 02:21:01 -0000	1.93
+++ xorg-x11-server.spec	20 Jun 2006 02:54:01 -0000	1.94
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   19
+Release:   20
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -59,13 +59,11 @@
 %define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
 %define with_hw_servers 1
 %define with_dmx_server 1
-%define with_xnest_server 1
 %endif
 %ifarch s390 s390x
 %define xservers --disable-xorg --disable-dmx --enable-xvfb --disable-xnest --enable-kdrive --enable-xephyr
 %define with_hw_servers 0
 %define with_dmx_server 0
-%define with_xnest_server 0
 %endif
 
 # NOTE: The developer utils are intended for low level video driver hackers,
@@ -106,11 +104,19 @@
 BuildRequires: libfontenc-devel
 # Required for Xtst examples
 BuildRequires: libXtst-devel
-# libXdmcp-devel needed for Xdmx, and Xnest
+# libXdmcp-devel needed for Xdmx, Xnest, Xephyr
 BuildRequires: libXdmcp-devel
-# FIXME: Should be wrapped in with_dmx_server - for Xdmxconfig, probably
-# should only be needed for DMX builds, but the build explodes with a
-# bogus configure check failure if this is missing.
+# libX11-devel needed for Xdmx, Xnest, Xephyr
+BuildRequires: libX11-devel
+# libXext-devel needed for Xdmx, Xnest, Xephyr
+BuildRequires: libXext-devel
+#
+BuildRequires: freetype-devel >= 2.1.9-1
+BuildRequires: zlib-devel
+
+# FIXME: libXt-devel should be wrapped in with_dmx_server - for Xdmxconfig,
+# probably should only be needed for DMX builds, but the build explodes with
+# a bogus configure check failure if this is missing.
 BuildRequires: libXt-devel
 
 
@@ -119,10 +125,6 @@
 BuildRequires: libdmx-devel
 # libXmu-devel needed for Xdmx
 BuildRequires: libXmu-devel
-# libXext-devel needed for Xdmx
-BuildRequires: libXext-devel
-# libX11-devel needed for Xdmx
-BuildRequires: libX11-devel
 # libXrender-devel needed for Xdmx
 BuildRequires: libXrender-devel
 # libXi-devel needed for Xdmx
@@ -131,8 +133,6 @@
 BuildRequires: libXaw-devel
 %endif
 
-BuildRequires: freetype-devel >= 2.1.9-1
-
 # To query fontdir from fontutil.pc
 BuildRequires: xorg-x11-font-utils >= 1.0.0-1
 # Needed at least for DRI enabled builds
@@ -189,7 +189,6 @@
 %endif
 
 # ----- Xnest -------------------------------------------------------
-%if %{with_xnest_server}
 %package Xnest
 Summary: A nested server.
 Group: User Interface/X
@@ -206,7 +205,6 @@
 but it is an X server itself in which you can run other software.  It
 is a very useful tool for developers who wish to test their
 applications without running them on their real X server.
-%endif
 
 # ----- Xdmx --------------------------------------------------------
 %if %{with_dmx_server}
@@ -550,13 +548,11 @@
 
 # ----- Xnest -------------------------------------------------------
 
-%if %{with_xnest_server}
 %files Xnest
 %defattr(-,root,root,-)
 %{_bindir}/Xnest
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/Xnest.1x*
-%endif
 
 # ----- Xdmx --------------------------------------------------------
 
@@ -614,12 +610,16 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-19
+* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-20
+- Remove with_xnest_server conditional, and fix more BuildRequires to pull
+  in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.
+
+* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-19
 - Add with_xnest_server conditional and disable on s390, since Xnest
   fails to build on there (Xlib doesn't get added to the link line).
 - Add -f to removal of xorgconfig and others which may or may not be built.
 
-* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-18
+* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-18
 - Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and
   xorg-x11-server-1.1.0-tfp-damage.patch backported to make compiz go
   faster and make compiz shadows work.
@@ -645,17 +645,17 @@
   publish such a list yet.
 - Fix mouse autoconfig to use /dev/input/mice instead of /dev/mouse.
 
-* Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-14
+* Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-14
 - Change selection atom to _COMPIZ_GL_INCLUDE_INFERIORS in
   xorg-x11-server-1.1.0-gl-include-inferiors.patch.
 
-* Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 1.1.0-13
+* Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-13
 - put back my -fPIC patch, libxf86config isn't built with fPIC otherwise
 
 * Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-12
 - Add EDID mode autodetection.
 
-* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-11
+* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-11
 - Add xorg-x11-server-1.1.0-gl-include-inferiors.patch to let GL
   rendering include child windows.
 
@@ -666,7 +666,7 @@
 - --enable-xorg on ppc64 too.
 - Re-add cvt, got dropped somehow.
 
-* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-8
+* Fri Jun 09 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-8
 - Add our friend, libtool, to BuildRequires.
 
 * Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-7



From fedora-cvs-commits at redhat.com  Tue Jun 20 02:58:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 19 Jun 2006 22:58:33 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.94,1.95
Message-ID: <200606200258.k5K2wXug030080@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30038

Modified Files:
	xorg-x11-server.spec 
Log Message:
Re-enable Xnest on s390


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- xorg-x11-server.spec	20 Jun 2006 02:54:01 -0000	1.94
+++ xorg-x11-server.spec	20 Jun 2006 02:58:29 -0000	1.95
@@ -61,7 +61,7 @@
 %define with_dmx_server 1
 %endif
 %ifarch s390 s390x
-%define xservers --disable-xorg --disable-dmx --enable-xvfb --disable-xnest --enable-kdrive --enable-xephyr
+%define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
 %define with_hw_servers 0
 %define with_dmx_server 0
 %endif



From fedora-cvs-commits at redhat.com  Tue Jun 20 04:15:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 00:15:35 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta4-directory-cleanup.patch, NONE,
	1.1 autofs.spec, 1.108, 1.109
Message-ID: <200606200415.k5K4FZaw020111@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20100

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-directory-cleanup.patch 
Log Message:
* Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-14
- fix directory cleanup at exit.


autofs-5.0.0_beta4-directory-cleanup.patch:
 CHANGELOG          |    1 +
 daemon/automount.c |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

--- NEW FILE autofs-5.0.0_beta4-directory-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index d801858..ca28b79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
 - add export access list matching to "hosts" lookup module.
 - add check for key length to long (Jeff Moyer).
 - add patch to restrict /proc lookup to pid directories (Jeff Moyer).
+- fix directory cleanup at exit.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index ee69006..aeece1b 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1190,9 +1190,16 @@ static void mutex_operation_wait(pthread
 static void handle_mounts_cleanup(void *arg)
 {
 	struct autofs_point *ap;
+	char path[PATH_MAX + 1];
+	char buf[MAX_ERR_BUF];
 
 	ap = (struct autofs_point *) arg;
 
+	if (!ap->submount && strcmp(ap->path, "/-") && ap->dir_created)
+		strcpy(path, ap->path);
+	else
+		*path = '\0';
+
 	/* Make sure alarms are cleared */
 	alarm_delete(ap);
 
@@ -1211,6 +1218,14 @@ static void handle_mounts_cleanup(void *
 	if (master_list_empty(master))
 		kill(getpid(), SIGTERM);
 
+	if (*path) {
+		if (rmdir(path) == -1) {
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			warn(LOGOPT_NONE, "failed to remove dir %s: %s",
+			     path, estr);
+		}
+	}
+
 	return;
 }
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- autofs.spec	19 Jun 2006 09:10:11 -0000	1.108
+++ autofs.spec	20 Jun 2006 04:15:26 -0000	1.109
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 13
+%define release 14
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,7 @@
 Patch21: autofs-5.0.0_beta4-proc-pid-only.patch
 Patch22: autofs-5.0.0_beta4-bad-key-length-fix.patch
 Patch23: autofs-5.0.0_beta4-bad-key-length-fix-fix.patch
+Patch24: autofs-5.0.0_beta4-directory-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel
 Prereq: chkconfig
@@ -97,6 +98,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -152,7 +154,10 @@
 %{_libdir}/autofs/*
 
 %changelog
-* Mon Jun 19 2006 Ian Kent <jikent at redhat.com> - 5.0.0_beta4-13
+* Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-14
+- fix directory cleanup at exit.
+
+* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-13
 - Change LDAP message severity from crit to degug (bz# 183893).
 - Corrections to INSTALL and README.v5.release.
 - Add patch to fix segv on overlength map keys in file maps (Jeff Moter).



From fedora-cvs-commits at redhat.com  Tue Jun 20 04:28:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 00:28:43 -0400
Subject: rpms/autofs/devel .cvsignore, 1.10, 1.11 autofs.spec, 1.109,
 1.110 sources, 1.10, 1.11 autofs-5.0.0_beta4-bad-key-length-fix-fix.patch,
 1.1, NONE autofs-5.0.0_beta4-bad-key-length-fix.patch, 1.1,
 NONE autofs-5.0.0_beta4-bad-key-length.patch, 1.1,
 NONE autofs-5.0.0_beta4-context-init-error.patch, 1.1,
 NONE autofs-5.0.0_beta4-directory-cleanup.patch, 1.1,
 NONE autofs-5.0.0_beta4-dontstrip-typo.patch, 1.1,
 NONE autofs-5.0.0_beta4-expire-base-mount-fix.patch, 1.1,
 NONE autofs-5.0.0_beta4-exports-access-list.patch, 1.1,
 NONE autofs-5.0.0_beta4-map-update.patch, 1.1,
 NONE autofs-5.0.0_beta4-master-map-update.patch, 1.1,
 NONE autofs-5.0.0_beta4-master_parse-redeclare.patch, 1.1,
 NONE autofs-5.0.0_beta4-memory-leaks.patch, 1.1,
 NONE autofs-5.0.0_beta4-minor-doco.patch, 1.1,
 NONE autofs-5.0.0_beta4-misc-fixes-2.patch, 1.1,
 NONE autofs-5.0.0_beta4-misc-fixes.patch, 1.1,
 NONE autofs-5.0.0_beta4-module-load-to-init.patch, 1.1,
 NONE autofs-5.0.0_beta4-no-first-message.patch, 1.1,
 NONE autofs-5.0.0_beta4-offset-check-b!
 ase-mounted.patch, 1.1, NONE autofs-5.0.0_beta4-proc-pid-only.patch, 1.1,
 NONE autofs-5.0.0_beta4-program-map-offset-handling.patch, 1.1,
 NONE autofs-5.0.0_beta4-replicated-parse-lookup-fix.patch, 1.1,
 NONE autofs-5.0.0_beta4-sources-list-corruption.patch, 1.1,
 NONE autofs-5.0.0_beta4-v4-dir-cleanup.patch, 1.1,
 NONE autofs-5.0.0_beta4-wildcard-handling.patch, 1.1,
 NONE autofs-5.0.0_beta4-wrong-conf-names.patch, 1.1, NONE
Message-ID: <200606200428.k5K4ShFE002411@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2389

Modified Files:
	.cvsignore autofs.spec sources 
Removed Files:
	autofs-5.0.0_beta4-bad-key-length-fix-fix.patch 
	autofs-5.0.0_beta4-bad-key-length-fix.patch 
	autofs-5.0.0_beta4-bad-key-length.patch 
	autofs-5.0.0_beta4-context-init-error.patch 
	autofs-5.0.0_beta4-directory-cleanup.patch 
	autofs-5.0.0_beta4-dontstrip-typo.patch 
	autofs-5.0.0_beta4-expire-base-mount-fix.patch 
	autofs-5.0.0_beta4-exports-access-list.patch 
	autofs-5.0.0_beta4-map-update.patch 
	autofs-5.0.0_beta4-master-map-update.patch 
	autofs-5.0.0_beta4-master_parse-redeclare.patch 
	autofs-5.0.0_beta4-memory-leaks.patch 
	autofs-5.0.0_beta4-minor-doco.patch 
	autofs-5.0.0_beta4-misc-fixes-2.patch 
	autofs-5.0.0_beta4-misc-fixes.patch 
	autofs-5.0.0_beta4-module-load-to-init.patch 
	autofs-5.0.0_beta4-no-first-message.patch 
	autofs-5.0.0_beta4-offset-check-base-mounted.patch 
	autofs-5.0.0_beta4-proc-pid-only.patch 
	autofs-5.0.0_beta4-program-map-offset-handling.patch 
	autofs-5.0.0_beta4-replicated-parse-lookup-fix.patch 
	autofs-5.0.0_beta4-sources-list-corruption.patch 
	autofs-5.0.0_beta4-v4-dir-cleanup.patch 
	autofs-5.0.0_beta4-wildcard-handling.patch 
	autofs-5.0.0_beta4-wrong-conf-names.patch 
Log Message:
* Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-1
- promote to beta5.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Jun 2006 08:36:01 -0000	1.10
+++ .cvsignore	20 Jun 2006 04:28:39 -0000	1.11
@@ -1 +1 @@
-autofs-5.0.0_beta4.tar.bz2
+autofs-5.0.0_beta5.tar.bz2


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- autofs.spec	20 Jun 2006 04:15:26 -0000	1.109
+++ autofs.spec	20 Jun 2006 04:28:39 -0000	1.110
@@ -3,39 +3,14 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
-%define version 5.0.0_beta4
-%define release 14
+%define version 5.0.0_beta5
+%define release 1
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-Patch0: autofs-5.0.0_beta4-dontstrip-typo.patch
-Patch1: autofs-5.0.0_beta4-v4-dir-cleanup.patch
-Patch2: autofs-5.0.0_beta4-master-map-update.patch
-Patch3: autofs-5.0.0_beta4-wrong-conf-names.patch
-Patch4: autofs-5.0.0_beta4-offset-check-base-mounted.patch
-Patch5: autofs-5.0.0_beta4-replicated-parse-lookup-fix.patch
-Patch6: autofs-5.0.0_beta4-expire-base-mount-fix.patch
-Patch7: autofs-5.0.0_beta4-wildcard-handling.patch
-Patch8: autofs-5.0.0_beta4-master_parse-redeclare.patch
-Patch9: autofs-5.0.0_beta4-misc-fixes.patch
-Patch10: autofs-5.0.0_beta4-misc-fixes-2.patch
-Patch11: autofs-5.0.0_beta4-sources-list-corruption.patch
-Patch12: autofs-5.0.0_beta4-memory-leaks.patch
-Patch13: autofs-5.0.0_beta4-context-init-error.patch
-Patch14: autofs-5.0.0_beta4-map-update.patch
-Patch15: autofs-5.0.0_beta4-program-map-offset-handling.patch
-Patch16: autofs-5.0.0_beta4-module-load-to-init.patch
-Patch17: autofs-5.0.0_beta4-exports-access-list.patch
-Patch18: autofs-5.0.0_beta4-no-first-message.patch
-Patch19: autofs-5.0.0_beta4-minor-doco.patch
-Patch20: autofs-5.0.0_beta4-bad-key-length.patch
-Patch21: autofs-5.0.0_beta4-proc-pid-only.patch
-Patch22: autofs-5.0.0_beta4-bad-key-length-fix.patch
-Patch23: autofs-5.0.0_beta4-bad-key-length-fix-fix.patch
-Patch24: autofs-5.0.0_beta4-directory-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel
 Prereq: chkconfig
@@ -74,31 +49,6 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -154,6 +104,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-1
+- promote to beta5.
+
 * Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-14
 - fix directory cleanup at exit.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Jun 2006 08:36:01 -0000	1.10
+++ sources	20 Jun 2006 04:28:39 -0000	1.11
@@ -1 +1 @@
-26c381cd0cf38f1949ee618d8070a118  autofs-5.0.0_beta4.tar.bz2
+fbdf7e31ed624dbabe88fed2f56b5e70  autofs-5.0.0_beta5.tar.bz2


--- autofs-5.0.0_beta4-bad-key-length-fix-fix.patch DELETED ---


--- autofs-5.0.0_beta4-bad-key-length-fix.patch DELETED ---


--- autofs-5.0.0_beta4-bad-key-length.patch DELETED ---


--- autofs-5.0.0_beta4-context-init-error.patch DELETED ---


--- autofs-5.0.0_beta4-directory-cleanup.patch DELETED ---


--- autofs-5.0.0_beta4-dontstrip-typo.patch DELETED ---


--- autofs-5.0.0_beta4-expire-base-mount-fix.patch DELETED ---


--- autofs-5.0.0_beta4-exports-access-list.patch DELETED ---


--- autofs-5.0.0_beta4-map-update.patch DELETED ---


--- autofs-5.0.0_beta4-master-map-update.patch DELETED ---


--- autofs-5.0.0_beta4-master_parse-redeclare.patch DELETED ---


--- autofs-5.0.0_beta4-memory-leaks.patch DELETED ---


--- autofs-5.0.0_beta4-minor-doco.patch DELETED ---


--- autofs-5.0.0_beta4-misc-fixes-2.patch DELETED ---


--- autofs-5.0.0_beta4-misc-fixes.patch DELETED ---


--- autofs-5.0.0_beta4-module-load-to-init.patch DELETED ---


--- autofs-5.0.0_beta4-no-first-message.patch DELETED ---


--- autofs-5.0.0_beta4-offset-check-base-mounted.patch DELETED ---


--- autofs-5.0.0_beta4-proc-pid-only.patch DELETED ---


--- autofs-5.0.0_beta4-program-map-offset-handling.patch DELETED ---


--- autofs-5.0.0_beta4-replicated-parse-lookup-fix.patch DELETED ---


--- autofs-5.0.0_beta4-sources-list-corruption.patch DELETED ---


--- autofs-5.0.0_beta4-v4-dir-cleanup.patch DELETED ---


--- autofs-5.0.0_beta4-wildcard-handling.patch DELETED ---


--- autofs-5.0.0_beta4-wrong-conf-names.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 04:43:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 00:43:22 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.95,1.96
Message-ID: <200606200443.k5K4hMax013419@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13378

Modified Files:
	xorg-x11-server.spec 
Log Message:
Temporarily fry files on s390/s390x for now that are holding up build.  We can fix that later.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- xorg-x11-server.spec	20 Jun 2006 02:58:29 -0000	1.95
+++ xorg-x11-server.spec	20 Jun 2006 04:43:02 -0000	1.96
@@ -394,6 +394,25 @@
 %endif
     # Remove all libtool archives (*.la)
     find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+
+%ifarch s390 s390x
+    # FIXME: The following files get installed on s390/s390x and we don't
+    # want some of them on s390 at all, and others should be in a -common
+    # subpackage, but it's not worth doing that for 3 files right now.
+#    error: Installed (but unpackaged) file(s) found:
+#	   /randrstr.h
+#	   /usr/lib/pkgconfig/xorg-server.pc
+#	      /usr/lib/xserver/SecurityPolicy
+#	      /usr/share/aclocal/xorg-server.m4
+#	      /usr/share/man/man1/Xserver.1x.gz
+#	      /var/lib/xkb/README.compiled
+    rm -f $RPM_BUILD_ROOT/randrstr.h
+    rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+    rm -rf $RPM_BUILD_ROOT%{_libdir}/xserver
+    rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
+    rm -f $RPM_BUILD_ROOT%{_datadir}/Xserver.1x*
+    rm -rf $RPM_BUILD_ROOT/var/lib/xkb
+%endif
 }
 
 %clean
@@ -613,6 +632,7 @@
 * Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-20
 - Remove with_xnest_server conditional, and fix more BuildRequires to pull
   in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.
+- Remove unwanted files leftover in buildroot for s390/s390x builds.
 
 * Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-19
 - Add with_xnest_server conditional and disable on s390, since Xnest



From fedora-cvs-commits at redhat.com  Tue Jun 20 04:51:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 00:51:06 -0400
Subject: rpms/anthy/devel .cvsignore, 1.17, 1.18 anthy.spec, 1.28,
	1.29 sources, 1.17, 1.18
Message-ID: <200606200451.k5K4p65G022684@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22452

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Tue Jun 20 2006 Akira TAGOH <tagoh at redhat.com> - 7818-1
- New upstream snapshot release.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	12 Jun 2006 05:23:12 -0000	1.17
+++ .cvsignore	20 Jun 2006 04:50:52 -0000	1.18
@@ -20,3 +20,4 @@
 anthy-7716.tar.gz
 anthy-7802.tar.gz
 anthy-7811.tar.gz
+anthy-7818.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- anthy.spec	12 Jun 2006 05:23:12 -0000	1.28
+++ anthy.spec	20 Jun 2006 04:50:53 -0000	1.29
@@ -1,4 +1,4 @@
-%define	version		7811
+%define	version		7818
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
@@ -127,6 +127,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Akira TAGOH <tagoh at redhat.com> - 7818-1
+- New upstream snapshot release.
+
 * Mon Jun 12 2006 Akira TAGOH <tagoh at redhat.com> - 7811-1
 - New upstream snapshot release.
 - use make install DESTDIR=... instead of %%makeinstall.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	12 Jun 2006 05:23:12 -0000	1.17
+++ sources	20 Jun 2006 04:50:53 -0000	1.18
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-e3619c07bd175ce5f73d67388c0c2ea5  anthy-7811.tar.gz
+7795230af52b2abf3e7cb7e67911298e  anthy-7818.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 20 04:56:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 00:56:10 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.96,1.97
Message-ID: <200606200456.k5K4uACG029699@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29660

Modified Files:
	xorg-x11-server.spec 
Log Message:
Argh.  Ok, install manpage to multiple subpackages to shut up rpmbuild.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- xorg-x11-server.spec	20 Jun 2006 04:43:02 -0000	1.96
+++ xorg-x11-server.spec	20 Jun 2006 04:56:00 -0000	1.97
@@ -410,8 +410,8 @@
     rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
     rm -rf $RPM_BUILD_ROOT%{_libdir}/xserver
     rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
-    rm -f $RPM_BUILD_ROOT%{_datadir}/Xserver.1x*
     rm -rf $RPM_BUILD_ROOT/var/lib/xkb
+#    rm -f $RPM_BUILD_ROOT%{_datadir}/man/man1/Xserver.1x*
 %endif
 }
 
@@ -572,6 +572,8 @@
 %{_bindir}/Xnest
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/Xnest.1x*
+# NOTE: Xserver.1x intentionally present in multiple subpackages
+%{_mandir}/man1/Xserver.1x*
 
 # ----- Xdmx --------------------------------------------------------
 
@@ -595,6 +597,8 @@
 %{_mandir}/man1/dmxtodmx.1x*
 %{_mandir}/man1/vdltodmx.1x*
 %{_mandir}/man1/xdmxconfig.1x*
+# NOTE: Xserver.1x intentionally present in multiple subpackages
+%{_mandir}/man1/Xserver.1x*
 %endif
 
 # ----- Xvfb --------------------------------------------------------
@@ -604,6 +608,8 @@
 %{_bindir}/Xvfb
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/Xvfb.1x*
+# NOTE: Xserver.1x intentionally present in multiple subpackages
+%{_mandir}/man1/Xserver.1x*
 
 # ----- Xephyr -------------------------------------------------------
 
@@ -613,6 +619,8 @@
 # no manpage yet
 #%dir %{_mandir}/man1x
 #%{_mandir}/man1/Xephyr.1x*
+# NOTE: Xserver.1x intentionally present in multiple subpackages
+%{_mandir}/man1/Xserver.1x*
 
 # ----- sdk ---------------------------------------------------------
 %if %{with_hw_servers}
@@ -633,6 +641,8 @@
 - Remove with_xnest_server conditional, and fix more BuildRequires to pull
   in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.
 - Remove unwanted files leftover in buildroot for s390/s390x builds.
+- Add Xserver.1x manpage to multiple subpackages, as it applies equally to
+  Xorg, Xnest, Xvfb, Xephyr.
 
 * Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-19
 - Add with_xnest_server conditional and disable on s390, since Xnest



From fedora-cvs-commits at redhat.com  Tue Jun 20 06:33:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 02:33:59 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2293,
	1.2294 linux-2.6-debug-periodic-slab-check.patch, 1.5,
	1.6 linux-2.6-debug-latency-tracing.patch, 1.11, NONE
Message-ID: <200606200633.k5K6XxdW003495@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3441

Modified Files:
	kernel-2.6.spec linux-2.6-debug-periodic-slab-check.patch 
Removed Files:
	linux-2.6-debug-latency-tracing.patch 
Log Message:
drop unused debug patch
resurrect periodic slab debug



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293
retrieving revision 1.2294
diff -u -r1.2293 -r1.2294
--- kernel-2.6.spec	18 Jun 2006 04:35:30 -0000	1.2293
+++ kernel-2.6.spec	20 Jun 2006 06:33:53 -0000	1.2294
@@ -338,10 +338,9 @@
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
 Patch1029: linux-2.6-debug-account-kmalloc.patch
-Patch1030: linux-2.6-debug-latency-tracing.patch
-Patch1031: linux-2.6-debug-periodic-slab-check.patch
-Patch1032: linux-2.6-debug-boot-delay.patch
-Patch1033: linux-2.6-debug-must_check.patch
+Patch1030: linux-2.6-debug-periodic-slab-check.patch
+Patch1031: linux-2.6-debug-boot-delay.patch
+Patch1032: linux-2.6-debug-must_check.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -898,10 +897,9 @@
 # Pause on oops.
 #%patch1028 -p1
 #%patch1029 -p1
-#%patch1030 -p1
-#%patch1031 -p1
+%patch1030 -p1
+%patch1031 -p1
 %patch1032 -p1
-%patch1033 -p1
 
 #
 # Make /dev/mem a need-to-know function

linux-2.6-debug-periodic-slab-check.patch:
 slab.c |  132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 129 insertions(+), 3 deletions(-)

Index: linux-2.6-debug-periodic-slab-check.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-periodic-slab-check.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-periodic-slab-check.patch	22 Mar 2006 23:59:59 -0000	1.5
+++ linux-2.6-debug-periodic-slab-check.patch	20 Jun 2006 06:33:55 -0000	1.6
@@ -6,15 +6,15 @@
 ===================================================================
 --- 2.6-git.orig/mm/slab.c
 +++ 2.6-git/mm/slab.c
-@@ -202,7 +202,7 @@
+@@ -203,7 +203,7 @@
  
  typedef unsigned int kmem_bufctl_t;
  #define BUFCTL_END	(((kmem_bufctl_t)(~0U))-0)
 -#define BUFCTL_FREE	(((kmem_bufctl_t)(~0U))-1)
 +#define BUFCTL_ALLOC	(((kmem_bufctl_t)(~0U))-1)
- #define	SLAB_LIMIT	(((kmem_bufctl_t)(~0U))-2)
+ #define	BUFCTL_ACTIVE	(((kmem_bufctl_t)(~0U))-2)
+ #define	SLAB_LIMIT	(((kmem_bufctl_t)(~0U))-3)
  
- /* Max number of objs-per-slab for caches which use off-slab slabs.
 @@ -430,6 +430,11 @@ struct kmem_cache {
  	 */
  	int obj_offset;
@@ -56,15 +56,15 @@
  	WARN_ON(slabp->nodeid != nodeid);
  #endif
  	slabp->free = next;
-@@ -2268,7 +2279,7 @@ static void slab_put_obj(struct kmem_cac
- 	/* Verify that the slab belongs to the intended node */
- 	WARN_ON(slabp->nodeid != nodeid);
- 
--	if (slab_bufctl(slabp)[objnr] != BUFCTL_FREE) {
-+	if (slab_bufctl(slabp)[objnr] != BUFCTL_ALLOC) {
- 		printk(KERN_ERR "slab: double free detected in cache "
- 		       "'%s', objp %p\n", cachep->name, objp);
- 		BUG();
+@@ -2690,7 +2690,7 @@ static void *cache_free_debugcheck(struc
+ 		cachep->dtor(objp + obj_offset(cachep), cachep, 0);
+ 	}
+ #ifdef CONFIG_DEBUG_SLAB_LEAK
+-	slab_bufctl(slabp)[objnr] = BUFCTL_FREE;
++	slab_bufctl(slabp)[objnr] = BUFCTL_ALLOC;
+ #endif
+ 	if (cachep->flags & SLAB_POISON) {
+ #ifdef CONFIG_DEBUG_PAGEALLOC
 @@ -3266,6 +3277,114 @@ static int alloc_kmemlist(struct kmem_ca
  	return err;
  }
@@ -194,3 +194,4 @@
  		/*
  		 * These are racy checks but it does not matter
  		 * if we skip one check or scan twice.
+


--- linux-2.6-debug-latency-tracing.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 07:34:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 03:34:57 -0400
Subject: rpms/scim/FC-5 factory-menu-singlet-submenus-187027.patch, NONE,
	1.1 scim.spec, 1.33, 1.34
Message-ID: <200606200734.k5K7YvbJ021523@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21491

Modified Files:
	scim.spec 
Added Files:
	factory-menu-singlet-submenus-187027.patch 
Log Message:
- use _host not _target_platform for update-gtk-immodules in scripts (#195763)
  - update scim-libs prereq to gtk2 > 2.8.19
- make scim explicitly require scim-libs with same ver-rel
- backport factory-menu-singlet-submenus-187027.patch to avoid having language
  submenus with a single IME


factory-menu-singlet-submenus-187027.patch:
 scim_panel_gtk.cpp |   59 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 42 insertions(+), 17 deletions(-)

--- NEW FILE factory-menu-singlet-submenus-187027.patch ---
2006-06-05  Jens Petersen  <petersen at redhat.com>

	* extras/panel/scim_panel_gtk.cpp (slot_show_factory_menu): Change
	the menu to put a single factory for a language on the main menu.
	Add variables `engines', `lang', `ime' and `text'.  `engines'
	holds number of factories for `lang'.  `ime' is the factory name.
	Label factories of miscellaneous `lang' with just the `ime' name.
	Add a tooltip to main menu entries with the `ime' name.


Index: extras/panel/scim_panel_gtk.cpp
===================================================================
RCS file: /cvsroot/scim/scim/extras/panel/scim_panel_gtk.cpp,v
retrieving revision 1.118.2.6
diff -u -r1.118.2.6 scim_panel_gtk.cpp
--- extras/panel/scim_panel_gtk.cpp	16 Feb 2006 05:49:54 -0000	1.118.2.6
+++ extras/panel/scim_panel_gtk.cpp	5 Jun 2006 11:18:11 -0000
@@ -2561,27 +2563,52 @@
         GtkWidget *menu_item;
         GtkWidget *icon_image;
         gint width, height;
+	int engines;
+	String lang, ime, text;
 
         gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
 
         for (MapStringVectorSizeT::iterator it = groups.begin (); it != groups.end (); ++ it) {
-            menu_item = gtk_menu_item_new_with_label (scim_get_language_name (it->first).c_str ());
-            submenu = gtk_menu_new ();
-            for (i = 0; i < it->second.size (); ++i) {
-                submenu_item = gtk_image_menu_item_new_with_label (menu [it->second [i]].name.c_str ());
-                icon_image = ui_create_icon (menu [it->second [i]].icon, NULL, width, height, false);
-
-                if (icon_image)
-                    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (submenu_item), icon_image);
-
-                gtk_menu_shell_append (GTK_MENU_SHELL (submenu), submenu_item);
-                g_signal_connect (G_OBJECT (submenu_item), "activate",
-                                  G_CALLBACK (ui_factory_menu_activate_cb),
-                                  GINT_TO_POINTER ((int)it->second [i]));
-                gtk_widget_show (submenu_item);
-            }
-            gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
-            gtk_widget_show (submenu);
+	    engines = (it->second.size ());
+	    if (engines == 1) {
+	        lang = it->first;
+		ime = menu [it->second [0]].name;
+		if (lang == "C" || lang == "~other")
+		    text = ime;
+		else
+		    text = scim_get_language_name (lang);
+		menu_item = gtk_image_menu_item_new_with_label (text.c_str ());
+
+		icon_image = ui_create_icon (menu [it->second [0]].icon, NULL, width, height, false);
+		if (icon_image)
+		    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), icon_image);
+	      
+		gtk_tooltips_set_tip (_tooltips, menu_item, ime.c_str (), NULL);
+
+		g_signal_connect (G_OBJECT (menu_item), "activate",
+				  G_CALLBACK (ui_factory_menu_activate_cb),
+				  GINT_TO_POINTER ((int)it->second [0]));
+		gtk_widget_show (menu_item);
+	    }
+	    else  {
+	        menu_item = gtk_menu_item_new_with_label (scim_get_language_name (it->first).c_str ());
+		submenu = gtk_menu_new ();
+		for (i = 0; i < engines; ++i) {
+		    submenu_item = gtk_image_menu_item_new_with_label (menu [it->second [i]].name.c_str ());
+
+		    icon_image = ui_create_icon (menu [it->second [i]].icon, NULL, width, height, false);
+		    if (icon_image)
+		        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (submenu_item), icon_image);
+
+		    gtk_menu_shell_append (GTK_MENU_SHELL (submenu), submenu_item);
+		    g_signal_connect (G_OBJECT (submenu_item), "activate",
+				      G_CALLBACK (ui_factory_menu_activate_cb),
+				      GINT_TO_POINTER ((int)it->second [i]));
+		    gtk_widget_show (submenu_item);
+		}
+		gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
+		gtk_widget_show (submenu);
+	    }
             gtk_menu_shell_append (GTK_MENU_SHELL (_factory_menu), menu_item);
             gtk_widget_show (menu_item);
         }


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- scim.spec	13 Jun 2006 12:01:32 -0000	1.33
+++ scim.spec	20 Jun 2006 07:34:55 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   9.4.fc5
+Release:   9.5.fc5
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -20,6 +20,7 @@
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
+Requires:  %{name}-libs = %{version}-%{release}
 PreReq:    %{_sbindir}/alternatives
 Obsoletes: iiimf-gtk <= 1:12.2, iiimf-gnome-im-switcher <= 1:12.2, iiimf-server <= 1:12.2, iiimf-x <= 1:12.2
 # fc5 scim-qtimm causes kde apps to crash
@@ -30,6 +31,7 @@
 Patch4:    scim.pc-versioned-moduledir-179706.patch
 Patch5:    scim-panjabi-punjabi.patch
 Patch6:    scim-system-default-config.patch
+Patch7:    factory-menu-singlet-submenus-187027.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -61,7 +63,7 @@
 Summary:    Smart Common Input Method libraries
 Group:      System Environment/Libraries
 # for update-gtk-immodules
-PreReq:     gtk2 > 2.8
+PreReq:     gtk2 > 2.8.19
 %if %{with_libstdc_preview}
 PreReq:     libstdc++so7
 %endif
@@ -79,6 +81,7 @@
 %patch4 -p1 -b .4-moduledir
 %patch5 -p0 -b .5-panjabi
 %patch6 -p1 -b .6-config
+%patch7 -p0 -b .7-submenu
 
 # patch1 touches configure.ac and src/Makefile.am
 autoreconf
@@ -106,7 +109,7 @@
 %if %{with_libstdc_preview}
 export CXX=%{_bindir}/g++-libstdc++-so_7
 %endif
-make DESTDIR=${RPM_BUILD_ROOT} install
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 # to be deprecated after FC5
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
@@ -125,7 +128,7 @@
 # remove capplet
 rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
 
-# install xinput config file.
+# install xinput config file
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
 install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
 
@@ -148,7 +151,7 @@
 
 %post libs
 /sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_target_platform}
+%{_bindir}/update-gtk-immodules %{_host}
 
 
 %postun
@@ -160,9 +163,10 @@
    done
 fi
 
+
 %postun libs
 /sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_target_platform}
+%{_bindir}/update-gtk-immodules %{_host}
 
 
 %files -f %{name}.lang
@@ -178,6 +182,7 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-scim-setup.desktop
 
+
 %files devel
 %defattr(-,root,root,-)
 %doc docs/developers
@@ -185,10 +190,12 @@
 %{_libdir}/libscim*.so
 %{_libdir}/pkgconfig/*.pc
 
+
 %files doc
 %defattr(-,root,root,-)
 %doc docs/html
 
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libscim-*.so.*
@@ -197,8 +204,15 @@
 
 
 %changelog
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.5.fc5
+- use _host not _target_platform for update-gtk-immodules in scripts (#195763)
+  - update scim-libs prereq to gtk2 > 2.8.19
+- make scim explicitly require scim-libs with same ver-rel
+- backport factory-menu-singlet-submenus-187027.patch to avoid having language
+  submenus with a single IME
+
 * Tue Jun 13 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.4.fc5
-- update libtool tweak for libsrdc++so7 to handle gcc-4.1.x (#194935)
+- update libstdc++so7 libtool tweak to handle gcc-4.1.x (#194561)
 
 * Tue Jun  6 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.3.fc5
 - obsolete scim-qtimm to avoid KDE apps crashing (#192471)



From fedora-cvs-commits at redhat.com  Tue Jun 20 07:57:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 03:57:23 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.10,
	1.11 glibc-kernheaders.spec, 1.149, 1.150 sources, 1.51, 1.52
Message-ID: <200606200757.k5K7vN7Q020800@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20778

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
update to 2.6.17, fix sparc, add alpha


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Jun 2006 13:27:10 -0000	1.10
+++ .cvsignore	20 Jun 2006 07:57:20 -0000	1.11
@@ -1 +1 @@
-glibc-kernheaders-2.6.16-1.2282_FC6.tar.bz2
+glibc-kernheaders-2.6.17-1.2294_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- glibc-kernheaders.spec	14 Jun 2006 13:27:10 -0000	1.149
+++ glibc-kernheaders.spec	20 Jun 2006 07:57:20 -0000	1.150
@@ -1,9 +1,9 @@
-%define KVER 2.6.16-1.2282_FC6
+%define KVER 2.6.17-1.2294_FC6
 
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 42
+Release: 43
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -40,6 +40,8 @@
 tar -cf -  usr | tar -xf - -C $RPM_BUILD_ROOT
 pushd $RPM_BUILD_ROOT/usr/include
 %define keepdirs asm-generic
+%define asmdir asm-%{_target_cpu}
+
 %ifarch x86_64
 %define keepdirs asm-i386|asm-x86_64|asm-generic
 %define asmdir asm-bix86
@@ -47,12 +49,9 @@
 %ifarch ppc ppc64
 %define asmdir asm-powerpc
 %endif
-%ifarch s390 s390x
+%ifarch s390x
 %define asmdir asm-s390
 %endif
-%ifarch i386 ia64 alpha
-%define asmdir asm-%{_target_cpu}
-%endif
 %ifarch sparc sparc64
 %define asmdir asm-bisparc
 %define keepdirs asm-sparc*|asm-generic
@@ -109,6 +108,10 @@
 /usr/include/*
 
 %changelog
+* Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-43
+- 2.6.17
+- Update SPARC headers according to DaveM's list, add Alpha
+
 * Wed Jun 14 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-42
 - Update to 2.6.16-1.2282_FC6; fix asm-s390/posix_types.h (was #194891)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Jun 2006 13:27:10 -0000	1.51
+++ sources	20 Jun 2006 07:57:20 -0000	1.52
@@ -1 +1 @@
-f11cc45ed03d85ebafef58d2f377818a  glibc-kernheaders-2.6.16-1.2282_FC6.tar.bz2
+6cea59704738bab3c11495ac1df7c19f  glibc-kernheaders-2.6.17-1.2294_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 20 08:00:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 04:00:01 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.150,1.151
Message-ID: <200606200800.k5K801dO021869@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21838

Modified Files:
	glibc-kernheaders.spec 
Log Message:
grrrrrr. fscking brew


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- glibc-kernheaders.spec	20 Jun 2006 07:57:20 -0000	1.150
+++ glibc-kernheaders.spec	20 Jun 2006 07:59:59 -0000	1.151
@@ -3,7 +3,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 43
+Release: 44
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -108,6 +108,9 @@
 /usr/include/*
 
 %changelog
+* Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-44
+- Argh. Fscking brew.
+
 * Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-43
 - 2.6.17
 - Update SPARC headers according to DaveM's list, add Alpha



From fedora-cvs-commits at redhat.com  Tue Jun 20 09:06:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 05:06:00 -0400
Subject: rpms/scim/FC-5 scim.spec,1.34,1.35
Message-ID: <200606200906.k5K960IK004179@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3977

Modified Files:
	scim.spec 
Log Message:
update scim-libs prereq to gtk2 >= 2.8.19 (not >)



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- scim.spec	20 Jun 2006 07:34:55 -0000	1.34
+++ scim.spec	20 Jun 2006 09:05:57 -0000	1.35
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   9.5.fc5
+Release:   9.6.fc5
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -63,7 +63,7 @@
 Summary:    Smart Common Input Method libraries
 Group:      System Environment/Libraries
 # for update-gtk-immodules
-PreReq:     gtk2 > 2.8.19
+PreReq:     gtk2 >= 2.8.19
 %if %{with_libstdc_preview}
 PreReq:     libstdc++so7
 %endif
@@ -204,9 +204,9 @@
 
 
 %changelog
-* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.5.fc5
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.6.fc5
 - use _host not _target_platform for update-gtk-immodules in scripts (#195763)
-  - update scim-libs prereq to gtk2 > 2.8.19
+  - update scim-libs prereq to gtk2 >= 2.8.19
 - make scim explicitly require scim-libs with same ver-rel
 - backport factory-menu-singlet-submenus-187027.patch to avoid having language
   submenus with a single IME



From fedora-cvs-commits at redhat.com  Tue Jun 20 09:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 05:11:30 -0400
Subject: rpms/gcc/devel gcc41-pr26559.patch,NONE,1.1 gcc41.spec,1.75,1.76
Message-ID: <200606200911.k5K9BUtp005322@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5265

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr26559.patch 
Log Message:
4.1.1-5

gcc41-pr26559.patch:
 0 files changed

--- NEW FILE gcc41-pr26559.patch ---
2006-06-14  Mark Mitchell  <mark at codesourcery.com>

	PR c++/26559
	* c-common.h (c_finish_omp_atomic): Adjust declaration.
	* c-omp.c (c_finish_omp_atomic): Return the expression to perform,
	rather than calling add_stmt on it.
	* c-parser.c (c_parser_omp_atomic): Adjust accordingly.

	* pt.c (tsubst_expr): Use finish_omp_atomic.
	* semantics.c (finish_omp_atomic): Rework to use standard
	paradigms for handling non-dependent expressions.

	* g++.dg/gomp/tpl-atomic-2.C: Remove XFAIL.
	
--- gcc/c-omp.c	(revision 114664)
+++ gcc/c-omp.c	(revision 114665)
@@ -82,15 +82,18 @@ c_finish_omp_barrier (void)
 
 
 /* Complete a #pragma omp atomic construct.  The expression to be 
-   implemented atomically is LHS code= RHS.  */
+   implemented atomically is LHS code= RHS.  The value returned is
+   either error_mark_node (if the construct was erroneous) or an
+   OMP_ATOMIC node which should be added to the current statement tree
+   with add_stmt.  */
 
-void
+tree
 c_finish_omp_atomic (enum tree_code code, tree lhs, tree rhs)
 {
   tree x, type, addr;
 
   if (lhs == error_mark_node || rhs == error_mark_node)
-    return;
+    return error_mark_node;
 
   /* ??? According to one reading of the OpenMP spec, complex type are
      supported, but there are no atomic stores for any architecture.
@@ -102,7 +105,7 @@ c_finish_omp_atomic (enum tree_code code
       && !SCALAR_FLOAT_TYPE_P (type))
     {
       error ("invalid expression type for %<#pragma omp atomic%>");
-      return;
+      return error_mark_node;
     }
 
   /* ??? Validate that rhs does not overlap lhs.  */
@@ -111,7 +114,7 @@ c_finish_omp_atomic (enum tree_code code
      via indirection.  */
   addr = build_unary_op (ADDR_EXPR, lhs, 0);
   if (addr == error_mark_node)
-    return;
+    return error_mark_node;
   addr = save_expr (addr);
   lhs = build_indirect_ref (addr, NULL);
 
@@ -120,12 +123,12 @@ c_finish_omp_atomic (enum tree_code code
      to do this, and then take it apart again.  */
   x = build_modify_expr (lhs, code, rhs);
   if (x == error_mark_node)
-    return;
+    return error_mark_node;
   gcc_assert (TREE_CODE (x) == MODIFY_EXPR);  
   rhs = TREE_OPERAND (x, 1);
 
   /* Punt the actual generation of atomic operations to common code.  */
-  add_stmt (build2 (OMP_ATOMIC, void_type_node, addr, rhs));
+  return build2 (OMP_ATOMIC, void_type_node, addr, rhs);
 }
 
 
--- gcc/c-common.h	(revision 114664)
+++ gcc/c-common.h	(revision 114665)
@@ -948,7 +948,7 @@ extern tree c_finish_omp_master (tree);
 extern tree c_finish_omp_critical (tree, tree);
 extern tree c_finish_omp_ordered (tree);
 extern void c_finish_omp_barrier (void);
-extern void c_finish_omp_atomic (enum tree_code, tree, tree);
+extern tree c_finish_omp_atomic (enum tree_code, tree, tree);
 extern void c_finish_omp_flush (void);
 extern tree c_finish_omp_for (location_t, tree, tree, tree, tree, tree, tree);
 extern void c_split_parallel_clauses (tree, tree *, tree *);
--- gcc/c-parser.c	(revision 114664)
+++ gcc/c-parser.c	(revision 114665)
@@ -7214,6 +7214,7 @@ static void
 c_parser_omp_atomic (c_parser *parser)
 {
   tree lhs, rhs;
+  tree stmt;
   enum tree_code code;
 
   c_parser_skip_to_pragma_eol (parser);
@@ -7280,7 +7281,9 @@ c_parser_omp_atomic (c_parser *parser)
       rhs = c_parser_expression (parser).value;
       break;
     }
-  c_finish_omp_atomic (code, lhs, rhs);
+  stmt = c_finish_omp_atomic (code, lhs, rhs);
+  if (stmt != error_mark_node)
+    add_stmt (stmt);
   c_parser_skip_until_found (parser, CPP_SEMICOLON, "expected %<;%>");
 }
 
--- gcc/cp/pt.c	(revision 114664)
+++ gcc/cp/pt.c	(revision 114665)
@@ -8546,10 +8546,7 @@ tsubst_expr (tree t, tree args, tsubst_f
 	tree op0, op1;
 	op0 = tsubst_expr (TREE_OPERAND (t, 0), args, complain, in_decl);
 	op1 = tsubst_expr (TREE_OPERAND (t, 1), args, complain, in_decl);
-	if (OMP_ATOMIC_DEPENDENT_P (t))
-	  c_finish_omp_atomic (OMP_ATOMIC_CODE (t), op0, op1);
-	else
-	  add_stmt (build2 (OMP_ATOMIC, void_type_node, op0, op1));
+	finish_omp_atomic (OMP_ATOMIC_CODE (t), op0, op1);
       }
       break;
 
--- gcc/cp/semantics.c	(revision 114670)
+++ gcc/cp/semantics.c	(revision 114671)
@@ -3834,24 +3834,41 @@ finish_omp_for (location_t locus, tree d
 void
 finish_omp_atomic (enum tree_code code, tree lhs, tree rhs)
 {
-  /* If either of the operands are dependent, we can't do semantic
-     processing yet.  Stuff the values away for now.  We cheat a bit
-     and use the same tree code for this, even though the operands
-     are of totally different form, thus we need to remember which
-     statements are which, thus the lang_flag bit.  */
-  /* ??? We ought to be using type_dependent_expression_p, but the
-     invocation of build_modify_expr in c_finish_omp_atomic can result
-     in the creation of CONVERT_EXPRs, which are not handled by
-     tsubst_copy_and_build.  */
-  if (uses_template_parms (lhs) || uses_template_parms (rhs))
+  tree orig_lhs;
+  tree orig_rhs;
+  bool dependent_p;
+  tree stmt;
+
+  orig_lhs = lhs;
+  orig_rhs = rhs;
+  dependent_p = false;
+  stmt = NULL_TREE;
+
+  /* Even in a template, we can detect invalid uses of the atomic
+     pragma if neither LHS nor RHS is type-dependent.  */
+  if (processing_template_decl)
     {
-      tree stmt = build2 (OMP_ATOMIC, void_type_node, lhs, rhs);
+      dependent_p = (type_dependent_expression_p (lhs) 
+		     || type_dependent_expression_p (rhs));
+      if (!dependent_p)
+	{
+	  lhs = build_non_dependent_expr (lhs);
+	  rhs = build_non_dependent_expr (rhs);
+	}
+    }
+  if (!dependent_p)
+    {
+      stmt = c_finish_omp_atomic (code, lhs, rhs);
+      if (stmt == error_mark_node)
+	return;
+    }
+  if (processing_template_decl)
+    {
+      stmt = build2 (OMP_ATOMIC, void_type_node, orig_lhs, orig_rhs);
       OMP_ATOMIC_DEPENDENT_P (stmt) = 1;
       OMP_ATOMIC_CODE (stmt) = code;
-      add_stmt (stmt);
     }
-  else
-    c_finish_omp_atomic (code, lhs, rhs);
+  add_stmt (stmt);
 }
 
 void
--- gcc/testsuite/g++.dg/gomp/tpl-atomic-2.C	(revision 114664)
+++ gcc/testsuite/g++.dg/gomp/tpl-atomic-2.C	(revision 114665)
@@ -17,11 +17,10 @@ template<typename T> void f2(float *f)
 }
 
 // Here the rhs is dependent, but not type dependent.
-// ??? Fails.  See the comment in finish_omp_atomic.
 template<typename T> void f3(float *f)
 {
   #pragma omp atomic
-  *f |= sizeof (T);	// { dg-error "invalid|evaluation" "" { xfail *-*-* } }
+  *f |= sizeof (T);	// { dg-error "invalid|evaluation" }
 }
 
 // And the converse, no error here because we're never fed a T.



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gcc41.spec	19 Jun 2006 21:02:26 -0000	1.75
+++ gcc41.spec	20 Jun 2006 09:11:27 -0000	1.76
@@ -1,6 +1,6 @@
 %define DATE 20060619
 %define gcc_version 4.1.1
-%define gcc_release 4
+%define gcc_release 5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -125,6 +125,7 @@
 Patch24: gcc41-pr26885.patch
 Patch25: gcc41-libgomp-critical.patch
 Patch26: gcc41-merge-all-constants.patch
+Patch27: gcc41-pr26559.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -429,6 +430,7 @@
 %patch24 -p0 -b .pr26885~
 %patch25 -p0 -b .libgomp-critical~
 %patch26 -p0 -b .merge-all-constants~
+%patch27 -p0 -b .pr26559~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1470,6 +1472,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jun 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-5
+- fix C++ #pragma omp atomic (Mark Mitchell)
+
 * Mon Jun 19 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-4
 - update from gcc-4_1-branch (-r114555:114766)
   - PRs bootstrap/22541, c++/21210, c++/26559, c++/27227, c++/27648,



From fedora-cvs-commits at redhat.com  Tue Jun 20 09:29:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 05:29:11 -0400
Subject: rpms/gcc/devel gcc41-pr26559.patch,1.1,1.2
Message-ID: <200606200929.k5K9TBKF025921@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25883

Modified Files:
	gcc41-pr26559.patch 
Log Message:
4.1.1-5

gcc41-pr26559.patch:
 0 files changed

Index: gcc41-pr26559.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr26559.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr26559.patch	20 Jun 2006 09:11:27 -0000	1.1
+++ gcc41-pr26559.patch	20 Jun 2006 09:29:08 -0000	1.2
@@ -117,13 +117,13 @@
  
 --- gcc/cp/semantics.c	(revision 114670)
 +++ gcc/cp/semantics.c	(revision 114671)
-@@ -3834,24 +3834,41 @@ finish_omp_for (location_t locus, tree d
+@@ -3829,24 +3829,41 @@ finish_omp_for (location_t locus, tree d
  void
  finish_omp_atomic (enum tree_code code, tree lhs, tree rhs)
  {
--  /* If either of the operands are dependent, we can't do semantic
+-  /* If either of the operands are dependent, we can't do semantic 
 -     processing yet.  Stuff the values away for now.  We cheat a bit
--     and use the same tree code for this, even though the operands
+-     and use the same tree code for this, even though the operands 
 -     are of totally different form, thus we need to remember which
 -     statements are which, thus the lang_flag bit.  */
 -  /* ??? We ought to be using type_dependent_expression_p, but the



From fedora-cvs-commits at redhat.com  Tue Jun 20 11:00:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 07:00:31 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.3-kioslave_media_dbus-fuser.patch,
	NONE, 1.1 kdebase.spec, 1.174, 1.175
Message-ID: <200606201100.k5KB0VZA008276@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8228

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kioslave_media_dbus-fuser.patch 
Log Message:
fix #187228, kio_media_mounthelper fails with fuser


kdebase-3.5.3-kioslave_media_dbus-fuser.patch:
 halbackend.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.3-kioslave_media_dbus-fuser.patch ---
--- kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp.tn	2006-06-20 12:51:16.000000000 +0200
+++ kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp	2006-06-20 12:52:55.000000000 +0200
@@ -1210,7 +1210,7 @@
       QString qerror = error.message;
       if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) {
 	qerror = QString("<qt>") + i18n("Device is Busy:");
-	QString cmdline = QString("/bin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+	QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
 	FILE *fuser = popen(cmdline.latin1(), "r");
 	uint counter = 0;
 	if (fuser) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kdebase.spec	15 Jun 2006 18:34:12 -0000	1.174
+++ kdebase.spec	20 Jun 2006 11:00:21 -0000	1.175
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 0.3.fc5
+Release: 0.4.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -55,6 +55,7 @@
 Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
+Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
 
 # upstream patches
 Patch100: kdebase-3.5.3-kfind-largefile.patch
@@ -66,6 +67,10 @@
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
 Patch300: post-3.5.0-kdebase-kdm.diff
 
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
+Requires(pre,post): fileutils sh-utils
+Requires(post): xfs
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -74,12 +79,10 @@
 Requires: /etc/X11/xinit/Xsession
 Requires: /etc/X11/xdm/Xsetup_0
 Requires: cdparanoia-libs
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): desktop-file-utils
-Requires(pre,post): fileutils sh-utils
-Requires(post): xfs
 Requires: pam >= 0.79-6
 Requires: htdig
+Requires: psmisc
+Requires: coreutils
 
 %if %{redhatify}
 Requires: desktop-backgrounds-basic
@@ -169,6 +172,7 @@
 %patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
+%patch19 -p1 -b .fuser
 
 # upstream patches
 %patch100 -p1 -b .kfind-largefile
@@ -546,6 +550,9 @@
 
 
 %changelog
+* Tue Jun 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.4.fc5
+- fix #187228, kio_media_mounthelper fails with fuser
+
 * Thu Jun 15 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
 - fix BR 
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 11:27:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 07:27:08 -0400
Subject: rpms/vim/devel 7.0.018,NONE,1.1
Message-ID: <200606201127.k5KBR8DG030605@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30576

Added Files:
	7.0.018 
Log Message:
VMS: plugins are not loaded on startup


--- NEW FILE 7.0.018 ---
To: vim-dev at vim.org
Subject: Patch 7.0.018
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.018
Problem:    VMS: plugins are not loaded on startup.
Solution:   Remove "**" from the path. (Zoltan Arpadffy)
Files:	    src/main.c


*** ../vim-7.0.017/src/main.c	Wed May  3 23:28:15 2006
--- src/main.c	Mon Jun 19 10:54:40 2006
***************
*** 564,570 ****
--- 564,574 ----
       */
      if (p_lpl)
      {
+ # ifdef VMS	/* Somehow VMS doesn't handle the "**". */
+ 	source_runtime((char_u *)"plugin/*.vim", TRUE);
+ # else
  	source_runtime((char_u *)"plugin/**/*.vim", TRUE);
+ # endif
  	TIME_MSG("loading plugins");
      }
  #endif
*** ../vim-7.0.017/src/version.c	Sat May 13 17:26:10 2006
--- src/version.c	Mon Jun 19 10:55:29 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     18,
  /**/

-- 
BLACK KNIGHT:  Come on you pansy!
    [hah] [parry thrust]
    [ARTHUR chops the BLACK KNIGHT's right arm off]
ARTHUR:        Victory is mine!  [kneeling]
               We thank thee Lord, that in thy merc-
    [Black Knight kicks Arthur in the head while he is praying]
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 20 11:27:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 07:27:28 -0400
Subject: rpms/vim/devel 7.0.019,NONE,1.1
Message-ID: <200606201127.k5KBRS5d030759@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30729

Added Files:
	7.0.019 
Log Message:
crash for VjA789 and repeating


--- NEW FILE 7.0.019 ---
To: vim-dev at vim.org
Subject: Patch 7.0.019
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.019
Problem:    Repeating "VjA789" may cause a crash. (James Vega)
Solution:   Check the cursor column after moving it to another line.
Files:	    src/ops.c


*** ../vim-7.0.018/src/ops.c	Sun Apr 30 20:45:12 2006
--- src/ops.c	Tue Jun 20 12:49:46 2006
***************
*** 2413,2418 ****
--- 2413,2419 ----
  	else
  	{
  	    curwin->w_cursor = oap->end;
+ 	    check_cursor_col();
  
  	    /* Works just like an 'i'nsert on the next character. */
  	    if (!lineempty(curwin->w_cursor.lnum)
*** ../vim-7.0.018/src/version.c	Mon Jun 19 10:56:20 2006
--- src/version.c	Tue Jun 20 12:55:10 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     19,
  /**/

-- 
Two cows are standing together in a field.  One asks the other:
"So what do you think about this Mad Cow Disease?"
The other replies: "That doesn't concern me. I'm a helicopter."

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 20 11:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 07:28:32 -0400
Subject: rpms/vim/devel README.patches,1.45,1.46 vim.spec,1.119,1.120
Message-ID: <200606201128.k5KBSWCg031196@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31164

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 19


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- README.patches	30 May 2006 09:58:15 -0000	1.45
+++ README.patches	20 Jun 2006 11:28:29 -0000	1.46
@@ -42,3 +42,5 @@
   4485  7.0.015  Athena: type casts for lvalues
   1810  7.0.016  recognize encodings "mac-roman", "dec-mcs" and "hp-roman8"
   2302  7.0.017  (after 7.0.014) Motif: doesn't link with Motif 1.2 and earlier
+  1649  7.0.018  VMS: plugins are not loaded on startup
+  1425  7.0.019  crash for "VjA789" and repeating


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vim.spec	30 May 2006 10:43:43 -0000	1.119
+++ vim.spec	20 Jun 2006 11:28:29 -0000	1.120
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 017
+%define patchlevel 019
 
 Summary: The VIM editor.
 Name: vim
@@ -71,6 +71,8 @@
 Patch015: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.015
 Patch016: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.016
 Patch017: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.017
+Patch018: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.018
+Patch019: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.019
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -218,6 +220,9 @@
 %patch015 -p0
 %patch016 -p0
 %patch017 -p0
+# VMS:
+#patch018 -p0
+%patch019 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -554,6 +559,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.019-1
+- patchlevel 19
+
 * Tue May 30 2006 Karsten Hopp <karsten at redhat.de> 7.0.017-1
 - patchlevel 17, although it affects just the Motif version
 - own some directories (#192787)



From fedora-cvs-commits at redhat.com  Tue Jun 20 11:38:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 07:38:46 -0400
Subject: rpms/vim/devel vim.spec,1.120,1.121
Message-ID: <200606201138.k5KBckvg000819@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv752

Modified Files:
	vim.spec 
Log Message:
BR autoconf


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- vim.spec	20 Jun 2006 11:28:29 -0000	1.120
+++ vim.spec	20 Jun 2006 11:38:34 -0000	1.121
@@ -93,7 +93,7 @@
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildrequires: python-devel perl libtermcap-devel gettext
-Buildrequires: libacl-devel gpm-devel
+Buildrequires: libacl-devel gpm-devel autoconf
 %if "%{withruby}" == "1"
 Buildrequires: ruby ruby-devel
 %endif
@@ -561,6 +561,7 @@
 %changelog
 * Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.019-1
 - patchlevel 19
+- buildrequire autoconf
 
 * Tue May 30 2006 Karsten Hopp <karsten at redhat.de> 7.0.017-1
 - patchlevel 17, although it affects just the Motif version



From fedora-cvs-commits at redhat.com  Tue Jun 20 12:17:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 08:17:35 -0400
Subject: rpms/scim/FC-5 scim.spec,1.35,1.36
Message-ID: <200606201217.k5KCHZO1009522@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9429

Modified Files:
	scim.spec 
Log Message:
ignore update-gtk-immodules errors in %%post and %%postun



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- scim.spec	20 Jun 2006 09:05:57 -0000	1.35
+++ scim.spec	20 Jun 2006 12:17:33 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   9.6.fc5
+Release:   9.7.fc5
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -63,7 +63,7 @@
 Summary:    Smart Common Input Method libraries
 Group:      System Environment/Libraries
 # for update-gtk-immodules
-PreReq:     gtk2 >= 2.8.19
+PreReq:     gtk2 >= 2.8.19-1
 %if %{with_libstdc_preview}
 PreReq:     libstdc++so7
 %endif
@@ -151,7 +151,7 @@
 
 %post libs
 /sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_host}
+%{_bindir}/update-gtk-immodules %{_host} || :
 
 
 %postun
@@ -166,7 +166,7 @@
 
 %postun libs
 /sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_host}
+%{_bindir}/update-gtk-immodules %{_host} || :
 
 
 %files -f %{name}.lang
@@ -204,9 +204,14 @@
 
 
 %changelog
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.7.fc5
+- ignore update-gtk-immodules errors in %%post and %%postun
+
 * Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.6.fc5
+- update scim-libs prereq to gtk2 >= 2.8.19-1
+
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.4.fc5
 - use _host not _target_platform for update-gtk-immodules in scripts (#195763)
-  - update scim-libs prereq to gtk2 >= 2.8.19
 - make scim explicitly require scim-libs with same ver-rel
 - backport factory-menu-singlet-submenus-187027.patch to avoid having language
   submenus with a single IME



From fedora-cvs-commits at redhat.com  Tue Jun 20 12:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 08:58:31 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.9,
	1.10 selinux-policy.spec, 1.212, 1.213
Message-ID: <200606201258.k5KCwUPm012618@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12604

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-5
- Break out selinux-devel package


policy-20060608.patch:
 doc/example.if                            |    4 -
 policy/global_tunables                    |    7 ++
 policy/modules/admin/bootloader.te        |    9 +++
 policy/modules/admin/consoletype.te       |    7 ++
 policy/modules/admin/logwatch.te          |    3 -
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/prelink.fc           |    3 -
 policy/modules/kernel/files.if            |   35 ++++++++++++++
 policy/modules/kernel/filesystem.te       |    5 ++
 policy/modules/kernel/kernel.if           |   38 +++++++++++++++
 policy/modules/services/apache.fc         |    1 
 policy/modules/services/apache.if         |   74 ++++++++++++++++++++++++++++++
 policy/modules/services/apache.te         |   46 +++++++++++++++---
 policy/modules/services/automount.te      |   13 ++++-
 policy/modules/services/clamav.if         |   20 ++++++++
 policy/modules/services/cups.fc           |    1 
 policy/modules/services/cups.if           |    2 
 policy/modules/services/cups.te           |    8 +++
 policy/modules/services/hal.if            |   20 ++++++++
 policy/modules/services/mta.te            |    5 --
 policy/modules/services/networkmanager.te |    1 
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/openvpn.fc        |    1 
 policy/modules/services/openvpn.te        |   11 ++++
 policy/modules/services/pegasus.if        |   31 ++++++++++++
 policy/modules/services/pegasus.te        |    5 --
 policy/modules/services/postfix.if        |   25 ++++++++++
 policy/modules/services/postfix.te        |    1 
 policy/modules/services/ppp.te            |    1 
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/tftp.te           |    1 
 policy/modules/services/tor.if            |    2 
 policy/modules/system/authlogin.if        |    1 
 policy/modules/system/hostname.te         |    5 +-
 policy/modules/system/init.if             |    7 --
 policy/modules/system/init.te             |    1 
 policy/modules/system/libraries.fc        |    2 
 policy/modules/system/mount.te            |    1 
 policy/modules/system/selinuxutil.te      |    2 
 policy/modules/system/unconfined.fc       |    2 
 policy/modules/system/userdomain.if       |    2 
 policy/modules/system/xen.if              |    4 -
 policy/modules/system/xen.te              |   12 ++++
 43 files changed, 382 insertions(+), 40 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policy-20060608.patch	16 Jun 2006 19:06:13 -0000	1.9
+++ policy-20060608.patch	20 Jun 2006 12:58:27 -0000	1.10
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/example.if serefpolicy-2.2.47/doc/example.if
 --- nsaserefpolicy/doc/example.if	2006-02-01 10:22:19.000000000 -0500
-+++ serefpolicy-2.2.47/doc/example.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/doc/example.if	2006-06-19 16:26:15.000000000 -0400
 @@ -25,7 +25,7 @@
  ## </param>
  #
@@ -21,7 +21,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/global_tunables	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/global_tunables	2006-06-19 16:26:15.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -38,7 +38,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-19 16:26:15.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -48,9 +48,34 @@
  allow bootloader_t self:fifo_file rw_file_perms;
  
  allow bootloader_t bootloader_etc_t:file r_file_perms;
+@@ -111,6 +111,7 @@
+ # for blkid.tab
+ files_manage_etc_runtime_files(bootloader_t)
+ files_etc_filetrans_etc_runtime(bootloader_t,file)
++files_dontaudit_search_home(bootloader_t)
+ 
+ init_getattr_initctl(bootloader_t)
+ init_use_script_ptys(bootloader_t)
+@@ -127,6 +128,8 @@
+ 
+ miscfiles_read_localization(bootloader_t)
+ 
++modutils_domtrans_insmod_uncond(bootloader_t)
++
+ seutil_read_bin_policy(bootloader_t)
+ seutil_read_loadpolicy(bootloader_t)
+ seutil_dontaudit_search_config(bootloader_t)
+@@ -207,3 +210,7 @@
+ 	userdom_dontaudit_search_staff_home_dirs(bootloader_t)
+ 	userdom_dontaudit_search_sysadm_home_dirs(bootloader_t)
+ ')
++
++optional_policy(`
++	kudzu_domtrans(bootloader_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-19 16:26:15.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -67,7 +92,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.47/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/logwatch.te	2006-06-16 15:01:01.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/logwatch.te	2006-06-19 16:26:15.000000000 -0400
 @@ -22,8 +22,7 @@
  #
  # Local policy
@@ -80,7 +105,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-19 16:26:15.000000000 -0400
 @@ -54,6 +54,7 @@
  corenet_udp_sendrecv_all_ports(netutils_t)
  corenet_tcp_connect_all_ports(netutils_t)
@@ -91,7 +116,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-19 16:26:15.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -102,7 +127,7 @@
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-19 16:26:15.000000000 -0400
 @@ -1931,6 +1931,21 @@
  ')
  
@@ -151,7 +176,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.47/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/filesystem.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/filesystem.te	2006-06-19 16:26:15.000000000 -0400
 @@ -48,6 +48,11 @@
  files_mountpoint(binfmt_misc_fs_t)
  genfscon binfmt_misc / gen_context(system_u:object_r:binfmt_misc_fs_t,s0)
@@ -166,7 +191,7 @@
  genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-19 16:26:15.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -211,7 +236,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.47/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.fc	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.fc	2006-06-19 16:26:15.000000000 -0400
 @@ -78,3 +78,4 @@
  /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
@@ -219,8 +244,20 @@
 +/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.47/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.if	2006-06-16 14:42:34.000000000 -0400
-@@ -515,6 +515,28 @@
++++ serefpolicy-2.2.47/policy/modules/services/apache.if	2006-06-19 16:26:15.000000000 -0400
+@@ -470,6 +470,11 @@
+ 	allow $1 httpdcontent:dir manage_dir_perms;
+ 	allow $1 httpdcontent:file manage_file_perms;
+ 	allow $1 httpdcontent:lnk_file create_lnk_perms;
++
++	allow $1 httpd_sys_script_exec_t:dir manage_dir_perms;
++	allow $1 httpd_sys_script_exec_t:file manage_file_perms;
++	allow $1 httpd_sys_script_exec_t:lnk_file create_lnk_perms;
++
+ ')
+ 
+ ########################################
+@@ -515,6 +520,28 @@
  
  ########################################
  ## <summary>
@@ -249,7 +286,7 @@
  ##	Execute the Apache helper program with
  ##	a domain transition.
  ## </summary>
-@@ -594,6 +616,28 @@
+@@ -594,6 +621,28 @@
  
  ########################################
  ## <summary>
@@ -278,7 +315,7 @@
  ##	Allow the specified domain to append
  ##	to apache log files.
  ## </summary>
-@@ -955,3 +999,28 @@
+@@ -955,3 +1004,28 @@
  	allow $2 httpd_$1_content_t:file r_file_perms;
  	allow $2 httpd_$1_content_t:lnk_file { getattr read };
  ')
@@ -309,7 +346,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-19 16:26:15.000000000 -0400
 @@ -109,13 +109,10 @@
  type squirrelmail_spool_t;
  files_tmp_file(squirrelmail_spool_t)
@@ -344,7 +381,7 @@
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
-@@ -692,3 +698,28 @@
+@@ -692,3 +698,29 @@
  optional_policy(`
  	nscd_socket_use(httpd_unconfined_script_t)
  ')
@@ -373,9 +410,10 @@
 +#
 +apache_domtrans_rotatelogs(httpd_sys_script_t)
 +
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-19 16:26:15.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -408,7 +446,7 @@
  corecmd_exec_shell(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.2.47/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/clamav.if	2006-06-16 15:04:59.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/clamav.if	2006-06-19 16:26:15.000000000 -0400
 @@ -84,3 +84,23 @@
  	allow clamscan_t $1:process sigchld;
  ')
@@ -433,9 +471,112 @@
 +	allow $1 clamd_var_lib_t:dir search_dir_perms;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.47/policy/modules/services/cups.fc
+--- nsaserefpolicy/policy/modules/services/cups.fc	2006-04-19 11:26:51.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/cups.fc	2006-06-19 16:26:15.000000000 -0400
+@@ -24,6 +24,7 @@
+ 
+ /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
+ /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
++/usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
+ /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.47/policy/modules/services/cups.if
+--- nsaserefpolicy/policy/modules/services/cups.if	2006-03-23 14:33:30.000000000 -0500
++++ serefpolicy-2.2.47/policy/modules/services/cups.if	2006-06-19 16:26:15.000000000 -0400
+@@ -40,7 +40,7 @@
+ 
+ 	files_search_pids($1)
+ 	allow $1 cupsd_var_run_t:dir search;
+-	allow $1 cupsd_var_run_t:sock_file write;
++	allow $1 cupsd_var_run_t:sock_file { getattr write };
+ 	allow $1 cupsd_t:unix_stream_socket connectto;
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.47/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-06-13 22:41:52.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/cups.te	2006-06-19 16:26:15.000000000 -0400
+@@ -298,6 +298,7 @@
+ allow cupsd_config_t self:unix_stream_socket create_socket_perms;
+ allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
+ allow cupsd_config_t self:tcp_socket create_stream_socket_perms;
++allow cupsd_config_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow cupsd_config_t cupsd_t:tcp_socket { connectto recvfrom };
+ allow cupsd_t cupsd_config_t:tcp_socket { acceptfrom recvfrom };
+@@ -332,6 +333,7 @@
+ allow cupsd_config_t cupsd_rw_etc_t:lnk_file create_lnk_perms;
+ files_var_filetrans(cupsd_config_t,cupsd_rw_etc_t,file)
+ 
++cups_stream_connect(cupsd_config_t)
+ allow cupsd_config_t cupsd_var_run_t:file { getattr read };
+ 
+ kernel_read_system_state(cupsd_config_t)
+@@ -349,6 +351,7 @@
+ 
+ dev_read_sysfs(cupsd_config_t)
+ dev_read_urand(cupsd_config_t)
++dev_read_rand(cupsd_config_t)
+ 
+ fs_getattr_all_fs(cupsd_config_t)
+ fs_search_auto_mountpoints(cupsd_config_t)
+@@ -387,6 +390,9 @@
+ userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
+ userdom_dontaudit_search_sysadm_home_dirs(cupsd_config_t)
+ 
++allow cupsd_config_t cupsd_tmp_t:file create_file_perms;
++files_tmp_filetrans(cupsd_config_t, cupsd_tmp_t, { file dir })
++
+ lpd_read_config(cupsd_config_t)
+ 
+ ifdef(`distro_redhat',`
+@@ -422,6 +428,7 @@
+ 
+ optional_policy(`
+ 	hal_domtrans(cupsd_config_t)
++	hal_read_tmp_files(cupsd_config_t)
+ ')
+ 
+ optional_policy(`
+@@ -588,6 +595,7 @@
+ dev_read_sysfs(hplip_t)
+ dev_rw_printer(hplip_t)
+ dev_read_urand(hplip_t)
++dev_read_rand(hplip_t)
+ dev_rw_generic_usb_dev(hplip_t)
+ 
+ fs_getattr_all_fs(hplip_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.47/policy/modules/services/hal.if
+--- nsaserefpolicy/policy/modules/services/hal.if	2006-03-23 14:33:30.000000000 -0500
++++ serefpolicy-2.2.47/policy/modules/services/hal.if	2006-06-19 16:26:15.000000000 -0400
+@@ -140,3 +140,23 @@
+ 	files_search_pids($1)
+ 	allow $1 hald_var_run_t:file rw_file_perms;
+ ')
++
++
++########################################
++## <summary>
++##	Read hald tmp files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`hal_read_tmp_files',`
++	gen_require(`
++		type hald_tmp_t;
++	')
++
++	allow $1 hald_tmp_t:file r_file_perms;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.47/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/mta.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/mta.te	2006-06-19 16:26:15.000000000 -0400
 @@ -195,8 +195,3 @@
  	')
  ')
@@ -445,9 +586,20 @@
 -allow initrc_t etc_mail_t:dir rw_dir_perms;
 -allow initrc_t etc_mail_t:file create_file_perms;
 -')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.47/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-13 07:03:44.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/networkmanager.te	2006-06-19 16:26:15.000000000 -0400
+@@ -92,6 +92,7 @@
+ logging_send_syslog_msg(NetworkManager_t)
+ 
+ miscfiles_read_localization(NetworkManager_t)
++miscfiles_read_certs(NetworkManager_t)
+ 
+ modutils_domtrans_insmod(NetworkManager_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-19 16:26:15.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -456,9 +608,61 @@
  
  corenet_non_ipsec_sendrecv(ntpd_t)
  corenet_tcp_sendrecv_all_if(ntpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-2.2.47/policy/modules/services/openvpn.fc
+--- nsaserefpolicy/policy/modules/services/openvpn.fc	2006-04-14 16:09:08.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/openvpn.fc	2006-06-19 16:26:15.000000000 -0400
+@@ -2,6 +2,7 @@
+ # /etc
+ #
+ /etc/openvpn(/.*)?		gen_context(system_u:object_r:openvpn_etc_t,s0)
++/etc/openvpn/openvpn-status.log	-- gen_context(system_u:object_r:openvpn_etc_rw_t,s0)
+ 
+ #
+ # /usr
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.2.47/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-06 22:21:55.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/openvpn.te	2006-06-19 16:26:15.000000000 -0400
+@@ -15,6 +15,10 @@
+ type openvpn_etc_t;
+ files_type(openvpn_etc_t)
+ 
++# configuration files
++type openvpn_etc_rw_t;
++files_type(openvpn_etc_rw_t)
++
+ # log files
+ type openvpn_var_log_t;
+ logging_log_file(openvpn_var_log_t)
+@@ -38,12 +42,17 @@
+ allow openvpn_t openvpn_etc_t:file r_file_perms;
+ allow openvpn_t openvpn_etc_t:lnk_file { getattr read };
+ 
++allow openvpn_t openvpn_etc_rw_t:file create_file_perms;
++# Automatically label newly created files under /etc/openvpn with this type
++type_transition openvpn_t openvpn_etc_t:file openvpn_etc_rw_t;
++
+ allow openvpn_t openvpn_var_log_t:file create_file_perms;
+ logging_log_filetrans(openvpn_t,openvpn_var_log_t,file)
+ 
+ allow openvpn_t openvpn_var_run_t:file create_file_perms;
+ files_pid_filetrans(openvpn_t, openvpn_var_run_t, file)
+ 
++kernel_read_kernel_sysctls(openvpn_t)
+ kernel_read_net_sysctls(openvpn_t)
+ kernel_read_network_state(openvpn_t)
+ kernel_read_system_state(openvpn_t)
+@@ -81,6 +90,8 @@
+ 
+ sysnet_exec_ifconfig(openvpn_t)
+ 
++term_dontaudit_use_generic_ptys(openvpn_t)
++
+ optional_policy(`
+ 	daemontools_service_domain(openvpn_t,openvpn_exec_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-19 16:26:15.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -494,7 +698,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-19 16:26:15.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -511,9 +715,41 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.2.47/policy/modules/services/postfix.if
+--- nsaserefpolicy/policy/modules/services/postfix.if	2006-06-06 22:21:55.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/postfix.if	2006-06-19 16:26:15.000000000 -0400
+@@ -459,3 +459,28 @@
+ 
+ 	typeattribute $1 postfix_user_domtrans;
+ ')
++
++
++########################################
++## <summary>
++##	Execute the master postfix program in the
++##	postfix_master domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`postfix_domtrans_smtp',`
++	gen_require(`
++		type postfix_smtp_t, postfix_smtp_exec_t;
++	')
++
++	domain_auto_trans($1,postfix_smtp_exec_t,postfix_smtp_t)
++
++	allow $1 postfix_smtp_t:fd use;
++	allow postfix_smtp_t $1:fd use;
++	allow postfix_smtp_t $1:fifo_file rw_file_perms;
++	allow postfix_smtp_t $1:process sigchld;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.47/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/postfix.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/postfix.te	2006-06-19 16:26:15.000000000 -0400
 @@ -456,6 +456,7 @@
  ')
  
@@ -524,7 +760,7 @@
  	cron_use_system_job_fds(postfix_postdrop_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.47/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ppp.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/ppp.te	2006-06-19 16:26:15.000000000 -0400
 @@ -68,6 +68,7 @@
  allow pppd_t self:tcp_socket create_stream_socket_perms;
  allow pppd_t self:udp_socket { connect connected_socket_perms };
@@ -535,7 +771,7 @@
  allow pppd_t pptp_t:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.47/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/procmail.te	2006-06-16 15:05:10.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/procmail.te	2006-06-19 16:26:15.000000000 -0400
 @@ -78,6 +78,7 @@
  
  optional_policy(`
@@ -544,9 +780,20 @@
  ')
  
  optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.47/policy/modules/services/tftp.te
+--- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/tftp.te	2006-06-20 07:50:40.000000000 -0400
+@@ -78,6 +78,7 @@
+ miscfiles_read_localization(tftpd_t)
+ 
+ sysnet_read_config(tftpd_t)
++sysnet_use_ldap(tftpd_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
+ userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-2.2.47/policy/modules/services/tor.if
 --- nsaserefpolicy/policy/modules/services/tor.if	2006-03-07 13:08:46.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/services/tor.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/services/tor.if	2006-06-19 16:26:15.000000000 -0400
 @@ -11,7 +11,7 @@
  ## </param>
  #
@@ -558,7 +805,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.47/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/authlogin.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/authlogin.if	2006-06-19 16:26:15.000000000 -0400
 @@ -1292,6 +1292,7 @@
  
  	sysnet_dns_name_resolve($1)
@@ -569,7 +816,7 @@
  		nis_use_ypbind($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-19 16:26:16.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -582,9 +829,26 @@
  role system_r types hostname_t;
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.47/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/init.if	2006-06-19 16:26:16.000000000 -0400
+@@ -158,13 +158,6 @@
+ 	allow $1 initrc_t:fifo_file rw_file_perms;
+ 	allow $1 initrc_t:process sigchld;
+ 
+-	ifdef(`hide_broken_symptoms',`
+-		# RHEL4 systems seem to have a stray
+-		# fds open from the initrd
+-		ifdef(`distro_rhel4',`
+-			kernel_dontaudit_use_fds($1)
+-		')
+-	')
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-19 16:26:16.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -595,7 +859,7 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.47/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/libraries.fc	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/libraries.fc	2006-06-19 16:26:16.000000000 -0400
 @@ -121,7 +121,7 @@
  
  /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -607,7 +871,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-19 16:26:16.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -618,7 +882,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-19 16:26:16.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -630,7 +894,7 @@
  # cjp: why is this needed?
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-19 16:26:16.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -640,7 +904,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-19 16:26:16.000000000 -0400
 @@ -4145,7 +4145,7 @@
  	gen_require(`
  		type user_home_dir_t;
@@ -652,7 +916,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.47/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/xen.if	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/xen.if	2006-06-19 16:26:16.000000000 -0400
 @@ -11,7 +11,7 @@
  ## </param>
  #
@@ -673,7 +937,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.47/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/xen.te	2006-06-16 14:42:34.000000000 -0400
++++ serefpolicy-2.2.47/policy/modules/system/xen.te	2006-06-19 16:26:16.000000000 -0400
 @@ -68,7 +68,8 @@
  # xend local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- selinux-policy.spec	16 Jun 2006 17:54:35 -0000	1.212
+++ selinux-policy.spec	20 Jun 2006 12:58:27 -0000	1.213
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.47
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -51,6 +51,16 @@
 %dir %{_sysconfdir}/selinux
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config
 %ghost %{_sysconfdir}/sysconfig/selinux
+
+%package devel
+Summary: SELinux policy development
+Group: System Environment/Base
+Requires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
+
+%description devel
+SELinux Policy development package
+
+%files devel
 %dir %{_usr}/share/selinux/devel
 %dir %{_usr}/share/selinux/devel/include
 %{_usr}/share/selinux/devel/include/*
@@ -333,6 +343,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-5
+- Break out selinux-devel package
+
 * Fri Jun 16 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-4
 - Add ibmasmfs
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 12:59:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 08:59:05 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.213,1.214
Message-ID: <200606201259.k5KCx5Hg012687@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12672

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-5
- Break out selinux-devel package



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- selinux-policy.spec	20 Jun 2006 12:58:27 -0000	1.213
+++ selinux-policy.spec	20 Jun 2006 12:59:02 -0000	1.214
@@ -39,7 +39,6 @@
 BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
 PreReq: policycoreutils >= %{POLICYCOREUTILSVER}
 Obsoletes: policy 
-Obsoletes: selinux-policy-devel
 
 %description 
 SELinux Base package



From fedora-cvs-commits at redhat.com  Tue Jun 20 13:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 09:14:49 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.204,
	1.205 policycoreutils.spec, 1.286, 1.287
Message-ID: <200606201314.k5KDEna6024435@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24396

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-3
- Prompt for selinux-policy-devel package in audit2allow


policycoreutils-rhat.patch:
 audit2allow/audit2allow.1 |    2 
 audit2allow/avc.py        |    2 
 po/hi.po                  |   33 +++---
 po/mr.po                  |   86 ++++++++++-------
 po/ms.po                  |  232 +++++++++++++++++++++++++++++-----------------
 setsebool/setsebool.8     |    3 
 setsebool/setsebool.c     |    6 -
 7 files changed, 227 insertions(+), 137 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- policycoreutils-rhat.patch	19 Jun 2006 14:36:40 -0000	1.204
+++ policycoreutils-rhat.patch	20 Jun 2006 13:14:45 -0000	1.205
@@ -1,3 +1,27 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.14/audit2allow/audit2allow.1
+--- nsapolicycoreutils/audit2allow/audit2allow.1	2006-05-15 09:42:57.000000000 -0400
++++ policycoreutils-1.30.14/audit2allow/audit2allow.1	2006-06-20 09:11:30.000000000 -0400
+@@ -66,7 +66,7 @@
+ Generate require output syntax for loadable modules.
+ .TP
+ .B "\-R" | "\-\-reference"
+-Generate reference policy using installed macros
++Generate reference policy using installed macros.  Requires the selinux-policy-devel package.
+ .TP
+ .B "\-t "  | "\-\-tefile"
+ Indicates input file is a te (type enforcement) file.  This can be used to translate old te format to new policy format.
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.14/audit2allow/avc.py
+--- nsapolicycoreutils/audit2allow/avc.py	2006-05-23 06:19:30.000000000 -0400
++++ policycoreutils-1.30.14/audit2allow/avc.py	2006-06-20 09:12:47.000000000 -0400
+@@ -66,7 +66,7 @@
+ 	try:
+ 		fd = open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt")
+ 	except IOError, error:
+-		raise IOError("Reference policy generation requires the policy development package.\n%s" % error)
++		raise IOError("Reference policy generation requires the policy development package selinux-policy-devel.\n%s" % error)
+         records = fd.read().split("\n")
+         regexp = "^define *\(`([^']*)' *, *` *\{([^}]*)}'"
+         for r in records:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.14/po/hi.po
 --- nsapolicycoreutils/po/hi.po	2006-06-16 15:08:24.000000000 -0400
 +++ policycoreutils-1.30.14/po/hi.po	2006-06-19 10:34:57.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- policycoreutils.spec	19 Jun 2006 14:36:43 -0000	1.286
+++ policycoreutils.spec	20 Jun 2006 13:14:46 -0000	1.287
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.14
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -111,6 +111,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-3
+- Prompt for selinux-policy-devel package in audit2allow
+
 * Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-2
 - Allow setsebool to use on/off
 - Update translations



From fedora-cvs-commits at redhat.com  Tue Jun 20 13:33:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 09:33:00 -0400
Subject: rpms/control-center/devel control-center.spec,1.146,1.147
Message-ID: <200606201333.k5KDX0TJ010995@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10936

Modified Files:
	control-center.spec 
Log Message:
rebuild



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- control-center.spec	15 Jun 2006 01:11:36 -0000	1.146
+++ control-center.spec	20 Jun 2006 13:32:44 -0000	1.147
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.3
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -258,6 +258,9 @@
 %{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Tue Jun 20 2006 Matthias Clasen  <mclasen at redhat.com> - 2.15.3-3
+- Rebuild against new libxklavier
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com>
 - rebuilt with new gnutls
 - require gstreamer-devel



From fedora-cvs-commits at redhat.com  Tue Jun 20 13:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 09:39:56 -0400
Subject: rpms/kdeartwork/FC-5 kdeartwork-3.5.3-kdeclassic.patch, NONE,
	1.1 kdeartwork.spec, 1.49, 1.50
Message-ID: <200606201339.k5KDduJL012484@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12398

Modified Files:
	kdeartwork.spec 
Added Files:
	kdeartwork-3.5.3-kdeclassic.patch 
Log Message:
add Inherits=hicolor in kdeclassic icon theme #195991



kdeartwork-3.5.3-kdeclassic.patch:
 index.theme |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdeartwork-3.5.3-kdeclassic.patch ---
--- kdeartwork-3.5.3/IconThemes/kdeclassic/index.theme.tn	2006-06-20 15:29:57.000000000 +0200
+++ kdeartwork-3.5.3/IconThemes/kdeclassic/index.theme	2006-06-20 15:30:40.000000000 +0200
@@ -1,5 +1,6 @@
 [Icon Theme]
 Name=KDE-Classic
+Inherits=hicolor
 Name[ca]=KDE-Cl??ssic
 Name[cs]=Klasick??
 Name[cy]=Clasurol KDE


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/kdeartwork.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdeartwork.spec	10 Jun 2006 14:02:01 -0000	1.49
+++ kdeartwork.spec	20 Jun 2006 13:39:53 -0000	1.50
@@ -14,22 +14,23 @@
 
 Name: kdeartwork
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch: kde-libtool.patch
+Patch0: kde-libtool.patch
+Patch1: kdeartwork-3.5.3-kdeclassic.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: xscreensaver-extras
 Requires: xscreensaver-gl-extras
 Requires: xscreensaver-base
 
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
+BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: xscreensaver-extras
 BuildRequires: xscreensaver-gl-extras
@@ -140,6 +141,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Tue Jun 20 2006 Than Ngo <than at redhat.com> 3.5.3-0.2.fc5
+- add Inherits=hicolor in kdeclassic icon theme #195991
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 14:28:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 10:28:22 -0400
Subject: rpms/booty/devel .cvsignore, 1.47, 1.48 booty.spec, 1.51,
	1.52 sources, 1.50, 1.51
Message-ID: <200606201428.k5KESMBO023766@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23725/devel

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
auto-import booty-0.77-1 on branch devel from booty-0.77-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	14 Jun 2006 04:32:36 -0000	1.47
+++ .cvsignore	20 Jun 2006 14:28:19 -0000	1.48
@@ -1 +1 @@
-booty-0.76.tar.bz2
+booty-0.77.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- booty.spec	14 Jun 2006 04:32:36 -0000	1.51
+++ booty.spec	20 Jun 2006 14:28:19 -0000	1.52
@@ -1,6 +1,6 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.76
+Version: 0.77
 Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
@@ -35,6 +35,9 @@
 
 
 %changelog
+* Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 0.77-1
+- fix for hv entry with new xen kernel naming (#196022) 
+
 * Wed Jun 14 2006 Jeremy Katz <katzj at redhat.com> - 0.76-1
 - handle new xen kernel naming
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	14 Jun 2006 04:32:36 -0000	1.50
+++ sources	20 Jun 2006 14:28:19 -0000	1.51
@@ -1 +1 @@
-b2f09cf1fe79b7af01233c58308461fb  booty-0.76.tar.bz2
+797f68406ae56552d91f037d96cdbc10  booty-0.77.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 20 14:45:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 10:45:13 -0400
Subject: rpms/vim/devel 7.0.020,NONE,1.1
Message-ID: <200606201445.k5KEjDhJ028095@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28066

Added Files:
	7.0.020 
Log Message:
GUI: crash when using 'mousefocus'


--- NEW FILE 7.0.020 ---
To: vim-dev at vim.org
Subject: Patch 7.0.020
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.020
Problem:    Crash when using 'mousefocus'. (William Fulton)
Solution:   Make buffer for mouse coordinates 2 bytes longer. (Juergen Weigert)
Files:	    src/gui.c


*** ../vim-7.0.019/src/gui.c	Sat May 13 12:15:09 2006
--- src/gui.c	Tue Jun 20 16:27:02 2006
***************
*** 4515,4521 ****
      int		y;
  {
      win_T	*wp;
!     char_u	st[6];
  
      /* Ignore this while still starting up. */
      if (!gui.in_use || gui.starting)
--- 4515,4521 ----
      int		y;
  {
      win_T	*wp;
!     char_u	st[8];
  
      /* Ignore this while still starting up. */
      if (!gui.in_use || gui.starting)
*** ../vim-7.0.019/src/version.c	Tue Jun 20 12:56:11 2006
--- src/version.c	Tue Jun 20 16:32:28 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     20,
  /**/

-- 
Michael: There is no such thing as a dump question.
Bernard: Sure there is.  For example "what is a core dump?"

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 20 14:45:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 10:45:24 -0400
Subject: rpms/vim/devel README.patches,1.46,1.47
Message-ID: <200606201445.k5KEjOPh028176@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28146

Modified Files:
	README.patches 
Log Message:
GUI: crash when using 'mousefocus'


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- README.patches	20 Jun 2006 11:28:29 -0000	1.46
+++ README.patches	20 Jun 2006 14:45:21 -0000	1.47
@@ -44,3 +44,4 @@
   2302  7.0.017  (after 7.0.014) Motif: doesn't link with Motif 1.2 and earlier
   1649  7.0.018  VMS: plugins are not loaded on startup
   1425  7.0.019  crash for "VjA789" and repeating
+  1470  7.0.020  GUI: crash when using 'mousefocus'



From fedora-cvs-commits at redhat.com  Tue Jun 20 14:45:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 10:45:47 -0400
Subject: rpms/vim/devel vim.spec,1.121,1.122
Message-ID: <200606201445.k5KEjlJS029185@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28918

Modified Files:
	vim.spec 
Log Message:
- patchlevel 20


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- vim.spec	20 Jun 2006 11:38:34 -0000	1.121
+++ vim.spec	20 Jun 2006 14:45:44 -0000	1.122
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 019
+%define patchlevel 020
 
 Summary: The VIM editor.
 Name: vim
@@ -73,6 +73,7 @@
 Patch017: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.017
 Patch018: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.018
 Patch019: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.019
+Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -223,6 +224,7 @@
 # VMS:
 #patch018 -p0
 %patch019 -p0
+%patch020 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -559,6 +561,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.020-1
+- patchlevel 20
+
 * Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.019-1
 - patchlevel 19
 - buildrequire autoconf



From fedora-cvs-commits at redhat.com  Tue Jun 20 15:23:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 11:23:35 -0400
Subject: rpms/system-config-lvm/FC-5 .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 system-config-lvm.spec, 1.21, 1.22
Message-ID: <200606201523.k5KFNZNu003792@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/system-config-lvm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3760/FC-5

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.18-1.2.FC5 on branch FC-5 from system-config-lvm-1.0.18-1.2.FC5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Feb 2006 16:28:30 -0000	1.20
+++ .cvsignore	20 Jun 2006 15:23:32 -0000	1.21
@@ -1 +1 @@
-system-config-lvm-1.0.13.tar.gz
+system-config-lvm-1.0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Feb 2006 16:28:30 -0000	1.20
+++ sources	20 Jun 2006 15:23:32 -0000	1.21
@@ -1 +1 @@
-9f717ee1b787ab5bbade50cf9e072bd5  system-config-lvm-1.0.13.tar.gz
+446d6d8dc0736f8135c3e919a1de601a  system-config-lvm-1.0.18.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/FC-5/system-config-lvm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- system-config-lvm.spec	10 Feb 2006 16:28:30 -0000	1.21
+++ system-config-lvm.spec	20 Jun 2006 15:23:32 -0000	1.22
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
-Version: 1.0.13
-Release: 1.0
+Version: 1.0.18
+Release: 1.2.FC5
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,7 @@
 Requires: lvm2 >= 2.00.20
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
+BuildRequires: perl(XML::Parser) gettext
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.
@@ -51,6 +52,15 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Thu Jun 01 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.18-1.0
+  - Version bump
+* Fri May 12 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.17-1.0
+  - Fixes for 175077, 171117, 175131, 176967, enable mirroring, 159455, 159456
+* Thu Feb 16 2006 Jim Parsons <jparsons at redhat.com> 1.0.16-1.0
+  - Disabled mirroring support in UI.
+* Mon Feb 14 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.14-1.0
+  - Fixes for bz180281, 159457, 180269. Mirroring support available with constants
+    in lvmui_constants file by setting MIRRORING_UI_SUPPORT to True
 * Fri Feb 10 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.13-1.0
   - Fix failure to display all unused space
 * Mon Feb 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.12-1.0



From fedora-cvs-commits at redhat.com  Tue Jun 20 15:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 11:35:43 -0400
Subject: rpms/glib2/devel .cvsignore, 1.53, 1.54 glib2.spec, 1.100,
	1.101 sources, 1.53, 1.54
Message-ID: <200606201535.k5KFZhkr007093@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6970

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.11.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	12 Jun 2006 16:27:40 -0000	1.53
+++ .cvsignore	20 Jun 2006 15:35:36 -0000	1.54
@@ -1 +1 @@
-glib-2.11.3.tar.bz2
+glib-2.11.4.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- glib2.spec	12 Jun 2006 16:27:40 -0000	1.100
+++ glib2.spec	20 Jun 2006 15:35:36 -0000	1.101
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.11.3
+Version: 2.11.4
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jun 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.4-1
+- Update to 2.11.4
+
 * Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.3-1
 - Update to 2.11.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	12 Jun 2006 16:27:40 -0000	1.53
+++ sources	20 Jun 2006 15:35:36 -0000	1.54
@@ -1 +1 @@
-41931c4965f7e1848f81b800914905cd  glib-2.11.3.tar.bz2
+9d3a94baa4bfcd9a579b45eea6de3a8c  glib-2.11.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 20 15:50:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 11:50:19 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.92,1.93
Message-ID: <200606201550.k5KFoJdx001182@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1126

Modified Files:
	nfs-utils.spec 
Log Message:
added krb5-devel to buildreq



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- nfs-utils.spec	20 Jun 2006 01:06:50 -0000	1.92
+++ nfs-utils.spec	20 Jun 2006 15:50:17 -0000	1.93
@@ -39,7 +39,7 @@
 Requires: modutils >= 2.4.26-9, nfs-utils-lib, pkgconfig
 BuildRequires: krb5-libs >= 1.4, autoconf >= 2.57, openldap-devel >= 2.2
 BuildRequires: libevent-devel, libgssapi-devel, nfs-utils-lib-devel >= 1.0.8-4
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig, krb5-devel >= 1.4
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 16:01:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 12:01:25 -0400
Subject: rpms/vim/devel 7.0.021, NONE, 1.1 README.patches, 1.47,
	1.48 vim.spec, 1.122, 1.123
Message-ID: <200606201601.k5KG1PDI001567@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1520

Modified Files:
	README.patches vim.spec 
Added Files:
	7.0.021 
Log Message:
- patchlevel 21


--- NEW FILE 7.0.021 ---
To: vim-dev at vim.org
Subject: Patch 7.0.021
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.021
Problem:    Crash when using "\\[" and "\\]" in 'errorformat'. (Marc Weber)
Solution:   Check for valid submatches after matching the pattern.
Files:      src/quickfix.c


*** ../vim-7.0.020/src/quickfix.c	Wed May  3 23:23:30 2006
--- src/quickfix.c	Tue Jun 20 17:04:20 2006
***************
*** 602,614 ****
  		else
  		    type = 0;
  		/*
! 		 * Extract error message data from matched line
  		 */
  		if ((i = (int)fmt_ptr->addr[0]) > 0)		/* %f */
  		{
! 		    int c = *regmatch.endp[i];
  
  		    /* Expand ~/file and $HOME/file to full path. */
  		    *regmatch.endp[i] = NUL;
  		    expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
  		    *regmatch.endp[i] = c;
--- 602,620 ----
  		else
  		    type = 0;
  		/*
! 		 * Extract error message data from matched line.
! 		 * We check for an actual submatch, because "\[" and "\]" in
! 		 * the 'errorformat' may cause the wrong submatch to be used.
  		 */
  		if ((i = (int)fmt_ptr->addr[0]) > 0)		/* %f */
  		{
! 		    int c;
! 
! 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
! 			continue;
  
  		    /* Expand ~/file and $HOME/file to full path. */
+ 		    c = *regmatch.endp[i];
  		    *regmatch.endp[i] = NUL;
  		    expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
  		    *regmatch.endp[i] = c;
***************
*** 618,652 ****
--- 624,686 ----
  			continue;
  		}
  		if ((i = (int)fmt_ptr->addr[1]) > 0)		/* %n */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    enr = (int)atol((char *)regmatch.startp[i]);
+ 		}
  		if ((i = (int)fmt_ptr->addr[2]) > 0)		/* %l */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    lnum = atol((char *)regmatch.startp[i]);
+ 		}
  		if ((i = (int)fmt_ptr->addr[3]) > 0)		/* %c */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    col = (int)atol((char *)regmatch.startp[i]);
+ 		}
  		if ((i = (int)fmt_ptr->addr[4]) > 0)		/* %t */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    type = *regmatch.startp[i];
+ 		}
  		if (fmt_ptr->flags == '+' && !multiscan)	/* %+ */
  		    STRCPY(errmsg, IObuff);
  		else if ((i = (int)fmt_ptr->addr[5]) > 0)	/* %m */
  		{
+ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+ 			continue;
  		    len = (int)(regmatch.endp[i] - regmatch.startp[i]);
  		    vim_strncpy(errmsg, regmatch.startp[i], len);
  		}
  		if ((i = (int)fmt_ptr->addr[6]) > 0)		/* %r */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    tail = regmatch.startp[i];
+ 		}
  		if ((i = (int)fmt_ptr->addr[7]) > 0)		/* %p */
  		{
+ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+ 			continue;
  		    col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
  		    if (*((char_u *)regmatch.startp[i]) != TAB)
  			use_viscol = TRUE;
  		}
  		if ((i = (int)fmt_ptr->addr[8]) > 0)		/* %v */
  		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    col = (int)atol((char *)regmatch.startp[i]);
  		    use_viscol = TRUE;
  		}
  		if ((i = (int)fmt_ptr->addr[9]) > 0)		/* %s */
  		{
+ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+ 			continue;
  		    len = (int)(regmatch.endp[i] - regmatch.startp[i]);
  		    if (len > CMDBUFFSIZE - 5)
  			len = CMDBUFFSIZE - 5;
*** ../vim-7.0.020/src/version.c	Tue Jun 20 16:33:21 2006
--- src/version.c	Tue Jun 20 17:07:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     21,
  /**/

-- 
TALL KNIGHT: We are now no longer the Knights Who Say Ni!
ONE KNIGHT:  Ni!
OTHERS:      Sh!
ONE KNIGHT:  (whispers) Sorry.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- README.patches	20 Jun 2006 14:45:21 -0000	1.47
+++ README.patches	20 Jun 2006 16:01:17 -0000	1.48
@@ -45,3 +45,4 @@
   1649  7.0.018  VMS: plugins are not loaded on startup
   1425  7.0.019  crash for "VjA789" and repeating
   1470  7.0.020  GUI: crash when using 'mousefocus'
+  4240  7.0.021  crash when using "\\[" and "\\]" in 'errorformat


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- vim.spec	20 Jun 2006 14:45:44 -0000	1.122
+++ vim.spec	20 Jun 2006 16:01:17 -0000	1.123
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 020
+%define patchlevel 021
 
 Summary: The VIM editor.
 Name: vim
@@ -74,6 +74,7 @@
 Patch018: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.018
 Patch019: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.019
 Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
+Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -225,6 +226,7 @@
 #patch018 -p0
 %patch019 -p0
 %patch020 -p0
+%patch021 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -561,6 +563,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.021-1
+- patchlevel 21
+
 * Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.020-1
 - patchlevel 20
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 16:33:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 12:33:30 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.72, 1.73 sources,
	1.75, 1.76 system-config-printer.spec, 1.30, 1.31
Message-ID: <200606201633.k5KGXUVl001589@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1558

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Tue Jun 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.14-1
- 0.7.14.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	19 Jun 2006 17:02:33 -0000	1.72
+++ .cvsignore	20 Jun 2006 16:33:27 -0000	1.73
@@ -52,3 +52,4 @@
 system-config-printer-0.7.11.tar.bz2
 system-config-printer-0.7.12.tar.bz2
 system-config-printer-0.7.13.tar.bz2
+system-config-printer-0.7.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	19 Jun 2006 17:02:33 -0000	1.75
+++ sources	20 Jun 2006 16:33:27 -0000	1.76
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-a77a70a4146d454905c73dd138e72bae  system-config-printer-0.7.13.tar.bz2
+32b23bb002b9f179182f4b6754da2400  system-config-printer-0.7.14.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-printer.spec	19 Jun 2006 17:02:33 -0000	1.30
+++ system-config-printer.spec	20 Jun 2006 16:33:27 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.13
+Version: 0.7.14
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -105,6 +105,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Jun 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.14-1
+- 0.7.14.
+
 * Mon Jun 19 2006 Tim Waugh <twaugh at redhat.com> 0.7.13-1
 - 0.7.13.
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 17:18:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 13:18:29 -0400
Subject: rpms/nfs-utils-lib/FC-5 nfs-utils-lib.spec,1.10,1.11
Message-ID: <200606201718.k5KHITbu007347@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7290

Modified Files:
	nfs-utils-lib.spec 
Log Message:
Added FC5 to end of release



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/FC-5/nfs-utils-lib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nfs-utils-lib.spec	19 Jun 2006 15:57:40 -0000	1.10
+++ nfs-utils-lib.spec	20 Jun 2006 17:18:24 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 4
+Release: 4.FC5
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 17:18:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 13:18:33 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.404, 1.405 kernel-2.6.spec, 1.2137, 1.2138 sources, 1.345,
	1.346 upstream, 1.315, 1.316
Message-ID: <200606201718.k5KHIXUr007375@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7335

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.1.bz2.sign 
Log Message:
2.6.17.1



--- NEW FILE patch-2.6.17.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEl8bnyGugalF9Dw4RAltcAJ0ZTYMxtRL+UKM6ISkOjC8j2K4yngCeKbGE
IwThqSk7vrdgHt7HB2Q5/Sk=
=/k0g
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- .cvsignore	18 Jun 2006 04:45:01 -0000	1.404
+++ .cvsignore	20 Jun 2006 17:18:29 -0000	1.405
@@ -3,3 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
+patch-2.6.17.1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2137
retrieving revision 1.2138
diff -u -r1.2137 -r1.2138
--- kernel-2.6.spec	19 Jun 2006 00:39:07 -0000	1.2137
+++ kernel-2.6.spec	20 Jun 2006 17:18:29 -0000	1.2138
@@ -237,7 +237,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-#Patch1: patch-2.6.17-rc6.bz2
+Patch1: patch-2.6.17.1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -719,7 +719,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-#%patch1 -p1
+%patch1 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1630,6 +1630,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2138_FC5]
+- 2.6.17.1
+
 * Sun Jun 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17
 - Only print info about SMP alternatives on SMP kernels.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- sources	18 Jun 2006 04:45:08 -0000	1.345
+++ sources	20 Jun 2006 17:18:30 -0000	1.346
@@ -1,2 +1,3 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
+f7197c29beb5bd28b6f566b58260ece8  patch-2.6.17.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- upstream	18 Jun 2006 04:45:08 -0000	1.315
+++ upstream	20 Jun 2006 17:18:30 -0000	1.316
@@ -1 +1,2 @@
 linux-2.6.17.tar.bz2
+patch-2.6.17.1.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 20 17:33:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 13:33:30 -0400
Subject: rpms/libgssapi/devel libgssapi.spec,1.9,1.10
Message-ID: <200606201733.k5KHXUhE011917@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11713

Modified Files:
	libgssapi.spec 
Log Message:
rebuilt for FC6 release



Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgssapi.spec	8 Jun 2006 20:35:36 -0000	1.9
+++ libgssapi.spec	20 Jun 2006 17:33:16 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.9
-Release: 1
+Release: 2
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.9.tar.gz
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Tue Jun 20 2006 Steve Dickson <steved at redhat.com>  0.9-2
+- rebuilt for FC6 release
+
 * Thu Jun  8 2006 Steve Dickson <steved at redhat.com>  0.9-1
 - Upgraded to 0.9-1 
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 17:47:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 13:47:11 -0400
Subject: rpms/kernel/FC-5 linux-2.6-x86-alternatives-smp-only.patch,1.1,1.2
Message-ID: <200606201747.k5KHlBUe029042@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28269

Modified Files:
	linux-2.6-x86-alternatives-smp-only.patch 
Log Message:
better fix


linux-2.6-x86-alternatives-smp-only.patch:
 alternative.c |    5 +++++
 1 files changed, 5 insertions(+)

Index: linux-2.6-x86-alternatives-smp-only.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-x86-alternatives-smp-only.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-alternatives-smp-only.patch	19 Jun 2006 00:39:07 -0000	1.1
+++ linux-2.6-x86-alternatives-smp-only.patch	20 Jun 2006 17:47:08 -0000	1.2
@@ -5,33 +5,36 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.17.noarch/include/asm-i386/bugs.h~	2006-06-18 20:32:01.000000000 -0400
-+++ linux-2.6.17.noarch/include/asm-i386/bugs.h	2006-06-18 20:32:19.000000000 -0400
-@@ -191,5 +191,7 @@ static void __init check_bugs(void)
- 	check_hlt();
- 	check_popad();
- 	system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
--	alternative_instructions(); 
-+#ifdef CONFIG_SMP
-+	alternative_instructions();
-+#endif
+--- linux-2.6.17.noarch/arch/i386/kernel/alternative.c~	2006-06-20 13:44:40.000000000 -0400
++++ linux-2.6.17.noarch/arch/i386/kernel/alternative.c	2006-06-20 13:46:33.000000000 -0400
+@@ -118,6 +118,7 @@ void apply_alternatives(struct alt_instr
+ 	}
  }
---- linux-2.6.17.noarch/arch/i386/kernel/Makefile~	2006-06-18 20:32:26.000000000 -0400
-+++ linux-2.6.17.noarch/arch/i386/kernel/Makefile	2006-06-18 20:33:04.000000000 -0400
-@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld
- obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
- 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
- 		pci-dma.o i386_ksyms.o i387.o bootflag.o \
--		quirks.o i8237.o topology.o alternative.o
-+		quirks.o i8237.o topology.o
  
- obj-y				+= cpu/
- obj-y				+= timers/
-@@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
- obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
- obj-$(CONFIG_VM86)		+= vm86.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_SMP)		+= alternative.o
++#ifdef CONFIG_SMP
+ static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end)
+ {
+ 	struct alt_instr *a;
+@@ -282,6 +283,8 @@ void alternatives_smp_switch(int smp)
+ 	}
+ 	spin_unlock_irqrestore(&smp_alt, flags);
+ }
++#endif
++
  
- EXTRA_AFLAGS   := -traditional
+ void __init alternative_instructions(void)
+ {
+@@ -297,6 +300,7 @@ void __init alternative_instructions(voi
+ 	smp_alt_once = 1;
+ #endif
  
++#ifdef CONFIG_SMP
+ 	if (smp_alt_once) {
+ 		if (1 == num_possible_cpus()) {
+ 			printk(KERN_INFO "SMP alternatives: switching to UP code\n");
+@@ -318,4 +322,5 @@ void __init alternative_instructions(voi
+ 					    _text, _etext);
+ 		alternatives_smp_switch(0);
+ 	}
++#endif
+ }



From fedora-cvs-commits at redhat.com  Tue Jun 20 17:55:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 13:55:41 -0400
Subject: rpms/kernel/FC-5 linux-2.6-x86-alternatives-smp-only.patch,1.2,1.3
Message-ID: <200606201755.k5KHtf6h001175@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1126

Modified Files:
	linux-2.6-x86-alternatives-smp-only.patch 
Log Message:
compile fix


linux-2.6-x86-alternatives-smp-only.patch:
 alternative.c |    6 ++++++
 1 files changed, 6 insertions(+)

Index: linux-2.6-x86-alternatives-smp-only.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-x86-alternatives-smp-only.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-x86-alternatives-smp-only.patch	20 Jun 2006 17:47:08 -0000	1.2
+++ linux-2.6-x86-alternatives-smp-only.patch	20 Jun 2006 17:55:39 -0000	1.3
@@ -24,14 +24,15 @@
  
  void __init alternative_instructions(void)
  {
-@@ -297,6 +300,7 @@ void __init alternative_instructions(voi
- 	smp_alt_once = 1;
- #endif
+@@ -290,6 +290,8 @@ void __init alternative_instructions(voi
+ {
+ 	apply_alternatives(__alt_instructions, __alt_instructions_end);
  
 +#ifdef CONFIG_SMP
- 	if (smp_alt_once) {
- 		if (1 == num_possible_cpus()) {
- 			printk(KERN_INFO "SMP alternatives: switching to UP code\n");
++
+ 	/* switch to patch-once-at-boottime-only mode and free the
+ 	 * tables in case we know the number of CPUs will never ever
+ 	 * change */
 @@ -318,4 +322,5 @@ void __init alternative_instructions(voi
  					    _text, _etext);
  		alternatives_smp_switch(0);



From fedora-cvs-commits at redhat.com  Tue Jun 20 18:09:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 14:09:32 -0400
Subject: rpms/kernel/FC-5 linux-2.6-x86-alternatives-smp-only.patch,1.3,1.4
Message-ID: <200606201809.k5KI9WaD003706@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3666

Modified Files:
	linux-2.6-x86-alternatives-smp-only.patch 
Log Message:
buildfix


linux-2.6-x86-alternatives-smp-only.patch:
 alternative.c |    6 ++++++
 module.c      |    4 ++++
 2 files changed, 10 insertions(+)

Index: linux-2.6-x86-alternatives-smp-only.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-x86-alternatives-smp-only.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86-alternatives-smp-only.patch	20 Jun 2006 17:55:39 -0000	1.3
+++ linux-2.6-x86-alternatives-smp-only.patch	20 Jun 2006 18:09:17 -0000	1.4
@@ -39,3 +39,27 @@
  	}
 +#endif
  }
+--- linux-2.6.17.noarch/arch/i386/kernel/module.c~	2006-06-20 14:08:15.000000000 -0400
++++ linux-2.6.17.noarch/arch/i386/kernel/module.c	2006-06-20 14:08:56.000000000 -0400
+@@ -125,6 +125,7 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		void *aseg = (void *)alt->sh_addr;
+ 		apply_alternatives(aseg, aseg + alt->sh_size);
+ 	}
++#ifdef CONFIG_SMP
+ 	if (locks && text) {
+ 		void *lseg = (void *)locks->sh_addr;
+ 		void *tseg = (void *)text->sh_addr;
+@@ -132,10 +133,13 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 					    lseg, lseg + locks->sh_size,
+ 					    tseg, tseg + text->sh_size);
+ 	}
++#endif
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++#ifdef CONFIG_SMP
+ 	alternatives_smp_module_del(mod);
++#endif
+ }



From fedora-cvs-commits at redhat.com  Tue Jun 20 18:13:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 14:13:03 -0400
Subject: rpms/control-center/devel control-center.spec,1.147,1.148
Message-ID: <200606201813.k5KID3cx004918@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4871

Modified Files:
	control-center.spec 
Log Message:
fix build reqs



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- control-center.spec	20 Jun 2006 13:32:44 -0000	1.147
+++ control-center.spec	20 Jun 2006 18:13:01 -0000	1.148
@@ -90,6 +90,8 @@
 BuildRequires: gstreamer-plugins-base
 BuildRequires: libglade2-devel
 BuildRequires: libxml2-devel
+BuildRequires: hal-devel >= 0.5.6
+BuildRequires: dbus-devel >= 0.32
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and



From fedora-cvs-commits at redhat.com  Tue Jun 20 18:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 14:25:43 -0400
Subject: rpms/kernel/FC-4/configs config-generic, 1.59, 1.60 config-i586, 1.2,
	1.3 config-i686, 1.1, 1.2 config-ia64-generic, 1.7,
	1.8 config-powerpc-generic, 1.3, 1.4 config-powerpc32-generic,
	1.2, 1.3 config-powerpc64, 1.2, 1.3 config-powerpc64-generic,
	1.1, 1.2 config-powerpc64-iseries, 1.2,
	1.3 config-rhel-generic, 1.2, 1.3 config-s390, 1.1,
	1.2 config-s390-generic, 1.5, 1.6 config-s390x, 1.1,
	1.2 config-x86-generic, 1.23, 1.24 config-x86_64-generic, 1.20,
	1.21 config-xen-generic, 1.10, 1.11 config-xen-x86_64, 1.3,
	1.4 config-xen-xen0, 1.5, 1.6 config-xen-xenU, 1.2, 1.3
Message-ID: <200606201825.k5KIPhXV024667@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24507/configs

Modified Files:
	config-generic config-i586 config-i686 config-ia64-generic 
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 config-powerpc64-generic 
	config-powerpc64-iseries config-rhel-generic config-s390 
	config-s390-generic config-s390x config-x86-generic 
	config-x86_64-generic config-xen-generic config-xen-x86_64 
	config-xen-xen0 config-xen-xenU 
Log Message:
Rebase to 2.6.17.1



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- config-generic	15 Jun 2006 23:40:48 -0000	1.59
+++ config-generic	20 Jun 2006 18:25:41 -0000	1.60
@@ -5,12 +5,11 @@
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
-
+# CONFIG_CRASH_DUMP is not set
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
@@ -36,10 +35,10 @@
 CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_PREEMPT_NONE=y 
-# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_BKL is not set
+CONFIG_PREEMPT_BKL=y
 
 #
 # Loadable module support
@@ -59,7 +58,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
@@ -69,38 +68,38 @@
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_DEBUG_KOBJECT is not set
 
 #
 # PCMCIA/CardBus support
 #
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
 CONFIG_PCMCIA_LOAD_CIS=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_YENTA=y
 CONFIG_CARDBUS=y
 CONFIG_I82092=m
-CONFIG_I82365=m
 CONFIG_PD6729=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
 CONFIG_PCMCIA_IOCTL=y
 
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_WBSD=y
+CONFIG_MMC_SDHCI=m
 
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_IPATH_CORE=m
+CONFIG_INFINIBAND_IPATH=m
 
 #
 # Executable file formats
@@ -118,6 +117,8 @@
 #
 CONFIG_FW_LOADER=y
 
+# CONFIG_SPI is not set
+
 #
 # Memory Technology Devices (MTD)
 #
@@ -162,7 +163,7 @@
 # CONFIG_MTD_PNC2000 is not set
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
+# CONFIG_MTD_SBC_GXX is not set
 CONFIG_MTD_SCx200_DOCFLASH=m
 # CONFIG_MTD_AMD76XROM is not set
 CONFIG_MTD_SCB2_FLASH=m
@@ -200,7 +201,7 @@
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NAND_IDS=m
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_ONENAND is not set
 
 CONFIG_MTD_REDBOOT_PARTS=m
@@ -214,11 +215,9 @@
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-# CONFIG_JFFS2_FS_WRITEBUFFER is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
 
-
 #
 # Parallel port support
 #
@@ -242,6 +241,8 @@
 CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 # CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+# CONFIG_ACPI_HOTKEY is not set
 
 #
 # Block devices
@@ -284,8 +285,8 @@
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_ATIIXP=y
 CONFIG_LBD=y
-# CONFIG_DCSSBLK is not set
-
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_LSF=y
 
 #
 # ATA/ATAPI/MFM/RLL support
@@ -345,7 +346,6 @@
 CONFIG_BLK_DEV_PDC202XX_OLD=y
 # CONFIG_PDC202XX_BURST is not set
 CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_PDC202XX_FORCE=y
 CONFIG_BLK_DEV_SVWKS=y
 CONFIG_BLK_DEV_SIIMAGE=y
 CONFIG_BLK_DEV_SIS5513=y
@@ -396,8 +396,6 @@
 CONFIG_SCSI_3W_9XXX=m
 # CONFIG_SCSI_7000FASST is not set
 CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AIC7XXX=m
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
@@ -417,7 +415,6 @@
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
 # CONFIG_SCSI_ADVANSYS is not set
-CONFIG_SCSI_IN2000=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -438,48 +435,38 @@
 CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_QSTOR=m
 CONFIG_SCSI_SATA_MV=m
+CONFIG_SCSI_SATA_SIL24=m
+CONFIG_SCSI_PDC_ADMA=m
 
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_EATA_PIO is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
-# CONFIG_SCSI_NCR53C406A is not set
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLOGIC_1280_1040=y
-# CONFIG_SCSI_SYM53C416 is not set
 CONFIG_SCSI_DC395x=m
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_QLA2XXX=m
+CONFIG_SCSI_QLA_FC=m
+# FIXME: Turn off for FC6 - Move to external firmware loader.
 CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
@@ -502,11 +489,6 @@
 
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Multi-device support (RAID and LVM)
 #
 CONFIG_MD=y
@@ -515,6 +497,7 @@
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5=m
+CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID6=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_MULTIPATH=m
@@ -530,7 +513,6 @@
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_MAX_SGE=40
@@ -564,8 +546,6 @@
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
 CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
 CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
 # CONFIG_IEEE1394_EXPORT_FULL_API is not set
@@ -594,7 +574,6 @@
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
-CONFIG_IP_TCPDIAG=m
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -645,22 +624,23 @@
 CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
 
-
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_DECNET is not set
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_DECNET_ROUTE_FWMARK=y
+# CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -672,19 +652,25 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
 #
 # IP: Netfilter Configuration
 #
@@ -692,53 +678,32 @@
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_MATCH_CONNMARK=m
-CONFIG_IP_NF_MATCH_COMMENT=m
-CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_REALM=m
-CONFIG_IP_NF_MATCH_SCTP=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_MATCH_DCCP=m
-CONFIG_IP_NF_MATCH_CONNBYTES=m
-CONFIG_IP_NF_MATCH_STRING=m
 CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_TARGET_CONNMARK=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_TARGET_NOTRACK=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_NFQUEUE=m
 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
@@ -762,35 +727,30 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_PHYSDEV=m
+CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_MARK=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_NFQUEUE=m
 
 #
 # Bridge: Netfilter Configuration
@@ -835,10 +795,6 @@
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=y
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
@@ -848,11 +804,19 @@
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
+CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
 #
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+
+#
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
@@ -868,7 +832,6 @@
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_TCINDEX=m
@@ -912,6 +875,7 @@
 #
 # ATM
 # 
+# CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
 CONFIG_ATM_BR2684=m
@@ -958,27 +922,12 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
-CONFIG_PHYCONTROL=y
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
 
 #
 # Tulip family network device support
@@ -996,21 +945,7 @@
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
-# CONFIG_AT1700 is not set
-CONFIG_DEPCA=m
 # CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-CONFIG_EWRK3=m
-CONFIG_E2100=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
 CONFIG_LNE390=m
 CONFIG_NE3210=m
 CONFIG_ES3210=m
@@ -1020,13 +955,10 @@
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
 CONFIG_B44=m
 CONFIG_BNX2=m
-CONFIG_CS89x0=m
 CONFIG_DGRS=m
-CONFIG_EEPRO100=m
+# CONFIG_EEPRO100 is not set
 CONFIG_E100=m
 CONFIG_FEALNX=m
 CONFIG_FORCEDETH=m
@@ -1052,6 +984,7 @@
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_CASSINI=m
+# CONFIG_FEC_8XX is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -1068,7 +1001,7 @@
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-CONFIG_SK98LIN=m
+# CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
@@ -1080,7 +1013,6 @@
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
-# CONFIG_2BUFF_MODE is not set
 CONFIG_CHELSIO_T1=m
 
 CONFIG_FDDI=y
@@ -1097,6 +1029,7 @@
 CONFIG_IPPP_FILTER=y
 # CONFIG_PPP_BSDCOMP is not set
 CONFIG_PPPOE=m
+CONFIG_PPP_MPPE=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
@@ -1112,7 +1045,6 @@
 #
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
-CONFIG_WAVELAN=m
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
 
@@ -1125,13 +1057,13 @@
 # Wireless 802.11b ISA/PCI cards support
 #
 CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 # CONFIG_IPW2100 is not set
-# CONFIG_IPW2100_PROMISC is not set
-# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -1144,6 +1076,8 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1154,13 +1088,14 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_CS=m
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_CS=m
 
 #
 # Token Ring devices
@@ -1168,14 +1103,11 @@
 CONFIG_TR=y
 CONFIG_IBMOL=m
 CONFIG_3C359=m
-CONFIG_TMS380TR=m
+# Broken with gcc4.1
+# CONFIG_TMS380TR is not set
 CONFIG_TMSPCI=m
 CONFIG_ABYSS=m
-CONFIG_IBMTR=m
 CONFIG_IBMLS=m
-CONFIG_SKISA=m
-CONFIG_PROTEON=m
-CONFIG_SMCTR=m
 CONFIG_PCMCIA_IBMTR=m
 
 
@@ -1221,6 +1153,7 @@
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
 CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_LITELINK_DONGLE=m
@@ -1261,7 +1194,6 @@
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
@@ -1271,7 +1203,6 @@
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIBPA10X=m
-CONFIG_USB_BLUETOOTH_TTY=m
 
 #
 # ISDN subsystem
@@ -1279,9 +1210,7 @@
 
 CONFIG_ISDN=m
 CONFIG_ISDN_I4L=m
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
 CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
 CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
 CONFIG_ISDN_DRV_AVMB1_T1PCI=m
 CONFIG_ISDN_DRV_AVMB1_C4=m
@@ -1296,10 +1225,6 @@
 CONFIG_ISDN_AUDIO=y
 
 CONFIG_ISDN_DRV_HISAX=m
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
 CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
 CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
 
@@ -1310,27 +1235,17 @@
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
 CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
 CONFIG_HISAX_FRITZPCI=y
 CONFIG_HISAX_AVM_A1_PCMCIA=y
 CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
 CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
 CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
 CONFIG_HISAX_NETJET=y
 CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
 CONFIG_HISAX_BKM_A4T=y
 CONFIG_HISAX_SCT_QUADRO=y
 CONFIG_HISAX_GAZEL=y
@@ -1341,7 +1256,7 @@
 # CONFIG_HISAX_DEBUG is not set
 CONFIG_HISAX_AVM_A1_CS=m
 CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
+# CONFIG_HISAX_HFCUSB is not set
 CONFIG_HISAX_FRITZ_PCIPNP=m
 CONFIG_HISAX_NO_SENDCOMPLETE=y
 CONFIG_HISAX_NO_LLC=y
@@ -1386,6 +1301,12 @@
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
 
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GIGASET_UNDOCREQ is not set
+
 #
 # Telephony Support
 #
@@ -1437,10 +1358,6 @@
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_ANALOG=m
@@ -1475,6 +1392,7 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_WISTRON_BTNS=m
 
 #
 # Character devices
@@ -1495,6 +1413,7 @@
 # CONFIG_TCG_NSC is not set
 # CONFIG_TCG_ATMEL is not set
 # CONFIG_TCG_INFINEON is not set
+# CONFIG_TELCLOCK is not set
 
 #
 # Serial drivers
@@ -1510,10 +1429,6 @@
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_FOURPORT=m
-CONFIG_SERIAL_8250_ACCENT=m
-CONFIG_SERIAL_8250_BOCA=m
-CONFIG_SERIAL_8250_HUB6=m
 # CONFIG_COMPUTONE is not set
 # CONFIG_CYCLADES is not set
 # CONFIG_DIGIEPCA is not set
@@ -1578,16 +1493,12 @@
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 
-# CONFIG_I2C_ISA is not set
-
 # CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_PCA_ISA=m
 CONFIG_I2C_STUB=m
@@ -1595,7 +1506,6 @@
 #
 # I2C Hardware Sensors Chip support
 #
-CONFIG_I2C_SENSOR=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -1642,19 +1552,22 @@
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_W83792D=m
 
-CONFIG_W1=m 
-CONFIG_W1_MATROX=m 
-CONFIG_W1_DS9490=m 
-CONFIG_W1_DS9490_BRIDGE=m 
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
-CONFIG_W1_DS2433=m
+CONFIG_RTC_X1205_I2C=m
+
+CONFIG_W1=m
 CONFIG_W1_DS2433_CRC=y
 
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS9490=m
+CONFIG_W1_MASTER_DS9490_BRIDGE=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2433=m
+
 #
 # Mice
 #
-# CONFIG_CRASH is not set
 
 #
 # IPMI
@@ -1672,15 +1585,13 @@
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_WDT=m
 # CONFIG_WDT_501 is not set
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
-CONFIG_PCWATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
 CONFIG_I8XX_TCO=m
 # CONFIG_MIXCOMWD is not set
 # CONFIG_SCx200_WDT is not set
@@ -1688,21 +1599,36 @@
 CONFIG_W83877F_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_MACHZ_WDT=m
-CONFIG_SC520_WDT=m
+# CONFIG_SC520_WDT is not set
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALIM1535_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_CPU5_WDT=m
+# CONFIG_SC1200_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_CPU5_WDT is not set
 CONFIG_I6300ESB_WDT=m
-CONFIG_SBC8360_WDT=m
+# CONFIG_SBC8360_WDT is not set
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
 
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
+CONFIG_RTC_CLASS=m
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_SYSFS=m
+CONFIG_RTC_INTF_PROC=m
+CONFIG_RTC_INTF_DEV=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_RS5C372=m
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_SA1100 is not set
+# CONFIG_RTC_DRV_TEST is not set
 CONFIG_DTLK=m
 CONFIG_R3964=m
 # CONFIG_APPLICOM is not set
@@ -1724,7 +1650,6 @@
 CONFIG_AGP_EFFICEON=y
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
@@ -1740,7 +1665,8 @@
 #
 # CONFIG_SYNCLINK_CS is not set
 
-
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
 
 CONFIG_MWAVE=m
 # CONFIG_RAW_DRIVER is not set
@@ -1752,6 +1678,9 @@
 #
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_VIDEO_VIVI is not set
 
 #
 # Video For Linux
@@ -1760,59 +1689,59 @@
 #
 # Video Adapters
 #
+CONFIG_VIDEO_AUDIO_DECODER=m
 CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_BT848_DVB=y
 CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_DECODER=m
+CONFIG_VIDEO_DPC=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_VIDEO_SAA5246A=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_TUNER_3036=m
+CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZORAN_BUZ=m
 CONFIG_VIDEO_ZORAN_DC10=m
 CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_OVCAMCHIP=m
-
+CONFIG_TUNER_3036=m
 
 #
 # Radio Adapters
 #
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
 CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_MIROPCM20_RDS=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
 
 
 #
@@ -1826,7 +1755,6 @@
 #
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
-CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
@@ -1860,7 +1788,6 @@
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
 # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-CONFIG_DVB_TDA80XX=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
 CONFIG_DVB_DIB3000MB=m
@@ -1876,8 +1803,8 @@
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MC=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -1888,6 +1815,11 @@
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA10021=m
+
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_VIDEOBUF=m
@@ -1926,7 +1858,6 @@
 CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GX=y
-# CONFIG_FB_ATY_XL_INIT is not set
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
@@ -1956,14 +1887,18 @@
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_CYBLA=m
+# CONFIG_FB_FIRMWARE_EDID is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FONTS is not set
 
 
@@ -1984,6 +1919,7 @@
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=m
+CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQUENCER_OSS=y
@@ -1991,11 +1927,12 @@
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_RTCTIMER=m
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
 
 #
 # Generic devices
@@ -2009,35 +1946,8 @@
 #
 # ISA devices
 #
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
 CONFIG_SND_AD1889=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
 # CONFIG_SND_WAVEFRONT is not set
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
 
 #
 # PCI devices
@@ -2047,13 +1957,14 @@
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS4281=m
+CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_CA0106=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
 CONFIG_SND_RME32=m
+CONFIG_SND_PCXHR=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
 CONFIG_SND_HDSP=m
@@ -2063,7 +1974,6 @@
 CONFIG_SND_CMIPCI=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
-CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_MAESTRO3=m
@@ -2085,9 +1995,12 @@
 CONFIG_SND_MIXART=m
 CONFIG_SND_FM801_TEA575X=m
 CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSPM=m
+CONFIG_SND_ADLIB=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_RIPTIDE=m
 
 #
 # ALSA USB devices
@@ -2143,7 +2056,7 @@
 CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
-# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_UB=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DATAFAB=y
@@ -2156,6 +2069,7 @@
 CONFIG_USB_STORAGE_USBAT=y
 CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_LIBUSUAL=y
 
 #
 # USB Human Interface Devices (HID)
@@ -2175,7 +2089,9 @@
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
 CONFIG_USB_AIPTEK=m
+
 CONFIG_USB_WACOM=m
+
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
 CONFIG_USB_XPAD=m
@@ -2209,7 +2125,8 @@
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_YEALINK=m
+# Has dumb detection, which gets loaded for every hid device.
+# CONFIG_USB_YEALINK is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_GL620A=m
@@ -2224,22 +2141,12 @@
 #
 CONFIG_USB_AN2720=y
 CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
 
 #
 # Intelligent USB Devices/Gadgets
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
 
 #
 # USB port drivers
@@ -2251,15 +2158,24 @@
 #
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRPRIME=m
+CONFIG_USB_SERIAL_ANYDATA=m
+CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_MPR=y
@@ -2277,21 +2193,16 @@
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_OPTION=y
+CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=y
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_CP2101=m
-CONFIG_USB_SERIAL_AIRPRIME=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_XIRCOM=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2302,7 +2213,7 @@
 #
 # USB Miscellaneous drivers
 #
-# CONFIG_USB_EMI26 is not set
+CONFIG_USB_EMI26=m
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
@@ -2312,31 +2223,35 @@
 # CONFIG_USB_GADGET_GOKU is not set
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
+# CONFIG_USB_GADGETFS is not set
 CONFIG_USB_W9968CF=m
+CONFIG_USB_ZC0301=m
 CONFIG_USB_PWC=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_MTOUCH=m
 CONFIG_USB_ATI_REMOTE=m
+CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
-CONFIG_USB_EGALAX=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_SL811_HCD=m
-CONFIG_USB_KC2190=y
 CONFIG_USB_PHIDGETKIT=m
 CONFIG_USB_MON=y
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ACECAD=m
-CONFIG_USB_ITMTOUCH=m
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
 CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_KEYSPAN_REMOTE=m
+CONFIG_USB_LD=m
+CONFIG_USB_APPLETOUCH=m
+
+CONFIG_USB_TOUCHSCREEN=m
+
 
 #
 # File systems
@@ -2345,7 +2260,7 @@
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT2_FS_XIP=y
 CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -2402,16 +2317,11 @@
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
 CONFIG_TMPFS=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_SECURITY=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
 CONFIG_DEBUG_FS=y
-CONFIG_RELAYFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -2429,6 +2339,8 @@
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_VXFS_FS=m
 # CONFIG_HPFS_FS is not set
 CONFIG_QNX4FS_FS=m
@@ -2459,7 +2371,7 @@
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
+# CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
@@ -2503,6 +2415,7 @@
 CONFIG_SUN_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_KARMA_PARTITION=y
+
 CONFIG_NLS=y
 
 #
@@ -2561,14 +2474,14 @@
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_RODATA=y
+# CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_VM=y
 
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value
@@ -2579,6 +2492,12 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 
+CONFIG_KGDB=y
+# CONFIG_KGDB_CONSOLE is not set
+CONFIG_KGDBOE=m
+# CONFIG_KGDB_SIMPLE_SERIAL is not set
+CONFIG_KGDB_8250_CONF_STRING=""
+
 #
 # Security options
 #
@@ -2639,7 +2558,6 @@
 
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_PC=y
 
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_KEYS=y
@@ -2658,7 +2576,7 @@
 CONFIG_NETDUMP=m
 CONFIG_DISKDUMP=m
 
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 
 CONFIG_TUX=m
 CONFIG_TUX_EXTCGI=y
@@ -2666,68 +2584,170 @@
 # CONFIG_TUX_DEBUG is not set
 
 CONFIG_CPUSETS=y
+CONFIG_RELAY=y
 # CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 
-# CONFIG_DETECT_SOFTLOCKUP is not set
+CONFIG_DETECT_SOFTLOCKUP=y
 
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 
-CONFIG_ACPI_SLEEP_PROC_SLEEP=y
-# CONFIG_ACPI_HOTKEY is not set
 CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_USB_KEYSPAN_REMOTE=m
-CONFIG_USB_ATI_REMOTE2=m
-CONFIG_USB_LD=m
-CONFIG_USB_APPLETOUCH=m
-
 CONFIG_INOTIFY=y
 
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-
 CONFIG_CONNECTOR=m
 
 CONFIG_IBMASR=m
 
 CONFIG_PM_LEGACY=y
-CONFIG_RFD_FTL=m
-# CONFIG_MTD_ONENAND is not set
-CONFIG_BLK_DEV_CS5535=y
-CONFIG_ISCSI_TCP=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_SIL24=m
-# CONFIG_ATM_DUMMY is not set
-CONFIG_PPP_MPPE=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-# CONFIG_TELCLOCK is not set
-CONFIG_RTC_X1205_I2C=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
-CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_AUDIO_DECODER=m
-CONFIG_VIDEO_DECODER=m
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_USB_LIBUSUAL=y
-CONFIG_USB_SERIAL_ANYDATA=m
-CONFIG_INFINIBAND_SRP=m
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_RCU_TORTURE_TEST is not set
 
-# CONFIG_CRASH_DUMP is not set
+CONFIG_CRASH=m
 
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_SCSI_QLA_FC=m
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
-# CONFIG_SPI is not set
+## BEGIN ISA Junk.
+
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+# CONFIG_PCMCIA_PROBE is not set
+# CONFIG_LTPC is not set
+# CONFIG_COPS is not set
+
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_CD_NO_IDESCSI is not set
+
+# CONFIG_EL1 is not set
+# CONFIG_EL2 is not set
+# CONFIG_ELPLUS is not set
+# CONFIG_EL16 is not set
+CONFIG_EL3=m
+# CONFIG_3C515 is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_ULTRA is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+CONFIG_NET_ISA=y
+CONFIG_NE2000=m
+# CONFIG_E2100 is not set
+CONFIG_EWRK3=m
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_LP486E is not set
+# CONFIG_ETH16I is not set
+# CONFIG_ZNET is not set
+# CONFIG_SEEQ8005 is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_IBMTR is not set
+# CONFIG_SKISA is not set
+# CONFIG_PROTEON is not set
+# CONFIG_SMCTR is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_HISAX_16_0 is not set
+# CONFIG_HISAX_AVM_A1 is not set
+# CONFIG_HISAX_IX1MICROR2 is not set
+# CONFIG_HISAX_ASUSCOM is not set
+# CONFIG_HISAX_TELEINT is not set
+# CONFIG_HISAX_HFCS is not set
+# CONFIG_HISAX_SPORTSTER is not set
+# CONFIG_HISAX_MIC is not set
+# CONFIG_HISAX_ISURF is not set
+# CONFIG_HISAX_HSTSAPHIR is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
+
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_ATIXL is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_WDT is not set
+
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+
+# CONFIG_SND_OPL4_LIB is not set
+# CONFIG_SND_AD1848_LIB is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+CONFIG_SND_CS4231_LIB=m
+CONFIG_SND_CS4236=m
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUS_SYNTH is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_SB8 is not set
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+# CONFIG_SND_SB16_CSP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_DT019X is not set
+CONFIG_SND_OPL3SA2=m
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+## END of ISA options.
+
+# FIXME: This needs to be made to depend on PPC
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
+
+CONFIG_UNWIND_INFO=y
 # CONFIG_FORCED_INLINING is not set
+
+CONFIG_MIGRATION=y
+# CONFIG_NEW_LEDS is not set
+


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-i586,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i586	22 Apr 2005 04:01:53 -0000	1.2
+++ config-i586	20 Jun 2006 18:25:41 -0000	1.3
@@ -3,3 +3,51 @@
 # CONFIG_MICROCODE is not set
 # CONFIG_PROFILING is not set
 CONFIG_X86_POWERNOW_K6=m
+
+# CONFIG_X86_MCE_P4THERMAL is not set
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_IBM is not set
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+# CONFIG_X86_POWERNOW_K8 is not set
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+# CONFIG_HOTPLUG_PCI_PCIE is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_MTD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_DISKDUMP is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_SYNCLINK is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_STALDRV is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_HPET is not set
+# CONFIG_W1 is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_MMC is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_KPROBES is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+
+# CONFIG_X86_UP_APIC is not set
+


Index: config-i686
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-i686,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-i686	6 Feb 2005 05:49:11 -0000	1.1
+++ config-i686	20 Jun 2006 18:25:41 -0000	1.2
@@ -1,5 +1,5 @@
 CONFIG_M686=y
-# CONFIG_NOHIGHMEM is not set
 # CONFIG_SMP is not set
+# CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-ia64-generic	28 Mar 2006 16:14:10 -0000	1.7
+++ config-ia64-generic	20 Jun 2006 18:25:41 -0000	1.8
@@ -1,12 +1,16 @@
 #
 # Automatically generated make config: don't edit
 #
- 
+
 #
 # Processor type and features
 #
 CONFIG_IA64=y
 CONFIG_64BIT=y
+# CONFIG_XEN is not set
+# CONFIG_ARCH_XEN is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+# CONFIG_XEN_VT is not set
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_TIME_INTERPOLATION=y
@@ -31,13 +35,14 @@
 # CONFIG_MMTIMER is not set
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=1024
 # CONFIG_IA32_SUPPORT is not set
 # CONFIG_COMPAT is not set
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
 CONFIG_EFI_VARS=y
 CONFIG_SERIAL_8250_ACPI=y
+CONFIG_SERIAL_8250_RUNTIME_UARTS=16
 CONFIG_EFI_PCDP=y
 #
 # Block devices
@@ -48,7 +53,6 @@
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_MAX_HWIFS=4
-
 CONFIG_BLK_DEV_SGIIOC4=m
 
 #
@@ -91,11 +95,11 @@
 #
 # CONFIG_MTD is not set
 
-# 
+#
 # SGI
-# 
+#
 CONFIG_SGI_SNSC=y
-# CONFIG_IA64_SGI_SN_XP is not set
+CONFIG_IA64_SGI_SN_XP=y
 
 #
 # SCSI low-level drivers
@@ -125,7 +129,8 @@
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
 # CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
@@ -162,3 +167,11 @@
 
 CONFIG_SERIAL_SGI_IOC3=m
 CONFIG_SGI_IOC3=m
+
+# CONFIG_PERMIT_BSP_REMOVE is not set
+# CONFIG_FORCE_CPEI_RETARGET is not set
+
+CONFIG_NODES_SHIFT=8
+
+# CONFIG_BCM43XX is not set
+


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc-generic	28 Mar 2006 16:14:10 -0000	1.3
+++ config-powerpc-generic	20 Jun 2006 18:25:41 -0000	1.4
@@ -40,7 +40,7 @@
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
 CONFIG_WINDFARM=y
-CONFIG_WINDFARM_PM112=m
+CONFIG_WINDFARM_PM112=y
 CONFIG_I2C_POWERMAC=y
 CONFIG_APPLE_AIRPORT=m
 CONFIG_SERIAL_PMACZILOG=m
@@ -82,3 +82,4 @@
 # CONFIG_SCSI_BUSLOGIC is not set
 
 CONFIG_USB_HIDINPUT_POWERBOOK=y
+


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc32-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc32-generic	28 Mar 2006 16:14:10 -0000	1.2
+++ config-powerpc32-generic	20 Jun 2006 18:25:41 -0000	1.3
@@ -7,7 +7,7 @@
 CONFIG_CLASSIC32=y
 CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC_MULTIPLATFORM=y
-# CONFIG_PPC_CHRP is not set
+CONFIG_PPC_CHRP=y
 CONFIG_PPC_PMAC=y
 # CONFIG_PPC_PREP is not set
 
@@ -56,15 +56,11 @@
 
 CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
-CONFIG_FB_ATY_XL_INIT=y
 CONFIG_FB_MATROX=y
 # CONFIG_KPROBES is not set
 # CONFIG_DISKDUMP is not set
 
 # CONFIG_CRASH is not set
 
-# drivers/media/video/cx25840/cx25840.ko needs unknown symbol __ucmpdi2
-# CONFIG_VIDEO_DECODER is not set
-
 # CONFIG_HVC_RTAS is not set
 # CONFIG_MAMBO is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc64	28 Mar 2006 16:14:10 -0000	1.2
+++ config-powerpc64	20 Jun 2006 18:25:41 -0000	1.3
@@ -5,6 +5,7 @@
 CONFIG_PPC_CELL=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
+CONFIG_KEXEC=y
 CONFIG_PPC_PMAC=y
 CONFIG_IBMEBUS=y
 CONFIG_SPU_FS=m
@@ -28,7 +29,6 @@
 CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
-CONFIG_I2C_PMAC_SMU=m
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y


Index: config-powerpc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-powerpc64-generic	6 Jan 2006 05:54:36 -0000	1.1
+++ config-powerpc64-generic	20 Jun 2006 18:25:41 -0000	1.2
@@ -1,4 +1,5 @@
 CONFIG_PPC64=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_NR_CPUS=128
 CONFIG_BLK_DEV_SL82C105=y
 # CONFIG_FB_PLATINUM is not set


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64-iseries,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc64-iseries	28 Mar 2006 16:14:10 -0000	1.2
+++ config-powerpc64-iseries	20 Jun 2006 18:25:41 -0000	1.3
@@ -46,7 +46,6 @@
 # CONFIG_ATM_FIRESTREAM is not set
 # CONFIG_SCHED_SMT is not set
 # CONFIG_XMON is not set
-# CONFIG_ROCKETPORT is not set
 # CONFIG_WINDFARM is not set
 CONFIG_LPARCFG=y
 CONFIG_HOTPLUG_PCI=y


Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-rhel-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-rhel-generic	29 Sep 2005 23:07:41 -0000	1.2
+++ config-rhel-generic	20 Jun 2006 18:25:41 -0000	1.3
@@ -13,11 +13,9 @@
 # CONFIG_PCMCIA_NINJA_SCSI is not set
 # CONFIG_PCMCIA_QLOGIC is not set
 # CONFIG_IEEE1394 is not set
-# CONFIG_EL1 is not set
 # CONFIG_EL2 is not set
 # CONFIG_ELPLUS is not set
 # CONFIG_WD80x3 is not set
-# CONFIG_IRDA is not set
 # CONFIG_GAMEPORT is not set
 # CONFIG_DVB is not set
 # CONFIG_SND_AD1816A is not set
@@ -123,7 +121,6 @@
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_BWQCAM is not set
@@ -136,7 +133,6 @@
 # CONFIG_TUNER_3036 is not set
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_ZORAN_BUZ is not set
 # CONFIG_VIDEO_ZORAN_DC10 is not set
 # CONFIG_VIDEO_ZORAN_DC30 is not set
@@ -167,7 +163,6 @@
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
 # CONFIG_LANCE is not set
-# CONFIG_ELPLUS is not set
 # CONFIG_EL16 is not set
 # CONFIG_EL3 is not set
 # CONFIG_3C515 is not set
@@ -177,7 +172,6 @@
 # CONFIG_NET_SB1000 is not set
 # CONFIG_DEPCA is not set
 # CONFIG_ATP is not set
-# CONFIG_FB_NEOMAGIC is not set
 # CONFIG_INFTL is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
@@ -194,4 +188,5 @@
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_I2C_PCA_ISA is not set
-CONFIG_RAW_DRIVER=y
+# CONFIG_DECNET is not set
+


Index: config-s390
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-s390,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-s390	6 Feb 2005 05:49:11 -0000	1.1
+++ config-s390	20 Jun 2006 18:25:41 -0000	1.2
@@ -1,6 +1,4 @@
-# CONFIG_ARCH_S390X is not set
 # CONFIG_64BIT is not set
-CONFIG_ARCH_S390_31=y
 CONFIG_MARCH_G5=y
 # CONFIG_MARCH_Z900 is not set
 # CONFIG_MARCH_Z990 is not set


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-s390-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-s390-generic	28 Mar 2006 16:14:10 -0000	1.5
+++ config-s390-generic	20 Jun 2006 18:25:41 -0000	1.6
@@ -24,11 +24,9 @@
 # CONFIG_PROCESS_DEBUG is not set
 CONFIG_PFAULT=y
 # CONFIG_SHARED_KERNEL is not set
-CONFIG_CMM=y
-# CONFIG_CMM_PROC is not set
+CONFIG_CMM=m
+CONFIG_CMM_PROC=y
 CONFIG_VIRT_TIMER=y
-CONFIG_DASD_EER=m
-CONFIG_DASD_CMB=m
 CONFIG_NETIUCV=m
 CONFIG_SMSGIUCV=m
 
@@ -42,12 +40,15 @@
 #
 # S/390 block device drivers
 #
+CONFIG_DCSSBLK=m
 CONFIG_BLK_DEV_XPRAM=m
 CONFIG_DASD=m
-# CONFIG_DASD_PROFILE is not set
+CONFIG_DASD_PROFILE=y
 CONFIG_DASD_ECKD=m
 CONFIG_DASD_FBA=m
 CONFIG_DASD_DIAG=m
+CONFIG_DASD_EER=y
+CONFIG_DASD_CMB=m
 
 #
 # S/390 character device drivers
@@ -64,13 +65,14 @@
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=y
 CONFIG_S390_TAPE=m
+CONFIG_S390_TAPE_3590=m
 
 CONFIG_APPLDATA_BASE=y
-CONFIG_APPLDATA_MEM=y
-CONFIG_APPLDATA_OS=y
-CONFIG_APPLDATA_NET_SUM=y
+CONFIG_APPLDATA_MEM=m
+CONFIG_APPLDATA_OS=m
+CONFIG_APPLDATA_NET_SUM=m
 CONFIG_TN3270_TTY=y
-# CONFIG_TN3270_FS is not set
+CONFIG_TN3270_FS=m
 
 
 #
@@ -105,8 +107,7 @@
 CONFIG_CTC=m
 CONFIG_IUCV=m
 CONFIG_QETH=m
-#  IPv6 support in qeth is disabled until the generate_eui64 is resolved.
-# CONFIG_QETH_IPV6 is not set
+CONFIG_QETH_IPV6=y
 CONFIG_QETH_VLAN=y
 CONFIG_QETH_PERF_STATS=y
 CONFIG_CCWGROUP=m
@@ -144,14 +145,12 @@
 #
 # Kernel hacking
 #
-# The s390 used to blow up with slab debugging, recheck if it works now
-CONFIG_DEBUG_SLAB=y
 
 #
 # S390 specific stack options; needs gcc 3.5 so off for now
 #
-CONFIG_PACK_STACK=y 
-# CONFIG_CHECK_STACK is not set
+CONFIG_PACK_STACK=y
+CONFIG_CHECK_STACK=y
 # CONFIG_WARN_STACK is not set
 # CONFIG_SMALL_STACK is not set
 
@@ -164,7 +163,7 @@
 
 CONFIG_VIRT_CPU_ACCOUNTING=y
 
-CONFIG_CLAW=m
+# CONFIG_CLAW is not set
 
 CONFIG_VMCP=m
 
@@ -174,5 +173,12 @@
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MII is not set
 
+# Breaks qeth (Feb 8th 2006)
+# CONFIG_DEBUG_SLAB is not set
+
 # CONFIG_BOOT_DELAY is not set
 
+CONFIG_STACK_GUARD=256
+CONFIG_CMM_IUCV=y
+
+# CONFIG_DETECT_SOFTLOCKUP is not set


Index: config-s390x
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-s390x,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-s390x	6 Feb 2005 05:49:11 -0000	1.1
+++ config-s390x	20 Jun 2006 18:25:41 -0000	1.2
@@ -1,9 +1,7 @@
-CONFIG_ARCH_S390X=y
 CONFIG_64BIT=y
 # CONFIG_MARCH_G5 is not set
 CONFIG_MARCH_Z900=y
 # CONFIG_MARCH_Z990 is not set
 CONFIG_NR_CPUS=64
-CONFIG_S390_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_BINFMT_ELF32=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-x86-generic	4 Apr 2006 18:42:16 -0000	1.23
+++ config-x86-generic	20 Jun 2006 18:25:41 -0000	1.24
@@ -1,15 +1,19 @@
 CONFIG_UID16=y
+CONFIG_X86_64_XEN is not set
 #
 # Processor type and features
 #
-CONFIG_X86_PC=y
+#
+# Enable summit and co via the generic arch
+#
+# CONFIG_X86_PC is not set
+CONFIG_X86_GENERICARCH=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -48,7 +52,6 @@
 CONFIG_HPET_EMULATE_RTC=y
 # CONFIG_HPET_RTC_IRQ is not set
 # CONFIG_HPET_MMAP is not set
-CONFIG_NR_CPUS=8
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y
@@ -63,22 +66,20 @@
 CONFIG_X86_CPUID=m
 CONFIG_EDD=m
 # CONFIG_NUMA is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
-CONFIG_HAVE_DEC_LOCK=y
 CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_APIC_DEFAULT_OFF=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_PM_TIMER=y
 
-# CONFIG_EFI is not set
-CONFIG_REGPARM=y
+CONFIG_EFI=y
+CONFIG_EFI_VARS=y
+CONFIG_EFI_PCDP=y
+CONFIG_EFI_RTC=y
 
+CONFIG_REGPARM=y
 
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -88,7 +89,7 @@
 #
 # x86 specific drivers
 #
-CONFIG_MDA_CONSOLE=m
+CONFIG_ROCKETPORT=m
 CONFIG_SYNCLINK_CS=m
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
@@ -97,7 +98,6 @@
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_CRASH=m
 CONFIG_CAPI_EICON=y
 
 CONFIG_I2O=m
@@ -107,7 +107,7 @@
 CONFIG_I2O_CONFIG=y
 CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_CONFIG_OLD_IOCTL=y 
 CONFIG_I2O_BUS=m
 
 #
@@ -124,13 +124,11 @@
 
 #
 # Kernel debugging
-# 
+#
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 
 CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@@ -141,13 +139,11 @@
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=2001
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
@@ -172,11 +168,11 @@
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 # CONFIG_X86_POWERNOW_K6 is not set
 CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
@@ -190,12 +186,11 @@
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
-# CONFIG_SMP_ALTERNATIVES is not set
 
 #
 # various x86 specific drivers
-# 
-CONFIG_NVRAM=m
+#
+CONFIG_NVRAM=y
 CONFIG_IBM_ASM=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
@@ -204,15 +199,21 @@
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 # CONFIG_IRQBALANCE is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DEBUG is not set
+CONFIG_SOFTWARE_SUSPEND=y
+# FIXME: Disable this before release.
+CONFIG_PM_DEBUG=y
+CONFIG_PM_STD_PARTITION=""
 
+CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_STACK_BACKTRACE_COLS=2
 CONFIG_4KSTACKS=y
 CONFIG_KPROBES=y
 
+# FIXME: Disable before release.
+# CONFIG_DEBUG_PAGEALLOC is not set
+
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
@@ -222,32 +223,27 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m 
+CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_ACPI_IBM_DOCK=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_PM=y
-CONFIG_NET_ISA=y
 
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT=m
-CONFIG_IEEE80211_WPA=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
-# CONFIG_IPW_DEBUG is not set
-CONFIG_IPW2100_PROMISC=y
-# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW_QOS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 
@@ -270,13 +266,13 @@
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_ISA=m
 CONFIG_I2C_VOODOO3=m
 
 # CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_PHYSICAL_START=0x400000
 
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
 
 CONFIG_CS5535_GPIO=m
 
@@ -290,4 +286,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 
+CONFIG_SCHED_MC=y
+
 CONFIG_SND_ES18XX=m
+
+CONFIG_TCG_INFINEON=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-x86_64-generic	28 Mar 2006 16:14:10 -0000	1.20
+++ config-x86_64-generic	20 Jun 2006 18:25:41 -0000	1.21
@@ -1,5 +1,6 @@
-CONFIG_UID16=y
 # CONFIG_SMP is not set
+CONFIG_UID16=y
+# CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
@@ -15,11 +16,9 @@
 CONFIG_X86_POWERNOW_K8=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
-CONFIG_INIT_DEBUG=y
 # CONFIG_IOMMU_DEBUG is not set
-# CONFIG_CHECKING is not set
 CONFIG_DEBUG_RODATA=y
-CONFIG_MICROCODE=m 
+CONFIG_MICROCODE=m
 CONFIG_SWIOTLB=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_EDD=m
@@ -40,8 +39,10 @@
 
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DEBUG is not set
+CONFIG_SOFTWARE_SUSPEND=y
+# FIXME: Disable this before release.
+CONFIG_PM_DEBUG=y
+CONFIG_PM_STD_PARTITION=""
 
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -55,7 +56,7 @@
 CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y 
+CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -78,13 +79,15 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_IBM_DOCK=y
+CONFIG_ACPI_HOTPLUG_MEMORY=m
 
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m 
+CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
@@ -105,9 +108,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW_QOS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
@@ -141,7 +144,7 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_NVRAM=m
+CONFIG_NVRAM=y
 
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
@@ -153,3 +156,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 
+CONFIG_REORDER=y
+
+CONFIG_SCHED_MC=y
+
+CONFIG_TCG_INFINEON=m


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-xen-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-xen-generic	29 Sep 2005 23:07:41 -0000	1.10
+++ config-xen-generic	20 Jun 2006 18:25:41 -0000	1.11
@@ -1,7 +1,6 @@
 #
 # XEN
 #
-CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_XEN_WRITABLE_PAGETABLES=y
@@ -15,13 +14,18 @@
 # CONFIG_XEN_NETDEV_GRANT_TX is not set
 # CONFIG_XEN_NETDEV_GRANT_RX is not set
 # CONFIG_SMP_ALTERNATIVES is not set
-CONFIG_X86=y
-# CONFIG_X86_64 is not set
+# CONFIG_XEN_PCIDEV_BACKEND is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+# CONFIG_XEN_PCIDEV_FRONTEND is not set
+# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
+CONFIG_XEN_NETDEV_LOOPBACK=y
+CONFIG_XEN_BACKEND=y
 
 #
 # X86 Processor Configuration
 #
-CONFIG_XENARCH="i386"
+CONFIG_X86_XEN=y
+# CONFIG_X86_GENERICARCH is not set
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -57,9 +61,9 @@
 # Firmware Drivers
 #
 # CONFIG_EDD is not set
-CONFIG_NOHIGHMEM=y
-# CONFIG_HIGHMEM4G is not set
-# HIGHMEM64G is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_REGPARM is not set
 
@@ -75,10 +79,16 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
 # CONFIG_KPROBES is not set
+# CONFIG_UNWIND_INFO is not set
+
+# FIXME: Why?
+# CONFIG_DEBUG_RODATA is not set
+# FIXME: Why?
+# CONFIG_DEBUG_SLAB_LEAK is not set
 
 #
 # Disabled until I figure out a way to make next_ram_page work
-# 
+#
 # CONFIG_NETDUMP is not set
 # CONFIG_DISKDUMP is not set
 
@@ -103,3 +113,19 @@
 # Cryptographic options
 #
 CONFIG_CRYPTO_AES_586=m
+
+#
+# kexec does not work with Xen right now.
+#
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH is not set
+CONFIG_XEN_SYSFS=y
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+CONFIG_PCI_GODIRECT=y
+# CONFIG_PCI_GOXEN_FE is not set
+# CONFIG_PCI_GOANY is not set
+CONFIG_PCI_DIRECT=y
+CONFIG_PCIEPORTBUS=y
+# CONFIG_TCG_TPM is not set


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-xen-x86_64,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-x86_64	29 Sep 2005 23:07:41 -0000	1.3
+++ config-xen-x86_64	20 Jun 2006 18:25:41 -0000	1.4
@@ -3,8 +3,8 @@
 # CONFIG_X86 is not set
 CONFIG_X86_64=y
 
-# CONFIG_XEN_X86 is not set
-CONFIG_XEN_X86_64=y
+# CONFIG_X86_XEN is not set
+CONFIG_X86_64_XEN=y
 
 CONFIG_XENARCH="x86_64"
 # CONFIG_MPSC is not set
@@ -12,3 +12,6 @@
 
 CONFIG_NR_CPUS=8
 # CONFIG_EARLY_PRINTK is not set
+
+CONFIG_PCI=y
+# CONFIG_PCI_MMCONFIG is not set


Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-xen-xen0,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-xen-xen0	29 Sep 2005 23:07:41 -0000	1.5
+++ config-xen-xen0	20 Jun 2006 18:25:41 -0000	1.6
@@ -5,17 +5,17 @@
 CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
+# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
+# CONFIG_PCI_GOANY is not set
 
 # Microcode driver in Xen won't work as a module - should be upgraded
 CONFIG_MICROCODE=y
@@ -33,6 +33,8 @@
 # CONFIG_3C515 is not set
 # CONFIG_NI65 is not set
 # CONFIG_ELPLUS is not set
+# B44 results in "b44.ko needs unknown symbol dma_get_cache_alignment"
+# CONFIG_B44 is not set
 
 #
 # SCSI low-level drivers
@@ -49,6 +51,7 @@
 #
 CONFIG_SERIAL_8250=m
 # CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_XEN_DISABLE_SERIAL is not set
 
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
@@ -57,3 +60,20 @@
 # FIR device drivers
 #
 # CONFIG_TOSHIBA_FIR is not set
+
+# 
+# TPM
+# 
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+
+#
+# Power management bits that don't work in Xen:
+#
+# CONFIG_X86_POWERNOW_K7 is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_PCI=y
+CONFIG_PCI_GODIRECT=y
+# CONFIG_PCI_GOXEN_FE is not set
+CONFIG_PCI_DIRECT=y
+CONFIG_PCIEPORTBUS=y


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-xen-xenU,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-xenU	12 Feb 2005 16:32:18 -0000	1.2
+++ config-xen-xenU	20 Jun 2006 18:25:41 -0000	1.3
@@ -6,19 +6,28 @@
 # CONFIG_XEN_BLKDEV_BACKEND is not set
 # CONFIG_XEN_NETDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
+CONFIG_XEN_DISABLE_SERIAL=y
 
 #
 # Disable the non-xen drivers, since unprivileged guests
 # do not get hardware access
 
 #
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA etc.)
 #
 # CONFIG_PCI is not set
 # CONFIG_ISA is not set
 # CONFIG_HOTPLUG is not set
+# CONFIG_AGP is not set
+
+#
+# Platform support
+#
+# CONFIG_I2C is not set
+# CONFIG_W1 is not set
+# CONFIG_EDAC is not set
 
 #
 # PCMCIA/CardBus support
@@ -33,9 +42,10 @@
 # CONFIG_FW_LOADER is not set
 
 #
-# Memory Technology Devices (MTD)
+# Memory Devices (MTD, MMC etc)
 #
 # CONFIG_MTD is not set
+# CONFIG_MMC is not set
 
 #
 # Parallel port support
@@ -69,3 +79,52 @@
 #
 # CONFIG_ATMEL is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RADIO_MAESTRO is not set
+
+# 
+# TPM
+# 
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+
+# CONFIG_TOSHIBA is not set
+# CONFIG_MICROCODE is not set
+
+#
+# FB devices
+#
+# CONFIG_FB_MODE_HELPERS is not set
+
+#
+# Video/DVB devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB is not set
+
+#
+# Networking
+#
+# CONFIG_PHYLIB is not set
+# CONFIG_NET_RADIO is not set
+
+#
+# ISDN/Modems
+#
+# CONFIG_ISDN is not set
+# CONFIG_MWAVE is not set
+# CONFIG_CS5535_GPIO is not set
+
+#
+# HW monitoring
+#
+# CONFIG_HWMON is not set
+
+#
+# Audio
+#
+# CONFIG_SND is not set
+
+#
+# Hardware crypto
+#
+# CONFIG_CRYPTO_DEV_PADLOCK is not set



From fedora-cvs-commits at redhat.com  Tue Jun 20 18:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 14:25:43 -0400
Subject: rpms/kernel/FC-4 linux-2.6-ac97_unregister_controls_ad18xx.patch,
 NONE, 1.1 linux-2.6-autofs-invalidate.patch, NONE,
 1.1 linux-2.6-cell-mambo-drivers.patch, NONE,
 1.1 linux-2.6-console-suspend.patch, NONE,
 1.1 linux-2.6-defaults-phys-start.patch, NONE,
 1.1 linux-2.6-defaults-unicode-vt.patch, NONE,
 1.1 linux-2.6-hvc-console.patch, 1.2,
 1.3 linux-2.6-iscsi-update-to-2-6-18-upstream.patch, NONE,
 1.1 linux-2.6-offb-find-fb.patch, NONE, 1.1 linux-2.6-powernow-k7-smp.patch,
 NONE, 1.1 linux-2.6-ppc-iseries-input-layer.patch, NONE,
 1.1 linux-2.6-proc-self-maps-fix.patch, NONE,
 1.1 linux-2.6-random-patches.patch, NONE,
 1.1 linux-2.6-sata-ahci-suspend.patch, NONE,
 1.1 linux-2.6-serial-resume.patch, NONE, 1.1 linux-2.6-warn-c-p-a.patch,
 NONE, 1.1 linux-2.6-x86-alternatives-smp-only.patch, NONE,
 1.1 linux-2.6-x86-tune-generic.patch, NONE,
 1.1 linux-2.6-x86_64-noisy-syscalls.patch, NONE,
 1.1 linux-2.6.17.tar.bz2.sign, NONE, 1.1 patch-2.6.17.1.bz2.sign, NONE,
 1.1 .cvsignore, 1.192, 1.193 kernel-2.6.spec, 1.1643, 1.1644 linu!
 x-2.6-build-nonintconfig.patch, 1.4, 1.5 linux-2.6-crash-driver.patch, 1.1,
 1.2 linux-2.6-debug-Wundef.patch, 1.3,
 1.4 linux-2.6-debug-disable-builtins.patch, 1.3,
 1.4 linux-2.6-debug-list_head.patch, 1.4,
 1.5 linux-2.6-debug-oops-pause.patch, 1.2,
 1.3 linux-2.6-debug-periodic-slab-check.patch, 1.3,
 1.4 linux-2.6-debug-singlebiterror.patch, 1.4,
 1.5 linux-2.6-debug-sysfs-crash-debugging.patch, 1.2,
 1.3 linux-2.6-debug-taint-vm.patch, 1.5, 1.6 linux-2.6-devmem.patch, 1.3,
 1.4 linux-2.6-execshield.patch, 1.6, 1.7 linux-2.6-ide-tune-locking.patch,
 1.3, 1.4 linux-2.6-module_version.patch, 1.1,
 1.2 linux-2.6-optimise-spinlock-debug.patch, 1.1,
 1.2 linux-2.6-radeon-backlight.patch, 1.5,
 1.6 linux-2.6-sata-promise-pata-ports.patch, 1.6,
 1.7 linux-2.6-sched-up-migration-cost.patch, 1.1, 1.2 linux-2.6-tux.patch,
 1.6, 1.7 sources, 1.176, 1.177 upstream, 1.117,
 1.118 linux-2.6-8250-16c950-faster.patch, 1.3,
 NONE linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, 1.1,
 NONE linux-2.6-audit-new-msg-types.patch, 1.1, NONE linux-2.6-a!
 utofs-pathlookup.patch,1.1,NONE linux-2.6-bzimage.patch,1.4,NO!
 NE linux
Message-ID: <200606201825.k5KIPhZc024658@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24507

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-build-nonintconfig.patch 
	linux-2.6-crash-driver.patch linux-2.6-debug-Wundef.patch 
	linux-2.6-debug-disable-builtins.patch 
	linux-2.6-debug-list_head.patch 
	linux-2.6-debug-oops-pause.patch 
	linux-2.6-debug-periodic-slab-check.patch 
	linux-2.6-debug-singlebiterror.patch 
	linux-2.6-debug-sysfs-crash-debugging.patch 
	linux-2.6-debug-taint-vm.patch linux-2.6-devmem.patch 
	linux-2.6-execshield.patch linux-2.6-ide-tune-locking.patch 
	linux-2.6-module_version.patch 
	linux-2.6-optimise-spinlock-debug.patch 
	linux-2.6-radeon-backlight.patch 
	linux-2.6-sata-promise-pata-ports.patch 
	linux-2.6-sched-up-migration-cost.patch linux-2.6-tux.patch 
	sources upstream 
Added Files:
	linux-2.6-ac97_unregister_controls_ad18xx.patch 
	linux-2.6-autofs-invalidate.patch 
	linux-2.6-cell-mambo-drivers.patch 
	linux-2.6-console-suspend.patch 
	linux-2.6-defaults-phys-start.patch 
	linux-2.6-defaults-unicode-vt.patch 
	linux-2.6-hvc-console.patch 
	linux-2.6-iscsi-update-to-2-6-18-upstream.patch 
	linux-2.6-offb-find-fb.patch linux-2.6-powernow-k7-smp.patch 
	linux-2.6-ppc-iseries-input-layer.patch 
	linux-2.6-proc-self-maps-fix.patch 
	linux-2.6-random-patches.patch 
	linux-2.6-sata-ahci-suspend.patch 
	linux-2.6-serial-resume.patch linux-2.6-warn-c-p-a.patch 
	linux-2.6-x86-alternatives-smp-only.patch 
	linux-2.6-x86-tune-generic.patch 
	linux-2.6-x86_64-noisy-syscalls.patch 
	linux-2.6.17.tar.bz2.sign patch-2.6.17.1.bz2.sign 
Removed Files:
	linux-2.6-8250-16c950-faster.patch 
	linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch 
	linux-2.6-audit-new-msg-types.patch 
	linux-2.6-autofs-pathlookup.patch linux-2.6-bzimage.patch 
	linux-2.6-crashdump-common.patch 
	linux-2.6-crashdump-reboot-exports.patch 
	linux-2.6-debug-dual-line-backtrace.patch 
	linux-2.6-debug-pm-pci.patch 
	linux-2.6-debug-reference-discarded-return-result.patch 
	linux-2.6-debug-slab-leaks.patch 
	linux-2.6-defaults-enable-sata-atapi.patch 
	linux-2.6-diskdump.patch linux-2.6-drm-cripple-r300.patch 
	linux-2.6-dump_smp_call_function.patch 
	linux-2.6-ide-cd-shutup.patch 
	linux-2.6-mv643xx-compile-fix.patch 
	linux-2.6-net-ipw2200-hwcrypto.patch 
	linux-2.6-net-wireless-features.patch 
	linux-2.6-netconsole.patch linux-2.6-netdump.patch 
	linux-2.6-obsolete-idescsi-warning.patch 
	linux-2.6-pcmcia-disable-warning.patch 
	linux-2.6-pwc-powerup-by-default.patch 
	linux-2.6-scsi-advansys-enabler.patch 
	linux-2.6-selinux-disable-attributes-no-policy.patch 
	linux-2.6-selinux-selinuxfs-hard-link-count.patch 
	linux-2.6-signal-trampolines-unwind-info.patch 
	linux-2.6-smsc-ircc2-pnp.patch linux-2.6-x86-tune-p4.patch 
	linux-2.6.16.tar.bz2.sign patch-2.6.16.20.bz2.sign 
Log Message:
Rebase to 2.6.17.1


linux-2.6-ac97_unregister_controls_ad18xx.patch:
 ac97_codec.c |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-ac97_unregister_controls_ad18xx.patch ---
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index d052007..fcb00c2 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1204,6 +1204,20 @@ #define snd_ac97_cmute_new(card, name, r
 
 static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97);
 
+static void snd_ctl_elem_remove(struct snd_card *card,
+				struct snd_kcontrol *kcontrol)
+{
+	struct snd_kcontrol *kct;
+	struct snd_ctl_elem_id id = kcontrol->id;
+
+	down_write(&card->controls_rwsem);
+
+	if ((kct = snd_ctl_find_id(card, &id)))
+		snd_ctl_remove(card, kct);
+
+	up_write(&card->controls_rwsem);
+}
+
 static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
 {
 	struct snd_card *card = ac97->bus->card;
@@ -1347,23 +1361,35 @@ static int snd_ac97_mixer_build(struct s
 			init_val = 0x9f9f;
 		else
 			init_val = 0x9f1f;
-		for (idx = 0; idx < 2; idx++)
-			if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_pcm[idx], ac97))) < 0)
+		for (idx = 0; idx < 2; idx++) {
+			struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_pcm[idx], ac97);
+			snd_ctl_elem_remove(card, kctrl);
+			if ((err = snd_ctl_add(card, kctrl)) < 0)
 				return err;
+			}
 		ac97->spec.ad18xx.pcmreg[0] = init_val;
 		if (ac97->scaps & AC97_SCAP_SURROUND_DAC) {
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_surround[idx], ac97))) < 0)
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_surround[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
+			}
 			ac97->spec.ad18xx.pcmreg[1] = init_val;
 		}
 		if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC) {
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_center[idx], ac97))) < 0)
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_center[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
-			for (idx = 0; idx < 2; idx++)
-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_ad18xx_lfe[idx], ac97))) < 0)
+			}
+			for (idx = 0; idx < 2; idx++) {
+				struct snd_kcontrol *kctrl = snd_ac97_cnew(&snd_ac97_controls_ad18xx_lfe[idx], ac97);
+				snd_ctl_elem_remove(card, kctrl);
+				if ((err = snd_ctl_add(card, kctrl)) < 0)
 					return err;
+			}
 			ac97->spec.ad18xx.pcmreg[2] = init_val;
 		}
 		snd_ac97_write_cache(ac97, AC97_PCM, init_val);

linux-2.6-autofs-invalidate.patch:
 expire.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-autofs-invalidate.patch ---

From: Ian Kent <raven at themaw.net>
To: Andrew Morton <akpm at osdl.org>
Cc: autofs mailing list <autofs at linux.kernel.org>, Kernel Mailing List
<linux-kernel at vger.kernel.org>, linux-fsdevel
<linux-fsdevel at vger.kernel.org>
Subject: [PATCH] autofs4 - need to invalidate children on tree mount expire
Date: Mon, 12 Jun 2006 14:52:45 +0800 (WST)

Hi Andrew,

I've found a case where invalid dentrys in a mount tree, waiting to be 
cleaned up by d_invalidate, prevent the expected expire.

In this case dentrys created during a lookup for which a mount fails or 
has no entry in the mount map contribute to the d_count of the parent 
dentry. These dentrys may not be invalidated prior to comparing the 
interanl usage count of valid autofs dentrys against the dentry d_count 
which makes a mount tree appear busy so it doesn't expire.

Signed-off-by: Ian Kent <raven at themaw.net>

--

--- linux-2.6.17-rc6-mm2/fs/autofs4/expire.c.need-invalidate-on-tree-expire	2006-06-12 14:24:21.000000000 +0800
+++ linux-2.6.17-rc6-mm2/fs/autofs4/expire.c	2006-06-12 14:24:36.000000000 +0800
@@ -174,6 +174,12 @@ static int autofs4_tree_busy(struct vfsm
 			struct autofs_info *ino = autofs4_dentry_ino(p);
 			unsigned int ino_count = atomic_read(&ino->count);
 
+			/*
+			 * Clean stale dentries below that have not been
+			 * invalidated after a mount fail during lookup
+			 */
+			d_invalidate(p);
+
 			/* allow for dget above and top is already dgot */
 			if (p == top)
 				ino_count += 2;


linux-2.6-cell-mambo-drivers.patch:
 arch/powerpc/Kconfig              |   21 ++
 b/drivers/block/mambo_bd.c        |  291 ++++++++++++++++++++++++++++
 b/drivers/net/mambonet.c          |  392 ++++++++++++++++++++++++++++++++++++++
 b/include/asm-powerpc/systemsim.h |  130 ++++++++++++
 drivers/block/Makefile            |    1 
 drivers/net/Makefile              |    1 
 include/asm-powerpc/processor.h   |   17 +
 include/linux/root_dev.h          |    3 
 8 files changed, 856 insertions(+)

--- NEW FILE linux-2.6-cell-mambo-drivers.patch ---
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -332,6 +332,27 @@ config PPC_OF
 	depends on PPC_MULTIPLATFORM	# for now
 	default y
 
+# Systemsim configuration
+config MAMBO
+        bool "  IBM Full System Simulator (systemsim) support"
+        default n
+        ---help---
+           Support booting resulting image under IBMs Full System Simulator.
+config MAMBO_DISK
+        depends on MAMBO
+        tristate "    IBM Full System Simulator Bogus Disk Support"
+        default y
+        ---help---
+           Provides quick access to disk images in the simulator without
+           simulating a full IDE or SCSI device.
+config MAMBO_NET
+        depends on MAMBO
+        tristate "    IBM Full System Simulator Bogus Network Support"
+        default y
+        ---help---
+           Provides quick access to a raw ethernet device in the simulator
+           without simulating any specific network device hardware.
+
 config XICS
 	depends on PPC_PSERIES
 	bool
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o
 obj-$(CONFIG_BLK_DEV_NBD)	+= nbd.o
 obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
 
+obj-$(CONFIG_MAMBO_DISK)	+= mambo_bd.o
 obj-$(CONFIG_VIODASD)		+= viodasd.o
 obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
 obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
--- /dev/null
+++ b/drivers/block/mambo_bd.c
@@ -0,0 +1,291 @@
+/*
+ *  Bogus Block Driver for PowerPC Full System Simulator
+ *
+ *  (C) Copyright IBM Corporation 2003-2005
+ *
+ *  Bogus Disk Driver
+ *
+ *  Author: Eric Van Hensbegren <ericvh at gmail.com>
+ *
+ *    inspired by drivers/block/nbd.c
+ *    written by Pavel Machek and Steven Whitehouse
+ *
+ *  Some code is from the IBM Full System Simulator Group in ARL
+ *  Author: PAtrick Bohrer <IBM Austin Research Lab>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * Free Software Foundation
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02111-1301  USA
+ *
+ */
+
+#include <linux/major.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/fs.h>
+#include <linux/stat.h>
+#include <linux/errno.h>
+#include <linux/file.h>
+#include <linux/ioctl.h>
+#include <linux/blkdev.h>
+#include <net/sock.h>
+
+#include <asm/systemsim.h>
+
+#include <linux/devfs_fs_kernel.h>
+
+#include <asm/uaccess.h>
+#include <asm/types.h>
+
+#define MAJOR_NR 112
+#define MAX_MBD 128
+
+#define MBD_SET_BLKSIZE _IO( 0xab, 1 )
+#define MBD_SET_SIZE    _IO( 0xab, 2 )
+#define MBD_SET_SIZE_BLOCKS     _IO( 0xab, 7 )
+#define MBD_DISCONNECT  _IO( 0xab, 8 )
+
+struct mbd_device {
+	int initialized;
+	int refcnt;
+	int flags;
+	struct gendisk *disk;
+};
+
+static struct mbd_device mbd_dev[MAX_MBD];
+
+#define BD_INFO_SYNC   0
+#define BD_INFO_STATUS 1
+#define BD_INFO_BLKSZ  2
+#define BD_INFO_DEVSZ  3
+#define BD_INFO_CHANGE 4
+
+#define BOGUS_DISK_READ  116
+#define BOGUS_DISK_WRITE 117
+#define BOGUS_DISK_INFO  118
+
+static inline int
+MamboBogusDiskRead(int devno, void *buf, ulong sect, ulong nrsect)
+{
+	return callthru3(BOGUS_DISK_READ, (unsigned long)buf,
+			 (unsigned long)sect,
+			 (unsigned long)((nrsect << 16) | devno));
+}
+
+static inline int
+MamboBogusDiskWrite(int devno, void *buf, ulong sect, ulong nrsect)
+{
+	return callthru3(BOGUS_DISK_WRITE, (unsigned long)buf,
+			 (unsigned long)sect,
+			 (unsigned long)((nrsect << 16) | devno));
+}
+
+static inline int MamboBogusDiskInfo(int op, int devno)
+{
+	return callthru2(BOGUS_DISK_INFO, (unsigned long)op,
+			 (unsigned long)devno);
+}
+
+static int mbd_init_disk(int devno)
+{
+	struct gendisk *disk = mbd_dev[devno].disk;
+	unsigned int sz;
+
+	if (!__onsim())
+		return -1;
+
+	/* check disk configured */
+	if (!MamboBogusDiskInfo(BD_INFO_STATUS, devno)) {
+		printk(KERN_ERR
+		       "Attempting to open bogus disk before initializaiton\n");
+		return 0;
+	}
+
+	mbd_dev[devno].initialized++;
+
+	sz = MamboBogusDiskInfo(BD_INFO_DEVSZ, devno);
+
+	if (sz == -1)
+		return 0;
+
+	printk("Initializing disk %d with devsz %u\n", devno, sz);
+
+	set_capacity(disk, sz << 1);
+
+	return 1;
+}
+
+static void do_mbd_request(request_queue_t * q)
+{
+	int result = 0;
+	struct request *req;
+
+	while ((req = elv_next_request(q)) != NULL) {
+		int minor = req->rq_disk->first_minor;
+
+		switch (rq_data_dir(req)) {
+		case READ:
+			result = MamboBogusDiskRead(minor,
+						    req->buffer, req->sector,
+						    req->current_nr_sectors);
+			break;
+		case WRITE:
+			result = MamboBogusDiskWrite(minor,
+						     req->buffer, req->sector,
+						     req->current_nr_sectors);
+		};
+
+		if (result)
+			end_request(req, 0);	/* failure */
+		else
+			end_request(req, 1);	/* success */
+	}
+}
+
+static int mbd_release(struct inode *inode, struct file *file)
+{
+	struct mbd_device *lo;
+	int dev;
+
+	if (!inode)
+		return -ENODEV;
+	dev = inode->i_bdev->bd_disk->first_minor;
+	if (dev >= MAX_MBD)
+		return -ENODEV;
+	if (MamboBogusDiskInfo(BD_INFO_SYNC, dev) < 0) {
+		printk(KERN_ALERT "mbd_release: unable to sync\n");
+	}
+	lo = &mbd_dev[dev];
+	if (lo->refcnt <= 0)
+		printk(KERN_ALERT "mbd_release: refcount(%d) <= 0\n",
+		       lo->refcnt);
+	lo->refcnt--;
+	return 0;
+}
+
+static int mbd_revalidate(struct gendisk *disk)
+{
+	int devno = disk->first_minor;
+
+	mbd_init_disk(devno);
+
+	return 0;
+}
+
+static int mbd_open(struct inode *inode, struct file *file)
+{
+	int dev;
+
+	if (!inode)
+		return -EINVAL;
+	dev = inode->i_bdev->bd_disk->first_minor;
+	if (dev >= MAX_MBD)
+		return -ENODEV;
+
+	check_disk_change(inode->i_bdev);
+
+	if (!mbd_dev[dev].initialized)
+		if (!mbd_init_disk(dev))
+			return -ENODEV;
+
+	mbd_dev[dev].refcnt++;
+	return 0;
+}
+
+static struct block_device_operations mbd_fops = {
+      owner:THIS_MODULE,
+      open:mbd_open,
+      release:mbd_release,
+	/* media_changed:      mbd_check_change, */
+      revalidate_disk:mbd_revalidate,
+};
+
+static spinlock_t mbd_lock = SPIN_LOCK_UNLOCKED;
+
+static int __init mbd_init(void)
+{
+	int err = -ENOMEM;
+	int i;
+
+	for (i = 0; i < MAX_MBD; i++) {
+		struct gendisk *disk = alloc_disk(1);
+		if (!disk)
+			goto out;
+		mbd_dev[i].disk = disk;
+		/*
+		 * The new linux 2.5 block layer implementation requires
+		 * every gendisk to have its very own request_queue struct.
+		 * These structs are big so we dynamically allocate them.
+		 */
+		disk->queue = blk_init_queue(do_mbd_request, &mbd_lock);
+		if (!disk->queue) {
+			put_disk(disk);
+			goto out;
+		}
+	}
+
+	if (register_blkdev(MAJOR_NR, "mbd")) {
+		err = -EIO;
+		goto out;
+	}
+#ifdef MODULE
+	printk("mambo bogus disk: registered device at major %d\n", MAJOR_NR);
+#else
+	printk("mambo bogus disk: compiled in with kernel\n");
+#endif
+
+	devfs_mk_dir("mambobd");
+	for (i = 0; i < MAX_MBD; i++) {	/* load defaults */
+		struct gendisk *disk = mbd_dev[i].disk;
+		mbd_dev[i].initialized = 0;
+		mbd_dev[i].refcnt = 0;
+		mbd_dev[i].flags = 0;
+		disk->major = MAJOR_NR;
+		disk->first_minor = i;
+		disk->fops = &mbd_fops;
+		disk->private_data = &mbd_dev[i];
+		sprintf(disk->disk_name, "mambobd%d", i);
+		sprintf(disk->devfs_name, "mambobd%d", i);
+		set_capacity(disk, 0x7ffffc00ULL << 1);	/* 2 TB */
+		add_disk(disk);
+	}
+
+	return 0;
+      out:
+	while (i--) {
+		if (mbd_dev[i].disk->queue)
+			blk_cleanup_queue(mbd_dev[i].disk->queue);
+		put_disk(mbd_dev[i].disk);
+	}
+	return -EIO;
+}
+
+static void __exit mbd_cleanup(void)
+{
+	devfs_remove("mambobd");
+
+	if (unregister_blkdev(MAJOR_NR, "mbd") != 0)
+		printk("mbd: cleanup_module failed\n");
+	else
+		printk("mbd: module cleaned up.\n");
+}
+
+module_init(mbd_init);
+module_exit(mbd_cleanup);
+
+MODULE_DESCRIPTION("Mambo Block Device");
+MODULE_LICENSE("GPL");
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -140,6 +140,7 @@ obj-$(CONFIG_EL3) += 3c509.o
 obj-$(CONFIG_3C515) += 3c515.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
+obj-$(CONFIG_MAMBO_NET) += mambonet.o
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ZNET) += znet.o
--- /dev/null
+++ b/drivers/net/mambonet.c
@@ -0,0 +1,392 @@
+/*
+ *  Bogus Network Driver for PowerPC Full System Simulator
+ *
+ *  (C) Copyright IBM Corporation 2003-2005
+ *
+ *  Bogus Network Driver
+ * 
+ *  Author: JimiX <jimix at watson.ibm.com>
+ *  Maintained By: Eric Van Hensbergen <ericvh at gmail.com>
+ *
+ * 	inspired by drivers/net/ibmveth.c
+ *	written by Dave Larson 
+ *
+ *  Some code is from the IBM Full System Simulator Group in ARL
+ *  Author: Patrick Bohrer <IBM Austin Research Lab>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to:
+ *  Free Software Foundation
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02111-1301  USA
+ *  
+ */
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/fs.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/socket.h>
+#include <linux/errno.h>
+#include <linux/fcntl.h>
+#include <linux/in.h>
+#include <linux/init.h>
+
+#include <asm/system.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#include <linux/inet.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#include <linux/if_ether.h>	/* For the statistics structure. */
+#include <linux/if_arp.h>	/* For ARPHRD_ETHER */
+#include <linux/workqueue.h>
+#include <asm/prom.h>
+#include <linux/version.h>
+#include <asm/systemsim.h>
+
+#define MAMBO_BOGUS_NET_PROBE   119
+#define MAMBO_BOGUS_NET_SEND    120
+#define MAMBO_BOGUS_NET_RECV    121
+
+static inline int MamboBogusNetProbe(int devno, void *buf)
+{
+	return callthru2(MAMBO_BOGUS_NET_PROBE,
+			 (unsigned long)devno, (unsigned long)buf);
+}
+
+static inline int MamboBogusNetSend(int devno, void *buf, ulong size)
+{
+	return callthru3(MAMBO_BOGUS_NET_SEND,
+			 (unsigned long)devno,
+			 (unsigned long)buf, (unsigned long)size);
+}
+
+static inline int MamboBogusNetRecv(int devno, void *buf, ulong size)
+{
+	return callthru3(MAMBO_BOGUS_NET_RECV,
+			 (unsigned long)devno,
+			 (unsigned long)buf, (unsigned long)size);
+}
+
+static irqreturn_t
+mambonet_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+
+#define INIT_BOTTOM_HALF(x,y,z) INIT_WORK(x, y, (void*)z)
+#define SCHEDULE_BOTTOM_HALF(x) schedule_delayed_work(x, 1)
+#define KILL_BOTTOM_HALF(x) cancel_delayed_work(x); flush_scheduled_work()
+
+#define MAMBO_MTU 1500
+
+struct netdev_private {
+	int devno;
+	int closing;
+	struct work_struct poll_task;
+	struct net_device_stats stats;
+};
+
+static int mambonet_probedev(int devno, void *buf)
+{
+	struct device_node *mambo;
+	struct device_node *net;
+	unsigned int *reg;
+
+	mambo = find_path_device("/mambo");
+
+	if (mambo == NULL) {
+		return -1;
+	}
+	net = find_path_device("/mambo/bogus-net at 0");
+	if (net == NULL) {
+		return -1;
+	}
+	reg = (unsigned int *)get_property(net, "reg", 0);
+
+	if (*reg != devno) {
+		return -1;
+	}
+
+	return MamboBogusNetProbe(devno, buf);
+}
+
+static int mambonet_send(int devno, void *buf, ulong size)
+{
+	return MamboBogusNetSend(devno, buf, size);
+}
+
+static int mambonet_recv(int devno, void *buf, ulong size)
+{
+	return MamboBogusNetRecv(devno, buf, size);
+}
+
+static int mambonet_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	struct netdev_private *priv = (struct netdev_private *)dev->priv;
+	int devno = priv->devno;
+
+	skb->dev = dev;
+
+	/* we might need to checksum or something */
+	mambonet_send(devno, skb->data, skb->len);
+
+	dev->last_rx = jiffies;
+	priv->stats.rx_bytes += skb->len;
+	priv->stats.tx_bytes += skb->len;
+	priv->stats.rx_packets++;
+	priv->stats.tx_packets++;
+
+	dev_kfree_skb(skb);
+
+	return (0);
+}
+
+static int mambonet_poll(struct net_device *dev, int *budget)
+{
+	struct netdev_private *np = dev->priv;
+	int devno = np->devno;
+	char buffer[1600];
+	int ns;
+	struct sk_buff *skb;
+	int frames = 0;
+	int max_frames = min(*budget, dev->quota);
+	int ret = 0;
+
+	while ((ns = mambonet_recv(devno, buffer, 1600)) > 0) {
+		if ((skb = dev_alloc_skb(ns + 2)) != NULL) {
+			skb->dev = dev;
+			skb_reserve(skb, 2);	/* 16 byte align the IP
+						 * header */
+#ifdef HAS_IP_COPYSUM
+			eth_copy_and_sum(skb, buffer, ns, 0);
+			skb_put(skb, ns);
+#else
+			memcpy(skb_put(skb, ns), buffer, ns);
+#endif
+			skb->protocol = eth_type_trans(skb, dev);
+
+			if (dev->irq)
+				netif_receive_skb(skb);
+			else
+				netif_rx(skb);
+
+			dev->last_rx = jiffies;
+			np->stats.rx_packets++;
+			np->stats.rx_bytes += ns;
+		} else {
+			printk("Failed to allocated skbuff, "
+			       "dropping packet\n");
+			np->stats.rx_dropped++;
+			/* wait for another cycle */
+			return 1;
+		}
+		++frames;
+		if (frames > max_frames) {
+			ret = 1;
+			break;
+		}
+	}
+	*budget -= frames;
+	dev->quota -= frames;
+
+	if ((!ret) && (dev->irq))
+		netif_rx_complete(dev);
+
+	return ret;
+}
+
+static void mambonet_timer(struct net_device *dev)
+{
+	int budget = 16;
+	struct netdev_private *priv = (struct netdev_private *)dev->priv;
+
+	mambonet_poll(dev, &budget);
+
+	if (!priv->closing) {
+		SCHEDULE_BOTTOM_HALF(&priv->poll_task);
+	}
+}
+
+static struct net_device_stats *get_stats(struct net_device *dev)
+{
+	struct netdev_private *priv = (struct netdev_private *)dev->priv;
+	return (struct net_device_stats *)&(priv->stats);
+}
+
+static irqreturn_t
+mambonet_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
+{
+	struct net_device *dev = dev_instance;
+	if (netif_rx_schedule_prep(dev)) {
+		__netif_rx_schedule(dev);
+	}
+	return IRQ_HANDLED;
+}
+
+static int mambonet_open(struct net_device *dev)
+{
+	struct netdev_private *priv;
+	int ret = 0;
+
+	priv = dev->priv;
+
+	/*
+	 * we can't start polling in mambonet_init, because I don't think
+	 * workqueues are usable that early. so start polling now.
+	 */
+
+	if (dev->irq) {
+		ret = request_irq(dev->irq, &mambonet_interrupt, 0,
+				  dev->name, dev);
+
+		if (ret == 0) {
+			netif_start_queue(dev);
+		} else {
+			printk(KERN_ERR "mambonet: request irq failed\n");
+		}
+
+		MamboBogusNetProbe(priv->devno, NULL);	/* probe with NULL to activate interrupts */
+	} else {
+		mambonet_timer(dev);
+	}
+
+	return ret;
+}
+
+static int mambonet_close(struct net_device *dev)
+{
+	struct netdev_private *priv;
+
+	netif_stop_queue(dev);
+
+	if (dev->irq)
+		free_irq(dev->irq, dev);
+
+	priv = dev->priv;
+	priv->closing = 1;
+	if (dev->irq == 0) {
+		KILL_BOTTOM_HALF(&priv->poll_task);
+	}
+
+	kfree(priv);
+
+	return 0;
+}
+
+static struct net_device_stats mambonet_stats;
+
+static struct net_device_stats *mambonet_get_stats(struct net_device *dev)
+{
+	return &mambonet_stats;
+}
+
+static int mambonet_set_mac_address(struct net_device *dev, void *p)
+{
+	return -EOPNOTSUPP;
+}
+static int mambonet_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+	return -EOPNOTSUPP;
+}
+static int nextdevno = 0;	/* running count of device numbers */
+
+/* Initialize the rest of the device. */
+int __init do_mambonet_probe(struct net_device *dev)
+{
+	struct netdev_private *priv;
+	int devno = nextdevno++;
+	int irq;
+
+	printk("eth%d: bogus network driver initialization\n", devno);
+
+	irq = mambonet_probedev(devno, dev->dev_addr);
+
+	if (irq < 0) {
+		printk("No IRQ retreived\n");
+		return (-ENODEV);
+	}
+
+	printk("%s: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", dev->name,
+	       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+	       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+
+	SET_MODULE_OWNER(dev);
+
+	dev->irq = irq;
+	dev->mtu = MAMBO_MTU;
+	dev->open = mambonet_open;
+	dev->poll = mambonet_poll;
+	dev->weight = 16;
+	dev->stop = mambonet_close;
+	dev->hard_start_xmit = mambonet_start_xmit;
+	dev->get_stats = mambonet_get_stats;
+	dev->set_mac_address = mambonet_set_mac_address;
+	dev->do_ioctl = mambonet_ioctl;
+
+	dev->priv = kmalloc(sizeof(struct netdev_private), GFP_KERNEL);
+	if (dev->priv == NULL)
+		return -ENOMEM;
+	memset(dev->priv, 0, sizeof(struct netdev_private));
+
+	priv = dev->priv;
+	priv->devno = devno;
+	priv->closing = 0;
+	dev->get_stats = get_stats;
+
+	if (dev->irq == 0) {
+		INIT_BOTTOM_HALF(&priv->poll_task, (void *)mambonet_timer,
+				 (void *)dev);
+	}
+
+	return (0);
+};
+
+struct net_device *__init mambonet_probe(int unit)
+{
+	struct net_device *dev = alloc_etherdev(0);
+	int err;
+
+	if (!dev)
+		return ERR_PTR(-ENODEV);
+
+	sprintf(dev->name, "eth%d", unit);
+	netdev_boot_setup_check(dev);
+
+	err = do_mambonet_probe(dev);
+
+	if (err)
+		goto out;
+
+	err = register_netdev(dev);
+	if (err)
+		goto out;
+
+	return dev;
+
+      out:
+	free_netdev(dev);
+	return ERR_PTR(err);
+}
+
+int __init init_mambonet(void)
+{
+	mambonet_probe(0);
+	return 0;
+}
+
+module_init(init_mambonet);
+MODULE_LICENSE("GPL");
--- /dev/null
+++ b/include/asm-powerpc/systemsim.h
@@ -0,0 +1,130 @@
+/*********************************************************
+ *
+ * Copyright (C) 2001, 2005 IBM
+ * 
+ * Filename	: systemsim.h
+ *
+ * Originator	: Patrick Bohrer and Charles Lefurgy
+ * Modified By	: Eric Van Hensbegren <ericvh at gmail.com>
+ *
+ * Purpose	: 
+ *
+ *   This file is compiled with programs that are run under the 
+ *   PowerPC Full System simulator.  For example, stand-alone programs 
+ *   or operating systems.  The programs call the callthru wrapper 
+ *   functions which use an illegal PowerPC instruction to signal the 
+ *   simulator to emulate special support.
+ *
+ *********************************************************/
+
+#ifndef _SYSTEMSIM_CONFIG_H_
+#define _SYSTEMSIM_CONFIG_H_
+
+/* The functions callthru0 to callthru5 setup up the arguments for the
+ * simulator callthru and then use the callthru instruction.  Note that
+ * 0-5 specify the number of arguments after the command */
+
+/* Note: Arguments are cast as void* to prevent casting by the
+   compiler.  This way, you can pass pointers, integers, etc. in
+   machine register and have the simulator interpret what the
+   register is supposed to be.  To help with typing errors when using
+   callthrus, we provide wrapper functions for each callthru.  The
+   wrappers cast all arguments to void*.  Unfortunately, this results
+   in a lot of compiler warnings that I do not know how to remove.  If
+   you modify this code, be aware that we are trying to pick a type
+   that is the size of the registers (32-bit or 64-bit) and that is
+   why are choosing to cast to a void* (it should be the size of a
+   machine register) */
+
+static inline int callthru0(int command)
+{
+	register int c asm("r3") = command;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c));
+	return (c);
+}
+static inline int callthru1(int command, unsigned long arg1)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1));
+	return (c);
+}
+static inline int callthru2(int command, unsigned long arg1, unsigned long arg2)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	register unsigned long a2 asm("r5") = arg2;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1), "r"(a2));
+	return (c);
+}
+static inline int callthru3(int command, unsigned long arg1, unsigned long arg2,
+			    unsigned long arg3)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	register unsigned long a2 asm("r5") = arg2;
+	register unsigned long a3 asm("r6") = arg3;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1), "r"(a2),
+		      "r"(a3));
+	return (c);
+}
+static inline int callthru4(int command, unsigned long arg1, unsigned long arg2,
+			    unsigned long arg3, unsigned long arg4)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	register unsigned long a2 asm("r5") = arg2;
+	register unsigned long a3 asm("r6") = arg3;
+	register unsigned long a4 asm("r7") = arg4;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1), "r"(a2),
+		      "r"(a3), "r"(a4));
+	return (c);
+}
+static inline int callthru5(int command, unsigned long arg1, unsigned long arg2,
+			    unsigned long arg3, unsigned long arg4,
+			    unsigned long arg5)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	register unsigned long a2 asm("r5") = arg2;
+	register unsigned long a3 asm("r6") = arg3;
+	register unsigned long a4 asm("r7") = arg4;
+	register unsigned long a5 asm("r8") = arg5;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1), "r"(a2),
+		      "r"(a3), "r"(a4), "r"(a5));
+	return (c);
+}
+static inline int callthru6(int command, unsigned long arg1, unsigned long arg2,
+			    unsigned long arg3, unsigned long arg4,
+			    unsigned long arg5, unsigned long arg6)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	register unsigned long a2 asm("r5") = arg2;
+	register unsigned long a3 asm("r6") = arg3;
+	register unsigned long a4 asm("r7") = arg4;
+	register unsigned long a5 asm("r8") = arg5;
+	register unsigned long a6 asm("r9") = arg6;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1), "r"(a2),
+		      "r"(a3), "r"(a4), "r"(a5), "r"(a6));
+	return (c);
+}
+static inline int callthru7(int command, unsigned long arg1, unsigned long arg2,
+			    unsigned long arg3, unsigned long arg4,
+			    unsigned long arg5, unsigned long arg6,
+			    unsigned long arg7)
+{
+	register int c asm("r3") = command;
+	register unsigned long a1 asm("r4") = arg1;
+	register unsigned long a2 asm("r5") = arg2;
+	register unsigned long a3 asm("r6") = arg3;
+	register unsigned long a4 asm("r7") = arg4;
+	register unsigned long a5 asm("r8") = arg5;
+	register unsigned long a6 asm("r9") = arg6;
+	register unsigned long a7 asm("r10") = arg7;
+	asm volatile (".long 0x000eaeb0":"=r" (c):"r"(c), "r"(a1), "r"(a2),
+		      "r"(a3), "r"(a4), "r"(a5), "r"(a6), "r"(a7));
+	return (c);
+}
+
+#endif/* _SYSTEMSIM_CONFIG_H_ */
--- a/include/linux/root_dev.h
+++ b/include/linux/root_dev.h
@@ -14,6 +14,9 @@ enum {
 	Root_SDA2 = MKDEV(SCSI_DISK0_MAJOR, 2),
 	Root_HDC1 = MKDEV(IDE1_MAJOR, 1),
 	Root_SR0 = MKDEV(SCSI_CDROM_MAJOR, 0),
+#ifdef CONFIG_MAMBO_DISK
+	Root_Mambo = MKDEV(112, 0),
+#endif
 };
 
 extern dev_t ROOT_DEV;
--- linux-2.6.15-rc.orig/include/asm-powerpc/processor.h
+++ linux-2.6.15-rc/include/asm-powerpc/processor.h
@@ -284,6 +284,23 @@ static inline void pause_zero(void)
 }
 #endif
 
+#ifdef CONFIG_PPC_CELL /* MAMBO SIMULATION code */
+#define MSR_SIM_LG      29
+#define MSR_SIM         __MASK(MSR_SIM_LG)
+
+static __inline__ int __onsim(void)
+{
+        unsigned long msr;
+        __asm__ __volatile__ ("mfmsr    %0" : "=&r" (msr));
+        return ((msr & MSR_SIM) ? 1 : 0);
+}
+#endif /* CONFIG_PPC_CELL */
+
 #endif /* __KERNEL__ */
+#else
+/* must be given a register to perform the compare, set cr0 = 1
+ * Usage: __onsim(r0); bne _if_onsim
+ */
+#define __onsim(r) mfmsr        r; rldicl. r,r,35,63
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_POWERPC_PROCESSOR_H */

linux-2.6-console-suspend.patch:
 power/console.c |   32 +++++---------------------------
 printk.c        |   12 ++++++++++++
 2 files changed, 17 insertions(+), 27 deletions(-)

--- NEW FILE linux-2.6-console-suspend.patch ---
Return-Path: <torvalds at osdl.org>
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
	nwo.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=5.0 tests=AWL,BAYES_00,
	FORGED_RCVD_HELO,UNPARSEABLE_RELAY autolearn=ham version=3.1.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
	for <davej at localhost> (single-drop); Wed, 14 Jun 2006 15:03:49 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
	 Wed, 14 Jun 2006 15:03:37 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k5EJ3bh3020398
	for <davej at pobox.devel.redhat.com>; Wed, 14 Jun 2006 15:03:37 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5EJ3bGj030972
	for <davej at redhat.com>; Wed, 14 Jun 2006 15:03:37 -0400
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5EJ3U96030450
	for <davej at redhat.com>; Wed, 14 Jun 2006 15:03:31 -0400
Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k5EJ3Ogt004764
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <davej at redhat.com>; Wed, 14 Jun 2006 12:03:25 -0700
Received: from localhost (shell0.pdx.osdl.net [10.9.0.31])
	by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id k5EJ3Nag015488
	for <davej at redhat.com>; Wed, 14 Jun 2006 12:03:23 -0700
Date: Wed, 14 Jun 2006 12:03:23 -0700 (PDT)
From: Linus Torvalds <torvalds at osdl.org>
To: Dave Jones <davej at redhat.com>
Subject: Re: [linux-pm] [PATCH 2/2] Fix console handling during suspend/resume
In-Reply-To: <20060614185928.GA23238 at redhat.com>
Message-ID: <Pine.LNX.4.64.0606141200311.5498 at g5.osdl.org>
References: <Pine.LNX.4.64.0606131418580.5498 at g5.osdl.org>
 <Pine.LNX.4.64.0606131435400.5498 at g5.osdl.org> <20060614185928.GA23238 at redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-MIMEDefang-Filter: osdl$Revision: 1.135 $
X-Scanned-By: MIMEDefang 2.36
X-RedHat-Spam-Score: 0.05 
Status: RO
Content-Length: 3717
Lines: 138



diff-tree b7140c89071f39e98b154a17463796d4fe3f0aea (from 8325a64d97b5c8489dc1694a77c3e25918049998)
Author: Linus Torvalds <torvalds at macmini.osdl.org>
Date:   Thu Jun 8 15:29:09 2006 -0700

    Fix console handling during suspend/resume
    
    The old code was terminally broken, and would do extremely bad
    things if you used netconsole, for example. Like sending out packets
    when the device had already been suspended etc.
    
    The new version may not be perfect either, but it seems fundamentally
    like a better design.
    
    Signed-off-by: Linus Torvalds <torvalds at osdl.org>

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 623786d..6e039ca 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -9,42 +9,20 @@ #include <linux/kbd_kern.h>
 #include <linux/console.h>
 #include "power.h"
 
-#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
-#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
-
-static int orig_fgconsole, orig_kmsg;
+extern int console_suspended;
 
 int pm_prepare_console(void)
 {
 	acquire_console_sem();
-
-	orig_fgconsole = fg_console;
-
-	if (vc_allocate(SUSPEND_CONSOLE)) {
-	  /* we can't have a free VC for now. Too bad,
-	   * we don't want to mess the screen for now. */
-		release_console_sem();
-		return 1;
-	}
-
-	set_console(SUSPEND_CONSOLE);
-	release_console_sem();
-
-	if (vt_waitactive(SUSPEND_CONSOLE)) {
-		pr_debug("Suspend: Can't switch VCs.");
-		return 1;
-	}
-	orig_kmsg = kmsg_redirect;
-	kmsg_redirect = SUSPEND_CONSOLE;
+	console_suspended = 1;
+	system_state = SYSTEM_BOOTING;
 	return 0;
 }
 
 void pm_restore_console(void)
 {
-	acquire_console_sem();
-	set_console(orig_fgconsole);
+	console_suspended = 0;
+	system_state = SYSTEM_RUNNING;
 	release_console_sem();
-	kmsg_redirect = orig_kmsg;
 	return;
 }
-#endif
diff --git a/kernel/printk.c b/kernel/printk.c
index c056f33..8adb9ed 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -67,6 +67,7 @@ EXPORT_SYMBOL(oops_in_progress);
  * driver system.
  */
 static DECLARE_MUTEX(console_sem);
+static DECLARE_MUTEX(secondary_console_sem);
 struct console *console_drivers;
 /*
  * This is used for debugging the mess that is the VT code by
@@ -77,6 +78,7 @@ struct console *console_drivers;
  * locked without the console sempahore held
  */
 static int console_locked;
+int console_suspended;
 
 /*
  * logbuf_lock protects log_buf, log_start, log_end, con_start and logged_chars
@@ -707,6 +709,11 @@ int __init add_preferred_console(char *n
  */
 void acquire_console_sem(void)
 {
+	if (console_suspended) {
+		down(&secondary_console_sem);
+		return;
+	}
+
 	BUG_ON(in_interrupt());
 	down(&console_sem);
 	console_locked = 1;
@@ -750,6 +757,11 @@ void release_console_sem(void)
 	unsigned long _con_start, _log_end;
 	unsigned long wake_klogd = 0;
 
+	if (console_suspended) {
+		up(&secondary_console_sem);
+		return;
+	}
+
 	for ( ; ; ) {
 		spin_lock_irqsave(&logbuf_lock, flags);
 		wake_klogd |= log_start - log_end;


linux-2.6-defaults-phys-start.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-phys-start.patch ---

http://www.lkml.org/lkml/2006/2/23/189

--- linux-2.6.16.noarch/arch/i386/Kconfig~	2006-04-04 15:30:43.000000000 -0500
+++ linux-2.6.16.noarch/arch/i386/Kconfig	2006-04-04 15:30:55.000000000 -0500
@@ -729,7 +729,7 @@ config CRASH_DUMP
 	  Generate crash dump after being started by kexec.
 
 config PHYSICAL_START
-	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+	hex "Physical address where the kernel is loaded"
 
 	default "0x1000000" if CRASH_DUMP
 	default "0x100000"

linux-2.6-defaults-unicode-vt.patch:
 keyboard.c |    2 +-
 vt.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-defaults-unicode-vt.patch ---

Unicode by default. Join the 20th century.

--- linux-2.6.11/drivers/char/vt.c.foo	2005-06-06 22:53:13.000000000 -0400
+++ linux-2.6.11/drivers/char/vt.c	2005-06-06 22:53:42.000000000 -0400
@@ -1443,7 +1443,7 @@
 	vc->vc_charset		= 0;
 	vc->vc_need_wrap	= 0;
 	vc->vc_report_mouse	= 0;
-	vc->vc_utf		= 0;
+	vc->vc_utf		= 1;
 	vc->vc_utf_count	= 0;
 
 	vc->vc_disp_ctrl	= 0;
--- linux-2.6.11/drivers/char/keyboard.c.foo	2005-06-06 23:35:07.000000000 -0400
+++ linux-2.6.11/drivers/char/keyboard.c	2005-06-06 23:36:28.000000000 -0400
@@ -1241,7 +1241,7 @@
         kbd0.lockstate = KBD_DEFLOCK;
         kbd0.slockstate = 0;
         kbd0.modeflags = KBD_DEFMODE;
-        kbd0.kbdmode = VC_XLATE;
+        kbd0.kbdmode = VC_UNICODE;
 
         for (i = 0 ; i < MAX_NR_CONSOLES ; i++)
                 kbd_table[i] = kbd0;

linux-2.6-hvc-console.patch:
 linux-2.6.14/drivers/char/hvc_fss.c    |  150 +++++++++++++++++++++++++++++++++
 linux-2.6.16.ppc/drivers/char/Kconfig  |    9 +
 linux-2.6.16.ppc/drivers/char/Makefile |    1 
 3 files changed, 160 insertions(+)

Index: linux-2.6-hvc-console.patch
===================================================================
RCS file: linux-2.6-hvc-console.patch
diff -N linux-2.6-hvc-console.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-hvc-console.patch	20 Jun 2006 18:25:40 -0000	1.3
@@ -0,0 +1,182 @@
+diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_fss.c linux-2.6.14/drivers/char/hvc_fss.c
+--- linux-2.6.14.cons/drivers/char/hvc_fss.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/drivers/char/hvc_fss.c	2005-12-07 16:34:02.000000000 +0100
+@@ -0,0 +1,150 @@
++/*
++ * IBM Full System Simulator driver interface to hvc_console.c
++ *
++ * (C) Copyright IBM Corporation 2001-2005
++ * Author(s): Maximino Augilar <IBM STI Design Center>
++ *          : Ryan S. Arnold <rsa at us.ibm.com>
++ *
++ *    inspired by drivers/char/hvc_console.c
++ *    written by Anton Blanchard and Paul Mackerras
++ *
++ * Some code is from the IBM Full System Simulator Group in ARL.
++ * Author: Patrick Bohrer <IBM Austin Research Lab>
++ *
++ * Much of this code was moved here from the IBM Full System Simulator
++ * Bogus console driver in order to reuse the framework provided by the hvc
++ * console driver. Ryan S. Arnold <rsa at us.ibm.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
++ */
++
++#include <linux/types.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <asm/irq.h>
++#include <asm/processor.h>
++#include "hvc_console.h"
++
++static uint32_t hvc_fss_vtermno = 0;
++struct hvc_struct *hvc_fss_dev;
++
++static inline int callthru0(int command)
++{
++	register int c asm ("r3") = command;
++
++	asm volatile (".long 0x000EAEB0" : "=r" (c): "r" (c));
++	return((c));
++}
++
++static inline int callthru3(int command, unsigned long arg1, unsigned long arg2, unsigned long arg3)
++{
++	register int c asm ("r3") = command;
++	register unsigned long a1 asm ("r4") = arg1;
++	register unsigned long a2 asm ("r5") = arg2;
++	register unsigned long a3 asm ("r6") = arg3;
++
++	asm volatile (".long 0x000EAEB0" : "=r" (c): "r" (c), "r" (a1), "r" (a2), "r" (a3));
++	return((c));
++}
++
++static inline int hvc_fss_write_console(uint32_t vtermno, const char *buf, int count)
++{
++	int ret = 0;
++	ret = callthru3(0, (unsigned long)buf,
++		(unsigned long)count, (unsigned long)1);
++	if (ret != 0) {
++		return (count - ret); /* is this right? */
++	}
++
++	/* the calling routine expects to receive the number of bytes sent */
++	return count;
++}
++
++static inline int hvc_fss_read_console(uint32_t vtermno, char *buf, int count)
++{
++	unsigned long got;
++	int c;	
++	int i;
++
++	for (got = 0, i = 0; i < count; i++) {
++	
++		if (( c = callthru0(60) ) != -1) {
++			buf[i] = c;
++			++got;
++		}
++		else
++			break;
++	}
++	return got;
++}
++
++static struct hv_ops hvc_fss_get_put_ops = {
++	.get_chars = hvc_fss_read_console,
++	.put_chars = hvc_fss_write_console,
++};
++
++static int hvc_fss_init(void)
++{
++	/* Register a single device with the driver */
++	struct hvc_struct *hp;
++
++	if(!__onsim()) {
++		return -1;
++	}
++
++	if(hvc_fss_dev) {
++		return -1; /* This shouldn't happen */
++	}
++
++	/* Allocate an hvc_struct for the console device we instantiated
++	 * earlier.  Save off hp so that we can return it on exit */
++	hp = hvc_alloc(hvc_fss_vtermno, NO_IRQ, &hvc_fss_get_put_ops);
++	if (IS_ERR(hp))
++		return PTR_ERR(hp);
++	hvc_fss_dev = hp;
++	return 0;
++}
++module_init(hvc_fss_init);
++
++/* This will tear down the tty portion of the driver */
++static void __exit hvc_fss_exit(void)
++{
++	struct hvc_struct *hp_safe;
++	/* Hopefully this isn't premature */
++	if (!hvc_fss_dev)
++		return;
++
++	hp_safe = hvc_fss_dev;
++	hvc_fss_dev = NULL;
++
++	/* Really the fun isn't over until the worker thread breaks down and the
++	 * tty cleans up */
++	hvc_remove(hp_safe);
++}
++module_exit(hvc_fss_exit); /* before drivers/char/hvc_console.c */
++
++/* This will happen prior to module init.  There is no tty at this time? */
++static int hvc_fss_console_init(void)
++{
++	/* Don't register if we aren't running on the simulator */
++	if (__onsim()) {
++		/* Tell the driver we know of one console device.  We
++		 * shouldn't get a collision on the index as long as no-one
++		 * else instantiates on hardware they don't have. */
++		hvc_instantiate(hvc_fss_vtermno, 0, &hvc_fss_get_put_ops );
++	}
++	return 0;
++}
++console_initcall(hvc_fss_console_init);
+--- linux-2.6.16.ppc/drivers/char/Makefile~	2006-03-31 20:44:59.000000000 +0100
++++ linux-2.6.16.ppc/drivers/char/Makefile	2006-03-31 21:28:29.000000000 +0100
+@@ -44,6 +44,7 @@ obj-$(CONFIG_RIO)		+= rio/ generic_seria
+ obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
+ obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
+ obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o
++obj-$(CONFIG_HVC_FSS)		+= hvc_fss.o
+ obj-$(CONFIG_RAW_DRIVER)	+= raw.o
+ obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
+ obj-$(CONFIG_MMTIMER)		+= mmtimer.o
+--- linux-2.6.16.ppc/drivers/char/Kconfig~	2006-03-31 20:44:59.000000000 +0100
++++ linux-2.6.16.ppc/drivers/char/Kconfig	2006-03-31 21:29:05.000000000 +0100
+@@ -588,6 +588,15 @@ config HVC_RTAS
+ 	help
+ 	  IBM Console device driver which makes use of RTAS
+ 
++
++config HVC_FSS
++	bool "IBM Full System Simulator Console support"
++	depends on MAMBO
++	select HVC_DRIVER
++	help
++	  IBM Full System Simulator Console device driver which makes use of
++	  the HVC_DRIVER front end.
++
+ config HVCS
+ 	tristate "IBM Hypervisor Virtual Console Server support"
+ 	depends on PPC_PSERIES

linux-2.6-iscsi-update-to-2-6-18-upstream.patch:
 drivers/scsi/Makefile               |    2 
 drivers/scsi/iscsi_tcp.c            | 3012 +++++++++++-------------------------
 drivers/scsi/iscsi_tcp.h            |  190 --
 drivers/scsi/libiscsi.c             | 1702 ++++++++++++++++++++
 drivers/scsi/scsi_transport_iscsi.c |  703 +++++---
 include/scsi/iscsi_if.h             |  128 +
 include/scsi/iscsi_proto.h          |    2 
 include/scsi/libiscsi.h             |  282 +++
 include/scsi/scsi_transport_iscsi.h |  119 +
 9 files changed, 3655 insertions(+), 2485 deletions(-)

--- NEW FILE linux-2.6-iscsi-update-to-2-6-18-upstream.patch ---
diff -Naurp linux-2.6.16.x86_64/drivers/scsi/iscsi_tcp.c linux-2.6.16.x86_64.work/drivers/scsi/iscsi_tcp.c
--- linux-2.6.16.x86_64/drivers/scsi/iscsi_tcp.c	2006-05-30 04:38:18.000000000 -0500
+++ linux-2.6.16.x86_64.work/drivers/scsi/iscsi_tcp.c	2006-05-30 04:39:36.000000000 -0500
@@ -3,7 +3,8 @@
  *
  * Copyright (C) 2004 Dmitry Yusupov
  * Copyright (C) 2004 Alex Aizman
- * Copyright (C) 2005 Mike Christie
+ * Copyright (C) 2005 - 2006 Mike Christie
+ * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
  * maintained by open-iscsi at googlegroups.com
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,37 +37,28 @@
 #include <linux/mutex.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_request.h>
-#include <scsi/scsi_tcq.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_transport_iscsi.h>
 
 #include "iscsi_tcp.h"
 
+#define ISCSI_TCP_VERSION "1.0-595"
+
 MODULE_AUTHOR("Dmitry Yusupov <dmitry_yus at yahoo.com>, "
 	      "Alex Aizman <itn780 at yahoo.com>");
 MODULE_DESCRIPTION("iSCSI/TCP data-path");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("0:4.445");
+MODULE_VERSION(ISCSI_TCP_VERSION);
 /* #define DEBUG_TCP */
-/* #define DEBUG_SCSI */
 #define DEBUG_ASSERT
 
 #ifdef DEBUG_TCP
-#define debug_tcp(fmt...) printk(KERN_DEBUG "tcp: " fmt)
+#define debug_tcp(fmt...) printk(KERN_INFO "tcp: " fmt)
 #else
 #define debug_tcp(fmt...)
 #endif
 
-#ifdef DEBUG_SCSI
-#define debug_scsi(fmt...) printk(KERN_DEBUG "scsi: " fmt)
-#else
-#define debug_scsi(fmt...)
-#endif
-
 #ifndef DEBUG_ASSERT
 #ifdef BUG_ON
 #undef BUG_ON
@@ -74,22 +66,9 @@ MODULE_VERSION("0:4.445");
 #define BUG_ON(expr)
 #endif
 
-#define INVALID_SN_DELTA	0xffff
-
 static unsigned int iscsi_max_lun = 512;
 module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);
 
-/* global data */
-static kmem_cache_t *taskcache;
-
-static inline void
-iscsi_buf_init_virt(struct iscsi_buf *ibuf, char *vbuf, int size)
-{
-	sg_init_one(&ibuf->sg, (u8 *)vbuf, size);
-	ibuf->sent = 0;
-	ibuf->use_sendmsg = 0;
-}
-
 static inline void
 iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)
 {
@@ -130,68 +109,39 @@ static inline void
 iscsi_hdr_digest(struct iscsi_conn *conn, struct iscsi_buf *buf,
 		 u8* crc)
 {
-	crypto_digest_digest(conn->tx_tfm, &buf->sg, 1, crc);
-	buf->sg.length += sizeof(uint32_t);
-}
-
-static void
-iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
-{
-	struct iscsi_session *session = conn->session;
-	unsigned long flags;
+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
 
-	spin_lock_irqsave(&session->lock, flags);
-	if (session->conn_cnt == 1 || session->leadconn == conn)
-		session->state = ISCSI_STATE_FAILED;
-	spin_unlock_irqrestore(&session->lock, flags);
-	set_bit(SUSPEND_BIT, &conn->suspend_tx);
-	set_bit(SUSPEND_BIT, &conn->suspend_rx);
-	iscsi_conn_error(conn->cls_conn, err);
+	crypto_digest_digest(tcp_conn->tx_tfm, &buf->sg, 1, crc);
+	buf->sg.length += sizeof(uint32_t);
 }
 
 static inline int
-iscsi_check_assign_cmdsn(struct iscsi_session *session, struct iscsi_nopin *hdr)
+iscsi_hdr_extract(struct iscsi_tcp_conn *tcp_conn)
 {
-	uint32_t max_cmdsn = be32_to_cpu(hdr->max_cmdsn);
-	uint32_t exp_cmdsn = be32_to_cpu(hdr->exp_cmdsn);
-
-	if (max_cmdsn < exp_cmdsn -1 &&
-	    max_cmdsn > exp_cmdsn - INVALID_SN_DELTA)
-		return ISCSI_ERR_MAX_CMDSN;
-	if (max_cmdsn > session->max_cmdsn ||
-	    max_cmdsn < session->max_cmdsn - INVALID_SN_DELTA)
-		session->max_cmdsn = max_cmdsn;
-	if (exp_cmdsn > session->exp_cmdsn ||
-	    exp_cmdsn < session->exp_cmdsn - INVALID_SN_DELTA)
-		session->exp_cmdsn = exp_cmdsn;
-
-	return 0;
-}
+	struct sk_buff *skb = tcp_conn->in.skb;
 
-static inline int
-iscsi_hdr_extract(struct iscsi_conn *conn)
-{
-	struct sk_buff *skb = conn->in.skb;
+	tcp_conn->in.zero_copy_hdr = 0;
 
-	if (conn->in.copy >= conn->hdr_size &&
-	    conn->in_progress == IN_PROGRESS_WAIT_HEADER) {
+	if (tcp_conn->in.copy >= tcp_conn->hdr_size &&
+	    tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER) {
 		/*
 		 * Zero-copy PDU Header: using connection context
 		 * to store header pointer.
 		 */
 		if (skb_shinfo(skb)->frag_list == NULL &&
-		    !skb_shinfo(skb)->nr_frags)
-			conn->in.hdr = (struct iscsi_hdr *)
-				((char*)skb->data + conn->in.offset);
-		else {
+		    !skb_shinfo(skb)->nr_frags) {
+			tcp_conn->in.hdr = (struct iscsi_hdr *)
+				((char*)skb->data + tcp_conn->in.offset);
+			tcp_conn->in.zero_copy_hdr = 1;
+		} else {
 			/* ignoring return code since we checked
 			 * in.copy before */
-			skb_copy_bits(skb, conn->in.offset,
-				&conn->hdr, conn->hdr_size);
-			conn->in.hdr = &conn->hdr;
+			skb_copy_bits(skb, tcp_conn->in.offset,
+				&tcp_conn->hdr, tcp_conn->hdr_size);
+			tcp_conn->in.hdr = &tcp_conn->hdr;
 		}
-		conn->in.offset += conn->hdr_size;
-		conn->in.copy -= conn->hdr_size;
+		tcp_conn->in.offset += tcp_conn->hdr_size;
+		tcp_conn->in.copy -= tcp_conn->hdr_size;
 	} else {
 		int hdr_remains;
 		int copylen;
@@ -201,118 +151,51 @@ iscsi_hdr_extract(struct iscsi_conn *con
 		 * copying it... This'll happen quite rarely.
 		 */
 
-		if (conn->in_progress == IN_PROGRESS_WAIT_HEADER)
-			conn->in.hdr_offset = 0;
+		if (tcp_conn->in_progress == IN_PROGRESS_WAIT_HEADER)
+			tcp_conn->in.hdr_offset = 0;
 
-		hdr_remains = conn->hdr_size - conn->in.hdr_offset;
+		hdr_remains = tcp_conn->hdr_size - tcp_conn->in.hdr_offset;
 		BUG_ON(hdr_remains <= 0);
 
-		copylen = min(conn->in.copy, hdr_remains);
-		skb_copy_bits(skb, conn->in.offset,
-			(char*)&conn->hdr + conn->in.hdr_offset, copylen);
+		copylen = min(tcp_conn->in.copy, hdr_remains);
+		skb_copy_bits(skb, tcp_conn->in.offset,
+			(char*)&tcp_conn->hdr + tcp_conn->in.hdr_offset,
+			copylen);
 
 		debug_tcp("PDU gather offset %d bytes %d in.offset %d "
-		       "in.copy %d\n", conn->in.hdr_offset, copylen,
-		       conn->in.offset, conn->in.copy);
+		       "in.copy %d\n", tcp_conn->in.hdr_offset, copylen,
+		       tcp_conn->in.offset, tcp_conn->in.copy);
 
-		conn->in.offset += copylen;
-		conn->in.copy -= copylen;
+		tcp_conn->in.offset += copylen;
+		tcp_conn->in.copy -= copylen;
 		if (copylen < hdr_remains)  {
-			conn->in_progress = IN_PROGRESS_HEADER_GATHER;
-			conn->in.hdr_offset += copylen;
[...7706 lines suppressed...]
  *
@@ -27,9 +27,13 @@
 #include <scsi/iscsi_if.h>
 
 struct scsi_transport_template;
+struct iscsi_transport;
 struct Scsi_Host;
 struct mempool_zone;
 struct iscsi_cls_conn;
+struct iscsi_conn;
+struct iscsi_cmd_task;
+struct iscsi_mgmt_task;
 
 /**
  * struct iscsi_transport - iSCSI Transport template
@@ -46,6 +50,24 @@ struct iscsi_cls_conn;
  * @start_conn:		set connection to be operational
  * @stop_conn:		suspend/recover/terminate connection
  * @send_pdu:		send iSCSI PDU, Login, Logout, NOP-Out, Reject, Text.
+ * @session_recovery_timedout: notify LLD a block during recovery timed out
+ * @suspend_conn_recv:	susepend the recv side of the connection
+ * @termincate_conn:	destroy socket connection. Called with mutex lock.
+ * @init_cmd_task:	Initialize a iscsi_cmd_task and any internal structs.
+ *			Called from queuecommand with session lock held.
+ * @init_mgmt_task:	Initialize a iscsi_mgmt_task and any internal structs.
+ *			Called from iscsi_conn_send_generic with xmitmutex.
+ * @xmit_cmd_task:	Requests LLD to transfer cmd task. Returns 0 or the
+ *			the number of bytes transferred on success, and -Exyz
+ *			value on error.
+ * @xmit_mgmt_task:	Requests LLD to transfer mgmt task. Returns 0 or the
+ *			the number of bytes transferred on success, and -Exyz
+ *			value on error.
+ * @cleanup_cmd_task:	requests LLD to fail cmd task. Called with xmitmutex
+ *			and session->lock after the connection has been
+ *			suspended and terminated during recovery. If called
+ *			from abort task then connection is not suspended
+ *			or terminated but sk_callback_lock is held
  *
  * Template API provided by iSCSI Transport
  */
@@ -53,38 +75,58 @@ struct iscsi_transport {
 	struct module *owner;
 	char *name;
 	unsigned int caps;
+	/* LLD sets this to indicate what values it can export to sysfs */
+	unsigned int param_mask;
 	struct scsi_host_template *host_template;
-	/* LLD session/scsi_host data size */
-	int hostdata_size;
-	/* LLD iscsi_host data size */
-	int ihostdata_size;
 	/* LLD connection data size */
 	int conndata_size;
+	/* LLD session data size */
+	int sessiondata_size;
 	int max_lun;
 	unsigned int max_conn;
 	unsigned int max_cmd_len;
-	struct iscsi_cls_session *(*create_session)
-		(struct scsi_transport_template *t, uint32_t sn, uint32_t *sid);
+	struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it,
+		struct scsi_transport_template *t, uint32_t sn, uint32_t *hn);
 	void (*destroy_session) (struct iscsi_cls_session *session);
 	struct iscsi_cls_conn *(*create_conn) (struct iscsi_cls_session *sess,
 				uint32_t cid);
 	int (*bind_conn) (struct iscsi_cls_session *session,
 			  struct iscsi_cls_conn *cls_conn,
-			  uint32_t transport_fd, int is_leading);
+			  uint64_t transport_eph, int is_leading);
 	int (*start_conn) (struct iscsi_cls_conn *conn);
 	void (*stop_conn) (struct iscsi_cls_conn *conn, int flag);
 	void (*destroy_conn) (struct iscsi_cls_conn *conn);
 	int (*set_param) (struct iscsi_cls_conn *conn, enum iscsi_param param,
 			  uint32_t value);
 	int (*get_conn_param) (struct iscsi_cls_conn *conn,
-			       enum iscsi_param param,
-			       uint32_t *value);
+			       enum iscsi_param param, uint32_t *value);
 	int (*get_session_param) (struct iscsi_cls_session *session,
 				  enum iscsi_param param, uint32_t *value);
+	int (*get_conn_str_param) (struct iscsi_cls_conn *conn,
+				   enum iscsi_param param, char *buf);
+	int (*get_session_str_param) (struct iscsi_cls_session *session,
+				      enum iscsi_param param, char *buf);
 	int (*send_pdu) (struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
 			 char *data, uint32_t data_size);
 	void (*get_stats) (struct iscsi_cls_conn *conn,
 			   struct iscsi_stats *stats);
+	void (*suspend_conn_recv) (struct iscsi_conn *conn);
+	void (*terminate_conn) (struct iscsi_conn *conn);
+	void (*init_cmd_task) (struct iscsi_cmd_task *ctask);
+	void (*init_mgmt_task) (struct iscsi_conn *conn,
+				struct iscsi_mgmt_task *mtask,
+				char *data, uint32_t data_size);
+	int (*xmit_cmd_task) (struct iscsi_conn *conn,
+			      struct iscsi_cmd_task *ctask);
+	void (*cleanup_cmd_task) (struct iscsi_conn *conn,
+				  struct iscsi_cmd_task *ctask);
+	int (*xmit_mgmt_task) (struct iscsi_conn *conn,
+			       struct iscsi_mgmt_task *mtask);
+	void (*session_recovery_timedout) (struct iscsi_cls_session *session);
+	int (*ep_connect) (struct sockaddr *dst_addr, int non_blocking,
+			   uint64_t *ep_handle);
+	int (*ep_poll) (uint64_t ep_handle, int timeout_ms);
+	void (*ep_disconnect) (uint64_t ep_handle);
 };
 
 /*
@@ -100,10 +142,26 @@ extern void iscsi_conn_error(struct iscs
 extern int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
 			  char *data, uint32_t data_size);
 
+
+/* Connection's states */
+#define ISCSI_CONN_INITIAL_STAGE	0
+#define ISCSI_CONN_STARTED		1
+#define ISCSI_CONN_STOPPED		2
+#define ISCSI_CONN_CLEANUP_WAIT		3
+
 struct iscsi_cls_conn {
 	struct list_head conn_list;	/* item in connlist */
 	void *dd_data;			/* LLD private data */
 	struct iscsi_transport *transport;
+	uint32_t cid;			/* connection id */
+
+	/* portal/group values we got during discovery */
+	char *persistent_address;
+	int persistent_port;
+	/* portal/group values we are currently using */
+	char *address;
+	int port;
+
 	int active;			/* must be accessed with the connlock */
 	struct device dev;		/* sysfs transport/container device */
 	struct mempool_zone *z_error;
@@ -114,9 +172,32 @@ struct iscsi_cls_conn {
 #define iscsi_dev_to_conn(_dev) \
 	container_of(_dev, struct iscsi_cls_conn, dev)
 
+/* Session's states */
+#define ISCSI_STATE_FREE		1
+#define ISCSI_STATE_LOGGED_IN		2
+#define ISCSI_STATE_FAILED		3
+#define ISCSI_STATE_TERMINATE		4
+#define ISCSI_STATE_IN_RECOVERY		5
+#define ISCSI_STATE_RECOVERY_FAILED	6
+
 struct iscsi_cls_session {
 	struct list_head sess_list;		/* item in session_list */
+	struct list_head host_list;
 	struct iscsi_transport *transport;
+
+	/* iSCSI values used as unique id by userspace. */
+	char *targetname;
+	int tpgt;
+
+	/* recovery fields */
+	int recovery_tmo;
+	struct work_struct recovery_work;
+
+	int target_id;
+	int channel;
+
+	int sid;				/* session id */
+	void *dd_data;				/* LLD private data */
 	struct device dev;	/* sysfs transport/container device */
 };
 
@@ -126,22 +207,22 @@ struct iscsi_cls_session {
 #define iscsi_session_to_shost(_session) \
 	dev_to_shost(_session->dev.parent)
 
+struct iscsi_host {
+	int next_target_id;
+	struct list_head sessions;
+	struct mutex mutex;
+};
+
 /*
  * session and connection functions that can be used by HW iSCSI LLDs
  */
 extern struct iscsi_cls_session *iscsi_create_session(struct Scsi_Host *shost,
-				struct iscsi_transport *t);
+				struct iscsi_transport *t, int channel);
 extern int iscsi_destroy_session(struct iscsi_cls_session *session);
 extern struct iscsi_cls_conn *iscsi_create_conn(struct iscsi_cls_session *sess,
 					    uint32_t cid);
 extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
-
-/*
- * session functions used by software iscsi
- */
-extern struct Scsi_Host *
-iscsi_transport_create_session(struct scsi_transport_template *scsit,
-                               struct iscsi_transport *transport);
-extern int iscsi_transport_destroy_session(struct Scsi_Host *shost);
+extern void iscsi_unblock_session(struct iscsi_cls_session *session);
+extern void iscsi_block_session(struct iscsi_cls_session *session);
 
 #endif

linux-2.6-offb-find-fb.patch:
 offb.c |  105 +++++++++++++++++++++++++++++------------------------------------
 1 files changed, 47 insertions(+), 58 deletions(-)

--- NEW FILE linux-2.6-offb-find-fb.patch ---
>From benh at kernel.crashing.org Fri Mar 31 22:27:35 2006
Return-path: <benh at kernel.crashing.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Fri, 31 Mar 2006 22:27:35 +0100
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FPR9b-00074r-6a for dwmw2 at baythorne.infradead.org; Fri, 31 Mar 2006
	22:27:35 +0100
Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by
	pentafluge.infradead.org with esmtps (Exim 4.60 #1 (Red Hat Linux)) id
	1FPR9X-0004DG-1Y for dwmw2 at infradead.org; Fri, 31 Mar 2006 22:27:34 +0100
Received: from localhost.localdomain (localhost [127.0.0.1]) by
	gate.crashing.org (8.12.8/8.12.8) with ESMTP id k2VLNnWP031196 for
	<dwmw2 at infradead.org>; Fri, 31 Mar 2006 15:23:50 -0600
Subject: offb crap
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
To: David Woodhouse <dwmw2 at infradead.org>
Content-Type: text/plain
Date: Sat, 01 Apr 2006 08:24:51 +1100
Message-Id: <1143840291.24876.16.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.6.0 
X-Spam-Score: -2.8 (--)
X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org
	summary: Content analysis details:   (-2.8 points, 5.0 required) pts rule
	name              description ---- ----------------------
	-------------------------------------------------- -2.8 ALL_TRUSTED        
	   Did not pass through any untrusted hosts
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

Index: linux-work/drivers/video/offb.c
===================================================================
--- linux-work.orig/drivers/video/offb.c	2006-01-11 13:30:27.000000000 +1100
+++ linux-work/drivers/video/offb.c	2006-01-11 14:11:01.000000000 +1100
@@ -321,8 +321,9 @@
 	int *pp, i;
 	unsigned int len;
 	int width = 640, height = 480, depth = 8, pitch;
-	unsigned int flags, rsize, *up;
-	u64 address = OF_BAD_ADDR;
+	unsigned  flags, rsize, *up, addr_prop = 0;
+	unsigned long max_size = 0;
+	u64 rstart, address = OF_BAD_ADDR;
 	u32 *addrp;
 	u64 asize;
 
@@ -343,69 +344,57 @@
 	} else
 		pitch = width;
 
-       rsize = (unsigned long)pitch * (unsigned long)height *
-               (unsigned long)(depth / 8);
+	rsize = (unsigned long)pitch * (unsigned long)height *
+		(unsigned long)(depth / 8);
 
-       /* Try to match device to a PCI device in order to get a properly
-	* translated address rather then trying to decode the open firmware
-	* stuff in various incorrect ways
-	*/
-#ifdef CONFIG_PCI
-       /* First try to locate the PCI device if any */
-       {
-               struct pci_dev *pdev = NULL;
-
-	       for_each_pci_dev(pdev) {
-                       if (dp == pci_device_to_OF_node(pdev))
-                               break;
-	       }
-               if (pdev) {
-                       for (i = 0; i < 6 && address == OF_BAD_ADDR; i++) {
-                               if ((pci_resource_flags(pdev, i) &
-				    IORESOURCE_MEM) &&
-				   (pci_resource_len(pdev, i) >= rsize))
-                                       address = pci_resource_start(pdev, i);
-                       }
-		       pci_dev_put(pdev);
-               }
-        }
-#endif /* CONFIG_PCI */
-
-       /* This one is dodgy, we may drop it ... */
-       if (address == OF_BAD_ADDR &&
-	   (up = (unsigned *) get_property(dp, "address", &len)) != NULL &&
-	   len == sizeof(unsigned int))
-	       address = (u64) * up;
-
-       if (address == OF_BAD_ADDR) {
-	       for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
-			    != NULL; i++) {
-		       if (!(flags & IORESOURCE_MEM))
-			       continue;
-		       if (asize >= pitch * height * depth / 8)
-			       break;
-	       }
-		if (addrp == NULL) {
-			printk(KERN_ERR
-			       "no framebuffer address found for %s\n",
-			       dp->full_name);
-			return;
+	/* Ok, now we try to figure out the address of the framebuffer.
+	 *
+	 * Unfortunately, Open Firmware doesn't provide a standard way to do
+	 * so. All we can do is a dodgy heuristic that happens to work in
+	 * practice. On most machines, the "address" property contains what
+	 * we need, though not on Matrox cards found in IBM machines. What I've
+	 * found that appears to give good results is to go through the PCI
+	 * ranges and pick one that is both big enough and if possible encloses
+	 * the "address" property. If none match, we pick the biggest
+	 */
+	up = (unsigned int *) get_property(dp, "address", &len);
+	if (up && len == sizeof(unsigned int))
+		addr_prop = *up;
+
+	for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
+		     != NULL; i++) {
+		int match_addrp = 0;
+
+		if (!(flags & IORESOURCE_MEM))
+			continue;
+		if (asize < rsize)
+			continue;
+		rstart = of_translate_address(dp, addrp);
+		if (rstart == OF_BAD_ADDR)
+			continue;
+		if (addr_prop && (rstart <= addr_prop) &&
+		    ((rstart + rsize) > addr_prop))
+			match_addrp = 1;
+		if (match_addrp) {
+			address = addr_prop;
+			break;
 		}
-		address = of_translate_address(dp, addrp);
-		if (address == OF_BAD_ADDR) {
-			printk(KERN_ERR
-			       "can't translate framebuffer address for %s\n",
-			       dp->full_name);
-			return;
+		if (rsize > max_size) {
+			max_size = rsize;
+			address = OF_BAD_ADDR;
 		}
-
+		if (address == OF_BAD_ADDR)
+			address = rstart;
+	}
+	if (address == OF_BAD_ADDR && addr_prop)
+		address = (u_long)addr_prop;
+	if (address != OF_BAD_ADDR) {
 		/* kludge for valkyrie */
 		if (strcmp(dp->name, "valkyrie") == 0)
 			address += 0x1000;
+		offb_init_fb(dp->name, dp->full_name, width, height, depth,
+			     pitch, address, dp);
 	}
-	offb_init_fb(dp->name, dp->full_name, width, height, depth,
-		     pitch, address, dp);
-
 }
 
 static void __init offb_init_fb(const char *name, const char *full_name,



linux-2.6-powernow-k7-smp.patch:
 powernow-k7.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-powernow-k7-smp.patch ---
--- linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/powernow-k7.c~	2006-06-05 13:50:27.000000000 -0400
+++ linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/powernow-k7.c	2006-06-05 13:54:32.000000000 -0400
@@ -582,9 +582,7 @@ static int __init powernow_cpu_init (str
 	rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val);
 
 	/* recalibrate cpu_khz */
-	result = recalibrate_cpu_khz();
-	if (result)
-		return result;
+	recalibrate_cpu_khz();
 
 	fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];
 	if (!fsb) {

linux-2.6-ppc-iseries-input-layer.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-iseries-input-layer.patch ---
iSeries has no keyboard, so it's valid to build a kernel with no input layer.
It seems a bit absurd to call one of these 'embedded'.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15/drivers/input/Kconfig~	2006-01-06 02:27:56.000000000 -0500
+++ linux-2.6.15/drivers/input/Kconfig	2006-01-06 02:28:08.000000000 -0500
@@ -5,7 +5,7 @@
 menu "Input device support"
 
 config INPUT
-	tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
+	tristate "Generic input layer (needed for keyboard, mouse, ...)"
 	default y
 	---help---
 	  Say Y here if you have any input device (mouse, keyboard, tablet,

linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                    |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                |    2 ++
 b/fs/proc/task_mmu.c                |    3 +--
 b/include/linux/proc_fs.h           |    0 
 b/include/linux/ptrace.h            |    1 +
 b/kernel/ptrace.c                   |    4 ++--
 linux-2.6.16.noarch/kernel/ptrace.c |    2 +-
 7 files changed, 27 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-proc-self-maps-fix.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165351

diff --git a/fs/proc/base.c b/fs/proc/base.c
index a3a3eec..3f262cd 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -408,6 +408,26 @@ static int proc_task_root_link(struct in
 	 (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \
 	 security_ptrace(current,task) == 0))
 
+struct mm_struct *mm_for_maps(struct task_struct *task)
+{
+	struct mm_struct *mm = get_task_mm(task);
+	if (!mm)
+		return NULL;
+	down_read(&mm->mmap_sem);
+	task_lock(task);
+	if (task->mm != mm)
+		goto out;
+	if (task->mm != current->mm && __ptrace_may_attach(task))
+		goto out;
+	task_unlock(task);
+	return mm;
+out:
+	task_unlock(task);
+	up_read(&mm->mmap_sem);
+	mmput(mm);
+	return NULL;
+}
+
 static int proc_pid_environ(struct task_struct *task, char * buffer)
 {
 	int res = 0;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 0502f17..cd172ce 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -16,6 +16,8 @@ struct vmalloc_info {
 	unsigned long	largest_chunk;
 };
 
+extern struct mm_struct *mm_for_maps(struct task_struct *);
+
 #ifdef CONFIG_MMU
 #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
 extern void get_vmalloc_info(struct vmalloc_info *vmi);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 91b7c15..3777557 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -311,12 +311,11 @@ static void *m_start(struct seq_file *m,
 	if (last_addr == -1UL)
 		return NULL;
 
-	mm = get_task_mm(task);
+	mm = mm_for_maps(task);
 	if (!mm)
 		return NULL;
 
 	tail_vma = get_gate_vma(task);
-	down_read(&mm->mmap_sem);
 
 	/* Start with last addr hint */
 	if (last_addr && (vma = find_vma(mm, last_addr))) {
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 0d36750..578c28e 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -94,6 +94,7 @@ extern void __ptrace_link(struct task_st
 extern void __ptrace_unlink(struct task_struct *child);
 extern void ptrace_untrace(struct task_struct *child);
 extern int ptrace_may_attach(struct task_struct *task);
+extern int __ptrace_may_attach(struct task_struct *task);
 
 static inline void ptrace_link(struct task_struct *child,
 			       struct task_struct *new_parent)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 0eeb7e6..443f77e 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -121,7 +121,7 @@ int ptrace_check_attach(struct task_stru
 	return ret;
 }
 
-static int may_attach(struct task_struct *task)
+int __ptrace_may_attach(struct task_struct *task)
 {
 	if (!task->mm)
 		return -EPERM;
@@ -143,7 +143,7 @@ int ptrace_may_attach(struct task_struct
 {
 	int err;
 	task_lock(task);
-	err = may_attach(task);
+	err = __ptrace_may_attach(task);
 	task_unlock(task);
 	return !err;
 }

--- linux-2.6.16.noarch/kernel/ptrace.c~	2006-04-10 14:36:15.000000000 -0500
+++ linux-2.6.16.noarch/kernel/ptrace.c	2006-04-10 14:36:30.000000000 -0500
@@ -160,7 +160,7 @@ int ptrace_attach(struct task_struct *ta
 	/* the same process cannot be attached many times */
 	if (task->ptrace & PT_PTRACED)
 		goto bad;
-	retval = may_attach(task);
+	retval = __ptrace_may_attach(task);
 	if (retval)
 		goto bad;
 

linux-2.6-random-patches.patch:
 char/watchdog/machzwd.c        |    3 +--
 media/dvb/ttpci/av7110.c       |    2 +-
 media/dvb/ttpci/budget-ci.c    |    2 +-
 media/dvb/ttpci/budget-patch.c |    2 +-
 media/dvb/ttpci/budget.c       |    5 +----
 5 files changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE linux-2.6-random-patches.patch ---

--- linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c~	2006-01-31 20:22:02.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c	2006-01-31 20:24:27.000000000 -0500
@@ -2956,7 +2956,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 
 static struct saa7146_extension av7110_extension = {
-	.name		= "dvb\0",
+	.name		= "dvb",
 	.flags		= SAA7146_I2C_SHORT_DELAY,
 
 	.module		= THIS_MODULE,
--- linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c~	2006-01-31 20:25:18.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c	2006-01-31 20:25:31.000000000 -0500
@@ -1165,7 +1165,7 @@ static struct pci_device_id pci_tbl[] = 
 MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
-	.name = "budget_ci dvb\0",
+	.name = "budget_ci dvb",
 	.flags = SAA7146_I2C_SHORT_DELAY,
 
 	.module = THIS_MODULE,
--- linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c~	2006-01-31 20:25:42.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c	2006-01-31 20:25:50.000000000 -0500
@@ -731,7 +731,7 @@ static void __exit budget_patch_exit(voi
 }
 
 static struct saa7146_extension budget_extension = {
-	.name           = "budget_patch dvb\0",
+	.name           = "budget_patch dvb",
 	.flags          = 0,
 
 	.module         = THIS_MODULE,
--- linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c~	2006-01-31 20:25:54.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c	2006-01-31 20:26:00.000000000 -0500
@@ -744,7 +744,7 @@ static struct pci_device_id pci_tbl[] = 
 MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
-	.name		= "budget dvb\0",
+	.name		= "budget dvb",
 	.flags		= SAA7146_I2C_SHORT_DELAY,
 
 	.module		= THIS_MODULE,

On a machine with no machzwd, loading the module prints out..

machzwd: MachZ ZF-Logic Watchdog driver initializing.
0xffff
machzwd: Watchdog using action = RESET

- the 0xffff printk is unnecessary
- 0xffff seems to be 'hardware not present'
- fix CodingStyle. (This driver could use some more work here)

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c~	2006-02-01 22:20:16.000000000 -0500
+++ linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c	2006-02-01 22:22:23.000000000 -0500
@@ -427,8 +427,7 @@ static int __init zf_init(void)
 	printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");
 
 	ret = zf_get_ZFL_version();
-	printk("%#x\n", ret);
-	if((!ret) || (ret != 0xffff)){
+	if ((!ret) || (ret == 0xffff)) {
 		printk(KERN_WARNING PFX ": no ZF-Logic found\n");
 		return -ENODEV;
 	}


#--- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
#+++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
#@@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a
# {
# 	if (ap->flags & ATA_FLAG_SUSPENDED) {
# 		ap->flags &= ~ATA_FLAG_SUSPENDED;
#+		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
# 		ata_set_mode(ap);
# 	}
# 	if (!ata_dev_present(dev))


linux-2.6-sata-ahci-suspend.patch:
 ahci.c |  529 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 472 insertions(+), 57 deletions(-)

--- NEW FILE linux-2.6-sata-ahci-suspend.patch ---
I ported the AHCI suspend/resume patch at
http://www.spinnaker.de/linux/c1320/sata-resume-2.6.16.5.patch to
libata-dev #upstream.
This patch provides the support for AHCI suspend/resume. The patch
works very well on Napa SDV in our lab.

Your comments and bug report are welcome.

Thanks,
Forrest


Signed-off-by: Zhao, Forrest <forrest.zhao at intel.com>

--

--- linux-2.6.16.i686/drivers/scsi/ahci.c.orig	2006-05-04 14:58:34.000000000 -0400
+++ linux-2.6.16.i686/drivers/scsi/ahci.c	2006-05-04 15:02:37.000000000 -0400
@@ -44,6 +44,7 @@
 #include <linux/device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 
@@ -88,7 +89,9 @@
 
 	/* HOST_CAP bits */
 	HOST_CAP_64		= (1 << 31), /* PCI DAC (64-bit DMA) support */
+	HOST_CAP_SSS		= (1 << 27), /* Staggered Spin-up */
 	HOST_CAP_CLO		= (1 << 24), /* Command List Override support */
+	HOST_CAP_SSC		= (1 << 14), /* Slumber capable */
 
 	/* registers for each SATA port */
 	PORT_LST_ADDR		= 0x00, /* command list DMA addr */
@@ -139,6 +142,7 @@
 
 	/* PORT_CMD bits */
 	PORT_CMD_ATAPI		= (1 << 24), /* Device is ATAPI */
+	PORT_CMD_CPD		= (1 << 20), /* Cold presence detection */
 	PORT_CMD_LIST_ON	= (1 << 15), /* cmd list DMA engine running */
 	PORT_CMD_FIS_ON		= (1 << 14), /* FIS DMA engine running */
 	PORT_CMD_FIS_RX		= (1 << 4), /* Enable FIS receive DMA engine */
@@ -147,6 +151,7 @@
 	PORT_CMD_SPIN_UP	= (1 << 1), /* Spin up device */
 	PORT_CMD_START		= (1 << 0), /* Enable port DMA engine */
 
+	PORT_CMD_ICC_MASK	= (0xf << 28), /* i/f ICC state mask */
 	PORT_CMD_ICC_ACTIVE	= (0x1 << 28), /* Put i/f in active state */
 	PORT_CMD_ICC_PARTIAL	= (0x2 << 28), /* Put i/f in partial state */
 	PORT_CMD_ICC_SLUMBER	= (0x6 << 28), /* Put i/f in slumber state */
@@ -174,6 +179,7 @@
 	unsigned long		flags;
 	u32			cap;	/* cache of HOST_CAP register */
 	u32			port_map; /* cache of HOST_PORTS_IMPL reg */
+	u32			dev_map; /* connected devices */
 };
 
 struct ahci_port_priv {
@@ -191,15 +197,30 @@
 static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);
 static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
+static int ahci_start_engine(void __iomem *port_mmio);
+static int ahci_stop_engine(void __iomem *port_mmio);
+static int ahci_stop_fis_rx(void __iomem *port_mmio);
+static void ahci_start_fis_rx(void __iomem *port_mmio,
+			     struct ahci_port_priv *pp,
+			     struct ahci_host_priv *hpriv);
 static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes);
 static void ahci_irq_clear(struct ata_port *ap);
 static void ahci_eng_timeout(struct ata_port *ap);
 static int ahci_port_start(struct ata_port *ap);
 static void ahci_port_stop(struct ata_port *ap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
+static int ahci_port_resume(struct ata_port *ap);
+static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
+static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static void ahci_port_disable(struct ata_port *ap);
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
+static int ahci_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state);
+static int ahci_scsi_device_resume(struct scsi_device *sdev);
+static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t state);
+static int ahci_pci_device_resume(struct pci_dev *pdev);
 static void ahci_remove_one (struct pci_dev *pdev);
 
 static struct scsi_host_template ahci_sht = {
@@ -217,10 +238,12 @@
 	.dma_boundary		= AHCI_DMA_BOUNDARY,
 	.slave_configure	= ata_scsi_slave_config,
 	.bios_param		= ata_std_bios_param,
+	.resume			= ahci_scsi_device_resume,
+	.suspend		= ahci_scsi_device_suspend,
 };
 
 static const struct ata_port_operations ahci_ops = {
-	.port_disable		= ata_port_disable,
+	.port_disable		= ahci_port_disable,
 
 	.check_status		= ahci_check_status,
 	.check_altstatus	= ahci_check_status,
@@ -305,6 +328,8 @@
 	.id_table		= ahci_pci_tbl,
 	.probe			= ahci_init_one,
 	.remove			= ahci_remove_one,
+	.suspend		= ahci_pci_device_suspend,
+	.resume			= ahci_pci_device_resume,
 };
 
 
@@ -378,21 +403,23 @@
 
 	ap->private_data = pp;
 
-	if (hpriv->cap & HOST_CAP_64)
-		writel((pp->cmd_slot_dma >> 16) >> 16, port_mmio + PORT_LST_ADDR_HI);
-	writel(pp->cmd_slot_dma & 0xffffffff, port_mmio + PORT_LST_ADDR);
-	readl(port_mmio + PORT_LST_ADDR); /* flush */
-
-	if (hpriv->cap & HOST_CAP_64)
-		writel((pp->rx_fis_dma >> 16) >> 16, port_mmio + PORT_FIS_ADDR_HI);
-	writel(pp->rx_fis_dma & 0xffffffff, port_mmio + PORT_FIS_ADDR);
-	readl(port_mmio + PORT_FIS_ADDR); /* flush */
-
-	writel(PORT_CMD_ICC_ACTIVE | PORT_CMD_FIS_RX |
-	       PORT_CMD_POWER_ON | PORT_CMD_SPIN_UP |
-	       PORT_CMD_START, port_mmio + PORT_CMD);
-	readl(port_mmio + PORT_CMD); /* flush */
-
+	/*
+	 * Driver is setup; initialize the HBA
+	 */
+	ahci_start_fis_rx(port_mmio, pp, hpriv);
+	rc = ahci_port_spinup(port_mmio, hpriv->cap);
+	if (rc)
+		printk(KERN_WARNING "ata%d: could not spinup device (%d)\n",
+		       ap->id, rc);
+ 
+	/*
+	 * Do not enable DMA here; according to the spec
+	 * (section 10.1.1) we should first enable FIS reception,
+	 * then check if the port is enabled before we try to 
+	 * switch on DMA.
+	 * And as the port check is done during probe
+	 * we really shouldn't be doing it here.
+	 */
 	return 0;
 }
 
@@ -401,19 +428,8 @@
 {
 	struct device *dev = ap->host_set->dev;
 	struct ahci_port_priv *pp = ap->private_data;
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
-	u32 tmp;
-
-	tmp = readl(port_mmio + PORT_CMD);
-	tmp &= ~(PORT_CMD_START | PORT_CMD_FIS_RX);
-	writel(tmp, port_mmio + PORT_CMD);
-	readl(port_mmio + PORT_CMD); /* flush */
 
-	/* spec says 500 msecs for each PORT_CMD_{START,FIS_RX} bit, so
-	 * this is slightly incorrect.
-	 */
-	msleep(500);
+	ahci_port_suspend(ap, PMSG_SUSPEND);
 
 	ap->private_data = NULL;
 	dma_free_coherent(dev, AHCI_PORT_PRIV_DMA_SZ,
@@ -422,6 +438,106 @@
 	kfree(pp);
 }
 
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+	int rc;
+
+	/*
+	 * Disable DMA
+	 */
+	rc = ahci_stop_engine(port_mmio);
+	if (rc) {
+		printk(KERN_WARNING "ata%u: DMA engine busy\n", ap->id);
+		return rc;
+	}
+
+	/*
+	 * Disable FIS reception
+	 */
+	rc = ahci_stop_fis_rx(port_mmio);
+	if (rc)
+		printk(KERN_WARNING "ata%d: FIS RX still running (rc %d)\n",
+		       ap->id, rc);
+
+	/*
+	 * Put device into slumber mode
+	 */
+	if (!rc && state.event != PM_EVENT_FREEZE)
+		ahci_port_standby(port_mmio, hpriv->cap);
+
+	return rc;
+}
+
+static int ahci_port_resume(struct ata_port *ap)
+{
+	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+	struct ahci_port_priv *pp = ap->private_data;
+	int rc;
+	u32 tmp;
+
+	/*
+	 * Enable FIS reception
+	 */
+	ahci_start_fis_rx(port_mmio, pp, hpriv);
+
+	rc = ahci_port_spinup(port_mmio, hpriv->cap);
+	if (rc)
+		printk(KERN_WARNING "ata%d: could not spinup device (%d)\n",
+		       ap->id, rc);
+
+	/*
+	 * Clear error status
+	 */
+	tmp = readl(port_mmio + PORT_SCR_ERR);
+	writel(tmp, port_mmio + PORT_SCR_ERR);
+	/*
+	 * Clear interrupt status
+	 */
+	tmp = readl(mmio + HOST_CTL);
+	if (!(tmp & HOST_IRQ_EN)) {
+		u32 irq_stat;
+
+		/* ack any pending irq events for this port */
+		irq_stat = readl(port_mmio + PORT_IRQ_STAT);
+		if (irq_stat)
+			writel(irq_stat, port_mmio + PORT_IRQ_STAT);
+
+		/* set irq mask (enables interrupts) */
+		writel(DEF_PORT_IRQ, port_mmio + PORT_IRQ_MASK);
+
+		if ((hpriv->dev_map >> (ap->port_no + 1)) == 0) {
+			/*
+			 * Enable interrupts if this was the last port
+			 */
+			printk(KERN_WARNING "ata%d: enabling interrupts\n",
+			       ap->id);
+
+			irq_stat = readl(mmio + HOST_IRQ_STAT);
+			if (irq_stat)
+				writel(irq_stat, mmio + HOST_IRQ_STAT);
+
+			tmp |= HOST_IRQ_EN;
+			writel(tmp, mmio + HOST_CTL);
+			(void) readl(mmio + HOST_CTL);
+		}
+	}
+
+	/*
+	 * Enable DMA
+	 */
+	rc = ahci_start_engine(port_mmio);
+	if (rc)
+		printk(KERN_WARNING "ata%d: cannot start DMA engine (rc %d)\n",
+		       ap->id, rc);
+
+	return rc;
+}
+
 static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
 {
 	unsigned int sc_reg;
@@ -456,19 +572,22 @@
 	writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
 }
 
-static int ahci_stop_engine(struct ata_port *ap)
+static int ahci_stop_engine(void __iomem *port_mmio)
 {
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	int work;
 	u32 tmp;
 
 	tmp = readl(port_mmio + PORT_CMD);
+	/* Check if the HBA is idle */
+	if ((tmp & (PORT_CMD_START | PORT_CMD_LIST_ON)) == 0)
+		return 0;
+
+	/* Setting HBA to idle */
 	tmp &= ~PORT_CMD_START;
 	writel(tmp, port_mmio + PORT_CMD);
 
-	/* wait for engine to stop.  TODO: this could be
-	 * as long as 500 msec
+	/*
+	 * wait for engine to become idle
 	 */
 	work = 1000;
 	while (work-- > 0) {
@@ -481,16 +600,233 @@
 	return -EIO;
 }
 
-static void ahci_start_engine(struct ata_port *ap)
+static int ahci_start_engine(void __iomem *port_mmio)
 {
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	u32 tmp;
+	int work = 1000;
 
+	/*
+	 * Get current status
+	 */
 	tmp = readl(port_mmio + PORT_CMD);
+
+	/*
+	 * AHCI rev 1.1 section 10.3.1:
+	 * Software shall not set PxCMD.ST to '1' until it verifies
+	 * that PxCMD.CR is '0' and has set PxCMD.FRE to '1'
+	 */
+	if ((tmp & PORT_CMD_FIS_RX) == 0)
+		return -EPERM;
+
+	/*
+	 * wait for engine to become idle.
+	 */
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_LIST_ON) == 0)
+			break;
+		udelay(10);
+	}
+
+	if (!work) {
+		/*
+		 * We need to do a port reset / HBA reset here
+		 */
+		return -EBUSY;
+	}
+
+	/*
+	 * Start DMA
+	 */
 	tmp |= PORT_CMD_START;
 	writel(tmp, port_mmio + PORT_CMD);
 	readl(port_mmio + PORT_CMD); /* flush */
+
+	return 0;
+}
+
+static int ahci_stop_fis_rx(void __iomem *port_mmio)
+{
+	u32 tmp;
+	int work = 1000;
+
+	/*
+	 * Get current status
+	 */
+	tmp = readl(port_mmio + PORT_CMD);
+
+	/* Check if FIS RX is already disabled */
+	if ((tmp & PORT_CMD_FIS_RX) == 0)
+		return 0;
+
+	/*
+	 * AHCI Rev 1.1 section 10.3.2
+	 * Software shall not clear PxCMD.FRE while
+	 * PxCMD.ST or PxCMD.CR is set to '1'
+	 */
+	if (tmp & (PORT_CMD_LIST_ON | PORT_CMD_START)) {
+		return -EPERM;
+	}
+
+	/*
+	 * Disable FIS reception
+	 *
+	 * AHCI Rev 1.1 Section 10.1.2:
+	 * If PxCMD.FRE is set to '1', software should clear it
+	 * to '0' and wait at least 500 milliseconds for PxCMD.FR
+	 * to return '0' when read. If PxCMD.FR does not clear
+	 * '0' correctly, then software may attempt a port reset
+	 * of a full HBA reset to recover.
+	 */
+	tmp &= ~(PORT_CMD_FIS_RX);
+	writel(tmp, port_mmio + PORT_CMD);
+
+	mdelay(500);
+	work = 1000;
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_FIS_ON) == 0)
+			return 0;
+		udelay(10);
+	}
+
+	return -EBUSY;
+}
+
+static void ahci_start_fis_rx(void __iomem *port_mmio,
+                             struct ahci_port_priv *pp,
+                             struct ahci_host_priv *hpriv)
+{
+	u32 tmp;
+
+	/*
+	 * Set FIS registers
+	 */
+	if (hpriv->cap & HOST_CAP_64)
+		writel((pp->cmd_slot_dma >> 16) >> 16, port_mmio + PORT_LST_ADDR_HI);
+	writel(pp->cmd_slot_dma & 0xffffffff, port_mmio + PORT_LST_ADDR);
+	readl(port_mmio + PORT_LST_ADDR); /* flush */
+
+	if (hpriv->cap & HOST_CAP_64)
+		writel((pp->rx_fis_dma >> 16) >> 16, port_mmio + PORT_FIS_ADDR_HI);
+	writel(pp->rx_fis_dma & 0xffffffff, port_mmio + PORT_FIS_ADDR);
+	readl(port_mmio + PORT_FIS_ADDR); /* flush */
+
+	/*
+	 * Enable FIS reception
+	 */
+	tmp = readl(port_mmio + PORT_CMD);
+	tmp |= PORT_CMD_FIS_RX;
+	writel(tmp, port_mmio + PORT_CMD);
+	readl(port_mmio + PORT_CMD); /* flush */
+}
+
+static int ahci_port_standby(void __iomem *port_mmio, u32 cap)
+{
+	u32 tmp, scontrol, sstatus;
+
+	tmp = readl(port_mmio + PORT_CMD);
+	/*
+	 * AHCI Rev1.1 Section 5.3.2.3:
+	 * Software is only allowed to program the PxCMD.FRE,
+	 * PxCMD.POD, PxSCTL.DET, and PxCMD.SUD register bits
+	 * when PxCMD.ST is set to '0'
+	 */
+	if (tmp & PORT_CMD_START)
+		return -EBUSY;
+
+	if (cap & HOST_CAP_SSC) {
+		/*
+		 * Enable transitions to slumber mode
+		 */
+		scontrol = readl(port_mmio + PORT_SCR_CTL);
+		if ((scontrol & 0x0f00) > 0x100) {
+			scontrol &= ~0xf00;
+			writel(scontrol, port_mmio + PORT_SCR_CTL);
+		}
+		/*
+		 * Put device into slumber mode
+		 */
+		tmp |= PORT_CMD_ICC_SLUMBER;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+
+		/*
+		 * Actually, we should wait for the device to
+		 * enter slumber mode by checking
+		 * sstatus & 0xf00 == 6
+		 */
+		sstatus = readl(port_mmio + PORT_SCR_STAT);
+	}
+
+	/*
+	 * Put device into listen mode
+	 */
+	scontrol = readl(port_mmio + PORT_SCR_CTL);
+	scontrol &= ~0xf;
+	writel(scontrol, port_mmio + PORT_SCR_CTL);
+
+	tmp = readl(port_mmio + PORT_CMD);
+	if (cap & HOST_CAP_SSS) {
+		/*
+		 * Spin down the device for staggered spin-up support
+		 */
+		tmp &= ~PORT_CMD_SPIN_UP;
+		writel(tmp, port_mmio + PORT_CMD);
+		readl(port_mmio + PORT_CMD); /* flush */
+	}
+
+	return 0;
+}
+
+static int ahci_port_spinup(void __iomem *port_mmio, u32 cap)
+{
+	u32 tmp;
+
+	tmp = readl(port_mmio + PORT_CMD);
+	/*
+	 * AHCI Rev1.1 Section 5.3.2.3:
+	 * Software is only allowed to program the PxCMD.FRE,
+	 * PxCMD.POD, PxSCTL.DET, and PxCMD.SUD register bits
+	 * when PxCMD.ST is set to '0'
+	 */
+	if (tmp & PORT_CMD_START)
+		return -EBUSY;
+
+	/*
+	 * Power on device if supported
+	 */
+	if (tmp & PORT_CMD_CPD) {
+		tmp |= PORT_CMD_POWER_ON;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+	}
+
+	/*
+	 * Spin up device
+	 */
+	if (cap & HOST_CAP_SSS) {
+		tmp |= PORT_CMD_SPIN_UP;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+	}
+
+	if ((tmp & PORT_CMD_ICC_MASK) != PORT_CMD_ICC_ACTIVE) {
+		tmp |= PORT_CMD_ICC_ACTIVE;
+		writel(tmp, port_mmio + PORT_CMD);
+		tmp = readl(port_mmio + PORT_CMD);
+	}
+
+	return 0;
+}
+
+static void ahci_port_disable(struct ata_port *ap)
+{
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+
+	ata_port_disable(ap);
+
+	hpriv->dev_map &= ~(1 << ap->port_no);
 }
 
 static unsigned int ahci_dev_classify(struct ata_port *ap)
@@ -549,7 +885,7 @@
 	DPRINTK("ENTER\n");
 
 	/* prepare for SRST (AHCI-1.1 10.4.1) */
-	rc = ahci_stop_engine(ap);
+	rc = ahci_stop_engine(port_mmio);
 	if (rc) {
 		reason = "failed to stop engine";
 		goto fail_restart;
@@ -580,7 +916,7 @@
 	}
 
 	/* restart engine */
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
 
 	ata_tf_init(ap, &tf, 0);
 	fis = pp->cmd_tbl;
@@ -638,7 +974,7 @@
 	return 0;
 
  fail_restart:
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
  fail:
 	if (verbose)
 		printk(KERN_ERR "ata%u: softreset failed (%s)\n",
@@ -651,12 +987,15 @@
 static int ahci_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
 {
 	int rc;
+ 	void __iomem *mmio = ap->host_set->mmio_base;
+ 	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+
 
 	DPRINTK("ENTER\n");
 
-	ahci_stop_engine(ap);
+	ahci_stop_engine(port_mmio);
 	rc = sata_std_hardreset(ap, verbose, class);
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
 
 	if (rc == 0)
 		*class = ahci_dev_classify(ap);
@@ -670,6 +1009,7 @@
 static void ahci_postreset(struct ata_port *ap, unsigned int *class)
 {
 	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
 	u32 new_tmp, tmp;
 
 	ata_std_postreset(ap, class);
@@ -684,6 +1024,9 @@
 		writel(new_tmp, port_mmio + PORT_CMD);
 		readl(port_mmio + PORT_CMD); /* flush */
 	}
+
+	if (*class != ATA_DEV_NONE)
+		hpriv->dev_map |= (1 << ap->port_no);
 }
 
 static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes)
@@ -792,7 +1135,7 @@
 			readl(port_mmio + PORT_SCR_ERR));
 
 	/* stop DMA */
-	ahci_stop_engine(ap);
+	ahci_stop_engine(port_mmio);
 
 	/* clear SATA phy error, if any */
 	tmp = readl(port_mmio + PORT_SCR_ERR);
@@ -811,7 +1154,7 @@
 	}
 
 	/* re-start DMA */
-	ahci_start_engine(ap);
+	ahci_start_engine(port_mmio);
 }
 
 static void ahci_eng_timeout(struct ata_port *ap)
@@ -835,6 +1178,71 @@
 	ata_eh_qc_complete(qc);
 }
 
+int ahci_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
+{
+	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+	struct ata_device *dev = &ap->device[sdev->id];
+	int rc;
+
+	rc = ata_device_suspend(ap, dev, state);
+
+	if (!rc)
+		rc = ahci_port_suspend(ap, state);
+
+	return rc;
+}
+
+int ahci_scsi_device_resume(struct scsi_device *sdev)
+{
+	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+	struct ata_device *dev = &ap->device[sdev->id];
+
+	ahci_port_resume(ap);
+
+	return ata_device_resume(ap, dev);
+}
+
+int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+	struct device *dev = pci_dev_to_dev(pdev);
+	struct ata_host_set *host_set = dev_get_drvdata(dev);
+	void __iomem *mmio = host_set->mmio_base;
+	u32 tmp;
+
+	/*
+	 * AHCI spec rev1.1 section 8.3.3:
+	 * Software must disable interrupts prior to
+	 * requesting a transition of the HBA to
+	 * D3 state.
+	 */
+	tmp = readl(mmio + HOST_CTL);
+	tmp &= ~HOST_IRQ_EN;
+	writel(tmp, mmio + HOST_CTL);
+	tmp = readl(mmio + HOST_CTL); /* flush */
+
+	return ata_pci_device_suspend(pdev, state);
+}
+
+int ahci_pci_device_resume(struct pci_dev *pdev)
+{
+	struct device *dev = pci_dev_to_dev(pdev);
+	struct ata_host_set *host_set = dev_get_drvdata(dev);
+	void __iomem *mmio = host_set->mmio_base;
+	u32 tmp;
+
+	/*
+	 * Enabling AHCI mode
+	 */
+	tmp = readl(mmio + HOST_CTL);
+	if (!(tmp & HOST_AHCI_EN)) {
+		tmp |= HOST_AHCI_EN;
+		writel(tmp, mmio + HOST_CTL);
+		tmp = readl(mmio + HOST_CTL);
+	}
+
+	return ata_pci_device_resume(pdev);
+}
+
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
 {
 	void __iomem *mmio = ap->host_set->mmio_base;
@@ -1015,6 +1423,7 @@
 
 	hpriv->cap = readl(mmio + HOST_CAP);
 	hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);
+	hpriv->dev_map = 0;
 	probe_ent->n_ports = (hpriv->cap & 0x1f) + 1;
 
 	VPRINTK("cap 0x%x  port_map 0x%x  n_ports %d\n",
@@ -1060,23 +1469,29 @@
 				(unsigned long) mmio, i);
 
 		/* make sure port is not active */
-		tmp = readl(port_mmio + PORT_CMD);
-		VPRINTK("PORT_CMD 0x%x\n", tmp);
-		if (tmp & (PORT_CMD_LIST_ON | PORT_CMD_FIS_ON |
-			   PORT_CMD_FIS_RX | PORT_CMD_START)) {
-			tmp &= ~(PORT_CMD_LIST_ON | PORT_CMD_FIS_ON |
-				 PORT_CMD_FIS_RX | PORT_CMD_START);
-			writel(tmp, port_mmio + PORT_CMD);
-			readl(port_mmio + PORT_CMD); /* flush */
-
-			/* spec says 500 msecs for each bit, so
-			 * this is slightly incorrect.
-			 */
-			msleep(500);
-		}
+		rc = ahci_stop_engine(port_mmio);
+		if (rc)
+			printk(KERN_WARNING "ata%u: DMA engine busy (rc %d)\n",
+			       i, rc);
+
+		rc = ahci_stop_fis_rx(port_mmio);
+		if (rc)
+			printk(KERN_WARNING "ata%u: FIS RX not stopped (rc %d)\n",
+			       i, rc);
+
+		/*
+		 * Actually, this is wrong again.
+		 * AHCI spec says that we first should
+		 * enable FIS reception before sending
+		 * SPIN_UP to the device ...
+		 */
 
 		writel(PORT_CMD_SPIN_UP, port_mmio + PORT_CMD);
 
+		/*
+		 * Wait for the communications link to establish
+		 */
+
 		j = 0;
 		while (j < 100) {
 			msleep(10);

linux-2.6-serial-resume.patch:
 drivers/char/tty_io.c        |   13 +++++++++++++
 drivers/serial/serial_core.c |   12 ++++++------
 include/linux/tty.h          |    2 ++
 3 files changed, 21 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-serial-resume.patch ---

On Fri, Jun 09, 2006 at 09:42:34AM +0100, Russell King wrote:
> The only sane solution is for the tty layer to be adjusted to allow
> suspend/resume support for consoles.

And for those who can't work out how to do that, here's something which
_probably_ does it.  Would folk mind testing it out please?

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1674,6 +1674,19 @@ release_mem_out:
 }
 
 /*
+ * Get a copy of the termios structure for the driver/index
+ */
+void tty_get_termios(struct tty_driver *driver, int idx, struct termios *tio)
+{
+	lock_kernel();
+	if (driver->termios[idx])
+		*tio = *driver->termios[idx];
+	else
+		*tio = driver->init_termios;
+	unlock_kernel();
+}
+
+/*
  * Releases memory associated with a tty structure, and clears out the
  * driver table slots.
  */
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1968,16 +1968,16 @@ int uart_resume_port(struct uart_driver 
 		struct termios termios;
 
 		/*
-		 * First try to use the console cflag setting.
+		 * Get the termios for this line
 		 */
-		memset(&termios, 0, sizeof(struct termios));
-		termios.c_cflag = port->cons->cflag;
+		tty_get_termios(drv->tty_driver, port->line, &termios);
 
 		/*
-		 * If that's unset, use the tty termios setting.
+		 * If the console cflag is still set, subsitute that
+		 * for the termios cflag.
 		 */
-		if (state->info && state->info->tty && termios.c_cflag == 0)
-			termios = *state->info->tty->termios;
+		if (port->cons->cflag)
+			termios.c_cflag = port->cons->cflag;
 
 		port->ops->set_termios(port, &termios, NULL);
 		console_start(port->cons);
diff --git a/include/linux/tty.h b/include/linux/tty.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -297,6 +297,8 @@ extern int tty_read_raw_data(struct tty_
 			     int buflen);
 extern void tty_write_message(struct tty_struct *tty, char *msg);
 
+extern void tty_get_termios(struct tty_driver *drv, int idx, struct termios *tio);
+
 extern int is_orphaned_pgrp(int pgrp);
 extern int is_ignored(int sig);
 extern int tty_signal(int sig, struct tty_struct *tty);



linux-2.6-warn-c-p-a.patch:
 pageattr.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE linux-2.6-warn-c-p-a.patch ---

--- linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c.org	2006-05-04 09:23:56.000000000 +0200
+++ linux-2.6.17-rc3-mm1-davej/arch/i386/mm/pageattr.c	2006-05-04 09:27:21.000000000 +0200
@@ -9,6 +9,7 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/kernel.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
@@ -18,6 +19,7 @@
 static DEFINE_SPINLOCK(cpa_lock);
 static struct list_head df_list = LIST_HEAD_INIT(df_list);
 
+extern char __start_rodata, __end_rodata;
 
 pte_t *lookup_address(unsigned long address) 
 { 
@@ -127,10 +129,16 @@
 	pte_t *kpte; 
 	unsigned long address;
 	struct page *kpte_page;
+	static int once = 0;
 
 	BUG_ON(PageHighMem(page));
 	address = (unsigned long)page_address(page);
 
+	if (address >= __start_rodata && address <= __end_rodata && prot != __PAGE_KERNEL_RO && once++ == 0) {
+		printk(KERN_ERR "Possible trojan or rootkit detected!\n");
+		add_taint(TAINT_MACHINE_CHECK);
+	}
+
 	kpte = lookup_address(address);
 	if (!kpte)
 		return -EINVAL;


linux-2.6-x86-alternatives-smp-only.patch:
 alternative.c |    6 ++++++
 module.c      |    4 ++++
 2 files changed, 10 insertions(+)

--- NEW FILE linux-2.6-x86-alternatives-smp-only.patch ---
On UP kernels, it's silly to print out info about SMP alternatives..

 SMP alternatives: switching to UP code
 Freeing SMP alternatives: 0k freed

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.17.noarch/arch/i386/kernel/alternative.c~	2006-06-20 13:44:40.000000000 -0400
+++ linux-2.6.17.noarch/arch/i386/kernel/alternative.c	2006-06-20 13:46:33.000000000 -0400
@@ -118,6 +118,7 @@ void apply_alternatives(struct alt_instr
 	}
 }
 
+#ifdef CONFIG_SMP
 static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end)
 {
 	struct alt_instr *a;
@@ -282,6 +283,8 @@ void alternatives_smp_switch(int smp)
 	}
 	spin_unlock_irqrestore(&smp_alt, flags);
 }
+#endif
+
 
 void __init alternative_instructions(void)
 {
@@ -290,6 +290,8 @@ void __init alternative_instructions(voi
 {
 	apply_alternatives(__alt_instructions, __alt_instructions_end);
 
+#ifdef CONFIG_SMP
+
 	/* switch to patch-once-at-boottime-only mode and free the
 	 * tables in case we know the number of CPUs will never ever
 	 * change */
@@ -318,4 +322,5 @@ void __init alternative_instructions(voi
 					    _text, _etext);
 		alternatives_smp_switch(0);
 	}
+#endif
 }
--- linux-2.6.17.noarch/arch/i386/kernel/module.c~	2006-06-20 14:08:15.000000000 -0400
+++ linux-2.6.17.noarch/arch/i386/kernel/module.c	2006-06-20 14:08:56.000000000 -0400
@@ -125,6 +125,7 @@ int module_finalize(const Elf_Ehdr *hdr,
 		void *aseg = (void *)alt->sh_addr;
 		apply_alternatives(aseg, aseg + alt->sh_size);
 	}
+#ifdef CONFIG_SMP
 	if (locks && text) {
 		void *lseg = (void *)locks->sh_addr;
 		void *tseg = (void *)text->sh_addr;
@@ -132,10 +133,13 @@ int module_finalize(const Elf_Ehdr *hdr,
 					    lseg, lseg + locks->sh_size,
 					    tseg, tseg + text->sh_size);
 	}
+#endif
 	return 0;
 }
 
 void module_arch_cleanup(struct module *mod)
 {
+#ifdef CONFIG_SMP
 	alternatives_smp_module_del(mod);
+#endif
 }

linux-2.6-x86-tune-generic.patch:
 Makefile.cpu |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-x86-tune-generic.patch ---
--- linux-2.6.15/arch/i386/Makefile.cpu~	2006-01-09 11:39:04.000000000 -0500
+++ linux-2.6.15/arch/i386/Makefile.cpu	2006-01-09 11:39:36.000000000 -0500
@@ -15,7 +15,7 @@ cflags-$(CONFIG_M486)		+= -march=i486
 cflags-$(CONFIG_M586)		+= -march=i586
 cflags-$(CONFIG_M586TSC)	+= -march=i586
 cflags-$(CONFIG_M586MMX)	+= -march=pentium-mmx
-cflags-$(CONFIG_M686)		+= -march=i686
+cflags-$(CONFIG_M686)		+= -march=i686 $(call tune,generic)
 cflags-$(CONFIG_MPENTIUMII)	+= -march=i686 $(call tune,pentium2)
 cflags-$(CONFIG_MPENTIUMIII)	+= -march=i686 $(call tune,pentium3)
 cflags-$(CONFIG_MPENTIUMM)	+= -march=i686 $(call tune,pentium3)

linux-2.6-x86_64-noisy-syscalls.patch:
 sys_ia32.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-x86_64-noisy-syscalls.patch ---
--- linux-2.6.16.noarch/arch/x86_64/ia32/sys_ia32.c~	2006-05-21 14:50:57.000000000 -0400
+++ linux-2.6.16.noarch/arch/x86_64/ia32/sys_ia32.c	2006-05-21 14:51:48.000000000 -0400
@@ -522,17 +522,9 @@ sys32_waitpid(compat_pid_t pid, unsigned
 }
 
 int sys32_ni_syscall(int call)
-{ 
-	struct task_struct *me = current;
-	static char lastcomm[sizeof(me->comm)];
-
-	if (strncmp(lastcomm, me->comm, sizeof(lastcomm))) {
-		printk(KERN_INFO "IA32 syscall %d from %s not implemented\n",
-		       call, me->comm);
-		strncpy(lastcomm, me->comm, sizeof(lastcomm));
-	} 
-	return -ENOSYS;	       
-} 
+{
+	return -ENOSYS;
+}
 
 /* 32-bit timeval and related flotsam.  */
 


--- NEW FILE linux-2.6.17.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBElLc9yGugalF9Dw4RAsplAJ9Vhjp8IgkMBdGdiYygXtYBcKZ6GwCffyTu
+gY8wsoFmSdAU6UiqakOcyo=
=hcew
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.17.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEl8bnyGugalF9Dw4RAltcAJ0ZTYMxtRL+UKM6ISkOjC8j2K4yngCeKbGE
IwThqSk7vrdgHt7HB2Q5/Sk=
=/k0g
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- .cvsignore	5 Jun 2006 18:33:49 -0000	1.192
+++ .cvsignore	20 Jun 2006 18:25:39 -0000	1.193
@@ -1,5 +1,5 @@
 kernel-2.6.*.config
 temp-*
-kernel-2.6.16
-linux-2.6.16.tar.bz2
-patch-2.6.16.20.bz2
+kernel-2.6.17
+linux-2.6.17.tar.bz2
+patch-2.6.17.1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1643
retrieving revision 1.1644
diff -u -r1.1643 -r1.1644
--- kernel-2.6.spec	5 Jun 2006 18:33:49 -0000	1.1643
+++ kernel-2.6.spec	20 Jun 2006 18:25:39 -0000	1.1644
@@ -4,7 +4,7 @@
 # These are the kernels that are built IF the architecture allows it.
 
 %define buildup 1
-%define buildsmp 1
+%define buildsmp 0
 %define builddoc 0
 
 # Versions of various parts
@@ -15,41 +15,39 @@
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 16
+%define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4
 %define signmodules 0
 %define make_target bzImage
-%define kernel_image arch/$Arch/boot/bzImage
+%define kernel_image x86
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
 # groups of related archs
 %define all_x86 i586 i686
 
-# Override generic defaults with per-arch defaults 
+# Override generic defaults with per-arch defaults
 
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
 # Second, per-architecture exclusions (ifarch)
 
-%ifarch i586
-%define buildsmp 0
-%endif
-
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
+%ifarch i686
+%define buildsmp 1
+%endif
+
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
@@ -57,7 +55,6 @@
 %endif
 
 %ifarch ppc64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -66,7 +63,6 @@
 %endif
 
 %ifarch ppc64iseries
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -75,24 +71,30 @@
 %endif
 
 %ifarch s390
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image arch/s390/boot/image
 %endif
 
 %ifarch s390x
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image arch/s390/boot/image
 %endif
 
 %ifarch sparc
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
-%define buildsmp 0
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch sparc64
+%define buildsmp 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch ppc
@@ -100,13 +102,15 @@
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
+%define buildsmp 1
 %endif
 
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
-%define buildsmp 0
 %define image_install_path boot/efi/EFI/redhat
 %define signmodules 1
+%define make_target compressed
+%define kernel_image vmlinux.gz
 %endif
 
 #
@@ -169,36 +173,42 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
+Source2: Config.mk
 
 Source10: COPYING.modules
 Source11: genkey
 
 Source20: kernel-%{kversion}-i586.config
-Source21: kernel-%{kversion}-i686.config
-Source22: kernel-%{kversion}-i686-smp.config
-Source23: kernel-%{kversion}-x86_64.config
-Source24: kernel-%{kversion}-x86_64-smp.config
-Source25: kernel-%{kversion}-ppc64.config
-Source26: kernel-%{kversion}-ppc64iseries.config
-Source27: kernel-%{kversion}-s390.config
-Source28: kernel-%{kversion}-s390x.config
-Source29: kernel-%{kversion}-ppc.config
-Source30: kernel-%{kversion}-ppc-smp.config
-Source31: kernel-%{kversion}-ia64.config
-#Source32: kernel-%{kversion}-sparc.config
-#Source33: kernel-%{kversion}-sparc64.config
-#Source34: kernel-%{kversion}-sparc64-smp.config
+Source21: kernel-%{kversion}-i586-smp.config
+Source22: kernel-%{kversion}-i686.config
+Source23: kernel-%{kversion}-i686-smp.config
+
+Source25: kernel-%{kversion}-x86_64.config
+
+Source27: kernel-%{kversion}-ppc.config
+Source28: kernel-%{kversion}-ppc-smp.config
+Source29: kernel-%{kversion}-ppc64.config
+Source30: kernel-%{kversion}-ppc64iseries.config
+
+Source32: kernel-%{kversion}-s390.config
+Source33: kernel-%{kversion}-s390x.config
+
+Source34: kernel-%{kversion}-ia64.config
+
+#Source66: kernel-%{kversion}-sparc.config
+#Source67: kernel-%{kversion}-sparc64.config
+#Source68: kernel-%{kversion}-sparc64-smp.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.20.bz2
+Patch1: patch-2.6.17.1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
-Patch100: linux-2.6-bzimage.patch
 
 # 200 - 299   x86(-64)
-Patch200: linux-2.6-x86-tune-p4.patch
+
+Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
 Patch202: linux-2.6-intel-cache-build.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
@@ -206,10 +216,15 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
+Patch208: linux-2.6-x86_64-noisy-syscalls.patch
+Patch210: linux-2.6-x86-alternatives-smp-only.patch
 
 # 300 - 399   ppc(64)
-Patch304: linux-2.6-ppc-rtas-check.patch
-Patch305: linux-2.6-mv643xx-compile-fix.patch
+Patch302: linux-2.6-offb-find-fb.patch
+Patch305: linux-2.6-cell-mambo-drivers.patch
+Patch306: linux-2.6-hvc-console.patch
+Patch314: linux-2.6-ppc-rtas-check.patch
+Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -224,6 +239,7 @@
 
 # Exec-shield.
 Patch810: linux-2.6-execshield.patch
+Patch813: linux-2.6-warn-c-p-a.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
@@ -243,16 +259,13 @@
 Patch1011: linux-2.6-debug-slab-backtrace.patch
 Patch1012: linux-2.6-debug-list_head.patch
 Patch1013: linux-2.6-debug-taint-vm.patch
-Patch1014: linux-2.6-debug-slab-leaks.patch
 Patch1015: linux-2.6-debug-singlebiterror.patch
 Patch1016: linux-2.6-debug-spinlock-taint.patch
 Patch1017: linux-2.6-debug-spinlock-panic.patch
 Patch1018: linux-2.6-debug-Wundef.patch
 Patch1019: linux-2.6-debug-disable-builtins.patch
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1021: linux-2.6-debug-reference-discarded-return-result.patch
 Patch1022: linux-2.6-debug-panic-stackdump.patch
-Patch1024: linux-2.6-debug-dual-line-backtrace.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1026: linux-2.6-debug-no-quiet.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
@@ -262,7 +275,6 @@
 Patch1031: linux-2.6-debug-periodic-slab-check.patch
 Patch1032: linux-2.6-debug-boot-delay.patch
 Patch1033: linux-2.6-debug-must_check.patch
-Patch1034: linux-2.6-debug-pm-pci.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -273,66 +285,48 @@
 Patch1070: linux-2.6-sleepon.patch
 
 # SCSI bits.
-Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
+Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
-Patch1204: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
-Patch1302: linux-2.6-net-wireless-features.patch
-Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch
 Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
 
-# Netdump and Diskdump bits.
-Patch1500: linux-2.6-crashdump-common.patch
-Patch1501: linux-2.6-netdump.patch
-Patch1502: linux-2.6-netconsole.patch
-Patch1503: linux-2.6-diskdump.patch
-Patch1504: linux-2.6-crashdump-reboot-exports.patch
-Patch1505: linux-2.6-dump_smp_call_function.patch
-
-
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
-Patch1601: linux-2.6-pcmcia-disable-warning.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
-Patch1621: linux-2.6-8250-16c950-faster.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-ide-tune-locking.patch
-Patch1641: linux-2.6-ide-cd-shutup.patch
-Patch1650: linux-2.6-autofs-pathlookup.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
-Patch1680: linux-2.6-pwc-powerup-by-default.patch
-Patch1690: linux-2.6-smsc-ircc2-pnp.patch
+Patch1680: linux-2.6-usb-unusual-devices.patch
+Patch1690: linux-2.6-autofs-invalidate.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
-Patch1730: linux-2.6-signal-trampolines-unwind-info.patch
+Patch1720: linux-2.6-proc-self-maps-fix.patch
+Patch1730: linux-2.6-ac97_unregister_controls_ad18xx.patch
 Patch1740: linux-2.6-softlockup-disable.patch
-Patch1750: linux-2.6-drm-cripple-r300.patch
+Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1780: linux-2.6-cpufreq-acpi-sticky.patch
+Patch1780: linux-2.6-powernow-k7-smp.patch
+Patch1790: linux-2.6-console-suspend.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
-Patch1802: linux-2.6-selinux-disable-attributes-no-policy.patch
-Patch1803: linux-2.6-selinux-selinuxfs-hard-link-count.patch
-Patch1804: linux-2.6-audit-new-msg-types.patch
 
 # Warn about usage of various obsolete functionality that may go away.
-Patch1900: linux-2.6-obsolete-idescsi-warning.patch
-Patch1901: linux-2.6-obsolete-oss-warning.patch
+Patch1900: linux-2.6-obsolete-oss-warning.patch
 
 # no external module should use these symbols.
 Patch1910: linux-2.6-unexport-symbols.patch
@@ -344,31 +338,38 @@
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-max-symlinks.patch
 Patch2101: linux-2.6-defaults-fat-utf8.patch
-Patch2102: linux-2.6-defaults-enable-sata-atapi.patch
-Patch2103: linux-2.6-defaults-firmware-loader-timeout.patch
+Patch2102: linux-2.6-defaults-firmware-loader-timeout.patch
+Patch2103: linux-2.6-defaults-phys-start.patch
+Patch2104: linux-2.6-defaults-unicode-vt.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-sata-silence-dumb-msg.patch
+Patch2202: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
-
+Patch2302: linux-2.6-cpufreq-acpi-sticky.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
-# amount of drivers they touch. But only these should go here. 
+# amount of drivers they touch. But only these should go here.
 # Not patches you're too lazy for to put in the proper place.
 #
 
 Patch10000: linux-2.6-compile-fixes.patch
 
+# Little obvious 1-2 liners that fix silly bugs.
+# Do not add anything non-trivial here.
+Patch10001: linux-2.6-random-patches.patch
+
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
-%description 
+%description
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
 of the operating system:  memory allocation, process allocation, device
@@ -379,7 +380,7 @@
 Group: System Environment/Kernel
 AutoReqProv: no
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -393,12 +394,11 @@
 %description doc
 This package contains documentation files from the kernel
 source. Various bits of information about the Linux kernel and the
-device drivers shipped with it are documented in these files. 
+device drivers shipped with it are documented in these files.
 
 You'll want to install this package if you need a reference to the
 options that can be passed to Linux kernel modules at load time.
 
-
 %package smp
 Summary: The Linux kernel compiled for SMP machines.
 
@@ -432,33 +432,43 @@
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
 Provides: kernel-devel = %{rpmversion}-%{release}smp
 AutoReqProv: no
-Prereq: /usr/sbin/hardlink, /usr/bin/find
+Prereq: /usr/bin/find
 
 %description smp-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the SMP kernel package.
 
+
 %prep
+# First we unpack the kernel tarball.
+# If this isn't the first make prep, we use links to the existing clean tarball
+# which speeds things up quite a bit.
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
-%setup -q -n %{name}-%{version} -c
   rm -f pax_global_header
+%setup -q -n %{name}-%{version} -c
   mv linux-%{kversion} vanilla
 else
   # We already have a vanilla dir.
   cd kernel-%{kversion}
-  mv linux-%{kversion} deleteme
-  rm -rf deleteme &
+  if [ -d linux-%{kversion}.%{_target_cpu} ]; then
+     # Just in case we ctrl-c'd a prep already
+     rm -rf deleteme
+     # Move away the stale away, and delete in background.
+     mv linux-%{kversion}.%{_target_cpu} deleteme
+     rm -rf deleteme &
+  fi
 fi
-cp -rl vanilla linux-%{kversion}
-cd linux-%{kversion}
+cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+
+cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
 %patch1 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
-# 
+#
 
 #
 # Patches to back out
@@ -467,7 +477,6 @@
 #
 # Architecture patches
 #
-%patch100 -p1
 
 #
 # x86(-64)
@@ -492,12 +501,24 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
+# Hush noisy unimplemented 32bit syscalls
+%patch208 -p1
+# Only print info about SMP alternatives on SMP kernels.
+%patch210 -p1
 
+#
 # ppc64
 #
-
-%patch304 -p1
+# Find OF framebuffer more reliably
+%patch302 -p1
+# Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
+# Make HVC console generic; support simulator console device using it.
+#%patch306 -p1
+# Check properly for successful RTAS instantiation
+%patch314 -p1
+# No input layer on iseries
+%patch317 -p1
 
 #
 # Patches 500 through 1000 are reserved for bugfixes to the core system
@@ -512,8 +533,9 @@
 # Warn if someone tries to build userspace using kernel headers
 %patch801 -p1
 
-# Exec shield
+# Exec shield 
 %patch810 -p1
+#%patch813 -p1
 
 #
 # GPG signed kernel modules
@@ -538,28 +560,25 @@
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
-%patch1014 -p1
 %patch1015 -p1
 %patch1016 -p1
 %patch1017 -p1
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1021 -p1
 %patch1022 -p1
-%patch1024 -p1
 %patch1025 -p1
 # Disable the 'quiet' boot switch for better bug reports.
-#%patch1026 -p1
+%patch1026 -p1
 # Slab leak detector.
 #%patch1027 -p1
-%patch1028 -p1
+# Pause on oops.
+#%patch1028 -p1
 #%patch1029 -p1
 #%patch1030 -p1
-%patch1031 -p1
+#%patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
-%patch1034 -p1
 
 #
 # Make /dev/mem a need-to-know function
@@ -579,10 +598,11 @@
 #
 # SCSI Bits.
 #
-# Enable Advansys driver
-%patch1101 -p1
 # Add a pci table to advansys driver.
 %patch1102 -p1
+# iSCSI driver update that can be dropped when kernel is rebased
+# against a kernel that has the SCSI updates for 2.6.18
+%patch1103 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -592,30 +612,16 @@
 %patch1201 -p1
 # Fix badness.
 %patch1203 -p1
-# NFSD: writes should not clobber utimes() calls
-%patch1204 -p1
 
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
-# Goodies for wireless drivers to make NetworkManager work
-%patch1302 -p1
-# ipw2200 hwcrypto=0 by default to avoid firmware restarts
-%patch1303 -p1
 # add IPW2200_MONITOR config option
 %patch1304 -p1
 
 # Squashfs
 %patch1400 -p1
 
-# netdump bits
-%patch1500 -p1
-%patch1501 -p1
-%patch1502 -p1
-%patch1503 -p1
-%patch1504 -p1
-%patch1505 -p1
-
 #
 # Various SELinux fixes from 2.6.10rc
 #
@@ -623,61 +629,50 @@
 # Misc fixes
 # Add missing MODULE_VERSION tags to some modules.
 %patch1600 -p1
-# Disable deprecation warning in old PCMCIA code.
-%patch1601 -p1
 # The input layer spews crap no-one cares about.
 %patch1610 -p1
 # Tickle the NMI whilst doing serial writes.
 %patch1620 -p1
-# make 16C950 UARTs work
-%patch1621 -p1
 # Radeon on thinkpad backlight power-management goodness.
 %patch1630 -p1
 # Fix IDE locking bug.
 %patch1640 -p1
-# Silence noisy CD drive spew
-%patch1641 -p1
-# autofs4 looks up wrong path element when ghosting is enabled
-%patch1650 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
-# Power up PWC driver by default.
+# Add some USB devices to the unusual quirk list.
 %patch1680 -p1
-# PNP support for smsc-ircc2
+# autofs4 - need to invalidate children on tree mount expire
 %patch1690 -p1
 # Silence debug messages in w1
 %patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
-# Mark unwind info for signal trampolines in vDSOs
+# setuid /proc/self/maps fix.
+%patch1720 -p1
+# OLPC ac97 fix.
 %patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
-# Disable R300 and above DRI as it's unstable.
+# serial/tty resume fixing.
 %patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
 %patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
-# Make acpi-cpufreq sticky
+# Fix up powernow-k7 to work on SMP kernels.
 %patch1780 -p1
+# Console fixes for suspend/resume
+%patch1790 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
-# Disable setting of security attributes on new inodes when no policy is loaded
-%patch1802 -p1
-# Fix incorrect hardlink count in selinuxfs
-%patch1803 -p1
-# Add some more audit message types.
-%patch1804 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
-%patch1901 -p1
 # Remove kernel-internal functionality that nothing external should use.
 %patch1910 -p1
 
@@ -686,7 +681,7 @@
 #
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
-# OOM killer tweaks.
+# VM oom killer tweaks.
 %patch2002 -p1
 
 # Changes to upstream defaults.
@@ -694,36 +689,45 @@
 %patch2100 -p1
 # Use UTF-8 by default on VFAT.
 %patch2101 -p1
-# Enable SATA ATAPI by default.
-%patch2102 -p1
 # Increase timeout on firmware loader.
+%patch2102 -p1
+# Change PHYSICAL_START
 %patch2103 -p1
+# Use unicode VT's by default.
+%patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
 # Silence silly SATA printk.
 %patch2201 -p1
+# Fix AHCI Suspend.
+%patch2202 -p1
 
+# ACPI patches
 # Silence more ACPI debug spew from suspend.
 %patch2300 -p1
 # acpi-ecdt-uid-hack
 %patch2301 -p1
+# Make acpi-cpufreq sticky.
+%patch2302 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
 #
 
-
 #
 # final stuff
 #
 
+
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
 #%patch10000 -p1
 
+# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
+%patch10001 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -751,7 +755,9 @@
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile
 
 # get rid of unwanted files resulting from patch fuzz
-find . -name "*.orig" -o -name "*~" -exec rm -f {} \; >/dev/null &
+cd ..
+find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
+
 
 ###
 ### build
@@ -761,33 +767,32 @@
 # Create gpg keys for signing the modules
 #
 
-gpg --homedir . --batch --gen-key %{SOURCE11}  
-gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub 
-make linux-%{kversion}/scripts/bin2c
-linux-%{kversion}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}/crypto/signature/key.h
-
-cd linux-%{kversion}
-
-
+gpg --homedir . --batch --gen-key %{SOURCE11}
+gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
+make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
+linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
 
 BuildKernel() {
+    MakeTarget=$1
+    KernelImage=$2
+    Flavour=$3
 
     # Pick the right config file for the kernel we're building
-    if [ -n "$1" ] ; then
-      Config=kernel-%{kversion}-%{_target_cpu}-$1.config
-      DevelDir=/usr/src/kernels/%{KVERREL}-$1-%{_target_cpu}
-      DevelLink=/usr/src/kernels/%{KVERREL}$1-%{_target_cpu}
+    if [ -n "$Flavour" ] ; then
+      Config=kernel-%{kversion}-%{_target_cpu}-$Flavour.config
+      DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour-%{_target_cpu}
+      DevelLink=/usr/src/kernels/%{KVERREL}$Flavour-%{_target_cpu}
     else
       Config=kernel-%{kversion}-%{_target_cpu}.config
       DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu}
       DevelLink=
     fi
 
-    KernelVer=%{version}-%{release}$1
-    echo BUILDING A KERNEL FOR $1 %{_target_cpu}...
+    KernelVer=%{version}-%{release}$Flavour
+    echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
     # make sure EXTRAVERSION says what we want it to say
-    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}$1/" Makefile
+    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}$Flavour/" Makefile
 
     # and now to start the build process
 
@@ -797,8 +802,12 @@
     Arch=`head -1 .config | cut -b 3-`
     echo USING ARCH=$Arch
 
+    if [ "$KernelImage" == "x86" ]; then
+       KernelImage=arch/$Arch/boot/bzImage
+    fi
+
     make -s ARCH=$Arch nonint_oldconfig > /dev/null
-    make -s ARCH=$Arch %{?_smp_mflags} %{make_target}
+    make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget
     make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1
 
     # Start installing the results
@@ -809,31 +818,31 @@
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
-    cp %{kernel_image} $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
+    cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
- 
+
     # And save the headers/makefiles etc for building modules against
     #
     # This all looks scary, but the end result is supposed to be:
     # * all arch relevant include/ files
     # * all Makefile/Kconfig files
-    # * all script/ files 
+    # * all script/ files
 
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source)
-	# dirs for additional modules per module-init-tools, kbuild/modules.txt
-	mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
-	mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
+    # dirs for additional modules per module-init-tools, kbuild/modules.txt
+    mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
+    mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
     # first copy everything
     cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build 
-    cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+	cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     # then drop all but the needed Makefiles/Kconfig files
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts
@@ -852,7 +861,7 @@
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
-    cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     if [ "$Arch" = "x86_64" ]; then
       cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -866,11 +875,12 @@
       ln -sf ../../../include/asm-ppc* asm
       popd
     fi
+
     # Make sure the Makefile and version.h have a matching timestamp so that
     # external modules can be built
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
-    cd .. 
+    cd ..
 
     #
     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
@@ -885,10 +895,10 @@
     # gpg sign the modules
 %if %{signmodules}
     gcc -o scripts/modsign/mod-extract scripts/modsign/mod-extract.c -Wall
-    KEYFLAGS="--no-default-keyring --homedir .." 
-    KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" 
-    KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" 
-    export KEYFLAGS 
+    KEYFLAGS="--no-default-keyring --homedir .."
+    KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec"
+    KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub"
+    export KEYFLAGS
 
     for i in `cat modnames`
     do
@@ -904,7 +914,7 @@
     # detect missing or incorrect license tags
     for i in `cat modnames`
     do
-      echo -n "$i " 
+      echo -n "$i "
       /sbin/modinfo -l $i >> modinfo
     done
     cat modinfo |\
@@ -912,7 +922,7 @@
       grep -v "^Dual BSD/GPL" |\
       grep -v "^Dual MPL/GPL" |\
       grep -v "^GPL and additional rights" |\
-      grep -v "^GPL v2" && exit 1 
+      grep -v "^GPL v2" && exit 1
     rm -f modinfo
     rm -f modnames
     # remove files that will be auto generated by depmod at rpm -i time
@@ -933,12 +943,14 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/boot
 
+cd linux-%{kversion}.%{_target_cpu}
+
 %if %{buildup}
-BuildKernel
+BuildKernel %make_target %kernel_image
 %endif
 
 %if %{buildsmp}
-BuildKernel smp
+BuildKernel %make_target %kernel_image smp
 %endif
 
 ###
@@ -947,7 +959,7 @@
 
 %install
 
-cd linux-%{kversion}
+cd linux-%{kversion}.%{_target_cpu}
 
 %if %{builddoc}
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}/Documentation
@@ -971,7 +983,7 @@
 
 # load the loop module for upgrades...in case the old modules get removed we have
 # loopback in the kernel so that mkinitrd will work.
-%pre 
+%pre
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 exit 0
 
@@ -979,23 +991,30 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 exit 0
 
-%post 
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
+%post
+if [ `uname -i` == "x86_64" ]; then
+  if [ -f /etc/sysconfig/kernel ]; then
+    /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
+  fi
+fi
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
+/sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
 
 %post devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
 fi
 
 %post smp
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp
+/sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
 
 %post smp-devel
-if [ -x /usr/sbin/hardlink ] ; then
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
@@ -1062,6 +1081,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2138_FC4]
+- 2.6.17.1
+
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2115_FC4]
 - 2.6.16.20
 

linux-2.6-build-nonintconfig.patch:
 linux-2.6.14/scripts/kconfig/confdata.c      |    8 +++-----
 linux-2.6.16.noarch/scripts/kconfig/Makefile |    3 +++
 linux-800/scripts/kconfig/conf.c             |   26 +++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 8 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-build-nonintconfig.patch	6 Jan 2006 05:42:17 -0000	1.4
+++ linux-2.6-build-nonintconfig.patch	20 Jun 2006 18:25:40 -0000	1.5
@@ -85,20 +85,18 @@
 -	return 0;
 +	return return_value;
  }
-diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/Makefile linux-800/scripts/kconfig/Makefile
---- linux-600/scripts/kconfig/Makefile
-+++ linux-800/scripts/kconfig/Makefile
-@@ -23,6 +23,10 @@ oldconfig: $(obj)/conf
+--- linux-2.6.16.noarch/scripts/kconfig/Makefile~	2006-03-25 15:55:18.000000000 -0500
++++ linux-2.6.16.noarch/scripts/kconfig/Makefile	2006-03-25 15:55:47.000000000 -0500
+@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf
  silentoldconfig: $(obj)/conf
  	$< -s arch/$(ARCH)/Kconfig
  
 +nonint_oldconfig: scripts/kconfig/conf
 +	./scripts/kconfig/conf -b arch/$(ARCH)/Kconfig
 +
-+
- .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
- 
- randconfig: $(obj)/conf
+ update-po-config: $(obj)/kxgettext
+ 	xgettext --default-domain=linux \
+           --add-comments --keyword=_ --keyword=N_ \
 --- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-10 14:55:46.000000000 -0500
 +++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-10 14:56:01.000000000 -0500
 @@ -149,7 +149,7 @@ int conf_read_simple(const char *name)
@@ -106,7 +104,7 @@
  			sym = sym_find(line + 9);
  			if (!sym) {
 -				conf_warning("trying to assign nonexistent symbol %s", line + 9);
-+				//conf_warning("trying to assign nonexistent symbol %s", line + 9);
++				conf_warning("trying to assign nonexistent symbol %s", line + 9);
  				break;
  			} else if (!(sym->flags & SYMBOL_NEW)) {
  				conf_warning("trying to reassign symbol %s", sym->name);
@@ -115,7 +113,7 @@
  			sym = sym_find(line + 7);
  			if (!sym) {
 -				conf_warning("trying to assign nonexistent symbol %s", line + 7);
-+				//conf_warning("trying to assign nonexistent symbol %s", line + 7);
++				conf_warning("trying to assign nonexistent symbol %s", line + 7);
  				break;
  			} else if (!(sym->flags & SYMBOL_NEW)) {
  				conf_warning("trying to reassign symbol %s", sym->name);

linux-2.6-crash-driver.patch:
 linux-1060/arch/i386/mm/init.c            |    2 
 linux-1060/arch/ia64/kernel/ia64_ksyms.c  |    3 
 linux-1060/arch/x86_64/mm/init.c          |    3 
 linux-1060/drivers/char/Kconfig           |    2 
 linux-1060/drivers/char/crash.c           |  129 ++++++++++++++++++++++++++++++
 linux-1060/include/asm-i386/crash.h       |   75 +++++++++++++++++
 linux-1060/include/asm-ia64/crash.h       |   90 ++++++++++++++++++++
 linux-1060/include/asm-x86_64/crash.h     |   75 +++++++++++++++++
 linux-2.6.16.noarch/drivers/char/Makefile |    1 
 9 files changed, 380 insertions(+)

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-crash-driver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-crash-driver.patch	28 Oct 2005 05:23:06 -0000	1.1
+++ linux-2.6-crash-driver.patch	20 Jun 2006 18:25:40 -0000	1.2
@@ -188,15 +188,14 @@
  
  config LEGACY_PTY_COUNT
  	int "Maximum number of legacy PTY in use"
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Makefile linux-1060/drivers/char/Makefile
---- linux-1050/drivers/char/Makefile
-+++ linux-1060/drivers/char/Makefile
-@@ -88,6 +88,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/
- obj-$(CONFIG_IPMI_HANDLER) += ipmi/
+--- linux-2.6.16.noarch/drivers/char/Makefile~	2006-03-25 18:50:42.000000000 -0500
++++ linux-2.6.16.noarch/drivers/char/Makefile	2006-03-25 18:50:59.000000000 -0500
+@@ -95,6 +95,7 @@ obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
+ 
+ obj-$(CONFIG_HANGCHECK_TIMER)	+= hangcheck-timer.o
+ obj-$(CONFIG_TCG_TPM)		+= tpm/
++obj-$(CONFIG_CRASH)		+= crash.o
  
- obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-+obj-$(CONFIG_CRASH) += crash.o
- obj-$(CONFIG_TCG_TPM) += tpm/
  # Files generated that shall be removed upon make clean
  clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h

linux-2.6-debug-Wundef.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-debug-Wundef.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-Wundef.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-Wundef.patch	28 Oct 2005 05:23:06 -0000	1.3
+++ linux-2.6-debug-Wundef.patch	20 Jun 2006 18:25:40 -0000	1.4
@@ -1,13 +1,17 @@
+
 -Wundef
+-Werror-implicit-function-declaration
+
+Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.11/Makefile~	2005-05-28 18:48:02.000000000 -0400
-+++ linux-2.6.11/Makefile	2005-05-28 18:48:27.000000000 -0400
-@@ -203,7 +203,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+--- linux-2.6/Makefile~	2005-05-28 18:48:02.000000000 -0400
++++ linux-2.6/Makefile	2005-05-28 18:48:27.000000000 -0400
+@@ -306,7 +306,7 @@ LINUXINCLUDE    := -Iinclude \
+ CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
- HOSTCC  	= gcc
- HOSTCXX  	= g++
--HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef
- HOSTCXXFLAGS	= -O2
+ CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+-	  	   -fno-strict-aliasing -fno-common
++	  	   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
+ AFLAGS		:= -D__ASSEMBLY__
  
- # 	Decide whether to build built-in, modular, or both.
+ # Read KERNELRELEASE from .kernelrelease (if it exists)

linux-2.6-debug-disable-builtins.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-debug-disable-builtins.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-disable-builtins.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-disable-builtins.patch	28 Oct 2005 05:23:06 -0000	1.3
+++ linux-2.6-debug-disable-builtins.patch	20 Jun 2006 18:25:40 -0000	1.4
@@ -1,4 +1,4 @@
-Disable built-ins and also more m32 work
+Disable built-ins
 
 diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/Makefile linux-10000/arch/i386/Makefile
 --- linux-3022/arch/i386/Makefile

linux-2.6-debug-list_head.patch:
 b/fs/select.c                     |    4 +++-
 b/include/linux/wait.h            |    2 +-
 b/kernel/wait.c                   |   26 ++++++++++++++++++++++++--
 linux-2.6.12/include/linux/list.h |   22 ++++++++++++++++++++++
 4 files changed, 50 insertions(+), 4 deletions(-)

Index: linux-2.6-debug-list_head.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-list_head.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-list_head.patch	29 May 2006 04:06:45 -0000	1.4
+++ linux-2.6-debug-list_head.patch	20 Jun 2006 18:25:40 -0000	1.5
@@ -49,6 +49,13 @@
 
 
 
+It _may_ give more information about exactly which wait-queue (or rather, 
+what the poll function that was related to that wait-queue) seems to be 
+corrupted. 
+
+		Linus
+
+---
 diff --git a/fs/select.c b/fs/select.c
 index a8109ba..8cd6dc3 100644
 --- a/fs/select.c
@@ -61,16 +68,16 @@
  
  #include <asm/uaccess.h>
  
-@@ -78,7 +78,8 @@ void poll_freewait(struct poll_wqueues *
- 		entry = p->entry;
- 		do {
- 			entry--;
--			remove_wait_queue(entry->wait_address,&entry->wait);
-+			if (remove_wait_queue(entry->wait_address,&entry->wait) < 0)
-+				print_symbol("bad poll-entry for %s", (unsigned long) entry->filp->f_op->poll);
- 			fput(entry->filp);
- 		} while (entry > p->entries);
- 		old = p;
+@@ -65,7 +66,8 @@ EXPORT_SYMBOL(poll_initwait);
+ 
+ static void free_poll_entry(struct poll_table_entry *entry)
+ {
+-	remove_wait_queue(entry->wait_address,&entry->wait);
++	if (remove_wait_queue(entry->wait_address,&entry->wait) < 0)
++		print_symbol("bad poll-entry for %s", (unsigned long) entry->filp->f_op->poll);
+ 	fput(entry->filp);
+ }
+ 
 diff --git a/include/linux/wait.h b/include/linux/wait.h
 index d285182..4c1d74e 100644
 --- a/include/linux/wait.h

linux-2.6-debug-oops-pause.patch:
 traps.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-oops-pause.patch	4 Feb 2006 01:04:37 -0000	1.2
+++ linux-2.6-debug-oops-pause.patch	20 Jun 2006 18:25:40 -0000	1.3
@@ -6,9 +6,11 @@
 
 (Wow, I'm really getting desperate for better debug data).
 
---- vanilla/arch/i386/kernel/traps.c	2006-01-02 22:21:10.000000000 -0500
-+++ linux-2.6.15/arch/i386/kernel/traps.c	2006-01-04 23:42:46.000000000 -0500
-@@ -28,6 +28,7 @@
+diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
+index 2d22f57..81726fd 100644
+--- a/arch/i386/kernel/traps.c
++++ b/arch/i386/kernel/traps.c
+@@ -28,6 +28,7 @@ #include <linux/ptrace.h>
  #include <linux/utsname.h>
  #include <linux/kprobes.h>
  #include <linux/kexec.h>
@@ -16,19 +18,49 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs
+@@ -165,6 +166,27 @@ #endif
+ 	return ebp;
+ }
+ 
++static int oopsdelay = 120;
++
++void pause_for_two_minutes(void)
++{
++	int i, j;
++	for (i=oopsdelay; i>0; i--) {
++		for (j=0; j<1000; j++)
++			udelay(1000);
++		touch_nmi_watchdog();
++		printk("Continuing in %d seconds. \r", i);
++	}
++	printk("\n");
++}	
++
++static int __init oopsdelay_setup(char *s)
++{
++	oopsdelay = simple_strtoul(s, NULL, 0);
++	return 1;
++}
++__setup("oopsdelay=", oopsdelay_setup);
++
+ static void show_trace_log_lvl(struct task_struct *task,
+ 			       unsigned long *stack, char *log_lvl)
+ {
+@@ -190,6 +212,7 @@ static void show_trace_log_lvl(struct ta
+ 		if (!stack)
+ 			break;
+ 		printk("%s =======================\n", log_lvl);
++		//pause_for_two_minutes();
+ 	}
+ }
+ 
+@@ -299,7 +322,8 @@ void show_registers(struct pt_regs *regs
  		}
  	}
  	printk("\n");
-+	{
-+		int i;
-+		for (i=120;i>0;i--) {
-+			mdelay(1000);
-+			touch_nmi_watchdog();
-+			printk("Continuing in %d seconds. \r", i);
-+		}
-+		printk("\n");
-+	}
- }	
+-}	
++	pause_for_two_minutes();
++}
  
  static void handle_BUG(struct pt_regs *regs)
+ {

linux-2.6-debug-periodic-slab-check.patch:
 slab.c |  132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 129 insertions(+), 3 deletions(-)

Index: linux-2.6-debug-periodic-slab-check.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-periodic-slab-check.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-periodic-slab-check.patch	28 Mar 2006 16:14:09 -0000	1.3
+++ linux-2.6-debug-periodic-slab-check.patch	20 Jun 2006 18:25:40 -0000	1.4
@@ -65,7 +65,7 @@
  		printk(KERN_ERR "slab: double free detected in cache "
  		       "'%s', objp %p\n", cachep->name, objp);
  		BUG();
-@@ -3266,6 +3277,116 @@ static int alloc_kmemlist(struct kmem_ca
+@@ -3266,6 +3277,114 @@ static int alloc_kmemlist(struct kmem_ca
  	return err;
  }
  
@@ -166,8 +166,6 @@
 +{
 +	int node;
 +
-+	check_spinlock_acquired(cache);
-+
 +	for_each_online_node(node) {
 +		struct kmem_list3 *lists = cache->nodelists[node];
 +
@@ -182,9 +180,9 @@
  struct ccupdate_struct {
  	struct kmem_cache *cachep;
  	struct array_cache *new[NR_CPUS];
-@@ -3446,6 +3567,13 @@ static void cache_reap(void *unused)
- 		drain_array_locked(searchp, cpu_cache_get(searchp), 0,
- 				   numa_node_id());
+@@ -3739,6 +3739,13 @@ static void cache_reap(void *unused)
+ 
+ 		drain_array(searchp, l3, cpu_cache_get(searchp), 0, node);
  
 +#if DEBUG
 +		if (time_before(searchp->next_verify, jiffies)) {
@@ -193,7 +191,6 @@
 +		}
 +#endif
 +
- 		if (time_after(l3->next_reap, jiffies))
- 			goto next_unlock;
- 
-
+ 		/*
+ 		 * These are racy checks but it does not matter
+ 		 * if we skip one check or scan twice.

linux-2.6-debug-singlebiterror.patch:
 slab.c |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-singlebiterror.patch	28 Mar 2006 16:14:09 -0000	1.4
+++ linux-2.6-debug-singlebiterror.patch	20 Jun 2006 18:25:40 -0000	1.5
@@ -1,32 +1,51 @@
---- linux-2.6.15/mm/slab.c~	2006-01-09 13:25:17.000000000 -0500
-+++ linux-2.6.15/mm/slab.c	2006-01-09 13:26:01.000000000 -0500
-@@ -1313,8 +1313,11 @@ static void poison_obj(kmem_cache_t *cac
+
+In case where we detect a single bit has been flipped, we spew
+the usual slab corruption message, which users instantly think
+is a kernel bug.  In a lot of cases, single bit errors are
+down to bad memory, or other hardware failure.
+
+This patch adds an extra line to the slab debug messages
+in those cases, in the hope that users will try memtest before
+they report a bug.
+
+000: 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b
+Single bit error detected. Possibly bad RAM. Run memtest86.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.16.noarch/mm/slab.c~	2006-03-22 18:29:27.000000000 -0500
++++ linux-2.6.16.noarch/mm/slab.c	2006-03-22 18:30:58.000000000 -0500
+@@ -1516,10 +1516,33 @@ static void poison_obj(struct kmem_cache
  static void dump_line(char *data, int offset, int limit)
  {
  	int i;
-+	unsigned char total=0;
++	unsigned char total=0, bad_count=0;
  	printk(KERN_ERR "%03x:", offset);
- 	for (i = 0; i < limit; i++) {
-+		if (data[offset+i] != POISON_FREE)
+-	for (i = 0; i < limit; i++)
++	for (i = 0; i < limit; i++) {
++		if (data[offset+i] != POISON_FREE) {
 +			total += data[offset+i];
++			++bad_count;
++		}
  		printk(" %02x", (unsigned char)data[offset + i]);
- 	}
- 	printk("\n");
-@@ -1019,6 +1023,18 @@ static void dump_line(char *data, int of
- 		}
- 	}
++	}
  	printk("\n");
-+	switch (total) {
-+		case 0x36:
-+		case 0x6a:
-+		case 0x6f:
-+		case 0x81:
-+		case 0xac:
-+		case 0xd3:
-+		case 0xd5:
-+		case 0xea:
-+			printk (KERN_ERR "Single bit error detected. Possibly bad RAM. Run memtest86.\n");
++	if (bad_count == 1) {
++		switch (total) {
++		case POISON_FREE ^ 0x01:
++		case POISON_FREE ^ 0x02:
++		case POISON_FREE ^ 0x04:
++		case POISON_FREE ^ 0x08:
++		case POISON_FREE ^ 0x10:
++		case POISON_FREE ^ 0x20:
++		case POISON_FREE ^ 0x40:
++		case POISON_FREE ^ 0x80:
++			printk (KERN_ERR "Single bit error detected. Possibly bad RAM.\n");
++#ifdef CONFIG_X86
++			printk (KERN_ERR "Run memtest86 or other memory test tool.\n");
++#endif
 +			return;
++		}
 +	}
  }
  #endif

linux-2.6-debug-sysfs-crash-debugging.patch:
 devel-akpm/arch/i386/kernel/traps.c     |    5 +++++
 devel-akpm/fs/sysfs/file.c              |    7 +++++++
 linux-2.6.14/arch/x86_64/kernel/traps.c |    5 +++++
 3 files changed, 17 insertions(+)

Index: linux-2.6-debug-sysfs-crash-debugging.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-sysfs-crash-debugging.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-sysfs-crash-debugging.patch	28 Mar 2006 16:14:09 -0000	1.2
+++ linux-2.6-debug-sysfs-crash-debugging.patch	20 Jun 2006 18:25:40 -0000	1.3
@@ -18,12 +18,11 @@
 diff -puN fs/sysfs/file.c~sysfs-crash-debugging fs/sysfs/file.c
 --- devel/fs/sysfs/file.c~sysfs-crash-debugging	2005-11-22 22:31:16.000000000 -0800
 +++ devel-akpm/fs/sysfs/file.c	2005-11-22 22:31:16.000000000 -0800
-@@ -6,6 +6,8 @@
- #include <linux/fsnotify.h>
+@@ -7,6 +7,7 @@
  #include <linux/kobject.h>
  #include <linux/namei.h>
+ #include <linux/poll.h>
 +#include <linux/limits.h>
-+
  #include <asm/uaccess.h>
  #include <asm/semaphore.h>
  
@@ -54,16 +53,16 @@
  int register_die_notifier(struct notifier_block *nb)
  {
  	int err = 0;
-@@ -346,6 +346,9 @@ void die(const char * str, struct pt_reg
+@@ -388,6 +388,9 @@ void die(const char * str, struct pt_reg
  #endif
  		if (nl)
  			printk("\n");
 +#ifdef CONFIG_SYSFS
 +		printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file);
 +#endif
- 	notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
- 		show_registers(regs);
- 		try_crashdump(regs);
+ 		if (notify_die(DIE_OOPS, str, regs, err,
+ 					current->thread.trap_no, SIGSEGV) !=
+ 				NOTIFY_STOP)
 --- linux-2.6.14/arch/x86_64/kernel/traps.c~	2005-12-02 18:38:28.000000000 -0500
 +++ linux-2.6.14/arch/x86_64/kernel/traps.c	2005-12-02 18:38:57.000000000 -0500
 @@ -75,6 +75,8 @@ asmlinkage void call_debug(void);

linux-2.6-debug-taint-vm.patch:
 linux-2.6.15/mm/page_alloc.c                  |    4 ++--
 linux-2.6.16.noarch/include/asm-generic/bug.h |    8 ++++++--
 linux-2.6.16.noarch/mm/slab.c                 |    4 ++--
 linux-2000/kernel/panic.c                     |    1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-taint-vm.patch	28 Mar 2006 16:14:09 -0000	1.5
+++ linux-2.6-debug-taint-vm.patch	20 Jun 2006 18:25:40 -0000	1.6
@@ -1,5 +1,5 @@
---- linux-2.6.11/include/asm-generic/bug.h~	2005-05-09 18:00:44.000000000 -0400
-+++ linux-2.6.11/include/asm-generic/bug.h	2005-05-09 18:01:23.000000000 -0400
+--- linux-2.6.16.noarch/include/asm-generic/bug.h~	2006-03-24 15:32:04.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-generic/bug.h	2006-03-24 15:33:29.000000000 -0500
 @@ -4,10 +4,14 @@
  #include <linux/compiler.h>
  #include <linux/config.h>
@@ -11,17 +11,17 @@
  #ifdef CONFIG_BUG
  #ifndef HAVE_ARCH_BUG
  #define BUG() do { \
--	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-+	printk("kernel BUG at %s:%d! (%s)\n", __FILE__, __LINE__, print_tainted()); \
+-	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
++	printk("BUG: failure at %s:%d/%s()! (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
  	panic("BUG!"); \
  } while (0)
  #endif
-@@ -25,7 +29,7 @@
+@@ -19,7 +23,7 @@
  #ifndef HAVE_ARCH_WARN_ON
  #define WARN_ON(condition) do { \
  	if (unlikely((condition)!=0)) { \
--		printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
-+		printk("Badness in %s at %s:%d (%s)\n", __FUNCTION__, __FILE__, __LINE__, print_tainted()); \
+-		printk("BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \
++		printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
  		dump_stack(); \
  	} \
  } while (0)
@@ -53,16 +53,16 @@
  	dump_stack();
  	page->flags &= ~(1 << PG_lru	|
  			1 << PG_private |
---- linux-2.6.15/mm/slab.c~	2006-01-09 13:19:33.000000000 -0500
-+++ linux-2.6.15/mm/slab.c	2006-01-09 13:19:55.000000000 -0500
-@@ -1371,8 +1371,8 @@ static void check_poison_obj(kmem_cache_
+--- linux-2.6.16.noarch/mm/slab.c~	2006-03-22 18:25:29.000000000 -0500
++++ linux-2.6.16.noarch/mm/slab.c	2006-03-22 18:25:53.000000000 -0500
+@@ -1573,8 +1573,8 @@ static void check_poison_obj(struct kmem
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
--				       "Slab corruption: start=%p, len=%d\n",
--				       realobj, size);
-+				       "Slab corruption: (%s) start=%p, len=%d\n",
-+				       print_tainted(), realobj, size);
+-					"Slab corruption: start=%p, len=%d\n",
+-					realobj, size);
++					"Slab corruption: (%s) start=%p, len=%d\n",
++					print_tainted(), realobj, size);
  				print_objinfo(cachep, objp, 0);
  				dump_stack();
  			}

linux-2.6-devmem.patch:
 arch/powerpc/mm/mem.c                        |   14 ++
 linux-1050/arch/i386/mm/init.c               |   19 +++
 linux-1050/arch/ia64/mm/init.c               |    7 +
 linux-1050/arch/s390/mm/init.c               |    5 
 linux-1050/arch/x86_64/mm/init.c             |   20 +++
 linux-1050/drivers/char/mem.c                |  143 ++++-----------------------
 linux-1050/fs/proc/kcore.c                   |    2 
 linux-1050/include/asm-arm/page.h            |    2 
 linux-1050/include/asm-arm26/page.h          |    2 
 linux-1050/include/asm-cris/page.h           |    2 
 linux-1050/include/asm-h8300/page.h          |    2 
 linux-1050/include/asm-i386/page.h           |    4 
 linux-1050/include/asm-ia64/page.h           |    2 
 linux-1050/include/asm-m68k/page.h           |    2 
 linux-1050/include/asm-m68knommu/page.h      |    2 
 linux-1050/include/asm-mips/page.h           |    2 
 linux-1050/include/asm-parisc/page.h         |    2 
 linux-1050/include/asm-s390/page.h           |    2 
 linux-1050/include/asm-sh/page.h             |    2 
 linux-1050/include/asm-sh64/page.h           |    2 
 linux-1050/include/asm-sparc/page.h          |    2 
 linux-1050/include/asm-sparc64/page.h        |    2 
 linux-1050/include/asm-um/page.h             |    1 
 linux-1050/include/asm-v850/page.h           |    2 
 linux-1050/include/asm-x86_64/page.h         |    4 
 linux-2.6.13/arch/x86_64/mm/init.c           |   22 ++++
 linux-2.6.14/include/asm-powerpc/page.h      |    2 
 linux-2.6.16.noarch/include/asm-alpha/page.h |    1 
 linux-2.6.16.noarch/include/asm-ppc/page.h   |    2 
 29 files changed, 154 insertions(+), 122 deletions(-)

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-devmem.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-devmem.patch	28 Mar 2006 16:14:09 -0000	1.3
+++ linux-2.6-devmem.patch	20 Jun 2006 18:25:40 -0000	1.4
@@ -55,8 +55,8 @@
  #include <asm/vdso.h>
  
  #include "mmu_decl.h"
-@@ -722,6 +722,19 @@ void __init mem_init(void)
- 	max_mapnr = num_physpages;
+@@ -352,6 +352,19 @@ void __init mem_init(void)
+ 	max_mapnr = max_pfn;
  	totalram_pages += free_all_bootmem();
  #endif
 +
@@ -72,9 +72,9 @@
 +	}
 +#endif
 +
- 	for_each_pgdat(pgdat) {
+ 	for_each_online_pgdat(pgdat) {
  		for (i = 0; i < pgdat->node_spanned_pages; i++) {
- 			page = pgdat->node_mem_map + i;
+ 			if (!pfn_valid(pgdat->node_start_pfn + i))
 diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/s390/mm/init.c linux-1050/arch/s390/mm/init.c
 --- linux-1020/arch/s390/mm/init.c
 +++ linux-1050/arch/s390/mm/init.c
@@ -173,7 +173,7 @@
  	read = 0;
  	virtr = 0;
  	if (p < (unsigned long) high_memory) {
-@@ -345,128 +367,6 @@ static ssize_t read_kmem(struct file *fi
+@@ -432,67 +432,6 @@ static ssize_t read_kmem(struct file *fi
  }
  
  
@@ -221,11 +221,9 @@
 -
 -		copied = copy_from_user(ptr, buf, sz);
 -		if (copied) {
--			ssize_t ret;
--
--			ret = written + (sz - copied);
--			if (ret)
--				return ret;
+-			written += sz - copied;
+-			if (written)
+-				break;
 -			return -EFAULT;
 -		}
 -		buf += sz;
@@ -240,6 +238,13 @@
 -}
 -
 -
+ /*
+  * This function writes to the *virtual* memory as seen by the kernel.
+  */
+@@ -432,64 +432,6 @@ static ssize_t read_kmem(struct file *fi
+ }
+ 
+ 
 -/*
 - * This function writes to the *virtual* memory as seen by the kernel.
 - */
@@ -279,11 +284,10 @@
 -			if (len) {
 -				written = copy_from_user(kbuf, buf, len);
 -				if (written) {
--					ssize_t ret;
--
+-					if (wrote + virtr)
+-						break;
 -					free_page((unsigned long)kbuf);
--					ret = wrote + virtr + (len - written);
--					return ret ? ret : -EFAULT;
+-					return -EFAULT;
 -				}
 -			}
 -			len = vwrite(kbuf, (char *)p, len);
@@ -330,17 +334,16 @@
  }
  
  static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
-diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-alpha/page.h linux-1050/include/asm-alpha/page.h
---- linux-1020/include/asm-alpha/page.h
-+++ linux-1050/include/asm-alpha/page.h
-@@ -110,6 +110,7 @@ extern __inline__ int get_order(unsigned
+--- linux-2.6.16.noarch/include/asm-alpha/page.h~	2006-03-28 10:15:44.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-alpha/page.h	2006-03-28 10:15:55.000000000 -0500
+@@ -93,6 +93,7 @@ typedef unsigned long pgprot_t;
+ 
  #define VM_DATA_DEFAULT_FLAGS		(VM_READ | VM_WRITE | VM_EXEC | \
  					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
 +#define devmem_is_allowed(x) 1
  #endif /* __KERNEL__ */
  
- #endif /* _ALPHA_PAGE_H */
+ #include <asm-generic/memory_model.h>
 diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-arm/page.h linux-1050/include/asm-arm/page.h
 --- linux-1020/include/asm-arm/page.h
 +++ linux-1050/include/asm-arm/page.h
@@ -466,15 +469,15 @@
  #endif /* __KERNEL__ */
  
  #endif /* _PARISC_PAGE_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ppc/page.h linux-1050/include/asm-ppc/page.h
---- linux-1020/include/asm-ppc/page.h
-+++ linux-1050/include/asm-ppc/page.h
-@@ -163,5 +163,7 @@ extern __inline__ int get_order(unsigned
- #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
- 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+--- linux-2.6.16.noarch/include/asm-ppc/page.h~	2006-03-28 10:16:25.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-ppc/page.h	2006-03-28 10:16:35.000000000 -0500
+@@ -174,6 +174,8 @@ extern __inline__ int get_order(unsigned
+ /* We do define AT_SYSINFO_EHDR but don't use the gate mecanism */
+ #define __HAVE_ARCH_GATE_AREA		1
  
 +#define devmem_is_allowed(x) 1
 +
+ #include <asm-generic/memory_model.h>
  #endif /* __KERNEL__ */
  #endif /* _PPC_PAGE_H */
 --- linux-2.6.14/include/asm-powerpc/page.h~	2005-11-15 12:12:43.000000000 -0500

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h |    3 
 linux/arch/i386/kernel/asm-offsets.c          |    1 
 linux/arch/i386/kernel/cpu/common.c           |    7 
 linux/arch/i386/kernel/entry.S                |    8 -
 linux/arch/i386/kernel/process.c              |   59 ++++++++
 linux/arch/i386/kernel/signal.c               |    4 
 linux/arch/i386/kernel/smp.c                  |    3 
 linux/arch/i386/kernel/sysenter.c             |   81 +++++++++++
 linux/arch/i386/kernel/traps.c                |   93 ++++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S    |    6 
 linux/arch/i386/kernel/vsyscall.lds.S         |    4 
 linux/arch/i386/mm/init.c                     |    6 
 linux/arch/i386/mm/mmap.c                     |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c           |    2 
 linux/arch/powerpc/kernel/vdso.c              |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c          |    6 
 linux/arch/x86_64/ia32/syscall32.c            |    4 
 linux/arch/x86_64/kernel/process.c            |    6 
 linux/arch/x86_64/mm/fault.c                  |    2 
 linux/arch/x86_64/mm/mmap.c                   |   99 +++++++++++---
 linux/drivers/char/random.c                   |    7 
 linux/fs/binfmt_elf.c                         |  151 ++++++++++++++++-----
 linux/fs/proc/array.c                         |    8 -
 linux/fs/proc/base.c                          |    8 -
 linux/fs/proc/task_mmu.c                      |   34 +++-
 linux/include/asm-i386/a.out.h                |    2 
 linux/include/asm-i386/desc.h                 |   14 +
 linux/include/asm-i386/elf.h                  |   50 +++++--
 linux/include/asm-i386/mmu.h                  |    6 
 linux/include/asm-i386/page.h                 |    5 
 linux/include/asm-i386/pgalloc.h              |    1 
 linux/include/asm-i386/processor.h            |    8 -
 linux/include/asm-i386/thread_info.h          |    1 
 linux/include/asm-ia64/pgalloc.h              |    4 
 linux/include/asm-powerpc/pgalloc.h           |    5 
 linux/include/asm-ppc/pgalloc.h               |    5 
 linux/include/asm-s390/pgalloc.h              |    4 
 linux/include/asm-sparc/pgalloc.h             |    4 
 linux/include/asm-sparc64/pgalloc.h           |    4 
 linux/include/asm-x86_64/pgalloc.h            |    7 
 linux/include/asm-x86_64/pgtable.h            |    2 
 linux/include/linux/mm.h                      |   16 +-
 linux/include/linux/resource.h                |    5 
 linux/include/linux/sched.h                   |    9 +
 linux/include/linux/sysctl.h                  |    3 
 linux/kernel/signal.c                         |   38 +++++
 linux/kernel/sysctl.c                         |   57 ++++++++
 linux/mm/fremap.c                             |   16 +-
 linux/mm/mmap.c                               |  183 ++++++++++++++++++++++++--
 linux/mm/mprotect.c                           |    5 
 linux/mm/mremap.c                             |    4 
 51 files changed, 930 insertions(+), 139 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-execshield.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-execshield.patch	10 May 2006 00:04:25 -0000	1.6
+++ linux-2.6-execshield.patch	20 Jun 2006 18:25:40 -0000	1.7
@@ -595,48 +595,6 @@
  }
  
  asmlinkage long sys_fork(struct pt_regs *regs)
-Index: linux/arch/x86_64/kernel/setup64.c
-===================================================================
---- linux.orig/arch/x86_64/kernel/setup64.c
-+++ linux/arch/x86_64/kernel/setup64.c
-@@ -46,7 +46,7 @@ Control non executable mappings for 64bi
- on	Enable(default)
- off	Disable
- */ 
--int __init nonx_setup(char *str)
-+void __init nonx_setup(const char *str)
- {
- 	if (!strncmp(str, "on", 2)) {
-                 __supported_pte_mask |= _PAGE_NX; 
-@@ -55,28 +55,7 @@ int __init nonx_setup(char *str)
- 		do_not_nx = 1;
- 		__supported_pte_mask &= ~_PAGE_NX;
-         }
--	return 0;
--} 
--__setup("noexec=", nonx_setup);	/* parsed early actually */
--
--int force_personality32 = READ_IMPLIES_EXEC;
--
--/* noexec32=on|off
--Control non executable heap for 32bit processes.
--To control the stack too use noexec=off
--
--on	PROT_READ does not imply PROT_EXEC for 32bit processes
--off	PROT_READ implies PROT_EXEC (default)
--*/
--static int __init nonx32_setup(char *str)
--{
--	if (!strcmp(str, "on"))
--		force_personality32 &= ~READ_IMPLIES_EXEC;
--	else if (!strcmp(str, "off"))
--		force_personality32 |= READ_IMPLIES_EXEC;
--	return 0;
- }
--__setup("noexec32=", nonx32_setup);
- 
- /*
-  * Great future plan:
 Index: linux/arch/x86_64/mm/fault.c
 ===================================================================
 --- linux.orig/arch/x86_64/mm/fault.c
@@ -2144,15 +2102,15 @@
  	pgprot_t newprot;
  	pgoff_t pgoff;
  	int error;
-@@ -166,6 +167,8 @@ success:
+@@ -167,6 +167,8 @@ success:
  	 */
  	vma->vm_flags = newflags;
  	vma->vm_page_prot = newprot;
 +	if (oldflags & VM_EXEC)
 +		arch_remove_exec_range(current->mm, old_end);
- 	change_protection(vma, start, end, newprot);
- 	vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);
- 	vm_stat_account(mm, newflags, vma->vm_file, nrpages);
+ 	if (is_vm_hugetlb_page(vma))
+ 		hugetlb_change_protection(vma, start, end, newprot);
+ 	else
 Index: linux/mm/mremap.c
 ===================================================================
 --- linux.orig/mm/mremap.c

linux-2.6-ide-tune-locking.patch:
 piix.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Index: linux-2.6-ide-tune-locking.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-ide-tune-locking.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-ide-tune-locking.patch	28 Oct 2005 05:23:06 -0000	1.3
+++ linux-2.6-ide-tune-locking.patch	20 Jun 2006 18:25:40 -0000	1.4
@@ -1,3 +1,11 @@
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=144743
+Kernel panic - not syncing: drivers/ide/pci/piix.c:231:
+spin_lock(drivers/ide/ide.c:c03cef28) already locked by driver/ide/ide-iops.c/1153.
+
+From: Alan Cox <alan at redhat.com>
+Signed-off-by: Dave Jones <davej at redhat.com>
+
 --- linux-2.6.12/drivers/ide/pci/piix.c~	2005-07-11 10:23:24.637181320 +0100
 +++ linux-2.6.12/drivers/ide/pci/piix.c	2005-07-11 10:23:24.637181320 +0100
 @@ -203,6 +203,8 @@

linux-2.6-module_version.patch:
 linux-1720/drivers/block/DAC960.c           |    1 +
 linux-1720/drivers/block/cpqarray.c         |    1 +
 linux-1720/drivers/message/fusion/mptbase.c |    1 +
 linux-1720/drivers/net/b44.c                |    1 +
 linux-1720/drivers/net/ns83820.c            |    1 +
 linux-1720/drivers/scsi/gdth.c              |    1 +
 linux-2.6.13/drivers/block/cciss.c          |    1 +
 7 files changed, 7 insertions(+)

Index: linux-2.6-module_version.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-module_version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-module_version.patch	28 Oct 2005 05:23:06 -0000	1.1
+++ linux-2.6-module_version.patch	20 Jun 2006 18:25:40 -0000	1.2
@@ -60,17 +60,6 @@
  
  MODULE_DEVICE_TABLE(pci, ns83820_pci_tbl);
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/net/tg3.c linux-1720/drivers/net/tg3.c
---- linux-1700/drivers/net/tg3.c
-+++ linux-1720/drivers/net/tg3.c
-@@ -146,6 +146,7 @@ MODULE_VERSION(DRV_MODULE_VERSION);
- static int tg3_debug = -1;	/* -1 == use TG3_DEF_MSG_ENABLE as value */
- module_param(tg3_debug, int, 0);
- MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");
-+MODULE_VERSION(DRV_MODULE_VERSION);
- 
- static struct pci_device_id tg3_pci_tbl[] = {
- 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700,
 diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/scsi/gdth.c linux-1720/drivers/scsi/gdth.c
 --- linux-1700/drivers/scsi/gdth.c
 +++ linux-1720/drivers/scsi/gdth.c

linux-2.6-optimise-spinlock-debug.patch:
 spinlock_debug.c |    3 ---
 1 files changed, 3 deletions(-)

Index: linux-2.6-optimise-spinlock-debug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-optimise-spinlock-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-optimise-spinlock-debug.patch	28 Mar 2006 16:14:09 -0000	1.1
+++ linux-2.6-optimise-spinlock-debug.patch	20 Jun 2006 18:25:40 -0000	1.2
@@ -1,42 +1,27 @@
 
 --- linux-2.6.16/lib/spinlock_debug.c~	2006-03-20 16:31:13.000000000 -0500
 +++ linux-2.6.16/lib/spinlock_debug.c	2006-03-20 16:31:24.000000000 -0500
-@@ -9,8 +9,9 @@
- #include <linux/config.h>
- #include <linux/spinlock.h>
- #include <linux/interrupt.h>
- #include <linux/delay.h>
- #include <linux/module.h>
-+#include <asm/processor.h>
- 
- int nopanic;
- static int __init nopanic_setup(char *str)
---- linux-2.6.16/lib/spinlock_debug.c~	2006-03-20 16:29:56.000000000 -0500
-+++ linux-2.6.16/lib/spinlock_debug.c	2006-03-20 16:30:52.000000000 -0500
-@@ -88,7 +88,7 @@ static void __spin_lock_debug(spinlock_t
+@@ -88,7 +88,6 @@ static void __spin_lock_debug(spinlock_t
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_spin_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {
-@@ -160,7 +160,7 @@ static void __read_lock_debug(rwlock_t *
+@@ -160,7 +160,6 @@ static void __read_lock_debug(rwlock_t *
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_read_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {
-@@ -233,7 +233,7 @@ static void __write_lock_debug(rwlock_t 
+@@ -233,7 +233,6 @@ static void __write_lock_debug(rwlock_t 
  		for (i = 0; i < loops_per_jiffy * HZ; i++) {
  			if (__raw_write_trylock(&lock->raw_lock))
  				return;
 -			__delay(1);
-+			cpu_relax();
  		}
  		/* lockup suspected: */
  		if (print_once) {

linux-2.6-radeon-backlight.patch:
 radeon_base.c         |   11 +++++++
 radeon_pm.c           |   51 ++++++++++++++++++++++++++++++++
 radeon_pm_whitelist.h |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-radeon-backlight.patch	28 Mar 2006 16:14:09 -0000	1.5
+++ linux-2.6-radeon-backlight.patch	20 Jun 2006 18:25:40 -0000	1.6
@@ -1,9 +1,87 @@
-
-http://bugme.osdl.org/show_bug.cgi?id=3022
-
---- vanilla/drivers/video/aty/radeon_pm.c	2005-10-27 20:02:08.000000000 -0400
-+++ linux-2.6.14/drivers/video/aty/radeon_pm.c	2005-11-30 02:20:01.000000000 -0500
-@@ -25,8 +25,532 @@
+--- linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h.backlight	2006-03-01 13:22:58.000000000 -0500
++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h	2006-03-01 13:56:54.000000000 -0500
+@@ -0,0 +1,78 @@
++#define E(_vendor, _product, _ident, _reporter)				\
++{	/* _reporter */							\
++	.ident = _ident,						\
++	.matches = {							\
++		DMI_MATCH(DMI_SYS_VENDOR, _vendor),			\
++		DMI_MATCH(DMI_PRODUCT_NAME, _product),			\
++	},								\
++}
++E("IBM", "18297RG", "IBM ThinkPad R50", "Borschuk Oleg <merlinse at yandex.ru>"),
++E("IBM", "18299MG", "IBM ThinkPad R51", "Georges Herber <gherber at gmail.com>"),
++E("IBM", "1829EHG", "IBM ThinkPad R51", "Wouter Cloetens <wouter at mind.be>"),
++E("IBM", "1829R6G", "IBM ThinkPad R51", "Sten Heinze"),
++E("IBM", "1836Q6U", "IBM ThinkPad R51", "Eugene Pavlovsky"),
++E("IBM", "236696G", "IBM ThinkPad T30", "Jakob Schiotz <schiotz at fysik.dtu.dk>"),
++E("IBM", "236697G", "IBM ThinkPad T30", "Stephan Gro?? <st.gross at inf.tu-dresden.de>"),
++E("IBM", "2366JBG", "IBM ThinkPad T30", "Thomas M Steenholdt <tmus at tmus.dk>"),
++E("IBM", "2366MU9", "IBM ThinkPad T30", "Phillip Jones <philljones at us.ibm.com>"),
++E("IBM", "2366QU5", "IBM ThinkPad T30", "ChazeFroy <chazefroy at gmail.com>"),
++/* brads's 2366QU8 works, but dmidecode shows bogus data */
++E("IBM", "2366QU8", "IBM ThinkPad T30", "Brad Smith <brads at redhat.com>"),
++E("IBM", "23729CU", "IBM ThinkPad T40", "George Avrunin <avrunin at math.umass.edu>"),
++E("IBM", "237314U", "IBM ThinkPad T40", "Dmitriy Zavin <dzavin at yahoo.com>"),
++E("IBM", "23731FG", "IBM ThinkPad T41", "Aivo Prykk <aivo.prykk at mail.ee>"),
++E("IBM", "237322G", "IBM ThinkPad T40", "Michele Lamarca <lammic at gmail.com>"),
++E("IBM", "237325G", "IBM ThinkPad T40", "Klaus Kurzmann <mok at fluxnetz.de>"),
++E("IBM", "23732FG", "IBM ThinkPad T41", "Antti Andreimann <Antti.Andreimann at mail.ee>"),
++E("IBM", "23733HM", "IBM ThinkPad T41", "Grahame Bowland <grahame at angrygoats.net>"),
++E("IBM", "23734G2", "IBM ThinkPad T40", "Antti P Miettinen <apm at brigitte.dna.fi>"),
++E("IBM", "23737JU", "IBM ThinkPad T41", "Matthew Saltzman <mjs at clemson.edu>"),
++E("IBM", "23738CG", "IBM ThinkPad T40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "237392G", "IBM ThinkPad T40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "237394G", "IBM ThinkPad T40", "Manuel Carro <mcarro at fi.upm.es>"),
++E("IBM", "237394U", "IBM ThinkPad T40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "23739FU", "IBM ThinkPad T41", "Peter Jones <pjones at redhat.com>"),
++E("IBM", "23739HG", "IBM ThinkPad T41", "Chris Vanden Berghe <Chris at VandenBerghe.org>"),
++E("IBM", "23739HU", "IBM ThinkPad T41", "Ajay Ramaswamy <ajay at ramaswamy.net>"),
++E("IBM", "2373BU7", "IBM ThinkPad T40", "Peter Jones <pjones at redhat.com>"),
++E("IBM", "2373F2G", "IBM ThinkPad T42", "Isaac Wilcox"),
++E("IBM", "2373FWG", "IBM ThinkPad T42", "Jerome Poggi <Jerome.Poggi at hsc.fr> and Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "2373G1G", "IBM ThinkPad T40p", "Juerg Billeter <j at bitron.ch>"),
++E("IBM", "2373G1U", "IBM ThinkPad T40p", "Bill Nottingham <notting at redhat.com>"),
++E("IBM", "2373G3G", "IBM ThinkPad T40p", "Hartwig, Thomas <t.hartwig at itth.com>"),
++E("IBM", "2373GEU", "IBM ThinkPad T41p", "Eric Benson <eric_a_benson at yahoo.com>"),
++E("IBM", "2373HU6", "IBM ThinkPad T41", "David Zeuthen <davidz at redhat.com>"),
++E("IBM", "2373JTU", "IBM ThinkPad T42", "Dwight Barkley <barkley at maths.warwick.ac.uk>"),
++E("IBM", "2373MU4", "IBM ThinkPad T40", "Vernon Mauery <vernux at us.ibm.com>"),
++E("IBM", "2373RU1", "IBM ThinkPad T40", "Adam Glasgall <adam at simons-rock.edu>"),
++E("IBM", "2373TG5", "IBM ThinkPad T41", "Paul Ionescu <i_p_a_u_l at yahoo.com>"),
++E("IBM", "2373XNX", "IBM ThinkPad T41", "Ajay Ramaswamy <ajay at ramaswamy.net>"),
++E("IBM", "23746VU", "IBM ThinkPad T42", "Tim Hull <thully at cyberspace.org>"),
++E("IBM", "2374CTO", "IBM ThinkPad T42", "Johannes Hansen"),
++E("IBM", "2374ZEP", "IBM ThinkPad T42", "Johannes Hansen"),
++E("IBM", "2378DEU", "IBM ThinkPad T41", "obi <graziano at cs.ucsb.edu>"),
++E("IBM", "2378DLU", "IBM ThinkPad T41", "Paul Stanisci <paul at stanisci.ca>"),
++E("IBM", "2378DUU", "IBM ThinkPad T42", "Austin Clements <amdragon+osdlbugzilla at mit.edu>"),
++E("IBM", "2378R2U", "IBM ThinkPad T42", "Ulrich Drepper <drepper at redhat.com>"),
++E("IBM", "2378RBF", "IBM ThinkPad T42", "Nicolas Dufresne <nicolas.dufresne at usherbrooke.ca>"),
++E("IBM", "2378RBU", "IBM ThinkPad T42", "Nicolas Dufresne <nicolas.dufresne at usherbrooke.ca>"),
++E("IBM", "2378XXE", "IBM ThinkPad T42", "Tom Marshall"),
++E("IBM", "2379D6U", "IBM ThinkPad T41", "anonymous"),
++E("IBM", "2379DJU", "IBM ThinkPad T41", "Volker Braun <vbraun at physics.upenn.edu>"),
++E("IBM", "2658BQG", "IBM ThinkPad R32", "Frank Otto <Frank.Otto at tc.pci.uni-heidelberg.de>"),
++E("IBM", "26725KU", "IBM ThinkPad X31", "Chris Lee <clee at redhat.com>"),
++E("IBM", "2672A9U", "IBM ThinkPad X31", "Jeremy Katz <katzj at redhat.com>"),
++E("IBM", "2672JHG", "IBM ThinkPad X31", "Daniel P. Berrange <berrange at redhat.com>"),
++E("IBM", "2672RU3", "IBM ThinkPad X31", "Chris Blizzard <blizzard at redhat.com>"),
++		/* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD 
++		   backlight on during S3 issue. */
++E("IBM", "2672XXH", "IBM ThinkPad X31", "Henrik Brix Andersen <brix at gentoo.org>"),
++E("IBM", "27223GG", "IBM ThinkPad R40", "Frank Schmitt <tonne2004 at gehheimdienst.de>"),
++E("IBM", "27225MG", "IBM ThinkPad R40", "Nils Trebing <nils.trebing at uni-konstanz.de>"),
++E("IBM", "27226YU", "IBM ThinkPad R40", "Rushi Bhatt"),
++E("IBM", "2722B3G", "IBM ThinkPad R40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "2722CDG", "IBM ThinkPad R40", "Meik Hellmund <hellmund at math.uni-leipzig.de>"),
++{ },
++/* Negative reports: */
++/* E("IBM", "2373KUU", "IBM ThinkPad T42p", "Dax Kelson <dax at gurulabs.com>"), */
++#undef E
+--- linux-2.6.15.i686/drivers/video/aty/radeon_pm.c.backlight	2006-03-01 13:22:06.000000000 -0500
++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm.c	2006-03-01 13:33:47.000000000 -0500
+@@ -25,8 +25,26 @@
  #include <asm/pmac_feature.h>
  #endif
  
@@ -21,513 +99,7 @@
 + * vendor and product codes for Your laptop.
 + */
 +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = {
-+
-+	{
-+		/* Reported by Stephan Gro?? <st.gross at inf.tu-dresden.de> */
-+		.ident = "IBM ThinkPad T30 (2366-97G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "236697G"),
-+		},
-+	},
-+	{
-+		/* Reported by Phillip Jones <philljones at us.ibm.com> */
-+		.ident = "IBM ThinkPad T30 (2366-MU9)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"),
-+		},
-+	},
-+	{
-+		/* Reported by Jakob Schiotz <schiotz at fysik.dtu.dk> */
-+		.ident = "IBM ThinkPad T30 (2366-96G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "236696G"),
-+		},
-+	},
-+	{
-+		/* Reported by Thomas M Steenholdt <tmus at tmus.dk> */
-+		.ident = "IBM ThinkPad T30 (2366-JBG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"),
-+		},
-+	},
-+	{
-+		/* Reported by ChazeFroy <chazefroy at gmail.com> */
-+		.ident = "IBM ThinkPad T30 (2366-QU5)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by George Avrunin <avrunin at math.umass.edu> */
-+		.ident = "IBM ThinkPad T40 (2372-9CU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"),
-+		},
-+	},
-+	{
-+		/* Reported by Dmitriy Zavin <dzavin at yahoo.com> */
-+		.ident = "IBM ThinkPad T40 (2373-14U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237314U"),
-+		},
-+	},
-+	{
-+		/* Reported by Klaus Kurzmann <mok at fluxnetz.de> */
-+		.ident = "IBM ThinkPad T40 (2373-25G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237325G"),
-+		},
-+	},
-+	{
-+		/* Reported by Antti P Miettinen <apm at brigitte.dna.fi> */
-+		.ident = "IBM ThinkPad T40 (2373-4G2)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"),
-+	      },
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete at verisignlabs.com> */
-+		.ident = "IBM ThinkPad T40 (2373-92G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237392G"),
-+	      },
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete at verisignlabs.com> */
-+		.ident = "IBM ThinkPad T40 (2373-8CG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"),
-+		},
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete at verisignlabs.com> */
-+		.ident = "IBM ThinkPad T40 (2373-94U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237394U"),
-+		},
-+	},
-+	{
-+		/* Reported by Manuel Carro <mcarro at fi.upm.es> */
-+		.ident = "IBM ThinkPad T40 (2373-94G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237394G"),
-+		},
-+	},
-+	{
-+		/* Reported by Peter Jones <pjones at redhat.com> */
-+		.ident = "IBM ThinkPad T40 (2373-BU7)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"),
-+		},
-+	},
-+	{
-+		/* Reported by Vernon Mauery <vernux at us.ibm.com> */
-+		.ident = "IBM ThinkPad T40 (2373-MU4)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"),
-+		},
-+	},
-+	{
-+		/* Reported by Michele Lamarca <lammic at gmail.com> */
-+		.ident = "IBM ThinkPad T40 (2373-22G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237322G"),
-+		},
-+	},
-+	{
-+		/* Reported by Adam Glasgall <adam at simons-rock.edu> */
-+		.ident = "IBM ThinkPad T40 (2373-RU1)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"),
-+		},
-+	},
-+	{
-+		/* Reported by Juerg Billeter <j at bitron.ch> */
-+		.ident = "IBM ThinkPad T40p (2373-G1G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"),
-+		},
-+	},
-+	{
-+		/* Reported by Bill Nottingham <notting at redhat.com> */
-+		.ident = "IBM ThinkPad T40p (2373-G1U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"),
-+		},
-+	},
-+	{
-+		/* Reported by Hartwig, Thomas <t.hartwig at itth.com> */
-+		.ident = "IBM ThinkPad T40p (2373-G3G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Antti Andreimann <Antti.Andreimann at mail.ee> */
-+		.ident = "IBM ThinkPad T41 (2373-2FG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"),
-+		},
-+	},
-+	{
-+		/* Reported by Peter Jones <pjones at redhat.com> */
-+		.ident = "IBM ThinkPad T41 (2373-9FU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"),
-+		},
-+	},
-+	{
-+		/* Reported by Ajay Ramaswamy <ajay at ramaswamy.net> */
-+		.ident = "IBM ThinkPad T41 (2373-9HU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"),
-+	      },
-+	},
-+	{
-+		/* Reported by Ajay Ramaswamy <ajay at ramaswamy.net> */
-+		.ident = "IBM ThinkPad T41 (2373-XNX)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"),
-+	      },
-+	},
-+	{
-+		/* Reported by obi <graziano at cs.ucsb.edu> */
-+		.ident = "IBM ThinkPad T41 (2378-DEU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"),
-+		},
-+	},
-+	{
-+		/* Reported by Volker Braun <vbraun at physics.upenn.edu> */
-+		.ident = "IBM ThinkPad T41 (2379-DJU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"),
-+		},
-+	},
-+	{
-+		/* Reported by Paul Ionescu <i_p_a_u_l at yahoo.com> */
-+		.ident = "IBM ThinkPad T41 (2373-TG5)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"),
-+		},
-+	},
-+	{
-+		/* Reported by Matthew Saltzman <mjs at clemson.edu> */
-+		.ident = "IBM ThinkPad T41 (2373-7JU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"),
-+		},
-+	},
-+	{
-+		/* Reported by David Zeuthen <davidz at redhat.com> */
-+		.ident = "IBM ThinkPad T41 (2373-HU6)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"),
-+		},
-+	},
-+	{
-+		/* Reported by Grahame Bowland <grahame at angrygoats.net> */
-+		.ident = "IBM ThinkPad T41 (2373-3HM)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"),
-+		},
-+	},
-+	{
-+		/* Reported by Aivo Prykk <aivo.prykk at mail.ee> */
-+		.ident = "IBM ThinkPad T41 (2373-1FG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"),
-+		},
-+	},
-+	{
-+		/* Reported by Chris Vanden Berghe <Chris at VandenBerghe.org> */
-+		.ident = "IBM ThinkPad T41 (2373-9HG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"),
-+		},
-+	},
-+	{
-+		/* Reported by Paul Stanisci <paul at stanisci.ca> */
-+		.ident = "IBM ThinkPad T41 (2378-DLU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"),
-+		},
-+	},
-+	{
-+		.ident = "IBM ThinkPad T41 (2379-D6U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Eric Benson <eric_a_benson at yahoo.com> */
-+		.ident = "IBM ThinkPad T41p (2373-GEU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Tim Hull <thully at cyberspace.org> */
-+		.ident = "IBM ThinkPad T42 (2374-6VU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"),
-+		},
-+	},
-+	{
-+		/* Reported by Dwight Barkley <barkley at maths.warwick.ac.uk> */
-+		.ident = "IBM ThinkPad T42 (2373-JTU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"),
-+		},
-+	},
-+	{
-+		/* Reported by Jerome Poggi <Jerome.Poggi at hsc.fr>
-+		  and Pete Toscano <pete at verisignlabs.com> */
-+		.ident = "IBM ThinkPad T42 (2373-FWG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"),
-+		},
-+	},
-+	{
-+		/* Reported by Ulrich Drepper <drepper at redhat.com> */
-+		.ident = "IBM ThinkPad T42 (2378-R2U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"),
-+		},
-+	},
-+	{
-+		/* Reported by Nicolas Dufresne <nicolas.dufresne at usherbrooke.ca> */
-+		.ident = "IBM ThinkPad T42 (2378-RBF)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"),
-+		},
-+	},
-+	{
-+		/* Reported by Nicolas Dufresne <nicolas.dufresne at usherbrooke.ca> */
-+		.ident = "IBM ThinkPad T42 (2378-RBU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"),
-+		},
-+	},
-+	{
-+		/* Reported by Johannes Hansen */
-+		.ident = "IBM ThinkPad T42 (2374-CTO)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"),
-+		},
-+	},
-+	{
-+		/* Reported by Johannes Hansen */
-+		.ident = "IBM ThinkPad T42 (2374-ZEP)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"),
-+		},
-+	},
-+	{
-+		/* Reported by Tom Marshall */
-+		.ident = "IBM ThinkPad T42 (2378-XXE)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"),
-+		},
-+	},
-+	{
-+		/* Reported by Isaac Wilcox */
-+		.ident = "IBM ThinkPad T42 (2373-F2G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"),
-+		},
-+	},
-+	{
-+		/* Reported by Austin Clements <amdragon+osdlbugzilla at mit.edu> */
-+		.ident = "IBM ThinkPad T42 (2378-DUU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Frank Otto <Frank.Otto at tc.pci.uni-heidelberg.de> */
-+		.ident = "IBM ThinkPad R32 (2658-BQG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Frank Schmitt <tonne2004 at gehheimdienst.de> */
-+		.ident = "IBM ThinkPad R40 (2722-3GG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"),
-+		},
-+	},
-+	{
-+		/* Reported by Rushi Bhatt */
-+		.ident = "IBM ThinkPad R40 (2722-6YU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"),
-+		},
-+	},
-+	{
-+		/* Reported by Nils Trebing <nils.trebing at uni-konstanz.de> */
-+		.ident = "IBM ThinkPad R40 (2722-5MG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"),
-+		},
-+	},
-+	{
-+		/* Reported by Meik Hellmund <hellmund at math.uni-leipzig.de> */
-+		.ident = "IBM ThinkPad R40 (2722-CDG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"),
-+		},
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete at verisignlabs.com> */
-+		.ident = "IBM ThinkPad R40 (2722-B3G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"),
-+		},
-+	},
-+
-+
-+	{
-+		/* Reported by Borschuk Oleg <merlinse at yandex.ru> */
-+		.ident = "IBM ThinkPad R50 (1829-7RG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Georges Herber <gherber at gmail.com> */
-+		.ident = "IBM ThinkPad R51 (1829-9MG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"),
-+		},
-+	},
-+	{
-+		/* Reported by Eugene Pavlovsky */
-+		.ident = "IBM ThinkPad R51 (1836-Q6U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"),
-+		},
-+	},
-+	{
-+		/* Reported by Sten Heinze */
-+		.ident = "IBM ThinkPad R51 (1829-R6G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"),
-+		},
-+	},
-+	{
-+		/* Reported by Wouter Cloetens <wouter at mind.be> */
-+		.ident = "IBM ThinkPad R51 (1829-EHG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"),
-+		},
-+	},
-+
-+
-+	{
-+		/* Reported by Henrik Brix Andersen <brix at gentoo.org> */
-+		.ident = "IBM ThinkPad X31 (2672-XXH)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"),
-+		},
-+	},
-+	{
-+		/* Reported by Jeremy Katz <katzj at redhat.com> */
-+		.ident = "IBM ThinkPad X31 (2672-A9U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"),
-+		},
-+	},
-+	{
-+		/* Reported by Chris Lee <clee at redhat.com> */
-+		.ident = "IBM ThinkPad X31 (2672-5KU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"),
-+		},
-+	},
-+	{
-+		/* Reported by Chris Blizzard <blizzard at redhat.com> */
-+		.ident = "IBM ThinkPad X31 (2672-RU3)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"),
-+		},
-+	},
-+	{ },
-+	/* Negative reports: */
-+	/* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts
-+	   Reported by: Dax Kelson <dax at gurulabs.com> */
-+	/* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD 
-+	   backlight on during S3 issue.
-+	   Reported by: Henrik Brix Andersen <brix at gentoo.org> */
++#include "radeon_pm_whitelist.h"
 +};
 +
 +extern int radeon_force_sleep;
@@ -536,7 +108,7 @@
  static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
  {
  	u32 tmp;
-@@ -852,7 +1376,14 @@ static void radeon_pm_setup_for_suspend(
+@@ -852,7 +870,14 @@
  	/* because both INPLL and OUTPLL take the same lock, that's why. */
  	tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
  	OUTPLL( pllMCLK_MISC, tmp);
@@ -552,7 +124,7 @@
  	/* AGP PLL control */
  	if (rinfo->family <= CHIP_FAMILY_RV280) {
  		OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
-@@ -864,6 +1395,7 @@ static void radeon_pm_setup_for_suspend(
+@@ -864,6 +889,7 @@
  		OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
  		OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
  	}
@@ -560,7 +132,7 @@
  
  	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
  				  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in
+@@ -2790,6 +2816,29 @@
  	}
  #endif /* defined(CONFIG_PPC_PMAC) */
  #endif /* defined(CONFIG_PM) */
@@ -590,8 +162,8 @@
  }
  
  void radeonfb_pm_exit(struct radeonfb_info *rinfo)
---- vanilla/drivers/video/aty/radeon_base.c	2005-02-20 20:08:15.000000000 +0200
-+++ linux-2.6.14/drivers/video/aty/radeon_base.c	2005-02-20 20:18:20.000000000 +0200
+--- linux-2.6.15.i686/drivers/video/aty/radeon_base.c.backlight	2006-03-01 13:22:06.000000000 -0500
++++ linux-2.6.15.i686/drivers/video/aty/radeon_base.c	2006-03-01 13:22:27.000000000 -0500
 @@ -272,6 +272,9 @@
  #ifdef CONFIG_MTRR
  static int nomtrr = 0;
@@ -602,7 +174,7 @@
  
  /*
   * prototypes
-@@ -2530,6 +2533,10 @@
+@@ -2615,6 +2618,10 @@
  			force_measure_pll = 1;
  		} else if (!strncmp(this_opt, "ignore_edid", 11)) {
  			ignore_edid = 1;
@@ -613,7 +185,7 @@
  		} else
  			mode_option = this_opt;
  	}
-@@ -2585,3 +2592,7 @@
+@@ -2670,3 +2677,7 @@
  MODULE_PARM_DESC(panel_yres, "int: set panel yres");
  module_param(mode_option, charp, 0);
  MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/libata-core.c  |    1 
 drivers/scsi/sata_promise.c |   52 ++++++++++++++++++++++++++++++++++++++------
 include/linux/libata.h      |    1 
 3 files changed, 48 insertions(+), 6 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-sata-promise-pata-ports.patch	28 Mar 2006 16:14:09 -0000	1.6
+++ linux-2.6-sata-promise-pata-ports.patch	20 Jun 2006 18:25:40 -0000	1.7
@@ -22,7 +22,7 @@
 diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
 --- a/drivers/scsi/sata_promise.c	2006-02-08 10:08:08.000000000 -0700
 +++ b/drivers/scsi/sata_promise.c	2006-02-08 11:26:47.000000000 -0700
-@@ -165,7 +165,7 @@
+@@ -172,7 +172,7 @@
  	/* board_2037x */
  	{
  		.sht		= &pdc_ata_sht,
@@ -31,7 +31,7 @@
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
  		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
-@@ -322,15 +322,34 @@
+@@ -360,15 +360,34 @@
  
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {
@@ -70,7 +70,7 @@
  
  	pdc_reset_port(ap);
  	ata_port_probe(ap);
-@@ -646,6 +665,7 @@
+@@ -673,6 +692,7 @@
  	unsigned int board_idx = (unsigned int) ent->driver_data;
  	int pci_dev_busy = 0;
  	int rc;
@@ -78,7 +78,7 @@
  
  	if (!printed_version++)
  		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
-@@ -705,6 +725,9 @@
+@@ -741,6 +761,9 @@
  	probe_ent->port[0].scr_addr = base + 0x400;
  	probe_ent->port[1].scr_addr = base + 0x500;
  
@@ -88,7 +88,7 @@
  	/* notice 4-port boards */
  	switch (board_idx) {
  	case board_20319:
-@@ -715,9 +738,23 @@
+@@ -755,13 +778,27 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -96,6 +96,10 @@
 +		probe_ent->port_flags[2] = ATA_FLAG_SATA;	/* pata fix */
 +		probe_ent->port_flags[3] = ATA_FLAG_SATA;	/* pata fix */
  		break;
+	case board_2057x:
+		/* Override hotplug offset for SATAII150 */
+		hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
+		/* Fall through */
  	case board_2037x:
 -		probe_ent->n_ports = 2;
 +/*		probe_ent->n_ports = 2; */			/* pata fix */
@@ -113,7 +117,7 @@
  		break;
  	case board_20771:
  		probe_ent->n_ports = 2;
-@@ -730,6 +767,9 @@
+@@ -774,6 +811,9 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -126,11 +130,12 @@
 diff -Nru a/include/linux/libata.h b/include/linux/libata.h
 --- a/include/linux/libata.h	2006-02-08 11:40:54.000000000 -0700
 +++ b/include/linux/libata.h	2006-02-08 11:45:02.000000000 -0700
-@@ -237,6 +237,7 @@
+@@ -281,6 +281,7 @@
  	unsigned long		irq;
  	unsigned int		irq_flags;
  	unsigned long		host_flags;
 +	unsigned long		port_flags[ATA_MAX_PORTS];	/* pata fix */
+	unsigned long		host_set_flags;
  	void __iomem		*mmio_base;
  	void			*private_data;
  };

linux-2.6-sched-up-migration-cost.patch:
 sched.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Index: linux-2.6-sched-up-migration-cost.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-sched-up-migration-cost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sched-up-migration-cost.patch	28 Mar 2006 16:14:09 -0000	1.1
+++ linux-2.6-sched-up-migration-cost.patch	20 Jun 2006 18:25:40 -0000	1.2
@@ -1,12 +1,24 @@
---- linux-2.6/kernel/sched.c~	2006-02-10 17:15:29.000000000 -0500
-+++ linux-2.6/kernel/sched.c	2006-02-10 17:18:19.000000000 -0500
-@@ -5459,7 +5459,8 @@ static void calibrate_migration_costs(co
+--- linux-2.6.16.noarch/kernel/sched.c~	2006-04-24 19:30:13.000000000 -0400
++++ linux-2.6.16.noarch/kernel/sched.c	2006-04-24 19:32:49.000000000 -0400
+@@ -5518,13 +5518,15 @@ static void calibrate_migration_costs(co
  #endif
  		);
  	if (system_state == SYSTEM_BOOTING) {
 -		printk("migration_cost=");
-+		if (num_online_cpus() > 1)
+-		for (distance = 0; distance <= max_distance; distance++) {
+-			if (distance)
+-				printk(",");
+-			printk("%ld", (long)migration_cost[distance] / 1000);
++		if (num_online_cpus() > 1) {
 +			printk("migration_cost=");
- 		for (distance = 0; distance <= max_distance; distance++) {
- 			if (distance)
- 				printk(",");
++			for (distance = 0; distance <= max_distance; distance++) {
++				if (distance)
++					printk(",");
++				printk("%ld", (long)migration_cost[distance] / 1000);
++			}
++			printk("\n");
+ 		}
+-		printk("\n");
+ 	}
+ 	j1 = jiffies;
+ 	if (migration_debug)

linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    3 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12697 insertions(+), 32 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-tux.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-tux.patch	28 Mar 2006 16:14:09 -0000	1.6
+++ linux-2.6-tux.patch	20 Jun 2006 18:25:40 -0000	1.7
@@ -453,14 +453,12 @@
  
  #define __NR_security			185
  __SYSCALL(__NR_security, sys_ni_syscall)
-Index: linux-tux.q/include/linux/buffer_head.h
-===================================================================
---- linux-tux.q.orig/include/linux/buffer_head.h
-+++ linux-tux.q/include/linux/buffer_head.h
-@@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in
+--- linux-2.6.16.noarch/include/linux/buffer_head.h~	2006-03-27 13:32:25.000000000 -0500
++++ linux-2.6.16.noarch/include/linux/buffer_head.h	2006-03-27 13:32:30.000000000 -0500
+@@ -204,6 +204,7 @@ int generic_cont_expand(struct inode *in
  int generic_cont_expand_simple(struct inode *inode, loff_t size);
  int block_commit_write(struct page *page, unsigned from, unsigned to);
- int block_sync_page(struct page *);
+ void block_sync_page(struct page *);
 +void flush_inode_pages (struct inode * inode);
  sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
  int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
@@ -528,15 +526,15 @@
 ===================================================================
 --- linux-tux.q.orig/include/linux/fs.h
 +++ linux-tux.q/include/linux/fs.h
-@@ -1575,7 +1575,7 @@ ssize_t generic_file_write_nolock(struct
+@@ -1610,7 +1610,7 @@ ssize_t generic_file_write_nolock(struct
  extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
  extern void do_generic_mapping_read(struct address_space *mapping,
  				    struct file_ra_state *, struct file *,
 -				    loff_t *, read_descriptor_t *, read_actor_t);
 +				    loff_t *, read_descriptor_t *, read_actor_t, int);
- extern void
- file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
- extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
+ 
+ /* fs/splice.c */
+ extern ssize_t generic_file_splice_read(struct file *, loff_t *,
 @@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru
  
  static inline void do_generic_file_read(struct file * filp, loff_t *ppos,
@@ -625,27 +623,24 @@
 ===================================================================
 --- linux-tux.q.orig/include/linux/socket.h
 +++ linux-tux.q/include/linux/socket.h
-@@ -301,6 +301,11 @@ extern int move_addr_to_user(void *kaddr
+@@ -301,6 +301,10 @@ extern int move_addr_to_user(void *kaddr
  extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr);
  extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
  
 +struct socket;
-+struct file * sock_map_file(struct socket *sock);
 +extern int sock_map_fd(struct socket *sock);
 +extern struct socket *sockfd_lookup(int fd, int *err);
 +
  #endif
  #endif /* not kernel and not glibc */
  #endif /* _LINUX_SOCKET_H */
-Index: linux-tux.q/include/linux/sysctl.h
-===================================================================
---- linux-tux.q.orig/include/linux/sysctl.h
-+++ linux-tux.q/include/linux/sysctl.h
-@@ -211,6 +211,7 @@ enum
- 	NET_SCTP=17,
+--- linux-2.6.16.noarch/include/linux/sysctl.h~	2006-03-21 15:04:07.000000000 -0500
++++ linux-2.6.16.noarch/include/linux/sysctl.h	2006-03-21 15:04:27.000000000 -0500
+@@ -215,6 +215,7 @@ enum
  	NET_LLC=18,
  	NET_NETFILTER=19,
-+	NET_TUX=20,
+ 	NET_DCCP=20,
++	NET_TUX=21,
  };
  
  /* /proc/sys/kernel/random */
@@ -2012,18 +2007,16 @@
  
  /* Send _single_ skb sitting at the send head. This function requires
   * true push pending frames to setup probe timer etc.
-Index: linux-tux.q/net/socket.c
-===================================================================
---- linux-tux.q.orig/net/socket.c
-+++ linux-tux.q/net/socket.c
+--- linux-2.6.16.noarch/net/socket.c~	2006-03-21 15:05:05.000000000 -0500
++++ linux-2.6.16.noarch/net/socket.c	2006-03-21 15:05:17.000000000 -0500
 @@ -68,6 +68,7 @@
  #include <linux/netdevice.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
 +#include <net/tux.h>
+ #include <linux/mutex.h>
  #include <linux/wanrouter.h>
  #include <linux/if_bridge.h>
- #include <linux/if_frad.h>
 @@ -123,7 +124,7 @@ static ssize_t sock_sendpage(struct file
   *	in the operation structures but are done directly via the socketcall() multiplexor.
   */
@@ -2033,163 +2026,6 @@
  	.owner =	THIS_MODULE,
  	.llseek =	no_llseek,
  	.aio_read =	sock_aio_read,
-@@ -348,72 +349,6 @@ static struct dentry_operations sockfs_d
- 	.d_delete =	sockfs_delete_dentry,
- };
- 
--/*
-- *	Obtains the first available file descriptor and sets it up for use.
-- *
-- *	This function creates file structure and maps it to fd space
-- *	of current process. On success it returns file descriptor
-- *	and file struct implicitly stored in sock->file.
-- *	Note that another thread may close file descriptor before we return
-- *	from this function. We use the fact that now we do not refer
-- *	to socket after mapping. If one day we will need it, this
-- *	function will increment ref. count on file by 1.
-- *
-- *	In any case returned fd MAY BE not valid!
-- *	This race condition is unavoidable
-- *	with shared fd spaces, we cannot solve it inside kernel,
-- *	but we take care of internal coherence yet.
-- */
--
--int sock_map_fd(struct socket *sock)
--{
--	int fd;
--	struct qstr this;
--	char name[32];
--
--	/*
--	 *	Find a file descriptor suitable for return to the user. 
--	 */
--
--	fd = get_unused_fd();
--	if (fd >= 0) {
--		struct file *file = get_empty_filp();
--
--		if (!file) {
--			put_unused_fd(fd);
--			fd = -ENFILE;
--			goto out;
--		}
--
--		this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
--		this.name = name;
--		this.hash = SOCK_INODE(sock)->i_ino;
--
--		file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
--		if (!file->f_dentry) {
--			put_filp(file);
--			put_unused_fd(fd);
--			fd = -ENOMEM;
--			goto out;
--		}
--		file->f_dentry->d_op = &sockfs_dentry_operations;
--		d_add(file->f_dentry, SOCK_INODE(sock));
--		file->f_vfsmnt = mntget(sock_mnt);
--		file->f_mapping = file->f_dentry->d_inode->i_mapping;
--
--		sock->file = file;
--		file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
--		file->f_mode = FMODE_READ | FMODE_WRITE;
--		file->f_flags = O_RDWR;
--		file->f_pos = 0;
--		file->private_data = sock;
--		fd_install(fd, file);
--	}
--
--out:
--	return fd;
--}
--
- /**
-  *	sockfd_lookup	- 	Go from a file number to its socket slot
-  *	@fd: file handle
-@@ -457,6 +392,83 @@ struct socket *sockfd_lookup(int fd, int
- 	return sock;
- }
- 
-+struct file * sock_map_file(struct socket *sock)
-+{
-+	struct file *file;
-+	struct qstr this;
-+	char name[32];
-+
-+	file = get_empty_filp();
-+
-+	if (!file)
-+		return ERR_PTR(-ENFILE);
-+
-+	this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
-+	this.name = name;
-+	this.hash = SOCK_INODE(sock)->i_ino;
-+
-+	file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
-+	if (!file->f_dentry) {
-+		put_filp(file);
-+		return ERR_PTR(-ENOMEM);
-+	}
-+	file->f_dentry->d_op = &sockfs_dentry_operations;
-+	d_add(file->f_dentry, SOCK_INODE(sock));
-+	file->f_vfsmnt = mntget(sock_mnt);
-+	file->f_mapping = file->f_dentry->d_inode->i_mapping;
-+
-+	if (sock->file)
-+		BUG();
-+	sock->file = file;
-+	file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
-+	file->f_mode = FMODE_READ | FMODE_WRITE;
-+	file->f_flags = O_RDWR;
-+	file->f_pos = 0;
-+	file->private_data = sock;
-+
-+	return file;
-+}
-+
-+/*
-+ *	Obtains the first available file descriptor and sets it up for use.
-+ *
-+ *	This function creates file structure and maps it to fd space
-+ *	of current process. On success it returns file descriptor
-+ *	and file struct implicitly stored in sock->file.
-+ *	Note that another thread may close file descriptor before we return
-+ *	from this function. We use the fact that now we do not refer
-+ *	to socket after mapping. If one day we will need it, this
-+ *	function will increment ref. count on file by 1.
-+ *
-+ *	In any case returned fd MAY BE not valid!
-+ *	This race condition is unavoidable
-+ *	with shared fd spaces, we cannot solve it inside kernel,
-+ *	but we take care of internal coherence yet.
-+ */
-+
-+int sock_map_fd(struct socket *sock)
-+{
-+	int fd;
-+	struct file *file;
-+
-+	/*
-+	 *	Find a file descriptor suitable for return to the user.
-+	 */
-+
-+	fd = get_unused_fd();
-+	if (fd < 0)
-+		return fd;
-+
-+	file = sock_map_file(sock);
-+	if (IS_ERR(file)) {
-+		put_unused_fd(fd);
-+		return PTR_ERR(file);
-+	}
-+	fd_install(fd, file);
-+
-+	return fd;
-+}
-+
- /**
-  *	sock_alloc	-	allocate a socket
-  *	
 @@ -465,7 +477,7 @@ struct socket *sockfd_lookup(int fd, int
   *	NULL is returned.
   */
@@ -6862,12 +6698,12 @@
 +		GOTO_ERR_no_unlock;
 +	mimetype[ret] = 0;
 +	Dprintk("got MIME type: %s.\n", mimetype);
-+        ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
-+        if (ret >= 0)
-+        	expires[ret] = 0;
++       ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
++       if (ret >= 0)
++		expires[ret] = 0;
 +	else
 +		expires[0] = 0;
-+        Dprintk("got expires header: %s.\n", expires);
++       Dprintk("got expires header: %s.\n", expires);
 +
 +	add_mimetype(extension, mimetype, expires);
 +	ret = 0;
@@ -7005,8 +6841,8 @@
 +			TUX_BUG();
 +
 +	if (!capable(CAP_SYS_ADMIN)
-+		 	&& (action != TUX_ACTION_CONTINUE_REQ) &&
-+		 		(action != TUX_ACTION_STOPTHREAD))
++			&& (action != TUX_ACTION_CONTINUE_REQ) &&
++				(action != TUX_ACTION_STOPTHREAD))
 +		goto userspace_actions;
 +
 +	switch (action) {
@@ -9470,7 +9306,7 @@
 +		req, bytes, ftp_bytes_sent, ftp_bandwidth);
 +}
 +
-+#define update_bandwidth(req,bytes) 				\
++#define update_bandwidth(req,bytes)				\
 +	do {							\
 +		if (unlikely(tux_ftp_login_message))		\
 +			__update_bandwidth(req, bytes);		\
@@ -10720,7 +10556,7 @@
 +		icsk = inet_csk(data_sock->sk);
 +
 +		tp->nonagle = 2;
-+	       	Dprintk("PASV bind() ret: %d.\n", err);
++		Dprintk("PASV bind() ret: %d.\n", err);
 +		if (err < 0) {
 +			req_err(req);
 +			sock_release(data_sock);
@@ -10798,7 +10634,7 @@
 +				(struct sockaddr*)&addr, sizeof(addr));
 +		current->cap_effective = saved_cap;
 +
-+	       	Dprintk("ACTIVE bind() ret: %d.\n", err);
++		Dprintk("ACTIVE bind() ret: %d.\n", err);
 +		if (err) {
 +			sock_release(data_sock);
 +			req_err(req);
@@ -11346,7 +11182,7 @@
 +				GOTO_REDIR;
 +		}
 +
-+#define PARSE_STR_FIELD(char,field,str,len) 				\
++#define PARSE_STR_FIELD(char,field,str,len)				\
 +	if (PARSE_TOKEN(curr,field,left)) {				\
 +		req->str = curr;					\
 +		SKIP_LINE(curr,left);					\
@@ -13190,7 +13026,7 @@
 +
 +static struct request_sock_ops tux_req =
 +{
-+ 	.destructor = &nop_destructor,
++	.destructor = &nop_destructor,
 +};
 +
 +static int redirect_sock (tux_req_t *req, const int port)
@@ -13495,13 +13331,13 @@
 +	s++;
 +	if ((s[0]!='G')||(s[1]!='M')||(s[2]!='T'))
 +	{
-+  		return 0; /* No GMT */
-+  	}
++		return 0; /* No GMT */
++	}
 +
 +	if (Y<TUX_YEAROFFSET) Y = TUX_YEAROFFSET;
 +	if (Y>TUX_YEAROFFSET+9) Y = TUX_YEAROFFSET+9;
 +
-+	Temp = 	TimeDays[Y-TUX_YEAROFFSET][M];
++	Temp = TimeDays[Y-TUX_YEAROFFSET][M];
 +	Temp += D*86400+H*3600+Min*60+S;
 +
 +	return Temp;
@@ -13686,7 +13522,7 @@
 +			/* Wed Jun  9 01:29:59 1993 */
 +
 +			if (str_len < 24)
-+                        	return -1;
++				return -1;
 +
 +			mon = make_month(str+4);
 +			mday = make_num(str+8);


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- sources	5 Jun 2006 18:33:51 -0000	1.176
+++ sources	20 Jun 2006 18:25:40 -0000	1.177
@@ -1,2 +1,2 @@
-9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-391e7410fb03a533d40d1a1620465ad7  patch-2.6.16.20.bz2
+37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
+f7197c29beb5bd28b6f566b58260ece8  patch-2.6.17.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- upstream	5 Jun 2006 18:33:51 -0000	1.117
+++ upstream	20 Jun 2006 18:25:40 -0000	1.118
@@ -1,2 +1,2 @@
-linux-2.6.16.tar.bz2
-patch-2.6.16.20.bz2
+linux-2.6.17.tar.bz2
+patch-2.6.17.1.bz2


--- linux-2.6-8250-16c950-faster.patch DELETED ---


--- linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch DELETED ---


--- linux-2.6-audit-new-msg-types.patch DELETED ---


--- linux-2.6-autofs-pathlookup.patch DELETED ---


--- linux-2.6-bzimage.patch DELETED ---


--- linux-2.6-crashdump-common.patch DELETED ---


--- linux-2.6-crashdump-reboot-exports.patch DELETED ---


--- linux-2.6-debug-dual-line-backtrace.patch DELETED ---


--- linux-2.6-debug-pm-pci.patch DELETED ---


--- linux-2.6-debug-reference-discarded-return-result.patch DELETED ---


--- linux-2.6-debug-slab-leaks.patch DELETED ---


--- linux-2.6-defaults-enable-sata-atapi.patch DELETED ---


--- linux-2.6-diskdump.patch DELETED ---


--- linux-2.6-drm-cripple-r300.patch DELETED ---


--- linux-2.6-dump_smp_call_function.patch DELETED ---


--- linux-2.6-ide-cd-shutup.patch DELETED ---


--- linux-2.6-mv643xx-compile-fix.patch DELETED ---


--- linux-2.6-net-ipw2200-hwcrypto.patch DELETED ---


--- linux-2.6-net-wireless-features.patch DELETED ---


--- linux-2.6-netconsole.patch DELETED ---


--- linux-2.6-netdump.patch DELETED ---


--- linux-2.6-obsolete-idescsi-warning.patch DELETED ---


--- linux-2.6-pcmcia-disable-warning.patch DELETED ---


--- linux-2.6-pwc-powerup-by-default.patch DELETED ---


--- linux-2.6-scsi-advansys-enabler.patch DELETED ---


--- linux-2.6-selinux-disable-attributes-no-policy.patch DELETED ---


--- linux-2.6-selinux-selinuxfs-hard-link-count.patch DELETED ---


--- linux-2.6-signal-trampolines-unwind-info.patch DELETED ---


--- linux-2.6-smsc-ircc2-pnp.patch DELETED ---


--- linux-2.6-x86-tune-p4.patch DELETED ---


--- linux-2.6.16.tar.bz2.sign DELETED ---


--- patch-2.6.16.20.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 18:28:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 14:28:36 -0400
Subject: rpms/nfs-utils-lib/devel .cvsignore, 1.2, 1.3 nfs-utils-lib.spec,
	1.6, 1.7 sources, 1.2, 1.3 libnfsidmap-0.12-set_debug.patch,
	1.2, NONE
Message-ID: <200606201828.k5KISaOS025937@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25812

Modified Files:
	.cvsignore nfs-utils-lib.spec sources 
Removed Files:
	libnfsidmap-0.12-set_debug.patch 
Log Message:
Updated libnfsidmap and  librpcsecgss to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 22:45:21 -0000	1.2
+++ .cvsignore	20 Jun 2006 18:28:33 -0000	1.3
@@ -1,2 +1,4 @@
 libnfsidmap-0.12.tar.gz
 librpcsecgss-0.7.tar.gz
+librpcsecgss-0.13.tar.gz
+libnfsidmap-0.16.tar.gz


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nfs-utils-lib.spec	11 Feb 2006 04:46:03 -0000	1.6
+++ nfs-utils-lib.spec	20 Jun 2006 18:28:33 -0000	1.7
@@ -1,13 +1,13 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 3.1
+Release: 5
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
-%define idmapvers 0.12
+%define idmapvers 0.16
 %define libnfsidmap libnfsidmap-%{idmapvers}
-%define rpcsecgssvers 0.7
+%define rpcsecgssvers 0.13
 %define librpcsecgss librpcsecgss-%{rpcsecgssvers}
 %define libs %{librpcsecgss} %{libnfsidmap}
 
@@ -17,12 +17,10 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext
-BuildRequires: libgssapi-devel
+BuildRequires: libgssapi-devel >= 0.9, openldap-devel
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: libgssapi
-
-Patch1: libnfsidmap-0.12-set_debug.patch
+Requires: libgssapi >= 0.9, openldap
 
 %description
 Support libaries that are needed by the commands and 
@@ -41,8 +39,6 @@
 %prep
 %setup -c -q -a1
 
-%patch1 -p1
-
 %build
 top=`pwd`
 for dir in %{libs} ; do
@@ -103,6 +99,7 @@
 %{_defaultdocdir}/%{libnfsidmap}/ChangeLog
 %{_defaultdocdir}/%{libnfsidmap}/NEWS
 %{_defaultdocdir}/%{libnfsidmap}/README
+%{_libdir}/pkgconfig/libnfsidmap.pc
 %{_mandir}/man3/nfs4_uid_to_name.3.gz
 
 %files devel
@@ -111,23 +108,16 @@
 %{_libdir}/librpcsecgss.so
 %{_includedir}/rpcsecgss/rpc/auth.h
 %{_includedir}/rpcsecgss/rpc/auth_gss.h
-%{_includedir}/rpcsecgss/rpc/auth_unix.h
-%{_includedir}/rpcsecgss/rpc/clnt.h
-%{_includedir}/rpcsecgss/rpc/pmap_clnt.h
-%{_includedir}/rpcsecgss/rpc/pmap_prot.h
-%{_includedir}/rpcsecgss/rpc/pmap_rmt.h
-%{_includedir}/rpcsecgss/rpc/rpc.h
-%{_includedir}/rpcsecgss/rpc/rpc_des.h
-%{_includedir}/rpcsecgss/rpc/rpc_msg.h
 %{_includedir}/rpcsecgss/rpc/svc.h
 %{_includedir}/rpcsecgss/rpc/svc_auth.h
-%{_includedir}/rpcsecgss/rpc/types.h
-%{_includedir}/rpcsecgss/rpc/xdr.h
 %{_includedir}/nfsidmap.h
 %{_libdir}/libnfsidmap.so
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Tue Jun 20 2006 Steve Dickson <steved at redhat.com> 1.0.8-3.1
+- Updated libnfsidmap and  librpcsecgss to latest upstream version
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-3.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 22:45:21 -0000	1.2
+++ sources	20 Jun 2006 18:28:33 -0000	1.3
@@ -1,2 +1,2 @@
-5459409f04b8d6f92b99e84a0f6382b1  libnfsidmap-0.12.tar.gz
-08d07cb462555c00cfba6708112a646a  librpcsecgss-0.7.tar.gz
+024143270490e0e252832c9f64499645  librpcsecgss-0.13.tar.gz
+ab167a7449c029bd9f26e8275cc95c7b  libnfsidmap-0.16.tar.gz


--- libnfsidmap-0.12-set_debug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 19:36:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 15:36:14 -0400
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.7,1.8
Message-ID: <200606201936.k5KJaE9a024378@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24222

Modified Files:
	nfs-utils-lib.spec 
Log Message:
added autoconf to BuildRequires:



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nfs-utils-lib.spec	20 Jun 2006 18:28:33 -0000	1.7
+++ nfs-utils-lib.spec	20 Jun 2006 19:36:11 -0000	1.8
@@ -16,7 +16,7 @@
 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pkgconfig, gettext
+BuildRequires: pkgconfig, gettext, autoconf
 BuildRequires: libgssapi-devel >= 0.9, openldap-devel
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig



From fedora-cvs-commits at redhat.com  Tue Jun 20 19:49:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 15:49:28 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.141,1.142
Message-ID: <200606201949.k5KJnSH4010905@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10819

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gnome-applets.spec	19 Jun 2006 12:47:14 -0000	1.141
+++ gnome-applets.spec	20 Jun 2006 19:49:26 -0000	1.142
@@ -65,8 +65,8 @@
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
 BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
-BuildRequires:  pygobject-devel >= %{pygobject_version}
-BuildRequires:  gnome-python2-devel >= %{gnome_python_version}
+BuildRequires:  pygobject >= %{pygobject_version}
+BuildRequires:  gnome-python2 >= %{gnome_python_version}
 
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:14:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:14:56 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-libdhcp6client-Makefile.patch, 1.3,
	1.4 dhcpv6.spec, 1.35, 1.36
Message-ID: <200606202014.k5KKEuH9017715@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17656

Modified Files:
	dhcpv6-0.10-libdhcp6client-Makefile.patch dhcpv6.spec 
Log Message:
- don't patch using autoconf, do it in the spec file so it can be
  patched on top of


dhcpv6-0.10-libdhcp6client-Makefile.patch:
 Makefile.in |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

Index: dhcpv6-0.10-libdhcp6client-Makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-libdhcp6client-Makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcpv6-0.10-libdhcp6client-Makefile.patch	19 May 2006 13:29:49 -0000	1.3
+++ dhcpv6-0.10-libdhcp6client-Makefile.patch	20 Jun 2006 20:14:52 -0000	1.4
@@ -1,5 +1,5 @@
---- dhcp-0.10/Makefile.in.libdhcp6client-Makefile	2006-05-19 09:20:26.000000000 -0400
-+++ dhcp-0.10/Makefile.in	2006-05-19 09:22:06.000000000 -0400
+--- dhcp-0.10/Makefile.in.libdhcp6client-Makefile	2006-06-20 16:03:07.000000000 -0400
++++ dhcp-0.10/Makefile.in	2006-06-20 16:04:23.000000000 -0400
 @@ -10,8 +10,8 @@
  CC=	@CC@
  YACC=	@YACC@
@@ -38,15 +38,14 @@
  dhcp6r: $(RELAYOBJS) $(LIBOBJS)
  	$(CC) $(LDFLAGS) -o dhcp6r $(RELAYOBJS)
  
-@@ -94,6 +102,22 @@
+@@ -94,6 +102,21 @@
  	$(LEX) -Psfyy server6_token.l
  	mv lex.sfyy.c $@
  
-+libdhcp6client/.: libdhcp6client.patch
++libdhcp6client/.: $(CLIENTOBJS:%.o=%.c)
 +	mkdir -p libdhcp6client/
-+	cp -fp $(CLIENTOBJS:%.o=%.c) $(CLIENTHDRS) $(COMMONGENSRCS:%.c=%.l) $(subst client6_parse.l,client6_parse.y,$(CLIENTGENSRCS:%.c=%.l)) strlcat.c strlcpy.c libdhcp6client/
-+	cp -fp Makefile libdhcp6client/
-+	patch -p1 -b --suffix=.libdhcp6client < libdhcp6client.patch
++	cp -fa $(CLIENTOBJS:%.o=%.c) $(CLIENTHDRS) $(COMMONGENSRCS:%.c=%.l) $(subst client6_parse.l,client6_parse.y,$(CLIENTGENSRCS:%.c=%.l)) strlcat.c strlcpy.c libdhcp6client/
++	cp -fa Makefile libdhcp6client/
 +
 +libdhcp6client/%.o: $(@:%.o:%.c) $(patsubst %,libdhcp6client/%,$(CLIENTHDRS))
 +	$(MAKE) -C libdhcp6client $*.o CFLAGS="$(subst -fPIE,-fPIC,$(subst -O2,-Os,$(CFLAGS))) -DLIBDHCP"
@@ -61,7 +60,7 @@
  install::
  	$(INSTALL) -d $(DESTDIR)$(sbindir)
  	$(INSTALL) -d $(DESTDIR)/sbin
-@@ -112,7 +136,13 @@
+@@ -112,7 +135,13 @@
  	$(INSTALL) -d  $(DESTDIR)/etc/sysconfig
  	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s.sysconfig  $(DESTDIR)/etc/sysconfig/dhcp6s
  	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6r.sysconfig  $(DESTDIR)/etc/sysconfig/dhcp6r


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dhcpv6.spec	9 Jun 2006 01:01:31 -0000	1.35
+++ dhcpv6.spec	20 Jun 2006 20:14:52 -0000	1.36
@@ -1,13 +1,12 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 26
+Release: 27
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
 Source0: ftp://ftp.sourceforge.net/pub/sourceforge/d/dh/dhcp/dhcp-%{version}.tgz
 Source1: rfc3315.txt
-Source2: dhcpv6-0.10-libdhcp6client.patch
 Source3: libdhcp6client.pc
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0:  dhcpv6-0.10-initscripts.patch
@@ -29,6 +28,7 @@
 Patch16: dhcpv6-0.10-prefix.patch
 Patch17: dhcpv6-0.10-htonl.patch
 Patch18: dhcpv6-0.10-libdhcp6client-Makefile.patch
+Patch19: dhcpv6-0.10-libdhcp6client.patch
 Prereq: /sbin/chkconfig, /sbin/service
 BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
 
@@ -71,18 +71,20 @@
 %patch17 -p1 -b .htonl
 %patch18 -p1 -b .libdhcp6client-Makefile
 
-%build
 %if %{NODEBUGINFO}
 export CFLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-O2//g'`' -g3 -gdwarf-2'
 %else
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack'
 export CFLAGS="$RPM_OPT_FLAGS -fPIE -g -Wall"
 %endif
-cp -fp %SOURCE2 libdhcp6client.patch
 autoconf
 %configure \
 	--prefix=\
 	--mandir=/usr/share/man
+make libdhcp6client/.
+%patch19 -p1 -b .libdhcp6client
+
+%build
 make
 cp -fp %{SOURCE1} docs
 
@@ -187,6 +189,10 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Jun 20 2006 Peter Jones <pjones at redhat.com> - 0.10-27
+- don't patch using autoconf, do it in the spec file so it can be
+  patched on top of
+
 * Thu Jun 08 2006 Jason Vas Dias<jvdias at redhat.com> 0.10-26
 - libdhcp6client fix to retry bind() to linklocal address
   on EADDRNOTAVAIL for up to 5 seconds to give kernel time



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:25:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:25:57 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.195,
	1.196 config-x86-generic, 1.53, 1.54 config-x86_64-generic,
	1.40, 1.41
Message-ID: <200606202025.k5KKPvVE003962@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3787/configs

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
git1



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- config-generic	17 Jun 2006 22:16:10 -0000	1.195
+++ config-generic	20 Jun 2006 20:25:54 -0000	1.196
@@ -646,9 +646,11 @@
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -664,11 +666,13 @@
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
@@ -680,6 +684,7 @@
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_AH_ESP=m
@@ -730,6 +735,7 @@
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
@@ -779,6 +785,10 @@
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
 
 #
 # SCTP Configuration (EXPERIMENTAL)
@@ -862,6 +872,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+# CONFIG_NET_TCPPROBE is not set
 CONFIG_NETDEVICES=y
 
 #
@@ -924,6 +935,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -1015,6 +1027,7 @@
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_MYRI10GE=m
 CONFIG_CHELSIO_T1=m
 
 CONFIG_FDDI=y
@@ -1165,15 +1178,16 @@
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_ACT200L_DONGLE=m
 
-CONFIG_USB_IRDA=m
+CONFIG_ALI_FIR=m
+CONFIG_MCS_FIR=m
 CONFIG_NSC_FIR=m
 CONFIG_SIGMATEL_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
 CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_USB_IRDA=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_WINBOND_FIR=m
 
 #
 # Bluetooth support
@@ -2527,6 +2541,7 @@
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 # CONFIG_SECURITY_SECLVL is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
@@ -2765,3 +2780,7 @@
 CONFIG_MIGRATION=y
 # CONFIG_NEW_LEDS is not set
 
+CONFIG_DMA_ENGINE=y
+CONFIG_NET_DMA=y
+CONFIG_INTEL_IOATDMA=m
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- config-x86-generic	17 Jun 2006 18:59:27 -0000	1.53
+++ config-x86-generic	20 Jun 2006 20:25:54 -0000	1.54
@@ -244,7 +244,9 @@
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW_QOS=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- config-x86_64-generic	18 Apr 2006 21:09:21 -0000	1.40
+++ config-x86_64-generic	20 Jun 2006 20:25:54 -0000	1.41
@@ -109,7 +109,9 @@
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW_QOS=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:25:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:25:57 -0400
Subject: rpms/kernel/devel patch-2.6.17-git1.bz2.sign, NONE,
	1.1 kernel-2.6.spec, 1.2294, 1.2295 linux-2.6-tux.patch, 1.19,
	1.20 linux-2.6-xen.patch, 1.24, 1.25 upstream, 1.365,
	1.366 linux-2.6-cpufreq-acpi-sticky.patch, 1.1,
	NONE linux-2.6-powernow-k7-smp.patch, 1.1, NONE
Message-ID: <200606202025.k5KKPvH5003952@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3787

Modified Files:
	kernel-2.6.spec linux-2.6-tux.patch linux-2.6-xen.patch 
	upstream 
Added Files:
	patch-2.6.17-git1.bz2.sign 
Removed Files:
	linux-2.6-cpufreq-acpi-sticky.patch 
	linux-2.6-powernow-k7-smp.patch 
Log Message:
git1



--- NEW FILE patch-2.6.17-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEl51tyGugalF9Dw4RAuO/AJ0erNRKpMjIr/nbksJTJJoTQv5hiQCeOKqf
1/gnWEwTkreVC9Yv9ktTokM=
=nz89
-----END PGP SIGNATURE-----


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2294
retrieving revision 1.2295
diff -u -r1.2294 -r1.2295
--- kernel-2.6.spec	20 Jun 2006 06:33:53 -0000	1.2294
+++ kernel-2.6.spec	20 Jun 2006 20:25:53 -0000	1.2295
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-#Patch1: patch-2.6.17-rc6.bz2
+Patch1: patch-2.6.17-git1.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -390,8 +390,6 @@
 Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1780: linux-2.6-powernow-k7-smp.patch
-Patch1790: linux-2.6-console-suspend.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -422,7 +420,6 @@
 # ACPI bits
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
-Patch2302: linux-2.6-cpufreq-acpi-sticky.patch
 
 # MTD / JFFS2
 Patch2400: linux-2.6-mtd-git.patch
@@ -738,7 +735,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-#%patch1 -p1
+%patch1 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -778,7 +775,7 @@
 # Hush noisy unimplemented 32bit syscalls
 %patch208 -p1
 # Jordan Crouse's Geode git tree.
-%patch209 -p1
+#%patch209 -p1
 
 #
 # ppc64
@@ -989,10 +986,6 @@
 %patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
-# Fix up powernow-k7 to work on SMP kernels.
-%patch1780 -p1
-# Console fixes for suspend/resume
-%patch1790 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1036,8 +1029,6 @@
 %patch2300 -p1
 # acpi-ecdt-uid-hack
 %patch2301 -p1
-# Make acpi-cpufreq sticky.
-%patch2302 -p1
 
 # MTD and JFFS2 updates
 %patch2400 -p1
@@ -1694,6 +1685,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git1
+
 * Sun Jun 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17
 

linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    1 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12696 insertions(+), 31 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-tux.patch	11 Jun 2006 23:28:22 -0000	1.19
+++ linux-2.6-tux.patch	20 Jun 2006 20:25:53 -0000	1.20
@@ -1960,20 +1960,11 @@
 ===================================================================
 --- linux-tux.q.orig/net/ipv4/tcp.c
 +++ linux-tux.q/net/ipv4/tcp.c
-@@ -936,7 +936,7 @@ static int tcp_recv_urg(struct sock *sk,
-  * calculation of whether or not we must ACK for the sake of
-  * a window update.
-  */
--static void cleanup_rbuf(struct sock *sk, int copied)
-+void cleanup_rbuf(struct sock *sk, int copied)
- {
- 	struct tcp_sock *tp = tcp_sk(sk);
- 	int time_to_ack = 0;
 @@ -2142,3 +2142,4 @@ EXPORT_SYMBOL(tcp_sendpage);
  EXPORT_SYMBOL(tcp_setsockopt);
  EXPORT_SYMBOL(tcp_shutdown);
  EXPORT_SYMBOL(tcp_statistics);
-+EXPORT_SYMBOL_GPL(cleanup_rbuf);
++EXPORT_SYMBOL_GPL(tcp_cleanup_rbuf);
 Index: linux-tux.q/net/ipv4/tcp_input.c
 ===================================================================
 --- linux-tux.q.orig/net/ipv4/tcp_input.c

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   54 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 257 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linux-2.6-xen.patch	10 Jun 2006 01:32:58 -0000	1.24
+++ linux-2.6-xen.patch	20 Jun 2006 20:25:53 -0000	1.25
@@ -86820,15 +86820,15 @@
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
 --- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-05-13 02:59:54.000000000 +0200
 +++ merge/net/ipv4/xfrm4_output.c	2006-05-30 12:44:06.000000000 +0200
-@@ -17,6 +17,8 @@
+@@ -16,6 +16,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
  
 +extern int skb_checksum_setup(struct sk_buff *skb);
 +
- /* Add encapsulation header.
-  *
-  * In transport mode, the IP header will be moved forward to make space
+ static int xfrm4_tunnel_check_size(struct sk_buff *skb)
+ {
+ 	int mtu, ret = 0;
 @@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
  	struct xfrm_state *x = dst->xfrm;
  	int err;


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- upstream	18 Jun 2006 04:24:53 -0000	1.365
+++ upstream	20 Jun 2006 20:25:54 -0000	1.366
@@ -1 +1,2 @@
 linux-2.6.17.tar.bz2
+patch-2.6.17-git1.bz2


--- linux-2.6-cpufreq-acpi-sticky.patch DELETED ---


--- linux-2.6-powernow-k7-smp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:31:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:31:06 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.86,
	1.87 libselinux.spec, 1.204, 1.205
Message-ID: <200606202031.k5KKV68x005712@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5684

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-2
- Add function to compare file context on disk versus contexts in file_contexts file.


libselinux-rhat.patch:
 include/selinux/selinux.h |   12 ++++++
 man/man8/matchpathcon.8   |   18 ++++++++-
 src/matchpathcon.c        |   83 +++++++++++++++++++++++++++++++++++++++++++---
 utils/matchpathcon.c      |   62 +++++++++++++++++++++++++++-------
 4 files changed, 154 insertions(+), 21 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- libselinux-rhat.patch	12 Jun 2006 18:10:30 -0000	1.86
+++ libselinux-rhat.patch	20 Jun 2006 20:30:59 -0000	1.87
@@ -1,165 +1,271 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.12/include/selinux/selinux.h
---- nsalibselinux/include/selinux/selinux.h	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.12/include/selinux/selinux.h	2006-06-09 15:29:18.000000000 -0400
-@@ -361,6 +361,13 @@
- extern int selinux_getenforcemode(int *enforce);
- 
- /*
-+  selinux_getpolicytype reads the /etc/selinux/config file and determines 
-+  what the default policy for the machine is.  Calling application must 
-+  free policytype.
-+ */
-+extern int selinux_getpolicytype(char **policytype);
-+
-+/*
-   selinux_policy_root reads the /etc/selinux/config file and returns 
-   the directory path under which the compiled policy file and context 
-   configuration files exist.
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.30.12/src/selinux_config.c
---- nsalibselinux/src/selinux_config.c	2006-05-23 06:19:32.000000000 -0400
-+++ libselinux-1.30.12/src/selinux_config.c	2006-06-09 15:42:35.000000000 -0400
-@@ -124,6 +124,37 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.15/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2006-06-16 15:08:24.000000000 -0400
++++ libselinux-1.30.15/include/selinux/selinux.h	2006-06-20 15:48:14.000000000 -0400
+@@ -429,8 +429,20 @@
+    Caller must free the returned strings via free. */
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
+ 
++/* This function allows you to compare two security context, it will ignore the 
++user component */
++int selinux_context_cmp(const security_context_t a, const security_context_t b);
++
++/* This function looks at the file context on disk and compares it to the 
++system defaults, it returns 1 on match non 0 on failure */
++int selinux_verify_file_context(const char *path, mode_t mode);
++
++/* This function sets the file context on to the system defaults returns 0 on success */
++int selinux_lsetfilecon_default(const char *path);
++
+ #ifdef __cplusplus
  }
- hidden_def(selinux_getenforcemode)
+ #endif
  
-+int selinux_getpolicytype(char **intype) {
-+  int ret=-1;
-+  char *type=NULL;
-+  char *end=NULL;
-+  FILE *cfg = fopen(SELINUXCONFIG,"r");
-+  char buf[4097];
-+  int len=sizeof(SELINUXTYPETAG)-1;
-+  if (!cfg) {
-+    cfg = fopen(SECURITYCONFIG,"r");
-+  }
-+  if (cfg) {
-+    while (fgets_unlocked(buf, 4096, cfg)) {
-+      if (strncmp(buf,SELINUXTYPETAG,len))
-+	continue;
-+      type = strdupa(buf+sizeof(SELINUXTYPETAG)-1);
-+      end  = type + strlen(type)-1;
-+      while ((end > type) && 
-+	     (isspace(*end) || iscntrl(*end))) {
-+	      *end = 0;
-+	      end--;
-+      }
-+      *intype=type;
-+      ret=0;
-+      break;
-+    }
-+    fclose(cfg);
-+  }
-+  return ret;
-+}
-+hidden_def(selinux_getpolicytype)
+ #endif
 +
- static char *selinux_policyroot = NULL;
- static char *selinux_rootpath = NULL;
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-1.30.15/man/man8/matchpathcon.8
+--- nsalibselinux/man/man8/matchpathcon.8	2006-05-15 09:43:24.000000000 -0400
++++ libselinux-1.30.15/man/man8/matchpathcon.8	2006-06-20 10:56:07.000000000 -0400
+@@ -3,13 +3,25 @@
+ matchpathcon \- get the default security context for the specified path from the file contexts configuration.
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.30.12/src/selinux_internal.h
---- nsalibselinux/src/selinux_internal.h	2006-05-23 06:19:32.000000000 -0400
-+++ libselinux-1.30.12/src/selinux_internal.h	2006-06-09 15:29:18.000000000 -0400
-@@ -64,6 +64,7 @@
- hidden_proto(selinux_usersconf_path);
- hidden_proto(selinux_translations_path);
- hidden_proto(selinux_getenforcemode);
-+hidden_proto(selinux_getpolicytype);
- hidden_proto(selinux_raw_to_trans_context);
- hidden_proto(selinux_trans_to_raw_context);
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-1.30.12/src/selinux.py
---- nsalibselinux/src/selinux.py	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.12/src/selinux.py	2006-06-09 15:29:18.000000000 -0400
-@@ -102,6 +102,7 @@
- is_context_customizable = _selinux.is_context_customizable
- selinux_trans_to_raw_context = _selinux.selinux_trans_to_raw_context
- selinux_raw_to_trans_context = _selinux.selinux_raw_to_trans_context
-+selinux_getpolicytype = _selinux.selinux_getpolicytype
- getseuserbyname = _selinux.getseuserbyname
- 
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.12/src/selinuxswig.i
---- nsalibselinux/src/selinuxswig.i	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.12/src/selinuxswig.i	2006-06-09 15:29:18.000000000 -0400
-@@ -126,4 +126,5 @@
- %typemap(argout) char ** {
- 	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ .SH "SYNOPSIS"
+-.B matchpathcon [-n] filepath...
+-
++.B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath...
+ .SH "DESCRIPTION"
+ .B matchpathcon
+ Prints the file path and the default security context associated with it.
++.SH OPTIONS
++.B \-n
++Do not display path.
++.br
++.B \-N
++Do not use translations.
++.br
++.B \-f file_context_file
++Use alternate file_context file
++.br
++.B \-p prefix
++Use prefix to speed translations
+ .br
+-If the -n option is given, do not display path.
++.B \-V
++Verify file context on disk matches defaults
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.30.15/src/matchpathcon.c
+--- nsalibselinux/src/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
++++ libselinux-1.30.15/src/matchpathcon.c	2006-06-20 15:37:25.000000000 -0400
+@@ -26,6 +26,8 @@
+ 	va_end(ap);
  }
-+extern int selinux_getpolicytype(char **enforce);
- extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.30.12/src/selinuxswig_wrap.c
---- nsalibselinux/src/selinuxswig_wrap.c	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.12/src/selinuxswig_wrap.c	2006-06-09 15:29:18.000000000 -0400
-@@ -4153,6 +4153,27 @@
+ 
++static unsigned int myflags;
++
+ static void 
+ #ifdef __GNUC__
+ __attribute__ ((format (printf, 1, 2)))
+@@ -50,7 +52,12 @@
+ static int default_canoncon(const char *path, unsigned lineno, char **context)
+ {
+ 	char *tmpcon;
+-	if (security_canonicalize_context(*context, &tmpcon) < 0) {
++	int rc;
++	if (myflags & MATCHPATHCON_NOTRANS)
++		rc = security_canonicalize_context_raw(*context, &tmpcon);
++	else
++		rc = security_canonicalize_context(*context, &tmpcon);
++	if ( rc < 0) {
+ 		if (errno == ENOENT)
+ 			return 0;
+ 		if (lineno)
+@@ -74,8 +81,6 @@
+ 		mycanoncon = &default_canoncon;
  }
  
+-static unsigned int myflags;
+-
+ void set_matchpathcon_flags(unsigned int flags)
+ {
+ 	myflags = flags;
+@@ -580,7 +585,6 @@
+ 				spec_arr[nspec].context_valid = 1;
+ 			}
+ 		}
+-
+ 		spec_arr[nspec].context = context;
+ 		
+ 		/* Determine if specification has 
+@@ -797,7 +801,6 @@
+ 		errno = ENOENT;
+ 		return -1;
+ 	}
+-
+ 	spec_arr[i].matches++;
  
-+SWIGINTERN PyObject *_wrap_selinux_getpolicytype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char **arg1 = (char **) 0 ;
-+  int result;
-+  char *temp1 ;
-+  
-+  {
-+    arg1 = &temp1;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)":selinux_getpolicytype")) SWIG_fail;
-+  result = (int)selinux_getpolicytype(arg1);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
-+  }
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
+ 	return i;
+@@ -877,3 +880,73 @@
+ 		}
+ 	}
+ }
 +
++/* Compare two contexts to see if their differences are "significant",
++ * or whether the only difference is in the user. */
++int selinux_context_cmp(const security_context_t a, const security_context_t b)
++{
++	char *rest_a, *rest_b; /* Rest of the context after the user */
++	if (!a && !b) return 0;
++	if (!a && b) return -1;
++	if (a && !b) return 1;
++	rest_a = strchr((char *)a, ':');
++	rest_b = strchr((char *)b, ':');
++	if (!rest_a && !rest_b) return 0;
++	if (!rest_a && rest_b) return -1;
++	if (rest_a && !rest_b) return 1;
++	return  strcmp(rest_a, rest_b);
++}
 +
- SWIGINTERN PyObject *_wrap_getseuserbyname(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   char *arg1 = (char *) 0 ;
-@@ -4253,6 +4274,7 @@
- 	 { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL},
- 	 { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL},
- 	 { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL},
-+	 { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL},
- 	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
- 	 { NULL, NULL, 0, NULL }
- };
---- libselinux-1.30.12/src/setrans_client.c~	2006-06-05 13:20:37.000000000 -0400
-+++ libselinux-1.30.12/src/setrans_client.c	2006-06-12 13:39:55.000000000 -0400
-@@ -16,6 +16,9 @@
- #include "selinux_internal.h"
- #include "setrans_internal.h"
- 
-+static int mls_enabled=-1;
-+#define MLSENABLED ((mls_enabled==-1) ? (mls_enabled=is_selinux_mls_enabled()) : mls_enabled)
-+
- // Simple cache
- static	__thread security_context_t prev_t2r_trans=NULL;
- static	__thread security_context_t prev_t2r_raw=NULL;
-@@ -243,6 +246,12 @@
- 		*rawp = NULL;
- 		return 0;
- 	}
++int selinux_verify_file_context(const char *path, mode_t mode)
++{
++ 	security_context_t con = NULL;
++ 	security_context_t fcontext = NULL;
++	int rc=0;
 +
-+	if (! MLSENABLED) {
-+		*rawp = strdup(trans);
-+		return 0;
++	if (myflags & MATCHPATHCON_NOTRANS) 
++		rc = lgetfilecon_raw(path, &con);
++	else 
++		rc = lgetfilecon(path, &con);
++	if (rc == -1) {
++		if (errno != ENOTSUP)
++			return 1;
++	        else
++			return 0;
 +	}
 +
- 	if (cache_trans) {
- 		if (prev_t2r_trans && strcmp(prev_t2r_trans, trans) == 0) {
- 			*rawp=strdup(prev_t2r_raw);
-@@ -279,6 +288,11 @@
- 		return 0;
- 	}
++	if (matchpathcon(path,mode,&fcontext) != 0)  {
++		if (fcontext == NULL && errno != ENOENT) 
++			rc = 1;
++		else
++			rc = 0;
++	} 
++	else 
++		rc = (selinux_context_cmp(fcontext, con) == 0);
++	freecon(con);
++	freecon(fcontext); 
++	return rc;
++}
++
++
++int selinux_lsetfilecon_default(const char *path) {
++	struct stat st;
++	int rc = -1;
++	security_context_t scontext=NULL;
++	unsigned int localflags=myflags;
++	if (lstat(path, &st) != 0)
++		return rc;
++
++	set_matchpathcon_flags(myflags | MATCHPATHCON_NOTRANS);
++
++	/* If there's an error determining the context, or it has none, 
++	   return to allow default context */
++	if (matchpathcon(path, st.st_mode, &scontext)) {
++		if (scontext == NULL && errno != ENOENT) 
++			rc =0;
++	} else 	{
++		rc = lsetfilecon_raw(path, scontext);
++		freecon(scontext);
++	}
++	set_matchpathcon_flags(localflags);
++	return rc;
++}
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.15/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
++++ libselinux-1.30.15/utils/matchpathcon.c	2006-06-20 11:30:26.000000000 -0400
+@@ -12,19 +12,43 @@
+ 	exit(1);
+ }
  
-+	if (! MLSENABLED) {
-+		*transp = strdup(raw);
-+		return 0;
++int printmatchpathcon(char *path, int header) {
++	char *buf;
++	int rc = matchpathcon(path, 0, &buf);
++	if (rc < 0) {
++		fprintf(stderr, "matchpathcon(%s) failed\n", path);
++		return 2;
 +	}
++	if (header)
++		printf("%s\t%s\n", path, buf);
++	else
++		printf("%s\n", buf);
++	
++	freecon(buf);
++	return 0;
++}
 +
- 	if (cache_trans) {
- 		if (prev_r2t_raw && strcmp(prev_r2t_raw, raw) == 0) {
- 			*transp=strdup(prev_r2t_trans);
+ int main(int argc, char **argv) 
+ {
+-	char *buf;
+-	int rc, i, init = 0;
++	int i, init = 0;
+ 	int header=1, opt;
++	int verify=0;
++	int notrans=0;
+ 
+ 	if (argc < 2) usage(argv[0]);
+ 
+-	while ((opt = getopt(argc, argv, "nf:p:")) > 0) {
++	while ((opt = getopt(argc, argv, "Nnf:p:V")) > 0) {
+ 		switch (opt) {
+ 		case 'n':
+ 			header=0;
+ 			break;
++		case 'V':
++			verify=1;
++			break;
++		case 'N':
++			notrans=1;
++			set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
++			break;
+ 		case 'f':
+ 			if (init) {
+ 				fprintf(stderr, "%s:  -f and -p are exclusive\n", argv[0]);
+@@ -54,17 +78,29 @@
+ 		}
+ 	}
+ 	for (i = optind; i < argc; i++) {
+-		rc = matchpathcon(argv[i], 0, &buf);
+-		if (rc < 0) {
+-			fprintf(stderr, "%s:  matchpathcon(%s) failed\n", argv[0], argv[i]);
+-			return 2;
+-		}
+-		if (header)
+-			printf("%s\t%s\n", argv[i], buf);
+-		else
+-			printf("%s\n", buf);
++		if (verify) {
++			if (selinux_verify_file_context(argv[i], 0)) {
++				printf("%s verified.\n", argv[i]);
++			} else {
++				security_context_t con;
++				int rc;
++				if (notrans) 
++					rc = lgetfilecon_raw(argv[i], &con);
++				else
++					rc = lgetfilecon(argv[i], &con);
+ 
+-		freecon(buf);
++				if (rc >= 0) {
++					printf("%s has context %s, should be ", argv[i], con);
++					printmatchpathcon(argv[i], 0);
++					freecon(con);
++				} else {
++					printf("actual context unknown: %s, should be ", strerror(errno));
++					printmatchpathcon(argv[i], 0);
++				}
++			}
++		} else {
++			printmatchpathcon(argv[i], header);
++		}
+ 	}
+ 	matchpathcon_fini();
+ 	return 0;


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- libselinux.spec	16 Jun 2006 19:16:03 -0000	1.204
+++ libselinux.spec	20 Jun 2006 20:30:59 -0000	1.205
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.15
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -115,6 +117,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-2
+- Add function to compare file context on disk versus contexts in file_contexts file.
+
 * Fri Jun 16 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-1
 - Upgrade to latest from NSA
 	* Merged patch from Dan Walsh with:



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:42:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:42:43 -0400
Subject: rpms/kernel/devel .cvsignore,1.456,1.457 sources,1.400,1.401
Message-ID: <200606202042.k5KKghMG008335@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8309

Modified Files:
	.cvsignore sources 
Log Message:
new files


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- .cvsignore	18 Jun 2006 04:24:51 -0000	1.456
+++ .cvsignore	20 Jun 2006 20:42:41 -0000	1.457
@@ -3,3 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
+patch-2.6.17-git1.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- sources	18 Jun 2006 04:24:53 -0000	1.400
+++ sources	20 Jun 2006 20:42:41 -0000	1.401
@@ -1,2 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
+4ec8c8c1e80bc41cef92e3769f6c4af8  patch-2.6.17-git1.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:46:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:46:34 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.142,1.143
Message-ID: <200606202046.k5KKkYIX018426@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17707

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gnome-applets.spec	20 Jun 2006 19:49:26 -0000	1.142
+++ gnome-applets.spec	20 Jun 2006 20:46:31 -0000	1.143
@@ -65,7 +65,7 @@
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
 BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
-BuildRequires:  pygobject >= %{pygobject_version}
+BuildRequires:  pygobject2-devel >= %{pygobject_version}
 BuildRequires:  gnome-python2 >= %{gnome_python_version}
 
 BuildRequires:  dbus-devel >= %{dbus_version}



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:47:02 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.31, 1.32 pykickstart.spec, 1.32,
	1.33 sources, 1.33, 1.34
Message-ID: <200606202047.k5KKl2SB022863@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9511

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	25 May 2006 20:12:34 -0000	1.31
+++ .cvsignore	20 Jun 2006 20:47:00 -0000	1.32
@@ -20,3 +20,4 @@
 pykickstart-0.28.tar.gz
 pykickstart-0.29.tar.gz
 pykickstart-0.30.tar.gz
+pykickstart-0.31.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pykickstart.spec	6 Jun 2006 13:58:23 -0000	1.32
+++ pykickstart.spec	20 Jun 2006 20:47:00 -0000	1.33
@@ -2,8 +2,8 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.30
-Release: 2
+Version: 0.31
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -39,6 +39,11 @@
 /usr/share/locale/*/*/*
 
 %changelog
+* Tue Jun 20 2006 Chris Lumens <clumens at redhat.com> 0.31-1
+- Handle nfs --opts (katzj).
+- RAID devices should be integers instead of strings (#176537).
+- Add initial support for iscsi (katzj).
+
 * Tue Jun 06 2006 Chris Lumens <clumens at redhat.com> 0.30-2
 - Add BuildRequires to fix building under mock (#194156,  Joost Soeterbroek
   <fedora AT soeterbroek.com>).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	6 Jun 2006 13:58:23 -0000	1.33
+++ sources	20 Jun 2006 20:47:00 -0000	1.34
@@ -1 +1 @@
-50b19bbc7281e0fe26e48308f3efab5d  pykickstart-0.30.tar.gz
+5cf3759c08c93a44fc8dd4db30e96a7b  pykickstart-0.31.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:48:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:48:22 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1644,1.1645
Message-ID: <200606202048.k5KKmMVd025147@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv25124

Modified Files:
	kernel-2.6.spec 
Log Message:
build fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1644
retrieving revision 1.1645
diff -u -r1.1644 -r1.1645
--- kernel-2.6.spec	20 Jun 2006 18:25:39 -0000	1.1644
+++ kernel-2.6.spec	20 Jun 2006 20:48:19 -0000	1.1645
@@ -179,7 +179,6 @@
 Source11: genkey
 
 Source20: kernel-%{kversion}-i586.config
-Source21: kernel-%{kversion}-i586-smp.config
 Source22: kernel-%{kversion}-i686.config
 Source23: kernel-%{kversion}-i686-smp.config
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 20:55:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 16:55:01 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1645,1.1646
Message-ID: <200606202055.k5KKt1M7027700@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27676

Modified Files:
	kernel-2.6.spec 
Log Message:
build fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1645
retrieving revision 1.1646
diff -u -r1.1645 -r1.1646
--- kernel-2.6.spec	20 Jun 2006 20:48:19 -0000	1.1645
+++ kernel-2.6.spec	20 Jun 2006 20:54:59 -0000	1.1646
@@ -173,7 +173,6 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source2: Config.mk
 
 Source10: COPYING.modules
 Source11: genkey



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:01:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:01:14 -0400
Subject: rpms/kernel/FC-4 linux-2.6-execshield.patch,1.7,1.8
Message-ID: <200606202101.k5KL1EG1029826@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29769

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
build fix

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h |    3 
 linux/arch/i386/kernel/asm-offsets.c          |    1 
 linux/arch/i386/kernel/cpu/common.c           |    7 
 linux/arch/i386/kernel/entry.S                |    8 -
 linux/arch/i386/kernel/process.c              |   59 ++++++++
 linux/arch/i386/kernel/signal.c               |    4 
 linux/arch/i386/kernel/smp.c                  |    3 
 linux/arch/i386/kernel/sysenter.c             |   81 +++++++++++
 linux/arch/i386/kernel/traps.c                |   93 ++++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S    |    6 
 linux/arch/i386/kernel/vsyscall.lds.S         |    4 
 linux/arch/i386/mm/init.c                     |    6 
 linux/arch/i386/mm/mmap.c                     |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c           |    2 
 linux/arch/powerpc/kernel/vdso.c              |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c          |    6 
 linux/arch/x86_64/ia32/syscall32.c            |    4 
 linux/arch/x86_64/kernel/process.c            |    6 
 linux/arch/x86_64/mm/fault.c                  |    2 
 linux/arch/x86_64/mm/mmap.c                   |   99 +++++++++++---
 linux/drivers/char/random.c                   |    7 
 linux/fs/binfmt_elf.c                         |  151 ++++++++++++++++-----
 linux/fs/proc/array.c                         |    8 -
 linux/fs/proc/base.c                          |    8 -
 linux/fs/proc/task_mmu.c                      |   34 +++-
 linux/include/asm-i386/a.out.h                |    2 
 linux/include/asm-i386/desc.h                 |   14 +
 linux/include/asm-i386/elf.h                  |   50 +++++--
 linux/include/asm-i386/mmu.h                  |    6 
 linux/include/asm-i386/page.h                 |    5 
 linux/include/asm-i386/pgalloc.h              |    1 
 linux/include/asm-i386/processor.h            |    8 -
 linux/include/asm-i386/thread_info.h          |    1 
 linux/include/asm-ia64/pgalloc.h              |    4 
 linux/include/asm-powerpc/pgalloc.h           |    5 
 linux/include/asm-ppc/pgalloc.h               |    5 
 linux/include/asm-s390/pgalloc.h              |    4 
 linux/include/asm-sparc/pgalloc.h             |    4 
 linux/include/asm-sparc64/pgalloc.h           |    4 
 linux/include/asm-x86_64/pgalloc.h            |    7 
 linux/include/linux/mm.h                      |   16 +-
 linux/include/linux/resource.h                |    5 
 linux/include/linux/sched.h                   |    9 +
 linux/include/linux/sysctl.h                  |    3 
 linux/kernel/signal.c                         |   38 +++++
 linux/kernel/sysctl.c                         |   57 ++++++++
 linux/mm/fremap.c                             |   16 +-
 linux/mm/mmap.c                               |  183 ++++++++++++++++++++++++--
 linux/mm/mprotect.c                           |    5 
 linux/mm/mremap.c                             |    4 
 50 files changed, 929 insertions(+), 138 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-execshield.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-execshield.patch	20 Jun 2006 18:25:40 -0000	1.7
+++ linux-2.6-execshield.patch	20 Jun 2006 21:01:12 -0000	1.8
@@ -1527,19 +1527,6 @@
  #define pmd_populate_kernel(mm, pmd, pte) \
  		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))
  #define pud_populate(mm, pud, pmd) \
-Index: linux/include/asm-x86_64/pgtable.h
-===================================================================
---- linux.orig/include/asm-x86_64/pgtable.h
-+++ linux/include/asm-x86_64/pgtable.h
-@@ -21,7 +21,7 @@ extern unsigned long __supported_pte_mas
- 
- #define swapper_pg_dir init_level4_pgt
- 
--extern int nonx_setup(char *str);
-+extern void nonx_setup(const char *str);
- extern void paging_init(void);
- extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
- 
 Index: linux/include/linux/mm.h
 ===================================================================
 --- linux.orig/include/linux/mm.h



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:06:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:06:34 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.10,
	1.11 selinux-policy.spec, 1.214, 1.215
Message-ID: <200606202106.k5KL6Y5i030228@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30180

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
- Update to upstream


policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    9 +
 modules/admin/consoletype.te       |    7 +
 modules/admin/logwatch.te          |    3 
 modules/admin/netutils.te          |    1 
 modules/admin/prelink.fc           |    3 
 modules/kernel/files.if            |   35 ++++++
 modules/kernel/filesystem.te       |    5 
 modules/kernel/kernel.if           |   38 ++++++
 modules/services/apache.fc         |    1 
 modules/services/apache.if         |   79 +++++++++++++-
 modules/services/apache.te         |   50 +++++++--
 modules/services/automount.te      |   13 ++
 modules/services/clamav.if         |   20 +++
 modules/services/cups.fc           |    1 
 modules/services/cups.if           |    2 
 modules/services/cups.te           |   10 +
 modules/services/hal.if            |   20 +++
 modules/services/mta.te            |    5 
 modules/services/networkmanager.te |    1 
 modules/services/ntp.te            |    1 
 modules/services/openvpn.te        |    3 
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.if        |   25 ++++
 modules/services/postfix.te        |    1 
 modules/services/ppp.te            |    1 
 modules/services/procmail.te       |    1 
 modules/services/tftp.te           |    1 
 modules/system/authlogin.if        |    1 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/init.te             |    1 
 modules/system/libraries.fc        |    2 
 modules/system/mount.te            |    1 
 modules/system/selinuxutil.te      |    2 
 modules/system/unconfined.fc       |    2 
 modules/system/userdomain.if       |  204 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 modules/system/xen.te              |   12 +-
 40 files changed, 518 insertions(+), 130 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policy-20060608.patch	20 Jun 2006 12:58:27 -0000	1.10
+++ policy-20060608.patch	20 Jun 2006 21:06:30 -0000	1.11
@@ -1,27 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/example.if serefpolicy-2.2.47/doc/example.if
---- nsaserefpolicy/doc/example.if	2006-02-01 10:22:19.000000000 -0500
-+++ serefpolicy-2.2.47/doc/example.if	2006-06-19 16:26:15.000000000 -0400
-@@ -25,7 +25,7 @@
- ## </param>
- #
- interface(`myapp_domtrans',`
--	gen_requires(`
-+	gen_require(`
- 		type myapp_t, myapp_exec_t;
- 	')
- 
-@@ -46,7 +46,7 @@
- ## </param>
- #
- interface(`myapp_read_log',`
--	gen_requires(`
-+	gen_require(`
- 		type myapp_log_t;
- 	')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.48/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/global_tunables	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/global_tunables	2006-06-20 10:16:12.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -36,9 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.48/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/bootloader.te	2006-06-20 10:16:12.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -73,9 +52,9 @@
 +optional_policy(`
 +	kudzu_domtrans(bootloader_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.48/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-20 10:16:12.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -90,9 +69,9 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.47/policy/modules/admin/logwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.48/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/logwatch.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/logwatch.te	2006-06-20 10:16:12.000000000 -0400
 @@ -22,8 +22,7 @@
  #
  # Local policy
@@ -103,9 +82,9 @@
  allow logwatch_t self:fifo_file rw_file_perms;
  allow logwatch_t self:unix_stream_socket create_stream_socket_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.48/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/netutils.te	2006-06-20 10:16:12.000000000 -0400
 @@ -54,6 +54,7 @@
  corenet_udp_sendrecv_all_ports(netutils_t)
  corenet_tcp_connect_all_ports(netutils_t)
@@ -114,9 +93,9 @@
  
  fs_getattr_xattr_fs(netutils_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.48/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/prelink.fc	2006-06-20 10:16:12.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -125,9 +104,9 @@
 -
  /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.48/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/files.if	2006-06-20 10:16:12.000000000 -0400
 @@ -1931,6 +1931,21 @@
  ')
  
@@ -174,9 +153,9 @@
 +	allow $1 { file_type -security_file_type }:file mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.47/policy/modules/kernel/filesystem.te
---- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/filesystem.te	2006-06-19 16:26:15.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.48/policy/modules/kernel/filesystem.te
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-20 09:54:01.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/filesystem.te	2006-06-20 10:16:12.000000000 -0400
 @@ -48,6 +48,11 @@
  files_mountpoint(binfmt_misc_fs_t)
  genfscon binfmt_misc / gen_context(system_u:object_r:binfmt_misc_fs_t,s0)
@@ -189,9 +168,9 @@
  type capifs_t;
  fs_type(capifs_t)
  genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.48/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-20 10:16:12.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -234,30 +213,54 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.47/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.48/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.fc	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.fc	2006-06-20 10:16:12.000000000 -0400
 @@ -78,3 +78,4 @@
  /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
  /usr/share/selinux-policy([^/]*)?/html(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
 +/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.47/policy/modules/services/apache.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.48/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.if	2006-06-19 16:26:15.000000000 -0400
-@@ -470,6 +470,11 @@
++++ serefpolicy-2.2.48/policy/modules/services/apache.if	2006-06-20 16:00:09.000000000 -0400
+@@ -15,6 +15,7 @@
+ 	gen_require(`
+ 		attribute httpdcontent;
+ 		attribute httpd_exec_scripts;
++		attribute httpd_script_exec_type;
+ 		type httpd_t, httpd_suexec_t, httpd_log_t;
+ 	')
+ 	# allow write access to public file transfer
+@@ -35,7 +36,7 @@
+ 	role system_r types httpd_$1_script_t;
+ 
+ 	# This type is used for executable scripts files
+-	type httpd_$1_script_exec_t; # customizable;
++	type httpd_$1_script_exec_t, httpd_script_exec_type; # customizable;
+ 	corecmd_shell_entry_type(httpd_$1_script_t)
+ 	domain_entry_file(httpd_$1_script_t,httpd_$1_script_exec_t)
+ 
+@@ -464,12 +465,17 @@
+ #
+ interface(`apache_manage_all_content',`
+ 	gen_require(`
+-		attribute httpdcontent;
++		attribute httpdcontent, httpd_script_exec_type;
+ 	')
+ 
  	allow $1 httpdcontent:dir manage_dir_perms;
  	allow $1 httpdcontent:file manage_file_perms;
  	allow $1 httpdcontent:lnk_file create_lnk_perms;
 +
-+	allow $1 httpd_sys_script_exec_t:dir manage_dir_perms;
-+	allow $1 httpd_sys_script_exec_t:file manage_file_perms;
-+	allow $1 httpd_sys_script_exec_t:lnk_file create_lnk_perms;
++	allow $1 httpd_script_exec_type:dir manage_dir_perms;
++	allow $1 httpd_script_exec_type:file manage_file_perms;
++	allow $1 httpd_script_exec_type:lnk_file create_lnk_perms;
 +
  ')
  
  ########################################
-@@ -515,6 +520,28 @@
+@@ -515,6 +521,28 @@
  
  ########################################
  ## <summary>
@@ -286,7 +289,7 @@
  ##	Execute the Apache helper program with
  ##	a domain transition.
  ## </summary>
-@@ -594,6 +621,28 @@
+@@ -594,6 +622,28 @@
  
  ########################################
  ## <summary>
@@ -315,7 +318,7 @@
  ##	Allow the specified domain to append
  ##	to apache log files.
  ## </summary>
-@@ -955,3 +1004,28 @@
+@@ -955,3 +1005,28 @@
  	allow $2 httpd_$1_content_t:file r_file_perms;
  	allow $2 httpd_$1_content_t:lnk_file { getattr read };
  ')
@@ -344,9 +347,9 @@
 +	allow httpd_rotatelogs_t $1:process sigchld;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-19 16:26:15.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.48/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-06-20 09:54:04.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.te	2006-06-20 10:16:12.000000000 -0400
 @@ -109,13 +109,10 @@
  type squirrelmail_spool_t;
  files_tmp_file(squirrelmail_spool_t)
@@ -381,7 +384,18 @@
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
-@@ -692,3 +698,29 @@
+@@ -600,6 +606,10 @@
+ 	allow httpd_sys_script_t httpd_suexec_t:process sigchld;
+ ')
+ 
++tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
++	domain_auto_trans(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
++')
++
+ tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
+ 	fs_read_nfs_files(httpd_suexec_t)
+ 	fs_read_nfs_symlinks(httpd_suexec_t)
+@@ -688,3 +698,29 @@
  optional_policy(`
  	nscd_socket_use(httpd_unconfined_script_t)
  ')
@@ -411,9 +425,9 @@
 +apache_domtrans_rotatelogs(httpd_sys_script_t)
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.48/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/automount.te	2006-06-20 10:16:12.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -444,9 +458,9 @@
  corecmd_exec_sbin(automount_t)
  corecmd_exec_bin(automount_t)
  corecmd_exec_shell(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.2.47/policy/modules/services/clamav.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.2.48/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/clamav.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/clamav.if	2006-06-20 10:16:12.000000000 -0400
 @@ -84,3 +84,23 @@
  	allow clamscan_t $1:process sigchld;
  ')
@@ -471,9 +485,9 @@
 +	allow $1 clamd_var_lib_t:dir search_dir_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.47/policy/modules/services/cups.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.48/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2006-04-19 11:26:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/cups.fc	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.fc	2006-06-20 10:16:12.000000000 -0400
 @@ -24,6 +24,7 @@
  
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
@@ -482,9 +496,9 @@
  /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
  /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.47/policy/modules/services/cups.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.48/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/services/cups.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.if	2006-06-20 10:16:12.000000000 -0400
 @@ -40,7 +40,7 @@
  
  	files_search_pids($1)
@@ -494,10 +508,10 @@
  	allow $1 cupsd_t:unix_stream_socket connectto;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.47/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-06-13 22:41:52.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/cups.te	2006-06-19 16:26:15.000000000 -0400
-@@ -298,6 +298,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.48/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-06-20 09:54:04.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.te	2006-06-20 10:37:06.000000000 -0400
+@@ -313,6 +313,7 @@
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_config_t self:tcp_socket create_stream_socket_perms;
@@ -505,7 +519,7 @@
  
  allow cupsd_config_t cupsd_t:tcp_socket { connectto recvfrom };
  allow cupsd_t cupsd_config_t:tcp_socket { acceptfrom recvfrom };
-@@ -332,6 +333,7 @@
+@@ -342,6 +343,7 @@
  allow cupsd_config_t cupsd_rw_etc_t:lnk_file create_lnk_perms;
  files_var_filetrans(cupsd_config_t,cupsd_rw_etc_t,file)
  
@@ -513,7 +527,7 @@
  allow cupsd_config_t cupsd_var_run_t:file { getattr read };
  
  kernel_read_system_state(cupsd_config_t)
-@@ -349,6 +351,7 @@
+@@ -357,6 +359,7 @@
  
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
@@ -521,7 +535,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -387,6 +390,9 @@
+@@ -395,6 +398,9 @@
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_sysadm_home_dirs(cupsd_config_t)
  
@@ -531,7 +545,7 @@
  lpd_read_config(cupsd_config_t)
  
  ifdef(`distro_redhat',`
-@@ -422,6 +428,7 @@
+@@ -430,6 +436,7 @@
  
  optional_policy(`
  	hal_domtrans(cupsd_config_t)
@@ -539,7 +553,7 @@
  ')
  
  optional_policy(`
-@@ -588,6 +595,7 @@
+@@ -593,6 +600,7 @@
  dev_read_sysfs(hplip_t)
  dev_rw_printer(hplip_t)
  dev_read_urand(hplip_t)
@@ -547,9 +561,18 @@
  dev_rw_generic_usb_dev(hplip_t)
  
  fs_getattr_all_fs(hplip_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.47/policy/modules/services/hal.if
+@@ -646,6 +654,8 @@
+ 	udev_read_db(hplip_t)
+ ')
+ 
++term_use_generic_ptys(hplip_t)
++
+ ########################################
+ #
+ # PTAL local policy
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.48/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/services/hal.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/hal.if	2006-06-20 10:16:13.000000000 -0400
 @@ -140,3 +140,23 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -574,9 +597,9 @@
 +	allow $1 hald_tmp_t:file r_file_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.47/policy/modules/services/mta.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.48/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/mta.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/mta.te	2006-06-20 10:16:13.000000000 -0400
 @@ -195,8 +195,3 @@
  	')
  ')
@@ -586,9 +609,9 @@
 -allow initrc_t etc_mail_t:dir rw_dir_perms;
 -allow initrc_t etc_mail_t:file create_file_perms;
 -')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.47/policy/modules/services/networkmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.48/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/networkmanager.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/networkmanager.te	2006-06-20 10:16:13.000000000 -0400
 @@ -92,6 +92,7 @@
  logging_send_syslog_msg(NetworkManager_t)
  
@@ -597,9 +620,9 @@
  
  modutils_domtrans_insmod(NetworkManager_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.48/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/ntp.te	2006-06-20 10:16:13.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -608,42 +631,10 @@
  
  corenet_non_ipsec_sendrecv(ntpd_t)
  corenet_tcp_sendrecv_all_if(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-2.2.47/policy/modules/services/openvpn.fc
---- nsaserefpolicy/policy/modules/services/openvpn.fc	2006-04-14 16:09:08.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/openvpn.fc	2006-06-19 16:26:15.000000000 -0400
-@@ -2,6 +2,7 @@
- # /etc
- #
- /etc/openvpn(/.*)?		gen_context(system_u:object_r:openvpn_etc_t,s0)
-+/etc/openvpn/openvpn-status.log	-- gen_context(system_u:object_r:openvpn_etc_rw_t,s0)
- 
- #
- # /usr
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.2.47/policy/modules/services/openvpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.2.48/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/openvpn.te	2006-06-19 16:26:15.000000000 -0400
-@@ -15,6 +15,10 @@
- type openvpn_etc_t;
- files_type(openvpn_etc_t)
- 
-+# configuration files
-+type openvpn_etc_rw_t;
-+files_type(openvpn_etc_rw_t)
-+
- # log files
- type openvpn_var_log_t;
- logging_log_file(openvpn_var_log_t)
-@@ -38,12 +42,17 @@
- allow openvpn_t openvpn_etc_t:file r_file_perms;
- allow openvpn_t openvpn_etc_t:lnk_file { getattr read };
- 
-+allow openvpn_t openvpn_etc_rw_t:file create_file_perms;
-+# Automatically label newly created files under /etc/openvpn with this type
-+type_transition openvpn_t openvpn_etc_t:file openvpn_etc_rw_t;
-+
- allow openvpn_t openvpn_var_log_t:file create_file_perms;
- logging_log_filetrans(openvpn_t,openvpn_var_log_t,file)
- 
++++ serefpolicy-2.2.48/policy/modules/services/openvpn.te	2006-06-20 10:37:57.000000000 -0400
+@@ -44,6 +44,7 @@
  allow openvpn_t openvpn_var_run_t:file create_file_perms;
  files_pid_filetrans(openvpn_t, openvpn_var_run_t, file)
  
@@ -651,7 +642,7 @@
  kernel_read_net_sysctls(openvpn_t)
  kernel_read_network_state(openvpn_t)
  kernel_read_system_state(openvpn_t)
-@@ -81,6 +90,8 @@
+@@ -81,6 +82,8 @@
  
  sysnet_exec_ifconfig(openvpn_t)
  
@@ -660,9 +651,9 @@
  optional_policy(`
  	daemontools_service_domain(openvpn_t,openvpn_exec_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.48/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-20 10:16:13.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -696,9 +687,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.48/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-20 10:16:13.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -715,9 +706,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.2.47/policy/modules/services/postfix.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.2.48/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/postfix.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/postfix.if	2006-06-20 10:16:13.000000000 -0400
 @@ -459,3 +459,28 @@
  
  	typeattribute $1 postfix_user_domtrans;
@@ -747,9 +738,9 @@
 +	allow postfix_smtp_t $1:fifo_file rw_file_perms;
 +	allow postfix_smtp_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.47/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.48/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/postfix.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/postfix.te	2006-06-20 10:16:13.000000000 -0400
 @@ -456,6 +456,7 @@
  ')
  
@@ -758,9 +749,9 @@
  	cron_use_fds(postfix_postdrop_t)
  	cron_rw_pipes(postfix_postdrop_t)
  	cron_use_system_job_fds(postfix_postdrop_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.47/policy/modules/services/ppp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.48/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ppp.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/ppp.te	2006-06-20 10:16:13.000000000 -0400
 @@ -68,6 +68,7 @@
  allow pppd_t self:tcp_socket create_stream_socket_perms;
  allow pppd_t self:udp_socket { connect connected_socket_perms };
@@ -769,9 +760,9 @@
  
  domain_auto_trans(pppd_t, pptp_exec_t, pptp_t)
  allow pppd_t pptp_t:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.47/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.48/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/procmail.te	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/procmail.te	2006-06-20 10:16:13.000000000 -0400
 @@ -78,6 +78,7 @@
  
  optional_policy(`
@@ -780,9 +771,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.47/policy/modules/services/tftp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.48/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/tftp.te	2006-06-20 07:50:40.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 10:16:13.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -791,21 +782,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-2.2.47/policy/modules/services/tor.if
---- nsaserefpolicy/policy/modules/services/tor.if	2006-03-07 13:08:46.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/services/tor.if	2006-06-19 16:26:15.000000000 -0400
-@@ -11,7 +11,7 @@
- ## </param>
- #
- interface(`tor_domtrans',`
--	gen_requires(`
-+	gen_require(`
- 		type tor_t, tor_exec_t;
- 	')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.47/policy/modules/system/authlogin.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.48/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/authlogin.if	2006-06-19 16:26:15.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/authlogin.if	2006-06-20 10:16:13.000000000 -0400
 @@ -1292,6 +1292,7 @@
  
  	sysnet_dns_name_resolve($1)
@@ -814,9 +793,9 @@
  
  	optional_policy(`
  		nis_use_ypbind($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.48/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-20 10:16:13.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -829,9 +808,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.47/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.48/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/init.if	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-20 10:16:13.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -846,9 +825,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.48/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/init.te	2006-06-20 10:16:13.000000000 -0400
 @@ -345,6 +345,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -857,9 +836,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.47/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.48/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/libraries.fc	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/libraries.fc	2006-06-20 10:16:13.000000000 -0400
 @@ -121,7 +121,7 @@
  
  /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -869,9 +848,9 @@
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.48/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/mount.te	2006-06-20 10:16:13.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -880,9 +859,9 @@
  	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.48/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-20 10:16:13.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -892,9 +871,9 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.48/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/unconfined.fc	2006-06-20 10:16:13.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -902,10 +881,305 @@
 +/usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-19 16:26:16.000000000 -0400
-@@ -4145,7 +4145,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.48/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-20 09:54:08.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-20 15:18:00.000000000 -0400
+@@ -8,11 +8,10 @@
+ ## <desc>
+ ##	<p>
+ ##	This template creates a user domain, types, and
+-##	rules for the user's tty, pty, home directories,
+-##	tmp, and tmpfs files.
++##	rules for the user's tty, pty, tmp, and tmpfs files.
+ ##	</p>
+ ##	<p>
+-##	This generally should not be used, rather the
++##	This should only be used for new non login user roles, rather the
+ ##	unpriv_user_template or admin_user_template should
+ ##	be used.
+ ##	</p>
+@@ -25,7 +24,9 @@
+ ## </param>
+ #
+ template(`base_user_template',`
+-
++	gen_require(`
++		attribute userdomain, unpriv_userdomain;
++	')
+ 	attribute $1_file_type;
+ 
+ 	type $1_t, userdomain;
+@@ -42,44 +43,17 @@
+ 	term_user_pty($1_t,$1_devpts_t)
+ 	files_type($1_devpts_t)
+ 
+-	# type for contents of home directory
+-	type $1_home_t, $1_file_type, home_type;
+-	files_type($1_home_t)
+-	files_associate_tmp($1_home_t)
+-	fs_associate_tmpfs($1_home_t)
+-
+-	# type of home directory
+-	type $1_home_dir_t, home_dir_type, home_type;
+-	files_type($1_home_dir_t)
+-	files_associate_tmp($1_home_dir_t)
+-	fs_associate_tmpfs($1_home_dir_t)
+-
+ 	type $1_tmp_t, $1_file_type;
+ 	files_tmp_file($1_tmp_t)
+ 
+ 	type $1_tmpfs_t;
+ 	files_tmpfs_file($1_tmpfs_t)
+ 
+-	# types for network-obtained content
+-	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
+-	files_type($1_untrusted_content_t)
+-	files_poly_member($1_untrusted_content_t)
+-
+-	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
+-	files_tmp_file($1_untrusted_content_tmp_t)
+-
+ 	type $1_tty_device_t; 
+ 	term_tty($1_t,$1_tty_device_t)
+ 
+ 	##############################
+ 	#
+-	# User home directory file rules
+-	#
+-
+-	allow $1_file_type $1_home_t:filesystem associate;
+-
+-	##############################
+-	#
+ 	# User domain Local policy
+ 	#
+ 
+@@ -103,19 +77,6 @@
+ 	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
+ 	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
+ 
+-	# execute files in the home directory
+-	can_exec($1_t,$1_home_t)
+-
+-	# full control of the home directory
+-	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
+-	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
+-	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
+-	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
+-	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
+-	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
+-	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
+-	files_search_home($1_t)
+-
+ 	can_exec($1_t,$1_tmp_t)
+ 
+ 	# user temporary files
+@@ -138,13 +99,13 @@
+ 	fs_tmpfs_filetrans($1_t,$1_tmpfs_t, { dir notdevfile_class_set } )
+ 
+ 	allow $1_t $1_tty_device_t:chr_file { setattr rw_file_perms };
+-
+-	# Allow user to relabel untrusted content
+-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
+-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
++	allow $1_t $1_devpts_t:chr_file { setattr rw_file_perms };
++	term_create_pty($1_t,$1_devpts_t)
+ 
+ 	allow $1_t unpriv_userdomain:fd use;
+ 
++	kernel_read_system_state($1_t)
++	kernel_read_network_state($1_t)
+ 	kernel_read_kernel_sysctls($1_t)
+ 	kernel_read_net_sysctls($1_t)
+ 	kernel_dontaudit_list_unlabeled($1_t)
+@@ -165,8 +126,10 @@
+ 
+ 	corenet_non_ipsec_sendrecv($1_t)
+ 	corenet_tcp_sendrecv_all_if($1_t)
++	corenet_raw_sendrecv_all_if($1_t)
+ 	corenet_udp_sendrecv_all_if($1_t)
+ 	corenet_tcp_sendrecv_all_nodes($1_t)
++	corenet_raw_sendrecv_all_nodes($1_t)
+ 	corenet_udp_sendrecv_all_nodes($1_t)
+ 	corenet_tcp_sendrecv_all_ports($1_t)
+ 	corenet_udp_sendrecv_all_ports($1_t)
+@@ -234,6 +197,10 @@
+ 	files_dontaudit_getattr_non_security_sockets($1_t)
+ 	files_dontaudit_getattr_non_security_blk_files($1_t)
+ 	files_dontaudit_getattr_non_security_chr_files($1_t)
++	files_read_etc_files($1_t)
++	files_read_etc_runtime_files($1_t)
++	files_read_usr_files($1_t)
++	files_exec_usr_files($1_t)
+ 
+ 	# Caused by su - init scripts
+ 	init_dontaudit_use_script_ptys($1_t)
+@@ -254,16 +221,86 @@
+ 	seutil_read_default_contexts($1_t)
+ 	seutil_run_newrole($1_t,$1_r,{ $1_devpts_t $1_tty_device_t })
+ 
+-	tunable_policy(`allow_execmem',`
+-		# Allow loading DSOs that require executable stack.
+-		allow $1_t self:process execmem;
+-	')
++')
++#######################################
++## <summary>
++##	The template containing rules common to unprivileged
++##	users and administrative users.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a user home directories,
++##	</p>
++##	<p>
++##	This generally should not be used, rather the
++##	unpriv_user_template or admin_user_template should
++##	be used.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++#
++template(`base_login_user_template',`
+ 
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1_t self:process execstack;
++	gen_require(`
++		attribute $1_file_type;
++		attribute home_dir_type, home_type;
++		attribute untrusted_content_type;
+ 	')
+ 
++	# type for contents of home directory
++	type $1_home_t, $1_file_type, home_type;
++	files_type($1_home_t)
++	files_associate_tmp($1_home_t)
++	fs_associate_tmpfs($1_home_t)
++
++	# type of home directory
++	type $1_home_dir_t, home_dir_type, home_type;
++	files_type($1_home_dir_t)
++	files_associate_tmp($1_home_dir_t)
++	fs_associate_tmpfs($1_home_dir_t)
++
++	# types for network-obtained content
++	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
++	files_type($1_untrusted_content_t)
++	files_poly_member($1_untrusted_content_t)
++
++	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
++	files_tmp_file($1_untrusted_content_tmp_t)
++
++	##############################
++	#
++	# User home directory file rules
++	#
++
++	allow $1_file_type $1_home_t:filesystem associate;
++
++	##############################
++	#
++	# User domain Local policy
++	#
++
++	# execute files in the home directory
++	can_exec($1_t,$1_home_t)
++
++	# full control of the home directory
++	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
++	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
++	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
++	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
++	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
++	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
++	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
++	files_search_home($1_t)
++
++	# Allow user to relabel untrusted content
++	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
++	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
++
+ 	tunable_policy(`read_default_t',`
+ 		files_list_default($1_t)
+ 		files_read_default_files($1_t)
+@@ -501,6 +538,7 @@
+ 
+ 	# Inherit rules for ordinary users.
+ 	base_user_template($1)
++	base_login_user_template($1)
+ 
+ 	typeattribute $1_t unpriv_userdomain;
+ 	domain_interactive_fd($1_t)
+@@ -521,9 +559,6 @@
+ 	# Local policy
+ 	#
+ 
+-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
+-	term_create_pty($1_t,$1_devpts_t)
+-
+ 	# Rules used to associate a homedir as a mountpoint
+ 	allow $1_home_t self:filesystem associate;
+ 	allow $1_file_type $1_home_t:filesystem associate;
+@@ -535,10 +570,6 @@
+ 	allow privhome $1_home_t:sock_file create_file_perms;
+ 	allow privhome $1_home_t:fifo_file create_file_perms;
+ 	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
+-
+-	kernel_read_system_state($1_t)
+-	kernel_read_network_state($1_t)
+-
+ 	dev_read_sysfs($1_t)
+ 
+ 	corecmd_exec_all_executables($1_t)
+@@ -546,11 +577,8 @@
+ 	# port access is audited even if dac would not have allowed it, so dontaudit it here
+ 	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
+ 
+-	files_read_etc_files($1_t)
+-	files_read_etc_runtime_files($1_t)
++
+ 	files_list_home($1_t)
+-	files_read_usr_files($1_t)
+-	files_exec_usr_files($1_t)
+ 	# Read directories and files with the readable_t type.
+ 	# This type is a general type for "world"-readable files.
+ 	files_list_world_readable($1_t)
+@@ -558,8 +586,6 @@
+ 	files_read_world_readable_symlinks($1_t)
+ 	files_read_world_readable_pipes($1_t)
+ 	files_read_world_readable_sockets($1_t)
+-	# cjp: why?
+-	files_read_kernel_symbol_table($1_t)
+ 
+ 	init_read_utmp($1_t)
+ 	# The library functions always try to open read-write first,
+@@ -748,6 +774,7 @@
+ 
+ 	# Inherit rules for ordinary users.
+ 	base_user_template($1)
++	base_login_user_template($1)
+ 
+ 	typeattribute $1_t privhome;
+ 	domain_obj_id_change_exemption($1_t)
+@@ -783,11 +810,6 @@
+ 
+ 	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
+ 
+-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
+-	term_create_pty($1_t,$1_devpts_t)
+-
+-	kernel_read_system_state($1_t)
+-	kernel_read_network_state($1_t)
+ 	kernel_read_software_raid_state($1_t)
+ 	kernel_getattr_core_if($1_t)
+ 	kernel_getattr_message_if($1_t)
+@@ -4128,7 +4150,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -914,30 +1188,112 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.47/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/xen.if	2006-06-19 16:26:16.000000000 -0400
-@@ -11,7 +11,7 @@
- ## </param>
+@@ -4767,3 +4789,37 @@
+ 	allow $1 user_home_dir_t:dir create_dir_perms;
+ 	files_home_filetrans($1,user_home_dir_t,dir)
+ ')
++
++########################################
++## <summary>
++##	The template containing rules for changing from one role to another
++## </summary>
++## <desc>
++##	<p>
++##	This should only be used for new non login user roles, rather the
++##	unpriv_user_template or admin_user_template should
++##	be used.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	userdomain changing from 
++##	</summary>
++## </param>
++## <summary>
++##	Unconfined access to user domains.
++## </summary>
++## <param name="userdomain_prefix">
++##	<summary>
++##	userdomain changing to
++##	</summary>
++## </param>
++#
++template(`role_change_template',`
++        allow $1_r $2_r;
++        type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
++        type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
++        # avoid annoying messages on terminal hangup
++        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.48/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-13 07:03:49.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-20 15:04:12.000000000 -0400
+@@ -56,14 +56,6 @@
+ # Local policy
  #
- interface(`xen_domtrans',`
--	gen_requires(`
-+	gen_require(`
- 		type xend_t, xend_exec_t;
+ 
+-define(`role_change',`
+-	allow $1_r $2_r;
+-	type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
+-	type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
+-	# avoid annoying messages on terminal hangup
+-	dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
+-')
+-
+ ifdef(`targeted_policy',`
+ 	# Define some type aliases to help with compatibility with
+ 	# macros and domains from the "strict" policy.
+@@ -124,34 +116,34 @@
+ 
+ 	# user role change rules:
+ 	# sysadm_r can change to user roles
+-	role_change(sysadm, user)
+-	role_change(sysadm, staff)
++	role_change_template(sysadm, user)
++	role_change_template(sysadm, staff)
+ 
+ 	# only staff_r can change to sysadm_r
+-	role_change(staff, sysadm)
++	role_change_template(staff, sysadm)
+ 
+ 	ifdef(`enable_mls',`
+ 		unpriv_user_template(secadm)
+ 		unpriv_user_template(auditadm)
+ 
+-		role_change(staff,auditadm)
+-		role_change(staff,secadm)
++		role_change_template(staff,auditadm)
++		role_change_template(staff,secadm)
+ 
+-		role_change(sysadm,secadm)
+-		role_change(sysadm,auditadm)
++		role_change_template(sysadm,secadm)
++		role_change_template(sysadm,auditadm)
+ 
+-		role_change(auditadm,secadm)
+-		role_change(auditadm,sysadm)
++		role_change_template(auditadm,secadm)
++		role_change_template(auditadm,sysadm)
+ 
+-		role_change(secadm,auditadm)
+-		role_change(secadm,sysadm)
++		role_change_template(secadm,auditadm)
++		role_change_template(secadm,sysadm)
  	')
  
-@@ -118,7 +118,7 @@
- ## </param>
- #
- interface(`xen_domtrans_xm',`
--	gen_requires(`
-+	gen_require(`
- 		type xm_t, xm_exec_t;
+ 	# this should be tunable_policy, but
+ 	# currently type_change and RBAC allow
+ 	# do not work in conditionals
+ 	ifdef(`user_canbe_sysadm',`
+-		role_change(user,sysadm)
++		role_change_template(user,sysadm)
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.47/policy/modules/system/xen.te
+ 	allow privhome home_root_t:dir { getattr search };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.48/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/xen.te	2006-06-19 16:26:16.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/xen.te	2006-06-20 10:16:13.000000000 -0400
 @@ -68,7 +68,8 @@
  # xend local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- selinux-policy.spec	20 Jun 2006 12:59:02 -0000	1.214
+++ selinux-policy.spec	20 Jun 2006 21:06:31 -0000	1.215
@@ -11,12 +11,12 @@
 %define BUILD_MLS 1
 %endif
 %define POLICYVER 20
-%define POLICYCOREUTILSVER 1.30.8-1
+%define POLICYCOREUTILSVER 1.30.14-3
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.47
-Release: 5
+Version: 2.2.48
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -131,7 +131,6 @@
 %define saveFileContext() \
 if [ -s /etc/selinux/config ]; then \
 	. %{_sysconfdir}/selinux/config; \
-	restorecon -R %{_sysconfdir}/selinux/%1; \
 	FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
 	if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
 		cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
@@ -342,6 +341,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
+- Update to upstream
+
 * Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-5
 - Break out selinux-devel package
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:15:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:15:13 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.215,1.216
Message-ID: <200606202115.k5KLFDMc032295@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32268

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-2
- Fix requires



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- selinux-policy.spec	20 Jun 2006 21:06:31 -0000	1.215
+++ selinux-policy.spec	20 Jun 2006 21:15:11 -0000	1.216
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.48
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -54,7 +54,8 @@
 %package devel
 Summary: SELinux policy development
 Group: System Environment/Base
-Requires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
+Prereq: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
+Prereq: selinux-policy = %{version}-%{release}
 
 %description devel
 SELinux Policy development package
@@ -341,6 +342,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-2
+- Fix requires
+
 * Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:17:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:17:14 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.216,1.217
Message-ID: <200606202117.k5KLHEuH013329@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12698

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
- Update to upstream



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- selinux-policy.spec	20 Jun 2006 21:15:11 -0000	1.216
+++ selinux-policy.spec	20 Jun 2006 21:17:11 -0000	1.217
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.48
-Release: 2
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -342,9 +342,6 @@
 %endif
 
 %changelog
-* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-2
-- Fix requires
-
 * Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:18:44 -0400
Subject: rpms/vim/devel 7.0.022,NONE,1.1
Message-ID: <200606202118.k5KLIiVp015655@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15509

Added Files:
	7.0.022 
Log Message:
Using buffer.append() in Ruby may append the line to the wrong
buffer. (Alex Norman)



--- NEW FILE 7.0.022 ---
To: vim-dev at vim.org
Subject: Patch 7.0.022
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.022
Problem:    Using buffer.append() in Ruby may append the line to the wrong
	    buffer. (Alex Norman)
Solution:   Properly switch to the buffer to do the appending.  Also for
	    buffer.delete() and setting a buffer line.
Files:	    src/if_ruby.c


*** ../vim-7.0.021/src/if_ruby.c	Sun Apr 30 20:25:42 2006
--- src/if_ruby.c	Tue Jun 20 21:01:23 2006
***************
*** 643,653 ****
  
  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
  {
!     buf_T *savebuf = curbuf;
!     char *line = STR2CSTR(str);
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
  	curbuf = buf;
  	if (u_savesub(n) == OK) {
  	    ml_replace(n, (char_u *)line, TRUE);
  	    changed();
--- 643,665 ----
  
  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
  {
!     char	*line = STR2CSTR(str);
! #ifdef FEAT_AUTOCMD
!     aco_save_T	aco;
! #else
!     buf_T	*save_curbuf = curbuf;
! #endif
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
!     {
! #ifdef FEAT_AUTOCMD
! 	/* set curwin/curbuf for "buf" and save some things */
! 	aucmd_prepbuf(&aco, buf);
! #else
  	curbuf = buf;
+ 	curwin->w_buffer = buf;
+ #endif
+ 
  	if (u_savesub(n) == OK) {
  	    ml_replace(n, (char_u *)line, TRUE);
  	    changed();
***************
*** 655,664 ****
  	    syn_changed(n); /* recompute syntax hl. for this line */
  #endif
  	}
! 	curbuf = savebuf;
  	update_curbuf(NOT_VALID);
      }
!     else {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
  	return Qnil; /* For stop warning */
      }
--- 667,685 ----
  	    syn_changed(n); /* recompute syntax hl. for this line */
  #endif
  	}
! 
! #ifdef FEAT_AUTOCMD
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
! 	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
!     else
!     {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
  	return Qnil; /* For stop warning */
      }
***************
*** 676,687 ****
  
  static VALUE buffer_delete(VALUE self, VALUE num)
  {
!     buf_T *buf = get_buf(self);
!     buf_T *savebuf = curbuf;
!     long n = NUM2LONG(num);
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count) {
  	curbuf = buf;
  	if (u_savedel(n, 1) == OK) {
  	    ml_delete(n, 0);
  
--- 697,720 ----
  
  static VALUE buffer_delete(VALUE self, VALUE num)
  {
!     buf_T	*buf = get_buf(self);
!     long	n = NUM2LONG(num);
! #ifdef FEAT_AUTOCMD
!     aco_save_T	aco;
! #else
!     buf_T	*save_curbuf = curbuf;
! #endif
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count)
!     {
! #ifdef FEAT_AUTOCMD
! 	/* set curwin/curbuf for "buf" and save some things */
! 	aucmd_prepbuf(&aco, buf);
! #else
  	curbuf = buf;
+ 	curwin->w_buffer = buf;
+ #endif
+ 
  	if (u_savedel(n, 1) == OK) {
  	    ml_delete(n, 0);
  
***************
*** 691,700 ****
  
  	    changed();
  	}
! 	curbuf = savebuf;
  	update_curbuf(NOT_VALID);
      }
!     else {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
      }
      return Qnil;
--- 724,742 ----
  
  	    changed();
  	}
! 
! #ifdef FEAT_AUTOCMD
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
! 	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
!     else
!     {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
      }
      return Qnil;
***************
*** 702,714 ****
  
  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
  {
!     buf_T *buf = get_buf(self);
!     buf_T *savebuf = curbuf;
!     char *line = STR2CSTR(str);
!     long n = NUM2LONG(num);
  
!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
  	curbuf = buf;
  	if (u_inssub(n + 1) == OK) {
  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
  
--- 744,768 ----
  
  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
  {
!     buf_T	*buf = get_buf(self);
!     char	*line = STR2CSTR(str);
!     long	n = NUM2LONG(num);
! #ifdef FEAT_AUTOCMD
!     aco_save_T	aco;
! #else
!     buf_T	*save_curbuf = curbuf;
! #endif
  
!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
!     {
! #ifdef FEAT_AUTOCMD
! 	/* set curwin/curbuf for "buf" and save some things */
! 	aucmd_prepbuf(&aco, buf);
! #else
  	curbuf = buf;
+ 	curwin->w_buffer = buf;
+ #endif
+ 
  	if (u_inssub(n + 1) == OK) {
  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
  
***************
*** 718,724 ****
  
  	    changed();
  	}
! 	curbuf = savebuf;
  	update_curbuf(NOT_VALID);
      }
      else {
--- 772,786 ----
  
  	    changed();
  	}
! 
! #ifdef FEAT_AUTOCMD
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
! 	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
      else {
*** ../vim-7.0.021/src/version.c	Tue Jun 20 20:49:42 2006
--- src/version.c	Tue Jun 20 18:42:35 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     22,
  /**/



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:20:49 -0400
Subject: rpms/vim/devel README.patches,1.48,1.49 vim.spec,1.123,1.124
Message-ID: <200606202120.k5KLKngp016395@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16294

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 22


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- README.patches	20 Jun 2006 16:01:17 -0000	1.48
+++ README.patches	20 Jun 2006 21:20:46 -0000	1.49
@@ -46,3 +46,4 @@
   1425  7.0.019  crash for "VjA789" and repeating
   1470  7.0.020  GUI: crash when using 'mousefocus'
   4240  7.0.021  crash when using "\\[" and "\\]" in 'errorformat
+  5471  7.0.022  Ruby: buffer.append() could append to the wrong buffer


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- vim.spec	20 Jun 2006 16:01:17 -0000	1.123
+++ vim.spec	20 Jun 2006 21:20:46 -0000	1.124
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 021
+%define patchlevel 022
 
 Summary: The VIM editor.
 Name: vim
@@ -75,6 +75,7 @@
 Patch019: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.019
 Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
 Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
+Patch022: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.022
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -227,6 +228,7 @@
 %patch019 -p0
 %patch020 -p0
 %patch021 -p0
+%patch022 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -563,8 +565,8 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.021-1
-- patchlevel 21
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-1
+- patchlevel 22
 
 * Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.020-1
 - patchlevel 20



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:23:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:23:11 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.47,
	1.48 java-1.4.2-gcj-compat.spec, 1.152, 1.153 sources, 1.51, 1.52
Message-ID: <200606202123.k5KLNBnK017246@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17126

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Tue Jun 20 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_87rh
- Make com.sun.tools.javac.Main.compile method static.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	2 Feb 2006 19:28:51 -0000	1.47
+++ .cvsignore	20 Jun 2006 21:23:09 -0000	1.48
@@ -1,3 +1 @@
-bcprov-jdk14-131.tar.gz
-eclipse-ecj-3.1.0_fc-12.jar
-java-gcj-compat-1.0.52.tar.gz
+java-gcj-compat-static-compile.patch


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- java-1.4.2-gcj-compat.spec	19 Jun 2006 21:08:23 -0000	1.152
+++ java-1.4.2-gcj-compat.spec	20 Jun 2006 21:23:09 -0000	1.153
@@ -14,7 +14,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_86rh
+%define release 	40jpp_87rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 %define bcfullver	1.31
@@ -40,6 +40,7 @@
 Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
 Source2:	eclipse-ecj-3.1.0_fc-12.jar
 Source3:	ecj.sh.in
+Patch0:		java-gcj-compat-static-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
@@ -126,6 +127,7 @@
 
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
+%patch0 -p1
 
 %build
 %if %{custom}
@@ -587,6 +589,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Tue Jun 20 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_87rh
+- Make com.sun.tools.javac.Main.compile method static.
+
 * Mon Jun 19 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_86rh
 - Provide jdbc-stdext.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	2 Feb 2006 19:28:51 -0000	1.51
+++ sources	20 Jun 2006 21:23:09 -0000	1.52
@@ -1,3 +1 @@
-830237b359ad7245ec67a972e58ac098  bcprov-jdk14-131.tar.gz
-95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
-40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz
+43d63ac889427a0f2d79fe7994180996  java-gcj-compat-static-compile.patch



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:44:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:44:14 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.48, 1.49 sources,
	1.52, 1.53
Message-ID: <200606202144.k5KLiEXZ030536@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30517

Modified Files:
	.cvsignore sources 
Log Message:
	* sources: Update.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	20 Jun 2006 21:23:09 -0000	1.48
+++ .cvsignore	20 Jun 2006 21:44:09 -0000	1.49
@@ -1 +1,5 @@
+java-gcj-compat-1.0.52.tar.gz
+bcprov-jdk14-131.tar.gz
+ecj.sh.in
+eclipse-ecj-3.1.0_fc-12.jar
 java-gcj-compat-static-compile.patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	20 Jun 2006 21:23:09 -0000	1.52
+++ sources	20 Jun 2006 21:44:12 -0000	1.53
@@ -1 +1,5 @@
+40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz
+830237b359ad7245ec67a972e58ac098  bcprov-jdk14-131.tar.gz
+e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
+95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
 43d63ac889427a0f2d79fe7994180996  java-gcj-compat-static-compile.patch



From fedora-cvs-commits at redhat.com  Tue Jun 20 21:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 17:48:19 -0400
Subject: rpms/eclipse-changelog/devel .cvsignore, 1.3,
	1.4 eclipse-changelog.spec, 1.35, 1.36 sources, 1.8, 1.9
Message-ID: <200606202148.k5KLmJDI007267@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6713

Modified Files:
	.cvsignore eclipse-changelog.spec sources 
Log Message:
* Tue Jun 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-1
- Updated to version 2.1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 May 2006 20:26:18 -0000	1.3
+++ .cvsignore	20 Jun 2006 21:48:13 -0000	1.4
@@ -1 +1 @@
-eclipse-changelog-fetched-2.0.4.tar.gz
+eclipse-changelog-fetched-2.1.0.tar.gz


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- eclipse-changelog.spec	14 Jun 2006 14:32:35 -0000	1.35
+++ eclipse-changelog.spec	20 Jun 2006 21:48:14 -0000	1.36
@@ -5,9 +5,9 @@
 %define section			free
 %define eclipse_name 		eclipse
 %define	changelog_major		2
-%define changelog_minor		0
+%define changelog_minor		1
 %define changelog_majmin	%{changelog_major}.%{changelog_minor}
-%define changelog_micro   	4
+%define changelog_micro   	0
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        4
+Release:        1
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-1
+- Updated to version 2.1.0.
+
 * Wed Jun 14 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-4
 - Require eclipse 3.2.0.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 May 2006 20:26:18 -0000	1.8
+++ sources	20 Jun 2006 21:48:14 -0000	1.9
@@ -1 +1 @@
-8d4476428f19cf5437fd81c56897e059  eclipse-changelog-fetched-2.0.4.tar.gz
+b1c2a74e300880c29d896502160432aa  eclipse-changelog-fetched-2.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:07:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:07:21 -0400
Subject: rpms/xen/FC-5 xen-config-dom0-minmem.patch, NONE, 1.1 .cvsignore,
	1.16, 1.17 sources, 1.31, 1.32 xen-initscript.patch, 1.1,
	1.2 xen.spec, 1.111, 1.112 xen-3.0.1-config-allow-http.patch,
	1.1, NONE xen-3.0.1-m64.patch, 1.1, NONE xen-blchanges.patch,
	1.2, NONE xen-compile-fixes.patch, 1.1,
	NONE xen-dom0-minmem.patch, 1.2, NONE xen-kva-mmap.patch, 1.1,
	NONE xen-misc-fixes.patch, 1.23, NONE
Message-ID: <200606202207.k5KM7Kp1013330@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/xen/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13316

Modified Files:
	.cvsignore sources xen-initscript.patch xen.spec 
Added Files:
	xen-config-dom0-minmem.patch 
Removed Files:
	xen-3.0.1-config-allow-http.patch xen-3.0.1-m64.patch 
	xen-blchanges.patch xen-compile-fixes.patch 
	xen-dom0-minmem.patch xen-kva-mmap.patch xen-misc-fixes.patch 
Log Message:
Update to xen-unstable cset 10278 (from rawhide) to enable kernel rebase


xen-config-dom0-minmem.patch:
 xend-config.sxp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-config-dom0-minmem.patch ---
--- xen-3.0.0/tools/examples/xend-config.sxp.min	2005-12-06 15:05:29.000000000 +0100
+++ xen-3.0.0/tools/examples/xend-config.sxp	2005-12-06 20:33:21.000000000 +0100
@@ -105,7 +105,7 @@
 # Dom0 will balloon out when needed to free memory for domU.
 # dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
 # If dom0-min-mem=0, dom0 will never balloon out.
-(dom0-min-mem 196)
+(dom0-min-mem 256)
 
 # In SMP system, dom0 will use dom0-cpus # of CPUS
 # If dom0-cpus = 0, dom0 will take all cpus available


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	28 Apr 2006 17:40:42 -0000	1.16
+++ .cvsignore	20 Jun 2006 22:07:17 -0000	1.17
@@ -1,2 +1,2 @@
 LibVNCServer-0.7.1.tar.gz
-xen-3.0.2-src.tgz
+xen-unstable-10278.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	28 Apr 2006 17:40:42 -0000	1.31
+++ sources	20 Jun 2006 22:07:17 -0000	1.32
@@ -1,2 +1,2 @@
 54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-ae26a3f51b2d94aca17fbe4df68fdc1d  xen-3.0.2-src.tgz
+3a9ceecf483dad0a29364b73b445636c  xen-unstable-10278.tar.bz2

xen-initscript.patch:
 xend |   42 +++++++++++!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 1 files changed, 11 insertions(+), 31 modifications(!)

Index: xen-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-initscript.patch	9 Sep 2005 03:27:15 -0000	1.1
+++ xen-initscript.patch	20 Jun 2006 22:07:17 -0000	1.2
@@ -1,37 +1,120 @@
---- xen-unstable/tools/examples/init.d/xend.path	2005-09-08 10:41:54.000000000 -0400
-+++ xen-unstable/tools/examples/init.d/xend	2005-09-08 10:43:03.000000000 -0400
-@@ -16,28 +16,28 @@
- {
- 	i=1
- 	rets=10
--	xend status
-+	/usr/sbin/xend status
- 	while [ $? -ne 0 -a $i -lt $rets ]; do
- 	    sleep 1
- 	    echo -n .
- 	    i=$(($i + 1))
--	    xend status
-+	    /usr/sbin/xend status
- 	done
- }
- 
- case "$1" in
-   start)
--	xend start
-+	/usr/sbin/xend start
- 	await_daemons_up
- 	;;
-   stop)
--	xend stop
-+	/usr/sbin/xend stop
- 	;;
-   status)
--	xend status
-+	/usr/sbin/xend status
- 	;;
-   restart|reload|force-reload)
--	xend restart
-+	/usr/sbin/xend restart
- 	await_daemons_up
- 	;;
-   *)
+*** xen-unstable/tools/examples/init.d/xend.orig	2006-06-12 17:10:53.000000000 +0200
+--- xen-unstable/tools/examples/init.d/xend	2006-06-12 17:11:22.000000000 +0200
+***************
+*** 7,43 ****
+  # chkconfig: 2345 98 01
+  # description: Starts and stops the Xen control daemon.
+  
+  if ! grep -q "control_d" /proc/xen/capabilities ; then
+  	exit 0
+  fi
+  
+  # Wait for Xend to be up
+  function await_daemons_up
+  {
+  	i=1
+  	rets=10
+! 	xend status
+  	while [ $? -ne 0 -a $i -lt $rets ]; do
+  	    sleep 1
+  	    echo -n .
+  	    i=$(($i + 1))
+! 	    xend status
+  	done
+  }
+  
+  case "$1" in
+    start)
+! 	xend start
+  	await_daemons_up
+  	;;
+    stop)
+! 	xend stop
+  	;;
+    status)
+! 	xend status
+  	;;
+    restart|reload|force-reload)
+! 	xend restart
+  	await_daemons_up
+  	;;
+    *)
+--- 7,64 ----
+  # chkconfig: 2345 98 01
+  # description: Starts and stops the Xen control daemon.
+  
++ # Source function library.
++ . /etc/rc.d/init.d/functions
++ 
++ RETVAL=0
+  if ! grep -q "control_d" /proc/xen/capabilities ; then
++         RETVAL=-1
+  	exit 0
+  fi
++ prog=xend
+  
+  # Wait for Xend to be up
+  function await_daemons_up
+  {
+  	i=1
+  	rets=10
+! 	/usr/sbin/xend status
+  	while [ $? -ne 0 -a $i -lt $rets ]; do
+  	    sleep 1
+  	    echo -n .
+  	    i=$(($i + 1))
+! 	    /usr/sbin/xend status
+  	done
++         if [ $i -ge $rets ]; then
++             RETVAL=-1
++             return 1
++         fi
++         return 0
+  }
+  
+  case "$1" in
+    start)
+! 	echo -n $"Starting $prog: "
+! 	/usr/sbin/xend start
+  	await_daemons_up
+  	;;
+    stop)
+! 	echo -n $"Stopping $prog: "
+! 	/usr/sbin/xend stop
+!         RETVAL=$?
+  	;;
+    status)
+! 	/usr/sbin/xend status
+! 	if [ $? = 0 ] ; then
+! 	    echo xend is running
+! 	else
+! 	    echo xend is stopped
+! 	fi
+!         exit 0
+  	;;
+    restart|reload|force-reload)
+!         echo -n $"$1 $prog: "
+! 	/usr/sbin/xend restart
+  	await_daemons_up
+  	;;
+    *)
+*************** case "$1" in
+*** 47,51 ****
+  	exit 1
+  esac
+  
+! exit $?
+  
+--- 68,79 ----
+  	exit 1
+  esac
+  
+! if [ $RETVAL = 0 ] ; then
+!     echo_success
+!     echo
+! else
+!     echo_failure
+!     echo
+! fi
+! exit $RETVAL
+  


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xen.spec	22 May 2006 16:54:13 -0000	1.111
+++ xen.spec	20 Jun 2006 22:07:17 -0000	1.112
@@ -5,27 +5,24 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 0.FC5.3
+Release: 1.FC5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-3.0.2-src.tgz
+Source0: xen-unstable-10278.tar.bz2
 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Source2: xenguest-install.py
 Source3: xen-udev.rules
-Patch0: xen-misc-fixes.patch
 Patch1: xen-initscript.patch
-Patch2: xen-kva-mmap.patch
-Patch3: xen-dom0-minmem.patch
-Patch4: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
-Patch9: xen-config-allow-http.patch
-Patch10: xen-3.0.1-m64.patch
 Patch11: xen-3.0.1-cloexec.patch
 Patch12: xen-3.0.1-tempdir.patch
-Patch13: xen-blchanges.patch
-Patch14: xen-check-returns.patch
+
+# Patches to modify the default config of xend
+Patch100: xen-config-dom0-minmem.patch
+Patch101: xen-config-allow-http.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -57,20 +54,16 @@
 or makes fun of you in front of your friends.
 
 %prep
-%setup -q -n xen-3.0.2-2 -a 1
-#patch0 -p1 -b .misc
+%setup -q -n xen-unstable.hg -a 1
 %patch1 -p1 -b .init
-#patch2 -p1 -b .kva-mmap
-%patch3 -p1 -b .mem-min
-%patch4 -p1 -b .compile
 %patch6 -p1
 %patch8 -p1
-%patch9 -p1 
-#patch10 -p1 -b .m64
-%patch11 -p1 -b .cloexec
+#patch11 -p1 -b .cloexec
 %patch12 -p1 -b .tempdir
-%patch13 -p1 -b .blchanges
-%patch14 -p1
+
+# config patches
+%patch100 -p1
+%patch101 -p1
 
 cp %{SOURCE2} .
 
@@ -169,6 +162,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Jun 20 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-1.FC5
+- Update to xen-unstable cset 10278 (from rawhide) to enable kernel rebase
+
 * Mon May 22 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-0.FC5.3
 - and fix a typo
 


--- xen-3.0.1-config-allow-http.patch DELETED ---


--- xen-3.0.1-m64.patch DELETED ---


--- xen-blchanges.patch DELETED ---


--- xen-compile-fixes.patch DELETED ---


--- xen-dom0-minmem.patch DELETED ---


--- xen-kva-mmap.patch DELETED ---


--- xen-misc-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:12:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:12:31 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.12,
	1.13
Message-ID: <200606202212.k5KMCUqT024099@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24054

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-4
- Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)
- Use setup -n instead of -c, and remove extraneous calls to cd from build
  and install sections.
- Use "make install DESTDIR=$RPM_BUILD_ROOT" instead of makeinstall macro.
- Added "AUTHORS ChangeLog COPYING INSTALL NEWS README" to doc macro.



Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xtrans-devel.spec	1 Mar 2006 07:13:41 -0000	1.12
+++ xorg-x11-xtrans-devel.spec	20 Jun 2006 22:12:27 -0000	1.13
@@ -6,11 +6,16 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.0
-Release: 3.2
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xtrans-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/xtrans-%{version}.tar.bz2
+
+# NOTE: Fix for http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195555 which
+# at the time I'm committing this to Fedora development, is only a "potential"
+# security issue, and does not yet have any known exploit vector.
+Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xtrans-1.0.0-setuid.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,24 +28,25 @@
 X.Org X11 developmental X transport library
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n xtrans-%{version}
+%patch0 -p0 -b .setuid
 
 %build
-cd xtrans-%{version}
+
 %configure
 # Running 'make' not needed.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd xtrans-%{version}
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xtrans
 %{_includedir}/X11/Xtrans/Xtrans.c
@@ -57,6 +63,13 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-4
+- Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)
+- Use setup -n instead of -c, and remove extraneous calls to cd from build
+  and install sections.
+- Use "make install DESTDIR=$RPM_BUILD_ROOT" instead of makeinstall macro.
+- Added "AUTHORS ChangeLog COPYING INSTALL NEWS README" to doc macro.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-3.2
 - bump again for double-long bug on ppc(64)
 
@@ -84,7 +97,7 @@
   *.pc files, and does not contain any ELF binaries or DSOs, so we disable
   debuginfo generation.
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
 - Use Fedora-Extras style BuildRoot tag
 - Add tarball URL
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:24:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:24:05 -0400
Subject: rpms/kernel/devel linux-2.6-geode-git.patch, 1.1,
	1.2 linux-2.6-mtd-git.patch, 1.1, 1.2
Message-ID: <200606202224.k5KMO5dn009941@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9857

Modified Files:
	linux-2.6-geode-git.patch linux-2.6-mtd-git.patch 
Log Message:
update mtd and geode trees

linux-2.6-geode-git.patch:
 arch/i386/Kconfig                       |    9 
 arch/i386/boot/setup.S                  |    5 
 drivers/crypto/Kconfig                  |    9 
 drivers/crypto/Makefile                 |    1 
 drivers/crypto/geode-aes.c              |  395 ++++++++++++++++++++++++++++++++
 drivers/crypto/geode-aes.h              |   42 +++
 drivers/i2c/busses/scx200_acb.c         |  203 ++++++++++++----
 drivers/video/Kconfig                   |    6 
 drivers/video/console/Kconfig           |    4 
 drivers/video/geode/Kconfig             |   20 +
 drivers/video/geode/display_gx.c        |   22 +
 drivers/video/geode/display_gx.h        |    3 
 drivers/video/geode/gxfb_core.c         |    8 
 drivers/video/geode/video_gx.c          |   24 +
 drivers/video/geode/video_gx.h          |    7 
 include/linux/pci_ids.h                 |    5 
 sound/pci/Kconfig                       |    9 
 sound/pci/ac97/ac97_codec.c             |    9 
 sound/pci/cs5535audio/Makefile          |    4 
 sound/pci/cs5535audio/cs5535audio.c     |   31 ++
 sound/pci/cs5535audio/cs5535audio.h     |    8 
 sound/pci/cs5535audio/cs5535audio_pcm.c |   24 +
 sound/pci/cs5535audio/cs5535audio_pm.c  |  123 +++++++++
 23 files changed, 893 insertions(+), 78 deletions(-)

Index: linux-2.6-geode-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-geode-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-geode-git.patch	17 Jun 2006 18:59:27 -0000	1.1
+++ linux-2.6-geode-git.patch	20 Jun 2006 22:24:02 -0000	1.2
@@ -834,8 +834,8 @@
  
  config FB_INTEL
  	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
--	depends on FB && EXPERIMENTAL && PCI && X86_32
-+	depends on FB && EXPERIMENTAL && PCI && X86_32 && !VGA_NOPROBE
+-	depends on FB && EXPERIMENTAL && PCI && X86
++	depends on FB && EXPERIMENTAL && PCI && X86 && !VGA_NOPROBE
  	select AGP
  	select AGP_INTEL
  	select FB_MODE_HELPERS

linux-2.6-mtd-git.patch:
 b/MAINTAINERS                         |    4 
 b/drivers/mtd/Kconfig                 |    4 
 b/drivers/mtd/chips/Kconfig           |    1 
 b/drivers/mtd/chips/Makefile          |    7 
 b/drivers/mtd/chips/amd_flash.c       |    8 
 b/drivers/mtd/chips/cfi_cmdset_0001.c |  474 +---
 b/drivers/mtd/chips/cfi_cmdset_0002.c |   22 
 b/drivers/mtd/chips/cfi_cmdset_0020.c |   22 
 b/drivers/mtd/chips/cfi_probe.c       |    8 
 b/drivers/mtd/chips/gen_probe.c       |   45 
 b/drivers/mtd/chips/map_ram.c         |    2 
 b/drivers/mtd/chips/map_rom.c         |    4 
 b/drivers/mtd/chips/sharp.c           |    1 
 b/drivers/mtd/devices/Kconfig         |    6 
 b/drivers/mtd/devices/Makefile        |    7 
 b/drivers/mtd/devices/block2mtd.c     |   27 
 b/drivers/mtd/devices/doc2000.c       |  129 -
 b/drivers/mtd/devices/doc2001.c       |   60 
 b/drivers/mtd/devices/doc2001plus.c   |   60 
 b/drivers/mtd/devices/docprobe.c      |   26 
 b/drivers/mtd/devices/lart.c          |    1 
 b/drivers/mtd/devices/m25p80.c        |    1 
 b/drivers/mtd/devices/ms02-nv.c       |    2 
 b/drivers/mtd/devices/mtdram.c        |    1 
 b/drivers/mtd/devices/phram.c         |   16 
 b/drivers/mtd/devices/slram.c         |    3 
 b/drivers/mtd/inftlcore.c             |  192 +-
 b/drivers/mtd/inftlmount.c            |   60 
 b/drivers/mtd/maps/Kconfig            |   11 
 b/drivers/mtd/maps/cfi_flagadm.c      |    4 
 b/drivers/mtd/maps/dbox2-flash.c      |    2 
 b/drivers/mtd/maps/mtx-1_flash.c      |    2 
 b/drivers/mtd/maps/nettel.c           |    4 
 b/drivers/mtd/maps/pcmciamtd.c        |    1 
 b/drivers/mtd/maps/physmap.c          |  255 +-
 b/drivers/mtd/mtdblock.c              |   16 
 b/drivers/mtd/mtdblock_ro.c           |    4 
 b/drivers/mtd/mtdchar.c               |  327 ++-
 b/drivers/mtd/mtdconcat.c             |  335 +--
 b/drivers/mtd/mtdcore.c               |   33 
 b/drivers/mtd/mtdpart.c               |  171 -
 b/drivers/mtd/nand/Kconfig            |   57 
 b/drivers/mtd/nand/Makefile           |    4 
 b/drivers/mtd/nand/ams-delta.c        |  237 ++
 b/drivers/mtd/nand/au1550nd.c         |  321 ++-
 b/drivers/mtd/nand/autcpu12.c         |  125 -
 b/drivers/mtd/nand/cs553x_nand.c      |  353 +++
 b/drivers/mtd/nand/diskonchip.c       |  530 ++---
 b/drivers/mtd/nand/edb7312.c          |   97 -
 b/drivers/mtd/nand/h1910.c            |   98 -
 b/drivers/mtd/nand/nand_base.c        | 3249 +++++++++++++++-------------------
 b/drivers/mtd/nand/nand_bbt.c         |  502 +++--
 b/drivers/mtd/nand/nand_ecc.c         |  227 --
 b/drivers/mtd/nand/nand_ids.c         |  177 -
 b/drivers/mtd/nand/nandsim.c          |   95 
 b/drivers/mtd/nand/ndfc.c             |  311 +++
 b/drivers/mtd/nand/ppchameleonevb.c   |  256 +-
 b/drivers/mtd/nand/rtc_from4.c        |  351 +--
 b/drivers/mtd/nand/s3c2410.c          |  252 +-
 b/drivers/mtd/nand/sharpsl.c          |  146 -
 b/drivers/mtd/nand/spia.c             |  101 -
 b/drivers/mtd/nand/toto.c             |  121 -
 b/drivers/mtd/nand/ts7250.c           |  206 ++
 b/drivers/mtd/nftlcore.c              |  221 +-
 b/drivers/mtd/nftlmount.c             |   91 
 b/drivers/mtd/onenand/Kconfig         |   14 
 b/drivers/mtd/onenand/onenand_base.c  |  718 +++++--
 b/drivers/mtd/onenand/onenand_bbt.c   |    9 
 b/drivers/mtd/redboot.c               |   18 
 b/drivers/mtd/rfd_ftl.c               |   48 
 b/fs/Kconfig                          |   38 
 b/fs/jffs/intrep.c                    |   15 
 b/fs/jffs2/Makefile                   |    3 
 b/fs/jffs2/README.Locking             |   21 
 b/fs/jffs2/acl.c                      |  485 +++++
 b/fs/jffs2/acl.h                      |   45 
 b/fs/jffs2/build.c                    |    2 
 b/fs/jffs2/compr.c                    |    2 
 b/fs/jffs2/compr.h                    |    4 
 b/fs/jffs2/debug.c                    |   14 
 b/fs/jffs2/debug.h                    |    6 
 b/fs/jffs2/dir.c                      |  121 -
 b/fs/jffs2/erase.c                    |   56 
 b/fs/jffs2/file.c                     |   35 
 b/fs/jffs2/fs.c                       |   63 
 b/fs/jffs2/gc.c                       |  131 -
 b/fs/jffs2/jffs2_fs_i.h               |   55 
 b/fs/jffs2/jffs2_fs_sb.h              |  133 +
 b/fs/jffs2/malloc.c                   |  127 +
 b/fs/jffs2/nodelist.c                 |  183 +
 b/fs/jffs2/nodelist.h                 |  189 +
 b/fs/jffs2/nodemgmt.c                 |  196 --
 b/fs/jffs2/os-linux.h                 |   23 
 b/fs/jffs2/readinode.c                |  119 -
 b/fs/jffs2/scan.c                     |  442 +++-
 b/fs/jffs2/security.c                 |   82 
 b/fs/jffs2/summary.c                  |  484 +++--
 b/fs/jffs2/summary.h                  |   64 
 b/fs/jffs2/super.c                    |   20 
 b/fs/jffs2/symlink.c                  |    7 
 b/fs/jffs2/wbuf.c                     |  968 +++++-----
 b/fs/jffs2/write.c                    |  147 -
 b/fs/jffs2/xattr.c                    | 1238 ++++++++++++
 b/fs/jffs2/xattr.h                    |  116 +
 b/fs/jffs2/xattr_trusted.c            |   52 
 b/fs/jffs2/xattr_user.c               |   52 
 b/include/linux/jffs2.h               |   56 
 b/include/linux/module.h              |    9 
 b/include/linux/mtd/inftl.h           |    2 
 b/include/linux/mtd/mtd.h             |   97 -
 b/include/linux/mtd/nand.h            |  354 ++-
 b/include/linux/mtd/ndfc.h            |   67 
 b/include/linux/mtd/nftl.h            |    2 
 b/include/linux/mtd/onenand.h         |   11 
 b/include/linux/mtd/onenand_regs.h    |    8 
 b/include/linux/mtd/partitions.h      |    2 
 b/include/linux/mtd/physmap.h         |   29 
 b/include/mtd/mtd-abi.h               |   90 
 b/include/mtd/mtd-user.h              |    1 
 b/init/Kconfig                        |    3 
 b/init/do_mounts.c                    |    4 
 b/kernel/Makefile                     |    1 
 fs/jffs2/histo.h                      |    3 
 include/linux/jffs2_fs_i.h            |   50 
 include/linux/jffs2_fs_sb.h           |  122 -
 kernel/intermodule.c                  |  184 -
 126 files changed, 11245 insertions(+), 6881 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-mtd-git.patch
Index: linux-2.6-mtd-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-mtd-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-mtd-git.patch	17 Jun 2006 18:59:27 -0000	1.1
+++ linux-2.6-mtd-git.patch	20 Jun 2006 22:24:02 -0000	1.2
@@ -2954,7 +2954,7 @@
  	add_mtd_blktrans_dev(dev);
  }
 diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
-index 6f04458..5dd0b8d 100644
+index 6f04458..aa18d45 100644
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
 @@ -49,24 +49,18 @@ static struct mtd_notifier notifier = {
@@ -3300,12 +3300,12 @@
 -		databuf = kmalloc(buf.length, GFP_KERNEL);
 -		if (!databuf)
 +		ops.len = buf.length;
-+		ops.ooblen = mtd->oobsize;
++		ops.ooblen = buf.length;
 +		ops.ooboffs = buf.start & (mtd->oobsize - 1);
 +		ops.datbuf = NULL;
 +		ops.mode = MTD_OOB_PLACE;
 +
-+		if (ops.ooboffs && ops.len > (ops.ooblen - ops.ooboffs))
++		if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
 +			return -EINVAL;
 +
 +		ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
@@ -3360,12 +3360,12 @@
 -		databuf = kmalloc(buf.length, GFP_KERNEL);
 -		if (!databuf)
 +		ops.len = buf.length;
-+		ops.ooblen = mtd->oobsize;
++		ops.ooblen = buf.length;
 +		ops.ooboffs = buf.start & (mtd->oobsize - 1);
 +		ops.datbuf = NULL;
 +		ops.mode = MTD_OOB_PLACE;
 +
-+		if (ops.ooboffs && ops.len > (ops.ooblen - ops.ooboffs))
++		if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
 +			return -EINVAL;
 +
 +		ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
@@ -4356,7 +4356,7 @@
  		if(parts[i].mtdp)
  		{	/* store the object pointer (caller may or may not register it */
 diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
-index cfe288a..203f90a 100644
+index cfe288a..3db77ee 100644
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
 @@ -23,6 +23,14 @@ config MTD_NAND_VERIFY_WRITE
@@ -4418,7 +4418,7 @@
  	  must advertise a platform_device for the driver to attach.
  
  config MTD_NAND_S3C2410_DEBUG
-@@ -109,6 +129,12 @@ config MTD_NAND_S3C2410_HWECC
+@@ -109,6 +129,22 @@ config MTD_NAND_S3C2410_HWECC
  	  currently not be able to switch to software, as there is no
  	  implementation for ECC method used by the S3C2410
  
@@ -4428,10 +4428,20 @@
 +	help
 +	 NDFC Nand Flash Controllers are integrated in EP44x SoCs
 +
++config MTD_NAND_S3C2410_CLKSTOP
++	bool "S3C2410 NAND IDLE clock stop"
++	depends on MTD_NAND_S3C2410
++	default n
++	help
++	  Stop the clock to the NAND controller when there is no chip
++	  selected to save power. This will mean there is a small delay
++	  when the is NAND chip selected or released, but will save
++	  approximately 5mA of power when there is nothing happening.
++
  config MTD_NAND_DISKONCHIP
  	tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
  	depends on MTD_NAND && EXPERIMENTAL
-@@ -183,11 +209,24 @@ config MTD_NAND_SHARPSL
+@@ -183,11 +219,24 @@ config MTD_NAND_SHARPSL
  	tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
  	depends on MTD_NAND && ARCH_PXA
  
@@ -5815,7 +5825,7 @@
 +MODULE_AUTHOR("David Woodhouse <dwmw2 at infradead.org>");
 +MODULE_DESCRIPTION("NAND controller driver for AMD CS5535/CS5536 companion chip");
 diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
-index ec5e45e..463e12c 100644
+index ec5e45e..6107f53 100644
 --- a/drivers/mtd/nand/diskonchip.c
 +++ b/drivers/mtd/nand/diskonchip.c
 @@ -58,10 +58,10 @@ #elif defined(__PPC__)
@@ -6146,6 +6156,15 @@
  
  		udelay(50);
  
+@@ -464,7 +464,7 @@ static void __init doc2000_count_chips(s
+ 	printk(KERN_DEBUG "Detected %d chips per floor.\n", i);
+ }
+ 
+-static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
++static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this)
+ {
+ 	struct doc_priv *doc = this->priv;
+ 
 @@ -482,7 +482,7 @@ static void doc2001_write_byte(struct mt
  {
  	struct nand_chip *this = mtd->priv;
@@ -7507,7 +7526,7 @@
  
  MODULE_LICENSE("GPL");
 diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index 95e96fa..77406fc 100644
+index 95e96fa..27083ed 100644
 --- a/drivers/mtd/nand/nand_base.c
 +++ b/drivers/mtd/nand/nand_base.c
 @@ -10,67 +10,31 @@
@@ -7754,7 +7773,8 @@
   * endianess conversion
   */
 -static u_char nand_read_byte16(struct mtd_info *mtd)
--{
++static uint8_t nand_read_byte16(struct mtd_info *mtd)
+ {
 -	struct nand_chip *this = mtd->priv;
 -	return (u_char) cpu_to_le16(readw(this->IO_ADDR_R));
 -}
@@ -7768,8 +7788,7 @@
 - * endianess conversion
 - */
 -static void nand_write_byte16(struct mtd_info *mtd, u_char byte)
-+static uint8_t nand_read_byte16(struct mtd_info *mtd)
- {
+-{
 -	struct nand_chip *this = mtd->priv;
 -	writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);
 +	struct nand_chip *chip = mtd->priv;
@@ -8138,11 +8157,11 @@
 -
 -	/* Set ALE and clear CLE to start address cycle */
 -	this->hwcontrol(mtd, NAND_CTL_CLRCLE);
--
--	if (column != -1 || page_addr != -1) {
--		this->hwcontrol(mtd, NAND_CTL_SETALE);
 +	chip->cmd_ctrl(mtd, command, ctrl);
  
+-	if (column != -1 || page_addr != -1) {
+-		this->hwcontrol(mtd, NAND_CTL_SETALE);
+-
 -		/* Serially input address */
 -		if (column != -1) {
 -			/* Adjust columns for 16 bit buswidth */
@@ -8189,11 +8208,7 @@
  	switch (command) {
  
  	case NAND_CMD_PAGEPROG:
-@@ -609,32 +501,34 @@ static void nand_command (struct mtd_inf
- 	case NAND_CMD_ERASE2:
- 	case NAND_CMD_SEQIN:
- 	case NAND_CMD_STATUS:
-+		chip->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE);
+@@ -612,29 +504,30 @@ static void nand_command (struct mtd_inf
  		return;
  
  	case NAND_CMD_RESET:
@@ -8235,7 +8250,7 @@
  
  	nand_wait_ready(mtd);
  }
-@@ -646,50 +540,49 @@ static void nand_command (struct mtd_inf
+@@ -646,50 +539,49 @@ static void nand_command (struct mtd_inf
   * @column:	the column address for this command, -1 if none
   * @page_addr:	the page address for this command, -1 if none
   *
@@ -8308,7 +8323,12 @@
  
  	/*
  	 * program and erase have their own busy handlers
-@@ -706,51 +599,49 @@ static void nand_command_lp (struct mtd_
+@@ -702,55 +594,62 @@ static void nand_command_lp (struct mtd_
+ 	case NAND_CMD_ERASE1:
+ 	case NAND_CMD_ERASE2:
+ 	case NAND_CMD_SEQIN:
++	case NAND_CMD_RNDIN:
+ 	case NAND_CMD_STATUS:
  	case NAND_CMD_DEPLETE1:
  		return;
  
@@ -8342,6 +8362,14 @@
 +		chip->cmd_ctrl(mtd, NAND_CMD_NONE,
 +			       NAND_NCE | NAND_CTRL_CHANGE);
 +		while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;
++		return;
++
++	case NAND_CMD_RNDOUT:
++		/* No ready / busy check necessary */
[...3154 lines suppressed...]
+ 		case JFFS2_NODETYPE_DIRENT:
+@@ -606,6 +634,7 @@ static int jffs2_get_inode_nodes(struct 
+ 				goto free_out;
+ 
+ 		}
++	cont:
+ 		spin_lock(&c->erase_completion_lock);
+ 	}
+ 
 diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
 index cf55b22..6161808 100644
 --- a/fs/jffs2/scan.c
@@ -21726,7 +22252,7 @@
 +	.get = jffs2_security_getxattr
 +};
 diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
-index fb9cec6..51bf165 100644
+index fb9cec6..0b02fc7 100644
 --- a/fs/jffs2/summary.c
 +++ b/fs/jffs2/summary.c
 @@ -5,6 +5,7 @@
@@ -21976,7 +22502,7 @@
 -				jeb->last_node = raw;
 -
 -				fd->raw = raw;
-+				fd->raw = sum_link_node_ref(c, jeb,  je32_to_cpu(spd->offset) | REF_PRISTINE,
++				fd->raw = sum_link_node_ref(c, jeb,  je32_to_cpu(spd->offset) | REF_UNCHECKED,
 +							    PAD(je32_to_cpu(spd->totlen)), ic);
 +
  				fd->next = NULL;
@@ -26316,7 +26842,7 @@
  			printk(KERN_INFO args);		\
  	} while(0)
 diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
-index da5e67b..bf2ce68 100644
+index da5e67b..a30969e 100644
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h
 @@ -11,47 +11,11 @@
@@ -26382,7 +26908,7 @@
  /* The maximum number of NAND chips in an array */
  #define NAND_MAX_CHIPS		8
  
-@@ -79,26 +39,24 @@ #define NAND_MAX_CHIPS		8
+@@ -79,44 +39,45 @@ #define NAND_MAX_CHIPS		8
   * adjust this accordingly.
   */
  #define NAND_MAX_OOBSIZE	64
@@ -26421,7 +26947,28 @@
  
  /*
   * Standard NAND flash commands
-@@ -138,6 +96,8 @@ #define NAND_CMD_STATUS_ERROR3	0x76
+  */
+ #define NAND_CMD_READ0		0
+ #define NAND_CMD_READ1		1
++#define NAND_CMD_RNDOUT		5
+ #define NAND_CMD_PAGEPROG	0x10
+ #define NAND_CMD_READOOB	0x50
+ #define NAND_CMD_ERASE1		0x60
+ #define NAND_CMD_STATUS		0x70
+ #define NAND_CMD_STATUS_MULTI	0x71
+ #define NAND_CMD_SEQIN		0x80
++#define NAND_CMD_RNDIN		0x85
+ #define NAND_CMD_READID		0x90
+ #define NAND_CMD_ERASE2		0xd0
+ #define NAND_CMD_RESET		0xff
+ 
+ /* Extended commands for large page devices */
+ #define NAND_CMD_READSTART	0x30
++#define NAND_CMD_RNDOUTSTART	0xE0
+ #define NAND_CMD_CACHEDPROG	0x15
+ 
+ /* Extended commands for AG-AND device */
+@@ -138,6 +99,8 @@ #define NAND_CMD_STATUS_ERROR3	0x76
  #define NAND_CMD_STATUS_RESET	0x7f
  #define NAND_CMD_STATUS_CLEAR	0xff
  
@@ -26430,7 +26977,7 @@
  /* Status bits */
  #define NAND_STATUS_FAIL	0x01
  #define NAND_STATUS_FAIL_N1	0x02
-@@ -148,21 +108,12 @@ #define NAND_STATUS_WP		0x80
+@@ -148,21 +111,12 @@ #define NAND_STATUS_WP		0x80
  /*
   * Constants for ECC_MODES
   */
@@ -26458,7 +27005,7 @@
  
  /*
   * Constants for Hardware ECC
-@@ -201,6 +152,10 @@ #define NAND_4PAGE_ARRAY	0x00000040
+@@ -201,6 +155,10 @@ #define NAND_4PAGE_ARRAY	0x00000040
   * bits from adjacent blocks from 'leaking' in altering data.
   * This happens with the Renesas AG-AND chips, possibly others.  */
  #define BBT_AUTO_REFRESH	0x00000080
@@ -26469,7 +27016,7 @@
  
  /* Options valid for Samsung large page devices */
  #define NAND_SAMSUNG_LP_OPTIONS \
-@@ -219,18 +174,12 @@ #define NAND_CHIPOPTIONS_MSK	(0x0000ffff
+@@ -219,18 +177,12 @@ #define NAND_CHIPOPTIONS_MSK	(0x0000ffff
  /* Use a flash based bad block table. This option is passed to the
   * default bad block table function. */
  #define NAND_USE_FLASH_BBT	0x00010000
@@ -26491,7 +27038,7 @@
  
  
  /*
-@@ -264,45 +213,95 @@ struct nand_hw_control {
+@@ -264,45 +216,102 @@ struct nand_hw_control {
  };
  
  /**
@@ -26532,6 +27079,13 @@
 +	void			(*write_page)(struct mtd_info *mtd,
 +					      struct nand_chip *chip,
 +					      const uint8_t *buf);
++	int			(*read_oob)(struct mtd_info *mtd,
++					    struct nand_chip *chip,
++					    int page,
++					    int sndcmd);
++	int			(*write_oob)(struct mtd_info *mtd,
++					     struct nand_chip *chip,
++					     int page);
 +};
 +
 +/**
@@ -26602,7 +27156,7 @@
   * @oobdirty:		[INTERN] indicates that oob_buf must be reinitialized
   * @data_poi:		[INTERN] pointer to a data buffer
   * @options:		[BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about
-@@ -312,12 +311,13 @@ struct nand_hw_control {
+@@ -312,12 +321,13 @@ struct nand_hw_control {
   * @chipsize:		[INTERN] the size of one chip for multichip arrays
   * @pagemask:		[INTERN] page number mask = number of (pages / chip) - 1
   * @pagebuf:		[INTERN] holds the pagenumber which is currently in data_buf
@@ -26618,7 +27172,7 @@
   * @priv:		[OPTIONAL] pointer to private chip date
   * @errstat:		[OPTIONAL] hardware specific function to perform additional error status checks
   *			(determine if errors are correctable)
-@@ -325,58 +325,57 @@ struct nand_hw_control {
+@@ -325,58 +335,57 @@ struct nand_hw_control {
  
  struct nand_chip {
  	void  __iomem	*IO_ADDR_R;
@@ -26651,7 +27205,7 @@
 +				    unsigned int ctrl);
 +	int		(*dev_ready)(struct mtd_info *mtd);
 +	void		(*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr);
-+	int		(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this, int state);
++	int		(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
  	void		(*erase_cmd)(struct mtd_info *mtd, int page);
  	int		(*scan_bbt)(struct mtd_info *mtd);
 -	int		eccmode;
@@ -26709,7 +27263,7 @@
  };
  
  /*
-@@ -388,19 +387,19 @@ #define NAND_MFR_FUJITSU	0x04
+@@ -388,19 +397,19 @@ #define NAND_MFR_FUJITSU	0x04
  #define NAND_MFR_NATIONAL	0x8f
  #define NAND_MFR_RENESAS	0x07
  #define NAND_MFR_STMICRO	0x20
@@ -26735,7 +27289,7 @@
   * @options:	Bitfield to store chip relevant options
   */
  struct nand_flash_dev {
-@@ -415,7 +414,7 @@ struct nand_flash_dev {
+@@ -415,7 +424,7 @@ struct nand_flash_dev {
  /**
   * struct nand_manufacturers - NAND Flash Manufacturer ID Structure
   * @name:	Manufacturer name
@@ -26744,7 +27298,7 @@
  */
  struct nand_manufacturers {
  	int id;
-@@ -455,7 +454,7 @@ struct nand_bbt_descr {
+@@ -455,7 +464,7 @@ struct nand_bbt_descr {
  	int	veroffs;
  	uint8_t	version[NAND_MAX_CHIPS];
  	int	len;
@@ -26753,7 +27307,7 @@
  	int	reserved_block_code;
  	uint8_t	*pattern;
  };
-@@ -494,14 +493,14 @@ #define NAND_BBT_SCAN2NDPAGE	0x00004000
+@@ -494,14 +503,14 @@ #define NAND_BBT_SCAN2NDPAGE	0x00004000
  /* The maximum number of blocks to scan for a bbt */
  #define NAND_BBT_SCAN_MAXBLOCKS	4
  
@@ -26776,7 +27330,7 @@
  
  /*
  * Constants for oob configuration
-@@ -509,4 +508,53 @@ extern int nand_do_read_ecc (struct mtd_
+@@ -509,4 +518,53 @@ extern int nand_do_read_ecc (struct mtd_
  #define NAND_SMALL_BADBLOCK_POS		5
  #define NAND_LARGE_BADBLOCK_POS		0
  



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:26:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:26:59 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xtrans-1.0.0-setuid.diff,NONE,1.1
Message-ID: <200606202226.k5KMQx7f011089@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11052

Added Files:
	xtrans-1.0.0-setuid.diff 
Log Message:
Actually add xtrans-1.0.0-setuid.diff this time

xtrans-1.0.0-setuid.diff:
 Xtranslcl.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE xtrans-1.0.0-setuid.diff ---
Index: Xtranslcl.c
===================================================================
RCS file: /cvs/xorg/lib/xtrans/Xtranslcl.c,v
retrieving revision 1.4
diff -u -r1.4 Xtranslcl.c
--- Xtranslcl.c	8 Nov 2005 06:33:26 -0000	1.4
+++ Xtranslcl.c	19 Jun 2006 21:22:07 -0000
@@ -360,7 +360,10 @@
 	uid_t       saved_euid;
 
 	saved_euid = geteuid();
-	setuid( getuid() ); /** sets the euid to the actual/real uid **/
+	/** sets the euid to the actual/real uid **/
+	if (setuid( getuid() ) == -1) {
+		exit(1);
+	}
 	if( chown( slave, saved_euid, -1 ) < 0 ) {
 		exit( 1 );
 		}
@@ -369,7 +372,13 @@
     }
 
     waitpid(saved_pid, &exitval, 0);
-
+    if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) {
+	close(fd);
+	close(server);
+	PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n",
+	      slave, 0, 0);
+	return(-1);
+    }
     if (chmod(slave, 0666) < 0) {
 	close(fd);
 	close(server);



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:29:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2295,1.2296
Message-ID: <200606202229.k5KMTFwB011996@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11950

Modified Files:
	kernel-2.6.spec 
Log Message:
re-enable geode tree


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2295
retrieving revision 1.2296
diff -u -r1.2295 -r1.2296
--- kernel-2.6.spec	20 Jun 2006 20:25:53 -0000	1.2295
+++ kernel-2.6.spec	20 Jun 2006 22:29:13 -0000	1.2296
@@ -775,7 +775,7 @@
 # Hush noisy unimplemented 32bit syscalls
 %patch208 -p1
 # Jordan Crouse's Geode git tree.
-#%patch209 -p1
+%patch209 -p1
 
 #
 # ppc64
@@ -1685,6 +1685,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update MTD tree, Update and re-enable Geode tree
+
 * Tue Jun 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git1
 



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:32:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:32:14 -0400
Subject: rpms/xen/FC-5 xen.spec,1.112,1.113
Message-ID: <200606202232.k5KMWED6012790@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/xen/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12710

Modified Files:
	xen.spec 
Log Message:
Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
glibc32 correctly



Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xen.spec	20 Jun 2006 22:07:17 -0000	1.112
+++ xen.spec	20 Jun 2006 22:32:11 -0000	1.113
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 1.FC5
+Release: 2.FC5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -33,6 +33,8 @@
 BuildRequires: perl 
 # so that the makefile knows to install udev rules
 BuildRequires: udev 
+# so that x86_64 builds pick up glibc32 correctly
+BuildRequires: /usr/include/gnu/stubs-32.h
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
@@ -162,7 +164,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
-* Tue Jun 20 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-1.FC5
+* Tue Jun 20 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-2.FC5
+- Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
+  glibc32 correctly
 - Update to xen-unstable cset 10278 (from rawhide) to enable kernel rebase
 
 * Mon May 22 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-0.FC5.3



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:40:57 -0400
Subject: rpms/eclipse-changelog/FC-5 .cvsignore, 1.3,
	1.4 eclipse-changelog.spec, 1.32, 1.33 sources, 1.9, 1.10
Message-ID: <200606202240.k5KMevtZ014551@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14525

Modified Files:
	.cvsignore eclipse-changelog.spec sources 
Log Message:
* Tue June 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-1
- Update to version 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 May 2006 19:15:12 -0000	1.3
+++ .cvsignore	20 Jun 2006 22:40:53 -0000	1.4
@@ -1 +1 @@
-eclipse-changelog-fetched-2.0.4.tar.gz
+eclipse-changelog-fetched-2.1.0.tar.gz


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/eclipse-changelog.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eclipse-changelog.spec	23 May 2006 19:15:12 -0000	1.32
+++ eclipse-changelog.spec	20 Jun 2006 22:40:53 -0000	1.33
@@ -5,9 +5,9 @@
 %define section			free
 %define eclipse_name 		eclipse
 %define	changelog_major		2
-%define changelog_minor		0
+%define changelog_minor		1
 %define changelog_majmin	%{changelog_major}.%{changelog_minor}
-%define changelog_micro   	4
+%define changelog_micro   	0
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Tue June 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-1
+- Update to version 2.1.0.
+
 * Tue May 23 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-1
 - Update to version 2.0.3, by fixes by Kyu Lee (rh#168682).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 May 2006 19:15:12 -0000	1.9
+++ sources	20 Jun 2006 22:40:53 -0000	1.10
@@ -1 +1 @@
-8d4476428f19cf5437fd81c56897e059  eclipse-changelog-fetched-2.0.4.tar.gz
+b1c2a74e300880c29d896502160432aa  eclipse-changelog-fetched-2.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:41:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:41:48 -0400
Subject: rpms/eclipse-changelog/FC-5 eclipse-changelog.spec,1.33,1.34
Message-ID: <200606202241.k5KMfmO5014735@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14710

Modified Files:
	eclipse-changelog.spec 
Log Message:
Bumped release.


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/eclipse-changelog.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- eclipse-changelog.spec	20 Jun 2006 22:40:53 -0000	1.33
+++ eclipse-changelog.spec	20 Jun 2006 22:41:45 -0000	1.34
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        1
+Release:        2
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -138,7 +138,7 @@
 %endif
 
 %changelog
-* Tue June 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-1
+* Tue June 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-2
 - Update to version 2.1.0.
 
 * Tue May 23 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-1



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:42:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:42:51 -0400
Subject: rpms/eclipse-changelog/FC-5 eclipse-changelog.spec,1.34,1.35
Message-ID: <200606202242.k5KMgpOw015011@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14943

Modified Files:
	eclipse-changelog.spec 
Log Message:
Fix changelog date.


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/eclipse-changelog.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eclipse-changelog.spec	20 Jun 2006 22:41:45 -0000	1.34
+++ eclipse-changelog.spec	20 Jun 2006 22:42:49 -0000	1.35
@@ -138,7 +138,7 @@
 %endif
 
 %changelog
-* Tue June 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-2
+* Tue Jun 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-2
 - Update to version 2.1.0.
 
 * Tue May 23 2006 Igor Foox <ifoox at redhat.com> 2.0.4_fc-1



From fedora-cvs-commits at redhat.com  Tue Jun 20 22:48:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 18:48:41 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2296,
	1.2297 linux-2.6-ac97_unregister_controls_ad18xx.patch, 1.1, NONE
Message-ID: <200606202248.k5KMmf36031691@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31636

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-ac97_unregister_controls_ad18xx.patch 
Log Message:
remove OLPC AC97 patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2296
retrieving revision 1.2297
diff -u -r1.2296 -r1.2297
--- kernel-2.6.spec	20 Jun 2006 22:29:13 -0000	1.2296
+++ kernel-2.6.spec	20 Jun 2006 22:48:38 -0000	1.2297
@@ -385,7 +385,6 @@
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
-Patch1730: linux-2.6-ac97_unregister_controls_ad18xx.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
@@ -976,8 +975,6 @@
 %patch1710 -p1
 # setuid /proc/self/maps fix.
 %patch1720 -p1
-# OLPC ac97 fix.
-%patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # serial/tty resume fixing.
@@ -1687,6 +1684,7 @@
 %changelog
 * Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update MTD tree, Update and re-enable Geode tree
+- Remove AC97 patch obsoleted by Geode tree
 
 * Tue Jun 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git1


--- linux-2.6-ac97_unregister_controls_ad18xx.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 20 23:50:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 19:50:57 -0400
Subject: rpms/libX11/devel libX11.spec,1.18,1.19
Message-ID: <200606202350.k5KNovLQ013797@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13762

Modified Files:
	libX11.spec 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
- Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
  so we can control this dep centrally.
- Added NEWS to doc list.



Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libX11.spec	7 Jun 2006 11:57:00 -0000	1.18
+++ libX11.spec	20 Jun 2006 23:50:54 -0000	1.19
@@ -1,13 +1,16 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
+Patch1: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -18,8 +21,7 @@
 # NOTE: Temporary BuildRequires needed for build time kludges.
 BuildRequires: autoconf
 
-# FIXME: check if still needed for X11R7
-Requires(pre): filesystem >= 2.3.6-1
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -43,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .datadir-locale-dir-fix
+%patch1 -p1 -b .setuid
 
 # Disable static library creation by default.
 %define with_static 0
@@ -78,7 +81,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/locale
 %dir %{_datadir}/X11/locale/C
@@ -238,19 +241,25 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
+- Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
+  so we can control this dep centrally.
+- Added NEWS to doc list.
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Remove package ownership of mandir/libdir/etc.
 
 * Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Bump to 1.0.1
 
-* Thu Feb 23 2006 Christopher Aillon <caillon at redhat.com> - 1.0.0-3
+* Thu Feb 23 2006 Christopher Aillon <caillon at redhat.com> 1.0.0-3
 - Look for the versioned libXcursor.so.1 (fixes 179044)
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Sat Dec 24 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-2
@@ -272,7 +281,7 @@
 - Added libX11-0.99.3-datadir-locale-dir-fix.patch, to fix build to install
   the locale data files into datadir instead of libdir. (#173282)
 
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0.99.3-3
+* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.3-3
 - require newer filesystem package (#172610)
 
 * Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-2
@@ -283,7 +292,7 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-* Mon Nov 7 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
+* Mon Nov 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
 - Fix devel subpackage summary and description with s/libXdmcp/libX11/
 
 * Fri Oct 21 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-1
@@ -291,7 +300,7 @@
 - Added en_GR.UTF-8 locale to file manifest.
 - Forcibly remove Xcms.txt
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-4
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-4
 - Added _smp_mflags to make invocation to speed up SMP builds
 
 * Thu Sep 29 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-3



From fedora-cvs-commits at redhat.com  Wed Jun 21 00:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 20:07:49 -0400
Subject: rpms/libX11/devel libX11-1.0.1-setuid.diff,NONE,1.1
Message-ID: <200606210007.k5L07mo9018551@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18512

Added Files:
	libX11-1.0.1-setuid.diff 
Log Message:
Ok, 2 packages in a row, commit spec changes, forget to cvs add patch.  How dumb is that.

libX11-1.0.1-setuid.diff:
 lcFile.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE libX11-1.0.1-setuid.diff ---
diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
index f8b3404..bb1ee20 100644
--- a/src/xlibi18n/lcFile.c
+++ b/src/xlibi18n/lcFile.c
@@ -269,7 +269,11 @@ #else
 	    if (seteuid(0) != 0) {
 		priv = 0;
 	    } else {
-		seteuid(oldeuid);
+		if (seteuid(oldeuid) == -1) {
+		    /* XXX ouch, coudn't get back to original uid 
+		     what can we do ??? */
+		    _exit(127);
+		}
 		priv = 1;
 	    }
 #endif



From fedora-cvs-commits at redhat.com  Wed Jun 21 00:12:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 20:12:07 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-tfp-damage.patch,
	1.1, 1.2 xorg-x11-server.spec, 1.97, 1.98
Message-ID: <200606210012.k5L0C6lH019384@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19358

Modified Files:
	xorg-x11-server-1.1.0-tfp-damage.patch xorg-x11-server.spec 
Log Message:
* Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-21
- Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D
  to only update the part of the texture that changed, based on damage
  regions.


xorg-x11-server-1.1.0-tfp-damage.patch:
 glxcmds.c     |    1 
 glxdrawable.h |    4 +-
 glxdri.c      |  103 +++++++++++++++++++++++++++++++++++++++++++---------------
 glxext.c      |    4 ++
 4 files changed, 86 insertions(+), 26 deletions(-)

Index: xorg-x11-server-1.1.0-tfp-damage.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-tfp-damage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-tfp-damage.patch	20 Jun 2006 01:05:12 -0000	1.1
+++ xorg-x11-server-1.1.0-tfp-damage.patch	21 Jun 2006 00:12:03 -0000	1.2
@@ -1,27 +1,5 @@
-? GL/glx/glxinterface.h
-? doc/Xserver.1x
-Index: GL/glx/glxcmds.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxcmds.c,v
-retrieving revision 1.10.2.5
-diff -u -p -r1.10.2.5 glxcmds.c
---- GL/glx/glxcmds.c	6 Mar 2006 00:11:40 -0000	1.10.2.5
-+++ GL/glx/glxcmds.c	6 Mar 2006 00:38:37 -0000
-@@ -1245,6 +1245,7 @@ int DoCreateGLXPixmap(__GLXclientState *
-     pGlxPixmap->pGlxScreen = pGlxScreen;
-     pGlxPixmap->pScreen = pScreen;
-     pGlxPixmap->idExists = True;
-+    pGlxPixmap->pDamage = NULL;
-     pGlxPixmap->refcnt = 0;
- 
-     pGlxPixmap->modes = modes;
-Index: GL/glx/glxdrawable.h
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxdrawable.h,v
-retrieving revision 1.4.10.1
-diff -u -p -r1.4.10.1 glxdrawable.h
---- GL/glx/glxdrawable.h	24 Feb 2006 05:49:33 -0000	1.4.10.1
-+++ GL/glx/glxdrawable.h	6 Mar 2006 00:38:37 -0000
+--- ./GL/glx/glxdrawable.h.tfp-damage	2006-03-11 19:11:33.000000000 -0500
++++ ./GL/glx/glxdrawable.h	2006-06-19 20:12:48.000000000 -0400
 @@ -41,6 +41,8 @@
  **
  */
@@ -31,7 +9,7 @@
  typedef struct {
  
      DrawablePtr pDraw;
-@@ -49,7 +51,7 @@ typedef struct {
+@@ -49,7 +51,7 @@
      ScreenPtr pScreen;
      Bool idExists;
      int refcnt;
@@ -40,27 +18,45 @@
  } __GLXpixmap;
  
  struct __GLXdrawable {
-Index: GL/glx/glxdri.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/GL/glx/Attic/glxdri.c,v
-retrieving revision 1.1.2.11
-diff -u -p -r1.1.2.11 glxdri.c
---- GL/glx/glxdri.c	6 Mar 2006 00:11:40 -0000	1.1.2.11
-+++ GL/glx/glxdri.c	6 Mar 2006 00:38:37 -0000
-@@ -334,13 +334,36 @@ __glXDRIbindTexImage(__GLXcontext *baseC
+--- ./GL/glx/glxcmds.c.tfp-damage	2006-05-09 13:44:26.000000000 -0400
++++ ./GL/glx/glxcmds.c	2006-06-19 20:12:48.000000000 -0400
+@@ -1271,6 +1271,7 @@
+     pGlxPixmap->pGlxScreen = pGlxScreen;
+     pGlxPixmap->pScreen = pScreen;
+     pGlxPixmap->idExists = True;
++    pGlxPixmap->pDamage = NULL;
+     pGlxPixmap->refcnt = 0;
+ 
+     pGlxPixmap->modes = modes;
+--- ./GL/glx/glxdri.c.tfp-damage	2006-04-02 21:25:21.000000000 -0400
++++ ./GL/glx/glxdri.c	2006-06-20 20:09:20.000000000 -0400
+@@ -326,7 +326,6 @@
+  * - No fbconfig handling for TEXTURE_TARGET
+  * - No fbconfig exposure of Y inversion state
+  * - No GenerateMipmapEXT support (due to no FBO support)
+- * - No damage tracking between binds
+  * - No support for anything but 16bpp and 32bpp-sparse pixmaps
+  */
+ 
+@@ -335,38 +334,92 @@
  		     int buffer,
  		     __GLXpixmap *glxPixmap)
  {
 +    RegionPtr	pRegion;
      PixmapPtr	pixmap;
--    int		bpp;
+     int		bpp;
 -    Bool	npot;
-+    int		bpp, xoff, yoff, width, height;
 +    GLenum	target, format, type;
  
      pixmap = (PixmapPtr) glxPixmap->pDraw;
 -    bpp = pixmap->drawable.depth >= 24 ? 4 : 2; /* XXX 24bpp packed, 8, etc */
 -    
+-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
+-                                       pixmap->devKind / bpp) );
+-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
+-                                       pixmap->drawable.y) );
+-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
+-                                       pixmap->drawable.x) );
 +    if (!glxPixmap->pDamage) {
 +        glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,
 +					  TRUE, glxPixmap->pScreen, NULL);
@@ -68,6 +64,7 @@
 +            return BadAlloc;
 +
 +	DamageRegister ((DrawablePtr) pixmap, glxPixmap->pDamage);
++	pRegion = NULL;
 +    } else {
 +	pRegion = DamageRegion(glxPixmap->pDamage);
 +	if (REGION_NIL(pRegion))
@@ -84,11 +81,7 @@
 +	format = GL_RGB;
 +	type = GL_UNSIGNED_SHORT_5_6_5;
 +    }
-+
-     CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
-                                        pixmap->devKind / bpp) );
-     CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
-@@ -351,22 +374,27 @@ __glXDRIbindTexImage(__GLXcontext *baseC
+ 
      if (pixmap->drawable.depth == 24)
          glxFillAlphaChannel(pixmap);
  
@@ -97,6 +90,16 @@
 -             strstr(CALL_GetString(GL_EXTENSIONS,
 -                    "GL_ARB_texture_non_power_of_two")) */ ;
 -    
+-    CALL_TexImage2D( GET_DISPATCH(),
+-		     ( npot ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D,
+-		       0,
+-		       bpp == 4 ? 4 : 3,
+-		       pixmap->drawable.width,
+-		       pixmap->drawable.height,
+-		       0,
+-		       bpp == 4 ? GL_BGRA : GL_RGB,
+-		       bpp == 4 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5,
+-		       pixmap->devPrivate.ptr ) );
 +    if (!(glxCountBits(pixmap->drawable.width) == 1 &&
 +	  glxCountBits(pixmap->drawable.height) == 1)
 +	/* || strstr(CALL_GetString(GL_EXTENSIONS,
@@ -105,33 +108,56 @@
 +    else
 +	target = GL_TEXTURE_2D;
 +
-     CALL_TexImage2D( GET_DISPATCH(),
--		     ( npot ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D,
-+		     ( target,
- 		       0,
- 		       bpp == 4 ? 4 : 3,
- 		       pixmap->drawable.width,
- 		       pixmap->drawable.height,
- 		       0,
--		       bpp == 4 ? GL_BGRA : GL_RGB,
--		       bpp == 4 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5,
-+		       format,
-+		       type,
- 		       pixmap->devPrivate.ptr ) );
- 
-+    DamageEmpty(glxPixmap->pDamage);
++    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
++				       pixmap->devKind / bpp) );
++    if (pRegion == NULL)
++    {
++        CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
++					   pixmap->drawable.x) );
++	CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
++					   pixmap->drawable.y) );
++
++	CALL_TexImage2D( GET_DISPATCH(),
++			 (target,
++			  0,
++			  bpp == 4 ? 4 : 3,
++			  pixmap->drawable.width,
++			  pixmap->drawable.height,
++			  0,
++			  format,
++			  type,
++			  pixmap->devPrivate.ptr) );
++    } else {
++        int i, numRects;
++	BoxPtr p;
++
++	numRects = REGION_NUM_RECTS (pRegion);
++	p = REGION_RECTS (pRegion);
++	for (i = 0; i < numRects; i++)
++	{
++	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
++					       pixmap->drawable.x + p[i].x1) );
++	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
++					       pixmap->drawable.y + p[i].y1) );
++
++	    CALL_TexSubImage2D( GET_DISPATCH(),
++				(target,
++				 0,
++				 p[i].x1, p[i].y1,
++				 p[i].x2 - p[i].x1, p[i].y2 - p[i].y1,
++				 format,
++				 type,
++				 pixmap->devPrivate.ptr) );
++	}
++    }
 +
++    DamageEmpty(glxPixmap->pDamage);
+ 
      return Success;
  }
- 
-Index: GL/glx/glxext.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxext.c,v
-retrieving revision 1.6.10.3
-diff -u -p -r1.6.10.3 glxext.c
---- GL/glx/glxext.c	6 Mar 2006 00:11:40 -0000	1.6.10.3
-+++ GL/glx/glxext.c	6 Mar 2006 00:38:37 -0000
-@@ -140,6 +140,10 @@ static int PixmapGone(__GLXpixmap *pGlxP
+--- ./GL/glx/glxext.c.tfp-damage	2006-03-16 20:47:25.000000000 -0500
++++ ./GL/glx/glxext.c	2006-06-19 20:12:48.000000000 -0400
+@@ -141,6 +141,10 @@
  
      pGlxPixmap->idExists = False;
      if (!pGlxPixmap->refcnt) {


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- xorg-x11-server.spec	20 Jun 2006 04:56:00 -0000	1.97
+++ xorg-x11-server.spec	21 Jun 2006 00:12:03 -0000	1.98
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   20
+Release:   21
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -637,6 +637,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-21
+- Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D
+  to only update the part of the texture that changed, based on damage
+  regions.
+
 * Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-20
 - Remove with_xnest_server conditional, and fix more BuildRequires to pull
   in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.



From fedora-cvs-commits at redhat.com  Wed Jun 21 01:39:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 21:39:29 -0400
Subject: rpms/pirut/devel .cvsignore, 1.25, 1.26 pirut.spec, 1.26,
	1.27 sources, 1.26, 1.27
Message-ID: <200606210139.k5L1dTnV001064@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1014/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.4-1 on branch devel from pirut-1.1.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	15 Jun 2006 19:38:29 -0000	1.25
+++ .cvsignore	21 Jun 2006 01:39:27 -0000	1.26
@@ -1 +1 @@
-pirut-1.1.3.tar.gz
+pirut-1.1.4.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pirut.spec	15 Jun 2006 19:38:30 -0000	1.26
+++ pirut.spec	21 Jun 2006 01:39:27 -0000	1.27
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.3
+Version: 1.1.4
 Release: 1
 License: GPL
 Group: Applications/System
@@ -10,7 +10,7 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0-4, comps-extras, rhpl
-Requires: gnome-python2-libegg, gnome-python2-gconf, pygobject2
+Requires: gnome-python2-libegg, gnome-python2-gconf
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 1.1.4-1
+- work with either yum 2.9.0 or 2.9.1
+
 * Thu Jun 15 2006 Bill Nottingham <notting at redhat.com> - 1.1.3-1
 - add pygobject2 dep
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	15 Jun 2006 19:38:30 -0000	1.26
+++ sources	21 Jun 2006 01:39:27 -0000	1.27
@@ -1 +1 @@
-6acac1ce02e2cdde9af76e8c5b24ec69  pirut-1.1.3.tar.gz
+5a4a49b0b872a7265e5666184577ad41  pirut-1.1.4.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 21 01:46:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 21:46:24 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.11,1.12
Message-ID: <200606210146.k5L1kOcA010858@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10202

Modified Files:
	policy-20060608.patch 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
- Update to upstream


policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    9 +
 modules/admin/consoletype.te       |    7 +
 modules/admin/logwatch.te          |    3 
 modules/admin/netutils.te          |    1 
 modules/admin/prelink.fc           |    3 
 modules/kernel/files.if            |   20 +++
 modules/kernel/filesystem.te       |    5 
 modules/kernel/kernel.if           |   38 ++++++
 modules/services/apache.fc         |    1 
 modules/services/apache.if         |   79 +++++++++++++-
 modules/services/apache.te         |   50 +++++++--
 modules/services/automount.te      |   13 ++
 modules/services/clamav.if         |   20 +++
 modules/services/cups.fc           |    1 
 modules/services/cups.if           |    2 
 modules/services/cups.te           |   10 +
 modules/services/hal.if            |   20 +++
 modules/services/mta.te            |    5 
 modules/services/networkmanager.te |    1 
 modules/services/ntp.te            |    1 
 modules/services/openvpn.te        |    3 
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.if        |   25 ++++
 modules/services/postfix.te        |    1 
 modules/services/ppp.te            |    1 
 modules/services/procmail.te       |    1 
 modules/services/tftp.te           |    1 
 modules/system/authlogin.if        |    1 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/mount.te            |    1 
 modules/system/selinuxutil.te      |    2 
 modules/system/unconfined.fc       |    2 
 modules/system/userdomain.if       |  204 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 modules/system/xen.te              |   12 +-
 39 files changed, 502 insertions(+), 130 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policy-20060608.patch	20 Jun 2006 21:06:30 -0000	1.11
+++ policy-20060608.patch	21 Jun 2006 01:46:22 -0000	1.12
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.48/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/global_tunables	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/global_tunables	2006-06-20 17:23:37.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -17,7 +17,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.48/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/bootloader.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/bootloader.te	2006-06-20 17:23:37.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -54,7 +54,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.48/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-20 17:23:37.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -71,7 +71,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.48/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/logwatch.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/logwatch.te	2006-06-20 17:23:37.000000000 -0400
 @@ -22,8 +22,7 @@
  #
  # Local policy
@@ -84,7 +84,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.48/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/netutils.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/netutils.te	2006-06-20 17:23:37.000000000 -0400
 @@ -54,6 +54,7 @@
  corenet_udp_sendrecv_all_ports(netutils_t)
  corenet_tcp_connect_all_ports(netutils_t)
@@ -95,7 +95,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.48/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/prelink.fc	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/prelink.fc	2006-06-20 17:23:37.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -106,30 +106,8 @@
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.48/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/files.if	2006-06-20 10:16:12.000000000 -0400
-@@ -1931,6 +1931,21 @@
- ')
- 
- ########################################
-+#
-+# files_unlink_boot_flag(domain)
-+#
-+# /halt, /.autofsck, etc
-+#
-+interface(`files_unlink_boot_flag',`
-+	gen_require(`
-+		type root_t;
-+	')
-+
-+	allow $1 root_t:file unlink;
-+')
-+
-+
-+########################################
- ## <summary>
- ##	Read files in /etc that are dynamically
- ##	created on boot, such as mtab.
-@@ -4379,3 +4394,23 @@
++++ serefpolicy-2.2.48/policy/modules/kernel/files.if	2006-06-20 17:24:32.000000000 -0400
+@@ -4379,3 +4379,23 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -155,7 +133,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.48/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-20 09:54:01.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/filesystem.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/filesystem.te	2006-06-20 17:23:37.000000000 -0400
 @@ -48,6 +48,11 @@
  files_mountpoint(binfmt_misc_fs_t)
  genfscon binfmt_misc / gen_context(system_u:object_r:binfmt_misc_fs_t,s0)
@@ -170,7 +148,7 @@
  genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.48/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-20 17:23:37.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -215,7 +193,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.48/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.fc	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.fc	2006-06-20 17:23:37.000000000 -0400
 @@ -78,3 +78,4 @@
  /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
@@ -223,7 +201,7 @@
 +/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.48/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.if	2006-06-20 16:00:09.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.if	2006-06-20 17:23:37.000000000 -0400
 @@ -15,6 +15,7 @@
  	gen_require(`
  		attribute httpdcontent;
@@ -349,7 +327,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.48/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-20 09:54:04.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.te	2006-06-20 17:23:37.000000000 -0400
 @@ -109,13 +109,10 @@
  type squirrelmail_spool_t;
  files_tmp_file(squirrelmail_spool_t)
@@ -427,7 +405,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.48/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/automount.te	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/automount.te	2006-06-20 17:23:37.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -460,7 +438,7 @@
  corecmd_exec_shell(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.2.48/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/clamav.if	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/clamav.if	2006-06-20 17:23:37.000000000 -0400
 @@ -84,3 +84,23 @@
  	allow clamscan_t $1:process sigchld;
  ')
@@ -487,7 +465,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.48/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2006-04-19 11:26:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/cups.fc	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.fc	2006-06-20 17:23:37.000000000 -0400
 @@ -24,6 +24,7 @@
  
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
@@ -498,7 +476,7 @@
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.48/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/services/cups.if	2006-06-20 10:16:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.if	2006-06-20 17:23:37.000000000 -0400
 @@ -40,7 +40,7 @@
  
  	files_search_pids($1)
@@ -510,7 +488,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.48/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-06-20 09:54:04.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/cups.te	2006-06-20 10:37:06.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.te	2006-06-20 17:23:37.000000000 -0400
 @@ -313,6 +313,7 @@
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
@@ -572,7 +550,7 @@
  # PTAL local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.48/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/services/hal.if	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/hal.if	2006-06-20 17:23:37.000000000 -0400
 @@ -140,3 +140,23 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -599,7 +577,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.48/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/mta.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/mta.te	2006-06-20 17:23:37.000000000 -0400
 @@ -195,8 +195,3 @@
  	')
  ')
@@ -611,7 +589,7 @@
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.48/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/networkmanager.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/networkmanager.te	2006-06-20 17:23:37.000000000 -0400
 @@ -92,6 +92,7 @@
  logging_send_syslog_msg(NetworkManager_t)
  
@@ -622,7 +600,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.48/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/ntp.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/ntp.te	2006-06-20 17:23:37.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -633,7 +611,7 @@
  corenet_tcp_sendrecv_all_if(ntpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.2.48/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/openvpn.te	2006-06-20 10:37:57.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/openvpn.te	2006-06-20 17:23:37.000000000 -0400
 @@ -44,6 +44,7 @@
  allow openvpn_t openvpn_var_run_t:file create_file_perms;
  files_pid_filetrans(openvpn_t, openvpn_var_run_t, file)
@@ -653,7 +631,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.48/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-20 17:23:37.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -689,7 +667,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.48/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-20 17:23:37.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -708,7 +686,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.2.48/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/postfix.if	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/postfix.if	2006-06-20 17:23:37.000000000 -0400
 @@ -459,3 +459,28 @@
  
  	typeattribute $1 postfix_user_domtrans;
@@ -740,7 +718,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.48/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/postfix.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/postfix.te	2006-06-20 17:23:37.000000000 -0400
 @@ -456,6 +456,7 @@
  ')
  
@@ -751,7 +729,7 @@
  	cron_use_system_job_fds(postfix_postdrop_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.48/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/ppp.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/ppp.te	2006-06-20 17:23:37.000000000 -0400
 @@ -68,6 +68,7 @@
  allow pppd_t self:tcp_socket create_stream_socket_perms;
  allow pppd_t self:udp_socket { connect connected_socket_perms };
@@ -762,7 +740,7 @@
  allow pppd_t pptp_t:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.48/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/procmail.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/procmail.te	2006-06-20 17:23:37.000000000 -0400
 @@ -78,6 +78,7 @@
  
  optional_policy(`
@@ -773,7 +751,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.48/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 17:23:37.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -784,7 +762,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.48/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/authlogin.if	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/authlogin.if	2006-06-20 17:23:37.000000000 -0400
 @@ -1292,6 +1292,7 @@
  
  	sysnet_dns_name_resolve($1)
@@ -795,7 +773,7 @@
  		nis_use_ypbind($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.48/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-20 17:23:37.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -810,7 +788,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.48/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-20 17:23:37.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -825,20 +803,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.48/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/init.te	2006-06-20 10:16:13.000000000 -0400
-@@ -345,6 +345,7 @@
- files_mounton_isid_type_dirs(initrc_t)
- files_list_default(initrc_t)
- files_mounton_default(initrc_t)
-+files_unlink_boot_flag(initrc_t)
- 
- libs_rw_ld_so_cache(initrc_t)
- libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.48/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/libraries.fc	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/libraries.fc	2006-06-20 17:23:37.000000000 -0400
 @@ -121,7 +121,7 @@
  
  /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -850,7 +817,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.48/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/mount.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/mount.te	2006-06-20 17:23:37.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -861,7 +828,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.48/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-20 17:23:37.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -873,7 +840,7 @@
  # cjp: why is this needed?
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.48/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/unconfined.fc	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/unconfined.fc	2006-06-20 17:23:37.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -883,7 +850,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.48/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-20 09:54:08.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-20 15:18:00.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-20 17:23:37.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1228,7 +1195,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.48/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-20 15:04:12.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-20 17:23:37.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1293,7 +1260,7 @@
  	allow privhome home_root_t:dir { getattr search };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.48/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/xen.te	2006-06-20 10:16:13.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/xen.te	2006-06-20 17:23:37.000000000 -0400
 @@ -68,7 +68,8 @@
  # xend local policy
  #



From fedora-cvs-commits at redhat.com  Wed Jun 21 02:26:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 22:26:33 -0400
Subject: rpms/autofs/devel autofs.spec,1.110,1.111
Message-ID: <200606210226.k5L2QXPB012611@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12537

Modified Files:
	autofs.spec 
Log Message:
* Wed Jun 21 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-2
- Add openssl-devel to the BuildRequires, as it is needed for the LDAP
  authentication bitsi also.



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- autofs.spec	20 Jun 2006 04:28:39 -0000	1.110
+++ autofs.spec	21 Jun 2006 02:26:31 -0000	1.111
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta5
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -12,7 +12,7 @@
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
 Buildroot: /var/tmp/autofs-tmp
-BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel
+BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
 Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps
 Obsoletes: autofs-ldap
@@ -104,6 +104,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jun 21 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-2
+- Add openssl-devel to the BuildRequires, as it is needed for the LDAP
+  authentication bitsi also.
+
 * Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-1
 - promote to beta5.
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 03:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 20 Jun 2006 23:56:37 -0400
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils-cflags.patch,
	NONE, 1.1 iscsi.init, NONE, 1.1 iscsistart-static.patch, NONE,
	1.1 iscsi-initiator-utils.spec, 1.11, 1.12
Message-ID: <200606210356.k5L3ubkM020293@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20276

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	iscsi-initiator-utils-cflags.patch iscsi.init 
	iscsistart-static.patch 
Log Message:
* Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 6.0.5.595-1
- ensure that we respect %{optflags}
- cleaned up initscript to make use of standard functions, return right 
  values and start by default
- build iscsistart as a static binary for use in initrds


iscsi-initiator-utils-cflags.patch:
 usr/Makefile   |    6 +++---
 utils/Makefile |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE iscsi-initiator-utils-cflags.patch ---
--- open-iscsi-6.0.5.595/utils/Makefile.cflags	2006-06-20 21:36:08.000000000 -0400
+++ open-iscsi-6.0.5.595/utils/Makefile	2006-06-20 21:36:58.000000000 -0400
@@ -1,12 +1,13 @@
 # This Makefile will work only with GNU make.
 
-CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g
+OPTFLAGS ?= -O2 -g
+CFLAGS += $(OPTFLAGS) -fno-inline -Wall -Wstrict-prototypes
 PROGRAMS = iscsi-iname
 
 all: $(PROGRAMS)
 
 iscsi-iname: md5.o iscsi-iname.o
-	$(CC) $^ $(DBM_LIB) -o $@
+	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
 
 clean:
 	rm -f *.o $(PROGRAMS)
--- open-iscsi-6.0.5.595/usr/Makefile.cflags	2006-06-20 21:35:55.000000000 -0400
+++ open-iscsi-6.0.5.595/usr/Makefile	2006-06-20 21:36:25.000000000 -0400
@@ -45,13 +45,13 @@
 all: $(PROGRAMS)
 
 iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
-	$(CC) $^ $(DBM_LIB) -o $@
+	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
 
 iscsiadm: $(COMMON_SRCS) strings.o discovery.o iscsiadm.o
-	$(CC) $^ $(DBM_LIB) -o $@
+	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
 
 iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o
-	$(CC) $^ -o $@
+	$(CC) $(CFLAGS) $^ -o $@
 
 clean:
 	rm -f *.o $(PROGRAMS)


--- NEW FILE iscsi.init ---
#!/bin/sh
#
# chkconfig: 345 13 89
# description: Starts and stops the iSCSI initiator
#
# processname: iscsid
# pidfile: /var/run/iscsid.pid
# config:  /etc/iscsid.conf

# Source function library.
. /etc/init.d/functions

PATH=/sbin:/bin:/usr/sbin:/usr/bin

RETVAL=0

start()
{
	echo -n $"Starting iSCSI initiator service: "
	modprobe -q iscsi_tcp
	daemon iscsid
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] || return

	touch /var/lock/subsys/iscsi

	echo -n $"Setting up iSCSI targets: "
	TARGETS=`iscsiadm -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1 at g'`
	for rec in $TARGETS; do
		STARTUP=`iscsiadm -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
		if [ $STARTUP = "automatic" ]; then
			iscsiadm -m node -r $rec -l
		fi
	done
	success
	echo

}

stop()
{
	echo -n $"Stopping iSCSI initiator service: "
	sync
	TARGETS=`iscsiadm -m session | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
	for rec in $TARGETS; do
	    iscsiadm -m node -r $rec -u
	done

	killproc iscsid
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/iscsi

	modprobe -r iscsi_tcp 2>/dev/null
}

restart()
{
	stop
	start
}

case "$1" in
	start)
		start
		;;
	stop)
		stop
		;;
	restart)
	        stop
		start
		;;
	status)
		status iscsid
		RETVAL=$?
		;;
        condrestart)
	        [ -f /var/lock/subsys/iscsi ] && restart
		;;
	*)
		echo $"Usage: $0 {start|stop|restart|status|condrestart}"
		exit 1
esac

exit $RETVAL

iscsistart-static.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE iscsistart-static.patch ---
--- open-iscsi-6.0.5.595/usr/Makefile.static	2006-06-20 23:21:15.000000000 -0400
+++ open-iscsi-6.0.5.595/usr/Makefile	2006-06-20 23:22:59.000000000 -0400
@@ -51,7 +51,7 @@
 	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
 
 iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o
-	$(CC) $(CFLAGS) $^ -o $@
+	$(CC) -static $(CFLAGS) $^ -o $@
 
 clean:
 	rm -f *.o $(PROGRAMS)


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- iscsi-initiator-utils.spec	8 Jun 2006 19:00:45 -0000	1.11
+++ iscsi-initiator-utils.spec	21 Jun 2006 03:56:34 -0000	1.12
@@ -1,12 +1,15 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.0.5.595
-Release: 0
+Release: 1
 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
+Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
 Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
 Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch
 Patch3: open-iscsi-5.0.5.595-fc-version.patch
+Patch4: iscsi-initiator-utils-cflags.patch
+Patch5: iscsistart-static.patch
 
 Group: System Environment/Daemons
 License: GPL
@@ -23,21 +26,19 @@
 Protocol networks.
 
 %prep
-%setup -q -n %{name}-%{version} -c
-cd open-iscsi-%{version}
+%setup -q -n open-iscsi-%{version}
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .add-iscsi-iname
 %patch2 -p1 -b .rm-reopen-max
 %patch3 -p1 -b .fc-version
+%patch4 -p1 -b .cflags
+%patch5 -p1 -b .static
 
 %build
-cd open-iscsi-%{version}
-make -C usr
-make -C utils
+make OPTFLAGS="%{optflags}" -C usr
+make OPTFLAGS="%{optflags}" -C utils
 
 %install
-cd open-iscsi-%{version}
-
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
@@ -46,9 +47,11 @@
 install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
 install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
-install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
+#install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc
 
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,7 +59,6 @@
 if [ ! -f /etc/initiatorname.iscsi ]; then
 	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
 fi
-
 /sbin/chkconfig --add iscsi
 
 %preun
@@ -66,14 +68,20 @@
 
 %files
 %defattr(-,root,root)
+%doc README
 %config /etc/rc.d/init.d/iscsi
-%attr(600,root,root) %config(noreplace) /etc/iscsid.conf
-%doc open-iscsi-%{version}/README
+%attr(0600,root,root) %config(noreplace) /etc/iscsid.conf
 %dir /var/db/iscsi
 /sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 6.0.5.595-1
+- ensure that we respect %%{optflags}
+- cleaned up initscript to make use of standard functions, return right 
+  values and start by default
+- build iscsistart as a static binary for use in initrds
+
 * Tue May 30 2006 Mike Christie <mchristi at redhat.com>
 - rebase package to svn rev 595 to fix several bugs
   NOTE!!!!!!!! This is not compatible with the older open-iscsi modules



From fedora-cvs-commits at redhat.com  Wed Jun 21 04:16:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 00:16:13 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.284, 1.285 anaconda.spec, 1.408,
	1.409 sources, 1.405, 1.406
Message-ID: <200606210416.k5L4GDOB000409@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv349/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.46-1 on branch devel from anaconda-11.1.0.46-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- .cvsignore	16 Jun 2006 18:53:59 -0000	1.284
+++ .cvsignore	21 Jun 2006 04:16:07 -0000	1.285
@@ -1 +1 @@
-anaconda-11.1.0.45.tar.bz2
+anaconda-11.1.0.46.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- anaconda.spec	16 Jun 2006 18:53:59 -0000	1.408
+++ anaconda.spec	21 Jun 2006 04:16:07 -0000	1.409
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.45
+Version: 11.1.0.46
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.46-1
+- more tweaking of greek lang-table (#193872)
+- mark some strings for translation (#194617)
+- add back handling of ksdevice=macaddr (dcantrel, #195907) 
+- copy libnss_dns* and libnss_files* to stage1 image to try to fix some 
+  of the dhcp oddities (dcantrel)
+- fix setupPythonUpdates (clumens)
+- wait for usb to be stable when reloading (pjones)
+- don't pass netlogger output as a format specifier (pjones)
+- fix traceback in zfcp_gui (#196097)
+- sort drive list more correctly in autopartitioning
+- bunch of tweaking to iscsi code
+- ensure that xvd devices are sorted as "first" so they're in front 
+  of things like iscsi devices
+
 * Fri Jun 16 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.45-1
 - setfiles moved.  more fixing of policy
 - Give info on when we add packages as deps (#189050)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- sources	16 Jun 2006 18:53:59 -0000	1.405
+++ sources	21 Jun 2006 04:16:07 -0000	1.406
@@ -1 +1 @@
-90a9c2ef50efa6733da0004c238c00f8  anaconda-11.1.0.45.tar.bz2
+8f07fc269bd9596b43aed2648cb22981  anaconda-11.1.0.46.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 04:19:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 00:19:12 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.110, 1.111 mkinitrd.spec, 1.127,
	1.128 sources, 1.123, 1.124 mkinitrd-5.0.41-nodm.patch, 1.1,
	NONE mkinitrd-5.0.41-sbp2.patch, 1.1,
	NONE mkinitrd-5.0.41-stabilized.patch, 1.1, NONE
Message-ID: <200606210419.k5L4J68t004769@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4436/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Removed Files:
	mkinitrd-5.0.41-nodm.patch mkinitrd-5.0.41-sbp2.patch 
	mkinitrd-5.0.41-stabilized.patch 
Log Message:
auto-import mkinitrd-5.0.42-1 on branch devel from mkinitrd-5.0.42-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- .cvsignore	24 May 2006 21:54:25 -0000	1.110
+++ .cvsignore	21 Jun 2006 04:19:01 -0000	1.111
@@ -1 +1 @@
-mkinitrd-5.0.41.tar.bz2
+mkinitrd-5.0.42.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mkinitrd.spec	5 Jun 2006 17:35:43 -0000	1.127
+++ mkinitrd.spec	21 Jun 2006 04:19:03 -0000	1.128
@@ -1,13 +1,10 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.41
-Release: 4
+Version: 5.0.42
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: mkinitrd-%{version}.tar.bz2
-Patch0: mkinitrd-5.0.41-sbp2.patch
-Patch1: mkinitrd-5.0.41-stabilized.patch
-Patch2: mkinitrd-5.0.41-nodm.patch
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -41,9 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .sbp2
-%patch1 -p1 -b .stabilized
-%patch2 -p1 -b .nodm
 
 %build
 make
@@ -69,15 +63,14 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
-* Mon Jun  5 2006 Peter Jones <pjones at redhat.com> - 5.0.41-4
-- Fix my bad shell code to detect DMs in use.
-
-* Tue May 30 2006 Peter Jones <pjones at redhat.com> - 5.0.41-3
-- rebuild on all arches
-
-* Sat May 27 2006 Peter Jones <pjones at redhat.com> - 5.0.41-2
-- fix "stabilized" to actually stat where appropriate
-- use stabilized for sbp2 (firewire) as well
+* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.42-1
+- add a hack to handle xennet devices not having a modalias (#196104)
+- initial pass at support for root on iscsi (patch from Patrick 
+  Mansfield <patmans at us.ibm.com>)
+
+* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> 
+- Fixes for stateless/diskless configurations (patch from Jeff Law,
+  <law at redhat.com>)
 
 * Wed May 24 2006 Peter Jones <pjones at redhat.com> - 5.0.41-1
 - (very) basic multipath support


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources	24 May 2006 21:54:25 -0000	1.123
+++ sources	21 Jun 2006 04:19:03 -0000	1.124
@@ -1 +1 @@
-6502ff3a9c08c948d438735bff4740ed  mkinitrd-5.0.41.tar.bz2
+451438f1f30cb5ecb5f8f83025d596f8  mkinitrd-5.0.42.tar.bz2


--- mkinitrd-5.0.41-nodm.patch DELETED ---


--- mkinitrd-5.0.41-sbp2.patch DELETED ---


--- mkinitrd-5.0.41-stabilized.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 05:23:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 01:23:45 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-tfp-damage.patch,
	1.2, 1.3
Message-ID: <200606210523.k5L5Nj27026927@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26900

Modified Files:
	xorg-x11-server-1.1.0-tfp-damage.patch 
Log Message:
Update xorg-x11-server-1.1.0-tfp-damage.patch to only fill alpha channel
for damaged region.

xorg-x11-server-1.1.0-tfp-damage.patch:
 glxcmds.c     |    1 
 glxdrawable.h |    4 +
 glxdri.c      |  142 ++++++++++++++++++++++++++++++++++++++++------------------
 glxext.c      |    4 +
 4 files changed, 108 insertions(+), 43 deletions(-)

Index: xorg-x11-server-1.1.0-tfp-damage.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-tfp-damage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.0-tfp-damage.patch	21 Jun 2006 00:12:03 -0000	1.2
+++ xorg-x11-server-1.1.0-tfp-damage.patch	21 Jun 2006 05:23:41 -0000	1.3
@@ -1,5 +1,5 @@
 --- ./GL/glx/glxdrawable.h.tfp-damage	2006-03-11 19:11:33.000000000 -0500
-+++ ./GL/glx/glxdrawable.h	2006-06-19 20:12:48.000000000 -0400
++++ ./GL/glx/glxdrawable.h	2006-06-20 20:33:53.000000000 -0400
 @@ -41,6 +41,8 @@
  **
  */
@@ -19,7 +19,7 @@
  
  struct __GLXdrawable {
 --- ./GL/glx/glxcmds.c.tfp-damage	2006-05-09 13:44:26.000000000 -0400
-+++ ./GL/glx/glxcmds.c	2006-06-19 20:12:48.000000000 -0400
++++ ./GL/glx/glxcmds.c	2006-06-20 20:33:53.000000000 -0400
 @@ -1271,6 +1271,7 @@
      pGlxPixmap->pGlxScreen = pGlxScreen;
      pGlxPixmap->pScreen = pScreen;
@@ -29,8 +29,41 @@
  
      pGlxPixmap->modes = modes;
 --- ./GL/glx/glxdri.c.tfp-damage	2006-04-02 21:25:21.000000000 -0400
-+++ ./GL/glx/glxdri.c	2006-06-20 20:09:20.000000000 -0400
-@@ -326,7 +326,6 @@
++++ ./GL/glx/glxdri.c	2006-06-21 00:39:40.000000000 -0400
+@@ -296,24 +296,18 @@
+ }
+ 
+ static void
+-glxFillAlphaChannel (PixmapPtr pixmap)
++glxFillAlphaChannel (PixmapPtr pixmap, int x, int y, int width, int height)
+ {
+-    int i, j;
+-    CARD32 *pixels = (CARD32 *)pixmap->devPrivate.ptr;
++    int i;
++    CARD32 *p, *end, *pixels = (CARD32 *)pixmap->devPrivate.ptr;
+     CARD32 rowstride = pixmap->devKind / 4;
+-    CARD32 x, y;
+-
+-    x = pixmap->drawable.x;
+-    y = pixmap->drawable.y;
+     
+-    for (i = y; i < pixmap->drawable.height + y; ++i)
++    for (i = y; i < y + height; i++)
+     {
+-        for (j = x; j < pixmap->drawable.width + x; ++j)
+-        {
+-            int index = i * rowstride + j;
+-
+-            pixels[index] |= 0xFF000000;
+-        }
++	p = &pixels[i * rowstride + x];
++	end = p + width;
++	while (p < end)
++	  *p++ |= 0xFF000000;
+     }
+ }
+ 
+@@ -326,7 +320,6 @@
   * - No fbconfig handling for TEXTURE_TARGET
   * - No fbconfig exposure of Y inversion state
   * - No GenerateMipmapEXT support (due to no FBO support)
@@ -38,7 +71,7 @@
   * - No support for anything but 16bpp and 32bpp-sparse pixmaps
   */
  
-@@ -335,38 +334,92 @@
+@@ -335,38 +328,103 @@
  		     int buffer,
  		     __GLXpixmap *glxPixmap)
  {
@@ -51,12 +84,6 @@
      pixmap = (PixmapPtr) glxPixmap->pDraw;
 -    bpp = pixmap->drawable.depth >= 24 ? 4 : 2; /* XXX 24bpp packed, 8, etc */
 -    
--    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
--                                       pixmap->devKind / bpp) );
--    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
--                                       pixmap->drawable.y) );
--    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
--                                       pixmap->drawable.x) );
 +    if (!glxPixmap->pDamage) {
 +        glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,
 +					  TRUE, glxPixmap->pScreen, NULL);
@@ -81,10 +108,25 @@
 +	format = GL_RGB;
 +	type = GL_UNSIGNED_SHORT_5_6_5;
 +    }
- 
-     if (pixmap->drawable.depth == 24)
-         glxFillAlphaChannel(pixmap);
- 
++
++    if (!(glxCountBits(pixmap->drawable.width) == 1 &&
++	  glxCountBits(pixmap->drawable.height) == 1)
++	/* || strstr(CALL_GetString(GL_EXTENSIONS,
++	             "GL_ARB_texture_non_power_of_two")) */)
++	target = GL_TEXTURE_RECTANGLE_ARB;
++    else
++	target = GL_TEXTURE_2D;
++
+     CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
+-                                       pixmap->devKind / bpp) );
+-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
+-                                       pixmap->drawable.y) );
+-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
+-                                       pixmap->drawable.x) );
+-
+-    if (pixmap->drawable.depth == 24)
+-        glxFillAlphaChannel(pixmap);
+-
 -    npot = !(glxCountBits(pixmap->drawable.width) == 1 &&
 -             glxCountBits(pixmap->drawable.height) == 1) /* ||
 -             strstr(CALL_GetString(GL_EXTENSIONS,
@@ -100,18 +142,16 @@
 -		       bpp == 4 ? GL_BGRA : GL_RGB,
 -		       bpp == 4 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5,
 -		       pixmap->devPrivate.ptr ) );
-+    if (!(glxCountBits(pixmap->drawable.width) == 1 &&
-+	  glxCountBits(pixmap->drawable.height) == 1)
-+	/* || strstr(CALL_GetString(GL_EXTENSIONS,
-+	             "GL_ARB_texture_non_power_of_two")) */)
-+	target = GL_TEXTURE_RECTANGLE_ARB;
-+    else
-+	target = GL_TEXTURE_2D;
-+
-+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
 +				       pixmap->devKind / bpp) );
 +    if (pRegion == NULL)
 +    {
++	if (pixmap->drawable.depth == 24)
++	    glxFillAlphaChannel(pixmap,
++				pixmap->drawable.x,
++				pixmap->drawable.y,
++				pixmap->drawable.width,
++				pixmap->drawable.height);
++
 +        CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
 +					   pixmap->drawable.x) );
 +	CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
@@ -135,6 +175,13 @@
 +	p = REGION_RECTS (pRegion);
 +	for (i = 0; i < numRects; i++)
 +	{
++	    if (pixmap->drawable.depth == 24)
++		glxFillAlphaChannel(pixmap,
++				    pixmap->drawable.x + p[i].x1,
++				    pixmap->drawable.y + p[i].y1,
++				    p[i].x2 - p[i].x1,
++				    p[i].y2 - p[i].y1);
++
 +	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
 +					       pixmap->drawable.x + p[i].x1) );
 +	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
@@ -156,7 +203,7 @@
      return Success;
  }
 --- ./GL/glx/glxext.c.tfp-damage	2006-03-16 20:47:25.000000000 -0500
-+++ ./GL/glx/glxext.c	2006-06-19 20:12:48.000000000 -0400
++++ ./GL/glx/glxext.c	2006-06-20 20:33:53.000000000 -0400
 @@ -141,6 +141,10 @@
  
      pGlxPixmap->idExists = False;



From fedora-cvs-commits at redhat.com  Wed Jun 21 08:09:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 04:09:14 -0400
Subject: rpms/xorg-x11-xdm/devel xdm-1.0.4-setuid.diff, NONE,
	1.1 xorg-x11-xdm.spec, 1.22, 1.23
Message-ID: <200606210809.k5L89Eef031987@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31947

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.0.4-setuid.diff 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.4-3
- Added xdm-1.0.4-setuid.diff to fix potential security issue (#196094)
- Added temporary "BuildRequires: autoconf, automake, libtool" dependencies
  for mock builds, for as long as we need to run autotools at compile time.


xdm-1.0.4-setuid.diff:
 session.c  |   10 ++++++++--
 xdmshell.c |    6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE xdm-1.0.4-setuid.diff ---
Index: session.c
===================================================================
RCS file: /cvs/xorg/app/xdm/session.c,v
retrieving revision 1.7
diff -u -r1.7 session.c
--- session.c	3 Jun 2006 00:05:24 -0000	1.7
+++ session.c	19 Jun 2006 21:30:50 -0000
@@ -492,8 +492,14 @@
     else
 	ResetServer (d);
     if (removeAuth) {
-	setgid (verify.gid);
-	setuid (verify.uid);
+	if (setgid (verify.gid) == -1) {
+	    LogError( "SessionExit: setgid: %s\n", strerror(errno));
+	    exit(status);
+	}
+	if (setuid (verify.uid) == -1) {
+	    LogError( "SessionExit: setuid: %s\n", strerror(errno));
+	    exit(status);
+	}
 	RemoveUserAuthorization (d, &verify);
 #if defined(K5AUTH) && !defined(USE_PAM)   /* PAM modules should handle this */
 	/* do like "kdestroy" program */
Index: xdmshell.c
===================================================================
RCS file: /cvs/xorg/app/xdm/xdmshell.c,v
retrieving revision 1.3
diff -u -r1.3 xdmshell.c
--- xdmshell.c	14 Jul 2005 22:58:25 -0000	1.3
+++ xdmshell.c	19 Jun 2006 21:30:50 -0000
@@ -183,7 +183,11 @@
 #endif
 
     /* make xdm run in a non-setuid environment */
-    setuid (geteuid());
+    if (setuid (geteuid()) == -1) {
+	fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
+		ProgramName, errno, strerror(errno));
+	exit(1);
+    }
 
     /*
      * exec /usr/bin/X11/xdm -nodaemon -udpPort 0


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-xdm.spec	30 May 2006 22:43:39 -0000	1.22
+++ xorg-x11-xdm.spec	21 Jun 2006 08:09:11 -0000	1.23
@@ -11,7 +11,7 @@
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 Version: 1.0.4
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -23,11 +23,17 @@
 Source11: xdm.pamd
 Source13: xserver.pamd
 
+Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xdm-1.0.4-setuid.diff
 # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead
 # of "-c" to fix bug (#86505)
 Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
 
+# FIXME: Temporary build dependencies for autotool dependence.
+BuildRequires: autoconf, automake, libtool
+
 BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXaw-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXt-devel
@@ -47,10 +53,9 @@
 BuildRequires: libXau-devel
 BuildRequires: libXinerama-devel
 BuildRequires: pam-devel
-BuildRequires: xorg-x11-util-macros
-BuildRequires: xorg-x11-xtrans-devel
 
 Provides: %{pkgname}
+
 Obsoletes: XFree86-xdm
 Obsoletes: xinitrc
 
@@ -70,22 +75,12 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p0 -b .setuid
+
 %patch10 -p0 -b .redhat-xdm-config-fix
 
 %build
-#cd 
 # FIXME: Work around pointer aliasing warnings from compiler for now
-# resource.c:213: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:215: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:219: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:223: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:227: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:229: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:235: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:242: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:251: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:253: warning: dereferencing type-punned pointer will break strict-aliasing rules
-
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 # NOTE: We invoke aclocal/automake/autoconf to enable the changes present in
 # xdm-0.99.3-xdm-app-defaults-in-datadir.patch & xdm-0.99.3-xdm-configdir.patch
@@ -125,7 +120,7 @@
 # FIXME: Move manpages to correct man section and rename them.  This should
 # get submitted as a bug upstream for each of the 4 components.  Hmm, the
 # manpage(s) do not actually get installed.  Fix it and report it upstream.
-%if 1
+%if 0
 {
    echo "FIXME: Upstream RC2 manpages install to incorrect location"
    mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1x
@@ -175,9 +170,14 @@
 %{_libdir}/X11/xdm/chooser
 %{_libdir}/X11/xdm/libXdmGreet.so
 #%dir %{_mandir}/man1x
-%{_mandir}/man1x/*.1x*
+%{_mandir}/man1/*.1*
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.4-3
+- Added xdm-1.0.4-setuid.diff to fix potential security issue (#196094)
+- Added temporary "BuildRequires: autoconf, automake, libtool" dependencies
+  for mock builds, for as long as we need to run autotools at compile time.
+
 * Tue May 30 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.4-2
 - Fix BuildRequires (#191858)
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 09:15:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 05:15:27 -0400
Subject: rpms/nfs-utils/devel .cvsignore, 1.14, 1.15 nfs-utils.spec, 1.90,
	1.91 sources, 1.15, 1.16 nfs-utils-1.0.7-mountd-stat64.patch,
	1.1, NONE nfs-utils-1.0.7-rquotad-curblocks.patch, 1.1,
	NONE nfs-utils-1.0.8-rc2-Makefileam.patch, 1.1,
	NONE nfs-utils-1.0.8-rc2-innetgr.patch, 1.1,
	NONE nfs-utils-1.0.8-rc2-nfs4_setdebug.patch, 1.1, NONE
Message-ID: <200606210915.k5L9FR6h015024@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14950

Modified Files:
	.cvsignore nfs-utils.spec sources 
Removed Files:
	nfs-utils-1.0.7-mountd-stat64.patch 
	nfs-utils-1.0.7-rquotad-curblocks.patch 
	nfs-utils-1.0.8-rc2-Makefileam.patch 
	nfs-utils-1.0.8-rc2-innetgr.patch 
	nfs-utils-1.0.8-rc2-nfs4_setdebug.patch 
Log Message:
Updated to nfs-utils-1.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Jun 2006 20:23:27 -0000	1.14
+++ .cvsignore	21 Jun 2006 09:15:24 -0000	1.15
@@ -4,3 +4,4 @@
 libnfsidmap-0.12.tar.gz
 nfs.doc.tar.gz
 nfs-utils-1.0.8-rc4.tar.gz
+nfs-utils-1.0.8.tar.gz


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- nfs-utils.spec	9 Jun 2006 12:07:41 -0000	1.90
+++ nfs-utils.spec	21 Jun 2006 09:15:24 -0000	1.91
@@ -1,12 +1,12 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 1.0.8.rc4
-Release: 1
+Version: 1.0.8
+Release: 2
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8-rc4.tar.gz
+Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
 Source10: nfs.init
@@ -18,9 +18,7 @@
 Patch50: nfs-utils-1.0.5-statdpath.patch
 Patch51: nfs-utils-1.0.6-mountd.patch
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
-Patch53: nfs-utils-1.0.7-mountd-stat64.patch
-Patch54: nfs-utils-1.0.7-nfsd-ctlbits.patch
-Patch55: nfs-utils-1.0.8-rc2-innetgr.patch
+Patch53: nfs-utils-1.0.7-nfsd-ctlbits.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -43,7 +41,6 @@
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
 BuildRequires: libevent-devel libgssapi-devel
-BuildRequires: automake libtool krb5-devel
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
 PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi
@@ -59,13 +56,11 @@
 clients which are mounted on that host.
 
 %prep
-%setup -q -n nfs-utils-1.0.8-rc4 -a1
+%setup -q
 %patch50 -p1 -b .statdpath
 %patch51 -p1 -b .mountd
 %patch52 -p1 -b .conf
-%patch53 -p1 -b .stat64
-%patch54 -p1 -b .ctlbits
-%patch55 -p1 -b .innetgr
+%patch53 -p1 -b .ctlbits
 
 # Do the magic to get things to compile
 %patch100 -p1 -b .compile
@@ -201,7 +196,7 @@
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) /var/lib/nfs/state
-%doc nfs/*.html nfs/*.ps linux-nfs/*
+%doc linux-nfs/*
 /sbin/rpcdebug
 /sbin/rpc.lockd
 /sbin/rpc.statd
@@ -220,6 +215,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Wed Jun 21 2006 <SteveD at RedHat.com> 1.0.8-2
+- Updated to nfs-utils-1.0.8
+
 * Thu Jun  8 2006 <SteveD at RedHat.com> 1.0.8.rc4-1
 - Upgraded to the upstream 1.0.8.rc4 version
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Jun 2006 20:23:27 -0000	1.15
+++ sources	21 Jun 2006 09:15:24 -0000	1.16
@@ -1,2 +1,2 @@
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
-e4e25a41ee2b1ad49d2dd13777301ec5  nfs-utils-1.0.8-rc4.tar.gz
+74fc2dd04b40c9d619ca41d3787ef8db  nfs-utils-1.0.8.tar.gz


--- nfs-utils-1.0.7-mountd-stat64.patch DELETED ---


--- nfs-utils-1.0.7-rquotad-curblocks.patch DELETED ---


--- nfs-utils-1.0.8-rc2-Makefileam.patch DELETED ---


--- nfs-utils-1.0.8-rc2-innetgr.patch DELETED ---


--- nfs-utils-1.0.8-rc2-nfs4_setdebug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 09:27:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 05:27:29 -0400
Subject: rpms/xorg-x11-xinit/devel xinit-1.0.2-setuid.diff, NONE,
	1.1 xorg-x11-xinit.spec, 1.19, 1.20
Message-ID: <200606210927.k5L9RTBP011893@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11874

Modified Files:
	xorg-x11-xinit.spec 
Added Files:
	xinit-1.0.2-setuid.diff 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
- Added xinit-1.0.2-setuid.diff to fix potential security issue (#196094)


xinit-1.0.2-setuid.diff:
 xinit.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xinit-1.0.2-setuid.diff ---
Index: xinit.c
===================================================================
RCS file: /cvs/xorg/app/xinit/xinit.c,v
retrieving revision 1.4
diff -u -r1.4 xinit.c
--- xinit.c	4 Oct 2005 01:27:34 -0000	1.4
+++ xinit.c	19 Jun 2006 21:31:58 -0000
@@ -692,7 +692,10 @@
 startClient(char *client[])
 {
 	if ((clientpid = vfork()) == 0) {
-		setuid(getuid());
+		if (setuid(getuid()) == -1) {
+			Error("cannot change uid: %s\n", strerror(errno));
+			_exit(ERR_EXIT);
+		}
 		setpgrp(0, getpid());
 		environ = newenviron;
 #ifdef __UNIXOS2__


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-xinit.spec	6 Jun 2006 16:22:37 -0000	1.19
+++ xorg-x11-xinit.spec	21 Jun 2006 09:27:26 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -20,6 +20,8 @@
 #       here instead of the xdm package.
 Source16: Xsession
 
+Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xinit-1.0.2-setuid.diff
+
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 # NOTE: startx needs xauth in order to run, but that is not picked up
@@ -40,6 +42,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p0 -b .setuid
 
 %build
 %configure
@@ -92,6 +95,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
+- Added xinit-1.0.2-setuid.diff to fix potential security issue (#196094)
+
 * Tue Jun 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Added "BuildRequires: pkgconfig" for bug (#194187)
 
@@ -128,7 +134,7 @@
 * Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-3
 - Updated to xinit 0.99.3 from X11R7 RC2.
 
-* Mon Nov 7 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
+* Mon Nov 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
 - Added "Provides: xinitrc = 5.0.0-1" for temporary compatibility between
   monolithic and modular X.  This will be removed however for FC5.
 
@@ -141,7 +147,7 @@
 - Updated to xinit 0.99.2 from X11R7 RC1.
 - Change manpage location to 'man1x' in file manifest.
 
-* Wed Oct  5 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
 - Use Fedora-Extras style BuildRoot tag.
 - Update BuildRequires to use new library package names.
 - Tidy up spec file a bit.



From fedora-cvs-commits at redhat.com  Wed Jun 21 09:35:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 05:35:19 -0400
Subject: rpms/kdeutils/FC-5 kdeutils.spec,1.57,1.58
Message-ID: <200606210935.k5L9ZJAV012010@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11998

Modified Files:
	kdeutils.spec 
Log Message:
add BR: gmp-devel #196051



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/kdeutils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeutils.spec	12 Jun 2006 22:17:13 -0000	1.57
+++ kdeutils.spec	21 Jun 2006 09:35:03 -0000	1.58
@@ -13,13 +13,13 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
 License: GPL
 Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
@@ -27,12 +27,14 @@
 Patch2: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: net-snmp-devel
 BuildRequires: libXtst-devel
 BuildRequires: python-devel
+BuildRequires: gmp-devel
 
 Obsoletes: ark
 Obsoletes: kcalc
@@ -268,7 +270,8 @@
 %if %{arts} == 0
    --without-arts \
 %endif
-   --includedir=%{_includedir}/kde
+   --includedir=%{_includedir}/kde \
+   --with-snmp
 
 make %{?_smp_mflags}
 
@@ -336,6 +339,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Jun 21 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
+- add BR: gmp-devel #196051
+
 * Mon Jun 12 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 09:37:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 05:37:19 -0400
Subject: rpms/xorg-x11-server/devel xorg-xserver-1.1.0-setuid.diff, NONE,
	1.1 xorg-x11-server.spec, 1.98, 1.99
Message-ID: <200606210937.k5L9bJIH012039@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12024

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-xserver-1.1.0-setuid.diff 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
- Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)


xorg-xserver-1.1.0-setuid.diff:
 hw/xfree86/common/xf86Init.c                |    6 +++++-
 hw/xfree86/os-support/shared/libc_wrapper.c |    5 ++++-
 hw/xfree86/parser/write.c                   |    5 ++++-
 os/utils.c                                  |   18 ++++++++++++------
 4 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE xorg-xserver-1.1.0-setuid.diff ---
Index: hw/xfree86/common/xf86Init.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.33.2.2
diff -u -u -r1.33.2.2 xf86Init.c
--- hw/xfree86/common/xf86Init.c	9 May 2006 18:04:19 -0000	1.33.2.2
+++ hw/xfree86/common/xf86Init.c	20 Jun 2006 08:33:03 -0000
@@ -1905,7 +1905,11 @@
           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
           break;
       case 0:  /* child */
-          setuid(getuid());
+	  if (setuid(getuid()) == -1) {
+	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
+			 strerror(errno));
+	      exit(255);
+	  }
           /* set stdin, stdout to the consoleFd */
           for (i = 0; i < 2; i++) {
             if (xf86Info.consoleFd != i) {
Index: hw/xfree86/os-support/shared/libc_wrapper.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v
retrieving revision 1.11
diff -u -u -r1.11 libc_wrapper.c
--- hw/xfree86/os-support/shared/libc_wrapper.c	25 Mar 2006 19:52:04 -0000	1.11
+++ hw/xfree86/os-support/shared/libc_wrapper.c	20 Jun 2006 08:33:03 -0000
@@ -1270,7 +1270,10 @@
 #ifndef SELF_CONTAINED_WRAPPER
 	xf86DisableIO();
 #endif
-        setuid(getuid());
+        if (setuid(getuid()) == -1) {
+		ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
+		exit(255);
+	}
 #if !defined(SELF_CONTAINED_WRAPPER)
         /* set stdin, stdout to the consoleFD, and leave stderr alone */
         for (i = 0; i < 2; i++)
Index: hw/xfree86/parser/write.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v
retrieving revision 1.3
diff -u -u -r1.3 write.c
--- hw/xfree86/parser/write.c	3 Jul 2005 07:01:37 -0000	1.3
+++ hw/xfree86/parser/write.c	20 Jun 2006 08:33:03 -0000
@@ -170,7 +170,10 @@
 					strerror(errno));
 			return 0;
 		case 0: /* child */
-			setuid(getuid());
+			if (setuid(getuid() == -1) 
+			    FatalError("xf86writeConfigFile(): "
+				"setuid failed(%s)\n", 
+				strerror(errno));
 			ret = doWriteConfigFile(filename, cptr);
 			exit(ret);
 			break;
Index: os/utils.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
retrieving revision 1.25
diff -u -u -r1.25 utils.c
--- os/utils.c	25 Mar 2006 19:52:05 -0000	1.25
+++ os/utils.c	20 Jun 2006 08:33:04 -0000
@@ -1721,8 +1721,10 @@
     case -1:	/* error */
 	p = -1;
     case 0:	/* child */
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) == -1)
+	    _exit(127);
+	if (setuid(getuid()) == -1)
+	    _exit(127);
 	execl("/bin/sh", "sh", "-c", command, (char *)NULL);
 	_exit(127);
     default:	/* parent */
@@ -1773,8 +1775,10 @@
 	xfree(cur);
 	return NULL;
     case 0:	/* child */
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) == -1)
+	    _exit(127);
+	if (setuid(getuid()) == -1)
+	    _exit(127);
 	if (*type == 'r') {
 	    if (pdes[1] != 1) {
 		/* stdout */
@@ -1848,8 +1852,10 @@
 	xfree(cur);
 	return NULL;
     case 0:	/* child */
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) == -1)
+	    _exit(127);
+	if (setuid(getuid()) == -1)
+	    _exit(127);
 	if (*type == 'r') {
 	    if (pdes[1] != 1) {
 		/* stdout */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- xorg-x11-server.spec	21 Jun 2006 00:12:03 -0000	1.98
+++ xorg-x11-server.spec	21 Jun 2006 09:37:16 -0000	1.99
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   21
+Release:   22
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -21,6 +21,7 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=6010
 Patch6:    xserver-1.0.1-randr-sdk.patch
 Patch7:	   xorg-x11-server-1.1.0-ppc64-build-fix.patch
+Patch8:    ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xorg-xserver-1.1.0-setuid.diff
 
 # Spiffiffity/compiz feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -294,6 +295,7 @@
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .ppc64
+%patch8 -p0 -b .setuid
 
 %patch100 -p0 -b .spiffiffity
 %patch101 -p0 -b .gl-include-inferiors
@@ -637,7 +639,10 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-21
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
+- Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
+
+* Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-21
 - Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D
   to only update the part of the texture that changed, based on damage
   regions.



From fedora-cvs-commits at redhat.com  Wed Jun 21 09:55:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 05:55:25 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.31,
	1.32
Message-ID: <200606210955.k5L9tPXD026877@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26861

Modified Files:
	system-config-printer.spec 
Log Message:
* Wed Jun 21 2006 Tim Waugh <twaugh at redhat.com>
- Build requires gettext-devel.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- system-config-printer.spec	20 Jun 2006 16:33:27 -0000	1.31
+++ system-config-printer.spec	21 Jun 2006 09:55:23 -0000	1.32
@@ -16,6 +16,7 @@
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils >= 0.2.92
+BuildRequires: gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -105,6 +106,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Wed Jun 21 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires gettext-devel.
+
 * Tue Jun 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.14-1
 - 0.7.14.
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 09:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 05:55:49 -0400
Subject: rpms/xorg-x11-apps/devel xload-1.0.1-setuid.diff, NONE,
	1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-apps.spec,
	1.14, 1.15
Message-ID: <200606210955.k5L9tnho026903@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26885

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Added Files:
	xload-1.0.1-setuid.diff 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
- Added xload-1.0.1-setuid.diff to fix potential security issue (#196094)
- Artificially inflate package version-release to 7.1 to match the X11R7.1
  release that all of the tarballs are taken from.
- Update to xconsole-1.0.2, xcursorgen-1.0.1 from X11R7.1


xload-1.0.1-setuid.diff:
 xload.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE xload-1.0.1-setuid.diff ---
Index: xload.c
===================================================================
RCS file: /cvs/xorg/app/xload/xload.c,v
retrieving revision 1.2
diff -u -r1.2 xload.c
--- xload.c	23 Apr 2004 19:54:57 -0000	1.2
+++ xload.c	19 Jun 2006 21:32:20 -0000
@@ -34,7 +34,7 @@
  * xload - display system load average in a window
  */
 
-
+#include <errno.h>
 #include <stdio.h> 
 #include <stdlib.h>
 #include <unistd.h>
@@ -162,8 +162,17 @@
     /* For security reasons, we reset our uid/gid after doing the necessary
        system initialization and before calling any X routines. */
     InitLoadPoint();
-    setgid(getgid());		/* reset gid first while still (maybe) root */
-    setuid(getuid());
+    /* reset gid first while still (maybe) root */
+    if (setgid(getgid()) == -1) {
+	    fprintf(stderr, "%s: setgid failed: %s\n", 
+		ProgramName, strerror(errno));
+	    exit(1);
+    }
+    if (setuid(getuid()) == -1) {
+	    fprintf(stderr, "%s: setuid failed: %s\n", 
+		ProgramName, strerror(errno));
+	    exit(1);
+    }
 
     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Apr 2006 22:09:47 -0000	1.6
+++ .cvsignore	21 Jun 2006 09:55:47 -0000	1.7
@@ -15,3 +15,5 @@
 xwd-1.0.1.tar.bz2
 xwud-1.0.1.tar.bz2
 xclock-1.0.2.tar.bz2
+xcursorgen-1.0.1.tar.bz2
+xconsole-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Apr 2006 22:09:47 -0000	1.6
+++ sources	21 Jun 2006 09:55:47 -0000	1.7
@@ -15,3 +15,5 @@
 911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
 6b930326f71993fb54b7203902b387cd  xclock-1.0.2.tar.bz2
+39e1e62f5bd92603b0230b8b948c2fc4  xcursorgen-1.0.1.tar.bz2
+8678ddd23573022d68dcd883ae239be8  xconsole-1.0.2.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-apps.spec	26 May 2006 15:17:53 -0000	1.14
+++ xorg-x11-apps.spec	21 Jun 2006 09:55:47 -0000	1.15
@@ -2,36 +2,37 @@
 
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
-Version: 1.0.3
-Release: 2
+Version: 7.1
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Clock apps
-Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/oclock-1.0.1.tar.bz2
+Source0:  http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.1.tar.bz2
 Source1:  http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.2.tar.bz2
 # X Window Dump (xwd) utilities
-Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwd-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwud-1.0.1.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xpr-1.0.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.1.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.1.tar.bz2
+Source4:  http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.1.tar.bz2
 # Miscellaneous other applications
-Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/luit-1.0.1.tar.bz2
+Source5:  http://xorg.freedesktop.org/releases/individual/app/luit-1.0.1.tar.bz2
 Source6:  http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xbiff-1.0.1.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclipboard-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.1.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcursorgen-1.0.0.tar.bz2
-Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xeyes-1.0.1.tar.bz2
-Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xkill-1.0.1.tar.bz2
-Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xload-1.0.1.tar.bz2
-Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlogo-1.0.1.tar.bz2
-Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmag-1.0.1.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmessage-1.0.1.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.1.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.2.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.1.tar.bz2
+Source11: http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.1.tar.bz2
+Source12: http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.1.tar.bz2
+Source13: http://xorg.freedesktop.org/releases/individual/app/xload-1.0.1.tar.bz2
+Source14: http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.1.tar.bz2
+Source15: http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.1.tar.bz2
+Source16: http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.1.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
+Patch10: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xload-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -69,6 +70,8 @@
 %patch0 -p0 -b .x11perf-datadir-cleanups
 %patch1 -p0 -b .locale.alias-datadir
 
+%patch10 -p0 -b .setuid
+
 %build
 # Build all apps
 {
@@ -106,7 +109,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+#%doc
 %{_bindir}/luit
 %{_bindir}/oclock
 %{_bindir}/x11perf
@@ -169,13 +172,19 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
+- Added xload-1.0.1-setuid.diff to fix potential security issue (#196094)
+- Artificially inflate package version-release to 7.1 to match the X11R7.1
+  release that all of the tarballs are taken from.
+- Update to xconsole-1.0.2, xcursorgen-1.0.1 from X11R7.1
+
 * Fri May 26 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-2
 - Add more BuildRequires to fix mock builds.  (#191896)
 
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
 - Updated xclock and xconsole
 
-* Thu Mar 2 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+* Thu Mar 02 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Bump x11perf to 1.4.1 from upstream.
 
 * Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:00:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:00:24 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.99,1.100
Message-ID: <200606211000.k5LA0OtB026996@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26982

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
- Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
- Disable DRI on ppc64 builds.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- xorg-x11-server.spec	21 Jun 2006 09:37:16 -0000	1.99
+++ xorg-x11-server.spec	21 Jun 2006 10:00:21 -0000	1.100
@@ -74,9 +74,10 @@
 # I can build one build with them enabled, install them, then disable it again.
 %define with_developer_utils	0
 
-%ifarch %{ix86} x86_64 ppc ia64 ppc64 alpha sparc sparc64
+%ifarch %{ix86} x86_64 ppc ia64 alpha sparc sparc64
 %define with_dri	1
-%else
+%endif
+%ifarch ppc64 s390 s390x
 %define with_dri	0
 %endif
 
@@ -641,6 +642,7 @@
 %changelog
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
 - Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
+- Disable DRI on ppc64 builds.
 
 * Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-21
 - Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:07:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:07:21 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.32,
	1.33
Message-ID: <200606211007.k5LA7LkY027152@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27140

Modified Files:
	system-config-printer.spec 
Log Message:
- Ship translations.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-printer.spec	21 Jun 2006 09:55:23 -0000	1.32
+++ system-config-printer.spec	21 Jun 2006 10:07:19 -0000	1.33
@@ -76,10 +76,12 @@
   --add-category Application                           \
   system-config-printer.desktop
 
+%find_lang system-config-printer
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files libs
+%files libs -f system-config-printer.lang
 %defattr(-,root,root)
 %doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO}
 %{_libdir}/python*/*/*.so
@@ -93,6 +95,7 @@
 %doc ChangeLog README NEWS TODO
 %{_bindir}/%{name}
 %{_sbindir}/%{name}
+%{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupsd.py*
 %{_datadir}/%{name}/nametree.py*
 %{_datadir}/%{name}/options.py*
@@ -108,6 +111,7 @@
 %changelog
 * Wed Jun 21 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires gettext-devel.
+- Ship translations.
 
 * Tue Jun 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.14-1
 - 0.7.14.



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:07:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:07:36 -0400
Subject: rpms/prelink/devel .cvsignore, 1.28, 1.29 prelink.cron, 1.4,
	1.5 prelink.spec, 1.35, 1.36 sources, 1.29, 1.30
Message-ID: <200606211007.k5LA7aKR027178@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27156

Modified Files:
	.cvsignore prelink.cron prelink.spec sources 
Log Message:
0.3.8-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	22 May 2006 17:01:34 -0000	1.28
+++ .cvsignore	21 Jun 2006 10:07:33 -0000	1.29
@@ -1 +1 @@
-prelink-20060522.tar.bz2
+prelink-20060621.tar.bz2


Index: prelink.cron
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prelink.cron	23 Nov 2004 10:43:08 -0000	1.4
+++ prelink.cron	21 Jun 2006 10:07:33 -0000	1.5
@@ -6,9 +6,9 @@
 
 if [ "$PRELINKING" != yes ]; then
   if [ -f /etc/prelink.cache ]; then
-    echo /usr/sbin/prelink -uav > /var/log/prelink.log
-    /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 \
-      || echo Prelink failed with return value $? >> /var/log/prelink.log
+    echo /usr/sbin/prelink -uav > /var/log/prelink/prelink.log
+    /usr/sbin/prelink -uav >> /var/log/prelink/prelink.log 2>&1 \
+      || echo Prelink failed with return value $? >> /var/log/prelink/prelink.log
     rm -f /etc/prelink.cache
     # Restart init if needed
     [ -n "$(find `ldd /sbin/init | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
@@ -42,9 +42,9 @@
   cp -a /var/lib/misc/prelink.{full,quick}
 fi
 
-echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log
-/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1 \
-  || echo Prelink failed with return value $? >> /var/log/prelink.log
+echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink/prelink.log
+/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink/prelink.log 2>&1 \
+  || echo Prelink failed with return value $? >> /var/log/prelink/prelink.log
 # Restart init if needed
 [ -n "$(find `ldd /sbin/init | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
 


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- prelink.spec	22 May 2006 17:01:53 -0000	1.35
+++ prelink.spec	21 Jun 2006 10:07:33 -0000	1.36
@@ -1,10 +1,10 @@
 Summary: An ELF prelinking utility
 Name: prelink
-Version: 0.3.7
+Version: 0.3.8
 Release: 1
 License: GPL
 Group: System Environment/Base
-%define date 20060522
+%define date 20060621
 Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
 Source2: prelink.conf
 Source3: prelink.cron
@@ -60,11 +60,11 @@
 EOF
 chmod 644 %{buildroot}%{_sysconfdir}/rpm/macros.prelink
 
-mkdir -p %{buildroot}/var/{lib/misc,log}
+mkdir -p %{buildroot}/var/{lib/misc,log/prelink}
 touch %{buildroot}/var/lib/misc/prelink.full
 touch %{buildroot}/var/lib/misc/prelink.quick
 touch %{buildroot}/var/lib/misc/prelink.force
-touch %{buildroot}/var/log/prelink.log
+touch %{buildroot}/var/log/prelink/prelink.log
 
 %post
 touch /var/lib/misc/prelink.force
@@ -86,9 +86,16 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.full
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.quick
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.force
-%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink.log
+%dir /var/log/prelink
+%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Wed Jun 21 2006 Jakub Jelinek <jakub at redhat.com> 0.3.8-1
+- fix -q mode canonicalization fix, speed up filename canonicalization
+  by caching canonicalization for directories (#145983, #188062)
+- remove bogus e_shoff assertion check (#194016)
+- move prelink log file to /var/log/prelink/prelink.log (#194473)
+
 * Mon May 22 2006 Jakub Jelinek <jakub at redhat.com> 0.3.7-1
 - in -q mode, recheck the canonicalized filename to avoid
   overwriting symlinks with regular files (#145983, #188062)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	22 May 2006 17:01:53 -0000	1.29
+++ sources	21 Jun 2006 10:07:33 -0000	1.30
@@ -1 +1 @@
-a35b69ee37fa029d6e9b11223013e35a  prelink-20060522.tar.bz2
+434474e212265425ad6cc42d9d527fa9  prelink-20060621.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:15:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:15:52 -0400
Subject: rpms/xorg-x11-apps/devel xload-1.0.1-setuid.diff,1.1,1.2
Message-ID: <200606211015.k5LAFqFo009473@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9160

Modified Files:
	xload-1.0.1-setuid.diff 
Log Message:
Fix patch to apply properly

xload-1.0.1-setuid.diff:
 xload.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

Index: xload-1.0.1-setuid.diff
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xload-1.0.1-setuid.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xload-1.0.1-setuid.diff	21 Jun 2006 09:55:47 -0000	1.1
+++ xload-1.0.1-setuid.diff	21 Jun 2006 10:15:50 -0000	1.2
@@ -1,10 +1,13 @@
+Patch from X.Org, modified to match path where files need patching in rpm
+packaging.
+
 Index: xload.c
 ===================================================================
 RCS file: /cvs/xorg/app/xload/xload.c,v
 retrieving revision 1.2
 diff -u -r1.2 xload.c
---- xload.c	23 Apr 2004 19:54:57 -0000	1.2
-+++ xload.c	19 Jun 2006 21:32:20 -0000
+--- xload-1.0.1/xload.c	23 Apr 2004 19:54:57 -0000	1.2
++++ xload-1.0.1/xload.c	19 Jun 2006 21:32:20 -0000
 @@ -34,7 +34,7 @@
   * xload - display system load average in a window
   */



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:16:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:16:16 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.33,
	1.34
Message-ID: <200606211016.k5LAGGbs012215@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11983

Modified Files:
	system-config-printer.spec 
Log Message:
Ship translations in main package; not needed in libs


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- system-config-printer.spec	21 Jun 2006 10:07:19 -0000	1.33
+++ system-config-printer.spec	21 Jun 2006 10:16:13 -0000	1.34
@@ -81,7 +81,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files libs -f system-config-printer.lang
+%files libs
 %defattr(-,root,root)
 %doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO}
 %{_libdir}/python*/*/*.so
@@ -90,7 +90,7 @@
 %{_datadir}/%{name}/cupshelpers.py*
 %{_datadir}/%{name}/gtk_html2pango.py*
 
-%files
+%files -f system-config-printer.lang
 %defattr(-,root,root)
 %doc ChangeLog README NEWS TODO
 %{_bindir}/%{name}



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:25:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:25:48 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.27,1.28
Message-ID: <200606211025.k5LAPmHX025303@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25270

Modified Files:
	ipsec-tools.spec 
Log Message:
rebuilt


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ipsec-tools.spec	19 May 2006 18:18:48 -0000	1.27
+++ ipsec-tools.spec	21 Jun 2006 10:25:45 -0000	1.28
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.5
-Release: 2
+Release: 3
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -95,6 +95,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Wed Jun 21 2006 Harald Hoyer <harald at redhat.com> - 0.6.5-3
+- rebuilt
+
 * Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.5-2
 - Fix patch to build MLS Stuff correctly
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:28:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:28:44 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.28,1.29
Message-ID: <200606211028.k5LASimt026491@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26459

Modified Files:
	ipsec-tools.spec 
Log Message:
more build requirements


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ipsec-tools.spec	21 Jun 2006 10:25:45 -0000	1.28
+++ ipsec-tools.spec	21 Jun 2006 10:28:41 -0000	1.29
@@ -18,7 +18,7 @@
 #Patch6: ipsec-tools-0.6.1-openssl-098.patch
 Patch7: ipsec-tools-0.6.5-mls.patch
 
-BuildPrereq: openssl-devel, krb5-devel, bison, flex
+BuildRequires: openssl-devel, krb5-devel, bison, flex, automake
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: initscripts >= 7.31.11.EL-1
 	
@@ -96,7 +96,7 @@
 
 %changelog
 * Wed Jun 21 2006 Harald Hoyer <harald at redhat.com> - 0.6.5-3
-- rebuilt
+- more build requirements
 
 * Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.5-2
 - Fix patch to build MLS Stuff correctly



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:34:41 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.29,1.30
Message-ID: <200606211034.k5LAYfms027669@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27636

Modified Files:
	ipsec-tools.spec 
Log Message:
more build requirements


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ipsec-tools.spec	21 Jun 2006 10:28:41 -0000	1.29
+++ ipsec-tools.spec	21 Jun 2006 10:34:38 -0000	1.30
@@ -18,7 +18,7 @@
 #Patch6: ipsec-tools-0.6.1-openssl-098.patch
 Patch7: ipsec-tools-0.6.5-mls.patch
 
-BuildRequires: openssl-devel, krb5-devel, bison, flex, automake
+BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: initscripts >= 7.31.11.EL-1
 	



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:41:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:41:44 -0400
Subject: rpms/prelink/devel prelink.spec,1.36,1.37 sources,1.30,1.31
Message-ID: <200606211041.k5LAfi6Y029460@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29424

Modified Files:
	prelink.spec sources 
Log Message:
0.3.8-1


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- prelink.spec	21 Jun 2006 10:07:33 -0000	1.36
+++ prelink.spec	21 Jun 2006 10:41:41 -0000	1.37
@@ -95,6 +95,7 @@
   by caching canonicalization for directories (#145983, #188062)
 - remove bogus e_shoff assertion check (#194016)
 - move prelink log file to /var/log/prelink/prelink.log (#194473)
+- increase x86-64 maxpagesize to 2MB
 
 * Mon May 22 2006 Jakub Jelinek <jakub at redhat.com> 0.3.7-1
 - in -q mode, recheck the canonicalized filename to avoid


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	21 Jun 2006 10:07:33 -0000	1.30
+++ sources	21 Jun 2006 10:41:42 -0000	1.31
@@ -1 +1 @@
-434474e212265425ad6cc42d9d527fa9  prelink-20060621.tar.bz2
+f4d9c801561452b2808b36b985a3aeb2  prelink-20060621.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:45:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:45:17 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.91,1.92
Message-ID: <200606211045.k5LAjHH1030830@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30718

Modified Files:
	nfs-utils.spec 
Log Message:
added back BuildRequires: automake, libtool



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- nfs-utils.spec	21 Jun 2006 09:15:24 -0000	1.91
+++ nfs-utils.spec	21 Jun 2006 10:45:15 -0000	1.92
@@ -41,6 +41,7 @@
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
 BuildRequires: libevent-devel libgssapi-devel
+BuildRequires: automake, libtool
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
 PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:53:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:53:38 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.100,1.101
Message-ID: <200606211053.k5LArc91016166@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16128

Modified Files:
	xorg-x11-server.spec 
Log Message:
Conditionalize inclusion of DRI related X server modules to with_dri builds.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- xorg-x11-server.spec	21 Jun 2006 10:00:21 -0000	1.100
+++ xorg-x11-server.spec	21 Jun 2006 10:53:36 -0000	1.101
@@ -502,11 +502,13 @@
 %dir %{_libdir}/xorg/modules
 %dir %{_libdir}/xorg/modules/drivers
 %dir %{_libdir}/xorg/modules/extensions
+%if %{with_dri}
 %{_libdir}/xorg/modules/extensions/libGLcore.so
-%{_libdir}/xorg/modules/extensions/libdbe.so
 %{_libdir}/xorg/modules/extensions/libdri.so
-%{_libdir}/xorg/modules/extensions/libextmod.so
 %{_libdir}/xorg/modules/extensions/libglx.so
+%endif
+%{_libdir}/xorg/modules/extensions/libdbe.so
+%{_libdir}/xorg/modules/extensions/libextmod.so
 %{_libdir}/xorg/modules/extensions/librecord.so
 %{_libdir}/xorg/modules/extensions/libxtrap.so
 %dir %{_libdir}/xorg/modules/input
@@ -515,7 +517,9 @@
 %{_libdir}/xorg/modules/fonts/libfreetype.so
 %{_libdir}/xorg/modules/fonts/libtype1.so
 %dir %{_libdir}/xorg/modules/linux
+%if %{with_dri}
 %{_libdir}/xorg/modules/linux/libdrm.so
+%endif
 %{_libdir}/xorg/modules/linux/libfbdevhw.so
 %dir %{_libdir}/xorg/modules/multimedia
 %{_libdir}/xorg/modules/multimedia/bt829_drv.so
@@ -643,6 +647,7 @@
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
 - Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
 - Disable DRI on ppc64 builds.
+- Conditionalize inclusion of DRI related X server modules to with_dri builds.
 
 * Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-21
 - Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:56:01 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.92,1.93
Message-ID: <200606211056.k5LAu1Zn017127@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16989

Modified Files:
	nfs-utils.spec 
Log Message:
Added krb5-devel to buildreq



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- nfs-utils.spec	21 Jun 2006 10:45:15 -0000	1.92
+++ nfs-utils.spec	21 Jun 2006 10:55:59 -0000	1.93
@@ -40,7 +40,7 @@
 BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
-BuildRequires: libevent-devel libgssapi-devel
+BuildRequires: libevent-devel libgssapi-devel krb5-devel
 BuildRequires: automake, libtool
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:56:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:56:06 -0400
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.15,1.16
Message-ID: <200606211056.k5LAu67X017178@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17095

Modified Files:
	xorg-x11-apps.spec 
Log Message:
Add temporary dependency on autoconf, automake for brew builds.


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-apps.spec	21 Jun 2006 09:55:47 -0000	1.15
+++ xorg-x11-apps.spec	21 Jun 2006 10:56:04 -0000	1.16
@@ -34,6 +34,9 @@
 Patch1: luit-1.0.1-locale.alias-datadir.patch
 Patch10: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xload-1.0.1-setuid.diff
 
+# FIXME: Temporary dependencies on autotools packages for now
+BuildRequires: autoconf automake
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # xbiff needs xbitmaps-devel
@@ -177,6 +180,7 @@
 - Artificially inflate package version-release to 7.1 to match the X11R7.1
   release that all of the tarballs are taken from.
 - Update to xconsole-1.0.2, xcursorgen-1.0.1 from X11R7.1
+- Add temporary dependency on autoconf, automake for brew builds.
 
 * Fri May 26 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-2
 - Add more BuildRequires to fix mock builds.  (#191896)



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:58:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:58:23 -0400
Subject: rpms/vim/devel vim-7.0-fstabsyntax.patch,1.2,1.3
Message-ID: <200606211058.k5LAwNPV018146@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18114

Modified Files:
	vim-7.0-fstabsyntax.patch 
Log Message:
- add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting

vim-7.0-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.0-fstabsyntax.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim-7.0-fstabsyntax.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vim-7.0-fstabsyntax.patch	20 Apr 2006 13:06:24 -0000	1.2
+++ vim-7.0-fstabsyntax.patch	21 Jun 2006 10:58:20 -0000	1.3
@@ -1,5 +1,14 @@
---- vim70e/runtime/syntax/fstab.vim.fstab	2006-04-20 13:30:57.000000000 +0200
-+++ vim70e/runtime/syntax/fstab.vim	2006-04-20 13:31:24.000000000 +0200
+--- vim70/runtime/syntax/fstab.vim.fstabsyntax	2006-04-16 18:01:27.000000000 +0200
++++ vim70/runtime/syntax/fstab.vim	2006-06-21 11:52:21.000000000 +0200
+@@ -36,7 +36,7 @@
+ " Type
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+ syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs binfmt_misc bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs rpc_pipefs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
+ 
+ " Options
+ " -------
 @@ -48,7 +48,7 @@
  syn keyword fsOptionsYesNo yes no
  syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck



From fedora-cvs-commits at redhat.com  Wed Jun 21 10:59:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 06:59:38 -0400
Subject: rpms/vim/devel vim.spec,1.124,1.125
Message-ID: <200606211059.k5LAxcAR018637@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18607

Modified Files:
	vim.spec 
Log Message:
- add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- vim.spec	20 Jun 2006 21:20:46 -0000	1.124
+++ vim.spec	21 Jun 2006 10:59:35 -0000	1.125
@@ -29,7 +29,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -565,6 +565,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Jun 21 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-2
+- add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting
+
 * Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-1
 - patchlevel 22
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:07:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:07:05 -0400
Subject: rpms/beagle/devel beagle-0.2.7-beagle-index-username.patch, NONE,
	1.1 beagle-0.2.7-crawl.patch, NONE,
	1.1 beagle-0.2.7-nodebug.patch, NONE,
	1.1 beagle-0.2.7-runuser.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 beagle-0.2.1-spew.patch, 1.4, 1.5 beagle.spec, 1.56,
	1.57 sources, 1.13, 1.14 beagle-0.2.5-crawl.patch, 1.1, NONE
Message-ID: <200606211207.k5LC75C4001613@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1569

Modified Files:
	.cvsignore beagle-0.2.1-spew.patch beagle.spec sources 
Added Files:
	beagle-0.2.7-beagle-index-username.patch 
	beagle-0.2.7-crawl.patch beagle-0.2.7-nodebug.patch 
	beagle-0.2.7-runuser.patch 
Removed Files:
	beagle-0.2.5-crawl.patch 
Log Message:
* Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-1
- update to 0.2.7
- Use runuser, not su in index cronjob (#195809)
- Rename beagleindex to beaglidx (#184157)
- Remove --debug from all wrappers



beagle-0.2.7-beagle-index-username.patch:
 beagle-crawl-system.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE beagle-0.2.7-beagle-index-username.patch ---
--- beagle-0.2.7/tools/beagle-crawl-system.in.beagleindex	2006-06-21 12:56:03.000000000 +0200
+++ beagle-0.2.7/tools/beagle-crawl-system.in	2006-06-21 12:56:19.000000000 +0200
@@ -28,7 +28,7 @@
 
 umask 022
 
-CRAWL_USER=beagleindex
+CRAWL_USER=beaglidx
 
 export TMPDIR=/tmp
 

beagle-0.2.7-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.7-crawl.patch ---
--- beagle-0.2.5/tools/crawl-rules/crawl-applications.crawl	2006-03-22 16:09:41.000000000 +0100
+++ beagle-0.2.5/tools/crawl-rules/crawl-applications	2006-04-21 09:23:26.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.5/tools/crawl-rules/crawl-documentation.crawl	2006-04-12 21:41:03.000000000 +0200
+++ beagle-0.2.5/tools/crawl-rules/crawl-documentation	2006-04-21 09:27:23.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help /opt/gnome/share/gtk-doc/html /usr/share/gtk-doc/html /usr/share/gnome/html"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gtk-doc/html /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.5/tools/Makefile.am.crawl	2006-04-19 02:30:36.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.am	2006-04-21 09:23:26.000000000 +0200
@@ -35,7 +35,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.5/tools/Makefile.in.crawl	2006-04-20 17:57:24.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.in	2006-04-21 09:23:26.000000000 +0200
@@ -366,7 +366,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 

beagle-0.2.7-nodebug.patch:
 ImLogViewer/beagle-imlogviewer.in |    2 +-
 beagled/beagled-index-helper.in   |    2 +-
 beagled/beagled.in                |    2 +-
 beagled/wrapper.in                |    2 +-
 bludgeon/bludgeon.in              |    2 +-
 search/beagle-search.in           |    2 +-
 tools/wrapper.in                  |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE beagle-0.2.7-nodebug.patch ---
--- beagle-0.2.7/beagled/beagled-index-helper.in.debug	2006-06-21 11:27:29.000000000 +0200
+++ beagle-0.2.7/beagled/beagled-index-helper.in	2006-06-21 11:28:00.000000000 +0200
@@ -31,7 +31,7 @@
 export MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}"
 export MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}"
 
-CMDLINE="mono --debug $MONO_EXTRA_ARGS $THIS_EXE $@"
+CMDLINE="mono $MONO_EXTRA_ARGS $THIS_EXE $@"
 
 PROCESS_NAME="beagled-helper"
 exec -a $PROCESS_NAME $CMDLINE
--- beagle-0.2.7/beagled/beagled.in.debug	2006-06-21 11:28:15.000000000 +0200
+++ beagle-0.2.7/beagled/beagled.in	2006-06-21 11:28:35.000000000 +0200
@@ -99,7 +99,7 @@
     export GC_DONT_GC=1
     CMDLINE="monogrind $TARGET_EXE $MONO_EXTRA_ARGS $BEAGLED_ARGS $FGBG_ARG"
 else
-    CMDLINE="$BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $TARGET_EXE $BEAGLED_ARGS $FGBG_ARG"
+    CMDLINE="$BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $TARGET_EXE $BEAGLED_ARGS $FGBG_ARG"
 fi
 
 PROCESS_NAME="beagled"
--- beagle-0.2.7/beagled/wrapper.in.debug	2006-06-21 11:26:25.000000000 +0200
+++ beagle-0.2.7/beagled/wrapper.in	2006-06-21 11:27:02.000000000 +0200
@@ -19,5 +19,5 @@
     export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
 
-MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/ImLogViewer/beagle-imlogviewer.in.debug	2006-06-21 11:28:59.000000000 +0200
+++ beagle-0.2.7/ImLogViewer/beagle-imlogviewer.in	2006-06-21 11:29:15.000000000 +0200
@@ -14,5 +14,5 @@
     export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
 
-MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/tools/wrapper.in.debug	2006-06-21 11:29:30.000000000 +0200
+++ beagle-0.2.7/tools/wrapper.in	2006-06-21 11:29:40.000000000 +0200
@@ -20,5 +20,5 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix@${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/bludgeon/bludgeon.in.debug	2006-06-21 11:29:51.000000000 +0200
+++ beagle-0.2.7/bludgeon/bludgeon.in	2006-06-21 11:29:58.000000000 +0200
@@ -28,5 +28,5 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/search/beagle-search.in.debug	2006-06-21 11:30:18.000000000 +0200
+++ beagle-0.2.7/search/beagle-search.in	2006-06-21 11:30:29.000000000 +0200
@@ -21,4 +21,4 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
\ No newline at end of file
+exec -a beagle-search $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"

beagle-0.2.7-runuser.patch:
 beagle-crawl-system.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE beagle-0.2.7-runuser.patch ---
--- beagle-0.2.7/tools/beagle-crawl-system.in.runuser	2006-06-21 13:07:54.000000000 +0200
+++ beagle-0.2.7/tools/beagle-crawl-system.in	2006-06-21 13:09:37.000000000 +0200
@@ -64,7 +64,7 @@
                 IONICE="$IONICE -c 3"
             fi
 
-	    eval nice -n 19 $IONICE su -s /bin/bash $CRAWL_USER -c \"MONO_SHARED_DIR=$MONO_SHARED_DIR @sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1
+	    eval nice -n 19 $IONICE  /sbin/runuser -s /bin/bash $CRAWL_USER -c \"MONO_SHARED_DIR=$MONO_SHARED_DIR @sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1
 	fi
     fi
 done


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 May 2006 09:09:53 -0000	1.11
+++ .cvsignore	21 Jun 2006 12:07:00 -0000	1.12
@@ -1,2 +1,3 @@
 beagle-0.2.6.tar.bz2
 beagle-0.2.4.tar.bz2
+beagle-0.2.7.tar.bz2

beagle-0.2.1-spew.patch:
 BeagleDaemon.cs            |    2 +-
 IndexHelper/IndexHelper.cs |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: beagle-0.2.1-spew.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.1-spew.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beagle-0.2.1-spew.patch	15 Jun 2006 22:26:14 -0000	1.4
+++ beagle-0.2.1-spew.patch	21 Jun 2006 12:07:00 -0000	1.5
@@ -26,7 +26,7 @@
  					// debugging this code, after all...
  					//arg_debug ? LogLevel.Debug : LogLevel.Warn,
 -					LogLevel.Debug,
-+					arg_debug ? LogLevel.Debug : LogLevel.Error
++					arg_debug ? LogLevel.Debug : LogLevel.Error,
  					arg_fg);
  
  			Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- beagle.spec	15 Jun 2006 22:26:14 -0000	1.56
+++ beagle.spec	21 Jun 2006 12:07:00 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           beagle
-Version:        0.2.6
-Release:        6
+Version:        0.2.7
+Release:        1
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -28,8 +28,11 @@
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
-Patch2: beagle-0.2.5-crawl.patch
+Patch1: beagle-0.2.7-nodebug.patch
+Patch2: beagle-0.2.7-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
+Patch4: beagle-0.2.7-beagle-index-username.patch
+Patch5: beagle-0.2.7-runuser.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -64,8 +67,11 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .nodebug
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
+%patch4 -p1 -b .beagleidx
+%patch5 -p1 -b .runuser
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -130,9 +136,11 @@
 
 %pre
 %define beagle_user_uid 58
-
-/usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || :
-/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
+# Remove old username, we switched to an 8 char one
+/usr/sbin/userdel beagleindex
+/usr/sbin/groupdel beagleindex
+/usr/sbin/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || :
+/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || :
 
 %post 
 if rpm -q firefox > /dev/null; then
@@ -187,8 +195,8 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_mandir}/*/*
-%dir %attr(-,beagleindex,beagleindex) /var/cache/beagle
-%dir %attr(-,beagleindex,beagleindex) /var/cache/beagle/indexes
+%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
+%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes
 #%{_sysconfdir}/xdg/autostart/beagle.desktop
 
 %files -n libbeagle
@@ -205,6 +213,12 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-1
+- update to 0.2.7
+- Use runuser, not su in index cronjob (#195809)
+- Rename beagleindex to beaglidx (#184157)
+- Remove --debug from all wrappers
+
 * Thu Jun 16 2006 Ray Strode <rstrode at redhat.com> - 0.2.6-6
 - add bug spew when debugging is enabled (bug 195621)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 May 2006 09:09:53 -0000	1.13
+++ sources	21 Jun 2006 12:07:00 -0000	1.14
@@ -1,2 +1,2 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
-56437aed8e5ac14a1b679755784e1a12  beagle-0.2.6.tar.bz2
+d4c8e93db23c9b7d06104ce97a182502  beagle-0.2.7.tar.bz2


--- beagle-0.2.5-crawl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:21:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:21:51 -0400
Subject: rpms/kdewebdev/FC-4 kdewebdev.spec,1.18,1.19
Message-ID: <200606211221.k5LCLp24017878@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31884

Modified Files:
	kdewebdev.spec 
Log Message:
remove Obsoletes: tidy




Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/kdewebdev.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdewebdev.spec	12 Jun 2006 22:57:18 -0000	1.18
+++ kdewebdev.spec	21 Jun 2006 12:21:49 -0000	1.19
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc4
+Release: 0.2.fc4
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -26,7 +26,6 @@
 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
-Source5: http://tidy.sourceforge.net/src/tidy_src_041026.tgz
 
 Patch0: javascript.patch
 
@@ -39,7 +38,6 @@
 
 Obsoletes: WebMaker
 Obsoletes: quanta
-Obsoletes: tidy
 
 %description
 The kdewebdev package contains Quanta Plus and other applications, which are useful
@@ -90,19 +88,11 @@
 
 make %{?_smp_mflags}
 
-# build tidy
-pushd tidy/build/gmake
-make
-popd
-
 %install
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
 
-# install tidy
-install tidy/bin/tab2space tidy/bin/tidy %{buildroot}%{_bindir}/
-
 # install docs
 for i in css html javascript ; do
    pushd $i
@@ -155,6 +145,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jun 21 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc4
+- remove Obsoletes: tidy
+
 * Mon Jun 12 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4 
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:22:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:22:51 -0400
Subject: rpms/kdewebdev/FC-4 kdewebdev.spec,1.19,1.20
Message-ID: <200606211222.k5LCMpVK031525@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31512

Modified Files:
	kdewebdev.spec 
Log Message:
remove Obsoletes: tidy




Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/kdewebdev.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdewebdev.spec	21 Jun 2006 12:21:49 -0000	1.19
+++ kdewebdev.spec	21 Jun 2006 12:22:49 -0000	1.20
@@ -57,7 +57,7 @@
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4 -a 5
+%setup -q -a 1 -a 2 -a 3 -a 4
 %patch0 -p0 -b .javascript
 
 %build



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:41:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:41:16 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.6, 1.7 libvirt.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200606211241.k5LCfG5N010262@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10231

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.1.1 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Apr 2006 13:24:07 -0000	1.6
+++ .cvsignore	21 Jun 2006 12:41:13 -0000	1.7
@@ -3,3 +3,4 @@
 libvirt-0.0.5.tar.gz
 libvirt-0.0.6.tar.gz
 libvirt-0.1.0.tar.gz
+libvirt-0.1.1.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libvirt.spec	10 Apr 2006 13:24:07 -0000	1.7
+++ libvirt.spec	21 Jun 2006 12:41:13 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.1.0
+Version: 0.1.1
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -100,8 +100,18 @@
 %doc python/tests/*.py
 %doc python/TODO
 %doc python/libvirtclass.txt
+%doc docs/examples/python
 
 %changelog
+* Wed Jun 21 2006 Daniel Veillard <veillard at redhat.com> 0.1.1-1
+- extend and cleanup the driver infrastructure and code
+- python examples
+- extend uuid support
+- bug fixes, buffer handling cleanups
+- support for new Xen hypervisor API
+- test driver for unit testing
+- virsh --conect argument
+
 * Mon Apr 10 2006 Daniel Veillard <veillard at redhat.com> 0.1.0-1
 - various fixes
 - new APIs: for Node information and Reboot


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Apr 2006 13:24:07 -0000	1.6
+++ sources	21 Jun 2006 12:41:13 -0000	1.7
@@ -1 +1 @@
-bebb6a89c592d3e2ba19594de7341b81  libvirt-0.1.0.tar.gz
+f5a86d6666ee783510c4896a7337ca9f  libvirt-0.1.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:49:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:49:46 -0400
Subject: rpms/openssl/devel openssl.spec,1.75,1.76 ca-bundle.crt,1.6,1.7
Message-ID: <200606211249.k5LCnkDo028029@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27991

Modified Files:
	openssl.spec ca-bundle.crt 
Log Message:
* Wed Jun 21 2006 Joe Orton <jorton at redhat.com> 0.9.8b-3
- update to new CA bundle from mozilla.org; adds CA certificates
  from netlock.hu and startcom.org



Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- openssl.spec	6 Jun 2006 12:03:44 -0000	1.75
+++ openssl.spec	21 Jun 2006 12:49:44 -0000	1.76
@@ -23,7 +23,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 2
+Release: 3
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -396,6 +396,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 21 2006 Joe Orton <jorton at redhat.com> 0.9.8b-3
+- update to new CA bundle from mozilla.org; adds CA certificates
+  from netlock.hu and startcom.org
+
 * Mon Jun  5 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-2
 - fixed a few rpmlint warnings
 - better fix for #173399 from upstream


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 ca-bundle.crt
Index: ca-bundle.crt
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/ca-bundle.crt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ca-bundle.crt	25 Apr 2005 09:06:16 -0000	1.6
+++ ca-bundle.crt	21 Jun 2006 12:49:44 -0000	1.7
@@ -3,7 +3,7 @@
 #
 # Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 #
-# Generated from certdata.txt RCS revision 1.37
+# Generated from certdata.txt RCS revision 1.39
 #
 Certificate:
     Data:
@@ -181,7 +181,7 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
         2d:e2:99:6b:b0:3d:7a:89:d7:59:a2:94:01:1f:2b:dd:12:4b:
         53:c2:ad:7f:aa:a7:00:5c:91:40:57:25:4a:38:aa:84:70:b9:
@@ -239,7 +239,7 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
         69:36:89:f7:34:2a:33:72:2f:6d:3b:d4:22:b2:b8:6f:9a:c5:
         36:66:0e:1b:3c:a1:b1:75:5a:e6:fd:35:d3:f8:a8:f2:07:6f:
@@ -297,7 +297,7 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
         c7:ec:92:7e:4e:f8:f5:96:a5:67:62:2a:a4:f0:4d:11:60:d0:
         6f:8d:60:58:61:ac:26:bb:52:35:5c:08:cf:30:fb:a8:4a:96:
@@ -356,7 +356,7 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
         07:fa:4c:69:5c:fb:95:cc:46:ee:85:83:4d:21:30:8e:ca:d9:
         a8:6f:49:1a:e6:da:51:e3:60:70:6c:84:61:11:a1:1a:c8:48:
@@ -414,7 +414,7 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
         26:48:2c:16:c2:58:fa:e8:16:74:0c:aa:aa:5f:54:3f:f2:d7:
         c9:78:60:5e:5e:6e:37:63:22:77:36:7e:b2:17:c4:34:b9:f5:
@@ -472,19 +472,19 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 CRL Distribution Points: 
-            DirName:/C=US/O=Equifax/OU=Equifax Secure Certificate Authority/CN=CRL1
+                DirName:/C=US/O=Equifax/OU=Equifax Secure Certificate Authority/CN=CRL1
 
             X509v3 Private Key Usage Period: 
-            Not After: Aug 22 16:41:51 2018 GMT
+                Not After: Aug 22 16:41:51 2018 GMT
             X509v3 Key Usage: 
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             X509v3 Authority Key Identifier: 
-            keyid:48:E6:68:F9:2B:D2:B2:95:D7:47:D8:23:20:10:4F:33:98:90:9F:D4
+                keyid:48:E6:68:F9:2B:D2:B2:95:D7:47:D8:23:20:10:4F:33:98:90:9F:D4
 
             X509v3 Subject Key Identifier: 
-            48:E6:68:F9:2B:D2:B2:95:D7:47:D8:23:20:10:4F:33:98:90:9F:D4
+                48:E6:68:F9:2B:D2:B2:95:D7:47:D8:23:20:10:4F:33:98:90:9F:D4
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
             1.2.840.113533.7.65.0: 
                 0...V3.0c....
     Signature Algorithm: sha1WithRSAEncryption
@@ -554,7 +554,7 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE, pathlen:8
+                CA:TRUE, pathlen:8
     Signature Algorithm: sha1WithRSAEncryption
         04:6f:25:86:e4:e6:96:27:b4:d9:42:c0:d0:c9:00:b1:7f:54:
         3e:87:b2:6d:24:a9:2f:0a:7e:fd:a4:44:b0:f8:54:07:bd:1b:
@@ -622,21 +622,21 @@
                 Exponent: 3 (0x3)
         X509v3 extensions:
             Netscape Cert Type: 
-            SSL CA, S/MIME CA, Object Signing CA
+                SSL CA, S/MIME CA, Object Signing CA
             X509v3 CRL Distribution Points: 
-            DirName:/C=US/O=Digital Signature Trust Co./OU=DSTCA E1/CN=CRL1
+                DirName:/C=US/O=Digital Signature Trust Co./OU=DSTCA E1/CN=CRL1
 
             X509v3 Private Key Usage Period: 
-            Not Before: Dec 10 18:10:23 1998 GMT, Not After: Dec 10 18:10:23 2018 GMT
+                Not Before: Dec 10 18:10:23 1998 GMT, Not After: Dec 10 18:10:23 2018 GMT
             X509v3 Key Usage: 
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             X509v3 Authority Key Identifier: 
-            keyid:6A:79:7E:91:69:46:18:13:0A:02:77:A5:59:5B:60:98:25:0E:A2:F8
+                keyid:6A:79:7E:91:69:46:18:13:0A:02:77:A5:59:5B:60:98:25:0E:A2:F8
 
             X509v3 Subject Key Identifier: 
-            6A:79:7E:91:69:46:18:13:0A:02:77:A5:59:5B:60:98:25:0E:A2:F8
+                6A:79:7E:91:69:46:18:13:0A:02:77:A5:59:5B:60:98:25:0E:A2:F8
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
             1.2.840.113533.7.65.0: 
                 0
 ..V4.0....
@@ -697,21 +697,21 @@
                 Exponent: 3 (0x3)
         X509v3 extensions:
             Netscape Cert Type: 
-            SSL CA, S/MIME CA, Object Signing CA
+                SSL CA, S/MIME CA, Object Signing CA
             X509v3 CRL Distribution Points: 
-            DirName:/C=US/O=Digital Signature Trust Co./OU=DSTCA E2/CN=CRL1
+                DirName:/C=US/O=Digital Signature Trust Co./OU=DSTCA E2/CN=CRL1
 
             X509v3 Private Key Usage Period: 
-            Not Before: Dec  9 19:17:26 1998 GMT, Not After: Dec  9 19:17:26 2018 GMT
+                Not Before: Dec  9 19:17:26 1998 GMT, Not After: Dec  9 19:17:26 2018 GMT
             X509v3 Key Usage: 
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             X509v3 Authority Key Identifier: 
-            keyid:1E:82:4D:28:65:80:3C:C9:41:6E:AC:35:2E:5A:CB:DE:EE:F8:39:5B
+                keyid:1E:82:4D:28:65:80:3C:C9:41:6E:AC:35:2E:5A:CB:DE:EE:F8:39:5B
 
             X509v3 Subject Key Identifier: 
-            1E:82:4D:28:65:80:3C:C9:41:6E:AC:35:2E:5A:CB:DE:EE:F8:39:5B
+                1E:82:4D:28:65:80:3C:C9:41:6E:AC:35:2E:5A:CB:DE:EE:F8:39:5B
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
             1.2.840.113533.7.65.0: 
                 0
 ..V4.0....
@@ -1312,11 +1312,11 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Key Usage: critical
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             X509v3 Subject Key Identifier: 
-            60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
+                60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
         ae:aa:9f:fc:b7:d2:cb:1f:5f:39:29:28:18:9e:34:c9:6c:4f:
         6f:1a:f0:64:a2:70:4a:4f:13:86:9b:60:28:9e:e8:81:49:98:
@@ -1853,22 +1853,22 @@
                 Exponent: 3 (0x3)
         X509v3 extensions:
             Netscape Cert Type: 
-            SSL CA, S/MIME CA, Object Signing CA
+                SSL CA, S/MIME CA, Object Signing CA
             X509v3 CRL Distribution Points: 
-            DirName:/C=US/O=Entrust.net/OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/OU=(c) 1999 Entrust.net Limited/CN=Entrust.net Secure Server Certification Authority/CN=CRL1
-            URI:http://www.entrust.net/CRL/net1.crl
+                DirName:/C=US/O=Entrust.net/OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/OU=(c) 1999 Entrust.net Limited/CN=Entrust.net Secure Server Certification Authority/CN=CRL1
+                URI:http://www.entrust.net/CRL/net1.crl
 
             X509v3 Private Key Usage Period: 
-            Not Before: May 25 16:09:40 1999 GMT, Not After: May 25 16:09:40 2019 GMT
+                Not Before: May 25 16:09:40 1999 GMT, Not After: May 25 16:09:40 2019 GMT
             X509v3 Key Usage: 
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             X509v3 Authority Key Identifier: 
-            keyid:F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
+                keyid:F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
 
             X509v3 Subject Key Identifier: 
-            F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
+                F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
             1.2.840.113533.7.65.0: 
                 0
[...1665 lines suppressed...]
+                CA:TRUE, pathlen:4
             Netscape Cert Type: 
-            SSL CA, S/MIME CA, Object Signing CA
+                SSL CA, S/MIME CA, Object Signing CA
             Netscape Comment: 
-            FIGYELEM! Ezen tanusitvany a NetLock Kft. Altalanos Szolgaltatasi Felteteleiben leirt eljarasok alapjan keszult. A hitelesites folyamatat a NetLock Kft. termekfelelosseg-biztositasa vedi. A digitalis alairas elfogadasanak feltetele az eloirt ellenorzesi eljaras megtetele. Az eljaras leirasa megtalalhato a NetLock Kft. Internet honlapjan a https://www.netlock.net/docs cimen vagy kerheto az ellenorzes at netlock.net e-mail cimen. IMPORTANT! The issuance and the use of this certificate is subject to the NetLock CPS available at https://www.netlock.net/docs or by e-mail at cps at netlock.net.
+                FIGYELEM! Ezen tanusitvany a NetLock Kft. Altalanos Szolgaltatasi Felteteleiben leirt eljarasok alapjan keszult. A hitelesites folyamatat a NetLock Kft. termekfelelosseg-biztositasa vedi. A digitalis alairas elfogadasanak feltetele az eloirt ellenorzesi eljaras megtetele. Az eljaras leirasa megtalalhato a NetLock Kft. Internet honlapjan a https://www.netlock.net/docs cimen vagy kerheto az ellenorzes at netlock.net e-mail cimen. IMPORTANT! The issuance and the use of this certificate is subject to the NetLock CPS available at https://www.netlock.net/docs or by e-mail at cps at netlock.net.
     Signature Algorithm: md5WithRSAEncryption
         48:24:46:f7:ba:56:6f:fa:c8:28:03:40:4e:e5:31:39:6b:26:
         6b:53:7f:db:df:df:f3:71:3d:26:c0:14:0e:c6:67:7b:23:a8:
@@ -7198,13 +7298,13 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE, pathlen:4
+                CA:TRUE, pathlen:4
             X509v3 Key Usage: critical
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             Netscape Cert Type: 
-            SSL CA, S/MIME CA, Object Signing CA
+                SSL CA, S/MIME CA, Object Signing CA
             Netscape Comment: 
-            FIGYELEM! Ezen tanusitvany a NetLock Kft. Altalanos Szolgaltatasi Felteteleiben leirt eljarasok alapjan keszult. A hitelesites folyamatat a NetLock Kft. termekfelelosseg-biztositasa vedi. A digitalis alairas elfogadasanak feltetele az eloirt ellenorzesi eljaras megtetele. Az eljaras leirasa megtalalhato a NetLock Kft. Internet honlapjan a https://www.netlock.net/docs cimen vagy kerheto az ellenorzes at netlock.net e-mail cimen. IMPORTANT! The issuance and the use of this certificate is subject to the NetLock CPS available at https://www.netlock.net/docs or by e-mail at cps at netlock.net.
+                FIGYELEM! Ezen tanusitvany a NetLock Kft. Altalanos Szolgaltatasi Felteteleiben leirt eljarasok alapjan keszult. A hitelesites folyamatat a NetLock Kft. termekfelelosseg-biztositasa vedi. A digitalis alairas elfogadasanak feltetele az eloirt ellenorzesi eljaras megtetele. Az eljaras leirasa megtalalhato a NetLock Kft. Internet honlapjan a https://www.netlock.net/docs cimen vagy kerheto az ellenorzes at netlock.net e-mail cimen. IMPORTANT! The issuance and the use of this certificate is subject to the NetLock CPS available at https://www.netlock.net/docs or by e-mail at cps at netlock.net.
     Signature Algorithm: md5WithRSAEncryption
         04:db:ae:8c:17:af:f8:0e:90:31:4e:cd:3e:09:c0:6d:3a:b0:
         f8:33:4c:47:4c:e3:75:88:10:97:ac:b0:38:15:91:c6:29:96:
@@ -7274,13 +7374,13 @@
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
-            CA:TRUE, pathlen:4
+                CA:TRUE, pathlen:4
             X509v3 Key Usage: critical
-            Certificate Sign, CRL Sign
+                Certificate Sign, CRL Sign
             Netscape Cert Type: 
-            SSL CA, S/MIME CA, Object Signing CA
+                SSL CA, S/MIME CA, Object Signing CA
             Netscape Comment: 
-            FIGYELEM! Ezen tanusitvany a NetLock Kft. Altalanos Szolgaltatasi Felteteleiben leirt eljarasok alapjan keszult. A hitelesites folyamatat a NetLock Kft. termekfelelosseg-biztositasa vedi. A digitalis alairas elfogadasanak feltetele az eloirt ellenorzesi eljaras megtetele. Az eljaras leirasa megtalalhato a NetLock Kft. Internet honlapjan a https://www.netlock.net/docs cimen vagy kerheto az ellenorzes at netlock.net e-mail cimen. IMPORTANT! The issuance and the use of this certificate is subject to the NetLock CPS available at https://www.netlock.net/docs or by e-mail at cps at netlock.net.
+                FIGYELEM! Ezen tanusitvany a NetLock Kft. Altalanos Szolgaltatasi Felteteleiben leirt eljarasok alapjan keszult. A hitelesites folyamatat a NetLock Kft. termekfelelosseg-biztositasa vedi. A digitalis alairas elfogadasanak feltetele az eloirt ellenorzesi eljaras megtetele. Az eljaras leirasa megtalalhato a NetLock Kft. Internet honlapjan a https://www.netlock.net/docs cimen vagy kerheto az ellenorzes at netlock.net e-mail cimen. IMPORTANT! The issuance and the use of this certificate is subject to the NetLock CPS available at https://www.netlock.net/docs or by e-mail at cps at netlock.net.
     Signature Algorithm: md5WithRSAEncryption
         10:ad:7f:d7:0c:32:80:0a:d8:86:f1:79:98:b5:ad:d4:cd:b3:
         36:c4:96:48:c1:5c:cd:9a:d9:05:2e:9f:be:50:eb:f4:26:14:
@@ -7362,13 +7462,13 @@
             1.3.6.1.4.1.311.20.2: 
                 ...C.A
             X509v3 Key Usage: 
-            Digital Signature, Certificate Sign, CRL Sign
+                Digital Signature, Certificate Sign, CRL Sign
             X509v3 Basic Constraints: critical
-            CA:TRUE
+                CA:TRUE
             X509v3 Subject Key Identifier: 
-            C6:4F:A2:3D:06:63:84:09:9C:CE:62:E4:04:AC:8D:5C:B5:E9:B6:1B
+                C6:4F:A2:3D:06:63:84:09:9C:CE:62:E4:04:AC:8D:5C:B5:E9:B6:1B
             X509v3 CRL Distribution Points: 
-            URI:http://crl.xrampsecurity.com/XGCA.crl
+                URI:http://crl.xrampsecurity.com/XGCA.crl
 
             1.3.6.1.4.1.311.21.1: 
                 ...
@@ -7451,14 +7551,14 @@
                 Exponent: 3 (0x3)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-            D2:C4:B0:D2:91:D4:4C:11:71:B3:61:CB:3D:A1:FE:DD:A8:6A:D4:E3
+                D2:C4:B0:D2:91:D4:4C:11:71:B3:61:CB:3D:A1:FE:DD:A8:6A:D4:E3
             X509v3 Authority Key Identifier: 
-            keyid:D2:C4:B0:D2:91:D4:4C:11:71:B3:61:CB:3D:A1:FE:DD:A8:6A:D4:E3
-            DirName:/C=US/O=The Go Daddy Group, Inc./OU=Go Daddy Class 2 Certification Authority
-            serial:00
+                keyid:D2:C4:B0:D2:91:D4:4C:11:71:B3:61:CB:3D:A1:FE:DD:A8:6A:D4:E3
+                DirName:/C=US/O=The Go Daddy Group, Inc./OU=Go Daddy Class 2 Certification Authority
+                serial:00
 
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
         32:4b:f3:b2:ca:3e:91:fc:12:c6:a1:07:8c:8e:77:a0:33:06:
         14:5c:90:1e:18:f7:08:a6:3d:0a:19:f9:87:80:11:6e:69:e4:
@@ -7537,14 +7637,14 @@
                 Exponent: 3 (0x3)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-            BF:5F:B7:D1:CE:DD:1F:86:F4:5B:55:AC:DC:D7:10:C2:0E:A9:88:E7
+                BF:5F:B7:D1:CE:DD:1F:86:F4:5B:55:AC:DC:D7:10:C2:0E:A9:88:E7
             X509v3 Authority Key Identifier: 
-            keyid:BF:5F:B7:D1:CE:DD:1F:86:F4:5B:55:AC:DC:D7:10:C2:0E:A9:88:E7
-            DirName:/C=US/O=Starfield Technologies, Inc./OU=Starfield Class 2 Certification Authority
-            serial:00
+                keyid:BF:5F:B7:D1:CE:DD:1F:86:F4:5B:55:AC:DC:D7:10:C2:0E:A9:88:E7
+                DirName:/C=US/O=Starfield Technologies, Inc./OU=Starfield Class 2 Certification Authority
+                serial:00
 
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
         05:9d:3f:88:9d:d1:c9:1a:55:a1:ac:69:f3:f3:59:da:9b:01:
         87:1a:4f:57:a9:a1:79:09:2a:db:f7:2f:b2:1e:cc:c7:5e:6a:
@@ -7588,3 +7688,95 @@
 -----END CERTIFICATE-----
 
 
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=IL, ST=Israel, L=Eilat, O=StartCom Ltd., OU=CA Authority Dep., CN=Free SSL Certification Authority/emailAddress=admin at startcom.org
+        Validity
+            Not Before: Mar 17 17:37:48 2005 GMT
+            Not After : Mar 10 17:37:48 2035 GMT
+        Subject: C=IL, ST=Israel, L=Eilat, O=StartCom Ltd., OU=CA Authority Dep., CN=Free SSL Certification Authority/emailAddress=admin at startcom.org
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ed:84:60:00:23:9e:c8:4a:51:29:27:de:3a:a1:
+                    39:b5:69:ab:09:b2:2f:34:fd:61:dc:3d:d3:b0:cf:
+                    b1:d7:c2:c4:c2:b1:e4:96:56:c4:be:aa:14:0e:e7:
+                    cc:3a:50:c8:3a:62:9d:c3:a3:ac:59:7b:8e:ee:55:
+                    1a:1c:47:be:a3:97:39:b3:b5:ef:23:2c:08:e8:d8:
+                    af:73:2f:b9:c9:83:e8:ed:00:0f:c8:75:a5:2f:34:
+                    4c:18:e8:76:88:23:49:8a:db:b6:ed:68:da:c3:b5:
+                    62:29:4c:a5:4b:b7:98:b4:09:14:10:a0:f8:fe:62:
+                    76:22:15:0b:a4:d6:08:2f:35
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: 
+                Digital Signature, Non Repudiation, Key Encipherment, Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                1C:89:C3:96:CC:BD:FE:32:D5:0D:8C:81:31:B6:98:9D:8D:28:64:8D
+            X509v3 Authority Key Identifier: 
+                keyid:1C:89:C3:96:CC:BD:FE:32:D5:0D:8C:81:31:B6:98:9D:8D:28:64:8D
+                DirName:/C=IL/ST=Israel/L=Eilat/O=StartCom Ltd./OU=CA Authority Dep./CN=Free SSL Certification Authority/emailAddress=admin at startcom.org
+                serial:00
+
+            X509v3 Subject Alternative Name: 
+                email:admin at startcom.org
+            X509v3 Issuer Alternative Name: 
+                email:admin at startcom.org
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            Netscape Comment: 
+                Free SSL Certification Authority
+            Netscape CA Revocation Url: 
+                http://cert.startcom.org/ca-crl.crl
+            Netscape Base Url: 
+                http://cert.startcom.org/
+            Netscape CA Policy Url: 
+                http://cert.startcom.org/index.php?app=111
+    Signature Algorithm: md5WithRSAEncryption
+        6c:71:25:e1:9e:34:91:21:ef:db:6c:bd:01:08:56:8f:88:d8:
+        41:3a:53:f5:72:df:27:57:4b:76:84:f7:68:a4:fe:eb:3f:09:
+        7e:28:b8:57:ea:1f:c1:aa:e2:ff:96:9f:49:99:e6:b2:95:73:
+        96:c6:48:c7:5e:8d:07:72:56:f8:83:8f:9f:77:af:29:d3:45:
+        0e:a4:ee:b0:36:74:2d:f0:cd:98:23:7b:37:4b:da:fe:51:98:
+        c4:1e:34:3c:88:fd:99:3b:50:a7:c1:8b:33:c7:c2:52:16:12:
+        95:53:65:22:ef:ba:8b:ce:62:db:70:23:b1:80:df:1a:20:38:
+        e7:7e
+MD5 Fingerprint=08:7C:58:1F:52:2B:44:B4:3B:79:CD:01:F8:C5:C3:C9
+-----BEGIN CERTIFICATE-----
+MIIFFjCCBH+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsDELMAkGA1UEBhMCSUwx
+DzANBgNVBAgTBklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0
+Q29tIEx0ZC4xGjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBG
+cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
+YWRtaW5Ac3RhcnRjb20ub3JnMB4XDTA1MDMxNzE3Mzc0OFoXDTM1MDMxMDE3Mzc0
+OFowgbAxCzAJBgNVBAYTAklMMQ8wDQYDVQQIEwZJc3JhZWwxDjAMBgNVBAcTBUVp
+bGF0MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMRowGAYDVQQLExFDQSBBdXRob3Jp
+dHkgRGVwLjEpMCcGA1UEAxMgRnJlZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkxITAfBgkqhkiG9w0BCQEWEmFkbWluQHN0YXJ0Y29tLm9yZzCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA7YRgACOeyEpRKSfeOqE5tWmrCbIvNP1h3D3TsM+x
+18LEwrHkllbEvqoUDufMOlDIOmKdw6OsWXuO7lUaHEe+o5c5s7XvIywI6Nivcy+5
+yYPo7QAPyHWlLzRMGOh2iCNJitu27Wjaw7ViKUylS7eYtAkUEKD4/mJ2IhULpNYI
+LzUCAwEAAaOCAjwwggI4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMB0G
+A1UdDgQWBBQcicOWzL3+MtUNjIExtpidjShkjTCB3QYDVR0jBIHVMIHSgBQcicOW
+zL3+MtUNjIExtpidjShkjaGBtqSBszCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgT
+BklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4x
+GjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBGcmVlIFNTTCBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSYWRtaW5Ac3Rh
+cnRjb20ub3JnggEAMB0GA1UdEQQWMBSBEmFkbWluQHN0YXJ0Y29tLm9yZzAdBgNV
+HRIEFjAUgRJhZG1pbkBzdGFydGNvbS5vcmcwEQYJYIZIAYb4QgEBBAQDAgAHMC8G
+CWCGSAGG+EIBDQQiFiBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAy
+BglghkgBhvhCAQQEJRYjaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL2NhLWNybC5j
+cmwwKAYJYIZIAYb4QgECBBsWGWh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy8wOQYJ
+YIZIAYb4QgEIBCwWKmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9pbmRleC5waHA/
+YXBwPTExMTANBgkqhkiG9w0BAQQFAAOBgQBscSXhnjSRIe/bbL0BCFaPiNhBOlP1
+ct8nV0t2hPdopP7rPwl+KLhX6h/BquL/lp9JmeaylXOWxkjHXo0Hclb4g4+fd68p
+00UOpO6wNnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLb
+cCOxgN8aIDjnfg==
+-----END CERTIFICATE-----
+
+



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:51:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:51:13 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.122,1.123
Message-ID: <200606211251.k5LCpDEi028585@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28554

Modified Files:
	util-linux.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.27
- Only execute chcon on machines with selinux enabled



Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- util-linux.spec	14 Jun 2006 14:49:17 -0000	1.122
+++ util-linux.spec	21 Jun 2006 12:51:10 -0000	1.123
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.26
+Release: 0.27
 License: distributable
 Group: System Environment/Base
 
@@ -501,7 +501,9 @@
 chown root:root /var/log/lastlog
 chmod 0644 /var/log/lastlog
 # Fix the file context, do not use restorecon
-chcon `matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+	chcon `matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
+fi
 
 %postun
 if [ "$1" = 0 ]; then
@@ -695,6 +697,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.27
+- Only execute chcon on machines with selinux enabled
+
 * Wed Jun 14 2006 Steve Dickson <steved at redhat.com> 2.13-0.26
 - Remove unneeded header files from nfsmount.c
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 12:58:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 08:58:38 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.12,1.13
Message-ID: <200606211258.k5LCwclk031445@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31412

Modified Files:
	policy-20060608.patch 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
- Update to upstream


policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    9 +
 modules/admin/consoletype.te       |    7 +
 modules/admin/logwatch.te          |    3 
 modules/admin/netutils.te          |    1 
 modules/admin/prelink.fc           |    3 
 modules/kernel/files.if            |   20 +++
 modules/kernel/filesystem.te       |    5 
 modules/kernel/kernel.if           |   38 ++++++
 modules/services/apache.fc         |    1 
 modules/services/apache.if         |   79 ++++++++++++++
 modules/services/apache.te         |   53 ++++++++-
 modules/services/automount.te      |   13 ++
 modules/services/clamav.if         |   20 +++
 modules/services/cups.fc           |    1 
 modules/services/cups.if           |    2 
 modules/services/cups.te           |   10 +
 modules/services/hal.if            |   20 +++
 modules/services/mta.te            |    5 
 modules/services/networkmanager.te |    1 
 modules/services/ntp.te            |    1 
 modules/services/openvpn.te        |    3 
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.if        |   27 ++++
 modules/services/postfix.te        |    1 
 modules/services/ppp.te            |    1 
 modules/services/procmail.te       |    1 
 modules/services/tftp.te           |    1 
 modules/system/authlogin.if        |    1 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/mount.te            |    1 
 modules/system/selinuxutil.te      |    2 
 modules/system/unconfined.fc       |    2 
 modules/system/userdomain.if       |  201 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 modules/system/xen.te              |   12 +-
 39 files changed, 504 insertions(+), 130 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- policy-20060608.patch	21 Jun 2006 01:46:22 -0000	1.12
+++ policy-20060608.patch	21 Jun 2006 12:58:35 -0000	1.13
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.48/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/global_tunables	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/global_tunables	2006-06-20 17:26:29.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -17,7 +17,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.48/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/bootloader.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/bootloader.te	2006-06-20 17:26:29.000000000 -0400
 @@ -49,7 +49,7 @@
  #
  
@@ -54,7 +54,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.48/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-20 17:26:29.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -71,7 +71,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.48/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/logwatch.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/logwatch.te	2006-06-20 17:26:29.000000000 -0400
 @@ -22,8 +22,7 @@
  #
  # Local policy
@@ -84,7 +84,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.48/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/netutils.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/netutils.te	2006-06-20 17:26:29.000000000 -0400
 @@ -54,6 +54,7 @@
  corenet_udp_sendrecv_all_ports(netutils_t)
  corenet_tcp_connect_all_ports(netutils_t)
@@ -95,7 +95,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.48/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/prelink.fc	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/prelink.fc	2006-06-20 17:26:29.000000000 -0400
 @@ -3,6 +3,5 @@
  
  /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
@@ -106,7 +106,7 @@
 +/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.48/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/files.if	2006-06-20 17:24:32.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/files.if	2006-06-20 17:26:29.000000000 -0400
 @@ -4379,3 +4379,23 @@
  
  	typeattribute $1 files_unconfined_type;
@@ -133,7 +133,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.48/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-20 09:54:01.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/filesystem.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/filesystem.te	2006-06-20 17:26:29.000000000 -0400
 @@ -48,6 +48,11 @@
  files_mountpoint(binfmt_misc_fs_t)
  genfscon binfmt_misc / gen_context(system_u:object_r:binfmt_misc_fs_t,s0)
@@ -148,7 +148,7 @@
  genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.48/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-20 17:26:29.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -193,7 +193,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.48/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.fc	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.fc	2006-06-20 17:26:29.000000000 -0400
 @@ -78,3 +78,4 @@
  /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
@@ -201,7 +201,7 @@
 +/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.48/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/apache.if	2006-06-20 17:26:29.000000000 -0400
 @@ -15,6 +15,7 @@
  	gen_require(`
  		attribute httpdcontent;
@@ -327,8 +327,18 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.48/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-06-20 09:54:04.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.te	2006-06-20 17:23:37.000000000 -0400
-@@ -109,13 +109,10 @@
++++ serefpolicy-2.2.48/policy/modules/services/apache.te	2006-06-20 22:20:33.000000000 -0400
+@@ -25,6 +25,9 @@
+ # domains that can exec all users scripts
+ attribute httpd_exec_scripts;
+ 
++# attribute of all script files
++attribute httpd_script_exec_type;
++
+ # user script domains
+ attribute httpd_script_domains;
+ 
+@@ -109,13 +112,10 @@
  type squirrelmail_spool_t;
  files_tmp_file(squirrelmail_spool_t)
  
@@ -346,7 +356,7 @@
  
  ifdef(`targeted_policy',`
  	typealias httpd_sys_content_t alias httpd_user_content_t;
-@@ -293,6 +290,15 @@
+@@ -293,6 +293,15 @@
  	miscfiles_manage_public_files(httpd_t)
  ') 
  
@@ -362,7 +372,7 @@
  tunable_policy(`httpd_can_network_connect',`
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
-@@ -600,6 +606,10 @@
+@@ -600,6 +609,10 @@
  	allow httpd_sys_script_t httpd_suexec_t:process sigchld;
  ')
  
@@ -373,7 +383,7 @@
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
  	fs_read_nfs_files(httpd_suexec_t)
  	fs_read_nfs_symlinks(httpd_suexec_t)
-@@ -688,3 +698,29 @@
+@@ -688,3 +701,29 @@
  optional_policy(`
  	nscd_socket_use(httpd_unconfined_script_t)
  ')
@@ -405,7 +415,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.48/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/automount.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/automount.te	2006-06-20 17:26:29.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -438,7 +448,7 @@
  corecmd_exec_shell(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.2.48/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/clamav.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/clamav.if	2006-06-20 17:26:29.000000000 -0400
 @@ -84,3 +84,23 @@
  	allow clamscan_t $1:process sigchld;
  ')
@@ -465,7 +475,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.48/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2006-04-19 11:26:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/cups.fc	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.fc	2006-06-20 17:26:29.000000000 -0400
 @@ -24,6 +24,7 @@
  
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
@@ -476,7 +486,7 @@
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.48/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/services/cups.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.if	2006-06-20 17:26:29.000000000 -0400
 @@ -40,7 +40,7 @@
  
  	files_search_pids($1)
@@ -488,7 +498,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.48/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-06-20 09:54:04.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/cups.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/cups.te	2006-06-20 17:26:29.000000000 -0400
 @@ -313,6 +313,7 @@
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
@@ -550,7 +560,7 @@
  # PTAL local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.48/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/services/hal.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/hal.if	2006-06-20 17:26:29.000000000 -0400
 @@ -140,3 +140,23 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -577,7 +587,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.48/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/mta.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/mta.te	2006-06-20 17:26:29.000000000 -0400
 @@ -195,8 +195,3 @@
  	')
  ')
@@ -589,7 +599,7 @@
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.48/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/networkmanager.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/networkmanager.te	2006-06-20 17:26:29.000000000 -0400
 @@ -92,6 +92,7 @@
  logging_send_syslog_msg(NetworkManager_t)
  
@@ -600,7 +610,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.48/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/ntp.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/ntp.te	2006-06-20 17:26:29.000000000 -0400
 @@ -62,6 +62,7 @@
  
  kernel_read_kernel_sysctls(ntpd_t)
@@ -611,7 +621,7 @@
  corenet_tcp_sendrecv_all_if(ntpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.2.48/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/openvpn.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/openvpn.te	2006-06-20 17:26:29.000000000 -0400
 @@ -44,6 +44,7 @@
  allow openvpn_t openvpn_var_run_t:file create_file_perms;
  files_pid_filetrans(openvpn_t, openvpn_var_run_t, file)
@@ -631,7 +641,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.48/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-20 17:26:29.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -667,7 +677,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.48/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-20 17:26:29.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -686,8 +696,8 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.2.48/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/postfix.if	2006-06-20 17:23:37.000000000 -0400
-@@ -459,3 +459,28 @@
++++ serefpolicy-2.2.48/policy/modules/services/postfix.if	2006-06-20 22:05:45.000000000 -0400
+@@ -459,3 +459,30 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -716,9 +726,11 @@
 +	allow postfix_smtp_t $1:fifo_file rw_file_perms;
 +	allow postfix_smtp_t $1:process sigchld;
 +')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.48/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/postfix.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/postfix.te	2006-06-20 17:26:29.000000000 -0400
 @@ -456,6 +456,7 @@
  ')
  
@@ -729,7 +741,7 @@
  	cron_use_system_job_fds(postfix_postdrop_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.48/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/ppp.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/ppp.te	2006-06-20 17:26:29.000000000 -0400
 @@ -68,6 +68,7 @@
  allow pppd_t self:tcp_socket create_stream_socket_perms;
  allow pppd_t self:udp_socket { connect connected_socket_perms };
@@ -740,7 +752,7 @@
  allow pppd_t pptp_t:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.48/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/procmail.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/procmail.te	2006-06-20 17:26:29.000000000 -0400
 @@ -78,6 +78,7 @@
  
  optional_policy(`
@@ -751,7 +763,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.48/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 17:26:29.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -762,7 +774,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.48/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/authlogin.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/authlogin.if	2006-06-20 17:26:29.000000000 -0400
 @@ -1292,6 +1292,7 @@
  
  	sysnet_dns_name_resolve($1)
@@ -773,7 +785,7 @@
  		nis_use_ypbind($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.48/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-20 17:26:29.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -788,7 +800,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.48/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-20 17:26:29.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -805,7 +817,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.48/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/libraries.fc	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/libraries.fc	2006-06-20 17:26:29.000000000 -0400
 @@ -121,7 +121,7 @@
  
  /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -817,7 +829,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.48/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/mount.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/mount.te	2006-06-20 17:26:29.000000000 -0400
 @@ -111,6 +111,7 @@
  	tunable_policy(`allow_mount_anyfile',`
  		auth_read_all_dirs_except_shadow(mount_t)
@@ -828,7 +840,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.48/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-20 17:26:29.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -840,7 +852,7 @@
  # cjp: why is this needed?
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.48/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/unconfined.fc	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/unconfined.fc	2006-06-20 17:26:29.000000000 -0400
 @@ -7,4 +7,6 @@
  ifdef(`targeted_policy',`
  /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -850,7 +862,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.48/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-20 09:54:08.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-20 22:00:25.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1155,7 +1167,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4767,3 +4789,37 @@
+@@ -4767,3 +4789,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -1176,9 +1188,6 @@
 +##	userdomain changing from 
 +##	</summary>
 +## </param>
-+## <summary>
-+##	Unconfined access to user domains.
-+## </summary>
 +## <param name="userdomain_prefix">
 +##	<summary>
 +##	userdomain changing to
@@ -1195,7 +1204,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.48/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-20 17:26:29.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1260,7 +1269,7 @@
  	allow privhome home_root_t:dir { getattr search };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.48/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/xen.te	2006-06-20 17:23:37.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/xen.te	2006-06-20 17:26:29.000000000 -0400
 @@ -68,7 +68,8 @@
  # xend local policy
  #



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:07:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:07:17 -0400
Subject: rpms/vim/FC-5 vim-4.2-speed_t.patch,1.1,NONE
Message-ID: <200606211307.k5LD7H4l032589@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32563

Removed Files:
	vim-4.2-speed_t.patch 
Log Message:
- remove obsolete patch


--- vim-4.2-speed_t.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:07:32 -0400
Subject: rpms/vim/FC-5 vim-5.6a-paths.patch,1.1,NONE
Message-ID: <200606211307.k5LD7WB7032618@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32600

Removed Files:
	vim-5.6a-paths.patch 
Log Message:
- remove obsolete patch


--- vim-5.6a-paths.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:07:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:07:55 -0400
Subject: rpms/vim/FC-5 vim-6.0-fixkeys.patch,1.3,NONE
Message-ID: <200606211307.k5LD7tZV032662@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32633

Removed Files:
	vim-6.0-fixkeys.patch 
Log Message:
- remove obsolete patch


--- vim-6.0-fixkeys.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:08:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:08:34 -0400
Subject: rpms/vim/FC-5 vim-6.0r-crv.patch,1.3,NONE
Message-ID: <200606211308.k5LD8Yed032735@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32697

Removed Files:
	vim-6.0r-crv.patch 
Log Message:
- remove obsolete patch


--- vim-6.0r-crv.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:08:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:08:56 -0400
Subject: rpms/vim/FC-5 vim-6.1-syntax.patch,1.1,NONE
Message-ID: <200606211308.k5LD8utS000344@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv302

Removed Files:
	vim-6.1-syntax.patch 
Log Message:
- remove obsolete patch


--- vim-6.1-syntax.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:09:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:09:23 -0400
Subject: rpms/vim/FC-5 vim-6.2-rclocation.patch,1.1,NONE
Message-ID: <200606211309.k5LD9NNJ000439@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv389

Removed Files:
	vim-6.2-rclocation.patch 
Log Message:
- remove obsolete patch


--- vim-6.2-rclocation.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:09:40 -0400
Subject: rpms/vim/FC-5 vim-6.3-dnssyntax.patch,1.1,NONE
Message-ID: <200606211309.k5LD9eXc000491@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv481

Removed Files:
	vim-6.3-dnssyntax.patch 
Log Message:
- remove obsolete patch


--- vim-6.3-dnssyntax.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:09:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:09:47 -0400
Subject: rpms/vim/FC-5 vim-6.4-fstabsyntax.patch,1.1,NONE
Message-ID: <200606211309.k5LD9lL5000544@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv520

Removed Files:
	vim-6.4-fstabsyntax.patch 
Log Message:
- remove obsolete patch


--- vim-6.4-fstabsyntax.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:10:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:10:13 -0400
Subject: rpms/vim/FC-5 vim-6.4-tmpfile.patch,1.1,NONE
Message-ID: <200606211310.k5LDAD57000595@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv567

Removed Files:
	vim-6.4-tmpfile.patch 
Log Message:
- remove obsolete patch


--- vim-6.4-tmpfile.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:10:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:10:34 -0400
Subject: rpms/vim/FC-5 Changelog.rpm,1.1,1.2
Message-ID: <200606211310.k5LDAYxP000711@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv683

Modified Files:
	Changelog.rpm 
Log Message:
- move some changelog entries into extra file


Index: Changelog.rpm
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/Changelog.rpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Changelog.rpm	9 Sep 2004 14:15:12 -0000	1.1
+++ Changelog.rpm	21 Jun 2006 13:10:31 -0000	1.2
@@ -1,3 +1,230 @@
+* Thu Mar 09 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-4
+- fix configure check for python (#184478)
+
+* Thu Mar 09 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-3
+- rebuild
+
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-2
+- gtk-update-icon-cache --ignore-theme-index 
+  (avoids %%post failures when hicolor-icon-theme isn't installed)
+
+* Wed Feb 15 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-1
+- fix vim.csh script (#180429)
+- patchlevel 7
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:6.4.006-1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:6.4.006-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 02 2006 Karsten Hopp <karsten at redhat.de> 6.4.006-1
+- patchlevel 6, fixes bz# 175048
+
+* Tue Dec 20 2005 Karsten Hopp <karsten at redhat.de> 6.4.004-2
+- disable templates when editing new .c / .h files (#175878)
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Thu Dec 08 2005 Karsten Hopp <karsten at redhat.de> 6.4.004-1
+- fix fstab syntax file (#174735)
+- patchlevel 4
+
+* Wed Nov 30 2005 Karsten Hopp <karsten at redhat.de> 6.4.003-1
+- patchlevel 3
+- remove withgui switch as we include vim-X11 in all our distributions now 
+  (#174271)
+
+* Fri Nov 25 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-4
+- enable tmpfile patch 
+
+* Thu Oct 27 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-3
+- test build
+
+* Tue Oct 25 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-2
+- use %%{_sysconfdir} (#171556)
+- add syntax highlighting rule for %%check (Ralf Ertzinger, #165277)
+
+* Mon Oct 17 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-1
+- vim-6.4 patchlevel 0
+
+* Tue Oct 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.090-2
+- don't try to run cscope if cscope binary doesn't exist (#170371)
+- another attempt to fix perl requirements (#145475)
+
+* Mon Oct 10 2005 Karsten Hopp <karsten at redhat.de> 6.3.090-1
+- patchlevel 90
+- next attempt to fix perl requirements, add perl-epoch (#145475)
+
+* Thu Sep 08 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-5
+- fix path to csupport templates
+- point user at README.csupport so that defaults can be set
+- make vim buildable without csupport with a variable
+
+* Thu Sep 01 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-3
+- move X11 stuff to /usr/bin per request of xorg.x11 maintainer
+  Matthias Saou (#167176)
+
+* Tue Aug 16 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-2
+- rebuild
+
+* Tue Aug 09 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-1
+- update to patchlevel 86
+
+* Mon Jun 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.080-1
+- update to patchlevel 80
+
+* Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> - 1:6.3.071-3
+- silence %%post
+
+* Mon Apr 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.071-2
+- fix wrong Russian code page for vimtutor (#155181)
+
+* Mon Apr 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.071-1
+- patchlevel 71, fixes crashes when converting text with illegal characters
+  and when moving the vertical separator to the far left (vertically splitted 
+  window)
+
+* Mon Apr 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.068-2
+- quote special characters in here documents (vim.sh/vim.csh) (#154321)
+
+* Thu Mar 31 2005 Karsten Hopp <karsten at redhat.de> 6.3-068
+- pathlevel 68 (can't write when editing symbolic link to compressed file)
+- remove -s parameter from install, this should fix debuginfo packages
+
+* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
+- rebuilt
+
+* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 6.3.067-2
+- Update the GTK+ theme icon cache on (un)install
+
+* Wed Mar 23 2005 Karsten Hopp <karsten at redhat.de> 6.3.067-1
+- Newly created files got execute permission (caused by patch 66)
+  #151667
+
+* Fri Mar 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.066-1
+- patchlevel 66
+
+* Mon Mar 14 2005 Karsten Hopp <karsten at redhat.de> 6.3.064-1
+- patchlevel 64
+- fix selinux warning (#150126)
+
+* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 6.3.062-1
+- patchlevel 62, build with gcc-4
+
+* Thu Feb 10 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-3
+- spec.vim fix from Andrew Overholt
+
+* Mon Feb 07 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-2 
+- fix tmpfile patch (#147192)
+
+* Mon Jan 31 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-1 
+- patchlevel 61
+
+* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> 1:058-2
+- rebuild for new perl
+
+* Tue Jan 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.058-1
+- Patchlevel 58
+- rebuild with new perl
+- remove all rpm backup files
+
+* Wed Jan 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-2
+- remove backup files
+
+* Wed Jan 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-1
+- patchlevel 54
+- fix unsecure tempfile usage (#144698)
+
+* Mon Dec 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.042-1 
+- patchlevel 42
+
+* Thu Dec 02 2004 Karsten Hopp <karsten at redhat.de> 6.3.035-2 
+- fix compressed docs handling (#141565)
+
+* Wed Dec 01 2004 Karsten Hopp <karsten at redhat.de> 6.3.035-1 
+- patchlevel 35
+- allow remapping of 'g' (#140747)
+
+* Fri Nov 19 2004 Karsten Hopp <karsten at redhat.de> 6.3.033-1 
+- patchlevel 33
+
+* Tue Nov 02 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-3 
+- fix selinux patch, so that HAVE_SELINUX will not be defined on 
+  non-selinux systems (#137860)
+
+* Tue Oct 19 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-3 
+- fix dependencies on vim-common (#132371)
+
+* Mon Oct 11 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-2 
+- add cscope to vimrc so that cscope DB will be used 
+  automatically when available
+
+* Fri Oct 08 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-2
+- patchlevel 30
+
+* Wed Oct 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.029-2 
+- fix perl requirement
+- patchlevel 29 to fix crash when inserting a line break
+
+* Wed Sep 29 2004 Karsten Hopp <karsten at redhat.de> 6.3.028-2 
+- add patch from Ulrich Drepper to fix syntax highlighting of 
+  DNS config files (#133746)
+
+* Tue Sep 21 2004 Than Ngo <than at redhat.com> 6.3.028-1
+- add patchlevel 27,28
+
+* Tue Sep 14 2004 Karsten Hopp <karsten at redhat.de> 6.3.026-1
+- patchlevel 26 (fixes an endless loop in syntax highlighting)
+
+* Wed Sep 08 2004 Karsten Hopp <karsten at redhat.de> 6.3.025-2 
+- clean up spec file
+- disable fontset
+- enable cscope
+
+* Mon Sep 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.025-1 
+- patchlevel 25
+
+* Wed Sep 01 2004 Karsten Hopp <karsten at redhat.de> 6.3.020-1
+- patchlevel 20
+
+* Sun Aug 29 2004 Karsten Hopp <karsten at redhat.de> 6.3.017-1 
+- patchlevel 17
+
+* Fri Aug 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.015-1
+- update to patchlevel 15
+- move older rpm changelog entries to Changelog.rpm
+
+* Mon Jul 26 2004 Warren Togami <wtogami at redhat.com> 6.3.014-2
+- future proof vim-enhanced perl dep
+
+* Thu Jul 22 2004 Karsten Hopp <karsten at redhat.de> 6.3.014-1
+- patchlevel 14, fixes 'helplang' default settings
+- fix escape sequence in /etc/vimrc (#128344)
+
+* Fri Jul 16 2004 Karsten Hopp <karsten at redhat.de> 6.3.013-2
+- use different encoding for tutor.pl (#125376)
+
+* Tue Jul 13 2004 Karsten Hopp <karsten at redhat.de> 6.3.013-1
+- patchlevel 13 to fix some crashes with multi-line patterns 
+  and when using CTRL-R in command mode
+
+* Thu Jul 8 2004 Dan Walsh <dwalsh at redhat.com> 6.3.011-4
+- Fix selinux patch to handle symlinks
+
+* Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 6.3.011-3
+- rebuild with new gcc
+
+* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 6.3.011-2 
+- convert tutorial files to UTF8 (#125376)
+
+* Sat Jul 03 2004 Karsten Hopp <karsten at redhat.de> 6.3.011-1 
+- patchlevel 11
+
+* Thu Jun 17 2004 Karsten Hopp <karsten at redhat.de> 6.3.006-1 
+- update to new major release
+
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:11:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:11:25 -0400
Subject: rpms/vim/FC-5 README.patches,1.40,1.41
Message-ID: <200606211311.k5LDBPGF000959@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv880

Modified Files:
	README.patches 
Log Message:
- vim70 starts with a new README file


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/README.patches,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- README.patches	15 Feb 2006 14:28:45 -0000	1.40
+++ README.patches	21 Jun 2006 13:11:22 -0000	1.41
@@ -1,4 +1,4 @@
-Patches for Vim - Vi IMproved 6.4
+Patches for Vim - Vi IMproved 7.0
 
 The files in this directory contain source code changes to fix
 problems in released versions of Vim.  Each file also contains an
@@ -14,21 +14,36 @@
 and "runtime" directories are located.
 Depending on the version of "patch" that you use, you may have add
 an argument to make it patch the right file:
-        patch -p < 6.4.001
-        patch -p0 < 6.4.001
+        patch -p < 7.0.001
+        patch -p0 < 7.0.001
 
 After applying a patch, you need to compile Vim.  There are no
 patches for binaries.
 
 Checksums for the patch files can be found in the file MD5.
 
-Individual patches for Vim 6.4:
+Individual patches for Vim 7.0:
 
   SIZE  NAME     FIXES
-  1705  6.4.001  (extra) Win32: can't compile the global IME code
-  7802  6.4.002  Unix: may change owner of wrong file in rare cases
-  1463  6.4.003  (after 6.4.002) build problem on non-Unix system
-  1581  6.4.004  "go" doesn't work correctly when 'virtualedit' is set
-  1577  6.4.005  truncating message may write before buffer
-  2320  6.4.006  ":argedit", "argdel" and ":argadd" used count argument
-  1717  6.4.007  Unix: crash when expanding backticks
+  1627  7.0.001  'spellsuggest' could not be added to
+  2007  7.0.002  C omni complete has problem with % and # in tags file path
+  1876  7.0.003  GUI: click in tab pages label may warp mouse pointer
+  1596  7.0.004  Compiler warning for debug_saved used before set
+  1579  7.0.005  (extra) Win32: uninstall didn't delete spell and autoload dirs
+  1347  7.0.006  Mac: "make shadow" didn't link infplist.xml
+  1919  7.0.007  AIX: compiling failed for message.c
+  2081  7.0.008  Can't call a function that uses both <SID> and {expr}
+  1625  7.0.009  ml_get errors when 'spell' is set
+  3705  7.0.010  spellfile plugin required typing login name and password
+  1989  7.0.011  can't compile with eval feature without folding feature
+  2532  7.0.012  matchparen plugin changed cursor column in Insert mode
+  4614  7.0.013  Insert mode completion: CTRL-L jumped back to original text
+  5712  7.0.014  Motif: doesn't compile with Motif 1.2 and earlier
+  4485  7.0.015  Athena: type casts for lvalues
+  1810  7.0.016  recognize encodings "mac-roman", "dec-mcs" and "hp-roman8"
+  2302  7.0.017  (after 7.0.014) Motif: doesn't link with Motif 1.2 and earlier
+  1649  7.0.018  VMS: plugins are not loaded on startup
+  1425  7.0.019  crash for "VjA789" and repeating
+  1470  7.0.020  GUI: crash when using 'mousefocus'
+  4240  7.0.021  crash when using "\\[" and "\\]" in 'errorformat
+  5471  7.0.022  Ruby: buffer.append() could append to the wrong buffer



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:12:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:12:14 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.87,
	1.88 libselinux.spec, 1.205, 1.206
Message-ID: <200606211312.k5LDCEYd001232@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1193

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-3
- Fix error reporting of matchpathcon


libselinux-rhat.patch:
 include/selinux/selinux.h |   12 ++++++
 man/man8/matchpathcon.8   |   18 ++++++++-
 src/matchpathcon.c        |   83 +++++++++++++++++++++++++++++++++++++++++++---
 utils/matchpathcon.c      |   65 ++++++++++++++++++++++++++++--------
 4 files changed, 156 insertions(+), 22 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- libselinux-rhat.patch	20 Jun 2006 20:30:59 -0000	1.87
+++ libselinux-rhat.patch	21 Jun 2006 13:12:11 -0000	1.88
@@ -181,8 +181,8 @@
 +}
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.15/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.15/utils/matchpathcon.c	2006-06-20 11:30:26.000000000 -0400
-@@ -12,19 +12,43 @@
++++ libselinux-1.30.15/utils/matchpathcon.c	2006-06-21 09:05:20.000000000 -0400
+@@ -12,19 +12,44 @@
  	exit(1);
  }
  
@@ -190,8 +190,8 @@
 +	char *buf;
 +	int rc = matchpathcon(path, 0, &buf);
 +	if (rc < 0) {
-+		fprintf(stderr, "matchpathcon(%s) failed\n", path);
-+		return 2;
++		fprintf(stderr, "matchpathcon(%s) failed: %s\n", path, strerror(errno));
++		return 1;
 +	}
 +	if (header)
 +		printf("%s\t%s\n", path, buf);
@@ -210,6 +210,7 @@
  	int header=1, opt;
 +	int verify=0;
 +	int notrans=0;
++	int error=0;
  
  	if (argc < 2) usage(argv[0]);
  
@@ -229,7 +230,7 @@
  		case 'f':
  			if (init) {
  				fprintf(stderr, "%s:  -f and -p are exclusive\n", argv[0]);
-@@ -54,17 +78,29 @@
+@@ -54,18 +79,30 @@
  		}
  	}
  	for (i = optind; i < argc; i++) {
@@ -256,16 +257,18 @@
 -		freecon(buf);
 +				if (rc >= 0) {
 +					printf("%s has context %s, should be ", argv[i], con);
-+					printmatchpathcon(argv[i], 0);
++					error += printmatchpathcon(argv[i], 0);
 +					freecon(con);
 +				} else {
 +					printf("actual context unknown: %s, should be ", strerror(errno));
-+					printmatchpathcon(argv[i], 0);
++					error += printmatchpathcon(argv[i], 0);
 +				}
 +			}
 +		} else {
-+			printmatchpathcon(argv[i], header);
++			error += printmatchpathcon(argv[i], header);
 +		}
  	}
  	matchpathcon_fini();
- 	return 0;
+-	return 0;
++	return error;
+ }


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- libselinux.spec	20 Jun 2006 20:30:59 -0000	1.205
+++ libselinux.spec	21 Jun 2006 13:12:11 -0000	1.206
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.15
-Release: 2
+Release: 3
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -117,6 +117,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-3
+- Fix error reporting of matchpathcon
+
 * Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-2
 - Add function to compare file context on disk versus contexts in file_contexts file.
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:13:30 -0400
Subject: rpms/vim/FC-5 7.0.001,NONE,1.1
Message-ID: <200606211313.k5LDDUcB001678@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1648

Added Files:
	7.0.001 
Log Message:
- patchlevel 01


--- NEW FILE 7.0.001 ---
To: vim-dev at vim.org
Subject: Patch 7.0.001
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.001
Problem:    ":set spellsuggest+=10" does not work. (Suresh Govindachar)
Solution:   Add P_COMMA to the 'spellsuggest' flags.
Files:      src/option.c


*** ../vim-7.0.000/src/option.c	Wed May  3 23:26:04 2006
--- src/option.c	Sun May  7 17:54:46 2006
***************
*** 2294,2300 ****
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
!     {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
  #ifdef FEAT_SPELL
  			    (char_u *)&p_sps, PV_NONE,
  			    {(char_u *)"best", (char_u *)0L}
--- 2294,2300 ----
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
!     {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
  #ifdef FEAT_SPELL
  			    (char_u *)&p_sps, PV_NONE,
  			    {(char_u *)"best", (char_u *)0L}
*** ../vim-7.0.000/src/version.c	Wed May  3 00:04:24 2006
--- src/version.c	Tue May  9 14:23:20 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     1,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
70. ISDN lines are added to your house on a hourly basis

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:13:38 -0400
Subject: rpms/vim/FC-5 7.0.002,NONE,1.1
Message-ID: <200606211313.k5LDDcuE001745@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1715

Added Files:
	7.0.002 
Log Message:
- patchlevel 02


--- NEW FILE 7.0.002 ---
To: vim-dev at vim.org
Subject: Patch 7.0.002
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.002
Problem:    C omni completion has a problem with tags files with a path
	    containing "#" or "%".
Solution:   Escape these characters. (Sebastian Baberowski)
Files:	    runtime/autoload/ccomplete.vim


*** ../vim-7.0.001/runtime/autoload/ccomplete.vim	Wed May 10 15:22:54 2006
--- runtime/autoload/ccomplete.vim	Mon May  8 13:52:07 2006
***************
*** 1,7 ****
  " Vim completion script
  " Language:	C
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 May 03
  
  
  " This function is used for the 'omnifunc' option.
--- 1,7 ----
  " Vim completion script
  " Language:	C
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 May 08
  
  
  " This function is used for the 'omnifunc' option.
***************
*** 458,464 ****
  " member.
  function! s:StructMembers(typename, items, all)
    " Todo: What about local structures?
!   let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
    if fnames == ''
      return []
    endif
--- 458,464 ----
  " member.
  function! s:StructMembers(typename, items, all)
    " Todo: What about local structures?
!   let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
    if fnames == ''
      return []
    endif
*** ../vim-7.0.001/src/version.c	Wed May 10 15:22:50 2006
--- src/version.c	Wed May 10 15:24:42 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     2,
  /**/

-- 
>From "know your smileys":
 =):-)	Uncle Sam

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:13:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:13:48 -0400
Subject: rpms/vim/FC-5 7.0.003,NONE,1.1
Message-ID: <200606211313.k5LDDmKl001811@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1784

Added Files:
	7.0.003 
Log Message:
- patchlevel 03


--- NEW FILE 7.0.003 ---
To: vim-dev at vim.org
Subject: Patch 7.0.003
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.003
Problem:    GUI: clicking in the lower part of a label in the tab pages line
	    while 'mousefocus' is set may warp the mouse pointer. (Robert
	    Webb)
Solution:   Check for a negative mouse position.
Files:	    src/gui.c


*** ../vim-7.0.002/src/gui.c	Wed May 10 15:22:49 2006
--- src/gui.c	Mon May  8 16:31:49 2006
***************
*** 4603,4613 ****
      /* Don't move the mouse when it's left or right of the Vim window */
      if (x < 0 || x > Columns * gui.char_width)
  	return;
  # ifdef FEAT_WINDOWS
!     if (Y_2_ROW(y) >= tabline_height())
! # else
!     if (y >= 0)
  # endif
  	wp = xy2win(x, y);
      if (wp != curwin && wp != NULL)	/* If in other than current window */
      {
--- 4603,4613 ----
      /* Don't move the mouse when it's left or right of the Vim window */
      if (x < 0 || x > Columns * gui.char_width)
  	return;
+     if (y >= 0
  # ifdef FEAT_WINDOWS
! 	    && Y_2_ROW(y) >= tabline_height()
  # endif
+        )
  	wp = xy2win(x, y);
      if (wp != curwin && wp != NULL)	/* If in other than current window */
      {
*** ../vim-7.0.002/src/version.c	Wed May 10 15:25:45 2006
--- src/version.c	Wed May 10 17:12:27 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     3,
  /**/

-- 
>From "know your smileys":
 2B|^2B	  Message from Shakespeare

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:13:57 -0400
Subject: rpms/vim/FC-5 7.0.004,NONE,1.1
Message-ID: <200606211313.k5LDDvPT001885@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1853

Added Files:
	7.0.004 
Log Message:
- patchlevel 04


--- NEW FILE 7.0.004 ---
To: vim-dev at vim.org
Subject: Patch 7.0.004
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.004
Problem:    Compiler warning for debug_saved used before set. (Todd Blumer)
Solution:   Remove the "else" for calling save_dbg_stuff().
Files:	    src/ex_docmd.c


*** ../vim-7.0.003/src/ex_docmd.c	Wed May 10 15:22:49 2006
--- src/ex_docmd.c	Mon May  8 16:43:34 2006
***************
*** 833,839 ****
       * If requested, store and reset the global values controlling the
       * exception handling (used when debugging).
       */
!     else if (flags & DOCMD_EXCRESET)
  	save_dbg_stuff(&debug_saved);
  
      initial_trylevel = trylevel;
--- 833,839 ----
       * If requested, store and reset the global values controlling the
       * exception handling (used when debugging).
       */
!     if (flags & DOCMD_EXCRESET)
  	save_dbg_stuff(&debug_saved);
  
      initial_trylevel = trylevel;
*** ../vim-7.0.003/src/version.c	Wed May 10 17:12:51 2006
--- src/version.c	Wed May 10 17:14:34 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     4,
  /**/

-- 
>From "know your smileys":
 :-D	Big smile

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:14:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:14:05 -0400
Subject: rpms/vim/FC-5 7.0.005,NONE,1.1
Message-ID: <200606211314.k5LDE5Uk001950@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1926

Added Files:
	7.0.005 
Log Message:
- patchlevel 05


--- NEW FILE 7.0.005 ---
To: vim-dev at vim.org
Subject: Patch 7.0.005 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.005 (extra)
Problem:    Win32: The installer doesn't remove the "autoload" and "spell"
	    directories. (David Fishburn)
Solution:   Add the directories to the list to be removed.
Files:	    nsis/gvim.nsi


*** ../vim-7.0.004/nsis/gvim.nsi	Wed May 10 15:22:50 2006
--- nsis/gvim.nsi	Mon May  8 17:57:28 2006
***************
*** 391,396 ****
--- 391,397 ----
  	ClearErrors
  	# Remove everything but *.dll files.  Avoids that
  	# a lot remains when gvimext.dll cannot be deleted.
+ 	RMDir /r $0\autoload
  	RMDir /r $0\colors
  	RMDir /r $0\compiler
  	RMDir /r $0\doc
***************
*** 398,403 ****
--- 399,405 ----
  	RMDir /r $0\indent
  	RMDir /r $0\macros
  	RMDir /r $0\plugin
+ 	RMDir /r $0\spell
  	RMDir /r $0\syntax
  	RMDir /r $0\tools
  	RMDir /r $0\tutor
*** ../vim-7.0.004/src/version.c	Wed May 10 17:15:05 2006
--- src/version.c	Wed May 10 17:24:02 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     5,
  /**/

-- 
>From "know your smileys":
 :-&	Eating spaghetti

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:14:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:14:13 -0400
Subject: rpms/vim/FC-5 7.0.006,NONE,1.1
Message-ID: <200606211314.k5LDEDG1002011@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1987

Added Files:
	7.0.006 
Log Message:
- patchlevel 06


--- NEW FILE 7.0.006 ---
To: vim-dev at vim.org
Subject: Patch 7.0.006
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.006
Problem:    Mac: "make shadow" doesn't make a link for infplist.xml. (Axel
	    Kielhorn)
Solution:   Make the link.
Files:	    src/Makefile


*** ../vim-7.0.005/src/Makefile	Wed May 10 15:22:49 2006
--- src/Makefile	Wed May 10 17:26:19 2006
***************
*** 2177,2182 ****
--- 2177,2183 ----
  	cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
  	if test -d $(RSRC_DIR); then \
  		cd $(SHADOWDIR); \
+ 		ln -s ../infplist.xml .; \
  		ln -s ../$(RSRC_DIR) ../os_mac.rsr.hqx ../dehqx.py .; \
  	fi
  	mkdir $(SHADOWDIR)/testdir
*** ../vim-7.0.005/src/version.c	Wed May 10 17:24:26 2006
--- src/version.c	Wed May 10 17:26:09 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     6,
  /**/

-- 
>From "know your smileys":
 @:-()	Elvis Presley

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:14:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:14:22 -0400
Subject: rpms/vim/FC-5 7.0.007,NONE,1.1
Message-ID: <200606211314.k5LDEMER002083@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2062

Added Files:
	7.0.007 
Log Message:
- patchlevel 07


--- NEW FILE 7.0.007 ---
To: vim-dev at vim.org
Subject: Patch 7.0.007
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.007
Problem:    AIX: compiling fails for message.c. (Ruediger Hornig)
Solution:   Move the #if outside of memchr().
Files:	    src/message.c


*** ../vim-7.0.006/src/message.c	Wed May 10 15:22:50 2006
--- src/message.c	Tue May  9 10:36:56 2006
***************
*** 4175,4189 ****
  			str_arg_l = 0;
  		    else
  		    {
! 			/* memchr on HP does not like n > 2^31  !!! */
! 			char *q = memchr(str_arg, '\0',
  #if SIZEOF_INT <= 2
! 				precision
  #else
! 				precision <= (size_t)0x7fffffffL ? precision
! 						       : (size_t)0x7fffffffL
  #endif
- 						       );
  			str_arg_l = (q == NULL) ? precision : q - str_arg;
  		    }
  		    break;
--- 4175,4190 ----
  			str_arg_l = 0;
  		    else
  		    {
! 			/* Don't put the #if inside memchr(), it can be a
! 			 * macro. */
  #if SIZEOF_INT <= 2
! 			char *q = memchr(str_arg, '\0', precision);
  #else
! 			/* memchr on HP does not like n > 2^31  !!! */
! 			char *q = memchr(str_arg, '\0',
! 				  precision <= (size_t)0x7fffffffL ? precision
! 						       : (size_t)0x7fffffffL);
  #endif
  			str_arg_l = (q == NULL) ? precision : q - str_arg;
  		    }
  		    break;
*** ../vim-7.0.006/src/version.c	Wed May 10 17:26:37 2006
--- src/version.c	Wed May 10 17:36:03 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     7,
  /**/

-- 
Momento mori, ergo carpe diem

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:14:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:14:35 -0400
Subject: rpms/vim/FC-5 7.0.008,NONE,1.1
Message-ID: <200606211314.k5LDEZq9002170@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2147

Added Files:
	7.0.008 
Log Message:
- patchlevel 08


--- NEW FILE 7.0.008 ---
To: vim-dev at vim.org
Subject: Patch 7.0.008
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.008
Problem:    Can't call a function that uses both <SID> and {expr}. (Thomas)
Solution:   Check both the expanded and unexpanded name for <SID>.
Files:	    src/eval.c


*** ../vim-7.0.007/src/eval.c	Wed May 10 15:22:49 2006
--- src/eval.c	Wed May 10 12:11:42 2006
***************
*** 11372,11378 ****
  	    if (argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
! 		int		xp_namelen;
  		long	argt;
  
  		rettv->vval.v_string = NULL;
--- 11372,11378 ----
  	    if (argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
! 		int	xp_namelen;
  		long	argt;
  
  		rettv->vval.v_string = NULL;
***************
*** 18963,18969 ****
      else if (lead > 0)
      {
  	lead = 3;
! 	if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp))
  	{
  	    /* It's "s:" or "<SID>" */
  	    if (current_SID <= 0)
--- 18963,18970 ----
      else if (lead > 0)
      {
  	lead = 3;
! 	if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name))
! 						       || eval_fname_sid(*pp))
  	{
  	    /* It's "s:" or "<SID>" */
  	    if (current_SID <= 0)
*** ../vim-7.0.007/src/version.c	Wed May 10 17:38:05 2006
--- src/version.c	Wed May 10 17:39:46 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     8,
  /**/

-- 
>From "know your smileys":
 %	Bike accident.  A bit far-fetched, I suppose; although...
             o      _     _         _
     _o     /\_   _ \\o  (_)\__/o  (_)
   _< \_   _>(_) (_)/<_    \_| \   _|/' \/
  (_)>(_) (_)        (_)   (_)    (_)'  _\o_

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:14:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:14:44 -0400
Subject: rpms/vim/FC-5 7.0.009,NONE,1.1
Message-ID: <200606211314.k5LDEiWu002227@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2208

Added Files:
	7.0.009 
Log Message:
- patchlevel 09


--- NEW FILE 7.0.009 ---
To: vim-dev at vim.org
Subject: Patch 7.0.009
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.009
Problem:    ml_get errors with both 'sidescroll' and 'spell' set.
Solution:   Use ml_get_buf() instead of ml_get(), get the line from the right
	    buffer, not the current one.
Files:	    src/spell.c


*** ../vim-7.0.008/src/spell.c	Wed May 10 15:22:50 2006
--- src/spell.c	Tue May  9 18:55:04 2006
***************
*** 2108,2114 ****
  	 * possible. */
  	STRCPY(buf, line);
  	if (lnum < wp->w_buffer->b_ml.ml_line_count)
! 	    spell_cat_line(buf + STRLEN(buf), ml_get(lnum + 1), MAXWLEN);
  
  	p = buf + skip;
  	endp = buf + len;
--- 2108,2115 ----
  	 * possible. */
  	STRCPY(buf, line);
  	if (lnum < wp->w_buffer->b_ml.ml_line_count)
! 	    spell_cat_line(buf + STRLEN(buf),
! 			  ml_get_buf(wp->w_buffer, lnum + 1, FALSE), MAXWLEN);
  
  	p = buf + skip;
  	endp = buf + len;
*** ../vim-7.0.008/src/version.c	Wed May 10 17:40:17 2006
--- src/version.c	Wed May 10 17:50:20 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     9,
  /**/

-- 
I AM THANKFUL...
...for the taxes that I pay because it means that I am employed.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:14:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:14:52 -0400
Subject: rpms/vim/FC-5 7.0.010,NONE,1.1
Message-ID: <200606211314.k5LDEq2n002279@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2255

Added Files:
	7.0.010 
Log Message:
- patchlevel 10


--- NEW FILE 7.0.010 ---
To: vim-dev at vim.org
Subject: Patch 7.0.010
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.010
Problem:    The spellfile plugin required typing login name and password.
Solution:   Use "anonymous" and "vim7user" by default.  No need to setup a
	    .netrc file.
Files:	    runtime/autoload/spellfile.vim


*** ../vim-7.0.009/runtime/autoload/spellfile.vim	Wed May 10 15:22:54 2006
--- runtime/autoload/spellfile.vim	Wed May 10 17:55:15 2006
***************
*** 1,9 ****
  " Vim script to download a missing spell file
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Feb 01
  
  if !exists('g:spellfile_URL')
!   let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/unstable/runtime/spell'
  endif
  let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
  
--- 1,9 ----
  " Vim script to download a missing spell file
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 May 10
  
  if !exists('g:spellfile_URL')
!   let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
  endif
  let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
  
***************
*** 61,73 ****
      new
      setlocal bin
      echo 'Downloading ' . fname . '...'
!     exe 'Nread ' g:spellfile_URL . '/' . fname
      if getline(2) !~ 'VIMspell'
        " Didn't work, perhaps there is an ASCII one.
        g/^/d
        let fname = a:lang . '.ascii.spl'
        echo 'Could not find it, trying ' . fname . '...'
!       exe 'Nread ' g:spellfile_URL . '/' . fname
        if getline(2) !~ 'VIMspell'
  	echo 'Sorry, downloading failed'
  	bwipe!
--- 61,73 ----
      new
      setlocal bin
      echo 'Downloading ' . fname . '...'
!     call spellfile#Nread(fname)
      if getline(2) !~ 'VIMspell'
        " Didn't work, perhaps there is an ASCII one.
        g/^/d
        let fname = a:lang . '.ascii.spl'
        echo 'Could not find it, trying ' . fname . '...'
!       call spellfile#Nread(fname)
        if getline(2) !~ 'VIMspell'
  	echo 'Sorry, downloading failed'
  	bwipe!
***************
*** 95,101 ****
  	g/^/d
  	let fname = substitute(fname, '\.spl$', '.sug', '')
  	echo 'Downloading ' . fname . '...'
! 	exe 'Nread ' g:spellfile_URL . '/' . fname
  	if getline(2) !~ 'VIMsug'
  	  echo 'Sorry, downloading failed'
  	else
--- 95,101 ----
  	g/^/d
  	let fname = substitute(fname, '\.spl$', '.sug', '')
  	echo 'Downloading ' . fname . '...'
! 	call spellfile#Nread(fname)
  	if getline(2) !~ 'VIMsug'
  	  echo 'Sorry, downloading failed'
  	else
***************
*** 108,111 ****
--- 108,118 ----
  
      bwipe
    endif
+ endfunc
+ 
+ " Read "fname" from the ftp server.
+ function! spellfile#Nread(fname)
+   let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
+   let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
+   exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
  endfunc
*** ../vim-7.0.009/src/version.c	Wed May 10 17:51:22 2006
--- src/version.c	Wed May 10 17:53:53 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     10,
  /**/

-- 
I AM THANKFUL...
...for the mess to clean after a party because it means I have
been surrounded by friends.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:15:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:15:00 -0400
Subject: rpms/vim/FC-5 7.0.011,NONE,1.1
Message-ID: <200606211315.k5LDF0Nc002343@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2320

Added Files:
	7.0.011 
Log Message:
- patchlevel 11


--- NEW FILE 7.0.011 ---
To: vim-dev at vim.org
Subject: Patch 7.0.011
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.011
Problem:    Can't compile without the folding and with the eval feature.
Solution:   Add an #ifdef. (Vallimar)
Files:	    src/option.c


*** ../vim-7.0.010/src/option.c	Wed May 10 15:22:50 2006
--- src/option.c	Wed May 10 19:37:10 2006
***************
*** 5227,5239 ****
  	    case PV_STL:	return &curwin->w_p_stl_flags;
  #endif
  #ifdef FEAT_EVAL
  	    case PV_FDE:	return &curwin->w_p_fde_flags;
  	    case PV_FDT:	return &curwin->w_p_fdt_flags;
  # ifdef FEAT_BEVAL
  	    case PV_BEXPR:	return &curbuf->b_p_bexpr_flags;
  # endif
- #endif
- #if defined(FEAT_EVAL)
  # if defined(FEAT_CINDENT)
  	    case PV_INDE:	return &curbuf->b_p_inde_flags;
  # endif
--- 5227,5239 ----
  	    case PV_STL:	return &curwin->w_p_stl_flags;
  #endif
  #ifdef FEAT_EVAL
+ # ifdef FEAT_FOLDING
  	    case PV_FDE:	return &curwin->w_p_fde_flags;
  	    case PV_FDT:	return &curwin->w_p_fdt_flags;
+ # endif
  # ifdef FEAT_BEVAL
  	    case PV_BEXPR:	return &curbuf->b_p_bexpr_flags;
  # endif
  # if defined(FEAT_CINDENT)
  	    case PV_INDE:	return &curbuf->b_p_inde_flags;
  # endif
*** ../vim-7.0.010/src/version.c	Wed May 10 17:55:37 2006
--- src/version.c	Thu May 11 19:22:54 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     11,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
112. You are amazed that anyone uses a phone without a modem on it...let
     alone hear actual voices.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:15:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:15:11 -0400
Subject: rpms/vim/FC-5 7.0.012,NONE,1.1
Message-ID: <200606211315.k5LDFB9X002430@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2407

Added Files:
	7.0.012 
Log Message:
- patchlevel 12


--- NEW FILE 7.0.012 ---
To: vim-dev at vim.org
Subject: Patch 7.0.012
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.012
Problem:    Using the matchparen plugin, moving the cursor in Insert mode to a
	    shorter line that ends in a brace, changes the preferred column
Solution:   Use winsaveview()/winrestview() instead of getpos()/setpos().
Files:	    runtime/plugin/matchparen.vim


*** ../vim-7.0.011/runtime/plugin/matchparen.vim	Wed May 10 15:22:55 2006
--- runtime/plugin/matchparen.vim	Thu May 11 14:42:55 2006
***************
*** 1,6 ****
  " Vim plugin for showing matching parens
  " Maintainer:  Bram Moolenaar <Bram at vim.org>
! " Last Change: 2006 Apr 27
  
  " Exit quickly when:
  " - this plugin was already loaded (or disabled)
--- 1,6 ----
  " Vim plugin for showing matching parens
  " Maintainer:  Bram Moolenaar <Bram at vim.org>
! " Last Change: 2006 May 11
  
  " Exit quickly when:
  " - this plugin was already loaded (or disabled)
***************
*** 90,96 ****
    " Find the match.  When it was just before the cursor move it there for a
    " moment.
    if before > 0
!     let save_cursor = getpos('.')
      call cursor(c_lnum, c_col - before)
    endif
  
--- 90,96 ----
    " Find the match.  When it was just before the cursor move it there for a
    " moment.
    if before > 0
!     let save_cursor = winsaveview()
      call cursor(c_lnum, c_col - before)
    endif
  
***************
*** 102,108 ****
    let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
  
    if before > 0
!     call setpos('.', save_cursor)
    endif
  
    " If a match is found setup match highlighting.
--- 102,108 ----
    let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
  
    if before > 0
!     call winrestview(save_cursor)
    endif
  
    " If a match is found setup match highlighting.
*** ../vim-7.0.011/src/version.c	Thu May 11 19:24:16 2006
--- src/version.c	Thu May 11 19:29:58 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     12,
  /**/

-- 
Corduroy pillows: They're making headlines!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:15:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:15:19 -0400
Subject: rpms/vim/FC-5 7.0.013,NONE,1.1
Message-ID: <200606211315.k5LDFJxv002478@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2459

Added Files:
	7.0.013 
Log Message:
- patchlevel 13


--- NEW FILE 7.0.013 ---
To: vim-dev at vim.org
Subject: Patch 7.0.013
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.013
Problem:    Insert mode completion: using CTRL-L to add an extra character
	    also deselects the current match, making it impossible to use
	    CTRL-L a second time.
Solution:   Keep the current match.  Also make CTRL-L work at the original
	    text, using the first displayed match.
Files:	    src/edit.c


*** ../vim-7.0.012/src/edit.c	Wed May 10 15:22:49 2006
--- src/edit.c	Thu May 11 10:38:54 2006
***************
*** 751,757 ****
  		    continue;
  		}
  
! 		/* Pressing CTRL-Y selects the current match.  Shen
  		 * compl_enter_selects is set the Enter key does the same. */
  		if (c == Ctrl_Y || (compl_enter_selects
  				   && (c == CAR || c == K_KENTER || c == NL)))
--- 751,757 ----
  		    continue;
  		}
  
! 		/* Pressing CTRL-Y selects the current match.  When
  		 * compl_enter_selects is set the Enter key does the same. */
  		if (c == Ctrl_Y || (compl_enter_selects
  				   && (c == CAR || c == K_KENTER || c == NL)))
***************
*** 3046,3052 ****
      ins_compl_delete();
      ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
      compl_used_match = FALSE;
-     compl_enter_selects = FALSE;
  
      if (compl_started)
  	ins_compl_set_original_text(compl_leader);
--- 3046,3051 ----
***************
*** 3076,3081 ****
--- 3075,3081 ----
  	compl_restarting = FALSE;
      }
  
+ #if 0   /* disabled, made CTRL-L, BS and typing char jump to original text. */
      if (!compl_used_match)
      {
  	/* Go to the original text, since none of the matches is inserted. */
***************
*** 3087,3092 ****
--- 3087,3094 ----
  	compl_curr_match = compl_shown_match;
  	compl_shows_dir = compl_direction;
      }
+ #endif
+     compl_enter_selects = !compl_used_match;
  
      /* Show the popup menu with a different set of matches. */
      ins_compl_show_pum();
***************
*** 3175,3184 ****
      char_u	*p;
      int		len = curwin->w_cursor.col - compl_col;
      int		c;
  
      p = compl_shown_match->cp_str;
      if ((int)STRLEN(p) <= len)   /* the match is too short */
! 	return;
      p += len;
  #ifdef FEAT_MBYTE
      c = mb_ptr2char(p);
--- 3177,3208 ----
      char_u	*p;
      int		len = curwin->w_cursor.col - compl_col;
      int		c;
+     compl_T	*cp;
  
      p = compl_shown_match->cp_str;
      if ((int)STRLEN(p) <= len)   /* the match is too short */
!     {
! 	/* When still at the original match use the first entry that matches
! 	 * the leader. */
! 	if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
! 	{
! 	    p = NULL;
! 	    for (cp = compl_shown_match->cp_next; cp != NULL
! 				 && cp != compl_first_match; cp = cp->cp_next)
! 	    {
! 		if (ins_compl_equal(cp, compl_leader,
! 						   (int)STRLEN(compl_leader)))
! 		{
! 		    p = cp->cp_str;
! 		    break;
! 		}
! 	    }
! 	    if (p == NULL || (int)STRLEN(p) <= len)
! 		return;
! 	}
! 	else
! 	    return;
!     }
      p += len;
  #ifdef FEAT_MBYTE
      c = mb_ptr2char(p);
***************
*** 4100,4105 ****
--- 4124,4144 ----
  		&& compl_shown_match->cp_next != NULL
  		&& compl_shown_match->cp_next != compl_first_match)
  	    compl_shown_match = compl_shown_match->cp_next;
+ 
+ 	/* If we didn't find it searching forward, and compl_shows_dir is
+ 	 * backward, find the last match. */
+ 	if (compl_shows_dir == BACKWARD
+ 		&& !ins_compl_equal(compl_shown_match,
+ 				      compl_leader, (int)STRLEN(compl_leader))
+ 		&& (compl_shown_match->cp_next == NULL
+ 		    || compl_shown_match->cp_next == compl_first_match))
+ 	{
+ 	    while (!ins_compl_equal(compl_shown_match,
+ 				      compl_leader, (int)STRLEN(compl_leader))
+ 		    && compl_shown_match->cp_prev != NULL
+ 		    && compl_shown_match->cp_prev != compl_first_match)
+ 		compl_shown_match = compl_shown_match->cp_prev;
+ 	}
      }
  
      if (allow_get_expansion && insert_match
*** ../vim-7.0.012/src/version.c	Thu May 11 19:30:09 2006
--- src/version.c	Fri May 12 19:03:32 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     13,
  /**/

-- 
I'm writing a book.  I've got the page numbers done.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:15:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:15:32 -0400
Subject: rpms/vim/FC-5 7.0.014,NONE,1.1
Message-ID: <200606211315.k5LDFW9w002543@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2518

Added Files:
	7.0.014 
Log Message:
- patchlevel 14


--- NEW FILE 7.0.014 ---
To: vim-dev at vim.org
Subject: Patch 7.0.014
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.014
Problem:    Compiling gui_xmebw.c fails on Dec Alpha Tru64. (Rolfe)
Solution:   Disable some code for Motif 1.2 and older.
Files:	    src/gui_xmebw.c


*** ../vim-7.0.013/src/gui_xmebw.c	Wed May 10 15:22:49 2006
--- src/gui_xmebw.c	Thu May 11 19:09:32 2006
***************
*** 480,486 ****
  	    || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
  	return;
  
! #ifndef LESSTIF_VERSION
      {
  	XmDisplay	dpy;
  
--- 480,486 ----
  	    || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
  	return;
  
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
      {
  	XmDisplay	dpy;
  
***************
*** 641,647 ****
      GC		tmp_gc = NULL;
      Boolean	replaceGC = False;
      Boolean	deadjusted = False;
! #ifndef LESSTIF_VERSION
      XmDisplay	dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
      Boolean	etched_in = dpy->display.enable_etched_in_menu;
  #else
--- 641,647 ----
      GC		tmp_gc = NULL;
      Boolean	replaceGC = False;
      Boolean	deadjusted = False;
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
      XmDisplay	dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
      Boolean	etched_in = dpy->display.enable_etched_in_menu;
  #else
***************
*** 726,732 ****
  	if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up)
  		&& _XmGetInDragMode((Widget) eb))
  	{
! #ifndef LESSTIF_VERSION
  	    XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
  	    Boolean etched_in = dpy->display.enable_etched_in_menu;
  #else
--- 726,732 ----
  	if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up)
  		&& _XmGetInDragMode((Widget) eb))
  	{
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
  	    XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
  	    Boolean etched_in = dpy->display.enable_etched_in_menu;
  #else
***************
*** 810,816 ****
  
      if (Lab_IsMenupane(eb))
      {
! #ifndef LESSTIF_VERSION
  	XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
  	Boolean etched_in = dpy->display.enable_etched_in_menu;
  #else
--- 810,816 ----
  
      if (Lab_IsMenupane(eb))
      {
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
  	XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
  	Boolean etched_in = dpy->display.enable_etched_in_menu;
  #else
***************
*** 1150,1156 ****
  Redisplay(Widget w, XEvent *event, Region region)
  {
      XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) w;
! #ifndef LESSTIF_VERSION
      XmDisplay		    dpy;
      XtEnum		    default_button_emphasis;
  #endif
--- 1150,1156 ----
  Redisplay(Widget w, XEvent *event, Region region)
  {
      XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) w;
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
      XmDisplay		    dpy;
      XtEnum		    default_button_emphasis;
  #endif
***************
*** 1162,1168 ****
      if (!XtIsRealized((Widget)eb))
  	return;
  
! #ifndef LESSTIF_VERSION
      dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
      default_button_emphasis = dpy->display.default_button_emphasis;
  #endif
--- 1162,1168 ----
      if (!XtIsRealized((Widget)eb))
  	return;
  
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
      dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
      default_button_emphasis = dpy->display.default_button_emphasis;
  #endif
***************
*** 1241,1247 ****
      {
  	int adjust = 0;
  
! #ifndef LESSTIF_VERSION
  	/*
  	 *  NOTE: PushButton has two types of shadows: primitive-shadow and
  	 *  default-button-shadow.  If pushbutton is in a menu only primitive
--- 1241,1247 ----
      {
  	int adjust = 0;
  
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
  	/*
  	 *  NOTE: PushButton has two types of shadows: primitive-shadow and
  	 *  default-button-shadow.  If pushbutton is in a menu only primitive
***************
*** 1289,1295 ****
  			  adjust, adjust, rectwidth, rectheight, borderwidth);
  	    }
  
! #ifndef LESSTIF_VERSION
  	    switch (default_button_emphasis)
  	    {
  		case XmINTERNAL_HIGHLIGHT:
--- 1289,1295 ----
  			  adjust, adjust, rectwidth, rectheight, borderwidth);
  	    }
  
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
  	    switch (default_button_emphasis)
  	    {
  		case XmINTERNAL_HIGHLIGHT:
***************
*** 1365,1371 ****
  		    default_button_shadow_thickness =
  			       eb->pushbutton.default_button_shadow_thickness;
  
! #ifndef LESSTIF_VERSION
  		/*
  		 * Compute location of bounding box to contain the
  		 * defaultButtonShadow.
--- 1365,1371 ----
  		    default_button_shadow_thickness =
  			       eb->pushbutton.default_button_shadow_thickness;
  
! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
  		/*
  		 * Compute location of bounding box to contain the
  		 * defaultButtonShadow.
*** ../vim-7.0.013/src/version.c	Fri May 12 19:10:03 2006
--- src/version.c	Fri May 12 19:23:12 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     14,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
126. You brag to all of your friends about your date Saturday night...but
     you don't tell them it was only in a chat room.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:15:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:15:44 -0400
Subject: rpms/vim/FC-5 7.0.015,NONE,1.1
Message-ID: <200606211315.k5LDFiNt002613@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2583

Added Files:
	7.0.015 
Log Message:
- patchlevel 15


--- NEW FILE 7.0.015 ---
To: vim-dev at vim.org
Subject: Patch 7.0.015
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.015
Problem:    Athena: compilation problems with modern compiler.
Solution:   Avoid type casts for lvalue. (Alexey Froloff)
Files:	    src/gui_at_fs.c


*** ../vim-7.0.014/src/gui_at_fs.c	Wed May 10 15:22:49 2006
--- src/gui_at_fs.c	Fri May 12 11:26:24 2006
***************
*** 1861,1887 ****
      XtPointer	pnew;
  {
      SFDir	*dir;
!     int		nw;
  
      dir = &(SFdirs[SFdirPtr + (int)(long)n]);
  
  #ifdef FEAT_GUI_NEXTAW
!     if ((int)(long)pnew < 0)
      {
! 	if ((int)(long)pnew > -SFvScrollHeight)
! 	    (int)(long)pnew = -1;
  	else
! 	    (int)(long)pnew = -SFlistSize;
      }
!     else if ((int)(long)pnew > 0)
      {
! 	if ((int)(long)pnew < SFvScrollHeight)
! 	    (int)(long)pnew = 1;
  	else
! 	    (int)(long)pnew = SFlistSize;
      }
  #endif
!     nw = dir->vOrigin + (int)(long)pnew;
  
      if (nw > dir->nEntries - SFlistSize)
  	nw = dir->nEntries - SFlistSize;
--- 1861,1887 ----
      XtPointer	pnew;
  {
      SFDir	*dir;
!     int		nw = (int)(long)pnew;
  
      dir = &(SFdirs[SFdirPtr + (int)(long)n]);
  
  #ifdef FEAT_GUI_NEXTAW
!     if (nw < 0)
      {
! 	if (nw > -SFvScrollHeight)
! 	    nw = -1;
  	else
! 	    nw = -SFlistSize;
      }
!     else if (nw > 0)
      {
! 	if (nw < SFvScrollHeight)
! 	    nw = 1;
  	else
! 	    nw = SFlistSize;
      }
  #endif
!     nw += dir->vOrigin;
  
      if (nw > dir->nEntries - SFlistSize)
  	nw = dir->nEntries - SFlistSize;
***************
*** 1941,1967 ****
      XtPointer	pnew;
  {
      SFDir	*dir;
!     int		nw;
  
      dir = &(SFdirs[SFdirPtr + (int)(long)n]);
  
  #ifdef FEAT_GUI_NEXTAW
!     if ((int)(long)pnew < 0)
      {
! 	if ((int)(long)pnew > -SFhScrollWidth)
! 	    (int)(long)pnew = -1;
  	else
! 	    (int)(long)pnew = -SFcharsPerEntry;
      }
!     else if ((int)(long)pnew > 0)
      {
! 	if ((int)(long)pnew < SFhScrollWidth)
! 	    (int)(long)pnew = 1;
  	else
! 	    (int)(long)pnew = SFcharsPerEntry;
      }
  #endif
!     nw = dir->hOrigin + (int)(long)pnew;
  
      if (nw > dir->nChars - SFcharsPerEntry)
  	nw = dir->nChars - SFcharsPerEntry;
--- 1941,1967 ----
      XtPointer	pnew;
  {
      SFDir	*dir;
!     int		nw = (int)(long)pnew;
  
      dir = &(SFdirs[SFdirPtr + (int)(long)n]);
  
  #ifdef FEAT_GUI_NEXTAW
!     if (nw < 0)
      {
! 	if (nw > -SFhScrollWidth)
! 	    nw = -1;
  	else
! 	    nw = -SFcharsPerEntry;
      }
!     else if (nw > 0)
      {
! 	if (nw < SFhScrollWidth)
! 	    nw = 1;
  	else
! 	    nw = SFcharsPerEntry;
      }
  #endif
!     nw += dir->hOrigin;
  
      if (nw > dir->nChars - SFcharsPerEntry)
  	nw = dir->nChars - SFcharsPerEntry;
***************
*** 2038,2063 ****
      XtPointer	client_data;
      XtPointer	pnew;
  {
!     int		nw;
      float	f;
  
  #ifdef FEAT_GUI_NEXTAW
!     if ((int)(long)pnew < 0)
      {
! 	if ((int)(long)pnew > -SFpathScrollWidth)
! 	    (int)(long)pnew = -1;
  	else
! 	    (int)(long)pnew = -3;
      }
!     else if ((int)(long)pnew > 0)
      {
! 	if ((int)(long)pnew < SFpathScrollWidth)
! 	    (int)(long)pnew = 1;
  	else
! 	    (int)(long)pnew = 3;
      }
  #endif
!     nw = SFdirPtr + (int)(long)pnew;
  
      if (nw > SFdirEnd - 3)
  	nw = SFdirEnd - 3;
--- 2038,2063 ----
      XtPointer	client_data;
      XtPointer	pnew;
  {
!     int		nw = (int)(long)pnew;
      float	f;
  
  #ifdef FEAT_GUI_NEXTAW
!     if (nw < 0)
      {
! 	if (nw > -SFpathScrollWidth)
! 	    nw = -1;
  	else
! 	    nw = -3;
      }
!     else if (nw > 0)
      {
! 	if (nw < SFpathScrollWidth)
! 	    nw = 1;
  	else
! 	    nw = 3;
      }
  #endif
!     nw += SFdirPtr;
  
      if (nw > SFdirEnd - 3)
  	nw = SFdirEnd - 3;
*** ../vim-7.0.014/src/version.c	Fri May 12 19:24:33 2006
--- src/version.c	Fri May 12 19:25:57 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     15,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
127. You bring your laptop and cellular phone to church.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:15:55 -0400
Subject: rpms/struts/devel struts.spec,1.31,1.32
Message-ID: <200606211315.k5LDFqpW002687@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2582

Modified Files:
	struts.spec 
Log Message:

Re-enable ppc64, s390 and s390x builds




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- struts.spec	7 Jun 2006 17:36:20 -0000	1.31
+++ struts.spec	21 Jun 2006 13:15:49 -0000	1.32
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.8
-%define release 	2jpp_11fc
+%define release 	2jpp_12fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -55,9 +55,6 @@
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
-
 %description
 Welcome to the Struts Framework! The goal of this project is to provide
 an open source framework useful in building web applications with Java
@@ -216,6 +213,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Wed Jun 21 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_12fc
+- Re-enable ppc64, s390 and s390x builds
+
 * Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_11fc
 - Added missing BR/Req. for tomcat5-jsp-2.0-api.
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:16:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:16:05 -0400
Subject: rpms/vim/FC-5 7.0.016,NONE,1.1
Message-ID: <200606211316.k5LDG51Z003084@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2792

Added Files:
	7.0.016 
Log Message:
- patchlevel 16


--- NEW FILE 7.0.016 ---
To: vim-dev at vim.org
Subject: Patch 7.0.016
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.016
Problem:    Printing doesn't work for "dec-mcs" encoding.
Solution:   Add "dec-mcs", "mac-roman" and "hp-roman8" to the list of
	    recognized 8-bit encodings. (Mike Williams)
Files:	    src/mbyte.c


*** ../vim-7.0.015/src/mbyte.c	Wed May 10 15:22:50 2006
--- src/mbyte.c	Sat May 13 09:12:43 2006
***************
*** 311,317 ****
  
  #define IDX_MACROMAN	57
      {"macroman",	ENC_8BIT + ENC_MACROMAN, 0},	/* Mac OS */
! #define IDX_COUNT	58
  };
  
  /*
--- 311,321 ----
  
  #define IDX_MACROMAN	57
      {"macroman",	ENC_8BIT + ENC_MACROMAN, 0},	/* Mac OS */
! #define IDX_DECMCS	58
!     {"dec-mcs",		ENC_8BIT,		0},	/* DEC MCS */
! #define IDX_HPROMAN8	59
!     {"hp-roman8",	ENC_8BIT,		0},	/* HP Roman8 */
! #define IDX_COUNT	60
  };
  
  /*
***************
*** 386,391 ****
--- 390,396 ----
      {"950",		IDX_BIG5},
  #endif
      {"mac",		IDX_MACROMAN},
+     {"mac-roman",	IDX_MACROMAN},
      {NULL,		0}
  };
  
*** ../vim-7.0.015/src/version.c	Fri May 12 19:27:55 2006
--- src/version.c	Sat May 13 09:11:27 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     16,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
135. You cut classes or miss work so you can stay home and browse the web.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:16:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:16:23 -0400
Subject: rpms/vim/FC-5 7.0.017,NONE,1.1
Message-ID: <200606211316.k5LDGNkr004058@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3572

Added Files:
	7.0.017 
Log Message:
- patchlevel 17


--- NEW FILE 7.0.017 ---
To: vim-dev at vim.org
Subject: Patch 7.0.017
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.017 (after 7.0.014)
Problem:    Linking gui_xmebw.c fails on Dec Alpha Tru64. (Rolfe)
Solution:   Adjust defines for Motif 1.2 and older.
Files:	    src/gui_xmebw.c


*** ../vim-7.0.016/src/gui_xmebw.c	Fri May 12 19:24:33 2006
--- src/gui_xmebw.c	Sat May 13 12:55:01 2006
***************
*** 47,59 ****
  #include "gui_xmebwp.h"
  
  /* Provide some missing wrappers, which are missed from the LessTif
!  * implementation.
   *
   * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
   * pixmap will not appear in it's caches properly. We cache the interresting
   * values in XmEnhancedButtonPart instead ourself.
   */
! #ifdef LESSTIF_VERSION
  # ifndef Lab_IsMenupane
  #  define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \
  		    Lab_MenuType(w) == (int)XmMENU_PULLDOWN)
--- 47,59 ----
  #include "gui_xmebwp.h"
  
  /* Provide some missing wrappers, which are missed from the LessTif
!  * implementation.  Also missing in Motif 1.2 and earlier.
   *
   * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
   * pixmap will not appear in it's caches properly. We cache the interresting
   * values in XmEnhancedButtonPart instead ourself.
   */
! #if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
  # ifndef Lab_IsMenupane
  #  define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \
  		    Lab_MenuType(w) == (int)XmMENU_PULLDOWN)
*** ../vim-7.0.016/src/version.c	Sat May 13 09:16:38 2006
--- src/version.c	Sat May 13 13:00:03 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     17,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
141. You'd rather go to http://www.weather.com/ than look out your window.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:16:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:16:39 -0400
Subject: rpms/vim/FC-5 7.0.018,NONE,1.1
Message-ID: <200606211316.k5LDGdLk005076@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4559

Added Files:
	7.0.018 
Log Message:
- patchlevel 18


--- NEW FILE 7.0.018 ---
To: vim-dev at vim.org
Subject: Patch 7.0.018
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.018
Problem:    VMS: plugins are not loaded on startup.
Solution:   Remove "**" from the path. (Zoltan Arpadffy)
Files:	    src/main.c


*** ../vim-7.0.017/src/main.c	Wed May  3 23:28:15 2006
--- src/main.c	Mon Jun 19 10:54:40 2006
***************
*** 564,570 ****
--- 564,574 ----
       */
      if (p_lpl)
      {
+ # ifdef VMS	/* Somehow VMS doesn't handle the "**". */
+ 	source_runtime((char_u *)"plugin/*.vim", TRUE);
+ # else
  	source_runtime((char_u *)"plugin/**/*.vim", TRUE);
+ # endif
  	TIME_MSG("loading plugins");
      }
  #endif
*** ../vim-7.0.017/src/version.c	Sat May 13 17:26:10 2006
--- src/version.c	Mon Jun 19 10:55:29 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     18,
  /**/

-- 
BLACK KNIGHT:  Come on you pansy!
    [hah] [parry thrust]
    [ARTHUR chops the BLACK KNIGHT's right arm off]
ARTHUR:        Victory is mine!  [kneeling]
               We thank thee Lord, that in thy merc-
    [Black Knight kicks Arthur in the head while he is praying]
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:16:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:16:47 -0400
Subject: rpms/vim/FC-5 7.0.019,NONE,1.1
Message-ID: <200606211316.k5LDGlxs005633@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5384

Added Files:
	7.0.019 
Log Message:
- patchlevel 19


--- NEW FILE 7.0.019 ---
To: vim-dev at vim.org
Subject: Patch 7.0.019
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.019
Problem:    Repeating "VjA789" may cause a crash. (James Vega)
Solution:   Check the cursor column after moving it to another line.
Files:	    src/ops.c


*** ../vim-7.0.018/src/ops.c	Sun Apr 30 20:45:12 2006
--- src/ops.c	Tue Jun 20 12:49:46 2006
***************
*** 2413,2418 ****
--- 2413,2419 ----
  	else
  	{
  	    curwin->w_cursor = oap->end;
+ 	    check_cursor_col();
  
  	    /* Works just like an 'i'nsert on the next character. */
  	    if (!lineempty(curwin->w_cursor.lnum)
*** ../vim-7.0.018/src/version.c	Mon Jun 19 10:56:20 2006
--- src/version.c	Tue Jun 20 12:55:10 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     19,
  /**/

-- 
Two cows are standing together in a field.  One asks the other:
"So what do you think about this Mad Cow Disease?"
The other replies: "That doesn't concern me. I'm a helicopter."

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:16:58 -0400
Subject: rpms/vim/FC-5 7.0.020,NONE,1.1
Message-ID: <200606211316.k5LDGwFR006078@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5925

Added Files:
	7.0.020 
Log Message:
- patchlevel 20


--- NEW FILE 7.0.020 ---
To: vim-dev at vim.org
Subject: Patch 7.0.020
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.020
Problem:    Crash when using 'mousefocus'. (William Fulton)
Solution:   Make buffer for mouse coordinates 2 bytes longer. (Juergen Weigert)
Files:	    src/gui.c


*** ../vim-7.0.019/src/gui.c	Sat May 13 12:15:09 2006
--- src/gui.c	Tue Jun 20 16:27:02 2006
***************
*** 4515,4521 ****
      int		y;
  {
      win_T	*wp;
!     char_u	st[6];
  
      /* Ignore this while still starting up. */
      if (!gui.in_use || gui.starting)
--- 4515,4521 ----
      int		y;
  {
      win_T	*wp;
!     char_u	st[8];
  
      /* Ignore this while still starting up. */
      if (!gui.in_use || gui.starting)
*** ../vim-7.0.019/src/version.c	Tue Jun 20 12:56:11 2006
--- src/version.c	Tue Jun 20 16:32:28 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     20,
  /**/

-- 
Michael: There is no such thing as a dump question.
Bernard: Sure there is.  For example "what is a core dump?"

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:17:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:17:15 -0400
Subject: rpms/vim/FC-5 7.0.021,NONE,1.1
Message-ID: <200606211317.k5LDHFxO006665@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6531

Added Files:
	7.0.021 
Log Message:
- patchlevel 21


--- NEW FILE 7.0.021 ---
To: vim-dev at vim.org
Subject: Patch 7.0.021
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.021
Problem:    Crash when using "\\[" and "\\]" in 'errorformat'. (Marc Weber)
Solution:   Check for valid submatches after matching the pattern.
Files:      src/quickfix.c


*** ../vim-7.0.020/src/quickfix.c	Wed May  3 23:23:30 2006
--- src/quickfix.c	Tue Jun 20 17:04:20 2006
***************
*** 602,614 ****
  		else
  		    type = 0;
  		/*
! 		 * Extract error message data from matched line
  		 */
  		if ((i = (int)fmt_ptr->addr[0]) > 0)		/* %f */
  		{
! 		    int c = *regmatch.endp[i];
  
  		    /* Expand ~/file and $HOME/file to full path. */
  		    *regmatch.endp[i] = NUL;
  		    expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
  		    *regmatch.endp[i] = c;
--- 602,620 ----
  		else
  		    type = 0;
  		/*
! 		 * Extract error message data from matched line.
! 		 * We check for an actual submatch, because "\[" and "\]" in
! 		 * the 'errorformat' may cause the wrong submatch to be used.
  		 */
  		if ((i = (int)fmt_ptr->addr[0]) > 0)		/* %f */
  		{
! 		    int c;
! 
! 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
! 			continue;
  
  		    /* Expand ~/file and $HOME/file to full path. */
+ 		    c = *regmatch.endp[i];
  		    *regmatch.endp[i] = NUL;
  		    expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
  		    *regmatch.endp[i] = c;
***************
*** 618,652 ****
--- 624,686 ----
  			continue;
  		}
  		if ((i = (int)fmt_ptr->addr[1]) > 0)		/* %n */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    enr = (int)atol((char *)regmatch.startp[i]);
+ 		}
  		if ((i = (int)fmt_ptr->addr[2]) > 0)		/* %l */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    lnum = atol((char *)regmatch.startp[i]);
+ 		}
  		if ((i = (int)fmt_ptr->addr[3]) > 0)		/* %c */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    col = (int)atol((char *)regmatch.startp[i]);
+ 		}
  		if ((i = (int)fmt_ptr->addr[4]) > 0)		/* %t */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    type = *regmatch.startp[i];
+ 		}
  		if (fmt_ptr->flags == '+' && !multiscan)	/* %+ */
  		    STRCPY(errmsg, IObuff);
  		else if ((i = (int)fmt_ptr->addr[5]) > 0)	/* %m */
  		{
+ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+ 			continue;
  		    len = (int)(regmatch.endp[i] - regmatch.startp[i]);
  		    vim_strncpy(errmsg, regmatch.startp[i], len);
  		}
  		if ((i = (int)fmt_ptr->addr[6]) > 0)		/* %r */
+ 		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    tail = regmatch.startp[i];
+ 		}
  		if ((i = (int)fmt_ptr->addr[7]) > 0)		/* %p */
  		{
+ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+ 			continue;
  		    col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
  		    if (*((char_u *)regmatch.startp[i]) != TAB)
  			use_viscol = TRUE;
  		}
  		if ((i = (int)fmt_ptr->addr[8]) > 0)		/* %v */
  		{
+ 		    if (regmatch.startp[i] == NULL)
+ 			continue;
  		    col = (int)atol((char *)regmatch.startp[i]);
  		    use_viscol = TRUE;
  		}
  		if ((i = (int)fmt_ptr->addr[9]) > 0)		/* %s */
  		{
+ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+ 			continue;
  		    len = (int)(regmatch.endp[i] - regmatch.startp[i]);
  		    if (len > CMDBUFFSIZE - 5)
  			len = CMDBUFFSIZE - 5;
*** ../vim-7.0.020/src/version.c	Tue Jun 20 16:33:21 2006
--- src/version.c	Tue Jun 20 17:07:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     21,
  /**/

-- 
TALL KNIGHT: We are now no longer the Knights Who Say Ni!
ONE KNIGHT:  Ni!
OTHERS:      Sh!
ONE KNIGHT:  (whispers) Sorry.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:17:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:17:28 -0400
Subject: rpms/vim/FC-5 7.0.022,NONE,1.1
Message-ID: <200606211317.k5LDHSNn007368@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6842

Added Files:
	7.0.022 
Log Message:
- patchlevel 22


--- NEW FILE 7.0.022 ---
To: vim-dev at vim.org
Subject: Patch 7.0.022
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.022
Problem:    Using buffer.append() in Ruby may append the line to the wrong
	    buffer. (Alex Norman)
Solution:   Properly switch to the buffer to do the appending.  Also for
	    buffer.delete() and setting a buffer line.
Files:	    src/if_ruby.c


*** ../vim-7.0.021/src/if_ruby.c	Sun Apr 30 20:25:42 2006
--- src/if_ruby.c	Tue Jun 20 21:01:23 2006
***************
*** 643,653 ****
  
  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
  {
!     buf_T *savebuf = curbuf;
!     char *line = STR2CSTR(str);
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
  	curbuf = buf;
  	if (u_savesub(n) == OK) {
  	    ml_replace(n, (char_u *)line, TRUE);
  	    changed();
--- 643,665 ----
  
  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
  {
!     char	*line = STR2CSTR(str);
! #ifdef FEAT_AUTOCMD
!     aco_save_T	aco;
! #else
!     buf_T	*save_curbuf = curbuf;
! #endif
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
!     {
! #ifdef FEAT_AUTOCMD
! 	/* set curwin/curbuf for "buf" and save some things */
! 	aucmd_prepbuf(&aco, buf);
! #else
  	curbuf = buf;
+ 	curwin->w_buffer = buf;
+ #endif
+ 
  	if (u_savesub(n) == OK) {
  	    ml_replace(n, (char_u *)line, TRUE);
  	    changed();
***************
*** 655,664 ****
  	    syn_changed(n); /* recompute syntax hl. for this line */
  #endif
  	}
! 	curbuf = savebuf;
  	update_curbuf(NOT_VALID);
      }
!     else {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
  	return Qnil; /* For stop warning */
      }
--- 667,685 ----
  	    syn_changed(n); /* recompute syntax hl. for this line */
  #endif
  	}
! 
! #ifdef FEAT_AUTOCMD
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
! 	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
!     else
!     {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
  	return Qnil; /* For stop warning */
      }
***************
*** 676,687 ****
  
  static VALUE buffer_delete(VALUE self, VALUE num)
  {
!     buf_T *buf = get_buf(self);
!     buf_T *savebuf = curbuf;
!     long n = NUM2LONG(num);
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count) {
  	curbuf = buf;
  	if (u_savedel(n, 1) == OK) {
  	    ml_delete(n, 0);
  
--- 697,720 ----
  
  static VALUE buffer_delete(VALUE self, VALUE num)
  {
!     buf_T	*buf = get_buf(self);
!     long	n = NUM2LONG(num);
! #ifdef FEAT_AUTOCMD
!     aco_save_T	aco;
! #else
!     buf_T	*save_curbuf = curbuf;
! #endif
  
!     if (n > 0 && n <= buf->b_ml.ml_line_count)
!     {
! #ifdef FEAT_AUTOCMD
! 	/* set curwin/curbuf for "buf" and save some things */
! 	aucmd_prepbuf(&aco, buf);
! #else
  	curbuf = buf;
+ 	curwin->w_buffer = buf;
+ #endif
+ 
  	if (u_savedel(n, 1) == OK) {
  	    ml_delete(n, 0);
  
***************
*** 691,700 ****
  
  	    changed();
  	}
! 	curbuf = savebuf;
  	update_curbuf(NOT_VALID);
      }
!     else {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
      }
      return Qnil;
--- 724,742 ----
  
  	    changed();
  	}
! 
! #ifdef FEAT_AUTOCMD
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
! 	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
!     else
!     {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
      }
      return Qnil;
***************
*** 702,714 ****
  
  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
  {
!     buf_T *buf = get_buf(self);
!     buf_T *savebuf = curbuf;
!     char *line = STR2CSTR(str);
!     long n = NUM2LONG(num);
  
!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
  	curbuf = buf;
  	if (u_inssub(n + 1) == OK) {
  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
  
--- 744,768 ----
  
  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
  {
!     buf_T	*buf = get_buf(self);
!     char	*line = STR2CSTR(str);
!     long	n = NUM2LONG(num);
! #ifdef FEAT_AUTOCMD
!     aco_save_T	aco;
! #else
!     buf_T	*save_curbuf = curbuf;
! #endif
  
!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
!     {
! #ifdef FEAT_AUTOCMD
! 	/* set curwin/curbuf for "buf" and save some things */
! 	aucmd_prepbuf(&aco, buf);
! #else
  	curbuf = buf;
+ 	curwin->w_buffer = buf;
+ #endif
+ 
  	if (u_inssub(n + 1) == OK) {
  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
  
***************
*** 718,724 ****
  
  	    changed();
  	}
! 	curbuf = savebuf;
  	update_curbuf(NOT_VALID);
      }
      else {
--- 772,786 ----
  
  	    changed();
  	}
! 
! #ifdef FEAT_AUTOCMD
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
! 	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
      else {
*** ../vim-7.0.021/src/version.c	Tue Jun 20 20:49:42 2006
--- src/version.c	Tue Jun 20 18:42:35 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     22,
  /**/



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:23:13 -0400
Subject: rpms/vim/FC-5 vim-selinux2.patch,NONE,1.1
Message-ID: <200606211323.k5LDNCpt019238@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19212

Added Files:
	vim-selinux2.patch 
Log Message:
- copy selinux context to temporary file

vim-selinux2.patch:
 memfile.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE vim-selinux2.patch ---
--- vim70/src/memfile.c	2006-05-08 11:37:01.000000000 +0200
+++ vim70/src/memfile.c.selinux	2006-05-08 11:34:45.000000000 +0200
@@ -1325,5 +1325,8 @@
 	mfp->mf_ffname = NULL;
     }
     else
+#ifdef HAVE_SELINUX
+        mch_copy_sec(fname, mfp->mf_fname);
+#endif
 	mch_hide(mfp->mf_fname);    /* try setting the 'hidden' flag */
 }



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:24:09 -0400
Subject: rpms/vim/FC-5 vim-7.0-syntax.patch,NONE,1.1
Message-ID: <200606211324.k5LDO9kw019476@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19443

Added Files:
	vim-7.0-syntax.patch 
Log Message:
- some syntax rules for apache

vim-7.0-syntax.patch:
 filetype.vim |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.0-syntax.patch ---
--- vim70aa/runtime/filetype.vim.orig	2006-03-13 23:15:53.000000000 +0100
+++ vim70aa/runtime/filetype.vim	2006-03-14 15:56:13.000000000 +0100
@@ -103,7 +103,7 @@
 
 " Apache config file
 au BufNewFile,BufRead .htaccess			 setf apache
-au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
 
 " XA65 MOS6510 cross assembler
 au BufNewFile,BufRead *.a65			setf a65



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:25:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:25:56 -0400
Subject: rpms/vim/FC-5 vim-7.0-fstabsyntax.patch,NONE,1.1
Message-ID: <200606211325.k5LDPuKo019927@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19895

Added Files:
	vim-7.0-fstabsyntax.patch 
Log Message:
- add some syntax rules for fstab/mtab

vim-7.0-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vim-7.0-fstabsyntax.patch ---
--- vim70/runtime/syntax/fstab.vim.fstabsyntax	2006-04-16 18:01:27.000000000 +0200
+++ vim70/runtime/syntax/fstab.vim	2006-06-21 11:52:21.000000000 +0200
@@ -36,7 +36,7 @@
 " Type
 syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
 syn match fsTypeUnknown /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
+syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs binfmt_misc bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs rpc_pipefs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
 
 " Options
 " -------
@@ -48,7 +48,7 @@
 syn keyword fsOptionsYesNo yes no
 syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
 syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
 syn match fsOptionsGeneral /_netdev/
 
 " Options: adfs



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:27:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:27:09 -0400
Subject: rpms/vim/FC-5 vim-7.0-rclocation.patch,NONE,1.1
Message-ID: <200606211327.k5LDR9Ot020362@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20240

Added Files:
	vim-7.0-rclocation.patch 
Log Message:
- configuration files should be in /etc

vim-7.0-rclocation.patch:
 os_unix.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vim-7.0-rclocation.patch ---
--- vim62/src/os_unix.h.rcloc	2003-08-04 15:38:05.000000000 +0200
+++ vim62/src/os_unix.h	2003-08-04 15:39:25.000000000 +0200
@@ -230,10 +230,10 @@
  * Unix system-dependent file names
  */
 #ifndef SYS_VIMRC_FILE
-# define SYS_VIMRC_FILE "$VIM/vimrc"
+# define SYS_VIMRC_FILE "/etc/vimrc"
 #endif
 #ifndef SYS_GVIMRC_FILE
-# define SYS_GVIMRC_FILE "$VIM/gvimrc"
+# define SYS_GVIMRC_FILE "/etc/gvimrc"
 #endif
 #ifndef DFLT_HELPFILE
 # define DFLT_HELPFILE	"$VIMRUNTIME/doc/help.txt"



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:29:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:29:27 -0400
Subject: rpms/vim/FC-5 vim-7.0-warning.patch,NONE,1.1
Message-ID: <200606211329.k5LDTRtC021260@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21234

Added Files:
	vim-7.0-warning.patch 
Log Message:
- don't write beyound the end of an array intentionally

vim-7.0-warning.patch:
 structs.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.0-warning.patch ---
--- vim70c/src/structs.h.warning1	2006-04-04 15:58:16.000000000 +0200
+++ vim70c/src/structs.h	2006-04-04 15:58:20.000000000 +0200
@@ -1082,7 +1082,7 @@
 {
     typval_T	di_tv;		/* type and value of the variable */
     char_u	di_flags;	/* flags (only used for variable) */
-    char_u	di_key[1];	/* key (actually longer!) */
+    char_u	di_key[10];	/* key (actually longer!) */
 };
 
 typedef struct dictitem_S dictitem_T;



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:30:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:30:59 -0400
Subject: rpms/vim/FC-5 sources,1.11,1.12
Message-ID: <200606211330.k5LDUx8q021770@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21729

Modified Files:
	sources 
Log Message:
- new sources


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Oct 2005 13:15:30 -0000	1.11
+++ sources	21 Jun 2006 13:30:56 -0000	1.12
@@ -1,4 +1,4 @@
 1f17af2008ae94359a48be7e865b084f  cvim.zip
-5f4489776cafcb3588223f79eb26e287  vim-6.4-extra.tar.gz
-3cca6128fe5439e89d3828b5e708bddb  vim-6.4-lang.tar.gz
-774c14d93ce58674b3b2c880edd12d77  vim-6.4.tar.bz2
+200f741ecc2a896fca25486764fa18a2  vim-7.0-extra.tar.gz
+6d43efaff570b5c86e76b833ea0c6a04  vim-7.0-lang.tar.gz
+4ca69757678272f718b1041c810d82d8  vim-7.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:31:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:31:29 -0400
Subject: rpms/vim/FC-5 .cvsignore,1.11,1.12
Message-ID: <200606211331.k5LDVTfl021878@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21802

Modified Files:
	.cvsignore 
Log Message:
- new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Oct 2005 13:16:30 -0000	1.11
+++ .cvsignore	21 Jun 2006 13:31:26 -0000	1.12
@@ -1,4 +1,4 @@
 cvim.zip
-vim-6.4-extra.tar.gz
-vim-6.4-lang.tar.gz
-vim-6.4.tar.bz2
+vim-7.0-extra.tar.gz
+vim-7.0-lang.tar.gz
+vim-7.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:34:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:34:51 -0400
Subject: rpms/vim/FC-5 vim.spec,1.100,1.101
Message-ID: <200606211334.k5LDYpYj022467@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22317

Modified Files:
	vim.spec 
Log Message:
- update to vim-7.0
- remove lots of old patches
- add patchlevel 1-22
- misc. fixes from -devel



Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/vim.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- vim.spec	9 Mar 2006 14:38:51 -0000	1.100
+++ vim.spec	21 Jun 2006 13:34:48 -0000	1.101
@@ -1,3 +1,5 @@
+# used for CVS snapshots:
+%define CVSDATE %{nil}
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -5,79 +7,96 @@
 %endif
 
 # Set this to 1 if you're building the enterprise version
-%define enterprise 1
+%define enterprise 0
+%define withruby 0
 
 %if %{enterprise}
 # don't include ruby interpreter
-%define withruby 0
-%else
-%define withruby 0
 %define withnetbeans 0
+%else
+%define withnetbeans 1
 %endif
 
-%define withcvim 1
+%define withcvim 0
 
 
-%define baseversion 6.4
-%define vimdir vim64
-%define patchlevel 007
+%define baseversion 7.0
+#used for pre-releases:
+%define beta %{nil}
+%define vimdir vim70%{?beta}
+%define patchlevel 022
 
 Summary: The VIM editor.
 Name: vim
-Version: %{baseversion}.%{patchlevel}
-Release: 4
+Version: %{baseversion}.%{beta}%{patchlevel}
+Release: 0.fc5
 License: freeware
 Group: Applications/Editors
-Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
-Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-lang.tar.gz
-Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-extra.tar.gz
+Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
+Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}%{?beta}-lang%{?CVSDATE}.tar.gz
+Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}%{?beta}-extra%{?CVSDATE}.tar.gz
 Source3: gvim.desktop
 Source4: vimrc
-Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
+#Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
 Source6: spec.vim
 Source7: gvim16.png
 Source8: gvim32.png
 Source9: gvim48.png
 Source10: gvim64.png
 Source11: Changelog.rpm
+#Source12: vi-help.txt
 # Source at http://www.vim.org/scripts/script.php?script_id=213 :
-Source12: cvim.zip
-Patch2000: vim-4.2-speed_t.patch
-Patch2001: vim-5.6a-paths.patch
-Patch2002: vim-6.0-fixkeys.patch
+#Source12: cvim.zip
+Patch2002: vim-7.0-fixkeys.patch
 Patch2003: vim-6.2-specsyntax.patch
-Patch2004: vim-6.0r-crv.patch
-Patch2005: vim-6.4-tmpfile.patch
+Patch2004: vim-7.0-crv.patch
 Patch2010: xxd-locale.patch
 # Patches 001 < 999 are patches from the base maintainer.
 # If you're as lazy as me, generate the list using
-# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.%03d\n" $i $i; done
-#Patch001: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.001
-Patch002: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.002
-Patch003: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.003
-Patch004: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.004
-Patch005: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.005
-Patch006: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.006
-Patch007: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.007
+# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.%03d\n" $i $i; done
+Patch001: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.001
+Patch002: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.002
+Patch003: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.003
+Patch004: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.004
+Patch005: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.005
+Patch006: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.006
+Patch007: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.007
+Patch008: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.008
+Patch009: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.009
+Patch010: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010
+Patch011: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.011
+Patch012: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.012
+Patch013: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.013
+Patch014: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.014
+Patch015: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.015
+Patch016: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.016
+Patch017: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.017
+Patch018: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.018
+Patch019: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.019
+Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
+Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
+Patch022: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.022
 
-Patch3000: vim-6.1-syntax.patch
+
+Patch3000: vim-7.0-syntax.patch
 Patch3001: vim-6.2-rh1.patch
 Patch3002: vim-6.1-rh2.patch
 Patch3003: vim-6.1-rh3.patch
-Patch3004: vim-6.2-rclocation.patch
+Patch3004: vim-7.0-rclocation.patch
 Patch3005: vim-6.2-rh4.patch
-Patch3006: vim-6.2-rh5.patch
-Patch3007: vim-6.3-dnssyntax.patch
+#Patch3006: vim-6.2-rh5.patch
 Patch3008: vim-6.4-cvim.patch
 Patch3009: vim-6.4-checkhl.patch
-Patch3010: vim-6.4-fstabsyntax.patch
+Patch3010: vim-7.0-fstabsyntax.patch
 Patch3011: vim-6.4-lib64.patch
+Patch3012: vim-7.0-warning.patch
 
 Patch3100: vim-selinux.patch
+Patch3101: vim-selinux2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildrequires: python-devel perl libtermcap-devel gettext
-Buildrequires: libacl-devel gpm-devel
+Buildrequires: libacl-devel gpm-devel autoconf
 %if "%{withruby}" == "1"
 Buildrequires: ruby ruby-devel
 %endif
@@ -88,7 +107,7 @@
 Requires: /usr/bin/desktop-file-install
 BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
-Epoch: 1
+Epoch: 2
 
 %description
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -99,6 +118,10 @@
 %package common
 Summary: The common files needed by any version of the VIM editor.
 Group: Applications/Editors
+Obsoletes: vim7-common
+Conflicts: man-pages-fr < 0.9.7-14
+Conflicts: man-pages-it < 0.3.0-17
+Conflicts: man-pages-pl < 0.24-2
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -114,7 +137,8 @@
 %package minimal
 Summary: A minimal version of the VIM editor.
 Group: Applications/Editors
-Obsoletes:  vim
+Obsoletes: vim
+Obsoletes: vim7-minimal
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -130,10 +154,8 @@
 Summary: A version of the VIM editor which includes recent enhancements.
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release}
-#Requires: %(perl -le 'printf("perl >= %vd\n",$^V);')
-#Requires: perl >= %(rpm -q --qf "%%{epoch}:%%{version}\n" perl)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Obsoletes: vim-color
+Obsoletes: vim7-enhanced
 
 %description enhanced
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -154,6 +176,7 @@
 Requires: vim-common = %{epoch}:%{version}-%{release} libattr
 BuildRequires: gtk2-devel libSM-devel libXt-devel
 Prereq: gtk2 >= 2.6
+Obsoletes: vim7-X11
 
 %description X11
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -171,43 +194,58 @@
 %prep
 %setup -q -b 1 -n %{vimdir}
 cp -f %{SOURCE6} runtime/ftplugin/spec.vim
-%patch2000 -p1
 # fix rogue dependencies from sample code
 chmod -x runtime/tools/mve.awk
-%patch2001 -p1
 %patch2002 -p1
 %patch2003 -p1
 %patch2004 -p1
-%patch2005 -p1
 %patch2010 -p1
 perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 
 # Base patches...
 # for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
-#%patch001 -p0
+%patch001 -p0
 %patch002 -p0
 %patch003 -p0
 %patch004 -p0
-%patch005 -p0
-%patch006 -p0
+# Win32:
+#patch005 -p0
+# MAC:
+#patch006 -p0
 %patch007 -p0
-
+%patch008 -p0
+%patch009 -p0
+%patch010 -p0
+%patch011 -p0
+%patch012 -p0
+%patch013 -p0
+%patch014 -p0
+%patch015 -p0
+%patch016 -p0
+%patch017 -p0
+# VMS:
+#patch018 -p0
+%patch019 -p0
+%patch020 -p0
+%patch021 -p0
+%patch022 -p0
 
 %patch3000 -p1
 %patch3001 -p1
 %patch3002 -p1
 %patch3003 -p1
 %patch3004 -p1
-%patch3005 -p1
-%patch3006 -p1
-%patch3007 -p1
+#patch3005 -p1
+#patch3006 -p1
 
 %patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
+%patch3012 -p1
 
 %if %{WITH_SELINUX}
 %patch3100 -p1
+%patch3101 -p1
 %endif
 
 %if "%{withcvim}" == "1"
@@ -251,7 +289,7 @@
 %configure --prefix=/usr --with-features=huge --enable-pythoninterp \
  --enable-perlinterp --disable-tclinterp --with-x=no \
  --enable-gui=no --exec-prefix=/usr --enable-multibyte \
- --disable-netbeans --enable-cscope --with-modified-by="<bugzilla at redhat.com>" \
+ --enable-cscope --with-modified-by="<bugzilla at redhat.com>" \
  --with-compiledby="<bugzilla at redhat.com>" \
 %if "%{withnetbeans}" == "1"
   --enable-netbeans \
@@ -266,6 +304,8 @@
 cp vim enhanced-vim
 make clean
 
+#perl -pi -e "s/help.txt/vi-help.txt/"  os_unix.h ex_cmds.c
+perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/"  os_unix.h
 %configure --prefix='${DEST}'/usr --with-features=tiny --with-x=no \
   --enable-multibyte \
   --disable-netbeans \
@@ -278,7 +318,7 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/bin
 mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim}
-cp -f %{SOURCE5} .
+#cp -f %{SOURCE5} .
 
 %if "%{withcvim}" == "1"
 # cvim plugin stuff:
@@ -301,10 +341,10 @@
 
 cd src
 %makeinstall BINDIR=/bin DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin
+mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin/xxd
 make installmacros DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
-install -m755 gvim $RPM_BUILD_ROOT/usr/bin
+install -m755 gvim $RPM_BUILD_ROOT/usr/bin/gvim
 install -m644 %{SOURCE7} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png
 install -m644 %{SOURCE8} \
@@ -316,13 +356,13 @@
 install -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim
 
 ( cd $RPM_BUILD_ROOT
-  mv ./bin/vimtutor ./usr/bin
+  mv ./bin/vimtutor ./usr/bin/vimtutor
   mv ./bin/vim ./bin/vi
   rm -f ./bin/rvim
-  ln -sf vi ./bin/view
   ln -sf vi ./bin/ex
   ln -sf vi ./bin/rvi
   ln -sf vi ./bin/rview
+  ln -sf vi ./bin/view
   ln -sf vim ./usr/bin/ex
   ln -sf vim ./usr/bin/rvim
   ln -sf vim ./usr/bin/vimdiff
@@ -399,13 +439,14 @@
 EOF
 chmod 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/virc
 (cd $RPM_BUILD_ROOT/usr/share/vim/%{vimdir}/doc;
- gzip -9 *.txt; gzip -d help.txt.gz
- cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/' > tags.new; mv -f tags.new tags)
-(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;
- mv -f  macros/README.txt ../README.macros;
- mv -f  tools/README.txt ../README.tools;
-)
+ gzip -9 *.txt
+ gzip -d help.txt.gz
+ cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/' > tags.new; mv -f tags.new tags
+# cp %{SOURCE12} . 
+ )
+(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 
 %post X11
 touch --no-create %{_datadir}/icons/hicolor
@@ -428,21 +469,49 @@
 %doc README*
 %doc runtime/docs
 %doc $RPM_SOURCE_DIR/Changelog.rpm
-/usr/share/vim
-%lang(af) /usr/share/vim/%{vimdir}/lang/af/*
-%lang(cs) /usr/share/vim/%{vimdir}/lang/cs/*
-%lang(de) /usr/share/vim/%{vimdir}/lang/de/*
-%lang(es) /usr/share/vim/%{vimdir}/lang/es/*
-%lang(fr) /usr/share/vim/%{vimdir}/lang/fr/*
-%lang(it) /usr/share/vim/%{vimdir}/lang/it/*
-%lang(ja) /usr/share/vim/%{vimdir}/lang/ja/*
-%lang(ko) /usr/share/vim/%{vimdir}/lang/ko/*
-%lang(pl) /usr/share/vim/%{vimdir}/lang/pl/*
-%lang(sk) /usr/share/vim/%{vimdir}/lang/sk/*
-%lang(uk) /usr/share/vim/%{vimdir}/lang/uk/*
-%lang(zh_CN) /usr/share/vim/%{vimdir}/lang/zh_CN/*
-%lang(zh_CN.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_CN.UTF-8/*
-%lang(zh_TW) /usr/share/vim/%{vimdir}/lang/zh_TW/*
+%dir /usr/share/vim
+%dir /usr/share/vim/%{vimdir}
+/usr/share/vim/%{vimdir}/autoload
+/usr/share/vim/%{vimdir}/colors
+/usr/share/vim/%{vimdir}/compiler
+/usr/share/vim/%{vimdir}/doc
+#exclude /usr/share/vim/%{vimdir}/doc/vi-help.txt
+/usr/share/vim/%{vimdir}/*.vim
+/usr/share/vim/%{vimdir}/ftplugin
+/usr/share/vim/%{vimdir}/indent
+/usr/share/vim/%{vimdir}/keymap
+/usr/share/vim/%{vimdir}/lang/*.vim
+/usr/share/vim/%{vimdir}/lang/*.txt
+%dir /usr/share/vim/%{vimdir}/lang
+/usr/share/vim/%{vimdir}/macros
+/usr/share/vim/%{vimdir}/plugin
+/usr/share/vim/%{vimdir}/print
+/usr/share/vim/%{vimdir}/spell
+/usr/share/vim/%{vimdir}/syntax
+/usr/share/vim/%{vimdir}/tools
+/usr/share/vim/%{vimdir}/tutor
+%lang(af) /usr/share/vim/%{vimdir}/lang/af
+%lang(ca) /usr/share/vim/%{vimdir}/lang/ca
+%lang(cs) /usr/share/vim/%{vimdir}/lang/cs
+%lang(de) /usr/share/vim/%{vimdir}/lang/de
+%lang(en_GB) /usr/share/vim/%{vimdir}/lang/en_GB
+%lang(es) /usr/share/vim/%{vimdir}/lang/es
+%lang(fr) /usr/share/vim/%{vimdir}/lang/fr
+%lang(ga) /usr/share/vim/%{vimdir}/lang/ga
+%lang(it) /usr/share/vim/%{vimdir}/lang/it
+%lang(ja) /usr/share/vim/%{vimdir}/lang/ja
+%lang(ko) /usr/share/vim/%{vimdir}/lang/ko
+%lang(no) /usr/share/vim/%{vimdir}/lang/no
+%lang(pl) /usr/share/vim/%{vimdir}/lang/pl
+%lang(ru) /usr/share/vim/%{vimdir}/lang/ru
+%lang(sk) /usr/share/vim/%{vimdir}/lang/sk
+%lang(sv) /usr/share/vim/%{vimdir}/lang/sv
+%lang(uk) /usr/share/vim/%{vimdir}/lang/uk
+%lang(vi) /usr/share/vim/%{vimdir}/lang/vi
+%lang(zh_CN) /usr/share/vim/%{vimdir}/lang/zh_CN
+%lang(zh_TW) /usr/share/vim/%{vimdir}/lang/zh_TW
+%lang(zh_CN.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_CN.UTF-8
+%lang(zh_TW.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_TW.UTF-8
 /usr/bin/xxd
 %{_mandir}/man1/vim.*
 %{_mandir}/man1/ex.*
@@ -451,15 +520,20 @@
 %{_mandir}/man1/rvi.*
 %{_mandir}/man1/rview.*
 %{_mandir}/man1/xxd.*
+%lang(fr) %{_mandir}/fr*
+%lang(it) %{_mandir}/it*
+%lang(ru) %{_mandir}/ru*
+%lang(pl) %{_mandir}/pl*
 
 %files minimal
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/vimrc
+%config(noreplace) %{_sysconfdir}/virc
 /bin/ex
 /bin/vi
 /bin/view
 /bin/rvi
 /bin/rview
+#/usr/share/vim/%{vimdir}/doc/vi-help.txt
 
 %files enhanced
 %defattr(-,root,root)
@@ -491,229 +565,93 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Thu Mar 09 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-4
-- fix configure check for python (#184478)
-
-* Thu Mar 09 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-3
-- rebuild
-
-* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-2
-- gtk-update-icon-cache --ignore-theme-index 
-  (avoids %%post failures when hicolor-icon-theme isn't installed)
-
-* Wed Feb 15 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-1
-- fix vim.csh script (#180429)
-- patchlevel 7
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:6.4.006-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:6.4.006-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Mon Jan 02 2006 Karsten Hopp <karsten at redhat.de> 6.4.006-1
-- patchlevel 6, fixes bz# 175048
-
-* Tue Dec 20 2005 Karsten Hopp <karsten at redhat.de> 6.4.004-2
-- disable templates when editing new .c / .h files (#175878)
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Thu Dec 08 2005 Karsten Hopp <karsten at redhat.de> 6.4.004-1
-- fix fstab syntax file (#174735)
-- patchlevel 4
-
-* Wed Nov 30 2005 Karsten Hopp <karsten at redhat.de> 6.4.003-1
-- patchlevel 3
-- remove withgui switch as we include vim-X11 in all our distributions now 
-  (#174271)
-
-* Fri Nov 25 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-4
-- enable tmpfile patch 
-
-* Thu Oct 27 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-3
-- test build
-
-* Tue Oct 25 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-2
-- use %%{_sysconfdir} (#171556)
-- add syntax highlighting rule for %%check (Ralf Ertzinger, #165277)
-
-* Mon Oct 17 2005 Karsten Hopp <karsten at redhat.de> 6.4.000-1
-- vim-6.4 patchlevel 0
-
-* Tue Oct 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.090-2
-- don't try to run cscope if cscope binary doesn't exist (#170371)
-- another attempt to fix perl requirements (#145475)
-
-* Mon Oct 10 2005 Karsten Hopp <karsten at redhat.de> 6.3.090-1
-- patchlevel 90
-- next attempt to fix perl requirements, add perl-epoch (#145475)
-
-* Thu Sep 08 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-5
-- fix path to csupport templates
-- point user at README.csupport so that defaults can be set
-- make vim buildable without csupport with a variable
-
-* Thu Sep 01 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-3
-- move X11 stuff to /usr/bin per request of xorg.x11 maintainer
-  Matthias Saou (#167176)
-
-* Tue Aug 16 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-2
-- rebuild
-
-* Tue Aug 09 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-1
-- update to patchlevel 86
-
-* Mon Jun 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.080-1
-- update to patchlevel 80
-
-* Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> - 1:6.3.071-3
-- silence %%post
-
-* Mon Apr 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.071-2
-- fix wrong Russian code page for vimtutor (#155181)
-
-* Mon Apr 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.071-1
-- patchlevel 71, fixes crashes when converting text with illegal characters
-  and when moving the vertical separator to the far left (vertically splitted 
-  window)
-
-* Mon Apr 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.068-2
-- quote special characters in here documents (vim.sh/vim.csh) (#154321)
+* Wed Jun 21 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-2
+- add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting
 
-* Thu Mar 31 2005 Karsten Hopp <karsten at redhat.de> 6.3-068
-- pathlevel 68 (can't write when editing symbolic link to compressed file)
-- remove -s parameter from install, this should fix debuginfo packages
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-1
+- patchlevel 22
 
-* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
-- rebuilt
-
-* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 6.3.067-2
-- Update the GTK+ theme icon cache on (un)install
-
-* Wed Mar 23 2005 Karsten Hopp <karsten at redhat.de> 6.3.067-1
-- Newly created files got execute permission (caused by patch 66)
-  #151667
-
-* Fri Mar 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.066-1
-- patchlevel 66
-
-* Mon Mar 14 2005 Karsten Hopp <karsten at redhat.de> 6.3.064-1
-- patchlevel 64
-- fix selinux warning (#150126)
-
-* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 6.3.062-1
-- patchlevel 62, build with gcc-4
-
-* Thu Feb 10 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-3
-- spec.vim fix from Andrew Overholt
-
-* Mon Feb 07 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-2 
-- fix tmpfile patch (#147192)
-
-* Mon Jan 31 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-1 
-- patchlevel 61
-
-* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> 1:058-2
-- rebuild for new perl
-
-* Tue Jan 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.058-1
-- Patchlevel 58
-- rebuild with new perl
-- remove all rpm backup files
-
-* Wed Jan 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-2
-- remove backup files
-
-* Wed Jan 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-1
-- patchlevel 54
-- fix unsecure tempfile usage (#144698)
-
-* Mon Dec 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.042-1 
-- patchlevel 42
-
-* Thu Dec 02 2004 Karsten Hopp <karsten at redhat.de> 6.3.035-2 
-- fix compressed docs handling (#141565)
-
-* Wed Dec 01 2004 Karsten Hopp <karsten at redhat.de> 6.3.035-1 
-- patchlevel 35
-- allow remapping of 'g' (#140747)
-
-* Fri Nov 19 2004 Karsten Hopp <karsten at redhat.de> 6.3.033-1 
-- patchlevel 33
-
-* Tue Nov 02 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-3 
-- fix selinux patch, so that HAVE_SELINUX will not be defined on 
-  non-selinux systems (#137860)
-
-* Tue Oct 19 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-3 
-- fix dependencies on vim-common (#132371)
-
-* Mon Oct 11 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-2 
-- add cscope to vimrc so that cscope DB will be used 
-  automatically when available
-
-* Fri Oct 08 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-2
-- patchlevel 30
-
-* Wed Oct 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.029-2 
-- fix perl requirement
-- patchlevel 29 to fix crash when inserting a line break
-
-* Wed Sep 29 2004 Karsten Hopp <karsten at redhat.de> 6.3.028-2 
-- add patch from Ulrich Drepper to fix syntax highlighting of 
-  DNS config files (#133746)
-
-* Tue Sep 21 2004 Than Ngo <than at redhat.com> 6.3.028-1
-- add patchlevel 27,28
-
-* Tue Sep 14 2004 Karsten Hopp <karsten at redhat.de> 6.3.026-1
-- patchlevel 26 (fixes an endless loop in syntax highlighting)
-
-* Wed Sep 08 2004 Karsten Hopp <karsten at redhat.de> 6.3.025-2 
-- clean up spec file
-- disable fontset
-- enable cscope
-
-* Mon Sep 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.025-1 
-- patchlevel 25
-
-* Wed Sep 01 2004 Karsten Hopp <karsten at redhat.de> 6.3.020-1
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.020-1
 - patchlevel 20
 
-* Sun Aug 29 2004 Karsten Hopp <karsten at redhat.de> 6.3.017-1 
-- patchlevel 17
-
-* Fri Aug 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.015-1
-- update to patchlevel 15
-- move older rpm changelog entries to Changelog.rpm
-
-* Mon Jul 26 2004 Warren Togami <wtogami at redhat.com> 6.3.014-2
-- future proof vim-enhanced perl dep
-
-* Thu Jul 22 2004 Karsten Hopp <karsten at redhat.de> 6.3.014-1
-- patchlevel 14, fixes 'helplang' default settings
-- fix escape sequence in /etc/vimrc (#128344)
-
-* Fri Jul 16 2004 Karsten Hopp <karsten at redhat.de> 6.3.013-2
-- use different encoding for tutor.pl (#125376)
-
-* Tue Jul 13 2004 Karsten Hopp <karsten at redhat.de> 6.3.013-1
-- patchlevel 13 to fix some crashes with multi-line patterns 
-  and when using CTRL-R in command mode
-
-* Thu Jul 8 2004 Dan Walsh <dwalsh at redhat.com> 6.3.011-4
-- Fix selinux patch to handle symlinks
-
-* Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 6.3.011-3
-- rebuild with new gcc
-
-* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 6.3.011-2 
-- convert tutorial files to UTF8 (#125376)
-
-* Sat Jul 03 2004 Karsten Hopp <karsten at redhat.de> 6.3.011-1 
-- patchlevel 11
+* Tue Jun 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.019-1
+- patchlevel 19
+- buildrequire autoconf
+
+* Tue May 30 2006 Karsten Hopp <karsten at redhat.de> 7.0.017-1
+- patchlevel 17, although it affects just the Motif version
+- own some directories (#192787)
+
+* Sat May 13 2006 Karsten Hopp <karsten at redhat.de> 7.0.016-1
+- patchlevel 016
+
+* Fri May 12 2006 Karsten Hopp <karsten at redhat.de> 7.0.012-1
+- patchlevel 012
+
+* Thu May 11 2006 Karsten Hopp <karsten at redhat.de> 7.0.010-1
+- patchlevel 010
+
+* Wed May 10 2006 Karsten Hopp <karsten at redhat.de> 7.0.005-2
+- patchlevel 005
+- move older changelogs (<7.0) into a file, no need to keep them 
+  in the rpm database
+
+* Tue May 09 2006 Karsten Hopp <karsten at redhat.de> 7.0.000-2
+- bump epoch, the buildsystem thinks 7.0.000-2 is older than 7.0.g001-1
+  although rpm is quite happy with it.
+
+* Mon May 08 2006 Karsten Hopp <karsten at redhat.de> 7.0.000-1
+- vim-7.0 
+- Spell checking support for about 50 languages
+- Intelligent completion for C, HTML, Ruby, Python, PHP, etc.
+- Tab pages, each containing multiple windows
+- Undo branches: never accidentally lose text again
+- Vim script supports Lists and Dictionaries (similar to Python)
+- Vim script profiling
+- Improved Unicode support
+- Highlighting of cursor line, cursor column and matching braces
+- Translated manual pages support.
+- Internal grep; works on all platforms, searches compressed files
+- Browsing remote directories, zip and tar archives
+- Printing multi-byte text
+- find details about the changes since vim-6.4 with :help version7
+
+- fix SE Linux context of temporary (.swp) files (#189968)
+- /bin/vi /vim-minimal is now using /etc/virc to avoid .rpmnew files
+  when updating
+
+* Tue May 02 2006 Karsten Hopp <karsten at redhat.de> 7.0.g001-1
+- vim-7.0g BETA
+
+* Fri Apr 28 2006 Karsten Hopp <karsten at redhat.de> 7.0.f001-1
+- vim-7.0f3 BETA
+
+* Thu Apr 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.e001-1
+- vim-7.0e BETA
+
+* Tue Apr 11 2006 Karsten Hopp <karsten at redhat.de> 7.0.d001-1
+- vim-7.0d BETA
+
+* Fri Apr 07 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-3
+- fix vimrc filename
+
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-2
+- new snapshot
+
+* Tue Apr 04 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-1
+- vim-7.0c BETA
+
+* Wed Mar 22 2006 Karsten Hopp <karsten at redhat.de> 7.0aa.000-3
+- Rawhide build as vim, opposed to vim7 (prerelease)
+- conflict with older man-pages-{it,fr} packages
+- cleanup lang stuff
+
+* Thu Mar 16 2006 Karsten Hopp <karsten at redhat.de> 7.0aa.000-2
+- make it coexist with vim-6 (temporarily)
+- new CVS snapshot
+
+* Tue Mar 14 2006 Karsten Hopp <karsten at redhat.de> 7.0aa.000-1
+- vim7 pre Release
+- older changelogs available in Changelog.rpm
 
-* Thu Jun 17 2004 Karsten Hopp <karsten at redhat.de> 6.3.006-1 
-- update to new major release
+# vim:nrformats-=octal



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:35:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:35:39 -0400
Subject: rpms/vim/FC-5 6.4.001,1.1,NONE
Message-ID: <200606211335.k5LDZdPq022715@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22685

Removed Files:
	6.4.001 
Log Message:
- remove old vim-6.4 patch


--- 6.4.001 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:36:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:36:06 -0400
Subject: rpms/vim/FC-5 6.4.002,1.1,NONE
Message-ID: <200606211336.k5LDa67s022813@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22748

Removed Files:
	6.4.002 
Log Message:
- remove old vim-6.4 patch


--- 6.4.002 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:36:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:36:22 -0400
Subject: rpms/vim/FC-5 6.4.003,1.1,NONE
Message-ID: <200606211336.k5LDaMAi022868@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22852

Removed Files:
	6.4.003 
Log Message:
- remove old vim-6.4 patch


--- 6.4.003 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:36:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:36:33 -0400
Subject: rpms/vim/FC-5 6.4.004,1.1,NONE
Message-ID: <200606211336.k5LDaXdq022944@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22919

Removed Files:
	6.4.004 
Log Message:
- remove old vim-6.4 patch


--- 6.4.004 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:36:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:36:46 -0400
Subject: rpms/vim/FC-5 6.4.005,1.1,NONE
Message-ID: <200606211336.k5LDak6K022986@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22976

Removed Files:
	6.4.005 
Log Message:
- remove old vim-6.4 patch


--- 6.4.005 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:36:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:36:57 -0400
Subject: rpms/vim/FC-5 6.4.006,1.1,NONE
Message-ID: <200606211336.k5LDav89023056@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23029

Removed Files:
	6.4.006 
Log Message:
- remove old vim-6.4 patch


--- 6.4.006 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:37:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:37:06 -0400
Subject: rpms/vim/FC-5 6.4.007,1.1,NONE
Message-ID: <200606211337.k5LDb6IG023120@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23097

Removed Files:
	6.4.007 
Log Message:
- remove old vim-6.4 patch


--- 6.4.007 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:40:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:40:02 -0400
Subject: rpms/inn/devel inn.spec,1.30,1.31
Message-ID: <200606211340.k5LDe2ZH023837@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/inn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23801

Modified Files:
	inn.spec 
Log Message:
enabled ipv6 support


Index: inn.spec
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- inn.spec	7 Jun 2006 12:47:39 -0000	1.30
+++ inn.spec	21 Jun 2006 13:39:59 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.3
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -97,6 +97,7 @@
 	--with-perl --enable-shared --enable-uucp-rnews \
 	--enable-pgp-verify --with-sendmail=/usr/sbin/sendmail \
 	--with-news-user=news --with-news-group=news --with-news-master=news \
+	--enable-ipv6 \
         %{_target_platform}
 
 # XXX don't include <db1/ndbm.h> to avoid linking with -ldb1.
@@ -290,6 +291,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jun 21 2006 Martin Stransky <stransky at redhat.com> 2.4.3-4
+- enabled ipv6 support
+
 * Wed Jun 07 2006 Karsten Hopp <karsten at redhat.de> 2.4.3-3
 - add some buildrequirements (krb5-devel pam-devel e2fsprogs-devel)
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:40:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:40:22 -0400
Subject: rpms/vim/FC-5 vim-7.0-fixkeys.patch,NONE,1.1
Message-ID: <200606211340.k5LDeMv1023966@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23920

Added Files:
	vim-7.0-fixkeys.patch 
Log Message:
- remap some keys

vim-7.0-fixkeys.patch:
 term.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE vim-7.0-fixkeys.patch ---
--- vim70aa/src/term.c.orig	2006-03-01 23:07:55.000000000 +0100
+++ vim70aa/src/term.c	2006-03-14 15:39:12.000000000 +0100
@@ -1008,14 +1008,14 @@
     {K_XRIGHT,		IF_EB("\033[1;*C", ESC_STR "[1;*C")},
     {K_XLEFT,		IF_EB("\033[1;*D", ESC_STR "[1;*D")},
     /* An extra set of function keys for vt100 mode */
-    {K_XF1,		IF_EB("\033O*P", ESC_STR "O*P")},
-    {K_XF2,		IF_EB("\033O*Q", ESC_STR "O*Q")},
-    {K_XF3,		IF_EB("\033O*R", ESC_STR "O*R")},
-    {K_XF4,		IF_EB("\033O*S", ESC_STR "O*S")},
-    {K_F1,		IF_EB("\033[11;*~", ESC_STR "[11;*~")},
-    {K_F2,		IF_EB("\033[12;*~", ESC_STR "[12;*~")},
-    {K_F3,		IF_EB("\033[13;*~", ESC_STR "[13;*~")},
-    {K_F4,		IF_EB("\033[14;*~", ESC_STR "[14;*~")},
+    {K_XF1,             IF_EB("\033[11~", ESC_STR "[11~")},
+    {K_XF2,             IF_EB("\033[12~", ESC_STR "[12~")},
+    {K_XF3,             IF_EB("\033[13~", ESC_STR "[13~")},
+    {K_XF4,             IF_EB("\033[14~", ESC_STR "[14~")},
+    {K_F1,              IF_EB("\033OP", ESC_STR "OP")},
+    {K_F2,              IF_EB("\033OQ", ESC_STR "OQ")},
+    {K_F3,              IF_EB("\033OR", ESC_STR "OR")},
+    {K_F4,              IF_EB("\033OS", ESC_STR "OS")},
     {K_F5,		IF_EB("\033[15;*~", ESC_STR "[15;*~")},
     {K_F6,		IF_EB("\033[17;*~", ESC_STR "[17;*~")},
     {K_F7,		IF_EB("\033[18;*~", ESC_STR "[18;*~")},



From fedora-cvs-commits at redhat.com  Wed Jun 21 13:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 09:42:39 -0400
Subject: rpms/vim/FC-5 vim-7.0-crv.patch,NONE,1.1
Message-ID: <200606211342.k5LDgdgx024623@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24603

Added Files:
	vim-7.0-crv.patch 
Log Message:
- don't remap this key

vim-7.0-crv.patch:
 term.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE vim-7.0-crv.patch ---
--- vim70aa/src/term.c.orig	2006-03-14 15:40:15.000000000 +0100
+++ vim70aa/src/term.c	2006-03-14 15:43:54.000000000 +0100
@@ -1284,7 +1284,6 @@
     {(int)KS_CWS,	"[%dCWS%d]"},
     {(int)KS_CWP,	"[%dCWP%d]"},
 #  endif
-    {(int)KS_CRV,	"[CRV]"},
     {K_UP,		"[KU]"},
     {K_DOWN,		"[KD]"},
     {K_LEFT,		"[KL]"},



From fedora-cvs-commits at redhat.com  Wed Jun 21 14:01:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 10:01:47 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.71,
	1.72 policy-20060608.patch, 1.13, 1.14 sources, 1.75, 1.76
Message-ID: <200606211401.k5LE1lIF013473@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13420

Modified Files:
	.cvsignore policy-20060608.patch sources 
Log Message:
* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	14 Jun 2006 15:48:59 -0000	1.71
+++ .cvsignore	21 Jun 2006 14:01:45 -0000	1.72
@@ -72,3 +72,4 @@
 serefpolicy-2.2.45.tgz
 serefpolicy-2.2.46.tgz
 serefpolicy-2.2.47.tgz
+serefpolicy-2.2.48.tgz

policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    9 +
 modules/admin/consoletype.te       |    7 +
 modules/admin/logwatch.te          |    3 
 modules/admin/netutils.te          |    1 
 modules/admin/prelink.fc           |    3 
 modules/kernel/files.if            |   20 +++
 modules/kernel/filesystem.te       |    5 
 modules/kernel/kernel.if           |   38 ++++++
 modules/services/apache.fc         |    1 
 modules/services/apache.if         |   79 ++++++++++++++
 modules/services/apache.te         |   53 ++++++++-
 modules/services/automount.te      |   13 ++
 modules/services/clamav.if         |   20 +++
 modules/services/cups.fc           |    1 
 modules/services/cups.if           |    2 
 modules/services/cups.te           |   10 +
 modules/services/hal.if            |   20 +++
 modules/services/mta.te            |    5 
 modules/services/networkmanager.te |    1 
 modules/services/ntp.te            |    1 
 modules/services/openvpn.te        |    3 
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.if        |   27 ++++
 modules/services/postfix.te        |    1 
 modules/services/ppp.te            |    1 
 modules/services/procmail.te       |    1 
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/system/authlogin.if        |    1 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/mount.te            |    1 
 modules/system/selinuxutil.te      |    2 
 modules/system/unconfined.fc       |    2 
 modules/system/userdomain.if       |  201 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 modules/system/xen.te              |   12 +-
 40 files changed, 506 insertions(+), 130 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- policy-20060608.patch	21 Jun 2006 12:58:35 -0000	1.13
+++ policy-20060608.patch	21 Jun 2006 14:01:45 -0000	1.14
@@ -761,6 +761,20 @@
  ')
  
  optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.2.48/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/squid.te	2006-06-21 09:56:26.000000000 -0400
+@@ -80,8 +80,10 @@
+ corenet_tcp_bind_all_nodes(squid_t)
+ corenet_udp_bind_all_nodes(squid_t)
+ corenet_tcp_bind_http_cache_port(squid_t)
++corenet_udp_bind_http_cache_port(squid_t)
+ corenet_tcp_bind_ftp_port(squid_t)
+ corenet_tcp_bind_gopher_port(squid_t)
++corenet_udp_bind_gopher_port(squid_t)
+ corenet_tcp_connect_ftp_port(squid_t)
+ corenet_tcp_connect_gopher_port(squid_t)
+ corenet_tcp_connect_http_port(squid_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.48/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
 +++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 17:26:29.000000000 -0400


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	14 Jun 2006 15:48:59 -0000	1.75
+++ sources	21 Jun 2006 14:01:45 -0000	1.76
@@ -1 +1 @@
-f8f313db16a432e3d20b771ab1823346  serefpolicy-2.2.47.tgz
+35e49f4a05fd163cf990b659a7b2c1b0  serefpolicy-2.2.48.tgz



From fedora-cvs-commits at redhat.com  Wed Jun 21 14:02:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 10:02:33 -0400
Subject: rpms/libvirt/FC-5 libvirt.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <200606211402.k5LE2Xb5013604@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13494

Modified Files:
	libvirt.spec sources 
Log Message:
Try to update to new release coping with xen hypervisor ABI breakage, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-5/libvirt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libvirt.spec	12 Apr 2006 12:09:44 -0000	1.7
+++ libvirt.spec	21 Jun 2006 14:02:29 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.1.0
+Version: 0.1.1
 Release: 1.FC5
 License: LGPL
 Group: Development/Libraries
@@ -100,8 +100,18 @@
 %doc python/tests/*.py
 %doc python/TODO
 %doc python/libvirtclass.txt
+%doc docs/examples/python
 
 %changelog
+* Wed Jun 21 2006 Daniel Veillard <veillard at redhat.com> 0.1.1-1.FC5
+- extend and cleanup the driver infrastructure and code
+- python examples
+- extend uuid support
+- bug fixes, buffer handling cleanups
+- support for new Xen hypervisor API
+- test driver for unit testing
+- virsh --conect argument
+
 * Mon Apr 10 2006 Daniel Veillard <veillard at redhat.com> 0.1.0-1.FC5
 - various fixes
 - new APIs: for Node information and Reboot


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Apr 2006 12:09:45 -0000	1.6
+++ sources	21 Jun 2006 14:02:29 -0000	1.7
@@ -1 +1 @@
-bebb6a89c592d3e2ba19594de7341b81  libvirt-0.1.0.tar.gz
+f5a86d6666ee783510c4896a7337ca9f  libvirt-0.1.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 21 14:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 10:11:30 -0400
Subject: rpms/joe/devel joe-3.4-pgup.patch,NONE,1.1 joe.spec,1.30,1.31
Message-ID: <200606211411.k5LEBUaZ015110@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14895

Modified Files:
	joe.spec 
Added Files:
	joe-3.4-pgup.patch 
Log Message:
Nonworking PgUp key fixed.


joe-3.4-pgup.patch:
 uedit.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE joe-3.4-pgup.patch ---
--- joe-3.4/uedit.c.pgup	2006-06-09 13:28:33.000000000 +0200
+++ joe-3.4/uedit.c	2006-06-09 13:20:54.000000000 +0200
@@ -1289,9 +1289,10 @@
 		if (bw->parent->link.prev->watom==&watommenu) {
 			return umpgup(bw->parent->link.prev->object);
 		}
-		else {
+		/* due to existence of this block PgUp didn't work */
+		/* else {
 		      return -1;
-		}
+		} */
 	} else {
 		if (bw->parent->link.next->watom==&watommenu) {
 			return umpgup(bw->parent->link.next->object);


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- joe.spec	31 May 2006 12:01:56 -0000	1.30
+++ joe.spec	21 Jun 2006 14:11:27 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: An easy to use, modeless text editor.
 Name: joe
 Version: 3.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch0: joe-3.1-joerc.patch
 Patch2: joe-3.4-selinux.patch
 Patch4: joe-3.1-ret.patch
+Patch5: joe-3.4-pgup.patch
 
 %description
 Joe is a powerful, easy to use, modeless text editor.
@@ -25,6 +26,7 @@
 %patch0 -p1 -b .joerc
 %patch2 -p1 -b .selinux
 %patch4 -p1 -b .ret
+%patch5 -p1 -b .pgup
 
 %build
 %configure
@@ -54,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jun 09 2006 Martin Bacovsky <mbacovsk at redhat.com> 3.4-2
+- fix nonworking PgUp - bug 194213
+
 * Wed May 31 2006 Ivana Varekova <varekova at redhat.com> 3.4-1
 - update to 3.4
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 14:45:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 10:45:27 -0400
Subject: rpms/xen/FC-5 xen.spec,1.113,1.114
Message-ID: <200606211445.k5LEjRjT007631@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xen/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7536

Modified Files:
	xen.spec 
Log Message:
Add a missing header, Daniel



Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- xen.spec	20 Jun 2006 22:32:11 -0000	1.113
+++ xen.spec	21 Jun 2006 14:45:24 -0000	1.114
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 2.FC5
+Release: 3.FC5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -105,6 +105,7 @@
 install -m 644 tools/libxc/xen/arch-x86_64.h %{buildroot}%{_includedir}/xen
 install -m 644 tools/libxc/xen/arch-ia64.h %{buildroot}%{_includedir}/xen
 install -m 644 xen/include/public/io/xs_wire.h %{buildroot}%{_includedir}/xen/io
+install -m 644 xen/include/public/xen-compat.h %{buildroot}%{_includedir}/xen
 
 ### fixing start-script dir
 mkdir -p %{buildroot}/etc/rc.d
@@ -164,6 +165,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Wed Jun 21 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-3.FC5
+- Add missing xen-compat.h needed to compile on the new xen sources
+
 * Tue Jun 20 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-2.FC5
 - Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
   glibc32 correctly



From fedora-cvs-commits at redhat.com  Wed Jun 21 14:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 10:53:20 -0400
Subject: rpms/gsf-sharp/devel .cvsignore, 1.2, 1.3 gsf-sharp.spec, 1.12,
	1.13 sources, 1.2, 1.3
Message-ID: <200606211453.k5LErKom025385@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25345

Modified Files:
	.cvsignore gsf-sharp.spec sources 
Log Message:
* Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.8-1
- update to 0.8 which is for gsf 1.14.x




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Nov 2005 14:25:18 -0000	1.2
+++ .cvsignore	21 Jun 2006 14:53:17 -0000	1.3
@@ -1 +1,2 @@
 gsf-sharp-0.6.tar.gz
+gsf-sharp-0.8.tar.gz


Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gsf-sharp.spec	9 Jun 2006 13:22:11 -0000	1.12
+++ gsf-sharp.spec	21 Jun 2006 14:53:17 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
-Version:        0.6
-Release:        10
+Version:        0.8
+Release:        1
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -27,7 +27,6 @@
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -51,6 +50,9 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.8-1
+- update to 0.8 which is for gsf 1.14.x
+
 * Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 0.6-10
 - Disable on s390* as mono doesn't build on s390 atm
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Nov 2005 14:25:18 -0000	1.2
+++ sources	21 Jun 2006 14:53:17 -0000	1.3
@@ -1 +1 @@
-d8a5e861f709bcfbd74265f4eb7915a4  gsf-sharp-0.6.tar.gz
+bfadc582cee4379d4368e0ffa7aafc93  gsf-sharp-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 21 15:19:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 11:19:22 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.111, 1.112 mkinitrd.spec, 1.128,
	1.129 sources, 1.124, 1.125
Message-ID: <200606211519.k5LFJMbN020845@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20821/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
auto-import mkinitrd-5.0.43-1 on branch devel from mkinitrd-5.0.43-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- .cvsignore	21 Jun 2006 04:19:01 -0000	1.111
+++ .cvsignore	21 Jun 2006 15:19:20 -0000	1.112
@@ -1 +1 @@
-mkinitrd-5.0.42.tar.bz2
+mkinitrd-5.0.43.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mkinitrd.spec	21 Jun 2006 04:19:03 -0000	1.128
+++ mkinitrd.spec	21 Jun 2006 15:19:20 -0000	1.129
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.42
+Version: 5.0.43
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,12 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.43-1
+- Add back patches from pjones which had just been in the package for 
+  * fix bad shell code to detect DMs in use
+  * fix "stabilized" to stat where appropriate
+  * use stabilized for sbp2
+
 * Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.42-1
 - add a hack to handle xennet devices not having a modalias (#196104)
 - initial pass at support for root on iscsi (patch from Patrick 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- sources	21 Jun 2006 04:19:03 -0000	1.124
+++ sources	21 Jun 2006 15:19:20 -0000	1.125
@@ -1 +1 @@
-451438f1f30cb5ecb5f8f83025d596f8  mkinitrd-5.0.42.tar.bz2
+7ae8bad01c935f4820fee74396188cdc  mkinitrd-5.0.43.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 15:37:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 11:37:23 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.143,1.144
Message-ID: <200606211537.k5LFbNBW021274@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21255

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gnome-applets.spec	20 Jun 2006 20:46:31 -0000	1.143
+++ gnome-applets.spec	21 Jun 2006 15:37:20 -0000	1.144
@@ -19,6 +19,7 @@
 %define hal_version 0.5.3
 %define libnotify_version 0.3.2
 %define pygobject_version 2.6
+%define pygtk_version 2.6
 %define gnome_python_version 2.10
 
 %define po_package gnome-applets-2.0
@@ -66,7 +67,9 @@
 BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  pygobject2-devel >= %{pygobject_version}
+BuildRequires:  pygtk2-devel >= %{pygtk_version}
 BuildRequires:  gnome-python2 >= %{gnome_python_version}
+BuildRequires:  gucharmap-devel
 
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 21 15:46:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 11:46:52 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.54, 1.55 firstboot.spec, 1.75,
	1.76 sources, 1.71, 1.72
Message-ID: <200606211546.k5LFkqnL012151@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11465

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	12 Jun 2006 14:58:58 -0000	1.54
+++ .cvsignore	21 Jun 2006 15:46:49 -0000	1.55
@@ -26,3 +26,4 @@
 firstboot-1.4.9.tar.bz2
 firstboot-1.4.10.tar.bz2
 firstboot-1.4.11.tar.bz2
+firstboot-1.4.12.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- firstboot.spec	12 Jun 2006 14:58:58 -0000	1.75
+++ firstboot.spec	21 Jun 2006 15:46:49 -0000	1.76
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.11
+Version: 1.4.12
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Wed Jun 21 2006 Chris Lumens <clumens at redhat.com> 1.4.12-1
+- Update translation files (#195010).
+- Fix traceback on exiting (#196128).
+
 * Mon Jun 12 2006 Chris Lumens <clumens at redhat.com> 1.4.11-1
 - Don't traceback on the display module if there's no display hardware
   (#142522).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	12 Jun 2006 14:58:58 -0000	1.71
+++ sources	21 Jun 2006 15:46:49 -0000	1.72
@@ -1 +1 @@
-91e5523cc5eef1e52f79010cadc3c0cb  firstboot-1.4.11.tar.bz2
+b7ea5d58b5b5e5d41864af6913772d1d  firstboot-1.4.12.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 21 16:52:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 12:52:31 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.166,1.167
Message-ID: <200606211652.k5LGqVvC000741@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv718/configs

Modified Files:
	config-generic 
Log Message:
disable slab debug


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- config-generic	18 Jun 2006 04:45:12 -0000	1.166
+++ config-generic	21 Jun 2006 16:52:29 -0000	1.167
@@ -2479,7 +2479,7 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 16:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 12:52:43 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.60,1.61
Message-ID: <200606211652.k5LGqhXu000836@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv810/configs

Modified Files:
	config-generic 
Log Message:
disable slab debug


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- config-generic	20 Jun 2006 18:25:41 -0000	1.60
+++ config-generic	21 Jun 2006 16:52:41 -0000	1.61
@@ -2479,7 +2479,7 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 17:18:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 13:18:16 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.144,1.145
Message-ID: <200606211718.k5LHIGK4022746@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22692

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gnome-applets.spec	21 Jun 2006 15:37:20 -0000	1.144
+++ gnome-applets.spec	21 Jun 2006 17:18:14 -0000	1.145
@@ -69,6 +69,7 @@
 BuildRequires:  pygobject2-devel >= %{pygobject_version}
 BuildRequires:  pygtk2-devel >= %{pygtk_version}
 BuildRequires:  gnome-python2 >= %{gnome_python_version}
+BuildRequires:  gnome-python2-desktop
 BuildRequires:  gucharmap-devel
 
 BuildRequires:  dbus-devel >= %{dbus_version}



From fedora-cvs-commits at redhat.com  Wed Jun 21 17:44:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 13:44:01 -0400
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.12,
	1.13 iscsistart-static.patch, 1.1, 1.2
Message-ID: <200606211744.k5LHi1X3030460@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30432

Modified Files:
	iscsi-initiator-utils.spec iscsistart-static.patch 
Log Message:
add static getpwuid workaround for iscsistart


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- iscsi-initiator-utils.spec	21 Jun 2006 03:56:34 -0000	1.12
+++ iscsi-initiator-utils.spec	21 Jun 2006 17:43:58 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.0.5.595
-Release: 1
+Release: 2
 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
@@ -76,6 +76,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jun 21 2006 Mike Christie <mchristi at redhat.com> - 6.0.5.595-2
+- add PatM's statics.c file. This is needed for boot since 
+  there is no getpwuid static available at that time.
 * Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 6.0.5.595-1
 - ensure that we respect %%{optflags}
 - cleaned up initscript to make use of standard functions, return right 

iscsistart-static.patch:
 Makefile  |    5 +++--
 statics.c |   20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

Index: iscsistart-static.patch
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsistart-static.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsistart-static.patch	21 Jun 2006 03:56:34 -0000	1.1
+++ iscsistart-static.patch	21 Jun 2006 17:43:58 -0000	1.2
@@ -1,11 +1,39 @@
---- open-iscsi-6.0.5.595/usr/Makefile.static	2006-06-20 23:21:15.000000000 -0400
-+++ open-iscsi-6.0.5.595/usr/Makefile	2006-06-20 23:22:59.000000000 -0400
-@@ -51,7 +51,7 @@
+diff -Naurp open-iscsi-6.0.5.595/usr/Makefile open-iscsi-6.0.5.610.work/usr/Makefile
+--- open-iscsi-6.0.5.595/usr/Makefile	2006-06-21 12:32:51.000000000 -0500
++++ open-iscsi-6.0.5.610.work/usr/Makefile	2006-06-21 12:33:55.000000000 -0500
+@@ -50,8 +50,9 @@ iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INIT
+ iscsiadm: $(COMMON_SRCS) strings.o discovery.o iscsiadm.o
  	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
  
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o
+-iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o
 -	$(CC) $(CFLAGS) $^ -o $@
++iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o \
++		statics.o
 +	$(CC) -static $(CFLAGS) $^ -o $@
  
  clean:
  	rm -f *.o $(PROGRAMS)
+diff -Naurp open-iscsi-6.0.5.595/usr/statics.c open-iscsi-6.0.5.610.work/usr/statics.c
+--- open-iscsi-6.0.5.595/usr/statics.c	1969-12-31 18:00:00.000000000 -0600
++++ open-iscsi-6.0.5.610.work/usr/statics.c	2006-06-21 12:30:05.000000000 -0500
+@@ -0,0 +1,20 @@
++#include <unistd.h>
++#include <pwd.h>
++#include <sys/errno.h>
++#include <sys/types.h>
++
++static struct passwd root_pw = {
++	.pw_name = "root",
++};
++
++struct passwd*
++getpwuid(uid_t uid)
++{
++	if (uid == 0)
++		return &root_pw;
++	else {
++		errno = ENOENT;
++		return 0;
++	}
++}
++



From fedora-cvs-commits at redhat.com  Wed Jun 21 18:26:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 14:26:49 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp-0.11.1-evo28.patch, 1.1,
	1.2 evolution-sharp.spec, 1.17, 1.18
Message-ID: <200606211826.k5LIQneG009518@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9499

Modified Files:
	evolution-sharp-0.11.1-evo28.patch evolution-sharp.spec 
Log Message:
- Update evolution-sharp-0.11.1-evo28.patch to set ECAL_SOVERSION to 6.
- Fix BuildRoot


evolution-sharp-0.11.1-evo28.patch:
 configure.in |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: evolution-sharp-0.11.1-evo28.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp-0.11.1-evo28.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-sharp-0.11.1-evo28.patch	15 May 2006 14:34:26 -0000	1.1
+++ evolution-sharp-0.11.1-evo28.patch	21 Jun 2006 18:26:47 -0000	1.2
@@ -16,7 +16,7 @@
 +	EDS_VERSION=-1.2
 +	EDS_SOVERSION=7
 +	EBOOK_SOVERSION=5  # Not sure if this is correct
-+	ECAL_SOVERSION=3   # Not sure if this is correct
++	ECAL_SOVERSION=6
 +fi
 +
  AC_SUBST(EDS_VERSION)


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- evolution-sharp.spec	16 Jun 2006 18:44:47 -0000	1.17
+++ evolution-sharp.spec	21 Jun 2006 18:26:47 -0000	1.18
@@ -2,13 +2,13 @@
 
 Name:           evolution-sharp
 Version:        0.11.1
-Release:        3
+Release:        4
 License:        LGPL
 Group:          System Environment/Libraries
 Summary:        Evolution Data Server Mono Bindings
 URL:            http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.10/
 Source:         evolution-sharp-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 # Mono only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -69,6 +69,10 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Wed Jun 21 2006 Matthew Barnes <mbarnes at redhat.com> 0.11.1-4
+- Update evolution-sharp-0.11.1-evo28.patch to set ECAL_SOVERSION to 6.
+- Fix BuildRoot
+
 * Fri Jun 16 2006 Matthew Barnes <mbarnes at redhat.com> 0.11.1-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 18:33:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 14:33:27 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.88,
	1.89 libselinux.spec, 1.206, 1.207
Message-ID: <200606211833.k5LIXRlI010660@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10645

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-4
- Turn off error printing in library.  Need to compile with DEBUG to get it back


libselinux-rhat.patch:
 include/selinux/selinux.h |   12 ++++++
 man/man8/matchpathcon.8   |   18 ++++++++-
 src/matchpathcon.c        |   85 +++++++++++++++++++++++++++++++++++++++++++---
 utils/matchpathcon.c      |   65 +++++++++++++++++++++++++++--------
 4 files changed, 158 insertions(+), 22 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- libselinux-rhat.patch	21 Jun 2006 13:12:11 -0000	1.88
+++ libselinux-rhat.patch	21 Jun 2006 18:33:13 -0000	1.89
@@ -56,9 +56,17 @@
  This manual page was written by Dan Walsh <dwalsh at redhat.com>.
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.30.15/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.15/src/matchpathcon.c	2006-06-20 15:37:25.000000000 -0400
-@@ -26,6 +26,8 @@
++++ libselinux-1.30.15/src/matchpathcon.c	2006-06-21 14:31:19.000000000 -0400
+@@ -20,12 +20,16 @@
+ #endif
+ default_printf(const char *fmt, ...) 
+ {
++#ifdef DEBUG
+ 	va_list ap;
+ 	va_start(ap, fmt);
+ 	vfprintf(stderr, fmt, ap);
  	va_end(ap);
++#endif
  }
  
 +static unsigned int myflags;
@@ -66,7 +74,7 @@
  static void 
  #ifdef __GNUC__
  __attribute__ ((format (printf, 1, 2)))
-@@ -50,7 +52,12 @@
+@@ -50,7 +54,12 @@
  static int default_canoncon(const char *path, unsigned lineno, char **context)
  {
  	char *tmpcon;
@@ -80,7 +88,7 @@
  		if (errno == ENOENT)
  			return 0;
  		if (lineno)
-@@ -74,8 +81,6 @@
+@@ -74,8 +83,6 @@
  		mycanoncon = &default_canoncon;
  }
  
@@ -89,7 +97,7 @@
  void set_matchpathcon_flags(unsigned int flags)
  {
  	myflags = flags;
-@@ -580,7 +585,6 @@
+@@ -580,7 +587,6 @@
  				spec_arr[nspec].context_valid = 1;
  			}
  		}
@@ -97,7 +105,7 @@
  		spec_arr[nspec].context = context;
  		
  		/* Determine if specification has 
-@@ -797,7 +801,6 @@
+@@ -797,7 +803,6 @@
  		errno = ENOENT;
  		return -1;
  	}
@@ -105,7 +113,7 @@
  	spec_arr[i].matches++;
  
  	return i;
-@@ -877,3 +880,73 @@
+@@ -877,3 +882,73 @@
  		}
  	}
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- libselinux.spec	21 Jun 2006 13:12:11 -0000	1.206
+++ libselinux.spec	21 Jun 2006 18:33:13 -0000	1.207
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.15
-Release: 3
+Release: 4
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -117,6 +117,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-4
+- Turn off error printing in library.  Need to compile with DEBUG to get it back
+
 * Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-3
 - Fix error reporting of matchpathcon
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 18:38:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 14:38:47 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.18,1.19
Message-ID: <200606211838.k5LIclmf010823@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10808

Modified Files:
	evolution-sharp.spec 
Log Message:
- Mono no longer available on s390 and s390x.



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- evolution-sharp.spec	21 Jun 2006 18:26:47 -0000	1.18
+++ evolution-sharp.spec	21 Jun 2006 18:38:45 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           evolution-sharp
 Version:        0.11.1
-Release:        4
+Release:        5
 License:        LGPL
 Group:          System Environment/Libraries
 Summary:        Evolution Data Server Mono Bindings
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
 ### Patches ###
 
@@ -69,6 +69,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Wed Jun 21 2006 Matthew Barnes <mbarnes at redhat.com> 0.11.1-5
+- Mono no longer available on s390 and s390x.
+
 * Wed Jun 21 2006 Matthew Barnes <mbarnes at redhat.com> 0.11.1-4
 - Update evolution-sharp-0.11.1-evo28.patch to set ECAL_SOVERSION to 6.
 - Fix BuildRoot



From fedora-cvs-commits at redhat.com  Wed Jun 21 18:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 14:41:54 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.145,1.146
Message-ID: <200606211841.k5LIfsgu022225@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22151

Modified Files:
	gnome-applets.spec 
Log Message:
fix file lists



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gnome-applets.spec	21 Jun 2006 17:18:14 -0000	1.145
+++ gnome-applets.spec	21 Jun 2006 18:41:51 -0000	1.146
@@ -210,7 +210,6 @@
 %{_libexecdir}/gnome-applets
 %{_libexecdir}/gnome-applets/mc-install-default-macros
 %{_libexecdir}/gnome-keyboard-applet
-%{_libexecdir}/gtik2_applet2
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
 %{_libexecdir}/mixer_applet2
@@ -219,6 +218,7 @@
 %{_libexecdir}/null_applet
 %{_libexecdir}/stickynotes_applet
 %{_libexecdir}/trashapplet
+%{_libexecdir}/investapplet
 %{_sbindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/pam.d/*



From fedora-cvs-commits at redhat.com  Wed Jun 21 18:44:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 14:44:11 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.146,1.147
Message-ID: <200606211844.k5LIiBxa023164@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23104

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gnome-applets.spec	21 Jun 2006 18:41:51 -0000	1.146
+++ gnome-applets.spec	21 Jun 2006 18:44:08 -0000	1.147
@@ -69,7 +69,7 @@
 BuildRequires:  pygobject2-devel >= %{pygobject_version}
 BuildRequires:  pygtk2-devel >= %{pygtk_version}
 BuildRequires:  gnome-python2 >= %{gnome_python_version}
-BuildRequires:  gnome-python2-desktop
+BuildRequires:  gnome-python2-applet
 BuildRequires:  gucharmap-devel
 
 BuildRequires:  dbus-devel >= %{dbus_version}



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:04:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:04:03 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.147,1.148
Message-ID: <200606211904.k5LJ43gi011594@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11573

Modified Files:
	gnome-applets.spec 
Log Message:
fix file lists



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gnome-applets.spec	21 Jun 2006 18:44:08 -0000	1.147
+++ gnome-applets.spec	21 Jun 2006 19:03:58 -0000	1.148
@@ -218,7 +218,7 @@
 %{_libexecdir}/null_applet
 %{_libexecdir}/stickynotes_applet
 %{_libexecdir}/trashapplet
-%{_libexecdir}/investapplet
+%{_libexecdir}/invest-applet
 %{_sbindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/pam.d/*



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:04:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:04:41 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel xorg-x11-drv-vmmouse.spec,1.5,1.6
Message-ID: <200606211904.k5LJ4fB1011650@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11610

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 12.4.0-2
- Enable vmmouse on ia64, as the "vmware" driver is also built on ia64.






From fedora-cvs-commits at redhat.com  Wed Jun 21 19:11:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:11:20 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.10,1.11
Message-ID: <200606211911.k5LJBK41012849@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12821

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Wed Jun 21 2006 Mike Harris <mharris at redhat.com> 7.1-1
- Regenerate driver list to match current rawhide X11R7.1 driver set.



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drivers.spec	1 Mar 2006 06:19:29 -0000	1.10
+++ xorg-x11-drivers.spec	21 Jun 2006 19:11:17 -0000	1.11
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
-Version: 7.0
-Release: 2
+Version: 7.1
+Release: 1
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
@@ -34,6 +34,10 @@
 Requires: xorg-x11-drv-ark
 %endif
 
+%ifarch %{ix86} x86_64
+Requires: xorg-x11-drv-ast
+%endif
+
 %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-ati
 %endif
@@ -82,7 +86,7 @@
 Requires: xorg-x11-drv-elographics
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 Requires: xorg-x11-drv-evdev
 %endif
 
@@ -122,7 +126,7 @@
 Requires: xorg-x11-drv-joystick
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 Requires: xorg-x11-drv-keyboard
 %endif
 
@@ -142,7 +146,7 @@
 Requires: xorg-x11-drv-microtouch
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 Requires: xorg-x11-drv-mouse
 %endif
 
@@ -226,7 +230,7 @@
 Requires: xorg-x11-drv-v4l
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 Requires: xorg-x11-drv-vesa
 %endif
 
@@ -242,7 +246,11 @@
 Requires: xorg-x11-drv-vmware
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+%ifarch %{ix86} x86_64
+Requires: xorg-x11-drv-vmmouse
+%endif
+
+%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 Requires: xorg-x11-drv-void
 %endif
 
@@ -250,7 +258,6 @@
 Requires: xorg-x11-drv-voodoo
 %endif
 
-
 %description
 The purpose of this package is to require all of the individual X.Org
 driver rpms, to allow the OS installation software to install all drivers
@@ -271,17 +278,20 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Feb 16 2006 Bill Nottingham <notting at redhat.com> - 7.0-2
+* Wed Jun 21 2006 Mike Harris <mharris at redhat.com> 7.1-1
+- Regenerate driver list to match current rawhide X11R7.1 driver set.
+
+* Thu Feb 16 2006 Bill Nottingham <notting at redhat.com> 7.0-2
 - uncomment (empty) file list so binary RPMs are built
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.0-1.1
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 7.0-1.1
 - bump again for double-long bug on ppc(64)
 
 * Thu Feb 09 2006 Mike Harris <mharris at redhat.com> 7.0-1
 - Bumped version to 7.0-1
 - Updated the driver list to match current rawhide, X11R7.0
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99.2-4.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.99.2-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Nov 23 2005 Mike Harris <mharris at redhat.com> 0.99.2-4



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:21:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:21:20 -0400
Subject: rpms/xorg-x11-drivers/devel Makefile,1.1,1.2
Message-ID: <200606211921.k5LJLK6U031189@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31090

Modified Files:
	Makefile 
Log Message:
Fix Makefile to find the correct spec file


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	15 Nov 2005 08:34:43 -0000	1.1
+++ Makefile	21 Jun 2006 19:21:17 -0000	1.2
@@ -1,6 +1,6 @@
 # Makefile for source rpm: xorg-x11-drivers
 # $Id$
 NAME := xorg-x11-drivers
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:22:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:22:41 -0400
Subject: rpms/rhpl/devel .cvsignore, 1.60, 1.61 rhpl.spec, 1.72, 1.73 sources,
	1.65, 1.66
Message-ID: <200606211922.k5LJMftG031728@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31676

Modified Files:
	.cvsignore rhpl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	23 Mar 2006 19:29:51 -0000	1.60
+++ .cvsignore	21 Jun 2006 19:22:39 -0000	1.61
@@ -1,2 +1,3 @@
 rhpl-0.185.tar.gz
 rhpl-0.186.tar.gz
+rhpl-0.187.tar.gz


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- rhpl.spec	23 Mar 2006 19:29:51 -0000	1.72
+++ rhpl.spec	21 Jun 2006 19:22:39 -0000	1.73
@@ -1,6 +1,6 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
-Version: 0.186
+Version: 0.187
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,10 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Wed Jun 21 2006 Chris Lumens <clumens at redhat.com> 0.187-1
+- Remove deprecated comps.py.
+- Fix traceback when updating resolv.conf (#182395).
+
 * Thu Mar 23 2006 Chris Lumens <clumens at redhat.com> 0.186-1 
 - Remove deprecated files now in rhpl or firstboot.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	23 Mar 2006 19:29:51 -0000	1.65
+++ sources	21 Jun 2006 19:22:39 -0000	1.66
@@ -1 +1 @@
-39603248f87f560199d224a41e114642  rhpl-0.186.tar.gz
+d50684eca625e731e5cd1071cf7f4d45  rhpl-0.187.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:34:24 -0400
Subject: rpms/rhpl/devel rhpl.spec,1.73,1.74 sources,1.66,1.67
Message-ID: <200606211934.k5LJYOAQ002764@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2722

Modified Files:
	rhpl.spec sources 
Log Message:
Fix ppc64 build.



Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- rhpl.spec	21 Jun 2006 19:22:39 -0000	1.73
+++ rhpl.spec	21 Jun 2006 19:34:20 -0000	1.74
@@ -8,7 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: python-devel, gettext
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
-%ifnarch s390 s390x ppc64
+%ifnarch s390 s390x
 BuildRequires: wireless-tools
 Requires: pyxf86config >= 0.3.2
 %endif


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	21 Jun 2006 19:22:39 -0000	1.66
+++ sources	21 Jun 2006 19:34:20 -0000	1.67
@@ -1 +1 @@
-d50684eca625e731e5cd1071cf7f4d45  rhpl-0.187.tar.gz
+7979e7677a5cb32c06d176052403c707  rhpl-0.187.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:52:16 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel xorg-x11-drv-vmmouse.spec,1.6,1.7
Message-ID: <200606211952.k5LJqGKM023093@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23063

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Log Message:
ia64 not supported in this driver


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-vmmouse.spec	21 Jun 2006 19:04:23 -0000	1.6
+++ xorg-x11-drv-vmmouse.spec	21 Jun 2006 19:52:14 -0000	1.7
@@ -15,7 +15,9 @@
 
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 
-ExclusiveArch: %{ix86} x86_64 ia64
+# NOTE: We build the "vmware" driver on ia64, however the vmmouse driver
+# fails during attempts to build it on ia64 saying it is for x86 only.
+ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-1
@@ -52,9 +54,6 @@
 %{_mandir}/man4/vmmouse.4*
 
 %changelog
-* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 12.4.0-2
-- Enable vmmouse on ia64, as the "vmware" driver is also built on ia64.
-
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 12.4.0-1
 - Update to 12.4.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:58:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:58:50 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.205,
	1.206 policycoreutils.spec, 1.287, 1.288
Message-ID: <200606211958.k5LJwo6J025685@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25642

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-4
- Don't use translations with matchpathcon


policycoreutils-rhat.patch:
 audit2allow/audit2allow.1 |    2 
 audit2allow/avc.py        |    2 
 po/hi.po                  |   33 +++---
 po/mr.po                  |   86 ++++++++++-------
 po/ms.po                  |  232 +++++++++++++++++++++++++++++-----------------
 restorecon/restorecon.c   |    3 
 restorecond/restorecond.c |    4 
 setfiles/setfiles.c       |    4 
 setsebool/setsebool.8     |    3 
 setsebool/setsebool.c     |    6 -
 10 files changed, 234 insertions(+), 141 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- policycoreutils-rhat.patch	20 Jun 2006 13:14:45 -0000	1.205
+++ policycoreutils-rhat.patch	21 Jun 2006 19:58:48 -0000	1.206
@@ -192,6 +192,7 @@
  
  #: ../newrole/newrole.c:481
  #, c-format
+3b
 +#, fuzzy
  msgid "Error: multiple roles specified\n"
 -msgstr ""
@@ -893,6 +894,68 @@
  msgid "Options Error: %s "
  msgstr "Ralat Pilihan: %s"
 +
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.14/restorecon/restorecon.c
+--- nsapolicycoreutils/restorecon/restorecon.c	2006-05-15 09:42:56.000000000 -0400
++++ policycoreutils-1.30.14/restorecon/restorecon.c	2006-06-21 15:51:43.000000000 -0400
+@@ -185,7 +185,7 @@
+     fprintf(stderr,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
+     return 1;
+   } 
+-  retcontext=lgetfilecon(filename,&prev_context);
++  retcontext=lgetfilecon_raw(filename,&prev_context);
+   
+   if (retcontext >= 0 || errno == ENODATA) {
+     int customizable=0;
+@@ -306,6 +306,7 @@
+   progname=argv[0];
+   if (is_selinux_enabled() <= 0 )
+     exit(0);
++  set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
+ 
+   while ((opt = getopt(argc, argv, "FrRnvf:o:e:")) > 0) {
+     switch (opt) {
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.14/restorecond/restorecond.c
+--- nsapolicycoreutils/restorecond/restorecond.c	2006-05-15 09:42:57.000000000 -0400
++++ policycoreutils-1.30.14/restorecond/restorecond.c	2006-06-21 15:56:15.000000000 -0400
+@@ -182,7 +182,7 @@
+ 		syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
+ 		return;
+ 	} 
+-	retcontext=fgetfilecon(fd,&prev_context);
++	retcontext=fgetfilecon_raw(fd,&prev_context);
+ 	
+ 	if (retcontext >= 0 || errno == ENODATA) {
+ 		if (retcontext < 0) prev_context=NULL;
+@@ -420,6 +420,8 @@
+ 	sigemptyset( &sa.sa_mask ) ;
+ 	sigaction( SIGTERM, &sa, NULL );
+ 
++	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
++
+ 	master_fd = inotify_init ();
+ 	if (master_fd < 0)
+ 	        exitApp("inotify_init");
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.14/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2006-06-16 15:08:24.000000000 -0400
++++ policycoreutils-1.30.14/setfiles/setfiles.c	2006-06-21 15:54:16.000000000 -0400
+@@ -301,7 +301,7 @@
+ 	}
+ 
+ 	/* Get the current context of the file. */
+-	ret = lgetfilecon(my_file, &context);
++	ret = lgetfilecon_raw(my_file, &context);
+ 	if (ret < 0) {
+ 		if (errno == ENODATA) {
+ 			context = NULL;
+@@ -485,7 +485,7 @@
+ 	memset(excludeArray,0, sizeof(excludeArray));
+ 
+ 	/* Validate all file contexts during matchpathcon_init. */
+-	set_matchpathcon_flags(MATCHPATHCON_VALIDATE);
++	set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS);
+ 
+ 	/* Process any options. */
+ 	while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) {
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8
 --- nsapolicycoreutils/setsebool/setsebool.8	2006-05-15 09:42:58.000000000 -0400
 +++ policycoreutils-1.30.14/setsebool/setsebool.8	2006-06-19 10:32:36.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- policycoreutils.spec	20 Jun 2006 13:14:46 -0000	1.287
+++ policycoreutils.spec	21 Jun 2006 19:58:48 -0000	1.288
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.14
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -111,6 +111,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-4
+- Don't use translations with matchpathcon
+
 * Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-3
 - Prompt for selinux-policy-devel package in audit2allow
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 19:58:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 15:58:56 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch,1.89,1.90
Message-ID: <200606211958.k5LJwtKX025729@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25697

Modified Files:
	libselinux-rhat.patch 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-4
- Turn off error printing in library.  Need to compile with DEBUG to get it back


libselinux-rhat.patch:
 include/selinux/selinux.h |   11 +++++
 man/man8/matchpathcon.8   |   18 +++++++-
 src/matchpathcon.c        |   97 +++++++++++++++++++++++++++++++++++++---------
 utils/matchpathcon.c      |   65 ++++++++++++++++++++++++------
 4 files changed, 156 insertions(+), 35 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- libselinux-rhat.patch	21 Jun 2006 18:33:13 -0000	1.89
+++ libselinux-rhat.patch	21 Jun 2006 19:58:52 -0000	1.90
@@ -1,17 +1,16 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.15/include/selinux/selinux.h
 --- nsalibselinux/include/selinux/selinux.h	2006-06-16 15:08:24.000000000 -0400
-+++ libselinux-1.30.15/include/selinux/selinux.h	2006-06-20 15:48:14.000000000 -0400
-@@ -429,8 +429,20 @@
++++ libselinux-1.30.15/include/selinux/selinux.h	2006-06-21 15:26:36.000000000 -0400
+@@ -429,8 +429,19 @@
     Caller must free the returned strings via free. */
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
  
-+/* This function allows you to compare two security context, it will ignore the 
-+user component */
-+int selinux_context_cmp(const security_context_t a, const security_context_t b);
++/* This function compares two file context, ignoring the user component */
++int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
 +
 +/* This function looks at the file context on disk and compares it to the 
-+system defaults, it returns 1 on match non 0 on failure */
-+int selinux_verify_file_context(const char *path, mode_t mode);
++system defaults, it returns 0 on match non 0 on failure */
++int selinux_file_context_verify(const char *path, mode_t mode);
 +
 +/* This function sets the file context on to the system defaults returns 0 on success */
 +int selinux_lsetfilecon_default(const char *path);
@@ -24,7 +23,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-1.30.15/man/man8/matchpathcon.8
 --- nsalibselinux/man/man8/matchpathcon.8	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.15/man/man8/matchpathcon.8	2006-06-20 10:56:07.000000000 -0400
++++ libselinux-1.30.15/man/man8/matchpathcon.8	2006-06-21 15:26:36.000000000 -0400
 @@ -3,13 +3,25 @@
  matchpathcon \- get the default security context for the specified path from the file contexts configuration.
  
@@ -56,8 +55,8 @@
  This manual page was written by Dan Walsh <dwalsh at redhat.com>.
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.30.15/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.15/src/matchpathcon.c	2006-06-21 14:31:19.000000000 -0400
-@@ -20,12 +20,16 @@
++++ libselinux-1.30.15/src/matchpathcon.c	2006-06-21 15:37:18.000000000 -0400
+@@ -20,10 +20,12 @@
  #endif
  default_printf(const char *fmt, ...) 
  {
@@ -69,58 +68,69 @@
 +#endif
  }
  
-+static unsigned int myflags;
-+
  static void 
- #ifdef __GNUC__
- __attribute__ ((format (printf, 1, 2)))
-@@ -50,7 +54,12 @@
+@@ -50,7 +52,7 @@
  static int default_canoncon(const char *path, unsigned lineno, char **context)
  {
  	char *tmpcon;
 -	if (security_canonicalize_context(*context, &tmpcon) < 0) {
-+	int rc;
-+	if (myflags & MATCHPATHCON_NOTRANS)
-+		rc = security_canonicalize_context_raw(*context, &tmpcon);
-+	else
-+		rc = security_canonicalize_context(*context, &tmpcon);
-+	if ( rc < 0) {
++	if (security_canonicalize_context_raw(*context, &tmpcon) < 0) {
  		if (errno == ENOENT)
  			return 0;
  		if (lineno)
-@@ -74,8 +83,6 @@
+@@ -74,7 +76,7 @@
  		mycanoncon = &default_canoncon;
  }
  
 -static unsigned int myflags;
--
++static __thread unsigned int myflags;
+ 
  void set_matchpathcon_flags(unsigned int flags)
  {
- 	myflags = flags;
-@@ -580,7 +587,6 @@
- 				spec_arr[nspec].context_valid = 1;
- 			}
- 		}
--
- 		spec_arr[nspec].context = context;
+@@ -552,21 +554,6 @@
  		
- 		/* Determine if specification has 
-@@ -797,7 +803,6 @@
- 		errno = ENOENT;
- 		return -1;
- 	}
+ 	skip_type:
+ 		if (strcmp(context, "<<none>>")) {
+-			char *tmpcon = NULL;
+-
+-			if (myflags & MATCHPATHCON_NOTRANS)
+-				goto skip_trans;
 -
- 	spec_arr[i].matches++;
+-			if (selinux_raw_to_trans_context(context, &tmpcon)) {
+-				myprintf("%s: line %u has invalid "
+-					 "context %s\n",
+-					 path, lineno, context);
+-				return 0;
+-			}
+-			free(context);
+-			context = tmpcon;
+-
+-skip_trans:
+ 			if (myflags & MATCHPATHCON_VALIDATE) {
+ 				if (myinvalidcon) {
+ 					/* Old-style validation of context. */
+@@ -831,7 +818,12 @@
+ 		spec_arr[i].context_valid = 1;
+ 	}
+ 
+-	*con = strdup(spec_arr[i].context);
++	if (myflags & MATCHPATHCON_NOTRANS) {
++		*con = strdup(spec_arr[i].context);
++	} else {
++		if (selinux_raw_to_trans_context(spec_arr[i].context, con)) 
++			return -1;
++	}
+ 	if (!(*con))
+ 		return -1;
  
- 	return i;
-@@ -877,3 +882,73 @@
+@@ -877,3 +869,72 @@
  		}
  	}
  }
 +
 +/* Compare two contexts to see if their differences are "significant",
 + * or whether the only difference is in the user. */
-+int selinux_context_cmp(const security_context_t a, const security_context_t b)
++int selinux_file_context_cmp(const security_context_t a, const security_context_t b)
 +{
 +	char *rest_a, *rest_b; /* Rest of the context after the user */
 +	if (!a && !b) return 0;
@@ -134,16 +144,14 @@
 +	return  strcmp(rest_a, rest_b);
 +}
 +
-+int selinux_verify_file_context(const char *path, mode_t mode)
++int selinux_file_context_verify(const char *path, mode_t mode)
 +{
 + 	security_context_t con = NULL;
 + 	security_context_t fcontext = NULL;
++	unsigned int localflags=myflags;
 +	int rc=0;
 +
-+	if (myflags & MATCHPATHCON_NOTRANS) 
-+		rc = lgetfilecon_raw(path, &con);
-+	else 
-+		rc = lgetfilecon(path, &con);
++	rc = lgetfilecon_raw(path, &con);
 +	if (rc == -1) {
 +		if (errno != ENOTSUP)
 +			return 1;
@@ -151,14 +159,16 @@
 +			return 0;
 +	}
 +
++	set_matchpathcon_flags(myflags | MATCHPATHCON_NOTRANS);
 +	if (matchpathcon(path,mode,&fcontext) != 0)  {
-+		if (fcontext == NULL && errno != ENOENT) 
++		if (errno != ENOENT) 
 +			rc = 1;
 +		else
 +			rc = 0;
 +	} 
 +	else 
-+		rc = (selinux_context_cmp(fcontext, con) == 0);
++		rc = (selinux_file_context_cmp(fcontext, con) == 0);
++	set_matchpathcon_flags(localflags);
 +	freecon(con);
 +	freecon(fcontext); 
 +	return rc;
@@ -178,8 +188,7 @@
 +	/* If there's an error determining the context, or it has none, 
 +	   return to allow default context */
 +	if (matchpathcon(path, st.st_mode, &scontext)) {
-+		if (scontext == NULL && errno != ENOENT) 
-+			rc =0;
++		if (errno == ENOENT) rc = 0;
 +	} else 	{
 +		rc = lsetfilecon_raw(path, scontext);
 +		freecon(scontext);
@@ -189,7 +198,7 @@
 +}
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.15/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.15/utils/matchpathcon.c	2006-06-21 09:05:20.000000000 -0400
++++ libselinux-1.30.15/utils/matchpathcon.c	2006-06-21 15:26:36.000000000 -0400
 @@ -12,19 +12,44 @@
  	exit(1);
  }
@@ -252,7 +261,7 @@
 -		else
 -			printf("%s\n", buf);
 +		if (verify) {
-+			if (selinux_verify_file_context(argv[i], 0)) {
++			if (selinux_file_context_verify(argv[i], 0)) {
 +				printf("%s verified.\n", argv[i]);
 +			} else {
 +				security_context_t con;



From fedora-cvs-commits at redhat.com  Wed Jun 21 20:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 16:16:15 -0400
Subject: rpms/libselinux/devel libselinux.spec,1.207,1.208
Message-ID: <200606212016.k5LKGF6q002669@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2043

Modified Files:
	libselinux.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-5
- Yet another change to matchpathcon



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- libselinux.spec	21 Jun 2006 18:33:13 -0000	1.207
+++ libselinux.spec	21 Jun 2006 20:16:13 -0000	1.208
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.15
-Release: 4
+Release: 5
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -117,6 +117,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-5
+- Yet another change to matchpathcon
+
 * Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-4
 - Turn off error printing in library.  Need to compile with DEBUG to get it back
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 20:33:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 16:33:17 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.206,1.207
Message-ID: <200606212033.k5LKXHHY017223@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17186

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-4
- Don't use translations with matchpathcon


policycoreutils-rhat.patch:
 audit2allow/audit2allow.1 |    2 
 audit2allow/avc.py        |    2 
 po/hi.po                  |   33 +++---
 po/mr.po                  |   86 ++++++++++-------
 po/ms.po                  |  232 +++++++++++++++++++++++++++++-----------------
 restorecon/restorecon.c   |    3 
 restorecond/restorecond.c |    4 
 setfiles/setfiles.c       |    4 
 setsebool/setsebool.8     |    3 
 setsebool/setsebool.c     |    6 -
 10 files changed, 234 insertions(+), 141 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- policycoreutils-rhat.patch	21 Jun 2006 19:58:48 -0000	1.206
+++ policycoreutils-rhat.patch	21 Jun 2006 20:33:15 -0000	1.207
@@ -192,7 +192,6 @@
  
  #: ../newrole/newrole.c:481
  #, c-format
-3b
 +#, fuzzy
  msgid "Error: multiple roles specified\n"
 -msgstr ""



From fedora-cvs-commits at redhat.com  Wed Jun 21 20:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 16:33:41 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.14,
	1.15 selinux-policy.spec, 1.217, 1.218
Message-ID: <200606212033.k5LKXfHC017285@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17237

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.49-1
- Update to upstream


policy-20060608.patch:
 global_tunables               |    7 +
 modules/admin/consoletype.te  |    7 +
 modules/kernel/kernel.if      |   38 +++++++
 modules/services/pegasus.if   |   31 ++++++
 modules/services/pegasus.te   |    5 -
 modules/services/squid.te     |    2 
 modules/services/tftp.te      |    1 
 modules/system/hostname.te    |    5 -
 modules/system/init.if        |    7 -
 modules/system/selinuxutil.te |    2 
 modules/system/userdomain.if  |  201 ++++++++++++++++++++++++++----------------
 modules/system/userdomain.te  |   32 ++----
 12 files changed, 232 insertions(+), 106 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- policy-20060608.patch	21 Jun 2006 14:01:45 -0000	1.14
+++ policy-20060608.patch	21 Jun 2006 20:33:38 -0000	1.15
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.48/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/global_tunables	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/global_tunables	2006-06-21 10:00:37.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,46 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.48/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/bootloader.te	2006-06-20 17:26:29.000000000 -0400
-@@ -49,7 +49,7 @@
- #
- 
- allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
--allow bootloader_t self:process { sigkill sigstop signull signal };
-+allow bootloader_t self:process { sigkill sigstop signull signal execmem };
- allow bootloader_t self:fifo_file rw_file_perms;
- 
- allow bootloader_t bootloader_etc_t:file r_file_perms;
-@@ -111,6 +111,7 @@
- # for blkid.tab
- files_manage_etc_runtime_files(bootloader_t)
- files_etc_filetrans_etc_runtime(bootloader_t,file)
-+files_dontaudit_search_home(bootloader_t)
- 
- init_getattr_initctl(bootloader_t)
- init_use_script_ptys(bootloader_t)
-@@ -127,6 +128,8 @@
- 
- miscfiles_read_localization(bootloader_t)
- 
-+modutils_domtrans_insmod_uncond(bootloader_t)
-+
- seutil_read_bin_policy(bootloader_t)
- seutil_read_loadpolicy(bootloader_t)
- seutil_dontaudit_search_config(bootloader_t)
-@@ -207,3 +210,7 @@
- 	userdom_dontaudit_search_staff_home_dirs(bootloader_t)
- 	userdom_dontaudit_search_sysadm_home_dirs(bootloader_t)
- ')
-+
-+optional_policy(`
-+	kudzu_domtrans(bootloader_t)
-+')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.48/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-21 10:00:37.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -69,86 +32,9 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.48/policy/modules/admin/logwatch.te
---- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/logwatch.te	2006-06-20 17:26:29.000000000 -0400
-@@ -22,8 +22,7 @@
- #
- # Local policy
- #
--
--allow logwatch_t self:capability setgid;
-+allow logwatch_t self:capability { dac_override dac_read_search setgid };
- allow logwatch_t self:fifo_file rw_file_perms;
- allow logwatch_t self:unix_stream_socket create_stream_socket_perms;
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.48/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/netutils.te	2006-06-20 17:26:29.000000000 -0400
-@@ -54,6 +54,7 @@
- corenet_udp_sendrecv_all_ports(netutils_t)
- corenet_tcp_connect_all_ports(netutils_t)
- corenet_sendrecv_all_client_packets(netutils_t)
-+corenet_udp_bind_generic_node(netutils_t)
- 
- fs_getattr_xattr_fs(netutils_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.48/policy/modules/admin/prelink.fc
---- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/prelink.fc	2006-06-20 17:26:29.000000000 -0400
-@@ -3,6 +3,5 @@
- 
- /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
- 
--/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
--
- /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
-+/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.48/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/files.if	2006-06-20 17:26:29.000000000 -0400
-@@ -4379,3 +4379,23 @@
- 
- 	typeattribute $1 files_unconfined_type;
- ')
-+
-+########################################
-+## <summary>
-+##	Mount a filesystem on all files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`files_mounton_all_files',`
-+	gen_require(`
-+		attribute file_type, security_file_type;
-+	')
-+
-+	allow $1 { file_type -security_file_type }:dir mounton;
-+	allow $1 { file_type -security_file_type }:file mounton;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.48/policy/modules/kernel/filesystem.te
---- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-06-20 09:54:01.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/filesystem.te	2006-06-20 17:26:29.000000000 -0400
-@@ -48,6 +48,11 @@
- files_mountpoint(binfmt_misc_fs_t)
- genfscon binfmt_misc / gen_context(system_u:object_r:binfmt_misc_fs_t,s0)
- 
-+type ibmasmfs_t;
-+fs_type(ibmasmfs_t)
-+allow ibmasmfs_t self:filesystem associate;
-+genfscon ibmasmfs / gen_context(system_u:object_r:ibmasmfs_t,s0)
-+
- type capifs_t;
- fs_type(capifs_t)
- genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.48/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-21 10:00:37.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -191,457 +77,9 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.48/policy/modules/services/apache.fc
---- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.fc	2006-06-20 17:26:29.000000000 -0400
-@@ -78,3 +78,4 @@
- /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
- /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
- /usr/share/selinux-policy([^/]*)?/html(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
-+/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.48/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.if	2006-06-20 17:26:29.000000000 -0400
-@@ -15,6 +15,7 @@
- 	gen_require(`
- 		attribute httpdcontent;
- 		attribute httpd_exec_scripts;
-+		attribute httpd_script_exec_type;
- 		type httpd_t, httpd_suexec_t, httpd_log_t;
- 	')
- 	# allow write access to public file transfer
-@@ -35,7 +36,7 @@
- 	role system_r types httpd_$1_script_t;
- 
- 	# This type is used for executable scripts files
--	type httpd_$1_script_exec_t; # customizable;
-+	type httpd_$1_script_exec_t, httpd_script_exec_type; # customizable;
- 	corecmd_shell_entry_type(httpd_$1_script_t)
- 	domain_entry_file(httpd_$1_script_t,httpd_$1_script_exec_t)
- 
-@@ -464,12 +465,17 @@
- #
- interface(`apache_manage_all_content',`
- 	gen_require(`
--		attribute httpdcontent;
-+		attribute httpdcontent, httpd_script_exec_type;
- 	')
- 
- 	allow $1 httpdcontent:dir manage_dir_perms;
- 	allow $1 httpdcontent:file manage_file_perms;
- 	allow $1 httpdcontent:lnk_file create_lnk_perms;
-+
-+	allow $1 httpd_script_exec_type:dir manage_dir_perms;
-+	allow $1 httpd_script_exec_type:file manage_file_perms;
-+	allow $1 httpd_script_exec_type:lnk_file create_lnk_perms;
-+
- ')
- 
- ########################################
-@@ -515,6 +521,28 @@
- 
- ########################################
- ## <summary>
-+##	Allow the specified domain to manage
-+##	apache configuration files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`apache_manage_config',`
-+	gen_require(`
-+		type httpd_config_t;
-+	')
-+
-+	files_search_etc($1)
-+	allow $1 httpd_config_t:dir create_dir_perms;
-+	allow $1 httpd_config_t:file create_file_perms;
-+	allow $1 httpd_config_t:lnk_file { getattr read };
-+')
-+
-+########################################
-+## <summary>
- ##	Execute the Apache helper program with
- ##	a domain transition.
- ## </summary>
-@@ -594,6 +622,28 @@
- 
- ########################################
- ## <summary>
-+##	Allow the specified domain to manage
-+##	to apache log files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`apache_manage_log',`
-+	gen_require(`
-+		type httpd_log_t;
-+	')
-+
-+	logging_search_logs($1)
-+	allow $1 httpd_log_t:dir create_dir_perms;
-+	allow $1 httpd_log_t:file create_file_perms;
-+	allow $1 httpd_log_t:lnk_file { getattr read };
-+')
-+
-+########################################
-+## <summary>
- ##	Allow the specified domain to append
- ##	to apache log files.
- ## </summary>
-@@ -955,3 +1005,28 @@
- 	allow $2 httpd_$1_content_t:file r_file_perms;
- 	allow $2 httpd_$1_content_t:lnk_file { getattr read };
- ')
-+
-+
-+########################################
-+## <summary>
-+##	Execute a domain transition to run httpd_rotatelogs.
-+## </summary>
-+## <param name="domain">
-+## <summary>
-+##	Domain allowed to transition.
-+## </summary>
-+## </param>
-+#
-+interface(`apache_domtrans_rotatelogs',`
-+	gen_require(`
-+		type httpd_rotatelogs_t, httpd_rotatelogs_exec_t;
-+	')
-+
-+	domain_auto_trans($1,httpd_rotatelogs_exec_t,httpd_rotatelogs_t)
-+
-+	allow $1 httpd_rotatelogs_t:fd use;
-+	allow httpd_rotatelogs_t $1:fd use;
-+	allow httpd_rotatelogs_t $1:fifo_file rw_file_perms;
-+	allow httpd_rotatelogs_t $1:process sigchld;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.48/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-06-20 09:54:04.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/apache.te	2006-06-20 22:20:33.000000000 -0400
-@@ -25,6 +25,9 @@
- # domains that can exec all users scripts
- attribute httpd_exec_scripts;
- 
-+# attribute of all script files
-+attribute httpd_script_exec_type;
-+
- # user script domains
- attribute httpd_script_domains;
- 
-@@ -109,13 +112,10 @@
- type squirrelmail_spool_t;
- files_tmp_file(squirrelmail_spool_t)
- 
--# mod_jk2 creates /var/log/httpd/jk2.shm to communicate with tomcat
--# This is a bug but it still exists in FC2
--# cjp: probably can remove this
--ifdef(`distro_redhat',`
--	typealias httpd_log_t alias httpd_runtime_t;
--	dontaudit httpd_t httpd_runtime_t:file ioctl;
--')
-+type httpd_rotatelogs_t;
-+type httpd_rotatelogs_exec_t;
-+domain_type(httpd_rotatelogs_t)
-+init_daemon_domain(httpd_rotatelogs_t, httpd_rotatelogs_exec_t)
- 
- ifdef(`targeted_policy',`
- 	typealias httpd_sys_content_t alias httpd_user_content_t;
-@@ -293,6 +293,15 @@
- 	miscfiles_manage_public_files(httpd_t)
- ') 
- 
-+ifdef(`TODO', `
-+#
-+# We need optionals to be able to be within booleans to make this work
-+#
-+tunable_policy(`allow_httpd_mod_auth_pam',`
-+	auth_domtrans_chk_passwd(httpd_t)
-+')
-+')
-+
- tunable_policy(`httpd_can_network_connect',`
- 	corenet_tcp_connect_all_ports(httpd_t)
- ')
-@@ -600,6 +609,10 @@
- 	allow httpd_sys_script_t httpd_suexec_t:process sigchld;
- ')
- 
-+tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
-+	domain_auto_trans(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
-+')
-+
- tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
- 	fs_read_nfs_files(httpd_suexec_t)
- 	fs_read_nfs_symlinks(httpd_suexec_t)
-@@ -688,3 +701,29 @@
- optional_policy(`
- 	nscd_socket_use(httpd_unconfined_script_t)
- ')
-+
-+########################################
-+#
-+# httpd_rotatelogs local policy
-+#
-+# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.
-+
-+# Some common macros (you might be able to remove some)
-+files_read_etc_files(httpd_rotatelogs_t)
-+libs_use_ld_so(httpd_rotatelogs_t)
-+libs_use_shared_libs(httpd_rotatelogs_t)
-+miscfiles_read_localization(httpd_rotatelogs_t)
-+kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-+kernel_dontaudit_list_proc(httpd_rotatelogs_t)
-+kernel_dontaudit_read_proc_symlinks(httpd_rotatelogs_t)
-+term_dontaudit_use_generic_ptys(httpd_rotatelogs_t)
-+
-+allow httpd_rotatelogs_t httpd_log_t:dir rw_dir_perms;
-+allow httpd_rotatelogs_t httpd_log_t:file create_file_perms;
-+
-+#
-+# Should we add a boolean?
-+#
-+apache_domtrans_rotatelogs(httpd_sys_script_t)
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.48/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/automount.te	2006-06-20 17:26:29.000000000 -0400
-@@ -28,7 +28,7 @@
- # Local policy
- #
- 
--allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
-+allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override sys_admin };
- dontaudit automount_t self:capability sys_tty_config;
- allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
- allow automount_t self:fifo_file rw_file_perms;
-@@ -64,9 +64,20 @@
- kernel_read_system_state(automount_t)
- kernel_read_network_state(automount_t)
- kernel_list_proc(automount_t)
-+kernel_dontaudit_search_xen_state(automount_t)
- 
- files_search_boot(automount_t)
- 
-+#
-+# Automount is slowly adding all mount functionality internally
-+#
-+files_search_all(automount_t)
-+files_mounton_all_mountpoints(automount_t)
-+files_mount_all_file_type_fs(automount_t)
-+files_unmount_all_file_type_fs(automount_t)
-+fs_mount_all_fs(automount_t)
-+fs_unmount_all_fs(automount_t)
-+
- corecmd_exec_sbin(automount_t)
- corecmd_exec_bin(automount_t)
- corecmd_exec_shell(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.2.48/policy/modules/services/clamav.if
---- nsaserefpolicy/policy/modules/services/clamav.if	2006-05-17 10:54:31.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/clamav.if	2006-06-20 17:26:29.000000000 -0400
-@@ -84,3 +84,23 @@
- 	allow clamscan_t $1:process sigchld;
- ')
- 
-+
-+########################################
-+## <summary>
-+##	Search clamav Libraries dir
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`clamav_search_lib',`
-+	gen_require(`
-+		type clamd_var_lib_t;
-+	')
-+
-+	files_search_var_lib($1)
-+	allow $1 clamd_var_lib_t:dir search_dir_perms;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.48/policy/modules/services/cups.fc
---- nsaserefpolicy/policy/modules/services/cups.fc	2006-04-19 11:26:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/cups.fc	2006-06-20 17:26:29.000000000 -0400
-@@ -24,6 +24,7 @@
- 
- /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
- /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-+/usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
- /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
- /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
- /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.48/policy/modules/services/cups.if
---- nsaserefpolicy/policy/modules/services/cups.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/services/cups.if	2006-06-20 17:26:29.000000000 -0400
-@@ -40,7 +40,7 @@
- 
- 	files_search_pids($1)
- 	allow $1 cupsd_var_run_t:dir search;
--	allow $1 cupsd_var_run_t:sock_file write;
-+	allow $1 cupsd_var_run_t:sock_file { getattr write };
- 	allow $1 cupsd_t:unix_stream_socket connectto;
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.48/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-06-20 09:54:04.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/cups.te	2006-06-20 17:26:29.000000000 -0400
-@@ -313,6 +313,7 @@
- allow cupsd_config_t self:unix_stream_socket create_socket_perms;
- allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
- allow cupsd_config_t self:tcp_socket create_stream_socket_perms;
-+allow cupsd_config_t self:netlink_route_socket r_netlink_socket_perms;
- 
- allow cupsd_config_t cupsd_t:tcp_socket { connectto recvfrom };
- allow cupsd_t cupsd_config_t:tcp_socket { acceptfrom recvfrom };
-@@ -342,6 +343,7 @@
- allow cupsd_config_t cupsd_rw_etc_t:lnk_file create_lnk_perms;
- files_var_filetrans(cupsd_config_t,cupsd_rw_etc_t,file)
- 
-+cups_stream_connect(cupsd_config_t)
- allow cupsd_config_t cupsd_var_run_t:file { getattr read };
- 
- kernel_read_system_state(cupsd_config_t)
-@@ -357,6 +359,7 @@
- 
- dev_read_sysfs(cupsd_config_t)
- dev_read_urand(cupsd_config_t)
-+dev_read_rand(cupsd_config_t)
- 
- fs_getattr_all_fs(cupsd_config_t)
- fs_search_auto_mountpoints(cupsd_config_t)
-@@ -395,6 +398,9 @@
- userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
- userdom_dontaudit_search_sysadm_home_dirs(cupsd_config_t)
- 
-+allow cupsd_config_t cupsd_tmp_t:file create_file_perms;
-+files_tmp_filetrans(cupsd_config_t, cupsd_tmp_t, { file dir })
-+
- lpd_read_config(cupsd_config_t)
- 
- ifdef(`distro_redhat',`
-@@ -430,6 +436,7 @@
- 
- optional_policy(`
- 	hal_domtrans(cupsd_config_t)
-+	hal_read_tmp_files(cupsd_config_t)
- ')
- 
- optional_policy(`
-@@ -593,6 +600,7 @@
- dev_read_sysfs(hplip_t)
- dev_rw_printer(hplip_t)
- dev_read_urand(hplip_t)
-+dev_read_rand(hplip_t)
- dev_rw_generic_usb_dev(hplip_t)
- 
- fs_getattr_all_fs(hplip_t)
-@@ -646,6 +654,8 @@
- 	udev_read_db(hplip_t)
- ')
- 
-+term_use_generic_ptys(hplip_t)
-+
- ########################################
- #
- # PTAL local policy
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.48/policy/modules/services/hal.if
---- nsaserefpolicy/policy/modules/services/hal.if	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/services/hal.if	2006-06-20 17:26:29.000000000 -0400
-@@ -140,3 +140,23 @@
- 	files_search_pids($1)
- 	allow $1 hald_var_run_t:file rw_file_perms;
- ')
-+
-+
-+########################################
-+## <summary>
-+##	Read hald tmp files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`hal_read_tmp_files',`
-+	gen_require(`
-+		type hald_tmp_t;
-+	')
-+
-+	allow $1 hald_tmp_t:file r_file_perms;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.48/policy/modules/services/mta.te
---- nsaserefpolicy/policy/modules/services/mta.te	2006-06-06 22:21:54.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/mta.te	2006-06-20 17:26:29.000000000 -0400
-@@ -195,8 +195,3 @@
- 	')
- ')
- 
--ifdef(`TODO',`
--# for the start script to run make -C /etc/mail
--allow initrc_t etc_mail_t:dir rw_dir_perms;
--allow initrc_t etc_mail_t:file create_file_perms;
--')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.48/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/networkmanager.te	2006-06-20 17:26:29.000000000 -0400
-@@ -92,6 +92,7 @@
- logging_send_syslog_msg(NetworkManager_t)
- 
- miscfiles_read_localization(NetworkManager_t)
-+miscfiles_read_certs(NetworkManager_t)
- 
- modutils_domtrans_insmod(NetworkManager_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.48/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/ntp.te	2006-06-20 17:26:29.000000000 -0400
-@@ -62,6 +62,7 @@
- 
- kernel_read_kernel_sysctls(ntpd_t)
- kernel_read_system_state(ntpd_t)
-+kernel_read_network_state(ntpd_t)
- 
- corenet_non_ipsec_sendrecv(ntpd_t)
- corenet_tcp_sendrecv_all_if(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.2.48/policy/modules/services/openvpn.te
---- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/openvpn.te	2006-06-20 17:26:29.000000000 -0400
-@@ -44,6 +44,7 @@
- allow openvpn_t openvpn_var_run_t:file create_file_perms;
- files_pid_filetrans(openvpn_t, openvpn_var_run_t, file)
- 
-+kernel_read_kernel_sysctls(openvpn_t)
- kernel_read_net_sysctls(openvpn_t)
- kernel_read_network_state(openvpn_t)
- kernel_read_system_state(openvpn_t)
-@@ -81,6 +82,8 @@
- 
- sysnet_exec_ifconfig(openvpn_t)
- 
-+term_dontaudit_use_generic_ptys(openvpn_t)
-+
- optional_policy(`
- 	daemontools_service_domain(openvpn_t,openvpn_exec_t)
- ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.48/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-21 10:00:37.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -677,7 +115,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.48/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-21 10:00:37.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -694,76 +132,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.2.48/policy/modules/services/postfix.if
---- nsaserefpolicy/policy/modules/services/postfix.if	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/postfix.if	2006-06-20 22:05:45.000000000 -0400
-@@ -459,3 +459,30 @@
- 
- 	typeattribute $1 postfix_user_domtrans;
- ')
-+
-+
-+########################################
-+## <summary>
-+##	Execute the master postfix program in the
-+##	postfix_master domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`postfix_domtrans_smtp',`
-+	gen_require(`
-+		type postfix_smtp_t, postfix_smtp_exec_t;
-+	')
-+
-+	domain_auto_trans($1,postfix_smtp_exec_t,postfix_smtp_t)
-+
-+	allow $1 postfix_smtp_t:fd use;
-+	allow postfix_smtp_t $1:fd use;
-+	allow postfix_smtp_t $1:fifo_file rw_file_perms;
-+	allow postfix_smtp_t $1:process sigchld;
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.48/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/postfix.te	2006-06-20 17:26:29.000000000 -0400
-@@ -456,6 +456,7 @@
- ')
- 
- optional_policy(`
-+	cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t)
- 	cron_use_fds(postfix_postdrop_t)
- 	cron_rw_pipes(postfix_postdrop_t)
- 	cron_use_system_job_fds(postfix_postdrop_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.48/policy/modules/services/ppp.te
---- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/ppp.te	2006-06-20 17:26:29.000000000 -0400
-@@ -68,6 +68,7 @@
- allow pppd_t self:tcp_socket create_stream_socket_perms;
- allow pppd_t self:udp_socket { connect connected_socket_perms };
- allow pppd_t self:packet_socket create_socket_perms;
-+allow pppd_t self:process signal;
- 
- domain_auto_trans(pppd_t, pptp_exec_t, pptp_t)
- allow pppd_t pptp_t:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.48/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/procmail.te	2006-06-20 17:26:29.000000000 -0400
-@@ -78,6 +78,7 @@
- 
- optional_policy(`
- 	clamav_domtrans_clamscan(procmail_t)
-+	clamav_search_lib(procmail_t)
- ')
- 
- optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.2.48/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/squid.te	2006-06-21 09:56:26.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/squid.te	2006-06-21 10:00:37.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -777,7 +148,7 @@
  corenet_tcp_connect_http_port(squid_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.48/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-21 10:00:37.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -786,20 +157,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.48/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/authlogin.if	2006-06-20 17:26:29.000000000 -0400
-@@ -1292,6 +1292,7 @@
- 
- 	sysnet_dns_name_resolve($1)
- 	sysnet_use_ldap($1)
-+	miscfiles_read_certs($1)
- 
- 	optional_policy(`
- 		nis_use_ypbind($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.48/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-21 10:00:37.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -814,7 +174,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.48/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-21 10:00:37.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -829,32 +189,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.48/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/libraries.fc	2006-06-20 17:26:29.000000000 -0400
-@@ -121,7 +121,7 @@
- 
- /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/lib(64)?/xorg/modules/drivers/fglx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.48/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/mount.te	2006-06-20 17:26:29.000000000 -0400
-@@ -111,6 +111,7 @@
- 	tunable_policy(`allow_mount_anyfile',`
- 		auth_read_all_dirs_except_shadow(mount_t)
- 		auth_read_all_files_except_shadow(mount_t)
-+		files_mounton_all_files(mount_t)
- 	')
- ')
- 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.48/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-21 10:00:37.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -864,19 +201,9 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.48/policy/modules/system/unconfined.fc
---- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/unconfined.fc	2006-06-20 17:26:29.000000000 -0400
-@@ -7,4 +7,6 @@
- ifdef(`targeted_policy',`
- /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.48/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-20 09:54:08.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-20 22:00:25.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-21 10:00:37.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1218,7 +545,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.48/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-20 17:26:29.000000000 -0400
++++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-21 10:00:37.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1281,53 +608,3 @@
  	')
  
  	allow privhome home_root_t:dir { getattr search };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.48/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/xen.te	2006-06-20 17:26:29.000000000 -0400
-@@ -68,7 +68,8 @@
- # xend local policy
- #
- 
--allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config };
-+allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
-+
- allow xend_t self:process { signal sigkill };
- # internal communication is often done using fifo and unix sockets.
- allow xend_t self:fifo_file rw_file_perms;
-@@ -168,6 +169,8 @@
- 
- xen_stream_connect_xenstore(xend_t)
- 
-+netutils_domtrans(xend_t)
-+
- optional_policy(`
- 	consoletype_domtrans(xend_t)
- ')
-@@ -255,7 +258,8 @@
- # xm local policy
- #
- 
--allow xm_t self:capability { dac_override ipc_lock };
-+allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
-+
- # internal communication is often done using fifo and unix sockets.
- allow xm_t self:fifo_file { read write };
- allow xm_t self:unix_stream_socket create_stream_socket_perms;
-@@ -265,6 +269,9 @@
- allow xm_t xend_var_lib_t:file create_file_perms;
- files_search_var_lib(xm_t)
- 
-+allow xm_t xen_image_t:dir rw_dir_perms;
-+allow xm_t xen_image_t:file r_file_perms;
-+
- kernel_read_system_state(xm_t)
- kernel_read_kernel_sysctls(xm_t)
- kernel_read_xen_state(xm_t)
-@@ -284,6 +291,7 @@
- term_use_all_terms(xm_t)
- 
- init_rw_script_stream_sockets(xm_t)
-+init_use_fds(xm_t)
- 
- libs_use_ld_so(xm_t)
- libs_use_shared_libs(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- selinux-policy.spec	20 Jun 2006 21:17:11 -0000	1.217
+++ selinux-policy.spec	21 Jun 2006 20:33:38 -0000	1.218
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.48
+Version: 2.2.49
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -342,6 +342,9 @@
 %endif
 
 %changelog
+* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.49-1
+- Update to upstream
+
 * Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 20:34:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 16:34:22 -0400
Subject: rpms/kernel/devel linux-2.6-net-label_1_7.patch, NONE,
	1.1.2.1 linux-2.6-net-label_2_7.patch, NONE,
	1.1.2.1 linux-2.6-net-label_3_7.patch, NONE,
	1.1.2.1 linux-2.6-net-label_4_7.patch, NONE,
	1.1.2.1 linux-2.6-net-label_5_7.patch, NONE,
	1.1.2.1 linux-2.6-net-label_6_7.patch, NONE,
	1.1.2.1 linux-2.6-net-label_7_7.patch, NONE,
	1.1.2.1 netlink-eff_cap-lsm-framework.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2293.2.1, 1.2293.2.2
Message-ID: <200606212034.k5LKYMPn017362@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17158

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	linux-2.6-net-label_1_7.patch linux-2.6-net-label_2_7.patch 
	linux-2.6-net-label_3_7.patch linux-2.6-net-label_4_7.patch 
	linux-2.6-net-label_5_7.patch linux-2.6-net-label_6_7.patch 
	linux-2.6-net-label_7_7.patch 
	netlink-eff_cap-lsm-framework.patch 
Log Message:
lspp.38, new netlink fix from Darrel & netlabel patch from Paul



linux-2.6-net-label_1_7.patch:
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++++++++++
 Documentation/netlabel/introduction.txt                   |   52 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 7 files changed, 947 insertions(+)

--- NEW FILE linux-2.6-net-label_1_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:36 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:50 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0odH006650;
	Wed, 21 Jun 2006 16:00:50 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0ndC023927;
	Wed, 21 Jun 2006 16:00:49 -0400
Received: from atlrel6.hp.com (atlrel6.hp.com [156.153.255.205])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5LK0bUt011820;
	Wed, 21 Jun 2006 16:00:37 -0400
Received: from smtp2.fc.hp.com (smtp.fc.hp.com [15.11.136.114])
	by atlrel6.hp.com (Postfix) with ESMTP id 0874335930;
	Wed, 21 Jun 2006 16:00:31 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 477711DA49;
	Wed, 21 Jun 2006 20:00:31 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0UZa012087;
	Wed, 21 Jun 2006 16:00:30 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0U0h012086;
	Wed, 21 Jun 2006 16:00:30 -0400
Message-Id: <20060621200030.065937000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:36 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 1/7] NetLabel: documentation
Content-Disposition: inline; filename=netlabel-documentation
X-RedHat-Spam-Score: -99.236 
Content-Type: 
X-UID: 70794
X-Length: 42878

Documentation for the NetLabel system, this includes a basic overview of how
NetLabel works and how LSM developers can integrate it into their favorite
LSM.  Also, due to the difficulty of finding expired IETF drafts, I am
including the IETF CIPSO draft that is the basis of the NetLabel CIPSO
implementation.
---
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  791 ++++++++++++++
 Documentation/netlabel/introduction.txt                   |   52 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 7 files changed, 957 insertions(+)

Index: linux-2.6.17.i686-quilt/CREDITS
===================================================================
--- linux-2.6.17.i686-quilt.orig/CREDITS
+++ linux-2.6.17.i686-quilt/CREDITS
@@ -2383,6 +2383,13 @@ N: Thomas Molina
 E: tmolina at cablespeed.com
 D: bug fixes, documentation, minor hackery
 
+N: Paul Moore
+E: paul.moore at hp.com
+D: NetLabel author
+S: Hewlett-Packard
+S: 110 Spit Brook Road
+S: Nashua, NH 03062
+
 N: James Morris
 E: jmorris at namei.org
 W: http://namei.org/
Index: linux-2.6.17.i686-quilt/Documentation/00-INDEX
===================================================================
--- linux-2.6.17.i686-quilt.orig/Documentation/00-INDEX
+++ linux-2.6.17.i686-quilt/Documentation/00-INDEX
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/00-INDEX
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/00-INDEX
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/cipso_ipv4.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/cipso_ipv4.txt
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
+labeled networking and is used in many trusted operating systems.
+
+ * Outbound Packet Processing
+
+The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
+adding the CIPSO label to the socket.  This causes all packets leaving the
+system through the socket to have the CIPSO IP option applied.  The socket's
+CIPSO label can be changed at any point in time, however, it is recommended
+that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
+label by using the NetLabel security module API; if the NetLabel "domain" is
+configured to use CIPSO for packet labeling then a CIPSO IP option will be
+generated and attached to the socket.
+
+ * Inbound Packet Processing
+
+The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
+IP layer without any special handling required by the LSM.  However, in order
+to decode and translate the CIPSO label on the packet the LSM must use the
+NetLabel security module API to extract the security attributes of the packet.
+This is typically done at the socket layer using the 'socket_sock_rcv_skb()'
+LSM hook.
+
+ * Label Translation
+
+The CIPSO/IPv4 protocol engine contains a mechanism to translate CIPSO security
+attributes such as sensitivity level and category to values which are
+appropriate for the host.  These mappings are defined as part of a CIPSO
+Domain Of Interpretation (DOI) definition and are configured through the
+NetLabel user space communication layer.  Each DOI definition can have a
+different security attribute mapping table.
+
+ * Label Translation Cache
+
+The NetLabel system provides a framework for caching security attribute
+mappings from the network labels to the corresponding LSM identifiers.  The
+CIPSO/IPv4 protocol engine supports this caching mechanism.
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
@@ -0,0 +1,791 @@
+IETF CIPSO Working Group
+16 July, 1992
+
+
+
+                 COMMERCIAL IP SECURITY OPTION (CIPSO 2.2)
+
+
+
+1.    Status
+
+This Internet Draft provides the high level specification for a Commercial
+IP Security Option (CIPSO).  This draft reflects the version as approved by
+the CIPSO IETF Working Group.  Distribution of this memo is unlimited.
+
+This document is an Internet Draft.  Internet Drafts are working documents
+of the Internet Engineering Task Force (IETF), its Areas, and its Working
+Groups. Note that other groups may also distribute working documents as
+Internet Drafts.
+
+Internet Drafts are draft documents valid for a maximum of six months.
+Internet Drafts may be updated, replaced, or obsoleted by other documents
+at any time.  It is not appropriate to use Internet Drafts as reference
+material or to cite them other than as a "working draft" or "work in
+progress."
+
+Please check the I-D abstract listing contained in each Internet Draft
+directory to learn the current status of this or any other Internet Draft.
+
+
+
+
+2.    Background
+
+Currently the Internet Protocol includes two security options.  One of
+these options is the DoD Basic Security Option (BSO) (Type 130) which allows
+IP datagrams to be labeled with security classifications.  This option
+provides sixteen security classifications and a variable number of handling
+restrictions.  To handle additional security information, such as security
+categories or compartments, another security option (Type 133) exists and
+is referred to as the DoD Extended Security Option (ESO).  The values for
+the fixed fields within these two options are administered by the Defense
+Information Systems Agency (DISA).
+
+Computer vendors are now building commercial operating systems with
+mandatory access controls and multi-level security.  These systems are
+no longer built specifically for a particular group in the defense or
+intelligence communities.  They are generally available commercial systems
+for use in a variety of government and civil sector environments.
+
+The small number of ESO format codes can not support all the possible
+applications of a commercial security option.  The BSO and ESO were
+designed to only support the United States DoD.  CIPSO has been designed
+to support multiple security policies.  This Internet Draft provides the
+format and procedures required to support a Mandatory Access Control
+security policy.  Support for additional security policies shall be
+defined in future RFCs.
+
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 1]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+
+3.    CIPSO Format
+
+Option type: 134 (Class 0, Number 6, Copy on Fragmentation)
+Option length: Variable
+
+This option permits security related information to be passed between
+systems within a single Domain of Interpretation (DOI).  A DOI is a
+collection of systems which agree on the meaning of particular values
+in the security option.  An authority that has been assigned a DOI
+identifier will define a mapping between appropriate CIPSO field values
+and their human readable equivalent.  This authority will distribute that
+mapping to hosts within the authority's domain.  These mappings may be
+sensitive, therefore a DOI authority is not required to make these
+mappings available to anyone other than the systems that are included in
+the DOI.
+
+This option MUST be copied on fragmentation.  This option appears at most
+once in a datagram.  All multi-octet fields in the option are defined to be
+transmitted in network byte order.  The format of this option is as follows:
+
++----------+----------+------//------+-----------//---------+
+| 10000110 | LLLLLLLL | DDDDDDDDDDDD | TTTTTTTTTTTTTTTTTTTT |
++----------+----------+------//------+-----------//---------+
+
+  TYPE=134    OPTION    DOMAIN OF               TAGS
+              LENGTH    INTERPRETATION
+
+
+                Figure 1. CIPSO Format
+
+
+3.1    Type
+
+This field is 1 octet in length.  Its value is 134.
+
+
+3.2    Length
+
+This field is 1 octet in length.  It is the total length of the option
+including the type and length fields.  With the current IP header length
+restriction of 40 octets the value of this field MUST not exceed 40.
+
+
+3.3    Domain of Interpretation Identifier
+
+This field is an unsigned 32 bit integer.  The value 0 is reserved and MUST
+not appear as the DOI identifier in any CIPSO option.  Implementations
+should assume that the DOI identifier field is not aligned on any particular
+byte boundary.
+
+To conserve space in the protocol, security levels and categories are
+represented by numbers rather than their ASCII equivalent.  This requires
+a mapping table within CIPSO hosts to map these numbers to their
+corresponding ASCII representations.  Non-related groups of systems may
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 2]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+have their own unique mappings.  For example, one group of systems may
+use the number 5 to represent Unclassified while another group may use the
+number 1 to represent that same security level.  The DOI identifier is used
+to identify which mapping was used for the values within the option.
+
+
+3.4    Tag Types
+
+A common format for passing security related information is necessary
+for interoperability.  CIPSO uses sets of "tags" to contain the security
+information relevant to the data in the IP packet.  Each tag begins with
+a tag type identifier followed by the length of the tag and ends with the
+actual security information to be passed.  All multi-octet fields in a tag
+are defined to be transmitted in network byte order.  Like the DOI
+identifier field in the CIPSO header, implementations should assume that
+all tags, as well as fields within a tag, are not aligned on any particular
+octet boundary.   The tag types defined in this document contain alignment
+bytes to assist alignment of some information, however alignment can not
+be guaranteed if CIPSO is not the first IP option.
+
+CIPSO tag types 0 through 127 are reserved for defining standard tag
+formats.  Their definitions will be published in RFCs.  Tag types whose
+identifiers are greater than 127 are defined by the DOI authority and may
+only be meaningful in certain Domains of Interpretation.  For these tag
+types, implementations will require the DOI identifier as well as the tag
+number to determine the security policy and the format associated with the
+tag.  Use of tag types above 127 are restricted to closed networks where
+interoperability with other networks will not be an issue.  Implementations
+that support a tag type greater than 127 MUST support at least one DOI that
+requires only tag types 1 to 127.
+
+Tag type 0 is reserved. Tag types 1, 2, and 5 are defined in this
+Internet Draft.  Types 3 and 4 are reserved for work in progress.
+The standard format for all current and future CIPSO tags is shown below:
+
++----------+----------+--------//--------+
+| TTTTTTTT | LLLLLLLL | IIIIIIIIIIIIIIII |
++----------+----------+--------//--------+
+    TAG       TAG         TAG
+    TYPE      LENGTH      INFORMATION
+
+    Figure 2:  Standard Tag Format
+
+In the three tag types described in this document, the length and count
+restrictions are based on the current IP limitation of 40 octets for all
+IP options.  If the IP header is later expanded, then the length and count
+restrictions specified in this document may increase to use the full area
+provided for IP options.
+
+
+3.4.1    Tag Type Classes
+
+Tag classes consist of tag types that have common processing requirements
+and support the same security policy.  The three tags defined in this
+Internet Draft belong to the Mandatory Access Control (MAC) Sensitivity
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 3]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+class and support the MAC Sensitivity security policy.
+
+
+3.4.2    Tag Type 1
+
+This is referred to as the "bit-mapped" tag type.  Tag type 1 is included
+in the MAC Sensitivity tag type class.  The format of this tag type is as
+follows:
+
++----------+----------+----------+----------+--------//---------+
+| 00000001 | LLLLLLLL | 00000000 | LLLLLLLL | CCCCCCCCCCCCCCCCC |
++----------+----------+----------+----------+--------//---------+
+
+    TAG       TAG      ALIGNMENT  SENSITIVITY    BIT MAP OF
+    TYPE      LENGTH   OCTET      LEVEL          CATEGORIES
+
+            Figure 3. Tag Type 1 Format
+
+
+3.4.2.1    Tag Type
+
+This field is 1 octet in length and has a value of 1.
+
+
+3.4.2.2    Tag Length
+
+This field is 1 octet in length.  It is the total length of the tag type
+including the type and length fields.  With the current IP header length
+restriction of 40 bytes the value within this field is between 4 and 34.
+
+
+3.4.2.3    Alignment Octet
+
+This field is 1 octet in length and always has the value of 0.  Its purpose
+is to align the category bitmap field on an even octet boundary.  This will
+speed many implementations including router implementations.
+
+
+3.4.2.4    Sensitivity Level
+
+This field is 1 octet in length.  Its value is from 0 to 255.  The values
+are ordered with 0 being the minimum value and 255 representing the maximum
+value.
+
+
+3.4.2.5    Bit Map of Categories
+
+The length of this field is variable and ranges from 0 to 30 octets.  This
+provides representation of categories 0 to 239.  The ordering of the bits
+is left to right or MSB to LSB.  For example category 0 is represented by
+the most significant bit of the first byte and category 15 is represented
+by the least significant bit of the second byte.  Figure 4 graphically
+shows this ordering.  Bit N is binary 1 if category N is part of the label
+for the datagram, and bit N is binary 0 if category N is not part of the
+label.  Except for the optimized tag 1 format described in the next section,
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 4]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+minimal encoding SHOULD be used resulting in no trailing zero octets in the
+category bitmap.
+
+        octet 0  octet 1  octet 2  octet 3  octet 4  octet 5
+        XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX . . .
+bit     01234567 89111111 11112222 22222233 33333333 44444444
+number             012345 67890123 45678901 23456789 01234567
+
+            Figure 4. Ordering of Bits in Tag 1 Bit Map
+
+
+3.4.2.6    Optimized Tag 1 Format
+
+Routers work most efficiently when processing fixed length fields.  To
+support these routers there is an optimized form of tag type 1.  The format
+does not change.  The only change is to the category bitmap which is set to
+a constant length of 10 octets.  Trailing octets required to fill out the 10
+octets are zero filled.  Ten octets, allowing for 80 categories, was chosen
+because it makes the total length of the CIPSO option 20 octets.  If CIPSO
+is the only option then the option will be full word aligned and additional
+filler octets will not be required.
+
+
+3.4.3    Tag Type 2
+
+This is referred to as the "enumerated" tag type.  It is used to describe
+large but sparsely populated sets of categories.  Tag type 2 is in the MAC
+Sensitivity tag type class.  The format of this tag type is as follows:
+
++----------+----------+----------+----------+-------------//-------------+
+| 00000010 | LLLLLLLL | 00000000 | LLLLLLLL | CCCCCCCCCCCCCCCCCCCCCCCCCC |
++----------+----------+----------+----------+-------------//-------------+
+
+    TAG       TAG      ALIGNMENT  SENSITIVITY         ENUMERATED
+    TYPE      LENGTH   OCTET      LEVEL               CATEGORIES
+
+                Figure 5. Tag Type 2 Format
+
+
+3.4.3.1     Tag Type
+
+This field is one octet in length and has a value of 2.
+
+
+3.4.3.2    Tag Length
+
+This field is 1 octet in length. It is the total length of the tag type
+including the type and length fields.  With the current IP header length
+restriction of 40 bytes the value within this field is between 4 and 34.
+
+
+3.4.3.3    Alignment Octet
+
+This field is 1 octet in length and always has the value of 0.  Its purpose
+is to align the category field on an even octet boundary.  This will
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 5]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+speed many implementations including router implementations.
+
+
+3.4.3.4    Sensitivity Level
+
+This field is 1 octet in length. Its value is from 0 to 255.  The values
+are ordered with 0 being the minimum value and 255 representing the
+maximum value.
+
+
+3.4.3.5    Enumerated Categories
+
+In this tag, categories are represented by their actual value rather than
+by their position within a bit field.  The length of each category is 2
+octets.  Up to 15 categories may be represented by this tag.  Valid values
+for categories are 0 to 65534.  Category 65535 is not a valid category
+value.  The categories MUST be listed in ascending order within the tag.
+
+
+3.4.4    Tag Type 5
+
+This is referred to as the "range" tag type.  It is used to represent
+labels where all categories in a range, or set of ranges, are included
+in the sensitivity label.  Tag type 5 is in the MAC Sensitivity tag type
+class.  The format of this tag type is as follows:
+
++----------+----------+----------+----------+------------//-------------+
+| 00000101 | LLLLLLLL | 00000000 | LLLLLLLL |  Top/Bottom | Top/Bottom  |
++----------+----------+----------+----------+------------//-------------+
+
+    TAG       TAG      ALIGNMENT  SENSITIVITY        CATEGORY RANGES
+    TYPE      LENGTH   OCTET      LEVEL
+
+                     Figure 6. Tag Type 5 Format
+
+
+3.4.4.1     Tag Type
+
+This field is one octet in length and has a value of 5.
+
+
+3.4.4.2    Tag Length
+
+This field is 1 octet in length. It is the total length of the tag type
+including the type and length fields.  With the current IP header length
+restriction of 40 bytes the value within this field is between 4 and 34.
+
+
+3.4.4.3    Alignment Octet
+
+This field is 1 octet in length and always has the value of 0.  Its purpose
+is to align the category range field on an even octet boundary.  This will
+speed many implementations including router implementations.
+
+
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 6]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+3.4.4.4    Sensitivity Level
+
+This field is 1 octet in length. Its value is from 0 to 255.  The values
+are ordered with 0 being the minimum value and 255 representing the maximum
+value.
+
+
+3.4.4.5    Category Ranges
+
+A category range is a 4 octet field comprised of the 2 octet index of the
+highest numbered category followed by the 2 octet index of the lowest
+numbered category.  These range endpoints are inclusive within the range of
+categories.  All categories within a range are included in the sensitivity
+label.  This tag may contain a maximum of 7 category pairs.  The bottom
+category endpoint for the last pair in the tag MAY be omitted and SHOULD be
+assumed to be 0.  The ranges MUST be non-overlapping and be listed in
+descending order.  Valid values for categories are 0 to 65534.  Category
+65535 is not a valid category value.
+
+
+3.4.5     Minimum Requirements
+
+A CIPSO implementation MUST be capable of generating at least tag type 1 in
+the non-optimized form.  In addition, a CIPSO implementation MUST be able
+to receive any valid tag type 1 even those using the optimized tag type 1
+format.
+
+
+4.    Configuration Parameters
+
+The configuration parameters defined below are required for all CIPSO hosts,
+gateways, and routers that support multiple sensitivity labels.  A CIPSO
+host is defined to be the origination or destination system for an IP
+datagram.  A CIPSO gateway provides IP routing services between two or more
+IP networks and may be required to perform label translations between
+networks.  A CIPSO gateway may be an enhanced CIPSO host or it may just
+provide gateway services with no end system CIPSO capabilities.  A CIPSO
+router is a dedicated IP router that routes IP datagrams between two or more
+IP networks.
+
+An implementation of CIPSO on a host MUST have the capability to reject a
+datagram for reasons that the information contained can not be adequately
+protected by the receiving host or if acceptance may result in violation of
+the host or network security policy.  In addition, a CIPSO gateway or router
+MUST be able to reject datagrams going to networks that can not provide
+adequate protection or may violate the network's security policy.  To
+provide this capability the following minimal set of configuration
+parameters are required for CIPSO implementations:
+
+HOST_LABEL_MAX - This parameter contains the maximum sensitivity label that
+a CIPSO host is authorized to handle.  All datagrams that have a label
+greater than this maximum MUST be rejected by the CIPSO host.  This
+parameter does not apply to CIPSO gateways or routers.  This parameter need
+not be defined explicitly as it can be implicitly derived from the
+PORT_LABEL_MAX parameters for the associated interfaces.
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 7]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+
+HOST_LABEL_MIN - This parameter contains the minimum sensitivity label that
+a CIPSO host is authorized to handle.  All datagrams that have a label less
+than this minimum MUST be rejected by the CIPSO host.  This parameter does
+not apply to CIPSO gateways or routers.  This parameter need not be defined
+explicitly as it can be implicitly derived from the PORT_LABEL_MIN
+parameters for the associated interfaces.
+
+PORT_LABEL_MAX - This parameter contains the maximum sensitivity label for
+all datagrams that may exit a particular network interface port.  All
+outgoing datagrams that have a label greater than this maximum MUST be
+rejected by the CIPSO system.  The label within this parameter MUST be
+less than or equal to the label within the HOST_LABEL_MAX parameter.  This
+parameter does not apply to CIPSO hosts that support only one network port.
+
+PORT_LABEL_MIN - This parameter contains the minimum sensitivity label for
+all datagrams that may exit a particular network interface port.  All
+outgoing datagrams that have a label less than this minimum MUST be
+rejected by the CIPSO system.  The label within this parameter MUST be
+greater than or equal to the label within the HOST_LABEL_MIN parameter.
+This parameter does not apply to CIPSO hosts that support only one network
+port.
+
+PORT_DOI - This parameter is used to assign a DOI identifier value to a
+particular network interface port.  All CIPSO labels within datagrams
+going out this port MUST use the specified DOI identifier.  All CIPSO
+hosts and gateways MUST support either this parameter, the NET_DOI
+parameter, or the HOST_DOI parameter.
+
+NET_DOI - This parameter is used to assign a DOI identifier value to a
+particular IP network address.  All CIPSO labels within datagrams destined
+for the particular IP network MUST use the specified DOI identifier.  All
+CIPSO hosts and gateways MUST support either this parameter, the PORT_DOI
+parameter, or the HOST_DOI parameter.
+
+HOST_DOI - This parameter is used to assign a DOI identifier value to a
+particular IP host address.  All CIPSO labels within datagrams destined for
+the particular IP host will use the specified DOI identifier.  All CIPSO
+hosts and gateways MUST support either this parameter, the PORT_DOI
+parameter, or the NET_DOI parameter.
+
+This list represents the minimal set of configuration parameters required
+to be compliant.  Implementors are encouraged to add to this list to
+provide enhanced functionality and control.  For example, many security
+policies may require both incoming and outgoing datagrams be checked against
+the port and host label ranges.
+
+
+4.1    Port Range Parameters
+
+The labels represented by the PORT_LABEL_MAX and PORT_LABEL_MIN parameters
+MAY be in CIPSO or local format.  Some CIPSO systems, such as routers, may
+want to have the range parameters expressed in CIPSO format so that incoming
+labels do not have to be converted to a local format before being compared
+against the range.  If multiple DOIs are supported by one of these CIPSO
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 8]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+systems then multiple port range parameters would be needed, one set for
+each DOI supported on a particular port.
+
+The port range will usually represent the total set of labels that may
+exist on the logical network accessed through the corresponding network
+interface.  It may, however, represent a subset of these labels that are
+allowed to enter the CIPSO system.
+
+
+4.2    Single Label CIPSO Hosts
+
+CIPSO implementations that support only one label are not required to
+support the parameters described above.  These limited implementations are
+only required to support a NET_LABEL parameter.  This parameter contains
+the CIPSO label that may be inserted in datagrams that exit the host.  In
+addition, the host MUST reject any incoming datagram that has a label which
+is not equivalent to the NET_LABEL parameter.
+
+
+5.    Handling Procedures
+
+This section describes the processing requirements for incoming and
+outgoing IP datagrams.  Just providing the correct CIPSO label format
+is not enough.  Assumptions will be made by one system on how a
+receiving system will handle the CIPSO label.  Wrong assumptions may
+lead to non-interoperability or even a security incident.  The
+requirements described below represent the minimal set needed for
+interoperability and that provide users some level of confidence.
+Many other requirements could be added to increase user confidence,
+however at the risk of restricting creativity and limiting vendor
+participation.
+
+
+5.1    Input Procedures
+
+All datagrams received through a network port MUST have a security label
+associated with them, either contained in the datagram or assigned to the
+receiving port.  Without this label the host, gateway, or router will not
+have the information it needs to make security decisions.  This security
+label will be obtained from the CIPSO if the option is present in the
+datagram.  See section 4.1.2 for handling procedures for unlabeled
+datagrams.  This label will be compared against the PORT (if appropriate)
+and HOST configuration parameters defined in section 3.
+
+If any field within the CIPSO option, such as the DOI identifier, is not
+recognized the IP datagram is discarded and an ICMP "parameter problem"
+(type 12) is generated and returned.  The ICMP code field is set to "bad
+parameter" (code 0) and the pointer is set to the start of the CIPSO field
+that is unrecognized.
+
+If the contents of the CIPSO are valid but the security label is
+outside of the configured host or port label range, the datagram is
+discarded and an ICMP "destination unreachable" (type 3) is generated
+and returned.  The code field of the ICMP is set to "communication with
+destination network administratively prohibited" (code 9) or to
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 9]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+"communication with destination host administratively prohibited"
+(code 10).  The value of the code field used is dependent upon whether
+the originator of the ICMP message is acting as a CIPSO host or a CIPSO
+gateway.  The recipient of the ICMP message MUST be able to handle either
+value.  The same procedure is performed if a CIPSO can not be added to an
+IP packet because it is too large to fit in the IP options area.
+
+If the error is triggered by receipt of an ICMP message, the message
+is discarded and no response is permitted (consistent with general ICMP
+processing rules).
+
+
+5.1.1    Unrecognized tag types
+
+The default condition for any CIPSO implementation is that an
+unrecognized tag type MUST be treated as a "parameter problem" and
+handled as described in section 4.1.  A CIPSO implementation MAY allow
+the system administrator to identify tag types that may safely be
+ignored.  This capability is an allowable enhancement, not a
+requirement.
+
+
+5.1.2    Unlabeled Packets
+
+A network port may be configured to not require a CIPSO label for all
+incoming  datagrams.  For this configuration a CIPSO label must be
+assigned to that network port and associated with all unlabeled IP
+datagrams.  This capability might be used for single level networks or
+networks that have CIPSO and non-CIPSO hosts and the non-CIPSO hosts
+all operate at the same label.
+
+If a CIPSO option is required and none is found, the datagram is
+discarded and an ICMP "parameter problem" (type 12) is generated and
+returned to the originator of the datagram.  The code field of the ICMP
+is set to "option missing" (code 1) and the ICMP pointer is set to 134
+(the value of the option type for the missing CIPSO option).
+
+
+5.2    Output Procedures
+
+A CIPSO option MUST appear only once in a datagram.  Only one tag type
+from the MAC Sensitivity class MAY be included in a CIPSO option.  Given
+the current set of defined tag types, this means that CIPSO labels at
+first will contain only one tag.
+
+All datagrams leaving a CIPSO system MUST meet the following condition:
+
+        PORT_LABEL_MIN <= CIPSO label <= PORT_LABEL_MAX
+
+If this condition is not satisfied the datagram MUST be discarded.
+If the CIPSO system only supports one port, the HOST_LABEL_MIN and the
+HOST_LABEL_MAX parameters MAY be substituted for the PORT parameters in
+the above condition.
+
+The DOI identifier to be used for all outgoing datagrams is configured by
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 10]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+the administrator.  If port level DOI identifier assignment is used, then
+the PORT_DOI configuration parameter MUST contain the DOI identifier to
+use.  If network level DOI assignment is used, then the NET_DOI parameter
+MUST contain the DOI identifier to use.  And if host level DOI assignment
+is employed, then the HOST_DOI parameter MUST contain the DOI identifier
+to use.  A CIPSO implementation need only support one level of DOI
+assignment.
+
+
+5.3    DOI Processing Requirements
+
+A CIPSO implementation MUST support at least one DOI and SHOULD support
+multiple DOIs.  System and network administrators are cautioned to
+ensure that at least one DOI is common within an IP network to allow for
+broadcasting of IP datagrams.
+
+CIPSO gateways MUST be capable of translating a CIPSO option from one
+DOI to another when forwarding datagrams between networks.  For
+efficiency purposes this capability is only a desired feature for CIPSO
+routers.
+
+
+5.4    Label of ICMP Messages
+
+The CIPSO label to be used on all outgoing ICMP messages MUST be equivalent
+to the label of the datagram that caused the ICMP message.  If the ICMP was
+generated due to a problem associated with the original CIPSO label then the
+following responses are allowed:
+
+  a.  Use the CIPSO label of the original IP datagram
+  b.  Drop the original datagram with no return message generated
+
+In most cases these options will have the same effect.  If you can not
+interpret the label or if it is outside the label range of your host or
+interface then an ICMP message with the same label will probably not be
+able to exit the system.
+
+
+6.    Assignment of DOI Identifier Numbers                                   =
+
+Requests for assignment of a DOI identifier number should be addressed to
+the Internet Assigned Numbers Authority (IANA).
+
+
+7.    Acknowledgements
+
+Much of the material in this RFC is based on (and copied from) work
+done by Gary Winiger of Sun Microsystems and published as Commercial
+IP Security Option at the INTEROP 89, Commercial IPSO Workshop.
+
+
+8.    Author's Address
+
+To submit mail for distribution to members of the IETF CIPSO Working
+Group, send mail to: cipso at wdl1.wdl.loral.com.
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 11]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+
+To be added to or deleted from this distribution, send mail to:
+cipso-request at wdl1.wdl.loral.com.
+
+
+9.    References
+
+RFC 1038, "Draft Revised IP Security Option", M. St. Johns, IETF, January
+1988.
+
+RFC 1108, "U.S. Department of Defense Security Options
+for the Internet Protocol", Stephen Kent, IAB, 1 March, 1991.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 12]
+
+
+
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/introduction.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/introduction.txt
@@ -0,0 +1,52 @@
+NetLabel Introduction
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+June 16, 2006
+
+ * Overview
+
+NetLabel is a mechanism which can be used by kernel security modules to attach
+security attributes to outgoing network packets generated from user space
+applications and read security attributes from incoming network packets.  It
+is composed of four main components, the protocol engines, the communication
+layer, the kernel security module API, and the network stack operations.
+
+ * Protocol Engines
+
+The protocol engines are responsible for both applying and retrieving the
+network packet's security attributes.  If any translation between the network
+security attributes and those on the host are required then the protocol
+engine will handle those tasks as well.  Other kernel subsystems should
+refrain from calling the protocol engines directly, instead they should use
+the NetLabel kernel security module API described below.
+
+Detailed information about each NetLabel protocol engine can be found in this
+directory, consult '00-INDEX' for filenames.
+
+ * Communication Layer
+
+The communication layer exists to allow NetLabel configuration and monitoring
+from user space.  The NetLabel communication layer uses a message based
+protocol built on top of the NETLINK transport mechanism.  The exact formatting
+of these NetLabel messages can be found in the the 'net/netlabel/' directory as
+comments in the header files.
+
+ * Security Module API
+
+The purpose of the NetLabel security module API is to provide a protocol
+independent interface to the underlying NetLabel protocol engines.  In addition
+to protocol independence, the security module API is designed to be completely
+LSM independent which should allow multiple LSMs to leverage the same code
+base.
+
+Detailed information about the NetLabel security module API can be found in the
+'include/net/netlabel.h' header file as well as the 'lsm_interface.txt' file
+found in this directory.
+
+ * Network Stack Operations
+
+The reason for the network stack operations are to ensure the correct handling
+of the security attributes for kernel generated packets.  In general only the
+core network stack should call these functions.
+
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/lsm_interface.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/lsm_interface.txt
@@ -0,0 +1,47 @@
+NetLabel Linux Security Module Interface
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+NetLabel is a mechanism which can set and retrieve security attributes from
+network packets.  It is intended to be used by LSM developers who want to make
+use of a common code base for several different packet labeling protocols.
+The NetLabel security module API is defined in 'include/net/netlabel.h' but a
+brief overview is given below.
+
+ * NetLabel Security Attributes
+
+Since NetLabel supports multiple different packet labeling protocols and LSMs
+it uses the concept of security attributes to refer to the packet's security
+labels.  The NetLabel security attributes are defined by the
+'netlbl_lsm_secattr' structure in the NetLabel header file.  Internally the
+NetLabel subsystem converts the security attributes to and from the correct
+low-level packet label depending on the NetLabel build time and run time
+configuration.  It is up to the LSM developer to translate the NetLabel
+security attributes into whatever security identifiers are in use for their
+particular LSM.
+
+ * NetLabel LSM Protocol Operations
+
+These are the functions which allow the LSM developer to manipulate the labels
+on outgoing packets as well as read the labels on incoming packets.  Functions
+exist to operate both on sockets as well as the sk_buffs directly.  These high
+level functions are translated into low level protocol operations based on how
+the administrator has configured the NetLabel subsystem.
+
+ * NetLabel Label Mapping Cache Operations
+
+Depending on the exact configuration, translation between the network packet
+label and the internal LSM security identifier can be time consuming.  The
+NetLabel label mapping cache is a caching mechanism which can be used to
+sidestep much of this overhead once a mapping has been established.  Once the
+LSM has received a packet, used NetLabel to decode it's security attributes,
+and translated the security attributes into a LSM internal identifier the LSM
+can use the NetLabel caching functions to associate the LSM internal
+identifier with the network packet's label.  This means that in the future
+when a incoming packet matches a cached value not only are the internal
+NetLabel translation mechanisms bypassed but the LSM translation mechanisms are
+bypassed as well which should result in a significant reduction in overhead.

--
paul moore
linux security @ hp


linux-2.6-net-label_2_7.patch:
 include/linux/ip.h       |    1 +
 include/linux/netlink.h  |    1 +
 include/linux/security.h |   16 ++++++++--------
 include/net/inet_sock.h  |    2 +-
 net/ipv4/Makefile        |    3 +++
 net/ipv4/af_inet.c       |    3 +++
 net/ipv4/ah4.c           |    2 +-
 net/ipv4/ip_options.c    |   19 +++++++++++++++++++
 net/socket.c             |   13 +++++++++++--
 security/dummy.c         |   12 ++++++------
 10 files changed, 54 insertions(+), 18 deletions(-)

--- NEW FILE linux-2.6-net-label_2_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:37 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:47 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0ldH006643;
	Wed, 21 Jun 2006 16:00:47 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0k8R023911;
	Wed, 21 Jun 2006 16:00:46 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5LK0eXF011834;
	Wed, 21 Jun 2006 16:00:40 -0400
Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
	by atlrel9.hp.com (Postfix) with ESMTP id 6A7BA34F94;
	Wed, 21 Jun 2006 16:00:32 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 05BF91DA48;
	Wed, 21 Jun 2006 20:00:31 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0Vx7012116;
	Wed, 21 Jun 2006 16:00:31 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0V0U012115;
	Wed, 21 Jun 2006 16:00:31 -0400
Message-Id: <20060621200030.880930000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:37 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 2/7] NetLabel: core network changes
Content-Disposition: inline; filename=netlabel-net_core-2.6.17
X-RedHat-Spam-Score: -99.822 
Content-Type: 
X-UID: 70792
X-Length: 10888

Changes to the core network stack to support the NetLabel subsystem.  This
includes changes to support the NetLabel NETLINK communication mechanism,
changes to the IPv4 option handling to support CIPSO labels, minor changes
to the socket_post_create() LSM hook so that it can return error codes, and
a new NetLabel hook in inet_accept() to handle NetLabel attributes across
an accept().
---
 include/linux/ip.h       |    1 +
 include/linux/netlink.h  |    1 +
 include/linux/security.h |   16 ++++++++--------
 include/net/inet_sock.h  |    2 +-
 net/ipv4/Makefile        |    3 +++
 net/ipv4/af_inet.c       |    3 +++
 net/ipv4/ah4.c           |    2 +-
 net/ipv4/ip_options.c    |   19 +++++++++++++++++++
 net/socket.c             |   13 +++++++++++--
 security/dummy.c         |   12 ++++++------
 10 files changed, 54 insertions(+), 18 deletions(-)

Index: linux-2.6.17.i686-quilt/include/linux/ip.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/linux/ip.h
+++ linux-2.6.17.i686-quilt/include/linux/ip.h
@@ -57,6 +57,7 @@
 #define IPOPT_SEC	(2 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_LSRR	(3 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_TIMESTAMP	(4 |IPOPT_MEASUREMENT)
+#define IPOPT_CIPSO	(6 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_RR	(7 |IPOPT_CONTROL)
 #define IPOPT_SID	(8 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_SSRR	(9 |IPOPT_CONTROL|IPOPT_COPY)
Index: linux-2.6.17.i686-quilt/include/linux/netlink.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/linux/netlink.h
+++ linux-2.6.17.i686-quilt/include/linux/netlink.h
@@ -21,6 +21,7 @@
 #define NETLINK_DNRTMSG		14	/* DECnet routing messages */
 #define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */
 #define NETLINK_GENERIC		16
+#define NETLINK_NETLABEL	17	/* Network packet labeling */
 
 #define MAX_LINKS 32		
 
Index: linux-2.6.17.i686-quilt/include/linux/security.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/linux/security.h
+++ linux-2.6.17.i686-quilt/include/linux/security.h
@@ -1267,8 +1267,8 @@ struct security_operations {
 	int (*unix_may_send) (struct socket * sock, struct socket * other);
 
 	int (*socket_create) (int family, int type, int protocol, int kern);
-	void (*socket_post_create) (struct socket * sock, int family,
-				    int type, int protocol, int kern);
+	int (*socket_post_create) (struct socket * sock, int family,
+				   int type, int protocol, int kern);
 	int (*socket_bind) (struct socket * sock,
 			    struct sockaddr * address, int addrlen);
 	int (*socket_connect) (struct socket * sock,
@@ -2677,13 +2677,13 @@ static inline int security_socket_create
 	return security_ops->socket_create(family, type, protocol, kern);
 }
 
-static inline void security_socket_post_create(struct socket * sock, 
-					       int family,
-					       int type, 
-					       int protocol, int kern)
+static inline int security_socket_post_create(struct socket * sock,
+					      int family,
+					      int type,
+					      int protocol, int kern)
 {
-	security_ops->socket_post_create(sock, family, type,
-					 protocol, kern);
+	return security_ops->socket_post_create(sock, family, type,
+						protocol, kern);
 }
 
 static inline int security_socket_bind(struct socket * sock, 
Index: linux-2.6.17.i686-quilt/include/net/inet_sock.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/net/inet_sock.h
+++ linux-2.6.17.i686-quilt/include/net/inet_sock.h
@@ -52,7 +52,7 @@ struct ip_options {
 			ts_needtime:1,
 			ts_needaddr:1;
 	unsigned char	router_alert;
-	unsigned char	__pad1;
+	unsigned char	cipso;
 	unsigned char	__pad2;
 	unsigned char	__data[0];
 };
Index: linux-2.6.17.i686-quilt/net/ipv4/Makefile
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/Makefile
+++ linux-2.6.17.i686-quilt/net/ipv4/Makefile
@@ -42,6 +42,9 @@ obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybl
 obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
 obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
 obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
+ifeq ($(CONFIG_NETLABEL_CIPSOV4),y)
+obj-y += cipso_ipv4.o
+endif
 
 obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
 		      xfrm4_output.o
Index: linux-2.6.17.i686-quilt/net/ipv4/af_inet.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/af_inet.c
+++ linux-2.6.17.i686-quilt/net/ipv4/af_inet.c
@@ -114,6 +114,7 @@
 #ifdef CONFIG_IP_MROUTE
 #include <linux/mroute.h>
 #endif
+#include <net/netlabel.h>
 
 DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
 
@@ -616,6 +617,8 @@ int inet_accept(struct socket *sock, str
 
 	sock_graft(sk2, newsock);
 
+	netlbl_socket_inet_accept(sock, newsock);
+
 	newsock->state = SS_CONNECTED;
 	err = 0;
 	release_sock(sk2);
Index: linux-2.6.17.i686-quilt/net/ipv4/ah4.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/ah4.c
+++ linux-2.6.17.i686-quilt/net/ipv4/ah4.c
@@ -35,7 +35,7 @@ static int ip_clear_mutable_options(stru
 		switch (*optptr) {
 		case IPOPT_SEC:
 		case 0x85:	/* Some "Extended Security" crap. */
-		case 0x86:	/* Another "Commercial Security" crap. */
+		case IPOPT_CIPSO:
 		case IPOPT_RA:
 		case 0x80|21:	/* RFC1770 */
 			break;
Index: linux-2.6.17.i686-quilt/net/ipv4/ip_options.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/ip_options.c
+++ linux-2.6.17.i686-quilt/net/ipv4/ip_options.c
@@ -24,6 +24,7 @@
 #include <net/ip.h>
 #include <net/icmp.h>
 #include <net/route.h>
+#include <net/cipso_ipv4.h>
 
 /* 
  * Write options to IP header, record destination address to
@@ -194,6 +195,13 @@ int ip_options_echo(struct ip_options * 
 			dopt->is_strictroute = sopt->is_strictroute;
 		}
 	}
+	if (sopt->cipso) {
+		optlen  = sptr[sopt->cipso+1];
+		dopt->cipso = dopt->optlen+sizeof(struct iphdr);
+		memcpy(dptr, sptr+sopt->cipso, optlen);
+		dptr += optlen;
+		dopt->optlen += optlen;
+	}
 	while (dopt->optlen & 3) {
 		*dptr++ = IPOPT_END;
 		dopt->optlen++;
@@ -435,6 +443,17 @@ int ip_options_compile(struct ip_options
 			if (optptr[2] == 0 && optptr[3] == 0)
 				opt->router_alert = optptr - iph;
 			break;
+		      case IPOPT_CIPSO:
+		        if (opt->cipso) {
+				pp_ptr = optptr;
+				goto error;
+			}
+			opt->cipso = optptr - iph;
+		        if (cipso_v4_validate(&optptr)) {
+				pp_ptr = optptr;
+				goto error;
+			}
+			break;
 		      case IPOPT_SEC:
 		      case IPOPT_SID:
 		      default:
Index: linux-2.6.17.i686-quilt/net/socket.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/socket.c
+++ linux-2.6.17.i686-quilt/net/socket.c
@@ -976,11 +976,18 @@ int sock_create_lite(int family, int typ
 		goto out;
 	}
 
-	security_socket_post_create(sock, family, type, protocol, 1);
 	sock->type = type;
+	err = security_socket_post_create(sock, family, type, protocol, 1);
+	if (err)
+		goto out_release;
+
 out:
 	*res = sock;
 	return err;
+out_release:
+	sock_release(sock);
+	sock = NULL;
+	goto out;
 }
 
 /* No kernel lock held - perfect */
@@ -1218,7 +1225,9 @@ static int __sock_create(int family, int
 	 */
 	module_put(net_families[family]->owner);
 	*res = sock;
-	security_socket_post_create(sock, family, type, protocol, kern);
+	err = security_socket_post_create(sock, family, type, protocol, kern);
+	if (err)
+		goto out_release;
 
 out:
 	net_family_read_unlock();
Index: linux-2.6.17.i686-quilt/security/dummy.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/dummy.c
+++ linux-2.6.17.i686-quilt/security/dummy.c
@@ -692,10 +692,10 @@ static int dummy_socket_create (int fami
 	return 0;
 }
 
-static void dummy_socket_post_create (struct socket *sock, int family, int type,
-				      int protocol, int kern)
+static int dummy_socket_post_create (struct socket *sock, int family, int type,
+				     int protocol, int kern)
 {
-	return;
+	return 0;
 }
 
 static int dummy_socket_bind (struct socket *sock, struct sockaddr *address,
@@ -720,10 +720,10 @@ static int dummy_socket_accept (struct s
 	return 0;
 }
 
-static void dummy_socket_post_accept (struct socket *sock, 
-				      struct socket *newsock)
+static int dummy_socket_post_accept (struct socket *sock,
+				     struct socket *newsock)
 {
-	return;
+	return 0;
 }
 
 static int dummy_socket_sendmsg (struct socket *sock, struct msghdr *msg,

--
paul moore
linux security @ hp


linux-2.6-net-label_3_7.patch:
 include/net/cipso_ipv4.h |  165 ++++
 net/ipv4/cipso_ipv4.c    | 1755 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1920 insertions(+)

--- NEW FILE linux-2.6-net-label_3_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:38 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:44 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0hdH006627;
	Wed, 21 Jun 2006 16:00:44 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0g8B023887;
	Wed, 21 Jun 2006 16:00:42 -0400
Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0cpT008510;
	Wed, 21 Jun 2006 16:00:39 -0400
Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
	by atlrel8.hp.com (Postfix) with ESMTP id 628EB340AD;
	Wed, 21 Jun 2006 16:00:33 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id BE2BC1DA48;
	Wed, 21 Jun 2006 20:00:32 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0WDi012145;
	Wed, 21 Jun 2006 16:00:32 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0W6M012144;
	Wed, 21 Jun 2006 16:00:32 -0400
Message-Id: <20060621200031.589235000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:38 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 3/7] NetLabel: CIPSOv4 engine
Content-Disposition: inline; filename=netlabel-net_cipsov4-2.6.17
X-RedHat-Spam-Score: -98.575 
Content-Type: 
X-UID: 70788
X-Length: 59039

Add support for the Commercial IP Security Option (CIPSO) to the IPv4 network
stack.  CIPSO has become a de-facto standard for trusted/labeled networking
amongst existing Trusted Operating Systems such as Trusted Solaris, HP-UX CMW,
etc.  This implementation is designed to be used with the NetLabel subsystem
to provide explicit packet labeling to LSM developers.

The CIPSO/IPv4 packet labeling works by the LSM calling a NetLabel API function
which attaches a CIPSO label (IPv4 option) to a given socket; this in turn
attaches the CIPSO label to every packet leaving the socket without any extra
processing on the outbound side.  On the inbound side the individual packet's
sk_buff is examined through a call to a NetLabel API function to determine if a
CIPSO/IPv4 label is present and if so the security attributes of the CIPSO
label are returned to the caller of the NetLabel API function.
---
 include/net/cipso_ipv4.h |  165 ++++
 net/ipv4/cipso_ipv4.c    | 1755 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1920 insertions(+)

Index: linux-2.6.17.i686-quilt/include/net/cipso_ipv4.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/include/net/cipso_ipv4.h
@@ -0,0 +1,165 @@
+/*
+ * CIPSO - Commercial IP Security Option
+ *
+ * This is an implementation of the CIPSO 2.2 protocol as specified in
+ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
+ * FIPS-188, copies of both documents can be found in the Documentation
+ * directory.  While CIPSO never became a full IETF RFC standard many vendors
+ * have chosen to adopt the protocol and over the years it has become a
+ * de-facto standard for labeled networking.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _CIPSO_IPV4_H
+#define _CIPSO_IPV4_H
+
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <net/netlabel.h>
+
+/* known doi values */
+#define CIPSO_V4_DOI_UNKNOWN          0x00000000
+
+/* tag types */
+#define CIPSO_V4_TAG_INVALID          0
+#define CIPSO_V4_TAG_RBITMAP          1
+#define CIPSO_V4_TAG_ENUM             2
+#define CIPSO_V4_TAG_RANGE            5
+#define CIPSO_V4_TAG_PBITMAP          6
+#define CIPSO_V4_TAG_FREEFORM         7
+
+/* doi mapping types */
+#define CIPSO_V4_MAP_UNKNOWN          0
+#define CIPSO_V4_MAP_STD              1
+#define CIPSO_V4_MAP_PASS             2
+
+/* limits */
+#define CIPSO_V4_MAX_REM_LVLS         256
+#define CIPSO_V4_INV_LVL              0x80000000
+#define CIPSO_V4_MAX_LOC_LVLS         (CIPSO_V4_INV_LVL - 1)
+#define CIPSO_V4_MAX_REM_CATS         65536
+#define CIPSO_V4_INV_CAT              0x80000000
+#define CIPSO_V4_MAX_LOC_CATS         (CIPSO_V4_INV_CAT - 1)
+
+/*
+ * CIPSO DOI definitions
+ */
+
+/* DOI definition struct */
+#define CIPSO_V4_TAG_MAXCNT           5
+struct cipso_v4_doi {
+	u32 doi;
+	u32 type;
+	union {
+		struct cipso_v4_std_map_tbl *std;
+	} map;
+	u8 tags[CIPSO_V4_TAG_MAXCNT];
+
+	u32 valid;
+	struct list_head list;
+	struct rcu_head rcu;
+	struct list_head dom_list;
+};
+
+/* Standard CIPSO mapping table */
+/* NOTE: the highest order bit (i.e. 0x80000000) is an 'invalid' flag, if the
+ *       bit is set then consider that value as unspecified, meaning the
+ *       mapping for that particular level/category is invalid */
+struct cipso_v4_std_map_tbl {
+	struct {
+		u32 *cipso;
+		u32 *local;
+		u32 cipso_size;
+		u32 local_size;
+	} lvl;
+	struct {
+		u32 *cipso;
+		u32 *local;
+		u32 cipso_size;
+		u32 local_size;
+	} cat;
+};
+
+/*
+ * Helper Functions
+ */
+
+#define CIPSO_V4_OPTEXIST(x) (IPCB(x)->opt.cipso != 0)
+#define CIPSO_V4_OPTPTR(x) ((x)->nh.raw + IPCB(x)->opt.cipso)
+
+/*
+ * DOI List Functions
+ */
+
+int cipso_v4_doi_add(struct cipso_v4_doi *doi_def);
+int cipso_v4_doi_remove(const u32 doi,
+			void (*callback) (struct rcu_head * head));
+struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi);
+
+struct sk_buff *cipso_v4_doi_dump(const u32 doi, const u32 headroom);
+
+int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain);
+int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+			       const char *domain);
+
+/*
+ * Label Mapping Cache Functions
+ */
+
+void cipso_v4_cache_invalidate(void);
+int cipso_v4_cache_add(const struct sk_buff *skb,
+		       const struct netlbl_lsm_secattr *secattr);
+
+/*
+ * Protocol Handling Functions
+ */
+
+int cipso_v4_error(struct sk_buff *skb,
+		   const int error,
+		   const u32 gateway);
+int cipso_v4_socket_setopt(struct socket *sock,
+			   unsigned char *opt,
+			   u32 opt_len);
+int cipso_v4_socket_setattr(const struct socket *sock,
+			    const struct cipso_v4_doi *doi_def,
+			    const struct netlbl_lsm_secattr *secattr);
+int cipso_v4_socket_getopt(const struct socket *sock,
+			   unsigned char **opt,
+			   u32 *opt_len);
+int cipso_v4_socket_getattr(const struct socket *sock,
+			    struct netlbl_lsm_secattr *secattr);
+int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+			    struct netlbl_lsm_secattr *secattr);
+
+#ifdef CONFIG_NETLABEL_CIPSOV4
+int cipso_v4_validate(unsigned char **option);
+#else
+static inline int cipso_v4_validate(unsigned char **option)
+{
+	return *option;
+}
+#endif /* CONFIG_NETLABEL_CIPSOV4 */
+
+#endif /* _CIPSO_IPV4_H */
Index: linux-2.6.17.i686-quilt/net/ipv4/cipso_ipv4.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/ipv4/cipso_ipv4.c
@@ -0,0 +1,1755 @@
+/*
+ * CIPSO - Commercial IP Security Option
+ *
+ * This is an implementation of the CIPSO 2.2 protocol as specified in
+ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
+ * FIPS-188, copies of both documents can be found in the Documentation
+ * directory.  While CIPSO never became a full IETF RFC standard many vendors
+ * have chosen to adopt the protocol and over the years it has become a
+ * de-facto standard for labeled networking.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#include <linux/jhash.h>
+#include <net/ip.h>
+#include <net/icmp.h>
+#include <net/tcp.h>
+#include <net/netlabel.h>
+#include <net/cipso_ipv4.h>
+#include <asm/bug.h>
+
+struct cipso_v4_domhsh_entry {
+	char *domain;
+	u32 valid;
+	struct list_head list;
+	struct rcu_head rcu;
+};
+
+/* List of available DOI definitions */
+/* XXX - Updates should be minimal so having a single lock for the
+   cipso_v4_doi_list and the cipso_v4_doi_list->dom_list should be
+   okay. */
+/* XXX - This currently assumes a minimal number of different DOIs in use,
+   if in practice there are a lot of different DOIs this list should
+   probably be turned into a hash table or something similar so we
+   can do quick lookups. */
+DEFINE_SPINLOCK(cipso_v4_doi_list_lock);
+static struct list_head cipso_v4_doi_list = LIST_HEAD_INIT(cipso_v4_doi_list);
+
+/* Label mapping cache */
+#define CIPSO_V4_CACHE_BUCKETBITS     7
+#define CIPSO_V4_CACHE_BUCKETS        (1 << CIPSO_V4_CACHE_BUCKETBITS)
+#define CIPSO_V4_CACHE_BUCKETSIZE     10
+#define CIPSO_V4_CACHE_REORDERLIMIT   10
+/* PM - the number of cache buckets should probably be a compile time option */
+struct cipso_v4_map_cache_bkt {
+	spinlock_t lock;
+	u32 size;
+	struct list_head list;
+};
+struct cipso_v4_map_cache_entry {
+	u32 hash;
+	unsigned char *key;
+	u32 key_len;
+
+	struct netlbl_lsm_cache lsm_data;
+
+	u32 activity;
+	struct list_head list;
+};
+static u32 cipso_v4_cache_size = 0;
+static struct cipso_v4_map_cache_bkt *cipso_v4_cache = NULL;
+#define CIPSO_V4_CACHE_ENABLED (cipso_v4_cache_size > 0)
+
+/*
+ * Helper Functions
+ */
+
+/**
+ * cipso_v4_bitmap_walk - Walk a bitmap looking for a bit
+ * @bitmap: the bitmap
+ * @bitmap_len: length in bits
+ * @offset: starting offset
+ * @state: if non-zero, look for a set (1) bit else look for a cleared (0) bit
+ *
+ * Description:
+ * Starting at @offset, walk the bitmap from left to right until either the
+ * desired bit is found or we reach the end.  Return the bit offset, -1 if
+ * not found, or -2 if error.
+ */
+static int cipso_v4_bitmap_walk(const unsigned char *bitmap,
+				const u32 bitmap_len,
+				const u32 offset,
+				const u8 state)
+{
+	u32 bit_spot;
+	u32 byte_offset;
+	unsigned char bitmask;
+	unsigned char byte;
+
+	/* gcc always rounds to zero when doing integer division */
+	byte_offset = offset / 8;
+	byte = bitmap[byte_offset];
+	bit_spot = offset;
+	bitmask = 0x80 >> offset % 8;
+
+	/* XXX - probably should use include/asm/bitops.h if we can */
+	while (bit_spot < bitmap_len) {
+		if ((state && (byte & bitmask) == bitmask) ||
+		    (state == 0 && (byte & bitmask) == 0))
+			return bit_spot;
+
+		bit_spot++;
+		bitmask >>= 1;
+		if (bitmask == 0) {
+			byte = bitmap[++byte_offset];
+			bitmask = 0x80;
+		}
+	}
+
+	return -1;
+}
+
+/**
+ * cipso_v4_bitmap_setbit - Sets a single bit in a bitmap
+ * @bitmap: the bitmap
+ * @bit: the bit
+ * @state: if non-zero, set the bit (1) else clear the bit (0)
+ *
+ * Description:
+ * Set a single bit in the bitmask.  Returns zero on success, negative values
+ * on error.
+ */
+static void cipso_v4_bitmap_setbit(unsigned char *bitmap,
+				   const u32 bit,
+				   const u8 state)
+{
+	u32 byte_spot;
+	u8 bitmask;
+
+	/* gcc always rounds to zero when doing integer division */
+	byte_spot = bit / 8;
+	bitmask = 0x80 >> bit % 8;
+	if (state)
+		bitmap[byte_spot] |= bitmask;
+	else
+		bitmap[byte_spot] &= ~bitmask;
+}
+
+/**
+ * cipso_v4_doi_domhsh_free - Frees a domain list entry
+ * @entry: the entry's RCU field
+ *
+ * Description:
+ * This function is designed to be used as a callback to the call_rcu()
+ * function so that the memory allocated to a domain list entry can be released
+ * safely.
+ *
+ */
+static void cipso_v4_doi_domhsh_free(struct rcu_head *entry)
+{
+	struct cipso_v4_domhsh_entry *ptr;
+
+	ptr = container_of(entry, struct cipso_v4_domhsh_entry, rcu);
+	if (ptr->domain)
+		kfree(ptr->domain);
+	kfree(ptr);
+}
+
+/**
+ * cipso_v4_cache_entry_free - Frees a cache entry
+ * @entry: the entry to free
+ *
+ * Description:
+ * This function frees the memory associated with a cache entry.
+ *
+ */
+static void cipso_v4_cache_entry_free(struct cipso_v4_map_cache_entry *entry)
+{
+	if (entry->lsm_data.free)
+		entry->lsm_data.free(entry->lsm_data.data);
+	if (entry->key)
+		kfree(entry->key);
+	kfree(entry);
+}
+
+/**
+ * cipso_v4_map_cache_hash - Hashing function for the CIPSO cache
+ * @key: the hash key
+ * @key_len: the length of the key in bytes
+ *
+ * Description:
+ * The CIPSO tag hashing function.  Returns a 32-bit hash value.
+ *
+ */
+static u32 cipso_v4_map_cache_hash(const unsigned char *key, const u32 key_len)
+{
+	/* PM - not sure if this is a good hash for this particular use but
+	   it's probably better than what I had here before */
+	return jhash(key, key_len, 0);
+}
+
+/*
+ * Label Mapping Cache Functions
+ */
+
+/**
+ * cipso_v4_cache_init - Initialize the CIPSO cache
+ * @bkt_size: the number of cache buckets
+ *
+ * Description:
+ * Initializes the CIPSO label mapping cache, this function should be called
+ * before any of the other functions defined in this file.  Returns zero on
+ * success, negative values on error.
+ *
+ */
+static int cipso_v4_cache_init(const u32 bkt_size)
+{
+	struct cipso_v4_map_cache_bkt *cache;
+	u32 iter;
+
+	if (bkt_size == 0)
+		return -EINVAL;
+
+	cache = kcalloc(bkt_size,
+			sizeof(struct cipso_v4_map_cache_bkt), GFP_KERNEL);
+	if (cache == NULL)
+		return -ENOMEM;
+
+	for (iter = 0; iter < bkt_size; iter++) {
+		cache[iter].lock = SPIN_LOCK_UNLOCKED;
+		cache[iter].size = 0;
+		INIT_LIST_HEAD(&cache[iter].list);
+	}
+	cipso_v4_cache = cache;
+	cipso_v4_cache_size = bkt_size;
+
+	return 0;
+}
+
+/**
+ * cipso_v4_cache_destroy - Destroy the CIPSO cache
+ *
+ * Description:
+ * Clears the CIPSO cache and frees all the memory.  This function does not
+ * hold any locks and should only be called when the module is being unloaded.
+ *
+ */
+static int cipso_v4_cache_destroy(void)
+{
+	struct cipso_v4_map_cache_bkt *cache;
+	struct cipso_v4_map_cache_entry *entry;
+	u32 cache_size;
+	u32 iter;
+
+	cache = cipso_v4_cache;
+	cache_size = cipso_v4_cache_size;
+	cipso_v4_cache_size = 0;
+	cipso_v4_cache = NULL;
+
+	for (iter = 0; iter < cache_size; iter++)
+		list_for_each_entry(entry, &cache[iter].list, list) {
+			list_del(&entry->list);
+			cipso_v4_cache_entry_free(entry);
+		}
+
+	return 0;
+}
+
+/**
+ * cipso_v4_cache_invalidate - Invalidates the current CIPSO cache
+ *
+ * Description:
+ * Invalidates and frees any entries in the CIPSO cache.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+void cipso_v4_cache_invalidate(void)
+{
+	struct cipso_v4_map_cache_entry *entry, *tmp_entry;
+	u32 iter;
+
+	if (!CIPSO_V4_CACHE_ENABLED)
+		return;
+
+	for (iter = 0; iter < cipso_v4_cache_size; iter++) {
+		spin_lock(&cipso_v4_cache[iter].lock);
+		list_for_each_entry_safe(entry,
+					 tmp_entry,
+					 &cipso_v4_cache[iter].list, list) {
+			list_del(&entry->list);
+			cipso_v4_cache_entry_free(entry);
+		}
+		cipso_v4_cache[iter].size = 0;
+		spin_unlock(&cipso_v4_cache[iter].lock);
+	}
+
+	return;
+}
+
+/**
+ * cipso_v4_cache_check - Check the CIPSO cache for a label mapping
+ * @key: the buffer to check
+ * @key_len: buffer length in bytes
+ * @secattr: the security attribute struct to use
+ *
+ * Description:
+ * This function checks the cache to see if a label mapping already exists for
+ * the given key.  If there is a match then the cache is adjusted and the
+ * @secattr struct is populated with the correct LSM security attributes.  The
+ * cache is adjusted in the following manner if the entry is not already the
+ * first in the cache bucket:
+ *
+ *  1. The cache entry's activity counter is incremented
+ *  2. The previous (higher ranking) entry's activity counter is decremented
+ *  3. If the difference between the two activity counters is geater than
+ *     CIPSO_V4_CACHE_REORDERLIMIT the two entries are swapped
+ *
+ * Returns zero on success, -ENOENT for a cache miss, and other negative values
+ * on error.
+ *
+ */
+static int cipso_v4_cache_check(const unsigned char *key,
+				const u32 key_len,
+				struct netlbl_lsm_secattr *secattr)
+{
+	u32 bkt;
+	struct cipso_v4_map_cache_entry *entry;
+	struct cipso_v4_map_cache_entry *prev_entry = NULL;
+	u32 hash;
+
+	if (!CIPSO_V4_CACHE_ENABLED)
+		return -ENOENT;
+
+	hash = cipso_v4_map_cache_hash(key, key_len);
+	bkt = hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
+	spin_lock(&cipso_v4_cache[bkt].lock);
+	list_for_each_entry(entry, &cipso_v4_cache[bkt].list, list) {
+		if (entry->hash == hash &&
+		    entry->key_len == key_len &&
+		    memcmp(entry->key, key, key_len) == 0) {
+			entry->activity += 1;
+
+			if (prev_entry != NULL) {
+				if (prev_entry->activity > 0)
+					prev_entry->activity -= 1;
+
+				if (entry->activity > prev_entry->activity &&
+				    entry->activity - prev_entry->activity >
+				    CIPSO_V4_CACHE_REORDERLIMIT) {
+					__list_del(entry->list.prev,
+						   entry->list.next);
+					__list_add(&entry->list,
+						   prev_entry->list.prev,
+						   &prev_entry->list);
+				}
+			}
+
+			secattr->cache.free = entry->lsm_data.free;
+			secattr->cache.data = entry->lsm_data.data;
+			spin_unlock(&cipso_v4_cache[bkt].lock);
+
+			secattr->set_cache = 1;
+			return 0;
+		}
+		prev_entry = entry;
+	}
+	spin_unlock(&cipso_v4_cache[bkt].lock);
+
+	return -ENOENT;
+}
+
+/**
+ * cipso_v4_cache_add - Add an entry to the CIPSO cache
+ * @skb: the packet
+ * @secattr: the packet's security attributes
+ *
+ * Description:
+ * Add a new entry into the CIPSO label mapping cache.  Add the new entry to
+ * head of the cache bucket's list, if the cache bucket is out of room remove
+ * the last entry in the list first.  It is important to note that there is
+ * currently no checking for duplicate keys.  Returns zero on success,
+ * negative values on failure.
+ *
+ */
+int cipso_v4_cache_add(const struct sk_buff *skb,
+		       const struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -EPERM;
+	u32 bkt;
+	struct cipso_v4_map_cache_entry *entry = NULL;
+	struct cipso_v4_map_cache_entry *old_entry = NULL;
+	unsigned char *cipso_ptr;
+	u32 cipso_ptr_len;
+
+	if (!CIPSO_V4_CACHE_ENABLED)
+		return 0;
+
+	cipso_ptr = CIPSO_V4_OPTPTR(skb);
+	cipso_ptr_len = cipso_ptr[1];
+
+	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
+	if (entry == NULL)
+		return -ENOMEM;
+	entry->key = kmalloc(cipso_ptr_len, GFP_ATOMIC);
+	if (entry->key == NULL) {
+		ret_val = -ENOMEM;
+		goto cache_add_failure;
+	}
+	memcpy(entry->key, cipso_ptr, cipso_ptr_len);
+	entry->key_len = cipso_ptr_len;
+	entry->hash = cipso_v4_map_cache_hash(cipso_ptr, cipso_ptr_len);
+	entry->lsm_data.free = secattr->cache.free;
+	entry->lsm_data.data = secattr->cache.data;
+
+	bkt = entry->hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
+	spin_lock(&cipso_v4_cache[bkt].lock);
+	if (cipso_v4_cache[bkt].size < CIPSO_V4_CACHE_BUCKETSIZE) {
+		list_add(&entry->list, &cipso_v4_cache[bkt].list);
+		cipso_v4_cache[bkt].size += 1;
+	} else {
+		old_entry = list_entry(cipso_v4_cache[bkt].list.prev,
+				       struct cipso_v4_map_cache_entry, list);
+		list_del(&old_entry->list);
+		list_add(&entry->list, &cipso_v4_cache[bkt].list);
+		cipso_v4_cache_entry_free(old_entry);
+	}
+	spin_unlock(&cipso_v4_cache[bkt].lock);
+
+	return 0;
+
+cache_add_failure:
+	if (entry)
+		cipso_v4_cache_entry_free(entry);
+	return ret_val;
+}
+
+/*
+ * DOI List Functions
+ */
+
+/**
+ * cipso_v4_doi_search - Searches for a DOI definition
+ * @doi: the DOI to search for
+ *
+ * Description:
+ * Search the DOI definition list for a DOI definition with a DOI value that
+ * matches @doi.  The caller is responsibile for calling rcu_read_[un]lock().
+ * Returns a pointer to the DOI definition on success and NULL on failure.
+ */
+static struct cipso_v4_doi *cipso_v4_doi_search(const u32 doi)
+{
+	struct cipso_v4_doi *iter;
+
+	list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
+		if (iter->doi == doi && iter->valid)
+			return iter;
+	return NULL;
+}
+
+/**
+ * cipso_v4_doi_add - Add a new DOI to the CIPSO protocol engine
+ * @doi_def: the DOI structure
+ *
+ * Description:
+ * The caller defines a new DOI for use by the CIPSO engine and calls this
+ * function to add it to the list of acceptable domains.  The caller must
+ * ensure that the mapping table specified in @doi_def->map meets all of the
+ * requirements of the mapping type (see cipso_ipv4.h for details).  Returns
+ * zero on success and non-zero on failure.
+ *
+ */
+int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
+{
+	if (doi_def == NULL || doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
+		return -EINVAL;
+
+	doi_def->valid = 1;
+	INIT_RCU_HEAD(&doi_def->rcu);
+	INIT_LIST_HEAD(&doi_def->dom_list);
+
+	rcu_read_lock();
+	if (cipso_v4_doi_search(doi_def->doi) != NULL) {
+		rcu_read_unlock();
+		return -EEXIST;
+	}
+	spin_lock(&cipso_v4_doi_list_lock);
+	list_add_tail_rcu(&doi_def->list, &cipso_v4_doi_list);
+	spin_unlock(&cipso_v4_doi_list_lock);
+	rcu_read_unlock();
+
+	return 0;
+}
+
+/**
+ * cipso_v4_doi_remove - Remove an existing DOI from the CIPSO protocol engine
+ * @doi: the DOI value
+ * @callback: the DOI cleanup/free callback
+ *
+ * Description:
+ * Removes a DOI definition from the CIPSO engine, @callback is called to
+ * free any memory.  The NetLabel routines will be called to release their own
+ * LSM domain mappings as well as our own domain list.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+int cipso_v4_doi_remove(const u32 doi,
+			void (*callback) (struct rcu_head * head))
+{
+	struct cipso_v4_doi *doi_def;
+	struct cipso_v4_domhsh_entry *dom_iter;
+
+	if (callback == NULL)
+		return -EINVAL;
+
+	rcu_read_lock();
+	doi_def = cipso_v4_doi_search(doi);
+	if (doi_def != NULL) {
+		spin_lock(&cipso_v4_doi_list_lock);
+		doi_def->valid = 0;
+		list_del_rcu(&doi_def->list);
+		spin_unlock(&cipso_v4_doi_list_lock);
+		list_for_each_entry_rcu(dom_iter, &doi_def->dom_list, list)
+			if (dom_iter->valid)
+				netlbl_domhsh_remove(dom_iter->domain);
+		rcu_read_unlock();
+		/* PM - should we invalidate the cache before we drop the
+		        lock? */
+		cipso_v4_cache_invalidate();
+
+		call_rcu(&doi_def->rcu, callback);
+		return 0;
+	}
+	rcu_read_unlock();
+
+	return -ENOENT;
+}
+
+/**
+ * cipso_v4_doi_getdef - Returns a pointer to a valid DOI definition
+ * @doi: the DOI value
+ *
+ * Description:
+ * Searches for a valid DOI definition and if one is found it is returned to
+ * the caller.  Otherwise NULL is returned.  The caller must ensure that
+ * rcu_read_lock() is held while accessing the returned definition.
+ *
+ */
+struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi)
+{
+	return cipso_v4_doi_search(doi);
+}
+
+/**
+ * cipso_v4_doi_dump - Dump the CIPSO DOI definitions into a sk_buff
+ * @doi: the DOI value
+ * @headroom: the amount of headroom to allocate for the sk_buff
+ *
+ * Description:
+ * If the @doi value is zero then dump a list of all the configured DOI values
+ * into a sk_buff.  If the @doi value is non-zero, lookup the match DOI
+ * definition and dump it's contents into a sk_buff.  The returned sk_buff has
+ * room at the front of the sk_buff for a nlmsghdr struct and a @headroom
+ * bytes.  See netlabel_cipso_v4.h for the LIST message format.  This function
+ * may fail if another process is changing the DOI list at the same time.
+ * Returns a pointer to a sk_buff on success, NULL on error.
+ *
+ */
+struct sk_buff *cipso_v4_doi_dump(const u32 doi, const u32 headroom)
+{
+	struct sk_buff *skb;
+	unsigned char *buf;
+	struct cipso_v4_doi *iter;
+	u32 doi_cnt = 0;
+	u32 tag_cnt = 0;
+	u32 lvl_cnt = 0;
+	u32 cat_cnt = 0;
+	u32 buf_len;
+	u32 tmp_len;
+
+	/* XXX - In both cases, this is kinda ugly as we have to go through
+	   the list once to determine how large of a buffer we need,
+	   drop the locks, allocate the buffer, grab the locks, and
+	   finally fill the buffer.  The problem is that there is that
+	   open window where the table could grow and we will end up
+	   short on space. */
+
+	if (doi == 0) {
+		buf_len = 4;
+		rcu_read_lock();
+		list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
+			if (iter->valid) {
+				doi_cnt += 1;
+				buf_len += 8;
+			}
+		rcu_read_unlock();
+
+		skb = alloc_skb(NLMSG_SPACE(headroom + buf_len), GFP_KERNEL);
+		if (skb == NULL)
+			return NULL;
+		skb_reserve(skb, NLMSG_SPACE(headroom));
+		tmp_len = skb_tailroom(skb);
+		if (tmp_len < buf_len)
+			goto doi_dump_failure;
+		buf = skb_put(skb, buf_len);
+		buf_len -= 4;
+		netlbl_putinc_u32(&buf, doi_cnt);
+
+		rcu_read_lock();
+		list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
+			if (iter->valid) {
+				if (buf_len < 8) {
+					rcu_read_unlock();
+					goto doi_dump_failure;
+				}
+				buf_len -= 8;
+				netlbl_putinc_u32(&buf, iter->doi);
+				netlbl_putinc_u32(&buf, iter->type);
+			}
+		rcu_read_unlock();
+	} else {
+		rcu_read_lock();
+		iter = cipso_v4_doi_getdef(doi);
+		if (iter == NULL) {
+			rcu_read_unlock();
+			return NULL;
+		}
+		buf_len = 4;
+		switch (iter->type) {
+		case CIPSO_V4_MAP_PASS:
+			buf_len += 4;
+			while (tag_cnt < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tag_cnt] != CIPSO_V4_TAG_INVALID) {
+				tag_cnt += 1;
+				buf_len += 1;
+			}
+			break;
+		case CIPSO_V4_MAP_STD:
+			buf_len += 12;
+			while (tag_cnt < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tag_cnt] != CIPSO_V4_TAG_INVALID) {
+				tag_cnt += 1;
+				buf_len += 1;
+			}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->lvl.local_size)
+				if (iter->map.std->lvl.local[tmp_len++] !=
+				    CIPSO_V4_INV_LVL) {
+					lvl_cnt += 1;
+					buf_len += 8;
+				}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->cat.local_size)
+				if (iter->map.std->cat.local[tmp_len++] !=
+				    CIPSO_V4_INV_CAT) {
+					cat_cnt += 1;
+					buf_len += 8;
+				}
+			break;
+		default:
+			rcu_read_unlock();
+			return NULL;
+		}
+		rcu_read_unlock();
+
+		skb = alloc_skb(NLMSG_SPACE(sizeof(headroom) + buf_len),
+				GFP_KERNEL);
+		if (skb == NULL)
+			return NULL;
+		skb_reserve(skb, NLMSG_SPACE(headroom));
+		tmp_len = skb_tailroom(skb);
+		if (tmp_len < buf_len)
+			goto doi_dump_failure;
+		buf = skb_put(skb, buf_len);
+		buf_len -= 4;
+		netlbl_putinc_u32(&buf, iter->type);
+
+		rcu_read_lock();
+		if (iter != cipso_v4_doi_getdef(doi)) {
+			rcu_read_unlock();
+			goto doi_dump_failure;
+		}
+		switch (iter->type) {
+		case CIPSO_V4_MAP_PASS:
+			netlbl_putinc_u32(&buf, tag_cnt);
+			tmp_len = 0;
+			while (tmp_len < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tmp_len] != CIPSO_V4_TAG_INVALID) {
+				if (buf_len < 1) {
+					rcu_read_unlock();
+					goto doi_dump_failure;
+				}
+				buf_len -= 1;
+				netlbl_putinc_u8(&buf, iter->tags[tmp_len++]);
+			}
+			break;
+		case CIPSO_V4_MAP_STD:
+			buf_len -= 12;
+			netlbl_putinc_u32(&buf, tag_cnt);
+			netlbl_putinc_u32(&buf, lvl_cnt);
+			netlbl_putinc_u32(&buf, cat_cnt);
+			tmp_len = 0;
+			while (tmp_len < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tmp_len] != CIPSO_V4_TAG_INVALID) {
+				if (buf_len < 1) {
+					rcu_read_unlock();
+					goto doi_dump_failure;
+				}
+				buf_len -= 1;
+				netlbl_putinc_u8(&buf, iter->tags[tmp_len++]);
+			}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->lvl.local_size) {
+				if (iter->map.std->lvl.local[tmp_len] !=
+				    CIPSO_V4_INV_LVL) {
+					if (buf_len < 8) {
+						rcu_read_unlock();
+						goto doi_dump_failure;
+					}
+					buf_len -= 8;
+					netlbl_putinc_u32(&buf, tmp_len);
+					netlbl_putinc_u32(&buf,
+							  iter->map.std->lvl.
+							  local[tmp_len]);
+				}
+				tmp_len += 1;
+			}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->cat.local_size) {
+				if (iter->map.std->cat.local[tmp_len] !=
+				    CIPSO_V4_INV_CAT) {
+					if (buf_len < 8) {
+						rcu_read_unlock();
+						goto doi_dump_failure;
+					}
+					buf_len -= 8;
+					netlbl_putinc_u32(&buf, tmp_len);
+					netlbl_putinc_u32(&buf,
+							  iter->map.std->cat.
+							  local[tmp_len]);
+				}
+				tmp_len += 1;
+			}
+			break;
+		}
+		rcu_read_unlock();
+	}
+
+	return skb;
+
+doi_dump_failure:
+	kfree(skb);
+	return NULL;
+}
+
+/**
+ * cipso_v4_doi_domhsh_add - Adds a domain entry to a DOI definition
+ * @doi_def: the DOI definition
+ * @domain: the domain to add
+ *
+ * Description:
+ * Adds the @domain to the the DOI specified by @doi_def, this function
+ * should only be called by external functions (i.e. NetLabel).  This function
+ * does allocate memory.  Returns zero on success, negative values on failure.
+ *
+ */
+int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain)
+{
+	struct cipso_v4_domhsh_entry *iter;
+	struct cipso_v4_domhsh_entry *new_dom;
+
+	new_dom = kzalloc(sizeof(*new_dom), GFP_KERNEL);
+	if (new_dom == NULL)
+		return -ENOMEM;
+	if (domain) {
+		new_dom->domain = kstrdup(domain, GFP_KERNEL);
+		if (new_dom->domain == NULL) {
+			kfree(new_dom);
+			return -ENOMEM;
+		}
+	}
+	new_dom->valid = 1;
+	INIT_RCU_HEAD(&new_dom->rcu);
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(iter, &doi_def->dom_list, list)
+		if (iter->valid &&
+		    ((domain != NULL && iter->domain != NULL &&
+		      strcmp(iter->domain, domain) == 0) ||
+		     (domain == NULL && iter->domain == NULL))) {
+			rcu_read_unlock();
+			if (new_dom->domain != NULL)
+				kfree(new_dom->domain);
+			kfree(new_dom);
+			return -EEXIST;
+		}
+	spin_lock(&cipso_v4_doi_list_lock);
+	list_add_tail_rcu(&new_dom->list, &doi_def->dom_list);
+	spin_unlock(&cipso_v4_doi_list_lock);
+	rcu_read_unlock();
+
+	return 0;
+}
+
+/**
+ * cipso_v4_doi_domhsh_remove - Removes a domain entry from a DOI definition
+ * @doi_def: the DOI definition
+ * @domain: the domain to remove
+ *
+ * Description:
+ * Removes the @domain from the DOI specified by @doi_def, this function
+ * should only be called by external functions (i.e. NetLabel).   Returns zero
+ * on success and negative values on error.
+ *
+ */
+int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+			       const char *domain)
+{
+	struct cipso_v4_domhsh_entry *iter;
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(iter, &doi_def->dom_list, list)
+		if (iter->valid &&
+		    ((domain != NULL && iter->domain != NULL &&
+		      strcmp(iter->domain, domain) == 0) ||
+		     (domain == NULL && iter->domain == NULL))) {
+			spin_lock(&cipso_v4_doi_list_lock);
+			iter->valid = 0;
+			list_del_rcu(&iter->list);
+			spin_unlock(&cipso_v4_doi_list_lock);
+			rcu_read_unlock();
+
+			call_rcu(&iter->rcu, cipso_v4_doi_domhsh_free);
+			return 0;
+		}
+	rcu_read_unlock();
+
+	return -ENOENT;
+}
+
+/*
+ * Label Mapping Functions
+ */
+
+/**
+ * cipso_v4_map_lvl_valid - Checks to see if the given level is understood
+ * @doi_def: the DOI definition
+ * @level: the level to check
+ *
+ * Description:
+ * Checks the given level against the given DOI definition and returns a
+ * negative value if the level does not have a valid mapping and a zero value
+ * if the level is defined by the DOI.
+ *
+ */
+static int cipso_v4_map_lvl_valid(const struct cipso_v4_doi *doi_def,
+				  const u8 level)
+{
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		if (doi_def->map.std->lvl.cipso[level] < CIPSO_V4_INV_LVL)
+			return 0;
+		break;
+	}
+
+	return -EFAULT;
+}
+
+/**
+ * cipso_v4_map_lvl_hton - Perform a level mapping from the host to the network
+ * @doi_def: the DOI definition
+ * @host_lvl: the host MLS level
+ * @net_lvl: the network/CIPSO MLS level
+ *
+ * Description:
+ * Perform a label mapping to translate a local MLS level to the correct
+ * CIPSO level using the given DOI definition.  Returns zero on success,
+ * negative values otherwise.
+ *
+ */
+static int cipso_v4_map_lvl_hton(const struct cipso_v4_doi *doi_def,
+				 const u32 host_lvl,
+				 u32 *net_lvl)
+{
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		*net_lvl = host_lvl;
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		if (host_lvl < doi_def->map.std->lvl.local_size) {
+			*net_lvl = doi_def->map.std->lvl.local[host_lvl];
+			return 0;
+		}
+		break;
+	}
+
+	return -EINVAL;
+}
+
+/**
+ * cipso_v4_map_lvl_ntoh - Perform a level mapping from the network to the host
+ * @doi_def: the DOI definition
+ * @net_lvl: the network/CIPSO MLS level
+ * @host_lvl: the host MLS level
+ *
+ * Description:
+ * Perform a label mapping to translate a CIPSO level to the correct local MLS
+ * level using the given DOI definition.  Returns zero on success, negative
+ * values otherwise.
+ *
+ */
+static int cipso_v4_map_lvl_ntoh(const struct cipso_v4_doi *doi_def,
+				 const u32 net_lvl,
+				 u32 *host_lvl)
+{
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		*host_lvl = net_lvl;
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		if (net_lvl < doi_def->map.std->lvl.cipso_size) {
+			*host_lvl = doi_def->map.std->lvl.cipso[net_lvl];
+			return 0;
+		}
+		break;
+	}
+
+	return -EINVAL;
+}
+
+/**
+ * cipso_v4_map_cat_rbm_valid - Checks to see if the category bitmap is valid
+ * @doi_def: the DOI definition
+ * @bitmap: category bitmap
+ * @bitmap_len: bitmap length in bytes
+ *
+ * Description:
+ * Checks the given category bitmap against the given DOI definition and
+ * returns a negative value if any of the categories in the bitmap do not have
+ * a valid mapping and a zero value if all of the categories are valid.
+ *
+ */
+static int cipso_v4_map_cat_rbm_valid(const struct cipso_v4_doi *doi_def,
+				      const unsigned char *bitmap,
+				      const u32 bitmap_len)
+{
+	int cat = -1;
+	u32 bitmap_len_bits = bitmap_len * 8;
+	u32 cipso_cat_size = doi_def->map.std->cat.cipso_size;
+	u32 *cipso_array = doi_def->map.std->cat.cipso;
+
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		for (;;) {
+			cat = cipso_v4_bitmap_walk(bitmap,
+						   bitmap_len_bits,
+						   cat + 1,
+						   1);
+			if (cat < 0)
+				break;
+			if (cat >= cipso_cat_size ||
+			    cipso_array[cat] >= CIPSO_V4_INV_CAT)
+				return -EFAULT;
+		}
+
+		if (cat == -1)
+			return 0;
+		break;
+	}
+
+	return -EFAULT;
+}
+
+/**
+ * cipso_v4_map_cat_rbm_hton - Perform a category mapping from host to network
+ * @doi_def: the DOI definition
+ * @host_cat: the category bitmap in host format
+ * @host_cat_len: the length of the host's category bitmap in bytes
+ * @net_cat: the zero'd out category bitmap in network/CIPSO format
+ * @net_cat_len: the length of the CIPSO bitmap in bytes
+ *
+ * Description:
+ * Perform a label mapping to translate a local MLS category bitmap to the
+ * correct CIPSO bitmap using the given DOI definition.  Returns the minimum
+ * size in bytes of the network bitmap on success, negative values otherwise.
+ *
+ */
+static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def,
+				     const unsigned char *host_cat,
+				     const u32 host_cat_len,
+				     unsigned char *net_cat,
+				     const u32 net_cat_len)
+{
+	int host_spot = -1;
+	u32 net_spot;
+	u32 net_spot_max = 0;
+	u32 host_clen_bits = host_cat_len * 8;
+	u32 net_clen_bits = net_cat_len * 8;
+	u32 host_cat_size = doi_def->map.std->cat.local_size;
+	u32 *host_cat_array = doi_def->map.std->cat.local;
+
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		net_spot_max = host_cat_len - 1;
+		while (net_spot_max > 0 && host_cat[net_spot_max] == 0)
+			net_spot_max--;
+		if (net_spot_max > net_cat_len)
+			return -EINVAL;
+		memcpy(net_cat, host_cat, net_spot_max);
+		return net_spot_max;
+	case CIPSO_V4_MAP_STD:
+		for (;;) {
+			host_spot = cipso_v4_bitmap_walk(host_cat,
+							 host_clen_bits,
+							 host_spot + 1,
+							 1);
+			if (host_spot < 0)
+				break;
+			if (host_spot >= host_cat_size)
+				return -EPERM;
+
+			net_spot = host_cat_array[host_spot];
+			if (net_spot >= net_clen_bits)
+				return -ENOSPC;
+			cipso_v4_bitmap_setbit(net_cat, net_spot, 1);
+
+			if (net_spot > net_spot_max)
+				net_spot_max = net_spot;
+		}
+
+		if (host_spot == -2)
+			return -EFAULT;
+
+		if (++net_spot_max % 8)
+			return net_spot_max / 8 + 1;
+		return net_spot_max / 8;
+	}
+
+	return -EINVAL;
+}
+
+/**
+ * cipso_v4_map_cat_rbm_ntoh - Perform a category mapping from network to host
+ * @doi_def: the DOI definition
+ * @net_cat: the category bitmap in network/CIPSO format
+ * @net_cat_len: the length of the CIPSO bitmap in bytes
+ * @host_cat: the zero'd out category bitmap in host format
+ * @host_cat_len: the length of the host's category bitmap in bytes
+ *
+ * Description:
+ * Perform a label mapping to translate a CIPSO bitmap to the correct local
+ * MLS category bitmap using the given DOI definition.  Returns the minimum
+ * size in bytes of the host bitmap on success, negative values otherwise.
+ *
+ */
+static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,
+				     const unsigned char *net_cat,
+				     const u32 net_cat_len,
+				     unsigned char *host_cat,
+				     const u32 host_cat_len)
+{
+	u32 host_spot;
+	u32 host_spot_max = 0;
+	int net_spot = -1;
+	u32 net_clen_bits = net_cat_len * 8;
+	u32 host_clen_bits = host_cat_len * 8;
+	u32 net_cat_size = doi_def->map.std->cat.cipso_size;
+	u32 *net_cat_array = doi_def->map.std->cat.cipso;
+
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		if (net_cat_len > host_cat_len)
+			return -EINVAL;
+		memcpy(host_cat, net_cat, net_cat_len);
+		return host_cat_len;
+	case CIPSO_V4_MAP_STD:
+		for (;;) {
+			net_spot = cipso_v4_bitmap_walk(net_cat,
+							net_clen_bits,
+							net_spot + 1,
+							1);
+			if (net_spot < 0)
+				break;
+			if (net_spot >= net_cat_size)
+				return -EPERM;
+
+			host_spot = net_cat_array[net_spot];
+			if (host_spot >= host_clen_bits)
+				return -ENOSPC;
+			cipso_v4_bitmap_setbit(host_cat, host_spot, 1);
+
+			if (host_spot > host_spot_max)
+				host_spot_max = host_spot;
+		}
+
+		if (net_spot == -2)
+			return -EFAULT;
+
+		if (++host_spot_max % 8)
+			return host_spot_max / 8 + 1;
+		return host_spot_max / 8;
+	}
+
+	return -EINVAL;
+}
+
+/*
+ * Protocol Handling Functions
+ */
+
+#define CIPSO_V4_HDR_LEN              6
+
+/**
+ * cipso_v4_gentag_hdr - Generate a CIPSO option header
+ * @doi_def: the DOI definition
+ * @len: the total tag length in bytes
+ * @buf: the CIPSO option buffer
+ *
+ * Description:
+ * Write a CIPSO header into the beginning of @buffer.  Return zero on success,
+ * negative values on failure.
+ *
+ */
+static int cipso_v4_gentag_hdr(const struct cipso_v4_doi *doi_def,
+			       const u32 len,
+			       unsigned char *buf)
+{
+	if (CIPSO_V4_HDR_LEN + len > 40)
+		return -ENOSPC;
+
+	buf[0] = IPOPT_CIPSO;
+	buf[1] = CIPSO_V4_HDR_LEN + len;
+	*(u32 *)&buf[2] = htonl(doi_def->doi);
+
+	return 0;
+}
+
+#define CIPSO_V4_TAG1_CAT_LEN         30
+
+/**
+ * cipso_v4_gentag_rbm - Generate a CIPSO restricted bitmap tag (type #1)
+ * @doi_def: the DOI definition
+ * @secattr: the security attributes
+ * @buffer: the option buffer
+ * @buffer_len: length of buffer in bytes
+ *
+ * Description:
+ * Generate a CIPSO option using the restricted bitmap tag, tag type #1.  The
+ * actual buffer length may be larger than the indicated size due to
+ * translation between host and network category bitmaps.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+static int cipso_v4_gentag_rbm(const struct cipso_v4_doi *doi_def,
+			       const struct netlbl_lsm_secattr *secattr,
+			       unsigned char **buffer,
+			       u32 *buffer_len)
+{
+	int ret_val = -EPERM;
+	unsigned char *buf = NULL;
+	u32 buf_len;
+	u32 level;
+
+	if (secattr->set_mls_cat) {
+		buf = kzalloc(CIPSO_V4_HDR_LEN + 4 + CIPSO_V4_TAG1_CAT_LEN,
+			      GFP_ATOMIC);
+		if (buf == NULL)
+			return -ENOMEM;
+
+		ret_val = cipso_v4_map_cat_rbm_hton(doi_def,
+						    secattr->mls_cat,
+						    secattr->mls_cat_len,
+						    &buf[CIPSO_V4_HDR_LEN + 4],
+						    CIPSO_V4_TAG1_CAT_LEN);
+		if (ret_val < 0)
+			goto gentag_failure;
+#if 0
+		/* PM - this should be a sysctl adjustable setting */
+		/* XXX - this will send packets using the "optimized" format
+		   when possibile as specified in  section 3.4.2.6 of the
+		   CIPSO draft */
+		if (ret_val > 0 && ret_val < 10)
+			ret_val = 10;
+#endif
+		buf_len = 4 + ret_val;
+	} else {
+		buf = kzalloc(CIPSO_V4_HDR_LEN + 4, GFP_ATOMIC);
+		if (buf == NULL)
+			return -ENOMEM;
+		buf_len = 4;
+	}
+
+	ret_val = cipso_v4_map_lvl_hton(doi_def, secattr->mls_lvl, &level);
+	if (ret_val != 0)
+		goto gentag_failure;
+
+	ret_val = cipso_v4_gentag_hdr(doi_def, buf_len, buf);
+	if (ret_val != 0)
+		goto gentag_failure;
+
+	buf[CIPSO_V4_HDR_LEN] = 0x01;
+	buf[CIPSO_V4_HDR_LEN + 1] = buf_len;
+	buf[CIPSO_V4_HDR_LEN + 3] = level;
+
+	*buffer = buf;
+	*buffer_len = CIPSO_V4_HDR_LEN + buf_len;
+
+	return 0;
+
+gentag_failure:
+	if (buf)
+		kfree(buf);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_parsetag_rbm - Parse a CIPSO restricted bitmap tag
+ * @doi_def: the DOI definition
+ * @tag: the CIPSO tag
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Parse a CIPSO restricted bitmap tag (tag type #1) and return the security
+ * attributes in @secattr.  Return zero on success, negatives values on
+ * failure.
+ *
+ */
+static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def,
+				 const unsigned char *tag,
+				 struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val;
+	u8 tag_len = tag[1];
+	u32 level;
+
+	ret_val = cipso_v4_map_lvl_ntoh(doi_def, tag[3], &level);
+	if (ret_val != 0)
+		return ret_val;
+	secattr->mls_lvl = level;
+	secattr->set_mls_lvl = 1;
+
+	if (tag_len > 4) {
+		switch (doi_def->type) {
+		case CIPSO_V4_MAP_PASS:
+			secattr->mls_cat_len = tag_len - 4;
+			break;
+		case CIPSO_V4_MAP_STD:
+			secattr->mls_cat_len =
+				doi_def->map.std->cat.local_size;
+			break;
+		}
+		secattr->mls_cat = kzalloc(secattr->mls_cat_len, GFP_ATOMIC);
+		if (secattr->mls_cat == NULL)
+			return -ENOMEM;
+
+		ret_val = cipso_v4_map_cat_rbm_ntoh(doi_def,
+						    &tag[4],
+						    tag_len - 4,
+						    secattr->mls_cat,
+						    secattr->mls_cat_len);
+		if (ret_val < 0) {
+			kfree(secattr->mls_cat);
+			return ret_val;
+		}
+		secattr->mls_cat_len = ret_val;
+		secattr->set_mls_cat = 1;
+	}
+
+	return 0;
+}
+
+/**
+ * cipso_v4_validate - Validate a CIPSO option
+ * @option: the start of the option, on error it is set to point to the error
+ *
+ * Description:
+ * This routine is called to validate a CIPSO option, it checks all of the
+ * fields to ensure that they are at least valid, see the draft snippet below
+ * for details.  If the option is valid then a zero value is returned and
+ * the value of @option is unchanged.  If the option is invalid then a
+ * non-zero value is returned and @option is adjusted to point to the
+ * offending portion of the option.  From the IETF draft ...
+ *
+ *  "If any field within the CIPSO options, such as the DOI identifier, is not
+ *   recognized the IP datagram is discarded and an ICMP 'parameter problem'
+ *   (type 12) is generated and returned.  The ICMP code field is set to 'bad
+ *   parameter' (code 0) and the pointer is set to the start of the CIPSO field
+ *   that is unrecognized."
+ *
+ */
+int cipso_v4_validate(unsigned char **option)
+{
+	unsigned char *opt = *option;
+	unsigned char *tag;
+	unsigned char opt_iter;
+	unsigned char err_offset = 0;
+	unsigned char locked = 0;
+	u8 opt_len;
+	u8 tag_len;
+	struct cipso_v4_doi *doi_def = NULL;
+	u32 tag_iter;
+
+	/* XXX: caller already checks for length values that are too large */
+	opt_len = opt[1];
+	if (opt_len < 8) {
+		err_offset = 1;
+		goto validate_return;
+	}
+
+	rcu_read_lock();
+	locked = 1;
+	doi_def = cipso_v4_doi_getdef(ntohl(*((u32 *)&opt[2])));
+	if (doi_def == NULL) {
+		err_offset = 2;
+		goto validate_return;
+	}
+
+	opt_iter = 6;
+	tag = opt + opt_iter;
+	while (opt_iter < opt_len) {
+		for (tag_iter = 0; doi_def->tags[tag_iter] != tag[0];)
+			if (doi_def->tags[tag_iter] == CIPSO_V4_TAG_INVALID ||
+			    ++tag_iter == CIPSO_V4_TAG_MAXCNT) {
+				err_offset = opt_iter;
+				goto validate_return;
+			}
+
+		tag_len = tag[1];
+		if (tag_len > (opt_len - opt_iter)) {
+			err_offset = opt_iter + 1;
+			goto validate_return;
+		}
+
+		switch (tag[0]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			if (tag_len < 4) {
+				err_offset = opt_iter + 1;
+				goto validate_return;
+			}
+#if 0
+			/* PM - i think we can skip this check safely */
+			if (tag[2] != 0) {
+				err_offset = opt_iter + 2;
+				goto validate_return;
+			}
+#endif
+			/* PM - how detailed a check do we need to make, are
+			   these last two checks (level and category)
+			   neccessary at this level?  if we do drop these
+			   checks we need to add a bit of code to the *_ntoh()
+			   functions to check for invalid levels/cats. */
+			if (cipso_v4_map_lvl_valid(doi_def, tag[3]) < 0) {
+				err_offset = opt_iter + 3;
+				goto validate_return;
+			}
+			if (tag_len > 4 &&
+			    cipso_v4_map_cat_rbm_valid(doi_def,
+						       &tag[4],
+						       tag_len - 4) < 0) {
+				err_offset = opt_iter + 4;
+				goto validate_return;
+			}
+			break;
+		case CIPSO_V4_TAG_ENUM:
+		case CIPSO_V4_TAG_RANGE:
+		case CIPSO_V4_TAG_PBITMAP:
+		case CIPSO_V4_TAG_FREEFORM:
+		default:
+			err_offset = opt_iter;
+			goto validate_return;
+		}
+
+		tag += tag_len;
+		opt_iter += tag_len;
+	}
+
+validate_return:
+	if (locked)
+		rcu_read_unlock();
+	*option = opt + err_offset;
+	return err_offset;
+}
+
+/**
+ * cipso_v4_error - Send the correct reponse for a bad packet
+ * @skb: the packet
+ * @error: the error code
+ * @gateway: CIPSO gateway flag
+ *
+ * Description:
+ * Based on the error code given in @error, send an ICMP error message back to
+ * the originating host.  Returns zero on success, negative values on failure.
+ * From the IETF draft ...
+ *
+ *  "If the contents of the CIPSO [option] are valid but the security label is
+ *   outside of the configured host or port label range, the datagram is
+ *   discarded and an ICMP 'destination unreachable' (type 3) is generated and
+ *   returned.  The code field of the ICMP is set to 'communication with
+ *   destination network administratively prohibited' (code 9) or to
+ *   'communication with destination host administratively prohibited'
+ *   (code 10).  The value of the code is dependent on whether the originator
+ *   of the ICMP message is acting as a CIPSO host or a CIPSO gateway.  The
+ *   recipient of the ICMP message MUST be able to handle either value.  The
+ *   same procedure is performed if a CIPSO [option] can not be added to an
+ *   IP packet because it is too large to fit in the IP options area."
+ *
+ *  "If the error is triggered by receipt of an ICMP message, the message is
+ *   discarded and no response is permitted (consistent with general ICMP
+ *   processing rules)."
+ *
+ */
+int cipso_v4_error(struct sk_buff *skb,
+		   const int error,
+		   const u32 gateway)
+{
+	switch (error) {
+	case -EACCES:
+		break;
+	default:
+		return 0;
+	}
+
+	if (skb->nh.iph->protocol == IPPROTO_ICMP)
+		return 0;
+
+	if (gateway)
+		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0);
+	else
+		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0);
+
+	return 0;
+}
+
+/**
+ * cipso_v4_socket_setopt - Set the CIPSO option string on a socket
+ * @sock: the socket
+ * @opt: the option string
+ * @opt_len: the option string length
+ *
+ * Description:
+ * Attempt to add the given CIPSO option string to the socket.  The caller is
+ * responsibile for locking and releasing the socket.  Returns zero on success,
+ * negative values on failure.
+ *
+ */
+int cipso_v4_socket_setopt(struct socket *sock,
+			   unsigned char *opt,
+			   u32 opt_len)
+{
+	int ret_val;
+	struct ip_options *ip_opt = NULL;
+	struct sock *sk = sock->sk;
+	struct inet_sock *sk_inet;
+	struct inet_connection_sock *sk_conn;
+
+	ret_val = ip_options_get(&ip_opt, opt, opt_len);
+	if (ret_val != 0)
+		goto socket_setopt_return;
+	ip_opt->is_setbyuser = 0;
+	sk_inet = inet_sk(sk);
+	if (sk_inet->is_icsk) {
+		sk_conn = inet_csk(sk);
+		if (sk_inet->opt)
+			sk_conn->icsk_ext_hdr_len -= sk_inet->opt->optlen;
+		sk_conn->icsk_ext_hdr_len += ip_opt->optlen;
+		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);
+	}
+	ip_opt = xchg(&sk_inet->opt, ip_opt);
+
+	ret_val = 0;
+
+socket_setopt_return:
+	if (ip_opt)
+		kfree(opt);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_socket_setattr - Add a CIPSO option to a socket
+ * @sock: the socket
+ * @doi_def: the CIPSO DOI to use
+ * @secattr: the specific security attributes of the socket
+ *
+ * Description:
+ * Set the CIPSO option on the given socket using the DOI definition and
+ * security attributes passed to the function.  Returns zero on success and
+ * negative values on failure.
+ *
+ */
+int cipso_v4_socket_setattr(const struct socket *sock,
+			    const struct cipso_v4_doi *doi_def,
+			    const struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -EPERM;
+	u32 iter;
+	unsigned char *buf = NULL;
+	u32 buf_len = 0;
+	struct ip_options *opt = NULL;
+	struct sock *sk;
+	struct inet_sock *sk_inet;
+	struct inet_connection_sock *sk_conn;
+
+	/* In the case of sock_create_lite(), the sock->sk field is not
+	   defined yet but it is not a problem as the only users of these
+	   "lite" PF_INET sockets are functions which do an accept() call
+	   afterwards so we will label the socket as part of the accept(). */
+	/* PM - test this, nfs/sunrpc is a "lite" socket user */
+	sk = sock->sk;
+	if (sk == NULL)
+		return 0;
+
+	/* XXX - this code assumes only one tag per CIPSO option which isnt
+	   really a good assumption to make but since we only support the MAC
+	   tags right now it is a safe assumption */
+	iter = 0;
+	do {
+		switch (doi_def->tags[iter]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			ret_val = cipso_v4_gentag_rbm(doi_def,
+						      secattr,
+						      &buf,
+						      &buf_len);
+			break;
+		case CIPSO_V4_TAG_ENUM:
+		case CIPSO_V4_TAG_RANGE:
+		case CIPSO_V4_TAG_PBITMAP:
+		case CIPSO_V4_TAG_FREEFORM:
+		default:
+			ret_val = -EPERM;
+			goto socket_setattr_failure;
+		}
+
+		iter++;
+	} while (ret_val != 0 &&
+		 iter < CIPSO_V4_TAG_MAXCNT &&
+		 doi_def->tags[iter] != CIPSO_V4_TAG_INVALID);
+	if (ret_val != 0)
+		goto socket_setattr_failure;
+
+	ret_val = ip_options_get(&opt, buf, buf_len);
+	if (ret_val != 0)
+		goto socket_setattr_failure;
+	opt->is_setbyuser = 0;
+
+	kfree(buf);
+	buf = NULL;
+
+	lock_sock(sk);
+	sk_inet = inet_sk(sk);
+	if (sk_inet->is_icsk) {
+		sk_conn = inet_csk(sk);
+		if (sk_inet->opt)
+			sk_conn->icsk_ext_hdr_len -= sk_inet->opt->optlen;
+		sk_conn->icsk_ext_hdr_len += opt->optlen;
+		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);
+	}
+	opt = xchg(&sk_inet->opt, opt);
+	release_sock(sk);
+	if (opt)
+		kfree(opt);
+
+	return 0;
+
+socket_setattr_failure:
+	if (buf)
+		kfree(buf);
+	if (opt)
+		kfree(opt);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_socket_getopt - Get the CIPSO IP option string from the socket
+ * @sock: the socket
+ * @opt: the option string
+ * @opt_len: the option string length in bytes
+ *
+ * Description:
+ * If a CIPSO option is present in the socket's IP options then return a
+ * a pointer to the option string.  The caller is responsibile for locking
+ * and releasing the socket.  Returns zero on success, negative values on
+ * failure.
+ *
+ */
+int cipso_v4_socket_getopt(const struct socket *sock,
+			   unsigned char **opt,
+			   u32 *opt_len)
+{
+	struct ip_options *ip_opt = inet_sk(sock->sk)->opt;
+	unsigned char *cipso_ptr;
+
+	if (ip_opt == NULL || ip_opt->cipso == 0)
+		return -ENOMSG;
+	cipso_ptr = ip_opt->__data + ip_opt->cipso - sizeof(struct iphdr);
+
+	*opt = cipso_ptr;
+	*opt_len = cipso_ptr[1];
+
+	return 0;
+}
+
+/**
+ * cipso_v4_socket_getattr - Get the security attributes from a socket
+ * @sock: the socket
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Query @sock to see if there is a CIPSO option attached to the socket and if
+ * there is return the CIPSO security attributes in @secattr.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+int cipso_v4_socket_getattr(const struct socket *sock,
+			    struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -ENOMSG;
+	struct sock *sk;
+	struct inet_sock *sk_inet;
+	unsigned char *cipso_ptr;
+	u32 doi;
+	struct cipso_v4_doi *doi_def;
+
+	sk = sock->sk;
+	lock_sock(sk);
+	sk_inet = inet_sk(sk);
+	if (sk_inet->opt == NULL || sk_inet->opt->cipso == 0)
+		goto socket_getattr_return;
+	cipso_ptr = sk_inet->opt->__data + sk_inet->opt->cipso -
+		sizeof(struct iphdr);
+	ret_val = cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr);
+	if (ret_val == 0)
+		goto socket_getattr_return;
+
+	doi = ntohl(*(u32 *)&cipso_ptr[2]);
+	rcu_read_lock();
+	doi_def = cipso_v4_doi_getdef(doi);
+	if (doi_def == NULL) {
+		rcu_read_unlock();
+		goto socket_getattr_return;
+	}
+	/* XXX - this code assumes only one tag per CIPSO option, the draft is
+	   a little unclear about supporting multiple tags per option
+	   but this seems safe for now */
+	switch (cipso_ptr[6]) {
+	case CIPSO_V4_TAG_RBITMAP:
+		ret_val = cipso_v4_parsetag_rbm(doi_def,
+						&cipso_ptr[6],
+						secattr);
+		break;
+	}
+	rcu_read_unlock();
+
+socket_getattr_return:
+	release_sock(sk);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_skbuff_getattr - Get the security attributes from the CIPSO option
+ * @skb: the packet
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Parse the given packet's CIPSO option and return the security attributes.
+ * Returns zero on success and negative values on failure.
+ *
+ */
+int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+			    struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -ENOMSG;
+	unsigned char *cipso_ptr;
+	u32 doi;
+	struct cipso_v4_doi *doi_def;
+
+	if (!CIPSO_V4_OPTEXIST(skb))
+		return -ENOMSG;
+	cipso_ptr = CIPSO_V4_OPTPTR(skb);
+	if (cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr) == 0)
+		return 0;
+
+	doi = ntohl(*(u32 *)&cipso_ptr[2]);
+	rcu_read_lock();
+	doi_def = cipso_v4_doi_getdef(doi);
+	if (doi_def == NULL)
+		goto skbuff_getattr_return;
+	/* XXX - this code assumes only one tag per CIPSO option which isnt
+	   really a good assumption to make but since we only support the MAC
+	   tags right now it is a safe assumption */
+	switch (cipso_ptr[6]) {
+	case CIPSO_V4_TAG_RBITMAP:
+		ret_val = cipso_v4_parsetag_rbm(doi_def,
+						&cipso_ptr[6],
+						secattr);
+		break;
+	}
+
+skbuff_getattr_return:
+	rcu_read_unlock();
+	return ret_val;
+}
+
+/*
+ * Setup Functions
+ */
+
+/**
+ * cipso_v4_init - Initialize the CIPSO module
+ *
+ * Description:
+ * Initialize the CIPSO module and prepare it for use.  Returns zero on success
+ * and negative values on failure.
+ *
+ */
+static int __init cipso_v4_init(void)
+{
+	return cipso_v4_cache_init(CIPSO_V4_CACHE_BUCKETS);
+}
+
+/* PM - not sure there is any point to this now, delete this func? */
+/**
+ * cipso_v4_exit - Cleanup after the CIPSO module
+ *
+ * Description:
+ * Perform any necessary cleanup tasks before the CIPSO module goes away.
+ *
+ */
+static void __exit cipso_v4_exit(void)
+{
+	cipso_v4_cache_destroy();
+}
+
+subsys_initcall(cipso_v4_init);
+

--
paul moore
linux security @ hp


linux-2.6-net-label_4_7.patch:
 include/net/netlabel.h             |  434 +++++++++++++++++++++++
 net/Kconfig                        |    2 
 net/Makefile                       |    3 
 net/netlabel/Kconfig               |   47 ++
 net/netlabel/Makefile              |   19 +
 net/netlabel/netlabel_domainhash.c |  629 +++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_domainhash.h |   64 +++
 net/netlabel/netlabel_kapi.c       |  392 +++++++++++++++++++++
 net/netlabel/netlabel_mgmt.c       |  689 +++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_mgmt.h       |  248 +++++++++++++
 net/netlabel/netlabel_user.c       |  162 ++++++++
 net/netlabel/netlabel_user.h       |   67 +++
 12 files changed, 2756 insertions(+)

--- NEW FILE linux-2.6-net-label_4_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:39 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:44 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0hdH006628;
	Wed, 21 Jun 2006 16:00:44 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0hQ2023893;
	Wed, 21 Jun 2006 16:00:43 -0400
Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0dMF008527;
	Wed, 21 Jun 2006 16:00:39 -0400
Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
	by atlrel8.hp.com (Postfix) with ESMTP id 4845034729;
	Wed, 21 Jun 2006 16:00:34 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 893471DA49;
	Wed, 21 Jun 2006 20:00:33 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0W4m012174;
	Wed, 21 Jun 2006 16:00:32 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0Whj012173;
	Wed, 21 Jun 2006 16:00:32 -0400
Message-Id: <20060621200032.379679000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:39 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 4/7] NetLabel: core NetLabel subsystem
Content-Disposition: inline; filename=netlabel-core
X-RedHat-Spam-Score: -98.575 
Content-Type: 
X-UID: 70789
X-Length: 84804

Add a new kernel subsystem, NetLabel, to provide explicit packet labeling 
services (CIPSO, RIPSO, etc.) to LSM developers.  NetLabel is designed to work
in conjunction with a LSM to intercept and decode security labels on incoming
network packets as well as ensure that outgoing network packets are labeled
according to the security mechanism employed by the LSM.  The NetLabel
subsystem is configured through a NETLINK interface described in the header
files included in this patch.
---
 include/net/netlabel.h             |  434 +++++++++++++++++++++++
 net/Kconfig                        |    2 
 net/Makefile                       |    3 
 net/netlabel/Kconfig               |   47 ++
 net/netlabel/Makefile              |   19 +
 net/netlabel/netlabel_domainhash.c |  629 +++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_domainhash.h |   64 +++
 net/netlabel/netlabel_kapi.c       |  392 +++++++++++++++++++++
 net/netlabel/netlabel_mgmt.c       |  689 +++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_mgmt.h       |  248 +++++++++++++
 net/netlabel/netlabel_user.c       |  162 ++++++++
 net/netlabel/netlabel_user.h       |   67 +++
 12 files changed, 2756 insertions(+)

Index: linux-2.6.17.i686-quilt/include/net/netlabel.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/include/net/netlabel.h
@@ -0,0 +1,434 @@
+/*
+ * NetLabel System
+ *
+ * The NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_H
+#define _NETLABEL_H
+
+#include <linux/types.h>
+#include <linux/skbuff.h>
+#include <net/netlink.h>
+
+/*
+ * NetLabel - A management interface for maintaining network packet label
+ *            mapping tables for explicit packet labling protocols.
+ *
+ * Network protocols such as CIPSO and RIPSO require a label translation layer
+ * to convert the label on the packet into something meaningful on the host
+ * machine.  In the current Linux implementation these mapping tables live
+ * inside the kernel; NetLabel provides a mechanism for user space applications
+ * to manage these mapping tables.
+ *
+ * NetLabel makes use of NETLINK as a transport layer to send messages between
+ * kernel and user space.  The general format of a NetLabel message is shown
+ * below:
+ *
+ *  +----------+------------------+--------- --- -- -
+ *  | nlmsghdr | subsystem header | payload
+ *  +----------+------------------+--------- --- -- -
+ *
+ * The 'nlmsghdr' struct should be dealt with like any other NETLINK 'nlmsghdr'
+ * struct.  The subsystem header structure is dependent on the subsystem
+ * specified in the 'nlmsghdr->nlmsg_type' and should be defined below,
+ * supporting functions should be defined in the corresponding
+ * net/netlabel/netlabel_<subsys>.h|c file.
+ *
+ */
+
+/*
+ * NetLabel NETLINK protocol
+ */
+
+#define NETLBL_PROTO_VERSION        1
+
+/* NetLabel NETLINK groups */
+#define NETLBL_NLGRP_NONE           0x00000000
+#define NETLBL_NLGRP_MAX            0x00000000
+
+/* NetLabel NETLINK types */
+#define NETLBL_NLTYPE_NONE          0
+#define NETLBL_NLTYPE_MGMT          1
+#define NETLBL_NLTYPE_RIPSO         2
+#define NETLBL_NLTYPE_CIPSOV4       3
+#define NETLBL_NLTYPE_CIPSOV6       4
+#define NETLBL_NLTYPE_UNLABELED     5
+
+/* NetLabel return codes */
+#define NETLBL_E_OK                 0
+
+/*
+ * Helper functions
+ */
+
+/**
+ * netlbl_put_u8 - Write a u8 value into a buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the value specified in @val into the buffer specified by @buffer.
+ *
+ */
+static inline void netlbl_put_u8(unsigned char *buffer, const u8 val)
+{
+	*(u8 *)buffer = val;
+}
+
+/**
+ * netlbl_put_u32 - Write a u32 value into a buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the value specified in @val into the buffer specified by @buffer.
+ *
+ */
+static inline void netlbl_put_u32(unsigned char *buffer, const u32 val)
+{
+	*(u32 *)buffer = val;
+}
+
+/**
+ * netlbl_put_str - Write a string into a buffer
+ * @buffer: the buffer
+ * @val: the string
+ *
+ * Description:
+ * Write the string specified in @val into the buffer specified by @buffer.
+ *
+ */
+static inline void netlbl_put_str(unsigned char *buffer, const char *val)
+{
+	strcpy((char *)buffer, val);
[...2501 lines suppressed...]
+#include "netlabel_unlabeled.h"
+#include "netlabel_cipso_v4.h"
+#include "netlabel_user.h"
+
+/* NETLINK socket */
+/* PM - do we need a lock (or something) around this? */
+static struct sock *netlbl_nl = NULL;
+
+/*
+ * NetLabel Functions
+ */
+
+/**
+ * netlbl_netlink_rcv - Catch incoming NETLINK packets
+ * @sk: the NETLINK socket
+ * @len: absolutely no clue, socket queue length maybe?
+ *
+ * Description:
+ * Receives the NETLINK packet, inspects the packet to determine the correct
+ * NetLabel subsystem and hands the packet off to the correct handler.
+ *
+ */
+static void netlbl_netlink_rcv(struct sock *sk, const int len)
+{
+	struct sk_buff *skb;
+	struct nlmsghdr *nl_hdr;
+
+	/* XXX - should this use netlink_run_queue() instead? */
+	while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+		nl_hdr = (struct nlmsghdr *)skb->data;
+		switch (nl_hdr->nlmsg_type) {
+		case NETLBL_NLTYPE_MGMT:
+			netlbl_mgmt_rcv(skb, nlmsg_data(nl_hdr));
+			break;
+#ifdef CONFIG_NETLABEL_UNLABELED
+		case NETLBL_NLTYPE_UNLABELED:
+			netlbl_unlabel_rcv(skb, nlmsg_data(nl_hdr));
+			break;
+#endif
+#ifdef CONFIG_NETLABEL_CIPSOV4
+		case NETLBL_NLTYPE_CIPSOV4:
+			netlbl_cipsov4_rcv(skb, nlmsg_data(nl_hdr));
+			break;
+#endif
+		}
+		nlmsg_free(skb);
+	}
+}
+
+/**
+ * netlbl_netlink_init - Initialize the netlink socket
+ *
+ * Description:
+ * Create the netlink socket and do any other setup required.  Returns zero on
+ * success and non-zero on failure.
+ *
+ */
+int __init netlbl_netlink_init(void)
+{
+	/* XXX - it might be a good idea to spawn a thread here at startup to
+	   handle the updates to the label mapping databases and have the
+	   netlbl_netlink_rcv() function simply poke the thread but i am unsure
+	   and this approach is much simpler so it wins for now */
+	netlbl_nl = netlink_kernel_create(NETLINK_NETLABEL,
+					  NETLBL_NLGRP_MAX,
+					  netlbl_netlink_rcv, THIS_MODULE);
+	if (netlbl_nl == NULL)
+		return -ENOMEM;
+
+	return 0;
+}
+
+/**
+ * netlbl_exit - Release the netlink socket
+ *
+ * Description:
+ * Close the netlink socket and do any other cleanup required.
+ *
+ */
+void netlbl_netlink_exit(void)
+{
+	/* XXX - if we do have a worker thread, see the above comment in
+	   netlbl_netlink_init(), we should handle any cleanup here
+	   before we go away */
+	if (netlbl_nl != NULL)
+		sock_release(netlbl_nl->sk_socket);
+}
+
+/*
+ * NETLINK I/O Functions
+ */
+
+/**
+ * netlbl_netlink_snd - Send a NetLabel message
+ * @skb: NetLabel message
+ * @pid: destination PID
+ *
+ * Description:
+ * Sends a unicast NetLabel message over the NETLINK socket.
+ *
+ */
+int netlbl_netlink_snd(struct sk_buff *skb, const u32 pid)
+{
+	return nlmsg_unicast(netlbl_nl, skb, pid);
+}
+
+/**
+ * netlbl_netlink_snd - Send a NetLabel message
+ * @skb: NetLabel message
+ * @pid: sending PID
+ * @group: multicast group id
+ *
+ * Description:
+ * Sends a multicast NetLabel message over the NETLINK socket to all members
+ * of @group except @pid.
+ *
+ */
+int netlbl_netlink_snd_multicast(struct sk_buff *skb,
+				 const u32 pid,
+				 const u32 group)
+{
+	return nlmsg_multicast(netlbl_nl, skb, pid, group);
+}
Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_user.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_user.h
@@ -0,0 +1,67 @@
+/*
+ * NetLabel NETLINK Interface
+ *
+ * This file defines the NETLINK interface for the NetLabel system.  The
+ * NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_USER_H
+#define _NETLABEL_USER_H
+
+#include <linux/skbuff.h>
+#include <linux/capability.h>
+
+/* NetLabel NETLINK helper functions */
+
+/**
+ * netlbl_netlink_cap_check - Check the NETLINK msg capabilities
+ * @skb: the NETLINK buffer
+ * @req_cap: the required capability
+ *
+ * Description:
+ * Check the NETLINK buffer's capabilities against the required capabilities.
+ * Returns zero on success, negative values on failure.
+ *
+ */
+static inline int netlbl_netlink_cap_check(const struct sk_buff *skb,
+					   const kernel_cap_t req_cap)
+{
+	if (cap_raised(NETLINK_CB(skb).eff_cap, req_cap))
+		return 0;
+	return -EPERM;
+}
+
+
+/* NetLabel NETLINK I/O functions */
+
+int netlbl_netlink_init(void) __init;
+void netlbl_netlink_exit(void) __exit;
+int netlbl_netlink_snd(struct sk_buff *skb, const u32 pid);
+int netlbl_netlink_snd_multicast(struct sk_buff *skb,
+				 const u32 pid,
+				 const u32 group);
+
+#endif

--
paul moore
linux security @ hp


linux-2.6-net-label_5_7.patch:
 hooks.c                     |   59 +++-
 include/av_inherit.h        |    1 
 include/av_perm_to_string.h |    1 
 include/av_permissions.h    |    1 
 include/flask.h             |    1 
 include/objsec.h            |   11 
 include/security.h          |    2 
 include/selinux_netlabel.h  |   94 +++++++
 nlmsgtab.c                  |   15 +
 ss/Makefile                 |    3 
 ss/ebitmap.c                |  155 +++++++++++
 ss/ebitmap.h                |    6 
 ss/mls.c                    |  160 ++++++++++++
 ss/mls.h                    |   25 +
 ss/selinux_netlabel.c       |  574 ++++++++++++++++++++++++++++++++++++++++++++
 ss/services.c               |   12 
 ss/services.h               |    2 
 17 files changed, 1109 insertions(+), 13 deletions(-)

--- NEW FILE linux-2.6-net-label_5_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:40 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:46 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0jdH006639;
	Wed, 21 Jun 2006 16:00:45 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0i4a023898;
	Wed, 21 Jun 2006 16:00:44 -0400
Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0exO008537;
	Wed, 21 Jun 2006 16:00:42 -0400
Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
	by atlrel8.hp.com (Postfix) with ESMTP id E2C6A34733;
	Wed, 21 Jun 2006 16:00:34 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 4A2C71DA48;
	Wed, 21 Jun 2006 20:00:34 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0XMp012203;
	Wed, 21 Jun 2006 16:00:33 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0Xls012202;
	Wed, 21 Jun 2006 16:00:33 -0400
Message-Id: <20060621200033.140169000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:40 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 5/7] NetLabel: SELinux support
Content-Disposition: inline; filename=netlabel-selinux-2.6.17
X-RedHat-Spam-Score: -99.715 
Content-Type: 
X-UID: 70791
X-Length: 48868

Add NetLabel support to the SELinux LSM.  The most significant part of this
patch is the addition of NetLabel hooks into the following SELinux LSM hooks:

 * selinux_file_permission()
 * selinux_socket_sendmsg()
 * selinux_socket_post_create()
 * selinux_socket_post_accept() [NEW]
 * selinux_socket_sock_rcv_skb()
 * selinux_socket_getpeersec_stream()
 * selinux_socket_getpeersec_dgram()

The basic reasoning behind this patch is that outgoing packets are "NetLabel'd"
by labeling their socket and the NetLabel security attributes are checked via
the additional hook in selinux_socket_sock_rcv_skb().  NetLabel itself is only
a labeling mechanism, similar to filesystem extended attributes, it is up to
the SELinux enforcement mechanism to perform the actual access checks.

In addition to the changes outlined above this patch also includes some changes
to the extended bitmap (ebitmap) and multi-level security (mls) code to import
and export SELinux TE/MLS attributes into and out of NetLabel.
---
 security/selinux/hooks.c                     |   59 ++
 security/selinux/include/av_inherit.h        |    1 
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/flask.h             |    1 
 security/selinux/include/objsec.h            |   11 
 security/selinux/include/security.h          |    2 
 security/selinux/include/selinux_netlabel.h  |   94 ++++
 security/selinux/nlmsgtab.c                  |   15 
 security/selinux/ss/Makefile                 |    3 
 security/selinux/ss/ebitmap.c                |  155 +++++++
 security/selinux/ss/ebitmap.h                |    6 
 security/selinux/ss/mls.c                    |  160 +++++++
 security/selinux/ss/mls.h                    |   25 +
 security/selinux/ss/selinux_netlabel.c       |  574 +++++++++++++++++++++++++++
 security/selinux/ss/services.c               |   12 
 security/selinux/ss/services.h               |    2 
 17 files changed, 1109 insertions(+), 13 deletions(-)

Index: linux-2.6.17.i686-quilt/security/selinux/hooks.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/hooks.c
+++ linux-2.6.17.i686-quilt/security/selinux/hooks.c
@@ -12,6 +12,8 @@
  *  Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris at redhat.com>
  *  Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
  *                          <dgoeddel at trustedcs.com>
+ *  Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
+ *                     Paul Moore, <paul.moore at hp.com>
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License version 2,
@@ -74,6 +76,7 @@
 #include "objsec.h"
 #include "netif.h"
 #include "xfrm.h"
+#include "selinux_netlabel.h"
 
 #define XATTR_SELINUX_SUFFIX "selinux"
 #define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
@@ -2293,6 +2296,7 @@ static int selinux_inode_listsecurity(st
 
 static int selinux_file_permission(struct file *file, int mask)
 {
+	int rc;
 	struct inode *inode = file->f_dentry->d_inode;
 
 	if (!mask) {
@@ -2304,8 +2308,12 @@ static int selinux_file_permission(struc
 	if ((file->f_flags & O_APPEND) && (mask & MAY_WRITE))
 		mask |= MAY_APPEND;
 
-	return file_has_perm(current, file,
-			     file_mask_to_av(inode->i_mode, mask));
+	rc = file_has_perm(current, file,
+			   file_mask_to_av(inode->i_mode, mask));
+	if (rc)
+		return rc;
+
+	return selinux_netlbl_inode_permission(inode, mask);
 }
 
 static int selinux_file_alloc_security(struct file *file)
@@ -2922,8 +2930,8 @@ out:
 	return err;
 }
 
-static void selinux_socket_post_create(struct socket *sock, int family,
-				       int type, int protocol, int kern)
+static int selinux_socket_post_create(struct socket *sock, int family,
+				      int type, int protocol, int kern)
 {
 	struct inode_security_struct *isec;
 	struct task_security_struct *tsec;
@@ -2935,7 +2943,7 @@ static void selinux_socket_post_create(s
 	isec->sid = kern ? SECINITSID_KERNEL : tsec->sid;
 	isec->initialized = 1;
 
-	return;
+	return selinux_netlbl_socket_create(sock, family, isec->sid);
 }
 
 /* Range of port numbers used to automatically bind.
@@ -3113,10 +3121,24 @@ static int selinux_socket_accept(struct 
 	return 0;
 }
 
+#ifdef CONFIG_NETLABEL
+static void selinux_socket_post_accept(struct socket *sock,
+				       struct socket *newsock)
+{
+	selinux_netlbl_socket_accept(sock, newsock);
+}
+#endif /* CONFIG_NETLABEL */
+
 static int selinux_socket_sendmsg(struct socket *sock, struct msghdr *msg,
  				  int size)
 {
-	return socket_has_perm(current, sock, SOCKET__WRITE);
+	int rc;
+
+	rc = socket_has_perm(current, sock, SOCKET__WRITE);
+	if (rc)
+		return rc;
+
+	return selinux_netlbl_inode_permission(SOCK_INODE(sock), MAY_WRITE);
 }
 
 static int selinux_socket_recvmsg(struct socket *sock, struct msghdr *msg,
@@ -3306,10 +3328,15 @@ static int selinux_socket_sock_rcv_skb(s
 
 		err = avc_has_perm(sock_sid, port_sid,
 				   sock_class, recv_perm, &ad);
+		if (err)
+			goto out;
 	}
 
-	if (!err)
-		err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
+	err = selinux_netlbl_sock_rcv_skb(sock_class, sock_sid, skb, &ad);
+	if (err)
+		goto out;
+
+	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
 
 out:	
 	return err;
@@ -3333,8 +3360,9 @@ static int selinux_socket_getpeersec_str
 		peer_sid = ssec->peer_sid;
 	}
 	else if (isec->sclass == SECCLASS_TCP_SOCKET) {
-		peer_sid = selinux_socket_getpeer_stream(sock->sk);
-
+		err = selinux_netlbl_socket_getpeersec_stream(sock, &peer_sid);
+		if (err || peer_sid == SECSID_NULL)
+			peer_sid = selinux_socket_getpeer_stream(sock->sk);
 		if (peer_sid == SECSID_NULL) {
 			err = -ENOPROTOOPT;
 			goto out;
@@ -3369,8 +3397,12 @@ out:	
 
 static int selinux_socket_getpeersec_dgram(struct sk_buff *skb, char **secdata, u32 *seclen)
 {
-	int err = 0;
-	u32 peer_sid = selinux_socket_getpeer_dgram(skb);
+	int err;
+	u32 peer_sid;
+
+	err = selinux_netlbl_socket_getpeersec_dgram(skb, &peer_sid);
+	if (err || peer_sid == SECSID_NULL)
+		peer_sid = selinux_socket_getpeer_dgram(skb);
 
 	if (peer_sid == SECSID_NULL)
 		return -EINVAL;
@@ -4353,6 +4385,9 @@ static struct security_operations selinu
 	.socket_connect =		selinux_socket_connect,
 	.socket_listen =		selinux_socket_listen,
 	.socket_accept =		selinux_socket_accept,
+#ifdef CONFIG_NETLABEL
+	.socket_post_accept =		selinux_socket_post_accept,
+#endif
 	.socket_sendmsg =		selinux_socket_sendmsg,
 	.socket_recvmsg =		selinux_socket_recvmsg,
 	.socket_getsockname =		selinux_socket_getsockname,
Index: linux-2.6.17.i686-quilt/security/selinux/include/av_inherit.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/av_inherit.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/av_inherit.h
@@ -29,3 +29,4 @@
    S_(SECCLASS_NETLINK_IP6FW_SOCKET, socket, 0x00400000UL)
    S_(SECCLASS_NETLINK_DNRT_SOCKET, socket, 0x00400000UL)
    S_(SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET, socket, 0x00400000UL)
+   S_(SECCLASS_NETLINK_NETLABEL_SOCKET, socket, 0x00400000UL)
Index: linux-2.6.17.i686-quilt/security/selinux/include/av_perm_to_string.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/av_perm_to_string.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/av_perm_to_string.h
@@ -239,3 +239,4 @@
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto")
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__RECVFROM, "recvfrom")
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__SETCONTEXT, "setcontext")
+   S_(SECCLASS_NETLINK_NETLABEL_SOCKET, NETLINK_NETLABEL_SOCKET__NLMSG_WRITE, "nlmsg_write")
Index: linux-2.6.17.i686-quilt/security/selinux/include/av_permissions.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/av_permissions.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/av_permissions.h
@@ -933,3 +933,4 @@
 #define NETLINK_KOBJECT_UEVENT_SOCKET__SEND_MSG   0x00100000UL
 #define NETLINK_KOBJECT_UEVENT_SOCKET__NAME_BIND  0x00200000UL
 
+#define NETLINK_NETLABEL_SOCKET__NLMSG_WRITE      0x00000001UL
Index: linux-2.6.17.i686-quilt/security/selinux/include/flask.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/flask.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/flask.h
@@ -60,6 +60,7 @@
 #define SECCLASS_NSCD                                    53
 #define SECCLASS_ASSOCIATION                             54
 #define SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET           55
+#define SECCLASS_NETLINK_NETLABEL_SOCKET                 56
 
 /*
  * Security identifier indices for initial entities
Index: linux-2.6.17.i686-quilt/security/selinux/include/objsec.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/objsec.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/objsec.h
@@ -35,6 +35,14 @@ struct task_security_struct {
 	u32 ptrace_sid;      /* SID of ptrace parent */
 };
 
+struct netlbl_security_struct {
+	u32 netlbl_sid;           /* SID used to set the NetLabel */
+	u32 peer_sid;             /* SID of the connected peer */
+	u32 req_netlbl:1,         /* socket requires a NetLabel label */
+	    labeled:1,            /* socket is labeled with NetLabel */
+	    __unused:30;
+};
+
 struct inode_security_struct {
         struct inode *inode;           /* back pointer to inode object */
 	struct list_head list;         /* list of inode_security_struct */
@@ -44,6 +52,9 @@ struct inode_security_struct {
 	unsigned char initialized;     /* initialization flag */
 	struct semaphore sem;
 	unsigned char inherit;         /* inherit SID from parent entry */
+#ifdef CONFIG_NETLABEL
+	struct netlbl_security_struct netlbl;
+#endif
 };
 
 struct file_security_struct {
Index: linux-2.6.17.i686-quilt/security/selinux/include/security.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/security.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/security.h
@@ -8,6 +8,8 @@
 #ifndef _SELINUX_SECURITY_H_
 #define _SELINUX_SECURITY_H_
 
+#include <linux/skbuff.h>
+
 #include "flask.h"
 
 #define SECSID_NULL			0x00000000 /* unspecified SID */
Index: linux-2.6.17.i686-quilt/security/selinux/include/selinux_netlabel.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/security/selinux/include/selinux_netlabel.h
@@ -0,0 +1,94 @@
+/*
+ * SELinux interface to the NetLabel subsystem
+ *
+ * Author : Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _SELINUX_NETLABEL_H_
+#define _SELINUX_NETLABEL_H_
+
+#ifdef CONFIG_NETLABEL
+void selinux_netlbl_cache_invalidate(void);
+
+int selinux_netlbl_inode_permission(struct inode *inode, int mask);
+
+int selinux_netlbl_socket_create(struct socket *sock,
+				 const int sock_family,
+				 u32 sid);
+void selinux_netlbl_socket_accept(struct socket *sock, struct socket *newsock);
+int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
+				const u32 sock_sid,
+				struct sk_buff *skb,
+				struct avc_audit_data *ad);
+int selinux_netlbl_socket_getpeersec_stream(struct socket *sock,
+					    u32 *peer_sid);
+int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb, u32 *peer_sid);
+#else
+static inline void selinux_netlbl_cache_invalidate(void)
+{
+	return;
+}
+
+static inline int selinux_netlbl_inode_permission(struct inode *inode,
+						  int mask)
+{
+	return 0;
+}
+
+static inline int selinux_netlbl_socket_create(struct socket *sock,
+					       const int sock_family,
+					       u32 sid)
+{
+	return 0;
+}
+
+static inline void selinux_netlbl_socket_accept(struct socket *sock,
+						struct socket *newsock)
+{
+	return;
+}
+
+static inline int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
+					      const u32 sock_sid,
+					      struct sk_buff *skb,
+					      struct avc_audit_data *ad)
+{
+	return 0;
+}
+
+static inline int selinux_netlbl_socket_getpeersec_stream(struct socket *sock,
+							  u32 *peer_sid)
+{
+	*peer_sid = SECSID_NULL;
+	return 0;
+}
+
+static inline int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb,
+							 u32 *peer_sid)
+{
+	*peer_sid = SECSID_NULL;
+	return 0;
+}
+#endif /* CONFIG_NETLABEL */
+
+#endif
Index: linux-2.6.17.i686-quilt/security/selinux/nlmsgtab.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/nlmsgtab.c
+++ linux-2.6.17.i686-quilt/security/selinux/nlmsgtab.c
@@ -19,6 +19,7 @@
 #include <linux/inet_diag.h>
 #include <linux/xfrm.h>
 #include <linux/audit.h>
+#include <net/netlabel.h>
 
 #include "flask.h"
 #include "av_permissions.h"
@@ -116,6 +117,15 @@ static struct nlmsg_perm nlmsg_audit_per
 	{ AUDIT_WATCH_LIST,	NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
 };
 
+static struct nlmsg_perm nlmsg_netlabel_perms[] =
+{
+	{ NETLBL_NLTYPE_NONE,        NETLINK_NETLABEL_SOCKET__NLMSG_WRITE },
+	{ NETLBL_NLTYPE_MGMT,        NETLINK_NETLABEL_SOCKET__NLMSG_WRITE },
+	{ NETLBL_NLTYPE_RIPSO,       NETLINK_NETLABEL_SOCKET__NLMSG_WRITE },
+	{ NETLBL_NLTYPE_CIPSOV4,     NETLINK_NETLABEL_SOCKET__NLMSG_WRITE },
+	{ NETLBL_NLTYPE_CIPSOV6,     NETLINK_NETLABEL_SOCKET__NLMSG_WRITE },
+	{ NETLBL_NLTYPE_UNLABELED,   NETLINK_NETLABEL_SOCKET__NLMSG_WRITE },
+};
 
 static int nlmsg_perm(u16 nlmsg_type, u32 *perm, struct nlmsg_perm *tab, size_t tabsize)
 {
@@ -169,6 +179,11 @@ int selinux_nlmsg_lookup(u16 sclass, u16
 		}
 		break;
 
+	case SECCLASS_NETLINK_NETLABEL_SOCKET:
+		err = nlmsg_perm(nlmsg_type, perm, nlmsg_netlabel_perms,
+				 sizeof(nlmsg_netlabel_perms));
+		break;
+
 	/* No messaging from userspace, or class unknown/unhandled */
 	default:
 		err = -ENOENT;
Index: linux-2.6.17.i686-quilt/security/selinux/ss/Makefile
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/Makefile
+++ linux-2.6.17.i686-quilt/security/selinux/ss/Makefile
@@ -7,3 +7,6 @@ obj-y := ss.o
 
 ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o conditional.o mls.o
 
+ifeq ($(CONFIG_NETLABEL),y)
+obj-y += selinux_netlabel.o
+endif
Index: linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/ebitmap.c
+++ linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.c
@@ -3,6 +3,14 @@
  *
  * Author : Stephen Smalley, <sds at epoch.ncsc.mil>
  */
+/*
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added ebitmap_export() and ebitmap_import()
+ *
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ */
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
@@ -59,6 +67,153 @@ int ebitmap_cpy(struct ebitmap *dst, str
 	return 0;
 }
 
+/**
+ * ebitmap_export - Export an ebitmap to a unsigned char bitmap string
+ * @src: the ebitmap to export
+ * @dst: the resulting bitmap string
+ * @dst_len: length of dst in bytes
+ *
+ * Description:
+ * Allocate a buffer at least src->highbit bits long and export the extensible
+ * bitmap into the buffer.  The bitmap string will be in little endian format,
+ * i.e. LSB first.  The value returned in dst_len may not the true size of the
+ * buffer as the length of the buffer is rounded up to a multiple of MAPTYPE.
+ * The caller must free the buffer when finished. Returns zero on success,
+ * negative values on failure.
+ *
+ */
+int ebitmap_export(const struct ebitmap *src,
+		   unsigned char **dst,
+		   u32 *dst_len)
+{
+	u32 bitmap_len;
+	unsigned char *bitmap;
+	struct ebitmap_node *iter_node;
+	MAPTYPE node_val;
+	u32 bitmap_byte;
+	unsigned char bitmask;
+
+	if (src == NULL || dst == NULL || dst_len == NULL)
+		return -EINVAL;
+
+	*dst = NULL;
+	*dst_len = 0;
+
+	bitmap_len = src->highbit / 8;
+	if (src->highbit % 8 > 0)
+		bitmap_len += 1;
+	if (bitmap_len == 0)
+		return -EINVAL;
+
+	bitmap = kzalloc(bitmap_len + sizeof(MAPTYPE) -
+			 (bitmap_len % sizeof(MAPTYPE)),
+			 GFP_ATOMIC);
+	if (bitmap == NULL)
+		return -ENOMEM;
+
+	/* PM - there _has_ to be a faster way to do this, work on this more */
+	iter_node = src->node;
+	do {
+		bitmap_byte = iter_node->startbit / 8;
+		bitmask = 0x80;
+		node_val = iter_node->map;
+		do {
+			if (bitmask == 0) {
+				bitmap_byte++;
+				bitmask = 0x80;
+			}
+			if (node_val & (MAPTYPE)0x01)
+				bitmap[bitmap_byte] |= bitmask;
+			node_val >>= 1;
+			bitmask >>= 1;
+		} while (node_val > 0);
+		iter_node = iter_node->next;
+	} while (iter_node);
+
+	*dst = bitmap;
+	*dst_len = bitmap_len;
+	return 0;
+}
+
+/**
+ * ebitmap_import - Import an unsigned char bitmap string into an ebitmap
+ * @src: the bitmap string
+ * @src_len: the bitmap length in bytes
+ * @dst: the empty ebitmap
+ *
+ * Description:
+ * This function takes a little endian bitmap string in src and imports it into
+ * the ebitmap pointed to by dst.  Returns zero on success, negative values on
+ * failure.
+ *
+ */
+int ebitmap_import(const unsigned char *src,
+		   const u32 src_len,
+		   struct ebitmap *dst)
+{
+	u32 src_off = 0;
+	struct ebitmap_node *node_new;
+	struct ebitmap_node *node_last = NULL;
+	u32 src_rem = src_len;
+	MAPTYPE tmp_val;
+	u32 iter;
+	u32 iter_bit;
+	unsigned char src_byte;
+
+	if (src == NULL || dst == NULL || src_len == 0)
+		return -EINVAL;
+
+	do {
+		node_new = kzalloc(sizeof(*node_new), GFP_ATOMIC);
+		if (node_new == NULL) {
+			ebitmap_destroy(dst);
+			return -ENOMEM;
+		}
+
+		/* PM - there _has_ to be a faster way to do this,
+		   work on this more */
+		if (src_rem >= sizeof(MAPTYPE))
+			iter = sizeof(MAPTYPE);
+		else
+			iter = src_rem;
+		tmp_val = 0;
+		while (iter > 0) {
+			src_byte = src[src_off + --iter];
+			if (src_byte > 0)
+				for (iter_bit = 0; iter_bit < 8; iter_bit++) {
+					tmp_val <<= 1;
+					tmp_val |= src_byte & 0x01;
+					src_byte >>= 1;
+				}
+			else
+				tmp_val <<= 8;
+		}
+		node_new->map = tmp_val;
+		node_new->startbit = src_off * 8;
+
+		if (node_last != NULL)
+			node_last->next = node_new;
+		else
+			dst->node = node_new;
+		node_last = node_new;
+
+		if (src_rem >= sizeof(MAPTYPE)) {
+			src_off += sizeof(MAPTYPE);
+			src_rem -= sizeof(MAPTYPE);
+		} else
+			src_off += src_rem;
+	} while (src_off < src_len);
+
+	tmp_val = node_last->map;
+	dst->highbit = node_last->startbit;
+	while (tmp_val >= 1) {
+		dst->highbit += 1;
+		tmp_val >>= 1;
+	}
+
+	return 0;
+}
+
 int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2)
 {
 	struct ebitmap_node *n1, *n2;
Index: linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/ebitmap.h
+++ linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.h
@@ -69,6 +69,12 @@ static inline int ebitmap_node_get_bit(s
 
 int ebitmap_cmp(struct ebitmap *e1, struct ebitmap *e2);
 int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src);
+int ebitmap_export(const struct ebitmap *src,
+		   unsigned char **dst,
+		   u32 *dst_len);
+int ebitmap_import(const unsigned char *src,
+		   const u32 src_len,
+		   struct ebitmap *dst);
 int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2);
 int ebitmap_get_bit(struct ebitmap *e, unsigned long bit);
 int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value);
Index: linux-2.6.17.i686-quilt/security/selinux/ss/mls.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/mls.c
+++ linux-2.6.17.i686-quilt/security/selinux/ss/mls.c
@@ -10,6 +10,13 @@
  *
  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  */
+/*
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added support to import/export the MLS label
+ *
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ */
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -585,3 +592,156 @@ int mls_compute_sid(struct context *scon
 	return -EINVAL;
 }
 
+/**
+ * mls_export_lvl - Export the MLS sensitivity levels
+ * @context: the security context
+ * @lvl_low: the low sensitivity level
+ * @lvl_high: the high sensitivity level
+ *
+ * Description:
+ * Given the security context copy the low MLS sensitivity level into lvl_low
+ * and the high sensitivity level in lvl_high.  The MLS levels are only
+ * exported if the pointers are not NULL, if they are NULL then that level is
+ * not exported.  Returns zero on success, negative values on failure.
+ *
+ */
+int mls_export_lvl(const struct context *context, u32 *lvl_low, u32 *lvl_high)
+{
+	if (!selinux_mls_enabled)
+		return 0;
+
+	if (lvl_low != NULL)
+		*lvl_low = context->range.level[0].sens - 1;
+	if (lvl_high != NULL)
+		*lvl_high = context->range.level[1].sens - 1;
+
+	return 0;
+}
+
+/**
+ * mls_import_lvl - Import the MLS sensitivity levels
+ * @context: the security context
+ * @lvl_low: the low sensitivity level
+ * @lvl_high: the high sensitivity level
+ *
+ * Description:
+ * Given the security context and the two sensitivty levels, set the MLS levels
+ * in the context according the two given as parameters.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+int mls_import_lvl(struct context *context,
+		   const u32 lvl_low,
+		   const u32 lvl_high)
+{
+	if (!selinux_mls_enabled)
+		return 0;
+
+	context->range.level[0].sens = lvl_low + 1;
+	context->range.level[1].sens = lvl_high + 1;
+
+	return 0;
+}
+
+/**
+ * mls_export_cat - Export the MLS categories
+ * @context: the security context
+ * @cat_low: the low category
+ * @cat_low_len: length of the cat_low bitmap in bytes
+ * @cat_high: the high category
+ * @cat_high_len: length of the cat_high bitmap in bytes
+ *
+ * Description:
+ * Given the security context export the low MLS category bitmap into cat_low
+ * and the high category bitmap into cat_high.  The MLS categories are only
+ * exported if the pointers are not NULL, if they are NULL then that level is
+ * not exported.  The caller is responsibile for freeing the memory when
+ * finished.  Returns zero on success, negative values on failure.
+ *
+ */
+int mls_export_cat(const struct context *context,
+		   unsigned char **cat_low,
+		   u32 *cat_low_len,
+		   unsigned char **cat_high,
+		   u32 *cat_high_len)
+{
+	int ret_val = -EPERM;
+
+	if (!selinux_mls_enabled)
+		return 0;
+
+	if (cat_low != NULL && cat_low_len != NULL) {
+		ret_val = ebitmap_export(&context->range.level[0].cat,
+					 cat_low,
+					 cat_low_len);
+		if (ret_val != 0)
+			goto export_cat_failure;
+	}
+	if (cat_high != NULL && cat_high_len != NULL) {
+		ret_val = ebitmap_export(&context->range.level[1].cat,
+					 cat_high,
+					 cat_high_len);
+		if (ret_val != 0)
+			goto export_cat_failure;
+	}
+
+	return 0;
+
+export_cat_failure:
+	if (cat_low != NULL && *cat_low != NULL)
+		kfree(*cat_low);
+	if (cat_high != NULL && *cat_high != NULL)
+		kfree(*cat_high);
+	return ret_val;
+}
+
+/**
+ * mls_import_cat - Import the MLS categories
+ * @context: the security context
+ * @cat_low: the low category
+ * @cat_low_len: length of the cat_low bitmap in bytes
+ * @cat_high: the high category
+ * @cat_high_len: length of the cat_high bitmap in bytes
+ *
+ * Description:
+ * Given the security context and the two category bitmap strings import the
+ * categories into the security context.  The MLS categories are only imported
+ * if the pointers are not NULL, if they are NULL they are skipped.  Returns
+ * zero on success, negative values on failure.
+ *
+ */
+int mls_import_cat(struct context *context,
+		   const unsigned char *cat_low,
+		   const u32 cat_low_len,
+		   const unsigned char *cat_high,
+		   const u32 cat_high_len)
+{
+	int ret_val = -EPERM;
+
+	if (!selinux_mls_enabled)
+		return 0;
+
+	if (cat_low != NULL && cat_low_len > 0) {
+		ret_val = ebitmap_import(cat_low,
+					 cat_low_len,
+					 &context->range.level[0].cat);
+		if (ret_val != 0)
+			goto import_cat_failure;
+	}
+	if (cat_high != NULL && cat_high_len > 0) {
+		ret_val = ebitmap_import(cat_high,
+					 cat_high_len,
+					 &context->range.level[1].cat);
+		if (ret_val != 0)
+			goto import_cat_failure;
+	}
+
+	return 0;
+
+import_cat_failure:
+	if (cat_low)
+		ebitmap_destroy(&context->range.level[0].cat);
+	if (cat_high)
+		ebitmap_destroy(&context->range.level[1].cat);
+	return ret_val;
+}
Index: linux-2.6.17.i686-quilt/security/selinux/ss/mls.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/mls.h
+++ linux-2.6.17.i686-quilt/security/selinux/ss/mls.h
@@ -10,6 +10,13 @@
  *
  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  */
+/*
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added support to import/export the MLS label
+ *
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ */
 
 #ifndef _SS_MLS_H_
 #define _SS_MLS_H_
@@ -42,5 +49,23 @@ int mls_compute_sid(struct context *scon
 int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
                          struct context *usercon);
 
+int mls_export_lvl(const struct context *context,
+		   u32 *lvl_low,
+		   u32 *lvl_high);
+int mls_import_lvl(struct context *context,
+		   const u32 lvl_low,
+		   const u32 lvl_high);
+
+int mls_export_cat(const struct context *context,
+                   unsigned char **cat_low,
+                   u32 *cat_low_len,
+                   unsigned char **cat_high,
+                   u32 *cat_high_len);
+int mls_import_cat(struct context *context,
+                   const unsigned char *cat_low,
+                   const u32 cat_low_len,
+                   const unsigned char *cat_high,
+                   const u32 cat_high_len);
+
 #endif	/* _SS_MLS_H */
 
Index: linux-2.6.17.i686-quilt/security/selinux/ss/selinux_netlabel.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/security/selinux/ss/selinux_netlabel.c
@@ -0,0 +1,574 @@
+/*
+ * SELinux interface to the NetLabel subsystem
+ *
+ * Author : Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/audit.h>
+#include <net/sock.h>
+#include <net/netlabel.h>
+
+#include "avc.h"
+#include "context.h"
+#include "sidtab.h"
+#include "services.h"
+#include "mls.h"
+#include "objsec.h"
+
+/*
+ * This is the structure we store inside the NetLabel cache block.
+ */
+#define NETLBL_CACHE(x)           ((struct netlbl_cache *)(x))
+#define NETLBL_CACHE_T_NONE       0
+#define NETLBL_CACHE_T_SID        1
+#define NETLBL_CACHE_T_MLSLBL     2
+struct netlbl_cache {
+	u32 type;
+	union {
+		u32 sid;
+		struct mls_level mls_label;
+	} data;
+};
+
+/**
+ * selinux_netlbl_cache_free - Free the NetLabel cached data
+ * @data: the data to free
+ *
+ * Description:
+ * This function is intended to be used as the free() callback inside the
+ * netlbl_lsm_cache structure.
+ *
+ */
+static void selinux_netlbl_cache_free(const void *data)
+{
+	struct netlbl_cache *cache = NETLBL_CACHE(data);
+	switch (cache->type) {
+	case NETLBL_CACHE_T_MLSLBL:
+		ebitmap_destroy(&cache->data.mls_label.cat);
+		break;
+	}
+	kfree(data);
+}
+
+/**
+ * selinux_netlbl_cache_add - Add an entry to the NetLabel cache
+ * @skb: the packet
+ * @ctx: the SELinux context
+ *
+ * Description:
+ * Attempt to cache the context in @ctx, which was derived from the packet in
+ * @skb, in the NetLabel subsystem cache.
+ *
+ */
+static void selinux_netlbl_cache_add(struct sk_buff *skb, struct context *ctx)
+{
+	struct netlbl_cache *cache = NULL;
+	struct netlbl_lsm_secattr secattr;
+
+	netlbl_secattr_init(&secattr);
+
+	cache = kzalloc(sizeof(*cache),	GFP_ATOMIC);
+	if (cache == NULL)
+		goto netlbl_cache_add_return;
+	secattr.cache.free = selinux_netlbl_cache_free;
+	secattr.cache.data = (void *)cache;
+	secattr.set_cache = 1;
+
+	if (ebitmap_cpy(&cache->data.mls_label.cat,
+			&ctx->range.level[0].cat) != 0)
+		goto netlbl_cache_add_return;
+	cache->data.mls_label.sens = ctx->range.level[0].sens;
+	cache->type = NETLBL_CACHE_T_MLSLBL;
+
+	if (netlbl_cache_add(skb, &secattr) != 0)
+		goto netlbl_cache_add_return;
+	secattr.set_cache = 0;
+
+netlbl_cache_add_return:
+	netlbl_secattr_destroy(&secattr);
+}
+
+/**
+ * selinux_netlbl_cache_invalidate - Invalidate the NetLabel cache
+ *
+ * Description:
+ * Invalidate the NetLabel security attribute mapping cache.
+ *
+ */
+void selinux_netlbl_cache_invalidate(void)
+{
+	netlbl_cache_invalidate();
+}
+
+/**
+ * selinux_netlbl_domain_export - Exports the type of a given context
+ * @context: the security context
+ * @scontext: the resulting type string
+ * @scontext_len: the length of scontext including the NULL byte
+ *
+ * Description:
+ * Allocate a buffer for the type name specified in context and copy the type
+ * name into the buffer.  The caller must free the buffer when finished.
+ * Returns zero on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_domain_export(const struct context *context,
+					char **scontext,
+					u32 *scontext_len)
+{
+	char *str;
+	u32 str_len;
+
+	*scontext = NULL;
+	if (scontext_len != NULL)
+		*scontext_len = 0;
+	str_len = strlen(policydb.p_type_val_to_name[context->type - 1]) + 1;
+	str = kmalloc(str_len, GFP_ATOMIC);
+	if (str == NULL)
+		return -ENOMEM;
+	strcpy(str, policydb.p_type_val_to_name[context->type - 1]);
+
+	*scontext = str;
+	if (scontext_len != NULL)
+		*scontext_len = str_len;
+	return 0;
+}
+
+/**
+ * selinux_netlbl_secattr_to_sid - Convert a NetLabel secattr to a SELinux SID
+ * @skb: the network packet
+ * @secattr: the NetLabel packet security attributes
+ * @base_sid: the SELinux SID to use as a context for MLS only attributes
+ * @sid: the SELinux SID
+ *
+ * Description:
+ * Convert the given NetLabel packet security attributes in @secattr into a
+ * SELinux SID.  If the @secattr field does not contain a full SELinux
+ * SID/context then use the context in @base_sid as the foundation.  If @skb
+ * is not NULL attempt to cache as much data as possibile.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_secattr_to_sid(struct sk_buff *skb,
+					  struct netlbl_lsm_secattr *secattr,
+					  const u32 base_sid,
+					  u32 *sid)
+{
+	int ret_val = -EIDRM;
+	struct context *ctx;
+	struct context ctx_new;
+	struct netlbl_cache *cache;
+	u32 ctx_new_destroy = 0;
+
+	if (secattr->set_cache) {
+		cache = NETLBL_CACHE(secattr->cache.data);
+		switch (cache->type) {
+		case NETLBL_CACHE_T_SID:
+			*sid = cache->data.sid;
+			break;
+		case NETLBL_CACHE_T_MLSLBL:
+			ctx = sidtab_search(&sidtab, base_sid);
+			if (ctx == NULL)
+				goto netlbl_secattr_to_sid_failure;
+			ret_val = context_cpy(&ctx_new, ctx);
+			if (ret_val != 0)
+				goto netlbl_secattr_to_sid_failure;
+			ctx_new_destroy = 1;
+			mls_context_destroy(&ctx_new);
+
+			ctx_new.range.level[0].sens =
+				cache->data.mls_label.sens;
+			ret_val = ebitmap_cpy(&ctx_new.range.level[0].cat,
+					      &cache->data.mls_label.cat);
+			if (ret_val != 0)
+				goto netlbl_secattr_to_sid_failure;
+			ctx_new.range.level[1].sens =
+				cache->data.mls_label.sens;
+			ret_val = ebitmap_cpy(&ctx_new.range.level[1].cat,
+					      &cache->data.mls_label.cat);
+			if (ret_val != 0)
+				goto netlbl_secattr_to_sid_failure;
+
+			ret_val = sidtab_context_to_sid(&sidtab,
+							&ctx_new,
+							sid);
+			break;
+		default:
+			goto netlbl_secattr_to_sid_failure;
+		}
+	} else if (secattr->set_mls_lvl) {
+		ctx = sidtab_search(&sidtab, base_sid);
+		if (ctx == NULL)
+			goto netlbl_secattr_to_sid_failure;
+		ret_val = context_cpy(&ctx_new, ctx);
+		if (ret_val != 0)
+			goto netlbl_secattr_to_sid_failure;
+		ctx_new_destroy = 1;
+		mls_context_destroy(&ctx_new);
+
+		if (mls_import_lvl(&ctx_new,
+				   secattr->mls_lvl,
+				   secattr->mls_lvl) != 0)
+			goto netlbl_secattr_to_sid_failure;
+		if (secattr->set_mls_cat) {
+			if (mls_import_cat(&ctx_new,
+					   secattr->mls_cat,
+					   secattr->mls_cat_len,
+					   secattr->mls_cat,
+					   secattr->mls_cat_len) != 0)
+				goto netlbl_secattr_to_sid_failure;
+		}
+
+		ret_val = mls_context_isvalid(&policydb, &ctx_new);
+		if (ret_val != 1)
+			goto netlbl_secattr_to_sid_failure;
+
+		if (skb != NULL)
+			selinux_netlbl_cache_add(skb, &ctx_new);
+
+		ret_val = sidtab_context_to_sid(&sidtab, &ctx_new, sid);
+	} else
+		*sid = SECINITSID_UNLABELED;
+
+	ret_val = 0;
+
+netlbl_secattr_to_sid_failure:
+	if (ctx_new_destroy)
+		context_destroy(&ctx_new);
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
+ * @skb: the packet
+ * @base_sid: the SELinux SID to use as a context for MLS only attributes
+ * @sid: the SID
+ *
+ * Description:
+ * Call the NetLabel mechanism to get the security attributes of the given
+ * packet and use those attributes to determine the correct context/SID to
+ * assign to the packet.  Returns zero on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
+					const u32 base_sid,
+					u32 *sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+
+	netlbl_secattr_init(&secattr);
+	ret_val = netlbl_skbuff_getattr(skb, &secattr);
+	if (ret_val == 0)
+		ret_val = selinux_netlbl_secattr_to_sid(skb,
+							 &secattr,
+							 base_sid,
+							 sid);
+
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_setsid - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sock_family: the socket family
+ * @sid: the SID to use
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_socket_setsid(struct socket *sock,
+					const int sock_family,
+					u32 sid)
+{
+	int ret_val;
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct netlbl_lsm_secattr secattr;
+	struct context *ctx;
+
+	ctx = sidtab_search(&sidtab, sid);
+	if (ctx != NULL) {
+		netlbl_secattr_init(&secattr);
+
+		if (selinux_netlbl_domain_export(ctx,
+						 &secattr.domain,
+						 NULL) == 0)
+			secattr.set_domain = 1;
+		if (mls_export_lvl(ctx, &secattr.mls_lvl, NULL) == 0)
+			secattr.set_mls_lvl = 1;
+		if (mls_export_cat(ctx,
+				   &secattr.mls_cat,
+				   &secattr.mls_cat_len,
+				   NULL,
+				   NULL) == 0)
+			secattr.set_mls_cat = 1;
+
+		ret_val = netlbl_socket_setattr(sock, &secattr);
+		if (ret_val == 0) {
+			isec->netlbl.netlbl_sid = sid;
+			isec->netlbl.labeled = 1;
+		}
+
+		netlbl_secattr_destroy(&secattr);
+	} else
+		ret_val = -ENOENT;
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_peeksid - Get the SID of the first queued packet
+ * @sock: the socket to query
+ * @sid: the packet's SID
+ *
+ * Description:
+ * Examine the first incoming packet in the socket's queue and determine the
+ * packet's SELinux SID.  Return zero on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_socket_peeksid(struct socket *sock, u32 *sid)
+{
+        int ret_val;
+	struct netlbl_lsm_secattr secattr;
+        struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+
+        netlbl_secattr_init(&secattr);
+        ret_val = netlbl_socket_peekattr(sock, &secattr);
+        if (ret_val == 0)
+                ret_val = selinux_netlbl_secattr_to_sid(NULL,
+							&secattr,
+							isec->sid,
+							sid);
+
+        secattr.set_cache = 0;
+        netlbl_secattr_destroy(&secattr);
+
+        return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_create - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sock_family: the socket family
+ * @sid: the SID to use
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int selinux_netlbl_socket_create(struct socket *sock,
+				 const int sock_family,
+				 u32 sid)
+{
+	struct inode_security_struct *isec;
+
+	if (!ss_initialized || sock_family != PF_INET)
+		return 0;
+
+	isec = SOCK_INODE(sock)->i_security;
+	isec->netlbl.req_netlbl = 1;
+
+	/* PM - should we audit failures, or at the very least do a printk()
+	   so users are not left wondering? */
+	return selinux_netlbl_socket_setsid(sock, sock_family, sid);
+}
+
+/**
+ * selinux_netlbl_socket_accept - Handle the labeling of an accept()ed socket
+ * @sock: the original socket
+ * @newsock: the new accept()ed socket
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism based on the packets
+ * in the queue and the original socket's SID.
+ *
+ */
+void selinux_netlbl_socket_accept(struct socket *sock, struct socket *newsock)
+{
+	int ret_val;
+	struct inode_security_struct *newisec;
+	struct netlbl_lsm_secattr secattr;
+
+	if (!ss_initialized ||
+	    newsock->sk == NULL || newsock->sk->sk_family != PF_INET)
+		return;
+
+	newisec = SOCK_INODE(newsock)->i_security;
+	newisec->netlbl.req_netlbl = 1;
+
+	netlbl_secattr_init(&secattr);
+	ret_val = netlbl_socket_getattr(newsock, &secattr);
+	if (ret_val == 0)
+		ret_val = selinux_netlbl_secattr_to_sid(NULL,
+						    &secattr,
+						    newisec->sid,
+						    &newisec->netlbl.peer_sid);
+	if (ret_val != 0)
+		newisec->netlbl.peer_sid = SECSID_NULL;
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+}
+
+/**
+ * selinux_netlbl_file_permission - Very the file/socket is NetLabel labeled
+ * @inode: the file descriptor's inode
+ * @mask: the permission mask
+ *
+ * Description:
+ * Looks at a file's inode and if it is marked as a socket protected by
+ * NetLabel then verify that the socket has been labeled, if not try to label
+ * the socket now with the task's SID.  Returns zero on success, negative
+ * values on failure.
+ *
+ */
+int selinux_netlbl_inode_permission(struct inode *inode, int mask)
+{
+	int ret_val = 0;
+	struct inode_security_struct *isec = inode->i_security;
+	struct task_security_struct *tsec;
+	struct netlbl_security_struct *netlbl_sec = &isec->netlbl;
+	struct socket *sock;
+
+	if (netlbl_sec->req_netlbl && (mask & (MAY_WRITE | MAY_APPEND))) {
+		tsec = current->security;
+		if (netlbl_sec->labeled == 0) {
+			sock = SOCKET_I(inode);
+			ret_val = selinux_netlbl_socket_setsid(sock,
+							  sock->sk->sk_family,
+							  tsec->sid);
+		} else if (netlbl_sec->netlbl_sid != tsec->sid &&
+			   netlbl_sec->netlbl_sid != SECINITSID_KERNEL)
+			ret_val = -EACCES;
+	}
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
+ * @sock_class: the socket class
+ * @sock_sid: the socket's SID
+ * @skb: the incoming packet
+ * @ad: the audit data
+ *
+ * Description:
+ * Fetch the NetLabel security attributes from @skb and perform an access check
+ * against the receiving socket.  Returns zero on success, negative values on
+ * error.
+ *
+ */
+int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
+				const u32 sock_sid,
+				struct sk_buff *skb,
+				struct avc_audit_data *ad)
+{
+	int ret_val;
+	u32 netlbl_sid;
+	u32 recv_perm;
+
+	ret_val = selinux_netlbl_skbuff_getsid(skb, sock_sid, &netlbl_sid);
+	if (ret_val)
+		goto netlbl_sock_rcv_skb;
+
+	/* PM - at some point we want to do an unlabeled check here too but
+	   we need a way to enable/disable NetLabel checks at runtime first,
+	   see RH BZ #195238 for more details */
+	if (netlbl_sid != SECINITSID_UNLABELED) {
+		switch (sock_class) {
+		case SECCLASS_UDP_SOCKET:
+			recv_perm = UDP_SOCKET__RECV_MSG;
+			break;
+		case SECCLASS_TCP_SOCKET:
+			recv_perm = TCP_SOCKET__RECV_MSG;
+			break;
+		default:
+			recv_perm = RAWIP_SOCKET__RECV_MSG;
+			break;
+		}
+
+		ret_val = avc_has_perm(sock_sid,
+				       netlbl_sid,
+				       sock_class,
+				       recv_perm,
+				       ad);
+		if (ret_val)
+			netlbl_skbuff_err(skb, ret_val);
+	}
+
+netlbl_sock_rcv_skb:
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_peersid - Return the peer SID of a connected socket
+ * @sock: the socket
+ * @peer_sid: the peer SID
+ *
+ * Description:
+ * Examine @sock to find the connected peer's SID, if that is not possibile
+ * check the socket's receive queue and take the SID from the incoming
+ * packets.  Returns zero on success, negative values on error.
+ *
+ */
+int selinux_netlbl_socket_getpeersec_stream(struct socket *sock, u32 *peer_sid)
+{
+	int ret_val = 0;
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+
+	if (isec->netlbl.peer_sid == 0)
+		ret_val = selinux_netlbl_socket_peeksid(sock, peer_sid);
+	else
+		*peer_sid = isec->netlbl.peer_sid;
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_getpeersec_dgram - Return the SID of a NetLabel packet
+ * @skb: the packet
+ * @peer_sid: the packet's SID
+ *
+ * Description:
+ * Examine @skb to find the SID assigned to it by NetLabel.  Returns zero on
+ * success, negative values on error.
+ *
+ */
+int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb, u32 *peer_sid)
+{
+	struct inode_security_struct *isec;
+
+	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
+		return -ENOPROTOOPT;
+
+	isec = SOCK_INODE(skb->sk->sk_socket)->i_security;
+
+	return selinux_netlbl_skbuff_getsid(skb, isec->sid, peer_sid);
+}
Index: linux-2.6.17.i686-quilt/security/selinux/ss/services.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/services.c
+++ linux-2.6.17.i686-quilt/security/selinux/ss/services.c
@@ -13,6 +13,11 @@
  *
  * 	Added conditional policy language extensions
  *
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added support for NetLabel
+ *
+ * Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  * Copyright (C) 2003 - 2004 Tresys Technology, LLC
  * Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris at redhat.com>
@@ -29,6 +34,7 @@
 #include <linux/sched.h>
 #include <linux/audit.h>
 #include <linux/mutex.h>
+#include <net/sock.h>
 
 #include "flask.h"
 #include "avc.h"
@@ -40,6 +46,8 @@
 #include "services.h"
 #include "conditional.h"
 #include "mls.h"
+#include "objsec.h"
+#include "selinux_netlabel.h"
 
 extern void selnl_notify_policyload(u32 seqno);
 unsigned int policydb_loaded_version;
@@ -54,7 +62,7 @@ static DEFINE_MUTEX(load_mutex);
 #define LOAD_LOCK mutex_lock(&load_mutex)
 #define LOAD_UNLOCK mutex_unlock(&load_mutex)
 
-static struct sidtab sidtab;
+struct sidtab sidtab;
 struct policydb policydb;
 int ss_initialized = 0;
 
@@ -1241,6 +1249,7 @@ int security_load_policy(void *data, siz
 		selinux_complete_init();
 		avc_ss_reset(seqno);
 		selnl_notify_policyload(seqno);
+		selinux_netlbl_cache_invalidate();
 		return 0;
 	}
 
@@ -1295,6 +1304,7 @@ int security_load_policy(void *data, siz
 
 	avc_ss_reset(seqno);
 	selnl_notify_policyload(seqno);
+	selinux_netlbl_cache_invalidate();
 
 	return 0;
 
Index: linux-2.6.17.i686-quilt/security/selinux/ss/services.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/services.h
+++ linux-2.6.17.i686-quilt/security/selinux/ss/services.h
@@ -9,7 +9,9 @@
 #include "policydb.h"
 #include "sidtab.h"
 
+extern struct sidtab sidtab;
 extern struct policydb policydb;
+extern int ss_initialized;
 
 #endif	/* _SS_SERVICES_H_ */
 

--
paul moore
linux security @ hp


linux-2.6-net-label_6_7.patch:
 netlabel_cipso_v4.c |  583 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 netlabel_cipso_v4.h |  201 +++++++++++++++++
 2 files changed, 784 insertions(+)

--- NEW FILE linux-2.6-net-label_6_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:41 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:50 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0odH006649;
	Wed, 21 Jun 2006 16:00:50 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0n77023928;
	Wed, 21 Jun 2006 16:00:49 -0400
Received: from atlrel7.hp.com (atlrel7.hp.com [156.153.255.213])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5LK0flU011837;
	Wed, 21 Jun 2006 16:00:41 -0400
Received: from smtp2.fc.hp.com (smtp.fc.hp.com [15.11.136.114])
	by atlrel7.hp.com (Postfix) with ESMTP id AEBC7354BB;
	Wed, 21 Jun 2006 16:00:35 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 1109B1DA49;
	Wed, 21 Jun 2006 20:00:34 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0Yke012232;
	Wed, 21 Jun 2006 16:00:34 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0YDE012231;
	Wed, 21 Jun 2006 16:00:34 -0400
Message-Id: <20060621200033.906052000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:41 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 6/7] NetLabel: CIPSOv4 integration
Content-Disposition: inline; filename=netlabel-cipsov4
X-RedHat-Spam-Score: -99.822 
Content-Type: 
X-UID: 70793
X-Length: 27395

Add CIPSO/IPv4 support and management to the NetLabel subsystem.  These changes
integrate the CIPSO/IPv4 configuration into the existing NetLabel code and
enable the use of CIPSO/IPv4 within the overall NetLabel framework.
---
 net/netlabel/netlabel_cipso_v4.c |  583 +++++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_cipso_v4.h |  201 +++++++++++++
 2 files changed, 784 insertions(+)

Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.c
@@ -0,0 +1,583 @@
+/*
+ * NetLabel CIPSO/IPv4 Support
+ *
+ * This file defines the CIPSO/IPv4 functions for the NetLabel system.  The
+ * NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/socket.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#include <net/netlink.h>
+#include <net/netlabel.h>
+#include <net/cipso_ipv4.h>
+
+#include "netlabel_user.h"
+#include "netlabel_cipso_v4.h"
+
+/*
+ * Local Prototypes
+ */
+
+static void netlbl_cipsov4_send_ack(const struct sk_buff *req_skb,
+				    const u32 ret_code);
+
+/*
+ * Helper Functions
+ */
+
+/**
+ * netlbl_cipsov4_put_hdr - Write a CIPSO NetLabel header into a buffer
+ * @buffer: the buffer
+ * @opcode: the NetLabel CIPSOv4 opcode
+ * @doi: the CIPSO DOI value
+ *
+ * Description:
+ * Use the given values to write a NetLabel CIPSOv4 header into the given
+ * buffer.
+ *
+ */
+static void netlbl_cipsov4_put_hdr(unsigned char *buffer,
+				   const u32 opcode,
+				   const u32 doi)
+{
+	struct netlbl_cipsov4_msghdr *hdr =
+		(struct netlbl_cipsov4_msghdr *)buffer;
+	hdr->opcode = opcode;
+	hdr->doi = doi;
+}
+
+/**
+ * netlbl_cipsov4_putinc_hdr - Write a CIPSO NetLabel header into a buffer
+ * @buffer: the buffer
+ * @opcode: the NetLabel CIPSOv4 opcode
+ * @doi: the CIPSO DOI value
+ *
+ * Description:
+ * Use the given values to write a NetLabel CIPSOv4 header into the given
+ * buffer and increment the buffer pointer past the header.
+ *
+ */
+static void netlbl_cipsov4_putinc_hdr(unsigned char **buffer,
+				      const u32 opcode,
+				      const u32 doi)
+{
+	netlbl_cipsov4_put_hdr(*buffer, opcode, doi);
+	*buffer += sizeof(struct netlbl_cipsov4_msghdr);
+}
+
+/**
+ * netlbl_cipsov4_payload_len - Return the length of the payload
+ * @skb: the NETLINK buffer
+ *
+ * Description:
+ * This function returns the length of the CIPSO V4 NetLabel payload.
+ *
+ */
+static u32 netlbl_cipsov4_payload_len(const struct sk_buff *skb)
+{
+	const struct nlmsghdr *nl_hdr = (struct nlmsghdr *)skb->data;
+
+	if (nlmsg_len(nl_hdr) <= sizeof(struct netlbl_cipsov4_msghdr))
+		return 0;
+	return nlmsg_len(nl_hdr) - sizeof(struct netlbl_cipsov4_msghdr);
+}
+
+/**
+ * netlbl_cipsov4_payload_data - Returns a pointer to the start of the data
+ * @skb: the NETLINK buffer
+ *
+ * Description:
+ * This function returns a pointer to the start of the CIPSO V4 NetLabel
+ * payload.
+ *
+ */
+static unsigned char *netlbl_cipsov4_payload_data(const struct sk_buff *skb)
+{
+	return nlmsg_data((struct nlmsghdr *)skb->data) +
+		sizeof(struct netlbl_cipsov4_msghdr);
+}
+
+/**
+ * netlbl_cipsov4_doi_free - Frees a CIPSO V4 DOI definition
+ * @entry: the entry's RCU field
+ *
+ * Description:
+ * This function is designed to be used as a callback to the call_rcu()
+ * function so that the memory allocated to the DOI definition can be released
+ * safely.
+ *
+ */
+static void netlbl_cipsov4_doi_free(struct rcu_head *entry)
+{
+	struct cipso_v4_doi *ptr;
+
+	ptr = container_of(entry, struct cipso_v4_doi, rcu);
+	switch (ptr->type) {
+	case CIPSO_V4_MAP_STD:
+		if (ptr->map.std->lvl.cipso_size > 0)
+			kfree(ptr->map.std->lvl.cipso);
+		if (ptr->map.std->lvl.local_size > 0)
+			kfree(ptr->map.std->lvl.local);
+		if (ptr->map.std->cat.cipso_size > 0)
+			kfree(ptr->map.std->cat.cipso);
+		if (ptr->map.std->cat.local_size > 0)
+			kfree(ptr->map.std->cat.local);
+		break;
+	}
+	kfree(ptr);
+}
+
+/*
+ * Label Mapping Functions
+ */
+
+/**
+ * netlbl_cipsov4_add_std - Adds a CIPSO V4 DOI definition
+ * @doi: the DOI value
+ * @msg: the ADD message data
+ * @msg_size: the size of the ADD message buffer
+ *
+ * Description:
+ * Create a new CIPSO_V4_MAP_STD DOI definition based on the given ADD message
+ * and add it to the CIPSO V4 engine.  Return zero on success and non-zero on
+ * error.
+ *
+ */
+static int netlbl_cipsov4_add_std(const u32 doi,
+				  const unsigned char *msg,
+				  const u32 msg_size)
+{
+	int ret_val = -EPERM;
+	unsigned char *msg_ptr = (unsigned char *)msg;
+	u32 msg_len = msg_size;
+	u32 num_tags;
+	u32 num_lvls;
+	u32 num_cats;
+	struct cipso_v4_doi *doi_def = NULL;
+	u32 iter;
+	u32 tmp_val_a;
+	u32 tmp_val_b;
+
+	if (msg_len < 4)
+		goto add_std_failure;
+	num_tags = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (num_tags == 0 || num_tags > CIPSO_V4_TAG_MAXCNT)
+		goto add_std_failure;
+
+	doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
+	if (doi_def == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->map.std = kzalloc(sizeof(*doi_def->map.std),
+				   GFP_KERNEL);
+	if (doi_def->map.std == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->type = CIPSO_V4_MAP_STD;
+
+	if (msg_len < num_tags)
+		goto add_std_failure;
+	msg_len -= num_tags;
+	for (iter = 0; iter < num_tags; iter++) {
+		doi_def->tags[iter] = netlbl_getinc_u8(&msg_ptr);
+		switch (doi_def->tags[iter]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			break;
+		default:
+			goto add_std_failure;
+		}
+	}
+	if (iter < CIPSO_V4_TAG_MAXCNT)
+		doi_def->tags[iter] = CIPSO_V4_TAG_INVALID;
+
+	if (msg_len < 24)
+		goto add_std_failure;
+
+	num_lvls = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (num_lvls == 0)
+		goto add_std_failure;
+	doi_def->map.std->lvl.local_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->lvl.local_size > CIPSO_V4_MAX_LOC_LVLS)
+		goto add_std_failure;
+	doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->lvl.local == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->map.std->lvl.cipso_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->lvl.cipso_size > CIPSO_V4_MAX_REM_LVLS)
+		goto add_std_failure;
+	doi_def->map.std->lvl.cipso = kcalloc(doi_def->map.std->lvl.cipso_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->lvl.cipso == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+
+	num_cats = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	doi_def->map.std->cat.local_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->cat.local_size > CIPSO_V4_MAX_LOC_CATS)
+		goto add_std_failure;
+	doi_def->map.std->cat.local = kcalloc(doi_def->map.std->cat.local_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->cat.local == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->map.std->cat.cipso_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->cat.cipso_size > CIPSO_V4_MAX_REM_CATS)
+		goto add_std_failure;
+	doi_def->map.std->cat.cipso = kcalloc(doi_def->map.std->cat.cipso_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->cat.cipso == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+
+	if (msg_len < num_lvls * 8 + num_cats * 8)
+		goto add_std_failure;
+	msg_len -= num_lvls * 8 + num_cats * 8;
+
+	for (iter = 0; iter < doi_def->map.std->lvl.cipso_size; iter++)
+		doi_def->map.std->lvl.cipso[iter] = CIPSO_V4_INV_LVL;
+	for (iter = 0; iter < doi_def->map.std->lvl.local_size; iter++)
+		doi_def->map.std->lvl.local[iter] = CIPSO_V4_INV_LVL;
+	for (iter = 0; iter < doi_def->map.std->cat.cipso_size; iter++)
+		doi_def->map.std->cat.cipso[iter] = CIPSO_V4_INV_CAT;
+	for (iter = 0; iter < doi_def->map.std->cat.local_size; iter++)
+		doi_def->map.std->cat.local[iter] = CIPSO_V4_INV_CAT;
+
+	for (iter = 0; iter < num_lvls; iter++) {
+		tmp_val_a = netlbl_getinc_u32(&msg_ptr);
+		tmp_val_b = netlbl_getinc_u32(&msg_ptr);
+
+		if (tmp_val_a >= doi_def->map.std->lvl.local_size ||
+		    tmp_val_b >= doi_def->map.std->lvl.cipso_size)
+			goto add_std_failure;
+
+		doi_def->map.std->lvl.cipso[tmp_val_b] = tmp_val_a;
+		doi_def->map.std->lvl.local[tmp_val_a] = tmp_val_b;
+	}
+
+	for (iter = 0; iter < num_cats; iter++) {
+		tmp_val_a = netlbl_getinc_u32(&msg_ptr);
+		tmp_val_b = netlbl_getinc_u32(&msg_ptr);
+
+		if (tmp_val_a >= doi_def->map.std->cat.local_size ||
+		    tmp_val_b >= doi_def->map.std->cat.cipso_size)
+			goto add_std_failure;
+
+		doi_def->map.std->cat.cipso[tmp_val_b] = tmp_val_a;
+		doi_def->map.std->cat.local[tmp_val_a] = tmp_val_b;
+	}
+
+	doi_def->doi = doi;
+	ret_val = cipso_v4_doi_add(doi_def);
+	if (ret_val != 0)
+		goto add_std_failure;
+	return 0;
+
+add_std_failure:
+	if (doi_def)
+		netlbl_cipsov4_doi_free(&doi_def->rcu);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_add_pass - Adds a CIPSO V4 DOI definition
+ * @doi: the DOI value
+ * @msg: the ADD message data
+ * @msg_size: the size of the ADD message buffer
+ *
+ * Description:
+ * Create a new CIPSO_V4_MAP_PASS DOI definition based on the given ADD message
+ * and add it to the CIPSO V4 engine.  Return zero on success and non-zero on
+ * error.
+ *
+ */
+static int netlbl_cipsov4_add_pass(const u32 doi,
+				   const unsigned char *msg,
+				   const u32 msg_size)
+{
+	int ret_val = -EPERM;
+	unsigned char *msg_ptr = (unsigned char *)msg;
+	u32 msg_len = msg_size;
+	u32 num_tags;
+	struct cipso_v4_doi *doi_def = NULL;
+	u32 iter;
+
+	if (msg_len < 4)
+		goto add_pass_failure;
+	num_tags = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (num_tags == 0 || num_tags > CIPSO_V4_TAG_MAXCNT)
+		goto add_pass_failure;
+
+	doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
+	if (doi_def == NULL) {
+		ret_val = -ENOMEM;
+		goto add_pass_failure;
+	}
+	doi_def->type = CIPSO_V4_MAP_PASS;
+
+	if (msg_len < num_tags)
+		goto add_pass_failure;
+	msg_len -= num_tags;
+	for (iter = 0; iter < num_tags; iter++) {
+		doi_def->tags[iter] = netlbl_getinc_u8(&msg_ptr);
+		switch (doi_def->tags[iter]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			break;
+		default:
+			goto add_pass_failure;
+		}
+	}
+	if (iter < CIPSO_V4_TAG_MAXCNT)
+		doi_def->tags[iter] = CIPSO_V4_TAG_INVALID;
+
+	doi_def->doi = doi;
+	ret_val = cipso_v4_doi_add(doi_def);
+	if (ret_val != 0)
+		goto add_pass_failure;
+	return 0;
+
+add_pass_failure:
+	if (doi_def)
+		netlbl_cipsov4_doi_free(&doi_def->rcu);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_add - Handle an ADD message
+ * @req_skb: the NETLINK buffer
+ * @doi: the DOI
+ * @msg: the NetLabel CIPSO V4 message
+ *
+ * Description:
+ * Create a new DOI definition based on the given ADD message and add it to the
+ * CIPSO V4 engine.
+ *
+ */
+static void netlbl_cipsov4_add(const struct sk_buff *req_skb,
+			       const u32 doi,
+			       const unsigned char *msg)
+{
+	int ret_val = -EINVAL;
+	u32 map_type;
+	u32 msg_len = netlbl_cipsov4_payload_len(req_skb);
+
+	if (msg_len < 4) {
+		netlbl_cipsov4_send_ack(req_skb, EINVAL);
+		return;
+	}
+
+	map_type = netlbl_get_u32(msg);
+	switch (map_type) {
+	case CIPSO_V4_MAP_STD:
+		ret_val = netlbl_cipsov4_add_std(doi, msg + 4, msg_len - 4);
+		break;
+	case CIPSO_V4_MAP_PASS:
+		ret_val = netlbl_cipsov4_add_pass(doi, msg + 4, msg_len - 4);
+		break;
+	}
+	netlbl_cipsov4_send_ack(req_skb, -ret_val);
+}
+
+/**
+ * netlbl_cipsov4_list - Handle a LIST message
+ * @req_skb: the NETLINK buffer
+ * @doi: the DOI
+ * @msg: the NetLabel CIPSO V4 message
+ *
+ * Description:
+ * Process a user generated LIST message and respond accordingly.
+ *
+ */
+static void netlbl_cipsov4_list(const struct sk_buff *req_skb,
+				const u32 doi,
+				const unsigned char *msg)
+{
+	int ret_val = -ENOMEM;
+	struct sk_buff *skb;
+	unsigned char *buf_ptr;
+
+	skb = cipso_v4_doi_dump(doi, sizeof(struct netlbl_cipsov4_msghdr));
+	if (skb == NULL)
+		goto list_return;
+	buf_ptr = skb_push(skb,
+			   NLMSG_SPACE(sizeof(struct netlbl_cipsov4_msghdr)));
+	if (buf_ptr == NULL) {
+		kfree(skb);
+		ret_val = -EAGAIN;
+		goto list_return;
+	}
+	netlbl_putinc_hdr(&buf_ptr,
+			  NETLBL_NLTYPE_CIPSOV4,
+			  skb->len,
+			  0,
+			  NETLINK_CB(req_skb).pid,
+			  0);
+	netlbl_cipsov4_putinc_hdr(&buf_ptr, NL_CV4_LIST, 0);
+
+	ret_val = netlbl_netlink_snd(skb, NETLINK_CB(req_skb).pid);
+
+list_return:
+	if (ret_val != 0)
+		netlbl_cipsov4_send_ack(skb, -ret_val);
+}
+
+/**
+ * netlbl_cipsov4_remove - Handle a REMOVE message
+ * @req_skb: the NETLINK buffer
+ * @doi: the DOI
+ * @msg: the NetLabel CIPSO V4 message
+ *
+ * Description:
+ * Process a user generated REMOVE message and respond accordingly.
+ *
+ */
+static void netlbl_cipsov4_remove(const struct sk_buff *req_skb,
+				 const u32 doi,
+				 const unsigned char *msg)
+{
+	int ret_val;
+
+	ret_val = cipso_v4_doi_remove(doi, netlbl_cipsov4_doi_free);
+	netlbl_cipsov4_send_ack(req_skb, -ret_val);
+}
+
+/*
+ * NetLabel Protocol Handlers
+ */
+
+/**
+ * netlbl_cipsov4_send_ack - Send an ACK message
+ * @req_skb: the NETLINK buffer
+ * @ret_code: return code to use
+ *
+ * Description:
+ * This function sends an ACK message to the sender of the NETLINK message
+ * specified by @req_skb.
+ *
+ */
+static void netlbl_cipsov4_send_ack(const struct sk_buff *req_skb,
+				    const u32 ret_code)
+{
+	size_t msg_size;
+	size_t data_size;
+	struct sk_buff *skb;
+	struct nlmsghdr *nl_ack_hdr;
+	unsigned char *data;
+
+	data_size = sizeof(struct netlbl_cipsov4_msghdr) + 8;
+	msg_size = NLMSG_SPACE(data_size);
+
+	skb = alloc_skb(msg_size, GFP_KERNEL);
+	if (skb == NULL)
+		return;
+
+	nl_ack_hdr = NLMSG_PUT(skb,
+			       NETLINK_CB(req_skb).pid,
+			       0,
+			       NETLBL_NLTYPE_CIPSOV4,
+			       data_size);
+	nl_ack_hdr->nlmsg_len = msg_size;
+
+	data = NLMSG_DATA(nl_ack_hdr);
+	netlbl_cipsov4_putinc_hdr(&data, NL_CV4_ACK, 0);
+	netlbl_putinc_u32(&data,
+			  ((struct nlmsghdr *)req_skb->data)->nlmsg_seq);
+	netlbl_putinc_u32(&data, ret_code);
+
+	netlbl_netlink_snd(skb, NETLINK_CB(req_skb).pid);
+	return;
+
+nlmsg_failure:
+	kfree_skb(skb);
+}
+
+/**
+ * netlbl_cipsov4_rcv - Process incoming NetLabel packets
+ * @skb: the NETLINK buffer
+ * @msg: pointer to the start of the NetLabel data
+ *
+ * Description:
+ * This function is reponsibile for reading all of the incoming CIPSO V4
+ * NetLabel traffic and dispatching it to the correct CIPSO V4 functions.
+ *
+ */
+void netlbl_cipsov4_rcv(const struct sk_buff *skb, const unsigned char *msg)
+{
+	int ret_val;
+	struct netlbl_cipsov4_msghdr *nl_cv4_hdr;
+
+	if (nlmsg_len((struct nlmsghdr *)skb->data) <
+	    sizeof(struct netlbl_cipsov4_msghdr)) {
+		netlbl_cipsov4_send_ack(skb, EINVAL);
+		return;
+	}
+
+	nl_cv4_hdr = (struct netlbl_cipsov4_msghdr *)msg;
+	switch (nl_cv4_hdr->opcode) {
+	case NL_CV4_ADD:
+		ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
+		if (ret_val != 0)
+			netlbl_cipsov4_send_ack(skb, ret_val);
+		netlbl_cipsov4_add(skb,
+				   nl_cv4_hdr->doi,
+				   netlbl_cipsov4_payload_data(skb));
+		break;
+	case NL_CV4_REMOVE:
+		ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
+		if (ret_val != 0)
+			netlbl_cipsov4_send_ack(skb, ret_val);
+		netlbl_cipsov4_remove(skb,
+				      nl_cv4_hdr->doi,
+				      netlbl_cipsov4_payload_data(skb));
+		break;
+	case NL_CV4_LIST:
+		netlbl_cipsov4_list(skb,
+				    nl_cv4_hdr->doi,
+				    netlbl_cipsov4_payload_data(skb));
+		break;
+	default:
+		netlbl_cipsov4_send_ack(skb, EINVAL);
+		return;
+	}
+}
Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.h
@@ -0,0 +1,201 @@
+/*
+ * NetLabel CIPSO/IPv4 Support
+ *
+ * This file defines the CIPSO/IPv4 functions for the NetLabel system.  The
+ * NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_CIPSO_V4
+#define _NETLABEL_CIPSO_V4
+
+#include <net/netlabel.h>
+
+/*
+ * The following NetLabel payloads are supported by the CIPSO subsystem, all
+ * of which are preceeded by the nlmsghdr struct.
+ *
+ * o ACK:
+ *   Sent by the kernel in response to an applications message, applications
+ *   should never send this message.
+ *
+ *   +----------------------+-----------------------+
+ *   | seq number (32 bits) | return code (32 bits) |
+ *   +----------------------+-----------------------+
+ *
+ *     seq number:  the sequence number of the original message, taken from the
+ *                  nlmsghdr structure
+ *     return code: return value, based on errno values
+ *
+ * o ADD:
+ *   Sent by an application to add a new DOI mapping table, after completion
+ *   of the task the kernel should ACK this message.
+ *
+ *   +--------------------+---------------------+
+ *   | map type (32 bits) | tag count (32 bits) | ...
+ *   +--------------------+---------------------+
+ *
+ *   +-----------------+
+ *   | tag #X (8 bits) | ... repeated
+ *   +-----------------+
+ *
+ *   +-------------- ---- --- -- -
+ *   | mapping data
+ *   +-------------- ---- --- -- -
+ *
+ *     map type:     the mapping table type (defined in the cipso_ipv4.h header
+ *                   as CIPSO_V4_MAP_*)
+ *     tag count:    the number of tags, must be greater than zero
+ *     tag:          the CIPSO tag for the DOI, tags listed first are given
+ *                   higher priorirty when sending packets
+ *     mapping data: specific to the map type (see below)
+ *
+ *   CIPSO_V4_MAP_STD
+ *
+ *   +------------------+-----------------------+-----------------------+
+ *   | levels (32 bits) | max l level (32 bits) | max r level (32 bits) | ...
+ *   +------------------+-----------------------+-----------------------+
+ *
+ *   +----------------------+---------------------+---------------------+
+ *   | categories (32 bits) | max l cat (32 bits) | max r cat (32 bits) | ...
+ *   +----------------------+---------------------+---------------------+
+ *
+ *   +--------------------------+--------------------------+
+ *   | local level #X (32 bits) | CIPSO level #X (32 bits) | ... repeated
+ *   +--------------------------+--------------------------+
+ *
+ *   +-----------------------------+-----------------------------+
+ *   | local category #X (32 bits) | CIPSO category #X (32 bits) | ... repeated
+ *   +-----------------------------+-----------------------------+
+ *
+ *     levels:         the number of level mappings
+ *     max l level:    the highest local level
+ *     max r level:    the highest remote/CIPSO level
+ *     categories:     the number of category mappings
+ *     max l cat:      the highest local category
+ *     max r cat:      the highest remote/CIPSO category
+ *     local level:    the local part of a level mapping
+ *     CIPSO level:    the remote/CIPSO part of a level mapping
+ *     local category: the local part of a category mapping
+ *     CIPSO category: the remote/CIPSO part of a category mapping
+ *
+ *   CIPSO_V4_MAP_PASS
+ *
+ *   No mapping data is needed for this map type.
+ *
+ * o REMOVE:
+ *   Sent by an application to remove a specific DOI mapping table from the
+ *   CIPSO V4 system.  This message does not contain a payload.  The kernel
+ *   should ACK this message.
+ *
+ * o LIST:
+ *   This message can be sent either from an application or by the kernel in
+ *   response to an application generated LIST message.  When sent by an
+ *   application there is no payload.  If the application sets the DOI field
+ *   to zero in the CIPSO V4 message header then the kernel should respond
+ *   with a list of valid DOIs.  If the application sets the DOI field equal to
+ *   a non-zero value then the kernel should respond with the matching mapping
+ *   table.  In the case of an error the kernel should respond with an ACK
+ *   message.
+ *
+ *   DOI Listing (DOI == 0)
+ *
+ *   +---------------------+------------------+-----------------------+
+ *   | DOI count (32 bits) | DOI #X (32 bits) | map type #X (32 bits) | ...
+ *   +---------------------+------------------+-----------------------+
+ *
+ *     DOI count:      the number of DOIs
+ *     DOI:            the DOI value
+ *     map type:       the DOI mapping table type (defined in the cipso_ipv4.h
+ *                     header as CIPSO_V4_MAP_*)
+ *
+ *   DOI Mapping Table (DOI != 0)
+ *
+ *   +--------------------+
+ *   | map type (32 bits) | ...
+ *   +--------------------+
+ *
+ *     map type:       the DOI mapping table type (defined in the cipso_ipv4.h
+ *                     header as CIPSO_V4_MAP_*)
+ *
+ *   (map type == CIPSO_V4_MAP_STD)
+ *
+ *   +----------------+------------------+----------------------+
+ *   | tags (32 bits) | levels (32 bits) | categories (32 bits) | ...
+ *   +----------------+------------------+----------------------+
+ *
+ *   +-----------------+
+ *   | tag #X (8 bits) | ... repeated
+ *   +-----------------+
+ *
+ *   +--------------------------+--------------------------+
+ *   | local level #X (32 bits) | CIPSO level #X (32 bits) | ... repeated
+ *   +--------------------------+--------------------------+
+ *
+ *   +-----------------------------+-----------------------------+
+ *   | local category #X (32 bits) | CIPSO category #X (32 bits) | ... repeated
+ *   +-----------------------------+-----------------------------+
+ *
+ *     tags:           the number of CIPSO tag types
+ *     levels:         the number of level mappings
+ *     categories:     the number of category mappings
+ *     tag:            the tag number, tags listed first are given higher
+ *                     priority when sending packets
+ *     local level:    the local part of a level mapping
+ *     CIPSO level:    the remote/CIPSO part of a level mapping
+ *     local category: the local part of a category mapping
+ *     CIPSO category: the remote/CIPSO part of a category mapping
+ *
+ *   (map type == CIPSO_V4_MAP_PASS)
+ *
+ *   +----------------+
+ *   | tags (32 bits) | ...
+ *   +----------------+
+ *
+ *   +-----------------+
+ *   | tag #X (8 bits) | ... repeated
+ *   +-----------------+
+ *
+ *     tags:           the number of CIPSO tag types
+ *     tag:            the tag number, tags listed first are given higher
+ *                     priority when sending packets
+ *
+ */
+
+/* CIPSO V4 message header */
+struct netlbl_cipsov4_msghdr {
+	enum { NL_CV4_NOOP,
+	       NL_CV4_ACK,
+	       NL_CV4_ADD,
+	       NL_CV4_REMOVE,
+	       NL_CV4_LIST
+	} opcode;
+	u32 doi;
+};
+
+/* Process CIPSO V4 NetLabel messages */
+void netlbl_cipsov4_rcv(const struct sk_buff *skb, const unsigned char *msg);
+
+#endif

--
paul moore
linux security @ hp


linux-2.6-net-label_7_7.patch:
 netlabel_unlabeled.c |  287 +++++++++++++++++++++++++++++++++++++++++++++++++++
 netlabel_unlabeled.h |   83 ++++++++++++++
 2 files changed, 370 insertions(+)

--- NEW FILE linux-2.6-net-label_7_7.patch ---
>From paul.moore at hp.com Wed Jun 21 15:42:42 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 21 Jun 2006 16:00:44 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5LK0hdH006625;
	Wed, 21 Jun 2006 16:00:43 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0g2T023888;
	Wed, 21 Jun 2006 16:00:42 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5LK0f8S008555;
	Wed, 21 Jun 2006 16:00:41 -0400
Received: from smtp2.fc.hp.com (smtp.fc.hp.com [15.11.136.114])
	by atlrel9.hp.com (Postfix) with ESMTP id 0DAB734FA0;
	Wed, 21 Jun 2006 16:00:36 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp2.fc.hp.com (Postfix) with ESMTP id 938421DA48;
	Wed, 21 Jun 2006 20:00:35 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5LK0ZY5012261;
	Wed, 21 Jun 2006 16:00:35 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5LK0YjD012260;
	Wed, 21 Jun 2006 16:00:35 -0400
Message-Id: <20060621200034.653917000 at flek.zko.hp.com>
References: <20060621194234.979661000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Wed, 21 Jun 2006 15:42:42 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 selinux at tycho.nsa.gov,
 linux-security-module at vger.kernel.org,
 netdev at vger.kernel.org
Cc: sds at epoch.ncsc.mil,
 jmorris at redhat.com,
 sgrubb at redhat.com
Subject: [RFC 7/7] NetLabel: unlabeled packet handling
Content-Disposition: inline; filename=netlabel-unlabeled
X-RedHat-Spam-Score: -99.715 
Content-Type: 
X-UID: 70787
X-Length: 13494

Add unlabeled packet support to the NetLabel subsystem.  NetLabel does not do
any processing on unlabled packets, but it must support passing unlabled
packets on both the inbound and outbound sides.
---
 net/netlabel/netlabel_unlabeled.c |  287 ++++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_unlabeled.h |   83 ++++++++++
 2 files changed, 370 insertions(+)

Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.c
@@ -0,0 +1,287 @@
+/*
+ * NetLabel Unlabeled Support
+ *
+ * This file defines functions for dealing with unlabeled packets for the
+ * NetLabel system.  The NetLabel system manages static and dynamic label
+ * mappings for network protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/socket.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#include <net/netlink.h>
+#include <net/netlabel.h>
+#include <asm/bug.h>
+
+#include "netlabel_user.h"
+#include "netlabel_domainhash.h"
+#include "netlabel_unlabeled.h"
+
+/* Accept unlabeled packets flag */
+static atomic_t netlabel_unlabel_accept_flg = ATOMIC_INIT(0);
+
+/*
+ * Local Prototypes
+ */
+
+static void netlbl_unlabel_send_ack(const struct sk_buff *req_skb,
+				    const u32 ret_code);
+
+/*
+ * Helper Functions
+ */
+
+/**
+ * netlbl_unlabel_put_hdr - Write a Unlabeled NetLabel header into a buffer
+ * @buffer: the buffer
+ * @opcode: the NetLabel Unlabeled opcode
+ *
+ * Description:
+ * Use the given values to write a NetLabel Unlabeled header into the given
+ * buffer.
+ *
+ */
+static void netlbl_unlabel_put_hdr(unsigned char *buffer, const u32 opcode)
+{
+	((struct netlbl_unlabel_msghdr *)buffer)->opcode = opcode;
+}
+
+/**
+ * netlbl_unlabel_putinc_hdr - Write a Unlabeled NetLabel header into a buffer
+ * @buffer: the buffer
+ * @opcode: the NetLabel Unlabeled opcode
+ *
+ * Description:
+ * Use the given values to write a NetLabel Unlabeled header into the given
+ * buffer and increment the buffer pointer past the header.
+ *
+ */
+static void netlbl_unlabel_putinc_hdr(unsigned char **buffer, const u32 opcode)
+{
+	netlbl_unlabel_put_hdr(*buffer, opcode);
+	*buffer += sizeof(struct netlbl_unlabel_msghdr);
+}
+
+/**
+ * netlbl_unlabel_payload_len - Return the length of the payload
+ * @skb: the NETLINK buffer
+ *
+ * Description:
+ * This function returns the length of the NetLabel unlabeled payload.
+ *
+ */
+static u32 netlbl_unlabel_payload_len(const struct sk_buff *skb)
+{
+	const struct nlmsghdr *nl_hdr = (struct nlmsghdr *)skb->data;
+
+	if (nlmsg_len(nl_hdr) <= sizeof(struct netlbl_unlabel_msghdr))
+		return 0;
+	return nlmsg_len(nl_hdr) - sizeof(struct netlbl_unlabel_msghdr);
+}
+
+/**
+ * netlbl_unlabel_payload_data - Returns a pointer to the start of the data
+ * @skb: the NETLINK buffer
+ *
+ * Description:
+ * This function returns a pointer to the start of the NetLabel unlabeled
+ * payload.
+ *
+ */
+static unsigned char *netlbl_unlabel_payload_data(const struct sk_buff *skb)
+{
+	return nlmsg_data((struct nlmsghdr *)skb->data)
+		+ sizeof(struct netlbl_unlabel_msghdr);
+}
+
+/*
+ * Label Mapping Functions
+ */
+
+/**
+ * netlbl_unlabel_accept - Handle an ACCEPT message
+ * @req_skb: the NETLINK buffer
+ * @msg: the NetLabel management message
+ *
+ * Description:
+ * Process a user generated ACCEPT message and set the accept flag accordingly.
+ *
+ */
+static void netlbl_unlabel_accept(const struct sk_buff *req_skb,
+				 const unsigned char *msg)
+{
+	u32 value;
+
+	if (netlbl_unlabel_payload_len(req_skb) == 4) {
+		value = netlbl_get_u32(msg);
+		if (value == 1 || value == 0) {
+			atomic_set(&netlabel_unlabel_accept_flg, value);
+			netlbl_unlabel_send_ack(req_skb, NETLBL_E_OK);
+			return;
+		}
+	}
+
+	netlbl_unlabel_send_ack(req_skb, EINVAL);
+	return;
+}
+
+/*
+ * NetLabel Protocol Handlers
+ */
+
+/**
+ * netlbl_unlabel_send_ack - Send an ACK message
+ * @req_skb: the NETLINK buffer
+ * @ret_code: return code to use
+ *
+ * Description:
+ * This function sends an ACK message to the sender of the NETLINK message
+ * specified by @req_skb.
+ *
+ */
+static void netlbl_unlabel_send_ack(const struct sk_buff *req_skb,
+				    const u32 ret_code)
+{
+	size_t msg_size;
+	size_t data_size;
+	struct sk_buff *skb;
+	struct nlmsghdr *nl_ack_hdr;
+	unsigned char *data;
+
+	data_size = sizeof(struct netlbl_unlabel_msghdr) + 8;
+	msg_size = NLMSG_SPACE(data_size);
+
+	skb = alloc_skb(msg_size, GFP_KERNEL);
+	if (skb == NULL)
+		return;
+
+	nl_ack_hdr = NLMSG_PUT(skb,
+			       NETLINK_CB(req_skb).pid,
+			       0,
+			       NETLBL_NLTYPE_UNLABELED,
+			       data_size);
+	nl_ack_hdr->nlmsg_len = msg_size;
+
+	data = NLMSG_DATA(nl_ack_hdr);
+	netlbl_unlabel_putinc_hdr(&data, NL_UNL_ACK);
+	netlbl_putinc_u32(&data,
+			  ((struct nlmsghdr *)req_skb->data)->nlmsg_seq);
+	netlbl_putinc_u32(&data, ret_code);
+
+	netlbl_netlink_snd(skb, NETLINK_CB(req_skb).pid);
+	return;
+
+nlmsg_failure:
+	kfree_skb(skb);
+}
+
+/**
+ * netlbl_unlabel_rcv - Process incoming NetLabel packets
+ * @skb: the NETLINK buffer
+ * @msg: pointer to the start of the NetLabel data
+ *
+ * Description:
+ * This function is reponsibile for reading all of the incoming Unlabeled
+ * NetLabel traffic and dispatching it to the correct Unlabeled functions.
+ *
+ */
+void netlbl_unlabel_rcv(const struct sk_buff *skb, const unsigned char *msg)
+{
+	int ret_val;
+
+	if (nlmsg_len((struct nlmsghdr *)skb->data) <
+	    sizeof(struct netlbl_unlabel_msghdr)) {
+		netlbl_unlabel_send_ack(skb, EINVAL);
+		return;
+	}
+
+	switch (((struct netlbl_unlabel_msghdr *)msg)->opcode) {
+	case NL_UNL_ACCEPT:
+		ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
+		if (ret_val != 0)
+			netlbl_unlabel_send_ack(skb, ret_val);
+		netlbl_unlabel_accept(skb, netlbl_unlabel_payload_data(skb));
+		break;
+	default:
+		netlbl_unlabel_send_ack(skb, EINVAL);
+		return;
+	}
+}
+
+/*
+ * NetLabel KAPI Hooks
+ */
+
+/**
+ * netlbl_unlabel_getattr - Get the security attributes for an unlabled packet
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Determine the security attributes, if any, for an unlabled packet and return
+ * them in @secattr.  Returns zero on success and negative values on failure.
+ *
+ */
+int netlbl_unlabel_getattr(struct netlbl_lsm_secattr *secattr)
+{
+	BUG_ON(secattr == NULL);
+
+	if (atomic_read(&netlabel_unlabel_accept_flg) == 1) {
+		memset(secattr, 0, sizeof(*secattr));
+		return 0;
+	}
+
+	return -ENOMSG;
+}
+
+/**
+ * netlbl_unlabel_defconf - Set the default config to allow unlabeled packets
+ *
+ * Description:
+ * Set the default NetLabel configuration to allow incoming unlabeled packets
+ * and to send unlabeled network traffic by default.
+ *
+ */
+int netlbl_unlabel_defconf(void)
+{
+	int ret_val;
+	struct netlbl_dom_map *entry;
+
+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+	if (entry == NULL)
+		return -ENOMEM;
+	entry->type = NETLBL_NLTYPE_UNLABELED;
+	ret_val = netlbl_domhsh_add_default(entry);
+	if (ret_val != 0)
+		return ret_val;
+
+	atomic_set(&netlabel_unlabel_accept_flg, 1);
+
+	return 0;
+}
Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.h
@@ -0,0 +1,83 @@
+/*
+ * NetLabel Unlabeled Support
+ *
+ * This file defines functions for dealing with unlabeled packets for the
+ * NetLabel system.  The NetLabel system manages static and dynamic label
+ * mappings for network protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_UNLABELED_H
+#define _NETLABEL_UNLABELED_H
+
+#include <net/netlabel.h>
+
+/*
+ * The following NetLabel payloads are supported by the Unlabeled subsystem,
+ * all of which are preceeded by the nlmsghdr struct.
+ *
+ * o ACK:
+ *   Sent by the kernel in response to an applications message, applications
+ *   should never send this message.
+ *
+ *   +----------------------+-----------------------+
+ *   | seq number (32 bits) | return code (32 bits) |
+ *   +----------------------+-----------------------+
+ *
+ *     seq number:  the sequence number of the original message, taken from the
+ *                  nlmsghdr structure
+ *     return code: return value, based on errno values
+ *
+ * o ACCEPT
+ *   This message is sent from an application to specify if the kernel should
+ *   allow unlabled packets to pass if they do not match any of the static
+ *   mappings defined in the unlabeled module.
+ *
+ *   +-----------------+
+ *   | allow (32 bits) |
+ *   +-----------------+
+ *
+ *     allow: if true (1) then allow the packets to pass, if false (0) then
+ *            reject the packets
+ *
+ */
+
+/* Unlabeled message header */
+struct netlbl_unlabel_msghdr {
+	enum { NL_UNL_NOOP,
+	       NL_UNL_ACK,
+	       NL_UNL_ACCEPT
+	} opcode;
+};
+
+/* Process Unlabeled NetLabel messages */
+void netlbl_unlabel_rcv(const struct sk_buff *skb, const unsigned char *msg);
+
+/* Process Unlabeled incoming network packets */
+int netlbl_unlabel_getattr(struct netlbl_lsm_secattr *secattr);
+
+/* Set the default configuration to allow Unlabeled packets */
+int netlbl_unlabel_defconf(void);
+
+#endif

--
paul moore
linux security @ hp


netlink-eff_cap-lsm-framework.patch:
 include/linux/security.h        |   13 +++++++------
 kernel/audit.c                  |    8 ++++----
 net/core/rtnetlink.c            |    2 +-
 net/decnet/netfilter/dn_rtmsg.c |    2 +-
 net/ipv4/netfilter/ip_queue.c   |    2 +-
 net/ipv6/netfilter/ip6_queue.c  |    2 +-
 net/netfilter/nfnetlink.c       |    2 +-
 net/netlink/genetlink.c         |    2 +-
 net/xfrm/xfrm_user.c            |    2 +-
 security/commoncap.c            |    4 ++--
 security/dummy.c                |    4 ++--
 security/selinux/hooks.c        |   26 +++++++++++++-------------
 12 files changed, 35 insertions(+), 34 deletions(-)

--- NEW FILE netlink-eff_cap-lsm-framework.patch ---
>From dgoeddel at trustedcs.com Mon Jun 19 11:48:17 2006
Return-Path: <dgoeddel at trustedcs.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Mon, 19 Jun 2006 11:48:37 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5JFmadH007320
	for <sgrubb at boston.redhat.com>; Mon, 19 Jun 2006 11:48:36 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5JFmaso024576;
	Mon, 19 Jun 2006 11:48:36 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5JFmScr003353;
	Mon, 19 Jun 2006 11:48:28 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k5JFmMgS012474;
	Mon, 19 Jun 2006 11:48:22 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap (V1.3)
	id (null); Mon Jun 19 11:48:19 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by trauma.tcs-sec.com with NetIQ MailMarshal (v6,0,3,8)
	id <B4496c7430000>; Mon, 19 Jun 2006 11:48:19 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13)
	id M0A82H3V; Mon, 19 Jun 2006 11:48:18 -0400
Message-ID: <4496C741.4080006 at trustedcs.com>
Date: Mon, 19 Jun 2006 10:48:17 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Steve Grubb <sgrubb at redhat.com>,
 Alexander Viro <aviro at redhat.com>
Subject: [PATCH] encapsulate netlink's eff_cap within the lsm framework
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.82 
X-UID: 70063
X-Length: 11479

Do you want to use this in the lspp kernels (and put in in the audit-git
patch) to replace the following "band-aid" patch in the lspp kernel?

https://www.redhat.com/archives/redhat-lspp/2006-May/msg00161.html

Assuming that it looks good...  Stephen Smalley seemed to give it an OK
from the SELinux end.

Darrel

-- 

This patch encapsulates the usage of eff_cap (in netlink_skb_params) within
the lsm framework by extending security_netlink_recv to include a required
capability parameter and converting all direct usage of eff_caps outside
of the lsm modules to use the interface.  It also updates the SELinux
implementation of the security_netlink_send and security_netlink_recv
hooks to take advantage of the sid in the netlink_skb_params struct.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>

diff --git a/include/linux/security.h b/include/linux/security.h
index 1bab48f..deb3968 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -67,7 +67,7 @@ struct xfrm_state;
 struct xfrm_user_sec_ctx;
 
 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
-extern int cap_netlink_recv(struct sk_buff *skb);
+extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 
 /*
  * Values used in the task_security_ops calls
@@ -647,6 +647,7 @@ #ifdef CONFIG_SECURITY
  *	Check permission before processing the received netlink message in
  *	@skb.
  *	@skb contains the sk_buff structure for the netlink message.
+ *	@cap indicates the capability required
  *	Return 0 if permission is granted.
  *
  * Security hooks for Unix domain networking.
@@ -1248,7 +1249,7 @@ struct security_operations {
 			  struct sembuf * sops, unsigned nsops, int alter);
 
 	int (*netlink_send) (struct sock * sk, struct sk_buff * skb);
-	int (*netlink_recv) (struct sk_buff * skb);
+	int (*netlink_recv) (struct sk_buff * skb, int cap);
 
 	/* allow module stacking */
 	int (*register_security) (const char *name,
@@ -2002,9 +2003,9 @@ static inline int security_netlink_send(
 	return security_ops->netlink_send(sk, skb);
 }
 
-static inline int security_netlink_recv(struct sk_buff * skb)
+static inline int security_netlink_recv(struct sk_buff * skb, int cap)
 {
-	return security_ops->netlink_recv(skb);
+	return security_ops->netlink_recv(skb, cap);
 }
 
 /* prototypes */
@@ -2630,9 +2631,9 @@ static inline int security_netlink_send 
 	return cap_netlink_send (sk, skb);
 }
 
-static inline int security_netlink_recv (struct sk_buff *skb)
+static inline int security_netlink_recv (struct sk_buff *skb, int cap)
 {
-	return cap_netlink_recv (skb);
+	return cap_netlink_recv (skb, cap);
 }
 
 static inline struct dentry *securityfs_create_dir(const char *name,
diff --git a/kernel/audit.c b/kernel/audit.c
index df57b49..8c6b430 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -412,7 +412,7 @@ nlmsg_failure:			/* Used by NLMSG_PUT */
  * Check for appropriate CAP_AUDIT_ capabilities on incoming audit
  * control messages.
  */
-static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type)
+static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
 {
 	int err = 0;
 
@@ -426,13 +426,13 @@ static int audit_netlink_ok(kernel_cap_t
 	case AUDIT_DEL:
 	case AUDIT_DEL_RULE:
 	case AUDIT_SIGNAL_INFO:
-		if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL))
+		if (security_netlink_recv(skb, CAP_AUDIT_CONTROL))
 			err = -EPERM;
 		break;
 	case AUDIT_USER:
 	case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG:
 	case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2:
-		if (!cap_raised(eff_cap, CAP_AUDIT_WRITE))
+		if (security_netlink_recv(skb, CAP_AUDIT_WRITE))
 			err = -EPERM;
 		break;
 	default:  /* bad msg */
@@ -453,7 +453,7 @@ static int audit_receive_msg(struct sk_b
 	uid_t			loginuid; /* loginuid of sender */
 	struct audit_sig_info   sig_data;
 
-	err = audit_netlink_ok(NETLINK_CB(skb).eff_cap, msg_type);
+	err = audit_netlink_ok(skb, msg_type);
 	if (err)
 		return err;
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 3fcfa9c..f25aac1 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -663,7 +663,7 @@ rtnetlink_rcv_msg(struct sk_buff *skb, s
 	sz_idx = type>>2;
 	kind = type&3;
 
-	if (kind != 2 && security_netlink_recv(skb)) {
+	if (kind != 2 && security_netlink_recv(skb, CAP_NET_ADMIN)) {
 		*errp = -EPERM;
 		return -1;
 	}
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 74133ec..8b99bd3 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -107,7 +107,7 @@ static inline void dnrmg_receive_user_sk
 	if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
 		return;
 
-	if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN))
+	if (security_netlink_recv(skb, CAP_NET_ADMIN))
 		RCV_SKB_FAIL(-EPERM);
 
 	/* Eventually we might send routing messages too */
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index b93f049..89a42af 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -507,7 +507,7 @@ ipq_rcv_skb(struct sk_buff *skb)
 	if (type <= IPQM_BASE)
 		return;
 		
-	if (security_netlink_recv(skb))
+	if (security_netlink_recv(skb, CAP_NET_ADMIN))
 		RCV_SKB_FAIL(-EPERM);
 	
 	write_lock_bh(&queue_lock);
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index b4b7d44..968a14b 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -505,7 +505,7 @@ ipq_rcv_skb(struct sk_buff *skb)
 	if (type <= IPQM_BASE)
 		return;
 	
-	if (security_netlink_recv(skb))
+	if (security_netlink_recv(skb, CAP_NET_ADMIN))
 		RCV_SKB_FAIL(-EPERM);	
 
 	write_lock_bh(&queue_lock);
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index b88e82a..ec9f0ef 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -229,7 +229,7 @@ static int nfnetlink_rcv_msg(struct sk_b
 		 NFNL_SUBSYS_ID(nlh->nlmsg_type),
 		 NFNL_MSG_TYPE(nlh->nlmsg_type));
 
-	if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) {
+	if (security_netlink_recv(skb, CAP_NET_ADMIN)) {
 		DEBUGP("missing CAP_NET_ADMIN\n");
 		*errp = -EPERM;
 		return -1;
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index f329b72..edf084b 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -320,7 +320,7 @@ static int genl_rcv_msg(struct sk_buff *
 		goto errout;
 	}
 
-	if ((ops->flags & GENL_ADMIN_PERM) && security_netlink_recv(skb)) {
+	if ((ops->flags & GENL_ADMIN_PERM) && security_netlink_recv(skb, CAP_NET_ADMIN)) {
 		err = -EPERM;
 		goto errout;
 	}
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 81d1005..d514b3b 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1430,7 +1430,7 @@ static int xfrm_user_rcv_msg(struct sk_b
 	link = &xfrm_dispatch[type];
 
 	/* All operations require privileges, even GET */
-	if (security_netlink_recv(skb)) {
+	if (security_netlink_recv(skb, CAP_NET_ADMIN)) {
 		*errp = -EPERM;
 		return -1;
 	}
diff --git a/security/commoncap.c b/security/commoncap.c
index 841eb4e..57673ee 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -33,9 +33,9 @@ int cap_netlink_send(struct sock *sk, st
 
 EXPORT_SYMBOL(cap_netlink_send);
 
-int cap_netlink_recv(struct sk_buff *skb)
+int cap_netlink_recv(struct sk_buff *skb, int cap)
 {
-	if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN))
+	if (!cap_raised(NETLINK_CB(skb).eff_cap, cap))
 		return -EPERM;
 	return 0;
 }
diff --git a/security/dummy.c b/security/dummy.c
index 8cccccc..49ad82d 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -665,9 +665,9 @@ static int dummy_netlink_send (struct so
 	return 0;
 }
 
-static int dummy_netlink_recv (struct sk_buff *skb)
+static int dummy_netlink_recv (struct sk_buff *skb, int cap)
 {
-	if (!cap_raised (NETLINK_CB (skb).eff_cap, CAP_NET_ADMIN))
+	if (!cap_raised (NETLINK_CB (skb).eff_cap, cap))
 		return -EPERM;
 	return 0;
 }
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 21dad41..023da01 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3586,32 +3586,32 @@ #endif	/* CONFIG_NETFILTER */
 
 static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb)
 {
-	struct task_security_struct *tsec;
-	struct av_decision avd;
 	int err;
 
 	err = secondary_ops->netlink_send(sk, skb);
 	if (err)
 		return err;
 
-	tsec = current->security;
-
-	avd.allowed = 0;
-	avc_has_perm_noaudit(tsec->sid, tsec->sid,
-				SECCLASS_CAPABILITY, ~0, &avd);
-	cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed);
-
 	if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS)
 		err = selinux_nlmsg_perm(sk, skb);
 
 	return err;
 }
 
-static int selinux_netlink_recv(struct sk_buff *skb)
+static int selinux_netlink_recv(struct sk_buff *skb, int capability)
 {
-	if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN))
-		return -EPERM;
-	return 0;
+	int err;
+	struct avc_audit_data ad;
+
+	err = secondary_ops->netlink_recv(skb, capability);
+	if (err)
+		return err;
+
+	AVC_AUDIT_DATA_INIT(&ad, CAP);
+	ad.u.cap = capability;
+
+	return avc_has_perm(NETLINK_CB(skb).sid, NETLINK_CB(skb).sid,
+	                    SECCLASS_CAPABILITY, CAP_TO_MASK(capability), &ad);
 }
 
 static int ipc_alloc_security(struct task_struct *task,



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.1
retrieving revision 1.2293.2.2
diff -u -r1.2293.2.1 -r1.2293.2.2
--- kernel-2.6.spec	19 Jun 2006 23:33:11 -0000	1.2293.2.1
+++ kernel-2.6.spec	21 Jun 2006 20:33:59 -0000	1.2293.2.2
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.37
+%define tag FC6.lspp.38
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -460,8 +460,20 @@
 # Audit & lspp patches
 Patch20100: linux-2.6-audit-git.patch
 Patch20101: linux-2.6-audit-pending.patch
-Patch20102: capabilities-over-netlink-in-permissive-mode.patch
-Patch20103: linux-2.6-net-label.patch
+Patch20102: netlink-eff_cap-lsm-framework.patch
+Patch20103: linux-2.6-net-label_1_7.patch
+Patch20104: linux-2.6-net-label_2_7.patch
+Patch20105: linux-2.6-net-label_3_7.patch
+Patch20106: linux-2.6-net-label_4_7.patch
+Patch20107: linux-2.6-net-label_5_7.patch
+Patch20108: linux-2.6-net-label_6_7.patch
+Patch20109: linux-2.6-net-label_7_7.patch
+#Patch20110: mlsxfrm-01_06.patch
+#Patch20111: mlsxfrm-02_06.patch
+#Patch20112: mlsxfrm-03_06.patch
+#Patch20113: mlsxfrm-04_06.patch
+#Patch20114: mlsxfrm-05_06.patch
+#Patch20115: mlsxfrm-06_06.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1102,8 +1114,23 @@
 # Audit patches
 %patch20100 -p1
 %patch20101 -p1
+# netlink fix
 %patch20102 -p1
-#%patch20103 -p1
+# netlabel
+%patch20103 -p1
+%patch20104 -p1
+%patch20105 -p1
+%patch20106 -p1
+%patch20107 -p1
+%patch20108 -p1
+%patch20109 -p1
+# ipsec
+#%patch20110 -p1
+#%patch20111 -p1
+#%patch20112 -p1
+#%patch20113 -p1
+#%patch20114 -p1
+#%patch20115 -p1
 
 
 # now run oldconfig over all the config files
@@ -1713,6 +1740,9 @@
 %endif
 
 %changelog
+* Wed Jun 21 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.38, new netlink fix from Darrel & netlabel patch from Paul
+
 * Mon Jun 19 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.37
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 20:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 16:51:35 -0400
Subject: rpms/kernel/devel linux-2.6-net-label.patch,1.1.8.1,NONE
Message-ID: <200606212051.k5LKpZoQ004943@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4797

Removed Files:
      Tag: private-lspp-37-branch
	linux-2.6-net-label.patch 
Log Message:
remove old patch



--- linux-2.6-net-label.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 20:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 16:55:30 -0400
Subject: rpms/kernel/devel linux-2.6-net-label_4_7.patch,1.1.2.1,1.1.2.2
Message-ID: <200606212055.k5LKtUU4016579@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24098

Modified Files:
      Tag: private-lspp-37-branch
	linux-2.6-net-label_4_7.patch 
Log Message:
take the __init and __exit modifiers off 2 functions


linux-2.6-net-label_4_7.patch:
 include/net/netlabel.h             |  434 +++++++++++++++++++++++
 net/Kconfig                        |    2 
 net/Makefile                       |    3 
 net/netlabel/Kconfig               |   47 ++
 net/netlabel/Makefile              |   19 +
 net/netlabel/netlabel_domainhash.c |  629 +++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_domainhash.h |   64 +++
 net/netlabel/netlabel_kapi.c       |  392 +++++++++++++++++++++
 net/netlabel/netlabel_mgmt.c       |  689 +++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_mgmt.h       |  248 +++++++++++++
 net/netlabel/netlabel_user.c       |  162 ++++++++
 net/netlabel/netlabel_user.h       |   67 +++
 12 files changed, 2756 insertions(+)

Index: linux-2.6-net-label_4_7.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-net-label_4_7.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-net-label_4_7.patch	21 Jun 2006 20:34:19 -0000	1.1.2.1
+++ linux-2.6-net-label_4_7.patch	21 Jun 2006 20:55:27 -0000	1.1.2.2
@@ -770,7 +770,7 @@
 + * values on error.
 + *
 + */
-+int __init netlbl_domhsh_init(const u32 size)
++int netlbl_domhsh_init(const u32 size)
 +{
 +	u32 iter;
 +	struct netlbl_domhsh_tbl *hsh_tbl;
@@ -1298,8 +1298,8 @@
 +};
 +
 +/* init/exit functions */
-+int netlbl_domhsh_init(const u32 size) __init;
-+void netlbl_domhsh_exit(void) __exit;
++int netlbl_domhsh_init(const u32 size) ;
++void netlbl_domhsh_exit(void) ;
 +
 +/* Manipulate the domain hash table */
 +int netlbl_domhsh_add(struct netlbl_dom_map *entry);
@@ -1652,7 +1652,7 @@
 + * Perform the initialization of the NetLabel module before first use.
 + *
 + */
-+static int __init netlbl_init(void)
++static int netlbl_init(void)
 +{
 +	int ret_val = 0;
 +
@@ -1699,7 +1699,7 @@
 + * Perform any cleanup required before removing the NetLabel module.
 + *
 + */
-+static void __exit netlbl_exit(void)
++static void netlbl_exit(void)
 +{
 +	netlbl_netlink_exit();
 +	netlbl_domhsh_exit();
@@ -2755,7 +2755,7 @@
 + * success and non-zero on failure.
 + *
 + */
-+int __init netlbl_netlink_init(void)
++int netlbl_netlink_init(void)
 +{
 +	/* XXX - it might be a good idea to spawn a thread here at startup to
 +	   handle the updates to the label mapping databases and have the
@@ -2885,8 +2885,8 @@
 +
 +/* NetLabel NETLINK I/O functions */
 +
-+int netlbl_netlink_init(void) __init;
-+void netlbl_netlink_exit(void) __exit;
++int netlbl_netlink_init(void) ;
++void netlbl_netlink_exit(void) ;
 +int netlbl_netlink_snd(struct sk_buff *skb, const u32 pid);
 +int netlbl_netlink_snd_multicast(struct sk_buff *skb,
 +				 const u32 pid,



From fedora-cvs-commits at redhat.com  Wed Jun 21 21:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 17:14:09 -0400
Subject: rpms/openssl/devel .cvsignore, 1.14,
	1.15 openssl-0.9.8a-padlock.patch, 1.1, 1.2 openssl.spec, 1.76,
	1.77 sources, 1.16, 1.17 libica-1.3.4-urandom.patch, 1.4,
	NONE libica-1.3.6-linkcrypto.patch, 1.1,
	NONE libica-1.3.6-no-config-h.patch, 1.1,
	NONE libica-1.3.6-stale-handles.patch, 1.1,
	NONE openssl-0.9.7a-libica-autoconf.patch, 1.1,
	NONE openssl-0.9.8a-ICA_engine-sep142005.patch, 1.1, NONE
Message-ID: <200606212114.k5LLE9OX028547@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28503

Modified Files:
	.cvsignore openssl-0.9.8a-padlock.patch openssl.spec sources 
Removed Files:
	libica-1.3.4-urandom.patch libica-1.3.6-linkcrypto.patch 
	libica-1.3.6-no-config-h.patch 
	libica-1.3.6-stale-handles.patch 
	openssl-0.9.7a-libica-autoconf.patch 
	openssl-0.9.8a-ICA_engine-sep142005.patch 
Log Message:
* Wed Jun 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-3
- dropped libica and ica engine from build



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 May 2006 11:52:19 -0000	1.14
+++ .cvsignore	21 Jun 2006 21:14:05 -0000	1.15
@@ -1,2 +1 @@
-libica-1.3.6-rc3.tar.bz2
 openssl-0.9.8b-usa.tar.bz2

openssl-0.9.8a-padlock.patch:
 eng_all.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: openssl-0.9.8a-padlock.patch
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl-0.9.8a-padlock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl-0.9.8a-padlock.patch	4 Apr 2006 17:45:56 -0000	1.1
+++ openssl-0.9.8a-padlock.patch	21 Jun 2006 21:14:05 -0000	1.2
@@ -1,16 +1,16 @@
---- openssl-0.9.8a/crypto/engine/eng_all.c.padlock	2005-11-22 16:36:22.000000000 +0100
-+++ openssl-0.9.8a/crypto/engine/eng_all.c	2006-04-04 18:03:13.000000000 +0200
-@@ -72,6 +72,9 @@
- #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_IBMCA)
- 	ENGINE_load_ibmca();
+--- openssl-0.9.8b/crypto/engine/eng_all.c.padlock	2005-04-19 15:24:44.000000000 +0200
++++ openssl-0.9.8b/crypto/engine/eng_all.c	2006-06-21 19:57:29.000000000 +0200
+@@ -69,6 +69,9 @@
+ 	ENGINE_load_openssl();
  #endif
+ 	ENGINE_load_dynamic();
 +#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
 +	ENGINE_load_padlock();
 +#endif
  #ifndef OPENSSL_NO_STATIC_ENGINE
  #ifndef OPENSSL_NO_HW
  #ifndef OPENSSL_NO_HW_4758_CCA
-@@ -98,9 +101,6 @@
+@@ -95,9 +98,6 @@
  #ifndef OPENSSL_NO_HW_UBSEC
  	ENGINE_load_ubsec();
  #endif


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- openssl.spec	21 Jun 2006 12:49:44 -0000	1.76
+++ openssl.spec	21 Jun 2006 21:14:05 -0000	1.77
@@ -18,8 +18,6 @@
 # Arches for which we don't build subpackages.
 %define optimize_arches i686
 
-%define libicaversion 1.3.6-rc3
-
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
@@ -31,8 +29,6 @@
 Source4: https://rhn.redhat.com/help/RHNS-CA-CERT
 Source5: https://rhn.redhat.com/help/RHNS-CA-CERT.asc
 Source6: make-dummy-cert
-# http://sourceforge.net/projects/opencryptoki/
-Source7: libica-%{libicaversion}.tar.bz2
 Source8: openssl-thread-test.c
 Source9: opensslconf-new.h
 Source10: opensslconf-new-warning.h
@@ -43,14 +39,7 @@
 Patch3: openssl-0.9.8b-soversion.patch
 Patch4: openssl-0.9.8a-enginesdir.patch
 Patch5: openssl-0.9.8a-no-rpath.patch
-Patch6: openssl-0.9.7a-libica-autoconf.patch
-# Added engines
-Patch20: libica-1.3.4-urandom.patch
-Patch21: libica-1.3.6-linkcrypto.patch
-Patch22: openssl-0.9.8a-ICA_engine-sep142005.patch
-Patch23: libica-1.3.6-stale-handles.patch
 Patch24: openssl-0.9.8a-padlock.patch
-Patch25: libica-1.3.6-no-config-h.patch
 # Functionality changes
 Patch32: openssl-0.9.7-beta6-ia64.patch
 Patch33: openssl-0.9.7f-ca-dir.patch
@@ -98,7 +87,7 @@
 from other formats to the formats used by the OpenSSL toolkit.
 
 %prep
-%setup -q -a 7
+%setup -q
 
 %{SOURCE1} > /dev/null
 %patch0 -p1 -b .redhat
@@ -108,17 +97,7 @@
 %patch3 -p1 -b .soversion
 %patch4 -p1 -b .enginesdir
 %patch5 -p1 -b .no-rpath
-%patch6 -p1 -b .libica-autoconf
 
-pushd libica-%{libicaversion}
-# Patch for libica to use /dev/urandom instead of internal pseudo random number
-# generator.
-%patch20 -p2 -b .urandom
-%patch21 -p1 -b .linkcrypto
-%patch23 -p1 -b .stale-handles
-%patch25 -p1 -b .no-config-h
-popd
-%patch22 -p1 -b .ibmca
 %patch24 -p1 -b .padlock
 
 %patch32 -p1 -b .ia64
@@ -199,18 +178,6 @@
 # Patch33 must be patched after tests otherwise they will fail
 patch -p1 -b -z .ca-dir < %{PATCH33}
 
-%ifarch s390 s390x
-pushd libica-%{libicaversion}
-if [[ $RPM_BUILD_ROOT  ]] ; then
-        export INSROOT=$RPM_BUILD_ROOT
-fi
-CPPFLAGS=-I../../include
-export CPPFLAGS
-%configure
-make
-popd
-%endif
-
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 # Install OpenSSL.
@@ -321,21 +288,6 @@
 # Remove fips fingerprint script 
 rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
 
-%ifarch s390 s390x
-pushd libica-%{libicaversion}
-if [[ $RPM_BUILD_ROOT  ]] ;
-then
-        export INSROOT=$RPM_BUILD_ROOT
-fi
-%makeinstall
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mv $RPM_BUILD_ROOT/%{_bindir}/libica.so $RPM_BUILD_ROOT/%{_libdir}/libica.so
-cp -f include/ica_api.h $RPM_BUILD_ROOT%{_includedir}
-popd
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrypto.so.%{soversion}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion}
-%endif
-
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -367,17 +319,11 @@
 %attr(0644,root,root) %{_mandir}/man1*/[ABD-Zabcd-z]*
 %attr(0644,root,root) %{_mandir}/man5*/*
 %attr(0644,root,root) %{_mandir}/man7*/*
-%ifarch s390 s390x
-%attr(0755,root,root) %{_libdir}/libica.so
-%endif
 
 %ifnarch %{optimize_arches}
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/openssl
-%ifarch s390 s390x
-%{_includedir}/*.h
-%endif
 %attr(0644,root,root) %{_libdir}/*.a
 %attr(0755,root,root) %{_libdir}/*.so
 %attr(0644,root,root) %{_mandir}/man3*/*
@@ -396,7 +342,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Wed Jun 21 2006 Joe Orton <jorton at redhat.com> 0.9.8b-3
+* Wed Jun 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-3
+- dropped libica and ica engine from build
+
+* Wed Jun 21 2006 Joe Orton <jorton at redhat.com>
 - update to new CA bundle from mozilla.org; adds CA certificates
   from netlock.hu and startcom.org
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 May 2006 11:52:19 -0000	1.16
+++ sources	21 Jun 2006 21:14:05 -0000	1.17
@@ -1,2 +1 @@
-ec1e464d40fb61fed27b7b0078d2e3dd  libica-1.3.6-rc3.tar.bz2
 c99f8df9f19fdd38ee784b0ac06c2221  openssl-0.9.8b-usa.tar.bz2


--- libica-1.3.4-urandom.patch DELETED ---


--- libica-1.3.6-linkcrypto.patch DELETED ---


--- libica-1.3.6-no-config-h.patch DELETED ---


--- libica-1.3.6-stale-handles.patch DELETED ---


--- openssl-0.9.7a-libica-autoconf.patch DELETED ---


--- openssl-0.9.8a-ICA_engine-sep142005.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:26:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:26:23 -0400
Subject: rpms/xorg-x11-xtrans-devel/FC-5 Makefile,1.1,1.2
Message-ID: <200606212326.k5LNQNWW010123@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10089

Modified Files:
	Makefile 
Log Message:
Fix Makefile


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/FC-5/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	29 Aug 2005 06:53:52 -0000	1.1
+++ Makefile	21 Jun 2006 23:26:21 -0000	1.2
@@ -1,6 +1,6 @@
 # Makefile for source rpm: xorg-x11-xtrans-devel
 # $Id$
 NAME := xorg-x11-xtrans-devel
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:27:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:27:04 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel Makefile,1.1,1.2
Message-ID: <200606212327.k5LNR4kI010402@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10374

Modified Files:
	Makefile 
Log Message:
Fix Makefile


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	29 Aug 2005 06:53:52 -0000	1.1
+++ Makefile	21 Jun 2006 23:27:01 -0000	1.2
@@ -1,6 +1,6 @@
 # Makefile for source rpm: xorg-x11-xtrans-devel
 # $Id$
 NAME := xorg-x11-xtrans-devel
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:32:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:32:20 -0400
Subject: rpms/xorg-x11-xtrans-devel/FC-5 xorg-x11-xtrans-devel.spec, 1.12,
	1.13
Message-ID: <200606212332.k5LNWKUa021606@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21591

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3.2.FC5.0
- Backport of 1.0.0-4 from rawhide, identical except for release tag.
- Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)
- Use setup -n instead of -c, and remove extraneous calls to cd from build
  and install sections.
- Use "make install DESTDIR=$RPM_BUILD_ROOT" instead of makeinstall macro.
- Added "AUTHORS ChangeLog COPYING INSTALL NEWS README" to doc macro.



Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/FC-5/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xtrans-devel.spec	1 Mar 2006 07:13:41 -0000	1.12
+++ xorg-x11-xtrans-devel.spec	21 Jun 2006 23:32:07 -0000	1.13
@@ -6,11 +6,16 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.0
-Release: 3.2
+Release: 3.2.FC5.0
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xtrans-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/xtrans-%{version}.tar.bz2
+
+# NOTE: Fix for http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195555 which
+# at the time I'm committing this to Fedora development, is only a "potential"
+# security issue, and does not yet have any known exploit vector.
+Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xtrans-1.0.0-setuid.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,24 +28,25 @@
 X.Org X11 developmental X transport library
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n xtrans-%{version}
+%patch0 -p0 -b .setuid
 
 %build
-cd xtrans-%{version}
+
 %configure
 # Running 'make' not needed.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd xtrans-%{version}
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xtrans
 %{_includedir}/X11/Xtrans/Xtrans.c
@@ -57,6 +63,14 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3.2.FC5.0
+- Backport of 1.0.0-4 from rawhide, identical except for release tag.
+- Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)
+- Use setup -n instead of -c, and remove extraneous calls to cd from build
+  and install sections.
+- Use "make install DESTDIR=$RPM_BUILD_ROOT" instead of makeinstall macro.
+- Added "AUTHORS ChangeLog COPYING INSTALL NEWS README" to doc macro.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-3.2
 - bump again for double-long bug on ppc(64)
 
@@ -84,7 +98,7 @@
   *.pc files, and does not contain any ELF binaries or DSOs, so we disable
   debuginfo generation.
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
 - Use Fedora-Extras style BuildRoot tag
 - Add tarball URL
 



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:38:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:38:45 -0400
Subject: rpms/xorg-x11-xtrans-devel/FC-5 xtrans-1.0.0-setuid.diff,NONE,1.1
Message-ID: <200606212338.k5LNcj0n021754@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21734

Added Files:
	xtrans-1.0.0-setuid.diff 
Log Message:
Add xtrans-1.0.0-setuid.diff

xtrans-1.0.0-setuid.diff:
 Xtranslcl.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE xtrans-1.0.0-setuid.diff ---
Index: Xtranslcl.c
===================================================================
RCS file: /cvs/xorg/lib/xtrans/Xtranslcl.c,v
retrieving revision 1.4
diff -u -r1.4 Xtranslcl.c
--- Xtranslcl.c	8 Nov 2005 06:33:26 -0000	1.4
+++ Xtranslcl.c	19 Jun 2006 21:22:07 -0000
@@ -360,7 +360,10 @@
 	uid_t       saved_euid;
 
 	saved_euid = geteuid();
-	setuid( getuid() ); /** sets the euid to the actual/real uid **/
+	/** sets the euid to the actual/real uid **/
+	if (setuid( getuid() ) == -1) {
+		exit(1);
+	}
 	if( chown( slave, saved_euid, -1 ) < 0 ) {
 		exit( 1 );
 		}
@@ -369,7 +372,13 @@
     }
 
     waitpid(saved_pid, &exitval, 0);
-
+    if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) {
+	close(fd);
+	close(server);
+	PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n",
+	      slave, 0, 0);
+	return(-1);
+    }
     if (chmod(slave, 0666) < 0) {
 	close(fd);
 	close(server);



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:38:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:38:57 -0400
Subject: rpms/openais/devel .cvsignore, 1.2, 1.3 openais.spec, 1.2,
	1.3 sources, 1.2, 1.3 openais-0.76-override.patch, 1.1, NONE
Message-ID: <200606212338.k5LNcvDU021793@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21770/devel

Modified Files:
	.cvsignore openais.spec sources 
Removed Files:
	openais-0.76-override.patch 
Log Message:
auto-import openais-0.77-1.0 on branch devel from openais-0.77-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jun 2006 18:42:38 -0000	1.2
+++ .cvsignore	21 Jun 2006 23:38:54 -0000	1.3
@@ -1 +1 @@
-openais-0.76.tar.gz
+openais-0.77.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openais.spec	14 Jun 2006 19:55:46 -0000	1.2
+++ openais.spec	21 Jun 2006 23:38:54 -0000	1.3
@@ -1,13 +1,12 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.76
-Release: 1.8
+Version: 0.77
+Release: 1.0
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
-Patch1: openais-0.76-override.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64
 Requires(pre): /usr/sbin/useradd
@@ -32,7 +31,6 @@
 %prep
 %setup -q -n openais-%{version}
 %patch0 -p0
-%patch1 -p0
 
 %build
 # -O3 required for performance reasons
@@ -131,10 +129,17 @@
 %{_includedir}/openais/totem/aispoll.h
 %{_includedir}/openais/totem/totem.h
 %{_includedir}/openais/totem/totemip.h
+%{_includedir}/openais/totem/totempg.h
 %dir %{_includedir}/openais/lcr/
 %{_includedir}/openais/lcr/lcr_ckpt.h
 %{_includedir}/openais/lcr/lcr_comp.h
 %{_includedir}/openais/lcr/lcr_ifact.h
+%dir %{_includedir}/openais/service
+%{_includedir}/openais/service/config.h
+%{_includedir}/openais/service/objdb.h
+%{_includedir}/openais/service/print.h
+%{_includedir}/openais/service/swab.h
+%{_includedir}/openais/service/service.h
 %{_mandir}/man5/openais.conf.5*
 %{_mandir}/man3/cpg_dispatch.3*
 %{_mandir}/man3/cpg_fd_get.3*
@@ -155,6 +160,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Wed Jun 21 2006 Steven Dake <sdake at redhat.com> - 0.77-1.0
+- New upstream release.
+
 * Tue Jun 13 2006 Steven Dake <sdake at redhat.com> - 0.76-1.8
 - Readded ExlcusiveArch since build system builds s390 and ia64 which are
   untested.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2006 18:42:39 -0000	1.2
+++ sources	21 Jun 2006 23:38:54 -0000	1.3
@@ -1 +1 @@
-1b78ae92ec8d73a91c3d250e03f86d5c  openais-0.76.tar.gz
+3b1798e5cfec5bddf69d8806d4995995  openais-0.77.tar.gz


--- openais-0.76-override.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:44:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:44:12 -0400
Subject: rpms/libXcursor/devel libXcursor.spec,1.12,1.13
Message-ID: <200606212344.k5LNiCwg022080@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22068

Modified Files:
	libXcursor.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.7-1
- Update to 1.1.7 from X11R7.1



Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXcursor.spec	7 Jun 2006 18:17:25 -0000	1.12
+++ libXcursor.spec	21 Jun 2006 23:44:10 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
-Version: 1.1.6
-Release: 2
+Version: 1.1.7
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -90,6 +90,9 @@
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.7-1
+- Update to 1.1.7 from X11R7.1
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.6-2
 - Added "BuildRequires: xorg-x11-proto-devel"
 - Added "Requires: xorg-x11-proto-devel" to devel package, needed by xcursor.pc



From fedora-cvs-commits at redhat.com  Wed Jun 21 23:46:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 19:46:48 -0400
Subject: rpms/libXcursor/devel .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <200606212346.k5LNkmTE001835@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1267

Modified Files:
	.cvsignore sources 
Log Message:
update cvs metadata files


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Apr 2006 19:39:37 -0000	1.7
+++ .cvsignore	21 Jun 2006 23:46:45 -0000	1.8
@@ -1 +1,3 @@
-libXcursor-1.1.6.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Apr 2006 19:39:37 -0000	1.8
+++ sources	21 Jun 2006 23:46:45 -0000	1.9
@@ -1 +1 @@
-1ac683d0ff22f1b6b21cbe5ead1d7899  libXcursor-1.1.6.tar.bz2
+893b488b3c1462ac44f852590a0a47f3  libXcursor-1.1.7.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:02:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:02:28 -0400
Subject: rpms/xorg-x11-util-macros/devel .cvsignore,1.6,1.7
Message-ID: <200606220002.k5M02SqA004633@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4619

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Dec 2005 04:31:05 -0000	1.6
+++ .cvsignore	22 Jun 2006 00:02:25 -0000	1.7
@@ -1 +1,3 @@
-util-macros-1.0.1.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:02:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:02:53 -0400
Subject: rpms/xorg-x11-util-macros/devel sources, 1.6,
	1.7 xorg-x11-util-macros.spec, 1.9, 1.10
Message-ID: <200606220002.k5M02rsm004654@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4642

Modified Files:
	sources xorg-x11-util-macros.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
- Update to util-macros-1.0.2 from X11R7.1
- Added COPYING, ChangeLog to file manifest.
- Use "make install" instead of makeinstall macro.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Dec 2005 04:31:05 -0000	1.6
+++ sources	22 Jun 2006 00:02:41 -0000	1.7
@@ -1 +1 @@
-299e3f40e16d9efdb662930c4d1d6de5  util-macros-1.0.1.tar.bz2
+8391f7eb3bf563f5314b0119e870727a  util-macros-1.0.2.tar.bz2


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-util-macros.spec	1 Mar 2006 06:41:15 -0000	1.9
+++ xorg-x11-util-macros.spec	22 Jun 2006 00:02:41 -0000	1.10
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -27,7 +27,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd util-macros-*
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
 %clean
@@ -35,11 +35,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc COPYING ChangeLog
 %{_datadir}/aclocal/xorgversion.m4
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
+- Update to util-macros-1.0.2 from X11R7.1
+- Added COPYING, ChangeLog to file manifest.
+- Use "make install" instead of makeinstall macro.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:09:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:09:31 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.10,
	1.11
Message-ID: <200606220009.k5M09VWu004752@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4741

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
Use setup -n instead of setup -c


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-util-macros.spec	22 Jun 2006 00:02:41 -0000	1.10
+++ xorg-x11-util-macros.spec	22 Jun 2006 00:09:26 -0000	1.11
@@ -1,3 +1,4 @@
+%define pkgname util-macros
 %define debug_package %{nil}
 
 Summary: X.Org X11 Autotools macros
@@ -16,19 +17,19 @@
 comprise the X Window System.
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n %{pkgname}-%{version}
 
 %build
-pushd util-macros-*
+#pushd util-macros-*
 %configure
 make
-popd
+#popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd util-macros-*
+#pushd util-macros-*
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
+#popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +45,7 @@
 - Update to util-macros-1.0.2 from X11R7.1
 - Added COPYING, ChangeLog to file manifest.
 - Use "make install" instead of makeinstall macro.
+- Use setup -n instead of setup -c
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:11:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:11:44 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.11,
	1.12
Message-ID: <200606220011.k5M0Bi7D015448@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15416

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
Clean up spec file


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-util-macros.spec	22 Jun 2006 00:09:26 -0000	1.11
+++ xorg-x11-util-macros.spec	22 Jun 2006 00:11:41 -0000	1.12
@@ -8,10 +8,10 @@
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/util-macros-%{version}.tar.bz2
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+Source0:  http://xorg.freedesktop.org/releases/individual/util/util-macros-%{version}.tar.bz2
+
 %description
 X.Org X11 autotools macros required for building the various packages that
 comprise the X Window System.
@@ -20,16 +20,13 @@
 %setup -q -n %{pkgname}-%{version}
 
 %build
-#pushd util-macros-*
 %configure
 make
-#popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#pushd util-macros-*
+
 make install DESTDIR=$RPM_BUILD_ROOT
-#popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:14:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:14:14 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.148,1.149
Message-ID: <200606220014.k5M0EEWX016368@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16283

Modified Files:
	gnome-applets.spec 
Log Message:
more file list fixing



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- gnome-applets.spec	21 Jun 2006 19:03:58 -0000	1.148
+++ gnome-applets.spec	22 Jun 2006 00:14:12 -0000	1.149
@@ -141,6 +141,10 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.la
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.a
 
+desktop-file-install --vendor gnome --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  --add-only-show-in GNOME                                  \
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 # usermode-ify cpufreq-selector
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -170,7 +174,6 @@
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/gswitchit.schemas                 \
-	    %{_sysconfdir}/gconf/schemas/gtik.schemas                      \
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
@@ -198,8 +201,10 @@
 %{_datadir}/gnome-applets
 %{_datadir}/xmodmap
 %{_datadir}/omf/*
+%{_datadir}/applications/invest-chart.desktop
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
+%{_libdir}/python2.4/site-packages/invest/
 %{_libdir}/libgweather.so*
 %{_libexecdir}/accessx-status-applet
 %{_libexecdir}/battstat-applet-2
@@ -207,8 +212,7 @@
 %{_libexecdir}/cpufreq-applet
 %{_libexecdir}/drivemount_applet2
 %{_libexecdir}/geyes_applet2
-%{_libexecdir}/gnome-applets
-%{_libexecdir}/gnome-applets/mc-install-default-macros
+%{_libexecdir}/gnome-applets/
 %{_libexecdir}/gnome-keyboard-applet
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:33:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:33:38 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.17, 1.18 sources, 1.16,
	1.17 xorg-x11-proto-devel.spec, 1.32, 1.33
Message-ID: <200606220033.k5M0XcwJ004863@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4831

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
- Update to xproto 7.0.7 for X11R7.1
- Use "make install" instead of makeinstall macro.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	12 May 2006 20:37:08 -0000	1.17
+++ .cvsignore	22 Jun 2006 00:33:35 -0000	1.18
@@ -28,3 +28,4 @@
 xproto-7.0.5.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
 glproto-1.4.7.tar.bz2
+xproto-7.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 May 2006 20:37:08 -0000	1.16
+++ sources	22 Jun 2006 00:33:35 -0000	1.17
@@ -6,6 +6,7 @@
 8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
+e4b1c5a323149d97f29434e5ace921c8  glproto-1.4.7.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 3ae193c317a3621966c3c53d83a254f4  kbproto-1.0.2.tar.bz2
 0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2
@@ -25,6 +26,5 @@
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
 f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
-7ebf5b845817a867f2e4bdcabc33a257  xproto-7.0.5.tar.bz2
+d0b9334f2cde90ad19ff94038395347d  xproto-7.0.7.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-e4b1c5a323149d97f29434e5ace921c8  glproto-1.4.7.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-proto-devel.spec	25 May 2006 18:34:14 -0000	1.32
+++ xorg-x11-proto-devel.spec	22 Jun 2006 00:33:35 -0000	1.33
@@ -10,48 +10,45 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 1
+Release: 2
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-%define sourceurl	http://xorg.freedesktop.org/releases/individual/proto
-Source0:  %{sourceurl}/bigreqsproto-1.0.2.tar.bz2
-Source1:  %{sourceurl}/compositeproto-0.3.1.tar.bz2
-Source2:  %{sourceurl}/damageproto-1.0.3.tar.bz2
-Source3:  %{sourceurl}/dmxproto-2.2.2.tar.bz2
-Source4:  %{sourceurl}/evieext-1.0.2.tar.bz2
-Source5:  %{sourceurl}/fixesproto-4.0.tar.bz2
-Source6:  %{sourceurl}/fontcacheproto-0.1.2.tar.bz2
-Source7:  %{sourceurl}/fontsproto-2.0.2.tar.bz2
-Source8:  %{sourceurl}/glproto-1.4.7.tar.bz2
-Source9:  %{sourceurl}/inputproto-1.3.2.tar.bz2
-Source10: %{sourceurl}/kbproto-1.0.2.tar.bz2
-# NOTE: What once was known as PanoramiX, is now known as Xinerama
-#Source11: %{sourceurl}/panoramixproto-1.1.tar.bz2
-Source12: %{sourceurl}/printproto-1.0.3.tar.bz2
-Source13: %{sourceurl}/randrproto-1.1.2.tar.bz2
-Source14: %{sourceurl}/recordproto-1.13.2.tar.bz2
-Source15: %{sourceurl}/renderproto-0.9.2.tar.bz2
-Source16: %{sourceurl}/resourceproto-1.0.2.tar.bz2
-Source17: %{sourceurl}/scrnsaverproto-1.1.0.tar.bz2
-Source18: %{sourceurl}/trapproto-3.4.3.tar.bz2
-Source19: %{sourceurl}/videoproto-2.2.2.tar.bz2
-Source20: %{sourceurl}/xcmiscproto-1.1.2.tar.bz2
-Source21: %{sourceurl}/xextproto-7.0.2.tar.bz2
-Source22: %{sourceurl}/xf86bigfontproto-1.1.2.tar.bz2
-Source23: %{sourceurl}/xf86dgaproto-2.0.2.tar.bz2
-Source24: %{sourceurl}/xf86driproto-2.0.3.tar.bz2
-Source25: %{sourceurl}/xf86miscproto-0.9.2.tar.bz2
-Source26: %{sourceurl}/xf86rushproto-1.1.2.tar.bz2
-Source27: %{sourceurl}/xf86vidmodeproto-2.2.2.tar.bz2
-Source28: %{sourceurl}/xineramaproto-1.1.2.tar.bz2
-Source29: %{sourceurl}/xproto-7.0.5.tar.bz2
-Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:  http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.0.2.tar.bz2
+Source1:  http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.3.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.0.3.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2
+Source4:  http://xorg.freedesktop.org/releases/individual/proto/evieext-1.0.2.tar.bz2
+Source5:  http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.0.tar.bz2
+Source6:  http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.2.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.0.2.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.7.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.3.2.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.2.tar.bz2
+Source12: http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.3.tar.bz2
+Source13: http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.1.2.tar.bz2
+Source14: http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.13.2.tar.bz2
+Source15: http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.2.tar.bz2
+Source16: http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.0.2.tar.bz2
+Source17: http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.1.0.tar.bz2
+Source18: http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2
+Source19: http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.2.2.tar.bz2
+Source20: http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.1.2.tar.bz2
+Source21: http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.2.tar.bz2
+Source22: http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
+Source23: http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.2.tar.bz2
+Source24: http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.3.tar.bz2
+Source25: http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.2.tar.bz2
+Source26: http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
+Source27: http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
+Source28: http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.1.2.tar.bz2
+Source29: http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.7.tar.bz2
+Source30: http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
+
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 # FIXME: This buildreq on xorg-x11-filesystem isn't really necessary, and
 # can be removed in the future.  The main purpose of it being here right
 # now, is to force buildmachines to get updated to solve the dir/symlink
@@ -90,7 +87,7 @@
 rm -rf $RPM_BUILD_ROOT
 for dir in $(ls -1) ; do
 	pushd $dir
-	%makeinstall
+	make install DESTDIR=$RPM_BUILD_ROOT
 	popd
 done
 
@@ -278,6 +275,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
+- Update to xproto 7.0.7 for X11R7.1
+- Use "make install" instead of makeinstall macro.
+
 * Thu May 25 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Bump package version-release to 7.1-1 for X.Org X11R7.1 release.
 
@@ -287,10 +288,10 @@
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 7.0-12
 - Update to xproto 7.0.5 for misc fixes
 
-* Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 7.0-10
+* Fri Apr 07 2006 Adam Jackson <ajackson at redhat.com> 7.0-10
 - Update to compositeproto-0.3.1 to fix big-endian LP64.
 
-* Sat Apr  1 2006 Adam Jackson <ajackson at redhat.com> 7.0-9
+* Sat Apr 01 2006 Adam Jackson <ajackson at redhat.com> 7.0-9
 - Update to scrnsaverproto-1.1
 
 * Mon Mar 20 2006 Adam Jackson <ajackson at redhat.com> 7.0-8
@@ -333,7 +334,7 @@
 * Thu Dec 15 2005 Mike A. Harris <mharris at redhat.com> 0.99.4-1
 - Update all proto tarballs to the RC4 release.
 
-* Wed Dec  7 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-1
+* Wed Dec 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-1
 - Update to printproto-1.0.2, trapproto-3.4.2, xproto-7.0.3 from the
   X11R7 RC3 release.
 
@@ -358,7 +359,7 @@
 - Remove glu.h and glx.h from file manifest, as they're provided by Mesa.
 - Added {_includedir}/GL/internal/dri_interface.h to file manifest.
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.0.1-3
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.0.1-3
 - Use Fedora-Extras style BuildRoot
 - Invoke make with _smp_mflags
 - Add full URLs to SourceN lines



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:34:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:34:42 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore,1.18,1.19
Message-ID: <200606220034.k5M0YgZt004970@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4957

Modified Files:
	.cvsignore 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	22 Jun 2006 00:33:35 -0000	1.18
+++ .cvsignore	22 Jun 2006 00:34:40 -0000	1.19
@@ -1,31 +1,3 @@
-bigreqsproto-1.0.2.tar.bz2
-compositeproto-0.3.1.tar.bz2
-damageproto-1.0.3.tar.bz2
-dmxproto-2.2.2.tar.bz2
-evieext-1.0.2.tar.bz2
-fixesproto-4.0.tar.bz2
-fontcacheproto-0.1.2.tar.bz2
-fontsproto-2.0.2.tar.bz2
-inputproto-1.3.2.tar.bz2
-kbproto-1.0.2.tar.bz2
-printproto-1.0.3.tar.bz2
-randrproto-1.1.2.tar.bz2
-recordproto-1.13.2.tar.bz2
-renderproto-0.9.2.tar.bz2
-resourceproto-1.0.2.tar.bz2
-scrnsaverproto-1.1.0.tar.bz2
-trapproto-3.4.3.tar.bz2
-videoproto-2.2.2.tar.bz2
-xcmiscproto-1.1.2.tar.bz2
-xextproto-7.0.2.tar.bz2
-xf86bigfontproto-1.1.2.tar.bz2
-xf86dgaproto-2.0.2.tar.bz2
-xf86driproto-2.0.3.tar.bz2
-xf86miscproto-0.9.2.tar.bz2
-xf86rushproto-1.1.2.tar.bz2
-xf86vidmodeproto-2.2.2.tar.bz2
-xineramaproto-1.1.2.tar.bz2
-xproto-7.0.5.tar.bz2
-xproxymanagementprotocol-1.0.2.tar.bz2
-glproto-1.4.7.tar.bz2
-xproto-7.0.7.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Thu Jun 22 00:43:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 20:43:56 -0400
Subject: rpms/xorg-x11-filesystem/devel xorg-x11-filesystem.spec,1.5,1.6
Message-ID: <200606220043.k5M0huqu007506@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7472

Modified Files:
	xorg-x11-filesystem.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
- Bumped version to 7.1-1 and rebuilt for X11R7.1.



Index: xorg-x11-filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-filesystem/devel/xorg-x11-filesystem.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-filesystem.spec	1 Mar 2006 06:21:26 -0000	1.5
+++ xorg-x11-filesystem.spec	22 Jun 2006 00:43:54 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: X.Org X11 filesystem layout
 Name: xorg-x11-filesystem
-Version: 7.0
+Version: 7.1
 Release: 1
 License: MIT/X11
 Group: System Environment/Base
@@ -22,6 +22,7 @@
 %prep
 %install
 rm -rf $RPM_BUILD_ROOT
+
 # NOTE: Do not replace these with _libdir or _includedir macros, they are
 #       intentionally explicit.
 mkdir -p "$RPM_BUILD_ROOT/usr/lib/X11"
@@ -81,7 +82,10 @@
 %{_bindir}/xorg-x11-filesystem-upgrade
 
 %changelog
-* Thu Feb  9 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
+- Bumped version to 7.1-1 and rebuilt for X11R7.1.
+
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
 - Bumped version to 7.0-1 and rebuilt.
 
 * Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3



From fedora-cvs-commits at redhat.com  Thu Jun 22 01:05:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 21:05:36 -0400
Subject: rpms/libXft/devel libXft.spec,1.14,1.15
Message-ID: <200606220105.k5M15Zem028898@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28867

Modified Files:
	libXft.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 2.1.10
- Updated libXft to version 2.1.10
- Specify freetype dependencies as >= 2.1.9-1
- Futureproof builds by adding release number to fontconfig dependencies.



Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXft.spec	9 Jun 2006 11:21:34 -0000	1.14
+++ libXft.spec	22 Jun 2006 01:05:33 -0000	1.15
@@ -1,22 +1,22 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
-Version: 2.1.8.2
-Release: 4
+Version: 2.1.10
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXrender-devel
-BuildRequires: freetype-devel
-BuildRequires: fontconfig-devel >= 2.2
+BuildRequires: freetype-devel >= 2.1.9-2
+BuildRequires: fontconfig-devel >= 2.2-1
 
-Requires: fontconfig >= 2.2
+Requires: fontconfig >= 2.2-1
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -31,8 +31,8 @@
 
 Requires: xorg-x11-proto-devel
 Requires: libXrender-devel
-Requires: fontconfig-devel
-Requires: freetype-devel
+Requires: fontconfig-devel >= 2.2-1
+Requires: freetype-devel >= 2.1.9-2
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -74,7 +74,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %{_libdir}/libXft.so.2
 %{_libdir}/libXft.so.2.1.2
 
@@ -95,6 +95,11 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 2.1.10
+- Updated libXft to version 2.1.10
+- Specify freetype dependencies as >= 2.1.9-1
+- Futureproof builds by adding release number to fontconfig dependencies.
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-4
 - Replace "makeinstall" with "make install DESTDIR=..."
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 01:11:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 21:11:04 -0400
Subject: rpms/libXt/devel .cvsignore, 1.7, 1.8 libXt.spec, 1.18, 1.19 sources,
	1.8, 1.9
Message-ID: <200606220111.k5M1B4dY029992@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29952

Modified Files:
	.cvsignore libXt.spec sources 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
- Updated libXt to version 1.0.2 from X11R7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Apr 2006 20:45:27 -0000	1.7
+++ .cvsignore	22 Jun 2006 01:11:02 -0000	1.8
@@ -1 +1,2 @@
 libXt-1.0.1.tar.bz2
+libXt-1.0.2.tar.bz2


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXt.spec	9 Jun 2006 12:10:05 -0000	1.18
+++ libXt.spec	22 Jun 2006 01:11:02 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -43,15 +43,6 @@
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now
-# EventUtil.c:105: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1122: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1132: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1142: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1156: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1299: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1315: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1340: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# NextEvent.c:1572: warning: dereferencing type-punned pointer will break strict-aliasing rules
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
 %if ! %{with_static}
@@ -77,7 +68,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %{_libdir}/libXt.so.6
 %{_libdir}/libXt.so.6.0.0
 
@@ -132,6 +123,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
+- Updated libXt to version 1.0.2 from X11R7.1
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xt.pc
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Apr 2006 20:45:27 -0000	1.8
+++ sources	22 Jun 2006 01:11:02 -0000	1.9
@@ -1 +1 @@
-c0d7f014448239f1c22caf05aa2821a9  libXt-1.0.1.tar.bz2
+f217b63e03a1ac9b155ee9a56ac47aea  libXt-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 01:15:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 21:15:08 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.72,1.73 sources,1.76,1.77
Message-ID: <200606220115.k5M1F8Rm031496@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31472

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.49-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	21 Jun 2006 14:01:45 -0000	1.72
+++ .cvsignore	22 Jun 2006 01:15:06 -0000	1.73
@@ -73,3 +73,4 @@
 serefpolicy-2.2.46.tgz
 serefpolicy-2.2.47.tgz
 serefpolicy-2.2.48.tgz
+serefpolicy-2.2.49.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	21 Jun 2006 14:01:45 -0000	1.76
+++ sources	22 Jun 2006 01:15:06 -0000	1.77
@@ -1 +1 @@
-35e49f4a05fd163cf990b659a7b2c1b0  serefpolicy-2.2.48.tgz
+a28b824570eeac1482c43c62f88735c9  serefpolicy-2.2.49.tgz



From fedora-cvs-commits at redhat.com  Thu Jun 22 01:33:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 21:33:31 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.285, 1.286 anaconda.spec, 1.409,
	1.410 sources, 1.406, 1.407
Message-ID: <200606220133.k5M1XVhb018921@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18874/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.47-1 on branch devel from anaconda-11.1.0.47-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- .cvsignore	21 Jun 2006 04:16:07 -0000	1.285
+++ .cvsignore	22 Jun 2006 01:33:19 -0000	1.286
@@ -1 +1 @@
-anaconda-11.1.0.46.tar.bz2
+anaconda-11.1.0.47.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- anaconda.spec	21 Jun 2006 04:16:07 -0000	1.409
+++ anaconda.spec	22 Jun 2006 01:33:19 -0000	1.410
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.46
+Version: 11.1.0.47
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -15,7 +15,7 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.5, libdhcp >= 1.5
+BuildPreReq: libdhcp-devel >= 1.5-2, libdhcp >= 1.5-2
 BuildPreReq: libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
 Requires: kudzu > 1.2.0, yum >= 2.9.0, pirut >= 1.1.0
@@ -101,6 +101,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.47-1
+- Fix iscsi-related tracebacks (clumens/katzj)
+- Remove some hacks that were added for s390 so that we fix them right
+- Set MALLOC_CHECK_ and _MALLOC_PERTURB for the loader to help flush 
+  out possible problems
+- Fix kernel selection on s390 (#196150)
+- Fixes for inet_pton usage (pjones)
+- Use a longer timeout for dhcp requests
+
 * Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.46-1
 - more tweaking of greek lang-table (#193872)
 - mark some strings for translation (#194617)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- sources	21 Jun 2006 04:16:07 -0000	1.406
+++ sources	22 Jun 2006 01:33:19 -0000	1.407
@@ -1 +1 @@
-8f07fc269bd9596b43aed2648cb22981  anaconda-11.1.0.46.tar.bz2
+a8fe54aa59c833a872a841e35d5941f0  anaconda-11.1.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 01:59:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 21:59:10 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.149,1.150
Message-ID: <200606220159.k5M1xAnP009145@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9088

Modified Files:
	gnome-applets.spec 
Log Message:
blargh



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- gnome-applets.spec	22 Jun 2006 00:14:12 -0000	1.149
+++ gnome-applets.spec	22 Jun 2006 01:59:07 -0000	1.150
@@ -201,10 +201,10 @@
 %{_datadir}/gnome-applets
 %{_datadir}/xmodmap
 %{_datadir}/omf/*
-%{_datadir}/applications/invest-chart.desktop
+%{_datadir}/applications/gnome-invest-chart.desktop
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
-%{_libdir}/python2.4/site-packages/invest/
+#%{_libdir}/python2.4/site-packages/invest/
 %{_libdir}/libgweather.so*
 %{_libexecdir}/accessx-status-applet
 %{_libexecdir}/battstat-applet-2



From fedora-cvs-commits at redhat.com  Thu Jun 22 02:35:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 22:35:27 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.150,1.151
Message-ID: <200606220235.k5M2ZRgC009491@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9479

Modified Files:
	gnome-applets.spec 
Log Message:
blargh



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- gnome-applets.spec	22 Jun 2006 01:59:07 -0000	1.150
+++ gnome-applets.spec	22 Jun 2006 02:35:13 -0000	1.151
@@ -204,7 +204,7 @@
 %{_datadir}/applications/gnome-invest-chart.desktop
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
-#%{_libdir}/python2.4/site-packages/invest/
+%{_libdir}/python2.4/site-packages/invest/
 %{_libdir}/libgweather.so*
 %{_libexecdir}/accessx-status-applet
 %{_libexecdir}/battstat-applet-2



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:15:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:15:47 -0400
Subject: rpms/gtk2/devel .cvsignore, 1.55, 1.56 gtk2.spec, 1.157,
	1.158 sources, 1.59, 1.60
Message-ID: <200606220315.k5M3FlgZ006212@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4618

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Jun 2006 04:56:51 -0000	1.55
+++ .cvsignore	22 Jun 2006 03:15:44 -0000	1.56
@@ -37,4 +37,5 @@
 gtk+-2.9.0.tar.bz2
 gtk+-2.9.1.tar.bz2
 gtk+-2.9.2.tar.bz2
-gtkbuiltincache.h
+gtk+-2.9.3.tar.bz2
+gtk+-2.9.4.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gtk2.spec	15 Jun 2006 14:39:57 -0000	1.157
+++ gtk2.spec	22 Jun 2006 03:15:44 -0000	1.158
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.9.3
+%define base_version 2.9.4
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -274,6 +274,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Jun 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.4-1
+- Update to 2.9.4
+
 * Thu Jun 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-4
 - Add more BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	13 Jun 2006 13:28:23 -0000	1.59
+++ sources	22 Jun 2006 03:15:44 -0000	1.60
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-d73039a3b5847c352f5740ac908be7d2  gtk+-2.9.3.tar.bz2
+c06cf2cfa66485600d90789c9e58f27c  gtk+-2.9.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:16:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:16:27 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.158,1.159
Message-ID: <200606220316.k5M3GRPj012264@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11184

Modified Files:
	gtk2.spec 
Log Message:
fix release



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gtk2.spec	22 Jun 2006 03:15:44 -0000	1.158
+++ gtk2.spec	22 Jun 2006 03:16:25 -0000	1.159
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:16:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:16:29 -0400
Subject: rpms/xorg-x11-font-utils/devel .cvsignore,1.9,1.10
Message-ID: <200606220316.k5M3GT3P012296@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12193

Modified Files:
	.cvsignore 
Log Message:
update cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Apr 2006 22:32:19 -0000	1.9
+++ .cvsignore	22 Jun 2006 03:16:26 -0000	1.10
@@ -1,5 +1,3 @@
-bdftopcf-1.0.0.tar.bz2
-font-util-1.0.0.tar.bz2
-fonttosfnt-1.0.1.tar.bz2
-mkfontdir-1.0.2.tar.bz2
-mkfontscale-1.0.1.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:16:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:16:43 -0400
Subject: rpms/xorg-x11-font-utils/devel
	font-util-1.0.1-autoconf-add-with-fontdir-option.patch, NONE,
	1.1 font-util-1.0.1-mapdir-use-datadir-fix.patch, NONE,
	1.1 sources, 1.9, 1.10 xorg-x11-font-utils.spec, 1.18,
	1.19 font-util-1.0.0-autoconf-add-with-fontdir-option.patch,
	1.1, NONE font-util-1.0.0-mapdir-use-datadir-fix.patch, 1.1, NONE
Message-ID: <200606220316.k5M3GhIA013736@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12929

Modified Files:
	sources xorg-x11-font-utils.spec 
Added Files:
	font-util-1.0.1-autoconf-add-with-fontdir-option.patch 
	font-util-1.0.1-mapdir-use-datadir-fix.patch 
Removed Files:
	font-util-1.0.0-autoconf-add-with-fontdir-option.patch 
	font-util-1.0.0-mapdir-use-datadir-fix.patch 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:7.1-1
- Update to font-util-1.0.1 from X11R7.1
- Set package version to X11 release the tarballs are based from.


font-util-1.0.1-autoconf-add-with-fontdir-option.patch:
 configure.ac   |    7 +++++++
 fontutil.pc.in |    1 +
 2 files changed, 8 insertions(+)

--- NEW FILE font-util-1.0.1-autoconf-add-with-fontdir-option.patch ---
--- font-util-1.0.1/configure.ac.autoconf-add-with-fontdir-option	2005-12-16 00:16:32.000000000 -0500
+++ font-util-1.0.1/configure.ac	2005-12-16 00:13:07.000000000 -0500
@@ -40,6 +40,13 @@
 	[MAPDIR="$DEFAULT_MAPDIR"])
 AC_SUBST(MAPDIR)
 
+DEFAULT_FONTDIR=${datadir}/X11/fonts
+AC_ARG_WITH(fontdir,
+	AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install Xorg fonts by default]),
+	[FONTDIR="$withval"],
+	[FONTDIR="$DEFAULT_FONTDIR"])
+AC_SUBST(FONTDIR)
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
--- font-util-1.0.1/fontutil.pc.in.autoconf-add-with-fontdir-option	2005-12-16 00:17:06.000000000 -0500
+++ font-util-1.0.1/fontutil.pc.in	2005-12-16 00:10:40.000000000 -0500
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 mapdir=@MAPDIR@
+fontdir=@FONTDIR@
  
 Name: FontUtil
 Description: Font utilities dirs

font-util-1.0.1-mapdir-use-datadir-fix.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE font-util-1.0.1-mapdir-use-datadir-fix.patch ---
--- font-util-1.0.0/configure.ac.font-util-mapdir-use-datadir-fix	2005-12-14 19:24:26.000000000 -0500
+++ font-util-1.0.1/configure.ac	2005-12-16 00:07:23.000000000 -0500
@@ -33,7 +33,7 @@
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
-DEFAULT_MAPDIR=${libdir}/X11/fonts/util
+DEFAULT_MAPDIR=${datadir}/X11/fonts/util
 AC_ARG_WITH(mapdir,
 	AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]),
 	[MAPDIR="$withval"],


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Apr 2006 22:32:19 -0000	1.9
+++ sources	22 Jun 2006 03:16:41 -0000	1.10
@@ -1,5 +1,5 @@
 f489db67914ca4d9d2fa0331132f342b  bdftopcf-1.0.0.tar.bz2
-0a537f95ee9d46f9e5b58c1a2c733dd4  font-util-1.0.0.tar.bz2
+b81535f78fe05732931f02841e5ca37b  font-util-1.0.1.tar.bz2
 efe452ec264ee0fddbe9300873164dec  fonttosfnt-1.0.1.tar.bz2
 94da9dcd2447300e8fdada896d7ed433  mkfontdir-1.0.2.tar.bz2
 1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-font-utils.spec	27 Apr 2006 22:32:19 -0000	1.18
+++ xorg-x11-font-utils.spec	22 Jun 2006 03:16:41 -0000	1.19
@@ -13,20 +13,23 @@
 Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
-Version: 1.0.2
-Release: 2
+# NOTE: Keep version set to the X11Rx.y release the package is based upon.
+Version: 7.1
+# Bump release for updates.
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/bdftopcf-1.0.0.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fonttosfnt-1.0.1.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.0.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.1.tar.bz2
 Source2: http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.2.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontscale-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/font-util-1.0.0.tar.bz2
-Patch0: font-util-1.0.0-mapdir-use-datadir-fix.patch
-Patch1: font-util-1.0.0-autoconf-add-with-fontdir-option.patch
+Source3: http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/font-util-1.0.1.tar.bz2
+
+Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
+Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
 
 BuildRequires: pkgconfig
 # xorg-x11-libXfont-devel needed for bdftopcf
@@ -151,6 +154,10 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:7.1-1
+- Update to font-util-1.0.1 from X11R7.1
+- Set package version to X11 release the tarballs are based from.
+
 * Thu Apr 26 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.2-2
 - Update mkfontdir
 


--- font-util-1.0.0-autoconf-add-with-fontdir-option.patch DELETED ---


--- font-util-1.0.0-mapdir-use-datadir-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:22:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:22:06 -0400
Subject: rpms/libXft/devel .cvsignore,1.5,1.6 sources,1.6,1.7
Message-ID: <200606220322.k5M3M64o021703@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21673

Modified Files:
	.cvsignore sources 
Log Message:
update cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:07:55 -0000	1.5
+++ .cvsignore	22 Jun 2006 03:22:03 -0000	1.6
@@ -1 +1,3 @@
-libXft-2.1.8.2.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:26:53 -0000	1.6
+++ sources	22 Jun 2006 03:22:03 -0000	1.7
@@ -1 +1,2 @@
 03f27b29ec11c8f9436c63fde62367b9  libXft-2.1.8.2.tar.bz2
+5905c7687fba70d1cd69b2c0ab9a098c  libXft-2.1.10.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:37:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:37:33 -0400
Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.13,1.14
Message-ID: <200606220337.k5M3bWua025612@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25570

Modified Files:
	xorg-x11-fonts.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
- Added "BuildRequires: autoconf" temporary dependency.



Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-fonts.spec	26 May 2006 17:35:34 -0000	1.13
+++ xorg-x11-fonts.spec	22 Jun 2006 03:37:30 -0000	1.14
@@ -29,68 +29,68 @@
 
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
-Version:	7.0
-Release:	4
+Version:	7.1
+Release:	1
 License:	Various licenses
 Group:		User Interface/X
 URL:		http://www.x.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
 
-Source0:	encodings-1.0.0.tar.bz2
-Source1:	font-alias-1.0.1.tar.bz2
-Source10:	font-adobe-100dpi-1.0.0.tar.bz2
-Source11:	font-adobe-75dpi-1.0.0.tar.bz2
-Source12:	font-adobe-utopia-100dpi-1.0.1.tar.bz2
-Source13:	font-adobe-utopia-75dpi-1.0.1.tar.bz2
-Source14:	font-adobe-utopia-type1-1.0.1.tar.bz2
-
-Source15:	font-arabic-misc-1.0.0.tar.bz2
-
-Source16:	font-bh-100dpi-1.0.0.tar.bz2
-Source17:	font-bh-75dpi-1.0.0.tar.bz2
-Source18:	font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
-Source19:	font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-
-Source20:	font-bh-ttf-1.0.0.tar.bz2
-Source21:	font-bh-type1-1.0.0.tar.bz2
-Source22:	font-bitstream-100dpi-1.0.0.tar.bz2
-Source23:	font-bitstream-75dpi-1.0.0.tar.bz2
+Source0:  ftp://ftp.freedesktop.org/pub/individual/font/encodings-1.0.0.tar.bz2
+Source1:  ftp://ftp.freedesktop.org/pub/individual/font/font-alias-1.0.1.tar.bz2
+Source10: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-100dpi-1.0.0.tar.bz2
+Source11: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-75dpi-1.0.0.tar.bz2
+Source12: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2
+Source13: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2
+Source14: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-type1-1.0.1.tar.bz2
+Source15: ftp://ftp.freedesktop.org/pub/individual/font/font-arabic-misc-1.0.0.tar.bz2
+Source16: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-100dpi-1.0.0.tar.bz2
+Source17: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-75dpi-1.0.0.tar.bz2
+Source18: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
+Source19: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
+Source20: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
+Source21: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
+Source22: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2
+Source23: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2
 # NOTE: X.Org 6.8.x and later has deprecated and disabled the speedo font
 # support by default, so we exclude the speedo fonts.
 #Source24:	font-bitstream-speedo-1.0.0.tar.bz2
-Source25:	font-bitstream-type1-1.0.0.tar.bz2
-Source26:	font-cronyx-cyrillic-1.0.0.tar.bz2
-Source27:	font-cursor-misc-1.0.0.tar.bz2
-Source28:	font-daewoo-misc-1.0.0.tar.bz2
-Source29:	font-dec-misc-1.0.0.tar.bz2
-Source30:	font-ibm-type1-1.0.0.tar.bz2
-Source31:	font-isas-misc-1.0.0.tar.bz2
-Source32:	font-jis-misc-1.0.0.tar.bz2
-Source33:	font-micro-misc-1.0.0.tar.bz2
-Source34:	font-misc-cyrillic-1.0.0.tar.bz2
+Source25: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-type1-1.0.0.tar.bz2
+Source26: ftp://ftp.freedesktop.org/pub/individual/font/font-cronyx-cyrillic-1.0.0.tar.bz2
+Source27: ftp://ftp.freedesktop.org/pub/individual/font/font-cursor-misc-1.0.0.tar.bz2
+Source28: ftp://ftp.freedesktop.org/pub/individual/font/font-daewoo-misc-1.0.0.tar.bz2
+Source29: ftp://ftp.freedesktop.org/pub/individual/font/font-dec-misc-1.0.0.tar.bz2
+Source30: ftp://ftp.freedesktop.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
+Source31: ftp://ftp.freedesktop.org/pub/individual/font/font-isas-misc-1.0.0.tar.bz2
+Source32: ftp://ftp.freedesktop.org/pub/individual/font/font-jis-misc-1.0.0.tar.bz2
+Source33: ftp://ftp.freedesktop.org/pub/individual/font/font-micro-misc-1.0.0.tar.bz2
+Source34: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-cyrillic-1.0.0.tar.bz2
 %if %{with_ethiopic_fonts}
-Source35:	font-misc-ethiopic-1.0.0.tar.bz2
+Source35: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-ethiopic-1.0.0.tar.bz2
 %endif
-Source36:	font-misc-meltho-1.0.0.tar.bz2
-Source37:	font-misc-misc-1.0.0.tar.bz2
-Source38:	font-mutt-misc-1.0.0.tar.bz2
-Source39:	font-schumacher-misc-1.0.0.tar.bz2
-Source40:	font-screen-cyrillic-1.0.0.tar.bz2
-Source41:	font-sony-misc-1.0.0.tar.bz2
-Source42:	font-sun-misc-1.0.0.tar.bz2
-Source43:	font-winitzki-cyrillic-1.0.0.tar.bz2
-Source44:	font-xfree86-type1-1.0.0.tar.bz2
+Source36: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
+Source37: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-misc-1.0.0.tar.bz2
+Source38: ftp://ftp.freedesktop.org/pub/individual/font/font-mutt-misc-1.0.0.tar.bz2
+Source39: ftp://ftp.freedesktop.org/pub/individual/font/font-schumacher-misc-1.0.0.tar.bz2
+Source40: ftp://ftp.freedesktop.org/pub/individual/font/font-screen-cyrillic-1.0.0.tar.bz2
+Source41: ftp://ftp.freedesktop.org/pub/individual/font/font-sony-misc-1.0.0.tar.bz2
+Source42: ftp://ftp.freedesktop.org/pub/individual/font/font-sun-misc-1.0.0.tar.bz2
+Source43: ftp://ftp.freedesktop.org/pub/individual/font/font-winitzki-cyrillic-1.0.0.tar.bz2
+Source44: ftp://ftp.freedesktop.org/pub/individual/font/font-xfree86-type1-1.0.0.tar.bz2
 
 Patch0: font-alias-1.0.0-fonts-alias-fontdir-fix.patch
 Patch1: encodings-1.0.0-encodings-fontdir-fix.patch
 
+# FIXME: Temporary requirement on autoconf for a workaround.
+BuildRequires: autoconf
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # The font-utils dep here is to ensure we have a fontutil.pc file which
 # defines the 'fontdir' variable.
-BuildRequires: font-utils >= 1.0.0
+BuildRequires: font-utils >= 1.0.2-1
 # FIXME: fontconfig is needed only because the upstream Makefiles invoke
 # fc-cache at build time.  This is totally useless, because we do not ship
 # any of the resulting cache files, we generate them at install time from the
@@ -1534,6 +1534,9 @@
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
+- Added "BuildRequires: autoconf" temporary dependency.
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 7.0-4
 - Added "BuildRequires: fontconfig" for (#192038)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:38:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:38:19 -0400
Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.14,1.15
Message-ID: <200606220338.k5M3cJ6G025943@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25892

Modified Files:
	xorg-x11-fonts.spec 
Log Message:
Use Fedora Extras style BuildRoot specification.


Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-fonts.spec	22 Jun 2006 03:37:30 -0000	1.14
+++ xorg-x11-fonts.spec	22 Jun 2006 03:38:17 -0000	1.15
@@ -1536,6 +1536,7 @@
 %changelog
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Added "BuildRequires: autoconf" temporary dependency.
+- Use Fedora Extras style BuildRoot specification.
 
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 7.0-4
 - Added "BuildRequires: fontconfig" for (#192038)



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:39:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:39:12 -0400
Subject: rpms/xorg-x11-fonts/devel .cvsignore,1.4,1.5
Message-ID: <200606220339.k5M3dChc026297@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26201

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jan 2006 04:17:29 -0000	1.4
+++ .cvsignore	22 Jun 2006 03:39:10 -0000	1.5
@@ -1,36 +1,3 @@
-encodings-1.0.0.tar.bz2
-font-adobe-100dpi-1.0.0.tar.bz2
-font-adobe-75dpi-1.0.0.tar.bz2
-font-adobe-utopia-100dpi-1.0.1.tar.bz2
-font-adobe-utopia-75dpi-1.0.1.tar.bz2
-font-adobe-utopia-type1-1.0.1.tar.bz2
-font-alias-1.0.1.tar.bz2
-font-arabic-misc-1.0.0.tar.bz2
-font-bh-100dpi-1.0.0.tar.bz2
-font-bh-75dpi-1.0.0.tar.bz2
-font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
-font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-font-bh-ttf-1.0.0.tar.bz2
-font-bh-type1-1.0.0.tar.bz2
-font-bitstream-100dpi-1.0.0.tar.bz2
-font-bitstream-75dpi-1.0.0.tar.bz2
-font-bitstream-type1-1.0.0.tar.bz2
-font-cronyx-cyrillic-1.0.0.tar.bz2
-font-cursor-misc-1.0.0.tar.bz2
-font-daewoo-misc-1.0.0.tar.bz2
-font-dec-misc-1.0.0.tar.bz2
-font-ibm-type1-1.0.0.tar.bz2
-font-isas-misc-1.0.0.tar.bz2
-font-jis-misc-1.0.0.tar.bz2
-font-micro-misc-1.0.0.tar.bz2
-font-misc-cyrillic-1.0.0.tar.bz2
-font-misc-ethiopic-1.0.0.tar.bz2
-font-misc-meltho-1.0.0.tar.bz2
-font-misc-misc-1.0.0.tar.bz2
-font-mutt-misc-1.0.0.tar.bz2
-font-schumacher-misc-1.0.0.tar.bz2
-font-screen-cyrillic-1.0.0.tar.bz2
-font-sony-misc-1.0.0.tar.bz2
-font-sun-misc-1.0.0.tar.bz2
-font-winitzki-cyrillic-1.0.0.tar.bz2
-font-xfree86-type1-1.0.0.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Thu Jun 22 03:53:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 21 Jun 2006 23:53:42 -0400
Subject: rpms/xorg-x11-twm/devel .cvsignore, 1.5, 1.6 Makefile, 1.1,
	1.2 xorg-x11-twm.spec, 1.13, 1.14
Message-ID: <200606220353.k5M3rgBH013891@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-twm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13854

Modified Files:
	.cvsignore Makefile xorg-x11-twm.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
- Bump and rebuild with minor specfile cleanups.
- Add documentation to doc list, even though half of it is 0 bytes. Ah well.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Jan 2006 15:21:42 -0000	1.5
+++ .cvsignore	22 Jun 2006 03:53:40 -0000	1.6
@@ -1 +1,3 @@
-twm-1.0.1.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog
\ No newline at end of file


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	29 Aug 2005 06:48:46 -0000	1.1
+++ Makefile	22 Jun 2006 03:53:40 -0000	1.2
@@ -1,6 +1,6 @@
 # Makefile for source rpm: xorg-x11-twm
 # $Id$
 NAME := xorg-x11-twm
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
 
 include ../common/Makefile.common


Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-twm.spec	6 Jun 2006 09:25:59 -0000	1.13
+++ xorg-x11-twm.spec	22 Jun 2006 03:53:40 -0000	1.14
@@ -5,14 +5,14 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{pkgname}-%{version}.tar.bz2
-#Source0: %{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{pkgname}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 # checking TWM_LIBS... -lXmu -lXt -lSM -lICE -lXext -lX11 -ldl
 BuildRequires: libX11-devel
@@ -42,31 +42,10 @@
 X.Org X11 twm window manager
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n %{pkgname}-%{version}
 
 %build
-cd %{pkgname}-%{version}
 # FIXME: Work around pointer aliasing warnings from compiler for now
-# events.c:279: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:282: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:306: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:309: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:369: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:521: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1026: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1270: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1398: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1462: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1489: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1846: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:2087: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:2244: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:2272: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# menus.c:521: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# menus.c:2673: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# menus.c:2857: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# parse.c:961: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resize.c:541: warning: dereferencing type-punned pointer will break strict-aliasing rules
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure
 make
@@ -74,7 +53,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd %{pkgname}-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Upstream sources do not create the system wide twm config dir, nor
@@ -89,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 %{_bindir}/twm
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/twm.1x*
@@ -97,6 +75,10 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
+- Bump and rebuild with minor specfile cleanups.
+- Add documentation to doc list, even though half of it is 0 bytes. Ah well.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#194186)
 
@@ -117,7 +99,7 @@
 - Added "BuildRequires: libXau-devel", as twm fails without it, but does not
   check for it with ./configure.  Bug (fdo#5065)
 
-* Wed Nov 2 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.1-3
+* Wed Nov 02 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.1-3
 - Actually spell RPM_OPT_FLAGS correctly this time.
 
 * Mon Oct 31 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.1-2
@@ -130,7 +112,7 @@
   X11R7 release number to the actual twm version.
 - Change manpage location to 'man1x' in file manifest
 
-* Wed Oct 5 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
 - Update BuildRequires to match new library naming scheme
 - Use Fedora Extras style BuildRoot declaration
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:00:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:00:52 -0400
Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.10,1.11
Message-ID: <200606220400.k5M40qGJ016552@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xauth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16517

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Add missing documentation to doc manifest.
- Use "make install" instead of makeinstall macro.



Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xauth.spec	1 Mar 2006 06:45:45 -0000	1.10
+++ xorg-x11-xauth.spec	22 Jun 2006 04:00:34 -0000	1.11
@@ -3,16 +3,17 @@
 Summary: X.Org X11 X authority utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.2
+Release: 2
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releasesX11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
 Source10: mkxauth
 Source11: mkxauth.man
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
@@ -22,7 +23,9 @@
 
 Provides: xauth
 Provides: mkxauth
+
 Obsoletes: XFree86-xauth, mkxauth
+
 # NOTE: xauth moved from the XFree86 package to XFree86-xauth in
 # XFree86-4.2.0-50.11, so this Obsoletes line is required for upgrades
 # from RHL 8 and older, and RHEL 2.1 to work properly when upgrading to
@@ -34,17 +37,16 @@
 used in connecting to an X server.
 
 %prep
-%setup -q -n xauth-%{version}
+%setup -q -n %{pkgname}-%{version}
 
 %build
-#cd %{pkgname}-%{version}
 %configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#cd %{pkgname}-%{version}
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 # Install mkxauth
 {
    install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/
@@ -56,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 %{_bindir}/xauth
 %{_bindir}/mkxauth
 #%dir %{_mandir}/man1x
@@ -64,6 +66,10 @@
 %{_mandir}/man1/mkxauth.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+- Add missing documentation to doc manifest.
+- Use "make install" instead of makeinstall macro.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:02:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:02:58 -0400
Subject: rpms/kernel/devel/configs config-generic,1.196,1.197
Message-ID: <200606220402.k5M42w86016813@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv16734/configs

Modified Files:
	config-generic 
Log Message:
git3



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- config-generic	20 Jun 2006 20:25:54 -0000	1.196
+++ config-generic	22 Jun 2006 04:02:54 -0000	1.197
@@ -439,6 +439,7 @@
 CONFIG_SCSI_SATA_MV=m
 CONFIG_SCSI_SATA_SIL24=m
 CONFIG_SCSI_PDC_ADMA=m
+CONFIG_SCSI_HPTIOP=m
 
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
@@ -2624,6 +2625,7 @@
 CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 
 CONFIG_CONNECTOR=m
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:02:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:02:58 -0400
Subject: rpms/kernel/devel patch-2.6.17-git3.bz2.sign, NONE, 1.1 .cvsignore,
	1.457, 1.458 kernel-2.6.spec, 1.2297,
	1.2298 linux-2.6-modsign-core.patch, 1.2, 1.3 sources, 1.401,
	1.402 upstream, 1.366,
	1.367 linux-2.6-iscsi-update-to-2-6-18-upstream.patch, 1.1,
	NONE linux-2.6-mtd-git.patch, 1.2,
	NONE patch-2.6.17-git1.bz2.sign, 1.1, NONE
Message-ID: <200606220402.k5M42wuZ016796@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16734

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-modsign-core.patch 
	sources upstream 
Added Files:
	patch-2.6.17-git3.bz2.sign 
Removed Files:
	linux-2.6-iscsi-update-to-2-6-18-upstream.patch 
	linux-2.6-mtd-git.patch patch-2.6.17-git1.bz2.sign 
Log Message:
git3



--- NEW FILE patch-2.6.17-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEmZfsyGugalF9Dw4RAvuVAJ9RG1S3WhIyaMEYEYZTmMFT9kNK9QCgjETy
G82HIqa+lyiF3JHTUz9HPzQ=
=SGCu
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- .cvsignore	20 Jun 2006 20:42:41 -0000	1.457
+++ .cvsignore	22 Jun 2006 04:02:40 -0000	1.458
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git1.bz2
+patch-2.6.17-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2297
retrieving revision 1.2298
diff -u -r1.2297 -r1.2298
--- kernel-2.6.spec	20 Jun 2006 22:48:38 -0000	1.2297
+++ kernel-2.6.spec	22 Jun 2006 04:02:43 -0000	1.2298
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git1.bz2
+Patch1: patch-2.6.17-git3.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -353,7 +353,6 @@
 
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
-Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -420,9 +419,6 @@
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 
-# MTD / JFFS2
-Patch2400: linux-2.6-mtd-git.patch
-
 # KGDB
 Patch9000: kgdb-core-lite.patch
 Patch9001: kgdb-core-lite-add-reboot-command.patch
@@ -920,9 +916,6 @@
 #
 # Add a pci table to advansys driver.
 %patch1102 -p1
-# iSCSI driver update that can be dropped when kernel is rebased
-# against a kernel that has the SCSI updates for 2.6.18
-%patch1103 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1027,9 +1020,6 @@
 # acpi-ecdt-uid-hack
 %patch2301 -p1
 
-# MTD and JFFS2 updates
-%patch2400 -p1
-
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1682,6 +1672,9 @@
 %endif
 
 %changelog
+* Wed Jun 21 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git3
+
 * Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update MTD tree, Update and re-enable Geode tree
 - Remove AC97 patch obsoleted by Geode tree

linux-2.6-modsign-core.patch:
 linux-2.6.12/kernel/module-verify.c  |    2 
 linux-2.6.17.noarch/kernel/Makefile  |    3 
 linux-900/include/linux/module.h     |    3 
 linux-900/init/Kconfig               |   16 +
 linux-900/kernel/module-verify-sig.c |  442 +++++++++++++++++++++++++++++++++++
 linux-900/kernel/module-verify.c     |  340 ++++++++++++++++++++++++++
 linux-900/kernel/module-verify.h     |   37 ++
 linux-900/kernel/module.c            |   19 +
 8 files changed, 857 insertions(+), 5 deletions(-)

Index: linux-2.6-modsign-core.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-core.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-modsign-core.patch	17 Jan 2006 21:18:44 -0000	1.2
+++ linux-2.6-modsign-core.patch	22 Jun 2006 04:02:45 -0000	1.3
@@ -37,19 +37,18 @@
  config KMOD
  	bool "Automatic kernel module loading"
  	depends on MODULES
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/Makefile linux-900/kernel/Makefile
---- linux-811/kernel/Makefile
-+++ linux-900/kernel/Makefile
-@@ -13,7 +13,8 @@ obj-$(CONFIG_FUTEX) += futex.o
- obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
+--- linux-2.6.17.noarch/kernel/Makefile~	2006-06-21 23:47:11.000000000 -0400
++++ linux-2.6.17.noarch/kernel/Makefile	2006-06-21 23:47:19.000000000 -0400
+@@ -19,7 +19,8 @@ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
  obj-$(CONFIG_SMP) += cpu.o spinlock.o
+ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
  obj-$(CONFIG_UID16) += uid16.o
 -obj-$(CONFIG_MODULES) += module.o
 +obj-$(CONFIG_MODULES) += module.o module-verify.o
 +obj-$(CONFIG_MODULE_SIG) += module-verify-sig.o
- obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o
  obj-$(CONFIG_KALLSYMS) += kallsyms.o
  obj-$(CONFIG_PM) += power/
+ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module.c linux-900/kernel/module.c
 --- linux-811/kernel/module.c
 +++ linux-900/kernel/module.c


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- sources	20 Jun 2006 20:42:41 -0000	1.401
+++ sources	22 Jun 2006 04:02:46 -0000	1.402
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-4ec8c8c1e80bc41cef92e3769f6c4af8  patch-2.6.17-git1.bz2
+498ca9d1cf20bd7c6680a8dc9c638a4f  patch-2.6.17-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- upstream	20 Jun 2006 20:25:54 -0000	1.366
+++ upstream	22 Jun 2006 04:02:46 -0000	1.367
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git1.bz2
+patch-2.6.17-git3.bz2


--- linux-2.6-iscsi-update-to-2-6-18-upstream.patch DELETED ---


--- linux-2.6-mtd-git.patch DELETED ---


--- patch-2.6.17-git1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:06:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:06:49 -0400
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.23,1.24
Message-ID: <200606220406.k5M46nho017323@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17289

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.4-4
- Add missing documentation to doc macro.
- Clean cruft out of specfile.



Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-xdm.spec	21 Jun 2006 08:09:11 -0000	1.23
+++ xorg-x11-xdm.spec	22 Jun 2006 04:06:35 -0000	1.24
@@ -1,17 +1,11 @@
-# FIXME:  The modular xdm package still needs a fair bit of work, most
-# of which probably needs to be done in the upstream CVS.  I've made
-# numerous FIXME comments throughout to document things I think need
-# to be done.  The spec file will naturally become less of a mess once
-# the upstream tarball is kosher.  -- mharris
-
 %define pkgname xdm
 
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
+Version: 1.0.4
+Release: 4
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
-Version: 1.0.4
-Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -54,7 +48,7 @@
 BuildRequires: libXinerama-devel
 BuildRequires: pam-devel
 
-Provides: %{pkgname}
+Provides: xdm
 
 Obsoletes: XFree86-xdm
 Obsoletes: xinitrc
@@ -111,32 +105,12 @@
    install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm
 }
 
-# FIXME: This was in the monolithic xorg packaging, but I don't know if it
-# is still needed.  If it is, it definitely should be fixed in upstream
-# sources instead of cluttering the rpm build instructions.  <mharris>
-# Explicitly create XDM authdir
-#mkdir -m 700 -p $RPM_BUILD_ROOT/var/lib/xdm/authdir
-
-# FIXME: Move manpages to correct man section and rename them.  This should
-# get submitted as a bug upstream for each of the 4 components.  Hmm, the
-# manpage(s) do not actually get installed.  Fix it and report it upstream.
-%if 0
-{
-   echo "FIXME: Upstream RC2 manpages install to incorrect location"
-   mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1x
-   for manpage in xdm ; do
-      mv $RPM_BUILD_ROOT%{_mandir}/man1/$manpage.* $RPM_BUILD_ROOT%{_mandir}/man1x/$manpage.1x
-   done
-   rmdir $RPM_BUILD_ROOT%{_mandir}/man1
-}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 %{_bindir}/xdm
 %{_bindir}/xdmshell
 %dir %{_sysconfdir}/X11/xdm
@@ -173,6 +147,10 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.4-4
+- Add missing documentation to doc macro.
+- Clean cruft out of specfile.
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.4-3
 - Added xdm-1.0.4-setuid.diff to fix potential security issue (#196094)
 - Added temporary "BuildRequires: autoconf, automake, libtool" dependencies



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:23:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:23:23 -0400
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.23,1.24
Message-ID: <200606220423.k5M4NNXB031770@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31379

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.2-3
- Added xfs documentation to doc macro.
- Use "make install" instead of makeinstall macro.
- Clean up source file URLs.



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-xfs.spec	30 May 2006 22:37:30 -0000	1.23
+++ xorg-x11-xfs.spec	22 Jun 2006 04:23:16 -0000	1.24
@@ -7,22 +7,22 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.2
-Release: 2
+Release: 3
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: System Environment/Daemons
 URL: http://www.x.org
-#Source0: %{pkgname}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.2.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfsinfo-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fslsfonts-1.0.1.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/xfsinfo-1.0.1.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.1.tar.bz2
 Source3: http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.2.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/showfont-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.1.tar.bz2
 Source10:  xfs.init
 # NOTE: xfs config input file, processed via sed below.
 Source11:  xfs.config.in
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 # xfs needs 'fontsproto' to build, as indicated by ./configure
@@ -38,7 +38,7 @@
 # FIXME: xfs needs freetype-devel to build, but autotools doesn't detect it missing
 BuildRequires: freetype-devel
 # font-utils >= 1.0.0 needed for fontdir pkgconfig variable
-BuildRequires: font-utils >= 1.0.0
+BuildRequires: font-utils >= 1.0.0-1
 BuildRequires: libfontenc-devel
 
 # FIXME: This Requires on libXfont can be removed from here in the future,
@@ -125,7 +125,7 @@
 
 for pkg in xfsinfo fslsfonts fstobdf showfont ; do
    pushd ${pkg}-*
-   %makeinstall
+   make install DESTDIR=$RPM_BUILD_ROOT
    popd
 done
 
@@ -251,7 +251,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc xfs-%{version}/AUTHORS xfs-%{version}/COPYING xfs-%{version}/INSTALL
+%doc xfs-%{version}/NEWS xfs-%{version}/README xfs-%{version}/ChangeLog
+
 %{_bindir}/xfs
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/fs
@@ -278,6 +280,11 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.2-3
+- Added xfs documentation to doc macro.
+- Use "make install" instead of makeinstall macro.
+- Clean up source file URLs.
+
 * Tue May 30 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.2-2
 - Fix BuildRequires (#191856).
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:24:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:24:27 -0400
Subject: rpms/xorg-x11-xsm/devel Makefile,1.1,1.2
Message-ID: <200606220424.k5M4ORbO000701@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv581

Modified Files:
	Makefile 
Log Message:
Fix Makefile


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	12 Nov 2005 04:33:42 -0000	1.1
+++ Makefile	22 Jun 2006 04:24:24 -0000	1.2
@@ -1,6 +1,6 @@
 # Makefile for source rpm: xorg-x11-xsm
 # $Id$
 NAME := xorg-x11-xsm
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:38:34 -0400
Subject: rpms/xorg-x11-xsm/devel .cvsignore,1.5,1.6
Message-ID: <200606220438.k5M4cYaG003841@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3795

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Apr 2006 22:54:49 -0000	1.5
+++ .cvsignore	22 Jun 2006 04:38:26 -0000	1.6
@@ -1,3 +1,3 @@
-xsm-1.0.1.tar.bz2
-rstart-1.0.2.tar.bz2
-smproxy-1.0.2.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:39:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:39:41 -0400
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.12,1.13
Message-ID: <200606220439.k5M4dfpK004103@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4073

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
- Added xsm documentation to doc macro.
- The 1.0.2-1 build had the version accidentally bumped to 1.0.2 before
  an xsm-1.0.2 was available, so I had to hard code the actual 1.0.1 version
  in a few places temporarily until xsm-1.0.2 is available.



Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xsm.spec	30 May 2006 21:43:33 -0000	1.12
+++ xorg-x11-xsm.spec	22 Jun 2006 04:39:38 -0000	1.13
@@ -2,12 +2,15 @@
 
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
+# NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
-Release: 2
+# Bump the release on rebuilds/bugfixes/etc.
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.1.tar.bz2
 Source1: http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2
 Source2: http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.2.tar.bz2
@@ -21,10 +24,14 @@
 # Patches for rstart (30-39)
 Patch30: rstart-1.0.2-rstart-installation-location-fixes.patch
 
-BuildRequires: pkgconfig automake autoconf
+# FIXME: Temporary dependency on automake/autoconf while they're still needed.
+BuildRequires: automake autoconf
+
+BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libXaw-devel libXext-devel libXt-devel libXpm-devel
 BuildRequires: rsh
-BuildRequires: xorg-x11-proto-devel xorg-x11-util-macros
 
 # NOTE: xorg-x11-filesystem >= 0.99.2-3 is required for OS upgrades from
 # monolithic X releases to modular X releases to work properly.
@@ -82,8 +89,14 @@
 
 %files
 %defattr(-,root,root,-)
-# FIXME: Fill in %doc sometime
-%doc
+# FIXME: The rpm package version was accidentally bumped to 1.0.2, so we
+# can't use the %%version macro here until a upstream xsm is released as
+# version 1.0.2 or higher.
+#%doc xsm-%{version}/AUTHORS xsm-%{version}/COPYING xsm-%{version}/INSTALL
+#%doc xsm-%{version}/NEWS xsm-%{version}/README xsm-%{version}/ChangeLog
+%doc xsm-1.0.1/AUTHORS xsm-1.0.1/COPYING xsm-1.0.1/INSTALL
+%doc xsm-1.0.1/NEWS xsm-1.0.1/README xsm-1.0.1/ChangeLog
+
 %{_bindir}/rstart
 %{_bindir}/rstartd
 %{_bindir}/smproxy
@@ -120,6 +133,12 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
+- Added xsm documentation to doc macro.
+- The 1.0.2-1 build had the version accidentally bumped to 1.0.2 before
+  an xsm-1.0.2 was available, so I had to hard code the actual 1.0.1 version
+  in a few places temporarily until xsm-1.0.2 is available.
+
 * Tue May 30 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-2
 - Fix BuildRequires (#191802)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:45:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:45:10 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.20,1.21
Message-ID: <200606220445.k5M4jAAV005181@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5149

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4
- Added documentation to doc macro.



Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-xinit.spec	21 Jun 2006 09:27:26 -0000	1.20
+++ xorg-x11-xinit.spec	22 Jun 2006 04:45:06 -0000	1.21
@@ -1,9 +1,10 @@
 %define pkgname xinit
+%define xinitver 1.0.2
 
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
-Version: 1.0.2
-Release: 3
+Version: %{xinitver}
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -76,7 +77,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL README NEWS ChangeLog
 %{_bindir}/startx
 %{_bindir}/xinit
 %dir %{_sysconfdir}/X11
@@ -95,6 +96,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4
+- Added documentation to doc macro.
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
 - Added xinit-1.0.2-setuid.diff to fix potential security issue (#196094)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 04:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 00:56:48 -0400
Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.13,1.14
Message-ID: <200606220456.k5M4umoI023758@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23726

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Added xkbutils_version macro, which can be used in the Version field
  in the future, to help prevent accidental bumping of the package version.



Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xkb-utils.spec	27 Apr 2006 22:09:37 -0000	1.13
+++ xorg-x11-xkb-utils.spec	22 Jun 2006 04:56:45 -0000	1.14
@@ -1,19 +1,26 @@
 %define pkgname xkb-utils
+%define xkbutils_version 1.0.1
 
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-%{pkgname}
+# FIXME: The version field should be the same as the xkbutils tarball version,
+# but it got accidentally bumped to 1.0.2.  When xkbutils 1.0.2 is actually
+# released, please use the %%{xkbutils_version} macro here to help prevent
+# inadvertent bumps in the future.
 Version: 1.0.2
-Release: 1
+# NOTE: Bump the release field when updating xkbcomp/xkbevd/xkbprint/setxkbmap,
+# as the package version is supposed to be the xkbutils version.
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define xorgurl http://xorg.freedesktop.org/releases/individual/app
-Source0: %{xorgurl}/xkbutils-1.0.1.tar.bz2
-Source1: %{xorgurl}/xkbcomp-1.0.2.tar.bz2
-Source2: %{xorgurl}/xkbevd-1.0.2.tar.bz2
-Source3: %{xorgurl}/xkbprint-1.0.1.tar.bz2
-Source4: %{xorgurl}/setxkbmap-1.0.2.tar.bz2
+
+Source0: http://xorg.freedesktop.org/releases/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.2.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.0.2.tar.bz2
+Source3: http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
 # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
@@ -77,7 +84,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+# FIXME: The package version is higher than the actual xkbutils version
+# currently, so this hack is necessary.  When xkbutils 1.0.2 is actually
+# released, this should be restored to use the "version" macro, which will
+# also have the side effect of helping prevent premature package version
+# incrementation.
+#%doc xkbutils-%{version}/AUTHORS xkbutils-%{version}/COPYING xkbutils-%{version}/INSTALL
+#%doc xkbutils-%{version}/NEWS xkbutils-%{version}/README xkbutils-%{version}/ChangeLog
+%doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
+%doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README xkbutils-%{xkbutils_version}/ChangeLog
 %{_bindir}/setxkbmap
 %{_bindir}/xkbbell
 %{_bindir}/xkbcomp
@@ -95,6 +110,10 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Added xkbutils_version macro, which can be used in the Version field
+  in the future, to help prevent accidental bumping of the package version.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update setxkbmap, xkbevd, and xkbcomp
 
@@ -126,7 +145,7 @@
 - Change manpage location to 'man1x' in file manifest.
 - Iterate over packages with for loop instead of serialized code duplication.
 
-* Wed Oct  5 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
 - Use Fedora-Extras style BuildRoot tag.
 - Update BuildRequires to use new library package names.
 - Tidy up spec file a bit.



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:06:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:06:52 -0400
Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.12,1.13
Message-ID: <200606220506.k5M56qFn026163@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26143

Modified Files:
	xorg-x11-xbitmaps.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
- Bump release and rebuild for FC6.



Index: xorg-x11-xbitmaps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xbitmaps.spec	3 Mar 2006 01:34:10 -0000	1.12
+++ xorg-x11-xbitmaps.spec	22 Jun 2006 05:06:49 -0000	1.13
@@ -5,12 +5,13 @@
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+
+Source0: http://xorg.freedesktop.org/releases/individual/data/%{pkgname}-%{version}.tar.bz2
 
 # NOTE: This dependency on xorg-x11-filesystem is required to work around
 # a nasty upgrade problem when going from FC4->FC5 or monolithic to
@@ -41,7 +42,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+#%doc
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/bitmaps
 %{_includedir}/X11/bitmaps/*
@@ -50,6 +51,9 @@
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
+- Bump release and rebuild for FC6.
+
 * Thu Mar 02 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Made package arch specific due to pkgconfig files being placed in lib64
   if the noarch packages manage to get built on x86_64/ppc64/s390x.



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:18:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:18:36 -0400
Subject: rpms/openmotif/FC-5 openmotif-2.3.0-MZ1331.patch, NONE,
	1.1 openmotif.spec, 1.43, 1.44
Message-ID: <200606220518.k5M5IaME011279@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/openmotif/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11192

Modified Files:
	openmotif.spec 
Added Files:
	openmotif-2.3.0-MZ1331.patch 
Log Message:
[tw]
- fixed XmList widget size problem: MotifZone1331 (#190331)



openmotif-2.3.0-MZ1331.patch:
 List.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openmotif-2.3.0-MZ1331.patch ---
--- openmotif-2.3.0/lib/Xm/List.c.MZ1331	2006-06-22 07:15:55.000000000 +0200
+++ openmotif-2.3.0/lib/Xm/List.c	2006-06-22 07:15:55.000000000 +0200
@@ -2667,12 +2667,12 @@
   if (lw->list.itemCount == 0)
     {
 #if USE_XFT
-      int height;
+      int height = 0;
 
       XmRenderTableGetDefaultFontExtents(lw->list.font, &height, NULL, NULL);
 					 
       lw->list.MaxItemHeight = (Dimension)height;
-      if (lw->list.MaxItemHeight)
+      if (lw->list.MaxItemHeight == 0)
         lw->list.MaxItemHeight = 1;
 #else
       if (XmeRenderTableGetDefaultFont(lw->list.font, &fs))


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/FC-5/openmotif.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- openmotif.spec	11 Feb 2006 04:50:26 -0000	1.43
+++ openmotif.spec	22 Jun 2006 05:18:33 -0000	1.44
@@ -4,7 +4,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.3.0
-Release: 0.1.9.2
+Release: 0.1.9.3
 License: Open Group Public License
 Group: System Environment/Libraries
 #Source:  %{intern_name}-%{version}.tar.gz
@@ -24,15 +24,6 @@
 Patch0: openmotif-2.3.0-CVS-2006-02-02.patch
 Patch22: openMotif-2.3.0-no_demos.patch
 Patch23: openMotif-2.2.3-uil_lib.patch
-Patch32: openMotif-2.3.0-CAN-2004-0914.patch
-Patch33: openMotif-2.2.3-CAN-2004-0914_autofoo.patch
-Patch34: openMotif-2.2.3-tmpnam.patch
-Patch35: openmotif-2.2.3-CAN-2004-0914_sec8.patch
-Patch36: openMotif-2.2.3-vizcount.patch
-Patch37: openMotif-2.2.3-long64.patch
-Patch38: openMotif-2.3.0-multiscreen.patch
-Patch41: openMotif-2.2.3-CAN-2005-0605.patch
-Patch42: openMotif-2.2.3-mrm.patch
 Patch43: openMotif-2.3.0-rgbtxt.patch
 Patch44: openMotif-2.3.0-xft-config.patch
 Patch45: openMotif-2.3.0-mwmrc_dir.patch
@@ -41,6 +32,7 @@
 Patch48: openMotif-2.2.3-CVE-2005-3964.patch
 Patch49: openMotif-2.2.3-overrun.patch
 Patch50: openMotif-2.2.3-text_paste.patch
+Patch51: openmotif-2.3.0-MZ1331.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -68,15 +60,6 @@
 %patch0 -p1 -b .CVS-2006-02-02
 %patch22 -p1 -b .no_demos
 %patch23 -p1 -b .uil_lib
-#%patch32 -p1 -b .CAN-2004-0914
-#%patch33 -p1 -b .CAN-2004-0914_autofoo
-#%patch34 -p1 -b .tmpnam
-#%patch35 -p1 -b .CAN-2004-0914_sec8
-#%patch36 -p1 -b .vizcount
-#%patch37 -p1 -b .long64
-#%patch38 -p1 -b .multiscreen
-#%patch41 -p1 -b .CAN-2005-0605
-#%patch42 -p1 -b .mrm
 %patch43 -p1 -b .rgbtxt
 %patch44 -p1 -b .xft-config
 %patch45 -p1 -b .mwmrc_dir
@@ -85,6 +68,7 @@
 %patch48 -p1 -b .CVE-2005-3964
 %patch49 -p1 -b .overrun
 %patch50 -p1 -b .text_paste
+%patch51 -p1 -b .MZ1331
 
 for i in doc/man/man3/{XmColumn,XmDataField}.3; do
 	iconv -f windows-1252 -t utf-8 < "$i" > "${i}_"
@@ -156,6 +140,9 @@
 %{_datadir}/man/man5/*
 
 %changelog
+* Thu Jun 22 2006 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1.9.3
+- fixed XmList widget size problem: MotifZone1331 (#190331)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-0.1.9.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:23:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:23:06 -0400
Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.15,1.16
Message-ID: <200606220523.k5M5N63k013021@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12985

Modified Files:
	xorg-x11-xkbdata.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-8.xkbc0.8.0
- Embed xkeyboard-config version in Release field so we can tell from the
  filename what is really in this package without having to look in the
  spec file.  We should rename the package to xkeyboard-config and restart
  the versioning.



Index: xorg-x11-xkbdata.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xkbdata.spec	6 Jun 2006 18:02:30 -0000	1.15
+++ xorg-x11-xkbdata.spec	22 Jun 2006 05:23:03 -0000	1.16
@@ -1,22 +1,22 @@
 %define tarname xkeyboard-config
-%define tarver  0.8
+%define xkeyboard_config_ver  0.8
 # INFO: Package contains data-only, no binaries, so no debuginfo is needed
 %define debug_package %{nil}
 
 Summary: xkeyboard-config alternative xkb data files
 #Name: xkeyboard-config
-#Version: 0.7
+#Version: 0.8
 #Release: 1
 Name: xorg-x11-xkbdata
 Version: 1.0.1
 # When rebuilding, bump the final digit only
-Release: 8
+Release: 8.xkbc%{xkeyboard_config_ver}.0
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xlibs.freedesktop.org/xkbdesc/%{tarname}-%{tarver}.tar.bz2
+Source0: http://xlibs.freedesktop.org/xkbdesc/%{tarname}-%{xkeyboard_config_ver}.tar.bz2
 
 BuildArch: noarch
 
@@ -32,7 +32,7 @@
 xkeyboard-config alternative xkb data files
 
 %prep
-%setup -q -n %{tarname}-%{tarver}
+%setup -q -n %{tarname}-%{xkeyboard_config_ver}
 
 %build
 %configure \
@@ -87,6 +87,12 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-8.xkbc0.8.0
+- Embed xkeyboard-config version in Release field so we can tell from the
+  filename what is really in this package without having to look in the
+  spec file.  We should rename the package to xkeyboard-config and restart
+  the versioning.
+
 * Tue Jun 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-8
 - Added "BuildRequires: perl(XML::Parser)" for (#194188)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:35:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:35:37 -0400
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-server-utils.spec, 1.18, 1.19
Message-ID: <200606220535.k5M5Zb5Q016388@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16357

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
- Bump the package version to 7.1 to have it match the X11 release that the
  tarballs came from going forward.
- Update to xrefresh-1.0.2, xtrap-1.0.2 from X11R7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Apr 2006 21:39:43 -0000	1.6
+++ .cvsignore	22 Jun 2006 05:35:35 -0000	1.7
@@ -15,3 +15,5 @@
 xrandr-1.0.2.tar.bz2
 xrdb-1.0.2.tar.bz2
 xset-1.0.2.tar.bz2
+xtrap-1.0.2.tar.bz2
+xrefresh-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Apr 2006 21:39:43 -0000	1.6
+++ sources	22 Jun 2006 05:35:35 -0000	1.7
@@ -4,12 +4,12 @@
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 45d8fa3c85d4bfda87251798fd605a45  xgamma-1.0.1.tar.bz2
 5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
-8e211e4dfa178d2797cea058709f72ab  xrefresh-1.0.1.tar.bz2
+1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 c94ea103e27e370e4e5030e50c5d5d69  xsetpointer-1.0.0.tar.bz2
 fc7eeb7130bb54345671a9dbaab567ac  xsetroot-1.0.1.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
-e49c695a0af17bc4896e51c298304643  xtrap-1.0.1.tar.bz2
+97a62a011a11f03b46d72851aa298fa8  xtrap-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
 66b8f25e9152e20849638d93a550ff7f  xmodmap-1.0.1.tar.bz2
 7157156809c7f432ae401859b0465ffe  xrandr-1.0.2.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-server-utils.spec	6 Jun 2006 09:48:15 -0000	1.18
+++ xorg-x11-server-utils.spec	22 Jun 2006 05:35:35 -0000	1.19
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 6
+Version: 7.1
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -18,13 +18,13 @@
 Source7:  http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.1.tar.bz2
 Source8:  http://xorg.freedesktop.org/releases/individual/app/xrandr-1.0.2.tar.bz2
 Source9:  http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.2.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.1.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.2.tar.bz2
 Source11: http://xorg.freedesktop.org/releases/individual/app/xset-1.0.2.tar.bz2
 Source12: http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2
 Source13: http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.0.tar.bz2
 Source14: http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.1.tar.bz2
 Source15: http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.1.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.1.tar.bz2
+Source16: http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
 Source17: http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.1.tar.bz2
 # NOTE: Each upstream tarball has its own "PatchN" section, taken from
 # multiplying the "SourceN" line times 100.  Please keep them in this
@@ -41,6 +41,10 @@
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
 
+# FIXME: Temporary build dep on automake, autoconf while they're still used
+# in the specfile.
+BuildRequires: autoconf, automake
+
 BuildRequires: pkgconfig
 # xsetroot requires xbitmaps-devel
 BuildRequires: xbitmaps-devel
@@ -200,6 +204,11 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
+- Bump the package version to 7.1 to have it match the X11 release that the
+  tarballs came from going forward.
+- Update to xrefresh-1.0.2, xtrap-1.0.2 from X11R7.1
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
 - Clean up Source lines in spec file, and other minor cleanups.
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:43:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:43:41 -0400
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.19,
	1.20
Message-ID: <200606220543.k5M5hfUZ018812@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18778

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
Remove build dependency on liblbxutil-devel, as LBX is no longer supported.


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-server-utils.spec	22 Jun 2006 05:35:35 -0000	1.19
+++ xorg-x11-server-utils.spec	22 Jun 2006 05:43:38 -0000	1.20
@@ -55,7 +55,7 @@
 # xtrap requires libXTrap-devel
 BuildRequires: libXTrap-devel
 # NOTE: All of the following were added for bug #191987
-BuildRequires: xorg-x11-xtrans-devel libXext-devel liblbxutil-devel
+BuildRequires: xorg-x11-xtrans-devel libXext-devel
 BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
 BuildRequires: libXrender-devel libXi-devel libXt-devel libXaw-devel
 BuildRequires: libXpm-devel libXxf86misc-devel libXfontcache-devel
@@ -208,6 +208,7 @@
 - Bump the package version to 7.1 to have it match the X11 release that the
   tarballs came from going forward.
 - Update to xrefresh-1.0.2, xtrap-1.0.2 from X11R7.1
+- Remove build dependency on liblbxutil-devel, as LBX is no longer supported.
 
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
 - Clean up Source lines in spec file, and other minor cleanups.



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:51:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:51:17 -0400
Subject: rpms/xorg-x11-utils/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-utils.spec, 1.12, 1.13
Message-ID: <200606220551.k5M5pHxx012373@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12358

Modified Files:
	.cvsignore sources xorg-x11-utils.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
- Bump package version to 7.1 to reflect the X11 release the utilities
  are aggregated from.
- Updated to xdriinfo-1.0.1, xev-1.0.2, xwininfo-1.0.2 from X11R7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jan 2006 16:10:25 -0000	1.4
+++ .cvsignore	22 Jun 2006 05:51:15 -0000	1.5
@@ -9,3 +9,6 @@
 xprop-1.0.1.tar.bz2
 xvinfo-1.0.1.tar.bz2
 xwininfo-1.0.1.tar.bz2
+xwininfo-1.0.2.tar.bz2
+xdriinfo-1.0.1.tar.bz2
+xev-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jan 2006 16:10:25 -0000	1.4
+++ sources	22 Jun 2006 05:51:15 -0000	1.5
@@ -1,6 +1,6 @@
 84cc4798fe62c1d8c67c3f38e8158f70  xdpyinfo-1.0.1.tar.bz2
-8941897fd2bd533f8a676df60ec4f7f5  xdriinfo-1.0.0.tar.bz2
-533a399580d6797faf1a7416fc2c653f  xev-1.0.1.tar.bz2
+be3c5a9b242a57226b5bb5f22ec341ca  xdriinfo-1.0.1.tar.bz2
+e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
 f7b240af84fa8f68f5074b3f0ae479e5  xfontsel-1.0.1.tar.bz2
 69adcda848479acc3b82b3928812d191  xlsatoms-1.0.1.tar.bz2
@@ -8,4 +8,4 @@
 ca9c6c88d0b83360b7b5092615fbf591  xlsfonts-1.0.1.tar.bz2
 9f2cb01264bcaa0455d8b06be6215744  xprop-1.0.1.tar.bz2
 0a5bd8e43de6eb8ff5b5bc673204401d  xvinfo-1.0.1.tar.bz2
-807a845434bd9bbe759b59aa923c258d  xwininfo-1.0.1.tar.bz2
+e5dbc8866a55958297f5f38205b6be1e  xwininfo-1.0.2.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-utils.spec	31 May 2006 15:09:37 -0000	1.12
+++ xorg-x11-utils.spec	22 Jun 2006 05:51:15 -0000	1.13
@@ -2,29 +2,30 @@
 
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 3
+Version: 7.1
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xdpyinfo-1.0.1.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xdriinfo-1.0.0.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xev-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfd-1.0.1.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfontsel-1.0.1.tar.bz2
-Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlsatoms-1.0.1.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlsclients-1.0.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlsfonts-1.0.1.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xprop-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xvinfo-1.0.1.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwininfo-1.0.1.tar.bz2
+Source0:  http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.0.1.tar.bz2
+Source1:  http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/app/xev-1.0.2.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/individual/app/xfd-1.0.1.tar.bz2
+Source4:  http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.1.tar.bz2
+Source5:  http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.1.tar.bz2
+Source6:  http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.0.1.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.1.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/individual/app/xprop-1.0.1.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.0.1.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.2.tar.bz2
 
 Patch0: xdpyinfo-1.0.1-spurious-xprint.patch
 
-%define applist xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# FIXME: Temporary autoconf/automake deps while we need to hack things up
+# with autotools.
+BuildRequires: autoconf automake
 
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
@@ -123,6 +124,11 @@
 %{_mandir}/man1/xwininfo.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
+- Bump package version to 7.1 to reflect the X11 release the utilities
+  are aggregated from.
+- Updated to xdriinfo-1.0.1, xev-1.0.2, xwininfo-1.0.2 from X11R7.1
+
 * Wed May 31 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-3
 - Fix BuildRequires (#191966)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 05:57:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 01:57:01 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.11,1.12
Message-ID: <200606220557.k5M5v1WT012451@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12438

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
- Bump package version to 7.1 to match the X11 release the packages were
  last synced with.



Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-resutils.spec	6 Jun 2006 13:37:20 -0000	1.11
+++ xorg-x11-resutils.spec	22 Jun 2006 05:56:59 -0000	1.12
@@ -2,19 +2,18 @@
 
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 2
+Version: 7.1
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  http://xorg.freedesktop.org/releases/individual/app/appres-1.0.0.tar.bz2
 Source1:  http://xorg.freedesktop.org/releases/individual/app/editres-1.0.1.tar.bz2
 Source2:  http://xorg.freedesktop.org/releases/individual/app/listres-1.0.1.tar.bz2
 Source3:  http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.1.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -93,6 +92,10 @@
 %{_mandir}/man1/viewres.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
+- Bump package version to 7.1 to match the X11 release the packages were
+  last synced with.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Fix all SourceN lines in spec file to not have to update them every time.
 - Remove package ownership of mandir/libdir/etc.
@@ -112,7 +115,7 @@
 - Change manpage dir from man1x to man1 to match RC4 default.
 - Added "BuildRequires: libX11-devel, libXt-devel"
 
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0.99.1-3
+* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.1-3
 - require newer filesystem package (#172610)
 
 * Sun Nov 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2



From fedora-cvs-commits at redhat.com  Thu Jun 22 06:05:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 02:05:11 -0400
Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.10,1.11
Message-ID: <200606220605.k5M65BsD012628@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfwp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12615

Modified Files:
	xorg-x11-xfwp.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Add BuildRequires on autoconf/automake for brew.
- Use "make install DESTDIR=..." instead of makeinstall macro.



Index: xorg-x11-xfwp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xfwp.spec	30 May 2006 22:22:16 -0000	1.10
+++ xorg-x11-xfwp.spec	22 Jun 2006 06:05:09 -0000	1.11
@@ -1,21 +1,26 @@
 %define pkgname xfwp
+%define xfwp_version 1.0.1
 
 Summary: X.Org X11 X firewall proxy
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 2
+# NOTE: The package version should always be the upstream xfwp tarball version.
+Version: %{xfwp_version}
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfwp-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/proxymngr-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfindproxy-1.0.1.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/xfwp-%{xfwp_version}.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/proxymngr-1.0.1.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/xfindproxy-1.0.1.tar.bz2
 
 Patch0: proxymngr-1.0.1-lbxproxy-die-die-die.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# FIXME: Temporary dependencies on autotools stuff for patch workaround.
+BuildRequires: automake autoconf libtool
+
 BuildRequires: pkgconfig
 BuildRequires: libICE-devel libXt-devel
 BuildRequires: xorg-x11-proto-devel
@@ -64,7 +69,7 @@
 {
    for pkg in * ; do
       pushd $pkg
-      %makeinstall
+      make install DESTDIR=$RPM_BUILD_ROOT
       popd
    done
 }
@@ -87,6 +92,10 @@
 %{_mandir}/man1/xfwp.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Add BuildRequires on autoconf/automake for brew.
+- Use "make install DESTDIR=..." instead of makeinstall macro.
+
 * Tue May 30 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
 - Fix BuildRequires (#191813) and add some LBX avoidance.
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 06:18:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 02:18:14 -0400
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-server-utils.spec, 1.20, 1.21
Message-ID: <200606220618.k5M6IEkx008296@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8266

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Jun 2006 05:35:35 -0000	1.7
+++ .cvsignore	22 Jun 2006 06:18:11 -0000	1.8
@@ -1,19 +1,3 @@
-iceauth-1.0.1.tar.bz2
-rgb-1.0.0.tar.bz2
-sessreg-1.0.0.tar.bz2
-xcmsdb-1.0.1.tar.bz2
-xgamma-1.0.1.tar.bz2
-xhost-1.0.1.tar.bz2
-xrefresh-1.0.1.tar.bz2
-xsetmode-1.0.0.tar.bz2
-xsetpointer-1.0.0.tar.bz2
-xsetroot-1.0.1.tar.bz2
-xstdcmap-1.0.1.tar.bz2
-xtrap-1.0.1.tar.bz2
-xvidtune-1.0.1.tar.bz2
-xmodmap-1.0.1.tar.bz2
-xrandr-1.0.2.tar.bz2
-xrdb-1.0.2.tar.bz2
-xset-1.0.2.tar.bz2
-xtrap-1.0.2.tar.bz2
-xrefresh-1.0.2.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Jun 2006 05:35:35 -0000	1.7
+++ sources	22 Jun 2006 06:18:11 -0000	1.8
@@ -15,3 +15,4 @@
 7157156809c7f432ae401859b0465ffe  xrandr-1.0.2.tar.bz2
 de1fd8e2169e813e43f43ced5837b989  xrdb-1.0.2.tar.bz2
 1b781a0802c7b8fb9619a6665607b3f0  xset-1.0.2.tar.bz2
+255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-server-utils.spec	22 Jun 2006 05:43:38 -0000	1.20
+++ xorg-x11-server-utils.spec	22 Jun 2006 06:18:11 -0000	1.21
@@ -3,14 +3,14 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.0.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.1.tar.bz2
 Source3:  http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.0.tar.bz2
 Source4:  http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.1.tar.bz2
 Source5:  http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.1.tar.bz2
@@ -204,6 +204,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
+- Update to rgb-1.0.2 from X11R7.1
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Bump the package version to 7.1 to have it match the X11 release that the
   tarballs came from going forward.



From fedora-cvs-commits at redhat.com  Thu Jun 22 06:19:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 02:19:05 -0400
Subject: rpms/xorg-x11-server-utils/devel
	rgb-1.0.0-datadir-rgbpath-fix.patch, 1.1, 1.2
Message-ID: <200606220619.k5M6J5hP008640@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8601

Modified Files:
	rgb-1.0.0-datadir-rgbpath-fix.patch 
Log Message:
* Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
- Update to rgb-1.0.2 from X11R7.1


rgb-1.0.0-datadir-rgbpath-fix.patch:
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: rgb-1.0.0-datadir-rgbpath-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/rgb-1.0.0-datadir-rgbpath-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rgb-1.0.0-datadir-rgbpath-fix.patch	16 Dec 2005 18:08:20 -0000	1.1
+++ rgb-1.0.0-datadir-rgbpath-fix.patch	22 Jun 2006 06:19:02 -0000	1.2
@@ -1,5 +1,5 @@
 --- rgb-0.99.2/Makefile.am.fix-rgbpath-installation	2005-11-17 21:56:55.000000000 -0500
-+++ rgb-1.0.0/Makefile.am	2005-11-17 21:58:08.000000000 -0500
++++ rgb-1.0.1/Makefile.am	2005-11-17 21:58:08.000000000 -0500
 @@ -37,9 +37,9 @@
  rgb_SOURCES = rgb.c 
  endif



From fedora-cvs-commits at redhat.com  Thu Jun 22 08:05:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 04:05:50 -0400
Subject: rpms/tcpdump/devel tcpdump.spec,1.53,1.54
Message-ID: <200606220805.k5M85ohg019102@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/tcpdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19026

Modified Files:
	tcpdump.spec 
Log Message:
ipv6 flags


Index: tcpdump.spec
===================================================================
RCS file: /cvs/dist/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- tcpdump.spec	4 Jun 2006 18:10:07 -0000	1.53
+++ tcpdump.spec	22 Jun 2006 08:05:17 -0000	1.54
@@ -2,7 +2,7 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
-%define releaseno        7
+%define releaseno        8
 %define arpwatch_release 15.%{releaseno}
 %define pcap_release %{releaseno}
 %define tcpdump_release %{releaseno}
@@ -194,7 +194,7 @@
 popd
 
 pushd %tcpslice_dir
-%configure
+%configure --enable-ipv6
 make
 popd
 
@@ -217,7 +217,7 @@
 
 pushd %arpwatch_dir
 unset CFLAGS
-%configure
+%configure --enable-ipv6
 make ARPDIR=%{_vararpwatch}
 popd
 
@@ -342,6 +342,9 @@
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Thu Jun 22 2006 Martin Stransky <stransky at redhat.com> - 14:3.9.4-8
+- more ipv6 flags
+
 * Sun Jun  4 2006 Jeremy Katz <katzj at redhat.com> - 14:3.9.4-7
 - fix libpcap-devel inclusion of .so and its deps (#193189)
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 08:56:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 04:56:25 -0400
Subject: rpms/man/devel man.spec,1.47,1.48
Message-ID: <200606220856.k5M8uPZx032304@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32290

Modified Files:
	man.spec 
Log Message:
add directories to file list (bug 192995)




Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- man.spec	2 May 2006 09:29:03 -0000	1.47
+++ man.spec	22 Jun 2006 08:56:22 -0000	1.48
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.6c
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -243,75 +243,75 @@
 %lang(bg) %dir /usr/share/locale/bg
 %lang(bg) /usr/share/locale/bg/man
 %lang(bg) %dir /usr/share/man/bg
-%lang(bg) /usr/share/man/bg/man?/*
+%lang(bg) /usr/share/man/bg/man?
 %lang(cs) %dir /usr/share/locale/cs
 %lang(cs) /usr/share/locale/cs/man
 %lang(cs) %dir /usr/share/man/cs
-%lang(cs) /usr/share/man/cs/man?/*
+%lang(cs) /usr/share/man/cs/man?
 %lang(da) %dir /usr/share/locale/da
 %lang(da) /usr/share/locale/da/man
 %lang(da) %dir /usr/share/man/da
-%lang(da) /usr/share/man/da/man?/*
+%lang(da) /usr/share/man/da/man?
 %lang(de) %dir /usr/share/locale/de
 %lang(de) /usr/share/locale/de/man
 %lang(de) %dir /usr/share/man/de
-%lang(de) /usr/share/man/de/man?/*
+%lang(de) /usr/share/man/de/man?
 %lang(el) %dir /usr/share/locale/el
 %lang(el) /usr/share/locale/el/man
 %lang(el) %dir /usr/share/man/el
-%lang(el) /usr/share/man/el/man?/*
+%lang(el) /usr/share/man/el/man?
 %lang(en) %dir /usr/share/locale/en
 %lang(en) /usr/share/locale/en/man
 %lang(en) %dir /usr/share/man/en
-%lang(en) /usr/share/man/en/man?/*
+%lang(en) /usr/share/man/en/man?
 %lang(es) %dir /usr/share/locale/es
 %lang(es) /usr/share/locale/es/man
 %lang(es) %dir /usr/share/man/es
-%lang(es) /usr/share/man/es/man?/*
+%lang(es) /usr/share/man/es/man?
 %lang(fi) %dir /usr/share/locale/fi
 %lang(fi) /usr/share/locale/fi/man
 %lang(fi) %dir /usr/share/man/fi
-%lang(fi) /usr/share/man/fi/man?/*
+%lang(fi) /usr/share/man/fi/man?
 %lang(fr) %dir /usr/share/locale/fr
 %lang(fr) /usr/share/locale/fr/man
 %lang(fr) %dir /usr/share/man/fr
-%lang(fr) /usr/share/man/fr/man?/*
+%lang(fr) /usr/share/man/fr/man?
 %lang(hr) %dir /usr/share/locale/hr
 %lang(hr) /usr/share/locale/hr/man
 %lang(hr) %dir /usr/share/man/hr
-%lang(hr) /usr/share/man/hr/man?/*
+%lang(hr) /usr/share/man/hr/man?
 %lang(it) %dir /usr/share/locale/it
 %lang(it) /usr/share/locale/it/man
 %lang(it) %dir /usr/share/man/it
-%lang(it) /usr/share/man/it/man?/*
+%lang(it) /usr/share/man/it/man?
 %lang(ja) %dir /usr/share/locale/ja
 %lang(ja) /usr/share/locale/ja/man
 %lang(ja) %dir /usr/share/man/ja
-%lang(ja) /usr/share/man/ja/man?/*
+%lang(ja) /usr/share/man/ja/man?
 %lang(ko) %dir /usr/share/locale/ko
 %lang(ko) /usr/share/locale/ko/man
 %lang(ko) %dir /usr/share/man/ko
-%lang(ko) /usr/share/man/ko/man?/*
+%lang(ko) /usr/share/man/ko/man?
 %lang(nl) %dir /usr/share/locale/nl
 %lang(nl) /usr/share/locale/nl/man
 %lang(nl) %dir /usr/share/man/nl
-%lang(nl) /usr/share/man/nl/man?/*
+%lang(nl) /usr/share/man/nl/man?
 %lang(pl) %dir /usr/share/locale/pl
 %lang(pl) /usr/share/locale/pl/man
 %lang(pl) %dir /usr/share/man/pl
-%lang(pl) /usr/share/man/pl/man?/*
+%lang(pl) /usr/share/man/pl/man?
 %lang(pt) %dir /usr/share/locale/pt
 %lang(pt) /usr/share/locale/pt/man
 %lang(pt) %dir /usr/share/man/pt
-%lang(pt) /usr/share/man/pt/man?/*
+%lang(pt) /usr/share/man/pt/man?
 %lang(ro) %dir /usr/share/locale/ro
 %lang(ro) /usr/share/locale/ro/man
 %lang(ro) %dir /usr/share/man/ro
-%lang(ro) /usr/share/man/ro/man?/*
+%lang(ro) /usr/share/man/ro/man?
 %lang(sl) %dir /usr/share/locale/sl
 %lang(sl) /usr/share/locale/sl/man
 %lang(sl) %dir /usr/share/man/sl
-%lang(sl) /usr/share/man/sl/man?/*
+%lang(sl) /usr/share/man/sl/man?
 %lang(ru) %dir /usr/share/locale/ru
 %lang(ru) /usr/share/locale/ru/man
 %attr(0755,root,root)	%dir %{cache}
@@ -322,6 +322,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Thu Jun 22 2006 Ivana Varekova <varekova at redhat.com> - 1.6c-4
+- add directories to file list (bug 192995)
+
 * Mon May 01 2006 Ivana Varekova <varekova at redhat.com> - 1.6c-3
 - fix man displaying problem (bug 190287) - thanks JW
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 09:03:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 05:03:38 -0400
Subject: rpms/beagle/devel beagle.spec,1.57,1.58
Message-ID: <200606220903.k5M93cgO032480@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32468

Modified Files:
	beagle.spec 
Log Message:
Rebuild



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- beagle.spec	21 Jun 2006 12:07:00 -0000	1.57
+++ beagle.spec	22 Jun 2006 09:03:33 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:        1
+Release:        2
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -213,6 +213,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Thu Jun 22 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-2
+- Rebuild to pick up new gsf-sharp
+
 * Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-1
 - update to 0.2.7
 - Use runuser, not su in index cronjob (#195809)



From fedora-cvs-commits at redhat.com  Thu Jun 22 09:07:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 05:07:13 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.73, 1.74 sources,
	1.76, 1.77 system-config-printer.spec, 1.34, 1.35
Message-ID: <200606220907.k5M97Dv0032571@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32555

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Wed Jun 22 2006 Tim Waugh <twaugh at redhat.com> 0.7.15-1
- 0.7.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	20 Jun 2006 16:33:27 -0000	1.73
+++ .cvsignore	22 Jun 2006 09:07:11 -0000	1.74
@@ -53,3 +53,4 @@
 system-config-printer-0.7.12.tar.bz2
 system-config-printer-0.7.13.tar.bz2
 system-config-printer-0.7.14.tar.bz2
+system-config-printer-0.7.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	20 Jun 2006 16:33:27 -0000	1.76
+++ sources	22 Jun 2006 09:07:11 -0000	1.77
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-32b23bb002b9f179182f4b6754da2400  system-config-printer-0.7.14.tar.bz2
+7719f7a889d38dcdd0c0a5645bc8404b  system-config-printer-0.7.15.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- system-config-printer.spec	21 Jun 2006 10:16:13 -0000	1.34
+++ system-config-printer.spec	22 Jun 2006 09:07:11 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.14
+Version: 0.7.15
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -109,7 +109,8 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Wed Jun 21 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Jun 22 2006 Tim Waugh <twaugh at redhat.com> 0.7.15-1
+- 0.7.15.
 - Build requires gettext-devel.
 - Ship translations.
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 09:13:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 05:13:50 -0400
Subject: rpms/kdeutils/devel kdeutils.spec,1.57,1.58
Message-ID: <200606220913.k5M9DoQj011307@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11274

Modified Files:
	kdeutils.spec 
Log Message:
- add buildrequire gmp so that kcalc can be built


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeutils.spec	5 Jun 2006 15:03:46 -0000	1.57
+++ kdeutils.spec	22 Jun 2006 09:13:47 -0000	1.58
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 2
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -36,6 +36,7 @@
 BuildRequires: net-snmp-devel
 BuildRequires: libXtst-devel
 BuildRequires: python-devel
+BuildRequires: gmp-devel
 
 Obsoletes: ark
 Obsoletes: kcalc
@@ -332,6 +333,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Jun 22 2006 Karsten Hopp <karsten at redhat.de> 3.5.3-2
+- add buildrequire gmp so that kcalc can be built
+
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 09:20:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 05:20:38 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.137.2.2,1.137.2.3
Message-ID: <200606220920.k5M9Kclj028389@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28250

Modified Files:
      Tag: private-2_6_2-check-only-active-folders-branch
	evolution.spec 
Log Message:
Update to 2.6.2-1.fc5.6



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.137.2.2
retrieving revision 1.137.2.3
diff -u -r1.137.2.2 -r1.137.2.3
--- evolution.spec	4 Jun 2006 12:06:05 -0000	1.137.2.2
+++ evolution.spec	22 Jun 2006 09:20:35 -0000	1.137.2.3
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.5.92
+%define eds_version 1.6.2
 %define use_mozilla_nss 1
 %define evo_major 2.6
 %define libbonoboui_version 2.4.2
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.1.dwmw2.2
+Release: 1.fc5.6.dwmw2.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -105,6 +105,10 @@
 Patch1000: evolution-2.5.91-check-only-active-folders.patch
 Patch1001: evolution-2.6.2-badalloc-crash.patch
 
+# Removed to placate the build system.  Feel free to try to re-add it, but,
+# wash your dog first.
+ExcludeArch: s390 s390x
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -641,6 +645,19 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.2-1.fc5.6
+- Rebuild
+
+* Tue Jun  6 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.5
+- Bump eds version requires
+
+* Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.3
+- ExcludeArch on s390{,x} because it's broken, and it's not shipped in FC5
+  on those arches anyway.
+
+* Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> - 2.6.2-1.fc5.2
+- Rebuild to hopefully fix build deps.
+
 * Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.1
 - Update to 2.6.2
 - Remove NSS/NSPR chunk from evolution-2.5.2-no-gnome-common.patch



From fedora-cvs-commits at redhat.com  Thu Jun 22 09:21:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 05:21:00 -0400
Subject: rpms/cvs/devel cvs.spec,1.44,1.45
Message-ID: <200606220921.k5M9L0d9028574@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/cvs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28541

Modified Files:
	cvs.spec 
Log Message:
added LFS support (#196259)


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cvs.spec	12 Jun 2006 08:08:43 -0000	1.44
+++ cvs.spec	22 Jun 2006 09:20:58 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -90,7 +90,7 @@
 %{!?nokerberos:CPPFLAGS=-I${k5prefix}/include/kerberosIV; export CPPFLAGS}
 %{!?nokerberos:CFLAGS=-I${k5prefix}/include/kerberosIV; export CFLAGS}
 %{!?nokerberos:LIBS="-lkrb4 -ldes425 -lk5crypto"; export LIBS}
-%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS" $PAM_CONFIG \
+%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" $PAM_CONFIG \
 %{!?nokerberos: --with-gssapi --with-krb4 --enable-encryption}
 
 make
@@ -141,6 +141,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Thu Jun 22 2006 Martin Stransky <stransky at redhat.com> - 1.11.22-2
+- added LFS support (#196259)
+
 * Mon Jun 12 2006 Martin Stransky <stransky at redhat.com> - 1.11.22-1
 - new upstream
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 11:12:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 07:12:55 -0400
Subject: rpms/libvirt/FC-5 libvirt.spec,1.8,1.9
Message-ID: <200606221112.k5MBCt9R007649@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7452

Modified Files:
	libvirt.spec 
Log Message:
trying to force brew to accept it, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-5/libvirt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libvirt.spec	21 Jun 2006 14:02:29 -0000	1.8
+++ libvirt.spec	22 Jun 2006 11:12:53 -0000	1.9
@@ -13,6 +13,7 @@
 Requires: readline
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
+BuildRequires: xen >= xen-3.0.2-3.FC5
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 12:36:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 08:36:36 -0400
Subject: rpms/man/devel man-1.6d-i18n_makewhatis.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 man-1.5p-pipe_makewhatis.patch, 1.2,
	1.3 man-1.6b-rpm.patch, 1.1, 1.2 man.spec, 1.48, 1.49 sources,
	1.10, 1.11 man-1.5m2-i18n_makewhatis.patch, 1.4,
	NONE man-1.5p-makewhatis2.patch, 1.2,
	NONE man-1.5p-makewhatis3.patch, 1.1,
	NONE man-1.5p-man2html.patch, 1.1,
	NONE man-1.5p-mandirlist.patch, 1.1, NONE
Message-ID: <200606221236.k5MCaaEZ028641@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28505

Modified Files:
	.cvsignore man-1.5p-pipe_makewhatis.patch man-1.6b-rpm.patch 
	man.spec sources 
Added Files:
	man-1.6d-i18n_makewhatis.patch 
Removed Files:
	man-1.5m2-i18n_makewhatis.patch man-1.5p-makewhatis2.patch 
	man-1.5p-makewhatis3.patch man-1.5p-man2html.patch 
	man-1.5p-mandirlist.patch 
Log Message:
update to 1.6d


man-1.6d-i18n_makewhatis.patch:
 makewhatis.sh |  537 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 258 insertions(+), 279 deletions(-)

--- NEW FILE man-1.6d-i18n_makewhatis.patch ---
--- man-1.6d/src/makewhatis.sh.pom	2006-06-10 01:14:34.000000000 +0200
+++ man-1.6d/src/makewhatis.sh	2006-06-22 13:41:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # makewhatis: create the whatis database
 # Created: Sun Jun 14 10:49:37 1992
 # Revised: Sat Jan  8 14:12:37 1994 by faith at cs.unc.edu
@@ -6,34 +6,6 @@
 # Copyright 1992, 1993, 1994 Rickard E. Faith (faith at cs.unc.edu)
 # May be freely distributed and modified as long as copyright is retained.
 #
-# Wed Dec 23 13:27:50 1992: Rik Faith (faith at cs.unc.edu) applied changes
-# based on Mitchum DSouza (mitchum.dsouza at mrc-apu.cam.ac.uk) cat patches.
-# Also, cleaned up code and make it work with NET-2 doc pages.
-#
-# makewhatis-1.4: aeb 940802, 941007, 950417
-# Fixed so that the -c option works correctly for the cat pages
-# on my machine. Fix for -u by Nan Zou (nan at ksu.ksu.edu).
-# Many minor changes.
-# The -s option is undocumented, and may well disappear again.
-#
-# Sat Mar 23 1996: Michael Hamilton (michael at actrix.gen.nz).
-# I changed the script to invoke gawk only once for each directory tree.
-# This speeds things up considerably (from 30 minutes down to 1.5 minutes
-# on my 486DX66).
-# 960401 - aeb: slight adaptation to work correctly with cat pages.
-# 960510 - added fixes by brennan at raven.ca.boeing.com, author of mawk.
-# 971012 - replaced "test -z" - it doesnt work on SunOS 4.1.3_U1.
-# 980710 - be more careful with TMPFILE
-# 000323 - do not change PATH, better treatment of catpages - Bryan Henderson
-# 011117 - avoid suspicious filenames
-# 030310 - find files only; fix LAPACK cruft; no /usr/man default;
-#	use /dev/stderr instead of /dev/tty; handle files with strange names;
-#	add support for chinese, hungarian, indonesian, japanese, korean,
-#	polish, russian (Thierry Vignaud);
-#
-# Note for Slackware users: "makewhatis -v -w -c" will work.
-#
-# makewhatis aeb 030801 (from %version%)
 
 program=`basename $0`
 
@@ -57,33 +29,20 @@
 done
 DEFCATPATH=$dc
 
-# In case /usr is read-only, make /usr/foo/whatis (etc) a symlink to
-# something like /var/cache/man/foo-whatis.
-# Some distributions make a single big /var/cache/man/whatis file,
-# but that leads to problems and bugs.
-
-# AWK=/usr/bin/gawk
-AWK=%awk%
-
-# Find a place for our temporary files. If security is not a concern, use
-#	TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
-# Of course makewhatis should only have the required permissions
-# (for reading and writing directories like /usr/man).
-# We try here to be careful (and avoid preconstructed symlinks)
-# in case makewhatis is run as root, by creating a subdirectory of /tmp.
-
-TMPFILEDIR=/tmp/whatis.tmp.dir.$$
-rm -rf TMPFILEDIR
-if ! mkdir -m 0700 $TMPFILEDIR; then
-    echo Could not create $TMPFILEDIR
-    exit 1;
-fi
-TMPFILE=$TMPFILEDIR/w
+# make a single big /var/cache/man/whatis file,
+DEFWHATIS=/var/cache/man/whatis
 
-# make sure TMPFILEDIR is deleted if program is killed or terminates
+AWK=/usr/bin/gawk
+
+# Find a place for our temporary files.
+
+if TMPFILE=$(mktemp /tmp/whatis.XXXXXX)
+then
+
+# make sure TMPFILE is deleted if program is killed or terminates
 # (just delete this line if your shell doesnt know about trap)
-trap "rm -rf $TMPFILEDIR" 0
-trap "rm -rf $TMPFILEDIR; exit 255" 1 2 3 15
+trap "rm -rf $TMPFILE" 0 
+trap "rm -rf $TMPFILEDIR; exit 255" 1 2 3 15 
 
 # default find arg: no directories, no empty files
 findarg0="-type f -size +0"
@@ -94,6 +53,7 @@
 defcatpath=
 
 sections="1 2 3 4 5 6 7 8 9 n l"
+whatisdb=$DEFWHATIS
 
 for name in "$@"
 do
@@ -102,6 +62,11 @@
 	sections=$name
 	continue
 fi
+if [ -n "$setwhatis" ]; then
+       setwhatis=
+       whatisdb=$name
+       continue
+fi
 case $name in
     --version|-V)
 	echo "$program from %version%"
@@ -112,6 +77,8 @@
 	continue;;
     -s) setsections=1
 	continue;;
+    -o) setwhatis=1
+        continue;;
     -u) findarg="-ctime 0"
 	update=1
 	continue;;
@@ -120,12 +87,13 @@
     -w) manpath=`man --path`
 	catpath=$manpath
 	continue;;
-    -*) echo "Usage: makewhatis [-s sections] [-u] [-v] [-w] [manpath] [-c [catpath]]"
+    -*) echo "Usage: makewhatis [-s sections] [-u] [-v] [-w] [manpath] [-c [catpath]] [-o whatisdb]"
 	echo "       This will build the whatis database for the man pages"
 	echo "       found in manpath and the cat pages found in catpath."
         echo "       -s: sections (default: $sections)"
 	echo "       -u: update database with new pages"
 	echo "       -v: verbose"
+        echo "       -o: location of whatis database (default: $DEFWHATIS)"
 	echo "       -w: use manpath obtained from \`man --path\`"
 	echo "       [manpath]: man directories (default: $DEFMANPATH)"
 	echo "       [catpath]: cat directories (default: the first existing"
@@ -153,14 +121,7 @@
 # first truncate all the whatis files that will be created new,
 # then only update - we might visit the same directory twice
 if [ x$update = x ]; then
-   for pages in man cat
-   do
-      eval path="\$$pages"path
-      for mandir in $path
-      do
-	 cp /dev/null $mandir/whatis
-      done
-   done
+   cp /dev/null $whatisdb
 fi
 
 for pages in man cat
@@ -172,11 +133,6 @@
      if [ x$verbose != x ]; then
 	echo "about to enter $mandir" > /dev/stderr
      fi
-     if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
-	if [ x$verbose != x ]; then
-	   echo skipping $mandir - we did it already > /dev/stderr
-	fi
-     else      
        here=`pwd`
        cd $mandir
        for i in $sections
@@ -187,234 +143,257 @@
 	    section=$i
 	    curdir=$mandir/${pages}$i
 	    export section verbose curdir
-	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
-
-	    function readline() {
-	      if (use_zcat || use_bzcat) {
-		result = (pipe_cmd | getline);
-		if (result < 0) {
-		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-		}
-	      } else {
-		result = (getline < filename);
-		if (result < 0) {
-		  print "Read file error: " filename " " ERRNO > "/dev/stderr";
-		}
-	      }
-	      return result;
+ 
+ 	    utf8=
+            for x in $(find $mandir/${pages}$i -name '*' $findarg0 $findarg)
+            do
+               if [ ${x%.gz} != ${x} ]
+               then
+                  cat=zcat
+               elif [ ${x%.bz2} != ${x} ]
+               then
+                  cat=bzcat
+               else
+                  cat=cat
+               fi
+   
+               if ${cat} ${x} | iconv -f utf-8 -t utf-8 -o /dev/null 2>/dev/null
+               then
+                  echo ${x} | $AWK '
+   
+    function readline() {
+      if (use_zcat || use_bzcat) {
+        result = (pipe_cmd | getline);
+        if (result < 0) {
+          print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
+        }
+      } else {
+        result = (getline < filename);
+        if (result < 0) {
+          print "Read file error: " filename " " ERRNO > "/dev/stderr";
+        }
+      }
+      return result;
+    }
+   
+    function closeline() {
+      if (use_zcat || use_bzcat) {
+        return close(pipe_cmd);
+      } else {
+        return close(filename);
+      }
+    }
+   
+    function do_one() {
+      insh = 0; thisjoin = 1; done = 0;
+      entire_line = "";
+   
+      if (verbose) {
+        print "adding " filename > "/dev/stderr"
+      }
+
+      use_zcat = match(filename,"\\.Z$") ||
+                 match(filename,"\\.z$") || match(filename,"\\.gz$");
+      if (!use_zcat)
+        use_bzcat = match(filename,"\\.bz2");
+      if (use_zcat || use_bzcat) {
+        filename_no_gz = substr(filename, 0, RSTART - 1);
+      } else {
+        filename_no_gz = filename;
+      }
+      match(filename_no_gz, "/[^/]+$");
+      progname = substr(filename, RSTART + 1, RLENGTH - 1);
+      if (match(progname, "\\." section "[A-Za-z]+")) {
+        actual_section = substr(progname, RSTART + 1, RLENGTH - 1);
+      } else {
+        actual_section = section;
+      }
+      sub(/\..*/, "", progname);
+      if (use_zcat || use_bzcat) {
+        if (use_zcat) {
+          pipe_cmd = "zcat \"" filename "\"";
+        } else {
+          pipe_cmd = "bzcat \"" filename "\"";
+        }
+        # try to avoid suspicious stuff
+        if (filename ~ /[;&|`$(]/) {
+          print "ignored strange file name " filename " in " curdir > "/dev/stderr";
+          return;
+        }
+      }
+
+      while (!done && readline() > 0) {
+        gsub(/.\b/, "");
+        if (($1 ~ /^\.[Ss][Hh]/ &&
+           ($2 ~ /[Nn][Aa][Mm][Ee]/ ||   # en/de
+            $2 ~ /^JM??NO/ ||            # cs
+            $2 ~ /^NAVN/ ||             # da
+            $2 ~ /^NUME/ ||             # ro
+            $2 ~ /^BEZEICHNUNG/ ||      # de
+            $2 ~ /^NOMBRE/ ||           # es
+            $2 ~ /^NIMI/ ||             # fi
+            $2 ~ /^NOM/ ||              # fr
+            $2 ~ /^IME/ ||              # sh
+            $2 ~ /^N[??E]V/ ||          # hu
+            $2 ~ /^NAMA/ ||             # XXX: what lang is this?
+            $2 ~ /^??????/ ||             # ja
+            $2 ~ /^??????/ ||             # ko
+            $2 ~ /^NAZWA/ ||            # pl
+            $2 ~ /^????????????????/ || # ru
+            $2 ~ /^??????/ ||             # zh_CN/ja
+            $2 ~ /^??????/ ||             # zh_TW
+            $2 ~ /^NOME/ ||             # it/pt
+            $2 ~ /^NAAM/)) ||           # nl
+          (pages == "cat" && $1 ~ /^NAME/)) {
+            if (!insh) {
+              insh = 1;
+            } else {
+              done = 1;
 	    }
-	    
-	    function closeline() {
-	      if (use_zcat || use_bzcat) {
-		return close(pipe_cmd);
+        } else if (insh) {
+          if ($1 ~ /^\.[Ss][HhYS]/ ||
+            (pages == "cat" &&
+            ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
+             $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
+             $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
+             $0 ~ /^[^ ]/))) {
+              # end insh for Synopsis, Syntax, but also for
+              # DESCRIPTION (e.g., XFree86.1x),
+              # COMMAND (e.g., xspread.1)
+              # OVERVIEW (e.g., TclCommandWriting.3)
+              # STRUCTURES (e.g., XEvent.3x)
+              # INTRODUCTION (e.g., TclX.n)
+              # and anything at all that begins in Column 1, so
+              # is probably a section header.
+            done = 1;
+          } else {
+            if ($0 ~ progname"-") {  # Fix old cat pages
+                sub(progname"-", progname" - ");
+   	    }	    
+            if ($0 ~ /[^ \\]-$/) {
+              sub(/-$/, "");      # Handle Hyphenations
+              nextjoin = 1;
+            } else if ($0 ~ /\\c$/) {
+              sub(/\\c$/, "");    # Handle Continuations
+              nextjoin = 1;
+            } else
+              nextjoin = 0;
+ 
+            sub(/^.[IB] /, "");       # Kill bold and italics
+            sub(/^.BI /, "");         #
+            sub(/^.SM /, "");         # Kill small
+            sub(/^.Nm /, "");         # Kill bold
+            sub(/^.Tn /, "");         # Kill normal
+            sub(/^.Li /, "");         # Kill .Li
+            sub(/^.Dq /, "");         # Kill .Dq
+            sub(/^.Nd */, "- ");      # Convert .Nd to dash
+            sub(/\\\".*/, "");        # Trim pending comments
+            sub(/  *$/, "");          # Trim pending spaces
+            sub(/^\.$/, "");          # Kill blank comments
+            sub(/^'"'"'.*/, "");      # Kill comment/troff lines
+            sub(/^.in .*/, "");       # Kill various macros
+            sub(/^.ti .*/, "");
+            sub(/^.ta .*/, "");
+            sub(/^.Vb .*/, "");
+            sub(/^.[PLTH]P$/, "");    # .PP/.LP/.TP/.HP
+            sub(/^.Pp$/, "");
+            sub(/^.[iI]X .*$/, "");
+            sub(/^.nolinks$/, "");
+            sub(/^.B$/, "");
+            sub(/^.nf$/, "");
+
+            if (($1 ~ /^\.../ || $1 == "") &&
+                (entire_line ~ / - / || entire_line ~ / \\- /)) {
+              # Assume that this ends the description of one line
+              # Sometimes there are several descriptions in one page,
+              # as in outb(2).
+              handle_entire_line();
+ 	      entire_line = "";
+              thisjoin = 1;
+            } else {
+              if (thisjoin) {
+                entire_line = entire_line $0;
 	      } else {
-		return close(filename);
+                entire_line = entire_line " " $0;
 	      }
+              thisjoin = nextjoin;
 	    }
-	    
-	    function do_one() {
-	      insh = 0; thisjoin = 1; done = 0;
-	      entire_line = "";
+          }
+        }
+      }
+      handle_entire_line();
+      closeline();
+    }
+
+    function handle_entire_line() {
+      x = entire_line;             # Keep it short
+
+      gsub(/\015/, "", x);         # Kill DOS remains
+      gsub(/	/, " ", x);        # Translate tabs to spaces
+      gsub(/  +/, " ", x);         # Collapse spaces
+      gsub(/ *, */, ", ", x);      # Fix comma spacings
+      sub(/^ /, "", x);            # Kill initial spaces
+      sub(/ $/, "", x);            # Kill trailing spaces
+      sub(/__+/, "_", x);          # Collapse underscores
+
+      gsub(/\\f\(../, "", x);         # Kill font changes
+      gsub(/\\f[PRIB0123]/, "", x);   # Kill font changes
+      gsub(/\\s[-+0-9]*/, "", x);     # Kill size changes
+      gsub(/\\&/, "", x);             # Kill \&
+      gsub(/\\\|/, "", x);            # Kill \|
+      gsub(/\\\((ru|ul)/, "_", x);    # Translate
+      gsub(/\\\((mi|hy|em)/, "-", x); # Translate
+      gsub(/\\\*\(../, "", x);        # Kill troff strings
+      gsub(/\\/, "", x);              # Kill all backslashes
+      gsub(/"/, "", x);               # Kill quotes (from .Nd "foo bar")
+      sub(/<h1 align=center>/, "", x);# Yuk! HTML cruft
+      gsub(/\000.*/, "X", x);         # Binary cruft in LAPACK pages
+      gsub(/  +/, " ", x);            # Collapse spaces (again)
+      sub(/^ /, "", x);               # Kill initial spaces (again)
+      sub(/ $/, "", x);               # Kill trailing spaces (again)
+      sub(/\.$/, "", x);              # Kill trailing period
+
+      if (!match(x, / - /))
+        return;
+
+      after_dash = substr(x, RSTART);
+      head = substr(x, 1, RSTART-1) ", ";
+      while (match(head, /, /)) {
+        prog = substr(head, 1, RSTART-1);
+        head = substr(head, RSTART+2);
+        if (prog != progname)
+          prog = prog " [" progname "]";
+        printf "%-*s (%s) %s\n", 20, prog, actual_section, after_dash;
+      }
+    }
+
+    {                  # Main action - process each filename read in.
+      filename = $0;
+      do_one();
+    }
 
-	      if (verbose) {
-		print "adding " filename > "/dev/stderr"
-	      }
-	      
-	      use_zcat = match(filename,"\\.Z$") ||
-			 match(filename,"\\.z$") || match(filename,"\\.gz$");
-	      if (!use_zcat)
-		use_bzcat = match(filename,"\\.bz2");
-	      if (use_zcat || use_bzcat) {
-		filename_no_gz = substr(filename, 0, RSTART - 1);
-	      } else {
-		filename_no_gz = filename;
-	      }
-	      match(filename_no_gz, "/[^/]+$");
-	      progname = substr(filename, RSTART + 1, RLENGTH - 1);
-	      if (match(progname, "\\." section "[A-Za-z]+")) {
-		actual_section = substr(progname, RSTART + 1, RLENGTH - 1);
-	      } else {
-		actual_section = section;
-	      }
-	      sub(/\..*/, "", progname);
-	      if (use_zcat || use_bzcat) {
-		if (use_zcat) {
-		  pipe_cmd = "zcat \"" filename "\"";
-		} else {
-		  pipe_cmd = "bzcat \"" filename "\"";
-		}
-		# try to avoid suspicious stuff
-		if (filename ~ /[;&|`$(]/) {
-		  print "ignored strange file name " filename " in " curdir > "/dev/stderr";
-		  return;
-		}
-	      }
-	    
-	      while (!done && readline() > 0) {
-		gsub(/.\b/, "");
-		if (($1 ~ /^\.[Ss][Hh]/ &&
-		  ($2 ~ /[Nn][Aa][Mm][Ee]/ ||
-		   $2 ~ /^JM?NO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ ||
-		   $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ ||
-		   $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ ||
-		   $2 ~ /^N[?E]V/ || $2 ~ /^NAMA/ || $2 ~ /^????/ ||
-		   $2 ~ /^????/ || $2 ~ /^????/ || $2 ~ /^NAZWA/ ||
-		   $2 ~ /^????????/ || $2 ~ /^????/ || $2 ~ /^?W??/ ||
-		   $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^???/)) ||
-		  (pages == "cat" && $1 ~ /^NAME/)) {
-		    if (!insh) {
-		      insh = 1;
-		    } else {
-		      done = 1;
-		    }
-		} else if (insh) {
-		  if ($1 ~ /^\.[Ss][HhYS]/ ||
-		    (pages == "cat" &&
-		    ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
-		     $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
-		     $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
-		     $0 ~ /^[^ ]/))) {
-		      # end insh for Synopsis, Syntax, but also for
-		      # DESCRIPTION (e.g., XFree86.1x),
-		      # COMMAND (e.g., xspread.1)
-		      # OVERVIEW (e.g., TclCommandWriting.3)
-		      # STRUCTURES (e.g., XEvent.3x)
-		      # INTRODUCTION (e.g., TclX.n)
-		      # and anything at all that begins in Column 1, so 
-		      # is probably a section header.
-		    done = 1;
-		  } else {
-		    if ($0 ~ progname"-") {  # Fix old cat pages
-			sub(progname"-", progname" - ");
-		    }
-		    if ($0 ~ /[^ \\]-$/) {
-		      sub(/-$/, "");	  # Handle Hyphenations
-		      nextjoin = 1;
-		    } else if ($0 ~ /\\c$/) {
-		      sub(/\\c$/, "");	  # Handle Continuations
-		      nextjoin = 1;
-		    } else
-		      nextjoin = 0;
-
-		    sub(/^.[IB] /, "");       # Kill bold and italics
-		    sub(/^.BI /, "");         #
-		    sub(/^.SM /, "");         # Kill small
-		    sub(/^.Nm /, "");         # Kill bold
-		    sub(/^.Tn /, "");         # Kill normal
-	            sub(/^.Li /, "");         # Kill .Li
-	            sub(/^.Dq /, "");         # Kill .Dq
-	            sub(/^.Nd */, "- ");      # Convert .Nd to dash
-		    sub(/\\\".*/, "");        # Trim pending comments
-		    sub(/  *$/, "");          # Trim pending spaces
-		    sub(/^\.$/, "");          # Kill blank comments
-		    sub(/^'"'"'.*/, "");      # Kill comment/troff lines
-		    sub(/^.in .*/, "");       # Kill various macros
-		    sub(/^.ti .*/, "");
-		    sub(/^.ta .*/, "");
-		    sub(/^.Vb .*/, "");
-		    sub(/^.[PLTH]P$/, "");    # .PP/.LP/.TP/.HP
-		    sub(/^.Pp$/, "");
-		    sub(/^.[iI]X .*$/, "");
-		    sub(/^.nolinks$/, "");
-		    sub(/^.B$/, "");
-		    sub(/^.nf$/, "");
-
-		    if (($1 ~ /^\.../ || $1 == "") &&
-		        (entire_line ~ / - / || entire_line ~ / \\- /)) {
-		      # Assume that this ends the description of one line
-		      # Sometimes there are several descriptions in one page,
-		      # as in outb(2).
-		      handle_entire_line();
-		      entire_line = "";
-		      thisjoin = 1;
-		    } else {
-		      if (thisjoin) {
-			entire_line = entire_line $0;
-		      } else {
-			entire_line = entire_line " " $0;
-		      }
-		      thisjoin = nextjoin;
-		    }
-		  }
-		}
-	      }
-	      handle_entire_line();
-	      closeline();
-	    }
-
-	    function handle_entire_line() {
-	      x = entire_line;             # Keep it short
-
-	      gsub(/\015/, "", x);         # Kill DOS remains
-	      gsub(/	/, " ", x);        # Translate tabs to spaces
-	      gsub(/  +/, " ", x);         # Collapse spaces
-	      gsub(/ *, */, ", ", x);      # Fix comma spacings
-	      sub(/^ /, "", x);            # Kill initial spaces
-	      sub(/ $/, "", x);            # Kill trailing spaces
-	      sub(/__+/, "_", x);          # Collapse underscores
-
-	      gsub(/\\f\(../, "", x);         # Kill font changes
-	      gsub(/\\f[PRIB0123]/, "", x);   # Kill font changes
-	      gsub(/\\s[-+0-9]*/, "", x);     # Kill size changes
-	      gsub(/\\&/, "", x);             # Kill \&
-	      gsub(/\\\|/, "", x);            # Kill \|
-	      gsub(/\\\((ru|ul)/, "_", x);    # Translate
-	      gsub(/\\\((mi|hy|em)/, "-", x); # Translate
-	      gsub(/\\\*\(../, "", x);        # Kill troff strings
-	      gsub(/\\/, "", x);              # Kill all backslashes
-	      gsub(/"/, "", x);               # Kill quotes (from .Nd "foo bar")
-	      sub(/<h1 align=center>/, "", x);# Yuk! HTML cruft
-	      gsub(/\000.*/, "X", x);         # Binary cruft in LAPACK pages
-	      gsub(/  +/, " ", x);            # Collapse spaces (again)
-	      sub(/^ /, "", x);               # Kill initial spaces (again)
-	      sub(/ $/, "", x);               # Kill trailing spaces (again)
-	      sub(/\.$/, "", x);              # Kill trailing period
-
-	      if (!match(x, / - /))
-		return;
-
-	      after_dash = substr(x, RSTART);
-	      head = substr(x, 1, RSTART-1) ", ";
-	      while (match(head, /, /)) {
-		prog = substr(head, 1, RSTART-1);
-		head = substr(head, RSTART+2);
-		if (prog != progname)
-		  prog = prog " [" progname "]";
-		printf "%-*s (%s) %s\n", 20, prog, actual_section, after_dash;
-	      }
-	    }
-
-	    {			# Main action - process each filename read in.
-	      filename = $0;
-	      do_one();
-	    }
 	    ' pages=$pages section=$section verbose=$verbose curdir=$curdir
+               fi
+            done
 	    cd ..
 	 fi
        done > $TMPFILE
 
        cd $here
 
-       # kludge for Slackware's /usr/man/preformat
-       if [ $mandir = /usr/man/preformat ]
-       then
-	 mandir1=/usr/man
-       else
-	 mandir1=$mandir
-       fi
-
-       if [ -f ${mandir1}/whatis ]
+       if [ -f ${whatisdb} ]
        then
-	 cat ${mandir1}/whatis >> $TMPFILE
+         cat ${whatisdb} >> $TMPFILE
        fi
-       tr -s '\n' < $TMPFILE | sort -u > ${mandir1}/whatis
+       tr -s '\n' < $TMPFILE | sort -u > ${whatisdb}
 
-       chmod 644 ${mandir1}/whatis
-       rm $TMPFILE
-     fi
+       chmod 644 ${whatisdb}
    done
 done
 
 # remove tempdir
-rm -rf $TMPFILEDIR
+rm -rf $TMPFILE
 
+else            # we're here if TMPFILE creation failed
+    exit 1
+fi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Feb 2006 19:35:39 -0000	1.10
+++ .cvsignore	22 Jun 2006 12:36:33 -0000	1.11
@@ -1,2 +1 @@
-man-1.6b.tar.gz
-man-1.6c.tar.gz
+man-1.6d.tar.gz

man-1.5p-pipe_makewhatis.patch:
 makewhatis.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: man-1.5p-pipe_makewhatis.patch
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man-1.5p-pipe_makewhatis.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- man-1.5p-pipe_makewhatis.patch	17 May 2005 07:04:13 -0000	1.2
+++ man-1.5p-pipe_makewhatis.patch	22 Jun 2006 12:36:33 -0000	1.3
@@ -1,14 +1,14 @@
---- man-1.5p/src/makewhatis.sh.pipe	2005-05-12 15:23:07.635109152 +0200
-+++ man-1.5p/src/makewhatis.sh	2005-05-12 15:24:19.780141440 +0200
-@@ -208,9 +208,9 @@
+--- man-1.6d/src/makewhatis.sh.pom	2006-06-22 14:07:20.000000000 +0200
++++ man-1.6d/src/makewhatis.sh	2006-06-22 14:08:40.000000000 +0200
+@@ -211,9 +211,9 @@
        sub(/\..*/, "", progname);
        if (use_zcat || use_bzcat) {
- 	if (use_zcat) {
--	  pipe_cmd = "zcat \"" filename "\"";
-+	  pipe_cmd = "zcat \"" filename "\" 2>/dev/null";
- 	} else {
--	  pipe_cmd = "bzcat \"" filename "\"";
-+	  pipe_cmd = "bzcat \"" filename "\" 2>/dev/null";
- 	}
- 	# try to avoid suspicious stuff
- 	if (filename ~ /[;&|`$(]/) {
+         if (use_zcat) {
+-          pipe_cmd = "zcat \"" filename "\"";
++          pipe_cmd = "zcat \"" filename "\" 2>/dev/null";
+         } else {
+-          pipe_cmd = "bzcat \"" filename "\"";
++          pipe_cmd = "bzcat \"" filename "\" 2>/dev/null";
+         }
+         # try to avoid suspicious stuff
+         if (filename ~ /[;&|`$(]/) {

man-1.6b-rpm.patch:
 makewhatis.sh |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: man-1.6b-rpm.patch
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man-1.6b-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6b-rpm.patch	13 Dec 2005 15:25:05 -0000	1.1
+++ man-1.6b-rpm.patch	22 Jun 2006 12:36:33 -0000	1.2
@@ -1,11 +1,11 @@
---- man-1.6b/src/makewhatis.sh.rpm	2005-12-13 15:26:24.000000000 +0100
-+++ man-1.6b/src/makewhatis.sh	2005-12-13 15:28:24.450640320 +0100
-@@ -118,7 +118,7 @@
+--- man-1.6d/src/makewhatis.sh.pom	2006-06-22 14:13:06.000000000 +0200
++++ man-1.6d/src/makewhatis.sh	2006-06-22 14:14:28.000000000 +0200
+@@ -121,7 +121,7 @@
  # first truncate all the whatis files that will be created new,
  # then only update - we might visit the same directory twice
  if [ x$update = x ]; then
--    cp /dev/null $whatisdb
-+ rpm -qa --queryformat '%-19{NAME} (rpm) - %{SUMMARY}\r' | tr -d '\n' | tr '\r' '\n' >$whatisdb
+-   cp /dev/null $whatisdb
++   rpm -qa --queryformat '%-19{NAME} (rpm) - %{SUMMARY}\r' | tr -d '\n' | tr '\r' '\n' >$whatisdb
  fi
  
  for pages in man cat


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- man.spec	22 Jun 2006 08:56:22 -0000	1.48
+++ man.spec	22 Jun 2006 12:36:33 -0000	1.49
@@ -3,8 +3,8 @@
 
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
-Version: 1.6c
-Release: 4
+Version: 1.6d
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -14,13 +14,8 @@
 Patch1: man-1.5m2-confpath.patch
 Patch2: man-1.5h1-make.patch
 Patch6: man-1.5m2-apropos.patch
-Patch7: man-1.5m2-lc_all.patch
-Patch10: man-1.5m2-i18n_makewhatis.patch
+Patch10: man-1.6d-i18n_makewhatis.patch
 Patch12: man-1.5m2-posix.patch
-Patch13: man-1.5p-makewhatis2.patch
-Patch14: man-1.5p-makewhatis3.patch
-Patch15: man-1.5p-mandirlist.patch
-Patch16: man-1.5p-man2html.patch
 Patch18: man-1.5p-pipe_makewhatis.patch
 Patch19: man-1.5p-sec.patch
 Patch20: man-1.5p-xorg.patch
@@ -51,13 +46,8 @@
 %patch1 -p1 -b .confpath
 %patch2 -p1 -b .make
 %patch6 -p1 -b .apropos
-%patch7 -p1 -b .lc_all
 %patch10 -p1 -b .i18n_makewhatis
 %patch12 -p1 -b .posix
-%patch13 -p1 -b .trap
-%patch14 -p1 -b .update
-%patch15 -p1 -b .lang
-%patch16 -p1 -b .man2html
 %patch18 -p1 -b .pipe
 %patch19 -p1 -b .sec
 %patch20 -p1 -b .xorg
@@ -322,6 +312,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Thu Jun 22 2006 Ivana Varekova <varekova at redhat.com> - 1.6d-1
+- update to 1.6d
+
 * Thu Jun 22 2006 Ivana Varekova <varekova at redhat.com> - 1.6c-4
 - add directories to file list (bug 192995)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Feb 2006 19:35:39 -0000	1.10
+++ sources	22 Jun 2006 12:36:33 -0000	1.11
@@ -1 +1 @@
-ac1e7d60dfedb7d1c6f398ae5b038996  man-1.6c.tar.gz
+36d3f65bcc10f0754a3234e00d92ad6d  man-1.6d.tar.gz


--- man-1.5m2-i18n_makewhatis.patch DELETED ---


--- man-1.5p-makewhatis2.patch DELETED ---


--- man-1.5p-makewhatis3.patch DELETED ---


--- man-1.5p-man2html.patch DELETED ---


--- man-1.5p-mandirlist.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:04:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:04:31 -0400
Subject: rpms/libvirt/FC-5 libvirt.spec,1.9,1.10
Message-ID: <200606221304.k5MD4VXt019894@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19769

Modified Files:
	libvirt.spec 
Log Message:
Try to fix things, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-5/libvirt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libvirt.spec	22 Jun 2006 11:12:53 -0000	1.9
+++ libvirt.spec	22 Jun 2006 13:04:26 -0000	1.10
@@ -13,7 +13,7 @@
 Requires: readline
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
-BuildRequires: xen >= xen-3.0.2-3.FC5
+BuildRequires: xen >= 3.0.2-3.FC5
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:26:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:26:19 -0400
Subject: rpms/scim-hangul/FC-5 scim-hangul.spec,1.15,1.16
Message-ID: <200606221326.k5MDQJKD007324@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7292

Modified Files:
	scim-hangul.spec 
Log Message:
* Thu Jun 22 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2.fc5
- rebuilt


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/FC-5/scim-hangul.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-hangul.spec	14 Jun 2006 03:45:06 -0000	1.15
+++ scim-hangul.spec	22 Jun 2006 13:26:13 -0000	1.16
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0 
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        1.fc5.1
+Release:        2.fc5
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Jun 22 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2.fc5
+- rebuilt
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:26:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:26:39 -0400
Subject: rpms/gphoto2/devel gphoto2-2.2.0-gcc4.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 gphoto2-2.1.99-config.patch, 1.1, 1.2 gphoto2.spec,
	1.66, 1.67 sources, 1.12, 1.13 gphoto2-2.1.99-canon_segv.patch,
	1.1, NONE gphoto2-2.1.99-dbus.patch, 1.1,
	NONE gphoto2-2.1.99-gtk_doc.patch, 1.3,
	NONE gphoto2-2.1.99-library-null.patch, 1.1,
	NONE gphoto2-2.1.99-new-usbids.patch, 1.1,
	NONE gphoto2-gcc4.patch, 1.3, NONE
Message-ID: <200606221326.k5MDQdJJ007466@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7424

Modified Files:
	.cvsignore gphoto2-2.1.99-config.patch gphoto2.spec sources 
Added Files:
	gphoto2-2.2.0-gcc4.patch 
Removed Files:
	gphoto2-2.1.99-canon_segv.patch gphoto2-2.1.99-dbus.patch 
	gphoto2-2.1.99-gtk_doc.patch gphoto2-2.1.99-library-null.patch 
	gphoto2-2.1.99-new-usbids.patch gphoto2-gcc4.patch 
Log Message:
- update to gphoto2-2.2.0 and libgphoto2-2.2.1

gphoto2-2.2.0-gcc4.patch:
 camlibs/digita/commands.c                      |    8 ++++----
 libgphoto2_port/libgphoto2_port/gphoto2-port.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE gphoto2-2.2.0-gcc4.patch ---
--- gphoto2-2.1.99/libgphoto2-2.2.1/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4	2005-02-22 06:33:42.000000000 +0000
+++ gphoto2-2.1.99/libgphoto2-2.2.1/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2005-06-23 12:07:51.000000000 +0100
@@ -408,7 +408,7 @@
 
 	/* Check if we read as many bytes as expected */
 	CHECK_SUPP (port, "read", port->pc->ops->read);
-	retval = port->pc->ops->read (port, data, size);
+	retval = (port->pc->ops->read) (port, data, size);
 	CHECK_RESULT (retval);
 	if (retval != size)
 		gp_log (GP_LOG_DEBUG, "gphoto2-port", _("Could only read %i "
--- gphoto2-2.1.99/libgphoto2-2.2.1/camlibs/digita/commands.c.gcc4	2005-03-21 12:26:46.000000000 +0000
+++ gphoto2-2.1.99/libgphoto2-2.2.1/camlibs/digita/commands.c	2005-06-23 11:51:43.000000000 +0100
@@ -73,7 +73,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, (unsigned char *)&ss, sizeof(ss));
+	ret = (dev->read)(dev, (unsigned char *)&ss, sizeof(ss));
 	if (ret < 0) {
 		GP_DEBUG("digita_get_storage_status: error getting count (ret = %d)", ret);
 		return -1;
@@ -117,7 +117,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, (void *)buffer, buflen);
+	ret = (dev->read)(dev, (void *)buffer, buflen);
 	if (ret < 0) {
 		GP_DEBUG("digita_get_file_list: error receiving data (ret = %d)", ret);
 		return -1;
@@ -169,7 +169,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, gfdr, GFD_BUFSIZE + sizeof(*gfdr));
+	ret = (dev->read)(dev, gfdr, GFD_BUFSIZE + sizeof(*gfdr));
 	if (ret < 0) {
 		GP_DEBUG("digita_get_file_data: error reading data (ret = %d)", ret);
 		return -1;
@@ -205,7 +205,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, (unsigned char *)&response, sizeof(response));
+	ret = (dev->read)(dev, (unsigned char *)&response, sizeof(response));
 	if (ret < 0) {
 		GP_DEBUG("error reading reply (ret = %d)", ret);
 		return -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 May 2006 14:32:38 -0000	1.12
+++ .cvsignore	22 Jun 2006 13:26:36 -0000	1.13
@@ -8,3 +8,5 @@
 gphoto2-2.1.99.tar.bz2
 gphoto2-2.1.99-installed-doc.tar.bz2
 gphoto2-config
+libgphoto2-2.2.1.tar.bz2
+gphoto2-2.2.0.tar.bz2

gphoto2-2.1.99-config.patch:
 gphoto2-config.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gphoto2-2.1.99-config.patch
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2-2.1.99-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphoto2-2.1.99-config.patch	14 Mar 2006 11:06:41 -0000	1.1
+++ gphoto2-2.1.99-config.patch	22 Jun 2006 13:26:37 -0000	1.2
@@ -1,5 +1,5 @@
---- gphoto2-2.1.99/libgphoto2-2.1.99/gphoto2-config.in.orig	2006-03-14 11:59:01.000000000 +0100
-+++ gphoto2-2.1.99/libgphoto2-2.1.99/gphoto2-config.in	2006-03-14 11:59:41.000000000 +0100
+--- gphoto2-2.1.99/libgphoto2-2.2.1/gphoto2-config.in.orig	2006-03-14 11:59:01.000000000 +0100
++++ gphoto2-2.1.99/libgphoto2-2.2.1/gphoto2-config.in	2006-03-14 11:59:41.000000000 +0100
 @@ -59,7 +59,7 @@
         	;;
  


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gphoto2.spec	7 Jun 2006 18:24:30 -0000	1.66
+++ gphoto2.spec	22 Jun 2006 13:26:37 -0000	1.67
@@ -4,11 +4,11 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.1.99
+%define pkgver 2.2.0
 %define libpkg libgphoto2
-%define libver 2.1.99
+%define libver 2.2.1
 Version: %{pkgver}
-Release: 14
+Release: 1
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -18,13 +18,8 @@
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Source5: gphoto2-config
-Patch2: gphoto2-gcc4.patch
-Patch3: gphoto2-2.1.99-dbus.patch
-Patch4: gphoto2-2.1.99-canon_segv.patch
+Patch2: gphoto2-2.2.0-gcc4.patch
 Patch5: gphoto2-2.1.99-config.patch
-Patch6: gphoto2-2.1.99-library-null.patch
-Patch7: gphoto2-2.1.99-gtk_doc.patch
-Patch8: gphoto2-2.1.99-new-usbids.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -81,12 +76,7 @@
 %prep
 %setup -q -a 1 -a 2
 %patch2 -p1 -b .gcc4
-%patch3 -p1 -b .dbus
-%patch4 -p1 -b .segv
 %patch5 -p1 -b .config
-%patch6 -p1 -b .null
-%patch7 -p1
-%patch8 -p1 -b .camlibs
 
 ####################################
 %build
@@ -137,7 +127,8 @@
     install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
     export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
     export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver}
-    ./print-usb-usermap --fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+    $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+#    ./print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
     popd
 popd
 
@@ -162,8 +153,18 @@
 rm -rf %{buildroot}%{_libdir}/*.a
 rm -rf %{buildroot}%{_libdir}/*.la
 
-eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
-eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
+# gphoto2-2.1.99
+#eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
+#eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
+
+# ghoto2-2.2.0
+#LIBGPHOTO2_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_CURRENT\],' %{libpkg}-%{libver}/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
+#LIBGPHOTO2_PORT_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_PORT_CURRENT\],' %{libpkg}-%{libver}/libgphoto2_port/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
+
+# the above doesn't get correct numbers -> hardcode them
+LIBGPHOTO2_CURRENT=2
+LIBGPHOTO2_PORT_CURRENT=0
+
 %find_lang %{name}
 %find_lang %{libpkg}-$LIBGPHOTO2_CURRENT
 %find_lang %{libpkg}_port-$LIBGPHOTO2_PORT_CURRENT
@@ -235,6 +236,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Thu Jun 22 2006 Radek Vok??l <rvokal at redhat.com> 2.2.0-1
+- update to gphoto2-2.2.0 and libgphoto2-2.2.1
+
 * Wed Jun  7 2006 Radek Vok??l <rvokal at redhat.com> 2.1.99-14
 - fix policy file (#189936)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 May 2006 14:32:39 -0000	1.12
+++ sources	22 Jun 2006 13:26:37 -0000	1.13
@@ -1,4 +1,4 @@
-3c6d9cb65661915e07491a6f9215d5a9  libgphoto2-2.1.99.tar.bz2
-549a9dfae6910ab6456b194ea86b55a2  gphoto2-2.1.99.tar.bz2
 584e1fca2dd1e6cd210d59f7944c8ebd  gphoto2-2.1.99-installed-doc.tar.bz2
 5f0bdd099f8649abf58490ffc2b5df5b  gphoto2-config
+69827311733e39fafa9f77bb05e55b77  libgphoto2-2.2.1.tar.bz2
+f5c1f83185db598b4ca52889964a5e84  gphoto2-2.2.0.tar.bz2


--- gphoto2-2.1.99-canon_segv.patch DELETED ---


--- gphoto2-2.1.99-dbus.patch DELETED ---


--- gphoto2-2.1.99-gtk_doc.patch DELETED ---


--- gphoto2-2.1.99-library-null.patch DELETED ---


--- gphoto2-2.1.99-new-usbids.patch DELETED ---


--- gphoto2-gcc4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:53:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:53:01 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.24,1.25
Message-ID: <200606221353.k5MDr1A9029852@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29819

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
update to hdrinstall2

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    5 +
 include/asm-arm/Kbuild                |    1 
 include/asm-arm26/Kbuild              |    1 
 include/asm-cris/Kbuild               |    1 
 include/asm-frv/Kbuild                |    1 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    1 
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    1 
 include/asm-m68k/Kbuild               |    1 
 include/asm-m68knommu/Kbuild          |    1 
 include/asm-mips/Kbuild               |    1 
 include/asm-parisc/Kbuild             |    1 
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    1 
 include/asm-sh64/Kbuild               |    1 
 include/asm-sparc/Kbuild              |    6 +
 include/asm-sparc64/Kbuild            |   10 ++
 include/asm-um/Kbuild                 |    1 
 include/asm-v850/Kbuild               |    1 
 include/asm-x86_64/Kbuild             |   11 ++
 include/asm-xtensa/Kbuild             |    1 
 include/linux/Kbuild                  |   63 +++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    6 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  158 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 399 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linux-2.6-header-install-git.patch	12 Jun 2006 23:53:36 -0000	1.24
+++ linux-2.6-header-install-git.patch	22 Jun 2006 13:52:58 -0000	1.25
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index a940eae..504d4d1 100644
+index 3494c17..dbab1a9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -858,6 +858,21 @@ depend dep:
+@@ -856,6 +856,21 @@ depend dep:
  	@echo '*** Warning: make $@ is unnecessary now.'
  
  # ---------------------------------------------------------------------------
@@ -24,12 +24,12 @@
  # Modules
  
  ifdef CONFIG_MODULES
-@@ -1029,6 +1044,8 @@ help:
+@@ -1027,6 +1042,8 @@ help:
  	@echo  '  cscope	  - Generate cscope index'
  	@echo  '  kernelrelease	  - Output the release version string'
  	@echo  '  kernelversion	  - Output the version stored in Makefile'
 +	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'
-+	@echo  '                    (default: /usr/include)'
++	@echo  '                    (default: /lib/modules/$$VERSION/abi)'
  	@echo  ''
  	@echo  'Static analysers'
  	@echo  '  checkstack      - Generate a list of stack hogs'
@@ -43,67 +43,43 @@
 +header-y += asm-$(ARCH)/ 
 diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild
 new file mode 100644
-index 0000000..57ff88a
+index 0000000..e57fd57
 --- /dev/null
 +++ b/include/asm-alpha/Kbuild
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,5 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += 8253pit.h agp.h agp_backend.h compiler.h console.h core_apecs.h \
-+	core_cia.h core_irongate.h core_lca.h core_marvel.h core_mcpcia.h \
-+	core_polaris.h core_t2.h core_titan.h core_tsunami.h core_wildfire.h \
-+	err_common.h err_ev6.h err_ev7.h floppy.h fpu.h gct.h gentrap.h \
-+	hdreg.h hw_irq.h hwrpb.h init.h jensen.h md.h numnodes.h pal.h \
-+	parport.h pci.h reg.h regdef.h segment.h serial.h sfp-machine.h \
-+	spinlock.h suspend.h sysinfo.h ucontext.h vga.h
++unifdef-y += console.h fpu.h sysinfo.h
++
++header-y += gentrap.h regdef.h pal.h reg.h
 diff --git a/include/asm-arm/Kbuild b/include/asm-arm/Kbuild
 new file mode 100644
-index 0000000..fad30e6
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-arm/Kbuild
-@@ -0,0 +1,7 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += apm.h assembler.h cpu-multi32.h cpu-single.h domain.h ecard.h \
-+	fiq.h floppy.h fpstate.h hardware.h hdreg.h ipc.h leds.h limits.h \
-+	locks.h memory.h numnodes.h nwflash.h parport.h procinfo.h \
-+	segment.h semaphore-helper.h serial.h sizes.h spinlock.h suspend.h \
-+	therm.h traps.h ucontext.h vga.h
 diff --git a/include/asm-arm26/Kbuild b/include/asm-arm26/Kbuild
 new file mode 100644
-index 0000000..8590f0b
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-arm26/Kbuild
-@@ -0,0 +1,8 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += assembler.h calls.h constants.h ecard.h fiq.h floppy.h fpstate.h \
-+	hardware.h hdreg.h ian_char.h ioc.h ipc.h irqchip.h leds.h limits.h \
-+	linux_logo.h locks.h mach-types.h map.h memory.h oldlatches.h \
-+	parport.h proc-fns.h procinfo.h segment.h semaphore-helper.h \
-+	serial.h sizes.h spinlock.h suspend.h sysirq.h ucontext.h \
-+	uncompress.h
 diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
 new file mode 100644
-index 0000000..8480c8a
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-cris/Kbuild
-@@ -0,0 +1,6 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += axisflashmap.h eshlibld.h ethernet.h etraxgpio.h etraxi2c.h \
-+	fasttimer.h ipc.h rs485.h segment.h semaphore-helper.h ucontext.h
-+
-+header-y += arch-v10/
-diff --git a/include/asm-cris/arch-v10/Kbuild b/include/asm-cris/arch-v10/Kbuild
+diff --git a/include/asm-frv/Kbuild b/include/asm-frv/Kbuild
 new file mode 100644
-index 0000000..1837529
+index 0000000..c68e168
 --- /dev/null
-+++ b/include/asm-cris/arch-v10/Kbuild
-@@ -0,0 +1,3 @@
-+header-y += bitops.h cache.h checksum.h dma.h elf.h io.h irq.h mmu.h \
-+	offset.h processor.h ptrace.h sv_addr_ag.h svinto.h system.h \
-+	timex.h unistd.h user.h
++++ b/include/asm-frv/Kbuild
+@@ -0,0 +1 @@
++include include/asm-generic/Kbuild.asm
 diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
 new file mode 100644
 index 0000000..70594b2
@@ -132,16 +108,11 @@
 +unifdef-y += elf.h page.h
 diff --git a/include/asm-h8300/Kbuild b/include/asm-h8300/Kbuild
 new file mode 100644
-index 0000000..a45477a
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-h8300/Kbuild
-@@ -0,0 +1,6 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += cachectl.h dbg.h flat.h fpu.h gpio.h h8300_ne.h hdreg.h \
-+	hw_irq.h init.h ipc.h keyboard.h linux_logo.h md.h \
-+	page_offset.h segment.h semaphore-helper.h sh_bios.h shm.h \
-+	spinlock.h target_time.h traps.h ucontext.h
 diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
 new file mode 100644
 index 0000000..c064a8e
@@ -168,93 +139,39 @@
 +unifdef-y += perfmon.h
 diff --git a/include/asm-m32r/Kbuild b/include/asm-m32r/Kbuild
 new file mode 100644
-index 0000000..d3f0f99
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-m32r/Kbuild
-@@ -0,0 +1,7 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += addrspace.h assembler.h bugs.h cachectl.h current.h delay.h \
-+	div64.h flat.h hdreg.h hw_irq.h ipc.h kmap_types.h m32102.h \
-+	m32102peri.h m32r.h m32r_mp_fpga.h mc146818rtc.h mmzone.h \
-+	numnodes.h pgtable-2level.h rtc.h scatterlist.h segment.h serial.h \
-+	setup.h smp.h spinlock.h string.h syscall.h ucontext.h vga.h
 diff --git a/include/asm-m68k/Kbuild b/include/asm-m68k/Kbuild
 new file mode 100644
-index 0000000..48881b3
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-m68k/Kbuild
-@@ -0,0 +1,17 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += adb.h adb_iop.h adb_mouse.h amigahw.h amigaints.h amigayle.h \
-+	amipcmcia.h apollodma.h apollohw.h atafd.h atafdreg.h \
-+	atari_SCCserial.h atari_SLM.h atari_acsi.h atari_joystick.h \
-+	atari_stdma.h atari_stram.h atarihw.h atariints.h atarikb.h \
-+	blinken.h bvme6000hw.h cachectl.h contregs.h dsp56k.h dvma.h \
-+	entry.h fbio.h floppy.h fpu.h hdreg.h hw_irq.h hwtest.h \
-+	idprom.h init.h intersil.h ipc.h kbio.h mac_asc.h mac_baboon.h\
-+	mac_iop.h mac_mouse.h mac_oss.h mac_psc.h mac_via.h machdep.h \
-+	machines.h machw.h macintosh.h macints.h math-emu.h md.h \
-+	motorola_pgalloc.h movs.h mvme147hw.h mvme16xhw.h nubus.h \
-+	openprom.h oplib.h page_offset.h parport.h q40_master.h \
-+	q40ints.h sbus.h segment.h semaphore-helper.h serial.h shm.h \
-+	spinlock.h sun3-head.h sun3_pgalloc.h sun3ints.h sun3mmu.h \
-+	sun3x.h sun3xflop.h sun3xprom.h suspend.h swim_iop.h traps.h \
-+	ucontext.h vuid_event.h
 diff --git a/include/asm-m68knommu/Kbuild b/include/asm-m68knommu/Kbuild
 new file mode 100644
-index 0000000..d91668d
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-m68knommu/Kbuild
-@@ -0,0 +1,12 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h anchor.h \
-+	asm-offsets.h bootstd.h cachectl.h coldfire.h commproc.h dbg.h \
-+	elia.h entry.h flat.h fpu.h hdreg.h hwtest.h init.h io_hw_swap.h \
-+	ipc.h keyboard.h m5206sim.h m5249sim.h m5272sim.h m5282sim.h \
-+	m5307sim.h m5407sim.h m68360.h m68360_enet.h m68360_pram.h \
-+	m68360_quicc.h m68360_regs.h machdep.h math-emu.h mcfdma.h \
-+	mcfmbus.h mcfne.h mcfpci.h mcfpit.h mcfsim.h mcfsmc.h mcftimer.h \
-+	mcfuart.h mcfwdebug.h md.h movs.h nap.h nettel.h openprom.h \
-+	oplib.h page_offset.h quicc_simple.h segment.h semaphore-helper.h \
-+	semp3.h shglcore.h shglports.h shm.h spinlock.h traps.h ucontext.h
 diff --git a/include/asm-mips/Kbuild b/include/asm-mips/Kbuild
 new file mode 100644
-index 0000000..e19ec09
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-mips/Kbuild
-@@ -0,0 +1,15 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += 8253pit.h addrspace.h asm.h asmmacro-32.h asmmacro-64.h \
-+	asmmacro.h bcache.h branch.h break.h cachectl.h cacheops.h \
-+	compat.h compiler.h cpu.h cpu-info.h ddb5074.h debug.h \
-+	ds1286.h fixmap.h floppy.h fpregdef.h fpu_emulator.h \
-+	gdb-stub.h gfx.h gt64120.h hdreg.h hw_irq.h i8259.h init.h \
-+	inst.h interrupt.h inventory.h ipc.h irq_cpu.h \
-+	isadep.h it8712.h jazz.h jazzdma.h m48t35.h mipsprom.h \
-+	mipsregs.h msc01_ic.h ng1.h ng1hw.h nile4.h paccess.h parport.h \
-+	pci_channel.h pgtable-32.h pgtable-64.h pgtable-bits.h prctl.h \
-+	r4kcache.h reboot.h regdef.h riscos-syscall.h segment.h \
-+	serial.h sgialib.h sgiarcs.h sgidefs.h sim.h sni.h spinlock.h \
-+	stackframe.h suspend.h sysmips.h tlbdebug.h traps.h \
-+	tx3912.h ucontext.h vga.h war.h watch.h wbflush.h
 diff --git a/include/asm-parisc/Kbuild b/include/asm-parisc/Kbuild
 new file mode 100644
-index 0000000..b94e3f9
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-parisc/Kbuild
-@@ -0,0 +1,8 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += asmregs.h assembly.h bootdata.h compat.h eisa_bus.h \
-+	eisa_eeprom.h fixmap.h floppy.h grfioctl.h hardware.h hdreg.h \
-+	hw_irq.h iosapic.h led.h machdep.h parisc-device.h parport.h \
-+	parport_gsc.h pdc.h pdc_chassis.h pdcpat.h perf.h psw.h real.h \
-+	rt_sigframe.h segment.h semaphore-helper.h serial.h som.h \
-+	spinlock.h superio.h ucontext.h unwind.h
 diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
 new file mode 100644
 index 0000000..ac61d7e
@@ -271,20 +188,6 @@
 +	ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h	\
 +	poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h	\
 +	resource.h sigcontext.h statfs.h
-diff --git a/include/asm-ppc/Kbuild b/include/asm-ppc/Kbuild
-new file mode 100644
-index 0000000..58af928
---- /dev/null
-+++ b/include/asm-ppc/Kbuild
-@@ -0,0 +1,8 @@
-+include include/asm-generic/Kbuild.asm
-+
-+header-y += agp.h amigayle.h amipcmcia.h ans-lcd.h bootx.h bseip.h \
-+	commproc.h cputable.h floppy.h gg2.h gt64260.h gt64260_defs.h \
-+	harrier.h hdreg.h heathrow.h hw_irq.h i8259.h ipc.h keylargo.h \
-+	m48t35.h machdep.h macio.h mk48t59.h nvram.h ocp_ids.h of_device.h\
-+	ohare.h open_pic.h parport.h ppc_asm.h ppcboot.h reg.h \
-+	segment.h spinlock.h todc.h traps.h ucontext.h vga.h xparameters.h
 diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
 new file mode 100644
 index 0000000..ed8955f
@@ -297,105 +200,60 @@
 +header-y += dasd.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h
 diff --git a/include/asm-sh/Kbuild b/include/asm-sh/Kbuild
 new file mode 100644
-index 0000000..7e77613
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-sh/Kbuild
-@@ -0,0 +1,6 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += addrspace.h floppy.h freq.h hdreg.h hw_irq.h init.h ipc.h \
-+	irq-sh73180.h \
-+	keyboard.h numnodes.h pgtable-2level.h semaphore-helper.h \
-+	serial.h sh_bios.h spinlock.h ubc.h ucontext.h watchdog.h
 diff --git a/include/asm-sh64/Kbuild b/include/asm-sh64/Kbuild
 new file mode 100644
-index 0000000..642b9db
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-sh64/Kbuild
-@@ -0,0 +1,6 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += bugs.h cayman.h current.h delay.h hardware.h hdreg.h \
-+	hw_irq.h ipc.h kmap_types.h mc146818rtc.h platform.h registers.h \
-+	scatterlist.h segment.h semaphore-helper.h serial.h smp.h \
-+	spinlock.h string.h ucontext.h
 diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
 new file mode 100644
-index 0000000..cecdc61
+index 0000000..e2a57fd
 --- /dev/null
 +++ b/include/asm-sparc/Kbuild
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,6 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += apc.h asi.h asmmacro.h auxio.h bitext.h bpp.h \
-+	bsderrno.h btfixup.h clock.h contregs.h cpudata.h cypress.h \
-+	ebus.h ecc.h eeprom.h fbio.h floppy.h head.h hw_irq.h \
-+	idprom.h io-unit.h iommu.h ipc.h jsflash.h \
-+	kdebug.h machines.h mbus.h memreg.h mostek.h mpmbox.h msi.h \
-+	mxcc.h obio.h openprom.h openpromio.h oplib.h pbm.h pcic.h \
-+	pconf.h perfctr.h pgtsrmmu.h pgtsun4.h pgtsun4c.h psr.h reg.h \
-+	ross.h sbi.h sbus.h sfp-machine.h smpprim.h \
-+	solerrno.h spinlock.h sun4paddr.h sun4prom.h sunbpp.h svr4.h \
-+	swift.h sysen.h timer.h traps.h tsunami.h turbosparc.h \
-+	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
++unifdef-y += fbio.h perfctr.h psr.h
++header-y += apc.h asi.h auxio.h bpp.h head.h ipc.h jsflash.h	\
++	openpromio.h pbm.h pconf.h pgtsun4.h reg.h traps.h	\
++	turbosparc.h vfc_ioctls.h winmacro.h
 diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
 new file mode 100644
-index 0000000..5edf764
+index 0000000..c78d44b
 --- /dev/null
 +++ b/include/asm-sparc64/Kbuild
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,10 @@
 +include include/asm-generic/Kbuild.asm
 +
 +ALTARCH := sparc
-+ARCHDEF := defined __sparc__ && defined __arch64__ 
++ARCHDEF := defined __sparc__ && defined __arch64__
 +ALTARCHDEF := defined __sparc__ && !defined __arch64__
 +
-+header-y += agp.h apb.h asi.h auxio.h bbc.h bpp.h bsderrno.h \
-+	chafsr.h chmctrl.h compat.h const.h cpudata.h dcr.h dcu.h \
-+	display7seg.h ebus.h envctrl.h estate.h fbio.h fhc.h floppy.h \
-+	fpumacro.h head.h hw_irq.h idprom.h iommu.h \
-+	ipc.h isa.h kdebug.h lsu.h mostek.h ns87303.h \
-+	openprom.h openpromio.h oplib.h parport.h pbm.h pconf.h \
-+	perfctr.h pil.h psrcompat.h pstate.h reg.h sbus.h \
-+	sfp-machine.h solerrno.h spinlock.h spitfire.h starfire.h \
-+	sunbpp.h svr4.h timer.h ttable.h uctx.h upa.h utrap.h vga.h \
-+	visasm.h watchdog.h
++unifdef-y := fbio.h perfctr.h
++header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h	\
++	ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h	\
++	pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h
 diff --git a/include/asm-um/Kbuild b/include/asm-um/Kbuild
 new file mode 100644
-index 0000000..e8f61cb
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-um/Kbuild
-@@ -0,0 +1,14 @@
-+header-y += a.out.h arch-signal-i386.h archparam-i386.h archparam-ppc.h \
-+	atomic.h bitops.h boot.h bug.h byteorder.h cache.h cacheflush.h \
-+	checksum.h cobalt.h desc.h dma.h elf.h errno.h fcntl.h fixmap.h \
-+	floppy.h hardirq.h hdreg.h hw_irq.h init.h io.h ioctl.h ioctls.h \
-+	ipc.h ipcbuf.h irq.h irq_vectors.h keyboard.h linkage.h locks.h \
-+	mca_dma.h mman.h mmu.h mmu_context.h msgbuf.h mtrr.h namei.h \
-+	page.h page_offset.h param.h pgalloc.h poll.h posix_types.h \
-+	processor-generic.h processor-i386.h processor-ppc.h \
-+	ptrace-generic.h ptrace-i386.h rwlock.h segment.h semaphore.h \
-+	sembuf.h serial.h shmbuf.h shmparam.h sigcontext-generic.h \
-+	sigcontext-i386.h sigcontext-ppc.h siginfo.h socket.h sockios.h \
-+	spinlock.h stat.h suspend.h system-generic.h system-i386.h \
-+	system-ppc.h termbits.h termios.h timex.h tlbflush.h types.h \
-+	ucontext.h unaligned.h unistd.h user.h vga.h
+@@ -0,0 +1 @@
++include include/asm-generic/Kbuild.asm
 diff --git a/include/asm-v850/Kbuild b/include/asm-v850/Kbuild
 new file mode 100644
-index 0000000..fe2930b
+index 0000000..c68e168
 --- /dev/null
 +++ b/include/asm-v850/Kbuild
-@@ -0,0 +1,10 @@
+@@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-+
-+header-y += anna.h as85ep1.h asm.h clinkage.h entry.h flat.h fpga85e2c.h \
-+	gbus_int.h highres_timer.h hw_irq.h ipc.h ma.h ma1.h machdep.h \
-+	macrology.h me2.h rte_cb.h rte_ma1_cb.h rte_mb_a_pci.h \
-+	rte_me2_cb.h rte_nb85e_cb.h segment.h serial.h sim.h sim85e2.h \
-+	sim85e2c.h sim85e2s.h simsyscall.h teg.h ucontext.h \
-+	v850e.h v850e2.h v850e2_cache.h v850e_cache.h v850e_intc.h \
-+	v850e_timer_c.h v850e_timer_d.h v850e_uart.h v850e_uarta.h \
-+	v850e_uartb.h v850e_utils.h
 diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
 new file mode 100644
 index 0000000..dc4d101
@@ -413,9 +271,16 @@
 +	 vsyscall32.h
 +
 +unifdef-y += mce.h mtrr.h vsyscall.h
+diff --git a/include/asm-xtensa/Kbuild b/include/asm-xtensa/Kbuild
+new file mode 100644
+index 0000000..c68e168
+--- /dev/null
++++ b/include/asm-xtensa/Kbuild
+@@ -0,0 +1 @@
++include include/asm-generic/Kbuild.asm
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 new file mode 100644
-index 0000000..5c95aa4
+index 0000000..f7252be
 --- /dev/null
 +++ b/include/linux/Kbuild
 @@ -0,0 +1,63 @@
@@ -433,7 +298,7 @@
 +	dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h	\
 +	fadvise.h fd.h fdreg.h ftape-header-segment.h ftape-vendors.h	\
 +	fuse.h futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h	\
-+	hpfs_fs.h hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h		\
++	hpfs_fs.h hysdn_if.h i2c-dev.h i8k.h icmp.h			\
 +	if_arcnet.h if_arp.h if_bonding.h if_cablemodem.h if_fc.h	\
 +	if_fddi.h if.h if_hippi.h if_infiniband.h if_packet.h		\
 +	if_plip.h if_ppp.h if_slip.h if_strip.h if_tunnel.h in6.h	\
@@ -459,7 +324,7 @@
 +	ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h		\
 +	filter.h flat.h fs.h ftape.h gameport.h generic_serial.h	\
 +	genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h	\
-+	i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h	\
++	i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h			\
 +	if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h		\
 +	if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h	\
 +	inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h		\



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:53:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:53:25 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-dlm.patch,1.3,1.4
Message-ID: <200606221353.k5MDrPJI030032@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29934

Modified Files:
	linux-2.6-gfs2-dlm.patch 
Log Message:
update from Steve

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   29 
 fs/dlm/Makefile                    |   21 
 fs/dlm/ast.c                       |  167 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 ++++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  296 +++
 fs/dlm/device.c                    | 1239 ++++++++++++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  494 +++++
 fs/dlm/lock.c                      | 3547 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   50 
 fs/dlm/lockspace.c                 |  678 +++++++
 fs/dlm/lockspace.h                 |   24 
 fs/dlm/lowcomms.c                  | 1238 ++++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   89 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  106 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  762 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1103 +++++++++++
 fs/gfs2/bmap.h                     |   32 
 fs/gfs2/daemon.c                   |  196 ++
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1980 ++++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++++
 fs/gfs2/eattr.h                    |   97 +
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2280 +++++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  491 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1358 ++++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 +++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  299 +++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 ++++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 ++++++++
 fs/gfs2/lops.h                     |   96 +
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  888 +++++++++
 fs/gfs2/meta_io.h                  |   89 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  304 +++
 fs/gfs2/ops_address.c              |  669 ++++++
 fs/gfs2/ops_address.h              |   17 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  285 ++
 fs/gfs2/ops_export.h               |   15 
 fs/gfs2/ops_file.c                 | 1000 ++++++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  842 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1167 ++++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  195 ++
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/page.c                     |  268 ++
 fs/gfs2/page.h                     |   23 
 fs/gfs2/quota.c                    | 1301 +++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1529 +++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  928 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 ++++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/dlm.h                |  302 +++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  441 ++++
 include/linux/iflags.h             |  102 +
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   40 
 kernel/printk.c                    |    1 
 mm/filemap.c                       |    1 
 mm/readahead.c                     |    1 
 132 files changed, 40810 insertions(+), 4 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 linux-2.6-gfs2-dlm.patch
Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-gfs2-dlm.patch	9 Jun 2006 17:12:12 -0000	1.3
+++ linux-2.6-gfs2-dlm.patch	22 Jun 2006 13:53:23 -0000	1.4
@@ -67,7 +67,7 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index c3c5842..e593ace 100644
+index 1421f74..50817bf 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -840,6 +840,16 @@ M:	jack at suse.cz
@@ -1563,10 +1563,10 @@
 +
 diff --git a/fs/dlm/device.c b/fs/dlm/device.c
 new file mode 100644
-index 0000000..47798fe
+index 0000000..825bbc0
 --- /dev/null
 +++ b/fs/dlm/device.c
-@@ -0,0 +1,1237 @@
+@@ -0,0 +1,1239 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -1614,10 +1614,6 @@
 +static struct list_head user_ls_list;
 +static struct mutex user_ls_lock;
 +
-+/* Lock infos are stored in here indexed by lock ID */
-+static DEFINE_IDR(lockinfo_idr);
-+static rwlock_t lockinfo_lock;
-+
 +/* Flags in li_flags */
 +#define LI_FLAG_COMPLETE   1
 +#define LI_FLAG_FIRSTLOCK  2
@@ -1668,6 +1664,10 @@
 +	atomic_t ls_refcnt;
 +	long     ls_flags;
 +
++	/* Lock infos are stored in here indexed by lock ID */
++	struct idr lockinfo_idr;
++	rwlock_t lockinfo_lock;
++
 +	/* Passed into misc_register() */
 +	struct miscdevice ls_miscinfo;
 +	struct list_head  ls_list;
@@ -1809,13 +1809,13 @@
 +		kfree(f);
 +}
 +
-+static void release_lockinfo(struct lock_info *li)
++static void release_lockinfo(struct user_ls *ls, struct lock_info *li)
 +{
 +	put_file_info(li->li_file);
 +
-+	write_lock(&lockinfo_lock);
-+	idr_remove(&lockinfo_idr, li->li_lksb.sb_lkid);
-+	write_unlock(&lockinfo_lock);
++	write_lock(&ls->lockinfo_lock);
++	idr_remove(&ls->lockinfo_idr, li->li_lksb.sb_lkid);
++	write_unlock(&ls->lockinfo_lock);
 +
 +	if (li->li_lksb.sb_lvbptr)
 +		kfree(li->li_lksb.sb_lvbptr);
@@ -1824,46 +1824,46 @@
 +	module_put(THIS_MODULE);
 +}
 +
-+static struct lock_info *get_lockinfo(uint32_t lockid)
++static struct lock_info *get_lockinfo(struct user_ls *ls, uint32_t lockid)
 +{
 +	struct lock_info *li;
 +
-+	read_lock(&lockinfo_lock);
-+	li = idr_find(&lockinfo_idr, lockid);
-+	read_unlock(&lockinfo_lock);
++	read_lock(&ls->lockinfo_lock);
++	li = idr_find(&ls->lockinfo_idr, lockid);
++	read_unlock(&ls->lockinfo_lock);
 +
 +	return li;
 +}
 +
-+static int add_lockinfo(struct lock_info *li)
++static int add_lockinfo(struct user_ls *ls, struct lock_info *li)
 +{
 +	int n;
 +	int r;
 +	int ret = -EINVAL;
 +
-+	write_lock(&lockinfo_lock);
++	write_lock(&ls->lockinfo_lock);
 +
-+	if (idr_find(&lockinfo_idr, li->li_lksb.sb_lkid))
++	if (idr_find(&ls->lockinfo_idr, li->li_lksb.sb_lkid))
 +		goto out_up;
 +
 +	ret = -ENOMEM;
-+	r = idr_pre_get(&lockinfo_idr, GFP_KERNEL);
++	r = idr_pre_get(&ls->lockinfo_idr, GFP_KERNEL);
 +	if (!r)
 +		goto out_up;
 +
-+	r = idr_get_new_above(&lockinfo_idr, li, li->li_lksb.sb_lkid, &n);
++	r = idr_get_new_above(&ls->lockinfo_idr, li, li->li_lksb.sb_lkid, &n);
 +	if (r)
 +		goto out_up;
 +
 +	if (n != li->li_lksb.sb_lkid) {
-+		idr_remove(&lockinfo_idr, n);
++		idr_remove(&ls->lockinfo_idr, n);
 +		goto out_up;
 +	}
 +
 +	ret = 0;
 +
 + out_up:
-+	write_unlock(&lockinfo_lock);
++	write_unlock(&ls->lockinfo_lock);
 +
 +	return ret;
 +}
@@ -1927,6 +1927,9 @@
 +		return status;
 +	}
 +
++	idr_init(&newls->lockinfo_idr);
++	rwlock_init(&newls->lockinfo_lock);
++
 +	snprintf((char*)newls->ls_miscinfo.name, namelen, "%s_%s",
 +		 name_prefix, name);
 +
@@ -2055,13 +2058,13 @@
 +			list_del(&li->li_ownerqueue);
 +			clear_bit(LI_FLAG_ONLIST, &li->li_flags);
 +			spin_unlock(&li->li_file->fi_li_lock);
-+			release_lockinfo(li);
++			release_lockinfo(li->li_file->fi_ls, li);
 +			return;
 +		}
 +		/* Free unlocks & queries */
 +		if (li->li_lksb.sb_status == -DLM_EUNLOCK ||
 +		    li->li_cmd == DLM_USER_QUERY) {
-+			release_lockinfo(li);
++			release_lockinfo(li->li_file->fi_ls, li);
 +		}
 +	} else {
 +		/* Synchronous request, just wake up the caller */
@@ -2210,7 +2213,7 @@
 +				       old_li->li_lksb.sb_lkid, status);
 +
 +			/* But tidy our references in it */
-+			release_lockinfo(old_li);
++			release_lockinfo(old_li->li_file->fi_ls, old_li);
 +			continue;
 +		}
 +
@@ -2231,7 +2234,7 @@
 +
 +		/* Unlock suceeded, free the lock_info struct. */
 +		if (status == 0)
-+			release_lockinfo(old_li);
++			release_lockinfo(old_li->li_file->fi_ls, old_li);
 +	}
 +
 +	remove_wait_queue(&li.li_waitq, &wq);
@@ -2489,7 +2492,7 @@
 +	   unless we are adopting an orphaned persistent lock */
 +	if (kparams->flags & DLM_LKF_CONVERT) {
 +
-+		li = get_lockinfo(kparams->lkid);
++		li = get_lockinfo(fi->fi_ls, kparams->lkid);
 +
 +		/* If this is a persistent lock we will have to create a
 +		   lockinfo again */
@@ -2507,7 +2510,7 @@
 +			   fail we want rid of it */
 +			init_completion(&li->li_firstcomp);
 +			set_bit(LI_FLAG_FIRSTLOCK, &li->li_flags);
-+			add_lockinfo(li);
++			add_lockinfo(fi->fi_ls, li);
 +
 +			/* TODO: do a query to get the current state ?? */
 +		}
@@ -2583,7 +2586,7 @@
 +		list_add(&li->li_ownerqueue, &fi->fi_li_list);
 +		set_bit(LI_FLAG_ONLIST, &li->li_flags);
 +		spin_unlock(&fi->fi_li_lock);
-+		if (add_lockinfo(li))
++		if (add_lockinfo(fi->fi_ls, li))
 +			printk(KERN_WARNING "Add lockinfo failed\n");
 +
 +		complete(&li->li_firstcomp);
@@ -2594,7 +2597,7 @@
[...6129 lines suppressed...]
-+ * @sdp: the filesystem
-+ *
-+ */
-+
-+void gfs2_unlinked_cleanup(struct gfs2_sbd *sdp)
-+{
-+	struct list_head *head = &sdp->sd_unlinked_list;
-+	struct gfs2_unlinked *ul;
-+	unsigned int x;
-+
-+	spin_lock(&sdp->sd_unlinked_spin);
-+	while (!list_empty(head)) {
-+		ul = list_entry(head->next, struct gfs2_unlinked, ul_list);
-+
-+		if (ul->ul_count > 1) {
-+			list_move_tail(&ul->ul_list, head);
-+			spin_unlock(&sdp->sd_unlinked_spin);
-+			schedule();
-+			spin_lock(&sdp->sd_unlinked_spin);
-+			continue;
-+		}
-+
-+		list_del_init(&ul->ul_list);
-+		atomic_dec(&sdp->sd_unlinked_count);
-+
-+		gfs2_assert_warn(sdp, ul->ul_count == 1);
-+		gfs2_assert_warn(sdp, !test_bit(ULF_LOCKED, &ul->ul_flags));
-+		kfree(ul);
-+	}
-+	spin_unlock(&sdp->sd_unlinked_spin);
-+
-+	gfs2_assert_warn(sdp, !atomic_read(&sdp->sd_unlinked_count));
-+
-+	if (sdp->sd_unlinked_bitmap) {
-+		for (x = 0; x < sdp->sd_unlinked_chunks; x++)
-+			kfree(sdp->sd_unlinked_bitmap[x]);
-+		kfree(sdp->sd_unlinked_bitmap);
-+	}
-+}
-+
-diff --git a/fs/gfs2/unlinked.h b/fs/gfs2/unlinked.h
-new file mode 100644
-index 0000000..159cf5f
---- /dev/null
-+++ b/fs/gfs2/unlinked.h
-@@ -0,0 +1,25 @@
-+/*
-+ * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
-+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
-+ *
-+ * This copyrighted material is made available to anyone wishing to use,
-+ * modify, copy, or redistribute it subject to the terms and conditions
-+ * of the GNU General Public License v.2.
-+ */
-+
-+#ifndef __UNLINKED_DOT_H__
-+#define __UNLINKED_DOT_H__
-+
-+int gfs2_unlinked_get(struct gfs2_sbd *sdp, struct gfs2_unlinked **ul);
-+void gfs2_unlinked_put(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul);
-+
-+int gfs2_unlinked_ondisk_add(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul);
-+int gfs2_unlinked_ondisk_munge(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul);
-+int gfs2_unlinked_ondisk_rm(struct gfs2_sbd *sdp, struct gfs2_unlinked *ul);
-+
-+int gfs2_unlinked_dealloc(struct gfs2_sbd *sdp);
-+
-+int gfs2_unlinked_init(struct gfs2_sbd *sdp);
-+void gfs2_unlinked_cleanup(struct gfs2_sbd *sdp);
-+
-+#endif /* __UNLINKED_DOT_H__ */
 diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
 new file mode 100644
-index 0000000..88974e9
+index 0000000..39e67b1
 --- /dev/null
 +++ b/fs/gfs2/util.c
 @@ -0,0 +1,245 @@
@@ -41461,7 +40299,7 @@
 +int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide,
 +			 const char *function, char *file, unsigned int line)
 +{
-+	struct gfs2_sbd *sdp = ip->i_sbd;
++	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
 +	int rv;
 +	rv = gfs2_lm_withdraw(sdp,
 +		"GFS2: fsid=%s: fatal: filesystem consistency error\n"
@@ -42186,18 +41024,18 @@
  
 diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
 new file mode 100644
-index 0000000..3893aac
+index 0000000..1181da8
 --- /dev/null
 +++ b/include/linux/gfs2_ondisk.h
-@@ -0,0 +1,459 @@
+@@ -0,0 +1,441 @@
 +/*
-+* Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
-+* Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
-+*
-+* This copyrighted material is made available to anyone wishing to use,
-+* modify, copy, or redistribute it subject to the terms and conditions
-+* of the GNU General Public License v.2.
-+*/
++ * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
++ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
++ *
++ * This copyrighted material is made available to anyone wishing to use,
++ * modify, copy, or redistribute it subject to the terms and conditions
++ * of the GNU General Public License v.2.
++ */
 +
 +#ifndef __GFS2_ONDISK_DOT_H__
 +#define __GFS2_ONDISK_DOT_H__
@@ -42228,7 +41066,6 @@
 +#define GFS2_FORMAT_LB		1000
 +#define GFS2_FORMAT_EA		1600
 +#define GFS2_FORMAT_ED		1700
-+#define GFS2_FORMAT_UT		1300
 +#define GFS2_FORMAT_QC		1400
 +/* These are format numbers for entities contained in files */
 +#define GFS2_FORMAT_RI		1100
@@ -42272,7 +41109,6 @@
 +#define GFS2_METATYPE_LB	12
 +#define GFS2_METATYPE_EA	10
 +#define GFS2_METATYPE_ED	11
-+#define GFS2_METATYPE_UT	13
 +#define GFS2_METATYPE_QC	14
 +
 +struct gfs2_meta_header {
@@ -42350,7 +41186,7 @@
 +
 +#define GFS2_BLKST_FREE		0
 +#define GFS2_BLKST_USED		1
-+#define GFS2_BLKST_INVALID	2
++#define GFS2_BLKST_UNLINKED	2
 +#define GFS2_BLKST_DINODE	3
 +
 +#define GFS2_RGF_JOURNAL	0x00000001
@@ -42589,20 +41425,6 @@
 +};
 +
 +/*
-+ * Unlinked Tag
-+ * Describes an allocated inode that isn't linked into
-+ * the directory tree and might need to be deallocated.
-+ */
-+
-+#define GFS2_UTF_UNINIT		0x00000001
-+
-+struct gfs2_unlinked_tag {
-+	struct gfs2_inum ut_inum;
-+	__be32 ut_flags;	/* GFS2_UTF_... */
-+	__u32 __pad;
-+};
-+
-+/*
 + * Quota change
 + * Describes an allocation change for a particular
 + * user or group.
@@ -42637,8 +41459,6 @@
 +extern void gfs2_inum_range_out(struct gfs2_inum_range *ir, char *buf);
 +extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf);
 +extern void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf);
-+extern void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf);
-+extern void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf);
 +extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf);
 +
 +/* Printing functions */
@@ -42816,10 +41636,10 @@
 +#endif
 +
 diff --git a/kernel/printk.c b/kernel/printk.c
-index c056f33..a33f342 100644
+index 19a9556..416b8f3 100644
 --- a/kernel/printk.c
 +++ b/kernel/printk.c
-@@ -997,6 +997,7 @@ void tty_write_message(struct tty_struct
+@@ -1023,6 +1023,7 @@ void tty_write_message(struct tty_struct
  		tty->driver->write(tty, msg, strlen(msg));
  	return;
  }
@@ -42828,14 +41648,14 @@
  /*
   * printk rate limiting, lifted from the networking subsystem.
 diff --git a/mm/filemap.c b/mm/filemap.c
-index fd57442..82c4488 100644
+index fd57442..a02a0b2 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
 @@ -1044,6 +1044,7 @@ success:
  	desc->arg.buf += size;
  	return size;
  }
-+EXPORT_SYMBOL(file_read_actor);
++EXPORT_SYMBOL_GPL(file_read_actor);
  
  /*
   * This is the "read()" routine for all filesystems



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:53:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:53:50 -0400
Subject: rpms/gawk/devel gawk-3.1.5-internal.patch, NONE, 1.1 gawk.spec, 1.35,
	1.36
Message-ID: <200606221353.k5MDroNF030216@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30175

Modified Files:
	gawk.spec 
Added Files:
	gawk-3.1.5-internal.patch 
Log Message:
fix work with /dev/fd/X

gawk-3.1.5-internal.patch:
 io.c |   74 ++++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 38 insertions(+), 36 deletions(-)

--- NEW FILE gawk-3.1.5-internal.patch ---
--- gawk-3.1.5/io.c.internal	2006-06-21 19:46:59.000000000 +0200
+++ gawk-3.1.5/io.c	2006-06-21 19:49:54.000000000 +0200
@@ -110,6 +110,7 @@
 #define at_eof(iop)     ((iop->flag & IOP_AT_EOF) != 0)
 #define has_no_data(iop)        (iop->dataend == NULL)
 #define no_data_left(iop)	(iop->off >= iop->dataend)
+#define is_internal(iop) ((iop->flag & IOP_IS_INTERNAL) != 0)
 /* The key point to the design is to split out the code that searches through */
 /* a buffer looking for the record and the terminator into separate routines, */
 /* with a higher-level routine doing the reading of data and buffer management. */
@@ -163,10 +164,10 @@
 static int gawk_pclose P((struct redirect *rp));
 static int do_pathopen P((const char *file));
 static int str2mode P((const char *mode));
-static void spec_setup P((IOBUF *iop, int len, int allocate));
-static int specfdopen P((IOBUF *iop, const char *name, const char *mode));
-static int pidopen P((IOBUF *iop, const char *name, const char *mode));
-static int useropen P((IOBUF *iop, const char *name, const char *mode));
+static void spec_setup P((IOBUF *iop, int len));
+static IOBUF *specfdopen P((IOBUF *iop, const char *name, const char *mode));
+static IOBUF *pidopen P((IOBUF *iop, const char *name, const char *mode));
+static IOBUF *useropen P((IOBUF *iop, const char *name, const char *mode));
 static int two_way_open P((const char *str, struct redirect *rp));
 static int pty_vs_pipe P((const char *command));
 
@@ -1422,30 +1423,24 @@
 /* spec_setup --- setup an IOBUF for a special internal file */
 
 static void
-spec_setup(IOBUF *iop, int len, int allocate)
+spec_setup(IOBUF *iop, int len)
 {
 	char *cp;
 
-	if (allocate) {
-		emalloc(cp, char *, len+2, "spec_setup");
-		iop->buf = cp;
-	} else {
-		len = strlen(iop->buf);
-		iop->buf[len++] = '\n';	/* get_a_record clobbered it */
-		iop->buf[len] = '\0';	/* just in case */
-	}
+	emalloc(cp, char *, len+2, "spec_setup");
+	iop->buf = cp;
 	iop->off = iop->buf;
 	iop->count = 0;
 	iop->size = len;
 	iop->end = iop->buf + len;
 	iop->dataend = iop->end;
 	iop->fd = -1;
-	iop->flag = IOP_IS_INTERNAL | IOP_AT_START;
+	iop->flag = IOP_IS_INTERNAL | IOP_AT_START | IOP_NO_FREE;
 }
 
 /* specfdopen --- open an fd special file */
 
-static int
+static IOBUF *
 specfdopen(IOBUF *iop, const char *name, const char *mode)
 {
 	int fd;
@@ -1453,23 +1448,20 @@
 
 	fd = devopen(name, mode);
 	if (fd == INVALID_HANDLE)
-		return INVALID_HANDLE;
-	tp = iop_alloc(fd, name, NULL);
+		return NULL;
+	tp = iop_alloc(fd, name, iop);
 	if (tp == NULL) {
 		/* don't leak fd's */
 		close(fd);
-		return INVALID_HANDLE;
+		return NULL;
 	}
-	*iop = *tp;
-	iop->flag |= IOP_NO_FREE;
-	free(tp);
-	return 0;
+	return tp;
 }
 
 
 /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */
 
-static int
+static IOBUF *
 pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED)
 {
 	char tbuf[BUFSIZ];
@@ -1478,6 +1470,12 @@
 
 	warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name);
 
+	if (iop == NULL) {
+		iop = iop_alloc(INVALID_HANDLE, name, iop);
+		if (iop == NULL)
+			return NULL;
+	}
+
 	if (name[6] == 'g')
 #ifdef GETPGRP_VOID
 		sprintf(tbuf, "%d\n", (int) getpgrp());
@@ -1489,9 +1487,9 @@
 	else
 		sprintf(tbuf, "%d\n", (int) getppid());
 	i = strlen(tbuf);
-	spec_setup(iop, i, TRUE);
+	spec_setup(iop, i);
 	strcpy(iop->buf, tbuf);
-	return 0;
+	return iop;
 }
 
 /* useropen --- "open" /dev/user */
@@ -1506,7 +1504,7 @@
  * supplementary group set.
  */
 
-static int
+static IOBUF *
 useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBUTE_UNUSED)
 {
 	char tbuf[BUFSIZ], *cp;
@@ -1514,6 +1512,12 @@
 
 	warning(_("use `PROCINFO[...]' instead of `/dev/user'"));
 
+	if (iop == NULL) {
+		iop = iop_alloc(INVALID_HANDLE, name, iop);
+		if (iop == NULL)
+			return NULL;
+	}
+
 	sprintf(tbuf, "%d %d %d %d", (int) getuid(), (int) geteuid(), (int) getgid(), (int) getegid());
 
 	cp = tbuf + strlen(tbuf);
@@ -1528,9 +1532,9 @@
 	*cp++ = '\0';
 
 	i = strlen(tbuf);
-	spec_setup(iop, i, TRUE);
+	spec_setup(iop, i);
 	strcpy(iop->buf, tbuf);
-	return 0;
+	return iop;
 }
 
 /* iop_open --- handle special and regular files for input */
@@ -1543,8 +1547,7 @@
 	static struct internal {
 		const char *name;
 		int compare;
-		int (*fp) P((IOBUF *, const char *, const char *));
-		IOBUF iob;
+		IOBUF *(*fp) P((IOBUF *, const char *, const char *));
 	} table[] = {
 		{ "/dev/fd/",		8,	specfdopen },
 		{ "/dev/stdin",		10,	specfdopen },
@@ -1569,12 +1572,7 @@
 
 		for (i = 0; i < devcount; i++) {
 			if (STREQN(name, table[i].name, table[i].compare)) {
-				iop = & table[i].iob;
-
-				if (iop->buf != NULL) {
-					spec_setup(iop, 0, FALSE);
-					return iop;
-				} else if ((*table[i].fp)(iop, name, mode) == 0)
+				if ((iop = (*table[i].fp)(iop, name, mode)) != NULL)
 					return iop;
 				else {
 					warning(_("could not open `%s', mode `%s'"),
@@ -2909,6 +2907,10 @@
 
         /* <fill initial buffer>=                                                   */
         if (has_no_data(iop) || no_data_left(iop)) {
+		if (is_internal(iop)) {
+			iop->flag |= IOP_AT_EOF;
+			return EOF;
+		}
                 iop->count = read(iop->fd, iop->buf, iop->readsize);
                 if (iop->count == 0) {
                         iop->flag |= IOP_AT_EOF;


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gawk.spec	14 Feb 2006 08:47:27 -0000	1.35
+++ gawk.spec	22 Jun 2006 13:53:48 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 6.2
+Release: 7
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 Patch4:	gawk-3.1.5-binmode.patch
 Patch5: gawk-3.1.5-num2str.patch
 Patch6: gawk-3.1.5-wconcat.patch
+Patch7: gawk-3.1.5-internal.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -33,6 +34,7 @@
 %patch4 -p1 -b .binmode
 %patch5 -p1 -b .num2str
 %patch6 -p1 -b .wconcat
+%patch7 -p1 -b .internal
 
 %build
 %configure
@@ -81,6 +83,9 @@
 %{_datadir}/awk
 
 %changelog
+* Wed Jun 21 2006 Karel Zak <kzak at redhat.com> 3.1.5-7
+- fix internal names like /dev/user, /dev/pid, or /dev/fd/N (patch by Aharon Robbins)
+
 * Tue Feb 14 2006 Karel Zak <kzak at redhat.com> 3.1.5-6.2
 - new version of the gawk-3.1.5-wconcat.patch patch
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:54:48 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2298,1.2299
Message-ID: <200606221354.k5MDsmYS027402@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23251

Modified Files:
	kernel-2.6.spec 
Log Message:
update gfs2 and headers_install


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2298
retrieving revision 1.2299
diff -u -r1.2298 -r1.2299
--- kernel-2.6.spec	22 Jun 2006 04:02:43 -0000	1.2298
+++ kernel-2.6.spec	22 Jun 2006 13:54:45 -0000	1.2299
@@ -254,10 +254,9 @@
 #
 # Clean up and export kernel headers to userspace
 #
-# git://git.infradead.org/hdrinstall-2.6.git
+# git://git.infradead.org/hdrinstall2-2.6.git
 Patch50: linux-2.6-header-install-git.patch
-# git://git.infradead.org/hdrcleanup-2.6.git
-Patch51: linux-2.6-header-cleanup-git.patch
+Patch51: linux-2.6-fix-tcp-h.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -736,6 +735,11 @@
 # Patches 10 through 100 are meant for core subsystem upgrades
 #
 
+# Implement 'make headers_install'
+%patch50 -p1
+# Fix I/OAT breakage in tcp.h
+%patch51 -p1
+
 #
 # Patches to back out
 #
@@ -937,6 +941,7 @@
 
 # GFS2/DLM
 %patch1500 -p1
+%patch1501 -p1
 %patch1502 -p1
 
 #
@@ -1054,13 +1059,6 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
-# Put these last for now, so they don't conflict with other people's patches
-%if %{buildheaders}
-%patch50 -p1
-%patch51 -p1
-%patch1501 -p1
-%endif
-
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1672,6 +1670,10 @@
 %endif
 
 %changelog
+* Wed Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update GFS2 patch
+- Apply 'make headers_install' unconditionally now Linus has the cleanups
+
 * Wed Jun 21 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git3
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 13:58:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 09:58:02 -0400
Subject: rpms/glibc-kernheaders/devel .cvsignore, 1.11,
	1.12 glibc-kernheaders.spec, 1.151, 1.152 sources, 1.52, 1.53
Message-ID: <200606221358.k5MDw2so008715@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8701

Modified Files:
	.cvsignore glibc-kernheaders.spec sources 
Log Message:
2.6.17-1.2299_FC6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Jun 2006 07:57:20 -0000	1.11
+++ .cvsignore	22 Jun 2006 13:58:00 -0000	1.12
@@ -1 +1 @@
-glibc-kernheaders-2.6.17-1.2294_FC6.tar.bz2
+glibc-kernheaders-2.6.17-1.2299_FC6.tar.bz2


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- glibc-kernheaders.spec	20 Jun 2006 07:59:59 -0000	1.151
+++ glibc-kernheaders.spec	22 Jun 2006 13:58:00 -0000	1.152
@@ -1,9 +1,9 @@
-%define KVER 2.6.17-1.2294_FC6
+%define KVER 2.6.17-1.2299_FC6
 
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 44
+Release: 45
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -108,6 +108,9 @@
 /usr/include/*
 
 %changelog
+* Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-45
+- 2.6.17-1.2299_FC6 (-git3, drop i2c-id.h and i2c-algo-ite.h)
+
 * Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-44
 - Argh. Fscking brew.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	20 Jun 2006 07:57:20 -0000	1.52
+++ sources	22 Jun 2006 13:58:00 -0000	1.53
@@ -1 +1 @@
-6cea59704738bab3c11495ac1df7c19f  glibc-kernheaders-2.6.17-1.2294_FC6.tar.bz2
+62be726c5b89e6babda669899d4e5dff  glibc-kernheaders-2.6.17-1.2299_FC6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 15:04:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 11:04:16 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.165,1.165.26.1
Message-ID: <200606221504.k5MF4GRH024813@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24546/configs

Modified Files:
      Tag: private-linville-netdev-fc5-5-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.165
retrieving revision 1.165.26.1
diff -u -r1.165 -r1.165.26.1
--- config-generic	4 May 2006 00:47:13 -0000	1.165
+++ config-generic	22 Jun 2006 15:04:12 -0000	1.165.26.1
@@ -621,6 +621,8 @@
 
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -642,16 +644,21 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -671,7 +678,7 @@
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
@@ -713,6 +720,8 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
@@ -726,7 +735,7 @@
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
@@ -789,6 +798,7 @@
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -843,6 +853,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NETDEVICES=y
 
 #
@@ -905,6 +916,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -1023,6 +1035,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1051,6 +1064,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1060,8 +1074,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1138,6 +1158,7 @@
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1154,6 +1175,7 @@
 CONFIG_ALI_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
 
 #
 # Bluetooth support
@@ -1367,7 +1389,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=m 
 CONFIG_INPUT_WISTRON_BTNS=m
 
 #



From fedora-cvs-commits at redhat.com  Thu Jun 22 15:14:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 11:14:56 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.112,
	1.113 openoffice.org.spec, 1.739, 1.740 sources, 1.183, 1.184
Message-ID: <200606221514.k5MFEtZI027152@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27120

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- .cvsignore	31 May 2006 22:26:44 -0000	1.112
+++ .cvsignore	22 Jun 2006 15:14:53 -0000	1.113
@@ -176,3 +176,4 @@
 OOC680_m3.tar.bz2
 OOC680_m4.tar.bz2
 OOC680_m5.tar.bz2
+OOC680_m6.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.739
retrieving revision 1.740
diff -u -r1.739 -r1.740
--- openoffice.org.spec	11 Jun 2006 18:40:28 -0000	1.739
+++ openoffice.org.spec	22 Jun 2006 15:14:53 -0000	1.740
@@ -1,6 +1,6 @@
 %define oootag OOC680
-%define ooomilestone 5
-%define rh_rpm_release 4
+%define ooomilestone 6
+%define rh_rpm_release 1
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -3310,9 +3310,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Sun Jun 11 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.4
-- There's something real strange going on with the linguistic component
-now being a valid uno component. 
+* Thu Jun 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-6.1
+- next milestone
 
 * Wed Jun 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.3
 - rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- sources	7 Jun 2006 10:10:17 -0000	1.183
+++ sources	22 Jun 2006 15:14:53 -0000	1.184
@@ -8,6 +8,6 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
-cb44d229dd69c5048dd45528c62a1e44  OOC680_m5.tar.bz2
 ad337f9c78224e0d7ad2a17f53fd584c  openoffice.org-simple-crash_report.sh
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
+35fa066628502dac73e7e82cd1db4a0b  OOC680_m6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 15:45:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 11:45:56 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.8,
	1.9 openoffice.org.spec, 1.740, 1.741
Message-ID: <200606221545.k5MFjuPA021445@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20442

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
no need for hack now

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                      |    0 
 inc/print.hxx                       |    0 
 inc/psprint/ppdparser.hxx           |    0 
 psprint/inc/psprint/ppdparser.hxx   |    2 
 source/dialogs/makefile.mk          |    0 
 source/dialogs/printdlg.cxx         |    0 
 source/gdi/jobset.cxx               |    0 
 svtools/source/dialogs/makefile.mk  |    4 
 svtools/source/dialogs/printdlg.cxx |  241 ++++++++++++++++++++++++++++++++++--
 svtools/util/makefile.mk            |    8 +
 util/makefile.mk                    |    0 
 vcl/inc/jobset.hxx                  |    1 
 vcl/inc/print.hxx                   |    1 
 vcl/source/gdi/jobset.cxx           |  173 +++++++++++++++++++++++++
 14 files changed, 420 insertions(+), 10 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	25 May 2006 10:59:36 -0000	1.8
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 15:45:54 -0000	1.9
@@ -331,7 +331,7 @@
  using namespace com::sun::star::ui::dialogs;
  using namespace rtl;
  
-@@ -606,6 +635,90 @@
+@@ -606,6 +635,63 @@
  
  // -----------------------------------------------------------------------
  
@@ -392,37 +392,10 @@
 +    g_list_free( pChildren );
 +}
 +
-+static int TempHorrorHack(GtkContainer *pWidget, int nIn)
-+{
-+	bool bRet = false;
-+	GList *pChildren = gtk_container_get_children(pWidget);
-+	for( GList *p = pChildren; p; p = p->next )
-+	{
-+		GtkWidget *pData = GTK_WIDGET(p->data);
-+		if (!pData)
-+			continue;
-+		if (GTK_IS_COMBO_BOX(pData))
-+		{
-+			if (!strcmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(pData)), "All sheets"))
-+			{
-+				gtk_widget_set_sensitive(pData, false);
-+				pData = 0;
-+				++nIn;
-+			}
-+		}
-+		if (pData && GTK_IS_CONTAINER(pData))
-+			nIn = TempHorrorHack(GTK_CONTAINER(pData), nIn);
-+		if (nIn == 1)
-+			break;
-+	}
-+	g_list_free(pChildren);
-+	return nIn;
-+}
-+
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -621,15 +734,153 @@
+@@ -621,15 +707,155 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -443,12 +416,14 @@
 +			pDialog = gtk_print_unix_dialog_new (NULL, NULL);
 +			rtl::OString aOptions(OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
 +			aOptions = aOptions.replace('~','_');
++			gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(pDialog), 
++				GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | 
++				GTK_PRINT_CAPABILITY_REVERSE));
 +			dialog_remove_buttons( GTK_DIALOG( pDialog ) );
 +			gtk_dialog_add_button( GTK_DIALOG( pDialog ), aOptions.getStr(), 10);
 +			gtk_dialog_add_buttons (GTK_DIALOG (pDialog), 
 +				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_PRINT, GTK_RESPONSE_OK, NULL);
 +			//gtk_dialog_set_default_response (GTK_DIALOG (pDialog), GTK_RESPONSE_OK);
-+			TempHorrorHack(GTK_CONTAINER(pDialog),0);
 +		}
 +
 +		GtkPrintSettings* pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(pDialog));
@@ -583,7 +558,7 @@
  	}
  
  	maStatusTimer.Stop();
-@@ -644,4 +895,3 @@
+@@ -644,4 +870,3 @@
  	mpPrinterImpl->m_bHelpDisabled = sal_True;
  	maBtnHelp.Disable();
  }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.740
retrieving revision 1.741
diff -u -r1.740 -r1.741
--- openoffice.org.spec	22 Jun 2006 15:14:53 -0000	1.740
+++ openoffice.org.spec	22 Jun 2006 15:45:54 -0000	1.741
@@ -3312,6 +3312,7 @@
 %changelog
 * Thu Jun 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-6.1
 - next milestone
+- drop hack and use new gtk_print_unix_dialog_set_manual_capabilities api instead
 
 * Wed Jun 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.3
 - rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses



From fedora-cvs-commits at redhat.com  Thu Jun 22 15:52:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 11:52:04 -0400
Subject: rpms/libselinux/FC-5 libselinux-rhat.patch, 1.77,
	1.78 libselinux.spec, 1.188, 1.189
Message-ID: <200606221552.k5MFq41m003788@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3762

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-4.fc5
- Return proper error number on selinux_mnt being undefined


libselinux-rhat.patch:
 include/selinux/selinux.h  |    3 
 man/man3/getfscreatecon.3  |    4 
 man/man3/matchpathcon.3    |   11 ++
 man/man8/booleans.8        |   24 +----
 src/booleans.c             |    2 
 src/canonicalize_context.c |    8 +
 src/check_context.c        |    5 +
 src/compute_av.c           |    8 +
 src/compute_create.c       |    8 +
 src/compute_member.c       |    8 +
 src/compute_relabel.c      |    8 +
 src/compute_user.c         |    8 +
 src/context.c              |    8 -
 src/disable.c              |    5 +
 src/enabled.c              |    8 +
 src/getcon.c               |    3 
 src/getenforce.c           |    5 +
 src/getexeccon.c           |    3 
 src/getfscreatecon.c       |    3 
 src/getpidcon.c            |    3 
 src/getprevcon.c           |    3 
 src/init.c                 |    6 -
 src/load_policy.c          |    5 +
 src/matchmediacon.c        |    2 
 src/matchpathcon.c         |   27 +++++
 src/policyvers.c           |    5 +
 src/selinux_internal.h     |    1 
 src/selinuxswig.i          |   13 ++
 src/selinuxswig_wrap.c     |  206 ++++++++++++++++++++-------------------------
 src/setenforce.c           |    5 +
 utils/avcstat.c            |   18 +--
 utils/matchpathcon.c       |    1 
 32 files changed, 253 insertions(+), 174 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux-rhat.patch,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- libselinux-rhat.patch	12 Jun 2006 14:06:05 -0000	1.77
+++ libselinux-rhat.patch	22 Jun 2006 15:52:02 -0000	1.78
@@ -1,244 +1,19 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.3/include/selinux/selinux.h
---- nsalibselinux/include/selinux/selinux.h	2006-04-14 07:21:54.000000000 -0400
-+++ libselinux-1.30.3/include/selinux/selinux.h	2006-06-06 13:39:58.000000000 -0400
-@@ -310,6 +310,9 @@
-    regexes that have stems that are prefixes of 'prefix'. */
- extern int matchpathcon_init_prefix(const char *path, const char *prefix);
- 
-+/* Free the memory allocated by matchpathcon_init. */
-+extern void matchpathcon_fini(void);
-+
- /* Match the specified pathname and mode against the file contexts
-    configuration and set *con to refer to the resulting context.
-    'mode' can be 0 to disable mode matching.
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfscreatecon.3 libselinux-1.30.3/man/man3/getfscreatecon.3
---- nsalibselinux/man/man3/getfscreatecon.3	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/man/man3/getfscreatecon.3	2006-06-06 13:40:32.000000000 -0400
-@@ -32,9 +32,7 @@
- save, reset, and restore the fscreate context to avoid unexpected behaviors.
- .SH "RETURN VALUE"
- On error -1 is returned.
--
--On success getfscreatecon returns the length of the context (not including
--the trailing zero byte).  On success setfscreatecon returns 0.
-+On success 0 is returned.
- 
- .SH "SEE ALSO"
- .BR freecon "(3), " getcon "(3), " getexeccon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-1.30.3/man/man3/matchpathcon.3
---- nsalibselinux/man/man3/matchpathcon.3	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/man/man3/matchpathcon.3	2006-06-06 13:40:32.000000000 -0400
-@@ -7,6 +7,8 @@
- .sp
- .BI "int matchpathcon_init(const char *" path ");"
- .br
-+.BI "int matchpathcon_fini(void);"
-+.br
- .BI "int matchpathcon(const char *" path ", mode_t " mode ", security_context_t *" con);
- .sp
- .br 
-@@ -40,6 +42,15 @@
- customizations.
- .br 
- .sp
-+.B matchpathcon_fini
-+frees the memory allocated by a prior call to
-+.B matchpathcon_init.
-+This function can be used to free and reset the internal state between multiple 
-+.B matchpathcon_init 
-+calls, or to free memory when finished using 
-+.B matchpathcon.
-+.br
-+.sp
- .B matchpathcon 
- matches the specified pathname and mode against the file contexts
- configuration and sets the security context 
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.3/man/man8/booleans.8
---- nsalibselinux/man/man8/booleans.8	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/man/man8/booleans.8	2006-06-06 13:40:45.000000000 -0400
-@@ -17,17 +17,13 @@
- value.  
- 
- The policy defines a default value for each boolean, typically false.
--These default values can be overridden at boot-time based on the
--settings in the
--.I /etc/selinux/SELINUXTYPE/booleans
--file, where
--SELINUXTYPE is the type of policy currently being run on the system as
--defined in the
--.I /etc/selinux/config
--file.  The
-+These default values can be overridden via local settings created via the
-+.B setsebool(8)
-+utility, using -P to make the setting persistent across reboots.
-+The 
- .B system-config-securitylevel
--tool provides an interface for altering
--the settings in this file.  The
-+tool provides a graphical interface for altering
-+the settings.  The
- .B load_policy(8)
- program will preserve
- current boolean settings upon a policy reload by default, or can
-@@ -41,8 +37,9 @@
- .B setsebool(8)
- utility or the
- .B togglesebool
--utility.  These utilities only change the
--current boolean value and do not affect the boot-time settings.
-+utility.  By default, these utilities only change the
-+current boolean value and do not affect the persistent settings,
-+unless the -P option is used to setsebool.
- 
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
-@@ -50,6 +47,3 @@
- 
- .SH "SEE ALSO"
- getsebool(8), setsebool(8), selinux(8), togglesebool(8)
--
--.SH FILES
--/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/booleans.c libselinux-1.30.3/src/booleans.c
---- nsalibselinux/src/booleans.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/booleans.c	2006-06-06 13:41:21.000000000 -0400
-@@ -309,7 +309,7 @@
- 		int val;
- 		char boolname[BUFSIZ];
- 		char *buffer;
--		char *inbuf=NULL;
-+		inbuf=NULL;
- 		__fsetlocking(boolf, FSETLOCKING_BYCALLER);
- 		while ((len=getline(&inbuf, &size, boolf)) > 0) {
- 			buffer=strdup(inbuf);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/canonicalize_context.c libselinux-1.30.3/src/canonicalize_context.c
---- nsalibselinux/src/canonicalize_context.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/canonicalize_context.c	2006-06-06 13:57:26.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- #include <limits.h>
-@@ -18,12 +17,15 @@
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/check_context.c libselinux-1.30.3/src/check_context.c
---- nsalibselinux/src/check_context.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/check_context.c	2006-06-06 13:44:45.000000000 -0400
-@@ -14,6 +14,9 @@
+--- libselinux-1.30.3/src/check_context.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/check_context.c	2006-06-22 11:47:35.000000000 -0400
+@@ -14,6 +14,11 @@
  	char path[PATH_MAX];
  	int fd, ret;
  
-+	if (!selinux_mnt)
++	if (!selinux_mnt) {
++		errno = ENOENT;
 +		return -1;
++	}
 +
  	snprintf(path, sizeof path, "%s/context", selinux_mnt);
  	fd = open(path, O_RDWR);
  	if (fd < 0)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_av.c libselinux-1.30.3/src/compute_av.c
---- nsalibselinux/src/compute_av.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/compute_av.c	2006-06-06 13:57:38.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- #include <limits.h>
-@@ -21,12 +20,15 @@
- 	size_t len;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0) 
- 		return -1;
- 
--	len = PAGE_SIZE;
-+	len = selinux_page_size;
- 	buf = malloc(len);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_create.c libselinux-1.30.3/src/compute_create.c
---- nsalibselinux/src/compute_create.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/compute_create.c	2006-06-06 13:57:40.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- #include <limits.h>
-@@ -20,12 +19,15 @@
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/create", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_member.c libselinux-1.30.3/src/compute_member.c
---- nsalibselinux/src/compute_member.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/compute_member.c	2006-06-06 13:57:44.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- #include <limits.h>
-@@ -20,12 +19,15 @@
- 	size_t size;
- 	int fd, ret;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/member", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_relabel.c libselinux-1.30.3/src/compute_relabel.c
---- nsalibselinux/src/compute_relabel.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/compute_relabel.c	2006-06-06 13:57:46.000000000 -0400
+--- libselinux-1.30.3/src/canonicalize_context.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/canonicalize_context.c	2006-06-22 11:48:08.000000000 -0400
 @@ -5,7 +5,6 @@
  #include <stdio.h>
  #include <errno.h>
@@ -247,42 +22,16 @@
  #include "selinux_internal.h"
  #include "policy.h"
  #include <limits.h>
-@@ -20,12 +19,15 @@
+@@ -18,12 +17,17 @@
  	size_t size;
  	int fd, ret;
  
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_user.c libselinux-1.30.3/src/compute_user.c
---- nsalibselinux/src/compute_user.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/compute_user.c	2006-06-06 13:57:49.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- #include <limits.h>
-@@ -21,12 +20,15 @@
- 	int fd, ret;
- 	unsigned int i, nel;
- 
-+	if (!selinux_mnt)
++	if (!selinux_mnt) {
++		errno = ENOENT;
 +		return -1;
++	}
 +
- 	snprintf(path, sizeof path, "%s/user", selinux_mnt);
+ 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
  	fd = open(path, O_RDWR);
  	if (fd < 0)
  		return -1;
@@ -292,340 +41,8 @@
  	buf = malloc(size);
  	if (!buf) {
  		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/context.c libselinux-1.30.3/src/context.c
---- nsalibselinux/src/context.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/context.c	2006-06-06 14:14:18.000000000 -0400
-@@ -137,7 +137,7 @@
- 
- /* Returns nonzero iff failed */
- 
--static int set_comp(context_private_t* n,int index, const char *str)
-+static int set_comp(context_private_t* n,int idx, const char *str)
- {
- 	char *t = NULL;
-         const char *p;
-@@ -146,15 +146,15 @@
- 		if ( !t ) { return 1; }
- 		for ( p = str; *p; p++ ) {
- 			if ( *p == '\t' || *p == '\n' || *p == '\r' ||
--			     ((*p == ':' || *p == ' ') && index != COMP_RANGE) ) {
-+			     ((*p == ':' || *p == ' ') && idx != COMP_RANGE) ) {
- 				free(t);
- 				return 1;
- 			}
- 		}
- 		strcpy(t,str);
- 	}
--        conditional_free(&n->component[index]);
--        n->component[index] = t;
-+        conditional_free(&n->component[idx]);
-+        n->component[idx] = t;
-         return 0;
- }
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/disable.c libselinux-1.30.3/src/disable.c
---- nsalibselinux/src/disable.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/disable.c	2006-06-06 13:46:48.000000000 -0400
-@@ -15,6 +15,9 @@
- 	char path[PATH_MAX];
- 	char buf[20];
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/disable", selinux_mnt);
- 	fd = open(path, O_WRONLY);
- 	if (fd < 0)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/enabled.c libselinux-1.30.3/src/enabled.c
---- nsalibselinux/src/enabled.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/enabled.c	2006-06-06 13:57:51.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <limits.h>
--#include <asm/page.h>
- #include <stdio.h>
- #include "policy.h"
- 
-@@ -22,7 +21,7 @@
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		enabled = -1;
-@@ -65,6 +64,9 @@
- 	char buf[20], path[PATH_MAX];
- 	int fd, ret, enabled = 0;
- 
-+	if (!selinux_mnt)
-+		return enabled;
-+
- 	snprintf(path, sizeof path, "%s/mls", selinux_mnt);
- 	fd = open(path, O_RDONLY);
- 	if (fd < 0)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/getcon.c libselinux-1.30.3/src/getcon.c
---- nsalibselinux/src/getcon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/getcon.c	2006-06-06 13:57:53.000000000 -0400
-@@ -4,7 +4,6 @@
- #include "selinux_internal.h"
- #include <stdlib.h>
- #include <errno.h>
--#include <asm/page.h>
- #include "policy.h"
- 
- int getcon_raw(security_context_t *context)
-@@ -18,7 +17,7 @@
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/getenforce.c libselinux-1.30.3/src/getenforce.c
---- nsalibselinux/src/getenforce.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/getenforce.c	2006-06-06 13:47:41.000000000 -0400
-@@ -15,6 +15,9 @@
- 	char path[PATH_MAX];
- 	char buf[20];
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
- 	fd = open(path, O_RDONLY);
- 	if (fd < 0)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/getexeccon.c libselinux-1.30.3/src/getexeccon.c
---- nsalibselinux/src/getexeccon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/getexeccon.c	2006-06-06 13:57:55.000000000 -0400
-@@ -3,7 +3,6 @@
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- 
-@@ -18,7 +17,7 @@
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/getfscreatecon.c libselinux-1.30.3/src/getfscreatecon.c
---- nsalibselinux/src/getfscreatecon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/getfscreatecon.c	2006-06-06 13:57:58.000000000 -0400
-@@ -3,7 +3,6 @@
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- 
-@@ -18,7 +17,7 @@
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/getpidcon.c libselinux-1.30.3/src/getpidcon.c
---- nsalibselinux/src/getpidcon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/getpidcon.c	2006-06-06 13:58:00.000000000 -0400
-@@ -4,7 +4,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- 
-@@ -22,7 +21,7 @@
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/getprevcon.c libselinux-1.30.3/src/getprevcon.c
---- nsalibselinux/src/getprevcon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/getprevcon.c	2006-06-06 13:58:02.000000000 -0400
-@@ -4,7 +4,6 @@
- #include "selinux_internal.h"
- #include <stdlib.h>
- #include <errno.h>
--#include <asm/page.h>
- #include "policy.h"
- 
- int getprevcon_raw(security_context_t *context)
-@@ -18,7 +17,7 @@
- 	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-1.30.3/src/init.c
---- nsalibselinux/src/init.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/init.c	2006-06-06 13:58:04.000000000 -0400
-@@ -4,7 +4,6 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <ctype.h>
--#include <asm/page.h>
- #include <stdio.h>
- #include <dlfcn.h>
- 
-@@ -13,6 +12,7 @@
- #include "selinux_internal.h"
- 
- char *selinux_mnt = NULL;
-+int selinux_page_size=0;
- 
- static void init_selinuxmnt(void)
- {
-@@ -27,7 +27,8 @@
- 	if (!fp)
- 		return;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
-+
- 	buf = malloc(size);
- 	if (!buf)
- 		goto out;
-@@ -134,6 +135,7 @@
- static void init_lib(void) __attribute__ ((constructor));
- static void init_lib(void)
- {
-+	selinux_page_size = sysconf(_SC_PAGE_SIZE);
- 	init_selinuxmnt();
- 	init_translations();
- }
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/load_policy.c libselinux-1.30.3/src/load_policy.c
---- nsalibselinux/src/load_policy.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/load_policy.c	2006-06-06 13:48:12.000000000 -0400
-@@ -20,6 +20,9 @@
- 	char path[PATH_MAX];
- 	int fd, ret;
- 	
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/load", selinux_mnt);
- 	fd = open(path, O_RDWR);
- 	if (fd < 0) 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchmediacon.c libselinux-1.30.3/src/matchmediacon.c
---- nsalibselinux/src/matchmediacon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/matchmediacon.c	2006-06-06 14:16:22.000000000 -0400
-@@ -17,7 +17,7 @@
- 	const char *path = selinux_media_context_path();
- 	FILE *infile;
- 	char *ptr, *ptr2=NULL;
--	int found=-1;
-+	int found=0;
- 	char current_line[PATH_MAX];
- 	if ((infile = fopen(path, "r")) == NULL)
- 		return -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.30.3/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/matchpathcon.c	2006-06-06 14:18:47.000000000 -0400
-@@ -758,6 +758,33 @@
- 	return matchpathcon_init_prefix(path, NULL);
- }
- 
-+void matchpathcon_fini(void)
-+{
-+	struct spec *spec;
-+	struct stem *stem;
-+	unsigned int i;
-+
-+	for (i = 0; i < nspec; i++) {
-+		spec = &spec_arr[i];
-+		free(spec->regex_str);
-+		free(spec->type_str);
-+		free(spec->context);
-+		regfree(&spec->regex);
-+	}
-+	free(spec_arr);
-+	spec_arr = NULL;
-+	nspec = 0;
-+	
-+	for (i = 0; i < (unsigned int)num_stems; i++) {
-+		stem = &stem_arr[i];
-+		free(stem->buf);
-+	}
-+	free(stem_arr);
-+	stem_arr = NULL;
-+	num_stems = 0;
-+	alloc_stems = 0;
-+}
-+
- static int matchpathcon_common(const char *name, 
- 			       mode_t mode)
- {
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/policyvers.c libselinux-1.30.3/src/policyvers.c
---- nsalibselinux/src/policyvers.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/policyvers.c	2006-06-06 13:48:37.000000000 -0400
-@@ -19,6 +19,9 @@
- 	char buf[20];
- 	unsigned vers = DEFAULT_POLICY_VERSION;
- 
-+	if (!selinux_mnt)
-+		return -1;
-+
- 	snprintf(path, sizeof path, "%s/policyvers", selinux_mnt);
- 	fd = open(path, O_RDONLY);
- 	if (fd < 0) {
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.30.3/src/selinux_internal.h
---- nsalibselinux/src/selinux_internal.h	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/selinux_internal.h	2006-06-06 13:56:26.000000000 -0400
-@@ -71,3 +71,4 @@
- 
- extern int load_setlocaldefs hidden;
- extern int require_seusers hidden;
-+extern int selinux_page_size hidden;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.3/src/selinuxswig.i
---- nsalibselinux/src/selinuxswig.i	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/selinuxswig.i	2006-06-06 14:19:57.000000000 -0400
-@@ -28,9 +28,18 @@
- %typemap(in, numinputs=0) security_context_t *(security_context_t temp) {
- 	$1 = &temp;
- }
--%typemap(argout) security_context_t * {
--	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
-+%typemap(argout) security_context_t * (char *temp) {
-+	if (*$1)
-+		temp = *$1;
-+	else
-+		temp = "";
-+	$result = SWIG_Python_AppendOutput($result, PyString_FromString(temp));
-+}
-+
-+%typemap(in) security_context_t {
-+	$1 = (security_context_t)PyString_AsString($input);
- }
-+
- %typedef unsigned mode_t;
- 
- extern int is_selinux_enabled(void);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.30.3/src/selinuxswig_wrap.c
---- nsalibselinux/src/selinuxswig_wrap.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/selinuxswig_wrap.c	2006-06-06 14:20:22.000000000 -0400
+--- libselinux-1.30.3/src/selinuxswig_wrap.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/selinuxswig_wrap.c	2006-06-22 11:46:36.000000000 -0400
 @@ -2832,6 +2832,7 @@
    security_context_t *arg1 = (security_context_t *) 0 ;
    int result;
@@ -1130,22 +547,600 @@
    }
    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
    return resultobj;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/setenforce.c libselinux-1.30.3/src/setenforce.c
---- nsalibselinux/src/setenforce.c	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/setenforce.c	2006-06-06 13:39:20.000000000 -0400
-@@ -15,6 +15,9 @@
+--- libselinux-1.30.3/src/disable.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/disable.c	2006-06-22 11:49:00.000000000 -0400
+@@ -15,6 +15,11 @@
  	char path[PATH_MAX];
  	char buf[20];
  
-+	if (!selinux_mnt)
++	if (!selinux_mnt) {
++		errno = ENOENT;
 +		return -1;
++	}
 +
- 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
- 	fd = open(path, O_RDWR);
+ 	snprintf(path, sizeof path, "%s/disable", selinux_mnt);
+ 	fd = open(path, O_WRONLY);
+ 	if (fd < 0)
+--- libselinux-1.30.3/src/getpidcon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getpidcon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ 
+@@ -22,7 +21,7 @@
  	if (fd < 0)
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.30.3/utils/avcstat.c
---- nsalibselinux/utils/avcstat.c	2006-04-14 07:21:54.000000000 -0400
-+++ libselinux-1.30.3/utils/avcstat.c	2006-06-06 13:38:42.000000000 -0400
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/booleans.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/booleans.c	2006-06-22 11:46:36.000000000 -0400
+@@ -309,7 +309,7 @@
+ 		int val;
+ 		char boolname[BUFSIZ];
+ 		char *buffer;
+-		char *inbuf=NULL;
++		inbuf=NULL;
+ 		__fsetlocking(boolf, FSETLOCKING_BYCALLER);
+ 		while ((len=getline(&inbuf, &size, boolf)) > 0) {
+ 			buffer=strdup(inbuf);
+--- libselinux-1.30.3/src/context.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/context.c	2006-06-22 11:46:36.000000000 -0400
+@@ -137,7 +137,7 @@
+ 
+ /* Returns nonzero iff failed */
+ 
+-static int set_comp(context_private_t* n,int index, const char *str)
++static int set_comp(context_private_t* n,int idx, const char *str)
+ {
+ 	char *t = NULL;
+         const char *p;
+@@ -146,15 +146,15 @@
+ 		if ( !t ) { return 1; }
+ 		for ( p = str; *p; p++ ) {
+ 			if ( *p == '\t' || *p == '\n' || *p == '\r' ||
+-			     ((*p == ':' || *p == ' ') && index != COMP_RANGE) ) {
++			     ((*p == ':' || *p == ' ') && idx != COMP_RANGE) ) {
+ 				free(t);
+ 				return 1;
+ 			}
+ 		}
+ 		strcpy(t,str);
+ 	}
+-        conditional_free(&n->component[index]);
+-        n->component[index] = t;
++        conditional_free(&n->component[idx]);
++        n->component[idx] = t;
+         return 0;
+ }
+ 
+--- libselinux-1.30.3/src/getenforce.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getenforce.c	2006-06-22 11:49:14.000000000 -0400
+@@ -15,6 +15,11 @@
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0)
+--- libselinux-1.30.3/src/selinux_internal.h.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/selinux_internal.h	2006-06-22 11:46:36.000000000 -0400
+@@ -71,3 +71,4 @@
+ 
+ extern int load_setlocaldefs hidden;
+ extern int require_seusers hidden;
++extern int selinux_page_size hidden;
+--- libselinux-1.30.3/src/matchmediacon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/matchmediacon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -17,7 +17,7 @@
+ 	const char *path = selinux_media_context_path();
+ 	FILE *infile;
+ 	char *ptr, *ptr2=NULL;
+-	int found=-1;
++	int found=0;
+ 	char current_line[PATH_MAX];
+ 	if ((infile = fopen(path, "r")) == NULL)
+ 		return -1;
+--- libselinux-1.30.3/src/getfscreatecon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getfscreatecon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -3,7 +3,6 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ 
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/init.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/init.c	2006-06-22 11:46:36.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <ctype.h>
+-#include <asm/page.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
+ 
+@@ -13,6 +12,7 @@
+ #include "selinux_internal.h"
+ 
+ char *selinux_mnt = NULL;
++int selinux_page_size=0;
+ 
+ static void init_selinuxmnt(void)
+ {
+@@ -27,7 +27,8 @@
+ 	if (!fp)
+ 		return;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
++
+ 	buf = malloc(size);
+ 	if (!buf)
+ 		goto out;
+@@ -134,6 +135,7 @@
+ static void init_lib(void) __attribute__ ((constructor));
+ static void init_lib(void)
+ {
++	selinux_page_size = sysconf(_SC_PAGE_SIZE);
+ 	init_selinuxmnt();
+ 	init_translations();
+ }
+--- libselinux-1.30.3/src/setenforce.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/setenforce.c	2006-06-22 11:49:43.000000000 -0400
+@@ -15,6 +15,11 @@
+ 	char path[PATH_MAX];
+ 	char buf[20];
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+--- libselinux-1.30.3/src/compute_av.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_av.c	2006-06-22 11:48:19.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -21,12 +20,17 @@
+ 	size_t len;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+ 		return -1;
+ 
+-	len = PAGE_SIZE;
++	len = selinux_page_size;
+ 	buf = malloc(len);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/getcon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getcon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include "selinux_internal.h"
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "policy.h"
+ 
+ int getcon_raw(security_context_t *context)
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/getprevcon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getprevcon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -4,7 +4,6 @@
+ #include "selinux_internal.h"
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "policy.h"
+ 
+ int getprevcon_raw(security_context_t *context)
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/selinuxswig.i.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/selinuxswig.i	2006-06-22 11:46:36.000000000 -0400
+@@ -28,9 +28,18 @@
+ %typemap(in, numinputs=0) security_context_t *(security_context_t temp) {
+ 	$1 = &temp;
+ }
+-%typemap(argout) security_context_t * {
+-	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
++%typemap(argout) security_context_t * (char *temp) {
++	if (*$1)
++		temp = *$1;
++	else
++		temp = "";
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(temp));
++}
++
++%typemap(in) security_context_t {
++	$1 = (security_context_t)PyString_AsString($input);
+ }
++
+ %typedef unsigned mode_t;
+ 
+ extern int is_selinux_enabled(void);
+--- libselinux-1.30.3/src/compute_user.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_user.c	2006-06-22 11:48:56.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -21,12 +20,17 @@
+ 	int fd, ret;
+ 	unsigned int i, nel;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/user", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/policyvers.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/policyvers.c	2006-06-22 11:49:36.000000000 -0400
+@@ -19,6 +19,11 @@
+ 	char buf[20];
+ 	unsigned vers = DEFAULT_POLICY_VERSION;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/policyvers", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0) {
+--- libselinux-1.30.3/src/load_policy.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/load_policy.c	2006-06-22 11:49:30.000000000 -0400
+@@ -20,6 +20,11 @@
+ 	char path[PATH_MAX];
+ 	int fd, ret;
+ 	
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/load", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+--- libselinux-1.30.3/src/compute_member.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_member.c	2006-06-22 11:48:41.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -20,12 +19,17 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/member", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/getexeccon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/getexeccon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -3,7 +3,6 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ 
+@@ -18,7 +17,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/compute_create.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_create.c	2006-06-22 11:48:36.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -20,12 +19,17 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/create", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/src/enabled.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/enabled.c	2006-06-22 11:49:10.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <limits.h>
+-#include <asm/page.h>
+ #include <stdio.h>
+ #include "policy.h"
+ 
+@@ -22,7 +21,7 @@
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		enabled = -1;
+@@ -65,6 +64,11 @@
+ 	char buf[20], path[PATH_MAX];
+ 	int fd, ret, enabled = 0;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/mls", selinux_mnt);
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0)
+--- libselinux-1.30.3/src/matchpathcon.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/matchpathcon.c	2006-06-22 11:46:36.000000000 -0400
+@@ -758,6 +758,33 @@
+ 	return matchpathcon_init_prefix(path, NULL);
+ }
+ 
++void matchpathcon_fini(void)
++{
++	struct spec *spec;
++	struct stem *stem;
++	unsigned int i;
++
++	for (i = 0; i < nspec; i++) {
++		spec = &spec_arr[i];
++		free(spec->regex_str);
++		free(spec->type_str);
++		free(spec->context);
++		regfree(&spec->regex);
++	}
++	free(spec_arr);
++	spec_arr = NULL;
++	nspec = 0;
++	
++	for (i = 0; i < (unsigned int)num_stems; i++) {
++		stem = &stem_arr[i];
++		free(stem->buf);
++	}
++	free(stem_arr);
++	stem_arr = NULL;
++	num_stems = 0;
++	alloc_stems = 0;
++}
++
+ static int matchpathcon_common(const char *name, 
+ 			       mode_t mode)
+ {
+--- libselinux-1.30.3/src/compute_relabel.c.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_relabel.c	2006-06-22 11:48:46.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -20,12 +19,17 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+--- libselinux-1.30.3/man/man8/booleans.8.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man8/booleans.8	2006-06-22 11:46:36.000000000 -0400
+@@ -17,17 +17,13 @@
+ value.  
+ 
+ The policy defines a default value for each boolean, typically false.
+-These default values can be overridden at boot-time based on the
+-settings in the
+-.I /etc/selinux/SELINUXTYPE/booleans
+-file, where
+-SELINUXTYPE is the type of policy currently being run on the system as
+-defined in the
+-.I /etc/selinux/config
+-file.  The
++These default values can be overridden via local settings created via the
++.B setsebool(8)
++utility, using -P to make the setting persistent across reboots.
++The 
+ .B system-config-securitylevel
+-tool provides an interface for altering
+-the settings in this file.  The
++tool provides a graphical interface for altering
++the settings.  The
+ .B load_policy(8)
+ program will preserve
+ current boolean settings upon a policy reload by default, or can
+@@ -41,8 +37,9 @@
+ .B setsebool(8)
+ utility or the
+ .B togglesebool
+-utility.  These utilities only change the
+-current boolean value and do not affect the boot-time settings.
++utility.  By default, these utilities only change the
++current boolean value and do not affect the persistent settings,
++unless the -P option is used to setsebool.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+@@ -50,6 +47,3 @@
+ 
+ .SH "SEE ALSO"
+ getsebool(8), setsebool(8), selinux(8), togglesebool(8)
+-
+-.SH FILES
+-/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
+--- libselinux-1.30.3/man/man3/getfscreatecon.3.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man3/getfscreatecon.3	2006-06-22 11:46:36.000000000 -0400
+@@ -32,9 +32,7 @@
+ save, reset, and restore the fscreate context to avoid unexpected behaviors.
+ .SH "RETURN VALUE"
+ On error -1 is returned.
+-
+-On success getfscreatecon returns the length of the context (not including
+-the trailing zero byte).  On success setfscreatecon returns 0.
++On success 0 is returned.
+ 
+ .SH "SEE ALSO"
+ .BR freecon "(3), " getcon "(3), " getexeccon "(3)"
+--- libselinux-1.30.3/man/man3/matchpathcon.3.rhat	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man3/matchpathcon.3	2006-06-22 11:46:36.000000000 -0400
+@@ -7,6 +7,8 @@
+ .sp
+ .BI "int matchpathcon_init(const char *" path ");"
+ .br
++.BI "int matchpathcon_fini(void);"
++.br
+ .BI "int matchpathcon(const char *" path ", mode_t " mode ", security_context_t *" con);
+ .sp
+ .br 
+@@ -40,6 +42,15 @@
+ customizations.
+ .br 
+ .sp
++.B matchpathcon_fini
++frees the memory allocated by a prior call to
++.B matchpathcon_init.
++This function can be used to free and reset the internal state between multiple 
++.B matchpathcon_init 
++calls, or to free memory when finished using 
++.B matchpathcon.
++.br
++.sp
+ .B matchpathcon 
+ matches the specified pathname and mode against the file contexts
+ configuration and sets the security context 
+--- libselinux-1.30.3/include/selinux/selinux.h.rhat	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/include/selinux/selinux.h	2006-06-22 11:46:36.000000000 -0400
+@@ -310,6 +310,9 @@
+    regexes that have stems that are prefixes of 'prefix'. */
+ extern int matchpathcon_init_prefix(const char *path, const char *prefix);
+ 
++/* Free the memory allocated by matchpathcon_init. */
++extern void matchpathcon_fini(void);
++
+ /* Match the specified pathname and mode against the file contexts
+    configuration and set *con to refer to the resulting context.
+    'mode' can be 0 to disable mode matching.
+--- libselinux-1.30.3/utils/avcstat.c.rhat	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/utils/avcstat.c	2006-06-22 11:46:36.000000000 -0400
 @@ -27,12 +27,12 @@
  #define HEADERS		"lookups hits misses allocations reclaims frees"
  
@@ -1192,9 +1187,8 @@
  			       rel.lookups, rel.hits, rel.misses,
  			       rel.allocations, rel.reclaims, rel.frees);
  		}
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.3/utils/matchpathcon.c
---- nsalibselinux/utils/matchpathcon.c	2006-04-14 07:21:54.000000000 -0400
-+++ libselinux-1.30.3/utils/matchpathcon.c	2006-06-06 13:38:19.000000000 -0400
+--- libselinux-1.30.3/utils/matchpathcon.c.rhat	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/utils/matchpathcon.c	2006-06-22 11:46:36.000000000 -0400
 @@ -66,5 +66,6 @@
  
  		freecon(buf);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- libselinux.spec	8 Jun 2006 16:44:30 -0000	1.188
+++ libselinux.spec	22 Jun 2006 15:52:02 -0000	1.189
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.3
-Release: 3.fc5
+Release: 4.fc5
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -116,6 +116,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-4.fc5
+- Return proper error number on selinux_mnt being undefined
+
 * Thu Jun 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-3.fc5
 - Apply patch this time...
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:08:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:08:44 -0400
Subject: rpms/scim-hangul/FC-5 scim-hangul.spec,1.16,1.17
Message-ID: <200606221608.k5MG8iAt007843@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7811

Modified Files:
	scim-hangul.spec 
Log Message:



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/FC-5/scim-hangul.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-hangul.spec	22 Jun 2006 13:26:13 -0000	1.16
+++ scim-hangul.spec	22 Jun 2006 16:08:32 -0000	1.17
@@ -64,7 +64,7 @@
 
 %changelog
 * Thu Jun 22 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2.fc5
-- rebuilt
+- rebuilt to fix the broken upgrade path.
 
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:17:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:17:32 -0400
Subject: rpms/openoffice.org/devel workspace.vcl59.patch,1.4,1.5
Message-ID: <200606221617.k5MGHWT5022993@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22214

Modified Files:
	workspace.vcl59.patch 
Log Message:
vcl59 partially integrated into m6

workspace.vcl59.patch:
 source/window/window.cxx           |    0 
 unx/gtk/app/gtkdata.cxx            |    0 
 unx/source/gdi/salgdi3.cxx         |    8 ++++++++
 vcl/source/window/window.cxx       |    2 +-
 vcl/unx/gtk/app/gtkdata.cxx        |    1 +
 vcl/unx/source/gdi/gcach_xpeer.cxx |    5 +++++
 vcl/unx/source/gdi/gcach_xpeer.hxx |    1 +
 7 files changed, 16 insertions(+), 1 deletion(-)

Index: workspace.vcl59.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl59.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.vcl59.patch	29 May 2006 13:13:51 -0000	1.4
+++ workspace.vcl59.patch	22 Jun 2006 16:17:29 -0000	1.5
@@ -57,19 +57,6 @@
      doDestruct();
  
  	for(int i = 0; i < POINTER_COUNT; i++)
-diff -u -p -u -r1.132 menu.cxx
---- openoffice.org.orig/vcl/source/window/menu.cxx	26 Jan 2006 18:10:24 -0000	1.132
-+++ openoffice.orig/vcl/source/window/menu.cxx	23 May 2006 13:45:40 -0000
-@@ -4406,7 +4466,8 @@ void MenuFloatingWindow::KeyInput( const
-                 MenuFloatingWindow* pFloat = pPopupMenu->ImplGetFloatingWindow();
-                 pFloat->GrabFocus();
-                 pFloat->KillActivePopup();
--                pPopupMenu->pStartedFrom->ImplCallHighlight(pFloat->nHighlightedItem);
-+                 if (pPopupMenu->pStartedFrom)
-+                     pPopupMenu->pStartedFrom->ImplCallHighlight(pFloat->nHighlightedItem);
-             }
- 		}
- 		break;
 Index: source/window/window.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/window/window.cxx,v



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:25:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:25:32 -0400
Subject: rpms/man-pages-ja/devel .cvsignore, 1.37, 1.38 man-pages-ja.spec,
	1.43, 1.44 rh-man-pages-ja.pl, 1.9, 1.10 sources, 1.36, 1.37
Message-ID: <200606221625.k5MGPWQu027786@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/man-pages-ja/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27749

Modified Files:
	.cvsignore man-pages-ja.spec rh-man-pages-ja.pl sources 
Log Message:
* Fri Jun 23 2006 Akira TAGOH <tagoh at redhat.com> - 20060615-1
- updates to 20060615.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	29 May 2006 04:50:21 -0000	1.37
+++ .cvsignore	22 Jun 2006 16:25:29 -0000	1.38
@@ -24,3 +24,4 @@
 man-pages-ja-20060315.tar.gz
 man-pages-ja-20060415.tar.gz
 man-pages-ja-20060515.tar.gz
+man-pages-ja-20060615.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- man-pages-ja.spec	29 May 2006 04:50:21 -0000	1.43
+++ man-pages-ja.spec	22 Jun 2006 16:25:29 -0000	1.44
@@ -1,4 +1,4 @@
-%define	manver		20060515
+%define	manver		20060615
 %define	use_utf8	1
 
 Summary: Japanese man (manual) pages from the Japanese Manual Project
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Fri Jun 23 2006 Akira TAGOH <tagoh at redhat.com> - 20060615-1
+- updates to 20060615.
+
 * Mon May 29 2006 Akira TAGOH <tagoh at redhat.com> - 20060515-1
 - updates to 20060515.
 


Index: rh-man-pages-ja.pl
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/rh-man-pages-ja.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rh-man-pages-ja.pl	20 Oct 2005 06:28:14 -0000	1.9
+++ rh-man-pages-ja.pl	22 Jun 2006 16:25:29 -0000	1.10
@@ -15,12 +15,12 @@
 ###
 # Maintainer should update these number according to the original Makefile
 ###
-for($i=0; $i<=103; $i++) {
+for($i=0; $i<=104; $i++) {
   print "\n";
 }
 print "C\n";
 
-for($i=0; $i<=55; $i++) {
+for($i=0; $i<=56; $i++) {
   print "0\n";
 }
 print "C\n";


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	29 May 2006 04:50:21 -0000	1.36
+++ sources	22 Jun 2006 16:25:29 -0000	1.37
@@ -1 +1 @@
-9c028df21cf8f06c1455ee539b26bc0a  man-pages-ja-20060515.tar.gz
+3c3b70fbb5d09a83828b1d83bb53cdb3  man-pages-ja-20060615.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:44:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:44:38 -0400
Subject: rpms/kernel/devel linux-2.6-fix-tcp-h.patch,NONE,1.1
Message-ID: <200606221644.k5MGica5000389@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv358

Added Files:
	linux-2.6-fix-tcp-h.patch 
Log Message:
doh

linux-2.6-fix-tcp-h.patch:
 tcp.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-fix-tcp-h.patch ---
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 420a689..8ebf497 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -18,7 +18,6 @@ #ifndef _LINUX_TCP_H
 #define _LINUX_TCP_H
 
 #include <linux/types.h>
-#include <linux/dmaengine.h>
 #include <asm/byteorder.h>
 
 struct tcphdr {
@@ -161,6 +160,7 @@ struct tcp_info
 #ifdef __KERNEL__
 
 #include <linux/skbuff.h>
+#include <linux/dmaengine.h>
 #include <net/sock.h>
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:53:24 -0400
Subject: rpms/kernel/devel patch-2.6.17-git4.bz2.sign, NONE, 1.1 .cvsignore,
	1.458, 1.459 kernel-2.6.spec, 1.2299, 1.2300 sources, 1.402,
	1.403 upstream, 1.367, 1.368 patch-2.6.17-git3.bz2.sign, 1.1, NONE
Message-ID: <200606221653.k5MGrOuL018386@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18342

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git4.bz2.sign 
Removed Files:
	patch-2.6.17-git3.bz2.sign 
Log Message:
git4



--- NEW FILE patch-2.6.17-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEmkBxyGugalF9Dw4RAqInAJ42Vc1MBzl9gm9ZRxRXGIW+13daEACeKdbf
dlUmlmqs1sc18mVmMMUffqs=
=J7+l
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- .cvsignore	22 Jun 2006 04:02:40 -0000	1.458
+++ .cvsignore	22 Jun 2006 16:53:21 -0000	1.459
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git3.bz2
+patch-2.6.17-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2299
retrieving revision 1.2300
diff -u -r1.2299 -r1.2300
--- kernel-2.6.spec	22 Jun 2006 13:54:45 -0000	1.2299
+++ kernel-2.6.spec	22 Jun 2006 16:53:21 -0000	1.2300
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git3.bz2
+Patch1: patch-2.6.17-git4.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1670,7 +1670,10 @@
 %endif
 
 %changelog
-* Wed Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
+* Thu Jun 22 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git4
+
+* Thu Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update GFS2 patch
 - Apply 'make headers_install' unconditionally now Linus has the cleanups
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- sources	22 Jun 2006 04:02:46 -0000	1.402
+++ sources	22 Jun 2006 16:53:21 -0000	1.403
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-498ca9d1cf20bd7c6680a8dc9c638a4f  patch-2.6.17-git3.bz2
+f733a0b5d58dc8422029ee359abf454f  patch-2.6.17-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- upstream	22 Jun 2006 04:02:46 -0000	1.367
+++ upstream	22 Jun 2006 16:53:21 -0000	1.368
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git3.bz2
+patch-2.6.17-git4.bz2


--- patch-2.6.17-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:53:24 -0400
Subject: rpms/kernel/devel/configs config-generic,1.197,1.198
Message-ID: <200606221653.k5MGrOYM018401@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv18342/configs

Modified Files:
	config-generic 
Log Message:
git4



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- config-generic	22 Jun 2006 04:02:54 -0000	1.197
+++ config-generic	22 Jun 2006 16:53:22 -0000	1.198
@@ -2058,6 +2058,7 @@
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
@@ -2225,6 +2226,7 @@
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
 CONFIG_USB_LED=m
+# CONFIG_USB_CY7C63 is not set
 CONFIG_USB_G_SERIAL=m
 
 
@@ -2252,6 +2254,7 @@
 CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
+CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_PHIDGETKIT=m



From fedora-cvs-commits at redhat.com  Thu Jun 22 16:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 12:56:18 -0400
Subject: rpms/kernel/devel linux-2.6-mtd-git.patch, 1.3, 1.4 kernel-2.6.spec,
	1.2300, 1.2301
Message-ID: <200606221656.k5MGuISO019546@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19506

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-mtd-git.patch 
Log Message:
mtd update

linux-2.6-mtd-git.patch:
 chips/cfi_cmdset_0001.c |    1 +
 chips/jedec.c           |    1 +
 chips/map_absent.c      |    3 ++-
 chips/map_ram.c         |    1 +
 chips/map_rom.c         |    1 +
 devices/block2mtd.c     |    1 +
 devices/ms02-nv.c       |    1 +
 devices/mtd_dataflash.c |    1 +
 devices/phram.c         |    1 +
 devices/pmc551.c        |    3 ++-
 devices/slram.c         |    1 +
 nand/nand_base.c        |   10 +++++-----
 nand/ndfc.c             |    6 +++---
 nand/s3c2410.c          |   10 ++++------
 14 files changed, 25 insertions(+), 16 deletions(-)

Index: linux-2.6-mtd-git.patch
===================================================================
RCS file: linux-2.6-mtd-git.patch
diff -N linux-2.6-mtd-git.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-mtd-git.patch	22 Jun 2006 16:56:15 -0000	1.4
@@ -0,0 +1,239 @@
+diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
+index 0d43581..39edb82 100644
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -357,6 +357,7 @@ struct mtd_info *cfi_cmdset_0001(struct 
+ 	mtd->resume  = cfi_intelext_resume;
+ 	mtd->flags   = MTD_CAP_NORFLASH;
+ 	mtd->name    = map->name;
++	mtd->writesize = 1;
+ 
+ 	mtd->reboot_notifier.notifier_call = cfi_intelext_reboot;
+ 
+diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
+index c40b48d..2c3f019 100644
+--- a/drivers/mtd/chips/jedec.c
++++ b/drivers/mtd/chips/jedec.c
+@@ -256,6 +256,7 @@ static struct mtd_info *jedec_probe(stru
+    MTD->name = map->name;
+    MTD->type = MTD_NORFLASH;
+    MTD->flags = MTD_CAP_NORFLASH;
++   MTD->writesize = 1;
+    MTD->erasesize = SectorSize*(map->buswidth);
+    //   printk("MTD->erasesize is %x\n",(unsigned int)MTD->erasesize);
+    MTD->size = priv->size;
+diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
+index a611de9..ac01a94 100644
+--- a/drivers/mtd/chips/map_absent.c
++++ b/drivers/mtd/chips/map_absent.c
+@@ -64,7 +64,8 @@ static struct mtd_info *map_absent_probe
+ 	mtd->write 	= map_absent_write;
+ 	mtd->sync 	= map_absent_sync;
+ 	mtd->flags 	= 0;
+-	mtd->erasesize = PAGE_SIZE;
++	mtd->erasesize  = PAGE_SIZE;
++	mtd->writesize  = 1;
+ 
+ 	__module_get(THIS_MODULE);
+ 	return mtd;
+diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
+index 7639257..3a66680 100644
+--- a/drivers/mtd/chips/map_ram.c
++++ b/drivers/mtd/chips/map_ram.c
+@@ -71,6 +71,7 @@ #endif
+ 	mtd->write = mapram_write;
+ 	mtd->sync = mapram_nop;
+ 	mtd->flags = MTD_CAP_RAM;
++	mtd->writesize = 1;
+ 
+ 	mtd->erasesize = PAGE_SIZE;
+  	while(mtd->size & (mtd->erasesize - 1))
+diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
+index bc6ee9e..1b328b1 100644
+--- a/drivers/mtd/chips/map_rom.c
++++ b/drivers/mtd/chips/map_rom.c
+@@ -47,6 +47,7 @@ static struct mtd_info *map_rom_probe(st
+ 	mtd->sync = maprom_nop;
+ 	mtd->flags = MTD_CAP_ROM;
+ 	mtd->erasesize = map->size;
++	mtd->writesize = 1;
+ 
+ 	__module_get(THIS_MODULE);
+ 	return mtd;
+diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
+index 0d98c22..be3f1c1 100644
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -324,6 +324,7 @@ static struct block2mtd_dev *add_device(
+ 
+ 	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
+ 	dev->mtd.erasesize = erase_size;
++	dev->mtd.writesize = 1;
+ 	dev->mtd.type = MTD_RAM;
+ 	dev->mtd.flags = MTD_CAP_RAM;
+ 	dev->mtd.erase = block2mtd_erase;
+diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
+index 4ab7670..08dfb89 100644
+--- a/drivers/mtd/devices/ms02-nv.c
++++ b/drivers/mtd/devices/ms02-nv.c
+@@ -225,6 +225,7 @@ static int __init ms02nv_init_one(ulong 
+ 	mtd->owner = THIS_MODULE;
+ 	mtd->read = ms02nv_read;
+ 	mtd->write = ms02nv_write;
++	mtd->writesize = 1;
+ 
+ 	ret = -EIO;
+ 	if (add_mtd_device(mtd)) {
+diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
+index a19480d..04271d0 100644
+--- a/drivers/mtd/devices/mtd_dataflash.c
++++ b/drivers/mtd/devices/mtd_dataflash.c
+@@ -478,6 +478,7 @@ add_dataflash(struct spi_device *spi, ch
+ 	device->name = (pdata && pdata->name) ? pdata->name : priv->name;
+ 	device->size = nr_pages * pagesize;
+ 	device->erasesize = pagesize;
++	device->writesize = pagesize;
+ 	device->owner = THIS_MODULE;
+ 	device->type = MTD_DATAFLASH;
+ 	device->flags = MTD_CAP_NORFLASH;
+diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
+index e09e416..6c7337f 100644
+--- a/drivers/mtd/devices/phram.c
++++ b/drivers/mtd/devices/phram.c
+@@ -151,6 +151,7 @@ static int register_device(char *name, u
+ 	new->mtd.owner = THIS_MODULE;
+ 	new->mtd.type = MTD_RAM;
+ 	new->mtd.erasesize = PAGE_SIZE;
++	new->mtd.writesize = 1;
+ 
+ 	ret = -EAGAIN;
+ 	if (add_mtd_device(&new->mtd)) {
+diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
+index 666cce1..f620d74 100644
+--- a/drivers/mtd/devices/pmc551.c
++++ b/drivers/mtd/devices/pmc551.c
+@@ -778,7 +778,8 @@ #endif
+                 mtd->type 	= MTD_RAM;
+                 mtd->name 	= "PMC551 RAM board";
+                 mtd->erasesize 	= 0x10000;
+-		mtd->owner = THIS_MODULE;
++                mtd->writesize  = 1;
++                mtd->owner = THIS_MODULE;
+ 
+                 if (add_mtd_device(mtd)) {
+                         printk(KERN_NOTICE "pmc551: Failed to register new device\n");
+diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
+index b3f665e..542a0c0 100644
+--- a/drivers/mtd/devices/slram.c
++++ b/drivers/mtd/devices/slram.c
+@@ -209,6 +209,7 @@ static int register_device(char *name, u
+ 	(*curmtd)->mtdinfo->owner = THIS_MODULE;
+ 	(*curmtd)->mtdinfo->type = MTD_RAM;
+ 	(*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ;
++	(*curmtd)->mtdinfo->writesize = 1;
+ 
+ 	if (add_mtd_device((*curmtd)->mtdinfo))	{
+ 		E("slram: Failed to register new device\n");
+diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
+index 27083ed..8df184f 100644
+--- a/drivers/mtd/nand/nand_base.c
++++ b/drivers/mtd/nand/nand_base.c
+@@ -1176,7 +1176,7 @@ static int nand_write_oob_std(struct mtd
+ 
+ 	status = chip->waitfunc(mtd, chip);
+ 
+-	return status;
++	return status & NAND_STATUS_FAIL ? -EIO : 0;
+ }
+ 
+ /**
+@@ -1271,10 +1271,6 @@ static int nand_do_read_oob(struct mtd_i
+ 		sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd);
+ 		buf = nand_transfer_oob(chip, buf, ops);
+ 
+-		readlen -= ops->ooblen;
+-		if (!readlen)
+-			break;
+-
+ 		if (!(chip->options & NAND_NO_READRDY)) {
+ 			/*
+ 			 * Apply delay or wait for ready/busy pin. Do this
+@@ -1288,6 +1284,10 @@ static int nand_do_read_oob(struct mtd_i
+ 				nand_wait_ready(mtd);
+ 		}
+ 
++		readlen -= ops->ooblen;
++		if (!readlen)
++			break;
++
+ 		/* Increment page address */
+ 		realpage++;
+ 
+diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
+index fe8d385..e5bd88f 100644
+--- a/drivers/mtd/nand/ndfc.c
++++ b/drivers/mtd/nand/ndfc.c
+@@ -61,15 +61,15 @@ static void ndfc_select_chip(struct mtd_
+ 
+ static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+ {
+-	struct nand_chip *chip = mtd->priv;
++	struct ndfc_controller *ndfc = &ndfc_ctrl;
+ 
+ 	if (cmd == NAND_CMD_NONE)
+ 		return;
+ 
+ 	if (ctrl & NAND_CLE)
+-		writel(cmd & 0xFF, chip->IO_ADDR_W + NDFC_CMD);
++		writel(cmd & 0xFF, ndfc->ndfcbase + NDFC_CMD);
+ 	else
+-		writel(cmd & 0xFF, chip->IO_ADDR_W + NDFC_ALE);
++		writel(cmd & 0xFF, ndfc->ndfcbase + NDFC_ALE);
+ }
+ 
+ static int ndfc_ready(struct mtd_info *mtd)
+diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
+index 2c262fe..5219bd2 100644
+--- a/drivers/mtd/nand/s3c2410.c
++++ b/drivers/mtd/nand/s3c2410.c
+@@ -63,8 +63,6 @@ #include <asm/io.h>
+ #include <asm/arch/regs-nand.h>
+ #include <asm/arch/nand.h>
+ 
+-#define PFX "s3c2410-nand: "
+-
+ #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
+ static int hardware_ecc = 1;
+ #else
+@@ -195,11 +193,11 @@ static int s3c2410_nand_inithw(struct s3
+ 	}
+ 
+ 	if (tacls < 0 || twrph0 < 0 || twrph1 < 0) {
+-		printk(KERN_ERR PFX "cannot get timings suitable for board\n");
++		dev_err(info->device, "cannot get suitable timings\n");
+ 		return -EINVAL;
+ 	}
+ 
+-	printk(KERN_INFO PFX "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
++	dev_info(info->device, "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
+ 	       tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate));
+ 
+ 	if (!info->is_s3c2440) {
+@@ -218,7 +216,7 @@ static int s3c2410_nand_inithw(struct s3
+ 		       info->regs + S3C2440_NFCONT);
+ 	}
+ 
+-	pr_debug(PFX "NF_CONF is 0x%lx\n", cfg);
++	dev_dbg(info->device, "NF_CONF is 0x%lx\n", cfg);
+ 
+ 	writel(cfg, info->regs + S3C2410_NFCONF);
+ 	return 0;
+@@ -250,7 +248,7 @@ static void s3c2410_nand_select_chip(str
+ 		cur |= bit;
+ 	} else {
+ 		if (nmtd->set != NULL && chip > nmtd->set->nr_chips) {
+-			printk(KERN_ERR PFX "chip %d out of range\n", chip);
++			dev_err(info->device, "invalid chip %d\n", chip);
+ 			return;
+ 		}
+ 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2300
retrieving revision 1.2301
diff -u -r1.2300 -r1.2301
--- kernel-2.6.spec	22 Jun 2006 16:53:21 -0000	1.2300
+++ kernel-2.6.spec	22 Jun 2006 16:56:15 -0000	1.2301
@@ -418,6 +418,9 @@
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 
+# MTD bits
+Patch2400: linux-2.6-mtd-git.patch
+
 # KGDB
 Patch9000: kgdb-core-lite.patch
 Patch9001: kgdb-core-lite-add-reboot-command.patch
@@ -1025,6 +1028,9 @@
 # acpi-ecdt-uid-hack
 %patch2301 -p1
 
+# MTD update from git://git.infradead.org/mtd-2.6.git
+%patch2400 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1670,6 +1676,9 @@
 %endif
 
 %changelog
+* Thu Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
+- MTD update
+
 * Thu Jun 22 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git4
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:16:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:16:55 -0400
Subject: rpms/kexec-tools/devel kexec-ppc64-ingnore-args-linux.patch, NONE,
	1.1 kexec-tools.spec, 1.18, 1.19
Message-ID: <200606221716.k5MHGtcx012818@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10860

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-ppc64-ingnore-args-linux.patch 
Log Message:
checking in update for ppc64 arg-linux handling

kexec-ppc64-ingnore-args-linux.patch:
 kexec-elf-ppc64.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE kexec-ppc64-ingnore-args-linux.patch ---
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
@@ -93,6 +93,7 @@ int elf_ppc64_load(int argc, char **argv
 #define OPT_APPEND     (OPT_ARCH_MAX+0)
 #define OPT_RAMDISK     (OPT_ARCH_MAX+1)
 #define OPT_DEVICETREEBLOB     (OPT_ARCH_MAX+2)
+#define OPT_ARGS_IGNORE		(OPT_ARCH_MAX+3)
 
 	static const struct option options[] = {
 		KEXEC_ARCH_OPTIONS
@@ -101,6 +102,7 @@ int elf_ppc64_load(int argc, char **argv
 		{ "ramdisk",            1, NULL, OPT_RAMDISK },
 		{ "initrd",             1, NULL, OPT_RAMDISK },
 		{ "devicetreeblob",     1, NULL, OPT_DEVICETREEBLOB },
+		{ "args-linux",		0, NULL, OPT_ARGS_IGNORE },
 		{ 0,                    0, NULL, 0 },
 	};
 
@@ -134,6 +136,8 @@ int elf_ppc64_load(int argc, char **argv
 		case OPT_DEVICETREEBLOB:
 			devicetreeblob = optarg;
 			break;
+		case OPT_ARGS_IGNORE:
+			break;
 		}
 	}
 


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kexec-tools.spec	8 Mar 2006 20:39:23 -0000	1.18
+++ kexec-tools.spec	22 Jun 2006 17:16:53 -0000	1.19
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 16
+Release: 17
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -28,6 +28,7 @@
 #
 # Patches 301 through 400 are meant for ppc64 kexec-tools enablement
 #
+Patch301: kexec-ppc64-ingnore-args-linux.patch
 
 Patch501: kexec-tools-1.101-Makefile.patch
 
@@ -43,6 +44,7 @@
 rm -f ../kexec-tools-1.101.spec
 %patch1 -p1
 %patch101 -p1
+%patch301 -p1
 %patch501 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
@@ -96,6 +98,9 @@
 %doc TODO
 
 %changelog
+* Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-17
+- Add patch to allow ppc64 to ignore args-linux option
+
 * Wed Mar 08 2006 Bill Nottingham <notting at redhat.com> - 1.101-16
 - fix scriptlet - call chkconfig --add, change the default in the
   script itself (#183633)



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:23:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:23:34 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-libdhcp6client.patch, 1.5,
	1.6 dhcpv6.spec, 1.36, 1.37
Message-ID: <200606221723.k5MHNYcN012900@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12884

Modified Files:
	dhcpv6-0.10-libdhcp6client.patch dhcpv6.spec 
Log Message:
If link is down, exit rather than loop indefinitely (#195250)


dhcpv6-0.10-libdhcp6client.patch:
 client6_addr.c    |   61 +++++--
 common.c          |   39 +++-
 dhc6_alloc.c      |   67 +++++++
 dhc6_alloc.h      |   17 ++
 dhcp6.h           |   17 +-
 dhcp6c.c          |  455 +++++++++++++++++++++++++++++++++++++++++++++++-------
 dhcp6client.h     |   22 ++
 lease.c           |   10 -
 lease.h           |    2 
 lease_token.l     |    3 
 libdhcp_control.h |  104 ++++++++++++
 11 files changed, 711 insertions(+), 86 deletions(-)

Index: dhcpv6-0.10-libdhcp6client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-libdhcp6client.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcpv6-0.10-libdhcp6client.patch	9 Jun 2006 00:54:12 -0000	1.5
+++ dhcpv6-0.10-libdhcp6client.patch	22 Jun 2006 17:23:31 -0000	1.6
@@ -1,17 +1,6 @@
---- dhcp-0.10/libdhcp6client/lease_token.l.libdhcp6client	2004-02-04 18:29:24.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/lease_token.l	2006-06-08 20:26:36.000000000 -0400
-@@ -241,6 +241,9 @@
- 	
- 	fseek(file, 0, 0);
- 	yyin = file;
-+	yy_init=1;
-+	yy_start=0;
-+	yy_current_buffer=0;
- 	yylex(); 
- 	return;
- }
---- dhcp-0.10/libdhcp6client/client6_addr.c.libdhcp6client	2006-06-08 20:26:21.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/client6_addr.c	2006-06-08 20:26:36.000000000 -0400
+diff -urN dhcp-0.10.orig/libdhcp6client/client6_addr.c dhcp-0.10/libdhcp6client/client6_addr.c
+--- dhcp-0.10.orig/libdhcp6client/client6_addr.c	2006-06-22 11:45:08.000000000 -0400
++++ dhcp-0.10/libdhcp6client/client6_addr.c	2006-06-22 11:46:51.000000000 -0400
 @@ -56,6 +56,10 @@
  #include "timer.h"
  #include "lease.h"
@@ -139,8 +128,258 @@
  	     (ifa != 0L) && ( i < MAX_DEVICE );
  	     i++, ifa = ifa->ifa_next
  	    )
---- dhcp-0.10/libdhcp6client/dhcp6c.c.libdhcp6client	2006-06-08 20:26:20.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-06-08 20:28:42.000000000 -0400
+diff -urN dhcp-0.10.orig/libdhcp6client/common.c dhcp-0.10/libdhcp6client/common.c
+--- dhcp-0.10.orig/libdhcp6client/common.c	2006-06-22 11:45:08.000000000 -0400
++++ dhcp-0.10/libdhcp6client/common.c	2006-06-22 11:46:51.000000000 -0400
+@@ -79,11 +79,19 @@
+ #include "timer.h"
+ #include "lease.h"
+ 
++#ifdef LIBDHCP
++#include "libdhcp_control.h"
++#endif
++
+ int foreground;
+ int debug_thresh;
+ struct dhcp6_if *dhcp6_if;
+ struct dns_list dnslist;
++#ifdef LIBDHCP
++struct host_conf *host_conflist;
++#else
+ static struct host_conf *host_conflist;
++#endif
+ static int in6_matchflags __P((struct sockaddr *, char *, int));
+ ssize_t gethwid __P((char *, int, const char *, u_int16_t *));
+ static int get_assigned_ipv6addrs __P((char *, char *,
+@@ -645,7 +653,7 @@
+ 	memset(&ifr, 0, sizeof(ifr));
+ 	strncpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name));
+ 	ifr.ifr_addr = *(struct sockaddr *)addr;
+-
++	dprintf(LOG_DEBUG,"in6_matchflags: SIOCGIFFLAGS");
+ 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
+ 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
+ 		     addr2str(addr));
+@@ -720,6 +728,9 @@
+ 	struct dhcp6_duid_type1 *dp; /* we only support the type1 DUID */
+ 	char tmpbuf[256];	/* DUID should be no more than 256 bytes */
+ 
++#ifdef LIBDHCP
++     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
++#endif
+ 	if ((fp = fopen(idfile, "r")) == NULL && errno != ENOENT)
+ 		dprintf(LOG_NOTICE, "%s" "failed to open DUID file: %s",
+ 		    FNAME, idfile);
+@@ -774,6 +785,9 @@
+ 	}
+ 
+ 	/* save the (new) ID to the file for next time */
++#ifdef LIBDHCP
++     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
++#endif
+ 	if (!fp) {
+ 		if ((fp = fopen(idfile, "w+")) == NULL) {
+ 			dprintf(LOG_ERR, "%s"
+@@ -821,8 +835,13 @@
+ 		return -1;
+ 
+ 	strcpy(if_hwaddr.ifr_name, ifname);
++	dprintf(LOG_DEBUG,"gethwid: ioctl SIOCGIFHWADDR");
+ 	if (ioctl(skfd, SIOCGIFHWADDR, &if_hwaddr) < 0)
++	{
++	    close(skfd);
+ 		return -1;
++	}
++	close(skfd);
+ 	/* only support Ethernet */
+ 	switch (if_hwaddr.ifr_hwaddr.sa_family) {
+ 	case ARPHRD_ETHER:
+@@ -938,7 +957,7 @@
+ 		cp = (char *)(p + 1);
+ 		np = (struct dhcp6opt *)(cp + optlen);
+ 
+-		dprintf(LOG_DEBUG, "%s" "get DHCP option %s, len %d",
++		dprintf(LOG_INFO, "%s" "get DHCP option %s, len %d",
+ 		    FNAME, dhcp6optstr(opt), optlen);
+ 
+ 		/* option length field overrun */
+@@ -1078,7 +1097,7 @@
+ 				ntohl(*(u_int32_t *)(cp + sizeof(u_int32_t)));
+ 			optinfo->iaidinfo.rebindtime = 
+ 				ntohl(*(u_int32_t *)(cp + 2 * sizeof(u_int32_t)));
+-			dprintf(LOG_DEBUG, "get option iaid is %u, renewtime %u, "
++			dprintf(LOG_INFO, "get option iaid is %u, renewtime %u, "
+ 				"rebindtime %u", optinfo->iaidinfo.iaid,
+ 				optinfo->iaidinfo.renewtime, optinfo->iaidinfo.rebindtime);
+ 			if (get_assigned_ipv6addrs(cp + 3 * sizeof(u_int32_t), 
+@@ -1182,7 +1201,7 @@
+ 		opt = ntohs(opth.dh6opt_type);
+ 		cp = p + sizeof(opth);
+ 		np = cp + optlen;
+-		dprintf(LOG_DEBUG, "  IA address option: %s, "
++		dprintf(LOG_INFO, "  IA address option: %s, "
+ 			"len %d", dhcp6optstr(opt), optlen);
+ 
+ 		if (np > ep) {
+@@ -1212,7 +1231,7 @@
+ 			}
+ 			break;
+ 		case DH6OPT_IADDR:
+-			if (optlen < sizeof(ai) - sizeof(u_int32_t))
++			if (optlen < sizeof(ai)- sizeof(u_int32_t))
+ 				goto malformed;
+ 			memcpy(&ai, p, sizeof(ai));
+ 			/* copy the information into internal format */
+@@ -1221,7 +1240,7 @@
+ 			addr6.preferlifetime = ntohl(ai.preferlifetime);
+ 			addr6.validlifetime = ntohl(ai.validlifetime);
+ 			addr6.plen = ai.plen;
+-			dprintf(LOG_DEBUG, "  get IAADR address information: "
++			dprintf(LOG_INFO, "  get IAADR address information: "
+ 			    "%s preferlifetime %d validlifetime %d",
+ 			    in6addr2str(&addr6.addr, 0),
+ 			    addr6.preferlifetime, addr6.validlifetime);
+@@ -1998,8 +2017,16 @@
+ 	va_list ap;
+ 	char logbuf[LINE_MAX];
+ 
++#if LIBDHCP
++	va_start(ap, fmt);
++	if ( libdhcp_control && libdhcp_control->eh )
++	    libdhcp_control->eh(libdhcp_control, level, fmt, ap);
++	va_end(ap);
++	return;
++#endif
+ 	va_start(ap, fmt);
+ 	vsnprintf(logbuf, sizeof(logbuf), fmt, ap);
++	va_end(ap);
+ 
+ 	if (foreground && debug_thresh >= level) {
+ 		time_t now;
+diff -urN dhcp-0.10.orig/libdhcp6client/dhc6_alloc.c dhcp-0.10/libdhcp6client/dhc6_alloc.c
+--- dhcp-0.10.orig/libdhcp6client/dhc6_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ dhcp-0.10/libdhcp6client/dhc6_alloc.c	2006-06-22 11:46:51.000000000 -0400
+@@ -0,0 +1,67 @@
++#include <malloc.h>
++#include <search.h>
++extern void tdestroy (void *root, void (*free_node)(void *nodep));
++void *ifp_ptr;
++
++static void *ptr_tree=0L;
++
++static int ptr_comparator( const void *p1, const void *p2 )
++{
++    return
++	(  (p1 == p2) 
++	   ? 0
++	   :( (p1 > p2)
++	      ? 1
++	      : -1
++	    )
++	);
++}
++
++void *dhc6_alloc( size_t s )
++{
++    void *ptr = malloc( s );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++void *dhc6_realloc( void *ptr, size_t s )
++{
++    void *ptr2 = realloc(ptr, s);
++    if ( ptr2 != 0 )
++    {
++	if ( ptr != 0 )
++	    tdelete(ptr,&(ptr_tree), ptr_comparator);
++	tsearch(ptr2, &(ptr_tree), ptr_comparator);
++    }
++    return ptr2;
++}
++
++void *dhc6_calloc( size_t n, size_t s )
++{
++    void *ptr = calloc( n, s );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++char *dhc6_strdup( char *str )
++{
++    char *ptr = strdup( str );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++void dhc6_free( void *ptr )
++{
++    free(ptr);
++    tdelete(ptr, &(ptr_tree), ptr_comparator);
++}
++
++void dhc6_free_all_pointers(void)
++{
++    if( ptr_tree != 0L )
++	tdestroy(ptr_tree, free);
++    ptr_tree = 0L;
++}
+diff -urN dhcp-0.10.orig/libdhcp6client/dhc6_alloc.h dhcp-0.10/libdhcp6client/dhc6_alloc.h
+--- dhcp-0.10.orig/libdhcp6client/dhc6_alloc.h	1969-12-31 19:00:00.000000000 -0500
++++ dhcp-0.10/libdhcp6client/dhc6_alloc.h	2006-06-22 11:46:51.000000000 -0400
+@@ -0,0 +1,17 @@
++
++extern void *dhc6_alloc( size_t );
++extern void *dhc6_realloc(void *, size_t);
++extern void *dhc6_calloc(size_t, size_t);
++extern char *dhc6_strdup(char *str);
++extern void dhc6_free( void *);
++extern void dhc6_free_all_pointers(void);
++#undef malloc
++#define malloc( size ) dhc6_alloc( size )
++#undef realloc
++#define realloc(ptr, size) dhc6_realloc(ptr, size)
++#undef calloc
++#define calloc(n, size) dhc6_calloc(n, size)
++#undef free
++#define free( ptr ) dhc6_free( ptr )
++#undef strdup
++#define strdup( str ) dhc6_strdup( str )
+diff -urN dhcp-0.10.orig/libdhcp6client/dhcp6.h dhcp-0.10/libdhcp6client/dhcp6.h
+--- dhcp-0.10.orig/libdhcp6client/dhcp6.h	2006-06-22 11:45:08.000000000 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6.h	2006-06-22 11:46:51.000000000 -0400
+@@ -116,9 +116,24 @@
+ 
+ typedef enum { IANA, IATA, IAPD} iatype_t;
+ 
+-typedef enum { ACTIVE, RENEW,
++#ifdef LIBDHCP
++typedef enum { DHCP6_ACTIVE=1, DHCP6_RENEW,
++	       DHCP6_REBIND, DHCP6_EXPIRED,
++	       DHCP6_INVALID } state_t;
++
++#define ACTIVE 	DHCP6_ACTIVE
++#define RENEW  	DHCP6_RENEW
++#define REBIND	DHCP6_REBIND
++#define EXPIRED	DHCP6_EXPIRED
++#define INVALID DHCP6_INVALID
++#include <libdhcp_control.h>
++extern LIBDHCP_Control *libdhcp_control;
++#include <dhc6_alloc.h>
++#else
++typedef enum { ACTIVE=1, RENEW,
+ 	       REBIND, EXPIRED,
+ 	       INVALID } state_t;
++#endif
+ /* Internal data structure */
+ 
+ struct duid {
+diff -urN dhcp-0.10.orig/libdhcp6client/dhcp6c.c dhcp-0.10/libdhcp6client/dhcp6c.c
+--- dhcp-0.10.orig/libdhcp6client/dhcp6c.c	2006-06-22 11:45:08.000000000 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-06-22 11:47:19.000000000 -0400
 @@ -73,6 +73,9 @@
  #include "common.h"
  #include "timer.h"
@@ -1047,8 +1286,8 @@
 +	       if( retries++ > 1 )
 +	       {
 +		   dprintf(LOG_INFO, "NIC is not connected to the network, "
-+			    "please connect it. dhcp6c is sleeping ...");
-+		   sleep(10);
++			    "please connect it.");
++		   exit(1);
 +	       }
 +	       memset(&ifr,'\0',sizeof(struct ifreq));
 +	       strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
@@ -1070,14 +1309,107 @@
  	}
  	return;
  }
---- /dev/null	2006-06-08 19:51:50.818060750 -0400
-+++ dhcp-0.10/libdhcp6client/libdhcp_control.h	2006-06-08 20:26:36.000000000 -0400
-@@ -0,0 +1,104 @@
-+/* libdhcp_control.h
+diff -urN dhcp-0.10.orig/libdhcp6client/dhcp6client.h dhcp-0.10/libdhcp6client/dhcp6client.h
+--- dhcp-0.10.orig/libdhcp6client/dhcp6client.h	1969-12-31 19:00:00.000000000 -0500
++++ dhcp-0.10/libdhcp6client/dhcp6client.h	2006-06-22 11:46:51.000000000 -0400
+@@ -0,0 +1,22 @@
++/* dhcp6client.h
 + *
-+ *  DHCP client control API for libdhcp, a minimal interface to the
-+ *  ISC dhcp IPv4 client libdhcp4client library,
-+ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
++ *  Interface to the DHCPv6 client libdhcp6client library.
++ *
++ *
++ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation at
++ *           http://www.fsf.org/licensing/licenses/gpl.txt
++ *  and included in this software distribution as the "LICENSE" file.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ */
++struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
++
++extern int dhcpv6_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
++/* the DHCPv6 client main() function */
+diff -urN dhcp-0.10.orig/libdhcp6client/lease.c dhcp-0.10/libdhcp6client/lease.c
+--- dhcp-0.10.orig/libdhcp6client/lease.c	2004-03-03 15:11:16.000000000 -0500
++++ dhcp-0.10/libdhcp6client/lease.c	2006-06-22 11:46:51.000000000 -0400
+@@ -64,7 +64,7 @@
+ static int init_lease_hashes __P((void));
+ 
+ int 
+-write_lease(const struct dhcp6_lease *lease_ptr,
++write_6_lease(const struct dhcp6_lease *lease_ptr,
+ 	    FILE *file)
+ {
+ 	struct tm brokendown_time;
+@@ -140,7 +140,7 @@
+ 		for (i = 0; i < lease_hash_table->hash_size; i++) {
+ 			element = lease_hash_table->hash_list[i];
+ 			while (element) {
+-				if (write_lease((struct dhcp6_lease *)element->data, 
++				if (write_6_lease((struct dhcp6_lease *)element->data, 
+ 							sync_file) < 0) {
+ 					dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
+ 					return (NULL);
+@@ -152,7 +152,7 @@
+ 		struct dhcp6_lease *lv, *lv_next;
+ 		for (lv = TAILQ_FIRST(&client6_iaidaddr.lease_list); lv; lv = lv_next) {
+ 			lv_next = TAILQ_NEXT(lv, link);
+-			if (write_lease(lv, sync_file) < 0)  
++			if (write_6_lease(lv, sync_file) < 0)  
+ 				dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
+ 		}
+ 	}
+@@ -354,8 +354,8 @@
+ get_linklocal(const char *ifname,
+ 	      struct in6_addr *linklocal)
+ {	
+-	struct ifaddrs *ifa, *ifap;
+-	struct sockaddr *sd;
++	struct ifaddrs *ifa=0, *ifap=0;
++	struct sockaddr *sd=0;
+ 	if (getifaddrs(&ifap) < 0) {
+ 		dprintf(LOG_ERR, "getifaddrs error");
+ 		return -1;
+diff -urN dhcp-0.10.orig/libdhcp6client/lease.h dhcp-0.10/libdhcp6client/lease.h
+--- dhcp-0.10.orig/libdhcp6client/lease.h	2003-07-01 22:21:25.000000000 -0400
++++ dhcp-0.10/libdhcp6client/lease.h	2006-06-22 11:46:51.000000000 -0400
+@@ -101,7 +101,7 @@
+ extern FILE *init_leases __P((const char *));
+ extern void lease_parse __P((FILE *));
+ extern int do_iaidaddr_hash __P((struct dhcp6_lease *, struct client6_if *));
+-extern int write_lease __P((const struct dhcp6_lease *, FILE *));
++extern int write_6_lease __P((const struct dhcp6_lease *, FILE *));
+ extern FILE *sync_leases __P((FILE *, const char *, char *));
+ extern struct dhcp6_timer *syncfile_timo __P((void *));
+ extern unsigned int addr_hash __P((const void *));
+diff -urN dhcp-0.10.orig/libdhcp6client/lease_token.l dhcp-0.10/libdhcp6client/lease_token.l
+--- dhcp-0.10.orig/libdhcp6client/lease_token.l	2004-02-04 18:29:24.000000000 -0500
++++ dhcp-0.10/libdhcp6client/lease_token.l	2006-06-22 11:46:51.000000000 -0400
+@@ -241,6 +241,9 @@
+ 	
+ 	fseek(file, 0, 0);
+ 	yyin = file;
++	yy_init=1;
++	yy_start=0;
++	yy_current_buffer=0;
+ 	yylex(); 
+ 	return;
+ }
+diff -urN dhcp-0.10.orig/libdhcp6client/libdhcp_control.h dhcp-0.10/libdhcp6client/libdhcp_control.h
+--- dhcp-0.10.orig/libdhcp6client/libdhcp_control.h	1969-12-31 19:00:00.000000000 -0500
++++ dhcp-0.10/libdhcp6client/libdhcp_control.h	2006-06-22 11:46:51.000000000 -0400
+@@ -0,0 +1,104 @@
++/* libdhcp_control.h
++ *
++ *  DHCP client control API for libdhcp, a minimal interface to the
++ *  ISC dhcp IPv4 client libdhcp4client library,
++ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
 + *
 + *  Each DHCP client library must include this file to be controlled
 + *  by libdhcp.
@@ -1177,324 +1509,3 @@
 +} LIBDHCP_Capability;
 +
 +#endif
---- /dev/null	2006-06-08 19:51:50.818060750 -0400
-+++ dhcp-0.10/libdhcp6client/dhc6_alloc.h	2006-06-08 20:26:36.000000000 -0400
-@@ -0,0 +1,17 @@
-+
-+extern void *dhc6_alloc( size_t );
-+extern void *dhc6_realloc(void *, size_t);
-+extern void *dhc6_calloc(size_t, size_t);
-+extern char *dhc6_strdup(char *str);
-+extern void dhc6_free( void *);
-+extern void dhc6_free_all_pointers(void);
-+#undef malloc
-+#define malloc( size ) dhc6_alloc( size )
-+#undef realloc
-+#define realloc(ptr, size) dhc6_realloc(ptr, size)
-+#undef calloc
-+#define calloc(n, size) dhc6_calloc(n, size)
-+#undef free
-+#define free( ptr ) dhc6_free( ptr )
-+#undef strdup
-+#define strdup( str ) dhc6_strdup( str )
---- dhcp-0.10/libdhcp6client/lease.c.libdhcp6client	2004-03-03 15:11:16.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/lease.c	2006-06-08 20:26:36.000000000 -0400
-@@ -64,7 +64,7 @@
- static int init_lease_hashes __P((void));
- 
- int 
--write_lease(const struct dhcp6_lease *lease_ptr,
-+write_6_lease(const struct dhcp6_lease *lease_ptr,
- 	    FILE *file)
- {
- 	struct tm brokendown_time;
-@@ -140,7 +140,7 @@
- 		for (i = 0; i < lease_hash_table->hash_size; i++) {
- 			element = lease_hash_table->hash_list[i];
- 			while (element) {
--				if (write_lease((struct dhcp6_lease *)element->data, 
-+				if (write_6_lease((struct dhcp6_lease *)element->data, 
- 							sync_file) < 0) {
- 					dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
- 					return (NULL);
-@@ -152,7 +152,7 @@
- 		struct dhcp6_lease *lv, *lv_next;
- 		for (lv = TAILQ_FIRST(&client6_iaidaddr.lease_list); lv; lv = lv_next) {
- 			lv_next = TAILQ_NEXT(lv, link);
--			if (write_lease(lv, sync_file) < 0)  
-+			if (write_6_lease(lv, sync_file) < 0)  
- 				dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
- 		}
- 	}
-@@ -354,8 +354,8 @@
- get_linklocal(const char *ifname,
- 	      struct in6_addr *linklocal)
- {	
--	struct ifaddrs *ifa, *ifap;
--	struct sockaddr *sd;
-+	struct ifaddrs *ifa=0, *ifap=0;
-+	struct sockaddr *sd=0;
- 	if (getifaddrs(&ifap) < 0) {
- 		dprintf(LOG_ERR, "getifaddrs error");
- 		return -1;
---- dhcp-0.10/libdhcp6client/lease.h.libdhcp6client	2003-07-01 22:21:25.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/lease.h	2006-06-08 20:26:36.000000000 -0400
-@@ -101,7 +101,7 @@
- extern FILE *init_leases __P((const char *));
- extern void lease_parse __P((FILE *));
- extern int do_iaidaddr_hash __P((struct dhcp6_lease *, struct client6_if *));
--extern int write_lease __P((const struct dhcp6_lease *, FILE *));
-+extern int write_6_lease __P((const struct dhcp6_lease *, FILE *));
- extern FILE *sync_leases __P((FILE *, const char *, char *));
- extern struct dhcp6_timer *syncfile_timo __P((void *));
- extern unsigned int addr_hash __P((const void *));
---- /dev/null	2006-06-08 19:51:50.818060750 -0400
-+++ dhcp-0.10/libdhcp6client/dhc6_alloc.c	2006-06-08 20:26:36.000000000 -0400
-@@ -0,0 +1,67 @@
-+#include <malloc.h>
-+#include <search.h>
-+extern void tdestroy (void *root, void (*free_node)(void *nodep));
-+void *ifp_ptr;
-+
-+static void *ptr_tree=0L;
-+
-+static int ptr_comparator( const void *p1, const void *p2 )
-+{
-+    return
-+	(  (p1 == p2) 
-+	   ? 0
-+	   :( (p1 > p2)
-+	      ? 1
-+	      : -1
-+	    )
-+	);
-+}
-+
-+void *dhc6_alloc( size_t s )
-+{
-+    void *ptr = malloc( s );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+void *dhc6_realloc( void *ptr, size_t s )
-+{
-+    void *ptr2 = realloc(ptr, s);
-+    if ( ptr2 != 0 )
-+    {
-+	if ( ptr != 0 )
-+	    tdelete(ptr,&(ptr_tree), ptr_comparator);
-+	tsearch(ptr2, &(ptr_tree), ptr_comparator);
-+    }
-+    return ptr2;
-+}
-+
-+void *dhc6_calloc( size_t n, size_t s )
-+{
-+    void *ptr = calloc( n, s );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+char *dhc6_strdup( char *str )
-+{
-+    char *ptr = strdup( str );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+void dhc6_free( void *ptr )
-+{
-+    free(ptr);
-+    tdelete(ptr, &(ptr_tree), ptr_comparator);
-+}
-+
-+void dhc6_free_all_pointers(void)
-+{
-+    if( ptr_tree != 0L )
-+	tdestroy(ptr_tree, free);
-+    ptr_tree = 0L;
-+}
---- dhcp-0.10/libdhcp6client/common.c.libdhcp6client	2006-06-08 20:26:21.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/common.c	2006-06-08 20:26:36.000000000 -0400
-@@ -79,11 +79,19 @@
- #include "timer.h"
- #include "lease.h"
- 
-+#ifdef LIBDHCP
-+#include "libdhcp_control.h"
-+#endif
-+
- int foreground;
- int debug_thresh;
- struct dhcp6_if *dhcp6_if;
- struct dns_list dnslist;
-+#ifdef LIBDHCP
-+struct host_conf *host_conflist;
-+#else
- static struct host_conf *host_conflist;
-+#endif
- static int in6_matchflags __P((struct sockaddr *, char *, int));
- ssize_t gethwid __P((char *, int, const char *, u_int16_t *));
- static int get_assigned_ipv6addrs __P((char *, char *,
-@@ -645,7 +653,7 @@
- 	memset(&ifr, 0, sizeof(ifr));
- 	strncpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name));
- 	ifr.ifr_addr = *(struct sockaddr *)addr;
--
-+	dprintf(LOG_DEBUG,"in6_matchflags: SIOCGIFFLAGS");
- 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
- 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
- 		     addr2str(addr));
-@@ -720,6 +728,9 @@
- 	struct dhcp6_duid_type1 *dp; /* we only support the type1 DUID */
- 	char tmpbuf[256];	/* DUID should be no more than 256 bytes */
- 
-+#ifdef LIBDHCP
-+     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
-+#endif
- 	if ((fp = fopen(idfile, "r")) == NULL && errno != ENOENT)
- 		dprintf(LOG_NOTICE, "%s" "failed to open DUID file: %s",
- 		    FNAME, idfile);
-@@ -774,6 +785,9 @@
- 	}
- 
- 	/* save the (new) ID to the file for next time */
-+#ifdef LIBDHCP
-+     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
-+#endif
- 	if (!fp) {
- 		if ((fp = fopen(idfile, "w+")) == NULL) {
- 			dprintf(LOG_ERR, "%s"
-@@ -821,8 +835,13 @@
- 		return -1;
- 
- 	strcpy(if_hwaddr.ifr_name, ifname);
-+	dprintf(LOG_DEBUG,"gethwid: ioctl SIOCGIFHWADDR");
- 	if (ioctl(skfd, SIOCGIFHWADDR, &if_hwaddr) < 0)
-+	{
-+	    close(skfd);
- 		return -1;
-+	}
-+	close(skfd);
- 	/* only support Ethernet */
- 	switch (if_hwaddr.ifr_hwaddr.sa_family) {
- 	case ARPHRD_ETHER:
-@@ -938,7 +957,7 @@
- 		cp = (char *)(p + 1);
- 		np = (struct dhcp6opt *)(cp + optlen);
- 
--		dprintf(LOG_DEBUG, "%s" "get DHCP option %s, len %d",
-+		dprintf(LOG_INFO, "%s" "get DHCP option %s, len %d",
- 		    FNAME, dhcp6optstr(opt), optlen);
- 
- 		/* option length field overrun */
-@@ -1078,7 +1097,7 @@
- 				ntohl(*(u_int32_t *)(cp + sizeof(u_int32_t)));
- 			optinfo->iaidinfo.rebindtime = 
- 				ntohl(*(u_int32_t *)(cp + 2 * sizeof(u_int32_t)));
--			dprintf(LOG_DEBUG, "get option iaid is %u, renewtime %u, "
-+			dprintf(LOG_INFO, "get option iaid is %u, renewtime %u, "
- 				"rebindtime %u", optinfo->iaidinfo.iaid,
- 				optinfo->iaidinfo.renewtime, optinfo->iaidinfo.rebindtime);
- 			if (get_assigned_ipv6addrs(cp + 3 * sizeof(u_int32_t), 
-@@ -1182,7 +1201,7 @@
- 		opt = ntohs(opth.dh6opt_type);
- 		cp = p + sizeof(opth);
- 		np = cp + optlen;
--		dprintf(LOG_DEBUG, "  IA address option: %s, "
-+		dprintf(LOG_INFO, "  IA address option: %s, "
- 			"len %d", dhcp6optstr(opt), optlen);
- 
- 		if (np > ep) {
-@@ -1212,7 +1231,7 @@
- 			}
- 			break;
- 		case DH6OPT_IADDR:
--			if (optlen < sizeof(ai) - sizeof(u_int32_t))
-+			if (optlen < sizeof(ai)- sizeof(u_int32_t))
- 				goto malformed;
- 			memcpy(&ai, p, sizeof(ai));
- 			/* copy the information into internal format */
-@@ -1221,7 +1240,7 @@
- 			addr6.preferlifetime = ntohl(ai.preferlifetime);
- 			addr6.validlifetime = ntohl(ai.validlifetime);
- 			addr6.plen = ai.plen;
--			dprintf(LOG_DEBUG, "  get IAADR address information: "
-+			dprintf(LOG_INFO, "  get IAADR address information: "
- 			    "%s preferlifetime %d validlifetime %d",
- 			    in6addr2str(&addr6.addr, 0),
- 			    addr6.preferlifetime, addr6.validlifetime);
-@@ -1998,8 +2017,16 @@
- 	va_list ap;
- 	char logbuf[LINE_MAX];
- 
-+#if LIBDHCP
-+	va_start(ap, fmt);
-+	if ( libdhcp_control && libdhcp_control->eh )
-+	    libdhcp_control->eh(libdhcp_control, level, fmt, ap);
-+	va_end(ap);
-+	return;
-+#endif
- 	va_start(ap, fmt);
- 	vsnprintf(logbuf, sizeof(logbuf), fmt, ap);
-+	va_end(ap);
- 
- 	if (foreground && debug_thresh >= level) {
- 		time_t now;
---- dhcp-0.10/libdhcp6client/dhcp6.h.libdhcp6client	2006-06-08 20:26:21.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6.h	2006-06-08 20:26:36.000000000 -0400
-@@ -116,9 +116,24 @@
- 
- typedef enum { IANA, IATA, IAPD} iatype_t;
- 
--typedef enum { ACTIVE, RENEW,
-+#ifdef LIBDHCP
-+typedef enum { DHCP6_ACTIVE=1, DHCP6_RENEW,
-+	       DHCP6_REBIND, DHCP6_EXPIRED,
-+	       DHCP6_INVALID } state_t;
-+
-+#define ACTIVE 	DHCP6_ACTIVE
-+#define RENEW  	DHCP6_RENEW
-+#define REBIND	DHCP6_REBIND
-+#define EXPIRED	DHCP6_EXPIRED
-+#define INVALID DHCP6_INVALID
-+#include <libdhcp_control.h>
-+extern LIBDHCP_Control *libdhcp_control;
-+#include <dhc6_alloc.h>
-+#else
-+typedef enum { ACTIVE=1, RENEW,
- 	       REBIND, EXPIRED,
- 	       INVALID } state_t;
-+#endif
- /* Internal data structure */
- 
- struct duid {
---- /dev/null	2006-06-08 19:51:50.818060750 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6client.h	2006-06-08 20:26:36.000000000 -0400
-@@ -0,0 +1,22 @@
-+/* dhcp6client.h
-+ *
-+ *  Interface to the DHCPv6 client libdhcp6client library.
-+ *
-+ *
-+ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at
-+ *           http://www.fsf.org/licensing/licenses/gpl.txt
-+ *  and included in this software distribution as the "LICENSE" file.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ */
-+struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
-+
-+extern int dhcpv6_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
-+/* the DHCPv6 client main() function */


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dhcpv6.spec	20 Jun 2006 20:14:52 -0000	1.36
+++ dhcpv6.spec	22 Jun 2006 17:23:31 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 27
+Release: 28
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -189,6 +189,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 0.10-28
+- If link is down, exit rather than loop indefinitely (#195250)
+
 * Tue Jun 20 2006 Peter Jones <pjones at redhat.com> - 0.10-27
 - don't patch using autoconf, do it in the spec file so it can be
   patched on top of



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:33:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:33:39 -0400
Subject: rpms/kexec-tools/FC-5 kexec-ppc64-ingnore-args-linux.patch, NONE,
	1.1 kexec-tools.spec, 1.18, 1.19
Message-ID: <200606221733.k5MHXdwT013202@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13187

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-ppc64-ingnore-args-linux.patch 
Log Message:
adding ppc64 args-linux patch

kexec-ppc64-ingnore-args-linux.patch:
 kexec-elf-ppc64.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE kexec-ppc64-ingnore-args-linux.patch ---
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
@@ -93,6 +93,7 @@ int elf_ppc64_load(int argc, char **argv
 #define OPT_APPEND     (OPT_ARCH_MAX+0)
 #define OPT_RAMDISK     (OPT_ARCH_MAX+1)
 #define OPT_DEVICETREEBLOB     (OPT_ARCH_MAX+2)
+#define OPT_ARGS_IGNORE		(OPT_ARCH_MAX+3)
 
 	static const struct option options[] = {
 		KEXEC_ARCH_OPTIONS
@@ -101,6 +102,7 @@ int elf_ppc64_load(int argc, char **argv
 		{ "ramdisk",            1, NULL, OPT_RAMDISK },
 		{ "initrd",             1, NULL, OPT_RAMDISK },
 		{ "devicetreeblob",     1, NULL, OPT_DEVICETREEBLOB },
+		{ "args-linux",		0, NULL, OPT_ARGS_IGNORE },
 		{ 0,                    0, NULL, 0 },
 	};
 
@@ -134,6 +136,8 @@ int elf_ppc64_load(int argc, char **argv
 		case OPT_DEVICETREEBLOB:
 			devicetreeblob = optarg;
 			break;
+		case OPT_ARGS_IGNORE:
+			break;
 		}
 	}
 


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kexec-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kexec-tools.spec	8 Mar 2006 20:39:23 -0000	1.18
+++ kexec-tools.spec	22 Jun 2006 17:33:37 -0000	1.19
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 16
+Release: 17
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -28,6 +28,7 @@
 #
 # Patches 301 through 400 are meant for ppc64 kexec-tools enablement
 #
+Patch301: kexec-ppc64-ingnore-args-linux.patch
 
 Patch501: kexec-tools-1.101-Makefile.patch
 
@@ -43,6 +44,7 @@
 rm -f ../kexec-tools-1.101.spec
 %patch1 -p1
 %patch101 -p1
+%patch301 -p1
 %patch501 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
@@ -96,6 +98,9 @@
 %doc TODO
 
 %changelog
+* Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-17
+- Add patch to allow ppc64 to ignore args-linux option
+
 * Wed Mar 08 2006 Bill Nottingham <notting at redhat.com> - 1.101-16
 - fix scriptlet - call chkconfig --add, change the default in the
   script itself (#183633)



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:38:36 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.9, 1.10
Message-ID: <200606221738.k5MHcaVC013311@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13296

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
Log Message:
extra include needed?

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                      |    0 
 inc/print.hxx                       |    0 
 inc/psprint/ppdparser.hxx           |    0 
 psprint/inc/psprint/ppdparser.hxx   |    2 
 source/dialogs/makefile.mk          |    0 
 source/dialogs/printdlg.cxx         |    0 
 source/gdi/jobset.cxx               |    0 
 svtools/source/dialogs/makefile.mk  |    4 
 svtools/source/dialogs/printdlg.cxx |  242 ++++++++++++++++++++++++++++++++++--
 svtools/util/makefile.mk            |    8 +
 util/makefile.mk                    |    0 
 vcl/inc/jobset.hxx                  |    1 
 vcl/inc/print.hxx                   |    1 
 vcl/source/gdi/jobset.cxx           |  173 +++++++++++++++++++++++++
 14 files changed, 421 insertions(+), 10 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 15:45:54 -0000	1.9
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 17:38:33 -0000	1.10
@@ -293,7 +293,7 @@
 diff -u -r1.21 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	8 Sep 2005 15:17:00 -0000	1.21
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	19 May 2006 14:58:56 -0000
-@@ -83,8 +83,37 @@
+@@ -83,8 +83,38 @@
  #include <comphelper/processfactory.hxx>
  #endif
  
@@ -316,6 +316,7 @@
 +#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
 +#include "miscopt.hxx"
 +#endif
++#include <gtk/gtkprintsettings.h>
 +#include <gtk/gtkprintunixdialog.h>
 +#include <gtk/gtkstock.h>
 +#include <gtk/gtkcheckbutton.h>



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:40:57 -0400
Subject: rpms/evolution/devel evolution-2.7.3-no-boolean-in-schemas.patch,
	NONE, 1.1 evolution.spec, 1.153, 1.154
Message-ID: <200606221740.k5MHevV3024330@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24205

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-no-boolean-in-schemas.patch 
Log Message:
- Fix bad type in schema file (Gnome.org #345677).


evolution-2.7.3-no-boolean-in-schemas.patch:
 evolution-mail.schemas.in.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.7.3-no-boolean-in-schemas.patch ---
--- evolution-2.7.3/mail/evolution-mail.schemas.in.in.no-boolean-in-schemas	2006-06-22 11:20:32.000000000 -0400
+++ evolution-2.7.3/mail/evolution-mail.schemas.in.in	2006-06-22 11:20:46.000000000 -0400
@@ -475,7 +475,7 @@
       <key>/schemas/apps/evolution/mail/display/address_compress</key>
       <applyto>/apps/evolution/mail/display/address_compress</applyto>
       <owner>evolution-mail</owner>
-      <type>boolean</type>
+      <type>bool</type>
       <default>true</default>
       <locale name="C">
          <short>Compress display of addresses in TO/CC/BCC</short>


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- evolution.spec	14 Jun 2006 23:45:06 -0000	1.153
+++ evolution.spec	22 Jun 2006 17:40:54 -0000	1.154
@@ -43,11 +43,11 @@
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
-### Description ###
+### Abstract ###
 
 Name: evolution
 Version: 2.7.3
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -116,6 +116,9 @@
 # Gnome.org #343331
 Patch900: evolution-2.7.2.1-quit-resize-crash.patch
 
+# Gnome.org #345677
+Patch901: evolution-2.7.3-no-boolean-in-schemas.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -268,6 +271,7 @@
 # %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain at redhat.com
 
 %patch900 -p1 -b .quit-resize-crash
+%patch901 -p1 -b .no-boolean-in-schemas
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -658,6 +662,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Jun 22 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-3
+- Fix bad type in schema file (Gnome.org #345677).
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.7.3-2
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:47:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2301,
	1.2302 linux-2.6-compile-fixes.patch, 1.73, 1.74
Message-ID: <200606221747.k5MHlY4j008958@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8828

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
buildenfixor.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2301
retrieving revision 1.2302
diff -u -r1.2301 -r1.2302
--- kernel-2.6.spec	22 Jun 2006 16:56:15 -0000	1.2301
+++ kernel-2.6.spec	22 Jun 2006 17:47:32 -0000	1.2302
@@ -1060,7 +1060,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1

linux-2.6-compile-fixes.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- linux-2.6-compile-fixes.patch	9 May 2006 19:22:38 -0000	1.73
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 17:47:32 -0000	1.74
@@ -0,0 +1,20 @@
+current.diff
+
+kernel/power/main.c: In function 'suspend_prepare':
+kernel/power/main.c:89: error: implicit declaration of function 'suspend_console'
+kernel/power/main.c: In function 'suspend_finish':
+kernel/power/main.c:137: error: implicit declaration of function 'resume_console'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.17.noarch/kernel/power/main.c~	2006-06-22 13:45:57.827853000 -0400
++++ linux-2.6.17.noarch/kernel/power/main.c	2006-06-22 13:46:09.894764000 -0400
+@@ -15,7 +15,7 @@
+ #include <linux/errno.h>
+ #include <linux/init.h>
+ #include <linux/pm.h>
+-
++#include <linux/console.h>
+ 
+ #include "power.h"
+ 



From fedora-cvs-commits at redhat.com  Thu Jun 22 17:47:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 13:47:36 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.112, 1.113 mkinitrd.spec, 1.129,
	1.130 sources, 1.125, 1.126
Message-ID: <200606221747.k5MHla9b008978@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8932/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
auto-import mkinitrd-5.0.44-1 on branch devel from mkinitrd-5.0.44-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- .cvsignore	21 Jun 2006 15:19:20 -0000	1.112
+++ .cvsignore	22 Jun 2006 17:47:34 -0000	1.113
@@ -1 +1 @@
-mkinitrd-5.0.43.tar.bz2
+mkinitrd-5.0.44.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- mkinitrd.spec	21 Jun 2006 15:19:20 -0000	1.129
+++ mkinitrd.spec	22 Jun 2006 17:47:34 -0000	1.130
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.43
+Version: 5.0.44
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,10 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.44-1
+- fix so we only use iscsistart if we're doing root on iscsi 
+- fix spurious shell error (noticed by karsten)
+
 * Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.43-1
 - Add back patches from pjones which had just been in the package for 
   * fix bad shell code to detect DMs in use


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- sources	21 Jun 2006 15:19:20 -0000	1.125
+++ sources	22 Jun 2006 17:47:34 -0000	1.126
@@ -1 +1 @@
-7ae8bad01c935f4820fee74396188cdc  mkinitrd-5.0.43.tar.bz2
+ad91b343633ec87805c2dfb3fe398a2b  mkinitrd-5.0.44.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:17:29 -0400
Subject: rpms/dhcp/devel dhcp-3.0.4-lib-makefile.patch, NONE,
	1.1 dhcp-3.0.4-timeouts.patch, NONE, 1.1 dhcp.spec, 1.104,
	1.105 libdhcp4client.Makefile, 1.4, NONE
Message-ID: <200606221817.k5MIHTaV032225@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29470

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-3.0.4-lib-makefile.patch dhcp-3.0.4-timeouts.patch 
Removed Files:
	libdhcp4client.Makefile 
Log Message:
- Make timeout dispatch code not recurse while traversing a linked
  list, so it doesn't try to free an entries that have been removed.
- Don't patch in a makefile, do it in the spec.


dhcp-3.0.4-lib-makefile.patch:
 libdhcp4client.Makefile |   67 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+)

--- NEW FILE dhcp-3.0.4-lib-makefile.patch ---
--- /dev/null	2006-06-15 21:25:35.725506500 -0400
+++ dhcp-3.0.4/libdhcp4client.Makefile	2006-06-22 12:06:40.000000000 -0400
@@ -0,0 +1,67 @@
+#
+# Makefile for libdhcp4client
+#
+# Jason Vas Dias <jvdias at redhat.com> May 2006
+#
+WORK:=work.$(shell ./configure --print-sysname)
+LIBS:=common omapip dst minires
+ARS:=common/libdhcp.a minires/libres.a omapip/libomapi.a dst/libdst.a
+OBJS:=$(patsubst $(WORK)/%,%,$(wildcard $(patsubst %,$(WORK)/%,client/dhclient.o client/clparse.o $(patsubst %,%/*.o,$(LIBS)))))
+MAKS:=$(patsubst %,%/Makefile,client $(LIBS))
+SRCS:=$(patsubst %.o,%.c,$(OBJS) $(wildcard dst/*.h))
+HDRS:=$(wildcard includes/*.h includes/cf/*.h includes/omapip/*.h includes/minires/*.h includes/arpa/*.h includes/netinet/*.h)
+DESTDIR ?=
+LIBDIR  ?=/usr/lib
+INCLUDEDIR ?= /usr/include
+PKGCFGDIR ?= $(LIBDIR)/pkgconfig
+
+all:	libdhcp4client/. libdhcp4client.a libdhcp4client.so.1
+
+clean:
+	rm -rf libdhcp4client/ libdhcp4client.a libdhcp4client.so.1 includes/libdhcp_control.h 
+
+libdhcp4client/.:	$(patsubst %,$(WORK)/%,$(MAKS) $(SRCS))
+	mkdir libdhcp4client
+	for x in client $(LIBS) ; do cp -avL $(WORK)/$$x libdhcp4client/$$x || :; done
+	sed -i -e '/^CC_OPTIONS\ =/{s/$$/ -DLIBDHCP/;s/-fpie/-fPIC/;s/-O2/-Os/}' libdhcp4client/*/Makefile
+
+libdhcp4client/client/%: $(patsubst %.o,%.c,$@) $(HDRS)
+	$(MAKE) -C libdhcp4client/client $*
+
+libdhcp4client/common/%: $(patsubst %.o,%.c,$@) $(HDRS)
+	$(MAKE) -C libdhcp4client/common $*
+
+libdhcp4client/omapip/%: $(patsubst %.o,%.c,$@) $(HDRS)
+	$(MAKE) -C libdhcp4client/omapip $*
+
+libdhcp4client/minires/%: $(patsubst %.o,%.c,$@) $(HDRS)
+	$(MAKE) -C libdhcp4client/minires $*
+
+libdhcp4client/dst/%: $(patsubst %.o,%.c,$@) $(HDRS)
+	$(MAKE) -C libdhcp4client/dst $*
+
+libdhcp4client.a: $(patsubst %,libdhcp4client/%,$(OBJS)) $(patsubst %,libdhcp4client/%,$(ARS))
+	$(AR) crus $@ libdhcp4client/client/dhclient.o libdhcp4client/client/clparse.o `for a in libdhcp4client/{common/libdhcp.a,minires/libres.a,omapip/libomapi.a,dst/libdst.a}; do ar t $$a | egrep -v res_query.o | sed 's@^@'$${a%/*}/'@'; done`
+# explanation: minires/res_query.o contains undefined symbol __h_errno_set,
+# is not used by any dhcp code, and is optimized out by the linker when
+# producing the dhclient executable or a shared library.
+#
+
+libdhcp4client.so.1: libdhcp4client/client/dhclient.o libdhcp4client/client/clparse.o $(patsubst %,libdhcp4client/%,$(ARS))
+	$(CC) -shared -o $@ -Wl,-soname,$@ $^
+
+install:  libdhcp4client.so.1 libdhcp4client.a libdhcp4client.pc
+	install -p -m 0754 -D libdhcp4client.so.1 $(DESTDIR)/$(LIBDIR)/libdhcp4client.so.1
+	ln -sf libdhcp4client.so.1 $(DESTDIR)/$(LIBDIR)/libdhcp4client.so
+	install -p -m 0644 -D libdhcp4client.a  $(DESTDIR)/$(LIBDIR)/libdhcp4client.a
+	mkdir -p   $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/{cf,arpa,minires,omapip,netinet}
+	chmod 0755 $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/{cf,arpa,minires,omapip,netinet}
+	install -p -m 0644 -D includes/*.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/
+	install -p -m 0644 includes/cf/*.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/cf
+	install -p -m 0644 includes/arpa/*.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/arpa
+	install -p -m 0644 includes/minires/*.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/minires
+	install -p -m 0644 includes/omapip/*.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/omapip
+	install -p -m 0644 includes/netinet/*.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/netinet
+	mv $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/dhcp4client.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/
+	mv $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/isc_dhcp/libdhcp_control.h $(DESTDIR)/$(INCLUDEDIR)/dhcp4client/
+	install -p -m 0644 -D libdhcp4client.pc $(DESTDIR)/$(PKGCFGDIR)/libdhcp4client.pc

dhcp-3.0.4-timeouts.patch:
 common/dispatch.c                |   11 +
 includes/dhcpd.h                 |    9 -
 libdhcp4client/client/dhclient.c |    1 
 libdhcp4client/common/dispatch.c |  225 ++++++++++++++++++++-------------------
 4 files changed, 129 insertions(+), 117 deletions(-)

--- NEW FILE dhcp-3.0.4-timeouts.patch ---
--- dhcp-3.0.4/libdhcp4client/client/dhclient.c.timeouts	2006-06-22 13:11:59.000000000 -0400
+++ dhcp-3.0.4/libdhcp4client/client/dhclient.c	2006-06-22 13:57:12.000000000 -0400
@@ -1011,7 +1011,6 @@
 extern int have_setup_fallback;
         have_setup_fallback=0;
 	quiet_interface_discovery=1;
-	timeouts = 0L;
 	dhcp_type_interface=0L;
 	interface_vector = 0L;
 	interface_count =0;
--- dhcp-3.0.4/libdhcp4client/common/dispatch.c.timeouts	2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.4/libdhcp4client/common/dispatch.c	2006-06-22 14:05:54.000000000 -0400
@@ -39,8 +39,16 @@
 
 #include "dhcpd.h"
 
-struct timeout *timeouts;
-static struct timeout *free_timeouts;
+struct timeout {
+	TIME when;
+	void (*func) PROTO ((void *));
+	void *what;
+	tvref_t ref;
+	tvunref_t unref;
+};
+
+static struct timeout *timeouts = NULL;
+static int ntimeouts = 0;
 
 void set_time(TIME t)
 {
@@ -53,29 +61,40 @@
 
 struct timeval *process_outstanding_timeouts (struct timeval *tvp)
 {
+	int i;
+	struct timeout t = { 0 };
 	/* Call any expired timeouts, and then if there's
 	   still a timeout registered, time out the select
 	   call then. */
-      another:
-	if (timeouts) {
-		struct timeout *t;
-		if (timeouts -> when <= cur_time) {
-			t = timeouts;
-			timeouts = timeouts -> next;
-			(*(t -> func)) (t -> what);
-			if (t -> unref)
-				(*t -> unref) (&t -> what, MDL);
-			t -> next = free_timeouts;
-			free_timeouts = t;
-			goto another;
-		}
-		if (tvp) {
-			tvp -> tv_sec = timeouts -> when;
-			tvp -> tv_usec = 0;
-		}
+	if (!ntimeouts)
+		return NULL;
+
+	for (i = 0; i < ntimeouts && timeouts[i].when <= cur_time;) {
+		struct timeout *new_timeouts;
+		size_t n;
+
+		memmove(&t, &timeouts[i], sizeof (t));
+
+		n = (ntimeouts - i - 1) * sizeof (t);
+		memmove(&timeouts[i+1], &timeouts[i], n);
+
+		n = --ntimeouts * sizeof (t);
+		new_timeouts = realloc(timeouts, n);
+		/* XXX broken API, no way to return error here */
+		if (new_timeouts || !n)
+			timeouts = new_timeouts;
+
+		if (t.func)
+			t.func(t.what);
+		if (t.unref)
+			t.unref(t.what, MDL);
+	}
+	if (tvp && ntimeouts) {
+		tvp->tv_sec = timeouts[0].when;
+		tvp->tv_usec = 0;
 		return tvp;
-	} else
-		return (struct timeval *)0;
+	}
+	return NULL;
 }
 
 /* Wait for packets to come in using select().   When one does, call
@@ -104,116 +123,110 @@
 	tvref_t ref;
 	tvunref_t unref;
 {
-	struct timeout *t, *q;
+	struct timeout t = {
+		.when = when,
+		.func = where,
+		.what = what,
+		.ref = ref,
+		.unref = unref
+	};
+	struct timeout *new_timeouts;
+	int i, pos = 0;
+	struct timeval tv = {0,0};
+
+	gettimeofday(&tv, NULL);
+	set_time(tv.tv_sec);
 
 	/* See if this timeout supersedes an existing timeout. */
-	t = (struct timeout *)0;
-	for (q = timeouts; q; q = q -> next) {
-		if ((where == NULL || q -> func == where) &&
-		    q -> what == what) {
-			if (t)
-				t -> next = q -> next;
-			else
-				timeouts = q -> next;
-			break;
-		}
-		t = q;
-	}
+	for (i = 0; i < ntimeouts; i++) {
+		struct timeout *q = &timeouts[i];
 
-	/* If we didn't supersede a timeout, allocate a timeout
-	   structure now. */
-	if (!q) {
-		if (free_timeouts) {
-			q = free_timeouts;
-			free_timeouts = q -> next;
-		} else {
-			q = ((struct timeout *)
-			     dmalloc (sizeof (struct timeout), MDL));
-			if (!q)
-				log_fatal ("add_timeout: no memory!");
-		}
-		memset (q, 0, sizeof *q);
-		q -> func = where;
-		q -> ref = ref;
-		q -> unref = unref;
-		if (q -> ref)
-			(*q -> ref)(&q -> what, what, MDL);
-		else
-			q -> what = what;
-	}
-
-	q -> when = when;
-
-	/* Now sort this timeout into the timeout list. */
-
-	/* Beginning of list? */
-	if (!timeouts || timeouts -> when > q -> when) {
-		q -> next = timeouts;
-		timeouts = q;
-		return;
-	}
-
-	/* Middle of list? */
-	for (t = timeouts; t -> next; t = t -> next) {
-		if (t -> next -> when > q -> when) {
-			q -> next = t -> next;
-			t -> next = q;
+		/* If this one is already in the list with a different time,
+		 * remove it and re-add */
+		if ((where == NULL || q->func == where) &&
+				q->what == what) {
+			size_t n = (--ntimeouts - i) * sizeof (*q);
+			memmove(&t, q, sizeof (t));
+
+			if (n)
+				memmove(&timeouts[i], &timeouts[i+1], n);
+
+			if (ntimeouts) {
+				new_timeouts = realloc(timeouts, ntimeouts * sizeof (*q));
+				/* XXX broken API, no way to return error here */
+				if (new_timeouts)
+					timeouts = new_timeouts;
+			} else {
+				timeouts = NULL;
+			}
+			add_timeout(when, where, what, ref, unref);
 			return;
+		} else if (timeouts[i].when > when) {
+			pos = i;
 		}
 	}
 
-	/* End of list. */
-	t -> next = q;
-	q -> next = (struct timeout *)0;
+	/* If we didn't supersede an existing timeout, then pos is set
+	 * to the timeout which will post after this one.  Insert this
+	 * one before it. */
+
+	new_timeouts = realloc(timeouts, sizeof (t) * (ntimeouts+1));
+	/* XXX broken API, no way to return error here */
+	if (new_timeouts) {
+		/* ntimeouts = 10
+		 * pos = 3;
+		 * n = 10-3 * sizeof (t) = 7 * sizeof (t) 
+		 */
+		size_t n = (ntimeouts - pos) * sizeof (t);
+
+		timeouts = new_timeouts;
+		memmove(&timeouts[pos+1], &timeouts[pos], n);
+		memmove(&timeouts[pos], &t, sizeof (t));
+		ntimeouts++;
+	}
 }
 
 void cancel_timeout (where, what)
 	void (*where) PROTO ((void *));
 	void *what;
 {
-	struct timeout *t, *q;
+	struct timeout t;
+	int i = 0;
 
 	/* Look for this timeout on the list, and unlink it if we find it. */
-	t = (struct timeout *)0;
-	for (q = timeouts; q; q = q -> next) {
-		if (q -> func == where && q -> what == what) {
-			if (t)
-				t -> next = q -> next;
-			else
-				timeouts = q -> next;
-			break;
-		}
-		t = q;
-	}
+	for (i = 0; i < ntimeouts; i++) {
+		struct timeout *new_timeouts, *q = &timeouts[i];
+
+		if (q->func == where && q->what == what) {
+			size_t n;
+
+			memmove(&t, q, sizeof (t));
 
-	/* If we found the timeout, put it on the free list. */
-	if (q) {
-		if (q -> unref)
-			(*q -> unref) (&q -> what, MDL);
-		q -> next = free_timeouts;
-		free_timeouts = q;
+			n = (ntimeouts - i - 1) * sizeof (t);
+			memmove(&timeouts[i+1], &timeouts[i], n);
+
+			n = --ntimeouts * sizeof (t);
+			new_timeouts = realloc(timeouts, n);
+			/* XXX broken API, no way to return error here */
+			if (new_timeouts || !n)
+				timeouts = new_timeouts;
+
+			if (t.unref)
+				t.unref(t.what, MDL);
+		}
 	}
 }
 
 #if defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
 void cancel_all_timeouts ()
 {
-	struct timeout *t, *n;
-	for (t = timeouts; t; t = n) {
-		n = t -> next;
-		if (t -> unref && t -> what)
-			(*t -> unref) (&t -> what, MDL);
-		t -> next = free_timeouts;
-		free_timeouts = t;
-	}
+	cur_time = TIME_MAX;
+	process_outstanding_timeouts(NULL);
 }
 
 void relinquish_timeouts ()
 {
-	struct timeout *t, *n;
-	for (t = free_timeouts; t; t = n) {
-		n = t -> next;
-		dfree (t, MDL);
-	}
+	while (ntimeouts)
+		cancel_timeout(timeouts[0].func, timeouts[0].what);
 }
 #endif
--- dhcp-3.0.4/common/dispatch.c.timeouts	2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.4/common/dispatch.c	2006-06-22 13:11:59.000000000 -0400
@@ -39,7 +39,16 @@
 
 #include "dhcpd.h"
 
-struct timeout *timeouts;
+struct timeout {
+	struct timeout *next;
+	TIME when;
+	void (*func) PROTO ((void *));
+	void *what;
+	tvref_t ref;
+	tvunref_t unref;
+};
+
+static struct timeout *timeouts;
 static struct timeout *free_timeouts;
 
 void set_time(TIME t)
--- dhcp-3.0.4/includes/dhcpd.h.timeouts	2006-06-22 13:11:57.000000000 -0400
+++ dhcp-3.0.4/includes/dhcpd.h	2006-06-22 13:11:59.000000000 -0400
@@ -818,14 +818,6 @@
 
 typedef void (*tvref_t)(void *, void *, const char *, int);
 typedef void (*tvunref_t)(void *, const char *, int);
-struct timeout {
-	struct timeout *next;
-	TIME when;
-	void (*func) PROTO ((void *));
-	void *what;
-	tvref_t ref;
-	tvunref_t unref;
-};
 
 struct protocol {
 	struct protocol *next;
@@ -1752,7 +1744,6 @@
 					    struct dhcp_packet *, unsigned,
 					    unsigned int,
 					    struct iaddr, struct hardware *));
-extern struct timeout *timeouts;
 extern omapi_object_type_t *dhcp_type_interface;
 #if defined (TRACING)
 trace_type_t *interface_trace;


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- dhcp.spec	8 Jun 2006 18:24:16 -0000	1.104
+++ dhcp.spec	22 Jun 2006 18:17:27 -0000	1.105
@@ -4,7 +4,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 14
+Release: 15
 Epoch:   12
 License: distributable
 Group: System Environment/Daemons
@@ -14,11 +14,8 @@
 Source3: dhcrelay.init
 Source4: dhcpd.conf
 Source5: findptrsize.c
-# new libdhcp4client package:
-Source6: libdhcp4client.Makefile
-Source7: dhcp-3.0.4-libdhcp4client.patch
-Source8: libdhcp4client.pc
-Source9: dhcptables.pl
+Source6: libdhcp4client.pc
+Source7: dhcptables.pl
 #
 Patch: 	  dhcp-3.0-alignment.patch
 Patch100: dhcp-3.0-jbuild.patch
@@ -92,7 +89,14 @@
 Patch176: dhcp-3.0.4-dhclient-R_option.patch
 Patch177: dhcp-3.0.4-dhclient-script-METRIC.patch
 Patch178: dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch
-#
+
+# patch to make the library subtree
+Patch179: dhcp-3.0.4-lib-makefile.patch
+
+# patches that _must_ go after the split
+Patch180: libdhcp4client.patch
+Patch181: dhcp-3.0.4-timeouts.patch
+
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -240,6 +244,8 @@
 %patch176 -p1 -b .dhclient-R_option
 %patch177 -p1 -b .dhclient-script-METRIC
 %patch178 -p1 -b .dhclient-script-ntp-fudge-bz191461
+%patch179 -p1 -b .lib-makefile
+
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcpd
@@ -255,7 +261,6 @@
 #define _PATH_DHCLIENT_DB       "%{_localstatedir}/lib/dhclient/dhclient.leases"
 EOF
 
-%build
 cp -fp %SOURCE5 .
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Dlint -Werror -Wno-unused"
 %{__cc} -I. -o findptrsize findptrsize.c
@@ -276,10 +281,18 @@
 # -DDEBUG_PACKET -DDEBUG_EXPRESSIONS"
 # -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
 #make %{?_smp_mflags} CC="gcc33"
+
+%if %{LIBDHCP4CLIENT}
+sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 >libdhcp4client.pc
+make -f libdhcp4client.Makefile CC="%{__cc}" libdhcp4client/.
+%patch180 -p1 -b .lib
+%patch181 -p1 -b .timeouts
+# can't handle make -j yet!
+%endif
+
+%build
 make %{?_smp_mflags} CC="%{__cc}"
 %if %{LIBDHCP4CLIENT}
-cp -fp %{SOURCE6} libdhcp4client.Makefile
-cp -fp %{SOURCE7} libdhcp4client.patch
 sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 >libdhcp4client.pc
 make -f libdhcp4client.Makefile CC="%{__cc}"
 # can't handle make -j yet!
@@ -326,17 +339,17 @@
 # Why not ship the doc/ documentation ? Some of it is quite useful.
 # Also generate DHCP options tables for C, perl, python:
 #
-/usr/bin/perl %SOURCE9 > doc/dhcp_options.h
-/usr/bin/perl %SOURCE9 -pe > doc/dhcp_options.pl
-/usr/bin/perl %SOURCE9 -py > doc/dhcp_options.py
-/usr/bin/perl %SOURCE9 -d  > doc/dhcp_options.txt
+/usr/bin/perl %SOURCE7 > doc/dhcp_options.h
+/usr/bin/perl %SOURCE7 -pe > doc/dhcp_options.pl
+/usr/bin/perl %SOURCE7 -py > doc/dhcp_options.py
+/usr/bin/perl %SOURCE7 -d  > doc/dhcp_options.txt
 #
 # Fix bug 163367: install default (empty) dhcpd.conf:
 cp -fp %SOURCE4 %{buildroot}/etc
 #
 %if %{LIBDHCP4CLIENT}
 # libdhcp4client install
-sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE8 >libdhcp4client.pc
+sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE6 >libdhcp4client.pc
 make -f libdhcp4client.Makefile install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 %endif
 %if !%{NODEBUGINFO}
@@ -479,6 +492,11 @@
 %endif
 
 %changelog
+* Thu Jun 22 2006 Peter Jones <pjones at redhat.com> - 12:3.0.4-15
+- Make timeout dispatch code not recurse while traversing a linked
+  list, so it doesn't try to free an entries that have been removed.
+- Don't patch in a makefile, do it in the spec.
+
 * Thu Jun 08 2006 Jason Vas Dias <jvdias at redhat.com> - 12:3.0.4-14
 - fix bug 191461: preserve ntp.conf local clock fudge statements
 - fix bug 193047: both dhcp and dhclient need to ship common


--- libdhcp4client.Makefile DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:19:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:19:00 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.105,1.106
Message-ID: <200606221819.k5MIJ0KY000408@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv376

Modified Files:
	dhcp.spec 
Log Message:
- fix patch filename


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- dhcp.spec	22 Jun 2006 18:17:27 -0000	1.105
+++ dhcp.spec	22 Jun 2006 18:18:58 -0000	1.106
@@ -94,7 +94,7 @@
 Patch179: dhcp-3.0.4-lib-makefile.patch
 
 # patches that _must_ go after the split
-Patch180: libdhcp4client.patch
+Patch180: dhcp-3.0.4-libdhcp4client.patch
 Patch181: dhcp-3.0.4-timeouts.patch
 
 URL: http://isc.org/products/DHCP/



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:26:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:26:56 -0400
Subject: rpms/parted/devel parted-1.7.1-O_DIRECT.patch, NONE,
	1.1 parted-1.7.1-dasd.patch, NONE, 1.1 parted.spec, 1.74,
	1.75 parted-1.7.0-dasd.patch, 1.2,
	NONE parted-1.7.1-dasdfixes.patch, 1.1, NONE
Message-ID: <200606221826.k5MIQuxV003452@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3373

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-O_DIRECT.patch parted-1.7.1-dasd.patch 
Removed Files:
	parted-1.7.0-dasd.patch parted-1.7.1-dasdfixes.patch 
Log Message:
- Roll dasd patches together
- Use O_DIRECT to prevent first partition corruption on GPT disks


parted-1.7.1-O_DIRECT.patch:
 linux.c |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

--- NEW FILE parted-1.7.1-O_DIRECT.patch ---
diff -urN parted-1.7.1.orig/libparted/arch/linux.c parted-1.7.1/libparted/arch/linux.c
--- parted-1.7.1.orig/libparted/arch/linux.c	2006-06-22 14:18:31.000000000 -0400
+++ parted-1.7.1/libparted/arch/linux.c	2006-06-22 14:24:59.000000000 -0400
@@ -30,6 +30,7 @@
 #include <libgen.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syscall.h>
 #include <unistd.h>
@@ -1212,7 +1213,7 @@
                 if (!name)
                         break;
                 if (!_partition_is_mounted_by_path (name)) {
-                        fd = open (name, O_WRONLY, 0);
+                        fd = open (name, O_WRONLY | O_DIRECT, 0);
                         if (fd > 0) {
                                 ioctl (fd, BLKFLSBUF);
                                 close (fd);
@@ -1228,11 +1229,11 @@
         LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
 
 retry:
-        arch_specific->fd = open (dev->path, O_RDWR);
+        arch_specific->fd = open (dev->path, O_RDWR | O_DIRECT);
         if (arch_specific->fd == -1) {
                 char*   rw_error_msg = strerror (errno);
 
-                arch_specific->fd = open (dev->path, O_RDONLY);
+                arch_specific->fd = open (dev->path, O_RDONLY | O_DIRECT);
                 if (arch_specific->fd == -1) {
                         if (ped_exception_throw (
                                 PED_EXCEPTION_ERROR,
@@ -1375,6 +1376,7 @@
         int                     status;
         PedExceptionOption      ex_status;
         size_t                  read_length = count * dev->sector_size;
+        void*                   diobuf;
 
         PED_ASSERT (dev->sector_size % 512 == 0, return 0);
 
@@ -1412,8 +1414,12 @@
                 }
         }
 
+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
+                return 0;
         while (1) {
-                status = read (arch_specific->fd, buffer, read_length);
+                status = read (arch_specific->fd, diobuf, read_length);
+                if (status > 0)
+                        memcpy(buffer, diobuf, status);
                 if (status == count * dev->sector_size) break;
                 if (status > 0) {
                         read_length -= status;
@@ -1430,6 +1436,7 @@
 
                 switch (ex_status) {
                         case PED_EXCEPTION_IGNORE:
+                                free(diobuf);
                                 return 1;
 
                         case PED_EXCEPTION_RETRY:
@@ -1438,9 +1445,11 @@
                         case PED_EXCEPTION_UNHANDLED:
                                 ped_exception_catch ();
                         case PED_EXCEPTION_CANCEL:
+                                free(diobuf);
                                 return 0;
                 }
         }
+        free(diobuf);
 
         return 1;
 }
@@ -1486,6 +1495,8 @@
         int                     status;
         PedExceptionOption      ex_status;
         size_t                  write_length = count * dev->sector_size;
+        void*                   diobuf;
+        void*                   diobuf_start;
 
         PED_ASSERT(dev->sector_size % 512 == 0, return 0);
 
@@ -1539,12 +1550,16 @@
                 dev->path, buffer, (int) start, (int) count);
 #else
         dev->dirty = 1;
+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
+                return 0;
+        memcpy(diobuf, buffer, count * PED_SECTOR_SIZE);
+        diobuf_start = diobuf;
         while (1) {
-                status = write (arch_specific->fd, buffer, write_length);
+                status = write (arch_specific->fd, diobuf, write_length);
                 if (status == count * dev->sector_size) break;
                 if (status > 0) {
                         write_length -= status;
-                        buffer += status;
+                        diobuf += status;
                         continue;
                 }
 
@@ -1556,6 +1571,7 @@
 
                 switch (ex_status) {
                         case PED_EXCEPTION_IGNORE:
+                                free(diobuf_start);
                                 return 1;
 
                         case PED_EXCEPTION_RETRY:
@@ -1564,9 +1580,11 @@
                         case PED_EXCEPTION_UNHANDLED:
                                 ped_exception_catch ();
                         case PED_EXCEPTION_CANCEL:
+                                free(diobuf_start);
                                 return 0;
                 }
         }
+        free(diobuf_start);
 #endif /* !READ_ONLY */
         return 1;
 }
@@ -1579,18 +1597,25 @@
         LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
         PedSector       done = 0;
         int             status;
+        void*           diobuf;
 
         PED_ASSERT(dev != NULL, return 0);
         
         if (!_device_seek (dev, start))
                 return 0;
 
+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
+                return 0;
+
         for (done = 0; done < count; done += status / dev->sector_size) {
-                status = read (arch_specific->fd, buffer,
+                status = read (arch_specific->fd, diobuf,
                                (size_t) ((count-done) * dev->sector_size));
+                if (status > 0)
+                        memcpy(buffer, diobuf, status);
                 if (status < 0)
                         break;
         }
+        free(diobuf);
 
         return done;
 }

parted-1.7.1-dasd.patch:
 include/parted/device.h      |    1 
 include/parted/disk.h        |    3 
 include/parted/fdasd.h       |  230 +++++++
 include/parted/linux.h       |    5 
 include/parted/vtoc.h        |  371 +++++++++++
 libparted/arch/linux.c       |   81 ++
 libparted/labels/Makefile.am |    5 
 libparted/labels/dasd.c      |  876 ++++++++++++++++++++++++++++
 libparted/labels/fdasd.c     | 1302 +++++++++++++++++++++++++++++++++++++++++
 libparted/labels/vtoc.c      | 1343 +++++++++++++++++++++++++++++++++++++++++++
 libparted/libparted.c        |    9 
 11 files changed, 4222 insertions(+), 4 deletions(-)

--- NEW FILE parted-1.7.1-dasd.patch ---
diff -urN parted-1.7.1.orig/include/parted/device.h parted-1.7.1/include/parted/device.h
--- parted-1.7.1.orig/include/parted/device.h	2006-06-22 14:11:48.000000000 -0400
+++ parted-1.7.1/include/parted/device.h	2006-06-22 14:12:10.000000000 -0400
@@ -43,6 +43,7 @@
         PED_DEVICE_ATARAID      = 6,
         PED_DEVICE_I2O          = 7,
         PED_DEVICE_UBD          = 8,
+        PED_DEVICE_DASD         = 9,
         PED_DEVICE_SX8          = 11
 } PedDeviceType;
 
diff -urN parted-1.7.1.orig/include/parted/disk.h parted-1.7.1/include/parted/disk.h
--- parted-1.7.1.orig/include/parted/disk.h	2006-05-25 13:28:43.000000000 -0400
+++ parted-1.7.1/include/parted/disk.h	2006-06-22 14:12:10.000000000 -0400
@@ -46,7 +46,8 @@
         PED_PARTITION_LOGICAL           = 0x01,
         PED_PARTITION_EXTENDED          = 0x02,
         PED_PARTITION_FREESPACE         = 0x04,
-        PED_PARTITION_METADATA          = 0x08
+        PED_PARTITION_METADATA          = 0x08,
+        PED_PARTITION_PROTECTED         = 0x10
 } PedPartitionType;
 
 /**
diff -urN parted-1.7.1.orig/include/parted/fdasd.h parted-1.7.1/include/parted/fdasd.h
--- parted-1.7.1.orig/include/parted/fdasd.h	1969-12-31 19:00:00.000000000 -0500
+++ parted-1.7.1/include/parted/fdasd.h	2006-06-22 14:12:10.000000000 -0400
@@ -0,0 +1,230 @@
+/*
+ * File...........: s390-tools/fdasd/fdasd.h
+ * Author(s)......: Volker Sameske <sameske at de.ibm.com>
+ *                  Horst Hummel   <Horst.Hummel at de.ibm.com>
+ * Bugreports.to..: <Linux390 at de.ibm.com>
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2001-2002
+ *
+ * History of changes (starts March 2001)
+ * version 1.01 - menu entry 's' to show mapping devnode - DS name
+ *         1.02 - DS names count now from 0001 instead from 0000
+ *         1.03 - volser checks: 'AA AAA' to 'AAAAA '
+ *              - removed dependency to kernel headers.
+ *         1.04 - added -p option
+ *         1.05 - new API policy, set it back to 0
+ */
+#ifndef FDASD_H
+#define FDASD_H
+
+/*****************************************************************************
+ * SECTION: Definitions needed for DASD-API (see dasd.h)                     *
+ *****************************************************************************/
+
+#define DASD_IOCTL_LETTER 'D'
+
+#define DASD_PARTN_BITS 2
+
+#define PARTITION_LINUX_SWAP    0x82
+#define PARTITION_LINUX         0x83
+#define PARTITION_LINUX_EXT     0x85
+#define PARTITION_LINUX_LVM     0x8e
+#define PARTITION_LINUX_RAID    0xfd
+#define PARTITION_LINUX_LVM_OLD 0xfe
+
+#define PART_TYPE_NATIVE "NATIVE"
+#define PART_TYPE_SWAP   "SWAP  "
+#define PART_TYPE_RAID   "RAID  "
+#define PART_TYPE_LVM   "LVM   "
+
+#ifdef DEBUG_DASD
+#define PDEBUG           fprintf(stderr, "%s:%d:%s\n", \
+                         __FILE__,                              \
+                         __LINE__,                              \
+                         __PRETTY_FUNCTION__);
+#else
+#define PDEBUG
+#endif
+
+/* 
+ * struct dasd_information_t
+ * represents any data about the device, which is visible to userspace.
+ *  including foramt and featueres.
+ */
+typedef struct dasd_information_t {
+        unsigned int devno;           /* S/390 devno                         */
+        unsigned int real_devno;      /* for aliases                         */
+        unsigned int schid;           /* S/390 subchannel identifier         */
+        unsigned int cu_type  : 16;   /* from SenseID                        */
+        unsigned int cu_model :  8;   /* from SenseID                        */
+        unsigned int dev_type : 16;   /* from SenseID                        */
+        unsigned int dev_model : 8;   /* from SenseID                        */
+        unsigned int open_count; 
+        unsigned int req_queue_len; 
+        unsigned int chanq_len;       /* length of chanq                     */
+        char type[4];                 /* from discipline.name, 'none' for    */
+	                              /* unknown                             */
+        unsigned int status;          /* current device level                */
+        unsigned int label_block;     /* where to find the VOLSER            */
+        unsigned int FBA_layout;      /* fixed block size (like AIXVOL)      */
+        unsigned int characteristics_size;
+        unsigned int confdata_size;
+        char characteristics[64];     /* from read_device_characteristics    */
+        char configuration_data[256]; /* from read_configuration_data        */
+} dasd_information_t;
+
+/* 
+ * struct format_data_t
+ * represents all data necessary to format a dasd
+ */
+typedef struct format_data_t {
+	int start_unit; /* from track */
+	int stop_unit;  /* to track */
+	int blksize;    /* sectorsize */
+        int intensity;  
+} format_data_t;
+
+/*
+ * values to be used for format_data_t.intensity
+ * 0/8: normal format
+ * 1/9: also write record zero
+ * 3/11: also write home address
+ * 4/12: invalidate track
+ */
+#define DASD_FMT_INT_FMT_R0 1 /* write record zero */
+#define DASD_FMT_INT_FMT_HA 2 /* write home address, also set FMT_R0 ! */
+#define DASD_FMT_INT_INVAL  4 /* invalidate tracks */
+#define DASD_FMT_INT_COMPAT 8 /* use OS/390 compatible disk layout */
+
+
+/* Disable the volume (for Linux) */
+#define BIODASDDISABLE _IO(DASD_IOCTL_LETTER,0) 
+/* Enable the volume (for Linux) */
+#define BIODASDENABLE  _IO(DASD_IOCTL_LETTER,1)  
+
+/* retrieve API version number */
+#define DASDAPIVER     _IOR(DASD_IOCTL_LETTER,0,int)
+/* Get information on a dasd device (enhanced) */
+#define BIODASDINFO   _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
+
+
+/*****************************************************************************
+ * SECTION: Further IOCTL Definitions  (see fs.h)                            *
+ *****************************************************************************/
+/* re-read partition table */
+#define BLKRRPART  _IO(0x12,95)	
+/* get block device sector size */
+#define BLKSSZGET  _IO(0x12,104)
+
+/*****************************************************************************
+ * SECTION: Definition from hdreq.h                                          *
+ *****************************************************************************/
+
+struct fdasd_hd_geometry {
+      unsigned char heads;
+      unsigned char sectors;
+      unsigned short cylinders;
+      unsigned long start;
+};
+
+/* get device geometry */
+#define HDIO_GETGEO		0x0301	
+
+/*****************************************************************************
+ * SECTION: FDASD internal types                                             *
+ *****************************************************************************/
+
+#define DASD_MIN_API_VERSION 0
+
+#define DEFAULT_FDASD_CONF "/etc/fdasd.conf" /* default config file */
+
+#define PARTN_MASK ((1 << DASD_PARTN_BITS) - 1)
+#define USABLE_PARTITIONS ((1 << DASD_PARTN_BITS) - 1)
+
+#define FDASD_VERSION "1.05"
+#define FDASD_ERROR "fdasd error: "
+#define DEVICE "device"
+#define DISC   "disc"
+#define PART   "part"
+
+#define ALTERNATE_CYLINDERS_USED 0x10
+
+typedef struct partition_info {
+        u_int8_t           used;
+        unsigned long      start_trk;
+        unsigned long      end_trk;
+        unsigned long      len_trk;
+        unsigned long      fspace_trk;
+        format1_label_t  * f1; 
+        struct partition_info *next;
+        struct partition_info *prev;
+        u_int8_t           type;
+} partition_info_t;
+
+
+typedef struct config_data {
+	unsigned long start;
+	unsigned long stop;
+} config_data_t;
+
+
+typedef struct fdasd_anchor {
+        int vlabel_changed;
[...3973 lines suppressed...]
+			bzero(tmp, sizeof(ds7ext_t));
+			tmp = ext;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "merge with successor\n");
+			i = -1;
+			continue;
+		} 
+	}
+}
+
+
+/*
+ * remove a free space extent description from the VTOC FMT7 DSCB
+ */
+void 
+vtoc_update_format7_label_del (format7_label_t *f7, int verbose, 
+			       u_int32_t a, u_int32_t b) 
+{
+	PDEBUG
+	ds7ext_t *ext;
+	int i, counter=0;
+	
+	for (i=0; i<16; i++)
+	{
+		if (i<5) 
+			ext = &f7->DS7EXTNT[i]; 
+		else 
+			ext = &f7->DS7ADEXT[i-5];
+
+		if ((a == ext->a) && (b == ext->b))
+		{
+			/* fills up whole free space gap */
+			bzero(ext, sizeof(ds7ext_t));
+			if (verbose) 
+				printf("FMT7 del extent: " \
+				       "fills whole gap\n");
+			counter++;
+			break;
+		}
+
+		if ((a == ext->a) && (b < ext->b))
+		{
+			/* left-bounded in free space gap */
+			ext->a = b + 1;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "left-bounded\n");
+			counter++;
+			break;
+		}
+
+		if ((a > ext->a) && (b == ext->b))
+		{
+			/* right-bounded in free space gap */
+			ext->b = a - 1;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "right-bounded\n");
+			counter++;
+			break;
+		}
+
+		if ((a > ext->a) && (b < ext->b))
+		{
+			/* partition devides free space into 2 pieces */
+			vtoc_update_format7_label_add(f7, verbose, 
+						      b+1, ext->b);
+			ext->b = a - 1;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "2 pieces\n");
+			counter++;
+			break;
+		}
+
+		if (((a < ext->a) && (b > ext->a)) || ((a < ext->b) && (b > ext->b)))
+		{
+			printf ("BUG: specified free space extent for deleting "
+				"doesn't match free space currently shown in "
+				"FMT7 DSCB!\nexiting...\n");
+			printf ("%d %d %d %d\n", a, b, ext->a, ext->b);
+			exit(1);
+		}
+	}
+
+	if (counter > 0) return;
+
+	printf("BUG: specified free space extent for " \
+	       "deleting not found in FMT7 DSCB!\n" \
+	       "exiting...\n");
+	exit(1);
+}
+
+
+/*
+ *
+ */
+void
+vtoc_set_freespace(format4_label_t *f4,
+		   format5_label_t *f5,
+		   format7_label_t *f7,
+		   char ch,
+		   int verbose,
+		   u_int32_t start,
+		   u_int32_t stop,
+		   int cyl,
+		   int trk)
+{
+	PDEBUG
+	if ((cyl * trk) > BIG_DISK_SIZE)
+	{
+		if (ch == '+')
+		{
+			vtoc_update_format7_label_add(f7, verbose, 
+						      start, stop);
+		}
+		else if (ch == '-')
+		{
+			vtoc_update_format7_label_del(f7, verbose, 
+						      start, stop);
+		}
+		else
+		{
+			printf("BUG: syntax error in " \
+			       "vtoc_set_freespace call\n");
+		}
+
+		vtoc_reorganize_FMT7_extents (f7);
+
+		f4->DS4VTOCI = 0xa0;
+		f4->DS4EFLVL = 0x07;
+		vtoc_set_cchhb(&f4->DS4EFPTR, 0x0000, 0x0001, 0x03);
+	}
+	else
+	{
+		u_int16_t x,y;
+		u_int8_t z;
+
+		x = (u_int16_t) start;
+		y = (u_int16_t) ((stop - start + 1) / trk);
+		z =  (u_int8_t) ((stop - start + 1) % trk);
+
+		if (ch == '+')
+		{
+			vtoc_update_format5_label_add(f5, verbose,
+						      cyl, trk,
+						      x, y, z);
+		}
+		else if (ch == '-')
+		{
+			vtoc_update_format5_label_del(f5, verbose, 
+						      cyl, trk,
+						      x, y, z);
+		}
+		else
+		{
+			printf("BUG: syntax error in " \
+			       "vtoc_set_freespace call\n");
+		}
+		vtoc_reorganize_FMT5_extents (f5);
+	}
+		
+}
diff -urN parted-1.7.1.orig/libparted/libparted.c parted-1.7.1/libparted/libparted.c
--- parted-1.7.1.orig/libparted/libparted.c	2006-05-25 13:29:06.000000000 -0400
+++ parted-1.7.1/libparted/libparted.c	2006-06-22 14:12:10.000000000 -0400
@@ -89,12 +89,17 @@
 extern void ped_disk_pc98_init ();
 extern void ped_disk_sun_init ();
 extern void ped_disk_amiga_init ();
+extern void ped_disk_dasd_init ();
 
 static void
 init_disk_types ()
 {
 	ped_disk_loop_init ();	/* must be last in the probe list */
 
+#if defined(__s390__) || defined(__s390x__)
+	ped_disk_dasd_init();
+#endif
+
 	ped_disk_sun_init ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_init ();
@@ -145,10 +150,14 @@
 extern void ped_disk_pc98_done ();
 extern void ped_disk_sun_done ();
 extern void ped_disk_amiga_done ();
+extern void ped_disk_dasd_done ();
 
 static void
 done_disk_types ()
 {
+#if defined(__s390__) || (__s390x__)
+	ped_disk_dasd_done ();
+#endif
 	ped_disk_sun_done ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_done ();


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- parted.spec	15 Jun 2006 20:16:26 -0000	1.74
+++ parted.spec	22 Jun 2006 18:26:53 -0000	1.75
@@ -4,17 +4,16 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 5
+Release: 6
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
-Patch3: parted-1.7.0-dasd.patch
+Patch3: parted-1.7.1-dasd.patch
 Patch4: parted-1.7.0-iseries.patch
 Patch5: parted-1.7.1-dm.patch
 Patch6: parted-1.7.0-aix.patch
 Patch7: parted-1.7.0-headers.patch
-
-Patch10: parted-1.7.1-dasdfixes.patch
+Patch8: parted-1.7.1-O_DIRECT.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -51,7 +50,7 @@
 %patch5 -p1 -b .dm
 %patch6 -p1 -b .aix
 %patch7 -p1 -b .headers
-%patch10 -p1 -b .dasdfixes
+%patch8 -p1 -b .o_direct
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -101,6 +100,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-6
+- Roll dasd patches together
+- Use O_DIRECT to prevent first partition corruption on GPT disks
+
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 1.7.1-5
 - fix segfaults with dasd devices
 


--- parted-1.7.0-dasd.patch DELETED ---


--- parted-1.7.1-dasdfixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:27:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:27:46 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.19,1.20
Message-ID: <200606221827.k5MIRk6C003828@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3801

Modified Files:
	kexec-tools.spec 
Log Message:
bumping rev number


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kexec-tools.spec	22 Jun 2006 17:16:53 -0000	1.19
+++ kexec-tools.spec	22 Jun 2006 18:27:44 -0000	1.20
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 17
+Release: 19
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -98,6 +98,9 @@
 %doc TODO
 
 %changelog
+* Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-19
+- Bumping rev number
+
 * Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-17
 - Add patch to allow ppc64 to ignore args-linux option
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:29:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:29:29 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.74,1.75
Message-ID: <200606221829.k5MITTc5004539@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4415

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
kludge around dep problem


linux-2.6-compile-fixes.patch:
 drivers/video/Kconfig |    4 ++--
 kernel/power/main.c   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- linux-2.6-compile-fixes.patch	22 Jun 2006 17:47:32 -0000	1.74
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 18:29:26 -0000	1.75
@@ -18,3 +18,17 @@
  
  #include "power.h"
  
+ 
+--- linux-2.6.17.noarch/drivers/video/Kconfig~	2006-06-22 14:27:13.000000000 -0400
++++ linux-2.6.17.noarch/drivers/video/Kconfig	2006-06-22 14:27:27.000000000 -0400
+@@ -807,8 +807,8 @@ config FB_I810_I2C
+ config FB_INTEL
+ 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
+ 	depends on FB && EXPERIMENTAL && PCI && X86 && !VGA_NOPROBE
+-	select AGP
+-	select AGP_INTEL
++	depends on AGP
++	depends on AGP_INTEL
+ 	select FB_MODE_HELPERS
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:35:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:35:11 -0400
Subject: rpms/parted/devel parted-1.7.1-O_DIRECT.patch, 1.1, 1.2 parted.spec,
	1.75, 1.76
Message-ID: <200606221835.k5MIZBFW005216@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5151

Modified Files:
	parted-1.7.1-O_DIRECT.patch parted.spec 
Log Message:
- PED_SECTOR_SIZE -> PED_SECTOR_SIZE_DEFAULT (whoops)


parted-1.7.1-O_DIRECT.patch:
 linux.c |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

Index: parted-1.7.1-O_DIRECT.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.7.1-O_DIRECT.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parted-1.7.1-O_DIRECT.patch	22 Jun 2006 18:26:53 -0000	1.1
+++ parted-1.7.1-O_DIRECT.patch	22 Jun 2006 18:35:07 -0000	1.2
@@ -1,6 +1,5 @@
-diff -urN parted-1.7.1.orig/libparted/arch/linux.c parted-1.7.1/libparted/arch/linux.c
---- parted-1.7.1.orig/libparted/arch/linux.c	2006-06-22 14:18:31.000000000 -0400
-+++ parted-1.7.1/libparted/arch/linux.c	2006-06-22 14:24:59.000000000 -0400
+--- parted-1.7.1/libparted/arch/linux.c.o_direct	2006-06-22 14:31:38.000000000 -0400
++++ parted-1.7.1/libparted/arch/linux.c	2006-06-22 14:32:59.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <libgen.h>
  #include <stdint.h>
@@ -44,7 +43,7 @@
                  }
          }
  
-+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
++        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
 +                return 0;
          while (1) {
 -                status = read (arch_specific->fd, buffer, read_length);
@@ -87,9 +86,9 @@
                  dev->path, buffer, (int) start, (int) count);
  #else
          dev->dirty = 1;
-+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
++        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
 +                return 0;
-+        memcpy(diobuf, buffer, count * PED_SECTOR_SIZE);
++        memcpy(diobuf, buffer, count * PED_SECTOR_SIZE_DEFAULT);
 +        diobuf_start = diobuf;
          while (1) {
 -                status = write (arch_specific->fd, buffer, write_length);
@@ -133,7 +132,7 @@
          if (!_device_seek (dev, start))
                  return 0;
  
-+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
++        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
 +                return 0;
 +
          for (done = 0; done < count; done += status / dev->sector_size) {


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- parted.spec	22 Jun 2006 18:26:53 -0000	1.75
+++ parted.spec	22 Jun 2006 18:35:07 -0000	1.76
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 6
+Release: 7
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -100,6 +100,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-7
+- PED_SECTOR_SIZE -> PED_SECTOR_SIZE_DEFAULT
+
 * Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-6
 - Roll dasd patches together
 - Use O_DIRECT to prevent first partition corruption on GPT disks



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:37:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:37:13 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.207,
	1.208 policycoreutils.spec, 1.288, 1.289
Message-ID: <200606221837.k5MIbDgZ005601@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5578

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-5
- Add progress indicator on fixfiles/setfiles/restorecon


policycoreutils-rhat.patch:
 audit2allow/audit2allow.1 |    2 
 audit2allow/avc.py        |    2 
 po/hi.po                  |   33 +++---
 po/mr.po                  |   86 ++++++++++-------
 po/ms.po                  |  232 +++++++++++++++++++++++++++++-----------------
 restorecon/restorecon.c   |   31 +++++-
 restorecond/restorecond.c |    4 
 scripts/fixfiles          |   14 +-
 setfiles/setfiles.c       |   36 ++++++-
 setsebool/setsebool.8     |    3 
 setsebool/setsebool.c     |    6 -
 11 files changed, 297 insertions(+), 152 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- policycoreutils-rhat.patch	21 Jun 2006 20:33:15 -0000	1.207
+++ policycoreutils-rhat.patch	22 Jun 2006 18:37:08 -0000	1.208
@@ -895,8 +895,43 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.14/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2006-05-15 09:42:56.000000000 -0400
-+++ policycoreutils-1.30.14/restorecon/restorecon.c	2006-06-21 15:51:43.000000000 -0400
-@@ -185,7 +185,7 @@
++++ policycoreutils-1.30.14/restorecon/restorecon.c	2006-06-22 14:07:15.000000000 -0400
+@@ -42,6 +42,7 @@
+ 
+ static int change=1;
+ static int verbose=0;
++static int progress=0;
+ static FILE *outfile=NULL;
+ static char *progname;
+ static int errors=0;
+@@ -49,6 +50,7 @@
+ static int force=0;
+ #define STAT_BLOCK_SIZE 1
+ static int pipe_fds[2] = { -1, -1 };
++static unsigned long long count=0;
+ 
+ #define MAX_EXCLUDES 100
+ static int excludeCtr=0;
+@@ -126,6 +128,18 @@
+   security_context_t prev_context=NULL;
+   struct stat st;
+   char path[PATH_MAX+1];
++  
++  if (progress) {
++	  count++;
++	  if (count % 80000 == 0) {
++		  fprintf(stdout, "\n");
++		  fflush(stdout);
++	  }
++	  if (count % 1000 == 0) {
++		  fprintf(stdout, "*");
++		  fflush(stdout);
++	  }
++  }
+ 
+   if (excludeCtr > 0 && exclude(filename)) {
+       return 0;
+@@ -185,7 +199,7 @@
      fprintf(stderr,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
      return 1;
    } 
@@ -905,14 +940,38 @@
    
    if (retcontext >= 0 || errno == ENODATA) {
      int customizable=0;
-@@ -306,6 +306,7 @@
+@@ -306,8 +320,9 @@
    progname=argv[0];
    if (is_selinux_enabled() <= 0 )
      exit(0);
 +  set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
-   while ((opt = getopt(argc, argv, "FrRnvf:o:e:")) > 0) {
+-  while ((opt = getopt(argc, argv, "FrRnvf:o:e:")) > 0) {
++  while ((opt = getopt(argc, argv, "pFrRnvf:o:e:")) > 0) {
      switch (opt) {
+     case 'n':
+       change = 0;
+@@ -332,8 +347,20 @@
+       __fsetlocking(outfile, FSETLOCKING_BYCALLER);
+       break;
+     case 'v':
++      if (progress) {
++	      fprintf(stderr, "Progress and Verbose mutually exclusive\n");
++	      usage(argv[0]);
++      }
++
+       verbose++;
+       break;
++    case 'p':
++      if (verbose) {
++	      fprintf(stderr, "Progress and Verbose mutually exclusive\n");
++	      usage(argv[0]);
++      }
++      progress = 1;
++      break;
+     case 'f':
+       file = 1;
+       file_name=optarg;
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.14/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-05-15 09:42:57.000000000 -0400
 +++ policycoreutils-1.30.14/restorecond/restorecond.c	2006-06-21 15:56:15.000000000 -0400
@@ -934,10 +993,107 @@
  	master_fd = inotify_init ();
  	if (master_fd < 0)
  	        exitApp("inotify_init");
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.14/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2006-06-16 15:08:24.000000000 -0400
++++ policycoreutils-1.30.14/scripts/fixfiles	2006-06-22 14:21:55.000000000 -0400
+@@ -28,7 +28,7 @@
+ DIRS=""
+ RPMILES=""
+ OUTFILES=""
+-LOGFILE=/dev/null
++LOGFILE=`tty`
+ SYSLOGFLAG="-l"
+ LOGGER=/usr/sbin/logger
+ SETFILES=/sbin/setfiles
+@@ -118,7 +118,7 @@
+ fi
+ if [ ! -z "$RPMFILES" ]; then
+     for i in `echo $RPMFILES | sed 's/,/ /g'`; do
+-	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE
++	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
+     done
+     exit $?
+ fi
+@@ -126,16 +126,16 @@
+     if [ -x /usr/bin/find ]; then
+ 	for d in ${DIRS} ; do find $d \
+ 	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o -print | \
+-	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE
++	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE
+ 	done
+     else
+-	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
++	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE
+     fi
+ 
+     exit $?
+ fi
+ LogReadOnly
+-${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
++${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
+ exit $?
+ }
+ 
+@@ -234,8 +234,8 @@
+ # Make sure they specified one of the three valid commands
+ #
+ case "$command" in
+-    restore) restore ;;
+-    check) restore -n ;;
++    restore) restore -p -q ;;
++    check) restore -n -v ;;
+     relabel) relabel;;
+     *)
+     usage
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.14/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/setfiles/setfiles.c	2006-06-21 15:54:16.000000000 -0400
-@@ -301,7 +301,7 @@
++++ policycoreutils-1.30.14/setfiles/setfiles.c	2006-06-22 14:32:43.000000000 -0400
+@@ -20,6 +20,7 @@
+  * -d   Show what specification matched each file.
+  * -l   Log changes in files labels to syslog.
+  * -n	Do not change any file labels.
++ * -p   Show progress.  Prints * for every 1000 files
+  * -q   Be quiet (suppress non-error output).
+  * -r   Use an alternate root path
+  * -s   Use stdin for a list of files instead of searching a partition.
+@@ -88,6 +89,8 @@
+ static int force=0;
+ #define STAT_BLOCK_SIZE 1
+ static int pipe_fds[2] = { -1, -1 };
++static int progress=0;
++static unsigned long long count=0;
+ 
+ #define MAX_EXCLUDES 100
+ static int excludeCtr=0;
+@@ -208,7 +211,7 @@
+ void usage(const char * const name)
+ {
+ 	fprintf(stderr,
+-		"usage:  %s [-dnqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
++		"usage:  %s [-dnpqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
+ 		"usage:  %s -c policyfile spec_file\n"
+ 		"usage:  %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, name);
+ 	exit(1);
+@@ -278,6 +281,18 @@
+ 		/* No matching specification. */
+ 		return 0;
+ 
++	if (progress) {
++		count++;
++		if (count % 80000 == 0) {
++			fprintf(stdout, "\n");
++			fflush(stdout);
++		}
++		if (count % 1000 == 0) {
++			fprintf(stdout, "*");
++			fflush(stdout);
++		}
++	}
++
+ 	/*
+ 	 * Try to add an association between this inode and
+ 	 * this specification.  If there is already an association
+@@ -301,7 +316,7 @@
  	}
  
  	/* Get the current context of the file. */
@@ -946,7 +1102,16 @@
  	if (ret < 0) {
  		if (errno == ENODATA) {
  			context = NULL;
-@@ -485,7 +485,7 @@
+@@ -414,7 +429,7 @@
+ 
+ 	if (policyfile) {
+ 		valid = (sepol_check_context (context) >= 0);
+-	} else if (security_canonicalize_context(context, &tmpcon) < 0) {
++	} else if (security_canonicalize_context_raw(context, &tmpcon) < 0) {
+ 		if (errno != ENOENT) {
+ 			valid = 0;
+ 			inc_err();
+@@ -485,10 +500,10 @@
  	memset(excludeArray,0, sizeof(excludeArray));
  
  	/* Validate all file contexts during matchpathcon_init. */
@@ -954,7 +1119,31 @@
 +	set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS);
  
  	/* Process any options. */
- 	while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) {
+-	while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) {
++	while ((opt = getopt(argc, argv, "Fc:dlnpqrsvWe:o:")) > 0) {
+ 		switch (opt) {
+ 		case 'c':
+ 		{
+@@ -566,8 +581,19 @@
+ 			add_assoc = 0;
+ 			break;
+ 		case 'v':
++			if (progress) {
++				fprintf(stderr, "Progress and Verbose mutually exclusive\n");
++				exit(1);
++			}
+ 			verbose++;
+ 			break;
++		case 'p':
++			if (verbose) {
++				fprintf(stderr, "Progress and Verbose mutually exclusive\n");
++				usage(argv[0]);
++			}
++			progress = 1;
++			break;
+ 		case 'W':
+ 			warn_no_match = 1;
+ 			break;
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8
 --- nsapolicycoreutils/setsebool/setsebool.8	2006-05-15 09:42:58.000000000 -0400
 +++ policycoreutils-1.30.14/setsebool/setsebool.8	2006-06-19 10:32:36.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- policycoreutils.spec	21 Jun 2006 19:58:48 -0000	1.288
+++ policycoreutils.spec	22 Jun 2006 18:37:10 -0000	1.289
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.14
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -111,6 +111,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-5
+- Add progress indicator on fixfiles/setfiles/restorecon
+
 * Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-4
 - Don't use translations with matchpathcon
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:39:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:39:31 -0400
Subject: rpms/kexec-tools/FC-5 kexec-tools.spec,1.19,1.20
Message-ID: <200606221839.k5MIdVcB006470@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6446

Modified Files:
	kexec-tools.spec 
Log Message:
bumping revision number


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kexec-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kexec-tools.spec	22 Jun 2006 17:33:37 -0000	1.19
+++ kexec-tools.spec	22 Jun 2006 18:39:29 -0000	1.20
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 17
+Release: 18
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -98,6 +98,9 @@
 %doc TODO
 
 %changelog
+* Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-18
+- Bumping revision number
+
 * Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-17
 - Add patch to allow ppc64 to ignore args-linux option
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:52:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:52:17 -0400
Subject: rpms/dhcp/devel dhcp-3.0.4-timeouts.patch,1.1,1.2
Message-ID: <200606221852.k5MIqH1E025768@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25682

Modified Files:
	dhcp-3.0.4-timeouts.patch 
Log Message:
- oops, checked in 4 lines that were supposed to go


dhcp-3.0.4-timeouts.patch:
 common/dispatch.c                |   11 +
 includes/dhcpd.h                 |    9 -
 libdhcp4client/client/dhclient.c |    1 
 libdhcp4client/common/dispatch.c |  221 ++++++++++++++++++++-------------------
 4 files changed, 125 insertions(+), 117 deletions(-)

Index: dhcp-3.0.4-timeouts.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.4-timeouts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.4-timeouts.patch	22 Jun 2006 18:17:27 -0000	1.1
+++ dhcp-3.0.4-timeouts.patch	22 Jun 2006 18:52:14 -0000	1.2
@@ -1,5 +1,5 @@
---- dhcp-3.0.4/libdhcp4client/client/dhclient.c.timeouts	2006-06-22 13:11:59.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/client/dhclient.c	2006-06-22 13:57:12.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/client/dhclient.c.timeouts	2006-06-22 14:50:33.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/client/dhclient.c	2006-06-22 14:50:33.000000000 -0400
 @@ -1011,7 +1011,6 @@
  extern int have_setup_fallback;
          have_setup_fallback=0;
@@ -9,7 +9,7 @@
  	interface_vector = 0L;
  	interface_count =0;
 --- dhcp-3.0.4/libdhcp4client/common/dispatch.c.timeouts	2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/common/dispatch.c	2006-06-22 14:05:54.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/dispatch.c	2006-06-22 14:51:07.000000000 -0400
 @@ -39,8 +39,16 @@
  
  #include "dhcpd.h"
@@ -89,7 +89,7 @@
  }
  
  /* Wait for packets to come in using select().   When one does, call
-@@ -104,116 +123,110 @@
+@@ -104,116 +123,106 @@
  	tvref_t ref;
  	tvunref_t unref;
  {
@@ -103,10 +103,6 @@
 +	};
 +	struct timeout *new_timeouts;
 +	int i, pos = 0;
-+	struct timeval tv = {0,0};
-+
-+	gettimeofday(&tv, NULL);
-+	set_time(tv.tv_sec);
  
  	/* See if this timeout supersedes an existing timeout. */
 -	t = (struct timeout *)0;
@@ -286,7 +282,7 @@
  }
  #endif
 --- dhcp-3.0.4/common/dispatch.c.timeouts	2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.4/common/dispatch.c	2006-06-22 13:11:59.000000000 -0400
++++ dhcp-3.0.4/common/dispatch.c	2006-06-22 14:50:33.000000000 -0400
 @@ -39,7 +39,16 @@
  
  #include "dhcpd.h"
@@ -305,8 +301,8 @@
  static struct timeout *free_timeouts;
  
  void set_time(TIME t)
---- dhcp-3.0.4/includes/dhcpd.h.timeouts	2006-06-22 13:11:57.000000000 -0400
-+++ dhcp-3.0.4/includes/dhcpd.h	2006-06-22 13:11:59.000000000 -0400
+--- dhcp-3.0.4/includes/dhcpd.h.timeouts	2006-06-22 14:50:32.000000000 -0400
++++ dhcp-3.0.4/includes/dhcpd.h	2006-06-22 14:50:33.000000000 -0400
 @@ -818,14 +818,6 @@
  
  typedef void (*tvref_t)(void *, void *, const char *, int);



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:55:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:55:32 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.75,1.76
Message-ID: <200606221855.k5MItWvs027045@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26991

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
more build fixing


linux-2.6-compile-fixes.patch:
 drivers/video/Kconfig    |    4 ++--
 include/linux/pci_regs.h |    1 +
 kernel/power/main.c      |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- linux-2.6-compile-fixes.patch	22 Jun 2006 18:29:26 -0000	1.75
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 18:55:30 -0000	1.76
@@ -32,3 +32,14 @@
  	select FB_MODE_HELPERS
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
+
+--- linux-2.6.17.noarch/include/linux/pci_regs.h~	2006-06-22 14:54:33.000000000 -0400
++++ linux-2.6.17.noarch/include/linux/pci_regs.h	2006-06-22 14:54:59.000000000 -0400
+@@ -197,6 +197,7 @@
+ #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
+ #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
+ #define  PCI_CAP_ID_HT_IRQCONF	0x08	/* HyperTransport IRQ Configuration */
++#define  PCI_CAP_ID_VNDR	0x09
+ #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
+ #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
+ #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */



From fedora-cvs-commits at redhat.com  Thu Jun 22 18:55:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 14:55:57 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.106,1.107
Message-ID: <200606221855.k5MItvsY027266@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27209

Modified Files:
	dhcp.spec 
Log Message:
- add bug number



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- dhcp.spec	22 Jun 2006 18:18:58 -0000	1.106
+++ dhcp.spec	22 Jun 2006 18:55:54 -0000	1.107
@@ -495,6 +495,7 @@
 * Thu Jun 22 2006 Peter Jones <pjones at redhat.com> - 12:3.0.4-15
 - Make timeout dispatch code not recurse while traversing a linked
   list, so it doesn't try to free an entries that have been removed.
+  (bz #195723)
 - Don't patch in a makefile, do it in the spec.
 
 * Thu Jun 08 2006 Jason Vas Dias <jvdias at redhat.com> - 12:3.0.4-14



From fedora-cvs-commits at redhat.com  Thu Jun 22 19:16:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 15:16:53 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.73,
	1.74 policy-20060608.patch, 1.15, 1.16 selinux-policy.spec,
	1.218, 1.219 sources, 1.77, 1.78
Message-ID: <200606221916.k5MJGrCK009823@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9366

Modified Files:
	.cvsignore policy-20060608.patch selinux-policy.spec sources 
Log Message:
* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.1-1
- Update to upstream
- Add new class for kernel key ring



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	22 Jun 2006 01:15:06 -0000	1.73
+++ .cvsignore	22 Jun 2006 19:16:49 -0000	1.74
@@ -74,3 +74,4 @@
 serefpolicy-2.2.47.tgz
 serefpolicy-2.2.48.tgz
 serefpolicy-2.2.49.tgz
+serefpolicy-2.3.1.tgz

policy-20060608.patch:
 global_tunables               |    7 +
 modules/admin/consoletype.te  |    7 +
 modules/kernel/kernel.if      |   38 +++++++
 modules/services/pegasus.if   |   31 ++++++
 modules/services/pegasus.te   |    5 -
 modules/services/squid.te     |    2 
 modules/services/tftp.te      |    1 
 modules/system/hostname.te    |    5 -
 modules/system/init.if        |    7 -
 modules/system/selinuxutil.te |    2 
 modules/system/userdomain.if  |  201 ++++++++++++++++++++++++++----------------
 modules/system/userdomain.te  |   32 ++----
 12 files changed, 232 insertions(+), 106 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policy-20060608.patch	21 Jun 2006 20:33:38 -0000	1.15
+++ policy-20060608.patch	22 Jun 2006 19:16:49 -0000	1.16
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.48/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.49/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/global_tunables	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/global_tunables	2006-06-22 15:13:37.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,9 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.48/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.49/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/admin/consoletype.te	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/admin/consoletype.te	2006-06-22 15:13:37.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -32,9 +32,9 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.48/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.49/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/kernel/kernel.if	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/kernel/kernel.if	2006-06-22 15:13:37.000000000 -0400
 @@ -2096,3 +2096,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -77,9 +77,9 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.48/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.49/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.if	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/services/pegasus.if	2006-06-22 15:13:37.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -113,9 +113,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.48/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.49/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/pegasus.te	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/services/pegasus.te	2006-06-22 15:13:37.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -132,9 +132,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.2.48/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.2.49/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/squid.te	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/services/squid.te	2006-06-22 15:13:37.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -146,9 +146,9 @@
  corenet_tcp_connect_ftp_port(squid_t)
  corenet_tcp_connect_gopher_port(squid_t)
  corenet_tcp_connect_http_port(squid_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.48/policy/modules/services/tftp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.49/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/services/tftp.te	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/services/tftp.te	2006-06-22 15:13:37.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -157,9 +157,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.48/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.49/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.48/policy/modules/system/hostname.te	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/system/hostname.te	2006-06-22 15:13:37.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -172,9 +172,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.48/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.49/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/init.if	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/system/init.if	2006-06-22 15:13:37.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -189,9 +189,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.48/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.49/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/selinuxutil.te	2006-06-21 10:00:37.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/system/selinuxutil.te	2006-06-22 15:13:37.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -201,9 +201,9 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.48/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-20 09:54:08.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.if	2006-06-21 10:00:37.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.49/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/system/userdomain.if	2006-06-22 15:13:37.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -508,7 +508,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4767,3 +4789,34 @@
+@@ -4789,3 +4789,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -543,9 +543,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.48/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.48/policy/modules/system/userdomain.te	2006-06-21 10:00:37.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.49/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
++++ serefpolicy-2.2.49/policy/modules/system/userdomain.te	2006-06-22 15:13:37.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- selinux-policy.spec	21 Jun 2006 20:33:38 -0000	1.218
+++ selinux-policy.spec	22 Jun 2006 19:16:49 -0000	1.219
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.49
+Version: 2.3.1
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -342,6 +342,10 @@
 %endif
 
 %changelog
+* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.1-1
+- Update to upstream
+- Add new class for kernel key ring
+
 * Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.49-1
 - Update to upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	22 Jun 2006 01:15:06 -0000	1.77
+++ sources	22 Jun 2006 19:16:49 -0000	1.78
@@ -1 +1 @@
-a28b824570eeac1482c43c62f88735c9  serefpolicy-2.2.49.tgz
+ea51e2652a0d30a9a043cca14c4523fe  serefpolicy-2.3.1.tgz



From fedora-cvs-commits at redhat.com  Thu Jun 22 19:18:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 15:18:35 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.76,1.77
Message-ID: <200606221918.k5MJIZYg015539@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15491

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix


linux-2.6-compile-fixes.patch:
 drivers/net/myri10ge/myri10ge.c |    2 +-
 drivers/video/Kconfig           |    4 ++--
 include/linux/pci_regs.h        |    2 ++
 kernel/power/main.c             |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- linux-2.6-compile-fixes.patch	22 Jun 2006 18:55:30 -0000	1.76
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 19:18:33 -0000	1.77
@@ -43,3 +43,25 @@
  #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
  #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
  #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
+
+--- linux-2.6.17.noarch/include/linux/pci_regs.h~	2006-06-22 14:54:33.000000000 -0400
++++ linux-2.6.17.noarch/include/linux/pci_regs.h	2006-06-22 14:54:59.000000000 -0400
+@@ -197,6 +197,7 @@
+ #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
+ #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
+ #define  PCI_CAP_ID_HT_IRQCONF	0x08	/* HyperTransport IRQ Configuration */
++#define  PCI_CAP_ID_VNDR	0x09
+ #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
+ #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
+ #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
+--- linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c~	2006-06-22 15:16:35.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c	2006-06-22 15:18:18.000000000 -0400
+@@ -2120,7 +2120,7 @@ abort_linearize:
+ 		goto drop;
+ 	}
+ 
+-	if (skb_linearize(skb, GFP_ATOMIC))
++	if (skb_linearize(skb))
+ 		goto drop;
+ 
+ 	mgp->tx_linearized++;



From fedora-cvs-commits at redhat.com  Thu Jun 22 19:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 15:24:09 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.77,1.78
Message-ID: <200606221924.k5MJO98p017664@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17538

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
trim


linux-2.6-compile-fixes.patch:
 drivers/net/myri10ge/myri10ge.c |    2 +-
 drivers/video/Kconfig           |    4 ++--
 include/linux/pci_regs.h        |    1 +
 kernel/power/main.c             |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- linux-2.6-compile-fixes.patch	22 Jun 2006 19:18:33 -0000	1.77
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 19:24:06 -0000	1.78
@@ -1,4 +1,3 @@
-current.diff
 
 kernel/power/main.c: In function 'suspend_prepare':
 kernel/power/main.c:89: error: implicit declaration of function 'suspend_console'
@@ -44,16 +43,6 @@
  #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
  #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
 
---- linux-2.6.17.noarch/include/linux/pci_regs.h~	2006-06-22 14:54:33.000000000 -0400
-+++ linux-2.6.17.noarch/include/linux/pci_regs.h	2006-06-22 14:54:59.000000000 -0400
-@@ -197,6 +197,7 @@
- #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
- #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
- #define  PCI_CAP_ID_HT_IRQCONF	0x08	/* HyperTransport IRQ Configuration */
-+#define  PCI_CAP_ID_VNDR	0x09
- #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
- #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
- #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
 --- linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c~	2006-06-22 15:16:35.000000000 -0400
 +++ linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c	2006-06-22 15:18:18.000000000 -0400
 @@ -2120,7 +2120,7 @@ abort_linearize:



From fedora-cvs-commits at redhat.com  Thu Jun 22 19:57:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 15:57:35 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.25,1.26
Message-ID: <200606221957.k5MJvZZ5020202@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20187

Modified Files:
	linux-2.6-xen.patch 
Log Message:
build fix

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   54 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 257 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linux-2.6-xen.patch	20 Jun 2006 20:25:53 -0000	1.25
+++ linux-2.6-xen.patch	22 Jun 2006 19:57:31 -0000	1.26
@@ -53779,9 +53779,9 @@
 +static void __netif_up(netif_t *netif)
 +{
 +	struct net_device *dev = netif->dev;
-+	spin_lock_bh(&dev->xmit_lock);
++	netif_tx_lock_bh(dev);
 +	netif->active = 1;
-+	spin_unlock_bh(&dev->xmit_lock);
++	netif_tx_unlock_bh(dev);
 +	enable_irq(netif->irq);
 +	netif_schedule_work(netif);
 +}
@@ -53790,9 +53790,9 @@
 +{
 +	struct net_device *dev = netif->dev;
 +	disable_irq(netif->irq);
-+	spin_lock_bh(&dev->xmit_lock);
++	netif_tx_lock_bh(dev);
 +	netif->active = 0;
-+	spin_unlock_bh(&dev->xmit_lock);
++	netif_tx_unlock_bh(dev);
 +	netif_deschedule_work(netif);
 +}
 +



From fedora-cvs-commits at redhat.com  Thu Jun 22 20:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 16:27:41 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.16,1.17
Message-ID: <200606222027.k5MKRfSD002984@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2971

Modified Files:
	libXaw.spec 
Log Message:
* Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6
- Added "Requires: libXpm-devel" to devel subpackage to attempt to fix
  bug (#192040).



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXaw.spec	7 Jun 2006 17:46:00 -0000	1.16
+++ libXaw.spec	22 Jun 2006 20:27:39 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 5
+Release: 6
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +35,7 @@
 Requires: xorg-x11-proto-devel
 Requires: libXmu-devel
 Requires: libXt-devel
+Requires: libXpm-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -100,6 +101,10 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6
+- Added "Requires: libXpm-devel" to devel subpackage to attempt to fix
+  bug (#192040).
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5
 - Remove package ownership of mandir/libdir/etc.
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 20:32:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 16:32:21 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.12,1.13
Message-ID: <200606222032.k5MKWLpM003120@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3105

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
Bump build dep to libXaw-devel >= 1.0.2-6, to pick up indirect dependency on libXpm-devel which was fixed in that release.


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-resutils.spec	22 Jun 2006 05:56:59 -0000	1.12
+++ xorg-x11-resutils.spec	22 Jun 2006 20:32:19 -0000	1.13
@@ -21,7 +21,7 @@
 BuildRequires: libXext-devel
 BuildRequires: libSM-devel
 BuildRequires: libICE-devel
-BuildRequires: libXaw-devel
+BuildRequires: libXaw-devel >= 1.0.2-6
 # FIXME: appres has 'x11 xt' as a dependency check, which fails.  While it
 # does not check for Xdmcp, installing libXdmcp-devel resolves the problem.
 # This implies that one of the other library devel packages should probably
@@ -29,8 +29,6 @@
 # what the best solution is yet, so I'm putting this here.
 BuildRequires: libXdmcp-devel
 
-#BuildRequires: libXpm-devel
-
 # FIXME: check if still needed for X11R7
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
@@ -95,6 +93,8 @@
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Bump package version to 7.1 to match the X11 release the packages were
   last synced with.
+- Bump build dep to libXaw-devel >= 1.0.2-6, to pick up indirect dependency
+  on libXpm-devel which was fixed in that release.
 
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Fix all SourceN lines in spec file to not have to update them every time.



From fedora-cvs-commits at redhat.com  Thu Jun 22 21:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 17:06:51 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.10,
	1.11 openoffice.org.spec, 1.741, 1.742
Message-ID: <200606222106.k5ML6p1H003489@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3437

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
adjust for new printing api

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                      |    0 
 inc/print.hxx                       |    0 
 inc/psprint/ppdparser.hxx           |    0 
 psprint/inc/psprint/ppdparser.hxx   |    2 
 psprint/source/printer/cupsmgr.cxx  |    7 -
 source/dialogs/makefile.mk          |    0 
 source/dialogs/printdlg.cxx         |    0 
 source/gdi/jobset.cxx               |    0 
 source/printer/cupsmgr.cxx          |    0 
 svtools/source/dialogs/makefile.mk  |    4 
 svtools/source/dialogs/printdlg.cxx |  252 ++++++++++++++++++++++++++++++++++--
 svtools/util/makefile.mk            |    8 +
 util/makefile.mk                    |    0 
 vcl/inc/jobset.hxx                  |    1 
 vcl/inc/print.hxx                   |    1 
 vcl/source/gdi/jobset.cxx           |  173 ++++++++++++++++++++++++
 16 files changed, 437 insertions(+), 11 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 17:38:33 -0000	1.10
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 21:06:32 -0000	1.11
@@ -293,7 +293,7 @@
 diff -u -r1.21 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	8 Sep 2005 15:17:00 -0000	1.21
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	19 May 2006 14:58:56 -0000
-@@ -83,8 +83,38 @@
+@@ -83,8 +83,37 @@
  #include <comphelper/processfactory.hxx>
  #endif
  
@@ -316,7 +316,6 @@
 +#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
 +#include "miscopt.hxx"
 +#endif
-+#include <gtk/gtkprintsettings.h>
 +#include <gtk/gtkprintunixdialog.h>
 +#include <gtk/gtkstock.h>
 +#include <gtk/gtkcheckbutton.h>
@@ -396,7 +395,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -621,15 +707,155 @@
+@@ -621,15 +707,166 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -419,7 +418,7 @@
 +			aOptions = aOptions.replace('~','_');
 +			gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(pDialog), 
 +				GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | 
-+				GTK_PRINT_CAPABILITY_REVERSE));
++				GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS));
 +			dialog_remove_buttons( GTK_DIALOG( pDialog ) );
 +			gtk_dialog_add_button( GTK_DIALOG( pDialog ), aOptions.getStr(), 10);
 +			gtk_dialog_add_buttons (GTK_DIALOG (pDialog), 
@@ -461,18 +460,32 @@
 +				rtl::OUString sNewPrinterName((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
 +				GtkPrintSettings* pSettings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG(pDialog));
 +
-+				if (gtk_print_settings_has_key(pSettings, "pdf-filename"))
++				rtl::OUString sPath;
++				if (const gchar *uri = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_URI))
++				{
++					if (gchar *pFile = g_filename_from_uri (uri, NULL, NULL))
++					{
++						sPath = rtl::OUString((const sal_Char *)pFile, strlen((const sal_Char*)(pFile)), osl_getThreadTextEncoding());
++						g_free(pFile);
++					}
++				}
++				pStr = 0;
++
++				if (sPath.getLength())
++					pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
++
++				if (pStr && !strcmp(pStr, "pdf"))
 +				{
 +					gtk_widget_hide( pDialog );
-+					pStr = gtk_print_settings_get(pSettings, "pdf-filename");
-+					rtl::OUString sPath((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), osl_getThreadTextEncoding());
 +					rtl::OUString sFileURL;
 +					FileBase::getFileURLFromSystemPath(sPath, sFileURL);
 +					ExportAsPDF(sFileURL);
 +				}
 +				else
 +				{
-+					pStr = gtk_print_settings_get(pSettings, "print-pages");
++					nRet = TRUE;
++
++					pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
 +					if (pStr && !strcmp(pStr, "ranges"))
 +					{
 +						maRangeText = String();
@@ -499,41 +512,38 @@
 +					else
 +						meCheckRange = PRINTDIALOG_ALL;
 +
-+					SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, "n-copies", 1));
++					SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
 +					EnableCollate(gtk_print_settings_get_collate(pSettings));
 +
-+					nRet = TRUE;
++					if (sPath.getLength())
++					{
++						mpPrinter->EnablePrintFile(true);
++						mpPrinter->SetPrintFile(sPath);
++						sNewPrinterName = ASCII_STR("Generic Printer");
++					}
++					
 +					OUString sOldPrinterName(mpPrinter->GetName());
 +					if (sNewPrinterName != sOldPrinterName)
 +					{
-+						USHORT nCount = Printer::GetQueueCount();
 +						USHORT i = 0;
-+						for (i = 0; i < nCount; ++i)
++						USHORT nCount = Printer::GetQueueCount();
++						if (nCount)
 +						{
-+							const QueueInfo& rInfo = Printer::GetQueueInfo(i, false);
-+							if (OUString(rInfo.GetPrinterName()) == sNewPrinterName)
++							for (i = 0; i < nCount; ++i)
 +							{
-+								Printer aTempPrinter(rInfo);
-+								mpPrinter->SetPrinterProps(&aTempPrinter);
-+								break;
++								const QueueInfo& rInfo = Printer::GetQueueInfo(i, false);
++								if (OUString(rInfo.GetPrinterName()) == sNewPrinterName)
++								{
++									Printer aTempPrinter(rInfo);
++									mpPrinter->SetPrinterProps(&aTempPrinter);
++									break;
++								}
 +							}
 +						}
 +						if (i == nCount)
-+						{
-+							fprintf(stderr, "OOo UNKNOWN PRINTER, oh dear\n");
-+							const QueueInfo& rInfo = Printer::GetQueueInfo(0, false);
-+							Printer aTempPrinter(rInfo);
-+							mpPrinter->SetPrinterProps(&aTempPrinter);
-+						}
++							fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
 +					}
 +					gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
-+					if (gboolean bPrintToFile = gtk_print_settings_get_print_to_file(pSettings))
-+					{
-+						mpPrinter->EnablePrintFile(bPrintToFile);
-+						pStr = gtk_print_settings_get(pSettings, "pdf-filename");
-+						rtl::OUString sPath((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), osl_getThreadTextEncoding());
-+						mpPrinter->SetPrintFile(sPath);
-+					}
 +				}
 +				g_object_unref(pSettings);
 +				}
@@ -559,8 +569,38 @@
  	}
  
  	maStatusTimer.Stop();
-@@ -644,4 +870,3 @@
+@@ -644,4 +881,3 @@
  	mpPrinterImpl->m_bHelpDisabled = sal_True;
  	maBtnHelp.Disable();
  }
 -
+Index: source/printer/cupsmgr.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/printer/cupsmgr.cxx,v
+retrieving revision 1.12
+diff -u -p -u -r1.12 cupsmgr.cxx
+--- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
++++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
+@@ -475,9 +487,10 @@ void CUPSManager::initialize()
+ 
+     // clear old stuff
+     m_aCUPSDestMap.clear();
+-
++#if 0
+     if( ! (m_nDests && m_pDests ) )
+         return;
++#endif
+ 
+     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
+     int nPrinter = m_nDests;
+@@ -550,6 +563,10 @@ void CUPSManager::initialize()
+ 
+     m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
+ #endif // ENABLE_CUPS
++
++	addPrinter(rtl::OUString::createFromAscii("Generic Printer"),
++		rtl::OUString::createFromAscii("SGENPRT"));
++
+ }
+ 
+ #ifdef ENABLE_CUPS


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.741
retrieving revision 1.742
diff -u -r1.741 -r1.742
--- openoffice.org.spec	22 Jun 2006 15:45:54 -0000	1.741
+++ openoffice.org.spec	22 Jun 2006 21:06:32 -0000	1.742
@@ -50,7 +50,7 @@
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, gcc-java >= 4.0.2
 BuildRequires:	libgcj-devel >= 4.0.2, java-1.4.2-gcj-compat-devel, zlib-devel
-BuildRequires:	freetype-devel, gtk2-devel >= 2.4.8, gnome-vfs2-devel
+BuildRequires:	freetype-devel, gtk2-devel >= 2.9.4, gnome-vfs2-devel
 BuildRequires:	cups-devel, curl-devel, boost-devel >= 1.31.0, python-devel
 BuildRequires:	expat-devel, libxml2-devel, neon-devel >= 0.24, libidn-devel
 BuildRequires:	pam-devel, libjpeg-devel, sane-backends-devel, libXt-devel
@@ -3313,6 +3313,7 @@
 * Thu Jun 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-6.1
 - next milestone
 - drop hack and use new gtk_print_unix_dialog_set_manual_capabilities api instead
+- readjust printing stuff for new "print to file" mechanism
 
 * Wed Jun 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.3
 - rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses



From fedora-cvs-commits at redhat.com  Thu Jun 22 22:23:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 18:23:10 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.113, 1.114 mkinitrd.spec, 1.130,
	1.131 sources, 1.126, 1.127
Message-ID: <200606222223.k5MMNAwt003740@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3705/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
auto-import mkinitrd-5.0.45-1 on branch devel from mkinitrd-5.0.45-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- .cvsignore	22 Jun 2006 17:47:34 -0000	1.113
+++ .cvsignore	22 Jun 2006 22:23:07 -0000	1.114
@@ -1 +1 @@
-mkinitrd-5.0.44.tar.bz2
+mkinitrd-5.0.45.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- mkinitrd.spec	22 Jun 2006 17:47:34 -0000	1.130
+++ mkinitrd.spec	22 Jun 2006 22:23:07 -0000	1.131
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.44
+Version: 5.0.45
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,10 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.45-1
+- don't emit <empty> for iscsi username/password stuff
+- handle _netdev option for filesystems
+
 * Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.44-1
 - fix so we only use iscsistart if we're doing root on iscsi 
 - fix spurious shell error (noticed by karsten)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- sources	22 Jun 2006 17:47:34 -0000	1.126
+++ sources	22 Jun 2006 22:23:07 -0000	1.127
@@ -1 +1 @@
-ad91b343633ec87805c2dfb3fe398a2b  mkinitrd-5.0.44.tar.bz2
+f5c8460b6e2e16dfd9b1f1b93a2cdb07  mkinitrd-5.0.45.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 22 22:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 18:42:08 -0400
Subject: rpms/coreutils/devel coreutils-5.96-newhashes.patch, NONE,
	1.1 coreutils-5.2.1-runuser.patch, 1.8,
	1.9 coreutils-selinux.patch, 1.22, 1.23 coreutils.spec, 1.120, 1.121
Message-ID: <200606222242.k5MMg8Bp008584@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8422

Modified Files:
	coreutils-5.2.1-runuser.patch coreutils-selinux.patch 
	coreutils.spec 
Added Files:
	coreutils-5.96-newhashes.patch 
Log Message:
* Thu Jun 22 2006 Tim Waugh <twaugh at redhat.com> 5.96-4
- Include new hashes (bug #196369).  Patch from upstream.


coreutils-5.96-newhashes.patch:
 AUTHORS                |    9 
 README                 |    6 
 aclocal.m4             |    2 
 configure.ac           |    8 
 lib/Makefile.am        |    1 
 lib/base64.c           |  416 ++++++++++++++++++++++++++++++++++++
 lib/base64.h           |   45 +++
 lib/md5.c              |  189 ++++++++--------
 lib/md5.h              |   52 +---
 lib/sha1.c             |   77 +++---
 lib/sha1.h             |   22 -
 lib/sha256.c           |  548 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sha256.h           |   88 +++++++
 lib/sha512.c           |  559 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sha512.h           |   90 +++++++
 m4/prereq.m4           |    2 
 m4/sha256.m4           |   15 +
 m4/sha512.m4           |   15 +
 man/Makefile.am        |   10 
 man/base64.x           |    4 
 man/sha224sum.x        |    4 
 man/sha256sum.x        |    4 
 man/sha384sum.x        |    4 
 man/sha512sum.x        |    4 
 src/Makefile.am        |   20 +
 src/base64.c           |  308 ++++++++++++++++++++++++++
 src/md5sum.c           |  137 ++++++++----
 tests/misc/Makefile.am |    5 
 tests/misc/base64      |   81 +++++++
 tests/misc/sha224sum   |   45 +++
 tests/misc/sha256sum   |   51 ++++
 tests/misc/sha384sum   |   51 ++++
 tests/misc/sha512sum   |   51 ++++
 33 files changed, 2691 insertions(+), 232 deletions(-)

--- NEW FILE coreutils-5.96-newhashes.patch ---
--- coreutils-5.96/configure.ac.newhashes	2006-05-16 18:12:36.000000000 +0100
+++ coreutils-5.96/configure.ac	2006-06-22 23:30:18.000000000 +0100
@@ -305,3 +305,11 @@
   tests/wc/Makefile
   )
 AC_OUTPUT
+
+# This is a _HACK_, tests are added via. patch so they don't have +x perms.
+# we hand hack them in here...
+chmod +x $srcdir/tests/misc/base64
+chmod +x $srcdir/tests/misc/sha224sum
+chmod +x $srcdir/tests/misc/sha256sum
+chmod +x $srcdir/tests/misc/sha384sum
+chmod +x $srcdir/tests/misc/sha512sum
--- coreutils-5.96/README.newhashes	2006-06-22 23:30:24.000000000 +0100
+++ coreutils-5.96/README	2006-06-22 23:31:21.000000000 +0100
@@ -7,11 +7,13 @@
 
 The programs that can be built with this package are:
 
-  [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
+  [ base64
+  basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
   df dir dircolors dirname du echo env expand expr factor false fmt fold
   ginstall groups head hostid hostname id join kill link ln logname ls
   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
-  printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
+  printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum
+  sha256sum sha384sum sha512sum shred sleep sort
   split stat stty su sum sync tac tail tee test touch tr true tsort tty
   uname unexpand uniq unlink uptime users vdir wc who whoami yes
 
--- coreutils-5.96/src/Makefile.am.newhashes	2005-07-18 08:52:18.000000000 +0100
+++ coreutils-5.96/src/Makefile.am	2006-06-22 23:30:18.000000000 +0100
@@ -24,10 +24,12 @@
   ginstall link ln dir vdir ls mkdir \
   mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
   cat cksum comm csplit cut expand fmt fold head join md5sum \
-  nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
+  nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+  sort split sum tac tail tr tsort unexpand uniq wc \
   basename date dirname echo env expr factor false \
   hostname id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
+  base64 \
   $(OPTIONAL_BIN_PROGS) $(DF_PROG)
 
 noinst_PROGRAMS = setuidgid
@@ -37,7 +39,7 @@
   chown-core.h fs.h \
   wheel.h wheel-size.h
 EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
-  groups.sh wheel-gen.pl extract-magic
+  groups.sh wheel-gen.pl extract-magic # rand-isaac.c
 CLEANFILES = $(SCRIPTS) su
 
 AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
@@ -169,8 +171,18 @@
 mv_SOURCES = mv.c copy.c cp-hash.c remove.c
 rm_SOURCES = rm.c remove.c
 
-md5sum_SOURCES = md5sum.c md5.c
-sha1sum_SOURCES = md5sum.c sha1sum.c
+md5sum_SOURCES = md5sum.c
+md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS)
+sha1sum_SOURCES = md5sum.c
+sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS)
+sha224sum_SOURCES = md5sum.c
+sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS)
+sha256sum_SOURCES = md5sum.c
+sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS)
+sha384sum_SOURCES = md5sum.c
+sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
+sha512sum_SOURCES = md5sum.c
+sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
 
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
--- coreutils-5.96/src/md5sum.c.newhashes	2005-10-27 17:22:14.000000000 +0100
+++ coreutils-5.96/src/md5sum.c	2006-06-22 23:30:18.000000000 +0100
@@ -1,4 +1,4 @@
-/* Compute MD5 or SHA1 checksum of files or strings
+/* Compute MD5, SHA1, SHA224, SHA256, SHA384 or SHA512 checksum of files or strings
    Copyright (C) 1995-2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -24,34 +24,85 @@
 
 #include "system.h"
 
-#include "md5.h"
-#include "sha1.h"
-#include "checksum.h"
+#if HASH_ALGO_MD5
+# include "md5.h"
+#endif
+#if HASH_ALGO_SHA1
+# include "sha1.h"
+#endif
+#if HASH_ALGO_SHA256 || HASH_ALGO_SHA224
+# include "sha256.h"
+#endif
+#if HASH_ALGO_SHA512 || HASH_ALGO_SHA384
+# include "sha512.h"
+#endif
 #include "getline.h"
 #include "error.h"
 #include "quote.h"
 #include "stdio--.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
-#define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "sha1sum")
+#if HASH_ALGO_MD5
+# define PROGRAM_NAME "md5sum"
+# define DIGEST_TYPE_STRING "MD5"
+# define DIGEST_STREAM md5_stream
+# define DIGEST_BUFFER md5_buffer
+# define DIGEST_BITS 128
+# define DIGEST_REFERENCE "RFC 1321"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA1
+# define PROGRAM_NAME "sha1sum"
+# define DIGEST_TYPE_STRING "SHA1"
+# define DIGEST_STREAM sha1_stream
+# define DIGEST_BUFFER sha1_buffer
+# define DIGEST_BITS 160
+# define DIGEST_REFERENCE "FIPS-180-1"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA256
+# define PROGRAM_NAME "sha256sum"
+# define DIGEST_TYPE_STRING "SHA256"
+# define DIGEST_STREAM sha256_stream
+# define DIGEST_BUFFER sha256_buffer
+# define DIGEST_BITS 256
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA224
+# define PROGRAM_NAME "sha224sum"
+# define DIGEST_TYPE_STRING "SHA224"
+# define DIGEST_STREAM sha224_stream
+# define DIGEST_BUFFER sha224_buffer
+# define DIGEST_BITS 224
+# define DIGEST_REFERENCE "RFC 3874"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA512
+# define PROGRAM_NAME "sha512sum"
+# define DIGEST_TYPE_STRING "SHA512"
+# define DIGEST_STREAM sha512_stream
+# define DIGEST_BUFFER sha512_buffer
+# define DIGEST_BITS 512
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#elif HASH_ALGO_SHA384
+# define PROGRAM_NAME "sha384sum"
+# define DIGEST_TYPE_STRING "SHA384"
+# define DIGEST_STREAM sha384_stream
+# define DIGEST_BUFFER sha384_buffer
+# define DIGEST_BITS 384
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#else
+# error "Can't decide which hash algorithm to compile."
+#endif
 
-#define AUTHORS "Ulrich Drepper", "Scott Miller"
+#define DIGEST_HEX_BYTES (DIGEST_BITS / 4)
+#define DIGEST_BIN_BYTES (DIGEST_BITS / 8)
 
-
-#define DIGEST_TYPE_STRING(Alg) ((Alg) == ALG_MD5 ? "MD5" : "SHA1")
-#define DIGEST_STREAM(Alg) ((Alg) == ALG_MD5 ? md5_stream : sha1_stream)
-
-#define DIGEST_BITS(Alg) ((Alg) == ALG_MD5 ? 128 : 160)
-#define DIGEST_HEX_BYTES(Alg) (DIGEST_BITS (Alg) / 4)
-#define DIGEST_BIN_BYTES(Alg) (DIGEST_BITS (Alg) / 8)
-
-#define MAX_DIGEST_BIN_BYTES MAX (DIGEST_BIN_BYTES (ALG_MD5), \
-				  DIGEST_BIN_BYTES (ALG_SHA1))
+#define AUTHORS "Ulrich Drepper", "Scott Miller", "David Madore"
 
 /* The minimum length of a valid digest line.  This length does
    not include any newline character at the end of a line.  */
-#define MIN_DIGEST_LINE_LENGTH(Alg) \
-  (DIGEST_HEX_BYTES (Alg) /* length of hexadecimal message digest */ \
+#define MIN_DIGEST_LINE_LENGTH \
+  (DIGEST_HEX_BYTES /* length of hexadecimal message digest */ \
    + 2 /* blank and binary indicator */ \
    + 1 /* minimum filename length */ )
 
@@ -72,9 +123,6 @@
    improperly formatted checksum line.  */
 static bool warn = false;
 
-/* Declared and set via one of the wrapper .c files.  */
-/* int algorithm = ALG_UNSPECIFIED; */
-
 /* The name this program was run with.  */
 char *program_name;
 
[...3208 lines suppressed...]
-	 little endian byte order we perhaps have to change the byte order
-	 before the computation.  To reduce the work for the next steps
-	 we store the swapped words in the array CORRECT_WORDS.  */
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
 
 #define OP(a, b, c, d, s, T)						\
       do								\
@@ -339,40 +340,40 @@
       while (0)
 
       /* It is unfortunate that C does not provide an operator for
-	 cyclic rotation.  Hope the C compiler is smart enough.  */
+         cyclic rotation.  Hope the C compiler is smart enough.  */
 #define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
 
       /* Before we start, one word to the strange constants.
-	 They are defined in RFC 1321 as
+         They are defined in RFC 1321 as
 
-	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
 
-	 Here is an equivalent invocation using Perl:
+         Here is an equivalent invocation using Perl:
 
-	 perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
        */
 
       /* Round 1.  */
-      OP (A, B, C, D,  7, 0xd76aa478);
+      OP (A, B, C, D, 7, 0xd76aa478);
       OP (D, A, B, C, 12, 0xe8c7b756);
       OP (C, D, A, B, 17, 0x242070db);
       OP (B, C, D, A, 22, 0xc1bdceee);
-      OP (A, B, C, D,  7, 0xf57c0faf);
+      OP (A, B, C, D, 7, 0xf57c0faf);
       OP (D, A, B, C, 12, 0x4787c62a);
       OP (C, D, A, B, 17, 0xa8304613);
       OP (B, C, D, A, 22, 0xfd469501);
-      OP (A, B, C, D,  7, 0x698098d8);
+      OP (A, B, C, D, 7, 0x698098d8);
       OP (D, A, B, C, 12, 0x8b44f7af);
       OP (C, D, A, B, 17, 0xffff5bb1);
       OP (B, C, D, A, 22, 0x895cd7be);
-      OP (A, B, C, D,  7, 0x6b901122);
+      OP (A, B, C, D, 7, 0x6b901122);
       OP (D, A, B, C, 12, 0xfd987193);
       OP (C, D, A, B, 17, 0xa679438e);
       OP (B, C, D, A, 22, 0x49b40821);
 
       /* For the second to fourth round we have the possibly swapped words
-	 in CORRECT_WORDS.  Redefine the macro to take an additional first
-	 argument specifying the function to use.  */
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
 #undef OP
 #define OP(f, a, b, c, d, k, s, T)					\
       do								\
@@ -384,58 +385,58 @@
       while (0)
 
       /* Round 2.  */
-      OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
-      OP (FG, D, A, B, C,  6,  9, 0xc040b340);
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
       OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
-      OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
-      OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
-      OP (FG, D, A, B, C, 10,  9, 0x02441453);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
       OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
-      OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
-      OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
-      OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
-      OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
-      OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
-      OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
-      OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
-      OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
       OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
 
       /* Round 3.  */
-      OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
-      OP (FH, D, A, B, C,  8, 11, 0x8771f681);
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
       OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
       OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
-      OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
-      OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
-      OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
       OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
-      OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
-      OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
-      OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
-      OP (FH, B, C, D, A,  6, 23, 0x04881d05);
-      OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
       OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
       OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-      OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
 
       /* Round 4.  */
-      OP (FI, A, B, C, D,  0,  6, 0xf4292244);
-      OP (FI, D, A, B, C,  7, 10, 0x432aff97);
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
       OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
-      OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
-      OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
-      OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
       OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
-      OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
-      OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
       OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-      OP (FI, C, D, A, B,  6, 15, 0xa3014314);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
       OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
-      OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
       OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
-      OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
-      OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
 
       /* Add the starting values of the context.  */
       A += A_save;
--- coreutils-5.96/AUTHORS.newhashes	2004-11-03 23:10:50.000000000 +0000
+++ coreutils-5.96/AUTHORS	2006-06-22 23:30:18.000000000 +0100
@@ -1,6 +1,7 @@
 Here are the names of the programs in this package,
 each followed by the name(s) of its author(s).
 
+base64: Simon Josefsson
 basename: FIXME unknown
 cat: Torbjorn Granlund, Richard M. Stallman
 chgrp: David MacKenzie, Jim Meyering
@@ -39,7 +40,7 @@
 ln: Mike Parker, David MacKenzie
 logname: FIXME: unknown
 ls: Richard Stallman, David MacKenzie
-md5sum: Ulrich Drepper, Scott Miller
+md5sum: Ulrich Drepper, Scott Miller, David Madore
 mkdir: David MacKenzie
 mkfifo: David MacKenzie
 mknod: David MacKenzie
@@ -60,7 +61,11 @@
 rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
 rmdir: David MacKenzie
 seq: Ulrich Drepper
-sha1sum: Ulrich Drepper, Scott Miller
+sha1sum: Ulrich Drepper, Scott Miller, David Madore
+sha224sum: Ulrich Drepper, Scott Miller, David Madore
+sha256sum: Ulrich Drepper, Scott Miller, David Madore
+sha384sum: Ulrich Drepper, Scott Miller, David Madore
+sha512sum: Ulrich Drepper, Scott Miller, David Madore
 shred: Colin Plumb
 sleep: Jim Meyering, Paul Eggert
 sort: Mike Haertel, Paul Eggert
--- coreutils-5.96/aclocal.m4.newhashes	2006-05-22 07:08:26.000000000 +0100
+++ coreutils-5.96/aclocal.m4	2006-06-22 23:30:18.000000000 +0100
@@ -1055,6 +1055,8 @@
 m4_include([m4/setenv.m4])
 m4_include([m4/settime.m4])
 m4_include([m4/sha1.m4])
+m4_include([m4/sha256.m4])
+m4_include([m4/sha512.m4])
 m4_include([m4/sig2str.m4])
 m4_include([m4/signed.m4])
 m4_include([m4/socklen.m4])

coreutils-5.2.1-runuser.patch:
 AUTHORS            |    1 
 README             |    2 -
 man/Makefile.am    |    3 +-
 man/runuser.1      |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/runuser.x      |    4 +++
 src/Makefile.am    |    8 +++++--
 src/su.c           |   20 +++++++++++++++++
 tests/help-version |    1 
 8 files changed, 93 insertions(+), 5 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- coreutils-5.2.1-runuser.patch	24 Nov 2005 23:00:49 -0000	1.8
+++ coreutils-5.2.1-runuser.patch	22 Jun 2006 22:41:57 -0000	1.9
@@ -1,93 +1,5 @@
---- /dev/null	2005-10-10 09:36:06.437701000 +0100
-+++ coreutils-5.93/man/runuser.1	2005-11-14 10:54:44.000000000 +0000
-@@ -0,0 +1,59 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-+.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
-+.SH NAME
-+runuser \- run a shell with substitute user and group IDs, similar to su, but will not prompt for password.
-+.SH SYNOPSIS
-+.B runuser
-+[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...]
-+.SH DESCRIPTION
-+.\" Add any additional description here
-+.PP
-+Change the effective user id and group id to that of USER.
-+.TP
-+-, \fB\-l\fR, \fB\-\-login\fR
-+make the shell a login shell
-+.TP
-+\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR
-+pass a single COMMAND to the shell with \fB\-c\fR
-+.TP
-+\fB\-f\fR, \fB\-\-fast\fR
-+pass \fB\-f\fR to the shell (for csh or tcsh)
-+.TP
-+\fB\-m\fR, \fB\-\-preserve\-environment\fR
-+do not reset environment variables
-+.TP
-+\fB\-p\fR
-+same as \fB\-m\fR
-+.TP
-+\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR
-+run SHELL if /etc/shells allows it
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.PP
-+A mere - implies \fB\-l\fR.   If USER not given, assume root.
-+.SH AUTHOR
-+Written by David MacKenzie, Dan Walsh.
-+.SH "REPORTING BUGS"
-+Report bugs to <bug-coreutils at gnu.org>.
-+.SH COPYRIGHT
-+Copyright \(co 2004 Free Software Foundation, Inc.
-+.br
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+.SH "SEE ALSO"
-+Since this command is trimmed down version of su use you can use the su manual.
-+The full documentation for
-+.B su
-+is maintained as a Texinfo manual.  If the
-+.B info
-+and
-+.B su
-+programs are properly installed at your site, the command
-+.IP
-+.B info coreutils su
-+.PP
-+should give you access to the complete manual.
---- coreutils-5.93/man/Makefile.am.runuser	2005-10-13 15:12:51.000000000 +0100
-+++ coreutils-5.93/man/Makefile.am	2005-11-14 10:54:44.000000000 +0000
-@@ -7,7 +7,7 @@
-   link.1 ln.1 logname.1 \
-   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
-   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
--  rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
-+  rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
-   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
-   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
-   who.1 whoami.1 yes.1
-@@ -81,6 +81,7 @@
- readlink.1:	$(common_dep)	$(srcdir)/readlink.x	../src/readlink.c
- rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
- rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
-+runuser.1:	$(common_dep)	$(srcdir)/runuser.x	../src/su.c
- seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
- sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
- shred.1:	$(common_dep)	$(srcdir)/shred.x	../src/shred.c
---- /dev/null	2005-10-10 09:36:06.437701000 +0100
-+++ coreutils-5.93/man/runuser.x	2005-11-14 10:54:45.000000000 +0000
-@@ -0,0 +1,4 @@
-+[NAME]
-+runuser \- run a shell with substitute user and group IDs
-+[DESCRIPTION]
-+.\" Add any additional description here
---- coreutils-5.93/src/su.c	2005-11-14 10:54:44.000000000 +0000
-+++ coreutils-5.93/src/su.c	2005-11-24 16:12:18.000000000 +0000
+--- coreutils-5.96/src/su.c.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/src/su.c	2006-06-22 23:31:37.000000000 +0100
 @@ -132,9 +132,15 @@
  #include "error.h"
  
@@ -157,8 +69,8 @@
      {
  #ifdef SYSLOG_FAILURE
        log_su (pw, false);
---- coreutils-5.93/src/Makefile.am	2005-11-14 10:54:44.000000000 +0000
-+++ coreutils-5.93/src/Makefile.am	2005-11-24 16:18:58.000000000 +0000
+--- coreutils-5.96/src/Makefile.am.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/src/Makefile.am	2006-06-22 23:31:37.000000000 +0100
 @@ -17,7 +17,7 @@
  ## along with this program; if not, write to the Free Software Foundation,
  ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -168,7 +80,8 @@
  
  bin_SCRIPTS = groups
  bin_PROGRAMS = [ chgrp chown chmod cp dd dircolors du \
-@@ -93,4 +93,8 @@
+@@ -94,6 +94,10 @@
+ 
  su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
  
 +runuser_SOURCES = su.c
@@ -177,7 +90,8 @@
 +
  $(PROGRAMS): ../lib/libcoreutils.a
  
-@@ -106,7 +110,7 @@
+ SUFFIXES = .sh
+@@ -108,7 +112,7 @@
  	chmod +x $@-t
  	mv $@-t $@
  
@@ -186,9 +100,9 @@
  
  installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
  
---- coreutils-5.93/tests/help-version.runuser	2005-01-05 22:08:48.000000000 +0000
-+++ coreutils-5.93/tests/help-version	2005-11-14 10:54:45.000000000 +0000
-@@ -136,6 +136,7 @@
+--- coreutils-5.96/tests/help-version.runuser	2006-02-07 09:13:43.000000000 +0000
++++ coreutils-5.96/tests/help-version	2006-06-22 23:31:37.000000000 +0100
+@@ -137,6 +137,7 @@
  seq_args=10
  sleep_args=0
  su_args=--version
@@ -196,24 +110,112 @@
  test_args=foo
  
  # This is necessary in the unusual event that there is
---- coreutils-5.93/README.runuser	2005-09-28 19:34:26.000000000 +0100
-+++ coreutils-5.93/README	2005-11-14 10:54:45.000000000 +0000
-@@ -11,7 +11,7 @@
-   df dir dircolors dirname du echo env expand expr factor false fmt fold
-   ginstall groups head hostid hostname id join kill link ln logname ls
-   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
--  printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
-+  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort
-   split stat stty su sum sync tac tail tee test touch tr true tsort tty
-   uname unexpand uniq unlink uptime users vdir wc who whoami yes
- 
---- coreutils-5.93/AUTHORS.runuser	2004-11-03 23:10:50.000000000 +0000
-+++ coreutils-5.93/AUTHORS	2005-11-14 10:54:45.000000000 +0000
-@@ -59,6 +59,7 @@
+--- coreutils-5.96/AUTHORS.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/AUTHORS	2006-06-22 23:31:37.000000000 +0100
+@@ -60,6 +60,7 @@
  readlink: Dmitry V. Levin
  rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
  rmdir: David MacKenzie
 +runuser: David MacKenzie, Dan Walsh
  seq: Ulrich Drepper
- sha1sum: Ulrich Drepper, Scott Miller
- shred: Colin Plumb
+ sha1sum: Ulrich Drepper, Scott Miller, David Madore
+ sha224sum: Ulrich Drepper, Scott Miller, David Madore
+--- coreutils-5.96/README.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/README	2006-06-22 23:32:02.000000000 +0100
+@@ -12,7 +12,7 @@
+   df dir dircolors dirname du echo env expand expr factor false fmt fold
+   ginstall groups head hostid hostname id join kill link ln logname ls
+   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
+-  printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum
++  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum
+   sha256sum sha384sum sha512sum shred sleep sort
+   split stat stty su sum sync tac tail tee test touch tr true tsort tty
+   uname unexpand uniq unlink uptime users vdir wc who whoami yes
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runuser.x	2006-06-22 23:31:37.000000000 +0100
+@@ -0,0 +1,4 @@
++[NAME]
++runuser \- run a shell with substitute user and group IDs
++[DESCRIPTION]
++.\" Add any additional description here
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runuser.1	2006-06-22 23:31:37.000000000 +0100
+@@ -0,0 +1,59 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
++.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
++.SH NAME
++runuser \- run a shell with substitute user and group IDs, similar to su, but will not prompt for password.
++.SH SYNOPSIS
++.B runuser
++[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...]
++.SH DESCRIPTION
++.\" Add any additional description here
++.PP
++Change the effective user id and group id to that of USER.
++.TP
++-, \fB\-l\fR, \fB\-\-login\fR
++make the shell a login shell
++.TP
++\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR
++pass a single COMMAND to the shell with \fB\-c\fR
++.TP
++\fB\-f\fR, \fB\-\-fast\fR
++pass \fB\-f\fR to the shell (for csh or tcsh)
++.TP
++\fB\-m\fR, \fB\-\-preserve\-environment\fR
++do not reset environment variables
++.TP
++\fB\-p\fR
++same as \fB\-m\fR
++.TP
++\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR
++run SHELL if /etc/shells allows it
++.TP
++\fB\-\-help\fR
++display this help and exit
++.TP
++\fB\-\-version\fR
++output version information and exit
++.PP
++A mere - implies \fB\-l\fR.   If USER not given, assume root.
++.SH AUTHOR
++Written by David MacKenzie, Dan Walsh.
++.SH "REPORTING BUGS"
++Report bugs to <bug-coreutils at gnu.org>.
++.SH COPYRIGHT
++Copyright \(co 2004 Free Software Foundation, Inc.
++.br
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++.SH "SEE ALSO"
++Since this command is trimmed down version of su use you can use the su manual.
++The full documentation for
++.B su
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B su
++programs are properly installed at your site, the command
++.IP
++.B info coreutils su
++.PP
++should give you access to the complete manual.
+--- coreutils-5.96/man/Makefile.am.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/man/Makefile.am	2006-06-22 23:31:37.000000000 +0100
+@@ -7,7 +7,7 @@
+   link.1 ln.1 logname.1 \
+   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
+   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
+-  rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
++  rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
+   shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
+   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
+   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
+@@ -83,6 +83,7 @@
+ readlink.1:	$(common_dep)	$(srcdir)/readlink.x	../src/readlink.c
+ rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
+ rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
++runuser.1:	$(common_dep)	$(srcdir)/runuser.x	../src/su.c
+ seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
+ sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
+ sha224sum.1:    $(common_dep)   $(srcdir)/sha224sum.x   ../src/md5sum.c

coreutils-selinux.patch:
 README             |    4 
 config.hin         |   27 +--
 configure.ac       |    7 
 man/Makefile.am    |    4 
 man/Makefile.in    |   56 +++----
 man/chcon.1        |   64 ++++++++
 man/chcon.x        |    4 
 man/cp.1           |    5 
 man/dir.1          |   14 +
 man/id.1           |    3 
 man/install.1      |    5 
 man/ls.1           |   14 +
 man/mkdir.1        |    2 
 man/mkfifo.1       |    3 
 man/mknod.1        |    3 
 man/runcon.1       |   43 +++++
 man/runcon.x       |   14 +
 man/stat.1         |    6 
 man/vdir.1         |   14 +
 src/Makefile.am    |   23 +-
 src/chcon.c        |  421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/copy.c         |   72 ++++++++-
 src/copy.h         |    3 
 src/cp.c           |   64 +++++++-
 src/id.c           |   68 ++++++++
 src/install.c      |   99 ++++++++++++
 src/ls.c           |  296 ++++++++++++++++++++++++++++++++-----
 src/mkdir.c        |   30 +++
 src/mkfifo.c       |   29 +++
 src/mknod.c        |   30 +++
 src/mv.c           |   12 +
 src/runcon.c       |  253 +++++++++++++++++++++++++++++++
 src/stat.c         |  142 ++++++++++++++---
 tests/help-version |    4 
 34 files changed, 1714 insertions(+), 124 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- coreutils-selinux.patch	26 Apr 2006 14:57:05 -0000	1.22
+++ coreutils-selinux.patch	22 Jun 2006 22:41:57 -0000	1.23
@@ -1,5 +1,5 @@
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/src/chcon.c	2006-03-24 13:23:45.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/src/chcon.c	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,421 @@
 +/* chcontext -- change security context of a pathname */
 +
@@ -422,8 +422,8 @@
 +    freecon(ref_context);
 +  exit (errors);
 +}
---- coreutils-5.94/src/mv.c.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/mv.c	2006-03-24 13:23:44.000000000 +0000
+--- coreutils-5.96/src/mv.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/mv.c	2006-06-22 23:32:16.000000000 +0100
 @@ -34,6 +34,11 @@
  #include "quote.h"
  #include "remove.h"
@@ -457,8 +457,8 @@
    /* FIXME: consider not calling getenv for SIMPLE_BACKUP_SUFFIX unless
       we'll actually use backup_suffix_string.  */
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
---- coreutils-5.94/src/mkdir.c.selinux	2005-06-15 00:55:47.000000000 +0100
-+++ coreutils-5.94/src/mkdir.c	2006-03-24 13:23:44.000000000 +0000
+--- coreutils-5.96/src/mkdir.c.selinux	2005-06-15 00:55:47.000000000 +0100
++++ coreutils-5.96/src/mkdir.c	2006-06-22 23:32:16.000000000 +0100
 @@ -34,11 +34,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -523,8 +523,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.94/src/cp.c.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/cp.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/cp.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/cp.c	2006-06-22 23:32:16.000000000 +0100
 @@ -51,6 +51,11 @@
  
  #define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
@@ -675,8 +675,8 @@
  
  	case REPLY_OPTION: /* Deprecated */
  	  x.interactive = XARGMATCH ("--reply", optarg,
---- coreutils-5.94/src/install.c.selinux	2006-03-24 13:23:44.000000000 +0000
-+++ coreutils-5.94/src/install.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/install.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/install.c	2006-06-22 23:32:16.000000000 +0100
 @@ -48,6 +48,43 @@
  # include <sys/wait.h>
  #endif
@@ -839,8 +839,8 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\
---- coreutils-5.94/src/copy.h.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/copy.h	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/copy.h.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/copy.h	2006-06-22 23:32:16.000000000 +0100
 @@ -127,6 +127,9 @@
    bool preserve_ownership;
    bool preserve_mode;
@@ -851,9 +851,9 @@
  
    /* Enabled for mv, and for cp by the --preserve=links option.
       If true, attempt to preserve in the destination files any
---- coreutils-5.94/src/Makefile.am.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/src/Makefile.am	2006-03-24 13:23:45.000000000 +0000
-@@ -20,13 +20,13 @@
+--- coreutils-5.96/src/Makefile.am.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/Makefile.am	2006-06-22 23:32:16.000000000 +0100
+@@ -20,14 +20,14 @@
  EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who
  
  bin_SCRIPTS = groups
@@ -862,14 +862,15 @@
    ginstall link ln dir vdir ls mkdir \
    mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
    cat cksum comm csplit cut expand fmt fold head join md5sum \
-   nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
+   nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+   sort split sum tac tail tr tsort unexpand uniq wc \
    basename date dirname echo env expr factor false \
 -  hostname id kill logname pathchk printenv printf pwd seq sleep tee \
 +  hostname id kill logname pathchk printenv printf pwd runcon seq sleep tee \
    test true tty whoami yes \
+   base64 \
    $(OPTIONAL_BIN_PROGS) $(DF_PROG)
- 
-@@ -50,9 +50,9 @@
+@@ -52,9 +52,9 @@
  LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
  
  # for eaccess in lib/euidaccess.c.
@@ -882,7 +883,7 @@
  pathchk_LDADD = $(LDADD) $(LIB_EACCESS)
  rm_LDADD = $(LDADD) $(LIB_EACCESS)
  test_LDADD = $(LDADD) $(LIB_EACCESS)
-@@ -61,11 +61,18 @@
+@@ -63,11 +63,18 @@
  
  # for clock_gettime and fdatasync
  dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
@@ -904,8 +905,8 @@
  
  ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
  sort_LDADD = $(LDADD) $(POW_LIB)
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/src/runcon.c	2006-03-24 13:23:44.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/src/runcon.c	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,253 @@
 +/*
 + * runcon [ context |
@@ -1160,8 +1161,8 @@
 +  }
 +  return 1; /* can't reach this statement.... */
 +}
---- coreutils-5.94/src/ls.c	2006-03-24 13:23:45.000000000 +0000
-+++ coreutils-5.94/src/ls.c	2006-04-20 12:24:40.000000000 +0100
+--- coreutils-5.96/src/ls.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/ls.c	2006-06-22 23:32:16.000000000 +0100
 @@ -135,6 +135,18 @@
  
  #define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -1692,7 +1693,10 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\n\
-@@ -4246,0 +4406,67 @@
+@@ -4244,3 +4403,70 @@
+     }
+   exit (status);
+ }
 +
 +#ifdef WITH_SELINUX
 +
@@ -1760,8 +1764,8 @@
 +  }
 +}
 +#endif
---- coreutils-5.94/src/stat.c.selinux	2005-12-15 21:25:53.000000000 +0000
-+++ coreutils-5.94/src/stat.c	2006-03-24 13:25:44.000000000 +0000
+--- coreutils-5.96/src/stat.c.selinux	2005-12-15 21:25:53.000000000 +0000
++++ coreutils-5.96/src/stat.c	2006-06-22 23:32:16.000000000 +0100
 @@ -42,6 +42,13 @@
  # endif
  #endif
@@ -2049,8 +2053,8 @@
  
    exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
  }
---- coreutils-5.94/src/mkfifo.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.94/src/mkfifo.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/mkfifo.c.selinux	2005-05-14 08:58:37.000000000 +0100
++++ coreutils-5.96/src/mkfifo.c	2006-06-22 23:32:16.000000000 +0100
 @@ -32,11 +32,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -2113,8 +2117,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.94/src/id.c.selinux	2006-03-24 13:23:44.000000000 +0000
-+++ coreutils-5.94/src/id.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/id.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/id.c	2006-06-22 23:32:16.000000000 +0100
 @@ -37,6 +37,20 @@
  
  int getugroups ();
@@ -2245,8 +2249,8 @@
 +  }
 +#endif
  }
---- coreutils-5.94/src/copy.c.selinux	2006-04-26 15:35:52.000000000 +0100
-+++ coreutils-5.94/src/copy.c	2006-04-26 15:42:15.000000000 +0100
+--- coreutils-5.96/src/copy.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/copy.c	2006-06-22 23:32:16.000000000 +0100
 @@ -51,6 +51,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2289,7 +2293,7 @@
        if (dest_desc < 0 && x->unlink_dest_after_failed_open)
  	{
  	  if (unlink (dst_name) != 0)
-@@ -1416,6 +1444,32 @@
+@@ -1410,6 +1438,32 @@
       In such cases, set this variable to zero.  */
    preserve_metadata = true;
  
@@ -2322,7 +2326,7 @@
    if (S_ISDIR (src_mode))
      {
        struct dir_list *dir;
-@@ -1486,7 +1540,13 @@
+@@ -1480,7 +1534,13 @@
  
        /* Are we crossing a file system boundary?  */
        if (x->one_file_system && device != 0 && device != src_sb.st_dev)
@@ -2337,7 +2341,7 @@
  
        /* Copy the contents of the directory.  */
  
-@@ -1622,6 +1682,11 @@
+@@ -1616,6 +1676,11 @@
  	    }
  	}
  
@@ -2349,7 +2353,7 @@
        /* There's no need to preserve timestamps or permissions.  */
        preserve_metadata = false;
  
-@@ -1760,6 +1825,11 @@
+@@ -1754,6 +1819,11 @@
  
  un_backup:
  
@@ -2361,8 +2365,8 @@
    /* We have failed to create the destination file.
       If we've just added a dev/ino entry via the remember_copied
       call above (i.e., unless we've just failed to create a hard link),
---- coreutils-5.94/src/mknod.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.94/src/mknod.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/mknod.c.selinux	2005-05-14 08:58:37.000000000 +0100
++++ coreutils-5.96/src/mknod.c	2006-06-22 23:32:16.000000000 +0100
 @@ -36,8 +36,15 @@
  /* The name this program was run with. */
  char *program_name;
@@ -2423,24 +2427,24 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.94/README.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/README	2006-03-24 13:23:47.000000000 +0000
-@@ -7,11 +7,11 @@
- 
+--- coreutils-5.96/README.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/README	2006-06-22 23:32:51.000000000 +0100
+@@ -8,11 +8,11 @@
  The programs that can be built with this package are:
  
--  [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
-+  [ basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd
+   [ base64
+-  basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
++  basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd
    df dir dircolors dirname du echo env expand expr factor false fmt fold
    ginstall groups head hostid hostname id join kill link ln logname ls
    md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
--  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort
-+  printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum shred sleep sort
+-  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum
++  printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum sha224sum
+   sha256sum sha384sum sha512sum shred sleep sort
    split stat stty su sum sync tac tail tee test touch tr true tsort tty
    uname unexpand uniq unlink uptime users vdir wc who whoami yes
- 
---- coreutils-5.94/tests/help-version.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/tests/help-version	2006-03-24 13:23:47.000000000 +0000
+--- coreutils-5.96/tests/help-version.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/tests/help-version	2006-06-22 23:32:16.000000000 +0100
 @@ -46,6 +46,8 @@
  
      # Skip `test'; it doesn't accept --help or --version.
@@ -2459,8 +2463,8 @@
  
    rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
    echo > $tmp_in
---- coreutils-5.94/configure.ac.selinux	2006-03-24 13:23:41.000000000 +0000
-+++ coreutils-5.94/configure.ac	2006-03-24 13:23:47.000000000 +0000
+--- coreutils-5.96/configure.ac.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/configure.ac	2006-06-22 23:32:16.000000000 +0100
 @@ -34,6 +34,13 @@
  LIB_PAM="-ldl -lpam -lpam_misc"
  AC_SUBST(LIB_PAM)])
@@ -2475,8 +2479,8 @@
  gl_DEFAULT_POSIX2_VERSION
  gl_USE_SYSTEM_EXTENSIONS
  gl_PERL
---- coreutils-5.94/config.hin.selinux	2006-03-24 13:23:41.000000000 +0000
-+++ coreutils-5.94/config.hin	2006-03-24 13:23:47.000000000 +0000
+--- coreutils-5.96/config.hin.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/config.hin	2006-06-22 23:32:16.000000000 +0100
 @@ -411,10 +411,6 @@
     don't. */
  #undef HAVE_DECL_TTYNAME
@@ -2508,7 +2512,7 @@
  /* Define to 1 if you have the `dgc' library (-ldgc). */
  #undef HAVE_LIBDGC
  
-@@ -1525,17 +1521,17 @@
+@@ -1529,17 +1525,17 @@
  /* Define to 1 if unlink (dir) cannot possibly succeed. */
  #undef UNLINK_CANNOT_UNLINK_DIR
  
@@ -2531,7 +2535,7 @@
  /* Version number of package */
  #undef VERSION
  
-@@ -1545,6 +1541,9 @@
+@@ -1549,6 +1545,9 @@
  /* Define if sys/ptem.h is required for struct winsize. */
  #undef WINSIZE_IN_PTEM
  
@@ -2541,7 +2545,7 @@
  /* Define to 1 if your processor stores words with the most significant byte
     first (like Motorola and SPARC, unlike Intel and VAX). */
  #undef WORDS_BIGENDIAN
-@@ -1690,7 +1689,7 @@
+@@ -1694,7 +1693,7 @@
  /* Define to rpl_nanosleep if the replacement function should be used. */
  #undef nanosleep
  
@@ -2550,7 +2554,7 @@
  #undef off_t
  
  /* Define to `int' if <sys/types.h> does not define. */
-@@ -1757,7 +1756,7 @@
+@@ -1761,7 +1760,7 @@
  /* Define to empty if the C compiler doesn't support this keyword. */
  #undef signed
  
@@ -2559,8 +2563,8 @@
  #undef size_t
  
  /* Map `socklen_t' to `int' if it is missing. */
---- coreutils-5.94/man/ls.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/ls.1	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/man/ls.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/ls.1	2006-06-22 23:32:16.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2582,8 +2586,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- coreutils-5.94/man/install.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/install.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/install.1.selinux	2006-05-16 18:31:20.000000000 +0100
++++ coreutils-5.96/man/install.1	2006-06-22 23:32:16.000000000 +0100
 @@ -65,6 +65,11 @@
  .TP
  \fB\-v\fR, \fB\-\-verbose\fR
@@ -2596,8 +2600,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- coreutils-5.94/man/id.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/id.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/id.1.selinux	2006-05-16 18:31:20.000000000 +0100
++++ coreutils-5.96/man/id.1	2006-06-22 23:32:16.000000000 +0100
 @@ -13,6 +13,9 @@
  \fB\-a\fR
  ignore, for compatibility with other versions
@@ -2608,8 +2612,8 @@
  \fB\-g\fR, \fB\-\-group\fR
  print only the effective group ID
  .TP
---- coreutils-5.94/man/stat.1.selinux	2006-02-13 12:53:40.000000000 +0000
-+++ coreutils-5.94/man/stat.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/stat.1.selinux	2006-05-16 18:31:23.000000000 +0100
++++ coreutils-5.96/man/stat.1	2006-06-22 23:32:16.000000000 +0100
 @@ -28,6 +28,9 @@
  \fB\-t\fR, \fB\-\-terse\fR
  print the information in terse form
@@ -2630,8 +2634,8 @@
  %D
  Device number in hex
  .TP
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/runcon.1	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runcon.1	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,43 @@
 +.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
 +.SH NAME
@@ -2676,10 +2680,10 @@
 +.PP
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
---- coreutils-5.94/man/Makefile.am.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/man/Makefile.am	2006-03-24 13:23:46.000000000 +0000
-@@ -10,7 +10,7 @@
-   rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
+--- coreutils-5.96/man/Makefile.am.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/man/Makefile.am	2006-06-22 23:32:16.000000000 +0100
+@@ -11,7 +11,7 @@
+   shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
    su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
 -  who.1 whoami.1 yes.1
@@ -2687,7 +2691,7 @@
  
  man_aux = $(dist_man_MANS:.1=.x)
  
-@@ -113,6 +113,8 @@
+@@ -119,6 +119,8 @@
  who.1:		$(common_dep)	$(srcdir)/who.x		../src/who.c
  whoami.1:	$(common_dep)	$(srcdir)/whoami.x	../src/whoami.c
  yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c
@@ -2696,8 +2700,8 @@
  
  SUFFIXES = .x .1
  
---- coreutils-5.94/man/cp.1.selinux	2006-02-13 12:53:36.000000000 +0000
-+++ coreutils-5.94/man/cp.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/cp.1.selinux	2006-05-16 18:31:18.000000000 +0100
++++ coreutils-5.96/man/cp.1	2006-06-22 23:32:16.000000000 +0100
 @@ -57,7 +57,7 @@
  .TP
  \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
@@ -2717,8 +2721,8 @@
  \fB\-\-version\fR
  output version information and exit
  .PP
---- coreutils-5.94/man/mkfifo.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/mkfifo.1	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/man/mkfifo.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/mkfifo.1	2006-06-22 23:32:16.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2729,8 +2733,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not a=rw \- umask
  .TP
---- coreutils-5.94/man/mknod.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/mknod.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/mknod.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/mknod.1	2006-06-22 23:32:16.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2741,8 +2745,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not a=rw \- umask
  .TP
---- coreutils-5.94/man/mkdir.1.selinux	2006-02-13 12:53:39.000000000 +0000
-+++ coreutils-5.94/man/mkdir.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/mkdir.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/mkdir.1	2006-06-22 23:32:16.000000000 +0100
 @@ -12,6 +12,8 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2752,8 +2756,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not rwxrwxrwx \- umask
  .TP
---- coreutils-5.94/man/dir.1.selinux	2006-02-13 12:53:37.000000000 +0000
-+++ coreutils-5.94/man/dir.1	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/man/dir.1.selinux	2006-05-16 18:31:19.000000000 +0100
++++ coreutils-5.96/man/dir.1	2006-06-22 23:32:16.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2775,8 +2779,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/runcon.x	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runcon.x	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,14 @@
 +[NAME]
 +runcon \- run command with specified security context
@@ -2792,8 +2796,8 @@
 +.PP
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
---- coreutils-5.94/man/vdir.1.selinux	2006-02-13 12:53:42.000000000 +0000
-+++ coreutils-5.94/man/vdir.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/vdir.1.selinux	2006-05-16 18:31:25.000000000 +0100
++++ coreutils-5.96/man/vdir.1	2006-06-22 23:32:16.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2815,15 +2819,15 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/chcon.x	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/chcon.x	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,4 @@
 +[NAME]
 +chcon \- change file security context
 +[DESCRIPTION]
 +.\" Add any additional description here
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/chcon.1	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/chcon.1	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,64 @@
 +.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
 +.SH NAME
@@ -2889,8 +2893,8 @@
 +.B info chcon
 +.PP
 +should give you access to the complete manual.
---- coreutils-5.94/man/Makefile.in.selinux	2006-02-13 12:51:58.000000000 +0000
-+++ coreutils-5.94/man/Makefile.in	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/Makefile.in.selinux	2006-05-22 07:08:33.000000000 +0100
++++ coreutils-5.96/man/Makefile.in	2006-06-22 23:32:16.000000000 +0100
 @@ -107,25 +107,25 @@
  	$(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/openat.m4 \
  	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
@@ -2961,7 +2965,7 @@
  LN_S = @LN_S@
  LTLIBICONV = @LTLIBICONV@
  LTLIBINTL = @LTLIBINTL@
-@@ -271,30 +273,23 @@
+@@ -269,30 +271,23 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -2992,7 +2996,7 @@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -307,10 +302,10 @@
+@@ -305,10 +300,10 @@
    link.1 ln.1 logname.1 \
    ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
    paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
@@ -3005,7 +3009,7 @@
  
  man_aux = $(dist_man_MANS:.1=.x)
  EXTRA_DIST = $(man_aux) help2man
-@@ -600,6 +595,7 @@
+@@ -598,6 +593,7 @@
  readlink.1:	$(common_dep)	$(srcdir)/readlink.x	../src/readlink.c
  rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
  rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
@@ -3013,7 +3017,7 @@
  seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
  sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
  shred.1:	$(common_dep)	$(srcdir)/shred.x	../src/shred.c
-@@ -631,6 +627,8 @@
+@@ -629,6 +625,8 @@
  who.1:		$(common_dep)	$(srcdir)/who.x		../src/who.c
  whoami.1:	$(common_dep)	$(srcdir)/whoami.x	../src/whoami.c
  yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- coreutils.spec	9 Jun 2006 09:46:52 -0000	1.120
+++ coreutils.spec	22 Jun 2006 22:41:57 -0000	1.121
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.96
-Release: 3
+Release: 4
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -20,6 +20,7 @@
 
 # From upstream
 Patch1: coreutils-tempname.patch
+Patch2: coreutils-5.96-newhashes.patch
 
 # Our patches
 Patch100: coreutils-chgrp.patch
@@ -78,6 +79,7 @@
 
 # From upstream
 %patch1 -p1 -b .tempname
+%patch2 -p1 -b .newhashes
 
 # Our patches
 %patch100 -p1 -b .chgrp
@@ -272,6 +274,9 @@
 /sbin/runuser
 
 %changelog
+* Thu Jun 22 2006 Tim Waugh <twaugh at redhat.com> 5.96-4
+- Include new hashes (bug #196369).  Patch from upstream.
+
 * Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com>
 - Fix large file support for temporary files.
 



From fedora-cvs-commits at redhat.com  Thu Jun 22 22:50:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 18:50:54 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.86,1.87
Message-ID: <200606222250.k5MMosVd026509@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26373

Modified Files:
	kdegraphics.spec 
Log Message:
add missing kuickshow, printnodetest, svgdisplay, xf86gammacfg #196067




Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdegraphics.spec	12 Jun 2006 14:55:18 -0000	1.86
+++ kdegraphics.spec	22 Jun 2006 22:50:52 -0000	1.87
@@ -18,7 +18,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -46,6 +46,13 @@
 BuildRequires: kdebase-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: freetype-devel
+BuildRequires: poppler-devel
+BuildRequires: fontconfig-devel
+BuildRequires: lcms-devel
+BuildRequires: libart_lgpl-devel 
+BuildRequires: imlib-devel
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -370,6 +377,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Jun 22 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.2.fc5
+- add missing kuickshow, printnodetest, svgdisplay, xf86gammacfg #196067
+
 * Mon Jun 12 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 00:50:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 20:50:49 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.64, 1.65 hwdata.spec, 1.65,
	1.66 sources, 1.67, 1.68
Message-ID: <200606230050.k5N0onUS003608@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3568/devel

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
auto-import hwdata-0.101.25-1 on branch devel from hwdata-0.101.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	11 May 2006 12:39:19 -0000	1.64
+++ .cvsignore	23 Jun 2006 00:50:46 -0000	1.65
@@ -1 +1 @@
-hwdata-0.180.tar.gz
+hwdata-0.101.25.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- hwdata.spec	11 May 2006 12:39:19 -0000	1.65
+++ hwdata.spec	23 Jun 2006 00:50:46 -0000	1.66
@@ -1,18 +1,17 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.180
+Version: 0.101.25
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.gz
 BuildArch: noarch
-Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0
-Requires: module-init-tools >= 3.2
+Conflicts: Xconfigurator < 4.9.42-1, kernel-pcmcia-cs < 3.1.31-11
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 hwdata contains various hardware identification and configuration data,
-such as the pci.ids database and MonitorsDb databases.
+such as the pci.ids database, the XFree86 Cards and MonitorsDb databases.
 
 %prep
 
@@ -29,277 +28,97 @@
 %defattr(-,root,root)
 %doc LICENSE COPYING
 %dir /usr/share/hwdata
-%config(noreplace) /etc/modprobe.d/blacklist
+%dir /etc/pcmcia
+%config /etc/pcmcia/config
 %config /usr/share/hwdata/*
+# This file is screaming to be moved into /usr/share/hwdata sometime <g>
+/usr/X11R6/lib/X11/Cards
 
 %changelog
-* Thu May 11 2006 Phil Knirsch <pknirsch at redhat.com> - 0.180-1
-- Updated and added some MonitorsDB entries
+* Thu Jun 22 2006 Adam Jackson <ajackson at redhat.com> 0.101.25-1
+- Added Matrox G200e to Cards and pcitable
 
-* Tue May 02 2006 Phil Knirsch <pknirsch at redhat.com> - 0.179-1
+* Fri May 26 2006 Karsten Hopp <karsten at redhat.de> 0.101.24-1
+- added some monitors to MonitorsDB (#191694)
+
+* Tue May 02 2006 Phil Knirsch <pknirsch at redhat.com> - 0.101.23-1
 - Updated PCI ids from upstream (#180402)
 - Fixed missing monitor entry in MonitorsDB (#189446)
 
-* Wed Mar 01 2006 Phil Knirsch <pknirsch at redhat.com> - 0.178-1
-- Commented out the VT lines at the end of usb.ids as our tools don't handle
-  them properly.
-
-* Fri Feb 24 2006 Bill Nottingham <notting at redhat.com> - 0.177-1
-- remove stock videoaliases in favor of driver-specific ones in
-  the X driver packages
-
-* Wed Feb 22 2006 Phil Knirsch <pknirsch at redhat.com> - 0.176-1
-- More entries from Dell to MonitorsDB (#181008)
-
-* Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 0.175-1
-- Added a few more entries to MonitorsDB
-
-* Wed Feb 01 2006 Phil Knirsch <pknirsch at redhat.com> - 0.174-1
-- Some cleanup and adds to the MonitorDB which closes several db related bugs.
-
-* Tue Dec 13 2005 Bill Nottingham <notting at redhat.com> - 0.173-1
-- add some IDs to the generic display entries for matching laptops
-
-* Fri Nov 18 2005 Bill Nottingham <notting at redhat.com> - 0.172-1
-- ditto for radeon
-
-* Fri Nov 18 2005 Jeremy Katz <katzj at redhat.com> - 0.171-1
-- r128 -> ati.  should fix the unresolved symbol and kem says its more 
-  generally the "right" thing to do
-
-* Wed Nov 16 2005 Bill Nottingham <notting at redhat.com> - 0.170-1
-- handle mptsas for migration as well
-- move videoaliases file to a subdir
-
-* Fri Sep 16 2005 Bill Nottingham <notting at redhat.com>
-- add Iiyama monitor (#168143)
-
-* Tue Sep 13 2005 Bill Nottingham <notting at redhat.com>
-- add IBM monitor (#168080)
-
-* Thu Sep  8 2005 Bill Nottingham <notting at redhat.com> - 0.169-1
-- remove Cards, pcitable. Add videodrivers
-
-* Fri Sep  2 2005 Dan Williams <dcbw at redhat.com> - 0.168-1
-- Add more Gateway monitors
-
-* Fri Sep  2 2005 Dan Williams <dcbw at redhat.com> - 0.167-1
-- Add some ADI monitors, one BenQ, and and DPMS codes for two Apples
-
-* Fri Sep  2 2005 Bill Nottingham <notting at redhat.com> - 0.166-1
-- add videoaliases file
-- remove CardMonitorCombos, as nothing uses it
-
-* Thu Aug 25 2005 Dan Williams <dcbw at redhat.com> - 0.165-1
-- Add a bunch of Acer monitors
-
-* Tue Aug  9 2005 Jeremy Katz <katzj at redhat.com> - 0.164-1
-- migrate sk98lin -> skge
-
-* Sat Jul 30 2005 Bill Nottingham <notting at redhat.com>
-- migrate mpt module names (#161420)
-- remove pcitable entries for drivers in modules.pcimap
-- switch lone remaining 'Server' entry - that can't work right
-
-* Tue Jul 26 2005 Bill Nottingham <notting at redhat.com>
-- add Daytek monitor (#164339)
-
-* Wed Jul 13 2005 Bill Nottingham <notting at redhat.com> - 0.162-1
-- remove /etc/pcmcia/config, conflict with pcmcia-cs
-
-* Fri Jul  7 2005 Bill Nottingham <notting at redhat.com> - 0.160-1
-- move blacklist to /etc/modprobe.d, require new module-init-tools
-- add LG monitors (#162466, #161734)
-- add orinoco card (#161696)
-- more mptfusion stuff (#107088)
-
-* Thu Jun 23 2005 Bill Nottingham <notting at redhat.com>
-- add Samsung monitor (#161013)
-
-* Wed Jun 22 2005 Bill Nottingham <notting at redhat.com> - 0.159-1
-- pcitable: make branding happy (#160047)
-- Cards: add required blank line (#157972)
-- add some monitors
-- add JVC CD-ROM (#160907, <richard at rsk.demon.co.uk>)
-- add hisax stuff to blacklist (#154799, #159068)
-
-* Mon May 16 2005 Bill Nottingham <notting at redhat.com> - 0.158-1
-- add a orinoco card (#157482)
-
-* Thu May  5 2005 Jeremy Katz <katzj at redhat.com> - 0.157-1
-- add 20" Apple Cinema Display
-
-* Sun Apr 10 2005 Mike A. Harris <mharris at redhat.com> 0.156-1
-- Update SiS entries in Cards/pcitable to match what Xorg X11 6.8.2 supports
-
-* Wed Mar 30 2005 Dan Williams <dcbw at redhat.com> 0.155-1
-- Add a boatload of BenQ, Acer, Sony, NEC, Mitsubishi, and Dell monitors
+* Fri Jan 27 2006 Phil Knirsch <pknirsch at redhat.com> - 0.101.22-1
+- 2nd update for pci.ids from upstream (#171207)
 
-* Wed Mar 30 2005 Dan Williams <dcbw at redhat.com> 0.154-1
-- Add Typhoon Speednet Wireless PCMCIA Card mapping to atmel_cs driver
+* Mon Nov 28 2005 Bill Nottingham <notting at redhat.com> - 0.101.21-1
+- update pci.ids, usb.ids from upstream (#171207)
+- add tg3 mappings (#165696)
+- add Emluex mappings (#174005)
+- add megaraid_sas mappings (#168226)
 
-* Mon Mar 28 2005 Bill Nottingham <notting at redhat.com> 0.153-1
-- update the framebuffer blacklist
+* Thu Aug 25 2005 Bill Nottingham <notting at redhat.com> - 0.101.20-1
+- update pci.ids (#156839)
 
-* Wed Mar  9 2005 Bill Nottingham <notting at redhat.com> 0.152-1
-- fix qlogic driver mappings, add upgradelist mappings for the modules
-  that changed names (#150621)
+* Thu Jul 21 2005 Bill Nottingham <notting at redhat.com> - 0.101.19-1
+- update usb.ids, MonitorsDB
 
-* Wed Mar  2 2005 Mike A. Harris <mharris at redhat.com> 0.151-1
-- Added one hundred billion new nvidia PCI IDs to pcitable and Cards to
-  synchronize it with X.Org X11 6.8.2.  (#140601)
+* Tue Jul 12 2005 Kristian <krh at valinor.boston.redhat.com> - 0.101.18-1
+- Add PCI IDs for ATI Raden RN50 cards.
 
-* Tue Jan 11 2005 Dan Williams <dcbw at redhat.com> - 0.150-1
-- Add Dell UltraSharp 1704FPV (Analog & Digital)
+* Thu Jun 30 2005 Bill Nottingham <notting at redhat.com>
+- add more mptfusion ids (#107088)
 
-* Sun Nov 21 2004 Bill Nottingham <notting at redhat.com> - 0.148-1
-- add Amptron monitors (#139142)
+* Tue May 31 2005 Bill Nottingham <notting at redhat.com>
+- fix 3w-9xxx mapping (#159204)
 
-* Wed Nov 10 2004 Bill Nottingham <notting at redhat.com> - 0.147-1
-- update usb.ids (#138533)
-- migrate dpt_i2o to i2o_block (#138603)
-
-* Tue Nov  9 2004 Bill Nottingham <notting at redhat.com> - 0.146-1
-- update pci.ids (#138233)
-- add Apple monitors (#138481)
-
-* Wed Oct 20 2004 Bill Nottingham <notting at redhat.com> - 0.145-1
-- remove ahci mappings, don't prefer it over ata_piix
-
-* Tue Oct 19 2004 Kristian H??gsberg <krh at redhat.com> - 0.144-1
-- update IDs for Cirrus, Trident, C&T, and S3
-
-* Tue Oct 12 2004 Bill Nottingham <notting at redhat.com> - 0.143-1
-- add ahci mappings to prefer it over ata_piix
-- map davej's ancient matrox card to vesa (#122750)
-
-* Thu Oct  7 2004 Dan Williams <dcbw at redhat.com> - 0.141-1
-- Add Belkin F5D6020 ver.2 (802.11b card based on Atmel chipset)
-
-* Fri Oct  1 2004 Bill Nottingham <notting at redhat.com> - 0.140-1
-- include /etc/hotplug/blacklist here
-
-* Thu Sep 30 2004 Bill Nottingham <notting at redhat.com> - 0.136-1
-- add S3 UniChrome (#131403)
+* Tue Apr 19 2005 Bill Nottingham <notting at redhat.com> - 0.101.17-1
 - update pci.ids
 
-* Thu Sep 23 2004 Bill Nottingham <notting at redhat.com> - 0.135-1
-- megaraid -> megaraid_mbox
-
-* Wed Sep 22 2004 Bill Nottingham <notting at redhat.com> - 0.134-1
-- map ncr53c8xx to sym53c8xx (#133181)
-
-* Fri Sep 17 2004 Bill Nottingham <notting at redhat.com> - 0.132-1
-- fix 3Ware 9000 mapping (#132851)
-
-* Tue Sep 14 2004 Kristian H??gsberg <krh at redhat.com> - 0.131-1
-- Add python script to check sorting of pci.ids
-
-* Thu Sep  9 2004 Kristian H??gsberg <krh at redhat.com> 0.131-1
-- Add pci ids and cards for new ATI, NVIDIA and Intel cards
-
-* Sat Sep  4 2004 Bill Nottingham <notting at redhat.com> 0.130-1
-- trim pcitable - now just ids/drivers
-
-* Wed Sep  1 2004 Bill Nottingham <notting at redhat.com> 0.125-1
-- pci.ids updates
-- remove updsftab.conf.*
-
-* Sun Aug 29 2004 Mike A. Harris <mharris at redhat.com>  0.124-1
-- Updates to pcitable/Cards for 'S3 Trio64 3D' cards. (#125866,59956)
-
-* Fri Jul  9 2004 Mike A. Harris <mharris at redhat.com>  0.123-1
-- Quick pcitable/Cards update for ATI Radeon and FireGL boards
-
-* Mon Jun 28 2004 Bill Nottingham <notting at redhat.com>
-- add Proview monitor (#125853)
-- add ViewSonic monitor (#126324)
-- add a Concord camera (#126673)
-
-* Wed Jun 23 2004 Brent Fox <bfox at redhat.com> - 0.122-1
-- Add Vobis monitor to MonitorsDB (bug #124151)
-
-* Wed Jun 09 2004 Dan Williams <dcbw at redhat.com> - 0.121-1
-- add Belkin F5D5020 10/100 PCMCIA card (#125581)
-
-* Fri May 28 2004 Bill Nottingham <notting at redhat.com>
-- add modem (#124663)
-
-* Mon May 24 2004 Bill Nottingham <notting at redhat.com> - 0.120-1
-- mainly:
-  fix upgradelist module for CMPci cards (#123647)
-- also:
-  add another wireless card (#122676)
-  add wireless card (#122625)
-  add 1280x800 (#121548)
-  add 1680x1050 (#121148)
-  add IntelligentStick (#124313)
-
-* Mon May 10 2004 Jeremy Katz <katzj at redhat.com> - 0.119-1
-- veth driver is iseries_veth in 2.6
-
-* Wed May  5 2004 Jeremy Katz <katzj at redhat.com> - 0.118-1
-- add a wireless card (#122064)
-- and a monitor (#121696)
-
-* Fri Apr 16 2004 Bill Nottingham <notting at redhat.com> 0.117-1
-- fix makefile
-
-* Thu Apr 15 2004 Bill Nottingham <notting at redhat.com> 0.116-1
-- move updfstab.conf here
-- add wireless card (#116865)
-- add laptop display panel (#117385)
-- add clipdrive (#119928)
-- add travelling disk (#119143)
-- add NEXDISK (#106782)
+* Mon Mar 14 2005 Bill Nottingham <notting at redhat.com> - 0.101.16-1
+- update pci.ids
 
-* Thu Apr 15 2004 Brent Fox <bfox at redhat.com> 0.115-1
-- replace snd-es1960 driver with snd-es1968 in pcitable (bug #120729)
+* Tue Mar  1 2005 Bill Nottingham <notting at redhat.com> - 0.101.15-1
+- update pci.ids, usb.ids, MonitorsDB
+- fix some e100 mismappings (#144929)
+- fix some aic79xx mappings (#142486)
 
-* Mon Mar 29 2004 Bill Nottingham <notting at redhat.com> 0.114-1
-- fix entries pointing to Banshee (#119388)
+* Tue Nov  9 2004 Bill Nottingham <notting at redhat.com> - 0.101.14-1
+- update pci.ids, MonitorsDB
 
-* Tue Mar 16 2004 Bill Nottingham <notting at redhat.com> 0.113-1
-- add a Marvell sk98lin card (#118467, <64bit_fedora at comcast.net>)
+* Thu Sep 30 2004 Bill Nottingham <notting at redhat.com> - 0.101.13-1
+- update pci.ids
 
-* Fri Mar 12 2004 Brent Fox <bfox at redhat.com> 0.112-1
-- add a Sun flat panel to MonitorsDB (bug #118138)
+* Fri Jul  2 2004 Bill Nottingham <notting at redhat.com> - 0.101.12-1
+- megaraid2 for certain cards
 
-* Fri Mar  5 2004 Brent Fox <bfox at redhat.com> 0.111-1
-- add Samsung monitor to MonitorsDB (bug #112112)
+* Fri Jun 25 2004 Bill Nottingham <notting at redhat.com> - 0.101.11-1
+- update MonitorsDB
+- update pcitable with emulex, aacraid, qlogic ids
 
-* Mon Mar  1 2004 Mike A. Harris <mharris at redhat.com> 0.110-1
-- Added 3Dfx Voodoo Graphics and Voodoo II entries to the Cards database, both
-  pointing to Alan Cox's new "voodoo" driver which is now included in XFree86
-  4.3.0-62 and later builds in Fedora development.  Mapped their PCI IDs to
-  the new Cards entry in pcitable.
-- Updated the entries for 3Dfx Banshee
+* Tue Jun 15 2004 Adrian Havill <havill at redhat.com> - 0.101.9-1
+- pci.ids updated to 2004-Jun-15 daily snapshot
 
-* Mon Feb 23 2004 Bill Nottingham <notting at redhat.com> 0.109-1
-- pci.ids and other updates
+* Thu Apr 15 2004 Bill Nottingham <notting at redhat.com> - 0.101.8-1
+- more pci.ids
 
-* Thu Feb 19 2004 Mike A. Harris <mharris at redhat.com> 0.108-1
-- Added Shamrock C407L to MonitorsDB for bug (#104920)
+* Tue Mar  9 2004 Jeremy Katz <katzj at redhat.com> - 0.101.7-1
+- some more radeons
 
-* Thu Feb 19 2004 Mike A. Harris <mharris at redhat.com> 0.107-1
-- Massive Viewsonic monitor update for MonitorsDB (#84882)
+* Fri Mar  5 2004 Jeremy Katz <katzj at redhat.com> - 0.101.6-1
+- don't map the secondaries
 
-* Fri Feb 13 2004 John Dennis <jdennis at finch.boston.redhat.com> 0.106-1
-- fix typo, GP should have been HP
+* Fri Mar  5 2004 Jeremy Katz <katzj at redhat.com> - 0.101.5-1
+- associate cards with some of the pci.ids
 
-* Thu Jan 29 2004 Bill Nottingham <notting at redhat.com> 0.105-1
-- many monitor updates (#114260, #114216, #113993, #113932, #113782,
-  #113685, #113523, #111203, #107788, #106526, #63005)
-- add some PCMCIA cards (#113006, #112505)
+* Mon Mar  1 2004 Bill Nottingham <notting at redhat.com> 0.101.4-1
+- update pci.ids again
 
-* Tue Jan 20 2004 Bill Nottingham <notting at redhat.com> 0.104-1
-- switch sound module mappings to alsa drivers
+* Mon Feb 23 2004 Bill Nottingham <notting at redhat.com> 0.101.3-1
+- update pci.ids, MonitorsDB (#92322, #109341, #104069)
 
-* Mon Jan 19 2004 Brent Fox <bfox at redhat.com> 0.103-1
-- fix tab spacing
+* Fri Feb 13 2004 John Dennis <jdennis at finch.boston.redhat.com> 0.101.2-1
+- fix typo in Hewlet-Packard, GP should have been HP
 
-* Fri Jan 16 2004 Brent Fox <bfox at redhat.com> 0.102-1
-- added an entry for ATI Radeon 9200SE (bug #111306)
+* Mon Dec  8 2003 Bill Nottingham <notting at redhat.com> 0.101.1-1
+- add some pci ids (#106891)
 
 * Sun Oct 26 2003 Jeremy Katz <katzj at redhat.com> 0.101-1
 - add 1920x1200 Generic LCD as used on some Dell laptops (#108006)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	11 May 2006 12:39:19 -0000	1.67
+++ sources	23 Jun 2006 00:50:46 -0000	1.68
@@ -1 +1 @@
-0e02b7d5d80f14f4994e8209c561535e  hwdata-0.180.tar.gz
+cbdf904f0cf7bc2681407d530a7cb08c  hwdata-0.101.25.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 23 01:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 21:04:19 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.65, 1.66 hwdata.spec, 1.66,
	1.67 sources, 1.68, 1.69
Message-ID: <200606230104.k5N14Jl5008492@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8448/devel

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
auto-import hwdata-0.180-2 on branch devel from hwdata-0.180-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	23 Jun 2006 00:50:46 -0000	1.65
+++ .cvsignore	23 Jun 2006 01:04:15 -0000	1.66
@@ -1 +1 @@
-hwdata-0.101.25.tar.gz
+hwdata-0.180.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- hwdata.spec	23 Jun 2006 00:50:46 -0000	1.66
+++ hwdata.spec	23 Jun 2006 01:04:15 -0000	1.67
@@ -1,17 +1,18 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.101.25
-Release: 1
+Version: 0.180
+Release: 2
 License: GPL/MIT
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.gz
 BuildArch: noarch
-Conflicts: Xconfigurator < 4.9.42-1, kernel-pcmcia-cs < 3.1.31-11
+Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0
+Requires: module-init-tools >= 3.2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 hwdata contains various hardware identification and configuration data,
-such as the pci.ids database, the XFree86 Cards and MonitorsDb databases.
+such as the pci.ids database and MonitorsDb databases.
 
 %prep
 
@@ -28,97 +29,280 @@
 %defattr(-,root,root)
 %doc LICENSE COPYING
 %dir /usr/share/hwdata
-%dir /etc/pcmcia
-%config /etc/pcmcia/config
+%config(noreplace) /etc/modprobe.d/blacklist
 %config /usr/share/hwdata/*
-# This file is screaming to be moved into /usr/share/hwdata sometime <g>
-/usr/X11R6/lib/X11/Cards
 
 %changelog
-* Thu Jun 22 2006 Adam Jackson <ajackson at redhat.com> 0.101.25-1
-- Added Matrox G200e to Cards and pcitable
+* Thu Jun 22 2006 Adam Jackson <ajackson at redhat.com> - 0.180-2
+- Bump.
 
-* Fri May 26 2006 Karsten Hopp <karsten at redhat.de> 0.101.24-1
-- added some monitors to MonitorsDB (#191694)
+* Thu May 11 2006 Phil Knirsch <pknirsch at redhat.com> - 0.180-1
+- Updated and added some MonitorsDB entries
 
-* Tue May 02 2006 Phil Knirsch <pknirsch at redhat.com> - 0.101.23-1
+* Tue May 02 2006 Phil Knirsch <pknirsch at redhat.com> - 0.179-1
 - Updated PCI ids from upstream (#180402)
 - Fixed missing monitor entry in MonitorsDB (#189446)
 
-* Fri Jan 27 2006 Phil Knirsch <pknirsch at redhat.com> - 0.101.22-1
-- 2nd update for pci.ids from upstream (#171207)
+* Wed Mar 01 2006 Phil Knirsch <pknirsch at redhat.com> - 0.178-1
+- Commented out the VT lines at the end of usb.ids as our tools don't handle
+  them properly.
 
-* Mon Nov 28 2005 Bill Nottingham <notting at redhat.com> - 0.101.21-1
-- update pci.ids, usb.ids from upstream (#171207)
-- add tg3 mappings (#165696)
-- add Emluex mappings (#174005)
-- add megaraid_sas mappings (#168226)
+* Fri Feb 24 2006 Bill Nottingham <notting at redhat.com> - 0.177-1
+- remove stock videoaliases in favor of driver-specific ones in
+  the X driver packages
 
-* Thu Aug 25 2005 Bill Nottingham <notting at redhat.com> - 0.101.20-1
-- update pci.ids (#156839)
+* Wed Feb 22 2006 Phil Knirsch <pknirsch at redhat.com> - 0.176-1
+- More entries from Dell to MonitorsDB (#181008)
 
-* Thu Jul 21 2005 Bill Nottingham <notting at redhat.com> - 0.101.19-1
-- update usb.ids, MonitorsDB
+* Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 0.175-1
+- Added a few more entries to MonitorsDB
 
-* Tue Jul 12 2005 Kristian <krh at valinor.boston.redhat.com> - 0.101.18-1
-- Add PCI IDs for ATI Raden RN50 cards.
+* Wed Feb 01 2006 Phil Knirsch <pknirsch at redhat.com> - 0.174-1
+- Some cleanup and adds to the MonitorDB which closes several db related bugs.
 
-* Thu Jun 30 2005 Bill Nottingham <notting at redhat.com>
-- add more mptfusion ids (#107088)
+* Tue Dec 13 2005 Bill Nottingham <notting at redhat.com> - 0.173-1
+- add some IDs to the generic display entries for matching laptops
 
-* Tue May 31 2005 Bill Nottingham <notting at redhat.com>
-- fix 3w-9xxx mapping (#159204)
+* Fri Nov 18 2005 Bill Nottingham <notting at redhat.com> - 0.172-1
+- ditto for radeon
 
-* Tue Apr 19 2005 Bill Nottingham <notting at redhat.com> - 0.101.17-1
-- update pci.ids
+* Fri Nov 18 2005 Jeremy Katz <katzj at redhat.com> - 0.171-1
+- r128 -> ati.  should fix the unresolved symbol and kem says its more 
+  generally the "right" thing to do
 
-* Mon Mar 14 2005 Bill Nottingham <notting at redhat.com> - 0.101.16-1
-- update pci.ids
+* Wed Nov 16 2005 Bill Nottingham <notting at redhat.com> - 0.170-1
+- handle mptsas for migration as well
+- move videoaliases file to a subdir
+
+* Fri Sep 16 2005 Bill Nottingham <notting at redhat.com>
+- add Iiyama monitor (#168143)
+
+* Tue Sep 13 2005 Bill Nottingham <notting at redhat.com>
+- add IBM monitor (#168080)
+
+* Thu Sep  8 2005 Bill Nottingham <notting at redhat.com> - 0.169-1
+- remove Cards, pcitable. Add videodrivers
+
+* Fri Sep  2 2005 Dan Williams <dcbw at redhat.com> - 0.168-1
+- Add more Gateway monitors
+
+* Fri Sep  2 2005 Dan Williams <dcbw at redhat.com> - 0.167-1
+- Add some ADI monitors, one BenQ, and and DPMS codes for two Apples
+
+* Fri Sep  2 2005 Bill Nottingham <notting at redhat.com> - 0.166-1
+- add videoaliases file
+- remove CardMonitorCombos, as nothing uses it
+
+* Thu Aug 25 2005 Dan Williams <dcbw at redhat.com> - 0.165-1
+- Add a bunch of Acer monitors
+
+* Tue Aug  9 2005 Jeremy Katz <katzj at redhat.com> - 0.164-1
+- migrate sk98lin -> skge
+
+* Sat Jul 30 2005 Bill Nottingham <notting at redhat.com>
+- migrate mpt module names (#161420)
+- remove pcitable entries for drivers in modules.pcimap
+- switch lone remaining 'Server' entry - that can't work right
+
+* Tue Jul 26 2005 Bill Nottingham <notting at redhat.com>
+- add Daytek monitor (#164339)
+
+* Wed Jul 13 2005 Bill Nottingham <notting at redhat.com> - 0.162-1
+- remove /etc/pcmcia/config, conflict with pcmcia-cs
+
+* Fri Jul  7 2005 Bill Nottingham <notting at redhat.com> - 0.160-1
+- move blacklist to /etc/modprobe.d, require new module-init-tools
+- add LG monitors (#162466, #161734)
+- add orinoco card (#161696)
+- more mptfusion stuff (#107088)
+
+* Thu Jun 23 2005 Bill Nottingham <notting at redhat.com>
+- add Samsung monitor (#161013)
+
+* Wed Jun 22 2005 Bill Nottingham <notting at redhat.com> - 0.159-1
+- pcitable: make branding happy (#160047)
+- Cards: add required blank line (#157972)
+- add some monitors
+- add JVC CD-ROM (#160907, <richard at rsk.demon.co.uk>)
+- add hisax stuff to blacklist (#154799, #159068)
+
+* Mon May 16 2005 Bill Nottingham <notting at redhat.com> - 0.158-1
+- add a orinoco card (#157482)
+
+* Thu May  5 2005 Jeremy Katz <katzj at redhat.com> - 0.157-1
+- add 20" Apple Cinema Display
+
+* Sun Apr 10 2005 Mike A. Harris <mharris at redhat.com> 0.156-1
+- Update SiS entries in Cards/pcitable to match what Xorg X11 6.8.2 supports
+
+* Wed Mar 30 2005 Dan Williams <dcbw at redhat.com> 0.155-1
+- Add a boatload of BenQ, Acer, Sony, NEC, Mitsubishi, and Dell monitors
+
+* Wed Mar 30 2005 Dan Williams <dcbw at redhat.com> 0.154-1
+- Add Typhoon Speednet Wireless PCMCIA Card mapping to atmel_cs driver
+
+* Mon Mar 28 2005 Bill Nottingham <notting at redhat.com> 0.153-1
+- update the framebuffer blacklist
+
+* Wed Mar  9 2005 Bill Nottingham <notting at redhat.com> 0.152-1
+- fix qlogic driver mappings, add upgradelist mappings for the modules
+  that changed names (#150621)
+
+* Wed Mar  2 2005 Mike A. Harris <mharris at redhat.com> 0.151-1
+- Added one hundred billion new nvidia PCI IDs to pcitable and Cards to
+  synchronize it with X.Org X11 6.8.2.  (#140601)
+
+* Tue Jan 11 2005 Dan Williams <dcbw at redhat.com> - 0.150-1
+- Add Dell UltraSharp 1704FPV (Analog & Digital)
+
+* Sun Nov 21 2004 Bill Nottingham <notting at redhat.com> - 0.148-1
+- add Amptron monitors (#139142)
+
+* Wed Nov 10 2004 Bill Nottingham <notting at redhat.com> - 0.147-1
+- update usb.ids (#138533)
+- migrate dpt_i2o to i2o_block (#138603)
 
-* Tue Mar  1 2005 Bill Nottingham <notting at redhat.com> - 0.101.15-1
-- update pci.ids, usb.ids, MonitorsDB
-- fix some e100 mismappings (#144929)
-- fix some aic79xx mappings (#142486)
+* Tue Nov  9 2004 Bill Nottingham <notting at redhat.com> - 0.146-1
+- update pci.ids (#138233)
+- add Apple monitors (#138481)
 
-* Tue Nov  9 2004 Bill Nottingham <notting at redhat.com> - 0.101.14-1
-- update pci.ids, MonitorsDB
+* Wed Oct 20 2004 Bill Nottingham <notting at redhat.com> - 0.145-1
+- remove ahci mappings, don't prefer it over ata_piix
 
-* Thu Sep 30 2004 Bill Nottingham <notting at redhat.com> - 0.101.13-1
+* Tue Oct 19 2004 Kristian H??gsberg <krh at redhat.com> - 0.144-1
+- update IDs for Cirrus, Trident, C&T, and S3
+
+* Tue Oct 12 2004 Bill Nottingham <notting at redhat.com> - 0.143-1
+- add ahci mappings to prefer it over ata_piix
+- map davej's ancient matrox card to vesa (#122750)
+
+* Thu Oct  7 2004 Dan Williams <dcbw at redhat.com> - 0.141-1
+- Add Belkin F5D6020 ver.2 (802.11b card based on Atmel chipset)
+
+* Fri Oct  1 2004 Bill Nottingham <notting at redhat.com> - 0.140-1
+- include /etc/hotplug/blacklist here
+
+* Thu Sep 30 2004 Bill Nottingham <notting at redhat.com> - 0.136-1
+- add S3 UniChrome (#131403)
 - update pci.ids
 
-* Fri Jul  2 2004 Bill Nottingham <notting at redhat.com> - 0.101.12-1
-- megaraid2 for certain cards
+* Thu Sep 23 2004 Bill Nottingham <notting at redhat.com> - 0.135-1
+- megaraid -> megaraid_mbox
+
+* Wed Sep 22 2004 Bill Nottingham <notting at redhat.com> - 0.134-1
+- map ncr53c8xx to sym53c8xx (#133181)
+
+* Fri Sep 17 2004 Bill Nottingham <notting at redhat.com> - 0.132-1
+- fix 3Ware 9000 mapping (#132851)
+
+* Tue Sep 14 2004 Kristian H??gsberg <krh at redhat.com> - 0.131-1
+- Add python script to check sorting of pci.ids
+
+* Thu Sep  9 2004 Kristian H??gsberg <krh at redhat.com> 0.131-1
+- Add pci ids and cards for new ATI, NVIDIA and Intel cards
+
+* Sat Sep  4 2004 Bill Nottingham <notting at redhat.com> 0.130-1
+- trim pcitable - now just ids/drivers
+
+* Wed Sep  1 2004 Bill Nottingham <notting at redhat.com> 0.125-1
+- pci.ids updates
+- remove updsftab.conf.*
+
+* Sun Aug 29 2004 Mike A. Harris <mharris at redhat.com>  0.124-1
+- Updates to pcitable/Cards for 'S3 Trio64 3D' cards. (#125866,59956)
+
+* Fri Jul  9 2004 Mike A. Harris <mharris at redhat.com>  0.123-1
+- Quick pcitable/Cards update for ATI Radeon and FireGL boards
+
+* Mon Jun 28 2004 Bill Nottingham <notting at redhat.com>
+- add Proview monitor (#125853)
+- add ViewSonic monitor (#126324)
+- add a Concord camera (#126673)
+
+* Wed Jun 23 2004 Brent Fox <bfox at redhat.com> - 0.122-1
+- Add Vobis monitor to MonitorsDB (bug #124151)
+
+* Wed Jun 09 2004 Dan Williams <dcbw at redhat.com> - 0.121-1
+- add Belkin F5D5020 10/100 PCMCIA card (#125581)
+
+* Fri May 28 2004 Bill Nottingham <notting at redhat.com>
+- add modem (#124663)
+
+* Mon May 24 2004 Bill Nottingham <notting at redhat.com> - 0.120-1
+- mainly:
+  fix upgradelist module for CMPci cards (#123647)
+- also:
+  add another wireless card (#122676)
+  add wireless card (#122625)
+  add 1280x800 (#121548)
+  add 1680x1050 (#121148)
+  add IntelligentStick (#124313)
+
+* Mon May 10 2004 Jeremy Katz <katzj at redhat.com> - 0.119-1
+- veth driver is iseries_veth in 2.6
+
+* Wed May  5 2004 Jeremy Katz <katzj at redhat.com> - 0.118-1
+- add a wireless card (#122064)
+- and a monitor (#121696)
+
+* Fri Apr 16 2004 Bill Nottingham <notting at redhat.com> 0.117-1
+- fix makefile
+
+* Thu Apr 15 2004 Bill Nottingham <notting at redhat.com> 0.116-1
+- move updfstab.conf here
+- add wireless card (#116865)
+- add laptop display panel (#117385)
+- add clipdrive (#119928)
+- add travelling disk (#119143)
+- add NEXDISK (#106782)
+
+* Thu Apr 15 2004 Brent Fox <bfox at redhat.com> 0.115-1
+- replace snd-es1960 driver with snd-es1968 in pcitable (bug #120729)
+
+* Mon Mar 29 2004 Bill Nottingham <notting at redhat.com> 0.114-1
+- fix entries pointing to Banshee (#119388)
+
+* Tue Mar 16 2004 Bill Nottingham <notting at redhat.com> 0.113-1
+- add a Marvell sk98lin card (#118467, <64bit_fedora at comcast.net>)
+
+* Fri Mar 12 2004 Brent Fox <bfox at redhat.com> 0.112-1
+- add a Sun flat panel to MonitorsDB (bug #118138)
 
-* Fri Jun 25 2004 Bill Nottingham <notting at redhat.com> - 0.101.11-1
-- update MonitorsDB
-- update pcitable with emulex, aacraid, qlogic ids
+* Fri Mar  5 2004 Brent Fox <bfox at redhat.com> 0.111-1
+- add Samsung monitor to MonitorsDB (bug #112112)
 
-* Tue Jun 15 2004 Adrian Havill <havill at redhat.com> - 0.101.9-1
-- pci.ids updated to 2004-Jun-15 daily snapshot
+* Mon Mar  1 2004 Mike A. Harris <mharris at redhat.com> 0.110-1
+- Added 3Dfx Voodoo Graphics and Voodoo II entries to the Cards database, both
+  pointing to Alan Cox's new "voodoo" driver which is now included in XFree86
+  4.3.0-62 and later builds in Fedora development.  Mapped their PCI IDs to
+  the new Cards entry in pcitable.
+- Updated the entries for 3Dfx Banshee
 
-* Thu Apr 15 2004 Bill Nottingham <notting at redhat.com> - 0.101.8-1
-- more pci.ids
+* Mon Feb 23 2004 Bill Nottingham <notting at redhat.com> 0.109-1
+- pci.ids and other updates
 
-* Tue Mar  9 2004 Jeremy Katz <katzj at redhat.com> - 0.101.7-1
-- some more radeons
+* Thu Feb 19 2004 Mike A. Harris <mharris at redhat.com> 0.108-1
+- Added Shamrock C407L to MonitorsDB for bug (#104920)
 
-* Fri Mar  5 2004 Jeremy Katz <katzj at redhat.com> - 0.101.6-1
-- don't map the secondaries
+* Thu Feb 19 2004 Mike A. Harris <mharris at redhat.com> 0.107-1
+- Massive Viewsonic monitor update for MonitorsDB (#84882)
 
-* Fri Mar  5 2004 Jeremy Katz <katzj at redhat.com> - 0.101.5-1
-- associate cards with some of the pci.ids
+* Fri Feb 13 2004 John Dennis <jdennis at finch.boston.redhat.com> 0.106-1
+- fix typo, GP should have been HP
 
-* Mon Mar  1 2004 Bill Nottingham <notting at redhat.com> 0.101.4-1
-- update pci.ids again
+* Thu Jan 29 2004 Bill Nottingham <notting at redhat.com> 0.105-1
+- many monitor updates (#114260, #114216, #113993, #113932, #113782,
+  #113685, #113523, #111203, #107788, #106526, #63005)
+- add some PCMCIA cards (#113006, #112505)
 
-* Mon Feb 23 2004 Bill Nottingham <notting at redhat.com> 0.101.3-1
-- update pci.ids, MonitorsDB (#92322, #109341, #104069)
+* Tue Jan 20 2004 Bill Nottingham <notting at redhat.com> 0.104-1
+- switch sound module mappings to alsa drivers
 
-* Fri Feb 13 2004 John Dennis <jdennis at finch.boston.redhat.com> 0.101.2-1
-- fix typo in Hewlet-Packard, GP should have been HP
+* Mon Jan 19 2004 Brent Fox <bfox at redhat.com> 0.103-1
+- fix tab spacing
 
-* Mon Dec  8 2003 Bill Nottingham <notting at redhat.com> 0.101.1-1
-- add some pci ids (#106891)
+* Fri Jan 16 2004 Brent Fox <bfox at redhat.com> 0.102-1
+- added an entry for ATI Radeon 9200SE (bug #111306)
 
 * Sun Oct 26 2003 Jeremy Katz <katzj at redhat.com> 0.101-1
 - add 1920x1200 Generic LCD as used on some Dell laptops (#108006)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	23 Jun 2006 00:50:46 -0000	1.68
+++ sources	23 Jun 2006 01:04:16 -0000	1.69
@@ -1 +1 @@
-cbdf904f0cf7bc2681407d530a7cb08c  hwdata-0.101.25.tar.gz
+0e02b7d5d80f14f4994e8209c561535e  hwdata-0.180.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 23 02:56:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 22 Jun 2006 22:56:36 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2302,1.2303
Message-ID: <200606230256.k5N2uaaX018655@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18609

Modified Files:
	kernel-2.6.spec 
Log Message:
- Update sysconfig/kernel on x86 %post - Robert Scheck (#196307)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2302
retrieving revision 1.2303
diff -u -r1.2302 -r1.2303
--- kernel-2.6.spec	22 Jun 2006 17:47:32 -0000	1.2302
+++ kernel-2.6.spec	23 Jun 2006 02:56:33 -0000	1.2303
@@ -1401,7 +1401,7 @@
 exit 0
 
 %post
-if [ `uname -i` == "x86_64" ]; then
+if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ]; then
   if [ -f /etc/sysconfig/kernel ]; then
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
   fi
@@ -1676,11 +1676,12 @@
 %endif
 
 %changelog
-* Thu Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
-- MTD update
-
 * Thu Jun 22 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git4
+- Update sysconfig/kernel on x86 %post - Robert Scheck (#196307)
+
+* Thu Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
+- MTD update
 
 * Thu Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update GFS2 patch



From fedora-cvs-commits at redhat.com  Fri Jun 23 05:30:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 01:30:49 -0400
Subject: rpms/gphoto2/devel gphoto2-2.2.0-print-camera-list.patch, NONE,
	1.1 gphoto2.spec, 1.67, 1.68
Message-ID: <200606230530.k5N5Ung8014356@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14310

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-2.2.0-print-camera-list.patch 
Log Message:
 - fix print-camera-list to not require libgphoto2 at build time

gphoto2-2.2.0-print-camera-list.patch:
 print-camera-list.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gphoto2-2.2.0-print-camera-list.patch ---
--- gphoto2-2.2.0/libgphoto2-2.2.1/packaging/generic/print-camera-list.c.old	2006-04-19 03:54:05.000000000 +0200
+++ gphoto2-2.2.0/libgphoto2-2.2.1/packaging/generic/print-camera-list.c	2006-06-22 16:11:21.000000000 +0200
@@ -48,8 +48,8 @@
 #include <time.h>
 #include <string.h>
 
-#include <gphoto2/gphoto2-camera.h>
-#include <gphoto2/gphoto2-port-log.h>
+#include "gphoto2-camera.h"
+#include "gphoto2-port-log.h"
 
 #ifndef TRUE
 #define TRUE  (0==0)


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gphoto2.spec	22 Jun 2006 13:26:37 -0000	1.67
+++ gphoto2.spec	23 Jun 2006 05:30:45 -0000	1.68
@@ -20,6 +20,7 @@
 Source5: gphoto2-config
 Patch2: gphoto2-2.2.0-gcc4.patch
 Patch5: gphoto2-2.1.99-config.patch
+Patch6: gphoto2-2.2.0-print-camera-list.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -77,6 +78,7 @@
 %setup -q -a 1 -a 2
 %patch2 -p1 -b .gcc4
 %patch5 -p1 -b .config
+%patch6 -p1 -b .include
 
 ####################################
 %build
@@ -127,8 +129,11 @@
     install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
     export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
     export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver}
+# get the correct lib
+    export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
     $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-#    ./print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+
+
     popd
 popd
 
@@ -236,6 +241,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Fri Jun 23 2006 Radek Vok??l <rvokal at redhat.com> 2.2.0-2
+- fix print-camera-list to not require libgphoto2 at build time
+
 * Thu Jun 22 2006 Radek Vok??l <rvokal at redhat.com> 2.2.0-1
 - update to gphoto2-2.2.0 and libgphoto2-2.2.1
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 05:34:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 01:34:26 -0400
Subject: rpms/autofs/FC-5 autofs-4.1.4-replicated-parse-error.patch, NONE,
	1.1 autofs.spec, 1.83, 1.84
Message-ID: <200606230534.k5N5YQ6M014866@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14808

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-replicated-parse-error.patch 
Log Message:
* Fri Jun 23 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-29
- fix parse error in patch for space handling in get_best_mount
  (possibly also fixes bz# 196394).


autofs-4.1.4-replicated-parse-error.patch:
 mount_nfs.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-replicated-parse-error.patch ---
--- autofs-4.1.4/modules/mount_nfs.c.replicated-parse-error	2006-06-23 01:25:54.000000000 -0400
+++ autofs-4.1.4/modules/mount_nfs.c	2006-06-23 01:26:17.000000000 -0400
@@ -252,7 +252,7 @@
 			/* No spaces in host names at least */
 			if (*next == ':') {
 				while (*next &&
-				      (*next != ' ' || *next != '\t'))
+				      (*next != ' ' && *next != '\t'))
 					next--;
 			}
 		} else if (*delim != '\0') {


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- autofs.spec	19 Jun 2006 08:49:51 -0000	1.83
+++ autofs.spec	23 Jun 2006 05:34:22 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 27
+%define release 29
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -42,6 +42,7 @@
 Patch29: autofs-4.1.4-discard-bg-nofg-options.patch
 Patch30: autofs-4.1.4-no-first-message.patch
 Patch31: autofs-4.1.4-bad-key-len-fix.patch
+Patch32: autofs-4.1.4-replicated-parse-error.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -111,7 +112,8 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1 -b .bad-key-len-fix
+%patch31 -p1
+%patch32 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -165,6 +167,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Jun 23 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-29
+- fix parse error in patch for space handling in get_best_mount
+  (possibly also fixes bz# 196394).
+
 * Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-27
 - Change LDAP message severity from crit to degug (bz# 183893).
 - Add patch to ignore the "bg" and "fg" mount options as they



From fedora-cvs-commits at redhat.com  Fri Jun 23 05:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 01:36:28 -0400
Subject: rpms/gphoto2/devel gphoto2.spec,1.68,1.69
Message-ID: <200606230536.k5N5aSt7015187@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15168

Modified Files:
	gphoto2.spec 
Log Message:
 release++


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gphoto2.spec	23 Jun 2006 05:30:45 -0000	1.68
+++ gphoto2.spec	23 Jun 2006 05:36:25 -0000	1.69
@@ -8,7 +8,7 @@
 %define libpkg libgphoto2
 %define libver 2.2.1
 Version: %{pkgver}
-Release: 1
+Release: 2
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-cvs-commits at redhat.com  Fri Jun 23 06:04:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 02:04:14 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta5-lookup_init-cleanup.patch, NONE,
	1.1 autofs-5.0.0_beta5-lookup_yp-leaks.patch, NONE,
	1.1 autofs-5.0.0_beta5-replicated-parse-error.patch, NONE,
	1.1 autofs-5.0.0_beta5-use-yp-map-order.patch, NONE,
	1.1 autofs.spec, 1.111, 1.112
Message-ID: <200606230604.k5N64Ej6005998@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5956

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta5-lookup_init-cleanup.patch 
	autofs-5.0.0_beta5-lookup_yp-leaks.patch 
	autofs-5.0.0_beta5-replicated-parse-error.patch 
	autofs-5.0.0_beta5-use-yp-map-order.patch 
Log Message:
* Fri Jun 23 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-3
- lookup_init cleanup and fix missed memory leak.
- use nis map order to check if update is needed.
- fix couple of memory leaks in lookup_yp.c.
- fix pasre error in replicated server module.


autofs-5.0.0_beta5-lookup_init-cleanup.patch:
 CHANGELOG                |    6 +++++-
 modules/lookup_file.c    |   11 ++++-------
 modules/lookup_hesiod.c  |   17 ++++++++++++++---
 modules/lookup_hosts.c   |   15 +++++++++++++--
 modules/lookup_ldap.c    |   10 +++-------
 modules/lookup_multi.c   |    4 ++--
 modules/lookup_nisplus.c |    9 ++++-----
 modules/lookup_program.c |   18 +++++++++++++-----
 modules/lookup_yp.c      |   10 +++++-----
 9 files changed, 63 insertions(+), 37 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-lookup_init-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index ca28b79..a59433f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
-?/6/2006 autofs-5.0.0_beta5
+?/6/2006 autofs-5.0.0
+---------------------
+- lookup_init cleanup and fix missed memory leak.
+
+20/6/2006 autofs-5.0.0_beta5
 ---------------------------
 - re-instate v4 directory cleanup.
 - backout master map lookup changes made to beta3.
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 28a5bd5..d598604 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -58,17 +58,18 @@ int lookup_init(const char *mapfmt, int 
 	char buf[MAX_ERR_BUF];
 	struct stat st;
 
-	if (!(ctxt = malloc(sizeof(struct lookup_context)))) {
+	*context = NULL;
+
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
-		*context = NULL;
 		return 1;
 	}
 
 	if (argc < 1) {
 		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -79,7 +80,6 @@ int lookup_init(const char *mapfmt, int 
 		      MODPREFIX "file map %s is not an absolute pathname",
 		      ctxt->mapname);
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -88,7 +88,6 @@ int lookup_init(const char *mapfmt, int 
 		     MODPREFIX "file map %s missing or not readable",
 		     ctxt->mapname);
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -96,7 +95,6 @@ int lookup_init(const char *mapfmt, int 
 		crit(LOGOPT_ANY, MODPREFIX "file map %s, could not stat",
 		     ctxt->mapname);
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 		
@@ -109,7 +107,6 @@ int lookup_init(const char *mapfmt, int 
 	if (!ctxt->parse) {
 		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	*context = ctxt;
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index 7fd2474..da4052d 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -43,9 +43,11 @@ int lookup_init(const char *mapfmt, int 
 	struct lookup_context *ctxt = NULL;
 	char buf[MAX_ERR_BUF];
 
+	*context = NULL;
+
 	/* If we can't build a context, bail. */
-	if ((*context = ctxt = (struct lookup_context *)
-	     malloc(sizeof(struct lookup_context))) == NULL) {
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
 		return 1;
@@ -58,6 +60,7 @@ int lookup_init(const char *mapfmt, int 
 	if (hesiod_init(&(ctxt->hesiod_context)) != 0) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "hesiod_init(): %s", estr);
+		free(ctxt);
 		return 1;
 	}
 
@@ -66,7 +69,15 @@ int lookup_init(const char *mapfmt, int 
 		mapfmt = MAPFMT_DEFAULT;
 
 	/* Open the parser, if we can. */
-	return !(ctxt->parser = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1));
+	ctxt->parser = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+	if (!ctxt->parser) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
+		free(ctxt);
+		return 1;
+	}
+	*context = ctxt;
+
+	return 0;
 }
 
 int lookup_read_master(struct master *master, time_t age, void *context)
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 55e9fd1..f1bd68b 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -48,7 +48,10 @@ int lookup_init(const char *mapfmt, int 
 	struct lookup_context *ctxt;
 	char buf[MAX_ERR_BUF];
 
-	if (!(*context = ctxt = malloc(sizeof(struct lookup_context)))) {
+	*context = NULL;
+
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
 		return 1;
@@ -56,7 +59,15 @@ int lookup_init(const char *mapfmt, int 
 
 	mapfmt = MAPFMT_DEFAULT;
 
-	return !(ctxt->parse = open_parse(mapfmt, MODPREFIX, argc, argv));
+	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc, argv);
+	if (!ctxt->parse) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
+		free(ctxt);
+		return 1;
+	}
+	*context = ctxt;
+
+	return 0;
 }
 
 int lookup_read_master(struct master *master, time_t age, void *context)
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index aaaed2e..8a6faca 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -694,12 +694,13 @@ int lookup_init(const char *mapfmt, int 
 	int ret;
 	LDAP *ldap = NULL;
 
+	*context = NULL;
+
 	/* If we can't build a context, bail. */
-	ctxt = (struct lookup_context *) malloc(sizeof(struct lookup_context));
+	ctxt = malloc(sizeof(struct lookup_context));
 	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
-		*context = NULL;
 		return 1;
 	}
 	memset(ctxt, 0, sizeof(struct lookup_context));
@@ -715,7 +716,6 @@ int lookup_init(const char *mapfmt, int 
 	if (!parse_server_string(argv[0], ctxt)) {
 		error(LOGOPT_ANY, MODPREFIX "cannot parse server string");
 		free_context(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -723,7 +723,6 @@ int lookup_init(const char *mapfmt, int 
 	if (!get_default_schema(ctxt)) {
 		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
 		free_context(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -736,7 +735,6 @@ #if WITH_SASL
 	if (ret) {
 		error(LOGOPT_ANY, MODPREFIX "cannot initialize auth setup");
 		free_context(ctxt);
-		*context = NULL;
 		return 1;
 	}
 #endif
@@ -745,7 +743,6 @@ #endif
 	if (!ldap) {
 		error(LOGOPT_ANY, MODPREFIX "cannot connect to server");
 		free_context(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -757,7 +754,6 @@ #endif
 	if (!ctxt->parse) {
 		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free_context(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	*context = ctxt;
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 996ed39..c64a141 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -49,7 +49,8 @@ int lookup_init(const char *my_mapfmt, i
 	int i, j, an;
 	char *estr;
 
-	if (!(*context = ctxt = malloc(sizeof(struct lookup_context))))
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt)
 		goto nomem;
 
 	memset(ctxt, 0, sizeof(struct lookup_context));
@@ -121,7 +122,6 @@ error_out:
 		if (ctxt->argl)
 			free(ctxt->argl);
 		free(ctxt);
-		*context = NULL;
 	}
 	return 1;
 }
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 6ea418e..6cb0d6c 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -37,17 +37,18 @@ int lookup_init(const char *mapfmt, int 
 	struct lookup_context *ctxt;
 	char buf[MAX_ERR_BUF];
 
-	if (!(ctxt = malloc(sizeof(struct lookup_context)))) {
+	*context = NULL;
+
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "%s", estr);
-		*context = NULL;
 		return 1;
 	}
 
 	if (argc < 1) {
 		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	ctxt->mapname = argv[0];
@@ -60,7 +61,6 @@ int lookup_init(const char *mapfmt, int 
 	if (!ctxt->domainname) {
 		crit(LOGOPT_ANY, MODPREFIX "NIS+ domain not set");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -71,7 +71,6 @@ int lookup_init(const char *mapfmt, int 
 	if (!ctxt->parse) {
 		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	*context = ctxt;
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index e20054b..e527f52 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -47,7 +47,10 @@ int lookup_init(const char *mapfmt, int 
 	struct lookup_context *ctxt;
 	char buf[MAX_ERR_BUF];
 
-	if (!(*context = ctxt = malloc(sizeof(struct lookup_context)))) {
+	*context = NULL;
+
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
 		return 1;
@@ -56,7 +59,6 @@ int lookup_init(const char *mapfmt, int 
 	if (argc < 1) {
 		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	ctxt->mapname = argv[0];
@@ -66,7 +68,6 @@ int lookup_init(const char *mapfmt, int 
 		     MODPREFIX "program map %s is not an absolute pathname",
 		     ctxt->mapname);
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -75,14 +76,21 @@ int lookup_init(const char *mapfmt, int 
 		     MODPREFIX "program map %s missing or not executable",
 		     ctxt->mapname);
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
 	if (!mapfmt)
 		mapfmt = MAPFMT_DEFAULT;
 
-	return !(ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1));
+	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+	if (!ctxt->parse) {
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
+		free(ctxt);
+		return 1;
+	}
+	*context = ctxt;
+
+	return 0;
 }
 
 int lookup_read_master(struct master *master, time_t age, void *context)
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 7eea62b..84b4feb 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -62,17 +62,19 @@ int lookup_init(const char *mapfmt, int 
 	char buf[MAX_ERR_BUF];
 	int err;
 
-	if (!(ctxt = malloc(sizeof(struct lookup_context)))) {
+	*context = NULL;
+
+	ctxt = malloc(sizeof(struct lookup_context));
+	if (!ctxt) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "%s", estr);
-		*context = NULL;
 		return 1;
 	}
+	memset(ctxt, 0, sizeof(struct lookup_context));
 
 	if (argc < 1) {
 		crit(LOGOPT_ANY, MODPREFIX "no map name");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	ctxt->mapname = argv[0];
@@ -85,7 +87,6 @@ int lookup_init(const char *mapfmt, int 
 		debug(LOGOPT_NONE, MODPREFIX "map %s: %s", ctxt->mapname,
 		       yperr_string(err));
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 
@@ -96,7 +97,6 @@ int lookup_init(const char *mapfmt, int 
 	if (!ctxt->parse) {
 		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free(ctxt);
-		*context = NULL;
 		return 1;
 	}
 	*context = ctxt;

autofs-5.0.0_beta5-lookup_yp-leaks.patch:
 CHANGELOG           |    1 +
 modules/lookup_yp.c |   11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-lookup_yp-leaks.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index bdd9fe6..b9a1e87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 ---------------------
 - lookup_init cleanup and fix missed memory leak.
 - use nis map order to check if update is needed.
+- fix couple of memory leaks in lookup_yp.c.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 5f4ad7d..36563a9 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -87,6 +87,7 @@ static unsigned int get_map_order(const 
 				return 0;
 
 			last_changed = atol(order);
+			free(order);
 
 			return (unsigned int) last_changed;
 		}
@@ -347,10 +348,6 @@ static int lookup_one(struct autofs_poin
 
 	strcpy(mapname, ctxt->mapname);
 
-	mapent = alloca(MAPENT_MAX_LEN + 1);
-	if (!mapent)
-		return 0;
-
 	/*
 	 * For reasons unknown, the standard YP definitions doesn't
 	 * define input strings as const char *.  However, my
@@ -382,6 +379,7 @@ static int lookup_one(struct autofs_poin
 	cache_writelock(mc);
 	ret = cache_update(mc, source, key, mapent, age);
 	cache_unlock(mc);
+	free(mapent);
 
 	return ret;
 }
@@ -402,10 +400,6 @@ static int lookup_wild(struct autofs_poi
 
 	strcpy(mapname, ctxt->mapname);
 
-	mapent = alloca(MAPENT_MAX_LEN + 1);
-	if (!mapent)
-		return 0;
-
 	ret = yp_match((char *) ctxt->domainname,
 		       mapname, "*", 1, &mapent, &mapent_len);
 
@@ -431,6 +425,7 @@ static int lookup_wild(struct autofs_poi
 	cache_writelock(mc);
 	ret = cache_update(mc, source, "*", mapent, age);
 	cache_unlock(mc);
+	free(mapent);
 
 	return ret;
 }

autofs-5.0.0_beta5-replicated-parse-error.patch:
 CHANGELOG            |    1 +
 modules/replicated.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta5-replicated-parse-error.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b9a1e87..144c0c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - lookup_init cleanup and fix missed memory leak.
 - use nis map order to check if update is needed.
 - fix couple of memory leaks in lookup_yp.c.
+- fix pasre error in replicated server module.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/modules/replicated.c b/modules/replicated.c
index e7f378b..2d7e94a 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -824,7 +824,7 @@ int parse_location(struct host **hosts, 
 				/* No spaces in host names at least */
 				if (*next == ':') {
 					while (*next &&
-					      (*next != ' ' || *next != '\t'))
+					      (*next != ' ' && *next != '\t'))
 						next--;
 					*next++ = '\0';
 				}

autofs-5.0.0_beta5-use-yp-map-order.patch:
 CHANGELOG           |    1 
 modules/lookup_yp.c |   67 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 55 insertions(+), 13 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-use-yp-map-order.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index a59433f..bdd9fe6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 ?/6/2006 autofs-5.0.0
 ---------------------
 - lookup_init cleanup and fix missed memory leak.
+- use nis map order to check if update is needed.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 84b4feb..5f4ad7d 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -39,7 +39,7 @@ #define MODPREFIX "lookup(yp): "
 struct lookup_context {
 	const char *domainname;
 	const char *mapname;
-	unsigned long yplast_modified;
+	unsigned long order;
 	struct parse_mod *parse;
 };
 
@@ -56,6 +56,49 @@ struct callback_data {
 
 int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
 
+static unsigned int get_map_order(const char *domain, const char *map)
+{
+	char key[] = "YP_LAST_MODIFIED";
+	int key_len = strlen(key);
+	char *order;
+	int order_len;
+	char *mapname;
+	long last_changed;
+	int err;
+
+	mapname = alloca(strlen(map) + 1);
+	if (!mapname)
+		return 0;
+
+	strcpy(mapname, map);
+
+	err = yp_match(domain, mapname, key, key_len, &order, &order_len);
+	if (err != YPERR_SUCCESS) {
+		if (err == YPERR_MAP) {
+			char *usc;
+
+			while ((usc = strchr(mapname, '_')))
+				*usc = '.';
+
+			err = yp_match(domain, mapname,
+				       key, key_len, &order, &order_len);
+
+			if (err != YPERR_SUCCESS)
+				return 0;
+
+			last_changed = atol(order);
+
+			return (unsigned int) last_changed;
+		}
+		return 0;
+	}
+
+	last_changed = atol(order);
+	free(order);
+
+	return (unsigned int) last_changed;
+}
+
 int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
 {
 	struct lookup_context *ctxt;
@@ -90,6 +133,8 @@ int lookup_init(const char *mapfmt, int 
 		return 1;
 	}
 
+	ctxt->order = get_map_order(ctxt->domainname, ctxt->mapname);
+
 	if (!mapfmt)
 		mapfmt = MAPFMT_DEFAULT;
 
@@ -397,8 +442,7 @@ static int check_map_indirect(struct aut
 	struct map_source *source = ap->entry->current;
 	struct mapent_cache *mc = source->mc;
 	struct mapent *me, *exists;
-	time_t now = time(NULL);
-	time_t t_last_read;
+	unsigned int map_order;
 	int need_map = 0;
 	int ret = 0;
 
@@ -420,15 +464,12 @@ static int check_map_indirect(struct aut
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	cache_readlock(mc);
-	me = cache_lookup_first(mc);
-	t_last_read = me ? now - me->age : ap->exp_runfreq + 1;
-	cache_unlock(mc);
-
-	if (t_last_read > ap->exp_runfreq)
-		if ((ret & CHE_UPDATED) ||
-		    (exists && (ret & CHE_MISSING)))
-			need_map = 1;
+	/* Only read map if it has been modified */
+	map_order = get_map_order(ctxt->domainname, ctxt->mapname);
+	if (map_order > ctxt->order) {
+		ctxt->order = map_order;
+		need_map = 1;
+	}
 
 	if (ret == CHE_MISSING) {
 		int wild = CHE_MISSING;
@@ -447,7 +488,7 @@ static int check_map_indirect(struct aut
 		pthread_cleanup_pop(1);
 	}
 
-	/* Have parent update its map */
+	/* Have parent update its map if needed */
 	if (ap->ghost && need_map) {
 		int status;
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- autofs.spec	21 Jun 2006 02:26:31 -0000	1.111
+++ autofs.spec	23 Jun 2006 06:04:11 -0000	1.112
@@ -4,13 +4,17 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta5
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
+Patch1: autofs-5.0.0_beta5-lookup_init-cleanup.patch
+Patch2: autofs-5.0.0_beta5-use-yp-map-order.patch
+Patch3: autofs-5.0.0_beta5-lookup_yp-leaks.patch
+Patch4: autofs-5.0.0_beta5-replicated-parse-error.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -49,6 +53,10 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -104,6 +112,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Jun 23 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-3
+- lookup_init cleanup and fix missed memory leak.
+- use nis map order to check if update is needed.
+- fix couple of memory leaks in lookup_yp.c.
+- fix pasre error in replicated server module.
+
 * Wed Jun 21 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-2
 - Add openssl-devel to the BuildRequires, as it is needed for the LDAP
   authentication bitsi also.



From fedora-cvs-commits at redhat.com  Fri Jun 23 07:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 03:35:43 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.16,1.17
Message-ID: <200606230735.k5N7ZhG4019244@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19232

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
* Fri Jun 23 2006 Mike A. Harris <mharris at redhat.com> 1.6.0-5
- Add with_dri macro to spec file, and conditionalize build time DRI support



Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-i810.spec	26 May 2006 15:49:30 -0000	1.16
+++ xorg-x11-drv-i810.spec	23 Jun 2006 07:35:41 -0000	1.17
@@ -2,25 +2,35 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-#%define cvsdate cvs20060322
+%define cvsdate cvsYYYYMMDD
+
+%ifarch %{ix86} x86_64 ia64
+%define with_dri        1
+%else
+%define with_dri        0
+%endif
 
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   4
+Release:   5
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   i810.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   i810.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-2
 BuildRequires: libXvMC-devel
-BuildRequires: libdrm >= 2.0-1
+%if %{with_dri}
+BuildRequires: mesa-libGL-devel >= 6.5-9
+BuildRequires: libdrm-devel >= 2.0-1
+%endif
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
@@ -43,7 +53,13 @@
 #%patch0 -p1 -b .more-libcunwrap
 
 %build
-%configure --disable-static
+%configure --disable-static \
+%if %{with_dri}
+           --enable-dri
+%else
+           --disable-dri
+%endif
+
 make
 
 %install
@@ -79,6 +95,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Jun 23 2006 Mike A. Harris <mharris at redhat.com> 1.6.0-5
+- Add with_dri macro to spec file, and conditionalize build time DRI support
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.6.0-4
 - Added "BuildRequires: libdrm >= 2.0-1" for (#192334), and updated sdk dep
   to pick up proto-devel as well.
@@ -89,22 +108,22 @@
 * Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-2
 - Bump for fc5-bling build.
 
-* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-1
+* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-1
 - Update to 1.6.0 from 7.1RC1.
 
-* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
+* Tue Apr 04 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
 - Add patch to add missing #include's, specifically assert.h.
 
 * Wed Mar 22 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322
 - Update to CVS snapshot of 20060322.
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1.3-3.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.4.1.3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sat Feb  4 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-3
+* Sat Feb 04 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-3
 - Added 8086:2772 mapping to i810.xinf for bug (#178451)
 
-* Fri Feb  3 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-2
+* Fri Feb 03 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-2
 - Added 8086:2592 mapping to i810.xinf for bug (#172884)
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-1
@@ -117,17 +136,17 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.4.1-1
 - Updated xorg-x11-drv-i810 to version 1.4.1 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.4.0.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.4.0.1-1
 - Updated xorg-x11-drv-i810 to version 1.4.0.1 from X11R7 RC1
 - Fix *.la file removal.
 - Added 'devel' subpackage for XvMC .so
 - Added 'BuildRequires: libXvMC-devel' for XvMC drivers.
 
-* Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.4.0-1
+* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 1.4.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
 - Limit "ExclusiveArch" to x86, x86_64, ia64
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.4.0-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.4.0-0
 - Initial spec file for i810 video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Fri Jun 23 10:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 06:28:45 -0400
Subject: rpms/ghostscript/devel ghostscript.spec, 1.120,
	1.121 espgs-cjkv.patch, 1.1, NONE
Message-ID: <200606231028.k5NASjDU005950@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5937

Modified Files:
	ghostscript.spec 
Removed Files:
	espgs-cjkv.patch 
Log Message:
* Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-8
- Revert CJKV patch.



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ghostscript.spec	14 Jun 2006 16:34:20 -0000	1.120
+++ ghostscript.spec	23 Jun 2006 10:28:43 -0000	1.121
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 7
+Release: 8
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -24,7 +24,6 @@
 Patch8: ghostscript-use-external-freetype.patch
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
-Patch11: espgs-cjkv.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -107,9 +106,6 @@
 # Support reading a big cmap/post table from a TrueType font.
 %patch10 -p1 -b .big-cmap-post
 
-# CJKV patch from svn164:165.
-%patch11 -p1 -b .cjkv
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -264,6 +260,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-8
+- Revert CJKV patch.
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 8.15.2-7
 - rebuilt with new gnutls
 


--- espgs-cjkv.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 23 11:40:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 07:40:46 -0400
Subject: rpms/hplip/devel hplip-0.9.10-2.patch,1.1,NONE
Message-ID: <200606231140.k5NBekQU023044@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22966

Removed Files:
	hplip-0.9.10-2.patch 
Log Message:
No longer needed.


--- hplip-0.9.10-2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 23 12:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 08:44:18 -0400
Subject: rpms/planner/devel .cvsignore, 1.5, 1.6 planner.spec, 1.25,
	1.26 sources, 1.5, 1.6
Message-ID: <200606231244.k5NCiIYi006821@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6790

Modified Files:
	.cvsignore planner.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2005 21:45:36 -0000	1.5
+++ .cvsignore	23 Jun 2006 12:44:15 -0000	1.6
@@ -1,3 +1,4 @@
 planner-0.12.tar.bz2
 planner-0.12.1.tar.bz2
 planner-0.13.tar.bz2
+planner-0.14.tar.bz2


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- planner.spec	17 May 2006 13:25:14 -0000	1.25
+++ planner.spec	23 Jun 2006 12:44:15 -0000	1.26
@@ -7,8 +7,8 @@
 ##################################
 Summary:   A graphical project management tool.
 Name:      planner
-Version:   0.13
-Release:   5
+Version:   0.14
+Release:   1
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -26,7 +26,7 @@
 BuildRequires: gtk2-devel >= 2.2.0, libgnomeui-devel >= 2.0.1 
 BuildRequires: libglade2-devel >= 2.0.0, gnome-vfs2-devel >= 2.0.2
 BuildRequires: libgnomeprintui22-devel >= 2.2.0, libxml2-devel >= 2.5.4
-BuildRequires: libxslt-devel >= 1.0.27, intltool, autoconf, automake17
+BuildRequires: libxslt-devel >= 1.0.27, intltool, autoconf, automake
 BuildRequires: libtool, gettext, libgsf-devel, gtk-doc, pygtk2-devel
 BuildRequires: scrollkeeper, glib2-devel, evolution-data-server
 BuildRequires: evolution-data-server-devel, evolution-devel, python-devel
@@ -35,7 +35,7 @@
 # Sources
 ##################################
 
-# http://ftp.gnome.org/pub/GNOME/sources/planner/0.11/planner-0.11.tar.bz2
+# http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/planner-0.14.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 
 Patch0: planner-0.12-desktop-fix.patch
@@ -88,10 +88,9 @@
 ##################################
 %build
 
-# aclocal-1.7
-automake-1.7
-# intltoolize --force
-intltoolize
+aclocal
+automake
+intltoolize --force
 libtoolize --force
 autoconf
 %configure --enable-python --enable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend
@@ -172,26 +171,22 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/file-modules
 %{_libdir}/%{name}/storage-modules
-%{_libdir}/%{name}/views
-%{_libdir}/%{name}/*.so
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/libhtml-plugin.so
 %{_libdir}/%{name}/plugins/libmsp-plugin.so
 %{_libdir}/%{name}/plugins/libxmlplanner-plugin.so
 %{_libdir}/lib%{name}-1*
-%{_libdir}/python*/site-packages/gtk-2.0/*
+%{_libdir}/python*/site-packages/*
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/%{name}
 %{_datadir}/doc/%{name}/*
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
-%{_datadir}/application-registry/*
-%{_datadir}/mime-info/*
 %{_datadir}/mime/packages/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/gtk-doc/html/lib%{name}
 %{_datadir}/gnome/help/%{name}/*
-%{_datadir}/omf/%{name}/%{name}-C.omf
+%{_datadir}/omf/%{name}/%{name}-*.omf
 
 %files eds
 %defattr(-,root,root)
@@ -215,6 +210,9 @@
 # Changelog
 ##################################
 %changelog
+* Fri Jun 23 2006 Caolan McNamara <caolanm at redhat.com> - 0.14-1
+- new version
+
 * Wed Mar 17 2006 Caolan McNamara <caolanm at redhat.com> - 0.13-5
 - courtesy Stuart Clark <sclark at tpg.com.au> bug fix for: 
   Gantt bar height doesn't match treeview row height


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2005 21:45:36 -0000	1.5
+++ sources	23 Jun 2006 12:44:15 -0000	1.6
@@ -1 +1 @@
-acc2e2075bc489e849843009d6583cc0  planner-0.13.tar.bz2
+af54ef691bfa7fc24c7ad858d55fed4a  planner-0.14.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 23 13:06:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 09:06:10 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.74, 1.75 sources,
	1.77, 1.78 system-config-printer.spec, 1.35, 1.36
Message-ID: <200606231306.k5ND6A76027943@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27903

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.16-1
- 0.7.16, now with SMB browser.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	22 Jun 2006 09:07:11 -0000	1.74
+++ .cvsignore	23 Jun 2006 13:05:55 -0000	1.75
@@ -54,3 +54,4 @@
 system-config-printer-0.7.13.tar.bz2
 system-config-printer-0.7.14.tar.bz2
 system-config-printer-0.7.15.tar.bz2
+system-config-printer-0.7.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	22 Jun 2006 09:07:11 -0000	1.77
+++ sources	23 Jun 2006 13:06:07 -0000	1.78
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-7719f7a889d38dcdd0c0a5645bc8404b  system-config-printer-0.7.15.tar.bz2
+1ec5680e256f446d57b469c95479d324  system-config-printer-0.7.16.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- system-config-printer.spec	22 Jun 2006 09:07:11 -0000	1.35
+++ system-config-printer.spec	23 Jun 2006 13:06:07 -0000	1.36
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.15
+Version: 0.7.16
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -109,6 +109,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.16-1
+- 0.7.16, now with SMB browser.
+
 * Wed Jun 22 2006 Tim Waugh <twaugh at redhat.com> 0.7.15-1
 - 0.7.15.
 - Build requires gettext-devel.



From fedora-cvs-commits at redhat.com  Fri Jun 23 13:09:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 09:09:55 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.36,
	1.37
Message-ID: <200606231309.k5ND9tMR028756@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28715

Modified Files:
	system-config-printer.spec 
Log Message:
New file.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- system-config-printer.spec	23 Jun 2006 13:06:07 -0000	1.36
+++ system-config-printer.spec	23 Jun 2006 13:09:53 -0000	1.37
@@ -101,6 +101,7 @@
 %{_datadir}/%{name}/options.py*
 %{_datadir}/%{name}/optionwidgets.py*
 %{_datadir}/%{name}/probe_printer.py*
+%{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
 %{_datadir}/%{name}/*.glade



From fedora-cvs-commits at redhat.com  Fri Jun 23 13:25:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 09:25:28 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.82,1.83
Message-ID: <200606231325.k5NDPSeF024884@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24871

Modified Files:
	kdegraphics.spec 
Log Message:
add missing kuickshow, printnodetest, svgdisplay, xf86gammacfg #196067



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdegraphics.spec	3 Jun 2006 17:23:28 -0000	1.82
+++ kdegraphics.spec	23 Jun 2006 13:25:26 -0000	1.83
@@ -18,7 +18,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 2
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -44,14 +44,13 @@
 BuildRequires: freeglut-devel
 %endif
 BuildRequires: kdebase-devel
-BuildRequires: zlib-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: freetype-devel
+BuildRequires: lcms-devel
+BuildRequires: libart_lgpl-devel
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 
@@ -79,186 +78,6 @@
 Graphic applications for the K Desktop Environment.
 This package contains header files for developing applications using kdegraphics.
 
-%package -n kamera
-Summary: Digital camera support for KDE
-Group: Applications/Multimedia
-Requires: gphoto2
-
-%description -n kamera
-Kamera adds support for digital cameras to KDE.
-After installing kamera, you can access your digital camera just like
-a filesystem from KDE applications.
-
-%package -n kcoloredit
-Summary: KDE palette editor and color chooser
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kcoloredit
-KDE palette editor and color chooser.
-kcoloredit can be used by other programs (and scripts) to pick a color or
-edit a palette.
-
-%package -n kdvi
-Summary: KDE DVI (TeX output) file viewer
-Group: Applications/Publishing
-Obsoletes: kdegraphics
-
-%description -n kdvi
-A DVI (TeX output) file viewer for KDE.
-
-%package -n kfax
-Summary: KDE Fax viewer
-Group: Applications/Communications
-Obsoletes: kdegraphics
-
-%description -n kfax
-A KDE viewer for incoming faxes
-
-%package -n kfile
-Summary: KFile module for reading image file
-Group: Applications/File
-Obsoletes: kfile-png
-Obsoletes: kfile-pdf
-
-%description -n kfile
-The KFile plugin allows all applications using KFile (e.g. Konqueror) to
-view information on image files.
-
-%package -n kfract
-Summary: KDE Fractal Generator
-Group: Applications/Engineering
-Obsoletes: kdegraphics
-
-%description -n kfract
-A Fractal generator for KDE
-
-%package -n kghostview
-Summary: PostScript viewer for KDE
-Group: Applications/Publishing
-Obsoletes: kdegraphics
-
-%description -n kghostview
-A PostScript and PDF file viewer for KDE.
-In addition to being a standalone viewer application, kghostview acts as
-a Konqueror plugin.
-
-%package -n kiconedit
-Summary: An icon editor for creating KDE icons
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kiconedit
-An icon editor for creating KDE icons
-
-%package -n kooka
-Summary: KDE scanner application
-Group: Applications/Multimedia
-Requires: libkscan = %{version}-%{release}, sane-backends
-
-%description -n kooka
-Kooka is a KDE application for previewing, cutting and receiving images
-from a scanner.
-
-%package -n kpaint
-Summary: A simple paint program for KDE
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kpaint
-A simple bitmap paint program for KDE.
-
-%package -n kruler
-Summary: A screen ruler and color measurement tool
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kruler
-A screen ruler and color measurement tool
-
-%package -n ksnapshot
-Summary: A KDE applet for taking snapshots of the desktop
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n ksnapshot
-A KDE applet for taking screenshots.
-ksnapshot allows both capturing the whole desktop and capturing just
-the active window.
-
-%package -n kuickshow
-Summary: Quick picture viewer for KDE
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kuickshow
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size.
-
-%package -n kview
-Summary: KDE Image Viewer
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kview
-KView is a KDE image viewer, supporting a wide range of graphics file formats.
-
-%package -n kviewshell
-Summary: Plugin integration for KView
-Group: Applications/Multimedia
-Requires: kview
-Obsoletes: kdegraphics
-
-%description -n kviewshell
-KViewShell allows the kview image viewer to be embedded into other KDE
-applications.
-
-%package -n kviewshell-devel
-Summary: Development files for kviewshell
-Group: Development/Libraries
-Requires: kviewshell
-Obsoletes: kdegraphics-devel
-
-%description -n kviewshell-devel
-Development files for KViewShell.
-Install kdegraphics-kviewshell-devel if you wish to develop or compile
-applications using kviewshell.
-
-%package -n libkscan
-Summary: KDE library for scanner support.
-Group: Applications/Multimedia
-Requires: sane-backends
-Obsoletes: kdegraphics
-
-%description -n libkscan
-KDE library for scanner support.
-
-%package -n libkscan-devel
-Summary: Development files for libkscan
-Group: Applications/Multimedia
-Requires: libkscan = %{version}-%{release}
-Obsoletes: kdegraphics-devel
-
-%description -n libkscan-devel
-Development files for libkscan - install kdegraphics-libkscan-devel if
-you wish to develop or compile applications using libkscan.
-
-%package -n kmrml
-Summary: MRML (Multimedia Retrieval Markup Language) client
-Group: Applications/Multimedia
-
-%description -n kmrml
-This package contains an MRML (Multimedia Retrieval Markup Language, http://www.mrml.net/) client
-for Konqueror.
-
-%package -n kpovmodeler
-Summary: Model editor for the PovRay raytracer
-Group: Applications/Multimedia
-
-%description -n kpovmodeler
-This package contains a model editor for the PovRay raytracer.
-
 %prep
 %setup -q
 %patch0 -p1 -b .libtool
@@ -281,15 +100,10 @@
 %endif
 
 %build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
@@ -337,9 +151,22 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -365,6 +192,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jun 23 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
+- add missing kuickshow, printnodetest, svgdisplay, xf86gammacfg #196067
+
 * Sat Jun 03 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 15:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 11:48:01 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.198,
	1.199 config-powerpc-generic, 1.16, 1.17 config-powerpc64,
	1.11, 1.12
Message-ID: <200606231548.k5NFm1qe004436@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv2372/configs

Modified Files:
	config-generic config-powerpc-generic config-powerpc64 
Log Message:
git5



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- config-generic	22 Jun 2006 16:53:22 -0000	1.198
+++ config-generic	23 Jun 2006 15:47:48 -0000	1.199
@@ -937,6 +937,7 @@
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_SMSC_PHY=m
+CONFIG_VITESSE_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -1520,10 +1521,12 @@
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_PCA_ISA=m
 CONFIG_I2C_STUB=m
+# CONFIG_I2C_OCORES is not set
 
 #
 # I2C Hardware Sensors Chip support
 #
+CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -1561,6 +1564,7 @@
 CONFIG_SENSORS_RTC8564=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT8231=m
@@ -1568,6 +1572,7 @@
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 
 CONFIG_RTC_X1205_I2C=m
@@ -1576,12 +1581,13 @@
 CONFIG_W1_DS2433_CRC=y
 
 CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS9490=m
-CONFIG_W1_MASTER_DS9490_BRIDGE=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_CON=y
+CONFIG_W1_MASTER_DS2490=m
 
 #
 # Mice


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-powerpc-generic	14 Feb 2006 23:32:01 -0000	1.16
+++ config-powerpc-generic	23 Jun 2006 15:47:48 -0000	1.17
@@ -49,6 +49,14 @@
 # CONFIG_FB_CONTROL is not set
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
+CONFIG_SND_AOA=m
+CONFIG_SND_AOA_SOUNDBUS=m
+CONFIG_SND_AOA_FABRIC_LAYOUT=m
+CONFIG_SND_AOA_ONYX=m
+CONFIG_SND_AOA_TAS=m
+CONFIG_SND_AOA_TOONIE=m
+CONFIG_SND_AOA_SOUNDBUS_I2S=m
+
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
 CONFIG_BOOTX_TEXT=y
@@ -64,7 +72,7 @@
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_NI52 is not set
-# CONFIG_NI65 is not set 
+# CONFIG_NI65 is not set
 # CONFIG_LANCE is not set
 # CONFIG_3C515 is not set
 # CONFIG_ELPLUS is not set
@@ -83,3 +91,4 @@
 
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
+# CONFIG_PPC_EARLY_DEBUG is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-powerpc64	6 Jun 2006 04:35:48 -0000	1.11
+++ config-powerpc64	23 Jun 2006 15:47:48 -0000	1.12
@@ -3,6 +3,7 @@
 CONFIG_PPC_PMAC64=y
 # CONFIG_PPC_MAPLE is not set
 CONFIG_PPC_CELL=y
+CONFIG_PPC_IBM_CELL_BLADE=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
 CONFIG_KEXEC=y
@@ -39,3 +40,4 @@
 CONFIG_MAMBO=y
 CONFIG_MAMBO_DISK=m
 CONFIG_MAMBO_NET=m
+CONFIG_CBE_RAS=y



From fedora-cvs-commits at redhat.com  Fri Jun 23 15:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 11:48:01 -0400
Subject: rpms/kernel/devel patch-2.6.17-git5.bz2.sign, NONE, 1.1 .cvsignore,
	1.459, 1.460 kernel-2.6.spec, 1.2304,
	1.2305 linux-2.6-compile-fixes.patch, 1.78,
	1.79 linux-2.6-debug-sleep-in-irq-warning.patch, 1.1,
	1.2 linux-2.6-xen.patch, 1.26, 1.27 sources, 1.403,
	1.404 upstream, 1.368, 1.369 linux-2.6-geode-git.patch, 1.2,
	NONE linux-2.6-net-sundance-ip100A.patch, 1.1,
	NONE patch-2.6.17-git4.bz2.sign, 1.1, NONE
Message-ID: <200606231548.k5NFm1GI004423@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2372

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-debug-sleep-in-irq-warning.patch linux-2.6-xen.patch 
	sources upstream 
Added Files:
	patch-2.6.17-git5.bz2.sign 
Removed Files:
	linux-2.6-geode-git.patch linux-2.6-net-sundance-ip100A.patch 
	patch-2.6.17-git4.bz2.sign 
Log Message:
git5



--- NEW FILE patch-2.6.17-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEm5IuyGugalF9Dw4RAm4JAJ44p0TXM0++sFOWbbVbSKdaWm6MCQCgiZTY
/chGi7IPKdIC72BJAYEKJbI=
=IZDo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- .cvsignore	22 Jun 2006 16:53:21 -0000	1.459
+++ .cvsignore	23 Jun 2006 15:47:41 -0000	1.460
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git4.bz2
+patch-2.6.17-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2304
retrieving revision 1.2305
diff -u -r1.2304 -r1.2305
--- kernel-2.6.spec	23 Jun 2006 15:42:42 -0000	1.2304
+++ kernel-2.6.spec	23 Jun 2006 15:47:41 -0000	1.2305
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git4.bz2
+Patch1: patch-2.6.17-git5.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -271,7 +271,6 @@
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
 Patch208: linux-2.6-x86_64-noisy-syscalls.patch
-Patch209: linux-2.6-geode-git.patch
 
 # 300 - 399   ppc(64)
 Patch302: linux-2.6-offb-find-fb.patch
@@ -359,7 +358,6 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
-Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
@@ -776,8 +774,6 @@
 %patch207 -p1
 # Hush noisy unimplemented 32bit syscalls
 %patch208 -p1
-# Jordan Crouse's Geode git tree.
-%patch209 -p1
 
 #
 # ppc64
@@ -792,8 +788,8 @@
 %patch314 -p1
 # No input layer on iseries
 %patch317 -p1
-%patch318 -p1
-%patch319 -p1
+#%patch318 -p1
+#%patch319 -p1
 
 #
 # Xen
@@ -934,8 +930,6 @@
 %patch1203 -p1
 
 # NIC driver fixes.
-# New PCI ID for sundance driver.
-%patch1301 -p1
 # add IPW2200_MONITOR config option
 %patch1304 -p1
 
@@ -1060,7 +1054,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
+#%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1676,7 +1670,10 @@
 %endif
 
 %changelog
-* Fri Jun 23 2006 Jeremy Katz <katzj at redhat.com> 
+* Fri Jun 23 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git5
+
+* Fri Jun 23 2006 Jeremy Katz <katzj at redhat.com>
 - update to squashfs 3.0
 
 * Thu Jun 22 2006 Dave Jones <davej at redhat.com>

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- linux-2.6-compile-fixes.patch	22 Jun 2006 19:24:06 -0000	1.78
+++ linux-2.6-compile-fixes.patch	23 Jun 2006 15:47:41 -0000	1.79
@@ -1,56 +0,0 @@
-
-kernel/power/main.c: In function 'suspend_prepare':
-kernel/power/main.c:89: error: implicit declaration of function 'suspend_console'
-kernel/power/main.c: In function 'suspend_finish':
-kernel/power/main.c:137: error: implicit declaration of function 'resume_console'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.17.noarch/kernel/power/main.c~	2006-06-22 13:45:57.827853000 -0400
-+++ linux-2.6.17.noarch/kernel/power/main.c	2006-06-22 13:46:09.894764000 -0400
-@@ -15,7 +15,7 @@
- #include <linux/errno.h>
- #include <linux/init.h>
- #include <linux/pm.h>
--
-+#include <linux/console.h>
- 
- #include "power.h"
- 
- 
---- linux-2.6.17.noarch/drivers/video/Kconfig~	2006-06-22 14:27:13.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/video/Kconfig	2006-06-22 14:27:27.000000000 -0400
-@@ -807,8 +807,8 @@ config FB_I810_I2C
- config FB_INTEL
- 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
- 	depends on FB && EXPERIMENTAL && PCI && X86 && !VGA_NOPROBE
--	select AGP
--	select AGP_INTEL
-+	depends on AGP
-+	depends on AGP_INTEL
- 	select FB_MODE_HELPERS
- 	select FB_CFB_FILLRECT
- 	select FB_CFB_COPYAREA
-
---- linux-2.6.17.noarch/include/linux/pci_regs.h~	2006-06-22 14:54:33.000000000 -0400
-+++ linux-2.6.17.noarch/include/linux/pci_regs.h	2006-06-22 14:54:59.000000000 -0400
-@@ -197,6 +197,7 @@
- #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
- #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
- #define  PCI_CAP_ID_HT_IRQCONF	0x08	/* HyperTransport IRQ Configuration */
-+#define  PCI_CAP_ID_VNDR	0x09
- #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
- #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
- #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
-
---- linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c~	2006-06-22 15:16:35.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c	2006-06-22 15:18:18.000000000 -0400
-@@ -2120,7 +2120,7 @@ abort_linearize:
- 		goto drop;
- 	}
- 
--	if (skb_linearize(skb, GFP_ATOMIC))
-+	if (skb_linearize(skb))
- 		goto drop;
- 
- 	mgp->tx_linearized++;

linux-2.6-debug-sleep-in-irq-warning.patch:
 delay.h |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

Index: linux-2.6-debug-sleep-in-irq-warning.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-sleep-in-irq-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-sleep-in-irq-warning.patch	18 Aug 2005 18:28:13 -0000	1.1
+++ linux-2.6-debug-sleep-in-irq-warning.patch	23 Jun 2006 15:47:42 -0000	1.2
@@ -12,25 +12,20 @@
  /*
   * Using udelay() for intervals greater than a few milliseconds can
   * risk overflow for high loops_per_jiffy (high bogomips) machines. The
-@@ -25,14 +25,13 @@ extern unsigned long loops_per_jiffy;
- #define MAX_UDELAY_MS	5
+@@ -26,9 +26,13 @@ extern unsigned long loops_per_jiffy;
  #endif
  
--#ifdef notdef
--#define mdelay(n) (\
--	{unsigned long __ms=(n); while (__ms--) udelay(1000);})
--#else
+ #ifndef mdelay
 -#define mdelay(n) (\
 -	(__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : \
 -	({unsigned long __ms=(n); while (__ms--) udelay(1000);}))
--#endif
-+#define mdelay(n) (					\
-+	{						\
-+		static int warned=0; 			\
-+		unsigned long __ms=(n); 		\
-+		WARN_ON(in_irq() && !(warned++)); 	\
-+		while (__ms--) udelay(1000);		\
-+	})
++#define mdelay(n) (				\
++{						\
++	static int warned=0;			\
++	unsigned long __ms=(n);			\
++	WARN_ON(in_irq() && !(warned++));	\
++	while (__ms--) udelay(1000);		\
++})
+ #endif
  
  #ifndef ndelay
- #define ndelay(x)	udelay(((x)+999)/1000)

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   54 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 257 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- linux-2.6-xen.patch	22 Jun 2006 19:57:31 -0000	1.26
+++ linux-2.6-xen.patch	23 Jun 2006 15:47:42 -0000	1.27
@@ -27750,10 +27750,10 @@
  	default y
  	help
  	  Use the IA-PC HPET (High Precision Event Timer) to manage
-@@ -389,7 +416,7 @@ config GART_IOMMU
- 	bool "K8 GART IOMMU support"
+@@ -417,7 +417,7 @@ config GART_IOMMU
  	default y
  	select SWIOTLB
+ 	select AGP
 -	depends on PCI
 +	depends on PCI && !X86_64_XEN
  	help


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- sources	22 Jun 2006 16:53:21 -0000	1.403
+++ sources	23 Jun 2006 15:47:48 -0000	1.404
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-f733a0b5d58dc8422029ee359abf454f  patch-2.6.17-git4.bz2
+2f00efd53336014c2e9910d2feff1c53  patch-2.6.17-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- upstream	22 Jun 2006 16:53:21 -0000	1.368
+++ upstream	23 Jun 2006 15:47:48 -0000	1.369
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git4.bz2
+patch-2.6.17-git5.bz2


--- linux-2.6-geode-git.patch DELETED ---


--- linux-2.6-net-sundance-ip100A.patch DELETED ---


--- patch-2.6.17-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 23 15:50:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 11:50:28 -0400
Subject: rpms/kernel/devel linux-2.6-tux.patch,1.20,1.21
Message-ID: <200606231550.k5NFoR70007188@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7118

Modified Files:
	linux-2.6-tux.patch 
Log Message:
fix unresolved symbol


linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    1 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12696 insertions(+), 31 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-tux.patch	20 Jun 2006 20:25:53 -0000	1.20
+++ linux-2.6-tux.patch	23 Jun 2006 15:50:24 -0000	1.21
@@ -764,7 +764,7 @@
  extern void tcp_push_one(struct sock *, unsigned int mss_now);
  extern void tcp_send_ack(struct sock *sk);
  extern void tcp_send_delayed_ack(struct sock *sk);
-+extern void cleanup_rbuf(struct sock *sk, int copied);
++extern void tcp_cleanup_rbuf(struct sock *sk, int copied);
  
  /* tcp_input.c */
  extern void tcp_cwnd_application_limited(struct sock *sk);
@@ -4824,7 +4824,7 @@
 +			lock_sock(sk);
 +			icsk->icsk_ack.pingpong = 0;
 +			icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
-+			cleanup_rbuf(sk, 1);
++			tcp_cleanup_rbuf(sk, 1);
 +			release_sock(sk);
 +		}
 +		if (len >= tux_max_header_len-1)



From fedora-cvs-commits at redhat.com  Fri Jun 23 15:59:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 11:59:05 -0400
Subject: rpms/gawk/devel gawk-3.1.5-syntaxerror.patch, NONE,
	1.1 gawk-3.1.5-internal.patch, 1.1, 1.2 gawk.spec, 1.36, 1.37
Message-ID: <200606231559.k5NFx58w010475@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10444

Modified Files:
	gawk-3.1.5-internal.patch gawk.spec 
Added Files:
	gawk-3.1.5-syntaxerror.patch 
Log Message:
fix syntax error, core dump bug

gawk-3.1.5-syntaxerror.patch:
 awkgram.y |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gawk-3.1.5-syntaxerror.patch ---
Fri Jun 23 15:48:34 2006  Arnold D. Robbins  <arnold at skeeve.com>

    * awkgram.y (subn): At end for `do_sprintf' check, verify that lnode is not NULL
    before using it assign through.

--- gawk-3.1.5/awkgram.y.syntaxerror	2005-07-26 20:07:43.000000000 +0200
+++ gawk-3.1.5/awkgram.y	2006-06-23 17:43:55.000000000 +0200
@@ -2399,7 +2399,8 @@
 	r->subnode = subn;
 	if (r->builtin == do_sprintf) {
 		count_args(r);
-		r->lnode->printf_count = r->printf_count; /* hack */
+		if (r->lnode != NULL)	/* r->lnode set from subn. guard against syntax errors & check it's valid */
+			r->lnode->printf_count = r->printf_count; /* hack */
 	}
 	return r;
 }

gawk-3.1.5-internal.patch:
 io.c |   74 ++++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 38 insertions(+), 36 deletions(-)

Index: gawk-3.1.5-internal.patch
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk-3.1.5-internal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gawk-3.1.5-internal.patch	22 Jun 2006 13:53:48 -0000	1.1
+++ gawk-3.1.5-internal.patch	23 Jun 2006 15:59:03 -0000	1.2
@@ -1,3 +1,23 @@
+Sun Jun 18 22:27:25 2006  Arnold D. Robbins  <arnold at skeeve.com>
+
+    Repair internal names like /dev/user, /dev/pid, as well as /dev/fd/N,
+    which have been broken for a long time but noone noticed.
+
+    * io.c (is_internal): new macro to check for internal file like `/dev/user'.
+    (spec_setup): Reduce to two parameters, allocate logic is always true.
+    Add IOP_NO_FREE to flag.
+    (pidopen, useropen): Return `IOBUF *' instead of int. Fix
+    logic to test if `iop' parameter is NULL and if so to allocate it.
+    (specfdopen,): Return `IOBUF *' instead of int. Fix
+    logic to test if `iop' parameter is NULL and if so to allocate it.
+    Don't set IOP_NO_FREE in flag.
+    (iop_open): Remove `IOBUF iob' field from `struct internal' and its use
+    and the use of `spec_setup' from the code here. Change the check in the
+    call to the open function to look for NULL.
+    (get_a_record): Use `is_internal' in initial check for filling the
+    buffer to not try to call `read' on internal files. If true, set
+    the IOP_AT_EOF in the flag and return EOF.
+
 --- gawk-3.1.5/io.c.internal	2006-06-21 19:46:59.000000000 +0200
 +++ gawk-3.1.5/io.c	2006-06-21 19:49:54.000000000 +0200
 @@ -110,6 +110,7 @@


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gawk.spec	22 Jun 2006 13:53:48 -0000	1.36
+++ gawk.spec	23 Jun 2006 15:59:03 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 7
+Release: 8
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -16,7 +16,10 @@
 Patch4:	gawk-3.1.5-binmode.patch
 Patch5: gawk-3.1.5-num2str.patch
 Patch6: gawk-3.1.5-wconcat.patch
+#  fix internal names like /dev/user, /dev/pid, as well as /dev/fd/N
 Patch7: gawk-3.1.5-internal.patch
+# 194214 - gawk coredumps on syntax error
+Patch8: gawk-3.1.5-syntaxerror.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -35,6 +38,7 @@
 %patch5 -p1 -b .num2str
 %patch6 -p1 -b .wconcat
 %patch7 -p1 -b .internal
+%patch8 -p1 -b .syntaxerror
 
 %build
 %configure
@@ -83,6 +87,9 @@
 %{_datadir}/awk
 
 %changelog
+* Fri Jun 23 2006 Karel Zak <kzak at redhat.com> 3.1.5-8
+- fix #194214 - gawk coredumps on syntax error (patch by Aharon Robbins)
+
 * Wed Jun 21 2006 Karel Zak <kzak at redhat.com> 3.1.5-7
 - fix internal names like /dev/user, /dev/pid, or /dev/fd/N (patch by Aharon Robbins)
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 16:10:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 12:10:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2305,
	1.2306 linux-2.6-compile-fixes.patch, 1.79, 1.80
Message-ID: <200606231610.k5NGALD7012515@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12473

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2305
retrieving revision 1.2306
diff -u -r1.2305 -r1.2306
--- kernel-2.6.spec	23 Jun 2006 15:47:41 -0000	1.2305
+++ kernel-2.6.spec	23 Jun 2006 16:10:17 -0000	1.2306
@@ -1054,7 +1054,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1

linux-2.6-compile-fixes.patch:
 cpufreq_conservative.c |    1 +
 cpufreq_ondemand.c     |    1 +
 2 files changed, 2 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- linux-2.6-compile-fixes.patch	23 Jun 2006 15:47:41 -0000	1.79
+++ linux-2.6-compile-fixes.patch	23 Jun 2006 16:10:18 -0000	1.80
@@ -0,0 +1,42 @@
+
+From: Andrew Morton <akpm at osdl.org>
+
+drivers/cpufreq/cpufreq_ondemand.c: In function 'do_dbs_timer':
+drivers/cpufreq/cpufreq_ondemand.c:374: warning: implicit declaration of function 'lock_cpu_hotplug'
+drivers/cpufreq/cpufreq_ondemand.c:381: warning: implicit declaration of function 'unlock_cpu_hotplug'
+drivers/cpufreq/cpufreq_conservative.c: In function 'do_dbs_timer':
+drivers/cpufreq/cpufreq_conservative.c:425: warning: implicit declaration of function 'lock_cpu_hotplug'
+drivers/cpufreq/cpufreq_conservative.c:432: warning: implicit declaration of function 'unlock_cpu_hotplug'
+
+Cc: Dave Jones <davej at codemonkey.org.uk>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ drivers/cpufreq/cpufreq_conservative.c |    1 +
+ drivers/cpufreq/cpufreq_ondemand.c     |    1 +
+ 2 files changed, 2 insertions(+)
+
+diff -puN drivers/cpufreq/cpufreq_ondemand.c~cpufreq-build-fix drivers/cpufreq/cpufreq_ondemand.c
+--- a/drivers/cpufreq/cpufreq_ondemand.c~cpufreq-build-fix
++++ a/drivers/cpufreq/cpufreq_ondemand.c
+@@ -21,6 +21,7 @@
+ #include <linux/types.h>
+ #include <linux/fs.h>
+ #include <linux/sysfs.h>
++#include <linux/cpu.h>
+ #include <linux/sched.h>
+ #include <linux/kmod.h>
+ #include <linux/workqueue.h>
+diff -puN drivers/cpufreq/cpufreq_conservative.c~cpufreq-build-fix drivers/cpufreq/cpufreq_conservative.c
+--- a/drivers/cpufreq/cpufreq_conservative.c~cpufreq-build-fix
++++ a/drivers/cpufreq/cpufreq_conservative.c
+@@ -22,6 +22,7 @@
+ #include <linux/types.h>
+ #include <linux/fs.h>
+ #include <linux/sysfs.h>
++#include <linux/cpu.h>
+ #include <linux/sched.h>
+ #include <linux/kmod.h>
+ #include <linux/workqueue.h>
+_
+



From fedora-cvs-commits at redhat.com  Fri Jun 23 16:16:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 12:16:34 -0400
Subject: rpms/gawk/devel gawk.spec,1.37,1.38
Message-ID: <200606231616.k5NGGYX8023047@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22222

Modified Files:
	gawk.spec 
Log Message:
fix BuildReq


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gawk.spec	23 Jun 2006 15:59:03 -0000	1.37
+++ gawk.spec	23 Jun 2006 16:16:32 -0000	1.38
@@ -10,6 +10,9 @@
 Requires: /bin/mktemp
 Buildroot: %{_tmppath}/%{name}-root
 
+BuildRequires: flex
+BuildRequires: bison
+
 Patch1: gawk-3.1.3-getpgrp_void.patch
 Patch2: gawk-3.1.5-free.patch
 Patch3: gawk-3.1.5-fieldwidths.patch



From fedora-cvs-commits at redhat.com  Fri Jun 23 16:27:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 12:27:15 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2138,1.2139
Message-ID: <200606231627.k5NGRF0E000758@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv712

Modified Files:
	kernel-2.6.spec 
Log Message:
Rebuild with slab debug off.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2138
retrieving revision 1.2139
diff -u -r1.2138 -r1.2139
--- kernel-2.6.spec	20 Jun 2006 17:18:29 -0000	1.2138
+++ kernel-2.6.spec	23 Jun 2006 16:27:13 -0000	1.2139
@@ -1630,6 +1630,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2139_FC5]
+- Rebuild with slab debug off.
+
 * Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2138_FC5]
 - 2.6.17.1
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 16:28:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 12:28:11 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1646,1.1647
Message-ID: <200606231628.k5NGSBsU001163@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1088

Modified Files:
	kernel-2.6.spec 
Log Message:
Rebuild with slab debug off



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1646
retrieving revision 1.1647
diff -u -r1.1646 -r1.1647
--- kernel-2.6.spec	20 Jun 2006 20:54:59 -0000	1.1646
+++ kernel-2.6.spec	23 Jun 2006 16:28:08 -0000	1.1647
@@ -1079,6 +1079,9 @@
 %endif
 
 %changelog
+* Fri Jun 23 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2139_FC4]
+- Rebuild with slab debug off.
+
 * Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2138_FC4]
 - 2.6.17.1
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 16:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 12:44:18 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.75, 1.76 sources,
	1.78, 1.79 system-config-printer.spec, 1.37, 1.38
Message-ID: <200606231644.k5NGiIdp013064@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13048

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.17-1
- 0.7.17.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	23 Jun 2006 13:05:55 -0000	1.75
+++ .cvsignore	23 Jun 2006 16:44:15 -0000	1.76
@@ -55,3 +55,4 @@
 system-config-printer-0.7.14.tar.bz2
 system-config-printer-0.7.15.tar.bz2
 system-config-printer-0.7.16.tar.bz2
+system-config-printer-0.7.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	23 Jun 2006 13:06:07 -0000	1.78
+++ sources	23 Jun 2006 16:44:15 -0000	1.79
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-1ec5680e256f446d57b469c95479d324  system-config-printer-0.7.16.tar.bz2
+fca89cb65a113312fe9640f40d30da44  system-config-printer-0.7.17.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- system-config-printer.spec	23 Jun 2006 13:09:53 -0000	1.37
+++ system-config-printer.spec	23 Jun 2006 16:44:15 -0000	1.38
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.16
+Version: 0.7.17
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -110,6 +110,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.17-1
+- 0.7.17.
+
 * Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.16-1
 - 0.7.16, now with SMB browser.
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 17:25:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 13:25:40 -0400
Subject: rpms/rpm/devel rpm-4.4.2-noselinux-verify.patch,NONE,1.1
Message-ID: <200606231725.k5NHPepY025522@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25496

Added Files:
	rpm-4.4.2-noselinux-verify.patch 
Log Message:
Patch for no contexts

rpm-4.4.2-noselinux-verify.patch:
 query.c  |   16 ----------------
 verify.c |   56 +++-----------------------------------------------------
 2 files changed, 3 insertions(+), 69 deletions(-)

--- NEW FILE rpm-4.4.2-noselinux-verify.patch ---
--- ./lib/query.c.nosever	2006-06-23 13:00:13.000000000 -0400
+++ ./lib/query.c	2006-06-23 13:00:56.000000000 -0400
@@ -787,22 +787,6 @@
     if (qva->qva_flags & VERIFY_HDRCHK)
 	vsflags |= RPMVSF_NOHDRCHK;
 
-#ifdef	NOTYET
-    /* Initialize security context patterns (if not already done). */
-    if (!(qva->qva_flags & VERIFY_CONTEXTS)) {
-	rpmsx sx = rpmtsREContext(ts);
-	if (sx == NULL) {
-	    arg = rpmGetPath("%{?_verify_file_context_path}", NULL);
-	    if (arg != NULL && *arg != '\0') {
-		sx = rpmsxNew(arg);
-		(void) rpmtsSetREContext(ts, sx);
-	    }
-	    arg = _free(arg);
-	}
-	sx = rpmsxFree(sx);
-    }
-#endif
-
     ovsflags = rpmtsSetVSFlags(ts, vsflags);
     ec = rpmcliArgIter(ts, qva, argv);
     vsflags = rpmtsSetVSFlags(ts, ovsflags);
--- ./lib/verify.c.nosever	2004-10-24 15:36:30.000000000 -0400
+++ ./lib/verify.c	2006-06-23 13:06:23.000000000 -0400
@@ -78,8 +78,6 @@
 	return 1;
     }
 
-    flags |= RPMVERIFY_CONTEXTS;	/* no disable from package. */
-
     /*
      * Not all attributes of non-regular files can be verified.
      */
@@ -117,33 +115,6 @@
      */
     flags &= ~(omitMask | RPMVERIFY_FAILURES);
 
-    /*
-     * Verify file security context.
-     */
-/*@-branchstate@*/
-    if (selinuxEnabled == 1 && (flags & RPMVERIFY_CONTEXTS)) {
-	security_context_t con;
-
-	rc = lgetfilecon(fn, &con);
-	if (rc == -1)
-	    *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS);
-	else {
-	    rpmsx sx = rpmtsREContext(ts);
-	    const char * fcontext;
-
-	    if (sx != NULL) {
-		/* Get file security context from patterns. */
-		fcontext = rpmsxFContext(sx, fn, fmode);
-		sx = rpmsxFree(sx);
-	    } else {
-		/* Get file security context from package. */
-		fcontext = rpmfiFContext(fi);
-	    }
-	    if (fcontext == NULL || strcmp(fcontext, con))
-		*res |= RPMVERIFY_CONTEXTS;
-	    freecon(con);
-	}
-    }
 /*@=branchstate@*/
 
     if (flags & RPMVERIFY_MD5) {
@@ -331,10 +302,9 @@
 	    }
 	} else if (verifyResult || rpmIsVerbose()) {
 	    const char * size, * MD5, * link, * mtime, * mode;
-	    const char * group, * user, * rdev, *ctxt;
+	    const char * group, * user, * rdev;
 	    /*@observer@*/ static const char *const aok = ".";
 	    /*@observer@*/ static const char *const unknown = "?";
-	    /*@observer@*/ static const char *const ctxt_ignore = " ";
 
 	    ec = 1;
 
@@ -346,10 +316,6 @@
 #define	_verifyfile(_RPMVERIFY_F, _C)	\
 	((verifyResult & RPMVERIFY_READFAIL) ? unknown : \
 	 (verifyResult & _RPMVERIFY_F) ? _C : aok)
-#define	_verifyctxt(_RPMVERIFY_F, _C)	\
-	((selinuxEnabled != 1 ? ctxt_ignore : \
-	 (verifyResult & RPMVERIFY_LGETFILECONFAIL) ? unknown : \
-	 (verifyResult & _RPMVERIFY_F) ? _C : aok))
 	
 	    MD5 = _verifyfile(RPMVERIFY_MD5, "5");
 	    size = _verify(RPMVERIFY_FILESIZE, "S");
@@ -359,15 +325,13 @@
 	    user = _verify(RPMVERIFY_USER, "U");
 	    group = _verify(RPMVERIFY_GROUP, "G");
 	    mode = _verify(RPMVERIFY_MODE, "M");
-	    ctxt = _verifyctxt(RPMVERIFY_CONTEXTS, "C");
 
-#undef _verifyctxt
 #undef _verifyfile
 #undef _verifylink
 #undef _verify
 
-	    sprintf(te, "%s%s%s%s%s%s%s%s%s %c %s",
-			size, mode, MD5, rdev, link, user, group, mtime, ctxt,
+	    sprintf(te, "%s%s%s%s%s%s%s%s %c %s",
+			size, mode, MD5, rdev, link, user, group, mtime,
 			((fileAttrs & RPMFILE_CONFIG)	? 'c' :
 			 (fileAttrs & RPMFILE_DOC)	? 'd' :
 			 (fileAttrs & RPMFILE_GHOST)	? 'g' :
@@ -522,20 +486,6 @@
 	vsflags |= RPMVSF_NOHDRCHK;
     vsflags &= ~RPMVSF_NEEDPAYLOAD;
 
-    /* Initialize security context patterns (if not already done). */
-    if (qva->qva_flags & VERIFY_CONTEXTS) {
-	rpmsx sx = rpmtsREContext(ts);
-	if (sx == NULL) {
-	    arg = rpmGetPath("%{?_verify_file_context_path}", NULL);
-	    if (arg != NULL && *arg != '\0') {
-		sx = rpmsxNew(arg);
-		(void) rpmtsSetREContext(ts, sx);
-	    }
-	    arg = _free(arg);
-	}
-	sx = rpmsxFree(sx);
-    }
-
     ovsflags = rpmtsSetVSFlags(ts, vsflags);
     ec = rpmcliArgIter(ts, qva, argv);
     vsflags = rpmtsSetVSFlags(ts, ovsflags);



From fedora-cvs-commits at redhat.com  Fri Jun 23 17:53:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 13:53:16 -0400
Subject: rpms/kernel/devel jwltest-ipw3945-1_0_5.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2306, 1.2306.2.1
Message-ID: <200606231753.k5NHrGqM016024@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15985

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-1-branch
	jwltest-ipw3945-1_0_5.patch 
Log Message:


jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |  106 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16650 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20701 insertions(+)

--- NEW FILE jwltest-ipw3945-1_0_5.patch ---
--- /dev/null	2006-05-15 14:49:11.248334992 -0400
+++ linux-2.6.17.noarch/Documentation/networking/README.ipw3945	2006-06-23 13:15:51.000000000 -0400
@@ -0,0 +1,998 @@
+
+Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
+support of:
+
+Intel(R) PRO/Wireless 3945ABG Network Connection Adapter
+Intel(R) PRO/Wireless 3945BG Network Connection Adapter
+
+Note: The Intel(R) PRO/Wireless 3945ABG Network Connection driver for 
+Linux is a unified driver that works on both hardware adapters listed 
+above. In this document the Intel(R) PRO/Wireless 3945ABG Network Connection 
+driver for Linux will be used to reference the unified driver.
+
+Copyright (C) 2005 - 2006, Intel Corporation
+
+README.ipw3945
+
+Version: 1.0.5
+Date   : May 22, 2006
+
+
+Index
+-----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+1.   Introduction
+1.1. Overview of Features
+2.   Loading the Driver
+3.   Feature Details
+3.1. LEDs
+3.2. Association Details
+3.3. Roaming Details
+3.4. Scanning Details
+3.5. Antenna Selection and "Diversity"
+3.6. IEEE 802.11h Details 
+3.7. Tx Power 
+3.8. Security Details
+3.9. Power Management
+4.   Configuring the driver
+4.1. Command Line Parameters
+4.3. Sysfs Helper Files:
+5.   Wireless Tools Details
+5.1. iwlist
+5.2. iwpriv
+5.3. iwconfig
+6.   Support
+7.   License
+
+
+===============================================
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+===============================================
+
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+
+
+===============================================
+1.   Introduction
+===============================================
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 3945ABG driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.5) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ 802.11i (WPA/WPA2)
++ Wireless Extension support 
++ Full B and G rate support
++ Full A rate support (ABG only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
+
+The following features are currently enabled, but not officially
+supported:
+
++ QoS
++ Monitor mode (aka RFMon)
++ Associated RF promiscuous mode
++ Frame Rx simulation
+
+The distinction between officially supported and enabled is a reflection 
+of the amount of validation and interoperability testing that has been
+performed on a given feature. Note: in addition, the features may not have 
+all of the code in the driver to fully enable the feature.
+
+
+===============================================
+2. Loading the Driver
+===============================================
+
+See the INSTALL document for information on installing the driver.
+
+Once installed, a typical method for launching the driver and the 
+regulatory daemon is via the load script provided in the source package:
+
+	# ./load debug=0x43fff   <--- You need to be root for this
+
+NOTE:  You will not be able to rmmod the driver so long as the 
+ipw3945d daemon is running.  
+
+If you followed the steps of the INSTALL document to set up your
+modprobe.conf, you can load the module by simply running:
+
+	# modprobe ipw3945       <--- You need to be root for this
+
+If you did not configure your modprobe.conf to automatically launch the 
+regulatory daemon (see INSTALL), you must do so manually after loading 
+the module:
+
+	# /sbin/ipw3945d	<--- You need to be root for this
+
+If you want to unload the module (and kill the deamon as well), you can 
+simply use the unload script:
+
+	# ./unload               <--- You need to be root for this
+
+or likewise if you configured modprobe.conf:
+
+	# modprobe -r ipw3945       <--- You need to be root for this
+
+If you did not configure modprobe.conf to unload the regulatory daemon 
+and are not using the unload script, you need to kill the regulatory 
+daemon before you will be able to unload the module:
+
+	# /sbin/ipw3945d --kill	<--- You need to be root for this
+	# modprobe -r ipw3945
+
+
+===============================================
+3. Feature Details
+===============================================
+
+3.1. LEDs
+-----------------------------------------------
+
+The driver will attempt to control the wireless LED, if one is 
+configured in hardware.  There are typically two LEDs:
+
+	Activity -- used to indicate wireless activity
+	Link     -- used to indicate wireless link
[...20346 lines suppressed...]
+ * a command to appear. Currently set to 60s. */
+#define DAEMON_POLL_INTERVAL 60000
+
+#define DAEMON_BUF_SIZE 3000
+
+struct daemon_cmd_hdr {
+	u8 cmd;
+	u8 flags;
+	u8 token;
+	u8 reserved1;
+	u16 version;
+	u16 data_len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+struct daemon_cmd {
+	struct daemon_cmd_hdr hdr;
+	u8 data[DAEMON_BUF_SIZE];
+} __attribute__ ((packed));
+
+/*  driver <- daemon error response */
+struct daemon_error {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon synchronous command done */
+struct daemon_cmd_done {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon regulatory information
+ *
+ * The following is sent from the daemon to the driver
+ * to inform the driver of current channel capabilities and
+ * restrictions.
+ *
+ * Immediately after INIT is provided from the driver the
+ * daemon will send the full channel map.
+ *
+ * After a channel has been selected via rx_config, the
+ * daemon will send periodic updates when the channel limits
+ * change for a specific channel.
+ *
+ * NOTE:  The txpower field represents the current configured
+ * power as directed by either the user (sent to the daemon
+ * through the DAEMON_SYNC::DAEMON_SYNC_TXPOWER_LIMIT command)
+ * or as specified through the currently associated access
+ * point.  The max_txpower is the highest the channel is
+ * allowed to transmit.
+ *
+ */
+enum {
+	DAEMON_A_BAND = (1 << 0),	/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	DAEMON_IBSS_ALLOWED = (1 << 1),
+	DAEMON_ACTIVE_ALLOWED = (1 << 2),
+	DAEMON_RADAR_DETECT = (1 << 3),
+};
+struct daemon_channel_info {
+	u8 channel;
+	u8 flags;
+	s8 txpower;
+	s8 max_txpower;
+};
+struct daemon_regulatory_info {
+	u16 count;		/* Number of channels provided */
+	struct daemon_channel_info channel_info[0];
+} __attribute__ ((packed));
+
+/* driver <- daemon information request */
+struct daemon_request_info {
+	u8 request;
+} __attribute__ ((packed));
+
+/* driver <- daemon set state */
+struct daemon_set_state {
+	u8 state;
+} __attribute__ ((packed));
+
+/* driver -> daemon scan request */
+#define DAEMON_MIN_24GHZ_CHANNEL 1
+#define DAEMON_MAX_24GHZ_CHANNEL 14
+#define DAEMON_MIN_52GHZ_CHANNEL 34
+#define DAEMON_MAX_52GHZ_CHANNEL 165
+
+#define DAEMON_SCAN_FLAG_24GHZ  (1<<0)
+#define DAEMON_SCAN_FLAG_52GHZ  (1<<1)
+#define DAEMON_SCAN_FLAG_ACTIVE (1<<2)
+#define DAEMON_SCAN_FLAG_DIRECT (1<<3)
+
+#define DAEMON_MAX_CMD_SIZE 1024
+
+enum {
+	DAEMON_TXRATE_1 = 0xa,
+	DAEMON_TXRATE_2 = 0x14,
+	DAEMON_TXRATE_5_5 = 0x37,
+	DAEMON_TXRATE_6 = 0xd,
+	DAEMON_TXRATE_9 = 0xf,
+	DAEMON_TXRATE_11 = 0x6e,
+	DAEMON_TXRATE_12 = 0x5,
+	DAEMON_TXRATE_18 = 0x7,
+	DAEMON_TXRATE_24 = 0x9,
+	DAEMON_TXRATE_36 = 0xb,
+	DAEMON_TXRATE_48 = 0x1,
+	DAEMON_TXRATE_54 = 0x3,
+};
+
+struct daemon_scan_channel {
+	u8 channel;
+	u8 request_active;
+	u16 active_dwell;
+	u16 passive_dwell;
+} __attribute__ ((packed));
+
+struct daemon_ssid_ie {
+	u8 id;
+	u8 len;
+	u8 ssid[32];
+} __attribute__ ((packed));
+
+struct daemon_rx_config {
+	u8 dev_type;
+	u16 channel;
+	u32 flags;
+	u32 filter_flags;
+	u8 ofdm_basic_rates;
+	u8 cck_basic_rates;
+	u8 node_addr[6];
+	u8 bssid_addr[6];
+	u16 assoc_id;
+	u16 beacon_interval;
+} __attribute__ ((packed));
+
+#define DAEMON_MAX_SCAN_SIZE 1024
+struct daemon_scan_request {
+	u8 flags;		/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	u8 channel_count;
+	u16 probe_request_len;
+	u16 quiet_time;		/* dwell only this long on quiet chnl (active scan) */
+	u16 quiet_plcp_th;	/* quiet chnl is < this # pkts (typ. 1) */
+	u32 suspend_time;	/* pause scan this long when returning to svc chnl */
+	u32 max_out_time;	/* max msec to be out of associated (service) chnl */
+	u8 probe_request_rate;	/* rate to send probe request */
+	u32 filter_flags;
+	u32 rxon_flags;
+	struct daemon_ssid_ie direct_scan;
+	u8 data[0];
+	/*
+	   The channels start after the probe request payload and are of type:
+
+	   struct daemon_scan_channel channels[0];
+
+	   NOTE:  Only one band of channels can be scanned per pass.  You
+	   can not mix 2.4Ghz channels and 5.2Ghz channels and must
+	   request a scan multiple times (not concurrently)
+
+	 */
+} __attribute__ ((packed));
+
+/* driver -> daemon 11h frame */
+struct daemon_80211_frame {
+	u8 channel;
+	u8 reserved1;
+	u16 rssi;
+	u16 reserved2;
+	u64 tsf;
+	u32 beacon_time;
+	u16 frame_len;
+	u8 frame[0];
+} __attribute__ ((packed));
+
+struct daemon_sync_txpower_limit {
+	u8 channel;
+	s8 power;
+} __attribute__ ((packed));
+
+enum {
+	DAEMON_SYNC_UNINIT = 0,
+	DAEMON_SYNC_INIT,
+	DAEMON_SYNC_SCAN_COMPLETE,
+	DAEMON_SYNC_TXPOWER_LIMIT,
+	DAEMON_SYNC_MEASURE_REPORT,
+	DAEMON_SYNC_TX_STATUS,
+	DAEMON_SYNC_SUSPEND,
+	DAEMON_SYNC_RESUME,
+};
+
+/* driver  -> daemon */
+struct daemon_sync_cmd {
+	u16 state;
+	u16 len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+#endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2306
retrieving revision 1.2306.2.1
diff -u -r1.2306 -r1.2306.2.1
--- kernel-2.6.spec	23 Jun 2006 16:10:17 -0000	1.2306
+++ kernel-2.6.spec	23 Jun 2006 17:53:13 -0000	1.2306.2.1
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6
+%define tag FC6.jwltest.1
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -358,7 +358,8 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
-Patch1304: linux-2.6-net-ipw2200-monitor.patch
+Patch1300: linux-2.6-net-ipw2200-monitor.patch
+Patch1301: jwltest-ipw3945-1_0_5.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -931,7 +932,9 @@
 
 # NIC driver fixes.
 # add IPW2200_MONITOR config option
-%patch1304 -p1
+%patch1300 -p1
+# add IPW3945 driver
+%patch1301 -p1
 
 # Squashfs
 %patch1400 -p1



From fedora-cvs-commits at redhat.com  Fri Jun 23 17:53:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 13:53:16 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.199,
	1.199.2.1 config-x86-generic, 1.54,
	1.54.2.1 config-x86_64-generic, 1.41, 1.41.2.1
Message-ID: <200606231753.k5NHrGN4016032@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15985/configs

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.199
retrieving revision 1.199.2.1
diff -u -r1.199 -r1.199.2.1
--- config-generic	23 Jun 2006 15:47:48 -0000	1.199
+++ config-generic	23 Jun 2006 17:53:13 -0000	1.199.2.1
@@ -1084,6 +1084,10 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IPW3945_DEBUG is not set
+# CONFIG_IPW3945_MONITOR is not set
+# CONFIG_IPW3945_PROMISCUOUS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -r1.54 -r1.54.2.1
--- config-x86-generic	20 Jun 2006 20:25:54 -0000	1.54
+++ config-x86-generic	23 Jun 2006 17:53:13 -0000	1.54.2.1
@@ -247,6 +247,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -r1.41 -r1.41.2.1
--- config-x86_64-generic	20 Jun 2006 20:25:54 -0000	1.41
+++ config-x86_64-generic	23 Jun 2006 17:53:13 -0000	1.41.2.1
@@ -112,6 +112,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Fri Jun 23 17:59:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 13:59:49 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2306,1.2307
Message-ID: <200606231759.k5NHxnVl018615@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18585

Modified Files:
	kernel-2.6.spec 
Log Message:
disable


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2306
retrieving revision 1.2307
diff -u -r1.2306 -r1.2307
--- kernel-2.6.spec	23 Jun 2006 16:10:17 -0000	1.2306
+++ kernel-2.6.spec	23 Jun 2006 17:59:47 -0000	1.2307
@@ -892,7 +892,7 @@
 # Pause on oops.
 #%patch1028 -p1
 #%patch1029 -p1
-%patch1030 -p1
+#%patch1030 -p1
 %patch1031 -p1
 %patch1032 -p1
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 18:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 14:12:48 -0400
Subject: rpms/booty/devel .cvsignore, 1.48, 1.49 booty.spec, 1.53,
	1.54 sources, 1.51, 1.52
Message-ID: <200606231812.k5NICmws020926@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20858

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	20 Jun 2006 14:28:19 -0000	1.48
+++ .cvsignore	23 Jun 2006 18:12:46 -0000	1.49
@@ -1 +1,2 @@
 booty-0.77.tar.bz2
+booty-0.78.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- booty.spec	22 Jun 2006 01:33:30 -0000	1.53
+++ booty.spec	23 Jun 2006 18:12:46 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.77
-Release: 2
+Version: 0.78
+Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
@@ -35,6 +35,9 @@
 
 
 %changelog
+* Fri Jun 23 2006 Paul Nasrat <pnasrat at redhat.com> - 0.78-1
+- Fix duplicate entries in boot= line on ppc
+
 * Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 0.77-1
 - fix for hv entry with new xen kernel naming (#196022) 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	20 Jun 2006 14:28:19 -0000	1.51
+++ sources	23 Jun 2006 18:12:46 -0000	1.52
@@ -1 +1 @@
-797f68406ae56552d91f037d96cdbc10  booty-0.77.tar.bz2
+6903e0f636ef5abaf96467ebdef16ee6  booty-0.78.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 23 18:36:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 14:36:29 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.80,1.81
Message-ID: <200606231836.k5NIaTo1010427@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10402

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

linux-2.6-compile-fixes.patch:
 a/drivers/cpufreq/cpufreq_conservative.c     |    1 +
 a/drivers/cpufreq/cpufreq_ondemand.c         |    1 +
 linux-2.6.17.noarch/drivers/pci/pcie/Kconfig |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- linux-2.6-compile-fixes.patch	23 Jun 2006 16:10:18 -0000	1.80
+++ linux-2.6-compile-fixes.patch	23 Jun 2006 18:36:18 -0000	1.81
@@ -40,3 +40,14 @@
  #include <linux/workqueue.h>
 _
 
+--- linux-2.6.17.noarch/drivers/pci/pcie/Kconfig~	2006-06-23 14:35:45.424777000 -0400
++++ linux-2.6.17.noarch/drivers/pci/pcie/Kconfig	2006-06-23 14:36:03.808377000 -0400
+@@ -15,7 +15,7 @@ config PCIEPORTBUS
+ #
+ config HOTPLUG_PCI_PCIE
+ 	tristate "PCI Express Hotplug driver"
+-	depends on HOTPLUG_PCI && PCIEPORTBUS
++	depends on HOTPLUG_PCI && PCIEPORTBUS && (BROKEN || ACPI)
+ 	help
+ 	  Say Y here if you have a motherboard that supports PCI Express Native
+ 	  Hotplug



From fedora-cvs-commits at redhat.com  Fri Jun 23 19:16:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 15:16:31 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.81,1.82
Message-ID: <200606231916.k5NJGVO1011876@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7469

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

linux-2.6-compile-fixes.patch:
 a/drivers/cpufreq/cpufreq_conservative.c                  |    1 +
 a/drivers/cpufreq/cpufreq_ondemand.c                      |    1 +
 linux-2.6.17.noarch/drivers/pci/pcie/Kconfig              |    2 +-
 linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h   |    2 +-
 linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h |    2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- linux-2.6-compile-fixes.patch	23 Jun 2006 18:36:18 -0000	1.81
+++ linux-2.6-compile-fixes.patch	23 Jun 2006 19:16:28 -0000	1.82
@@ -51,3 +51,26 @@
  	help
  	  Say Y here if you have a motherboard that supports PCI Express Native
  	  Hotplug
+
+--- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h~	2006-06-23 15:14:49.023437000 -0400
++++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h	2006-06-23 15:15:06.941500000 -0400
+@@ -12,7 +12,7 @@
+  *	access the videoram directly without any black magic.
+  */
+ 
+-#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
++#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
+ 
+ #define vga_readb(x) (*(x))
+ #define vga_writeb(x,y) (*(y) = (x))
+--- linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h~	2006-06-23 15:15:13.543893000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h	2006-06-23 15:15:25.187234000 -0400
+@@ -12,7 +12,7 @@
+  *	access the videoram directly without any black magic.
+  */
+ 
+-#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
++#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
+ 
+ #define vga_readb(x) (*(x))
+ #define vga_writeb(x,y) (*(y) = (x))



From fedora-cvs-commits at redhat.com  Fri Jun 23 19:50:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 15:50:04 -0400
Subject: rpms/kernel/devel/configs config-generic,1.199.2.1,1.199.2.2
Message-ID: <200606231950.k5NJo4Qq015422@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15409/configs

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.199.2.1
retrieving revision 1.199.2.2
diff -u -r1.199.2.1 -r1.199.2.2
--- config-generic	23 Jun 2006 17:53:13 -0000	1.199.2.1
+++ config-generic	23 Jun 2006 19:50:02 -0000	1.199.2.2
@@ -61,7 +61,7 @@
 CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+# CONFIG_HOTPLUG_PCI_PCIE is not set
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
 # CONFIG_EISA is not set



From fedora-cvs-commits at redhat.com  Fri Jun 23 19:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 15:50:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2306.2.1,1.2306.2.2
Message-ID: <200606231950.k5NJoh3v015495@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15482

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2306.2.1
retrieving revision 1.2306.2.2
diff -u -r1.2306.2.1 -r1.2306.2.2
--- kernel-2.6.spec	23 Jun 2006 17:53:13 -0000	1.2306.2.1
+++ kernel-2.6.spec	23 Jun 2006 19:50:41 -0000	1.2306.2.2
@@ -182,7 +182,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:08:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:08:02 -0400
Subject: rpms/cscope/devel cscope-15.5-putstring-overflow.patch, NONE,
	1.1 cscope.spec, 1.23, 1.24
Message-ID: <200606232008.k5NK82De015922@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15906

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-putstring-overflow.patch 
Log Message:
fixing bz 189666

cscope-15.5-putstring-overflow.patch:
 build.c  |   16 ++++++++--------
 find.c   |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 global.h |    2 +-
 3 files changed, 47 insertions(+), 30 deletions(-)

--- NEW FILE cscope-15.5-putstring-overflow.patch ---
--- cscope-15.5/src/find.c.stack	2006-06-23 16:00:34.000000000 -0400
+++ cscope-15.5/src/find.c	2006-06-23 16:00:47.000000000 -0400
@@ -184,7 +184,7 @@ find_symbol_or_assignment(char *pattern,
 
 	(void) scanpast('\t');			/* find the end of the header */
 	skiprefchar();			/* skip the file marker */
-	putstring(file);		/* save the file name */
+	putstring(file, PATHLEN);	/* save the file name */
 	(void) strcpy(function, global);/* set the dummy global function name */
 	(void) strcpy(macro, global);/* set the dummy global macro name */
 	
@@ -216,7 +216,7 @@ find_symbol_or_assignment(char *pattern,
 
 				/* save the name */
 				skiprefchar();
-				putstring(file);
+				putstring(file, PATHLEN);
 			
 				/* check for the end of the symbols */
 				if (*file == '\0') {
@@ -255,7 +255,7 @@ find_symbol_or_assignment(char *pattern,
 			}
 			/* save the name */
 			skiprefchar();
-			putstring(s);
+			putstring(s, PATHLEN);
 
 			/* see if this is a regular expression pattern */
 			if (isregexp_valid == YES) { 
@@ -293,7 +293,7 @@ find_symbol_or_assignment(char *pattern,
 			
 			if (isalpha((unsigned char)firstchar) || firstchar == '_') {
 				blockp = cp;
-				putstring(symbol);
+				putstring(symbol, PATHLEN);
 				if (caseless == YES) {
 					s = lcasify(symbol);	/* point to lower case version */
 				}
@@ -382,7 +382,7 @@ finddef(char *pattern)
 			
 		case NEWFILE:
 			skiprefchar();	/* save file name */
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -412,21 +412,36 @@ finddef(char *pattern)
 }
 /* find all function definitions (used by samuel only) */
 
+static void blow_up(int line)
+{
+	fprintf(stderr,"STACK CORRUPTION AT %d\n",line);
+	abort();
+}
+
+#define CHECK_STACK() do { if(test != (unsigned int)&test) {\
+blow_up(__LINE__);\
+}} while(0)
+
 char *
 findallfcns(char *dummy)
 {
+	volatile unsigned int test = 0;
 	char	file[PATHLEN + 1];	/* source file name */
 	char	function[PATLEN + 1];	/* function name */
-
+	char oldblockp;  
 	(void) dummy;		/* unused argument */
 
 	/* find the next file name or definition */
+	test = (unsigned int)&test;
 	while (scanpast('\t') != NULL) {
+		CHECK_STACK();
+		oldblockp=*blockp;	
 		switch (*blockp) {
 			
 		case NEWFILE:
 			skiprefchar();	/* save file name */
-			putstring(file);
+			putstring(file, PATHLEN);
+			CHECK_STACK();
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -440,8 +455,7 @@ findallfcns(char *dummy)
 		case FCNDEF:
 		case CLASSDEF:
 			skiprefchar();	/* save function name */
-			putstring(function);
-
+			putstring(function, PATHLEN);
 			/* output the file, function and source line */
 			putref(0, file, function);
 			break;
@@ -483,7 +497,7 @@ findcalling(char *pattern)
 			
 		case NEWFILE:		/* save file name */
 			skiprefchar();
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -494,7 +508,7 @@ findcalling(char *pattern)
 		case DEFINE:		/* could be a macro */
 			if (fileversion >= 10) {
 				skiprefchar();
-				putstring(macro);
+				putstring(macro, PATHLEN);
 			}
 			break;
 
@@ -504,7 +518,7 @@ findcalling(char *pattern)
 
 		case FCNDEF:		/* save calling function name */
 			skiprefchar();
-			putstring(function);
+			putstring(function, PATHLEN);
 			for (i = 0; i < morefuns; i++)
 				if ( !strcmp(tmpfunc[i], function) )
 					break;
@@ -639,7 +653,7 @@ findinclude(char *pattern)
 			
 		case NEWFILE:		/* save file name */
 			skiprefchar();
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -790,7 +804,7 @@ match(void)
 
 	/* see if this is a regular expression pattern */
 	if (isregexp_valid == YES) {
-		putstring(string);
+		putstring(string, PATHLEN);
 		if (*string == '\0') {
 			return(NO);
 		}
@@ -940,26 +954,29 @@ putline(FILE *output)
 /* put the rest of the cross-reference line into the string */
 
 void
-putstring(char *s)
+putstring(char *s, int length)
 {
 	char	*cp;
 	unsigned c;
-	
+	int i=0;	
 	setmark('\n');
 	cp = blockp;
 	do {
-		while ((c = (unsigned)(*cp)) != '\n') {
+		while (((c = (unsigned)(*cp)) != '\n') && (i<length)) {
 			if (c > '\177') {
 				c &= 0177;
 				*s++ = dichar1[c / 8];
 				*s++ = dichar2[c & 7];
+				i+=2;
 			}
 			else {
 				*s++ = c;
+				i++;
 			}
 			++cp;
 		}
-	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
+	} while (((*(cp + 1) == '\0' && (cp = readblock()) != NULL)) && 
+	  (i < length));
 	blockp = cp;
 	*s = '\0';
 }
@@ -1059,7 +1076,7 @@ findcalledby(char *pattern)
 			
 		case NEWFILE:
 			skiprefchar();	/* save file name */
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return(&found_caller);
 			}
@@ -1194,7 +1211,7 @@ putpostingref(POSTING *p, char *pat)
 		if (p->type == FCNDEF) { /* need to find the function name */
 			if (dbseek(p->lineoffset) != -1) {
 				scanpast(FCNDEF);
-				putstring(function);
+				putstring(function, PATHLEN);
 			}
 		}
 		else if (p->type != FCNCALL) {
@@ -1203,7 +1220,7 @@ putpostingref(POSTING *p, char *pat)
 	}
 	else if (p->fcnoffset != lastfcnoffset) {
 		if (dbseek(p->fcnoffset) != -1) {
-			putstring(function);
+			putstring(function, PATHLEN);
 			lastfcnoffset = p->fcnoffset;
 		}
 	}
--- cscope-15.5/src/global.h.stack	2006-06-23 16:01:31.000000000 -0400
+++ cscope-15.5/src/global.h	2006-06-23 16:02:55.000000000 -0400
@@ -370,7 +370,7 @@ void	postmsg(char *msg);
 void	postmsg2(char *msg);
 void	posterr(char *msg,...);
 void	putposting(char *term, int type);
-void	putstring(char *s);
+void	putstring(char *s, int length);
 void	resetcmd(void);
 void	seekline(int line);
 void	setfield(void);
--- cscope-15.5/src/build.c.stack	2003-03-05 05:43:59.000000000 -0500
+++ cscope-15.5/src/build.c	2006-06-23 16:00:47.000000000 -0400
@@ -82,7 +82,7 @@ static	void	copyinverted(void);
 static	char	*getoldfile(void);
 static	void	movefile(char *new, char *old);
 static	void	putheader(char *dir);
-static	void	putinclude(char *s);
+static	void	putinclude(char *s, int len);
 static	void	putlist(char **names, int count);
 static	BOOL	samelist(FILE *oldrefs, char **names, int count);
 
@@ -512,7 +512,7 @@ getoldfile(void)
 		do {
 			if (*blockp == NEWFILE) {
 				skiprefchar();
-				putstring(file);
+				putstring(file, PATHLEN);
 				if (file[0] != '\0') {	/* if not end-of-crossref */
 					return(file);
 				}
@@ -614,7 +614,7 @@ copydata(void)
 		/* look for an #included file */
 		if (*cp == INCLUDE) {
 			blockp = cp;
-			putinclude(symbol);
+			putinclude(symbol, PATHLEN);
 			writestring(symbol);
 			setmark('\t');
 			cp = blockp;
@@ -666,12 +666,12 @@ copyinverted(void)
 			case NEWFILE:		/* file name */
 				return;
 			case INCLUDE:		/* #included file */
-				putinclude(symbol);
+				putinclude(symbol, PATHLEN);
 				goto output;
 			}
 			dbputc(type);
 			skiprefchar();
-			putstring(symbol);
+			putstring(symbol, PATHLEN);
 			goto output;
 		}
 		c = *cp;
@@ -681,7 +681,7 @@ copyinverted(void)
 		/* if this is a symbol */
 		if (isalpha((unsigned char)c) || c == '_') {
 			blockp = cp;
-			putstring(symbol);
+			putstring(symbol, PATHLEN);
 			type = ' ';
 		output:
 			putposting(symbol, type);
@@ -712,11 +712,11 @@ movefile(char *new, char *old)
 /* process the #included file in the old database */
 
 static void
-putinclude(char *s)
+putinclude(char *s, int len)
 {
 	dbputc(INCLUDE);
 	skiprefchar();
-	putstring(s);
+	putstring(s, len);
 	incfile(s + 1, s);
 }
 


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cscope.spec	5 May 2006 18:25:46 -0000	1.23
+++ cscope.spec	23 Jun 2006 20:08:00 -0000	1.24
@@ -22,6 +22,7 @@
 Patch6:cscope-15.5-tempsec.patch
 Patch7:cscope-15.5-inv-overflow.patch
 Patch8:cscope-15.5-ocs-sysdir.patch
+Patch9:cscope-15.5-putstring-overflow.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -89,6 +90,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Fri Jun 23 2006 Neil Horman <nhorman at redhat.com>
+- Fix putstring overflow (bz 189666)
+
 * Fri May 5  2006 Neil Horman <nhorman at redhat.com>
 - Adding fix to put SYSDIR in right location (bz190580)
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:18:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:18:36 -0400
Subject: rpms/cscope/devel cscope.spec,1.24,1.25
Message-ID: <200606232018.k5NKIaKe010566@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10541

Modified Files:
	cscope.spec 
Log Message:
fixing spec file


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cscope.spec	23 Jun 2006 20:08:00 -0000	1.24
+++ cscope.spec	23 Jun 2006 20:18:33 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.5 
+Release: 13.6 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -42,6 +42,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1 
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:19:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:19:30 -0400
Subject: rpms/cscope/devel cscope.spec,1.25,1.26
Message-ID: <200606232019.k5NKJUbo010933@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10905

Modified Files:
	cscope.spec 
Log Message:
fixing revision number


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cscope.spec	23 Jun 2006 20:18:33 -0000	1.25
+++ cscope.spec	23 Jun 2006 20:19:28 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.6 
+Release: 13.8 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:21:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:21:12 -0400
Subject: rpms/cscope/FC-5 cscope-15.5-putstring-overflow.patch, NONE,
	1.1 cscope.spec, 1.25, 1.26
Message-ID: <200606232021.k5NKLCjH011584@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11558

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-putstring-overflow.patch 
Log Message:
fixing bz 189666

cscope-15.5-putstring-overflow.patch:
 build.c  |   16 ++++++++--------
 find.c   |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 global.h |    2 +-
 3 files changed, 47 insertions(+), 30 deletions(-)

--- NEW FILE cscope-15.5-putstring-overflow.patch ---
--- cscope-15.5/src/find.c.stack	2006-06-23 16:00:34.000000000 -0400
+++ cscope-15.5/src/find.c	2006-06-23 16:00:47.000000000 -0400
@@ -184,7 +184,7 @@ find_symbol_or_assignment(char *pattern,
 
 	(void) scanpast('\t');			/* find the end of the header */
 	skiprefchar();			/* skip the file marker */
-	putstring(file);		/* save the file name */
+	putstring(file, PATHLEN);	/* save the file name */
 	(void) strcpy(function, global);/* set the dummy global function name */
 	(void) strcpy(macro, global);/* set the dummy global macro name */
 	
@@ -216,7 +216,7 @@ find_symbol_or_assignment(char *pattern,
 
 				/* save the name */
 				skiprefchar();
-				putstring(file);
+				putstring(file, PATHLEN);
 			
 				/* check for the end of the symbols */
 				if (*file == '\0') {
@@ -255,7 +255,7 @@ find_symbol_or_assignment(char *pattern,
 			}
 			/* save the name */
 			skiprefchar();
-			putstring(s);
+			putstring(s, PATHLEN);
 
 			/* see if this is a regular expression pattern */
 			if (isregexp_valid == YES) { 
@@ -293,7 +293,7 @@ find_symbol_or_assignment(char *pattern,
 			
 			if (isalpha((unsigned char)firstchar) || firstchar == '_') {
 				blockp = cp;
-				putstring(symbol);
+				putstring(symbol, PATHLEN);
 				if (caseless == YES) {
 					s = lcasify(symbol);	/* point to lower case version */
 				}
@@ -382,7 +382,7 @@ finddef(char *pattern)
 			
 		case NEWFILE:
 			skiprefchar();	/* save file name */
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -412,21 +412,36 @@ finddef(char *pattern)
 }
 /* find all function definitions (used by samuel only) */
 
+static void blow_up(int line)
+{
+	fprintf(stderr,"STACK CORRUPTION AT %d\n",line);
+	abort();
+}
+
+#define CHECK_STACK() do { if(test != (unsigned int)&test) {\
+blow_up(__LINE__);\
+}} while(0)
+
 char *
 findallfcns(char *dummy)
 {
+	volatile unsigned int test = 0;
 	char	file[PATHLEN + 1];	/* source file name */
 	char	function[PATLEN + 1];	/* function name */
-
+	char oldblockp;  
 	(void) dummy;		/* unused argument */
 
 	/* find the next file name or definition */
+	test = (unsigned int)&test;
 	while (scanpast('\t') != NULL) {
+		CHECK_STACK();
+		oldblockp=*blockp;	
 		switch (*blockp) {
 			
 		case NEWFILE:
 			skiprefchar();	/* save file name */
-			putstring(file);
+			putstring(file, PATHLEN);
+			CHECK_STACK();
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -440,8 +455,7 @@ findallfcns(char *dummy)
 		case FCNDEF:
 		case CLASSDEF:
 			skiprefchar();	/* save function name */
-			putstring(function);
-
+			putstring(function, PATHLEN);
 			/* output the file, function and source line */
 			putref(0, file, function);
 			break;
@@ -483,7 +497,7 @@ findcalling(char *pattern)
 			
 		case NEWFILE:		/* save file name */
 			skiprefchar();
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -494,7 +508,7 @@ findcalling(char *pattern)
 		case DEFINE:		/* could be a macro */
 			if (fileversion >= 10) {
 				skiprefchar();
-				putstring(macro);
+				putstring(macro, PATHLEN);
 			}
 			break;
 
@@ -504,7 +518,7 @@ findcalling(char *pattern)
 
 		case FCNDEF:		/* save calling function name */
 			skiprefchar();
-			putstring(function);
+			putstring(function, PATHLEN);
 			for (i = 0; i < morefuns; i++)
 				if ( !strcmp(tmpfunc[i], function) )
 					break;
@@ -639,7 +653,7 @@ findinclude(char *pattern)
 			
 		case NEWFILE:		/* save file name */
 			skiprefchar();
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return NULL;
 			}
@@ -790,7 +804,7 @@ match(void)
 
 	/* see if this is a regular expression pattern */
 	if (isregexp_valid == YES) {
-		putstring(string);
+		putstring(string, PATHLEN);
 		if (*string == '\0') {
 			return(NO);
 		}
@@ -940,26 +954,29 @@ putline(FILE *output)
 /* put the rest of the cross-reference line into the string */
 
 void
-putstring(char *s)
+putstring(char *s, int length)
 {
 	char	*cp;
 	unsigned c;
-	
+	int i=0;	
 	setmark('\n');
 	cp = blockp;
 	do {
-		while ((c = (unsigned)(*cp)) != '\n') {
+		while (((c = (unsigned)(*cp)) != '\n') && (i<length)) {
 			if (c > '\177') {
 				c &= 0177;
 				*s++ = dichar1[c / 8];
 				*s++ = dichar2[c & 7];
+				i+=2;
 			}
 			else {
 				*s++ = c;
+				i++;
 			}
 			++cp;
 		}
-	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
+	} while (((*(cp + 1) == '\0' && (cp = readblock()) != NULL)) && 
+	  (i < length));
 	blockp = cp;
 	*s = '\0';
 }
@@ -1059,7 +1076,7 @@ findcalledby(char *pattern)
 			
 		case NEWFILE:
 			skiprefchar();	/* save file name */
-			putstring(file);
+			putstring(file, PATHLEN);
 			if (*file == '\0') {	/* if end of symbols */
 				return(&found_caller);
 			}
@@ -1194,7 +1211,7 @@ putpostingref(POSTING *p, char *pat)
 		if (p->type == FCNDEF) { /* need to find the function name */
 			if (dbseek(p->lineoffset) != -1) {
 				scanpast(FCNDEF);
-				putstring(function);
+				putstring(function, PATHLEN);
 			}
 		}
 		else if (p->type != FCNCALL) {
@@ -1203,7 +1220,7 @@ putpostingref(POSTING *p, char *pat)
 	}
 	else if (p->fcnoffset != lastfcnoffset) {
 		if (dbseek(p->fcnoffset) != -1) {
-			putstring(function);
+			putstring(function, PATHLEN);
 			lastfcnoffset = p->fcnoffset;
 		}
 	}
--- cscope-15.5/src/global.h.stack	2006-06-23 16:01:31.000000000 -0400
+++ cscope-15.5/src/global.h	2006-06-23 16:02:55.000000000 -0400
@@ -370,7 +370,7 @@ void	postmsg(char *msg);
 void	postmsg2(char *msg);
 void	posterr(char *msg,...);
 void	putposting(char *term, int type);
-void	putstring(char *s);
+void	putstring(char *s, int length);
 void	resetcmd(void);
 void	seekline(int line);
 void	setfield(void);
--- cscope-15.5/src/build.c.stack	2003-03-05 05:43:59.000000000 -0500
+++ cscope-15.5/src/build.c	2006-06-23 16:00:47.000000000 -0400
@@ -82,7 +82,7 @@ static	void	copyinverted(void);
 static	char	*getoldfile(void);
 static	void	movefile(char *new, char *old);
 static	void	putheader(char *dir);
-static	void	putinclude(char *s);
+static	void	putinclude(char *s, int len);
 static	void	putlist(char **names, int count);
 static	BOOL	samelist(FILE *oldrefs, char **names, int count);
 
@@ -512,7 +512,7 @@ getoldfile(void)
 		do {
 			if (*blockp == NEWFILE) {
 				skiprefchar();
-				putstring(file);
+				putstring(file, PATHLEN);
 				if (file[0] != '\0') {	/* if not end-of-crossref */
 					return(file);
 				}
@@ -614,7 +614,7 @@ copydata(void)
 		/* look for an #included file */
 		if (*cp == INCLUDE) {
 			blockp = cp;
-			putinclude(symbol);
+			putinclude(symbol, PATHLEN);
 			writestring(symbol);
 			setmark('\t');
 			cp = blockp;
@@ -666,12 +666,12 @@ copyinverted(void)
 			case NEWFILE:		/* file name */
 				return;
 			case INCLUDE:		/* #included file */
-				putinclude(symbol);
+				putinclude(symbol, PATHLEN);
 				goto output;
 			}
 			dbputc(type);
 			skiprefchar();
-			putstring(symbol);
+			putstring(symbol, PATHLEN);
 			goto output;
 		}
 		c = *cp;
@@ -681,7 +681,7 @@ copyinverted(void)
 		/* if this is a symbol */
 		if (isalpha((unsigned char)c) || c == '_') {
 			blockp = cp;
-			putstring(symbol);
+			putstring(symbol, PATHLEN);
 			type = ' ';
 		output:
 			putposting(symbol, type);
@@ -712,11 +712,11 @@ movefile(char *new, char *old)
 /* process the #included file in the old database */
 
 static void
-putinclude(char *s)
+putinclude(char *s, int len)
 {
 	dbputc(INCLUDE);
 	skiprefchar();
-	putstring(s);
+	putstring(s, len);
 	incfile(s + 1, s);
 }
 


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/FC-5/cscope.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cscope.spec	5 May 2006 19:28:32 -0000	1.25
+++ cscope.spec	23 Jun 2006 20:21:10 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.4 
+Release: 13.7 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -22,6 +22,7 @@
 Patch6:cscope-15.5-tempsec.patch
 Patch7:cscope-15.5-inv-overflow.patch
 Patch8:cscope-15.5-ocs-sysdir.patch
+Patch9:cscope-15.5-putstring-overflow.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -41,6 +42,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %configure
@@ -89,6 +91,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Fri Jun 23 2006 Neil Horman <nhorman at redhat.com>
+- Fixing putstring bug (bz 189666)
+
 * Fri May 5  2006 Neil Horman <nhorman at redhat.com>
 - Checking in sysdir change for bz 190580
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:35:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:35:13 -0400
Subject: rpms/kernel/devel/configs config-x86_64-kdump,1.1,1.2
Message-ID: <200606232035.k5NKZDeE015486@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15415/configs

Modified Files:
	config-x86_64-kdump 
Log Message:
work around build breakage



Index: config-x86_64-kdump
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-kdump,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-x86_64-kdump	31 Jan 2006 22:13:02 -0000	1.1
+++ config-x86_64-kdump	23 Jun 2006 20:35:09 -0000	1.2
@@ -2,3 +2,10 @@
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y
+# FIXME: broken June 23rd
+# In file included from include/asm/msi.h:11,
+#  from drivers/pci/msi.h:71,
+#  from drivers/pci/msi-apic.c:8:
+#  include/asm/smp.h:103: error: expected ')' before '->' token
+#  make[2]: *** [drivers/pci/msi-apic.o] Error 1
+# CONFIG_PCI_MSI is not set



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:39:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:39:46 -0400
Subject: rpms/squirrelmail/devel
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch, NONE,
	1.1 squirrelmail-1.4.6-japanese-multibyte-view-body.patch, NONE,
	1.1 squirrelmail-1.4.6-japanese-multibyte-view-text.patch,
	NONE, 1.1 squirrelmail-1.4.6-zenkaku-subject-convert.patch,
	NONE, 1.1 squirrelmail.spec, 1.36, 1.37
Message-ID: <200606232039.k5NKdkiO016576@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16514

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-body.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-text.patch 
	squirrelmail-1.4.6-zenkaku-subject-convert.patch 
Log Message:
- Japanese zenkaku subject conversion      (#196017)
- Japanese MSIE garbled download ugly hack (#195639)
- Japanese multibyte attachment view text  (#195452)
- Japanese multibyte attachment body text  (#194457)
- Do not convert Japanese Help to UTF-8    (#194599)


squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch:
 mime.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195639

--- functions/mime.php.org	2006-06-16 13:47:27.000000000 +0900
+++ functions/mime.php	2006-06-16 13:48:23.000000000 +0900
@@ -2151,7 +2151,10 @@ function SendDownloadHeaders($type0, $ty
     // version
     //set all the Cache Control Headers for IE
     if ($isIE) {
-        $filename=rawurlencode($filename);
+        if($squirrelmail_language != 'ja_JP' &&
+	    $_SERVER['HTTP_ACCEPT_LANGUAGE'] != 'ja'){
+                $filename=rawurlencode($filename);
+	 }
         header ("Pragma: public");
         header ("Cache-Control: no-store, max-age=0, no-cache, must-revalidate"); // HTTP/1.1
         header ("Cache-Control: post-check=0, pre-check=0", false);

squirrelmail-1.4.6-japanese-multibyte-view-body.patch:
 mime.php |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE squirrelmail-1.4.6-japanese-multibyte-view-body.patch ---
diff -urN squirrelmail-1.4.6.orig/functions/mime.php squirrelmail-1.4.6/functions/mime.php
--- squirrelmail-1.4.6.orig/functions/mime.php	2006-06-23 16:29:07.000000000 -0400
+++ squirrelmail-1.4.6/functions/mime.php	2006-06-23 16:31:17.000000000 -0400
@@ -243,12 +243,18 @@
  * Extracted from strings.php 23/03/2002
  */
 
-function translateText(&$body, $wrap_at, $charset) {
+function translateText(&$body, $wrap_at, $charset, $transfer_encoding) {
     global $where, $what;   /* from searching */
     global $color;          /* color theme */
+    global $default_charset;
 
     require_once(SM_PATH . 'functions/url_parser.php');
 
+    if ($default_charset == 'iso-2022-jp' && $transfer_encoding == 'base64' ||
+        $transfer_encoding == 'quoted-printable' ||  $transfer_encoding == 'quoted_printable'){
+            $charset = $default_charset;
+    }
+
     $body_ary = explode("\n", $body);
     for ($i=0; $i < count($body_ary); $i++) {
         $line = $body_ary[$i];
@@ -347,14 +353,26 @@
                 $body = strip_tags($body);
                 $body = trim($body);
                 translateText($body, $wrap_at,
-                        $body_message->header->getParameter('charset'));
+                        $body_message->header->getParameter('charset'),$body_message->header->encoding);
             } else {
                 $body = magicHTML($body, $id, $message, $mailbox);
                 $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
             }
         } else {
-            translateText($body, $wrap_at,
-                    $body_message->header->getParameter('charset'));
+                if($squirrelmail_language != 'ja_JP'){
+                        translateText($body, $wrap_at,
+                                      $body_message->header->getParameter('charset'),$body_message->header->encoding);
+                } else {
+                        if($body_message->header->encoding == 'base64' ||
+                           $body_message->header->encoding == 'quoted-printable' ||
+                           $body_message->header->encoding == 'quoted_printable'){
+                                translateText($body, $wrap_at, $default_charset);
+                        } else {
+				// it may never call here.
+                                translateText($body, $wrap_at,
+					      $body_message->header->getParameter('charset'));
+                        }
+                }
         }
 
         // if this is the clean display (i.e. printer friendly), stop here.

squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
 view_text.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-japanese-multibyte-view-text.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195452
squirrelmail view_text.php cannot handle handle multibyte characters in attachment
viewing text of the attachment within squirrelmail itself.

--- src/view_text.php.org	2006-06-14 13:44:28.000000000 +0900
+++ src/view_text.php	2006-06-14 13:44:47.000000000 +0900
@@ -58,8 +58,13 @@ if ($passed_ent_id) {
 $header   = $message_ent->header;
 $type0    = $header->type0;
 $type1    = $header->type1;
-$charset  = $header->getParameter('charset');
 $encoding = strtolower($header->encoding);
+if($squirrelmail_language == 'ja_JP' && $encoding == 'base64' ||
+   $encoding == 'quoted-printable' || $encoding == 'quoted_printable'){
+        $charset  = $default_charset;
+} else {
+        $charset  = $header->getParameter('charset');
+}
 
 $msg_url   = 'read_body.php?' . $QUERY_STRING;
 $msg_url   = set_url_var($msg_url, 'ent_id', 0);

squirrelmail-1.4.6-zenkaku-subject-convert.patch:
 i18n.php |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE squirrelmail-1.4.6-zenkaku-subject-convert.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196017
The latest squirrelmail did not convert convert Subject to "zen-kaku
kata-kana". Usually, if a user used "han-kaku kata-kana" in the body
or header, any mail application would convert it to "zen-kaku kata-kana".
The squirrelmail also should convert.

diff -urN squirrelmail-1.4.6.orig/functions/i18n.php squirrelmail-1.4.6/functions/i18n.php
--- squirrelmail-1.4.6.orig/functions/i18n.php	2006-02-10 15:30:31.000000000 -0500
+++ squirrelmail-1.4.6/functions/i18n.php	2006-06-23 15:49:06.000000000 -0400
@@ -487,6 +487,7 @@
             break;
         case 'encodeheader':
             $result = '';
+            $ret = mb_convert_kana($ret, "KV");
             if (strlen($ret) > 0) {
                 $tmpstr = mb_substr($ret, 0, 1);
                 $prevcsize = strlen($tmpstr);


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- squirrelmail.spec	7 Jun 2006 16:59:20 -0000	1.36
+++ squirrelmail.spec	23 Jun 2006 20:39:43 -0000	1.37
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 7.fc6
+Release: 8.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -17,6 +17,10 @@
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
 Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
+Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
+Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
+Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -38,6 +42,11 @@
 #%setup -q
 %setup -q -n squirrelmail-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p0
+%patch4 -p1
+
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
@@ -127,6 +136,7 @@
 
     if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
 	for a in `ls help/$LOCALE/ 2>/dev/null` ; do
+            if [ "$LOCALE" == "ja_JP" ]; then continue; fi
 	    iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
 	done
 	sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
@@ -233,6 +243,13 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Fri Jun 23 2006 Warren Togami <wtogami at redhat.com> 1.4.6-8
+- Japanese zenkaku subject conversion      (#196017)
+- Japanese MSIE garbled download ugly hack (#195639)
+- Japanese multibyte attachment view text  (#195452)
+- Japanese multibyte attachment body text  (#194457)
+- Do not convert Japanese Help to UTF-8    (#194599)
+
 * Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-7
 - CVE-2006-2842 File Inclusion Vulnerability
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:39:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:39:53 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.83,1.84
Message-ID: <200606232039.k5NKdrND016686@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16376

Modified Files:
	kdegraphics.spec 
Log Message:
BR: automake autoconf



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdegraphics.spec	23 Jun 2006 13:25:26 -0000	1.83
+++ kdegraphics.spec	23 Jun 2006 20:39:50 -0000	1.84
@@ -50,6 +50,10 @@
 BuildRequires: freetype-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
+%if {make_cvs}
+BuildRequires: autoconf
+BuildRequires: automake
+%endif
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:40:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:40:37 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.84,1.85
Message-ID: <200606232040.k5NKebwm016992@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16877

Modified Files:
	kdegraphics.spec 
Log Message:
BR: automake autoconf



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdegraphics.spec	23 Jun 2006 20:39:50 -0000	1.84
+++ kdegraphics.spec	23 Jun 2006 20:40:34 -0000	1.85
@@ -50,7 +50,7 @@
 BuildRequires: freetype-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
-%if {make_cvs}
+%if %{make_cvs}
 BuildRequires: autoconf
 BuildRequires: automake
 %endif



From fedora-cvs-commits at redhat.com  Fri Jun 23 20:44:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 16:44:19 -0400
Subject: rpms/mesa/FC-5 mesa-6.4.2-parallel-build-fix.patch, NONE,
	1.1 mesa-6.5-noexecstack.patch, NONE, 1.1 mesa.spec, 1.47, 1.48
Message-ID: <200606232044.k5NKiJBv018384@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18307

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.4.2-parallel-build-fix.patch mesa-6.5-noexecstack.patch 
Log Message:
- Backport the 6.5 noexec-stack fixes.  Fix parallel builds.


mesa-6.4.2-parallel-build-fix.patch:
 Makefile |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE mesa-6.4.2-parallel-build-fix.patch ---
Do not push this change upstream.  It's only safe here because the build
system doesn't actually care about dependency order; it'll rebuild everything
anyway.

--- Mesa-6.4.2/src/mesa/Makefile.parallel-build	2006-06-23 16:42:56.000000000 -0400
+++ Mesa-6.4.2/src/mesa/Makefile	2006-06-23 16:43:14.000000000 -0400
@@ -208,10 +208,7 @@
 
 # Update dependencies
 depend: $(ALL_SOURCES)
-	@ echo "running $(MKDEP)"
 	@ touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-		> /dev/null 
 
 
 # Emacs tags

mesa-6.5-noexecstack.patch:
 drivers/dri/r200/r200_vtxtmp_x86.S     |    4 ++++
 drivers/dri/radeon/radeon_vtxtmp_x86.S |    4 ++++
 tnl/t_vtx_x86_gcc.S                    |    4 ++++
 x86-64/glapi_x86-64.S                  |    4 ++++
 x86-64/xform4.S                        |    4 ++++
 x86/3dnow_normal.S                     |    4 ++++
 x86/3dnow_xform1.S                     |    4 ++++
 x86/3dnow_xform2.S                     |    4 ++++
 x86/3dnow_xform3.S                     |    4 ++++
 x86/3dnow_xform4.S                     |    4 ++++
 x86/common_x86_asm.S                   |    4 ++++
 x86/glapi_x86.S                        |    4 ++++
 x86/mmx_blend.S                        |    4 ++++
 x86/read_rgba_span_x86.S               |    4 ++++
 x86/sse_normal.S                       |    4 ++++
 x86/sse_xform1.S                       |    4 ++++
 x86/sse_xform2.S                       |    4 ++++
 x86/sse_xform3.S                       |    4 ++++
 x86/sse_xform4.S                       |    4 ++++
 x86/x86_cliptest.S                     |    4 ++++
 x86/x86_xform2.S                       |    4 ++++
 x86/x86_xform3.S                       |    4 ++++
 x86/x86_xform4.S                       |    4 ++++
 23 files changed, 92 insertions(+)

--- NEW FILE mesa-6.5-noexecstack.patch ---
Index: src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S,v
retrieving revision 1.5
diff -u -p -r1.5 r200_vtxtmp_x86.S
--- src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S	2 Jun 2004 22:09:11 -0000	1.5
+++ src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S	10 Apr 2006 21:48:16 -0000
@@ -493,3 +493,7 @@ GLOBL( _sse_MultiTexCoord2f_2 )
 	ret
 GLOBL( _sse_MultiTexCoord2f_2_end )
 #endif
+
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S,v
retrieving revision 1.3
diff -u -p -r1.3 radeon_vtxtmp_x86.S
--- src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S	13 Oct 2005 14:30:20 -0000	1.3
+++ src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S	10 Apr 2006 21:48:16 -0000
@@ -492,3 +492,7 @@ GLOBL( _sse_MultiTexCoord2f_2 )
 	ret
 GLOBL( _sse_MultiTexCoord2f_2_end )
 #endif
+
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/tnl/t_vtx_x86_gcc.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S,v
retrieving revision 1.13
diff -u -p -r1.13 t_vtx_x86_gcc.S
--- src/mesa/tnl/t_vtx_x86_gcc.S	17 Sep 2004 05:10:33 -0000	1.13
+++ src/mesa/tnl/t_vtx_x86_gcc.S	10 Apr 2006 21:48:19 -0000
@@ -555,3 +555,7 @@ GLOBL( _tnl_x86_dispatch_vertexattribfv 
 	ret	$8		/* return */
 GLOBL( _tnl_x86_dispatch_vertexattribfv_end )
 #endif /* defined (STDCALL_API) */
+
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_normal.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_normal.S,v
retrieving revision 1.9
diff -u -p -r1.9 3dnow_normal.S
--- src/mesa/x86/3dnow_normal.S	4 Jan 2005 14:33:47 -0000	1.9
+++ src/mesa/x86/3dnow_normal.S	10 Apr 2006 21:48:20 -0000
@@ -846,3 +846,7 @@ LLBL (G3R_end):
     RET
 
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform1.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform1.S,v
retrieving revision 1.3
diff -u -p -r1.3 3dnow_xform1.S
--- src/mesa/x86/3dnow_xform1.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/3dnow_xform1.S	10 Apr 2006 21:48:20 -0000
@@ -431,3 +431,7 @@ LLBL( G3TP3R_3 ):
     RET
 
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 3dnow_xform2.S
--- src/mesa/x86/3dnow_xform2.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/3dnow_xform2.S	10 Apr 2006 21:48:20 -0000
@@ -471,3 +471,7 @@ LLBL( G3TPIR_4 ):
     POP_L     ( ESI )
     RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform3.S,v
retrieving revision 1.4
diff -u -p -r1.4 3dnow_xform3.S
--- src/mesa/x86/3dnow_xform3.S	4 Jan 2005 14:33:47 -0000	1.4
+++ src/mesa/x86/3dnow_xform3.S	10 Apr 2006 21:48:20 -0000
@@ -555,3 +555,7 @@ LLBL( G3TPIR_2 ):
     POP_L     ( ESI )
     RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform4.S,v
retrieving revision 1.4
diff -u -p -r1.4 3dnow_xform4.S
--- src/mesa/x86/3dnow_xform4.S	4 Jan 2005 14:33:47 -0000	1.4
+++ src/mesa/x86/3dnow_xform4.S	10 Apr 2006 21:48:20 -0000
@@ -564,3 +564,7 @@ LLBL( G3TPIR_2 ):
     POP_L     ( ESI )
     RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/common_x86_asm.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/common_x86_asm.S,v
retrieving revision 1.19
diff -u -p -r1.19 common_x86_asm.S
--- src/mesa/x86/common_x86_asm.S	4 Jan 2005 14:33:47 -0000	1.19
+++ src/mesa/x86/common_x86_asm.S	10 Apr 2006 21:48:20 -0000
@@ -213,3 +213,7 @@ GLNAME( _mesa_test_os_sse_exception_supp
 
 #endif
 
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/glapi_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/glapi_x86.S,v
retrieving revision 1.59
diff -u -p -r1.59 glapi_x86.S
--- src/mesa/x86/glapi_x86.S	1 Mar 2006 02:07:50 -0000	1.59
+++ src/mesa/x86/glapi_x86.S	10 Apr 2006 21:48:21 -0000
@@ -1156,3 +1156,7 @@ GLNAME(gl_dispatch_functions_end):
 	.long	2,4,20    /* Minimum kernel version w/TLS */
 3:	.p2align 2        /* pad out section */
 #endif /* GLX_USE_TLS */
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/mmx_blend.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/mmx_blend.S,v
retrieving revision 1.18
diff -u -p -r1.18 mmx_blend.S
--- src/mesa/x86/mmx_blend.S	26 Apr 2004 10:10:25 -0000	1.18
+++ src/mesa/x86/mmx_blend.S	10 Apr 2006 21:48:21 -0000
@@ -364,3 +364,7 @@ TWO(MOVQ       ( MM1, REGIND(rgba) ))
 #include "mmx_blendtmp.h"
 
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/read_rgba_span_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/read_rgba_span_x86.S,v
retrieving revision 1.5
diff -u -p -r1.5 read_rgba_span_x86.S
--- src/mesa/x86/read_rgba_span_x86.S	30 Jun 2005 11:42:56 -0000	1.5
+++ src/mesa/x86/read_rgba_span_x86.S	10 Apr 2006 21:48:21 -0000
@@ -687,3 +687,7 @@ _generic_read_RGBA_span_RGB565_MMX:
 #endif
 	ret
 #endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_normal.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_normal.S,v
retrieving revision 1.5
diff -u -p -r1.5 sse_normal.S
--- src/mesa/x86/sse_normal.S	4 Jan 2005 14:33:47 -0000	1.5
+++ src/mesa/x86/sse_normal.S	10 Apr 2006 21:48:21 -0000
@@ -255,3 +255,7 @@ LLBL(K_G3TNNRR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform1.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform1.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform1.S
--- src/mesa/x86/sse_xform1.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform1.S	10 Apr 2006 21:48:22 -0000
@@ -440,3 +440,7 @@ LLBL(K_GTP13P3DR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform2.S
--- src/mesa/x86/sse_xform2.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform2.S	10 Apr 2006 21:48:22 -0000
@@ -459,3 +459,7 @@ LLBL(K_GTP23P3DR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform3.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform3.S
--- src/mesa/x86/sse_xform3.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform3.S	10 Apr 2006 21:48:22 -0000
@@ -505,3 +505,7 @@ LLBL(K_GTP3P3DR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform4.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform4.S
--- src/mesa/x86/sse_xform4.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform4.S	10 Apr 2006 21:48:22 -0000
@@ -229,3 +229,7 @@ LLBL( sse_identity_done ):
 	POP_L( ESI )
 	RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_cliptest.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_cliptest.S,v
retrieving revision 1.11
diff -u -p -r1.11 x86_cliptest.S
--- src/mesa/x86/x86_cliptest.S	4 Jan 2005 14:33:47 -0000	1.11
+++ src/mesa/x86/x86_cliptest.S	10 Apr 2006 21:48:22 -0000
@@ -401,3 +401,7 @@ LLBL(ctp4_np_finish):
 	POP_L( ESI )
 
 	RET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform2.S
--- src/mesa/x86/x86_xform2.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/x86_xform2.S	10 Apr 2006 21:48:22 -0000
@@ -568,3 +568,7 @@ LLBL(x86_p2_ir_done):
 	POP_L( ESI )
 	RET
 #undef FRAME_OFFSET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform3.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform3.S
--- src/mesa/x86/x86_xform3.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/x86_xform3.S	10 Apr 2006 21:48:22 -0000
@@ -638,3 +638,7 @@ LLBL(x86_p3_ir_done):
 	POP_L( EDI )
 	POP_L( ESI )
 	RET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform4.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform4.S
--- src/mesa/x86/x86_xform4.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/x86_xform4.S	10 Apr 2006 21:48:23 -0000
@@ -671,3 +671,7 @@ LLBL(x86_p4_ir_done):
 	POP_L( EDI )
 	POP_L( ESI )
 	RET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86-64/glapi_x86-64.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S,v
retrieving revision 1.8
diff -u -p -r1.8 glapi_x86-64.S
--- src/mesa/x86-64/glapi_x86-64.S	1 Mar 2006 02:07:50 -0000	1.8
+++ src/mesa/x86-64/glapi_x86-64.S	10 Apr 2006 21:48:26 -0000
@@ -31127,3 +31127,7 @@ GL_PREFIX(BlitFramebufferEXT):
 	.long	2,4,20    /* Minimum kernel version w/TLS */
 3:	.p2align 2        /* pad out section */
 #endif /* GLX_USE_TLS */
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86-64/xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/xform4.S,v
retrieving revision 1.1
diff -u -p -r1.1 xform4.S
--- src/mesa/x86-64/xform4.S	7 May 2005 16:59:59 -0000	1.1
+++ src/mesa/x86-64/xform4.S	10 Apr 2006 21:48:27 -0000
@@ -456,3 +456,7 @@ p4_2d_done:
 	ret
 			
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/FC-5/mesa.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mesa.spec	17 May 2006 21:23:24 -0000	1.47
+++ mesa.spec	23 Jun 2006 20:44:16 -0000	1.48
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 6.FC5.1
+Release: 6.FC5.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,9 +75,11 @@
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch5: mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch
 Patch6: mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
+Patch7: mesa-6.4.2-parallel-build-fix.patch
 #Patch4: mesa-6.4.1-enable-osmesa.patch
 
 # General patches from upstream go here:
+Patch100: mesa-6.5-noexecstack.patch
 
 # Red Hat custom patches, feature development
 Patch200: mesa-6.4.1-texture-from-drawable.patch
@@ -244,8 +246,10 @@
 %endif
 %patch5 -p1 -b .dprintf-to-debugprintf-for-bug180122
 %patch6 -p0 -b .xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835
+%patch7 -p1 -b .parallel-build-fix
 
-# NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
+# Bug #178262: Stack doesn't really need to be executable.
+%patch100 -p0 -b .noexec-stack
 
 %patch200 -p0 -b .texture-from-drawable
 # According to Adam, this patch makes metacity's compositing
@@ -439,6 +443,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Fri Jun 23 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-6.FC5.2
+- Backport the 6.5 noexec-stack fixes.  Fix parallel builds.
+
 * Wed May 17 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-6.FC5.1
 - Add "BuildRequires: makedepend" for bug (#191967)
 



From fedora-cvs-commits at redhat.com  Fri Jun 23 21:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 17:35:58 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.286, 1.287 anaconda.spec, 1.410,
	1.411 sources, 1.407, 1.408
Message-ID: <200606232135.k5NLZwMZ029946@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29909/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.48-1 on branch devel from anaconda-11.1.0.48-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- .cvsignore	22 Jun 2006 01:33:19 -0000	1.286
+++ .cvsignore	23 Jun 2006 21:35:55 -0000	1.287
@@ -1 +1 @@
-anaconda-11.1.0.47.tar.bz2
+anaconda-11.1.0.48.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- anaconda.spec	22 Jun 2006 01:33:19 -0000	1.410
+++ anaconda.spec	23 Jun 2006 21:35:55 -0000	1.411
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.47
+Version: 11.1.0.48
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jun 23 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.48-1
+- various pychecker inspired cleanups (clumsn)
+- don't try to unmount CDs twice (clumens)
+- filter devices without media rather than removable devices (clumens)
+- add iscsistart to second stage
+- fix pkgorder for yum api changes
+- fix manual ip entry (#196154)
+- fix tyop in zfcp gui
+- fix serial console being propagated to installed system (#196375)
+
 * Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.47-1
 - Fix iscsi-related tracebacks (clumens/katzj)
 - Remove some hacks that were added for s390 so that we fix them right


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- sources	22 Jun 2006 01:33:19 -0000	1.407
+++ sources	23 Jun 2006 21:35:55 -0000	1.408
@@ -1 +1 @@
-a8fe54aa59c833a872a841e35d5941f0  anaconda-11.1.0.47.tar.bz2
+ff223dc08fe563a858ac9eb24df5663f  anaconda-11.1.0.48.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 23 21:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 17:57:56 -0400
Subject: rpms/shared-mime-info/FC-5 shared-mime-info-0.17-pdf.patch, NONE,
	1.1 shared-mime-info.spec, 1.39, 1.40
Message-ID: <200606232157.k5NLvueh018477@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/shared-mime-info/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18415

Modified Files:
	shared-mime-info.spec 
Added Files:
	shared-mime-info-0.17-pdf.patch 
Log Message:
- Backport upstream change to fix PDFs in mozplugger.


shared-mime-info-0.17-pdf.patch:
 freedesktop.org.xml.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE shared-mime-info-0.17-pdf.patch ---
--- freedesktop.org.xml.in	2006/04/19 16:26:47	1.138
+++ freedesktop.org.xml.in	2006/05/09 20:31:38	1.139
@@ -2843,8 +2843,10 @@
   <mime-type type="text/x-matlab">
     <sub-class-of type="text/plain"/>
     <_comment>MATLAB script/function</_comment>
-    <magic priority="50">
+    <magic priority="10">
       <match type="string" value="%" offset="0"/>
+    </magic>
+    <magic priority="50">
       <match type="string" value="function" offset="0"/>
     </magic>
     <glob pattern="*.m"/>
@@ -2928,7 +2930,7 @@
     <glob pattern="*.ltx"/>
     <glob pattern="*.sty"/>
     <glob pattern="*.cls"/>
-    <magic priority="50">
+    <magic priority="10">
       <match type="string" value="%" offset="0"/>
     </magic>
   </mime-type>


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/shared-mime-info.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- shared-mime-info.spec	22 Mar 2006 19:21:21 -0000	1.39
+++ shared-mime-info.spec	23 Jun 2006 21:57:53 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.17
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -12,6 +12,8 @@
 Patch1: shared-mime-info-0.16-fonts.patch
 # fixed in upstream cvs
 Patch2: shared-mime-info-0.17-postscript.patch
+# Bug #190858
+Patch3: shared-mime-info-0.17-pdf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
@@ -32,6 +34,7 @@
 %patch0 -p0 -b .cisco-vpn
 %patch1 -p1 -b .fonts
 %patch2 -p1 -b .postscript
+%patch3 -p0 -b .pdf
 
 %build
 
@@ -65,6 +68,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jun 23 2006 Adam Jackson <ajackson at redhat.com> - 0.17-1.fc5.2
+- Backport upstream change to fix PDFs in mozplugger.
+
 * Wed Mar 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.17-1.fc5.1
 - Backport upstream change to fix postscript vs. matlab confusion
 



From fedora-cvs-commits at redhat.com  Sat Jun 24 00:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 20:51:00 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1647,
	1.1648 linux-2.6-debug-no-quiet.patch, 1.1, NONE
Message-ID: <200606240051.k5O0p0pn006502@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6367

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-no-quiet.patch 
Log Message:
make quiet work again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1647
retrieving revision 1.1648
diff -u -r1.1647 -r1.1648
--- kernel-2.6.spec	23 Jun 2006 16:28:08 -0000	1.1647
+++ kernel-2.6.spec	24 Jun 2006 00:50:56 -0000	1.1648
@@ -265,7 +265,6 @@
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
 Patch1022: linux-2.6-debug-panic-stackdump.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
-Patch1026: linux-2.6-debug-no-quiet.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
 Patch1029: linux-2.6-debug-account-kmalloc.patch
@@ -566,8 +565,6 @@
 %patch1020 -p1
 %patch1022 -p1
 %patch1025 -p1
-# Disable the 'quiet' boot switch for better bug reports.
-%patch1026 -p1
 # Slab leak detector.
 #%patch1027 -p1
 # Pause on oops.


--- linux-2.6-debug-no-quiet.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jun 24 00:51:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 23 Jun 2006 20:51:53 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2139,
	1.2140 linux-2.6-debug-no-quiet.patch, 1.2, NONE
Message-ID: <200606240051.k5O0prEt006907@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6882

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-no-quiet.patch 
Log Message:
* Tue Jun 20 2006 Dave Jones <davej at redhat.com>
- Make 'quiet' work again.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2139
retrieving revision 1.2140
diff -u -r1.2139 -r1.2140
--- kernel-2.6.spec	23 Jun 2006 16:27:13 -0000	1.2139
+++ kernel-2.6.spec	24 Jun 2006 00:51:50 -0000	1.2140
@@ -314,7 +314,6 @@
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
 Patch1022: linux-2.6-debug-panic-stackdump.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
-Patch1026: linux-2.6-debug-no-quiet.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
 Patch1029: linux-2.6-debug-account-kmalloc.patch
@@ -871,8 +870,6 @@
 %patch1020 -p1
 %patch1022 -p1
 %patch1025 -p1
-# Disable the 'quiet' boot switch for better bug reports.
-%patch1026 -p1
 # Slab leak detector.
 #%patch1027 -p1
 # Pause on oops.
@@ -1630,6 +1627,9 @@
 %endif
 
 %changelog
+* Tue Jun 20 2006 Dave Jones <davej at redhat.com>
+- Make 'quiet' work again.
+
 * Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2139_FC5]
 - Rebuild with slab debug off.
 


--- linux-2.6-debug-no-quiet.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jun 24 06:03:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 02:03:30 -0400
Subject: rpms/kernel/devel/configs config-i586,1.14,1.15
Message-ID: <200606240603.k5O63UuU013724@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13500/devel/configs

Modified Files:
	config-i586 
Log Message:
Enable profiling for 586 kernels.



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-i586	12 Jun 2006 14:41:43 -0000	1.14
+++ config-i586	24 Jun 2006 06:03:25 -0000	1.15
@@ -1,7 +1,6 @@
 CONFIG_M586=y
 # CONFIG_SMP is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_PROFILING is not set
 CONFIG_X86_POWERNOW_K6=m
 
 # CONFIG_X86_MCE_P4THERMAL is not set



From fedora-cvs-commits at redhat.com  Sat Jun 24 06:03:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 02:03:20 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1648,1.1649
Message-ID: <200606240603.k5O63KML013642@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13500/FC-4

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable profiling for 586 kernels.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1648
retrieving revision 1.1649
diff -u -r1.1648 -r1.1649
--- kernel-2.6.spec	24 Jun 2006 00:50:56 -0000	1.1648
+++ kernel-2.6.spec	24 Jun 2006 06:02:54 -0000	1.1649
@@ -1076,6 +1076,9 @@
 %endif
 
 %changelog
+* Sat Jun 24 2006 Dave Jones <davej at redhat.com>
+- Enable profiling for 586 kernels.
+
 * Fri Jun 23 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2139_FC4]
 - Rebuild with slab debug off.
 



From fedora-cvs-commits at redhat.com  Sat Jun 24 06:03:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 02:03:20 -0400
Subject: rpms/kernel/FC-4/configs config-i586,1.3,1.4
Message-ID: <200606240603.k5O63K7H013651@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13500/FC-4/configs

Modified Files:
	config-i586 
Log Message:
Enable profiling for 586 kernels.



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-i586,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-i586	20 Jun 2006 18:25:41 -0000	1.3
+++ config-i586	24 Jun 2006 06:03:05 -0000	1.4
@@ -1,7 +1,6 @@
 CONFIG_M586=y
 # CONFIG_SMP is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_PROFILING is not set
 CONFIG_X86_POWERNOW_K6=m
 
 # CONFIG_X86_MCE_P4THERMAL is not set



From fedora-cvs-commits at redhat.com  Sat Jun 24 06:03:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 02:03:22 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.14,1.15
Message-ID: <200606240603.k5O63M5w013686@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13500/FC-5/configs

Modified Files:
	config-i586 
Log Message:
Enable profiling for 586 kernels.



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-i586	18 Jun 2006 04:45:12 -0000	1.14
+++ config-i586	24 Jun 2006 06:03:20 -0000	1.15
@@ -1,7 +1,6 @@
 CONFIG_M586=y
 # CONFIG_SMP is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_PROFILING is not set
 CONFIG_X86_POWERNOW_K6=m
 
 # CONFIG_X86_MCE_P4THERMAL is not set



From fedora-cvs-commits at redhat.com  Sat Jun 24 06:03:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 02:03:22 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2140,1.2141
Message-ID: <200606240603.k5O63MLr013680@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13500/FC-5

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable profiling for 586 kernels.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2140
retrieving revision 1.2141
diff -u -r1.2140 -r1.2141
--- kernel-2.6.spec	24 Jun 2006 00:51:50 -0000	1.2140
+++ kernel-2.6.spec	24 Jun 2006 06:03:20 -0000	1.2141
@@ -1627,7 +1627,10 @@
 %endif
 
 %changelog
-* Tue Jun 20 2006 Dave Jones <davej at redhat.com>
+* Sat Jun 24 2006 Dave Jones <davej at redhat.com>
+- Enable profiling for 586 kernels.
+
+* Fri Jun 23 2006 Dave Jones <davej at redhat.com>
 - Make 'quiet' work again.
 
 * Tue Jun 20 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2139_FC5]



From fedora-cvs-commits at redhat.com  Sat Jun 24 06:03:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 02:03:25 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2307,1.2308
Message-ID: <200606240603.k5O63PMY013702@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13500/devel

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable profiling for 586 kernels.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2307
retrieving revision 1.2308
diff -u -r1.2307 -r1.2308
--- kernel-2.6.spec	23 Jun 2006 17:59:47 -0000	1.2307
+++ kernel-2.6.spec	24 Jun 2006 06:03:21 -0000	1.2308
@@ -1670,6 +1670,9 @@
 %endif
 
 %changelog
+* Sat Jun 24 2006 Dave Jones <davej at redhat.com>
+- Enable profiling for 586 kernels.
+
 * Fri Jun 23 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git5
 



From fedora-cvs-commits at redhat.com  Sat Jun 24 07:10:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 03:10:23 -0400
Subject: rpms/kernel/devel/configs config-s390-generic,1.15,1.16
Message-ID: <200606240710.k5O7ANiE008118@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv8057/configs

Modified Files:
	config-s390-generic 
Log Message:
git6


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-s390-generic	2 Jun 2006 20:30:47 -0000	1.15
+++ config-s390-generic	24 Jun 2006 07:10:20 -0000	1.16
@@ -182,3 +182,5 @@
 CONFIG_CMM_IUCV=y
 
 # CONFIG_DETECT_SOFTLOCKUP is not set
+
+CONFIG_S390_HYPFS_FS=y



From fedora-cvs-commits at redhat.com  Sat Jun 24 07:10:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 03:10:22 -0400
Subject: rpms/kernel/devel patch-2.6.17-git6.bz2.sign, NONE, 1.1 .cvsignore,
	1.460, 1.461 kernel-2.6.spec, 1.2308,
	1.2309 linux-2.6-compile-fixes.patch, 1.82,
	1.83 linux-2.6-execshield.patch, 1.20,
	1.21 linux-2.6-xen-compile-fixes.patch, 1.9,
	1.10 linux-2.6-xen.patch, 1.27, 1.28 sources, 1.404,
	1.405 upstream, 1.369,
	1.370 linux-2.6-acpi-ecdt-uid-hack.patch, 1.1,
	NONE linux-2.6-fix-tcp-h.patch, 1.1,
	NONE linux-2.6-x86-cpu_index-false.patch, 1.1,
	NONE patch-2.6.17-git5.bz2.sign, 1.1, NONE
Message-ID: <200606240710.k5O7AMJm008107@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8057

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-execshield.patch linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen.patch sources upstream 
Added Files:
	patch-2.6.17-git6.bz2.sign 
Removed Files:
	linux-2.6-acpi-ecdt-uid-hack.patch linux-2.6-fix-tcp-h.patch 
	linux-2.6-x86-cpu_index-false.patch patch-2.6.17-git5.bz2.sign 
Log Message:
git6


--- NEW FILE patch-2.6.17-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEnDqwyGugalF9Dw4RAklbAJ9ecksV5ENb9DpvB9+tl874jMVl0ACghTDi
mqm/1oEvB63QquVeE0QQKrE=
=WlzW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- .cvsignore	23 Jun 2006 15:47:41 -0000	1.460
+++ .cvsignore	24 Jun 2006 07:10:13 -0000	1.461
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git5.bz2
+patch-2.6.17-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2308
retrieving revision 1.2309
diff -u -r1.2308 -r1.2309
--- kernel-2.6.spec	24 Jun 2006 06:03:21 -0000	1.2308
+++ kernel-2.6.spec	24 Jun 2006 07:10:13 -0000	1.2309
@@ -249,14 +249,13 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git5.bz2
+Patch1: patch-2.6.17-git6.bz2
 
 #
 # Clean up and export kernel headers to userspace
 #
 # git://git.infradead.org/hdrinstall2-2.6.git
 Patch50: linux-2.6-header-install-git.patch
-Patch51: linux-2.6-fix-tcp-h.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -269,7 +268,6 @@
 Patch204: linux-2.6-edid-check.patch
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
-Patch207: linux-2.6-x86-cpu_index-false.patch
 Patch208: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
@@ -414,7 +412,6 @@
 
 # ACPI bits
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
-Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 
 # MTD bits
 Patch2400: linux-2.6-mtd-git.patch
@@ -738,8 +735,6 @@
 
 # Implement 'make headers_install'
 %patch50 -p1
-# Fix I/OAT breakage in tcp.h
-%patch51 -p1
 
 #
 # Patches to back out
@@ -770,8 +765,6 @@
 %patch205 -p1
 # Reboot through BIOS on HP systems,.
 %patch206 -p1
-# cpu_index >= NR_CPUS becomming always false.
-%patch207 -p1
 # Hush noisy unimplemented 32bit syscalls
 %patch208 -p1
 
@@ -975,7 +968,7 @@
 # serial/tty resume fixing.
 %patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
-%patch1760 -p1
+#%patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
 
@@ -1018,9 +1011,7 @@
 
 # ACPI patches
 # Silence more ACPI debug spew from suspend.
-%patch2300 -p1
-# acpi-ecdt-uid-hack
-%patch2301 -p1
+#%patch2300 -p1
 
 # MTD update from git://git.infradead.org/mtd-2.6.git
 %patch2400 -p1
@@ -1054,7 +1045,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
+#%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1672,6 +1663,7 @@
 %changelog
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.
+- 2.6.17-git6
 
 * Fri Jun 23 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git5

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- linux-2.6-compile-fixes.patch	23 Jun 2006 19:16:28 -0000	1.82
+++ linux-2.6-compile-fixes.patch	24 Jun 2006 07:10:13 -0000	1.83
@@ -1,76 +0,0 @@
-
-From: Andrew Morton <akpm at osdl.org>
-
-drivers/cpufreq/cpufreq_ondemand.c: In function 'do_dbs_timer':
-drivers/cpufreq/cpufreq_ondemand.c:374: warning: implicit declaration of function 'lock_cpu_hotplug'
-drivers/cpufreq/cpufreq_ondemand.c:381: warning: implicit declaration of function 'unlock_cpu_hotplug'
-drivers/cpufreq/cpufreq_conservative.c: In function 'do_dbs_timer':
-drivers/cpufreq/cpufreq_conservative.c:425: warning: implicit declaration of function 'lock_cpu_hotplug'
-drivers/cpufreq/cpufreq_conservative.c:432: warning: implicit declaration of function 'unlock_cpu_hotplug'
-
-Cc: Dave Jones <davej at codemonkey.org.uk>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- drivers/cpufreq/cpufreq_conservative.c |    1 +
- drivers/cpufreq/cpufreq_ondemand.c     |    1 +
- 2 files changed, 2 insertions(+)
-
-diff -puN drivers/cpufreq/cpufreq_ondemand.c~cpufreq-build-fix drivers/cpufreq/cpufreq_ondemand.c
---- a/drivers/cpufreq/cpufreq_ondemand.c~cpufreq-build-fix
-+++ a/drivers/cpufreq/cpufreq_ondemand.c
-@@ -21,6 +21,7 @@
- #include <linux/types.h>
- #include <linux/fs.h>
- #include <linux/sysfs.h>
-+#include <linux/cpu.h>
- #include <linux/sched.h>
- #include <linux/kmod.h>
- #include <linux/workqueue.h>
-diff -puN drivers/cpufreq/cpufreq_conservative.c~cpufreq-build-fix drivers/cpufreq/cpufreq_conservative.c
---- a/drivers/cpufreq/cpufreq_conservative.c~cpufreq-build-fix
-+++ a/drivers/cpufreq/cpufreq_conservative.c
-@@ -22,6 +22,7 @@
- #include <linux/types.h>
- #include <linux/fs.h>
- #include <linux/sysfs.h>
-+#include <linux/cpu.h>
- #include <linux/sched.h>
- #include <linux/kmod.h>
- #include <linux/workqueue.h>
-_
-
---- linux-2.6.17.noarch/drivers/pci/pcie/Kconfig~	2006-06-23 14:35:45.424777000 -0400
-+++ linux-2.6.17.noarch/drivers/pci/pcie/Kconfig	2006-06-23 14:36:03.808377000 -0400
-@@ -15,7 +15,7 @@ config PCIEPORTBUS
- #
- config HOTPLUG_PCI_PCIE
- 	tristate "PCI Express Hotplug driver"
--	depends on HOTPLUG_PCI && PCIEPORTBUS
-+	depends on HOTPLUG_PCI && PCIEPORTBUS && (BROKEN || ACPI)
- 	help
- 	  Say Y here if you have a motherboard that supports PCI Express Native
- 	  Hotplug
-
---- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h~	2006-06-23 15:14:49.023437000 -0400
-+++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h	2006-06-23 15:15:06.941500000 -0400
-@@ -12,7 +12,7 @@
-  *	access the videoram directly without any black magic.
-  */
- 
--#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
-+#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
- 
- #define vga_readb(x) (*(x))
- #define vga_writeb(x,y) (*(y) = (x))
---- linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h~	2006-06-23 15:15:13.543893000 -0400
-+++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h	2006-06-23 15:15:25.187234000 -0400
-@@ -12,7 +12,7 @@
-  *	access the videoram directly without any black magic.
-  */
- 
--#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
-+#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
- 
- #define vga_readb(x) (*(x))
- #define vga_writeb(x,y) (*(y) = (x))

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/arch/i386/kernel/sysenter.c |  123 ++++++++--------
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux/arch/i386/kernel/asm-offsets.c            |    1 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/entry.S                  |    8 -
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/signal.c                 |    4 
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S      |    6 
 linux/arch/i386/kernel/vsyscall.lds.S           |    4 
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  145 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   34 +++-
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/elf.h                    |   50 ++++--
 linux/include/asm-i386/mmu.h                    |    6 
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-i386/thread_info.h            |    1 
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 52 files changed, 915 insertions(+), 213 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-execshield.patch	22 May 2006 03:15:29 -0000	1.20
+++ linux-2.6-execshield.patch	24 Jun 2006 07:10:13 -0000	1.21
@@ -856,34 +856,34 @@
 ===================================================================
 --- linux.orig/fs/binfmt_elf.c
 +++ linux/fs/binfmt_elf.c
-@@ -47,7 +47,7 @@
+@@ -45,7 +45,7 @@
  
- static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs);
- static int load_elf_library(struct file*);
+ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);
+ static int load_elf_library(struct file *);
 -static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);
 +static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
  extern int dump_fpu (struct pt_regs *, elf_fpregset_t *);
  
  #ifndef elf_addr_t
-@@ -86,7 +86,7 @@ static struct linux_binfmt elf_format = 
+@@ -84,7 +84,7 @@ static struct linux_binfmt elf_format = 
  		.min_coredump	= ELF_EXEC_PAGESIZE
  };
  
--#define BAD_ADDR(x)	((unsigned long)(x) > TASK_SIZE)
-+#define BAD_ADDR(x)	((unsigned long)(x) > PAGE_MASK)
+-#define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE)
++#define BAD_ADDR(x) ((unsigned long)(x) > PAGE_MASK)
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -285,26 +285,65 @@ create_elf_tables(struct linux_binprm *b
+@@ -286,33 +286,72 @@ create_elf_tables(struct linux_binprm *b
  #ifndef elf_map
  
  static unsigned long elf_map(struct file *filep, unsigned long addr,
--			struct elf_phdr *eppnt, int prot, int type)
-+			     struct elf_phdr *eppnt, int prot, int type,
-+			     unsigned long total_size)
+-		struct elf_phdr *eppnt, int prot, int type)
++		struct elf_phdr *eppnt, int prot, int type,
++		unsigned long total_size)
  {
  	unsigned long map_addr;
--	unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr);
+ 	unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr);
 +	unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr);
 +	unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr);
 +
@@ -903,15 +903,14 @@
 +		return addr;
 +
 +	down_write(&current->mm->mmap_sem);
-+
 +	/*
-+	 * total_size is the size of the ELF (interpreter) image.
-+	 * The _first_ mmap needs to know the full size, otherwise
-+	 * randomization might put this image into an overlapping
-+	 * position with the ELF binary image. (since size < total_size)
-+	 * So we first map the 'big' image - and unmap the remainder at
-+	 * the end. (which unmap is needed for ELF images with holes.)
-+	 */
++	* total_size is the size of the ELF (interpreter) image.
++	* The _first_ mmap needs to know the full size, otherwise
++	* randomization might put this image into an overlapping
++	* position with the ELF binary image. (since size < total_size)
++	* So we first map the 'big' image - and unmap the remainder at
++	* the end. (which unmap is needed for ELF images with holes.)
++	*/
 +	if (total_size) {
 +		total_size = ELF_PAGEALIGN(total_size);
 +		map_addr = do_mmap(filep, addr, total_size, prot, type, off);
@@ -921,9 +920,7 @@
 +		map_addr = do_mmap(filep, addr, size, prot, type, off);
 +
  	up_write(&current->mm->mmap_sem);
--	return(map_addr);
-+
-+	return map_addr;
+ 	return(map_addr);
  }
  
  #endif /* !elf_map */
@@ -950,13 +947,12 @@
  /* This is much more generalized than the library routine read function,
     so we keep this separate.  Technically the library read function
     is only provided so that we can read a.out libraries that have
-@@ -312,7 +351,8 @@ static unsigned long elf_map(struct file
+    an ELF header */
  
- static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,
- 				     struct file * interpreter,
--				     unsigned long *interp_load_addr)
-+				     unsigned long *interp_map_addr,
-+				     unsigned long no_base)
+ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+-		struct file *interpreter, unsigned long *interp_load_addr)
++		struct file *interpreter, unsigned long *interp_load_addr,
++		unsigned long no_base)
  {
  	struct elf_phdr *elf_phdata;
  	struct elf_phdr *eppnt;
@@ -979,27 +975,28 @@
  	eppnt = elf_phdata;
  	for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
  	  if (eppnt->p_type == PT_LOAD) {
-@@ -372,8 +417,13 @@ static unsigned long load_elf_interp(str
- 	    vaddr = eppnt->p_vaddr;
- 	    if (interp_elf_ex->e_type == ET_EXEC || load_addr_set)
- 	    	elf_type |= MAP_FIXED;
-+	    else if (no_base && interp_elf_ex->e_type == ET_DYN)
-+		load_addr = -vaddr;
- 
--	    map_addr = elf_map(interpreter, load_addr + vaddr, eppnt, elf_prot, elf_type);
-+	    map_addr = elf_map(interpreter, load_addr + vaddr, eppnt, elf_prot, elf_type, total_size);
-+	    total_size = 0;
-+	    if (!*interp_map_addr)
-+		*interp_map_addr = map_addr;
- 	    error = map_addr;
- 	    if (BAD_ADDR(map_addr))
- 	    	goto out_close;
-@@ -435,8 +485,7 @@ static unsigned long load_elf_interp(str
+@@ -419,9 +419,14 @@ static unsigned long load_elf_interp(str
+ 			vaddr = eppnt->p_vaddr;
+ 			if (interp_elf_ex->e_type == ET_EXEC || load_addr_set)
+ 				elf_type |= MAP_FIXED;
++			else if (no_base && interp_elf_ex->e_type == ET_DYN)
++				load_addr = -vaddr;
+ 
+ 			map_addr = elf_map(interpreter, load_addr + vaddr,
+-					   eppnt, elf_prot, elf_type);
++					   eppnt, elf_prot, elf_type, total_size);
++			total_size = 0;
++			if (!*interp_map_addr)
++				*interp_map_addr = map_addr;
+ 			error = map_addr;
+ 			if (BAD_ADDR(map_addr))
+ 				goto out_close;
+@@ -487,8 +492,7 @@ static unsigned long load_elf_interp(str
  			goto out_close;
  	}
  
 -	*interp_load_addr = load_addr;
--	error = ((unsigned long) interp_elf_ex->e_entry) + load_addr;
+-	error = ((unsigned long)interp_elf_ex->e_entry) + load_addr;
 +	error = load_addr;
  
  out_close:
@@ -1066,41 +1063,41 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if ( !(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -790,10 +856,10 @@ static int load_elf_binary(struct linux_
- 	
+@@ -861,9 +865,8 @@ static int load_elf_binary(struct linux_
  	current->mm->start_stack = bprm->p;
  
-+
  	/* Now we do a little grungy work by mmaping the ELF image into
 -	   the correct location in memory.  At this point, we assume that
 -	   the image should be loaded at fixed address, not at a variable
 -	   address. */
 +	   the correct location in memory.
 +	 */
- 
- 	for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
+ 	for(i = 0, elf_ppnt = elf_phdata;
+ 	    i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
  		int elf_prot = 0, elf_flags;
-@@ -837,16 +903,16 @@ static int load_elf_binary(struct linux_
- 		elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE;
+@@ -913,18 +913,18 @@ static int load_elf_binary(struct linux_
+ 		elf_flags = MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE;
  
  		vaddr = elf_ppnt->p_vaddr;
 -		if (loc->elf_ex.e_type == ET_EXEC || load_addr_set) {
 +		if (loc->elf_ex.e_type == ET_EXEC || load_addr_set)
  			elf_flags |= MAP_FIXED;
 -		} else if (loc->elf_ex.e_type == ET_DYN) {
--			/* Try and get dynamic programs out of the way of the default mmap
--			   base, as well as whatever program they might try to exec.  This
--			   is because the brk will follow the loader, and is not movable.  */
+-			/* Try and get dynamic programs out of the way of the
+-			 * default mmap base, as well as whatever program they
+-			 * might try to exec.  This is because the brk will
+-			 * follow the loader, and is not movable.  */
 +		else if (loc->elf_ex.e_type == ET_DYN)
 +#ifdef __i386__
 +			load_bias = 0;
 +#else
  			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
--		}
 +#endif
+ 		}
  
--		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
-+		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags, 0);
+ 		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
+-				elf_prot, elf_flags);
++				elf_prot, elf_flags, 0);
  		if (BAD_ADDR(error)) {
  			send_sig(SIGKILL, current, 0);
  			goto out_free_dentry;
@@ -1162,14 +1159,14 @@
  	if (current->personality & MMAP_PAGE_ZERO) {
  		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,
  		   and some applications "depend" upon this behavior.
-@@ -1158,6 +1236,9 @@ static int maydump(struct vm_area_struct
+@@ -1251,6 +1251,9 @@ static int maydump(struct vm_area_struct
  	if (vma->vm_flags & (VM_IO | VM_RESERVED))
  		return 0;
  
 +	if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO.  */
 +		return 1;
 +
- 	/* Dump shared memory only if mapped from an anonymous file.  */
+ 	/* Dump shared memory only if mapped from an anonymous file. */
  	if (vma->vm_flags & VM_SHARED)
  		return vma->vm_file->f_dentry->d_inode->i_nlink == 0;
 Index: linux/fs/proc/array.c
@@ -2200,15 +2197,15 @@
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
  
-@@ -105,7 +106,7 @@ mprotect_fixup(struct vm_area_struct *vm
+@@ -123,7 +123,7 @@ mprotect_fixup(struct vm_area_struct *vm
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
 -	unsigned long charged = 0;
 +	unsigned long charged = 0, old_end = vma->vm_end;
+ 	unsigned int mask;
  	pgprot_t newprot;
  	pgoff_t pgoff;
- 	int error;
 @@ -167,6 +167,8 @@ success:
  	 */
  	vma->vm_flags = newflags;

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h         |    7 +++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h      |    2 -
 linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h    |    2 -
 16 files changed, 49 insertions(+), 12 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-xen-compile-fixes.patch	26 Apr 2006 11:13:46 -0000	1.9
+++ linux-2.6-xen-compile-fixes.patch	24 Jun 2006 07:10:13 -0000	1.10
@@ -215,3 +215,25 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
+--- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h~	2006-06-23 15:14:49.023437000 -0400
++++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h	2006-06-23 15:15:06.941500000 -0400
+@@ -12,7 +12,7 @@
+  *	access the videoram directly without any black magic.
+  */
+ 
+-#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
++#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
+ 
+ #define vga_readb(x) (*(x))
+ #define vga_writeb(x,y) (*(y) = (x))
+--- linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h~	2006-06-23 15:15:13.543893000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h	2006-06-23 15:15:25.187234000 -0400
+@@ -12,7 +12,7 @@
+  *	access the videoram directly without any black magic.
+  */
+ 
+-#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
++#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
+ 
+ #define vga_readb(x) (*(x))
+ #define vga_writeb(x,y) (*(y) = (x))

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   54 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   43 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82853 insertions(+), 258 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- linux-2.6-xen.patch	23 Jun 2006 15:47:42 -0000	1.27
+++ linux-2.6-xen.patch	24 Jun 2006 07:10:13 -0000	1.28
@@ -50,16 +50,16 @@
  	help
  	  This enables the use of the HPET for the kernel's internal timer.
  	  HPET is the next generation timer replacing legacy 8254s.
-@@ -223,7 +233,7 @@ config NR_CPUS
+@@ -239,7 +239,7 @@ config NR_CPUS
  
  config SCHED_SMT
  	bool "SMT (Hyperthreading) scheduler support"
 -	depends on SMP
 +	depends on SMP && !X86_XEN
- 	default off
  	help
  	  SMT scheduler support improves the CPU scheduler's decision making
-@@ -233,7 +243,7 @@ config SCHED_SMT
+ 	  when dealing with Intel Pentium 4 chips with HyperThreading at a
+@@ -248,7 +248,7 @@ config SCHED_SMT
  
  config SCHED_MC
  	bool "Multi-core scheduler support"
@@ -68,7 +68,7 @@
  	default y
  	help
  	  Multi-core scheduler support improves the CPU scheduler's decision
-@@ -244,7 +254,7 @@ source "kernel/Kconfig.preempt"
+@@ -259,7 +259,7 @@ source "kernel/Kconfig.preempt"
  
  config X86_UP_APIC
  	bool "Local APIC support on uniprocessors"
@@ -86723,7 +86723,7 @@
  	if (!skb)
  		goto out;
  
-@@ -235,16 +241,29 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -235,17 +235,30 @@ struct sk_buff *alloc_skb_from_cache(kme
  	skb->data = data;
  	skb->tail = data;
  	skb->end  = data + size;
@@ -86731,17 +86731,12 @@
 +	shinfo = skb_shinfo(skb);
 +	atomic_set(&shinfo->dataref, 1);
 +	shinfo->nr_frags  = 0;
-+	shinfo->tso_size = 0;
-+	shinfo->tso_segs = 0;
-+	shinfo->ufo_size = 0;
++	shinfo->gso_size = 0;
++	shinfo->gso_segs = 0;
++	shinfo->gso_size = 0;
 +	shinfo->ip6_frag_id = 0;
 +	shinfo->frag_list = NULL;
- 
--	atomic_set(&(skb_shinfo(skb)->dataref), 1);
--	skb_shinfo(skb)->nr_frags  = 0;
--	skb_shinfo(skb)->tso_size = 0;
--	skb_shinfo(skb)->tso_segs = 0;
--	skb_shinfo(skb)->frag_list = NULL;
++
 +	if (fclone) {
 +		struct sk_buff *child = skb + 1;
 +		atomic_t *fclone_ref = (atomic_t *) (child + 1);
@@ -86751,6 +86746,13 @@
 +
 +		child->fclone = SKB_FCLONE_UNAVAILABLE;
 +	}
+ 
+-	atomic_set(&(skb_shinfo(skb)->dataref), 1);
+-	skb_shinfo(skb)->nr_frags  = 0;
+-	skb_shinfo(skb)->gso_size = 0;
+-	skb_shinfo(skb)->gso_segs = 0;
+-	skb_shinfo(skb)->gso_type = 0;
+-	skb_shinfo(skb)->frag_list = NULL;
  out:
  	return skb;
  nodata:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- sources	23 Jun 2006 15:47:48 -0000	1.404
+++ sources	24 Jun 2006 07:10:14 -0000	1.405
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-2f00efd53336014c2e9910d2feff1c53  patch-2.6.17-git5.bz2
+8ae664359a83c9b8a778e0badebcdff5  patch-2.6.17-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- upstream	23 Jun 2006 15:47:48 -0000	1.369
+++ upstream	24 Jun 2006 07:10:14 -0000	1.370
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git5.bz2
+patch-2.6.17-git6.bz2


--- linux-2.6-acpi-ecdt-uid-hack.patch DELETED ---


--- linux-2.6-fix-tcp-h.patch DELETED ---


--- linux-2.6-x86-cpu_index-false.patch DELETED ---


--- patch-2.6.17-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jun 24 07:57:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 03:57:05 -0400
Subject: rpms/kdelibs/devel kde.sh,1.2,1.3 kdelibs.spec,1.145,1.146
Message-ID: <200606240757.k5O7v5hY020488@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20417

Modified Files:
	kde.sh kdelibs.spec 
Log Message:
- fix #196013, mark kde.sh/kde.csh as config file
- fix #178323 #196225, typo in kde.sh



Index: kde.sh
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kde.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde.sh	16 May 2006 14:56:43 -0000	1.2
+++ kde.sh	24 Jun 2006 07:57:03 -0000	1.3
@@ -1,7 +1,7 @@
 # When/if using prelinking, avoids (some) use of kdeinit
 if [ -f /etc/sysconfig/prelink ] ; then
    source /etc/sysconfig/prelink
-   if [ "$PRELINKING" == yes ] ; then
+   if [ "$PRELINKING" = yes ] ; then
       [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
    fi
 fi


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdelibs.spec	8 Jun 2006 14:00:37 -0000	1.145
+++ kdelibs.spec	24 Jun 2006 07:57:03 -0000	1.146
@@ -1,4 +1,4 @@
-%define redhatify 1
+%define distname "Fedora-Core"
 
 %define debug 0
 %define final 1
@@ -16,22 +16,19 @@
 %define make_cvs 0
 %define fam 1
 %define dnotify 1
-%define pcre 1
-%define alsa 1
-%define pie 1
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 4
+Release: 5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
 Epoch: 6
 Group: System Environment/Libraries
 License: LGPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
@@ -59,28 +56,22 @@
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: iceauth
-
-%if %{redhatify}
 Requires: desktop-backgrounds-basic
 Requires: redhat-artwork >= 0.239-2
 Requires: hicolor-icon-theme
 Requires: redhat-menus >= 5.0.4
-%endif
-
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): desktop-file-utils
-Requires: fileutils
+Requires(pre): coreutils
+Requires(post): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): /sbin/ldconfig
+Requires(postun): desktop-file-utils
 Requires: shadow-utils
-Requires: dev
 
 %if %{fam}
 BuildRequires: fam-devel
 %endif
 
-%if %{pcre}
 BuildRequires: pcre-devel
-%endif
-
 BuildRequires: cups-devel >= %{cups_epoch}:1.1.20
 BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: flex >= 2.5.4a-13
@@ -105,14 +96,18 @@
 BuildRequires: byacc
 BuildRequires: libart_lgpl-devel >= 2.3.8
 BuildRequires: bzip2-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: pkgconfig
-BuildRequires: autoconf automake
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libacl-devel
 BuildRequires: libattr-devel
 BuildRequires: aspell-devel
+BuildRequires: krb5-devel
+BuildRequires: openldap-devel
+BuildRequires: db4-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: pkgconfig
+
 Obsoletes: %{name}2
 Obsoletes: kdesupport
 Obsoletes: kdoc
@@ -144,9 +139,8 @@
 %if %{fam}
 Requires: fam-devel
 %endif
-%if %{pcre}
 Requires: pcre-devel
-%endif
+
 Obsoletes: kdesupport-devel
 
 %description devel
@@ -183,46 +177,19 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
-# add redhat into KDE_VERSION_STRING
-%if %{redhatify}
-   perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
-%endif
+perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %build
-export QTDOC=%{qtdocdir}
 unset QTDIR && . /etc/profile.d/qt.sh
+export QTDOC=%{qtdocdir}
 export libltdl_cv_shlibext=".so"
+export PATH=/usr/kerberos/bin:${PATH}
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
-# set some default FLAGS
-FLAGS="%{optflags}"
-
-%if %{debug}
-   FLAGS="-O0"
-%endif
-
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-
-if pkg-config openssl ; then
-   export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-   export CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`"
-   export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
-   export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-
-# Check which version/distribution we are...
-%if %{redhatify}
-   VERSION=`cat /etc/redhat-release 2>/dev/null |awk '{ print $5; }'`
-   if [ -z "$VERSION" -o -z "echo $VERSION |sed -e 's,[0-9]*,,g;s,\.,,g'" ]; then
-      VERSION="A Red Hat Linux-based distribution"
-   else
-      VERSION="Red Hat Linux $VERSION"
-   fi
-%endif
+VERSION=`cat /etc/redhat-release 2>/dev/null`
 
 suffix=""
 if [ "%{_lib}" == "lib64" ] ; then
@@ -240,18 +207,12 @@
 %if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
 %endif
-%if %{pie}
    --enable-pie \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
-%if %{redhatify}
    --with-distribution="$VERSION" \
-%endif 
-%if %{alsa}
    --with-alsa \
-%endif
    --includedir=%{_includedir}/kde \
 %if %{debug} == 0
    --disable-debug \
@@ -266,9 +227,6 @@
 %if %{dnotify}
    --enable-dnotify \
 %endif
-%if %{pcre} == 0
-   --disable-pcre \
-%endif
    --disable-rpath \
    --with-rgbfile=%{_datadir}/X11/rgb.txt
 
@@ -306,15 +264,13 @@
 done
 popd
 
-%if %{redhatify}
-   mkdir -p %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
-   pushd %{buildroot}%{_sysconfdir}/xdg/menus/
-      mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
-      ln -s applications-merged kde-applications-merged
-   popd
-   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
-   rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
-%endif
+mkdir -p %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
+pushd %{buildroot}%{_sysconfdir}/xdg/menus/
+   mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
+   ln -s applications-merged kde-applications-merged
+popd
+echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
 
 %clean
 rm -rf %{buildroot}
@@ -348,13 +304,67 @@
 %dir %{_sysconfdir}/xdg.d
 %dir %{_sysconfdir}/xdg.d/kde
 %dir %{_sysconfdir}/xdg.d/kde/menus
-%{_sysconfdir}/profile.d/*
+%config(noreplace) %{_sysconfdir}/profile.d/*
 %{_sysconfdir}/xdg/menus/*
 %{_sysconfdir}/xdg.d/kde/menus/*
-%{_bindir}/*
+%{_bindir}/artsmessage
+%{_bindir}/checkXML
+%{_bindir}/cupsdconf
+%{_bindir}/cupsdoprint
+%{_bindir}/dcop
+%{_bindir}/dcopclient
+%{_bindir}/dcopfind
+%{_bindir}/dcopobject
+%{_bindir}/dcopquit
+%{_bindir}/dcopref
+%{_bindir}/dcopserver
+%{_bindir}/dcopserver_shutdown
+%{_bindir}/dcopstart
+%{_bindir}/filesharelist
+%{_bindir}/fileshareset
+%{_bindir}/imagetops
+%{_bindir}/kab2kabc
+%{_bindir}/kaddprinterwizard
+%{_bindir}/kbuildsycoca
+%{_bindir}/kcmshell
+%{_bindir}/kconf_update
+%{_bindir}/kconfig_compiler
+%{_bindir}/kcookiejar
+%{_bindir}/kde-config
+%{_bindir}/kde-menu
+%{_bindir}/kded
+%{_bindir}/kdeinit
+%{_bindir}/kdeinit_shutdown
+%{_bindir}/kdeinit_wrapper
+%{_bindir}/kdesu_stub
+%{_bindir}/kdontchangethehostname
+%{_bindir}/kdostartupconfig
+%{_bindir}/kfile
+%{_bindir}/kfmexec
+%{_bindir}/khotnewstuff
+%{_bindir}/kinstalltheme
+%{_bindir}/kio_http_cache_cleaner
+%{_bindir}/kio_uiserver
+%{_bindir}/kioexec
+%{_bindir}/kioslave
+%{_bindir}/klauncher
+%{_bindir}/kmailservice
+%{_bindir}/ksendbugmail
+%{_bindir}/kshell
+%{_bindir}/kstartupconfig
+%{_bindir}/ksvgtopng
+%{_bindir}/ktelnetservice
+%{_bindir}/ktradertest
+%{_bindir}/kunittestmodrunner
+%{_bindir}/kwrapper
+%{_bindir}/lnusertemp
+%{_bindir}/make_driver_db_cups
+%{_bindir}/make_driver_db_lpr
+%{_bindir}/makekdewidgets
+%{_bindir}/meinproc
+%{_bindir}/preparetips
 %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %attr(4755,root,root) %{_bindir}/kgrantpty
-%exclude %{_bindir}/dcopidl*
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*
 %{_libdir}/lib*.la
@@ -372,9 +382,9 @@
 %{_datadir}/services
 %{_datadir}/servicetypes
 %dir %{_docdir}/HTML
-%dir %{_docdir}/HTML/en
-%doc %{_docdir}/HTML/en/common
-%doc %{_docdir}/HTML/en/kspell
+%dir(en) %{_docdir}/HTML/en
+%doc(en) %{_docdir}/HTML/en/common
+%doc(en) %{_docdir}/HTML/en/kspell
 
 %files devel
 %defattr(-,root,root)
@@ -390,6 +400,10 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Sat Jun 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
+- fix #196013, mark kde.sh/kde.csh as config file
+- fix #178323 #196225, typo in kde.sh
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
 - enable --enable-new-ldflags again since ld bug fixed
 - move only *.so symlinks to -devel subpackage



From fedora-cvs-commits at redhat.com  Sat Jun 24 13:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 09:48:01 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-khtml-regression.patch, NONE,
	1.1 kdelibs-3.5.3-konqueror-khtml.patch, NONE,
	1.1 kdelibs-3.5.3.diff, NONE, 1.1 kdelibs.spec, 1.146, 1.147
Message-ID: <200606241348.k5ODm1Ev006601@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6525

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-khtml-regression.patch 
	kdelibs-3.5.3-konqueror-khtml.patch kdelibs-3.5.3.diff 
Log Message:
apply upstream patches


kdelibs-3.5.3-khtml-regression.patch:
 htmltokenizer.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-khtml-regression.patch ---
--- kdelibs-3.5.3/khtml/html/htmltokenizer.cpp.orig	2006-06-24 15:12:38.000000000 +0200
+++ kdelibs-3.5.3/khtml/html/htmltokenizer.cpp	2006-06-24 15:14:08.000000000 +0200
@@ -388,9 +388,10 @@
 
     // Scripts following a frameset element should not be executed or even loaded in the case of extern scripts.
     bool followingFrameset = (parser->doc()->body() && parser->doc()->body()->id() == ID_FRAMESET);
+    bool effectiveScript = !parser->skipMode() && !followingFrameset; 
     bool deferredScript = false;
 
-    if ( !parser->skipMode() && !followingFrameset) {
+    if ( effectiveScript ) { 
         CachedScript* cs = 0;
 
         // forget what we just got, load from src url instead
@@ -419,7 +420,7 @@
     script = false;
     scriptCodeSize = scriptCodeResync = 0;
 
-    if (parser->skipMode() || followingFrameset)
+    if ( !effectiveScript )
         return;
 
     if ( !m_executingScript && cachedScript.isEmpty() ) {

kdelibs-3.5.3-konqueror-khtml.patch:
 dom_stringimpl.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdelibs-3.5.3-konqueror-khtml.patch ---
--- kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp.orig	2006-06-14 11:47:06.000000000 +0200
+++ kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp	2006-06-14 11:49:01.000000000 +0200
@@ -308,6 +308,11 @@
     str = str.simplifyWhiteSpace();
 
     len = str.contains(',') + 1;
+
+    // If we have no commas, we have no array. 
+    if( len == 1 ) 
+        return 0L; 
+ 
     khtml::Length* r = new khtml::Length[len];
 
     int i = 0;

kdelibs-3.5.3.diff:
 kcrash.cpp   |    7 +++++--
 kprocess.cpp |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.3.diff ---
Patch102: kdelibs-3.5.3.diff
------------------------------------------------------------------------
r549079 | mueller | 2006-06-07 13:18:16 +0200 (Wed, 07 Jun 2006) | 2 lines

add safety checks for set*uid return values

------------------------------------------------------------------------
Index: kdecore/kprocess.cpp
===================================================================
--- kdecore/kprocess.cpp	(revision 549078)
+++ kdecore/kprocess.cpp	(revision 549079)
@@ -387,7 +387,10 @@ bool KProcess::start(RunMode runmode, Co
            if (pw)
               initgroups(pw->pw_name, pw->pw_gid);
 #endif
-           setuid(getuid());
+	   if (geteuid() != getuid())
+	       setuid(getuid());
+	   if (geteuid() != getuid())
+	       _exit(1);
         }
 
         setupEnvironment();
Index: kdecore/kcrash.cpp

===================================================================
--- kdecore/kcrash.cpp	(revision 549078)
+++ kdecore/kcrash.cpp	(revision 549079)
 com
iapply upstream patches
  kdlel	.s	
  pid_t pid = fork();
   - apply upstream patches
if (pid <= 0)
   {
-    setgid(getgid());
-    setuid(getuid());
+    if(!geteuid() && setgid(getgid()) < 0)
+      _exit(253);
+    if(!geteuid() && setuid(getuid()) < 0)
+      _exit(253);
     execvp("drkonqi", const_cast< char** >( argv ));
+    _exit(errno);
   }
   else
   {ireturn-check


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdelibs.spec	24 Jun 2006 07:57:03 -0000	1.146
+++ kdelibs.spec	24 Jun 2006 13:47:58 -0000	1.147
@@ -50,6 +50,11 @@
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
+# upstream patches
+Patch100: kdelibs-3.5.3-konqueror-khtml.patch
+Patch101: kdelibs-3.5.3-khtml-regression.patch
+Patch102: kdelibs-3.5.3.diff
+
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -177,10 +182,16 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
+# upstream patches
+%patch100 -p1 -b .konqueror-khtml
+%patch101 -p1 -b .khtml-regression
+%patch102 -p0 -b .return-check
+
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
+
 export QTDOC=%{qtdocdir}
 export libltdl_cv_shlibext=".so"
 export PATH=/usr/kerberos/bin:${PATH}
@@ -403,6 +414,7 @@
 * Sat Jun 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - fix #196013, mark kde.sh/kde.csh as config file
 - fix #178323 #196225, typo in kde.sh
+- apply upstream patches
 
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
 - enable --enable-new-ldflags again since ld bug fixed



From fedora-cvs-commits at redhat.com  Sat Jun 24 18:41:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 14:41:02 -0400
Subject: rpms/kernel/devel linux-2.6-execshield.patch,1.21,1.22
Message-ID: <200606241841.k5OIf2uD029952@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29907

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
buildfixes


linux-2.6-execshield.patch:
 linux-2.6.16.noarch/arch/i386/kernel/sysenter.c |  123 ++++++++--------
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux/arch/i386/kernel/asm-offsets.c            |    1 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/entry.S                  |    8 -
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/signal.c                 |    4 
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S      |    6 
 linux/arch/i386/kernel/vsyscall.lds.S           |    4 
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   34 +++-
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/elf.h                    |   50 ++++--
 linux/include/asm-i386/mmu.h                    |    6 
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-i386/thread_info.h            |    1 
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 52 files changed, 915 insertions(+), 215 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-execshield.patch	24 Jun 2006 07:10:13 -0000	1.21
+++ linux-2.6-execshield.patch	24 Jun 2006 18:40:59 -0000	1.22
@@ -874,7 +874,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -286,33 +286,72 @@ create_elf_tables(struct linux_binprm *b
+@@ -286,33 +286,71 @@ create_elf_tables(struct linux_binprm *b
  #ifndef elf_map
  
  static unsigned long elf_map(struct file *filep, unsigned long addr,
@@ -883,7 +883,7 @@
 +		unsigned long total_size)
  {
  	unsigned long map_addr;
- 	unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr);
+-	unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr);
 +	unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr);
 +	unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr);
 +
@@ -951,7 +951,7 @@
  
  static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
 -		struct file *interpreter, unsigned long *interp_load_addr)
-+		struct file *interpreter, unsigned long *interp_load_addr,
++		struct file *interpreter, unsigned long *interp_map_addr,
 +		unsigned long no_base)
  {
  	struct elf_phdr *elf_phdata;
@@ -1075,7 +1075,7 @@
  	for(i = 0, elf_ppnt = elf_phdata;
  	    i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
  		int elf_prot = 0, elf_flags;
-@@ -913,18 +913,18 @@ static int load_elf_binary(struct linux_
+@@ -913,18 +913,17 @@ static int load_elf_binary(struct linux_
  		elf_flags = MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE;
  
  		vaddr = elf_ppnt->p_vaddr;
@@ -1093,7 +1093,7 @@
 +#else
  			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
 +#endif
- 		}
+-		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
 -				elf_prot, elf_flags);



From fedora-cvs-commits at redhat.com  Sat Jun 24 18:55:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 14:55:58 -0400
Subject: rpms/kernel/devel patch-2.6.17-git7.bz2.sign, NONE, 1.1 .cvsignore,
	1.461, 1.462 kernel-2.6.spec, 1.2309,
	1.2310 linux-2.6-sata-promise-pata-ports.patch, 1.2,
	1.3 linux-2.6-xen.patch, 1.28, 1.29 sources, 1.405,
	1.406 upstream, 1.370,
	1.371 linux-2.6-sata-silence-dumb-msg.patch, 1.1,
	NONE patch-2.6.17-git6.bz2.sign, 1.1, NONE
Message-ID: <200606241855.k5OItwtY017703@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17659

Modified Files:
	.cvsignore kernel-2.6.spec 
	linux-2.6-sata-promise-pata-ports.patch linux-2.6-xen.patch 
	sources upstream 
Added Files:
	patch-2.6.17-git7.bz2.sign 
Removed Files:
	linux-2.6-sata-silence-dumb-msg.patch 
	patch-2.6.17-git6.bz2.sign 
Log Message:
git7



--- NEW FILE patch-2.6.17-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEnOOuyGugalF9Dw4RAhZHAJ9GTPL2DvAlo0Pr0QwPu8MyRNnW5QCfev1S
2ca0fWzOWen+ViudV4mmUEU=
=Oik8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- .cvsignore	24 Jun 2006 07:10:13 -0000	1.461
+++ .cvsignore	24 Jun 2006 18:55:55 -0000	1.462
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git6.bz2
+patch-2.6.17-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2309
retrieving revision 1.2310
diff -u -r1.2309 -r1.2310
--- kernel-2.6.spec	24 Jun 2006 07:10:13 -0000	1.2309
+++ kernel-2.6.spec	24 Jun 2006 18:55:55 -0000	1.2310
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git6.bz2
+Patch1: patch-2.6.17-git7.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -407,7 +407,6 @@
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
-Patch2201: linux-2.6-sata-silence-dumb-msg.patch
 Patch2202: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
@@ -1004,10 +1003,8 @@
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
-# Silence silly SATA printk.
-%patch2201 -p1
 # Fix AHCI Suspend.
-%patch2202 -p1
+#%patch2202 -p1
 
 # ACPI patches
 # Silence more ACPI debug spew from suspend.
@@ -1663,7 +1660,9 @@
 %changelog
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.
-- 2.6.17-git6
+- 2.6.17-git6 & git7
+  This required lots of rediffing. SATA suspend, Promise PATA-on-SATA,
+  Xen, exec-shield, and more.  Tread carefully, harmful if swallowed etc.
 
 * Fri Jun 23 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git5

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/libata-core.c  |    1 +
 drivers/scsi/sata_promise.c |   43 +++++++++++++++++++++++++++++++++++++++----
 include/linux/libata.h      |    1 +
 3 files changed, 41 insertions(+), 4 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-sata-promise-pata-ports.patch	21 Apr 2006 17:42:16 -0000	1.2
+++ linux-2.6-sata-promise-pata-ports.patch	24 Jun 2006 18:55:55 -0000	1.3
@@ -31,43 +31,36 @@
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
  		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
-@@ -360,15 +360,34 @@
+@@ -363,8 +363,16 @@ static void pdc_reset_port(struct ata_po
  
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {
 -	pdc_reset_port(ap);
 -	sata_phy_reset(ap);
-+/*	pdc_reset_port(ap); */	/* pata fix */
-+/*	sata_phy_reset(ap); */	/* pata fix */
-+	/* if no sata flag, test for pata drive */	/* pata fix */
-+	if (ap->flags & ATA_FLAG_SATA)	/* pata fix */
-+	{				/* pata fix */
-+		pdc_reset_port(ap);	/* pata fix */
-+		sata_phy_reset(ap);	/* pata fix */
-+	}				/* pata fix */
-+	else				/* pata fix */
-+		pdc_pata_phy_reset(ap);	/* pata fix */
++	/*    pdc_reset_port(ap); */  /* pata fix */
++	/*    sata_phy_reset(ap); */  /* pata fix */
++	/* if no sata flag, test for pata drive */      /* pata fix */
++	if (ap->flags & ATA_FLAG_SATA)  /* pata fix */
++	{                               /* pata fix */
++		pdc_reset_port(ap);     /* pata fix */
++		sata_phy_reset(ap);     /* pata fix */
++	}                               /* pata fix */
++	else                            /* pata fix */
++		pdc_pata_phy_reset(ap); /* pata fix */
  }
  
+ static void pdc_pata_cbl_detect(struct ata_port *ap)
+@@ -383,6 +391,12 @@ static void pdc_pata_cbl_detect(struct a
+ 
  static void pdc_pata_phy_reset(struct ata_port *ap)
  {
- 	/* FIXME: add cable detect.  Don't assume 40-pin cable */
--	ap->cbl = ATA_CBL_PATA40;
--	ap->udma_mask &= ATA_UDMA_MASK_40C;
-+/*	ap->cbl = ATA_CBL_PATA40; */			/* pata fix */
-+/*	ap->udma_mask &= ATA_UDMA_MASK_40C; */		/* pata fix */
-+	/* add cable detection code for pata drives */	/* pata fix */
-+	u8 tmp;						/* pata fix */
-+	void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;	/* pata fix */
-+	tmp = readb(mmio);				/* pata fix */
-+	if (tmp & 0x01)					/* pata fix */
-+	{						/* pata fix */
-+		ap->cbl = ATA_CBL_PATA40;		/* pata fix */
-+		ap->udma_mask &= ATA_UDMA_MASK_40C;	/* pata fix */
-+	}						/* pata fix */
-+	else						/* pata fix */
-+		ap->cbl = ATA_CBL_PATA80;		/* pata fix */
- 
++	u8 tmp;                                         /* pata fix */
++	void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata fix */
++	tmp = readb(mmio);                              /* pata fix */
++	if (tmp & 0x01)                                 /* pata fix */
++		ap->udma_mask &= ATA_UDMA_MASK_40C;     /* pata fix */
++
+ 	pdc_pata_cbl_detect(ap);
  	pdc_reset_port(ap);
  	ata_port_probe(ap);
 @@ -673,6 +692,7 @@

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1795 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  665 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1103 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  414 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  642 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   65 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   68 
 arch/ia64/kernel/irq_ia64.c                         |  200 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   53 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   60 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  761 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   57 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1179 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  257 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  605 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  580 ++++
 drivers/xen/blkback/common.h                        |  136 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  822 +++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  900 ++++++
 drivers/xen/blktap/common.h                         |  100 
 drivers/xen/blktap/interface.c                      |  134 
 drivers/xen/blktap/xenbus.c                         |  223 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  855 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  460 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  134 
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1597 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  370 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  327 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   71 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |    8 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  198 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   52 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  112 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  280 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  319 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  224 +
 include/xen/interface/arch-x86_64.h                 |  293 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  574 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  187 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  144 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  296 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  121 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   43 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 258 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- linux-2.6-xen.patch	24 Jun 2006 07:10:13 -0000	1.28
+++ linux-2.6-xen.patch	24 Jun 2006 18:55:55 -0000	1.29
@@ -21398,14 +21398,6 @@
  #ifdef CONFIG_BLK_DEV_INITRD
  	if (ia64_boot_param->initrd_start) {
  		rsvd_region[n].start = (unsigned long)__va(ia64_boot_param->initrd_start);
-@@ -260,6 +272,7 @@ reserve_memory (void)
- 	n++;
- 
- 	num_rsvd_regions = n;
-+	BUG_ON(IA64_MAX_RSVD_REGIONS + 1 < n);
- 
- 	sort_regions(rsvd_region, num_rsvd_regions);
- }
 @@ -333,6 +346,16 @@ early_console_setup (char *cmdline)
  {
  	int earlycons = 0;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- sources	24 Jun 2006 07:10:14 -0000	1.405
+++ sources	24 Jun 2006 18:55:56 -0000	1.406
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-8ae664359a83c9b8a778e0badebcdff5  patch-2.6.17-git6.bz2
+43752b2e8d7de5e783e4f8a76ff69dae  patch-2.6.17-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- upstream	24 Jun 2006 07:10:14 -0000	1.370
+++ upstream	24 Jun 2006 18:55:56 -0000	1.371
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git6.bz2
+patch-2.6.17-git7.bz2


--- linux-2.6-sata-silence-dumb-msg.patch DELETED ---


--- patch-2.6.17-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 25 01:41:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 21:41:00 -0400
Subject: rpms/w3m/devel w3m.spec,1.32,1.33
Message-ID: <200606250141.k5P1f0Jq017233@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17190

Modified Files:
	w3m.spec 
Log Message:
adding missing BRs


Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- w3m.spec	6 Mar 2006 10:42:35 -0000	1.32
+++ w3m.spec	25 Jun 2006 01:40:55 -0000	1.33
@@ -4,13 +4,15 @@
 
 Name:		w3m
 Version:	0.5.1
-Release: 13
+Release: 	14
 License:	BSD
 URL:		http://w3m.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildPreReq:	bzip2 findutils sed ncurses-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
+BuildRequires:	gettext-devel
+BuildRequires:	automake
 BuildPreReq:	gtk2-devel
 %ifnarch s390 s390x
 BuildRequires:	gpm-devel
@@ -134,6 +136,9 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-14
+- Fix missing br gettext-devel, automake
+
 * Mon Mar  6 2006 Akira TAGOH <tagoh at redhat.com> - 0.5.1-13
 - w3m-multilib.patch: fixed to link 64bit version of libnsl.so. (#182408)
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 02:26:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 22:26:29 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.45,1.46
Message-ID: <200606250226.k5P2QTSa028909@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28884

Modified Files:
	gnome-python-extras.spec 
Log Message:
adding missing BR


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-python-extras.spec	13 Mar 2006 16:11:45 -0000	1.45
+++ gnome-python-extras.spec	25 Jun 2006 02:26:27 -0000	1.46
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.14.0
-Release: 1
+Release: 2
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.13/gnome-python-extras-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires: gtkspell-devel >= %{gtkspell_version}
 BuildRequires: mozilla-devel >= %{mozilla_version}
 BuildRequires: python-devel
+BuildRequires: pygtk2-devel
 %description
 The gnome-python-extra package contains the source packages for additional 
 Python bindings for GNOME. It should be used together with gnome-python.
@@ -125,6 +126,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 2.14.0-2
+- Add missing BR pygtk2-devel
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.de> 2.14.0-1
 - Update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 02:57:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 22:57:03 -0400
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.12,1.13
Message-ID: <200606250257.k5P2v3uY026186@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26172

Modified Files:
	gecko-sharp2.spec 
Log Message:
add missing BRs


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gecko-sharp2.spec	28 Feb 2006 10:13:58 -0000	1.12
+++ gecko-sharp2.spec	25 Jun 2006 02:57:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        6
+Release:        7
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -9,11 +9,11 @@
 Source0:        gecko-sharp-2.0-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk-sharp2 mozilla-devel gtk2-devel
+BuildRequires:  gtk-sharp2 mozilla-devel gtk2-devel mono-devel gtk-sharp2-gapi
 Requires:       mozilla 
 
-# Mono only availible on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x
+# Mono only availible on these: (s390(x) disabled for now)
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc #s390 s390x
 
 %description
 This package provides Mono bindings for the Gecko engine, through
@@ -47,6 +47,10 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.11-7
+- BuildRequires: mono-devel, gtk-sharp2-gapi
+- Diable s390 as well
+
 * Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.11-6
 - BuildRequires: gtk2-devel
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 03:04:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 23:04:44 -0400
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.13,1.14
Message-ID: <200606250304.k5P34id3026330@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26317

Modified Files:
	gecko-sharp2.spec 
Log Message:
disable in a cleaner way


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gecko-sharp2.spec	25 Jun 2006 02:57:00 -0000	1.13
+++ gecko-sharp2.spec	25 Jun 2006 03:04:41 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        7
+Release:        8
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -13,7 +13,8 @@
 Requires:       mozilla 
 
 # Mono only availible on these: (s390(x) disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc #s390 s390x
+#ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
 %description
 This package provides Mono bindings for the Gecko engine, through
@@ -47,7 +48,7 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
-* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.11-7
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.11-8
 - BuildRequires: mono-devel, gtk-sharp2-gapi
 - Diable s390 as well
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 03:28:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 23:28:44 -0400
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.18,1.19
Message-ID: <200606250328.k5P3Sikl022949@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22924

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
add missing BRs


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- krb5-auth-dialog.spec	13 Feb 2006 07:16:55 -0000	1.18
+++ krb5-auth-dialog.spec	25 Jun 2006 03:28:41 -0000	1.19
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.6.cvs20060212
-Release: 1
+Release: 2
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -16,6 +16,7 @@
 BuildRequires: krb5-devel >= %{krb5_version}
 BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: perl-XML-Parser, gettext
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: krb5-libs >= %{krb5_version}
 
@@ -49,6 +50,9 @@
 
 
 %changelog
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> - 0.6.cvs20060212-2
+- Add missing BRs perl-XML-Parser, gettext
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.6.cvs20060212-1
 - Update to latest CVS to get some of Nalin's fixes
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 03:39:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 23:39:50 -0400
Subject: rpms/iso-codes/devel iso-codes.spec,1.6,1.7
Message-ID: <200606250339.k5P3doW5024348@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iso-codes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24329

Modified Files:
	iso-codes.spec 
Log Message:
add missing BRs


Index: iso-codes.spec
===================================================================
RCS file: /cvs/dist/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iso-codes.spec	1 Jan 2006 20:06:01 -0000	1.6
+++ iso-codes.spec	25 Jun 2006 03:39:47 -0000	1.7
@@ -2,11 +2,12 @@
 Summary:	ISO code lists and translations
 
 Version:	0.49
-Release:	1
+Release:	2
 License:	LGPL
 Group:	System Environment/Base
 URL:	http://alioth.debian.org/projects/pkg-isocodes/
 Source:	iso-codes_%{version}.orig.tar.gz
+BuildRequires:	gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 
@@ -60,6 +61,9 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.49-2
+- Missing BR gettext
+
 * Sun Jan  1 2006 Christopher Aillon <caillon at redhat.com> 0.49-1
 - Update to 0.49
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 03:56:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 23:56:54 -0400
Subject: rpms/f-spot/devel f-spot.spec,1.22,1.23
Message-ID: <200606250356.k5P3usRl010263@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10234

Modified Files:
	f-spot.spec 
Log Message:
Add missing BR


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- f-spot.spec	31 May 2006 14:12:03 -0000	1.22
+++ f-spot.spec	25 Jun 2006 03:56:51 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.11
-Release:        2
+Release:        3
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 dbus-sharp
 BuildRequires:  gtk-sharp2 >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
+BuildRequires:  gettext
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 
@@ -67,6 +68,9 @@
 %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
 
 %changelog
+* Sun Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.1.11-3
+- Add missing BR gettext
+
 * Wed May 31 2006 Alexander Larsson <alexl at redhat.com> 0.1.11-2
 - Rebuild for gmime update
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 03:59:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 24 Jun 2006 23:59:30 -0400
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.19,1.20
Message-ID: <200606250359.k5P3xU1R010970@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10946

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
work around s390s


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- krb5-auth-dialog.spec	25 Jun 2006 03:28:41 -0000	1.19
+++ krb5-auth-dialog.spec	25 Jun 2006 03:59:28 -0000	1.20
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.6.cvs20060212
-Release: 2
+Release: 3
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -14,9 +14,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: krb5-devel >= %{krb5_version}
-BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: perl-XML-Parser, gettext
+%ifnarch s390 s390x
+BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
+%endif
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: krb5-libs >= %{krb5_version}
 
@@ -50,8 +52,9 @@
 
 
 %changelog
-* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> - 0.6.cvs20060212-2
+* Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> - 0.6.cvs20060212-3
 - Add missing BRs perl-XML-Parser, gettext
+- Work around no network manager stuff on z900s
 
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.6.cvs20060212-1
 - Update to latest CVS to get some of Nalin's fixes



From fedora-cvs-commits at redhat.com  Sun Jun 25 13:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 09:19:08 -0400
Subject: rpms/scim-hangul/devel scim-hangul.spec,1.16,1.17
Message-ID: <200606251319.k5PDJ8Y7020108@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20072

Modified Files:
	scim-hangul.spec 
Log Message:



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-hangul.spec	9 Jun 2006 03:21:16 -0000	1.16
+++ scim-hangul.spec	25 Jun 2006 13:19:05 -0000	1.17
@@ -1,4 +1,4 @@
-%define with_libstdc_preview 0
+%define with_libstdc_preview 1
 
 Name:           scim-hangul
 Version:        0.2.2



From fedora-cvs-commits at redhat.com  Sun Jun 25 13:21:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 09:21:28 -0400
Subject: rpms/scim-hangul/devel scim-hangul.spec,1.17,1.18
Message-ID: <200606251321.k5PDLRRK020735@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20666

Modified Files:
	scim-hangul.spec 
Log Message:



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scim-hangul.spec	25 Jun 2006 13:19:05 -0000	1.17
+++ scim-hangul.spec	25 Jun 2006 13:21:24 -0000	1.18
@@ -1,4 +1,4 @@
-%define with_libstdc_preview 1
+%define with_libstdc_preview 0
 
 Name:           scim-hangul
 Version:        0.2.2



From fedora-cvs-commits at redhat.com  Sun Jun 25 13:23:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 09:23:24 -0400
Subject: rpms/scim-hangul/FC-5 scim-hangul.spec,1.17,1.18
Message-ID: <200606251323.k5PDNOU1021358@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21326

Modified Files:
	scim-hangul.spec 
Log Message:



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/FC-5/scim-hangul.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scim-hangul.spec	22 Jun 2006 16:08:32 -0000	1.17
+++ scim-hangul.spec	25 Jun 2006 13:23:22 -0000	1.18
@@ -1,4 +1,4 @@
-%define with_libstdc_preview 0 
+%define with_libstdc_preview 1
 
 Name:           scim-hangul
 Version:        0.2.2



From fedora-cvs-commits at redhat.com  Sun Jun 25 17:20:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 13:20:25 -0400
Subject: rpms/kernel/devel patch-2.6.17-git8.bz2.sign, NONE, 1.1 .cvsignore,
	1.462, 1.463 kernel-2.6.spec, 1.2310, 1.2311 sources, 1.406,
	1.407 upstream, 1.371, 1.372 patch-2.6.17-git7.bz2.sign, 1.1, NONE
Message-ID: <200606251720.k5PHKPLX007835@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7817

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git8.bz2.sign 
Removed Files:
	patch-2.6.17-git7.bz2.sign 
Log Message:
git8



--- NEW FILE patch-2.6.17-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEnjUvyGugalF9Dw4RAv20AJ98tPOXOTPwrDzxG9VVLmEZR3sewgCdErHo
fJMyGLuTYhWaJSZ+TfmdbWo=
=+LE7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- .cvsignore	24 Jun 2006 18:55:55 -0000	1.462
+++ .cvsignore	25 Jun 2006 17:20:19 -0000	1.463
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git7.bz2
+patch-2.6.17-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2310
retrieving revision 1.2311
diff -u -r1.2310 -r1.2311
--- kernel-2.6.spec	24 Jun 2006 18:55:55 -0000	1.2310
+++ kernel-2.6.spec	25 Jun 2006 17:20:19 -0000	1.2311
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git7.bz2
+Patch1: patch-2.6.17-git8.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1658,6 +1658,9 @@
 %endif
 
 %changelog
+* Sun Jun 25 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git8
+
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.
 - 2.6.17-git6 & git7


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- sources	24 Jun 2006 18:55:56 -0000	1.406
+++ sources	25 Jun 2006 17:20:19 -0000	1.407
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-43752b2e8d7de5e783e4f8a76ff69dae  patch-2.6.17-git7.bz2
+73ac3ce3ac7ace11f0177f2dd0e85306  patch-2.6.17-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- upstream	24 Jun 2006 18:55:56 -0000	1.371
+++ upstream	25 Jun 2006 17:20:19 -0000	1.372
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git7.bz2
+patch-2.6.17-git8.bz2


--- patch-2.6.17-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jun 25 17:20:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 13:20:25 -0400
Subject: rpms/kernel/devel/configs config-generic,1.199,1.200
Message-ID: <200606251720.k5PHKPYB007841@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7817/configs

Modified Files:
	config-generic 
Log Message:
git8



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- config-generic	23 Jun 2006 15:47:48 -0000	1.199
+++ config-generic	25 Jun 2006 17:20:20 -0000	1.200
@@ -2641,6 +2641,7 @@
 CONFIG_IBMASR=m
 
 CONFIG_PM_LEGACY=y
+# CONFIG_PM_TRACE is not set
 
 CONFIG_CRASH=m
 



From fedora-cvs-commits at redhat.com  Sun Jun 25 17:45:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 13:45:59 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.121,1.122
Message-ID: <200606251745.k5PHjxXd024008@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23333

Modified Files:
	coreutils.spec 
Log Message:
- Build at -O1 on s390 for the moment (bug #196369).


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- coreutils.spec	22 Jun 2006 22:41:57 -0000	1.121
+++ coreutils.spec	25 Jun 2006 17:45:57 -0000	1.122
@@ -115,7 +115,8 @@
 
 %build
 %ifarch s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+# Build at -O1 for the moment (bug #196369).
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -O1"
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
 %endif
@@ -274,8 +275,9 @@
 /sbin/runuser
 
 %changelog
-* Thu Jun 22 2006 Tim Waugh <twaugh at redhat.com> 5.96-4
+* Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.96-4
 - Include new hashes (bug #196369).  Patch from upstream.
+- Build at -O1 on s390 for the moment (bug #196369).
 
 * Fri Jun  9 2006 Tim Waugh <twaugh at redhat.com>
 - Fix large file support for temporary files.



From fedora-cvs-commits at redhat.com  Sun Jun 25 19:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 15:45:42 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.16,1.17
Message-ID: <200606251945.k5PJjgDd011894@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11859

Modified Files:
	libXfont.spec 
Log Message:
moot


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXfont.spec	9 Jun 2006 10:58:33 -0000	1.16
+++ libXfont.spec	25 Jun 2006 19:45:39 -0000	1.17
@@ -107,10 +107,10 @@
 * Sat Apr 01 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 for crash fix and new headers
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2



From fedora-cvs-commits at redhat.com  Sun Jun 25 21:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 17:41:14 -0400
Subject: rpms/ipv6calc/devel .cvsignore, 1.7, 1.8 ipv6calc.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200606252141.k5PLfEBC001684@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1652

Modified Files:
	.cvsignore ipv6calc.spec sources 
Log Message:
upgrade to 0.60.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2006 08:43:13 -0000	1.7
+++ .cvsignore	25 Jun 2006 21:41:11 -0000	1.8
@@ -1 +1 @@
-ipv6calc-0.51.tar.gz
+ipv6calc-0.60.0.tar.gz


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ipv6calc.spec	22 Feb 2006 08:43:13 -0000	1.18
+++ ipv6calc.spec	25 Jun 2006 21:41:11 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
-Version: 	0.51
+Version: 	0.60.0
 Release: 	1
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
@@ -55,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sun Jun 25 2006 Radek Vok??l <rvokal at redhat.com> 0.60.0-1
+- upgrade to 0.60.0
+
 * Wed Feb 22 2006 Radek Vok??l <rvokal at redhat.com> 0.51-1
 - upgrade to 0.51
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Feb 2006 08:43:13 -0000	1.7
+++ sources	25 Jun 2006 21:41:11 -0000	1.8
@@ -1 +1 @@
-c08c77712854ef3ba17f129a84d73ee2  ipv6calc-0.51.tar.gz
+894f67ad3883bd0153ede1946d9dc4cb  ipv6calc-0.60.0.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jun 25 23:15:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 19:15:02 -0400
Subject: rpms/coreutils/devel coreutils-autoconf.patch, NONE,
	1.1 coreutils-newhashes.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 coreutils.spec, 1.122, 1.123 sources, 1.10,
	1.11 coreutils-5.96-newhashes.patch, 1.1,
	NONE coreutils-5.96.pl.po, 1.1, NONE coreutils-tee.patch, 1.1,
	NONE coreutils-tempname.patch, 1.1, NONE
Message-ID: <200606252315.k5PNF2wq024064@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23942

Modified Files:
	.cvsignore coreutils.spec sources 
Added Files:
	coreutils-autoconf.patch coreutils-newhashes.patch 
Removed Files:
	coreutils-5.96-newhashes.patch coreutils-5.96.pl.po 
	coreutils-tee.patch coreutils-tempname.patch 
Log Message:
* Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.97-1
- 5.97.  No longer need tempname or tee patches, or pl translation.


coreutils-autoconf.patch:
 jm-macros.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE coreutils-autoconf.patch ---
--- coreutils-5.97/m4/jm-macros.m4.autoconf	2006-06-25 23:57:47.000000000 +0100
+++ coreutils-5.97/m4/jm-macros.m4	2006-06-25 23:57:53.000000000 +0100
@@ -22,7 +22,7 @@
 
 AC_DEFUN([gl_MACROS],
 [
-  AC_PREREQ(2.59d)
+  AC_PREREQ(2.59)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",

coreutils-newhashes.patch:
 AUTHORS                |    9 
 README                 |    6 
 aclocal.m4             |    2 
 configure.ac           |    8 
 lib/Makefile.am        |    1 
 lib/base64.c           |  416 ++++++++++++++++++++++++++++++++++++
 lib/base64.h           |   45 +++
 lib/md5.c              |  189 ++++++++--------
 lib/md5.h              |   52 +---
 lib/sha1.c             |   77 +++---
 lib/sha1.h             |   22 -
 lib/sha256.c           |  548 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sha256.h           |   88 +++++++
 lib/sha512.c           |  559 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sha512.h           |   90 +++++++
 m4/prereq.m4           |    2 
 m4/sha256.m4           |   15 +
 m4/sha512.m4           |   15 +
 man/Makefile.am        |   10 
 man/base64.x           |    4 
 man/sha224sum.x        |    4 
 man/sha256sum.x        |    4 
 man/sha384sum.x        |    4 
 man/sha512sum.x        |    4 
 src/Makefile.am        |   20 +
 src/base64.c           |  308 ++++++++++++++++++++++++++
 src/md5sum.c           |  137 ++++++++----
 tests/misc/Makefile.am |    5 
 tests/misc/base64      |   81 +++++++
 tests/misc/sha224sum   |   45 +++
 tests/misc/sha256sum   |   51 ++++
 tests/misc/sha384sum   |   51 ++++
 tests/misc/sha512sum   |   51 ++++
 33 files changed, 2691 insertions(+), 232 deletions(-)

--- NEW FILE coreutils-newhashes.patch ---
--- coreutils-5.97/configure.ac.newhashes	2006-05-23 21:38:46.000000000 +0100
+++ coreutils-5.97/configure.ac	2006-06-25 23:50:01.000000000 +0100
@@ -305,3 +305,11 @@
   tests/wc/Makefile
   )
 AC_OUTPUT
+
+# This is a _HACK_, tests are added via. patch so they don't have +x perms.
+# we hand hack them in here...
+chmod +x $srcdir/tests/misc/base64
+chmod +x $srcdir/tests/misc/sha224sum
+chmod +x $srcdir/tests/misc/sha256sum
+chmod +x $srcdir/tests/misc/sha384sum
+chmod +x $srcdir/tests/misc/sha512sum
--- coreutils-5.97/README.newhashes	2005-09-28 19:34:26.000000000 +0100
+++ coreutils-5.97/README	2006-06-25 23:50:01.000000000 +0100
@@ -7,11 +7,13 @@
 
 The programs that can be built with this package are:
 
-  [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
+  [ base64
+  basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
   df dir dircolors dirname du echo env expand expr factor false fmt fold
   ginstall groups head hostid hostname id join kill link ln logname ls
   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
-  printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
+  printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum
+  sha256sum sha384sum sha512sum shred sleep sort
   split stat stty su sum sync tac tail tee test touch tr true tsort tty
   uname unexpand uniq unlink uptime users vdir wc who whoami yes
 
--- coreutils-5.97/src/Makefile.am.newhashes	2005-07-18 08:52:18.000000000 +0100
+++ coreutils-5.97/src/Makefile.am	2006-06-25 23:50:01.000000000 +0100
@@ -24,10 +24,12 @@
   ginstall link ln dir vdir ls mkdir \
   mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
   cat cksum comm csplit cut expand fmt fold head join md5sum \
-  nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
+  nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+  sort split sum tac tail tr tsort unexpand uniq wc \
   basename date dirname echo env expr factor false \
   hostname id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
+  base64 \
   $(OPTIONAL_BIN_PROGS) $(DF_PROG)
 
 noinst_PROGRAMS = setuidgid
@@ -37,7 +39,7 @@
   chown-core.h fs.h \
   wheel.h wheel-size.h
 EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
-  groups.sh wheel-gen.pl extract-magic
+  groups.sh wheel-gen.pl extract-magic # rand-isaac.c
 CLEANFILES = $(SCRIPTS) su
 
 AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
@@ -169,8 +171,18 @@
 mv_SOURCES = mv.c copy.c cp-hash.c remove.c
 rm_SOURCES = rm.c remove.c
 
-md5sum_SOURCES = md5sum.c md5.c
-sha1sum_SOURCES = md5sum.c sha1sum.c
+md5sum_SOURCES = md5sum.c
+md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS)
+sha1sum_SOURCES = md5sum.c
+sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS)
+sha224sum_SOURCES = md5sum.c
+sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS)
+sha256sum_SOURCES = md5sum.c
+sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS)
+sha384sum_SOURCES = md5sum.c
+sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
+sha512sum_SOURCES = md5sum.c
+sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
 
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
--- coreutils-5.97/src/md5sum.c.newhashes	2005-10-27 17:22:14.000000000 +0100
+++ coreutils-5.97/src/md5sum.c	2006-06-25 23:50:01.000000000 +0100
@@ -1,4 +1,4 @@
-/* Compute MD5 or SHA1 checksum of files or strings
+/* Compute MD5, SHA1, SHA224, SHA256, SHA384 or SHA512 checksum of files or strings
    Copyright (C) 1995-2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -24,34 +24,85 @@
 
 #include "system.h"
 
-#include "md5.h"
-#include "sha1.h"
-#include "checksum.h"
+#if HASH_ALGO_MD5
+# include "md5.h"
+#endif
+#if HASH_ALGO_SHA1
+# include "sha1.h"
+#endif
+#if HASH_ALGO_SHA256 || HASH_ALGO_SHA224
+# include "sha256.h"
+#endif
+#if HASH_ALGO_SHA512 || HASH_ALGO_SHA384
+# include "sha512.h"
+#endif
 #include "getline.h"
 #include "error.h"
 #include "quote.h"
 #include "stdio--.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
-#define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "sha1sum")
+#if HASH_ALGO_MD5
+# define PROGRAM_NAME "md5sum"
+# define DIGEST_TYPE_STRING "MD5"
+# define DIGEST_STREAM md5_stream
+# define DIGEST_BUFFER md5_buffer
+# define DIGEST_BITS 128
+# define DIGEST_REFERENCE "RFC 1321"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA1
+# define PROGRAM_NAME "sha1sum"
+# define DIGEST_TYPE_STRING "SHA1"
+# define DIGEST_STREAM sha1_stream
+# define DIGEST_BUFFER sha1_buffer
+# define DIGEST_BITS 160
+# define DIGEST_REFERENCE "FIPS-180-1"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA256
+# define PROGRAM_NAME "sha256sum"
+# define DIGEST_TYPE_STRING "SHA256"
+# define DIGEST_STREAM sha256_stream
+# define DIGEST_BUFFER sha256_buffer
+# define DIGEST_BITS 256
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA224
+# define PROGRAM_NAME "sha224sum"
+# define DIGEST_TYPE_STRING "SHA224"
+# define DIGEST_STREAM sha224_stream
+# define DIGEST_BUFFER sha224_buffer
+# define DIGEST_BITS 224
+# define DIGEST_REFERENCE "RFC 3874"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA512
+# define PROGRAM_NAME "sha512sum"
+# define DIGEST_TYPE_STRING "SHA512"
+# define DIGEST_STREAM sha512_stream
+# define DIGEST_BUFFER sha512_buffer
+# define DIGEST_BITS 512
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#elif HASH_ALGO_SHA384
+# define PROGRAM_NAME "sha384sum"
+# define DIGEST_TYPE_STRING "SHA384"
+# define DIGEST_STREAM sha384_stream
+# define DIGEST_BUFFER sha384_buffer
+# define DIGEST_BITS 384
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#else
+# error "Can't decide which hash algorithm to compile."
+#endif
 
-#define AUTHORS "Ulrich Drepper", "Scott Miller"
+#define DIGEST_HEX_BYTES (DIGEST_BITS / 4)
+#define DIGEST_BIN_BYTES (DIGEST_BITS / 8)
 
-
-#define DIGEST_TYPE_STRING(Alg) ((Alg) == ALG_MD5 ? "MD5" : "SHA1")
-#define DIGEST_STREAM(Alg) ((Alg) == ALG_MD5 ? md5_stream : sha1_stream)
-
-#define DIGEST_BITS(Alg) ((Alg) == ALG_MD5 ? 128 : 160)
-#define DIGEST_HEX_BYTES(Alg) (DIGEST_BITS (Alg) / 4)
-#define DIGEST_BIN_BYTES(Alg) (DIGEST_BITS (Alg) / 8)
-
-#define MAX_DIGEST_BIN_BYTES MAX (DIGEST_BIN_BYTES (ALG_MD5), \
-				  DIGEST_BIN_BYTES (ALG_SHA1))
+#define AUTHORS "Ulrich Drepper", "Scott Miller", "David Madore"
 
 /* The minimum length of a valid digest line.  This length does
    not include any newline character at the end of a line.  */
-#define MIN_DIGEST_LINE_LENGTH(Alg) \
-  (DIGEST_HEX_BYTES (Alg) /* length of hexadecimal message digest */ \
+#define MIN_DIGEST_LINE_LENGTH \
+  (DIGEST_HEX_BYTES /* length of hexadecimal message digest */ \
    + 2 /* blank and binary indicator */ \
    + 1 /* minimum filename length */ )
 
@@ -72,9 +123,6 @@
    improperly formatted checksum line.  */
 static bool warn = false;
 
-/* Declared and set via one of the wrapper .c files.  */
-/* int algorithm = ALG_UNSPECIFIED; */
-
 /* The name this program was run with.  */
 char *program_name;
 
[...3209 lines suppressed...]
-	 little endian byte order we perhaps have to change the byte order
-	 before the computation.  To reduce the work for the next steps
-	 we store the swapped words in the array CORRECT_WORDS.  */
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
 
 #define OP(a, b, c, d, s, T)						\
       do								\
@@ -339,40 +340,40 @@
       while (0)
 
       /* It is unfortunate that C does not provide an operator for
-	 cyclic rotation.  Hope the C compiler is smart enough.  */
+         cyclic rotation.  Hope the C compiler is smart enough.  */
 #define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
 
       /* Before we start, one word to the strange constants.
-	 They are defined in RFC 1321 as
+         They are defined in RFC 1321 as
 
-	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
 
-	 Here is an equivalent invocation using Perl:
+         Here is an equivalent invocation using Perl:
 
-	 perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
        */
 
       /* Round 1.  */
-      OP (A, B, C, D,  7, 0xd76aa478);
+      OP (A, B, C, D, 7, 0xd76aa478);
       OP (D, A, B, C, 12, 0xe8c7b756);
       OP (C, D, A, B, 17, 0x242070db);
       OP (B, C, D, A, 22, 0xc1bdceee);
-      OP (A, B, C, D,  7, 0xf57c0faf);
+      OP (A, B, C, D, 7, 0xf57c0faf);
       OP (D, A, B, C, 12, 0x4787c62a);
       OP (C, D, A, B, 17, 0xa8304613);
       OP (B, C, D, A, 22, 0xfd469501);
-      OP (A, B, C, D,  7, 0x698098d8);
+      OP (A, B, C, D, 7, 0x698098d8);
       OP (D, A, B, C, 12, 0x8b44f7af);
       OP (C, D, A, B, 17, 0xffff5bb1);
       OP (B, C, D, A, 22, 0x895cd7be);
-      OP (A, B, C, D,  7, 0x6b901122);
+      OP (A, B, C, D, 7, 0x6b901122);
       OP (D, A, B, C, 12, 0xfd987193);
       OP (C, D, A, B, 17, 0xa679438e);
       OP (B, C, D, A, 22, 0x49b40821);
 
       /* For the second to fourth round we have the possibly swapped words
-	 in CORRECT_WORDS.  Redefine the macro to take an additional first
-	 argument specifying the function to use.  */
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
 #undef OP
 #define OP(f, a, b, c, d, k, s, T)					\
       do								\
@@ -384,58 +385,58 @@
       while (0)
 
       /* Round 2.  */
-      OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
-      OP (FG, D, A, B, C,  6,  9, 0xc040b340);
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
       OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
-      OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
-      OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
-      OP (FG, D, A, B, C, 10,  9, 0x02441453);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
       OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
-      OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
-      OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
-      OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
-      OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
-      OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
-      OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
-      OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
-      OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
       OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
 
       /* Round 3.  */
-      OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
-      OP (FH, D, A, B, C,  8, 11, 0x8771f681);
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
       OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
       OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
-      OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
-      OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
-      OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
       OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
-      OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
-      OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
-      OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
-      OP (FH, B, C, D, A,  6, 23, 0x04881d05);
-      OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
       OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
       OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-      OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
 
       /* Round 4.  */
-      OP (FI, A, B, C, D,  0,  6, 0xf4292244);
-      OP (FI, D, A, B, C,  7, 10, 0x432aff97);
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
       OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
-      OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
-      OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
-      OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
       OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
-      OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
-      OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
       OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-      OP (FI, C, D, A, B,  6, 15, 0xa3014314);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
       OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
-      OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
       OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
-      OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
-      OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
 
       /* Add the starting values of the context.  */
       A += A_save;
--- coreutils-5.97/AUTHORS.newhashes	2004-11-03 23:10:50.000000000 +0000
+++ coreutils-5.97/AUTHORS	2006-06-25 23:50:01.000000000 +0100
@@ -1,6 +1,7 @@
 Here are the names of the programs in this package,
 each followed by the name(s) of its author(s).
 
+base64: Simon Josefsson
 basename: FIXME unknown
 cat: Torbjorn Granlund, Richard M. Stallman
 chgrp: David MacKenzie, Jim Meyering
@@ -39,7 +40,7 @@
 ln: Mike Parker, David MacKenzie
 logname: FIXME: unknown
 ls: Richard Stallman, David MacKenzie
-md5sum: Ulrich Drepper, Scott Miller
+md5sum: Ulrich Drepper, Scott Miller, David Madore
 mkdir: David MacKenzie
 mkfifo: David MacKenzie
 mknod: David MacKenzie
@@ -60,7 +61,11 @@
 rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
 rmdir: David MacKenzie
 seq: Ulrich Drepper
-sha1sum: Ulrich Drepper, Scott Miller
+sha1sum: Ulrich Drepper, Scott Miller, David Madore
+sha224sum: Ulrich Drepper, Scott Miller, David Madore
+sha256sum: Ulrich Drepper, Scott Miller, David Madore
+sha384sum: Ulrich Drepper, Scott Miller, David Madore
+sha512sum: Ulrich Drepper, Scott Miller, David Madore
 shred: Colin Plumb
 sleep: Jim Meyering, Paul Eggert
 sort: Mike Haertel, Paul Eggert
--- coreutils-5.97/aclocal.m4.newhashes	2006-06-10 10:02:48.000000000 +0100
+++ coreutils-5.97/aclocal.m4	2006-06-25 23:50:01.000000000 +0100
@@ -1055,6 +1055,8 @@
 m4_include([m4/setenv.m4])
 m4_include([m4/settime.m4])
 m4_include([m4/sha1.m4])
+m4_include([m4/sha256.m4])
+m4_include([m4/sha512.m4])
 m4_include([m4/sig2str.m4])
 m4_include([m4/signed.m4])
 m4_include([m4/socklen.m4])


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 May 2006 14:06:48 -0000	1.9
+++ .cvsignore	25 Jun 2006 23:15:00 -0000	1.10
@@ -4,3 +4,4 @@
 coreutils-5.94.tar.bz2
 coreutils-5.95.tar.bz2
 coreutils-5.96.tar.bz2
+coreutils-5.97.tar.bz2


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- coreutils.spec	25 Jun 2006 17:45:57 -0000	1.122
+++ coreutils.spec	25 Jun 2006 23:15:00 -0000	1.123
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
-Version: 5.96
-Release: 4
+Version: 5.97
+Release: 1
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -10,7 +10,6 @@
 Requires: libselinux >= 1.25.6-1
 
 Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
-Source1: coreutils-5.96.pl.po
 Source101:	DIR_COLORS
 Source102:	DIR_COLORS.xterm
 Source105:  colorls.sh
@@ -19,8 +18,7 @@
 Source201:  runuser.pamd
 
 # From upstream
-Patch1: coreutils-tempname.patch
-Patch2: coreutils-5.96-newhashes.patch
+Patch10: coreutils-newhashes.patch
 
 # Our patches
 Patch100: coreutils-chgrp.patch
@@ -45,7 +43,7 @@
 Patch908: coreutils-getgrouplist.patch
 Patch912: coreutils-overflow.patch
 Patch913: coreutils-afs.patch
-Patch914: coreutils-tee.patch
+Patch914: coreutils-autoconf.patch
 
 #SELINUX Patch
 Patch950: coreutils-selinux.patch
@@ -74,12 +72,9 @@
 
 %prep
 %setup -q
-rm po/pl.*
-cp %{SOURCE1} po/pl.po
 
 # From upstream
-%patch1 -p1 -b .tempname
-%patch2 -p1 -b .newhashes
+%patch10 -p1 -b .newhashes
 
 # Our patches
 %patch100 -p1 -b .chgrp
@@ -102,7 +97,7 @@
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
 %patch913 -p1 -b .afs
-%patch914 -p1 -b .tee
+%patch914 -p1 -b .autoconf
 
 #SELinux
 %patch950 -p1 -b .selinux
@@ -275,6 +270,9 @@
 /sbin/runuser
 
 %changelog
+* Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.97-1
+- 5.97.  No longer need tempname or tee patches, or pl translation.
+
 * Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.96-4
 - Include new hashes (bug #196369).  Patch from upstream.
 - Build at -O1 on s390 for the moment (bug #196369).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Jun 2006 12:50:31 -0000	1.10
+++ sources	25 Jun 2006 23:15:00 -0000	1.11
@@ -1 +1 @@
-bf55d069d82128fd754a090ce8b5acff  coreutils-5.96.tar.bz2
+1537379b6264a1def443713988a78020  coreutils-5.97.tar.bz2


--- coreutils-5.96-newhashes.patch DELETED ---


--- coreutils-5.96.pl.po DELETED ---


--- coreutils-tee.patch DELETED ---


--- coreutils-tempname.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 26 01:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 21:14:49 -0400
Subject: rpms/anthy/devel .cvsignore, 1.18, 1.19 anthy.spec, 1.29,
	1.30 sources, 1.18, 1.19
Message-ID: <200606260114.k5Q1EnrH021412@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21381

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Mon Jun 26 2006 Akira TAGOH <tagoh at redhat.com> - 7824-1
- New upstream snapshot release.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Jun 2006 04:50:52 -0000	1.18
+++ .cvsignore	26 Jun 2006 01:14:46 -0000	1.19
@@ -21,3 +21,4 @@
 anthy-7802.tar.gz
 anthy-7811.tar.gz
 anthy-7818.tar.gz
+anthy-7824.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- anthy.spec	20 Jun 2006 04:50:53 -0000	1.29
+++ anthy.spec	26 Jun 2006 01:14:46 -0000	1.30
@@ -1,4 +1,4 @@
-%define	version		7818
+%define	version		7824
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
@@ -127,6 +127,9 @@
 %endif
 
 %changelog
+* Mon Jun 26 2006 Akira TAGOH <tagoh at redhat.com> - 7824-1
+- New upstream snapshot release.
+
 * Tue Jun 20 2006 Akira TAGOH <tagoh at redhat.com> - 7818-1
 - New upstream snapshot release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	20 Jun 2006 04:50:53 -0000	1.18
+++ sources	26 Jun 2006 01:14:46 -0000	1.19
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-7795230af52b2abf3e7cb7e67911298e  anthy-7818.tar.gz
+bf4cce0a20f53cc7813a3f2d90c5a52c  anthy-7824.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 26 01:38:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 21:38:25 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.200,
	1.201 config-powerpc-generic, 1.17, 1.18
Message-ID: <200606260138.k5Q1cPEh015924@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15874/configs

Modified Files:
	config-generic config-powerpc-generic 
Log Message:
git9



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- config-generic	25 Jun 2006 17:20:20 -0000	1.200
+++ config-generic	26 Jun 2006 01:38:22 -0000	1.201
@@ -230,6 +230,7 @@
 # CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_PC_PCMCIA=m
 CONFIG_PARPORT_1284=y
+# CONFIG_PARPORT_AX88796 is not set
 
 #
 # Plug and Play support
@@ -1653,6 +1654,14 @@
 # CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
+
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_V3020=m
+
 CONFIG_DTLK=m
 CONFIG_R3964=m
 # CONFIG_APPLICOM is not set
@@ -1745,12 +1754,14 @@
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_ZORAN_BUZ=m
 CONFIG_VIDEO_ZORAN_DC10=m
 CONFIG_VIDEO_ZORAN_DC30=m
@@ -1826,16 +1837,17 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -2253,6 +2265,7 @@
 CONFIG_USB_W9968CF=m
 CONFIG_USB_ZC0301=m
 CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -2279,6 +2292,7 @@
 
 CONFIG_USB_TOUCHSCREEN=m
 
+CONFIG_USB_QUICKCAM_MESSENGER=m
 
 #
 # File systems
@@ -2379,6 +2393,7 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
 CONFIG_9P_FS=m
 CONFIG_FUSE_FS=m
 


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-powerpc-generic	23 Jun 2006 15:47:48 -0000	1.17
+++ config-powerpc-generic	26 Jun 2006 01:38:22 -0000	1.18
@@ -4,7 +4,7 @@
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
 CONFIG_DEBUGGER=y
-# CONFIG_KPROBES is not set 
+# CONFIG_KPROBES is not set
 # CONFIG_KEXEC is not set
 CONFIG_GENERIC_NVRAM=y
 CONFIG_ALTIVEC=y
@@ -92,3 +92,10 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 # CONFIG_PPC_EARLY_DEBUG is not set
+
+# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+



From fedora-cvs-commits at redhat.com  Mon Jun 26 01:38:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 25 Jun 2006 21:38:25 -0400
Subject: rpms/kernel/devel patch-2.6.17-git9.bz2.sign, NONE, 1.1 .cvsignore,
	1.463, 1.464 kernel-2.6.spec, 1.2311,
	1.2312 linux-2.6-compile-fixes.patch, 1.83,
	1.84 linux-2.6-tux.patch, 1.21, 1.22 linux-2.6-xen.patch, 1.29,
	1.30 sources, 1.407, 1.408 upstream, 1.372,
	1.373 linux-2.6-autofs-invalidate.patch, 1.1,
	NONE patch-2.6.17-git8.bz2.sign, 1.1, NONE
Message-ID: <200606260138.k5Q1cPR7015911@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15874

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-tux.patch linux-2.6-xen.patch sources upstream 
Added Files:
	patch-2.6.17-git9.bz2.sign 
Removed Files:
	linux-2.6-autofs-invalidate.patch patch-2.6.17-git8.bz2.sign 
Log Message:
git9



--- NEW FILE patch-2.6.17-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEnt3wyGugalF9Dw4RAkYOAJ4jARN9QYCfWF9ATAADwunvHYJE7gCgk9D6
SR0ymTbsetDMxbV82Ak09Tk=
=58cH
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- .cvsignore	25 Jun 2006 17:20:19 -0000	1.463
+++ .cvsignore	26 Jun 2006 01:38:09 -0000	1.464
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git8.bz2
+patch-2.6.17-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2311
retrieving revision 1.2312
diff -u -r1.2311 -r1.2312
--- kernel-2.6.spec	25 Jun 2006 17:20:19 -0000	1.2311
+++ kernel-2.6.spec	26 Jun 2006 01:38:09 -0000	1.2312
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git8.bz2
+Patch1: patch-2.6.17-git9.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -375,7 +375,6 @@
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
-Patch1690: linux-2.6-autofs-invalidate.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -954,8 +953,6 @@
 %patch1670 -p1
 # Add some USB devices to the unusual quirk list.
 %patch1680 -p1
-# autofs4 - need to invalidate children on tree mount expire
-%patch1690 -p1
 # Silence debug messages in w1
 %patch1700 -p1
 # Only print migration info on SMP
@@ -1042,7 +1039,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1659,7 +1656,7 @@
 
 %changelog
 * Sun Jun 25 2006 Dave Jones <davej at redhat.com>
-- 2.6.17-git8
+- 2.6.17-git8 & git9
 
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.

linux-2.6-compile-fixes.patch:
 quickcam_messenger.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- linux-2.6-compile-fixes.patch	24 Jun 2006 07:10:13 -0000	1.83
+++ linux-2.6-compile-fixes.patch	26 Jun 2006 01:38:15 -0000	1.84
@@ -0,0 +1,11 @@
+--- linux-2.6.17.noarch/drivers/media/video/usbvideo/quickcam_messenger.c~	2006-06-25 21:37:04.000000000 -0400
++++ linux-2.6.17.noarch/drivers/media/video/usbvideo/quickcam_messenger.c	2006-06-25 21:37:11.000000000 -0400
+@@ -33,7 +33,7 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/input.h>
+-#include <linux/usb_input.h>
++#include <linux/usb/input.h>
+ 
+ #include "usbvideo.h"
+ #include "quickcam_messenger.h"

linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-2.6.17.noarch/kernel/exit.c               |    9 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    1 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12698 insertions(+), 31 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-tux.patch	23 Jun 2006 15:50:24 -0000	1.21
+++ linux-2.6-tux.patch	26 Jun 2006 01:38:15 -0000	1.22
@@ -644,7 +644,7 @@
  };
  
  /* /proc/sys/kernel/random */
-@@ -735,6 +736,55 @@ enum {
+@@ -771,6 +771,55 @@ enum {
  	NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
  };
  
@@ -697,9 +697,9 @@
 +	NET_TUX_IGNORE_QUERY		= 45,
 +};
 +
- /* CTL_PROC names: */
- 
  /* CTL_FS names: */
+ enum
+ {
 Index: linux-tux.q/include/net/sock.h
 ===================================================================
 --- linux-tux.q.orig/include/net/sock.h
@@ -1745,24 +1745,24 @@
 +} ftp_command_t;
 +
 +#endif
-Index: linux-tux.q/kernel/exit.c
-===================================================================
---- linux-tux.q.orig/kernel/exit.c
-+++ linux-tux.q/kernel/exit.c
-@@ -851,6 +851,13 @@ fastcall NORET_TYPE void do_exit(long co
+--- linux-2.6.17.noarch/kernel/exit.c~	2006-06-25 21:22:42.000000000 -0400
++++ linux-2.6.17.noarch/kernel/exit.c	2006-06-25 21:24:03.000000000 -0400
+@@ -895,6 +895,15 @@ fastcall NORET_TYPE void do_exit(long co
   		hrtimer_cancel(&tsk->signal->real_timer);
  		exit_itimers(tsk->signal);
- 		acct_process(code);
-+		if (current->tux_info) {
+ 	}
++
++	if (current->tux_info) {
 +#ifdef CONFIG_TUX_DEBUG
-+			printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n",
-+				code, __builtin_return_address(0));
++		printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n",
++			code, __builtin_return_address(0));
 +#endif
-+			current->tux_exit();
-+		}
- 	}
- 	exit_mm(tsk);
- 
++		current->tux_exit();
++	}
++
+ 	acct_collect(code, group_dead);
+ 	if (unlikely(tsk->robust_list))
+ 		exit_robust_list(tsk);
 Index: linux-tux.q/kernel/fork.c
 ===================================================================
 --- linux-tux.q.orig/kernel/fork.c

linux-2.6-xen.patch:
 linux-2.6.17.noarch/drivers/firmware/Kconfig              |    2 
 merge/arch/i386/Kconfig                                   |   92 
 merge/arch/i386/Kconfig.cpu                               |    2 
 merge/arch/i386/Kconfig.debug                             |    1 
 merge/arch/i386/Makefile                                  |   24 
 merge/arch/i386/boot-xen/Makefile                         |   21 
 merge/arch/i386/kernel/Makefile                           |   22 
 merge/arch/i386/kernel/acpi/Makefile                      |    4 
 merge/arch/i386/kernel/acpi/boot-xen.c                    | 1167 +++++
 merge/arch/i386/kernel/apic-xen.c                         |  160 
 merge/arch/i386/kernel/asm-offsets.c                      |   10 
 merge/arch/i386/kernel/cpu/Makefile                       |    5 
 merge/arch/i386/kernel/cpu/common-xen.c                   |  732 +++
 merge/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 merge/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 merge/arch/i386/kernel/early_printk-xen.c                 |    2 
 merge/arch/i386/kernel/entry-xen.S                        |  903 ++++
 merge/arch/i386/kernel/entry.S                            |   10 
 merge/arch/i386/kernel/fixup.c                            |   86 
 merge/arch/i386/kernel/head-xen.S                         |  181 
 merge/arch/i386/kernel/init_task-xen.c                    |   51 
 merge/arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++
 merge/arch/i386/kernel/ioport-xen.c                       |  121 
 merge/arch/i386/kernel/irq-xen.c                          |  306 +
 merge/arch/i386/kernel/irq.c                              |    4 
 merge/arch/i386/kernel/ldt-xen.c                          |  269 +
 merge/arch/i386/kernel/microcode-xen.c                    |  148 
 merge/arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++
 merge/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 merge/arch/i386/kernel/process-xen.c                      |  812 ++++
 merge/arch/i386/kernel/quirks-xen.c                       |   48 
 merge/arch/i386/kernel/setup-xen.c                        | 1795 +++++++++
 merge/arch/i386/kernel/smp-xen.c                          |  613 +++
 merge/arch/i386/kernel/swiotlb.c                          |  665 +++
 merge/arch/i386/kernel/sysenter.c                         |  102 
 merge/arch/i386/kernel/time-xen.c                         | 1103 +++++
 merge/arch/i386/kernel/traps-xen.c                        | 1136 +++++
 merge/arch/i386/kernel/traps.c                            |    9 
 merge/arch/i386/kernel/vm86.c                             |   12 
 merge/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 merge/arch/i386/mach-xen/Makefile                         |    5 
 merge/arch/i386/mach-xen/setup.c                          |   49 
 merge/arch/i386/mm/Makefile                               |    8 
 merge/arch/i386/mm/fault-xen.c                            |  683 +++
 merge/arch/i386/mm/highmem-xen.c                          |  123 
 merge/arch/i386/mm/hypervisor.c                           |  414 ++
 merge/arch/i386/mm/init-xen.c                             |  850 ++++
 merge/arch/i386/mm/ioremap-xen.c                          |  476 ++
 merge/arch/i386/mm/pageattr.c                             |    2 
 merge/arch/i386/mm/pgtable-xen.c                          |  642 +++
 merge/arch/i386/mm/pgtable.c                              |   12 
 merge/arch/i386/oprofile/Makefile                         |    4 
 merge/arch/i386/oprofile/xenoprof.c                       |  432 ++
 merge/arch/i386/pci/Makefile                              |    9 
 merge/arch/i386/pci/irq-xen.c                             | 1204 ++++++
 merge/arch/i386/pci/pcifront.c                            |   55 
 merge/arch/i386/power/Makefile                            |    4 
 merge/arch/ia64/Kconfig                                   |   65 
 merge/arch/ia64/Makefile                                  |   18 
 merge/arch/ia64/hp/sim/Makefile                           |    2 
 merge/arch/ia64/kernel/entry.S                            |   32 
 merge/arch/ia64/kernel/head.S                             |    6 
 merge/arch/ia64/kernel/iosapic.c                          |   68 
 merge/arch/ia64/kernel/irq_ia64.c                         |  200 +
 merge/arch/ia64/kernel/pal.S                              |    5 
 merge/arch/ia64/kernel/setup.c                            |   53 
 merge/arch/ia64/mm/ioremap.c                              |    3 
 merge/arch/ia64/xen/Makefile                              |    8 
 merge/arch/ia64/xen/drivers/README                        |    2 
 merge/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 merge/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 merge/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 merge/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 merge/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 merge/arch/ia64/xen/drivers/xenia64_init.c                |   60 
 merge/arch/ia64/xen/hypercall.S                           |  353 +
 merge/arch/ia64/xen/hypervisor.c                          |  761 +++
 merge/arch/ia64/xen/util.c                                |  115 
 merge/arch/ia64/xen/xenentry.S                            |  883 ++++
 merge/arch/ia64/xen/xenhpski.c                            |   19 
 merge/arch/ia64/xen/xenivt.S                              | 2171 +++++++++++
 merge/arch/ia64/xen/xenminstate.h                         |  369 +
 merge/arch/ia64/xen/xenpal.S                              |   76 
 merge/arch/ia64/xen/xensetup.S                            |   24 
 merge/arch/um/kernel/physmem.c                            |    4 
 merge/arch/x86_64/Kconfig                                 |   60 
 merge/arch/x86_64/Makefile                                |   20 
 merge/arch/x86_64/ia32/Makefile                           |   20 
 merge/arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++
 merge/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 merge/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 merge/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 merge/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 merge/arch/x86_64/kernel/Makefile                         |   19 
 merge/arch/x86_64/kernel/acpi/Makefile                    |    1 
 merge/arch/x86_64/kernel/apic-xen.c                       |  198 +
 merge/arch/x86_64/kernel/asm-offsets.c                    |    2 
 merge/arch/x86_64/kernel/e820-xen.c                       |  757 +++
 merge/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 merge/arch/x86_64/kernel/entry-xen.S                      | 1141 +++++
 merge/arch/x86_64/kernel/entry.S                          |    2 
 merge/arch/x86_64/kernel/genapic-xen.c                    |  144 
 merge/arch/x86_64/kernel/genapic_xen.c                    |  162 
 merge/arch/x86_64/kernel/head-xen.S                       |  176 
 merge/arch/x86_64/kernel/head64-xen.c                     |  140 
 merge/arch/x86_64/kernel/init_task.c                      |    3 
 merge/arch/x86_64/kernel/io_apic-xen.c                    | 2232 +++++++++++
 merge/arch/x86_64/kernel/ioport-xen.c                     |   57 
 merge/arch/x86_64/kernel/irq-xen.c                        |  163 
 merge/arch/x86_64/kernel/irq.c                            |    4 
 merge/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 merge/arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++
 merge/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 merge/arch/x86_64/kernel/process-xen.c                    |  791 ++++
 merge/arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++
 merge/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 merge/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 merge/arch/x86_64/kernel/smp.c                            |    4 
 merge/arch/x86_64/kernel/traps-xen.c                      | 1035 +++++
 merge/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 merge/arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 
 merge/arch/x86_64/kernel/xen_entry.S                      |   40 
 merge/arch/x86_64/mm/Makefile                             |   10 
 merge/arch/x86_64/mm/fault-xen.c                          |  644 +++
 merge/arch/x86_64/mm/init-xen.c                           | 1179 ++++++
 merge/arch/x86_64/mm/pageattr-xen.c                       |  390 +
 merge/arch/x86_64/oprofile/Makefile                       |    5 
 merge/arch/x86_64/pci/Makefile                            |   12 
 merge/drivers/Makefile                                    |    1 
 merge/drivers/acpi/Kconfig                                |    3 
 merge/drivers/char/mem.c                                  |    6 
 merge/drivers/char/tpm/Kconfig                            |   14 
 merge/drivers/char/tpm/Makefile                           |    2 
 merge/drivers/char/tpm/tpm.c                              |   44 
 merge/drivers/char/tpm/tpm.h                              |    7 
 merge/drivers/char/tpm/tpm_vtpm.c                         |  546 ++
 merge/drivers/char/tpm/tpm_vtpm.h                         |   38 
 merge/drivers/char/tpm/tpm_xen.c                          |  756 +++
 merge/drivers/char/tty_io.c                               |    7 
 merge/drivers/ide/ide-lib.c                               |    8 
 merge/drivers/oprofile/buffer_sync.c                      |   39 
 merge/drivers/oprofile/cpu_buffer.c                       |   26 
 merge/drivers/oprofile/cpu_buffer.h                       |    8 
 merge/drivers/oprofile/event_buffer.h                     |    3 
 merge/drivers/oprofile/oprof.c                            |   19 
 merge/drivers/oprofile/oprof.h                            |    2 
 merge/drivers/oprofile/oprofile_files.c                   |   82 
 merge/drivers/pci/Kconfig                                 |    1 
 merge/drivers/serial/Kconfig                              |    1 
 merge/drivers/video/Kconfig                               |    2 
 merge/drivers/xen/Kconfig                                 |  257 +
 merge/drivers/xen/Makefile                                |   17 
 merge/drivers/xen/balloon/Makefile                        |    2 
 merge/drivers/xen/balloon/balloon.c                       |  605 +++
 merge/drivers/xen/blkback/Makefile                        |    3 
 merge/drivers/xen/blkback/blkback.c                       |  580 ++
 merge/drivers/xen/blkback/common.h                        |  136 
 merge/drivers/xen/blkback/interface.c                     |  165 
 merge/drivers/xen/blkback/vbd.c                           |  119 
 merge/drivers/xen/blkback/xenbus.c                        |  410 ++
 merge/drivers/xen/blkfront/Kconfig                        |    6 
 merge/drivers/xen/blkfront/Makefile                       |    5 
 merge/drivers/xen/blkfront/blkfront.c                     |  822 ++++
 merge/drivers/xen/blkfront/block.h                        |  156 
 merge/drivers/xen/blkfront/vbd.c                          |  318 +
 merge/drivers/xen/blktap/Makefile                         |    3 
 merge/drivers/xen/blktap/blktap.c                         |  900 ++++
 merge/drivers/xen/blktap/common.h                         |  100 
 merge/drivers/xen/blktap/interface.c                      |  134 
 merge/drivers/xen/blktap/xenbus.c                         |  223 +
 merge/drivers/xen/char/Makefile                           |    2 
 merge/drivers/xen/char/mem.c                              |  182 
 merge/drivers/xen/console/Makefile                        |    2 
 merge/drivers/xen/console/console.c                       |  640 +++
 merge/drivers/xen/console/xencons_ring.c                  |  141 
 merge/drivers/xen/core/Makefile                           |   14 
 merge/drivers/xen/core/cpu_hotplug.c                      |  185 
 merge/drivers/xen/core/evtchn.c                           |  855 ++++
 merge/drivers/xen/core/features.c                         |   30 
 merge/drivers/xen/core/gnttab.c                           |  460 ++
 merge/drivers/xen/core/hypervisor_sysfs.c                 |   60 
 merge/drivers/xen/core/reboot.c                           |  364 +
 merge/drivers/xen/core/skbuff.c                           |  134 
 merge/drivers/xen/core/smpboot.c                          |  433 ++
 merge/drivers/xen/core/xen_proc.c                         |   19 
 merge/drivers/xen/core/xen_sysfs.c                        |  316 +
 merge/drivers/xen/evtchn/Makefile                         |    2 
 merge/drivers/xen/evtchn/evtchn.c                         |  458 ++
 merge/drivers/xen/netback/Makefile                        |    5 
 merge/drivers/xen/netback/common.h                        |  123 
 merge/drivers/xen/netback/interface.c                     |  314 +
 merge/drivers/xen/netback/loopback.c                      |  255 +
 merge/drivers/xen/netback/netback.c                       | 1039 +++++
 merge/drivers/xen/netback/xenbus.c                        |  396 ++
 merge/drivers/xen/netfront/Kconfig                        |    6 
 merge/drivers/xen/netfront/Makefile                       |    4 
 merge/drivers/xen/netfront/netfront.c                     | 1597 ++++++++
 merge/drivers/xen/pciback/Makefile                        |   13 
 merge/drivers/xen/pciback/conf_space.c                    |  403 ++
 merge/drivers/xen/pciback/conf_space.h                    |  123 
 merge/drivers/xen/pciback/conf_space_capability.c         |   71 
 merge/drivers/xen/pciback/conf_space_capability.h         |   23 
 merge/drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 merge/drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 merge/drivers/xen/pciback/conf_space_header.c             |  299 +
 merge/drivers/xen/pciback/passthrough.c                   |  157 
 merge/drivers/xen/pciback/pci_stub.c                      |  690 +++
 merge/drivers/xen/pciback/pciback.h                       |   91 
 merge/drivers/xen/pciback/pciback_ops.c                   |   95 
 merge/drivers/xen/pciback/vpci.c                          |  204 +
 merge/drivers/xen/pciback/xenbus.c                        |  454 ++
 merge/drivers/xen/pcifront/Makefile                       |    7 
 merge/drivers/xen/pcifront/pci.c                          |   46 
 merge/drivers/xen/pcifront/pci_op.c                       |  272 +
 merge/drivers/xen/pcifront/pcifront.h                     |   40 
 merge/drivers/xen/pcifront/xenbus.c                       |  294 +
 merge/drivers/xen/privcmd/Makefile                        |    2 
 merge/drivers/xen/privcmd/privcmd.c                       |  285 +
 merge/drivers/xen/tpmback/Makefile                        |    4 
 merge/drivers/xen/tpmback/common.h                        |   82 
 merge/drivers/xen/tpmback/interface.c                     |  177 
 merge/drivers/xen/tpmback/tpmback.c                       | 1074 +++++
 merge/drivers/xen/tpmback/xenbus.c                        |  306 +
 merge/drivers/xen/util.c                                  |   70 
 merge/drivers/xen/xenbus/Makefile                         |   12 
 merge/drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 merge/drivers/xen/xenbus/xenbus_client.c                  |  281 +
 merge/drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 merge/drivers/xen/xenbus/xenbus_comms.h                   |   43 
 merge/drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 merge/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 merge/drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++
 merge/fs/Kconfig                                          |    1 
 merge/include/asm-i386/a.out.h                            |    2 
 merge/include/asm-i386/apic.h                             |    2 
 merge/include/asm-i386/elf.h                              |    7 
 merge/include/asm-i386/fixmap.h                           |   13 
 merge/include/asm-i386/mach-default/mach_traps.h          |   12 
 merge/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 merge/include/asm-i386/mach-xen/asm/desc.h                |  164 
 merge/include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 
 merge/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 merge/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 merge/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 merge/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 merge/include/asm-i386/mach-xen/asm/hypercall.h           |  370 +
 merge/include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 merge/include/asm-i386/mach-xen/asm/io.h                  |  390 +
 merge/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 merge/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 merge/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 merge/include/asm-i386/mach-xen/asm/page.h                |  327 +
 merge/include/asm-i386/mach-xen/asm/param.h               |   24 
 merge/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 merge/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 merge/include/asm-i386/mach-xen/asm/pgtable.h             |  509 ++
 merge/include/asm-i386/mach-xen/asm/processor.h           |  753 +++
 merge/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 merge/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 merge/include/asm-i386/mach-xen/asm/segment.h             |  117 
 merge/include/asm-i386/mach-xen/asm/setup.h               |   64 
 merge/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 merge/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 merge/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 merge/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 merge/include/asm-i386/mach-xen/asm/system.h              |  578 ++
 merge/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 merge/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 merge/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 merge/include/asm-i386/mach-xen/mach_traps.h              |   33 
 merge/include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 merge/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 merge/include/asm-i386/page.h                             |    4 
 merge/include/asm-i386/pgtable-2level-defs.h              |    2 
 merge/include/asm-i386/pgtable-3level-defs.h              |    2 
 merge/include/asm-ia64/agp.h                              |   31 
 merge/include/asm-ia64/dma-mapping.h                      |   71 
 merge/include/asm-ia64/fixmap.h                           |    2 
 merge/include/asm-ia64/gcc_intrin.h                       |   60 
 merge/include/asm-ia64/hw_irq.h                           |    8 
 merge/include/asm-ia64/hypercall.h                        |  533 ++
 merge/include/asm-ia64/hypervisor.h                       |  198 +
 merge/include/asm-ia64/intel_intrin.h                     |   68 
 merge/include/asm-ia64/io.h                               |   52 
 merge/include/asm-ia64/iosapic.h                          |    2 
 merge/include/asm-ia64/irq.h                              |   31 
 merge/include/asm-ia64/machvec.h                          |   15 
 merge/include/asm-ia64/meminit.h                          |    5 
 merge/include/asm-ia64/page.h                             |  112 
 merge/include/asm-ia64/pal.h                              |    1 
 merge/include/asm-ia64/pgalloc.h                          |    2 
 merge/include/asm-ia64/privop.h                           |   60 
 merge/include/asm-ia64/processor.h                        |    1 
 merge/include/asm-ia64/synch_bitops.h                     |   61 
 merge/include/asm-ia64/system.h                           |    4 
 merge/include/asm-ia64/xen/privop.h                       |  280 +
 merge/include/asm-um/page.h                               |    2 
 merge/include/asm-x86_64/apic.h                           |    2 
 merge/include/asm-x86_64/hw_irq.h                         |    2 
 merge/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 merge/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 merge/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 merge/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 merge/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 merge/include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 merge/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 merge/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 merge/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 merge/include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 +
 merge/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 merge/include/asm-x86_64/mach-xen/asm/io.h                |  328 +
 merge/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 merge/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 merge/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 merge/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 merge/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 merge/include/asm-x86_64/mach-xen/asm/page.h              |  319 +
 merge/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 merge/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 merge/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 merge/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++
 merge/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 merge/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 merge/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 merge/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 merge/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 merge/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 merge/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 merge/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 merge/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 merge/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 merge/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 merge/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 merge/include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 merge/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 merge/include/linux/gfp.h                                 |    6 
 merge/include/linux/highmem.h                             |    6 
 merge/include/linux/mm.h                                  |   10 
 merge/include/linux/oprofile.h                            |    8 
 merge/include/linux/pfn.h                                 |    2 
 merge/include/linux/skbuff.h                              |   13 
 merge/include/xen/balloon.h                               |   63 
 merge/include/xen/cpu_hotplug.h                           |   44 
 merge/include/xen/driver_util.h                           |   16 
 merge/include/xen/evtchn.h                                |  114 
 merge/include/xen/features.h                              |   20 
 merge/include/xen/foreign_page.h                          |   30 
 merge/include/xen/gnttab.h                                |  150 
 merge/include/xen/hypervisor_sysfs.h                      |   32 
 merge/include/xen/interface/acm.h                         |  187 
 merge/include/xen/interface/acm_ops.h                     |  102 
 merge/include/xen/interface/arch-ia64.h                   |  418 ++
 merge/include/xen/interface/arch-x86_32.h                 |  224 +
 merge/include/xen/interface/arch-x86_64.h                 |  293 +
 merge/include/xen/interface/callback.h                    |   74 
 merge/include/xen/interface/dom0_ops.h                    |  574 ++
 merge/include/xen/interface/event_channel.h               |  233 +
 merge/include/xen/interface/features.h                    |   53 
 merge/include/xen/interface/grant_table.h                 |  317 +
 merge/include/xen/interface/hvm/hvm_info_table.h          |   24 
 merge/include/xen/interface/hvm/ioreq.h                   |   98 
 merge/include/xen/interface/hvm/vmx_assist.h              |   98 
 merge/include/xen/interface/io/blkif.h                    |   87 
 merge/include/xen/interface/io/console.h                  |   33 
 merge/include/xen/interface/io/netif.h                    |   92 
 merge/include/xen/interface/io/pciif.h                    |   55 
 merge/include/xen/interface/io/ring.h                     |  273 +
 merge/include/xen/interface/io/tpmif.h                    |   59 
 merge/include/xen/interface/io/xenbus.h                   |   45 
 merge/include/xen/interface/io/xs_wire.h                  |   97 
 merge/include/xen/interface/memory.h                      |  187 
 merge/include/xen/interface/nmi.h                         |   60 
 merge/include/xen/interface/physdev.h                     |  144 
 merge/include/xen/interface/sched.h                       |  103 
 merge/include/xen/interface/sched_ctl.h                   |   69 
 merge/include/xen/interface/trace.h                       |   86 
 merge/include/xen/interface/vcpu.h                        |  121 
 merge/include/xen/interface/version.h                     |   67 
 merge/include/xen/interface/xen-compat.h                  |   47 
 merge/include/xen/interface/xen.h                         |  505 ++
 merge/include/xen/interface/xenoprof.h                    |   94 
 merge/include/xen/pcifront.h                              |   39 
 merge/include/xen/public/evtchn.h                         |   91 
 merge/include/xen/public/privcmd.h                        |   79 
 merge/include/xen/xen_proc.h                              |   13 
 merge/include/xen/xenbus.h                                |  296 +
 merge/include/xen/xencons.h                               |   14 
 merge/kernel/Kconfig.preempt                              |    1 
 merge/kernel/irq/manage.c                                 |   26 
 merge/lib/Makefile                                        |    3 
 merge/mm/Kconfig                                          |    3 
 merge/mm/highmem.c                                        |   11 
 merge/mm/memory.c                                         |  121 
 merge/mm/mmap.c                                           |    4 
 merge/mm/page_alloc.c                                     |    6 
 merge/net/core/dev.c                                      |   63 
 merge/net/core/skbuff.c                                   |   43 
 merge/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 merge/net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 merge/net/ipv4/xfrm4_output.c                             |    6 
 merge/scripts/Makefile.xen                                |   14 
 405 files changed, 82852 insertions(+), 258 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- linux-2.6-xen.patch	24 Jun 2006 18:55:55 -0000	1.29
+++ linux-2.6-xen.patch	26 Jun 2006 01:38:15 -0000	1.30
@@ -43747,13 +43747,12 @@
  #endif
  	return 0;
  }
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/drivers/firmware/Kconfig merge/drivers/firmware/Kconfig
---- ../upstream/hg/linux-2.6/drivers/firmware/Kconfig	2005-11-23 12:37:42.000000000 +0100
-+++ merge/drivers/firmware/Kconfig	2006-05-30 12:42:55.000000000 +0200
-@@ -8,7 +8,7 @@ menu "Firmware Drivers"
+--- linux-2.6.17.noarch/drivers/firmware/Kconfig~	2006-06-25 21:19:15.000000000 -0400
++++ linux-2.6.17.noarch/drivers/firmware/Kconfig	2006-06-25 21:19:20.000000000 -0400
+@@ -7,7 +7,7 @@ menu "Firmware Drivers"
+ 
  config EDD
- 	tristate "BIOS Enhanced Disk Drive calls determine boot disk (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
+ 	tristate "BIOS Enhanced Disk Drive calls determine boot disk"
 -	depends on !IA64
 +	depends on !IA64 && !XEN
  	help


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- sources	25 Jun 2006 17:20:19 -0000	1.407
+++ sources	26 Jun 2006 01:38:20 -0000	1.408
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-73ac3ce3ac7ace11f0177f2dd0e85306  patch-2.6.17-git8.bz2
+1a5bfe97d1ac4abf516b0f72d51da312  patch-2.6.17-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- upstream	25 Jun 2006 17:20:19 -0000	1.372
+++ upstream	26 Jun 2006 01:38:20 -0000	1.373
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git8.bz2
+patch-2.6.17-git9.bz2


--- linux-2.6-autofs-invalidate.patch DELETED ---


--- patch-2.6.17-git8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 26 06:06:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 02:06:42 -0400
Subject: rpms/scim-chewing/devel scim-chewing-LTC23919-191957.patch, NONE,
	1.1 scim-chewing.spec, 1.16, 1.17
Message-ID: <200606260606.k5Q66gGS021804@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21701

Modified Files:
	scim-chewing.spec 
Added Files:
	scim-chewing-LTC23919-191957.patch 
Log Message:
Add scim-chewing-LTC23919-191957.patch


scim-chewing-LTC23919-191957.patch:
 scim_chewing_imengine.cpp |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE scim-chewing-LTC23919-191957.patch ---
--- scim-chewing-0.3.1/src/scim_chewing_imengine.cpp.orig	2006-06-23 17:39:06.000000000 +0530
+++ scim-chewing-0.3.1/src/scim_chewing_imengine.cpp	2006-06-23 17:38:39.000000000 +0530
@@ -275,6 +275,10 @@
     SCIM_DEBUG_IMENGINE( 2 ) <<
         "Create IMEngineInstance\n";
      
+     	// Initialize private members
+	memset(&gOut, 0, sizeof(gOut));
+	memset(&da, 0, sizeof(da));
+       
 	ctx = chewing_new();
 	reload_config( m_factory->m_config );
 	m_lookup_table.init( m_factory->m_selection_keys,


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-chewing.spec	16 Jun 2006 13:46:09 -0000	1.16
+++ scim-chewing.spec	26 Jun 2006 06:06:28 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.3.1
-Release:	1%{?dist}
+Release:	2
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -11,6 +11,7 @@
 Source:		http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 BuildRequires:	scim-devel, libchewing-devel >= 0.3.0, gettext,  intltool
+Patch1:  scim-chewing-LTC23919-191957.patch 
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -63,6 +64,9 @@
 
 
 %changelog
+* Mon Jun 26 2006 Darshan Santani <dsantani at redhat.com> 
+- Add scim-chewing-LTC23919-191957.patch by Shoji Sugiyama [IBM Japan]  (#191957)
+
 * Fri Jun 16 2006 Darshan Santani <dsantani at redhat.com> 
 - Update to 0.3.1
 - Changed BuildRequires to include intltool



From fedora-cvs-commits at redhat.com  Mon Jun 26 07:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 03:37:20 -0400
Subject: rpms/man-pages-de/devel man-pages-de.spec,1.13,1.14
Message-ID: <200606260737.k5Q7bKXh007212@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages-de/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7107

Modified Files:
	man-pages-de.spec 
Log Message:
- fix bug 196453 - remove newgrp.1 man page



Index: man-pages-de.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-de/devel/man-pages-de.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- man-pages-de.spec	9 Dec 2005 22:41:55 -0000	1.13
+++ man-pages-de.spec	26 Jun 2006 07:37:17 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: German man pages from the Linux Documentation Project.
 Name: man-pages-de
 Version: 0.4
-Release: 10.1
+Release: 11
 License: Distributable
 Group: Documentation
 URL: http://www.infodrom.org/projects/manpages-de/
@@ -29,6 +29,9 @@
 %build
 rm -f man1/hostname.*
 
+# part of shadow-utils
+rm -f man1/newgrp.*
+
 %install
 rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/de
@@ -56,6 +59,9 @@
 
 
 %changelog
+* Mon Jul 26 2006 Ivana Varekova <varekova at redhat.com> 0.4-11
+- fix bug 196453 - remove newgrp.1 man page
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 08:19:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 04:19:04 -0400
Subject: rpms/logwatch/devel logwatch-7.3-secure.patch, NONE,
	1.1 logwatch.spec, 1.38, 1.39
Message-ID: <200606260819.k5Q8J4TG017232@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16813

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3-secure.patch 
Log Message:
- dded secure-service patch


logwatch-7.3-secure.patch:
 secure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3-secure.patch ---
--- logwatch-7.3/scripts/services/secure.pom	2006-03-20 21:42:57.000000000 +0100
+++ logwatch-7.3/scripts/services/secure	2006-06-23 15:55:46.000000000 +0200
@@ -161,8 +161,8 @@
       ( $ThisLine =~ /^cyrus\/lmtpd\[\d+\]: [^ ]+ server step [12]/ ) or
       ( $ThisLine =~ /^cyrus\/imapd\[\d+\]: [^ ]+ server step [12]/ ) or
       ( $ThisLine =~ /pam_timestamp: updated timestamp file/) or
-      ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or
-      ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) or
+      ( $ThisLine =~ /pam_timestamp\(?[^ ]*\)?: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or
+      ( $ThisLine =~ /pam_timestamp\(?[^ ]*\)?: timestamp file `([^ ]+)'/) or # has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) or
       ( $ThisLine =~ /userhelper\[\d+\]: running '([^ ]+)' with [^ ]+ context/) or
       ( $ThisLine =~ /pam_timestamp\(.*:session\): updated timestamp file `\/var\/run\/sudo.*'/)   
    ) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- logwatch.spec	5 May 2006 09:42:20 -0000	1.38
+++ logwatch.spec	26 Jun 2006 08:19:02 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.3
-Release: 2
+Release: 3
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -10,6 +10,8 @@
 Patch3: logwatch-7.2.1-up2date.patch
 Patch4: logwatch-7.3-samba.patch
 Patch5: logwatch-7.3-temp_dir.patch
+Patch6: logwatch-7.3-secure.patch
+
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -27,6 +29,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %install
@@ -129,6 +132,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Fri Jun 23 2006 Ivana Varekova <varekova at redhat.com> 7.3-3
+- added secure-service patch
+
 * Fri May  5 2006 Ivana Varekova <varekova at redhat.com> 7.3-2
 - added tests to file creation and access, clean up 
 resulting files when logwatch fails (upstream change) 



From fedora-cvs-commits at redhat.com  Mon Jun 26 08:28:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 04:28:25 -0400
Subject: rpms/iproute/devel iproute2-2.6.16-initcwnd-correct-order.patch,
	NONE, 1.1 iproute.spec, 1.49, 1.50
Message-ID: <200606260828.k5Q8SP8x020374@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20344

Modified Files:
	iproute.spec 
Added Files:
	iproute2-2.6.16-initcwnd-correct-order.patch 
Log Message:
- improve handling of initcwnd value (#179719)

iproute2-2.6.16-initcwnd-correct-order.patch:
 iproute.c |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

--- NEW FILE iproute2-2.6.16-initcwnd-correct-order.patch ---
--- iproute2-2.6.16-060323/ip/iproute.c.initcwnd	2005-10-13 00:49:50.000000000 +0200
+++ iproute2-2.6.16-060323/ip/iproute.c	2006-06-26 10:23:27.000000000 +0200
@@ -59,8 +59,8 @@
 	fprintf(stderr, "NH := [ via ADDRESS ] [ dev STRING ] [ weight NUMBER ] NHFLAGS\n");
 	fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
 	fprintf(stderr, "           [ rtt NUMBER ] [ rttvar NUMBER ]\n");
-	fprintf(stderr, "           [ window NUMBER] [ cwnd NUMBER ] [ ssthresh NUMBER ]\n");
-	fprintf(stderr, "           [ realms REALM ]\n");
+	fprintf(stderr, "           [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n");
+	fprintf(stderr, "           [ ssthresh NUMBER ] [ realms REALM ]\n");
 	fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
 	fprintf(stderr, "          unreachable | prohibit | blackhole | nat ]\n");
 	fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
@@ -487,6 +487,15 @@
 			mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]);
 
 		for (i=2; i<=RTAX_MAX; i++) {
+
+			/*
+			 * "hoplimit" and "features" are not supported in
+			 * userspace yet, but they are present in kernel's
+			 * RTM_METRICS array in include/linux/rtnetlink.h,
+			 * so putting placeholders in here for now so we
+			 * can match the position of initcwnd in this
+			 * structure:					*/
+
 			static char *mx_names[] = 
 			{
 				"mtu",
@@ -497,6 +506,9 @@
 				"cwnd",
 				"advmss",
 				"reordering",
+				"hoplimit",
+				"initcwnd",
+				"features",
 			};
 			static int hz;
 			if (mxrta[i] == NULL)
@@ -794,6 +806,16 @@
 			if (get_unsigned(&win, *argv, 0))
 				invarg("\"cwnd\" value is invalid\n", *argv);
 			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_CWND, win);
+		} else if (matches(*argv, "initcwnd") == 0) {
+			unsigned win;
+			NEXT_ARG();
+			if (strcmp(*argv, "lock") == 0) {
+				mxlock |= (1<<RTAX_INITCWND);
+				NEXT_ARG();
+			}
+			if (get_unsigned(&win, *argv, 0))
+				invarg("\"initcwnd\" value is invalid\n", *argv);
+			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_INITCWND, win);
 		} else if (matches(*argv, "rttvar") == 0) {
 			unsigned win;
 			NEXT_ARG();


Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- iproute.spec	28 May 2006 07:44:46 -0000	1.49
+++ iproute.spec	26 Jun 2006 08:28:22 -0000	1.50
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.16
-Release: 2
+Release: 3
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
@@ -13,6 +13,7 @@
 Patch5: iproute2-ss050901-opt_flags.patch
 Patch7: iproute2-051007-add_tunnel.patch
 Patch8: iproute2-2.6.16-libdir.patch
+Patch9:	iproute2-2.6.16-initcwnd-correct-order.patch
 
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -32,6 +33,7 @@
 %patch5 -p1 -b .opt_flags
 %patch7 -p1 -b .tunnel_add
 %patch8 -p1 -b .libdir
+%patch9 -p1 -b .initcwnd
 
 %build
 export LIBDIR=%{_libdir}
@@ -92,6 +94,9 @@
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Mon Jun 26 2006 Radek Vok??l <rvokal at redhat.com> - 2.6.16-3
+- improve handling of initcwnd value (#179719)
+
 * Sun May 28 2006 Radek Vok??l <rvokal at redhat.com> - 2.6.16-2
 - fix BuildRequires: flex (#193403)
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 08:48:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 04:48:37 -0400
Subject: rpms/mkbootdisk/FC-5 mkbootdisk-1.5.2-tail.patch, NONE,
	1.1 mkbootdisk.spec, 1.19, 1.20
Message-ID: <200606260848.k5Q8mbK7007499@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/mkbootdisk/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7451

Modified Files:
	mkbootdisk.spec 
Added Files:
	mkbootdisk-1.5.2-tail.patch 
Log Message:
fix tail command usage (#196525)


mkbootdisk-1.5.2-tail.patch:
 mkbootdisk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mkbootdisk-1.5.2-tail.patch ---
--- mkbootdisk-1.5.2/mkbootdisk.tail	2006-06-26 10:42:09.000000000 +0200
+++ mkbootdisk-1.5.2/mkbootdisk	2006-06-26 10:42:35.000000000 +0200
@@ -110,8 +110,8 @@
     # whee, now we have to look through every partition looking for
     # the thing called $rootlabel, which could be raid. Ick.
 
-    list=$(tail +3 /proc/partitions | awk '{ print $4 '} | grep '^md')
-    list="$list $(tail +3 /proc/partitions | 
+    list=$(tail -n +3 /proc/partitions | awk '{ print $4 '} | grep '^md')
+    list="$list $(tail -n +3 /proc/partitions | 
 			awk '{ print $4 '} | grep -v '^md')"
     rootdev=""
     for dev in $list; do


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/FC-5/mkbootdisk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mkbootdisk.spec	7 Mar 2006 10:23:21 -0000	1.19
+++ mkbootdisk.spec	26 Jun 2006 08:48:34 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
 Version: 1.5.2
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source: mkbootdisk-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Patch1: mkbootdisk-1.5.2-hangup.patch
 Patch2: mkbootdisk-1.5.2-mantypo.patch
 Patch3: mkbootdisk-x86_64.patch
+Patch4: mkbootdisk-1.5.2-tail.patch
 ExclusiveOs: Linux
 BuildArch: noarch
 Requires: mkinitrd dosfstools
@@ -36,6 +37,7 @@
 %patch1 -p1 -b .hangup
 %patch2 -p1 -b .mantypo
 %patch3 -p0 -b .x86_64
+%patch4 -p1 -b .tail
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,6 +52,9 @@
 %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
 
 %changelog
+* Mon Jun 26 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.2-7
+- fix tail command usage (#196525) 
+
 * Tue Mar 07 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.2-6
 - build  as noarch
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 10:31:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 06:31:27 -0400
Subject: rpms/openoffice.org/FC-5 sources,1.165,1.166
Message-ID: <200606261031.k5QAVRE3023651@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23623

Modified Files:
	sources 
Log Message:
update dictionaries


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	9 Jun 2006 11:16:02 -0000	1.165
+++ sources	26 Jun 2006 10:31:24 -0000	1.166
@@ -6,7 +6,6 @@
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 20789fc643e2b857291e1973075fccb0  OOB680_m5.tar.bz2
 67ba19cf8ac46671799ff63a48901e8b  openoffice.org-simple-crash_report.sh
-bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
 afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
 7f31494f6d929e03b1e29408d8083d19  GSI_ga.sdf
 008752c97e7cd0edbb7f6589ae61e498  GSI_ta-IN.sdf
@@ -14,3 +13,4 @@
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
 baaf6187c060cc0525acbe4c07748025  DisableJavaApplets.xcu
+cc92c22601beae1800342255d1a18ff1  openoffice.org-myspell-contrib.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 26 11:36:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 07:36:07 -0400
Subject: rpms/ipv6calc/FC-5 .cvsignore, 1.7, 1.8 ipv6calc.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200606261136.k5QBa7Rg006784@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ipv6calc/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6754

Modified Files:
	.cvsignore ipv6calc.spec sources 
Log Message:
 - upgrade to 0.60.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2006 08:43:13 -0000	1.7
+++ .cvsignore	26 Jun 2006 11:36:05 -0000	1.8
@@ -1 +1 @@
-ipv6calc-0.51.tar.gz
+ipv6calc-0.60.0.tar.gz


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/FC-5/ipv6calc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ipv6calc.spec	22 Feb 2006 08:43:13 -0000	1.18
+++ ipv6calc.spec	26 Jun 2006 11:36:05 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
-Version: 	0.51
-Release: 	1
+Version: 	0.60.0
+Release: 	fc5.1
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
 License: 	GNU GPL version 2
@@ -55,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Mon Jun 26 2006 Radek Vokal <rvokal at redhat.com> 0.60.0-fc5.1
+- upgrade to 0.60.0
+
 * Wed Feb 22 2006 Radek Vok??l <rvokal at redhat.com> 0.51-1
 - upgrade to 0.51
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Feb 2006 08:43:13 -0000	1.7
+++ sources	26 Jun 2006 11:36:05 -0000	1.8
@@ -1 +1 @@
-c08c77712854ef3ba17f129a84d73ee2  ipv6calc-0.51.tar.gz
+894f67ad3883bd0153ede1946d9dc4cb  ipv6calc-0.60.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 26 11:59:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 07:59:14 -0400
Subject: rpms/kdemultimedia/FC-4 kdemultimedia.spec,1.50,1.51
Message-ID: <200606261159.k5QBxEcM030091@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30047

Modified Files:
	kdemultimedia.spec 
Log Message:
fix #185836, Unknown protocol audiocd when kaudiocreator started



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdemultimedia.spec	9 Jun 2006 18:30:14 -0000	1.50
+++ kdemultimedia.spec	26 Jun 2006 11:59:11 -0000	1.51
@@ -1,7 +1,6 @@
 %define debug 0
 %define final 0
 %define make_cvs 1
-%define disable_gcc_check_and_hidden_visibility 1
 
 # support mp3
 %define build_mpeglib 0
@@ -13,7 +12,6 @@
 %define libtool 1
 %define alsa 1
 %define juk 0
-%define cdparanoia 1
 %define arts 1
 
 %define redhatify 1
@@ -27,7 +25,7 @@
 %endif
 
 Version: 3.5.3
-Release: 0.1.fc4
+Release: 0.2.fc4
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -58,12 +56,13 @@
 BuildRequires: glib2-devel
 BuildRequires: libmng-devel
 BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: flac-devel
+BuildRequires: libtheora-devel
 %if %{alsa}
 BuildRequires: alsa-lib-devel >= 1.0.2
 %endif
-%if %{cdparanoia}
+BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
-%endif
 %if %{juk}
 BuildRequires: taglib => 1.0
 BuildRequires: libmusicbrainz >= 2.1
@@ -106,9 +105,6 @@
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
-perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
-perl -pi -e "s,examples,,g" kmid/Make*
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -129,12 +125,8 @@
    --without-debug \
    --disable-warnings \
 %endif
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{cdparanoia} == 0
-   --disable-cdparanoia \
-%endif
+   --with-cdparanoia \
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -225,6 +217,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc4
+- fix #185836, Unknown protocol audiocd when kaudiocreator started
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 12:08:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 08:08:49 -0400
Subject: rpms/kdemultimedia/FC-5 kdemultimedia.spec,1.59,1.60
Message-ID: <200606261208.k5QC8n8A031615@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31565

Modified Files:
	kdemultimedia.spec 
Log Message:
fix #196231, Unknown protocol audiocd when kaudiocreator started




Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/kdemultimedia.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdemultimedia.spec	9 Jun 2006 16:32:04 -0000	1.59
+++ kdemultimedia.spec	26 Jun 2006 12:08:47 -0000	1.60
@@ -7,12 +7,10 @@
 
 %define my_vendor kde
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 
 %define libtool 1
-%define alsa 1
 %define juk 0
-%define cdparanoia 1
 %define arts 1
 
 %define redhatify 1
@@ -25,10 +23,8 @@
 %define patch_name -patched
 %endif
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
-Release: 0.1.fc5
+Release: 0.2.fc5
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -59,18 +55,16 @@
 BuildRequires: libmng-devel
 BuildRequires: /usr/bin/desktop-file-install
 BuildRequires: libtheora-devel
+BuildRequires: flac-devel
 %if %{make_cvs}
 BuildRequires: autoconf automake libtool
 %endif
 %if %{build_mpeglib}
 BuildRequires: libXxf86dga-devel
 %endif
-%if %{alsa}
 BuildRequires: alsa-lib-devel >= 1.0.2
-%endif
-%if %{cdparanoia}
+BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
-%endif
 %if %{juk}
 BuildRequires: taglib => 1.0
 BuildRequires: libmusicbrainz >= 2.1
@@ -141,19 +135,13 @@
    --with-motif-includes=none \
    --with-motif-libraries=none \
    --with-extra-includes=/usr/include/cdda \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{cdparanoia} == 0
-   --disable-cdparanoia \
-%endif
+   --with-cdparanoia \
 %if %{arts} == 0
    --without-arts \
 %endif
-%if %{alsa}
    --with-alsa \
    --with-arts-alsa \
-%endif
    --disable-rpath \
    --includedir=%{_includedir}/kde \
    --with-xinerama \
@@ -242,6 +230,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
+- fix #196231, Unknown protocol audiocd when kaudiocreator started
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 12:30:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 08:30:24 -0400
Subject: rpms/mesa/FC-5 mesa.spec,1.48,1.49
Message-ID: <200606261230.k5QCUOIl029021@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29008

Modified Files:
	mesa.spec 
Log Message:
* Mon Jun 26 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-6.FC5.3
- Added mesa-6.4.2-64bit-fix-bug190245.patch to fix numerous bug reports on
  x86_64 including (#190245,185929,187603,185727,189730)
- Change BuildRoot to comply with Fedora packaging guidelines.
- Add proper Requires(post) etc. to runtime lib packages.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/FC-5/mesa.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mesa.spec	23 Jun 2006 20:44:16 -0000	1.48
+++ mesa.spec	26 Jun 2006 12:30:21 -0000	1.49
@@ -53,11 +53,12 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 6.FC5.2
+Release: 6.FC5.3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
 # MesaDemos is included here just for glxinfo and glxgears, as they were
 # previously supplied in X.Org sources, whereas the rest of the demos were not.
@@ -67,7 +68,7 @@
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
-#Patch0: mesa-6.3.2-makedepend.patch
+
 Patch0: mesa-6.3.2-build-configuration-v4.patch
 Patch1: mesa-6.3.2-fix-installmesa.patch
 Patch2: mesa-6.4-multilib-fix.patch
@@ -76,7 +77,7 @@
 Patch5: mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch
 Patch6: mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
 Patch7: mesa-6.4.2-parallel-build-fix.patch
-#Patch4: mesa-6.4.1-enable-osmesa.patch
+Patch8: mesa-6.4.2-64bit-fix-bug190245.patch
 
 # General patches from upstream go here:
 Patch100: mesa-6.5-noexecstack.patch
@@ -108,6 +109,9 @@
 Summary: Mesa libGL runtime libraries and DRI drivers.
 Group: System Environment/Libraries
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Provides: libGL
 
 # libGL used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -146,6 +150,9 @@
 Summary: Mesa libGLU runtime library
 Group: System Environment/Libraries
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Provides: libGLU
 
 # libGLU used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -184,6 +191,9 @@
 Summary: Mesa libGLw runtime library
 Group: System Environment/Libraries
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Provides: libGLw
 
 # libGLw used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -247,6 +257,7 @@
 %patch5 -p1 -b .dprintf-to-debugprintf-for-bug180122
 %patch6 -p0 -b .xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835
 %patch7 -p1 -b .parallel-build-fix
+%patch8 -p1 -b .64bit-fix-bug190245
 
 # Bug #178262: Stack doesn't really need to be executable.
 %patch100 -p0 -b .noexec-stack
@@ -259,7 +270,7 @@
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
-rm include/GL/uglglutshapes.h
+rm -f include/GL/uglglutshapes.h
 
 #-- Build ------------------------------------------------------------
 %build
@@ -443,6 +454,12 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Jun 26 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-6.FC5.3
+- Added mesa-6.4.2-64bit-fix-bug190245.patch to fix numerous bug reports on
+  x86_64 including (#190245,185929,187603,185727,189730)
+- Change BuildRoot to comply with Fedora packaging guidelines.
+- Add proper Requires(post) etc. to runtime lib packages.
+
 * Fri Jun 23 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-6.FC5.2
 - Backport the 6.5 noexec-stack fixes.  Fix parallel builds.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 12:39:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 08:39:05 -0400
Subject: rpms/mesa/FC-5 mesa-6.4.2-64bit-fix-bug190245.patch,NONE,1.1
Message-ID: <200606261239.k5QCd51o029141@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29115

Added Files:
	mesa-6.4.2-64bit-fix-bug190245.patch 
Log Message:
add mesa-6.4.2-64bit-fix-bug190245.patch

mesa-6.4.2-64bit-fix-bug190245.patch:
 glheader.h |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE mesa-6.4.2-64bit-fix-bug190245.patch ---
diff -u -r Mesa-6.4.2-old/src/mesa/main/glheader.h Mesa-6.4.2/src/mesa/main/glheader.h
--- Mesa-6.4.2-old/src/mesa/main/glheader.h	2005-11-27 18:16:31.000000000 +0000
+++ Mesa-6.4.2/src/mesa/main/glheader.h	2006-06-17 12:54:06.000000000 +0100
@@ -46,6 +46,9 @@
 #ifndef GLHEADER_H
 #define GLHEADER_H
 
+#ifdef HAVE_DIX_CONFIG_H
+#include "dix-config.h"
+#endif
 
 #if defined(XFree86LOADER) && defined(IN_MODULE)
 #include "xf86_ansic.h"



From fedora-cvs-commits at redhat.com  Mon Jun 26 12:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 08:40:01 -0400
Subject: rpms/mesa/FC-5 mesa.spec,1.49,1.50
Message-ID: <200606261240.k5QCe11Q007323@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7282

Modified Files:
	mesa.spec 
Log Message:
add missing bug ID to changelog


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/FC-5/mesa.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mesa.spec	26 Jun 2006 12:30:21 -0000	1.49
+++ mesa.spec	26 Jun 2006 12:39:58 -0000	1.50
@@ -461,7 +461,7 @@
 - Add proper Requires(post) etc. to runtime lib packages.
 
 * Fri Jun 23 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-6.FC5.2
-- Backport the 6.5 noexec-stack fixes.  Fix parallel builds.
+- Backport the 6.5 noexec-stack fixes.  Fix parallel builds.  (#178262)
 
 * Wed May 17 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-6.FC5.1
 - Add "BuildRequires: makedepend" for bug (#191967)



From fedora-cvs-commits at redhat.com  Mon Jun 26 12:53:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 08:53:21 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta5-auth-config.patch, NONE,
	1.1 autofs-5.0.0_beta5-compile-warnings.patch, NONE,
	1.1 autofs-5.0.0_beta5-get-dn-update.patch, NONE,
	1.1 autofs-5.0.0_beta5-get-dn.patch, NONE,
	1.1 autofs-5.0.0_beta5-ldap-default-auth.patch, NONE,
	1.1 autofs-5.0.0_beta5-mapclass.patch, NONE,
	1.1 autofs-5.0.0_beta5-parse-old-style-dn.patch, NONE,
	1.1 autofs.spec, 1.112, 1.113
Message-ID: <200606261253.k5QCrLCw026943@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26863

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta5-auth-config.patch 
	autofs-5.0.0_beta5-compile-warnings.patch 
	autofs-5.0.0_beta5-get-dn-update.patch 
	autofs-5.0.0_beta5-get-dn.patch 
	autofs-5.0.0_beta5-ldap-default-auth.patch 
	autofs-5.0.0_beta5-mapclass.patch 
	autofs-5.0.0_beta5-parse-old-style-dn.patch 
Log Message:
* Mon Jun 26 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-4
- correct spelling error in default config.
- fix default auth config not being installed.
- change LDAP query method as my test db was incorrect.
- change ldap defaults code to handle missing auth config.
- fix mistake in parsing old style LDAP specs.
- update LDAP so that new query method also works for old syntax.


autofs-5.0.0_beta5-auth-config.patch:
 CHANGELOG                     |    1 
 samples/Makefile              |   48 +++++++++++++++++++++++++++++++-----------
 samples/autofs_ldap_auth.conf |    2 -
 3 files changed, 38 insertions(+), 13 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-auth-config.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 7c193e8..3397b3b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - fix couple of memory leaks in lookup_yp.c.
 - fix pasre error in replicated server module.
 - correct spelling error in default config.
+- fix default auth config not being installed.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/samples/Makefile b/samples/Makefile
index 2123dc8..f65658a 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -30,7 +30,7 @@ autofs.init:
 	@echo
 ifneq ($(initdir),)
 	install -d -m 755 $(INSTALLROOT)$(initdir)
-	install -c rc.autofs -m 755 $(INSTALLROOT)$(initdir)/autofs
+	install rc.autofs -m 755 $(INSTALLROOT)$(initdir)/autofs
 else
 	if test -d $(INSTALLROOT)/etc/rc.d ; then \
 		install -c rc.autofs -m 755 $(INSTALLROOT)/etc/rc.d ; \
@@ -46,12 +46,12 @@ autofs.conf: autofs.conf.default
 	@echo "Installing autofs default configuation in $(autofsconfdir)"
 	@if test -z "$(CONFIG)" ; \
 	then \
-		install -v -c autofs.conf.default -m 755 \
+		install -v autofs.conf.default -m 755 \
 			$(INSTALLROOT)$(autofsconfdir)/autofs.conf.new ; \
 		echo "Found existing backup of configuration file." ; \
 		echo "Installed package default configuration file as \"autofs.conf.new\"." ; \
 	else \
-		install -v -c autofs.conf.default -m 755 $(CONFIG) \
+		install -v autofs.conf.default -m 755 $(CONFIG) \
 				$(INSTALLROOT)$(autofsconfdir)/autofs ; \
 		echo "Installed package configuration configuration as \"autofs\"." ; \
 		if test -z "$(CEXISTS)" ; \
@@ -60,6 +60,29 @@ autofs.conf: autofs.conf.default
 		fi ; \
 	fi
 
+AUTH = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/autofs_ldap_auth.conf.orig || echo "-b --suffix=.orig")
+AEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/autofs_ldap_auth.conf || echo "no")
+
+.PHONY: autofs_ldap_auth.conf
+autofs_ldap_auth.conf:
+	@echo
+	@echo "Installing autofs ldap auth config \"autofs_ldap_auth.conf\" in $(autofsmapdir)"
+	@if test -z "$(AUTH)" ; \
+	then \
+		install -v autofs_ldap_auth.conf -m 600 \
+			$(INSTALLROOT)$(autofsmapdir)/autofs_ldap_auth.conf.new ; \
+		echo "Found existing backup of auth config \"autofs_ldap_auth.conf\"." ; \
+		echo "Installed package auth config as \"autofs_ldap_auth.conf.new\"." ; \
+	else \
+		install -v autofs_ldap_auth.conf -m 600 $(AUTH) \
+				$(INSTALLROOT)$(autofsmapdir)/autofs_ldap_auth.conf ; \
+		echo "Installed package auth config as \"autofs_ldap_auth.conf\"." ; \
+		if test -z "$(SEXISTS)" ; \
+		then \
+			echo "Backup of existing auth config made to \".utofs_ldap_auth.conf.orig\"." ; \
+		fi ; \
+	fi
+
 MASTER = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.master.orig || echo "-b --suffix=.orig")
 MEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.master || echo "no")
 
@@ -69,12 +92,12 @@ auto.master:
 	@echo "Installing autofs default master map in $(autofsmapdir)"
 	@if test -z "$(MASTER)" ; \
 	then \
-		install -v -c auto.master -m 644 \
+		install -v auto.master -m 644 \
 			$(INSTALLROOT)$(autofsmapdir)/auto.master.new ; \
 		echo "Found existing backup of master map." ; \
 		echo "Installed package default master map as \"auto.master.new\"." ; \
 	else \
-		install -v -c auto.master -m 644 $(MASTER) \
+		install -v auto.master -m 644 $(MASTER) \
 				$(INSTALLROOT)$(autofsmapdir)/auto.master ; \
 		echo "Installed package master map as \"auto.master\"." ; \
 		if test -z "$(MEXISTS)" ; \
@@ -92,12 +115,12 @@ auto.misc:
 	@echo "Installing autofs sample map \"auto.misc\" in $(autofsmapdir)"
 	@if test -z "$(MISC)" ; \
 	then \
-		install -v -c auto.misc -m 644 \
+		install -v auto.misc -m 644 \
 			$(INSTALLROOT)$(autofsmapdir)/auto.misc.new ; \
 		echo "Found existing backup of sample map \"auto.misc\"." ; \
 		echo "Installed package sample as \"auto.misc.new\"." ; \
 	else \
-		install -v -c auto.misc -m 644 $(MISC) \
+		install -v auto.misc -m 644 $(MISC) \
 				$(INSTALLROOT)$(autofsmapdir)/auto.misc ; \
 		echo "Installed package sample map as \"auto.misc\"." ; \
 		if test -z "$(MEXISTS)" ; \
@@ -115,12 +138,12 @@ auto.net:
 	@echo "Installing autofs sample map \"auto.net\" in $(autofsmapdir)"
 	@if test -z "$(NET)" ; \
 	then \
-		install -v -c auto.net -m 755 \
+		install -v auto.net -m 755 \
 			$(INSTALLROOT)$(autofsmapdir)/auto.net.new ; \
 		echo "Found existing backup of sample map \"auto.net\"." ; \
 		echo "Installed package sample as \"auto.net.new\"." ; \
 	else \
-		install -v -c auto.net -m 755 $(NET) \
+		install -v auto.net -m 755 $(NET) \
 				$(INSTALLROOT)$(autofsmapdir)/auto.net ; \
 		echo "Installed package sample map as \"auto.net\"." ; \
 		if test -z "$(NEXISTS)" ; \
@@ -138,12 +161,12 @@ auto.smb:
 	@echo "Installing autofs sample map \"auto.smb\" in $(autofsmapdir)"
 	@if test -z "$(SMB)" ; \
 	then \
-		install -v -c auto.smb -m 755 \
+		install -v auto.smb -m 755 \
 			$(INSTALLROOT)$(autofsmapdir)/auto.smb.new ; \
 		echo "Found existing backup of sample map \"auto.smb\"." ; \
 		echo "Installed package sample as \"auto.smb.new\"." ; \
 	else \
-		install -v -c auto.net -m 755 $(SMB) \
+		install -v auto.net -m 755 $(SMB) \
 				$(INSTALLROOT)$(autofsmapdir)/auto.smb ; \
 		echo "Installed package sample map as \"auto.smb\"." ; \
 		if test -z "$(SEXISTS)" ; \
@@ -152,7 +175,8 @@ auto.smb:
 		fi ; \
 	fi
 
-install: rc.autofs autofs.conf.default dirs autofs.init autofs.conf $(SAMPLES)
+install: rc.autofs autofs.conf.default dirs autofs.init autofs.conf \
+		autofs_ldap_auth.conf $(SAMPLES)
 	@echo
 
 clean:
diff --git a/samples/autofs_ldap_auth.conf b/samples/autofs_ldap_auth.conf
index feb6a2e..265571e 100644
--- a/samples/autofs_ldap_auth.conf
+++ b/samples/autofs_ldap_auth.conf
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <autofs_ldap_sasl_conf
-	usetls="yes"
+	usetls="no"
 	tlsrequired="no"
 	authrequired="no"
 	authtype="DIGEST-MD5"

autofs-5.0.0_beta5-compile-warnings.patch:
 lib/master.c          |    4 +---
 lib/rpc_subs.c        |    1 +
 modules/lookup_ldap.c |    2 --
 modules/lookup_yp.c   |    2 +-
 modules/mount_nfs.c   |    2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-compile-warnings.patch ---
diff --git a/lib/master.c b/lib/master.c
index d61df03..a0a7ae8 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -616,8 +616,6 @@ void master_remove_mapent(struct master_
 
 void master_free_mapent_sources(struct master_mapent *entry, unsigned int free_cache)
 {
-	int status;
-
 	master_source_writelock(entry);
 
 	if (entry->maps) {
@@ -659,7 +657,7 @@ void master_free_mapent(struct master_ma
 struct master *master_new(const char *name, unsigned int timeout, unsigned int ghost)
 {
 	struct master *master;
-	char *tmp;
+	const char *tmp;
 
 	master = malloc(sizeof(struct master));
 	if (!master)
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 143dbdd..6ce4cf7 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -28,6 +28,7 @@ #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/fcntl.h>
+#include <rpcsvc/ypclnt.h>
 #include <errno.h>
 
 #include "mount.h"
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 7fa2157..130a0c6 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1227,8 +1227,6 @@ int lookup_read_map(struct autofs_point 
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	int rv = LDAP_SUCCESS;
-	char *key;
-	int keylen;
 	int ret;
 
 	ret = read_one_map(ap, ctxt, age, &rv);
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 36563a9..25bc6db 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -436,7 +436,7 @@ static int check_map_indirect(struct aut
 {
 	struct map_source *source = ap->entry->current;
 	struct mapent_cache *mc = source->mc;
-	struct mapent *me, *exists;
+	struct mapent *exists;
 	unsigned int map_order;
 	int need_map = 0;
 	int ret = 0;
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index e25988d..a67d01c 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -47,7 +47,7 @@ int mount_init(void **context)
 {
 	/* Make sure we have the local mount method available */
 	if (!mount_bind) {
-		if (mount_bind = open_mount("bind", MODPREFIX));
+		if ((mount_bind = open_mount("bind", MODPREFIX)));
 			init_ctr++;
 	} else
 		init_ctr++;

autofs-5.0.0_beta5-get-dn-update.patch:
 CHANGELOG             |    2 ++
 modules/lookup_ldap.c |   22 ++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-get-dn-update.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 77fde7e..ced35cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@
 - change LDAP query method as my test db was incorrect.
 - change ldap defaults code to handle missing auth config.
 - fix mistake in parsing old style LDAP specs.
+- update LDAP so that new query methos also works for old
+  syntax.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 9794c5f..7fa2157 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -709,6 +709,8 @@ static void free_context(struct lookup_c
 		free(ctxt->secret);
 	if (ctxt->mapname)
 		free(ctxt->mapname);
+	if (ctxt->qdn)
+		ldap_memfree(ctxt->qdn);
 	if (ctxt->server)
 		free(ctxt->server);
 	if (ctxt->base)
@@ -725,6 +727,7 @@ static int get_query_dn(LDAP *ldap, stru
 	LDAPMessage *result, *e;
 	char *class, *key;
 	char *attrs[2];
+	int scope;
 	int rv, l;
 
 	class = ctxt->map_obj_class;
@@ -761,17 +764,18 @@ static int get_query_dn(LDAP *ldap, stru
 			      MODPREFIX "error forming query string");
 			return 0;
 		}
+		scope = LDAP_SCOPE_ONE;
 	} else {
 		if (sprintf(query, "(objectclass=%s)", class) >= l) {
 			debug(LOGOPT_NONE,
 			      MODPREFIX "error forming query string");
 			return 0;
 		}
+		scope = LDAP_SCOPE_BASE;
 	}
 	query[l] = '\0';
 
-	rv = ldap_search_s(ldap, ctxt->base, LDAP_SCOPE_ONE,
-			   query, attrs, 0, &result);
+	rv = ldap_search_s(ldap, ctxt->base, scope, query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
 		error(LOGOPT_NONE,
@@ -898,6 +902,7 @@ int lookup_read_master(struct master *ma
 	char **keyValue = NULL;
 	char **values = NULL;
 	char *attrs[3];
+	int scope = LDAP_SCOPE_SUBTREE;
 	LDAP *ldap;
 
 	class = ctxt->entry_obj_class;
@@ -932,8 +937,7 @@ int lookup_read_master(struct master *ma
 	debug(LOGOPT_NONE,
 	      MODPREFIX "searching for \"%s\" under \"%s\"", query, ctxt->qdn);
 
-	rv = ldap_search_s(ldap, ctxt->qdn,
-			   LDAP_SCOPE_SUBTREE, query, attrs, 0, &result);
+	rv = ldap_search_s(ldap, ctxt->qdn, scope, query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
 		error(LOGOPT_NONE,
@@ -1043,6 +1047,7 @@ static int read_one_map(struct autofs_po
 	char **keyValue = NULL;
 	char **values = NULL;
 	char *attrs[3];
+	int scope = LDAP_SCOPE_SUBTREE;
 	LDAP *ldap;
 
 	if (ctxt == NULL) {
@@ -1083,8 +1088,7 @@ static int read_one_map(struct autofs_po
 	debug(ap->logopt,
 	      MODPREFIX "searching for \"%s\" under \"%s\"", query, ctxt->qdn);
 
-	rv = ldap_search_s(ldap, ctxt->qdn, LDAP_SCOPE_SUBTREE,
-			   query, attrs, 0, &result);
+	rv = ldap_search_s(ldap, ctxt->qdn, scope, query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
 		debug(ap->logopt,
@@ -1253,6 +1257,7 @@ static int lookup_one(struct autofs_poin
 	char **keyValue;
 	char **values = NULL;
 	char *attrs[3];
+	int scope = LDAP_SCOPE_SUBTREE;
 	LDAP *ldap;
 	char *mapent = NULL;
 	int ret = CHE_OK;
@@ -1303,8 +1308,7 @@ static int lookup_one(struct autofs_poin
 	if (!ldap)
 		return CHE_FAIL;
 
-	rv = ldap_search_s(ldap, ctxt->qdn, LDAP_SCOPE_SUBTREE,
-			   query, attrs, 0, &result);
+	rv = ldap_search_s(ldap, ctxt->qdn, scope, query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
 		crit(ap->logopt, MODPREFIX "query failed for %s", query);
@@ -1565,8 +1569,6 @@ #if WITH_SASL
 	EVP_cleanup();
 	ERR_free_strings();
 #endif
-	if (ctxt->qdn)
-		ldap_memfree(ctxt->qdn);
 	free_context(ctxt);
 	return rv;
 }

autofs-5.0.0_beta5-get-dn.patch:
 CHANGELOG             |    1 
 include/lookup_ldap.h |    1 
 modules/lookup_ldap.c |  207 +++++++++++++++++++++++++++-----------------------
 3 files changed, 116 insertions(+), 93 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-get-dn.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 3397b3b..c5fb124 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - fix pasre error in replicated server module.
 - correct spelling error in default config.
 - fix default auth config not being installed.
+- change LDAP query method as my test db was incorrect.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
index 0d14b1b..db6389c 100644
--- a/include/lookup_ldap.h
+++ b/include/lookup_ldap.h
@@ -14,6 +14,7 @@ struct lookup_context {
 
 	char *server;
 	char *base;
+	char *qdn;
 
 	/* LDAP version 2 or 3 */
 	int version;
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 8a6faca..2910d38 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -683,6 +683,88 @@ static void free_context(struct lookup_c
 	return;
 }
 
+static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
+{
+	char buf[PARSE_MAX_BUF];
+	char *query, *dn;
+	LDAPMessage *result, *e;
+	char *class, *key;
+	char *attrs[2];
+	int rv, l;
+
+	class = ctxt->map_obj_class;
+	key = ctxt->map_attr;
+
+	attrs[0] = LDAP_NO_ATTRS;
+	attrs[1] = NULL;
+
+	if (!ctxt->mapname && !ctxt->base) {
+		error(LOGOPT_ANY, MODPREFIX "no master map to lookup");
+		return 0;
+	}
+
+	/* Build a query string. */
+	l = strlen("(objectclass=)") + strlen(class) + 1;
+	if (ctxt->mapname)
+		l += strlen(key) + strlen(ctxt->mapname) + strlen("(&(=))");
+
+	query = alloca(l);
+	if (query == NULL) {
+		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+		crit(LOGOPT_ANY, MODPREFIX "alloca: %s", estr);
+		return NSS_STATUS_UNAVAIL;
+	}
+
+	/*
+	 * If we have a master mapname construct a query using it
+	 * otherwise assume the base dn will catch it.
+	 */
+	if (ctxt->mapname) {
+		if (sprintf(query, "(&(objectclass=%s)(%s=%.*s))", class,
+		     key, (int) strlen(ctxt->mapname), ctxt->mapname) >= l) {
+			debug(LOGOPT_NONE,
+			      MODPREFIX "error forming query string");
+			return 0;
+		}
+	} else {
+		if (sprintf(query, "(objectclass=%s)", class) >= l) {
+			debug(LOGOPT_NONE,
+			      MODPREFIX "error forming query string");
+			return 0;
+		}
+	}
+	query[l] = '\0';
+
+	rv = ldap_search_s(ldap, ctxt->base, LDAP_SCOPE_ONE,
+			   query, attrs, 0, &result);
+
+	if ((rv != LDAP_SUCCESS) || !result) {
+		error(LOGOPT_NONE,
+		      MODPREFIX "query failed for %s: %s",
+		      query, ldap_err2string(rv));
+		ldap_unbind_connection(ldap, ctxt);
+		return 0;
+	}
+
+	e = ldap_first_entry(ldap, result);
+	if (e) {
+		dn = ldap_get_dn(ldap, e);
+		debug(LOGOPT_NONE, MODPREFIX "query dn %s", dn);
+		ldap_msgfree(result);
+	} else {
+		debug(LOGOPT_NONE,
+		      MODPREFIX "query succeeded, no matches for %s",
+		      query);
+		ldap_msgfree(result);
+		ldap_unbind_connection(ldap, ctxt);
+		return 0;
+	}
+
+	ctxt->qdn = dn;
+
+	return 1;
+}
+
 /*
  * This initializes a context (persistent non-global data) for queries to
  * this module.  Return zero if we succeed.
@@ -746,6 +828,13 @@ #endif
 		return 1;
 	}
 
+	if (!get_query_dn(ldap, ctxt)) {
+		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
+		ldap_unbind_connection(ldap, ctxt);
+		free_context(ctxt);
+		return 1;
+	}
+
 	/* Okay, we're done here. */
 	ldap_unbind_connection(ldap, ctxt);
 
@@ -770,14 +859,13 @@ int lookup_read_master(struct master *ma
 	char buf[PARSE_MAX_BUF];
 	char *query;
 	LDAPMessage *result, *e;
-	char *class, *key, *info, *entry;
+	char *class, *info, *entry;
 	char **keyValue = NULL;
 	char **values = NULL;
 	char *attrs[3];
 	LDAP *ldap;
 
 	class = ctxt->entry_obj_class;
-	key = ctxt->map_attr;
 	entry = ctxt->entry_attr;
 	info = ctxt->value_attr;
 
@@ -785,15 +873,7 @@ int lookup_read_master(struct master *ma
 	attrs[1] = info;
 	attrs[2] = NULL;
 
-	if (!ctxt->mapname && !ctxt->base) {
-		error(LOGOPT_ANY, MODPREFIX "no master map to lookup");
-		return NSS_STATUS_UNAVAIL;
-	}
-
-	/* Build a query string. */
 	l = strlen("(objectclass=)") + strlen(class) + 1;
-	if (ctxt->mapname)
-		l += strlen(key) + strlen(ctxt->mapname) + strlen("(&(=))");
 
 	query = alloca(l);
 	if (query == NULL) {
@@ -802,22 +882,9 @@ int lookup_read_master(struct master *ma
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	/*
-	 * If we have a master mapname construct a query using it
-	 * otherwise assume the base dn will catch it.
-	 */
-	memset(query, '\0', l);
-	if (ctxt->mapname) {
-		if (sprintf(query, "(&(objectclass=%s)(%s=%.*s))", class,
-		     key, (int) strlen(ctxt->mapname), ctxt->mapname) >= l) {
-			debug(LOGOPT_NONE,
-			      MODPREFIX "error forming query string");
-		}
-	} else {
-		if (sprintf(query, "(objectclass=%s)", class) >= l) {
-			debug(LOGOPT_NONE,
-			      MODPREFIX "error forming query string");
-		}
+	if (sprintf(query, "(objectclass=%s)", class) >= l) {
+		debug(LOGOPT_NONE, MODPREFIX "error forming query string");
+		return NSS_STATUS_UNAVAIL;
 	}
 	query[l] = '\0';
 
@@ -828,11 +895,10 @@ int lookup_read_master(struct master *ma
 
 	/* Look around. */
 	debug(LOGOPT_NONE,
-	      MODPREFIX "searching for \"%s\" under \"%s\"",
-	      query, ctxt->base ? ctxt->base : "(default)");
+	      MODPREFIX "searching for \"%s\" under \"%s\"", query, ctxt->qdn);
 
-	rv = ldap_search_s(ldap, ctxt->base, LDAP_SCOPE_SUBTREE,
-			   query, attrs, 0, &result);
+	rv = ldap_search_s(ldap, ctxt->qdn,
+			   LDAP_SCOPE_SUBTREE, query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
 		error(LOGOPT_NONE,
@@ -929,7 +995,6 @@ next:
 }
 
 static int read_one_map(struct autofs_point *ap,
-			const char *keyval, int keyvallen,
 			struct lookup_context *ctxt,
 			time_t age, int *result_ldap)
 {
@@ -939,7 +1004,7 @@ static int read_one_map(struct autofs_po
 	char buf[MAX_ERR_BUF];
 	char *query;
 	LDAPMessage *result, *e;
-	char *class, *key, *info, *entry;
+	char *class, *info, *entry;
 	char **keyValue = NULL;
 	char **values = NULL;
 	char *attrs[3];
@@ -951,7 +1016,6 @@ static int read_one_map(struct autofs_po
 	}
 
 	class = ctxt->entry_obj_class;
-	key = ctxt->map_attr;
 	entry = ctxt->entry_attr;
 	info = ctxt->value_attr;
 
@@ -961,9 +1025,6 @@ static int read_one_map(struct autofs_po
 
 	/* Build a query string. */
 	l = strlen("(objectclass=)") + strlen(class) + 1;
-	if (keyvallen > 0) {
-		l += strlen(key) + keyvallen + strlen("(&(=))");
-	}
 
 	query = alloca(l);
 	if (query == NULL) {
@@ -972,22 +1033,9 @@ static int read_one_map(struct autofs_po
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	/*
-	 * If we have a mapname (keyval) construct a query using it
-	 * otherwise assume the base dn will catch it.
-	 */
-	memset(query, 0, l);
-	if (keyvallen > 0) {
-		if (sprintf(query, "(&(objectclass=%s)(%s=%.*s))", class,
-			    key, keyvallen, keyval) >= l) {
-			error(ap->logopt,
-			      MODPREFIX "error forming query string");
-		}
-	} else {
-		if (sprintf(query, "(objectclass=%s)", class) >= l) {
-			error(ap->logopt,
-			      MODPREFIX "error forming query string");
-		}
+	if (sprintf(query, "(objectclass=%s)", class) >= l) {
+		error(ap->logopt, MODPREFIX "error forming query string");
+		return NSS_STATUS_UNAVAIL;
 	}
 	query[l] = '\0';
 
@@ -998,10 +1046,9 @@ static int read_one_map(struct autofs_po
 
 	/* Look around. */
 	debug(ap->logopt,
-	      MODPREFIX "searching for \"%s\" under \"%s\"",
-	      query, ctxt->base ? ctxt->base : "(default)");
+	      MODPREFIX "searching for \"%s\" under \"%s\"", query, ctxt->qdn);
 
-	rv = ldap_search_s(ldap, ctxt->base, LDAP_SCOPE_SUBTREE,
+	rv = ldap_search_s(ldap, ctxt->qdn, LDAP_SCOPE_SUBTREE,
 			   query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
@@ -1145,14 +1192,7 @@ int lookup_read_map(struct autofs_point 
 	int keylen;
 	int ret;
 
-	key = ctxt->mapname;
-	keylen = strlen(ctxt->mapname);
-
-	if (key)
-		ret = read_one_map(ap, key, keylen, ctxt, age, &rv);
-	else
-		ret = read_one_map(ap, NULL, 0, ctxt, age, &rv);
-
+	ret = read_one_map(ap, ctxt, age, &rv);
 	if (ret != NSS_STATUS_SUCCESS) {
 		switch (rv) {
 		case LDAP_SIZELIMIT_EXCEEDED:
@@ -1174,7 +1214,7 @@ static int lookup_one(struct autofs_poin
 	time_t age = time(NULL);
 	char *query;
 	LDAPMessage *result, *e;
-	char *class, *info, *map, *entry;
+	char *class, *info, *entry;
 	char **keyValue;
 	char **values = NULL;
 	char *attrs[3];
@@ -1188,7 +1228,6 @@ static int lookup_one(struct autofs_poin
 	}
 
 	class = ctxt->entry_obj_class;
-	map = ctxt->map_attr;
 	entry = ctxt->entry_attr;
 	info = ctxt->value_attr;
 
@@ -1200,13 +1239,7 @@ static int lookup_one(struct autofs_poin
 		*qKey = '/';
 
 	/* Build a query string. */
-	if (ctxt->mapname) {
-		l = strlen(class) 
-			+ strlen(map) + strlen(ctxt->mapname)
-			+ strlen(entry) + strlen(qKey) + 28;
-	} else {
-		l = strlen(class) + strlen(entry) + strlen(qKey) + 21;
-	}
+	l = strlen(class) + strlen(entry) + strlen(qKey) + 21;
 
 	query = alloca(l);
 	if (query == NULL) {
@@ -1215,24 +1248,11 @@ static int lookup_one(struct autofs_poin
 		return CHE_FAIL;
 	}
 
-	/* Look around. */
-	memset(query, 0, l);
-	if (ctxt->mapname) {
-		/*
-		 * Look for an entry in class containing map
-		 * ctxt->mapname whose entry is equal to qKey.
-		 */
-		ql = sprintf(query,
-			 "(&(&(objectclass=%s)(%s=%s)(%s=%s)))",
-			 class, map, ctxt->mapname, entry, qKey);
-	} else {
-		/*
-		 * Look for an entry in class under ctxt-base
-		 * whose entry is equal to qKey.
-		 */
-		ql = sprintf(query,
-			 "(&(objectclass=%s)(%s=%s))", class, entry, qKey);
-	}
+	/*
+	 * Look for an entry in class under ctxt-base
+	 * whose entry is equal to qKey.
+	 */
+	ql = sprintf(query, "(&(objectclass=%s)(%s=%s))", class, entry, qKey);
 	if (ql >= l) {
 		error(ap->logopt,
 		      MODPREFIX "error forming query string");
@@ -1241,15 +1261,14 @@ static int lookup_one(struct autofs_poin
 	query[ql] = '\0';
 
 	debug(ap->logopt,
-	      MODPREFIX "searching for \"%s\" under \"%s\"",
-	      query, ctxt->base ? ctxt->base : "(default)");
+	      MODPREFIX "searching for \"%s\" under \"%s\"", query, ctxt->qdn);
 
 	/* Initialize the LDAP context. */
 	ldap = do_connect(ctxt);
 	if (!ldap)
 		return CHE_FAIL;
 
-	rv = ldap_search_s(ldap, ctxt->base, LDAP_SCOPE_SUBTREE,
+	rv = ldap_search_s(ldap, ctxt->qdn, LDAP_SCOPE_SUBTREE,
 			   query, attrs, 0, &result);
 
 	if ((rv != LDAP_SUCCESS) || !result) {
@@ -1511,6 +1530,8 @@ #if WITH_SASL
 	EVP_cleanup();
 	ERR_free_strings();
 #endif
+	if (ctxt->qdn)
+		ldap_memfree(ctxt->qdn);
 	free_context(ctxt);
 	return rv;
 }

autofs-5.0.0_beta5-ldap-default-auth.patch:
 CHANGELOG             |    1 +
 lib/defaults.c        |   14 +++++++-------
 lib/master.c          |    2 +-
 modules/lookup_ldap.c |   25 ++++++++++++++++++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-ldap-default-auth.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c5fb124..13d0679 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - correct spelling error in default config.
 - fix default auth config not being installed.
 - change LDAP query method as my test db was incorrect.
+- change ldap defaults code to handle missing auth config.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/lib/defaults.c b/lib/defaults.c
index 3e6ec8a..0170f9b 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -185,7 +185,7 @@ const char *defaults_get_master_map(void
 
 	master = get_env_string(ENV_NAME_MASTER_MAP);
 	if (!master)
-		return default_master_map_name;
+		return strdup(default_master_map_name);
 
 	return (const char *) master;
 }
@@ -253,7 +253,7 @@ const char *defaults_get_map_obj_class(v
 
 	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
 	if (!moc)
-		return default_map_obj_class;
+		return strdup(default_map_obj_class);
 
 	return (const char *) moc;
 }
@@ -264,7 +264,7 @@ const char *defaults_get_entry_obj_class
 
 	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
 	if (!eoc)
-		return default_entry_obj_class;
+		return strdup(default_entry_obj_class);
 
 	return (const char *) eoc;
 }
@@ -275,7 +275,7 @@ const char *defaults_get_map_attr(void)
 
 	ma = get_env_string(ENV_NAME_MAP_ATTR);
 	if (!ma)
-		return default_map_attr;
+		return strdup(default_map_attr);
 
 	return (const char *) ma;
 }
@@ -286,7 +286,7 @@ const char *defaults_get_entry_attr(void
 
 	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
 	if (!ea)
-		return default_entry_attr;
+		return strdup(default_entry_attr);
 
 	return (const char *) ea;
 }
@@ -297,7 +297,7 @@ const char *defaults_get_value_attr(void
 
 	va = get_env_string(ENV_NAME_VALUE_ATTR);
 	if (!va)
-		return default_value_attr;
+		return strdup(default_value_attr);
 
 	return (const char *) va;
 }
@@ -308,7 +308,7 @@ const char *defaults_get_auth_conf_file(
 
 	cf = get_env_string(ENV_AUTH_CONF_FILE);
 	if (!cf)
-		return default_auth_conf_file;
+		return strdup(default_auth_conf_file);
 
 	return (const char *) cf;
 }
diff --git a/lib/master.c b/lib/master.c
index b0c5b58..d61df03 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -666,7 +666,7 @@ struct master *master_new(const char *na
 		return NULL;
 
 	if (!name)
-		tmp = strdup(defaults_get_master_map());
+		tmp = defaults_get_master_map();
 	else
 		tmp = strdup(name);
 
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 2910d38..45d755d 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -251,7 +251,7 @@ int authtype_requires_creds(const char *
  *  The idea is that a -1 return value should abort the program.  A 0
  *  return value requires more checking.  If ctxt->authtype is filled in,
  *  then no further action is necessary.  If it is not, the caller is free
- *  to then use another method to determine how to connec to the server.
+ *  to then use another method to determine how to connect to the server.
  */
 int parse_ldap_config(struct lookup_context *ctxt)
 {
@@ -281,6 +281,17 @@ int parse_ldap_config(struct lookup_cont
 	 */
 	memset(&st, 0, sizeof(st));
 	if (stat(auth_conf, &st) == -1 || st.st_size == 0) {
+		/* Auth config doesn't exist so disable TLS and auth */
+		if (errno == EEXIST) {
+			ctxt->auth_conf = auth_conf;
+			ctxt->use_tls = LDAP_TLS_DONT_USE;
+			ctxt->tls_required = LDAP_TLS_DONT_USE;
+			ctxt->auth_required = 0;
+			ctxt->sasl_mech = NULL;
+			ctxt->user = NULL;
+			ctxt->secret = NULL;
+			return 0;
+		}
 		error(LOGOPT_ANY,
 		      MODPREFIX "stat(2) failed with error %s.",
 		      strerror(errno));
@@ -485,9 +496,9 @@ int ldap_auth_init(struct lookup_context
 	/*
 	 *  If sasl_mech was not filled in, it means that there was no
 	 *  mechanism specified in the configuration file.  Try to auto-
-	 *  select one.
+	 *  select one if there are credentials.
 	 */
-	if (ctxt->sasl_mech == NULL) {
+	if (ctxt->sasl_mech == NULL && ctxt->user != NULL) {
 		ret = sasl_choose_mech(ctxt, &ctxt->sasl_mech);
 		if (ret != 0)
 			return -1;
@@ -666,6 +677,14 @@ free_moc:
 
 static void free_context(struct lookup_context *ctxt)
 {
+	if (ctxt->map_obj_class) {
+		free(ctxt->map_obj_class);
+		free(ctxt->entry_obj_class);
+		free(ctxt->map_attr);
+		free(ctxt->entry_attr);
+	}
+	if (ctxt->auth_conf)
+		free(ctxt->auth_conf);
 	if (ctxt->sasl_mech)
 		free(ctxt->sasl_mech);
 	if (ctxt->user)

autofs-5.0.0_beta5-mapclass.patch:
 CHANGELOG                      |    1 +
 samples/autofs.conf.default.in |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-mapclass.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 144c0c8..7c193e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - use nis map order to check if update is needed.
 - fix couple of memory leaks in lookup_yp.c.
 - fix pasre error in replicated server module.
+- correct spelling error in default config.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 9c4b1ca..eca1392 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -21,7 +21,7 @@ # Define the default LDAP schema to use 
 #
 # System default
 #
-#DEFAULT_MAP_OBJECT_CALSS="nisMap"
+#DEFAULT_MAP_OBJECT_CLASS="nisMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="nisObject"
 #DEFAULT_MAP_ATTRIBUTE="nisMapName"
 #DEFAULT_ENTRY_ATTRIBUTE="cn"
@@ -29,13 +29,13 @@ #DEFAULT_VALUE_ATTRIBUTE="nisMapEntry"
 #
 # Other common LDAP nameing
 #
-#DEFAULT_MAP_OBJECT_CALSS="automountMap"
+#DEFAULT_MAP_OBJECT_CLASS="automountMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="automount"
 #DEFAULT_MAP_ATTRIBUTE="ou"
 #DEFAULT_ENTRY_ATTRIBUTE="cn"
 #DEFAULT_VALUE_ATTRIBUTE="automountInformation"
 #
-#DEFAULT_MAP_OBJECT_CALSS="automountMap"
+#DEFAULT_MAP_OBJECT_CLASS="automountMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="automount"
 #DEFAULT_MAP_ATTRIBUTE="automountMapName"
 #DEFAULT_ENTRY_ATTRIBUTE="automountKey"

autofs-5.0.0_beta5-parse-old-style-dn.patch:
 CHANGELOG             |    1 +
 lib/master_parse.y    |    1 +
 lib/master_tok.l      |    9 ++++++++-
 modules/lookup_ldap.c |   30 +++++++++++++++++++++++-------
 4 files changed, 33 insertions(+), 8 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-parse-old-style-dn.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 13d0679..77fde7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - fix default auth config not being installed.
 - change LDAP query method as my test db was incorrect.
 - change ldap defaults code to handle missing auth config.
+- fix mistake in parsing old style LDAP specs.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/lib/master_parse.y b/lib/master_parse.y
index 54543af..4def672 100644
--- a/lib/master_parse.y
+++ b/lib/master_parse.y
@@ -514,6 +514,7 @@ int master_parse_entry(const char *buffe
 	source = master_add_map_source(entry, type, format, age, 
 					local_argc, (const char **) local_argv);
 	if (!source) {
+		error(LOGOPT_ANY, "failed to add source");
 		if (new)
 			master_free_mapent(new);
 		return 0;
diff --git a/lib/master_tok.l b/lib/master_tok.l
index 1f8a7ea..2abdfc3 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -80,7 +80,9 @@ OPTIONSTR	([\-]?([[:alpha:]_]([[:alnum:]
 MACROSTR	(-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-])+)
 NUMBER		[0-9]+
 
-DNSERVERSTR	(\/\/[[:alpha:]][[:alnum:]\-.]*(:[0-9])?\/)
+DNSERVSTR1	([[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?:)
+DNSERVSTR2	(\/\/[[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?\/)
+DNSERVERSTR	{DNSERVSTR1}|{DNSERVSTR2}
 DNATTRSTR	(ou|cn|nisMapName|automountMapName|dc)
 DNNAMESTR	([[:alnum:]_.\-]+)
 
@@ -198,6 +200,11 @@ MTYPE           ((file|program|yp|nis|ni
 		yyless(0);
 	}
 
+	{DNSERVERSTR} {
+		BEGIN(DNSTR);
+		yyless(0);
+	}
+
 	{DNATTRSTR}= {
 		BEGIN(DNSTR);
 		yyless(0);
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 45d755d..9794c5f 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -510,7 +510,7 @@ #endif
 
 /*
  *  Take an input string as specified in the master map, and break it
- *  down into a basedn, servername, and port.
+ *  down into a server name and basedn.
  */
 static int parse_server_string(const char *url, struct lookup_context *ctxt)
 {
@@ -528,11 +528,7 @@ static int parse_server_string(const cha
 		const char *s = ptr + 2;
 		const char *q = NULL;
 
-		/*
-		 * Isolate the server(s).  The ':' breaks the SUN
-		 * parser for submounts, so we can't actually
-		 * use it.
-		 */
+		/* Isolate the server(s). */
 		if ((q = strchr(s, '/'))) {
 			l = q - s;
 			tmp = malloc(l + 1);
@@ -547,6 +543,10 @@ static int parse_server_string(const cha
 			memcpy(ctxt->server, s, l);
 			ptr = q + 1;
 		} else {
+			crit(LOGOPT_ANY,
+			     MODPREFIX "invalid LDAP map syntax %s", ptr);
+			return 0;
+/* TODO: why did I put this here, the parser shouldn't let this by
 			l = strlen(ptr);
 			tmp = malloc(l + 1);
 			if (!tmp) {
@@ -558,9 +558,24 @@ static int parse_server_string(const cha
 			ctxt->server = tmp;
 			memset(ctxt->server, 0, l + 1);
 			memcpy(ctxt->server, s, l);
+*/
 		}
 	} else if (strchr(ptr, ':') != NULL) {
-		l = strchr(ptr, ':') - ptr;
+		char *q = NULL;
+
+		/* Isolate the server(s). Include the port spec */
+		q = strchr(ptr, ':');
+		if (isdigit(*q))
+			while (isdigit(*q))
+				q++;
+
+		if (*q != ':') {
+			crit(LOGOPT_ANY,
+			     MODPREFIX "invalid LDAP map syntax %s", ptr);
+			return 0;
+		}
+
+		l = q - ptr;
 		/* Isolate the server's name. */
 		tmp = malloc(l + 1);
 		if (!tmp) {
@@ -575,6 +590,7 @@ static int parse_server_string(const cha
 		ptr += l + 1;
 	}
 
+	/* TODO: why did I do this - how can the map name "and" base dn be missing? */
 	if (!ptr)
 		goto done;
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- autofs.spec	23 Jun 2006 06:04:11 -0000	1.112
+++ autofs.spec	26 Jun 2006 12:53:19 -0000	1.113
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta5
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -15,6 +15,13 @@
 Patch2: autofs-5.0.0_beta5-use-yp-map-order.patch
 Patch3: autofs-5.0.0_beta5-lookup_yp-leaks.patch
 Patch4: autofs-5.0.0_beta5-replicated-parse-error.patch
+Patch5: autofs-5.0.0_beta5-mapclass.patch
+Patch6: autofs-5.0.0_beta5-auth-config.patch
+Patch7: autofs-5.0.0_beta5-get-dn.patch
+Patch8: autofs-5.0.0_beta5-ldap-default-auth.patch
+Patch9: autofs-5.0.0_beta5-parse-old-style-dn.patch
+Patch10: autofs-5.0.0_beta5-get-dn-update.patch
+Patch11: autofs-5.0.0_beta5-compile-warnings.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -57,6 +64,13 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -105,6 +119,7 @@
 %config(noreplace,missingok) /etc/auto.net
 %config(noreplace,missingok) /etc/auto.smb
 %config(noreplace) /etc/sysconfig/autofs
+%config(noreplace) /etc/autofs_ldap_auth.conf
 %dir /misc
 %dir %{_libdir}/autofs
 %{_sbindir}/automount
@@ -112,6 +127,14 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jun 26 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-4
+- correct spelling error in default config.
+- fix default auth config not being installed.
+- change LDAP query method as my test db was incorrect.
+- change ldap defaults code to handle missing auth config.
+- fix mistake in parsing old style LDAP specs.
+- update LDAP so that new query method also works for old syntax.
+
 * Fri Jun 23 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-3
 - lookup_init cleanup and fix missed memory leak.
 - use nis map order to check if update is needed.



From fedora-cvs-commits at redhat.com  Mon Jun 26 13:10:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 09:10:39 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia-3.5.3-examples.patch, NONE,
	1.1 kdemultimedia.spec, 1.66, 1.67
Message-ID: <200606261310.k5QDAdqJ031573@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31510

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-3.5.3-examples.patch 
Log Message:
fix #196605, BR: cdparanoia



kdemultimedia-3.5.3-examples.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdemultimedia-3.5.3-examples.patch ---
--- kdemultimedia-3.5.3-patched/kmid/Makefile.in.orig	2006-06-26 14:33:57.000000000 +0200
+++ kdemultimedia-3.5.3-patched/kmid/Makefile.in	2006-06-26 14:34:09.000000000 +0200
@@ -556,7 +556,7 @@
 #>- METASOURCES = AUTO
 servicetype_DATA = audiomidi.desktop
 servicetypedir = $(kde_servicetypesdir)
-SUBDIRS = maps examples pics
+SUBDIRS = maps pics
 xdg_apps_DATA = kmid.desktop
 mime_DATA = x-karaoke.desktop
 mimedir = $(kde_mimedir)/audio
--- kdemultimedia-3.5.3-patched/kmid/Makefile.am.orig	2006-06-26 14:32:27.000000000 +0200
+++ kdemultimedia-3.5.3-patched/kmid/Makefile.am	2006-06-26 14:32:40.000000000 +0200
@@ -38,7 +38,7 @@
 servicetype_DATA = audiomidi.desktop
 servicetypedir = $(kde_servicetypesdir)
 
-SUBDIRS = maps examples pics
+SUBDIRS = maps pics
 
 xdg_apps_DATA = kmid.desktop
 


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdemultimedia.spec	8 Jun 2006 21:54:31 -0000	1.66
+++ kdemultimedia.spec	26 Jun 2006 13:10:36 -0000	1.67
@@ -2,81 +2,52 @@
 %define final 0
 %define make_cvs 1
 
-# support mp3
-%define build_mpeglib 0
-
-%define my_vendor kde
-
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 
 %define libtool 1
-%define alsa 1
-%define juk 0
-%define cdparanoia 1
 %define arts 1
 
 %define redhatify 1
 
 %define appdir %{_datadir}/applications/kde
 
-%if %{build_mpeglib}
-%define patch_name %{nil}
-%else
-%define patch_name -patched
-%endif
-
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
-Release: 3
+Release: 4
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
+Patch4: kdemultimedia-3.5.3-examples.patch
 
-Prereq: /sbin/ldconfig
-
-Requires: kdelibs >= 6:%{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdebase >= 6:%{version}
 
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel >= %{version}
-BuildRequires: libjpeg-devel
 BuildRequires: gcc-c++
 BuildRequires: glibc-devel
 BuildRequires: perl
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: glib2-devel
-BuildRequires: libmng-devel
 BuildRequires: /usr/bin/desktop-file-install
 BuildRequires: libtheora-devel
+BuildRequires: flac-devel
 %if %{make_cvs}
 BuildRequires: autoconf automake libtool
 %endif
-%if %{build_mpeglib}
-BuildRequires: libXxf86dga-devel
-%endif
-%if %{alsa}
 BuildRequires: alsa-lib-devel >= 1.0.2
-%endif
-%if %{cdparanoia}
+BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
-%endif
-%if %{juk}
-BuildRequires: taglib => 1.0
-BuildRequires: libmusicbrainz >= 2.1
-BuildRequires: libtunepimp
-Obsoletes: juk
-%endif
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -106,13 +77,11 @@
 noatun plugins.
 
 %prep
-%setup -q -n %{name}-%{version}%{patch_name}
+%setup -q -n %{name}-%{version}-patched
 %patch1 -p1
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
-
-perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
-perl -pi -e "s,examples,,g" kmid/Make*
+%patch4 -p1 -b .examples
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -120,44 +89,22 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="%{optflags}"
-export KDEDIR=%{prefix}
-export PATH=%{prefix}/bin:$PATH
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
-
-%if %{arts}
-export CFLAGS="$CFLAGS `artsc-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `artsc-config --cflags`"
-export LDFLAGS="$LDFLAGS `artsc-config --libs`"
-%endif
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
-   --disable-motif \
-   --with-motif-includes=none \
-   --with-motif-libraries=none \
-   --with-extra-includes=/usr/include/cdda \
-%if %{disable_gcc_check_and_hidden_visibility}
+   --with-extra-includes=%{_includedir}/cdda \
+   --includedir=%{_includedir}/kde \
    --disable-gcc-hidden-visibility \
-%endif
-%if %{cdparanoia} == 0
-   --disable-cdparanoia \
-%endif
+   --with-cdparanoia \
+   --with-flac \
+   --with-theora \
+   --with-vorbis \
 %if %{arts} == 0
    --without-arts \
 %endif
-%if %{alsa}
    --with-alsa \
    --with-arts-alsa \
-%endif
-   --disable-rpath \
-   --includedir=%{_includedir}/kde \
    --with-xinerama \
 %if %{debug} == 0
    --disable-debug \
@@ -167,12 +114,11 @@
 %if %{final}
    --enable-final \
 %endif
-   --disable-xaw
+   --disable-rpath
 
-SMP_MFLAGS=%{?_smp_mflags}
 
-make $SMP_MFLAGS
-make $SMP_MFLAGS -C kaudiocreator
+make %{?_smp_mflags}
+make %{?_smp_mflags} -C kaudiocreator
 
 %install
 rm -rf %{buildroot} 
@@ -188,10 +134,6 @@
   done
 %endif
 
-%if ! %{juk}
-  rm -rf %{buildroot}%{_docdir}/HTML/en/juk
-%endif
-
 # don't make these world-writeable
 chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
@@ -212,12 +154,10 @@
 %defattr(-,root,root)
 /etc/xdg/menus/applications-merged/*
 %doc %{_docdir}/HTML/en/artsbuilder
-%if %{juk}
-%doc %{_docdir}/HTML/en/juk
-%endif
+%exclude %doc %{_docdir}/HTML/en/juk
 %doc %{_docdir}/HTML/en/kaboodle
 %doc %{_docdir}/HTML/en/kaudiocreator
-%doc %{_docdir}/HTML/en/kdemultimedia%{patch_name}-apidocs
+%doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
 %doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid
 %doc %{_docdir}/HTML/en/kmix
@@ -247,6 +187,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
+- fix #196605, BR: cdparanoia
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-3
 - move only *.so symlinks to -devel subpackage
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:18:44 -0400
Subject: rpms/qt/devel qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff,
	NONE, 1.1 qt-x11-free-3.3.6-strip.patch, NONE, 1.1 qt.spec,
	1.115, 1.116 qt-x11-free-3.3.0-strip.patch, 1.1, NONE
Message-ID: <200606261418.k5QEIi79031667@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31594

Modified Files:
	qt.spec 
Added Files:
	qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff 
	qt-x11-free-3.3.6-strip.patch 
Removed Files:
	qt-x11-free-3.3.0-strip.patch 
Log Message:
- fix utf8 issue in changelog
- fix #195410, don't strip binaries/libraries
- fix #156572, keyReleaseEvent issue


qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff:
 qapplication_x11.cpp |    9 +++------
 qwidget_x11.cpp      |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff ---
--- qt-x11-free-3.3.6/src/kernel/qapplication_x11.cpp.orig	2006-06-20 15:45:44.000000000 +0200
+++ qt-x11-free-3.3.6/src/kernel/qapplication_x11.cpp	2006-06-20 15:51:13.000000000 +0200
@@ -3294,11 +3294,7 @@
     // filtering opportunity first to ensure all input methods work
     // properly regardless of application design.
 
-#ifndef QT_NO_IM_EXTENSIONS
     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
-#else
-    if( keywidget && keywidget->isEnabled() ) {
-#endif
 	if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
 	    sm_blockUserInput ) // block user interaction during session management
 	    return TRUE;
@@ -5220,11 +5216,12 @@
     } else {
 	key = (int)(long)keyDict->find( keycode );
 	if ( key )
-	    if( !willRepeat ) // Take out key of dictionary only if this call.
+	    if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
 		keyDict->take( keycode );
 	long s = (long)textDict->find( keycode );
 	if ( s ) {
-	    textDict->take( keycode );
+	    if( statefulTranslation )
+	        textDict->take( keycode );
 	    ascii = (char)(s-256);
 	}
     }
--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp.orig	2006-06-20 15:46:49.000000000 +0200
+++ qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp	2006-06-20 15:48:14.000000000 +0200
@@ -2699,11 +2699,10 @@
 {
     QInputContext *qic = 0;
 
-#if !defined(QT_NO_IM_EXTENSIONS)
     if ( isInputMethodEnabled() ) {
+#if !defined(QT_NO_IM_EXTENSIONS)
 	qic = icHolderWidget()->ic;
 #else
-    {
 	// icHolderWidget is always topLevelWidget
 	QTLWExtra *topdata = icHolderWidget()->topData();
 	qic = (QInputContext *)topdata->xic;
@@ -2754,10 +2753,8 @@
 */
 void QWidget::createInputContext()
 {
-#if !defined(QT_NO_IM_EXTENSIONS)
     if( !isInputMethodEnabled() || QApplication::closingDown() )
 	return;
-#endif
 
     QWidget *icWidget = icHolderWidget();
 #ifndef QT_NO_IM

qt-x11-free-3.3.6-strip.patch:
 linux-g++-32/qmake.conf |    4 ++--
 linux-g++-64/qmake.conf |    4 ++--
 linux-g++/qmake.conf    |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-strip.patch ---
--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig	2006-06-21 15:37:53.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf	2006-06-21 15:38:02.000000000 +0200
@@ -84,7 +84,7 @@
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QMAKE_STRIP             =
+QMAKE_STRIPFLAGS_LIB 	+=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig	2006-06-21 15:37:09.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf	2006-06-21 15:37:19.000000000 +0200
@@ -84,7 +84,7 @@
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QMAKE_STRIP             =
+QMAKE_STRIPFLAGS_LIB 	+=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig	2006-06-21 15:36:23.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf	2006-06-21 15:36:56.000000000 +0200
@@ -87,7 +87,7 @@
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QMAKE_STRIP             =
+QMAKE_STRIPFLAGS_LIB 	+=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- qt.spec	8 Jun 2006 10:26:36 -0000	1.115
+++ qt.spec	26 Jun 2006 14:18:41 -0000	1.116
@@ -86,7 +86,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 7
+Release: 8
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -100,7 +100,7 @@
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
 Patch3: qt-3.1.0-makefile.patch
-Patch5: qt-x11-free-3.3.0-strip.patch
+Patch5: qt-x11-free-3.3.6-strip.patch
 Patch7: qt-x11-free-3.3.2-quiet.patch
 Patch8: qt-x11-free-3.3.3-qembed.patch
 Patch12: qt-uic-nostdlib.patch
@@ -117,6 +117,7 @@
 Patch51: qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
 Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
 Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
+Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
@@ -368,6 +369,7 @@
 %patch51 -p1
 %patch52 -p1 -b .post
 %patch53 -p1 -b .quiet
+%patch54 -p1 -b .fix-key-release-event-with-imm
 %endif
 
 %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
@@ -720,6 +722,8 @@
 %changelog
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:3.3.6-7
 - fix utf8 issue in changelog
+- fix #195410, don't strip binaries/libraries
+- fix #156572, keyReleaseEvent issue
 
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 1:3.3.6-6
 - qt-devel requires on mesa-libGLU-devel mesa-libGU-devel


--- qt-x11-free-3.3.0-strip.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:23:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:23:57 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1649,1.1650
Message-ID: <200606261423.k5QENvfK001253@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1197

Modified Files:
	kernel-2.6.spec 
Log Message:
Reenable SMP x86-64 builds.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1649
retrieving revision 1.1650
diff -u -r1.1649 -r1.1650
--- kernel-2.6.spec	24 Jun 2006 06:02:54 -0000	1.1649
+++ kernel-2.6.spec	26 Jun 2006 14:23:54 -0000	1.1650
@@ -52,6 +52,7 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
+%define buildsmp 1
 %endif
 
 %ifarch ppc64
@@ -1076,6 +1077,9 @@
 %endif
 
 %changelog
+* Mon Jun 26 2006 Dave Jones <davej at redhat.com>
+- Reenable SMP x86-64 builds.
+
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:24:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:24:20 -0400
Subject: rpms/openoffice.org/FC-3 6438334-macros-so7-sfx2.diff, NONE,
	1.1 disable-java-applets.diff, NONE,
	1.1 sax+source+expatwrap+xml2utf.cxx.diff, NONE,
	1.1 openoffice.org.spec, 1.64, 1.65 redhat-fixes.patch, 1.35, 1.36
Message-ID: <200606261424.k5QEOKGT001425@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv1404

Modified Files:
	openoffice.org.spec redhat-fixes.patch 
Added Files:
	6438334-macros-so7-sfx2.diff disable-java-applets.diff 
	sax+source+expatwrap+xml2utf.cxx.diff 
Log Message:
port from RHEL

6438334-macros-so7-sfx2.diff:
 inc/objsh.hxx                    |    0 
 sfx2/inc/objsh.hxx               |    1 
 sfx2/source/doc/objmisc.cxx      |   79 +++++++++++++++++++++++++++++++++++
 sfx2/source/doc/objstor.cxx      |   16 -------
 sfx2/source/doc/sfxbasemodel.cxx |   86 +++++++++++++++++++++++++++++++--------
 source/doc/objmisc.cxx           |    0 
 source/doc/objstor.cxx           |    0 
 source/doc/sfxbasemodel.cxx      |    0 
 8 files changed, 149 insertions(+), 33 deletions(-)

--- NEW FILE 6438334-macros-so7-sfx2.diff ---
Index: inc/objsh.hxx
===================================================================
RCS file: /cvs/framework/sfx2/inc/objsh.hxx,v
retrieving revision 1.32.12.3
diff -u -p -r1.32.12.3 objsh.hxx
--- sfx2/inc/objsh.hxx.orig	21 Apr 2004 09:42:09 -0000	1.32.12.3
+++ sfx2/inc/objsh.hxx	13 Jun 2006 12:14:45 -0000
@@ -569,6 +569,7 @@ public:
 #if _SOLAR__PRIVATE
 	static SEQUENCE< OUSTRING >	GetEventNames_Impl();
     void                        InitBasicManager_Impl( SvStorage *pStor, const String* pName = NULL );
+	void						CheckMacrosOnLoading_Impl();
 	SfxObjectShell_Impl*        Get_Impl() { return pImp; }
 	const SfxObjectShell_Impl*  Get_Impl() const { return pImp; }
 
Index: source/doc/objmisc.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v
retrieving revision 1.33.12.1
diff -u -p -r1.33.12.1 objmisc.cxx
--- sfx2/source/doc/objmisc.cxx.orig	21 Apr 2004 09:42:21 -0000	1.33.12.1
+++ sfx2/source/doc/objmisc.cxx	13 Jun 2006 12:16:28 -0000
@@ -126,6 +126,7 @@
 #include <svtools/securityoptions.hxx>
 
 
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::document;
@@ -181,6 +182,8 @@ using namespace ::com::sun::star::docume
 #include "helper.hxx"
 #include "doc.hrc"
 
+#include <scriptcont.hxx>
+
 // class SfxHeaderAttributes_Impl ----------------------------------------
 
 class SfxHeaderAttributes_Impl : public SvKeyValueIterator
@@ -1008,6 +1011,80 @@ void SfxObjectShell::SetAutoLoad(
 	}
 }
 
+//-------------------------------------------------------------------------
+
+void SfxObjectShell::CheckMacrosOnLoading_Impl()
+{
+	const SfxFilter* pFilter = pMedium->GetFilter();
+	sal_Bool bHasStorage = IsOwnStorageFormat_Impl( *pMedium );
+
+	if ( GetError() != ERRCODE_NONE )
+		return;
+
+	sal_Bool bHasMacros = sal_False;
+
+	if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
+	{
+		SvStorageRef xStorage( pMedium->GetStorage() );
+		if ( xStorage.Is() )
+		{
+			if ( xStorage->IsOLEStorage() )
+				bHasMacros = BasicManager::HasBasicWithModules( *xStorage );
+			else
+				bHasMacros = xStorage->IsStorage( String::CreateFromAscii("Basic") );
+		}
+		else
+			SetError( ERRCODE_IO_GENERAL );
+	}
+
+	if ( !bHasMacros && pImp->pBasicLibContainer != 0 )
+	{
+		// a library container exists; check if it's empty
+
+		// if there are libraries except "Standard" library
+		// we assume that they are not empty (because they have been created by the user)
+		try
+		{
+			if ( pImp->pBasicLibContainer->hasElements() )
+			{
+				::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+				uno::Sequence< ::rtl::OUString > aElements = pImp->pBasicLibContainer->getElementNames();
+				if ( aElements.getLength() )
+				{
+					if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) )
+						bHasMacros = sal_True;
+					else	
+					{
+						// usually a "Standard" library is always present (design)
+						// for this reason we must check if it's empty
+						uno::Reference < container::XNameAccess > xLib;
+						uno::Any aAny = pImp->pBasicLibContainer->getByName( aStdLibName );
+						aAny >>= xLib;
+						if ( xLib.is() )
+							bHasMacros = xLib->hasElements();
+					}
+				}
+			}
+		}
+		catch( uno::Exception& )
+		{}
+	}
+
+	if ( GetError() != ERRCODE_NONE )
+		return;
+
+	if ( bHasMacros )
+	{
+		AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
+	}
+	else
+	{
+		// if macros will be added by the user later, the security check is obsolete
+		pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
+	}
+}
+//-------------------------------------------------------------------------
+
 void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags )
 {
 	sal_Bool bSetModifiedTRUE = sal_False;
@@ -1028,6 +1105,8 @@ void SfxObjectShell::FinishedLoading( sa
 						 SfxStringItem, SID_DOC_SALVAGE, sal_False );
 		if ( pSalvageItem )
 			bSetModifiedTRUE = sal_True;
+
+		CheckMacrosOnLoading_Impl();
 	}
 
 	if( ( nFlags & SFX_LOADED_IMAGES ) &&
Index: source/doc/objstor.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objstor.cxx,v
retrieving revision 1.118.16.3
diff -u -p -r1.118.16.3 objstor.cxx
--- sfx2/source/doc/objstor.cxx.orig	25 Mar 2004 12:07:10 -0000	1.118.16.3
+++ sfx2/source/doc/objstor.cxx	13 Jun 2006 12:16:34 -0000
@@ -607,22 +607,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
             	xStor->FillInfoList( &aList );
             	if ( !aList.Count() && !xStor->IsOLEStorage() )
                 	SetError( ERRCODE_IO_BROKENPACKAGE );
-            	else
-            	{
-                	BOOL bHasMacros = FALSE;
-                	if ( xStor->IsOLEStorage() )
-                    	bHasMacros = BasicManager::HasBasicWithModules( *xStor );
-                	else
-                    	bHasMacros = xStor->IsStorage( String::CreateFromAscii("Basic") );
-
-                	if ( bHasMacros )
-                    	AdjustMacroMode( String() );
-					else
-					{
-						// if macros will be added by the user later, the security check is obsolete
-						pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
-					}
-            	}
         	}
 
         	// Load
Index: source/doc/sfxbasemodel.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/sfxbasemodel.cxx,v
retrieving revision 1.51.10.1
diff -u -p -r1.51.10.1 sfxbasemodel.cxx
--- sfx2/source/doc/sfxbasemodel.cxx.orig	9 Jan 2004 17:44:22 -0000	1.51.10.1
+++ sfx2/source/doc/sfxbasemodel.cxx	13 Jun 2006 12:16:42 -0000
@@ -103,6 +103,10 @@
 #include <com/sun/star/view/PaperOrientation.hpp>
 #endif
 
+#ifndef _COM_SUN_STAR_SCRIPT_XLIBRARYCONTAINER_HPP_
+#include <com/sun/star/script/XLibraryContainer.hpp>
+#endif
+
 #ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_
 #include <cppuhelper/interfacecontainer.hxx>
 #endif
@@ -578,6 +582,7 @@ SEQUENCE< sal_Int8 > SAL_CALL SfxBaseMod
 
 REFERENCE< XSTARBASICACCESS > implGetStarBasicAccess( SfxObjectShell* pObjectShell )
 {
+	// is not used
 	REFERENCE< XSTARBASICACCESS > xRet;
 	if( pObjectShell )
 	{
@@ -593,13 +598,20 @@ REFERENCE< XNAMECONTAINER > SAL_CALL Sfx
 	if ( impl_isDisposed() )
 		throw DISPOSEDEXCEPTION();
 
-	REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess;
-	if( !rxAccess.is() )
-		rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
+//  the document library container must be used directly
+//	REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess;
+//	if( !rxAccess.is() )
+//		rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
+//
+//	REFERENCE< XNAMECONTAINER > xRet;
+//	if( rxAccess.is() )
+//		xRet = rxAccess->getLibraryContainer();
+//	return xRet;
 
 	REFERENCE< XNAMECONTAINER > xRet;
-	if( rxAccess.is() )
-		xRet = rxAccess->getLibraryContainer();
+	if( m_pData->m_pObjectShell )
+		xRet = REFERENCE< XNAMECONTAINER >( m_pData->m_pObjectShell->GetBasicContainer(), UNO_QUERY );
+
 	return xRet;
 }
 
@@ -614,12 +626,32 @@ void SAL_CALL SfxBaseModel::createLibrar
 	if ( impl_isDisposed() )
 		throw DISPOSEDEXCEPTION();
 
-	REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess;
-	if( !rxAccess.is() )
-		rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
-
-	if( rxAccess.is() )
-		rxAccess->createLibrary( LibName, Password, ExternalSourceURL, LinkTargetURL );
+	if( m_pData->m_pObjectShell )
+	{
+		Reference< ::com::sun::star::script::XLibraryContainer > xContainer = m_pData->m_pObjectShell->GetBasicContainer();
+		if ( xContainer.is() )
+		{
+			// insert a dummy library to let library existance be detected
+			// it is a hack to fix 136937
+			try
+			{
+				::rtl::OUString aDummy( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ) );
+				if ( !xContainer->hasByName( aDummy ) )
+					xContainer->createLibrary( aDummy );
+			}
+			catch( uno::Exception& )
+			{
+				return;
+			}
+
+			REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess;
+			if( !rxAccess.is() )
+				rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
+		
+			if( rxAccess.is() )
+				rxAccess->createLibrary( LibName, Password, ExternalSourceURL, LinkTargetURL );
+		}
+	}
 }
 
 /**___________________________________________________________________________________________________
@@ -633,12 +665,32 @@ void SAL_CALL SfxBaseModel::addModule( c
 	if ( impl_isDisposed() )
 		throw DISPOSEDEXCEPTION();
 
-	REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess;
-	if( !rxAccess.is() )
-		rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
-
-	if( rxAccess.is() )
-		rxAccess->addModule( LibraryName, ModuleName, Language, Source );
+	if( m_pData->m_pObjectShell )
+	{
+		Reference< ::com::sun::star::script::XLibraryContainer > xContainer = m_pData->m_pObjectShell->GetBasicContainer();
+		if ( xContainer.is() )
+		{
+			// insert a dummy library to let library existance be detected
+			// it is a hack to fix 136937
+			try
+			{
+				::rtl::OUString aDummy( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ) );
+				if ( !xContainer->hasByName( aDummy ) )
+					xContainer->createLibrary( aDummy );
+			}
+			catch( uno::Exception& )
+			{
+				return;
+			}
+
+			REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess;
+			if( !rxAccess.is() )
+				rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
+			
+			if( rxAccess.is() )
+				rxAccess->addModule( LibraryName, ModuleName, Language, Source );
+		}
+	}
 }
 
 /**___________________________________________________________________________________________________


disable-java-applets.diff:
 data/org/openoffice/Office/Common.xcu   |    7 +++++++
 schema/org/openoffice/Office/Common.xcs |    1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE disable-java-applets.diff ---
--- officecfg/registry/data/org/openoffice/Office/Common.xcu.orig	2004-05-09 11:22:21.000000000 -0400
+++ officecfg/registry/data/org/openoffice/Office/Common.xcu	2006-06-26 09:09:33.000000000 -0400
@@ -61,6 +61,13 @@
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
 <oor:component-data oor:name="Common" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <node oor:name="Java">
+   <node oor:name="Applet">
+    <prop oor:name="Enable" oor:type="xs:boolean">
+     <value>false</value>
+    </prop>
+   </node>
+  </node>
   <node oor:name="View">
     <node oor:name="Localisation">
       <prop oor:name="AutoMnemonic">
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig	2004-04-27 12:35:22.000000000 -0400
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2006-06-26 09:07:52.000000000 -0400
@@ -7070,7 +7070,6 @@
 						<label xml:lang="af">Words with two initial capital letters - Add automatically</label>
 						<label xml:lang="zu">Words with two initial capital letters - Add automatically</label>
 					</info>
-					<value>true</value>
 				</prop>
 				<prop oor:name="CapitalAtStartSentence" oor:type="xs:boolean">
 					<!-- OldPath: AutoCorrect/Options/All -->

sax+source+expatwrap+xml2utf.cxx.diff:
 xml2utf.cxx |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

--- NEW FILE sax+source+expatwrap+xml2utf.cxx.diff ---
diff -urN -x CVS -x unxlngi6.pro sax.orig/source/expatwrap/xml2utf.cxx sax/source/expatwrap/xml2utf.cxx
--- sax.orig/source/expatwrap/xml2utf.cxx	2005-09-08 14:05:22.000000000 +0200
+++ sax/source/expatwrap/xml2utf.cxx	2006-06-22 11:04:22.000000000 +0200
@@ -78,24 +78,26 @@
 				// ensure that enough data is available to parse encoding
 				if( seqStart.getLength() )
 				{
-					seq.realloc( seqStart.getLength() + seq.getLength() );
-					memcpy( (sal_Int8*)seq.getConstArray() + seqStart.getLength() ,
-							seq.getConstArray() ,
-							seq.getLength() );
-					memcpy( (sal_Int8*)seq.getConstArray() ,
-							seqStart.getConstArray(),
-							seqStart.getLength() );
+				  // prefix with what we had so far.
+				  sal_Int32 nLength = seq.getLength();
+				  seq.realloc( seqStart.getLength() + nLength );
+
+				  memmove (seq.getArray() + seqStart.getLength(),
+					   seq.getConstArray(),
+					   nLength);
+				  memcpy  (seq.getArray(),
+					   seqStart.getConstArray(),
+					   seqStart.getLength());
 				}
 
 				// autodetection with the first bytes
 				if( ! isEncodingRecognizable( seq ) )
 				{
-					seqStart.realloc( seqStart.getLength() + seq.getLength() );
-					memcpy( (sal_Int8*)seqStart.getConstArray() + seqStart.getLength(),
-							seq.getConstArray(),
-							seq.getLength());
-					// read more !
-					continue;
+				  // remember what we have so far.
+				  seqStart = seq;
+
+				  // read more !
+				  continue;
 				}
 				if( scanForEncoding( seq ) || m_sEncoding.getLength() ) {
 					// initialize decoding
@@ -291,7 +293,7 @@
 
 		// simply add the byte order mark !
 		seq.realloc( seq.getLength() + 2 );
-		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() );
+		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 );
 		((sal_uInt8*)seq.getArray())[0] = 0xFE;
 		((sal_uInt8*)seq.getArray())[1] = 0xFF;
 
@@ -302,7 +304,7 @@
 		// The byte order mark is simply added
 
 		seq.realloc( seq.getLength() + 2 );
-		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() );
+		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 );
 		((sal_uInt8*)seq.getArray())[0] = 0xFF;
 		((sal_uInt8*)seq.getArray())[1] = 0xFE;
 
@@ -511,9 +513,7 @@
 		// In general when surrogates are used, they should be rarely
 		// cut off between two convert()-calls. So this code is used
 		// rarely and the extra copy is acceptable.
-		nSourceSize += m_seqSource.getLength();
-
-		puTempMem = new sal_Unicode[ nSourceSize ];
+		puTempMem = new sal_Unicode[ nSourceSize + m_seqSource.getLength()];
 		memcpy( puTempMem ,
 				m_seqSource.getConstArray() ,
 				m_seqSource.getLength() * sizeof( sal_Unicode ) );
@@ -522,6 +522,7 @@
 			puSource ,
 			nSourceSize*sizeof( sal_Unicode ) );
 		puSource = puTempMem;
+		nSourceSize += m_seqSource.getLength();
 
 		m_seqSource = Sequence< sal_Unicode > ();
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openoffice.org.spec	15 Jul 2005 13:11:35 -0000	1.64
+++ openoffice.org.spec	26 Jun 2006 14:24:17 -0000	1.65
@@ -219,6 +219,9 @@
 
 # rh#147395# drop G_GNUC_CONST usage
 Patch25: patches-OOO_1_1-evoab2-crash.diff
+Patch26: 6438334-macros-so7-sfx2.diff
+Patch27: disable-java-applets.diff
+Patch28: sax+source+expatwrap+xml2utf.cxx.diff
 ##################################
 # Description
 ##################################
@@ -306,6 +309,9 @@
 ln -s %{PATCH22} patches/vclplug/
 ln -s %{PATCH23} patches/OOO_1_1/
 ln -s %{PATCH24} patches/OOO_1_1/
+ln -s %{PATCH26} patches/OOO_1_1/
+ln -s %{PATCH27} patches/OOO_1_1/
+ln -s %{PATCH28} patches/OOO_1_1/
 
 # autogen here only needed when sources come from intermediate CVS releases,
 # not release from ooo.ximian.com
@@ -572,9 +578,11 @@
 # Changelog
 ##################################
 %changelog
-* Fri Jul 12 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-12
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-12
 - add a fix for rh#147395#/ooo#52023# (caolanm)
-- UNBUILT
+- CVE-2006-2198 macro security
+- CVE-2006-2199 java applets
+- CVE-2006-3117 corrupt file format
 
 * Tue Apr 12 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-11
 - Fix CAN-2005-0941 (sot module overflow in .doc parsing)

redhat-fixes.patch:
 bin/build-ooo                                         |   30 ++++++++++++
 bin/install-dictionaries                              |   44 +-----------------
 bin/ooo-wrapper.in                                    |   40 ----------------
 configure.in                                          |    4 -
 patches/OOO_1_1/gui-menu-new-wizard-translations.diff |   39 ---------------
 patches/OOO_1_1/sc-filter-hide-filteredrows.diff      |    1 
 patches/OOO_1_1_3/apply                               |   22 +++++++--
 7 files changed, 56 insertions(+), 124 deletions(-)

Index: redhat-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/redhat-fixes.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- redhat-fixes.patch	12 Apr 2005 14:16:42 -0000	1.35
+++ redhat-fixes.patch	26 Jun 2006 14:24:17 -0000	1.36
@@ -280,12 +280,15 @@
  [ FilePickers ]
  
  #
-@@ -461,6 +466,9 @@
+@@ -461,6 +466,12 @@
  # Make Tools->Options less confused in pt_BR locales #rh124877#
  tools-options-pt_BR-fix.diff
  
 +# Fix CAN-2005-0941 (overflow in sot module .doc parsing code)
 +patches-OOO_1_1-sot-overflow.diff
++6438334-macros-so7-sfx2.diff
++disable-java-applets.diff
++sax+source+expatwrap+xml2utf.cxx.diff
 +
  [ GnomeVFS ]
  



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:34:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:34:15 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1650,1.1651
Message-ID: <200606261434.k5QEYFmQ004330@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv4279

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable PCI fake hotplug driver.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1650
retrieving revision 1.1651
diff -u -r1.1650 -r1.1651
--- kernel-2.6.spec	26 Jun 2006 14:23:54 -0000	1.1650
+++ kernel-2.6.spec	26 Jun 2006 14:34:11 -0000	1.1651
@@ -1079,6 +1079,7 @@
 %changelog
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - Reenable SMP x86-64 builds.
+- Enable PCI fake hotplug driver.
 
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:34:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:34:15 -0400
Subject: rpms/kernel/FC-4/configs config-generic, 1.61,
	1.62 config-ia64-generic, 1.8, 1.9 config-powerpc64, 1.3,
	1.4 config-powerpc64-iseries, 1.3, 1.4 config-ppc64-generic,
	1.13, 1.14 config-x86-generic, 1.24,
	1.25 config-x86_64-generic, 1.21, 1.22
Message-ID: <200606261434.k5QEYFCX004345@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv4279/configs

Modified Files:
	config-generic config-ia64-generic config-powerpc64 
	config-powerpc64-iseries config-ppc64-generic 
	config-x86-generic config-x86_64-generic 
Log Message:
Enable PCI fake hotplug driver.


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- config-generic	21 Jun 2006 16:52:41 -0000	1.61
+++ config-generic	26 Jun 2006 14:34:13 -0000	1.62
@@ -63,6 +63,7 @@
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
+# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-ia64-generic	20 Jun 2006 18:25:41 -0000	1.8
+++ config-ia64-generic	26 Jun 2006 14:34:13 -0000	1.9
@@ -128,7 +128,7 @@
 # CONFIG_PM_DEBUG is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
-# CONFIG_HOTPLUG_PCI_FAKE is not set
+CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc64	20 Jun 2006 18:25:41 -0000	1.3
+++ config-powerpc64	26 Jun 2006 14:34:13 -0000	1.4
@@ -20,7 +20,7 @@
 CONFIG_THERM_PM72=y
 CONFIG_IBMVETH=m
 CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_FAKE is not set
+CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_RPA=m


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64-iseries,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc64-iseries	20 Jun 2006 18:25:41 -0000	1.3
+++ config-powerpc64-iseries	26 Jun 2006 14:34:13 -0000	1.4
@@ -49,7 +49,6 @@
 # CONFIG_WINDFARM is not set
 CONFIG_LPARCFG=y
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y


Index: config-ppc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ppc64-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-ppc64-generic	28 Mar 2006 16:14:10 -0000	1.13
+++ config-ppc64-generic	26 Jun 2006 14:34:13 -0000	1.14
@@ -29,7 +29,7 @@
 
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
+CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-x86-generic	20 Jun 2006 18:25:41 -0000	1.24
+++ config-x86-generic	26 Jun 2006 14:34:13 -0000	1.25
@@ -219,7 +219,7 @@
 CONFIG_PCI_BIOS=y
 
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
+CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-x86_64-generic	20 Jun 2006 18:25:41 -0000	1.21
+++ config-x86_64-generic	26 Jun 2006 14:34:13 -0000	1.22
@@ -83,7 +83,7 @@
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
+CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:36:03 -0400
Subject: rpms/kernel/FC-5/configs config-generic, 1.167,
	1.168 config-ia64-generic, 1.22, 1.23 config-powerpc64, 1.11,
	1.12 config-x86-generic, 1.42, 1.43 config-x86_64-generic,
	1.34, 1.35
Message-ID: <200606261436.k5QEa3TV004657@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv4612/configs

Modified Files:
	config-generic config-ia64-generic config-powerpc64 
	config-x86-generic config-x86_64-generic 
Log Message:
Enable fake PCI hotplug driver. (#190437


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- config-generic	21 Jun 2006 16:52:29 -0000	1.167
+++ config-generic	26 Jun 2006 14:36:00 -0000	1.168
@@ -62,6 +62,7 @@
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
 # CONFIG_EISA is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-ia64-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-ia64-generic	18 Jun 2006 04:45:12 -0000	1.22
+++ config-ia64-generic	26 Jun 2006 14:36:00 -0000	1.23
@@ -128,7 +128,6 @@
 # CONFIG_PM_DEBUG is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc64,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-powerpc64	6 Jun 2006 04:35:26 -0000	1.11
+++ config-powerpc64	26 Jun 2006 14:36:00 -0000	1.12
@@ -20,7 +20,6 @@
 CONFIG_THERM_PM72=y
 CONFIG_IBMVETH=m
 CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_RPA=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- config-x86-generic	18 Jun 2006 04:45:12 -0000	1.42
+++ config-x86-generic	26 Jun 2006 14:36:00 -0000	1.43
@@ -219,7 +219,6 @@
 CONFIG_PCI_BIOS=y
 
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86_64-generic,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- config-x86_64-generic	18 Jun 2006 04:45:12 -0000	1.34
+++ config-x86_64-generic	26 Jun 2006 14:36:00 -0000	1.35
@@ -82,7 +82,6 @@
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:36:03 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2141,1.2142
Message-ID: <200606261436.k5QEa3sI004645@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4612

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable fake PCI hotplug driver. (#190437


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2141
retrieving revision 1.2142
diff -u -r1.2141 -r1.2142
--- kernel-2.6.spec	24 Jun 2006 06:03:20 -0000	1.2141
+++ kernel-2.6.spec	26 Jun 2006 14:35:59 -0000	1.2142
@@ -1627,6 +1627,9 @@
 %endif
 
 %changelog
+* Mon Jun 26 2006 Dave Jones <davej at redhat.com>
+- Enable fake PCI hotplug driver. (#190437)
+
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:40:32 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2142,1.2143
Message-ID: <200606261440.k5QEeWhG006185@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6100

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable gameport/joystick on i586 builds. (#196581)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2142
retrieving revision 1.2143
diff -u -r1.2142 -r1.2143
--- kernel-2.6.spec	26 Jun 2006 14:35:59 -0000	1.2142
+++ kernel-2.6.spec	26 Jun 2006 14:40:29 -0000	1.2143
@@ -1629,6 +1629,7 @@
 %changelog
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - Enable fake PCI hotplug driver. (#190437)
+- Enable gameport/joystick on i586 builds. (#196581)
 
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:40:32 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.15,1.16
Message-ID: <200606261440.k5QEeWNh006192@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6100/configs

Modified Files:
	config-i586 
Log Message:
Enable gameport/joystick on i586 builds. (#196581)


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-i586	24 Jun 2006 06:03:20 -0000	1.15
+++ config-i586	26 Jun 2006 14:40:29 -0000	1.16
@@ -24,8 +24,6 @@
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_DISKDUMP is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_GAMEPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_STALDRV is not set
@@ -46,7 +44,6 @@
 # CONFIG_AGP_AMD64 is not set
 # CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
 
 # CONFIG_X86_UP_APIC is not set
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:40:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:40:50 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1651,1.1652
Message-ID: <200606261440.k5QEeoqe006328@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6298

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable gameport/joystick on i586 builds. (#196581)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1651
retrieving revision 1.1652
diff -u -r1.1651 -r1.1652
--- kernel-2.6.spec	26 Jun 2006 14:34:11 -0000	1.1651
+++ kernel-2.6.spec	26 Jun 2006 14:40:48 -0000	1.1652
@@ -1080,6 +1080,7 @@
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - Reenable SMP x86-64 builds.
 - Enable PCI fake hotplug driver.
+- Enable gameport/joystick on i586 builds. (#196581)
 
 * Sat Jun 24 2006 Dave Jones <davej at redhat.com>
 - Enable profiling for 586 kernels.



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:40:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:40:50 -0400
Subject: rpms/kernel/FC-4/configs config-i586,1.4,1.5
Message-ID: <200606261440.k5QEeoSo006337@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6298/configs

Modified Files:
	config-i586 
Log Message:
Enable gameport/joystick on i586 builds. (#196581)


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-i586,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-i586	24 Jun 2006 06:03:05 -0000	1.4
+++ config-i586	26 Jun 2006 14:40:48 -0000	1.5
@@ -24,8 +24,6 @@
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_DISKDUMP is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_GAMEPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_STALDRV is not set
@@ -46,7 +44,6 @@
 # CONFIG_AGP_AMD64 is not set
 # CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
 
 # CONFIG_X86_UP_APIC is not set
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:42:38 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.16,1.17
Message-ID: <200606261442.k5QEgc3B007068@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7019/configs

Modified Files:
	config-i586 
Log Message:
enable mmc too



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-i586	26 Jun 2006 14:40:29 -0000	1.16
+++ config-i586	26 Jun 2006 14:42:36 -0000	1.17
@@ -36,7 +36,6 @@
 # CONFIG_W1 is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_KPROBES is not set
 # CONFIG_AGP_ATI is not set



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:42:59 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.17,1.18
Message-ID: <200606261442.k5QEgxft007221@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7177/configs

Modified Files:
	config-i586 
Log Message:
and kprobes



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-i586	26 Jun 2006 14:42:36 -0000	1.17
+++ config-i586	26 Jun 2006 14:42:57 -0000	1.18
@@ -37,7 +37,6 @@
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_KPROBES is not set
 # CONFIG_AGP_ATI is not set
 # CONFIG_AGP_AMD is not set
 # CONFIG_AGP_AMD64 is not set



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:43:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:43:20 -0400
Subject: rpms/kernel/FC-4/configs config-i586,1.5,1.6
Message-ID: <200606261443.k5QEhKKV007386@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7268/configs

Modified Files:
	config-i586 
Log Message:
enable mmc & kprobes on 586



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-i586,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-i586	26 Jun 2006 14:40:48 -0000	1.5
+++ config-i586	26 Jun 2006 14:43:18 -0000	1.6
@@ -36,9 +36,7 @@
 # CONFIG_W1 is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_KPROBES is not set
 # CONFIG_AGP_ATI is not set
 # CONFIG_AGP_AMD is not set
 # CONFIG_AGP_AMD64 is not set



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:44:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:44:12 -0400
Subject: rpms/openoffice.org/FC-4 disable-java-applets.diff, NONE,
	1.1 sax+source+expatwrap+xml2utf.cxx.diff, NONE,
	1.1 openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, 1.2,
	1.3 openoffice.org.spec, 1.241, 1.242 sources, 1.91, 1.92
Message-ID: <200606261444.k5QEiC9N007716@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7685

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
	openoffice.org.spec sources 
Added Files:
	disable-java-applets.diff 
	sax+source+expatwrap+xml2utf.cxx.diff 
Log Message:
port to FC-4

disable-java-applets.diff:
 data/org/openoffice/Office/Common.xcu   |    7 +++++++
 schema/org/openoffice/Office/Common.xcs |    1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE disable-java-applets.diff ---
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/Common.xcu	2004-05-09 11:22:21.000000000 -0400
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Common.xcu	2006-06-26 09:09:33.000000000 -0400
@@ -35,6 +35,13 @@
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
 <oor:component-data oor:name="Common" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <node oor:name="Java">
+   <node oor:name="Applet">
+    <prop oor:name="Enable" oor:type="xs:boolean">
+     <value>false</value>
+    </prop>
+   </node>
+  </node>
   <node oor:name="View">
     <node oor:name="Dialog">
       <prop oor:name="MiddleMouseButton">
--- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2004-04-27 12:35:22.000000000 -0400
+++ openoffice.org/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2006-06-26 09:07:52.000000000 -0400
@@ -7070,7 +7070,6 @@
 						<label xml:lang="af">Words with two initial capital letters - Add automatically</label>
 						<label xml:lang="zu">Words with two initial capital letters - Add automatically</label>
 					</info>
-					<value>true</value>
 				</prop>
 				<prop oor:name="CapitalAtStartSentence" oor:type="xs:boolean">
 					<!-- OldPath: AutoCorrect/Options/All -->

sax+source+expatwrap+xml2utf.cxx.diff:
 xml2utf.cxx |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

--- NEW FILE sax+source+expatwrap+xml2utf.cxx.diff ---
diff -urN -x CVS -x unxlngi6.pro sax/source/expatwrap/xml2utf.cxx sax/source/expatwrap/xml2utf.cxx
--- openoffice.org.orig/sax/source/expatwrap/xml2utf.cxx	2005-09-08 14:05:22.000000000 +0200
+++ openoffice.org/sax/source/expatwrap/xml2utf.cxx	2006-06-22 11:04:22.000000000 +0200
@@ -78,24 +78,26 @@
 				// ensure that enough data is available to parse encoding
 				if( seqStart.getLength() )
 				{
-					seq.realloc( seqStart.getLength() + seq.getLength() );
-					memcpy( (sal_Int8*)seq.getConstArray() + seqStart.getLength() ,
-							seq.getConstArray() ,
-							seq.getLength() );
-					memcpy( (sal_Int8*)seq.getConstArray() ,
-							seqStart.getConstArray(),
-							seqStart.getLength() );
+				  // prefix with what we had so far.
+				  sal_Int32 nLength = seq.getLength();
+				  seq.realloc( seqStart.getLength() + nLength );
+
+				  memmove (seq.getArray() + seqStart.getLength(),
+					   seq.getConstArray(),
+					   nLength);
+				  memcpy  (seq.getArray(),
+					   seqStart.getConstArray(),
+					   seqStart.getLength());
 				}
 
 				// autodetection with the first bytes
 				if( ! isEncodingRecognizable( seq ) )
 				{
-					seqStart.realloc( seqStart.getLength() + seq.getLength() );
-					memcpy( (sal_Int8*)seqStart.getConstArray() + seqStart.getLength(),
-							seq.getConstArray(),
-							seq.getLength());
-					// read more !
-					continue;
+				  // remember what we have so far.
+				  seqStart = seq;
+
+				  // read more !
+				  continue;
 				}
 				if( scanForEncoding( seq ) || m_sEncoding.getLength() ) {
 					// initialize decoding
@@ -291,7 +293,7 @@
 
 		// simply add the byte order mark !
 		seq.realloc( seq.getLength() + 2 );
-		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() );
+		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 );
 		((sal_uInt8*)seq.getArray())[0] = 0xFE;
 		((sal_uInt8*)seq.getArray())[1] = 0xFF;
 
@@ -302,7 +304,7 @@
 		// The byte order mark is simply added
 
 		seq.realloc( seq.getLength() + 2 );
-		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() );
+		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 );
 		((sal_uInt8*)seq.getArray())[0] = 0xFF;
 		((sal_uInt8*)seq.getArray())[1] = 0xFE;
 
@@ -511,9 +513,7 @@
 		// In general when surrogates are used, they should be rarely
 		// cut off between two convert()-calls. So this code is used
 		// rarely and the extra copy is acceptable.
-		nSourceSize += m_seqSource.getLength();
-
-		puTempMem = new sal_Unicode[ nSourceSize ];
+		puTempMem = new sal_Unicode[ nSourceSize + m_seqSource.getLength()];
 		memcpy( puTempMem ,
 				m_seqSource.getConstArray() ,
 				m_seqSource.getLength() * sizeof( sal_Unicode ) );
@@ -522,6 +522,7 @@
 			puSource ,
 			nSourceSize*sizeof( sal_Unicode ) );
 		puSource = puTempMem;
+		nSourceSize += m_seqSource.getLength();
 
 		m_seqSource = Sequence< sal_Unicode > ();
 	}

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 inc/objsh.hxx                    |    0 
 sfx2/inc/objsh.hxx               |    1 
 sfx2/source/doc/objmisc.cxx      |   97 +++++++++++++++++++++------------------
 sfx2/source/doc/sfxbasemodel.cxx |    6 ++
 sfx2/source/inc/objshimp.hxx     |    4 +
 source/doc/objmisc.cxx           |    0 
 source/doc/sfxbasemodel.cxx      |    0 
 source/inc/objshimp.hxx          |    0 
 8 files changed, 63 insertions(+), 45 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 12:15:11 -0000	1.2
+++ openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	26 Jun 2006 14:44:09 -0000	1.3
@@ -1,23 +1,49 @@
-Index: objmisc.cxx
+Index: inc/objsh.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/objsh.hxx,v
+retrieving revision 1.65
+diff -u -p -r1.65 objsh.hxx
+--- openoffice.org.orig/sfx2/inc/objsh.hxx	2 May 2006 16:01:46 -0000	1.65
++++ openoffice.org/sfx2/inc/objsh.hxx	15 Jun 2006 12:12:47 -0000
+@@ -714,6 +714,7 @@ public:
+ 					const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ 
+ 	SAL_DLLPRIVATE void InitOwnModel_Impl();
++	SAL_DLLPRIVATE void BreakMacroSign_Impl( sal_Bool bBreakMacroSing );
+ 	SAL_DLLPRIVATE void CheckMacrosOnLoading_Impl();
+ 
+ 	SAL_DLLPRIVATE static SEQUENCE< OUSTRING > GetEventNames_Impl();
+Index: source/doc/objmisc.cxx
 ===================================================================
 RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v
 retrieving revision 1.78
 diff -u -p -r1.78 objmisc.cxx
 --- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
-+++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
-@@ -1054,37 +1054,23 @@
++++ openoffice.org/sfx2/source/doc/objmisc.cxx	15 Jun 2006 12:15:02 -0000
+@@ -1039,6 +1039,12 @@
+ }
+ 
+ //-------------------------------------------------------------------------
++void SfxObjectShell::BreakMacroSign_Impl( sal_Bool bBreakMacroSign )
++{
++	pImp->m_bMacroSignBroken = bBreakMacroSign;
++}
++
++//-------------------------------------------------------------------------
+ void SfxObjectShell::CheckMacrosOnLoading_Impl()
+ {
+ 	const SfxFilter* pFilter = pMedium->GetFilter();
+@@ -1053,35 +1059,24 @@
  		pImp->bMacroDisabled = sal_True;
  		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
  	}
 -	else if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
-+	else
- 	{
+-	{
 -		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
 -		if ( xStorage.is() )
 -		{
 -			BOOL bHasMacros = StorageHasMacros( xStorage );
-+		sal_Bool bHasMacros = sal_False;
- 
+-
 -			if ( bHasMacros )
 -			{
 -				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
@@ -33,30 +59,47 @@
 -				// if macros will be added by the user later, the security check is obsolete
 -				pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
 -			}
-+		if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
-+		{
-+			uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
-+			if ( xStorage.is() )
-+				bHasMacros = StorageHasMacros( xStorage );
-+			else
-+				SetError( ERRCODE_IO_GENERAL );
- 		}
+-		}
 -		else
 -			SetError( ERRCODE_IO_GENERAL );
 -	}
--	else
--	{
+ 	else
+ 	{
 -		if ( HasMacrosLib_Impl() )
-+		if ( !bHasMacros )
-+			bHasMacros = HasMacrosLib_Impl();
-+
-+		if ( bHasMacros )
++		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
++                sal_Bool bHasMacros = sal_False;
++ 
++                if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
++                {
++                        uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
++                        if ( xStorage.is() )
++                                bHasMacros = StorageHasMacros( xStorage );
++                        else
++                                SetError( ERRCODE_IO_GENERAL );
++		}
++ 
++                if ( !bHasMacros )
++                        bHasMacros = HasMacrosLib_Impl();
++ 
++                if ( bHasMacros )
  		{
--			// no signing in alien formats!
+ 			// no signing in alien formats!
  			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
- 			if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
- 			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-@@ -2245,23 +2231,30 @@
+@@ -1968,6 +1963,13 @@
+ 	    	::com::sun::star::uno::Sequence< security::DocumentSignatureInformation > aScriptingSignatureInformations;
+             uno::Reference < embed::XStorage > xStore = GetMedium()->GetLastCommitReadStorage_Impl();
+ 	    	sal_uInt16 nSignatureState = GetScriptingSignatureState();
++
++            if ( nSignatureState != SIGNATURESTATE_NOSIGNATURES && pImp->m_bMacroSignBroken )
++			{
++				// if there is a macro signature it must be handled as broken
++	    		nSignatureState = SIGNATURESTATE_SIGNATURES_BROKEN;
++			}
++			
+ 	    	if ( nSignatureState == SIGNATURESTATE_SIGNATURES_BROKEN )
+ 	    	{
+ 				if ( pImp->nMacroMode != MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN )
+@@ -2244,23 +2246,30 @@
          if ( bHasMacros )
          {
              // a library container exists; check if it's empty
@@ -104,3 +147,48 @@
      }
      catch( uno::Exception& )
      {
+Index: source/inc/objshimp.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/inc/objshimp.hxx,v
+retrieving revision 1.29
+diff -u -r1.29 objshimp.hxx
+--- openoffice.org.orig/sfx2/source/inc/objshimp.hxx	11 Nov 2005 12:24:06 -0000	1.29
++++ openoffice.org/sfx2/source/inc/objshimp.hxx	26 Jun 2006 14:37:46 -0000
+@@ -112,7 +112,8 @@
+                         bInitialized:1,
+                         bSignatureErrorIsShown:1,
+                         bModelInitialized:1, // whether the related model is initialized
+-                        bPreserveVersions:1;
++                        bPreserveVersions:1,
++						m_bMacroSignBroken:1; // whether the macro signature was explicitly broken
+ 
+ 	String              aNewName;  // Der Name, unter dem das Doc gespeichert
+ 								   // werden soll
+@@ -219,6 +220,7 @@
+         bLoadingWindows( sal_False ),
+         bPreserveVersions( sal_True ),
+         bHidden( sal_False )
++                , m_bMacroSignBroken( sal_False )
+ 		, nStyleFilter( 0 )
+         , nMacroMode( -1 )
+ 		, bDisposing( sal_False )
+Index: source/doc/sfxbasemodel.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/doc/sfxbasemodel.cxx,v
+retrieving revision 1.110
+diff -u -p -r1.110 sfxbasemodel.cxx
+--- openoffice.org.orig/sfx2/source/doc/sfxbasemodel.cxx	2 May 2006 16:45:09 -0000	1.110
++++ openoffice.org/sfx2/source/doc/sfxbasemodel.cxx	15 Jun 2006 12:15:21 -0000
+@@ -1182,6 +1182,12 @@ sal_Bool SAL_CALL SfxBaseModel::attachRe
+                     m_pData->m_pObjectShell->SetVisArea( aTmpRect );
+                 }
+ 			}
++			else if ( rArgs[nInd].Name.equalsAscii( "BreakMacroSignature" ) )
++			{
++				sal_Bool bBreakMacroSign = sal_False;
++				rArgs[nInd].Value >>= bBreakMacroSign;
++				m_pData->m_pObjectShell->BreakMacroSign_Impl( bBreakMacroSign );
++			}
+ 			else if ( !rArgs[nInd].Name.equalsAscii( "Stream" ) && !rArgs[nInd].Name.equalsAscii( "InputStream" ) )
+ 			{
+ 				// TODO/LATER: all the parameters that are accepted by ItemSet of the DocShell must be ignored here


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- openoffice.org.spec	9 Jun 2006 11:12:02 -0000	1.241
+++ openoffice.org.spec	26 Jun 2006 14:44:09 -0000	1.242
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 %define build_fc5 0
 %define build_fc4 1
@@ -136,7 +136,6 @@
 Source7:	GSI_ga.sdf
 Source8:	gcj-sed.sh
 Source9:	evolocal.odb
-Source10:	DisableJavaApplets.xcu
 BuildRequires: 	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -218,6 +217,8 @@
 Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
 Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
 Patch53: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
+Patch54: disable-java-applets.diff
+Patch55: sax+source+expatwrap+xml2utf.cxx.diff
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -889,6 +890,8 @@
 %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
 %patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
 %patch53 -p1 -b .oooXXXXX.safety.sfx2.patch
+%patch54 -p1 -b .disable-java-applets.diff
+%patch55 -p1 -b .sax
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -1059,7 +1062,6 @@
 %install
 #add our custom configuration options
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5}
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE10}
 
 # rh#163147# convert non AMT to AMT fonts
 sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -3348,6 +3350,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Jun 09 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-7
+- CVE-2006-2198 macro security
+- CVE-2006-2199 java applets
+- CVE-2006-3117 corrupt file format
+
 * Fri Jun 09 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-6
 - security errata
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	9 Jun 2006 11:10:31 -0000	1.91
+++ sources	26 Jun 2006 14:44:09 -0000	1.92
@@ -8,4 +8,3 @@
 79d2ce6b3bf7e0b5d88f601838b791f7  OOA680_m1.tar.bz2
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 33abf0fa04f7ec90b49ba4a8072713b6  GSI_ga.sdf
-baaf6187c060cc0525acbe4c07748025  DisableJavaApplets.xcu



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:44:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:44:46 -0400
Subject: rpms/kdemultimedia/FC-5 kdemultimedia-3.5.3-examples.patch, NONE,
	1.1 kdemultimedia.diff, NONE, 1.1 kdemultimedia.spec, 1.60, 1.61
Message-ID: <200606261444.k5QEikq6007990@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7914

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-3.5.3-examples.patch kdemultimedia.diff 
Log Message:
fix #196231, Unknown protocol audiocd when kaudiocreator started


kdemultimedia-3.5.3-examples.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdemultimedia-3.5.3-examples.patch ---
--- kdemultimedia-3.5.3-patched/kmid/Makefile.in.orig	2006-06-26 14:33:57.000000000 +0200
+++ kdemultimedia-3.5.3-patched/kmid/Makefile.in	2006-06-26 14:34:09.000000000 +0200
@@ -556,7 +556,7 @@
 #>- METASOURCES = AUTO
 servicetype_DATA = audiomidi.desktop
 servicetypedir = $(kde_servicetypesdir)
-SUBDIRS = maps examples pics
+SUBDIRS = maps pics
 xdg_apps_DATA = kmid.desktop
 mime_DATA = x-karaoke.desktop
 mimedir = $(kde_mimedir)/audio
--- kdemultimedia-3.5.3-patched/kmid/Makefile.am.orig	2006-06-26 14:32:27.000000000 +0200
+++ kdemultimedia-3.5.3-patched/kmid/Makefile.am	2006-06-26 14:32:40.000000000 +0200
@@ -38,7 +38,7 @@
 servicetype_DATA = audiomidi.desktop
 servicetypedir = $(kde_servicetypesdir)
 
-SUBDIRS = maps examples pics
+SUBDIRS = maps pics
 
 xdg_apps_DATA = kmid.desktop
 

kdemultimedia.diff:
 cddaslave.c       |    3 +++
 libwm/cddaslave.c |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE kdemultimedia.diff ---
Index: kscd/cddaslave.c
===================================================================
--- kscd/cddaslave.c	(revision 549101)
+++ kscd/cddaslave.c	(working copy)
@@ -418,7 +418,10 @@ main(argc, argv)
 	 * superuser access.
 	 */
 	nice(-14);
+	setgid(getgid());
 	setuid(getuid());
+	if (getuid() != geteuid())
+		return 255;
 
 	FD_ZERO(&dummyfd);
 	FD_ZERO(&readfd);
Index: kscd/libwm/cddaslave.c
===================================================================
--- kscd/libwm/cddaslave.c	(revision 549101)
+++ kscd/libwm/cddaslave.c	(working copy)
@@ -489,7 +489,10 @@ int main(int argc, char **argv)
    * superuser access.
    */
   nice(-14);
+  setgid(getgid());
   setuid(getuid());
+  if (geteuid() != getuid())
+    return 255;
 
   FD_ZERO(&dummyfd);
   FD_ZERO(&readfd);


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/kdemultimedia.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdemultimedia.spec	26 Jun 2006 12:08:47 -0000	1.60
+++ kdemultimedia.spec	26 Jun 2006 14:44:43 -0000	1.61
@@ -2,26 +2,16 @@
 %define final 0
 %define make_cvs 1
 
-# support mp3
-%define build_mpeglib 0
-
-%define my_vendor kde
-
 %define qt_version 3.3.6
 
 %define libtool 1
-%define juk 0
 %define arts 1
 
 %define redhatify 1
 
 %define appdir %{_datadir}/applications/kde
 
-%if %{build_mpeglib}
-%define patch_name %{nil}
-%else
 %define patch_name -patched
-%endif
 
 Version: 3.5.3
 Release: 0.2.fc5
@@ -30,47 +20,39 @@
 Prefix: /usr
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
+Patch4: kdemultimedia-3.5.3-examples.patch
 
-Prereq: /sbin/ldconfig
+# upstream patches
+Patch100: kdemultimedia.diff
 
-Requires: kdelibs >= 6:%{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdebase >= 6:%{version}
 
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel >= %{version}
-BuildRequires: libjpeg-devel
 BuildRequires: gcc-c++
 BuildRequires: glibc-devel
 BuildRequires: perl
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: glib2-devel
-BuildRequires: libmng-devel
 BuildRequires: /usr/bin/desktop-file-install
 BuildRequires: libtheora-devel
 BuildRequires: flac-devel
 %if %{make_cvs}
 BuildRequires: autoconf automake libtool
 %endif
-%if %{build_mpeglib}
-BuildRequires: libXxf86dga-devel
-%endif
 BuildRequires: alsa-lib-devel >= 1.0.2
 BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
-%if %{juk}
-BuildRequires: taglib => 1.0
-BuildRequires: libmusicbrainz >= 2.1
-BuildRequires: libtunepimp
-Obsoletes: juk
-%endif
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -104,9 +86,10 @@
 %patch1 -p1
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
+%patch4 -p1 -b .examples
 
-perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
-perl -pi -e "s,examples,,g" kmid/Make*
+# upstream patches
+%patch100 -p0 -b .setuid-check
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -114,36 +97,22 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="%{optflags}"
-export KDEDIR=%{prefix}
-export PATH=%{prefix}/bin:$PATH
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-
-%if %{arts}
-export CFLAGS="$CFLAGS `artsc-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `artsc-config --cflags`"
-export LDFLAGS="$LDFLAGS `artsc-config --libs`"
-%endif
 
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
-   --disable-motif \
-   --with-motif-includes=none \
-   --with-motif-libraries=none \
    --with-extra-includes=/usr/include/cdda \
+   --includedir=%{_includedir}/kde \
    --disable-gcc-hidden-visibility \
    --with-cdparanoia \
+   --with-flac \
+   --with-theora \
+   --with-vorbis \
 %if %{arts} == 0
    --without-arts \
 %endif
    --with-alsa \
    --with-arts-alsa \
-   --disable-rpath \
-   --includedir=%{_includedir}/kde \
    --with-xinerama \
 %if %{debug} == 0
    --disable-debug \
@@ -153,7 +122,7 @@
 %if %{final}
    --enable-final \
 %endif
-   --disable-xaw
+   --disable-rpath
 
 SMP_MFLAGS=%{?_smp_mflags}
 
@@ -174,10 +143,6 @@
   done
 %endif
 
-%if ! %{juk}
-  rm -rf %{buildroot}%{_docdir}/HTML/en/juk
-%endif
-
 # don't make these world-writeable
 chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
@@ -198,9 +163,7 @@
 %defattr(-,root,root)
 /etc/xdg/menus/applications-merged/*
 %doc %{_docdir}/HTML/en/artsbuilder
-%if %{juk}
-%doc %{_docdir}/HTML/en/juk
-%endif
+%exclude %doc %{_docdir}/HTML/en/juk
 %doc %{_docdir}/HTML/en/kaboodle
 %doc %{_docdir}/HTML/en/kaudiocreator
 %doc %{_docdir}/HTML/en/kdemultimedia%{patch_name}-apidocs



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:50:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:50:46 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.62,1.63
Message-ID: <200606261450.k5QEokql002117@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv2085/configs

Modified Files:
	config-generic 
Log Message:
reenable smbfs


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- config-generic	26 Jun 2006 14:34:13 -0000	1.62
+++ config-generic	26 Jun 2006 14:50:44 -0000	1.63
@@ -2372,7 +2372,7 @@
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
-# CONFIG_SMB_FS is not set
+CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:50:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:50:46 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1652,1.1653
Message-ID: <200606261450.k5QEokpM002109@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2085

Modified Files:
	kernel-2.6.spec 
Log Message:
reenable smbfs


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -r1.1652 -r1.1653
--- kernel-2.6.spec	26 Jun 2006 14:40:48 -0000	1.1652
+++ kernel-2.6.spec	26 Jun 2006 14:50:44 -0000	1.1653
@@ -1078,7 +1078,9 @@
 
 %changelog
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
-- Reenable SMP x86-64 builds.
+- Fix up various stupidities incurred by the last big rebase.
+  - Reenable SMP x86-64 builds.
+  - Reenable SMBFS.
 - Enable PCI fake hotplug driver.
 - Enable gameport/joystick on i586 builds. (#196581)
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:51:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:51:22 -0400
Subject: rpms/oprofile/devel oprofile.spec,1.41,1.42
Message-ID: <200606261451.k5QEpMop002148@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2090

Modified Files:
	oprofile.spec 
Log Message:
Split out the oprof_start GUI program into separate RPM.




Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- oprofile.spec	7 Jun 2006 15:27:33 -0000	1.41
+++ oprofile.spec	26 Jun 2006 14:51:19 -0000	1.42
@@ -1,6 +1,6 @@
 %define DATE 200511111
 %define oprofile_version 0.9.1
-%define oprofile_release 10
+%define oprofile_release 11
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
@@ -51,6 +51,14 @@
 
 Header files and libraries for developing apps which will use oprofile.
 
+%package gui
+Summary: GUI for oprofile.
+Group: Development/System
+Requires: oprofile = %{version}-%{release}
+
+%description gui
+
+The oprof_start GUI for oprofile.
 %prep
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
@@ -131,7 +139,6 @@
 %defattr(-,root,root)
 %doc doc/oprofile.html
 
-%{_bindir}/oprof_start
 %{_bindir}/ophelp
 %{_bindir}/opimport
 %{_bindir}/opannotate
@@ -233,8 +240,15 @@
 %{_libdir}/liboputil++.a
 %{_libdir}/liboputil.a
 
+%files gui
+%defattr(-,root,root)
+
+%{_bindir}/oprof_start
 
 %changelog
+* Wed Jun 07 2006 Will Cohen <wcohen at redhat.com>
+- Put oprof_start in to oprofile-gui.
+
 * Wed Jun 07 2006 Will Cohen <wcohen at redhat.com> - 0.9.1-10.1.1
 - Bump version and rebuild.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 14:57:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 10:57:50 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia.diff, NONE,
	1.1 kdemultimedia.spec, 1.67, 1.68
Message-ID: <200606261457.k5QEvoMW002303@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2286

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia.diff 
Log Message:
. apply patch to check return value


kdemultimedia.diff:
 cddaslave.c       |    3 +++
 libwm/cddaslave.c |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE kdemultimedia.diff ---
Index: kscd/cddaslave.c
===================================================================
--- kscd/cddaslave.c	(revision 549101)
+++ kscd/cddaslave.c	(working copy)
@@ -418,7 +418,10 @@ main(argc, argv)
 	 * superuser access.
 	 */
 	nice(-14);
+	setgid(getgid());
 	setuid(getuid());
+	if (getuid() != geteuid())
+		return 255;
 
 	FD_ZERO(&dummyfd);
 	FD_ZERO(&readfd);
Index: kscd/libwm/cddaslave.c
===================================================================
--- kscd/libwm/cddaslave.c	(revision 549101)
+++ kscd/libwm/cddaslave.c	(working copy)
@@ -489,7 +489,10 @@ int main(int argc, char **argv)
    * superuser access.
    */
   nice(-14);
+  setgid(getgid());
   setuid(getuid());
+  if (geteuid() != getuid())
+    return 255;
 
   FD_ZERO(&dummyfd);
   FD_ZERO(&readfd);


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdemultimedia.spec	26 Jun 2006 13:10:36 -0000	1.67
+++ kdemultimedia.spec	26 Jun 2006 14:57:48 -0000	1.68
@@ -12,7 +12,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 4
+Release: 5
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -27,6 +27,9 @@
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch4: kdemultimedia-3.5.3-examples.patch
 
+# upstream patches
+Patch100: kdemultimedia.diff
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdebase >= 6:%{version}
@@ -83,6 +86,9 @@
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples
 
+# upstream patches
+%patch100 -p0 -b .setuid-check
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -187,6 +193,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
+- apply patch to check return value
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
 - fix #196605, BR: cdparanoia
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:02:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:02:18 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.ooo65519.printing.samba.patch, NONE, 1.1
Message-ID: <200606261502.k5QF2I3R002454@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2439

Added Files:
	openoffice.org-2.0.3.ooo65519.printing.samba.patch 
Log Message:
samba fix

openoffice.org-2.0.3.ooo65519.printing.samba.patch:
 sfx2/sfx2/source/doc/objmisc.cxx   |    3 +++
 tools/tools/inc/urlobj.hxx         |    6 ++++--
 tools/tools/source/fsys/urlobj.cxx |    6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo65519.printing.samba.patch ---
diff -rup sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx
--- openoffice.orig/sfx2/sfx2/source/doc/objmisc.cxx	2006-05-18 09:48:27.000000000 +0200
+++ openoffice.org/sfx2/sfx2/source/doc/objmisc.cxx	2006-05-18 09:49:19.000000000 +0200
@@ -857,6 +857,9 @@ String SfxObjectShell::GetTitle
 		// ggf. Titel aus Dateiname generieren
 		if ( !pImp->aTitle.Len() )
 			pImp->aTitle = aURL.GetBase();
+
+		if ( !pImp->aTitle.Len() )
+			pImp->aTitle = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
 	}
 
 	// ganzer Titel
diff -rup tools/inc/urlobj.hxx tools/inc/urlobj.hxx
--- openoffice.org.orig/tools/tools/inc/urlobj.hxx	2006-05-18 09:47:10.000000000 +0200
+++ openoffice.org/tools/tools/inc/urlobj.hxx	2006-05-18 09:47:18.000000000 +0200
@@ -105,6 +105,7 @@ namespace com { namespace sun { namespac
 #define INET_DB_SCHEME "db:"
 #define INET_BUGID_SCHEME "bugid:"
 #define INET_TELNET_SCHEME "telnet://"
+#define INET_SAMBA_SCHEME "smb://"
 
 #define URL_PREFIX_PRIV_SOFFICE "private:"
 enum
@@ -162,8 +163,9 @@ enum INetProtocol
     INET_PROT_TELNET = 28,
     INET_PROT_VND_SUN_STAR_EXPAND = 29,
     INET_PROT_VND_SUN_STAR_TDOC = 30,
-    INET_PROT_GENERIC = 31,
-	INET_PROT_END = 32
+	INET_PROT_SAMBA = 31,
+    INET_PROT_GENERIC = 32,
+	INET_PROT_END = 33
 };
 
 //============================================================================
diff -rup tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
--- openoffice.org.orig/tools/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:10.000000000 +0200
+++ openoffice.org/tools/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:18.000000000 +0200
@@ -288,6 +288,8 @@ using namespace com::sun;
    vnd-sun-star-tdoc-url = "VND.SUN.STAR.TDOC:/" segment *("/" segment)
    segment = *pchar
 
+   ; private (http://ubiqx.org/cifs/Appendix-D.html)
+   samba-url = smb://[[[authdomain;]user@]host[:port][/share[/path][/name]]][?context]
 
    ; private
    unknown-url = scheme ":" 1*uric
@@ -452,6 +454,8 @@ static INetURLObject::SchemeInfo const a
 		  false, false, false, false, false },
         { "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false,
           false, false, false, true, false },
+		{ "smb", "smb://", 139, true, true, false, true, true, true, true,
+		  false },
         { "", "", 0, false, false, false, false, false, false, false, false } };
 
 // static
@@ -2086,6 +2090,7 @@ INetURLObject::getPrefix(sal_Unicode con
 			  INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
 			{ "slot:", "staroffice.slot:", INET_PROT_SLOT,
 			  PrefixInfo::INTERNAL },
+			{ "smb:", 0, INET_PROT_SAMBA, PrefixInfo::OFFICIAL },
 			{ "staroffice.component:", ".component:", INET_PROT_COMPONENT,
 			  PrefixInfo::EXTERNAL },
 			{ "staroffice.db:", "db:", INET_PROT_DB, PrefixInfo::EXTERNAL },
@@ -2472,6 +2477,7 @@ bool INetURLObject::parsePath(INetProtoc
 			return false;
 
 		case INET_PROT_FTP:
+		case INET_PROT_SAMBA:
 		case INET_PROT_IMAP:
 			if (pPos < pEnd && *pPos != '/')
 				return false;



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:08:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:08:26 -0400
Subject: rpms/openoffice.org/FC-5 disable-java-applets.diff, NONE,
	1.1 sax+source+expatwrap+xml2utf.cxx.diff, NONE,
	1.1 openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch, 1.2, 1.3
Message-ID: <200606261508.k5QF8Qj1002540@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2514

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch 
Added Files:
	disable-java-applets.diff 
	sax+source+expatwrap+xml2utf.cxx.diff 
Log Message:
port to FC-5

disable-java-applets.diff:
 data/org/openoffice/Office/Common.xcu   |    7 +++++++
 schema/org/openoffice/Office/Common.xcs |    1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE disable-java-applets.diff ---
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/Common.xcu	2004-05-09 11:22:21.000000000 -0400
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Common.xcu	2006-06-26 09:09:33.000000000 -0400
@@ -35,6 +35,13 @@
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
 <oor:component-data oor:name="Common" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <node oor:name="Java">
+   <node oor:name="Applet">
+    <prop oor:name="Enable" oor:type="xs:boolean">
+     <value>false</value>
+    </prop>
+   </node>
+  </node>
   <node oor:name="View">
     <node oor:name="Dialog">
       <prop oor:name="MiddleMouseButton">
--- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2004-04-27 12:35:22.000000000 -0400
+++ openoffice.org/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2006-06-26 09:07:52.000000000 -0400
@@ -7070,7 +7070,6 @@
 						<label xml:lang="af">Words with two initial capital letters - Add automatically</label>
 						<label xml:lang="zu">Words with two initial capital letters - Add automatically</label>
 					</info>
-					<value>true</value>
 				</prop>
 				<prop oor:name="CapitalAtStartSentence" oor:type="xs:boolean">
 					<!-- OldPath: AutoCorrect/Options/All -->

sax+source+expatwrap+xml2utf.cxx.diff:
 xml2utf.cxx |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

--- NEW FILE sax+source+expatwrap+xml2utf.cxx.diff ---
diff -urN -x CVS -x unxlngi6.pro sax/source/expatwrap/xml2utf.cxx sax/source/expatwrap/xml2utf.cxx
--- openoffice.org.orig/sax/source/expatwrap/xml2utf.cxx	2005-09-08 14:05:22.000000000 +0200
+++ openoffice.org/sax/source/expatwrap/xml2utf.cxx	2006-06-22 11:04:22.000000000 +0200
@@ -78,24 +78,26 @@
 				// ensure that enough data is available to parse encoding
 				if( seqStart.getLength() )
 				{
-					seq.realloc( seqStart.getLength() + seq.getLength() );
-					memcpy( (sal_Int8*)seq.getConstArray() + seqStart.getLength() ,
-							seq.getConstArray() ,
-							seq.getLength() );
-					memcpy( (sal_Int8*)seq.getConstArray() ,
-							seqStart.getConstArray(),
-							seqStart.getLength() );
+				  // prefix with what we had so far.
+				  sal_Int32 nLength = seq.getLength();
+				  seq.realloc( seqStart.getLength() + nLength );
+
+				  memmove (seq.getArray() + seqStart.getLength(),
+					   seq.getConstArray(),
+					   nLength);
+				  memcpy  (seq.getArray(),
+					   seqStart.getConstArray(),
+					   seqStart.getLength());
 				}
 
 				// autodetection with the first bytes
 				if( ! isEncodingRecognizable( seq ) )
 				{
-					seqStart.realloc( seqStart.getLength() + seq.getLength() );
-					memcpy( (sal_Int8*)seqStart.getConstArray() + seqStart.getLength(),
-							seq.getConstArray(),
-							seq.getLength());
-					// read more !
-					continue;
+				  // remember what we have so far.
+				  seqStart = seq;
+
+				  // read more !
+				  continue;
 				}
 				if( scanForEncoding( seq ) || m_sEncoding.getLength() ) {
 					// initialize decoding
@@ -291,7 +293,7 @@
 
 		// simply add the byte order mark !
 		seq.realloc( seq.getLength() + 2 );
-		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() );
+		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 );
 		((sal_uInt8*)seq.getArray())[0] = 0xFE;
 		((sal_uInt8*)seq.getArray())[1] = 0xFF;
 
@@ -302,7 +304,7 @@
 		// The byte order mark is simply added
 
 		seq.realloc( seq.getLength() + 2 );
-		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() );
+		memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 );
 		((sal_uInt8*)seq.getArray())[0] = 0xFF;
 		((sal_uInt8*)seq.getArray())[1] = 0xFE;
 
@@ -511,9 +513,7 @@
 		// In general when surrogates are used, they should be rarely
 		// cut off between two convert()-calls. So this code is used
 		// rarely and the extra copy is acceptable.
-		nSourceSize += m_seqSource.getLength();
-
-		puTempMem = new sal_Unicode[ nSourceSize ];
+		puTempMem = new sal_Unicode[ nSourceSize + m_seqSource.getLength()];
 		memcpy( puTempMem ,
 				m_seqSource.getConstArray() ,
 				m_seqSource.getLength() * sizeof( sal_Unicode ) );
@@ -522,6 +522,7 @@
 			puSource ,
 			nSourceSize*sizeof( sal_Unicode ) );
 		puSource = puTempMem;
+		nSourceSize += m_seqSource.getLength();
 
 		m_seqSource = Sequence< sal_Unicode > ();
 	}

openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch:
 inc/objsh.hxx                    |    0 
 sfx2/inc/objsh.hxx               |    1 
 sfx2/source/doc/objmisc.cxx      |   97 +++++++++++++++++++++------------------
 sfx2/source/doc/sfxbasemodel.cxx |    6 ++
 sfx2/source/inc/objshimp.hxx     |    4 +
 source/doc/objmisc.cxx           |    0 
 source/doc/sfxbasemodel.cxx      |    0 
 source/inc/objshimp.hxx          |    0 
 8 files changed, 63 insertions(+), 45 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	9 Jun 2006 12:15:49 -0000	1.2
+++ openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch	26 Jun 2006 15:08:24 -0000	1.3
@@ -1,23 +1,49 @@
-Index: objmisc.cxx
+Index: inc/objsh.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/objsh.hxx,v
+retrieving revision 1.65
+diff -u -p -r1.65 objsh.hxx
+--- openoffice.org.orig/sfx2/inc/objsh.hxx	2 May 2006 16:01:46 -0000	1.65
++++ openoffice.org/sfx2/inc/objsh.hxx	15 Jun 2006 12:12:47 -0000
+@@ -714,6 +714,7 @@ public:
+ 					const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ 
+ 	SAL_DLLPRIVATE void InitOwnModel_Impl();
++	SAL_DLLPRIVATE void BreakMacroSign_Impl( sal_Bool bBreakMacroSing );
+ 	SAL_DLLPRIVATE void CheckMacrosOnLoading_Impl();
+ 
+ 	SAL_DLLPRIVATE static SEQUENCE< OUSTRING > GetEventNames_Impl();
+Index: source/doc/objmisc.cxx
 ===================================================================
 RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v
 retrieving revision 1.78
 diff -u -p -r1.78 objmisc.cxx
 --- openoffice.org.orig/sfx2/source/doc/objmisc.cxx	2 May 2006 16:43:29 -0000	1.78
-+++ openoffice.org/sfx2/source/doc/objmisc.cxx	9 Jun 2006 08:38:15 -0000
-@@ -1054,37 +1054,23 @@
++++ openoffice.org/sfx2/source/doc/objmisc.cxx	15 Jun 2006 12:15:02 -0000
+@@ -1039,6 +1039,12 @@
+ }
+ 
+ //-------------------------------------------------------------------------
++void SfxObjectShell::BreakMacroSign_Impl( sal_Bool bBreakMacroSign )
++{
++	pImp->m_bMacroSignBroken = bBreakMacroSign;
++}
++
++//-------------------------------------------------------------------------
+ void SfxObjectShell::CheckMacrosOnLoading_Impl()
+ {
+ 	const SfxFilter* pFilter = pMedium->GetFilter();
+@@ -1053,35 +1059,24 @@
  		pImp->bMacroDisabled = sal_True;
  		pImp->nMacroMode = MacroExecMode::NEVER_EXECUTE;
  	}
 -	else if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
-+	else
- 	{
+-	{
 -		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
 -		if ( xStorage.is() )
 -		{
 -			BOOL bHasMacros = StorageHasMacros( xStorage );
-+		sal_Bool bHasMacros = sal_False;
- 
+-
 -			if ( bHasMacros )
 -			{
 -				AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
@@ -33,30 +59,47 @@
 -				// if macros will be added by the user later, the security check is obsolete
 -				pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
 -			}
-+		if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
-+		{
-+			uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
-+			if ( xStorage.is() )
-+				bHasMacros = StorageHasMacros( xStorage );
-+			else
-+				SetError( ERRCODE_IO_GENERAL );
- 		}
+-		}
 -		else
 -			SetError( ERRCODE_IO_GENERAL );
 -	}
--	else
--	{
+ 	else
+ 	{
 -		if ( HasMacrosLib_Impl() )
-+		if ( !bHasMacros )
-+			bHasMacros = HasMacrosLib_Impl();
-+
-+		if ( bHasMacros )
++		uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
++                sal_Bool bHasMacros = sal_False;
++ 
++                if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
++                {
++                        uno::Reference< embed::XStorage > xStorage = pMedium->GetStorage();
++                        if ( xStorage.is() )
++                                bHasMacros = StorageHasMacros( xStorage );
++                        else
++                                SetError( ERRCODE_IO_GENERAL );
++		}
++ 
++                if ( !bHasMacros )
++                        bHasMacros = HasMacrosLib_Impl();
++ 
++                if ( bHasMacros )
  		{
--			// no signing in alien formats!
+ 			// no signing in alien formats!
  			AdjustMacroMode( String() ); // if macros are disabled the message will be shown here
- 			if ( SvtSecurityOptions().GetMacroSecurityLevel() >= 2
- 			  && MacroExecMode::NEVER_EXECUTE == pImp->nMacroMode )
-@@ -2245,23 +2231,30 @@
+@@ -1968,6 +1963,13 @@
+ 	    	::com::sun::star::uno::Sequence< security::DocumentSignatureInformation > aScriptingSignatureInformations;
+             uno::Reference < embed::XStorage > xStore = GetMedium()->GetLastCommitReadStorage_Impl();
+ 	    	sal_uInt16 nSignatureState = GetScriptingSignatureState();
++
++            if ( nSignatureState != SIGNATURESTATE_NOSIGNATURES && pImp->m_bMacroSignBroken )
++			{
++				// if there is a macro signature it must be handled as broken
++	    		nSignatureState = SIGNATURESTATE_SIGNATURES_BROKEN;
++			}
++			
+ 	    	if ( nSignatureState == SIGNATURESTATE_SIGNATURES_BROKEN )
+ 	    	{
+ 				if ( pImp->nMacroMode != MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN )
+@@ -2244,23 +2246,30 @@
          if ( bHasMacros )
          {
              // a library container exists; check if it's empty
@@ -104,3 +147,48 @@
      }
      catch( uno::Exception& )
      {
+Index: source/inc/objshimp.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/inc/objshimp.hxx,v
+retrieving revision 1.29
+diff -u -r1.29 objshimp.hxx
+--- openoffice.org.orig/sfx2/source/inc/objshimp.hxx	11 Nov 2005 12:24:06 -0000	1.29
++++ openoffice.org/sfx2/source/inc/objshimp.hxx	26 Jun 2006 14:37:46 -0000
+@@ -112,7 +112,8 @@
+                         bInitialized:1,
+                         bSignatureErrorIsShown:1,
+                         bModelInitialized:1, // whether the related model is initialized
+-                        bPreserveVersions:1;
++                        bPreserveVersions:1,
++						m_bMacroSignBroken:1; // whether the macro signature was explicitly broken
+ 
+ 	String              aNewName;  // Der Name, unter dem das Doc gespeichert
+ 								   // werden soll
+@@ -219,6 +220,7 @@
+         bLoadingWindows( sal_False ),
+         bPreserveVersions( sal_True )
+         //, bHidden( sal_False )
++	, m_bMacroSignBroken( sal_False )
+ 		, nStyleFilter( 0 )
+         , nMacroMode( -1 )
+ 		, bDisposing( sal_False )
+Index: source/doc/sfxbasemodel.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/doc/sfxbasemodel.cxx,v
+retrieving revision 1.110
+diff -u -p -r1.110 sfxbasemodel.cxx
+--- openoffice.org.orig/sfx2/source/doc/sfxbasemodel.cxx	2 May 2006 16:45:09 -0000	1.110
++++ openoffice.org/sfx2/source/doc/sfxbasemodel.cxx	15 Jun 2006 12:15:21 -0000
+@@ -1182,6 +1182,12 @@ sal_Bool SAL_CALL SfxBaseModel::attachRe
+                     m_pData->m_pObjectShell->SetVisArea( aTmpRect );
+                 }
+ 			}
++			else if ( rArgs[nInd].Name.equalsAscii( "BreakMacroSignature" ) )
++			{
++				sal_Bool bBreakMacroSign = sal_False;
++				rArgs[nInd].Value >>= bBreakMacroSign;
++				m_pData->m_pObjectShell->BreakMacroSign_Impl( bBreakMacroSign );
++			}
+ 			else if ( !rArgs[nInd].Name.equalsAscii( "Stream" ) && !rArgs[nInd].Name.equalsAscii( "InputStream" ) )
+ 			{
+ 				// TODO/LATER: all the parameters that are accepted by ItemSet of the DocShell must be ignored here



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:09:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:09:15 -0400
Subject: rpms/SDL/devel SDL.spec,1.42,1.43
Message-ID: <200606261509.k5QF9F2e002593@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2580

Modified Files:
	SDL.spec 
Log Message:
fix X related buildreqs (#195398)



Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- SDL.spec	6 Jun 2006 08:41:48 -0000	1.42
+++ SDL.spec	26 Jun 2006 15:09:12 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 2
+Release: 3
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -14,7 +14,8 @@
 BuildRequires: nasm arts-devel audiofile-devel
 BuildRequires: esound-devel alsa-lib-devel
 BuildRequires: libXext-devel libX11-devel
-BuildRequires: mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires: libXt-devel libXrender-devel libXrandr-devel
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -99,6 +100,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Mon Jun 26 2006 Warren Togami <wtogami at redhat.com> 1.2.10-3
+- fix X related buildreqs (#195398)
+
 * Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-2
 - added missing (build) requires for GL and GLU
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:12:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:12:57 -0400
Subject: rpms/kdemultimedia/FC-4 kdemultimedia.diff, NONE,
	1.1 kdemultimedia.spec, 1.51, 1.52
Message-ID: <200606261512.k5QFCvTQ014327@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14141

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia.diff 
Log Message:
- apply patch to check return value


kdemultimedia.diff:
 cddaslave.c       |    3 +++
 libwm/cddaslave.c |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE kdemultimedia.diff ---
Index: kscd/cddaslave.c
===================================================================
--- kscd/cddaslave.c	(revision 549101)
+++ kscd/cddaslave.c	(working copy)
@@ -418,7 +418,10 @@ main(argc, argv)
 	 * superuser access.
 	 */
 	nice(-14);
+	setgid(getgid());
 	setuid(getuid());
+	if (getuid() != geteuid())
+		return 255;
 
 	FD_ZERO(&dummyfd);
 	FD_ZERO(&readfd);
Index: kscd/libwm/cddaslave.c
===================================================================
--- kscd/libwm/cddaslave.c	(revision 549101)
+++ kscd/libwm/cddaslave.c	(working copy)
@@ -489,7 +489,10 @@ int main(int argc, char **argv)
    * superuser access.
    */
   nice(-14);
+  setgid(getgid());
   setuid(getuid());
+  if (geteuid() != getuid())
+    return 255;
 
   FD_ZERO(&dummyfd);
   FD_ZERO(&readfd);


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdemultimedia.spec	26 Jun 2006 11:59:11 -0000	1.51
+++ kdemultimedia.spec	26 Jun 2006 15:12:54 -0000	1.52
@@ -39,6 +39,9 @@
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
+# upstream patches
+Patch100: kdemultimedia.diff
+
 Prereq: /sbin/ldconfig
 
 Requires: kdelibs >= 6:%{version}
@@ -105,6 +108,9 @@
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
+# upstream patches
+%patch100 -p0 -b .setuid-check
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:14:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:14:55 -0400
Subject: rpms/evolution/devel
	evolution-2.7.3-candidate-window-position.patch, NONE,
	1.1 evolution.spec, 1.154, 1.155
Message-ID: <200606261514.k5QFEtxu015251@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15130

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-candidate-window-position.patch 
Log Message:
- Add patch for RH bug #157505 for QE testing.


evolution-2.7.3-candidate-window-position.patch:
 e-text.c |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 e-text.h |    6 ++++-
 2 files changed, 75 insertions(+), 4 deletions(-)

--- NEW FILE evolution-2.7.3-candidate-window-position.patch ---
diff -uNrp evolution.orig/widgets/text/e-text.c evolution/widgets/text/e-text.c
--- evolution.orig/widgets/text/e-text.c	2006-06-20 18:52:39.000000000 +0530
+++ evolution/widgets/text/e-text.c	2006-06-20 18:58:17.000000000 +0530
@@ -132,6 +132,11 @@ static void e_text_insert(EText *text, c
 
 static void reset_layout_attrs (EText *text);
 
+// for positioning preedit candidate selection window
+void e_text_get_cursor_locations (EText *text, GdkRectangle *strong_pos, GdkRectangle *weak_pos);
+void update_im_cursor_position (EText *text);
+
+
 #if 0
 /* GtkEditable Methods */
 static void e_text_editable_do_insert_text (GtkEditable    *editable,
@@ -324,6 +329,9 @@ insert_preedit_text (EText *text)
 			pango_layout_set_attributes (text->layout, attrs);
 			pango_attr_list_unref (attrs);
 		}
+		
+		// update im cursor position for candidate selection
+		update_im_cursor_position (text);
 	}
 
 	if (preedit_string)
@@ -2195,6 +2203,8 @@ e_text_event (GnomeCanvasItem *item, Gdk
 			   	 * handlers connect to  multiple e-texts but with subsequent commit these 
 				 * should go away.
 				 */
+				if(text->im_context)
+					gtk_im_context_focus_in(text->im_context);
 
 				if (save_text && save_text->im_context) {
 					g_signal_handlers_disconnect_matched (save_text->im_context,
@@ -3721,6 +3731,8 @@ e_text_init (EText *text)
 	text->text                    = e_text_model_get_text (text->model);
 	text->preedit_len	      = 0;
 	text->layout                  = NULL;
+	
+	text->preedit_pos	      = 0;
 
 	text->revert                  = NULL;
 
@@ -3842,11 +3854,16 @@ e_text_preedit_changed_cb (GtkIMContext 
 				EText        *etext)
 {
 	gchar *preedit_string = NULL;
+	gint cursor_pos;
 
-	gtk_im_context_get_preedit_string (context, &preedit_string, 
-					NULL, NULL);
-
+	/* get the cursor position for the preedit string */
+	gtk_im_context_get_preedit_string (context, &preedit_string, NULL, &cursor_pos);
 	etext->preedit_len = strlen (preedit_string);
+	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+	etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
+	
+	if(preedit_string)
+		g_free (preedit_string);
 
 	g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
 }
@@ -3875,3 +3892,53 @@ e_text_delete_surrounding_cb   (GtkIMCon
 
 	return TRUE;
 }
+
+
+/* Fetch cursor location into Strong or Weak positions so as to
+   display the preedit candidate selection window in the right place */
+ void e_text_get_cursor_locations (EText *text, GdkRectangle *strong_pos, GdkRectangle *weak_pos)
+{
+	GtkLayout *layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (text)->canvas);
+	GtkAdjustment *vadj, *hadj;
+	double x1, y1, x2, y2;
+	PangoRectangle pango_strong_pos;
+	PangoRectangle pango_weak_pos;
+	int x, y;
+	gint index;
+
+	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, &x2, &y2);
+
+	vadj = gtk_layout_get_vadjustment (layout);
+	hadj = gtk_layout_get_hadjustment (layout);
+	x = gtk_adjustment_get_value (hadj);
+	y = gtk_adjustment_get_value (vadj);
+
+	index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
+
+	pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos, &pango_strong_pos, &pango_weak_pos);
+
+	/* get the position for the candidate window */
+	if (strong_pos) {
+		strong_pos->x = x1 - x + pango_strong_pos.x / PANGO_SCALE;
+		strong_pos->y = y1 - y + pango_strong_pos.y / PANGO_SCALE;
+		strong_pos->width = 0;
+		strong_pos->height = pango_strong_pos.height / PANGO_SCALE;
+	}
+
+	if (weak_pos) {
+		weak_pos->x = x1 - x + pango_weak_pos.x / PANGO_SCALE;
+		weak_pos->y = y1 - y + pango_weak_pos.y / PANGO_SCALE;
+		weak_pos->width = 0;
+		weak_pos->height = pango_weak_pos.height / PANGO_SCALE;
+	}
+}
+
+
+/* Update IM's cursor position to display candidate selection window */
+void update_im_cursor_position (EText *text)
+{
+	GdkRectangle area;
+	
+	e_text_get_cursor_locations (text, &area, NULL);
+	gtk_im_context_set_cursor_location (text->im_context, &area);
+}
diff -uNrp evolution.orig/widgets/text/e-text.h evolution/widgets/text/e-text.h
--- evolution.orig/widgets/text/e-text.h	2006-06-20 18:46:54.000000000 +0530
+++ evolution/widgets/text/e-text.h	2006-06-20 18:46:07.000000000 +0530
@@ -107,8 +107,12 @@ struct _EText {
 	gint model_changed_signal_id;
 	gint model_repos_signal_id;
 
-	const gchar *text;              /* Text to display --- from the ETextModel */
+	const gchar *text;          /* Text to display --- from the ETextModel */
 	gint preedit_len;      		/* preedit length to display */
+	
+	gint preedit_pos;      		/* preedit window cursor position */
+	
+	
 	PangoLayout *layout;
 	int num_lines;			/* Number of lines of text */
 


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- evolution.spec	22 Jun 2006 17:40:54 -0000	1.154
+++ evolution.spec	26 Jun 2006 15:14:52 -0000	1.155
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -119,6 +119,9 @@
 # Gnome.org #345677
 Patch901: evolution-2.7.3-no-boolean-in-schemas.patch
 
+# RH bug #157505
+Patch902: evolution-2.7.3-candidate-window-position.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -272,6 +275,7 @@
 
 %patch900 -p1 -b .quit-resize-crash
 %patch901 -p1 -b .no-boolean-in-schemas
+%patch902 -p1 -b .candidate-window-position
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -662,6 +666,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Jun 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-4
+- Add patch for RH bug #157505 for QE testing.
+
 * Thu Jun 22 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-3
 - Fix bad type in schema file (Gnome.org #345677).
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:09 -0400
Subject: rpms/vim/FC-5 7.0.023,NONE,1.1
Message-ID: <200606261515.k5QFF96G015361@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15334

Added Files:
	7.0.023 
Log Message:
- patchlevel 23


--- NEW FILE 7.0.023 ---
To: vim-dev at vim.org
Subject: Patch 7.0.023
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.023
Problem:    Crash when doing spell completion in an empty line and pressing
	    CTRL-E.
Solution:   Check for a zero pointer. (James Vega)
	    Also handle a situation without a matching pattern better, report
	    "No matches" instead of remaining in undefined CTRL-X mode.  And
	    get out of CTRL-X mode when typing a letter.
Files:	    src/edit.c


*** ../vim-7.0.022/src/edit.c	Sat May 13 15:27:57 2006
--- src/edit.c	Thu Jun 22 16:44:01 2006
***************
*** 719,727 ****
  #ifdef FEAT_INS_EXPAND
  	/*
  	 * Special handling of keys while the popup menu is visible or wanted
! 	 * and the cursor is still in the completed word.
  	 */
! 	if (compl_started && pum_wanted() && curwin->w_cursor.col >= compl_col)
  	{
  	    /* BS: Delete one character from "compl_leader". */
  	    if ((c == K_BS || c == Ctrl_H)
--- 721,734 ----
  #ifdef FEAT_INS_EXPAND
  	/*
  	 * Special handling of keys while the popup menu is visible or wanted
! 	 * and the cursor is still in the completed word.  Only when there is
! 	 * a match, skip this when no matches were found.
  	 */
! 	if (compl_started
! 		&& pum_wanted()
! 		&& curwin->w_cursor.col >= compl_col
! 		&& (compl_shown_match == NULL
! 		    || compl_shown_match != compl_shown_match->cp_next))
  	{
  	    /* BS: Delete one character from "compl_leader". */
  	    if ((c == K_BS || c == Ctrl_H)
***************
*** 3393,3408 ****
  		    ptr = compl_leader;
  		else
  		    ptr = compl_orig_text;
! 		p = compl_orig_text;
! 		for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
! 		    ;
  #ifdef FEAT_MBYTE
! 		if (temp > 0)
! 		    temp -= (*mb_head_off)(compl_orig_text, p + temp);
  #endif
! 		for (p += temp; *p != NUL; mb_ptr_adv(p))
! 		    AppendCharToRedobuff(K_BS);
! 		AppendToRedobuffLit(ptr + temp, -1);
  	    }
  
  #ifdef FEAT_CINDENT
--- 3401,3421 ----
  		    ptr = compl_leader;
  		else
  		    ptr = compl_orig_text;
! 		if (compl_orig_text != NULL)
! 		{
! 		    p = compl_orig_text;
! 		    for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp];
! 								       ++temp)
! 			;
  #ifdef FEAT_MBYTE
! 		    if (temp > 0)
! 			temp -= (*mb_head_off)(compl_orig_text, p + temp);
  #endif
! 		    for (p += temp; *p != NUL; mb_ptr_adv(p))
! 			AppendCharToRedobuff(K_BS);
! 		}
! 		if (ptr != NULL)
! 		    AppendToRedobuffLit(ptr + temp, -1);
  	    }
  
  #ifdef FEAT_CINDENT
***************
*** 4650,4659 ****
  				     (int)STRLEN(compl_pattern), curs_col);
  	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
  		    || compl_xp.xp_context == EXPAND_NOTHING)
! 		return FAIL;
! 	    startcol = (int)(compl_xp.xp_pattern - compl_pattern);
! 	    compl_col = startcol;
! 	    compl_length = curs_col - startcol;
  	}
  	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
  	{
--- 4663,4680 ----
  				     (int)STRLEN(compl_pattern), curs_col);
  	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
  		    || compl_xp.xp_context == EXPAND_NOTHING)
! 	    {
! 		compl_col = curs_col;
! 		compl_length = 0;
! 		vim_free(compl_pattern);
! 		compl_pattern = NULL;
! 	    }
! 	    else
! 	    {
! 		startcol = (int)(compl_xp.xp_pattern - compl_pattern);
! 		compl_col = startcol;
! 		compl_length = curs_col - startcol;
! 	    }
  	}
  	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
  	{
***************
*** 4707,4717 ****
  	    else
  		compl_col = spell_word_start(startcol);
  	    if (compl_col >= (colnr_T)startcol)
! 		return FAIL;
! 	    spell_expand_check_cap(compl_col);
  	    /* Need to obtain "line" again, it may have become invalid. */
  	    line = ml_get(curwin->w_cursor.lnum);
- 	    compl_length = (int)curs_col - compl_col;
  	    compl_pattern = vim_strnsave(line + compl_col, compl_length);
  	    if (compl_pattern == NULL)
  #endif
--- 4728,4744 ----
  	    else
  		compl_col = spell_word_start(startcol);
  	    if (compl_col >= (colnr_T)startcol)
! 	    {
! 		compl_length = 0;
! 		compl_col = curs_col;
! 	    }
! 	    else
! 	    {
! 		spell_expand_check_cap(compl_col);
! 		compl_length = (int)curs_col - compl_col;
! 	    }
  	    /* Need to obtain "line" again, it may have become invalid. */
  	    line = ml_get(curwin->w_cursor.lnum);
  	    compl_pattern = vim_strnsave(line + compl_col, compl_length);
  	    if (compl_pattern == NULL)
  #endif
*** ../vim-7.0.022/src/version.c	Tue Jun 20 21:08:02 2006
--- src/version.c	Thu Jun 22 16:34:42 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     23,
  /**/

-- 
BEDEVERE: Look!  It's the old man from scene 24 - what's he Doing here?
ARTHUR:   He is the keeper of the Bridge.  He asks each traveler five
          questions ...
GALAHAD:  Three questions.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:16 -0400
Subject: rpms/vim/FC-5 7.0.024,NONE,1.1
Message-ID: <200606261515.k5QFFGVd015455@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15424

Added Files:
	7.0.024 
Log Message:
- patchlevel 24


--- NEW FILE 7.0.024 ---
To: vim-dev at vim.org
Subject: Patch 7.0.024
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.024
Problem:    It is possible to set arbitrary "v:" variables.
Solution:   Disallow setting "v:" variables that are not predefined.
Files:	    src/eval.c


*** ../vim-7.0.023/src/eval.c	Sat May 13 13:36:47 2006
--- src/eval.c	Thu Jun 22 17:27:51 2006
***************
*** 17759,17764 ****
--- 17763,17775 ----
      }
      else		    /* add a new variable */
      {
+ 	/* Can't add "v:" variable. */
+ 	if (ht == &vimvarht)
+ 	{
+ 	    EMSG2(_(e_illvar), name);
+ 	    return;
+ 	}
+ 
  	/* Make sure the variable name is valid. */
  	for (p = varname; *p != NUL; ++p)
  	    if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
*** ../vim-7.0.023/src/version.c	Thu Jun 22 16:48:43 2006
--- src/version.c	Thu Jun 22 17:30:59 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     24,
  /**/

-- 
ARTHUR:  No, hang on!  Just answer the five questions ...
GALAHAD: Three questions ...
ARTHUR:  Three questions ...  And we shall watch ... and pray.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:23 -0400
Subject: rpms/vim/FC-5 7.0.025,NONE,1.1
Message-ID: <200606261515.k5QFFNvY015514@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15478

Added Files:
	7.0.025 
Log Message:
- patchlevel 25


--- NEW FILE 7.0.025 ---
To: vim-dev at vim.org
Subject: Patch 7.0.025
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.025
Problem:    Crash when removing an element of a:000.  (Nikolai Weibull)
Solution:   Mark the a:000 list with VAR_FIXED.
Files:	    src/eval.c


*** ../vim-7.0.024/src/eval.c	Thu Jun 22 17:33:49 2006
--- src/eval.c	Thu Jun 22 17:56:50 2006
***************
*** 13250,13256 ****
  	if (argvars[2].v_type != VAR_UNKNOWN)
  	    EMSG2(_(e_toomanyarg), "remove()");
  	else if ((d = argvars[0].vval.v_dict) != NULL
! 		&& !tv_check_lock(d->dv_lock, (char_u *)"remove()"))
  	{
  	    key = get_tv_string_chk(&argvars[1]);
  	    if (key != NULL)
--- 13254,13260 ----
  	if (argvars[2].v_type != VAR_UNKNOWN)
  	    EMSG2(_(e_toomanyarg), "remove()");
  	else if ((d = argvars[0].vval.v_dict) != NULL
! 		&& !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
  	{
  	    key = get_tv_string_chk(&argvars[1]);
  	    if (key != NULL)
***************
*** 13270,13276 ****
      else if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listdictarg), "remove()");
      else if ((l = argvars[0].vval.v_list) != NULL
! 	    && !tv_check_lock(l->lv_lock, (char_u *)"remove()"))
      {
  	int	    error = FALSE;
  
--- 13274,13280 ----
      else if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listdictarg), "remove()");
      else if ((l = argvars[0].vval.v_list) != NULL
! 	    && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
      {
  	int	    error = FALSE;
  
***************
*** 19693,19698 ****
--- 19697,19703 ----
      v->di_tv.vval.v_list = &fc.l_varlist;
      vim_memset(&fc.l_varlist, 0, sizeof(list_T));
      fc.l_varlist.lv_refcount = 99999;
+     fc.l_varlist.lv_lock = VAR_FIXED;
  
      /*
       * Set a:firstline to "firstline" and a:lastline to "lastline".
*** ../vim-7.0.024/src/version.c	Thu Jun 22 17:33:49 2006
--- src/version.c	Thu Jun 22 17:59:17 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     25,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
GAWAIN:       Blue ...  No yelloooooww!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:25 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.166,1.167
Message-ID: <200606261515.k5QFFPpU015526@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15493

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- cman-kernel.spec	22 May 2006 18:50:44 -0000	1.166
+++ cman-kernel.spec	26 Jun 2006 15:15:22 -0000	1.167
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.21
+Release: 0.FC5.22
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:35 -0400
Subject: rpms/vim/FC-5 7.0.026,NONE,1.1
Message-ID: <200606261515.k5QFFZYS015615@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15556

Added Files:
	7.0.026 
Log Message:
- patchlevel 26


--- NEW FILE 7.0.026 ---
To: vim-dev at vim.org
Subject: Patch 7.0.026
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.026
Problem:    Using libcall() may show an old error.
Solution:   Invoke dlerror() to clear a previous error. (Yukihiro Nakadaira)
Files:      src/os_unix.c


*** ../vim-7.0.025/src/os_unix.c	Wed May  3 00:01:30 2006
--- src/os_unix.c	Sat Jun 17 21:00:14 2006
***************
*** 5757,5764 ****
      int		retval_int = 0;
      int		success = FALSE;
  
!     /* Get a handle to the DLL module. */
  # if defined(USE_DLOPEN)
      hinstLib = dlopen((char *)libname, RTLD_LAZY
  #  ifdef RTLD_LOCAL
  	    | RTLD_LOCAL
--- 5758,5770 ----
      int		retval_int = 0;
      int		success = FALSE;
  
!     /*
!      * Get a handle to the DLL module.
!      */
  # if defined(USE_DLOPEN)
+     /* First clear any error, it's not cleared by the dlopen() call. */
+     (void)dlerror();
+ 
      hinstLib = dlopen((char *)libname, RTLD_LAZY
  #  ifdef RTLD_LOCAL
  	    | RTLD_LOCAL
*** ../vim-7.0.025/src/version.c	Thu Jun 22 18:02:06 2006
--- src/version.c	Thu Jun 22 18:05:10 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     26,
  /**/

-- 
BRIDGEKEEPER: What is your favorite editor?
GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:46 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.159,1.160
Message-ID: <200606261515.k5QFFkK4015682@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15652

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gnbd-kernel.spec	22 May 2006 18:50:56 -0000	1.159
+++ gnbd-kernel.spec	26 Jun 2006 15:15:43 -0000	1.160
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.28
+Release: 5.FC5.29
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:15:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:15:46 -0400
Subject: rpms/vim/FC-5 7.0.027,NONE,1.1
Message-ID: <200606261515.k5QFFkZd015692@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15651

Added Files:
	7.0.027 
Log Message:
- patchlevel 27


--- NEW FILE 7.0.027 ---
To: vim-dev at vim.org
Subject: Patch 7.0.027 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.027 (extra)
Problem:    Win32: When compiled with SNIFF gvim may hang on exit.
Solution:   Translate and dispatch the WM_USER message. (Mathias Michaelis)
Files:	    src/gui_w48.c


*** ../vim-7.0.026/src/gui_w48.c	Thu Apr 27 01:52:16 2006
--- src/gui_w48.c	Sat Jun 17 13:23:26 2006
***************
*** 1664,1670 ****
--- 1664,1674 ----
  	/* request is handled in normal.c */
      }
      if (msg.message == WM_USER)
+     {
+ 	MyTranslateMessage(&msg)
+ 	DispatchMessage(&msg);
  	return;
+     }
  #endif
  
  #ifdef MSWIN_FIND_REPLACE
*** ../vim-7.0.026/src/version.c	Thu Jun 22 18:06:48 2006
--- src/version.c	Thu Jun 22 18:20:40 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     27,
  /**/

-- 
SIGFUN -- signature too funny (core dumped)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:00 -0400
Subject: rpms/vim/FC-5 7.0.028,NONE,1.1
Message-ID: <200606261516.k5QFG0eC016167@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15846

Added Files:
	7.0.028 
Log Message:
- patchlevel 28


--- NEW FILE 7.0.028 ---
To: vim-dev at vim.org
Subject: Patch 7.0.028 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.028 (extra)
Problem:    OS/2: Vim doesn't compile with gcc 3.2.1.
Solution:   Add argument to after_pathsep(), don't define vim_handle_signal(),
	    define HAVE_STDARG_H. (David Sanders)
Files:	    src/os_unix.c, src/vim.h, src/os_os2_cfg.h


*** ../vim-7.0.027/src/os_unix.c	Thu Jun 22 18:06:48 2006
--- src/os_unix.c	Sat Jun 17 21:00:14 2006
***************
*** 4971,4977 ****
  		    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
  		    {
  			STRCPY((*file)[*num_file], p);
! 			if (!after_pathsep((*file)[*num_file] + len))
  			{
  			    (*file)[*num_file][len] = psepc;
  			    (*file)[*num_file][len + 1] = NUL;
--- 4971,4978 ----
  		    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
  		    {
  			STRCPY((*file)[*num_file], p);
! 			if (!after_pathsep((*file)[*num_file],
! 						    (*file)[*num_file] + len))
  			{
  			    (*file)[*num_file][len] = psepc;
  			    (*file)[*num_file][len + 1] = NUL;
*** ../vim-7.0.027/src/vim.h	Sun Apr 30 20:27:22 2006
--- src/vim.h	Sat Jun 17 20:59:31 2006
***************
*** 1983,1989 ****
  /* values for vim_handle_signal() that are not a signal */
  #define SIGNAL_BLOCK	-1
  #define SIGNAL_UNBLOCK  -2
! #if !defined(UNIX) && !defined(VMS)
  # define vim_handle_signal(x) 0
  #endif
  
--- 1983,1989 ----
  /* values for vim_handle_signal() that are not a signal */
  #define SIGNAL_BLOCK	-1
  #define SIGNAL_UNBLOCK  -2
! #if !defined(UNIX) && !defined(VMS) && !defined(OS2)
  # define vim_handle_signal(x) 0
  #endif
  
*** ../vim-7.0.027/src/os_os2_cfg.h	Sun Jun 13 18:47:02 2004
--- src/os_os2_cfg.h	Sat Jun 17 20:58:56 2006
***************
*** 183,188 ****
--- 183,191 ----
  /* Define if you have the ANSI C header files. */
  /* #undef STDC_HEADERS */
  
+ /* added by David Sanders */
+ #define HAVE_STDARG_H 1
+ 
  /* instead, we check a few STDC things ourselves */
  #define HAVE_STDLIB_H	1
  #undef HAVE_STRING_H	/* On EMX it is better to use strings.h */
*** ../vim-7.0.027/src/version.c	Thu Jun 22 19:34:23 2006
--- src/version.c	Thu Jun 22 19:41:06 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     28,
  /**/

-- 
BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
ARTHUR:       What do you mean?  An African or European swallow?
BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
   BRIDGEKEEPER is cast into the gorge.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:12 -0400
Subject: rpms/vim/FC-5 7.0.029,NONE,1.1
Message-ID: <200606261516.k5QFGCcx017330@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16395

Added Files:
	7.0.029 
Log Message:
- patchlevel 29


--- NEW FILE 7.0.029 ---
To: vim-dev at vim.org
Subject: Patch 7.0.029
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.029
Problem:    getchar() may not position the cursor after a space.
Solution:   Position the cursor explicitly.
Files:	    src/eval.c


*** ../vim-7.0.028/src/eval.c	Thu Jun 22 18:02:06 2006
--- src/eval.c	Thu Jun 22 21:00:00 2006
***************
*** 9792,9797 ****
--- 9792,9800 ----
      varnumber_T		n;
      int			error = FALSE;
  
+     /* Position the cursor.  Needed after a message that ends in a space. */
+     windgoto(msg_row, msg_col);
+ 
      ++no_mapping;
      ++allow_keys;
      if (argvars[0].v_type == VAR_UNKNOWN)
*** ../vim-7.0.028/src/version.c	Thu Jun 22 19:47:11 2006
--- src/version.c	Thu Jun 22 20:55:43 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     29,
  /**/

-- 
BEDEVERE: How do you know so much about swallows?
ARTHUR:   Well you have to know these things when you're a king, you know.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:16 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.136,1.137
Message-ID: <200606261516.k5QFGFKi017395@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17256

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- dlm-kernel.spec	22 May 2006 18:51:09 -0000	1.136
+++ dlm-kernel.spec	26 Jun 2006 15:16:12 -0000	1.137
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.19
+Release: 0.FC5.20
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:25 -0400
Subject: rpms/vim/FC-5 7.0.030,NONE,1.1
Message-ID: <200606261516.k5QFGPht018539@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17438

Added Files:
	7.0.030 
Log Message:
- patchlevel 30


--- NEW FILE 7.0.030 ---
To: vim-dev at vim.org
Subject: Patch 7.0.030
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.030
Problem:    The ":compiler" command can't be used in a FileChangedRO event.
	    (Hari Krishna Dara)
Solution:   Add the CMDWIN flag to the ":compiler" command.
Files:	    src/ex_cmds.h


*** ../vim-7.0.029/src/ex_cmds.h	Fri Apr  7 23:40:07 2006
--- src/ex_cmds.h	Sun Jun 18 22:44:01 2006
***************
*** 262,268 ****
  EX(CMD_comclear,	"comclear",	ex_comclear,
  			TRLBAR|CMDWIN),
  EX(CMD_compiler,	"compiler",	ex_compiler,
! 			BANG|TRLBAR|WORD1),
  EX(CMD_continue,	"continue",	ex_continue,
  			TRLBAR|SBOXOK|CMDWIN),
  EX(CMD_confirm,		"confirm",	ex_wrongmodifier,
--- 262,268 ----
  EX(CMD_comclear,	"comclear",	ex_comclear,
  			TRLBAR|CMDWIN),
  EX(CMD_compiler,	"compiler",	ex_compiler,
! 			BANG|TRLBAR|WORD1|CMDWIN),
  EX(CMD_continue,	"continue",	ex_continue,
  			TRLBAR|SBOXOK|CMDWIN),
  EX(CMD_confirm,		"confirm",	ex_wrongmodifier,
*** ../vim-7.0.029/src/version.c	Thu Jun 22 21:01:19 2006
--- src/version.c	Thu Jun 22 21:08:12 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     30,
  /**/

-- 
Every person is responsible for the choices he makes.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:34 -0400
Subject: rpms/vim/FC-5 7.0.031,NONE,1.1
Message-ID: <200606261516.k5QFGYKS019039@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18775

Added Files:
	7.0.031 
Log Message:
- patchlevel 31


--- NEW FILE 7.0.031 ---
To: vim-dev at vim.org
Subject: Patch 7.0.031
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.031
Problem:    When deleting a buffer the buffer-local mappings for Select mode
	    remain.
Solution:   Add the Select mode bit to MAP_ALL_MODES. (Edwin Steiner)
Files:	    src/vim.h


*** ../vim-7.0.030/src/vim.h	Thu Jun 22 19:47:11 2006
--- src/vim.h	Fri Jun 23 16:29:03 2006
***************
*** 585,591 ****
  #define INSERT		0x10	/* Insert mode */
  #define LANGMAP		0x20	/* Language mapping, can be combined with
  				   INSERT and CMDLINE */
- #define MAP_ALL_MODES	0x3f	/* all mode bits used for mapping */
  
  #define REPLACE_FLAG	0x40	/* Replace mode flag */
  #define REPLACE		(REPLACE_FLAG + INSERT)
--- 585,590 ----
***************
*** 604,609 ****
--- 603,611 ----
  #define SHOWMATCH	(0x700 + INSERT) /* show matching paren */
  #define CONFIRM		0x800	/* ":confirm" prompt */
  #define SELECTMODE	0x1000	/* Select mode, only for mappings */
+ 
+ #define MAP_ALL_MODES	(0x3f | SELECTMODE)	/* all mode bits used for
+ 						 * mapping */
  
  /* directions */
  #define FORWARD			1
*** ../vim-7.0.030/src/version.c	Thu Jun 22 21:15:46 2006
--- src/version.c	Fri Jun 23 16:33:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     31,
  /**/

-- 
Why don't cannibals eat clowns?
Because they taste funny.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:33 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.154,1.155
Message-ID: <200606261516.k5QFGX6O019008@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18691

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- GFS-kernel.spec	22 May 2006 18:51:28 -0000	1.154
+++ GFS-kernel.spec	26 Jun 2006 15:16:30 -0000	1.155
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.22
+Release: 5.FC5.23
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:45 -0400
Subject: rpms/vim/FC-5 7.0.032,NONE,1.1
Message-ID: <200606261516.k5QFGjgQ019880@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19206

Added Files:
	7.0.032 
Log Message:
- patchlevel 32


--- NEW FILE 7.0.032 ---
To: vim-dev at vim.org
Subject: Patch 7.0.032 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.032 (extra, after 7.0.027)
Problem:    Missing semicolon.
Solution:   Add the semicolon.
Files:	    src/gui_w48.c


*** ../vim-7.0.031/src/gui_w48.c	Thu Jun 22 19:34:23 2006
--- src/gui_w48.c	Fri Jun 23 16:36:09 2006
***************
*** 1665,1671 ****
      }
      if (msg.message == WM_USER)
      {
! 	MyTranslateMessage(&msg)
  	DispatchMessage(&msg);
  	return;
      }
--- 1665,1671 ----
      }
      if (msg.message == WM_USER)
      {
! 	MyTranslateMessage(&msg);
  	DispatchMessage(&msg);
  	return;
      }
*** ../vim-7.0.031/src/version.c	Fri Jun 23 16:33:41 2006
--- src/version.c	Fri Jun 23 16:37:24 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     32,
  /**/

-- 
Snoring is prohibited unless all bedroom windows are closed and securely
locked.
		[real standing law in Massachusetts, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:51 -0400
Subject: rpms/vim/FC-5 7.0.033,NONE,1.1
Message-ID: <200606261516.k5QFGplL020453@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20037

Added Files:
	7.0.033 
Log Message:
- patchlevel 33


--- NEW FILE 7.0.033 ---
To: vim-dev at vim.org
Subject: Patch 7.0.033
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.033
Problem:    When pasting text, with the menu or CTRL-V, autoindent is removed.
Solution:   Use "x<BS>" to avoid indent to be removed. (Benji Fisher)
Files:	    runtime/autoload/paste.vim


*** ../vim-7.0.032/runtime/autoload/paste.vim	Fri Apr 21 23:57:39 2006
--- runtime/autoload/paste.vim	Fri Jun 23 17:18:48 2006
***************
*** 1,6 ****
  " Vim support file to help with paste mappings and menus
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Apr 21
  
  " Define the string to use for items that are present both in Edit, Popup and
  " Toolbar menu.  Also used in mswin.vim and macmap.vim.
--- 1,6 ----
  " Vim support file to help with paste mappings and menus
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Jun 23
  
  " Define the string to use for items that are present both in Edit, Popup and
  " Toolbar menu.  Also used in mswin.vim and macmap.vim.
***************
*** 12,18 ****
  if has("virtualedit")
    let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
    let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
!   let paste#paste_cmd['i'] = '<Esc>' . paste#paste_cmd['n'] . 'gi'
  
    func! paste#Paste()
      let ove = &ve
--- 12,18 ----
  if has("virtualedit")
    let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
    let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
!   let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'
  
    func! paste#Paste()
      let ove = &ve
*** ../vim-7.0.032/src/version.c	Fri Jun 23 16:44:32 2006
--- src/version.c	Fri Jun 23 17:18:56 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     33,
  /**/

-- 
Yesterday, all my deadlines seemed so far away
now it looks as though it's freeze in four days
oh I believe in cvs..
    [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:16:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:16:59 -0400
Subject: rpms/vim/FC-5 7.0.034,NONE,1.1
Message-ID: <200606261516.k5QFGxfQ020941@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20636

Added Files:
	7.0.034 
Log Message:
- patchlevel 34


--- NEW FILE 7.0.034 ---
To: vim-dev at vim.org
Subject: Patch 7.0.034
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.034
Problem:    After doing completion and typing more characters or using BS
	    repeating with "." didn't work properly. (Martin Stubenschrott)
Solution:   Don't put BS and other characters in the redo buffer right away,
	    do this when finishing completion.
Files:	    src/edit.c


*** ../vim-7.0.033/src/edit.c	Thu Jun 22 16:48:43 2006
--- src/edit.c	Fri Jun 23 17:50:47 2006
***************
*** 3020,3028 ****
      if ((int)(p - line) - (int)compl_col <= 0)
  	return K_BS;
  
-     /* For redo we need to repeat this backspace. */
-     AppendCharToRedobuff(K_BS);
- 
      /* Deleted more than what was used to find matches or didn't finish
       * finding all matches: need to look for matches all over again. */
      if (curwin->w_cursor.col <= compl_col + compl_length
--- 3020,3025 ----
***************
*** 3121,3130 ****
      else
  #endif
  	ins_char(c);
- 
-     /* For redo we need to count this character so that the number of
-      * backspaces is correct. */
-     AppendCharToRedobuff(c);
  
      /* If we didn't complete finding matches we must search again. */
      if (compl_was_interrupted)
--- 3118,3123 ----
*** ../vim-7.0.033/src/version.c	Fri Jun 23 17:26:02 2006
--- src/version.c	Fri Jun 23 17:59:04 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     34,
  /**/

-- 
A parent can be arrested if his child cannot hold back a burp during a church
service.
		[real standing law in Nebraska, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:17:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:17:05 -0400
Subject: rpms/vim/FC-5 7.0.035,NONE,1.1
Message-ID: <200606261517.k5QFH5VR021490@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21095

Added Files:
	7.0.035 
Log Message:
- patchlevel 35


--- NEW FILE 7.0.035 ---
To: vim-dev at vim.org
Subject: Patch 7.0.035
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.035
Problem:    Insert mode completion works when typed but not when replayed from
	    a register. (Hari Krishna Dara)
	    Also: Mappings for Insert mode completion don't always work.
Solution:   When finding a non-completion key in the input don't interrupt
	    completion when it wasn't typed.
	    Do use mappings when checking for typeahead while still finding
	    completions.  Avoids that completion is interrupted too soon.
	    Use "compl_pending" in a different way.
Files:	    src/edit.c


*** ../vim-7.0.034/src/edit.c	Fri Jun 23 17:59:26 2006
--- src/edit.c	Fri Jun 23 21:32:42 2006
***************
*** 4166,4173 ****
      {
  	if (compl_shows_dir == FORWARD && compl_shown_match->cp_next != NULL)
  	{
- 	    if (compl_pending != 0)
- 		--compl_pending;
  	    compl_shown_match = compl_shown_match->cp_next;
  	    found_end = (compl_first_match != NULL
  			   && (compl_shown_match->cp_next == compl_first_match
--- 4166,4171 ----
***************
*** 4176,4189 ****
  	else if (compl_shows_dir == BACKWARD
  					&& compl_shown_match->cp_prev != NULL)
  	{
- 	    if (compl_pending != 0)
- 		++compl_pending;
  	    found_end = (compl_shown_match == compl_first_match);
  	    compl_shown_match = compl_shown_match->cp_prev;
  	    found_end |= (compl_shown_match == compl_first_match);
  	}
  	else
  	{
  	    if (advance)
  	    {
  		if (compl_shows_dir == BACKWARD)
--- 4174,4197 ----
  	else if (compl_shows_dir == BACKWARD
  					&& compl_shown_match->cp_prev != NULL)
  	{
  	    found_end = (compl_shown_match == compl_first_match);
  	    compl_shown_match = compl_shown_match->cp_prev;
  	    found_end |= (compl_shown_match == compl_first_match);
  	}
  	else
  	{
+ 	    if (!allow_get_expansion)
+ 	    {
+ 		if (advance)
+ 		{
+ 		    if (compl_shows_dir == BACKWARD)
+ 			compl_pending -= todo + 1;
+ 		    else
+ 			compl_pending += todo + 1;
+ 		}
+ 		return -1;
+ 	    }
+ 
  	    if (advance)
  	    {
  		if (compl_shows_dir == BACKWARD)
***************
*** 4191,4204 ****
  		else
  		    ++compl_pending;
  	    }
- 	    if (!allow_get_expansion)
- 		return -1;
  
  	    /* Find matches. */
  	    num_matches = ins_compl_get_exp(&compl_startpos);
! 	    if (compl_pending != 0 && compl_direction == compl_shows_dir
  								   && advance)
! 		compl_shown_match = compl_curr_match;
  	    found_end = FALSE;
  	}
  	if ((compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0
--- 4199,4225 ----
  		else
  		    ++compl_pending;
  	    }
  
  	    /* Find matches. */
  	    num_matches = ins_compl_get_exp(&compl_startpos);
! 
! 	    /* handle any pending completions */
! 	    while (compl_pending != 0 && compl_direction == compl_shows_dir
  								   && advance)
! 	    {
! 		if (compl_pending > 0 && compl_shown_match->cp_next != NULL)
! 		{
! 		    compl_shown_match = compl_shown_match->cp_next;
! 		    --compl_pending;
! 		}
! 		if (compl_pending < 0 && compl_shown_match->cp_prev != NULL)
! 		{
! 		    compl_shown_match = compl_shown_match->cp_prev;
! 		    ++compl_pending;
! 		}
! 		else
! 		    break;
! 	    }
  	    found_end = FALSE;
  	}
  	if ((compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0
***************
*** 4307,4315 ****
  	return;
      count = 0;
  
!     ++no_mapping;
      c = vpeekc_any();
-     --no_mapping;
      if (c != NUL)
      {
  	if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
--- 4328,4336 ----
  	return;
      count = 0;
  
!     /* Check for a typed key.  Do use mappings, otherwise vim_is_ctrl_x_key()
!      * can't do its work correctly. */
      c = vpeekc_any();
      if (c != NUL)
      {
  	if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
***************
*** 4319,4330 ****
  	    (void)ins_compl_next(FALSE, ins_compl_key2count(c),
  						    c != K_UP && c != K_DOWN);
  	}
! 	else if (c != Ctrl_R)
! 	    compl_interrupted = TRUE;
      }
      if (compl_pending != 0 && !got_int)
! 	(void)ins_compl_next(FALSE, compl_pending > 0
! 				      ? compl_pending : -compl_pending, TRUE);
  }
  
  /*
--- 4340,4366 ----
  	    (void)ins_compl_next(FALSE, ins_compl_key2count(c),
  						    c != K_UP && c != K_DOWN);
  	}
! 	else
! 	{
! 	    /* Need to get the character to have KeyTyped set.  We'll put it
! 	     * back with vungetc() below. */
! 	    c = safe_vgetc();
! 
! 	    /* Don't interrupt completion when the character wasn't typed,
! 	     * e.g., when doing @q to replay keys. */
! 	    if (c != Ctrl_R && KeyTyped)
! 		compl_interrupted = TRUE;
! 
! 	    vungetc(c);
! 	}
      }
      if (compl_pending != 0 && !got_int)
!     {
! 	int todo = compl_pending > 0 ? compl_pending : -compl_pending;
! 
! 	compl_pending = 0;
! 	(void)ins_compl_next(FALSE, todo, TRUE);
!     }
  }
  
  /*
*** ../vim-7.0.034/src/version.c	Fri Jun 23 17:59:26 2006
--- src/version.c	Fri Jun 23 21:35:39 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     35,
  /**/

-- 
So when I saw the post to comp.editors, I rushed over to the FTP site to
grab it.  So I yank apart the tarball, light x candles, where x= the
vim version multiplied by the md5sum of the source divided by the MAC of
my NIC (8A3FA78155A8A1D346C3C4A), put on black robes, dim the lights,
wave a dead chicken over the hard drive, and summon the power of GNU GCC
with the magic words "make config ; make!".
		[Jason Spence, compiling Vim 5.0]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:17:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:17:26 -0400
Subject: rpms/vim/FC-5 README.patches,1.41,1.42
Message-ID: <200606261517.k5QFHQsf024255@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23903

Modified Files:
	README.patches 
Log Message:
- patchlevel 35


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/README.patches,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- README.patches	21 Jun 2006 13:11:22 -0000	1.41
+++ README.patches	26 Jun 2006 15:17:23 -0000	1.42
@@ -47,3 +47,16 @@
   1470  7.0.020  GUI: crash when using 'mousefocus'
   4240  7.0.021  crash when using "\\[" and "\\]" in 'errorformat
   5471  7.0.022  Ruby: buffer.append() could append to the wrong buffer
+  5351  7.0.023  crash after Insert mode completion without matches
+  1619  7.0.024  it is possible to set arbitrary v: variables
+  2606  7.0.025  crash when deleting an item from a:000
+  1800  7.0.026  Unix: when using libcall() and old error may be shown
+  1344  7.0.027  (extra) Win32: hang on exit when compiled with SNiFF+
+  3014  7.0.028  (extra) OS/2: compilation problem
+  1494  7.0.029  cursor position may be wrong when using getchar()
+  1664  7.0.030  the ":compiler" command can't be used in a FileChangedRO event
+  1808  7.0.031  after deleting a buffer its Select mode mappings remain
+  1424  7.0.032  (extra, after 7.0.027) missing semicolon
+  2431  7.0.033  pasting after autoindent removes the indent
+  2042  7.0.034  repeating completion was wrong after typing text or using BS
+  5905  7.0.035  repeating Insert mode completion doesn't work properly



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:17:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:17:50 -0400
Subject: rpms/vim/FC-5 vim.spec,1.101,1.102
Message-ID: <200606261517.k5QFHojB027255@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26843

Modified Files:
	vim.spec 
Log Message:
- patchlevel 35


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/vim.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- vim.spec	21 Jun 2006 13:34:48 -0000	1.101
+++ vim.spec	26 Jun 2006 15:17:48 -0000	1.102
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 022
+%define patchlevel 035
 
 Summary: The VIM editor.
 Name: vim
@@ -76,6 +76,19 @@
 Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
 Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
 Patch022: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.022
+Patch023: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.023
+Patch024: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.024
+Patch025: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.025
+Patch026: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.026
+Patch027: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.027
+Patch028: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.028
+Patch029: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.029
+Patch030: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.030
+Patch031: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.031
+Patch032: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.032
+Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
+Patch034: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.034
+Patch035: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.035
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -119,9 +132,6 @@
 Summary: The common files needed by any version of the VIM editor.
 Group: Applications/Editors
 Obsoletes: vim7-common
-Conflicts: man-pages-fr < 0.9.7-14
-Conflicts: man-pages-it < 0.3.0-17
-Conflicts: man-pages-pl < 0.24-2
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -229,6 +239,22 @@
 %patch020 -p0
 %patch021 -p0
 %patch022 -p0
+%patch023 -p0
+%patch024 -p0
+%patch025 -p0
+%patch026 -p0
+# Win32
+#patch027 -p0
+# OS/2
+#patch028 -p0
+%patch029 -p0
+%patch030 -p0
+%patch031 -p0
+# Win32
+#patch032 -p0
+%patch033 -p0
+%patch034 -p0
+%patch035 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -448,6 +474,11 @@
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 
+# Remove some man pages which are provided by man-pages-{fr,it,pl}:
+rm -f $RPM_BUILD_ROOT/%{_mandir}/pl/man1/{evim,ex,rview,rvim,view,vim,vimdiff,vimtutor}.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/fr/man1/{rview,view,vim,vimdiff,vimtutor}.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/it/man1/vim.1*
+
 %post X11
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -565,6 +596,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Jun 26 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-0.fc5
+- patchlevel 35
+- remove conflicts with some man-page packages
+
 * Wed Jun 21 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-2
 - add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:17:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:17:52 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.167,1.168
Message-ID: <200606261517.k5QFHq74027301@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27212

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- cman-kernel.spec	26 Jun 2006 15:15:22 -0000	1.167
+++ cman-kernel.spec	26 Jun 2006 15:17:49 -0000	1.168
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2139_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.22
+Release: 0.FC5.23
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:18:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:18:10 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.160,1.161
Message-ID: <200606261518.k5QFIAJZ029059@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28627

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gnbd-kernel.spec	26 Jun 2006 15:15:43 -0000	1.160
+++ gnbd-kernel.spec	26 Jun 2006 15:18:07 -0000	1.161
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2139_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.29
+Release: 5.FC5.30
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:18:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:18:26 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.137,1.138
Message-ID: <200606261518.k5QFIQ6d031462@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30252

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- dlm-kernel.spec	26 Jun 2006 15:16:12 -0000	1.137
+++ dlm-kernel.spec	26 Jun 2006 15:18:24 -0000	1.138
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2139_FC5
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.20
+Release: 0.FC5.21
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:18:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:18:42 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.155,1.156
Message-ID: <200606261518.k5QFIguX031718@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31692

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- GFS-kernel.spec	26 Jun 2006 15:16:30 -0000	1.155
+++ GFS-kernel.spec	26 Jun 2006 15:18:39 -0000	1.156
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2139_FC5
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.23
+Release: 5.FC5.24
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:27:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:27:26 -0400
Subject: rpms/kernel/devel patch-2.6.17-git10.bz2.sign, NONE, 1.1 .cvsignore,
	1.464, 1.465 kernel-2.6.spec, 1.2312, 1.2313 sources, 1.408,
	1.409 upstream, 1.373, 1.374 patch-2.6.17-git9.bz2.sign, 1.1, NONE
Message-ID: <200606261527.k5QFRQ5d002413@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2342

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git10.bz2.sign 
Removed Files:
	patch-2.6.17-git9.bz2.sign 
Log Message:
git10



--- NEW FILE patch-2.6.17-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEn4avyGugalF9Dw4RAiyXAJ46BFROjpPC1nuG2CqzC+3NbSXG9QCcCQtS
X1+8w3MUDw9tfhzdJz6+k4w=
=9jVL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- .cvsignore	26 Jun 2006 01:38:09 -0000	1.464
+++ .cvsignore	26 Jun 2006 15:27:23 -0000	1.465
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git9.bz2
+patch-2.6.17-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2312
retrieving revision 1.2313
diff -u -r1.2312 -r1.2313
--- kernel-2.6.spec	26 Jun 2006 01:38:09 -0000	1.2312
+++ kernel-2.6.spec	26 Jun 2006 15:27:23 -0000	1.2313
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git9.bz2
+Patch1: patch-2.6.17-git10.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1655,6 +1655,10 @@
 %endif
 
 %changelog
+* Mon Jun 26 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git10
+- Enable fake PCI hotplug driver. (#190437)
+
 * Sun Jun 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git8 & git9
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- sources	26 Jun 2006 01:38:20 -0000	1.408
+++ sources	26 Jun 2006 15:27:23 -0000	1.409
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-1a5bfe97d1ac4abf516b0f72d51da312  patch-2.6.17-git9.bz2
+925bec75109765473c2eb25e3df5e75d  patch-2.6.17-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- upstream	26 Jun 2006 01:38:20 -0000	1.373
+++ upstream	26 Jun 2006 15:27:23 -0000	1.374
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git9.bz2
+patch-2.6.17-git10.bz2


--- patch-2.6.17-git9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:27:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:27:26 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.201, 1.202 config-i586,
	1.15, 1.16 config-ia64-generic, 1.29, 1.30 config-powerpc64,
	1.12, 1.13 config-x86-generic, 1.54,
	1.55 config-x86_64-generic, 1.41, 1.42
Message-ID: <200606261527.k5QFRQb8002436@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv2342/configs

Modified Files:
	config-generic config-i586 config-ia64-generic 
	config-powerpc64 config-x86-generic config-x86_64-generic 
Log Message:
git10



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- config-generic	26 Jun 2006 01:38:22 -0000	1.201
+++ config-generic	26 Jun 2006 15:27:24 -0000	1.202
@@ -62,6 +62,7 @@
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -100,6 +101,7 @@
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_IPATH_CORE=m
 CONFIG_INFINIBAND_IPATH=m
+CONFIG_INFINIBAND_ISER=m
 
 #
 # Executable file formats


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-i586	24 Jun 2006 06:03:25 -0000	1.15
+++ config-i586	26 Jun 2006 15:27:24 -0000	1.16
@@ -24,8 +24,6 @@
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_DISKDUMP is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_GAMEPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_STALDRV is not set
@@ -38,15 +36,12 @@
 # CONFIG_W1 is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_KPROBES is not set
 # CONFIG_AGP_ATI is not set
 # CONFIG_AGP_AMD is not set
 # CONFIG_AGP_AMD64 is not set
 # CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
 
 # CONFIG_X86_UP_APIC is not set
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-ia64-generic	11 May 2006 03:03:15 -0000	1.29
+++ config-ia64-generic	26 Jun 2006 15:27:24 -0000	1.30
@@ -128,7 +128,6 @@
 # CONFIG_PM_DEBUG is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-powerpc64	23 Jun 2006 15:47:48 -0000	1.12
+++ config-powerpc64	26 Jun 2006 15:27:24 -0000	1.13
@@ -21,7 +21,6 @@
 CONFIG_THERM_PM72=y
 CONFIG_IBMVETH=m
 CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_RPA=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- config-x86-generic	20 Jun 2006 20:25:54 -0000	1.54
+++ config-x86-generic	26 Jun 2006 15:27:24 -0000	1.55
@@ -220,7 +220,6 @@
 CONFIG_PCI_BIOS=y
 
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-x86_64-generic	20 Jun 2006 20:25:54 -0000	1.41
+++ config-x86_64-generic	26 Jun 2006 15:27:24 -0000	1.42
@@ -82,7 +82,6 @@
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:27:33 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.199,
	1.199.4.1 config-x86-generic, 1.54,
	1.54.4.1 config-x86_64-generic, 1.41, 1.41.4.1
Message-ID: <200606261527.k5QFRXe6002508@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv2457/configs

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.199
retrieving revision 1.199.4.1
diff -u -r1.199 -r1.199.4.1
--- config-generic	23 Jun 2006 15:47:48 -0000	1.199
+++ config-generic	26 Jun 2006 15:27:29 -0000	1.199.4.1
@@ -1084,6 +1084,10 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IPW3945_DEBUG is not set
+# CONFIG_IPW3945_MONITOR is not set
+# CONFIG_IPW3945_PROMISCUOUS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.54
retrieving revision 1.54.4.1
diff -u -r1.54 -r1.54.4.1
--- config-x86-generic	20 Jun 2006 20:25:54 -0000	1.54
+++ config-x86-generic	26 Jun 2006 15:27:29 -0000	1.54.4.1
@@ -247,6 +247,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.41
retrieving revision 1.41.4.1
diff -u -r1.41 -r1.41.4.1
--- config-x86_64-generic	20 Jun 2006 20:25:54 -0000	1.41
+++ config-x86_64-generic	26 Jun 2006 15:27:29 -0000	1.41.4.1
@@ -112,6 +112,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:27:33 -0400
Subject: rpms/kernel/devel jwltest-ipw3945-1_0_5.patch, NONE,
	1.1.4.1 kernel-2.6.spec, 1.2307, 1.2307.2.1
Message-ID: <200606261527.k5QFRVXU002498@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2457

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-1-branch
	jwltest-ipw3945-1_0_5.patch 
Log Message:


jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |  106 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16645 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20696 insertions(+)

--- NEW FILE jwltest-ipw3945-1_0_5.patch ---
--- linux-2.6.16.noarch/Documentation/networking/README.ipw3945.orig	2006-06-15 12:59:52.000000000 -0400
+++ linux-2.6.16.noarch/Documentation/networking/README.ipw3945	2006-06-15 12:59:58.000000000 -0400
@@ -0,0 +1,998 @@
+
+Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
+support of:
+
+Intel(R) PRO/Wireless 3945ABG Network Connection Adapter
+Intel(R) PRO/Wireless 3945BG Network Connection Adapter
+
+Note: The Intel(R) PRO/Wireless 3945ABG Network Connection driver for 
+Linux is a unified driver that works on both hardware adapters listed 
+above. In this document the Intel(R) PRO/Wireless 3945ABG Network Connection 
+driver for Linux will be used to reference the unified driver.
+
+Copyright (C) 2005 - 2006, Intel Corporation
+
+README.ipw3945
+
+Version: 1.0.5
+Date   : May 22, 2006
+
+
+Index
+-----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+1.   Introduction
+1.1. Overview of Features
+2.   Loading the Driver
+3.   Feature Details
+3.1. LEDs
+3.2. Association Details
+3.3. Roaming Details
+3.4. Scanning Details
+3.5. Antenna Selection and "Diversity"
+3.6. IEEE 802.11h Details 
+3.7. Tx Power 
+3.8. Security Details
+3.9. Power Management
+4.   Configuring the driver
+4.1. Command Line Parameters
+4.3. Sysfs Helper Files:
+5.   Wireless Tools Details
+5.1. iwlist
+5.2. iwpriv
+5.3. iwconfig
+6.   Support
+7.   License
+
+
+===============================================
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+===============================================
+
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+
+
+===============================================
+1.   Introduction
+===============================================
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 3945ABG driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.5) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ 802.11i (WPA/WPA2)
++ Wireless Extension support 
++ Full B and G rate support
++ Full A rate support (ABG only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
+
+The following features are currently enabled, but not officially
+supported:
+
++ QoS
++ Monitor mode (aka RFMon)
++ Associated RF promiscuous mode
++ Frame Rx simulation
+
+The distinction between officially supported and enabled is a reflection 
+of the amount of validation and interoperability testing that has been
+performed on a given feature. Note: in addition, the features may not have 
+all of the code in the driver to fully enable the feature.
+
+
+===============================================
+2. Loading the Driver
+===============================================
+
+See the INSTALL document for information on installing the driver.
+
+Once installed, a typical method for launching the driver and the 
+regulatory daemon is via the load script provided in the source package:
+
+	# ./load debug=0x43fff   <--- You need to be root for this
+
+NOTE:  You will not be able to rmmod the driver so long as the 
+ipw3945d daemon is running.  
+
+If you followed the steps of the INSTALL document to set up your
+modprobe.conf, you can load the module by simply running:
+
+	# modprobe ipw3945       <--- You need to be root for this
+
+If you did not configure your modprobe.conf to automatically launch the 
+regulatory daemon (see INSTALL), you must do so manually after loading 
+the module:
+
+	# /sbin/ipw3945d	<--- You need to be root for this
+
+If you want to unload the module (and kill the deamon as well), you can 
+simply use the unload script:
+
+	# ./unload               <--- You need to be root for this
+
+or likewise if you configured modprobe.conf:
+
+	# modprobe -r ipw3945       <--- You need to be root for this
+
+If you did not configure modprobe.conf to unload the regulatory daemon 
+and are not using the unload script, you need to kill the regulatory 
+daemon before you will be able to unload the module:
+
+	# /sbin/ipw3945d --kill	<--- You need to be root for this
+	# modprobe -r ipw3945
+
+
+===============================================
+3. Feature Details
+===============================================
+
+3.1. LEDs
+-----------------------------------------------
+
+The driver will attempt to control the wireless LED, if one is 
+configured in hardware.  There are typically two LEDs:
+
+	Activity -- used to indicate wireless activity
+	Link     -- used to indicate wireless link
[...20341 lines suppressed...]
+ * a command to appear. Currently set to 60s. */
+#define DAEMON_POLL_INTERVAL 60000
+
+#define DAEMON_BUF_SIZE 3000
+
+struct daemon_cmd_hdr {
+	u8 cmd;
+	u8 flags;
+	u8 token;
+	u8 reserved1;
+	u16 version;
+	u16 data_len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+struct daemon_cmd {
+	struct daemon_cmd_hdr hdr;
+	u8 data[DAEMON_BUF_SIZE];
+} __attribute__ ((packed));
+
+/*  driver <- daemon error response */
+struct daemon_error {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon synchronous command done */
+struct daemon_cmd_done {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon regulatory information
+ *
+ * The following is sent from the daemon to the driver
+ * to inform the driver of current channel capabilities and
+ * restrictions.
+ *
+ * Immediately after INIT is provided from the driver the
+ * daemon will send the full channel map.
+ *
+ * After a channel has been selected via rx_config, the
+ * daemon will send periodic updates when the channel limits
+ * change for a specific channel.
+ *
+ * NOTE:  The txpower field represents the current configured
+ * power as directed by either the user (sent to the daemon
+ * through the DAEMON_SYNC::DAEMON_SYNC_TXPOWER_LIMIT command)
+ * or as specified through the currently associated access
+ * point.  The max_txpower is the highest the channel is
+ * allowed to transmit.
+ *
+ */
+enum {
+	DAEMON_A_BAND = (1 << 0),	/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	DAEMON_IBSS_ALLOWED = (1 << 1),
+	DAEMON_ACTIVE_ALLOWED = (1 << 2),
+	DAEMON_RADAR_DETECT = (1 << 3),
+};
+struct daemon_channel_info {
+	u8 channel;
+	u8 flags;
+	s8 txpower;
+	s8 max_txpower;
+};
+struct daemon_regulatory_info {
+	u16 count;		/* Number of channels provided */
+	struct daemon_channel_info channel_info[0];
+} __attribute__ ((packed));
+
+/* driver <- daemon information request */
+struct daemon_request_info {
+	u8 request;
+} __attribute__ ((packed));
+
+/* driver <- daemon set state */
+struct daemon_set_state {
+	u8 state;
+} __attribute__ ((packed));
+
+/* driver -> daemon scan request */
+#define DAEMON_MIN_24GHZ_CHANNEL 1
+#define DAEMON_MAX_24GHZ_CHANNEL 14
+#define DAEMON_MIN_52GHZ_CHANNEL 34
+#define DAEMON_MAX_52GHZ_CHANNEL 165
+
+#define DAEMON_SCAN_FLAG_24GHZ  (1<<0)
+#define DAEMON_SCAN_FLAG_52GHZ  (1<<1)
+#define DAEMON_SCAN_FLAG_ACTIVE (1<<2)
+#define DAEMON_SCAN_FLAG_DIRECT (1<<3)
+
+#define DAEMON_MAX_CMD_SIZE 1024
+
+enum {
+	DAEMON_TXRATE_1 = 0xa,
+	DAEMON_TXRATE_2 = 0x14,
+	DAEMON_TXRATE_5_5 = 0x37,
+	DAEMON_TXRATE_6 = 0xd,
+	DAEMON_TXRATE_9 = 0xf,
+	DAEMON_TXRATE_11 = 0x6e,
+	DAEMON_TXRATE_12 = 0x5,
+	DAEMON_TXRATE_18 = 0x7,
+	DAEMON_TXRATE_24 = 0x9,
+	DAEMON_TXRATE_36 = 0xb,
+	DAEMON_TXRATE_48 = 0x1,
+	DAEMON_TXRATE_54 = 0x3,
+};
+
+struct daemon_scan_channel {
+	u8 channel;
+	u8 request_active;
+	u16 active_dwell;
+	u16 passive_dwell;
+} __attribute__ ((packed));
+
+struct daemon_ssid_ie {
+	u8 id;
+	u8 len;
+	u8 ssid[32];
+} __attribute__ ((packed));
+
+struct daemon_rx_config {
+	u8 dev_type;
+	u16 channel;
+	u32 flags;
+	u32 filter_flags;
+	u8 ofdm_basic_rates;
+	u8 cck_basic_rates;
+	u8 node_addr[6];
+	u8 bssid_addr[6];
+	u16 assoc_id;
+	u16 beacon_interval;
+} __attribute__ ((packed));
+
+#define DAEMON_MAX_SCAN_SIZE 1024
+struct daemon_scan_request {
+	u8 flags;		/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	u8 channel_count;
+	u16 probe_request_len;
+	u16 quiet_time;		/* dwell only this long on quiet chnl (active scan) */
+	u16 quiet_plcp_th;	/* quiet chnl is < this # pkts (typ. 1) */
+	u32 suspend_time;	/* pause scan this long when returning to svc chnl */
+	u32 max_out_time;	/* max msec to be out of associated (service) chnl */
+	u8 probe_request_rate;	/* rate to send probe request */
+	u32 filter_flags;
+	u32 rxon_flags;
+	struct daemon_ssid_ie direct_scan;
+	u8 data[0];
+	/*
+	   The channels start after the probe request payload and are of type:
+
+	   struct daemon_scan_channel channels[0];
+
+	   NOTE:  Only one band of channels can be scanned per pass.  You
+	   can not mix 2.4Ghz channels and 5.2Ghz channels and must
+	   request a scan multiple times (not concurrently)
+
+	 */
+} __attribute__ ((packed));
+
+/* driver -> daemon 11h frame */
+struct daemon_80211_frame {
+	u8 channel;
+	u8 reserved1;
+	u16 rssi;
+	u16 reserved2;
+	u64 tsf;
+	u32 beacon_time;
+	u16 frame_len;
+	u8 frame[0];
+} __attribute__ ((packed));
+
+struct daemon_sync_txpower_limit {
+	u8 channel;
+	s8 power;
+} __attribute__ ((packed));
+
+enum {
+	DAEMON_SYNC_UNINIT = 0,
+	DAEMON_SYNC_INIT,
+	DAEMON_SYNC_SCAN_COMPLETE,
+	DAEMON_SYNC_TXPOWER_LIMIT,
+	DAEMON_SYNC_MEASURE_REPORT,
+	DAEMON_SYNC_TX_STATUS,
+	DAEMON_SYNC_SUSPEND,
+	DAEMON_SYNC_RESUME,
+};
+
+/* driver  -> daemon */
+struct daemon_sync_cmd {
+	u16 state;
+	u16 len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+#endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2307
retrieving revision 1.2307.2.1
diff -u -r1.2307 -r1.2307.2.1
--- kernel-2.6.spec	23 Jun 2006 17:59:47 -0000	1.2307
+++ kernel-2.6.spec	26 Jun 2006 15:27:29 -0000	1.2307.2.1
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6
+%define tag FC6.jwltest.1
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -182,7 +182,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -358,7 +359,8 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
-Patch1304: linux-2.6-net-ipw2200-monitor.patch
+Patch1300: linux-2.6-net-ipw2200-monitor.patch
+Patch1301: jwltest-ipw3945-1_0_5.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -931,7 +933,9 @@
 
 # NIC driver fixes.
 # add IPW2200_MONITOR config option
-%patch1304 -p1
+%patch1300 -p1
+# add IPW3945 driver
+%patch1301 -p1
 
 # Squashfs
 %patch1400 -p1



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:28:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:28:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2313,1.2314
Message-ID: <200606261528.k5QFSHjT002994@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2953

Modified Files:
	kernel-2.6.spec 
Log Message:
Remove lots of 'modprobe loop's from specfile.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2313
retrieving revision 1.2314
diff -u -r1.2313 -r1.2314
--- kernel-2.6.spec	26 Jun 2006 15:27:23 -0000	1.2313
+++ kernel-2.6.spec	26 Jun 2006 15:28:14 -0000	1.2314
@@ -1369,16 +1369,6 @@
 ### scripts
 ###
 
-# load the loop module for upgrades...in case the old modules get removed we have
-# loopback in the kernel so that mkinitrd will work.
-%pre
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-exit 0
-
-%pre smp
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-exit 0
-
 %post
 if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ]; then
   if [ -f /etc/sysconfig/kernel ]; then
@@ -1470,27 +1460,21 @@
 fi
 
 %preun
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
 
 %preun smp
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
 
 %preun PAE
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}PAE
 
 %preun kdump
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
 
 %preun xen
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
 %preun xen-PAE
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen-PAE
 
 
@@ -1658,6 +1642,7 @@
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git10
 - Enable fake PCI hotplug driver. (#190437)
+- Remove lots of 'modprobe loop's from specfile.
 
 * Sun Jun 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git8 & git9



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:37:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:37:05 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec, 1.668, 1.669 sources,
	1.166, 1.167
Message-ID: <200606261537.k5QFb59E004768@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4706

Modified Files:
	openoffice.org.spec sources 
Log Message:
port to FC-5


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- openoffice.org.spec	9 Jun 2006 11:16:02 -0000	1.668
+++ openoffice.org.spec	26 Jun 2006 15:37:02 -0000	1.669
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 13
+%define rh_rpm_release 14
 
 %define build_fc5 1
 
@@ -96,7 +96,6 @@
 Source12:	ooo64726.sdf
 Source13:	AutoSaveRecovery.xcu
 Source14:	AutoSaveCommon.xcu
-Source15:	DisableJavaApplets.xcu
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -173,7 +172,10 @@
 Patch44: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
 Patch45: openoffice.org-2.0.3.ooo65721.crash.vcl.patch
 Patch46: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch47: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
+Patch47: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch48: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
+Patch49: disable-java-applets.diff
+Patch50: sax+source+expatwrap+xml2utf.cxx.diff
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -829,7 +831,11 @@
 %patch44 -p1 -b .oooXXXXX.atkbroken.vcl.patch
 %patch45 -p1 -b .ooo65721.crash.vcl.patch
 %patch46 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch47 -p1 -b .oooXXXXX.safety.sfx2.patch
+%patch47 -p1 -b .ooo65519.printing.samba.patch
+%patch48 -p1 -b .oooXXXXX.safety.sfx2.patch
+%patch49 -p1 -b .disable-java-applets.diff
+%patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
+
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -994,7 +1000,6 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE4}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE13}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE14}
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE15}
 
 # rh#163147# convert non AMT to AMT fonts
 sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -3276,9 +3281,14 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.14
+- CVE-2006-2198 macro security
+- CVE-2006-2199 java applets
+- CVE-2006-3117 corrupt file format
+- rh#195637# add openoffice.org-2.0.3.ooo65519.printing.samba.patch
+
 * Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-- sfx2 safety patch
 
 * Tue May 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
 - ooo#65721# sneaky bug in a11y


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	26 Jun 2006 10:31:24 -0000	1.166
+++ sources	26 Jun 2006 15:37:02 -0000	1.167
@@ -12,5 +12,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
-baaf6187c060cc0525acbe4c07748025  DisableJavaApplets.xcu
 cc92c22601beae1800342255d1a18ff1  openoffice.org-myspell-contrib.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 26 15:37:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 11:37:58 -0400
Subject: rpms/hplip/devel hplip-1.6.6-1.patch,NONE,1.1 hplip.spec,1.84,1.85
Message-ID: <200606261537.k5QFbw7u005136@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5098

Modified Files:
	hplip.spec 
Added Files:
	hplip-1.6.6-1.patch 
Log Message:
* Mon Jun 26 2006 Tim Waugh <twaugh at redhat.com>
- Patchlevel 1.


hplip-1.6.6-1.patch:
 hpfax.py |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE hplip-1.6.6-1.patch ---
diff -uNr hplip-1.6.6.old/fax/backend/hpfax.py hplip-1.6.6.new/fax/backend/hpfax.py
--- hplip-1.6.6.old/fax/backend/hpfax.py	2006-06-05 15:23:32.000000000 -0700
+++ hplip-1.6.6.new/fax/backend/hpfax.py	2006-06-16 11:44:57.916413784 -0700
@@ -20,7 +20,7 @@
 # Author: Don Welch
 #
 
-__version__ = '2.0'
+__version__ = '2.2'
 __title__ = 'CUPS Fax Backend (hpfax:)'
 __doc__ = "CUPS backend for PC send fax. Generally this backend is run by CUPS, not directly by a user. To send a fax as a user, run hp-sendfax"
 
@@ -121,6 +121,7 @@
                            'timeout' : 5,
                            'ttl' : 4,
                            'filter' : 'fax',
+                           'format' : 'cups',
                           }
                        )
 
@@ -135,10 +136,13 @@
     for d in data.splitlines():
         m = direct_pat.match(d)
         
-        uri = m.group(1) or ''
-        uri = uri.replace('hp:/', 'hpfax:/')
-        mdl = m.group(2) or ''
-        devid = m.group(4) or ''
+        try:
+            uri = m.group(1) or ''
+            uri = uri.replace('hp:/', 'hpfax:/')
+            mdl = m.group(2) or ''
+            devid = m.group(4) or ''
+        except AttributeError:
+            continue
         
         try:
             back_end, is_hp, bus, model, serial, dev_file, host, port = \
@@ -146,8 +150,7 @@
         except Error:
             continue
         
-        print 'direct %s "HPLIP Fax" "%s HPLIP Fax" "%s"' % (uri, mdl, devid)
-        
+        print 'direct %s "HPLIP Fax" "%s HPLIP Fax" "MFG:HP;MDL:HP Fax;DES:HP Fax;"' % (uri, mdl)
         
     sys.exit(0)
 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- hplip.spec	16 Jun 2006 11:37:49 -0000	1.84
+++ hplip.spec	26 Jun 2006 15:37:56 -0000	1.85
@@ -10,6 +10,7 @@
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
+Patch0: hplip-1.6.6-1.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
@@ -62,6 +63,9 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Patchlevel 1.
+%patch0 -p1 -b .1.6.6-1
+
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
@@ -175,6 +179,9 @@
 fi
 
 %changelog
+* Mon Jun 26 2006 Tim Waugh <twaugh at redhat.com>
+- Patchlevel 1.
+
 * Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-2
 - 1.6.6.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:03:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:03:38 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.ooo65519.printing.samba.patch, 1.1, 1.2
Message-ID: <200606261603.k5QG3Y7S029232@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29199

Modified Files:
	openoffice.org-2.0.3.ooo65519.printing.samba.patch 
Log Message:
bad prefix

openoffice.org-2.0.3.ooo65519.printing.samba.patch:
 sfx2/source/doc/objmisc.cxx  |    3 +++
 tools/inc/urlobj.hxx         |    6 ++++--
 tools/source/fsys/urlobj.cxx |    6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

Index: openoffice.org-2.0.3.ooo65519.printing.samba.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-2.0.3.ooo65519.printing.samba.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo65519.printing.samba.patch	26 Jun 2006 15:02:16 -0000	1.1
+++ openoffice.org-2.0.3.ooo65519.printing.samba.patch	26 Jun 2006 16:03:20 -0000	1.2
@@ -1,6 +1,6 @@
 diff -rup sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx
---- openoffice.orig/sfx2/sfx2/source/doc/objmisc.cxx	2006-05-18 09:48:27.000000000 +0200
-+++ openoffice.org/sfx2/sfx2/source/doc/objmisc.cxx	2006-05-18 09:49:19.000000000 +0200
+--- openoffice.org.org.orig/sfx2/source/doc/objmisc.cxx	2006-05-18 09:48:27.000000000 +0200
++++ openoffice.org/sfx2/source/doc/objmisc.cxx	2006-05-18 09:49:19.000000000 +0200
 @@ -857,6 +857,9 @@ String SfxObjectShell::GetTitle
  		// ggf. Titel aus Dateiname generieren
  		if ( !pImp->aTitle.Len() )
@@ -12,8 +12,8 @@
  
  	// ganzer Titel
 diff -rup tools/inc/urlobj.hxx tools/inc/urlobj.hxx
---- openoffice.org.orig/tools/tools/inc/urlobj.hxx	2006-05-18 09:47:10.000000000 +0200
-+++ openoffice.org/tools/tools/inc/urlobj.hxx	2006-05-18 09:47:18.000000000 +0200
+--- openoffice.org.orig/tools/inc/urlobj.hxx	2006-05-18 09:47:10.000000000 +0200
++++ openoffice.org/tools/inc/urlobj.hxx	2006-05-18 09:47:18.000000000 +0200
 @@ -105,6 +105,7 @@ namespace com { namespace sun { namespac
  #define INET_DB_SCHEME "db:"
  #define INET_BUGID_SCHEME "bugid:"
@@ -35,8 +35,8 @@
  
  //============================================================================
 diff -rup tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
---- openoffice.org.orig/tools/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:10.000000000 +0200
-+++ openoffice.org/tools/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:18.000000000 +0200
+--- openoffice.org.orig/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:10.000000000 +0200
++++ openoffice.org/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:18.000000000 +0200
 @@ -288,6 +288,8 @@ using namespace com::sun;
     vnd-sun-star-tdoc-url = "VND.SUN.STAR.TDOC:/" segment *("/" segment)
     segment = *pchar



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:07:16 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo65519.printing.samba.patch, NONE,
	1.1 openoffice.org.spec, 1.742, 1.743
Message-ID: <200606261607.k5QG7GDL029843@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29770

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65519.printing.samba.patch 
Log Message:
samba printing fix

openoffice.org-2.0.3.ooo65519.printing.samba.patch:
 sfx2/source/doc/objmisc.cxx  |    3 +++
 tools/inc/urlobj.hxx         |    6 ++++--
 tools/source/fsys/urlobj.cxx |    6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo65519.printing.samba.patch ---
diff -rup sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx
--- openoffice.org.org.orig/sfx2/source/doc/objmisc.cxx	2006-05-18 09:48:27.000000000 +0200
+++ openoffice.org/sfx2/source/doc/objmisc.cxx	2006-05-18 09:49:19.000000000 +0200
@@ -857,6 +857,9 @@ String SfxObjectShell::GetTitle
 		// ggf. Titel aus Dateiname generieren
 		if ( !pImp->aTitle.Len() )
 			pImp->aTitle = aURL.GetBase();
+
+		if ( !pImp->aTitle.Len() )
+			pImp->aTitle = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
 	}
 
 	// ganzer Titel
diff -rup tools/inc/urlobj.hxx tools/inc/urlobj.hxx
--- openoffice.org.orig/tools/inc/urlobj.hxx	2006-05-18 09:47:10.000000000 +0200
+++ openoffice.org/tools/inc/urlobj.hxx	2006-05-18 09:47:18.000000000 +0200
@@ -105,6 +105,7 @@ namespace com { namespace sun { namespac
 #define INET_DB_SCHEME "db:"
 #define INET_BUGID_SCHEME "bugid:"
 #define INET_TELNET_SCHEME "telnet://"
+#define INET_SAMBA_SCHEME "smb://"
 
 #define URL_PREFIX_PRIV_SOFFICE "private:"
 enum
@@ -162,8 +163,9 @@ enum INetProtocol
     INET_PROT_TELNET = 28,
     INET_PROT_VND_SUN_STAR_EXPAND = 29,
     INET_PROT_VND_SUN_STAR_TDOC = 30,
-    INET_PROT_GENERIC = 31,
-	INET_PROT_END = 32
+	INET_PROT_SAMBA = 31,
+    INET_PROT_GENERIC = 32,
+	INET_PROT_END = 33
 };
 
 //============================================================================
diff -rup tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
--- openoffice.org.orig/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:10.000000000 +0200
+++ openoffice.org/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:18.000000000 +0200
@@ -288,6 +288,8 @@ using namespace com::sun;
    vnd-sun-star-tdoc-url = "VND.SUN.STAR.TDOC:/" segment *("/" segment)
    segment = *pchar
 
+   ; private (http://ubiqx.org/cifs/Appendix-D.html)
+   samba-url = smb://[[[authdomain;]user@]host[:port][/share[/path][/name]]][?context]
 
    ; private
    unknown-url = scheme ":" 1*uric
@@ -452,6 +454,8 @@ static INetURLObject::SchemeInfo const a
 		  false, false, false, false, false },
         { "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false,
           false, false, false, true, false },
+		{ "smb", "smb://", 139, true, true, false, true, true, true, true,
+		  false },
         { "", "", 0, false, false, false, false, false, false, false, false } };
 
 // static
@@ -2086,6 +2090,7 @@ INetURLObject::getPrefix(sal_Unicode con
 			  INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
 			{ "slot:", "staroffice.slot:", INET_PROT_SLOT,
 			  PrefixInfo::INTERNAL },
+			{ "smb:", 0, INET_PROT_SAMBA, PrefixInfo::OFFICIAL },
 			{ "staroffice.component:", ".component:", INET_PROT_COMPONENT,
 			  PrefixInfo::EXTERNAL },
 			{ "staroffice.db:", "db:", INET_PROT_DB, PrefixInfo::EXTERNAL },
@@ -2472,6 +2477,7 @@ bool INetURLObject::parsePath(INetProtoc
 			return false;
 
 		case INET_PROT_FTP:
+		case INET_PROT_SAMBA:
 		case INET_PROT_IMAP:
 			if (pPos < pEnd && *pPos != '/')
 				return false;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- openoffice.org.spec	22 Jun 2006 21:06:32 -0000	1.742
+++ openoffice.org.spec	26 Jun 2006 16:07:01 -0000	1.743
@@ -104,6 +104,7 @@
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
 Patch40: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
+Patch41: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -835,6 +836,7 @@
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
 %patch40 -p1 -b .ooo66018.linguistic.vorcrash.patch
+%patch41 -p1 -b .ooo65519.printing.samba.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:10:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:10:18 -0400
Subject: rpms/hplip/devel hplip.spec,1.85,1.86
Message-ID: <200606261610.k5QGAI60030315@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30279

Modified Files:
	hplip.spec 
Log Message:
- Fixed libsane-hpaio %post scriptlet (bug #196663).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- hplip.spec	26 Jun 2006 15:37:56 -0000	1.85
+++ hplip.spec	26 Jun 2006 16:10:15 -0000	1.86
@@ -174,13 +174,16 @@
 
 %post -n libsane-hpaio
 /sbin/ldconfig
-if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
+if [ -f /etc/sane.d/dll.conf ] && \
+   ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
         echo hpaio >> /etc/sane.d/dll.conf; \
 fi
+exit 0
 
 %changelog
 * Mon Jun 26 2006 Tim Waugh <twaugh at redhat.com>
 - Patchlevel 1.
+- Fixed libsane-hpaio %%post scriptlet (bug #196663).
 
 * Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-2
 - 1.6.6.



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:13:57 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.161,1.162
Message-ID: <200606261613.k5QGDvpM031719@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31690

Modified Files:
	gnbd-kernel.spec 
Log Message:
Added conditional buildrequires.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gnbd-kernel.spec	26 Jun 2006 15:18:07 -0000	1.161
+++ gnbd-kernel.spec	26 Jun 2006 16:13:54 -0000	1.162
@@ -25,19 +25,26 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.30
+Release: 5.FC5.31
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
 BuildRequires: kernel = %{kernel_version}
+
+%if %{buildsmp}
 BuildRequires: kernel-smp = %{kernel_version}
+BuildRequires: kernel-smp-devel = %{kernel_version}
+%endif
+
+%if %{buildxen}
 BuildRequires: kernel-xenU = %{kernel_version}
 BuildRequires: kernel-xen0 = %{kernel_version}
 BuildRequires: kernel-smp = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}
-BuildRequires: kernel-smp-devel = %{kernel_version}
 BuildRequires: kernel-xenU-devel = %{kernel_version}
 BuildRequires: kernel-xen0-devel = %{kernel_version}
+%endif
+
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: kernel = %{kernel_version}
@@ -45,7 +52,6 @@
 Prereq: /sbin/depmod
 Provides: gnbd-kernel-modules = %{version}-%{release}
 Provides: kernel-modules
-#ExclusiveArch: i586 i686 x86_64 ppc 
 ExclusiveArch: i686 x86_64
 Source0: %{name}-%{version}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:14:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:14:37 -0400
Subject: rpms/kernel/devel jwltest-ipw3945-1_0_5.patch,1.1.4.1,1.1.4.2
Message-ID: <200606261614.k5QGEZui032134@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32092

Modified Files:
      Tag: private-linville-jwltest-fc6-1-branch
	jwltest-ipw3945-1_0_5.patch 
Log Message:


jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |  106 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16651 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20702 insertions(+)

Index: jwltest-ipw3945-1_0_5.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/jwltest-ipw3945-1_0_5.patch,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- jwltest-ipw3945-1_0_5.patch	26 Jun 2006 15:27:28 -0000	1.1.4.1
+++ jwltest-ipw3945-1_0_5.patch	26 Jun 2006 16:14:32 -0000	1.1.4.2
@@ -1,5 +1,5 @@
---- linux-2.6.16.noarch/Documentation/networking/README.ipw3945.orig	2006-06-15 12:59:52.000000000 -0400
-+++ linux-2.6.16.noarch/Documentation/networking/README.ipw3945	2006-06-15 12:59:58.000000000 -0400
+--- linux-2.6.17.noarch/Documentation/networking/README.ipw3945.orig	2006-06-26 12:09:00.000000000 -0400
++++ linux-2.6.17.noarch/Documentation/networking/README.ipw3945	2006-06-26 12:09:05.000000000 -0400
 @@ -0,0 +1,998 @@
 +
 +Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
@@ -999,8 +999,8 @@
 +* Other names and brands may be claimed as the property of others.
 +
 +
---- linux-2.6.16.noarch/drivers/net/wireless/Makefile.orig	2006-06-15 12:58:45.000000000 -0400
-+++ linux-2.6.16.noarch/drivers/net/wireless/Makefile	2006-06-15 12:59:00.000000000 -0400
+--- linux-2.6.17.noarch/drivers/net/wireless/Makefile.orig	2006-06-26 12:09:00.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wireless/Makefile	2006-06-26 12:09:05.000000000 -0400
 @@ -6,6 +6,8 @@ obj-$(CONFIG_IPW2100) += ipw2100.o
  
  obj-$(CONFIG_IPW2200) += ipw2200.o
@@ -1010,9 +1010,9 @@
  obj-$(CONFIG_STRIP) += strip.o
  obj-$(CONFIG_ARLAN) += arlan.o 
  
---- linux-2.6.16.noarch/drivers/net/wireless/ipw3945.c.orig	2006-06-15 12:58:02.000000000 -0400
-+++ linux-2.6.16.noarch/drivers/net/wireless/ipw3945.c	2006-06-15 12:58:14.000000000 -0400
-@@ -0,0 +1,16645 @@
+--- linux-2.6.17.noarch/drivers/net/wireless/ipw3945.c.orig	2006-06-26 12:09:00.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wireless/ipw3945.c	2006-06-26 12:12:52.000000000 -0400
+@@ -0,0 +1,16651 @@
 +/******************************************************************************
 +
 +  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
@@ -5304,7 +5304,8 @@
 +			spin_lock_irqsave(&priv->lock, flags);
 +			rc = ieee80211_tx_frame(priv->ieee,
 +						(struct ieee80211_hdr
-+						 *)&frame, sizeof(frame));
++						 *)&frame, IEEE80211_3ADDR_LEN,
++						sizeof(frame), 0);
 +			spin_unlock_irqrestore(&priv->lock, flags);
 +		}
 +	}
@@ -5777,7 +5778,8 @@
 +		case DAEMON_FRAME_TX:
 +			ieee80211_tx_frame(priv->ieee, (struct ieee80211_hdr *)
 +					   daemon_cmd->cmd.data,
-+					   daemon_cmd->cmd.data_len);
++					   IEEE80211_3ADDR_LEN,
++					   daemon_cmd->cmd.data_len, 0);
 +			daemon_cmd->cmd.data_len = 0;
 +			spin_lock_irqsave(&priv->daemon_lock, flags);
 +			list_add_tail(&daemon_cmd->list,
@@ -10393,7 +10395,8 @@
 +				ieee80211_tx_frame(priv->ieee,
 +						   (struct ieee80211_hdr *)
 +						   priv->auth_frame,
-+						   skb_auth->len);
++						   IEEE80211_3ADDR_LEN,
++						   skb_auth->len, 0);
 +				dev_kfree_skb_any(skb_auth);
 +			      out_fail2:
 +				spin_unlock_irqrestore(&priv->lock, flags);
@@ -10438,7 +10441,8 @@
 +		if (len) {
 +			IPW_DEBUG_11H("Sending %d bytes.\n", len);
 +			spin_lock_irqsave(&priv->lock, flags);
-+			ieee80211_tx_frame(priv->ieee, &frame->u.frame, len);
++			ieee80211_tx_frame(priv->ieee, &frame->u.frame,
++					   IEEE80211_3ADDR_LEN, len, 0);
 +			spin_unlock_irqrestore(&priv->lock, flags);
 +		}
 +
@@ -10508,7 +10512,8 @@
 +		out_frame->u.frame.frame_ctl = IEEE80211_FTYPE_MGMT |
 +		    IEEE80211_STYPE_PROBE_RESP;
 +
-+		ieee80211_tx_frame(priv->ieee, &out_frame->u.frame, len);
++		ieee80211_tx_frame(priv->ieee, &out_frame->u.frame,
++				   IEEE80211_3ADDR_LEN, len, 0);
 +	}
 +
 +	ipw_free_frame(priv, out_frame);
@@ -10581,7 +10586,8 @@
 +	   priv->auth_state = CMAS_INIT;
 +
 +	   ieee80211_tx_frame(priv->ieee,
-+	   (struct ieee80211_hdr *)&frame, sizeof(frame));
++	   		      (struct ieee80211_hdr *)&frame, 
++			      IEEE80211_3ADDR_LEN, sizeof(frame), 0);
 +
 +	   return 0;
 +	 */
@@ -17658,9 +17664,9 @@
 +#endif
 +module_exit(ipw_exit);
 +module_init(ipw_init);
---- linux-2.6.16.noarch/drivers/net/wireless/Kconfig.orig	2006-06-15 12:56:54.000000000 -0400
-+++ linux-2.6.16.noarch/drivers/net/wireless/Kconfig	2006-06-15 12:57:43.000000000 -0400
-@@ -246,6 +246,112 @@ config IPW2200_MONITOR
+--- linux-2.6.17.noarch/drivers/net/wireless/Kconfig.orig	2006-06-26 12:09:00.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wireless/Kconfig	2006-06-26 12:09:06.000000000 -0400
+@@ -300,6 +300,112 @@ config IPW2200_MONITOR
  	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
  	  mode, no packets can be sent.
  
@@ -17773,8 +17779,8 @@
  config AIRO
  	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
   	depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN)
---- linux-2.6.16.noarch/drivers/net/wireless/ipw3945.h.orig	2006-06-15 12:58:04.000000000 -0400
-+++ linux-2.6.16.noarch/drivers/net/wireless/ipw3945.h	2006-06-15 12:58:14.000000000 -0400
+--- linux-2.6.17.noarch/drivers/net/wireless/ipw3945.h.orig	2006-06-26 12:09:00.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wireless/ipw3945.h	2006-06-26 12:09:06.000000000 -0400
 @@ -0,0 +1,2556 @@
 +/******************************************************************************
 +
@@ -20332,8 +20338,8 @@
 +#define IPW_RATE_SCALE_DECREASE_TH       1920
 +
 +#endif				/* __ipw3945_h__ */
---- linux-2.6.16.noarch/drivers/net/wireless/ipw3945_daemon.h.orig	2006-06-15 12:58:21.000000000 -0400
-+++ linux-2.6.16.noarch/drivers/net/wireless/ipw3945_daemon.h	2006-06-15 12:58:25.000000000 -0400
+--- linux-2.6.17.noarch/drivers/net/wireless/ipw3945_daemon.h.orig	2006-06-26 12:09:00.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wireless/ipw3945_daemon.h	2006-06-26 12:09:06.000000000 -0400
 @@ -0,0 +1,403 @@
 +/*
 +



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:19:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:19:23 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.162,1.163
Message-ID: <200606261619.k5QGJNO4016252@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16223

Modified Files:
	gnbd-kernel.spec 
Log Message:
Removed extraneous requires on kernel-smp.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnbd-kernel.spec	26 Jun 2006 16:13:54 -0000	1.162
+++ gnbd-kernel.spec	26 Jun 2006 16:19:20 -0000	1.163
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.31
+Release: 5.FC5.32
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -39,7 +39,6 @@
 %if %{buildxen}
 BuildRequires: kernel-xenU = %{kernel_version}
 BuildRequires: kernel-xen0 = %{kernel_version}
-BuildRequires: kernel-smp = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}
 BuildRequires: kernel-xenU-devel = %{kernel_version}
 BuildRequires: kernel-xen0-devel = %{kernel_version}



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:20:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:20:38 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.168,1.169
Message-ID: <200606261620.k5QGKcR9016782@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16752

Modified Files:
	cman-kernel.spec 
Log Message:
Add conditional buildrequires.


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- cman-kernel.spec	26 Jun 2006 15:17:49 -0000	1.168
+++ cman-kernel.spec	26 Jun 2006 16:20:35 -0000	1.169
@@ -26,18 +26,25 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.23
+Release: 0.FC5.24
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules
 BuildRequires: kernel = %{kernel_version}
+
+%if %{buildsmp}
 BuildRequires: kernel-smp = %{kernel_version}
+BuildRequires: kernel-smp-devel = %{kernel_version}
+%endif
+
+%if %{buildxen}
 BuildRequires: kernel-xen0 = %{kernel_version}
 BuildRequires: kernel-xenU = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}
-BuildRequires: kernel-smp-devel = %{kernel_version}
 BuildRequires: kernel-xen0-devel = %{kernel_version}
 BuildRequires: kernel-xenU-devel = %{kernel_version}
+%endif
+
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules GFS-modules-smp GFS-modules-hugemem
 Requires: kernel = %{kernel_version}
@@ -45,7 +52,6 @@
 Prereq: /sbin/depmod
 Provides: kernel-modules
 Provides: cman-kernel-modules = %{version}-%{release}
-#ExclusiveArch: i586 i686 x86_64 ppc ppc64
 ExclusiveArch: i686 x86_64
 Source0: %{name}-%{tempversion}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:34:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:34:37 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel-2.6.15-2.kernel-2.6.17.patch, NONE,
	1.1 gnbd-kernel.spec, 1.163, 1.164
Message-ID: <200606261634.k5QGYbbB020822@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20791

Modified Files:
	gnbd-kernel.spec 
Added Files:
	gnbd-kernel-2.6.15-2.kernel-2.6.17.patch 
Log Message:
Added patch for new kernel.

gnbd-kernel-2.6.15-2.kernel-2.6.17.patch:
 gnbd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnbd-kernel-2.6.15-2.kernel-2.6.17.patch ---
--- gnbd-kernel-2.6.15-2/src/gnbd.c.kernel2.6.17	2006-06-26 11:32:05.000000000 -0500
+++ gnbd-kernel-2.6.15-2/src/gnbd.c	2006-06-26 11:32:30.000000000 -0500
@@ -29,7 +29,7 @@
 #include <linux/in.h>
 #include <linux/buffer_head.h>
 #include <linux/miscdevice.h>
-
+#include <linux/moduleparam.h>
 #include <linux/devfs_fs_kernel.h>
 
 #include <asm/uaccess.h>
@@ -1048,6 +1048,6 @@ MODULE_DESCRIPTION("Network Block Device
 MODULE_LICENSE("GPL");
 
 #ifndef NDEBUG
-MODULE_PARM(debugflags, "i");
+module_param(debugflags, uint, 0644);
 MODULE_PARM_DESC(debugflags, "flags for controlling debug output");
 #endif


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnbd-kernel.spec	26 Jun 2006 16:19:20 -0000	1.163
+++ gnbd-kernel.spec	26 Jun 2006 16:34:28 -0000	1.164
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.32
+Release: 5.FC5.33
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -53,6 +53,7 @@
 Provides: kernel-modules
 ExclusiveArch: i686 x86_64
 Source0: %{name}-%{version}-%{subversion}.tar.gz
+Patch0: gnbd-kernel-2.6.15-2.kernel-2.6.17.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -107,6 +108,7 @@
 ################################################################################
 %prep
 %setup -q -n %{name}-%{version}-%{subversion}
+%patch0 -p1 -b .kernel-2.6.17
 
 ################################################################################
 ##  THE BUILD SECTION
@@ -222,6 +224,9 @@
 %{_includedir}/linux/gnbd.h
 
 %changelog
+* Mon Jun 26 2006 Chris Feist <cfeist at redhat.com>
+- Added patch for new kernel (2.6.17).
+
 * Fri Mar 31 2006 Chris Feist <cfeist at redhat.com>
 - Build xen for x86_64.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:54:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:54:04 -0400
Subject: rpms/qt/FC-5 qt-x11-free-3.3.6-strip.patch, NONE,
	1.1 qt-x11-free-3.3.6-uic-multilib.patch, NONE, 1.1 qt.csh,
	NONE, 1.1 qt.sh, NONE, 1.1 qt.spec, 1.103,
	1.104 qt-visibility.patch, 1.1,
	NONE qt-x11-free-3.3.0-strip.patch, 1.1, NONE
Message-ID: <200606261654.k5QGs4tU009650@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9579

Modified Files:
	qt.spec 
Added Files:
	qt-x11-free-3.3.6-strip.patch 
	qt-x11-free-3.3.6-uic-multilib.patch qt.csh qt.sh 
Removed Files:
	qt-visibility.patch qt-x11-free-3.3.0-strip.patch 
Log Message:
- fix #195410, don't strip binaries/libraries
- fix #156572, keyReleaseEvent issue


qt-x11-free-3.3.6-strip.patch:
 linux-g++-32/qmake.conf |    4 ++--
 linux-g++-64/qmake.conf |    4 ++--
 linux-g++/qmake.conf    |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-strip.patch ---
--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig	2006-06-21 15:37:53.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf	2006-06-21 15:38:02.000000000 +0200
@@ -84,7 +84,7 @@
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QMAKE_STRIP             =
+QMAKE_STRIPFLAGS_LIB 	+=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig	2006-06-21 15:37:09.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf	2006-06-21 15:37:19.000000000 +0200
@@ -84,7 +84,7 @@
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QMAKE_STRIP             =
+QMAKE_STRIPFLAGS_LIB 	+=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig	2006-06-21 15:36:23.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf	2006-06-21 15:36:56.000000000 +0200
@@ -87,7 +87,7 @@
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QMAKE_STRIP             =
+QMAKE_STRIPFLAGS_LIB 	+=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p

qt-x11-free-3.3.6-uic-multilib.patch:
 embed.cpp |    3 +--
 main.cpp  |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-uic-multilib.patch ---
--- qt-x11-free-3.3.6/tools/designer/uic/main.cpp.orig	2006-05-15 19:43:34.000000000 +0200
+++ qt-x11-free-3.3.6/tools/designer/uic/main.cpp	2006-05-15 19:45:24.000000000 +0200
@@ -316,8 +316,7 @@
 	out << "/****************************************************************************" << endl;
 	out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
 	out << "**" << endl;
-	out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
-	out << "**      by: The User Interface Compiler ($Id: qt/main.cpp   3.3.6   edited Aug 31 2005 $)" << endl;
+	out << "** Created by: The User Interface Compiler ($Id: qt/main.cpp   3.3.6   edited Aug 31 2005 $)" << endl;
 	out << "**" << endl;
 	out << "** WARNING! All changes made in this file will be lost!" << endl;
 	out << "****************************************************************************/" << endl << endl;
--- qt-x11-free-3.3.6/tools/designer/uic/embed.cpp.orig	2006-05-15 19:45:32.000000000 +0200
+++ qt-x11-free-3.3.6/tools/designer/uic/embed.cpp	2006-05-15 19:46:07.000000000 +0200
@@ -130,8 +130,7 @@
     for ( it = images.begin(); it != images.end(); ++it )
 	out << "**      " << *it << "\n";
     out << "**\n";
-    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
-    out << "**      by: The User Interface Compiler ($Id: qt/embed.cpp   3.3.6   edited Aug 31 2005 $)\n";
+    out << "** Created by: The User Interface Compiler ($Id: qt/embed.cpp   3.3.6   edited Aug 31 2005 $)\n";
     out << "**\n";
     out << "** WARNING! All changes made in this file will be lost!\n";
     out << "****************************************************************************/\n";


--- NEW FILE qt.csh ---
# Qt initialization script (csh)

set qt_prefix = `/usr/bin/pkg-config --variable=prefix qt-mt`

if ( "${path}" !~ *$qt_prefix/bin* ) then
   set path = ( $qt_prefix/bin $path )
endif

if ( $?QTDIR ) then
   exit
endif

setenv QTDIR $qt_prefix
setenv QTINC $qt_prefix/include
setenv QTLIB $qt_prefix/lib


--- NEW FILE qt.sh ---
# Qt initialization script (sh)

qt_prefix=`/usr/bin/pkg-config --variable=prefix qt-mt`

if ! echo ${PATH} | /bin/grep -q $qt_prefix/bin ; then
   PATH=$qt_prefix/bin:${PATH}
fi

if [ -z "$QTDIR" ] ; then
	QTDIR="$qt_prefix"
	QTINC="$qt_prefix/include"
	QTLIB="$qt_prefix/lib"
fi

export QTDIR QTINC QTLIB PATH


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- qt.spec	8 Jun 2006 17:58:23 -0000	1.103
+++ qt.spec	26 Jun 2006 16:54:01 -0000	1.104
@@ -13,12 +13,6 @@
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
 
-# build Motif extention
-%define motif_extention 0
-
-# pkg-config
-%define pkg_config 1
-
 # install manuals
 %define installman 1
 
@@ -37,9 +31,6 @@
 # cups support
 %define cups 1
 
-# visibility
-%define enable_hidden_visibility 0
-
 %define debug 0
 
 %define sover %{ver}
@@ -85,19 +76,21 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 0.1.fc5
+Release: 0.2.fc5
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Url: http://www.troll.no
-Source: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
+Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
 Source1: qtrc
+Source2: qt.sh
+Source3: qt.csh
 
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
 Patch3: qt-3.1.0-makefile.patch
-Patch5: qt-x11-free-3.3.0-strip.patch
+Patch5: qt-x11-free-3.3.6-strip.patch
 Patch7: qt-x11-free-3.3.2-quiet.patch
 Patch8: qt-x11-free-3.3.3-qembed.patch
 Patch12: qt-uic-nostdlib.patch
@@ -105,14 +98,15 @@
 Patch14: qt-x11-free-3.3.3-gl.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
 Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
-Patch23: qt-visibility.patch
 Patch24: qt-x11-free-3.3.5-uic.patch
+Patch25: qt-x11-free-3.3.6-uic-multilib.patch
 
 # immodule patches
 Patch50: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch
 Patch51: qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
 Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
 Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
+Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
@@ -125,9 +119,9 @@
 
 Prefix: %{qtdir}
 
-Prereq: /sbin/ldconfig
-Prereq: fileutils
-
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: fileutils
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
@@ -156,14 +150,11 @@
 BuildRequires: libSM-devel
 BuildRequires: libICE-devel
 BuildRequires: libXt-devel
+BuildRequires: libXmu-devel
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 
-%if %{motif_extention}
-BuildRequires: openmotif-devel >= 2.2.2
-%endif
-
 %if %{desktop_file}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
@@ -209,6 +200,7 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: libmng-devel
+Requires: pkgconfig
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
 
@@ -340,11 +332,8 @@
 %patch19 -p1 -b .gtk
 %patch20 -p1 -b .gcc4-buildkey
 
-%if %{enable_hidden_visibility}
-%patch23 -p1 -b .hidden_visibility
-%endif
-
 %patch24 -p1 -b .uic
+%patch25 -p1 -b .uic-multilib
 
 %if %{immodule}
 %patch50 -p1 -b .pre
@@ -378,11 +367,22 @@
    sh ./make-symlinks.sh
 %endif
 
+# set correct X11 prefix
+perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
+perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
+perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
+perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
+
 # don't use rpath
 perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
 
+
+%if ! %{debug}
+disable_warning="-DQT_NO_CHECK"
+%endif
+
 # set correct FLAGS
-perl -pi -e "s|-O2|$INCLUDES $RPM_OPT_FLAGS|g" mkspecs/*/qmake.conf
+perl -pi -e "s|-O2|$INCLUDES %{optflags} $disable_warning|g" mkspecs/*/qmake.conf
 
 # set correct lib path
 if [ "%{_lib}" == "lib64" ] ; then
@@ -469,11 +469,6 @@
 make $SMP_MFLAGS sub-src
 make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
 
-# build Xt/Motif Extention
-%if %{motif_extention}
-   make -C extensions/motif/src $SMP_MFLAGS
-%endif
-
 %install
 rm -rf %{buildroot}
 
@@ -488,14 +483,7 @@
    install bin/$i %{buildroot}%{qtdir}/bin/
 done
 
-%if ! %{pkg_config}
-   rm -rf %{buildroot}%{_libdir}/pkgconfig
-%else
-   mkdir -p  %{buildroot}%{_libdir}/pkgconfig
-   pushd %{buildroot}%{_libdir}/pkgconfig
-   ln -sf ../%{qt_dirname}/lib/pkgconfig/* .
-popd
-%endif
+mv %{buildroot}%{qt_dirname}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 # install man pages
 %if %{installman}
@@ -523,27 +511,7 @@
 done
 
 mkdir -p %{buildroot}/etc/profile.d
-cat > %{buildroot}/etc/profile.d/%{name}.sh <<EOF
-# Qt initialization script (sh)
-if [ -z "\$QTDIR" ] ; then
-	QTDIR="%{qtdir}"
-	QTINC="%{qtdir}/include"
-	QTLIB="%{qtdir}/lib"
-fi
-export QTDIR QTINC QTLIB
-EOF
-
-cat > %{buildroot}/etc/profile.d/%{name}.csh <<EOF
-# Qt initialization script (csh)
-if ( \$?QTDIR ) then
-         exit
-endif
-setenv QTDIR %{qtdir}
-setenv QTINC %{qtdir}/include
-setenv QTLIB %{qtdir}/lib
-EOF
-
-chmod 755 %{buildroot}/etc/profile.d/*
+install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
 
 mkdir -p %{buildroot}%{_bindir}
 for i in bin/*; do
@@ -669,23 +637,11 @@
 %{_bindir}/linguist
 %{_bindir}/lrelease
 %{_bindir}/lupdate
-%if %{pkg_config}
 %{_libdir}/pkgconfig/*
-%{qtdir}/lib/pkgconfig
-%endif
 %doc doc/html
 %doc examples
 %doc tutorial
 
-%if %{motif_extention}
-%post Xt -p /sbin/ldconfig
-%postun Xt -p /sbin/ldconfig
-
-%files Xt
-%defattr(-,root,root,-)
-%{qtdir}/lib/libqmotif.so*
-%endif
-
 
 %if %{styleplugins}
 %files styles
@@ -731,6 +687,10 @@
 
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.2.fc5
+- fix #195410, don't strip binaries/libraries
+- fix #156572, keyReleaseEvent issue
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.1.fc5
 - update to 3.3.6
 


--- qt-visibility.patch DELETED ---


--- qt-x11-free-3.3.0-strip.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:54:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:54:35 -0400
Subject: rpms/qt/FC-5 qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff,
	NONE, 1.1
Message-ID: <200606261654.k5QGsZE1009880@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9826

Added Files:
	qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff 
Log Message:
- fix #195410, don't strip binaries/libraries
- fix #156572, keyReleaseEvent issue


qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff:
 qapplication_x11.cpp |    9 +++------
 qwidget_x11.cpp      |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff ---
--- qt-x11-free-3.3.6/src/kernel/qapplication_x11.cpp.orig	2006-06-20 15:45:44.000000000 +0200
+++ qt-x11-free-3.3.6/src/kernel/qapplication_x11.cpp	2006-06-20 15:51:13.000000000 +0200
@@ -3294,11 +3294,7 @@
     // filtering opportunity first to ensure all input methods work
     // properly regardless of application design.
 
-#ifndef QT_NO_IM_EXTENSIONS
     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
-#else
-    if( keywidget && keywidget->isEnabled() ) {
-#endif
 	if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
 	    sm_blockUserInput ) // block user interaction during session management
 	    return TRUE;
@@ -5220,11 +5216,12 @@
     } else {
 	key = (int)(long)keyDict->find( keycode );
 	if ( key )
-	    if( !willRepeat ) // Take out key of dictionary only if this call.
+	    if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
 		keyDict->take( keycode );
 	long s = (long)textDict->find( keycode );
 	if ( s ) {
-	    textDict->take( keycode );
+	    if( statefulTranslation )
+	        textDict->take( keycode );
 	    ascii = (char)(s-256);
 	}
     }
--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp.orig	2006-06-20 15:46:49.000000000 +0200
+++ qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp	2006-06-20 15:48:14.000000000 +0200
@@ -2699,11 +2699,10 @@
 {
     QInputContext *qic = 0;
 
-#if !defined(QT_NO_IM_EXTENSIONS)
     if ( isInputMethodEnabled() ) {
+#if !defined(QT_NO_IM_EXTENSIONS)
 	qic = icHolderWidget()->ic;
 #else
-    {
 	// icHolderWidget is always topLevelWidget
 	QTLWExtra *topdata = icHolderWidget()->topData();
 	qic = (QInputContext *)topdata->xic;
@@ -2754,10 +2753,8 @@
 */
 void QWidget::createInputContext()
 {
-#if !defined(QT_NO_IM_EXTENSIONS)
     if( !isInputMethodEnabled() || QApplication::closingDown() )
 	return;
-#endif
 
     QWidget *icWidget = icHolderWidget();
 #ifndef QT_NO_IM



From fedora-cvs-commits at redhat.com  Mon Jun 26 16:55:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 12:55:26 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.3.diff, NONE,
	1.1 kdenetwork.spec, 1.80, 1.81
Message-ID: <200606261655.k5QGtQFh010264@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10204

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.3.diff 
Log Message:
apply patch to check return value


kdenetwork-3.5.3.diff:
 kppp/accounts.cpp               |    8 +++++++-
 kppp/main.cpp                   |    9 ++++++++-
 lanbrowsing/lisa/main.cpp       |    6 +++++-
 lanbrowsing/lisa/netscanner.cpp |   11 -----------
 4 files changed, 20 insertions(+), 14 deletions(-)

--- NEW FILE kdenetwork-3.5.3.diff ---
Index: kppp/accounts.cpp
===================================================================
--- kppp/accounts.cpp	(revision 549512)
+++ kppp/accounts.cpp	(working copy)
@@ -41,6 +41,8 @@
 #include <kstdguiitem.h>
 #include <qvgroupbox.h>
 
+#include <errno.h>
+
 #include "pppdata.h"
 #include "accounts.h"
 #include "accounting.h"
@@ -211,8 +213,12 @@ void AccountWidget::viewLogClicked(){
 
     QApplication::flushX();
     if(fork() == 0) {
-      setgid(getgid());
+      if (setgid(getgid()) < 0 && errno != EPERM)
+        _exit(2);
       setuid(getuid());
+      if( geteuid() != getuid() )
+        _exit(1);
+      // TODO: use execvp
       system("kppplogview -kppp");
       _exit(0);
     }
Index: kppp/main.cpp
===================================================================
--- kppp/main.cpp	(revision 549512)
+++ kppp/main.cpp	(working copy)
@@ -177,8 +177,15 @@ int main( int argc, char **argv ) {
 
   // drop setuid status
   euid = geteuid();
-  setgid(getgid());
+  if (setgid(getgid()) < 0 && errno != EPERM) {
+    perror("setgid() failed");
+    exit(1);
+  }
   setuid(getuid());
+  if (geteuid() != getuid()) {
+    perror("setuid() failed");
+    exit(1);
+  }
 
   //
   // end of setuid-dropping block.
Index: lanbrowsing/lisa/netscanner.cpp
===================================================================
--- lanbrowsing/lisa/netscanner.cpp	(revision 549512)
+++ lanbrowsing/lisa/netscanner.cpp	(working copy)
@@ -471,17 +471,6 @@ void NetScanner::pingScan(std::list<Node
    MyString dummy("");
    mdcerr<<"pingScan: m_maxPings: "<<m_maxPings<<std::endl;
 
-/*   int bufferSize(60*1024);
-   mdcerr<<"NetScanner::pingScan: regaining root privileges for setting up the icmp socket"<<std::endl;
-   seteuid(0);
-   int sockFD=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP);
-   mdcerr<<"NetScanner::pingScan: setsockopt returns "<<setsockopt(sockFD,SOL_SOCKET,SO_RCVBUF,&bufferSize,sizeof(bufferSize))<<std::endl;
-   //make the socket non-blocking
-   //long int options = O_NONBLOCK | ::fcntl(sockFD, F_GETFL);
-   //mdcerr<<"NetScanner::pingScan:: made it non blocking: "<<::fcntl(sockFD, F_SETFL, options )<<std::endl;
-   seteuid(getuid());
-   mdcerr<<"NetScanner::pingScan: dropped root privileges again"<<std::endl;*/
-
    pid_t pid=getpid();
    ICMPEchoRequest echo;
    echo.type=ICMP_ECHO;
Index: lanbrowsing/lisa/main.cpp
===================================================================
--- lanbrowsing/lisa/main.cpp	(revision 549512)
+++ lanbrowsing/lisa/main.cpp	(working copy)
@@ -257,8 +257,12 @@ int main(int argc, char** argv)
    //for creating a raw socket
 
    //now dropping root privileges once and ever
-   setuid(getuid());
    
+   
+   setuid(getuid());
+   if (geteuid() != getuid())
+     _exit(255);
+
    //according to R. Stevens the following three lines 
    //make daemons feel good :)
    setsid();


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdenetwork.spec	8 Jun 2006 22:04:35 -0000	1.80
+++ kdenetwork.spec	26 Jun 2006 16:55:24 -0000	1.81
@@ -3,7 +3,6 @@
 %define arts 1
 %define libidn 1
 %define make_cvs 1
-%define xmms 0
 
 %define qt_version 3.3.6
 %define kdelibs_epoch 6
@@ -12,19 +11,17 @@
 
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdenetwork
 Version: 3.5.3
-Release: 2
+Release: 3
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kppp.pamd
 Source2: ktalk
 Source4: lisarc
@@ -37,6 +34,9 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
+# upstream patches
+Patch100: kdenetwork-3.5.3.diff
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -56,11 +56,7 @@
 BuildRequires: libXmu-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXtst-devel
-%if %{xmms}
-BuildRequires: xmms-devel
-%else
-Obsoletes: kdenetwork-nowlistening
-%endif
+BuildRequires: openssl-devel
 
 %description
 Networking applications for the K Desktop Environment.
@@ -75,16 +71,6 @@
 Development files for kdenetwork. Install kdenetwork-devel if you wish
 to develop or compile KDE networking applications.
 
-%if %{xmms}
-%package nowlistening
-Summary: Xmms plugin for Kopete
-Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description nowlistening
-Xmms plugin for Kopete
-%endif
-
 %prep
 %setup -q
 %patch0 -p1 -b .dt
@@ -94,11 +80,10 @@
 %patch4 -p1 -b .ppp
 %patch5 -p1 -b .libgadu-va_copy
 
-find -name CVS | xargs rm -rf 
+# upstream patches
+%patch100 -p0 -b .setuid-check
 
-%if !%{xmms}
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
-%endif
+echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -107,19 +92,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="%{optflags}"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-export KDEDIR=%{_prefix}
-export LDFLAGS="$LDFLAGS `krb5-config --libs`"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --enable-gcc-hidden-visibility \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -130,7 +107,6 @@
 %if %{final}
    --enable-final \
 %endif
-   --with-qt-libraries=$QTDIR/lib \
    --includedir=%{_includedir}/kde
 
 # ld breaks with -fPIC on ppc, workaround
@@ -186,29 +162,39 @@
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add lisa
-exit 0
+/sbin/chkconfig --add lisa ||:
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %preun
 if [ "$1" = "0" ]; then
-    /sbin/chkconfig --del lisa
+    /sbin/chkconfig --del lisa ||:
+    /sbin/service lisa stop > /dev/null 2>&1 ||:
 fi
-exit 0
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING README
+%doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/security/console.apps/kppp
 %config(noreplace) /etc/pam.d/kppp
 %config(noreplace) %{_sysconfdir}/lisarc
 %config %{_sysconfdir}/rc.d/init.d/lisa
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
-%doc %{_docdir}/HTML/en/*
 %{_libdir}/*.so.*
 %{_libdir}/libkdeinit_*
 %{_libdir}/*.la
@@ -238,17 +224,10 @@
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*
 
-%if %{xmms}
-%files nowlistening
-%defattr(-,root,root)
-%{_datadir}/apps/kopete/*nowlisteningchatui*
-%{_datadir}/apps/kopete/*nowlisteningui*
-%{_datadir}/services/kconfiguredialog/*nowlistening*
-%{_datadir}/services/*nowlistening*
-%{_libdir}/kde3/*nowlistening*
-%endif
-
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 7:3.5.3-3
+- apply patch to check return value
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
 - enable --enable-new-ldflags again since ld bug fixed
 - move only *.so symlinks to -devel subpackage



From fedora-cvs-commits at redhat.com  Mon Jun 26 17:26:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 13:26:15 -0400
Subject: rpms/iprutils/devel .cvsignore, 1.11, 1.12 iprutils.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200606261726.k5QHQF4W011264@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11250

Modified Files:
	.cvsignore iprutils.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Dec 2005 10:22:00 -0000	1.11
+++ .cvsignore	26 Jun 2006 17:26:13 -0000	1.12
@@ -6,3 +6,4 @@
 iprutils-2.0.14-src.tgz
 iprutils-2.0.15.3-src.tgz
 iprutils-2.1.1-src.tgz
+iprutils-2.1.4-src.tgz


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- iprutils.spec	11 Feb 2006 03:37:19 -0000	1.17
+++ iprutils.spec	26 Jun 2006 17:26:13 -0000	1.18
@@ -1,8 +1,8 @@
 ExclusiveArch: ppc ppc64
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
-Version: 2.1.1
-Release: 1.2
+Version: 2.1.4
+Release: 1
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -55,6 +55,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Jun 26 2006 Paul Nasrat <pnasrat at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Dec 2005 10:22:00 -0000	1.12
+++ sources	26 Jun 2006 17:26:13 -0000	1.13
@@ -1,2 +1 @@
-0d5c47fad38113bb315309e1a94980ba  iprutils-2.0.15.3-src.tgz
-e4786adda2d85f562e718167a00d16ca  iprutils-2.1.1-src.tgz
+37cdb233e1dfbd42143541feb3a0d3c3  iprutils-2.1.4-src.tgz



From fedora-cvs-commits at redhat.com  Mon Jun 26 17:26:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 13:26:35 -0400
Subject: rpms/kernel/devel ipsec-lspp-38.patch, NONE, 1.1.2.1 kernel-2.6.spec,
	1.2293.2.2, 1.2293.2.3
Message-ID: <200606261726.k5QHQZhH011320@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11276

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	ipsec-lspp-38.patch 
Log Message:
* Mon Jun 26 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.39, ipsec xfrm patch from Venkat



ipsec-lspp-38.patch:
 include/linux/security.h                     |  116 +++++++++++++--
 include/net/flow.h                           |    5 
 include/net/sock.h                           |    9 +
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/key/af_key.c                             |   22 +++
 net/xfrm/xfrm_policy.c                       |   28 ++-
 net/xfrm/xfrm_state.c                        |   12 +
 net/xfrm/xfrm_user.c                         |   45 +++---
 security/dummy.c                             |   28 +++
 security/selinux/hooks.c                     |   34 +++-
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   22 ++-
 security/selinux/ss/mls.c                    |   20 --
 security/selinux/ss/mls.h                    |   20 ++
 security/selinux/ss/services.c               |   48 ++++++
 security/selinux/xfrm.c                      |  198 ++++++++++++++++++++++-----
 20 files changed, 498 insertions(+), 123 deletions(-)

--- NEW FILE ipsec-lspp-38.patch ---
>From vyekkirala at trustedcs.com Mon Jun 26 11:08:18 2006
Return-Path: <vyekkirala at trustedcs.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Mon, 26 Jun 2006 11:08:45 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5QF8isM018858
	for <sgrubb at boston.redhat.com>; Mon, 26 Jun 2006 11:08:44 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5QF8ioI015088
	for <sgrubb at redhat.com>; Mon, 26 Jun 2006 11:08:44 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5QF8fhY007948
	for <sgrubb at redhat.com>; Mon, 26 Jun 2006 11:08:41 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k5QF8aZB031140
	for <sgrubb at redhat.com>; Mon, 26 Jun 2006 11:08:36 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap (V1.3)
	id (null); Mon Jun 26 11:08:21 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by trauma.tcs-sec.com with NetIQ MailMarshal (v6,0,3,8)
	id <B449ff8650000>; Mon, 26 Jun 2006 11:08:21 -0400
Received: from [10.1.10.204] (VYEKKIRALA-PC [10.1.10.204]) by chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13)
	id N4CXJFAS; Mon, 26 Jun 2006 11:08:20 -0400
Message-ID: <449FF862.6020003 at trustedcs.com>
Date: Mon, 26 Jun 2006 10:08:18 -0500
From: Venkat Yekkirala <vyekkirala at trustedcs.com>
User-Agent: Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version: 1.0
To: sgrubb at redhat.com
CC: chanson at trustedcs.com,
 dgoeddel at trustedcs.com
Subject: IPSec patch relative to lspp-38
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-UID: 71651
X-Length: 44440

--- linux-2.6.17.i686.vanilla/include/linux/security.h	2006-06-26 09:54:07.000000000 -0500
+++ linux-2.6.17.i686/include/linux/security.h	2006-06-22 17:45:56.000000000 -0500
@@ -31,6 +31,7 @@
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
+#include <linux/xfrm.h>
 
 struct ctl_table;
 
@@ -795,6 +796,8 @@ struct swap_info_struct;
  *      which is used to copy security attributes between local stream sockets.
  * @sk_free_security:
  *	Deallocate security structure.
+ * @sk_clone_security:
+ *	Clone/copy security structure.
  * @sk_getsid:
  *	Retrieve the LSM-specific sid for the sock to enable caching of network
  *	authorizations.
@@ -806,9 +809,8 @@ struct swap_info_struct;
  *	used by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level policy update program (e.g., setkey).
- *	Allocate a security structure to the xp->selector.security field.
- *	The security field is initialized to NULL when the xfrm_policy is
- *	allocated.
+ *	Allocate a security structure to the xp->security field; the security
+ *	field is initialized to NULL when the xfrm_policy is allocated.
  *	Return 0 if operation was successful (memory to allocate, legal context)
  * @xfrm_policy_clone_security:
  *	@old contains an existing xfrm_policy in the SPD.
@@ -824,9 +826,14 @@ struct swap_info_struct;
  *	Database by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level SA generation program (e.g., setkey or racoon).
- *	Allocate a security structure to the x->sel.security field.  The
- *	security field is initialized to NULL when the xfrm_state is
- *	allocated.
+ *	@polsec contains the security context information associated with a xfrm
+ *	policy rule from which to take the base context. polsec must be NULL
+ *	when sec_ctx is specified.
+ *	@sid contains the sid from which to take the mls portion of the context.
+ *	Allocate a security structure to the x->security field; the security
+ *	field is initialized to NULL when the xfrm_state is allocated. Set the
+ *	context to correspond to either sec_ctx or polsec, with the mls portion
+ *	taken from sid in the latter case.
  *	Return 0 if operation was successful (memory to allocate, legal context).
  * @xfrm_state_free_security:
  *	@x contains the xfrm_state.
@@ -834,13 +841,26 @@ struct swap_info_struct;
  * @xfrm_policy_lookup:
  *	@xp contains the xfrm_policy for which the access control is being
  *	checked.
- *	@sk_sid contains the sock security label that is used to authorize
+ *	@fl_sid contains the flow security label that is used to authorize
  *	access to the policy xp.
  *	@dir contains the direction of the flow (input or output).
- *	Check permission when a sock selects a xfrm_policy for processing
+ *	Check permission when a flow selects a xfrm_policy for processing
  *	XFRMs on a packet.  The hook is called when selecting either a
  *	per-socket policy or a generic xfrm policy.
  *	Return 0 if permission is granted.
+ * @xfrm_state_pol_flow_match:
+ *	@x contains the state to match.
+ *	@xp contains the policy to check for a match.
+ *	@fl contains the flow to check for a match.
+ *	Return 1 if there is a match.
+ * @xfrm_flow_state_match:
+ *	@fl contains the flow key to match.
+ *	@xfrm points to the xfrm_state to match.
+ *	Return 1 if there is a match.
+ * @xfrm_decode_session:
+ *	@skb points to skb to decode.
+ *	@fl points to the flow key to set.
+ *	Return 0 if successful decoding.
  *
  * Security hooks affecting all Key Management operations
  *
@@ -1292,6 +1312,7 @@ struct security_operations {
 	int (*socket_getpeersec_dgram) (struct sk_buff *skb, char **secdata, u32 *seclen);
 	int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
 	void (*sk_free_security) (struct sock *sk);
+	void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
 	unsigned int (*sk_getsid) (struct sock *sk, struct flowi *fl, u8 dir);
 #endif	/* CONFIG_SECURITY_NETWORK */
 
@@ -1299,9 +1320,15 @@ struct security_operations {
 	int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
 	int (*xfrm_policy_clone_security) (struct xfrm_policy *old, struct xfrm_policy *new);
 	void (*xfrm_policy_free_security) (struct xfrm_policy *xp);
-	int (*xfrm_state_alloc_security) (struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx);
+	int (*xfrm_state_alloc_security) (struct xfrm_state *x,
+		struct xfrm_user_sec_ctx *sec_ctx, struct xfrm_sec_ctx *polsec,
+		u32 sid);
 	void (*xfrm_state_free_security) (struct xfrm_state *x);
-	int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 sk_sid, u8 dir);
+	int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 fl_sid, u8 dir);
+	int (*xfrm_state_pol_flow_match)(struct xfrm_state *x,
+			struct xfrm_policy *xp, struct flowi *fl);
+	int (*xfrm_flow_state_match)(struct flowi *fl, struct xfrm_state *xfrm);
+	int (*xfrm_decode_session)(struct sk_buff *skb, struct flowi *fl);
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 
 	/* key management security hooks */
@@ -2786,6 +2813,11 @@ static inline void security_sk_free(stru
 	return security_ops->sk_free_security(sk);
 }
 
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+	return security_ops->sk_clone_security(sk, newsk);
+}
+
 static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	return security_ops->sk_getsid(sk, fl, dir);
@@ -2913,6 +2945,10 @@ static inline void security_sk_free(stru
 {
 }
 
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+}
+
 static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	return 0;
@@ -2935,9 +2971,16 @@ static inline void security_xfrm_policy_
 	security_ops->xfrm_policy_free_security(xp);
 }
 
-static inline int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static inline int security_xfrm_state_alloc(struct xfrm_state *x,
+			struct xfrm_user_sec_ctx *sec_ctx)
+{
+	return security_ops->xfrm_state_alloc_security(x, sec_ctx, NULL, 0);
+}
+
+static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
+				struct xfrm_sec_ctx *polsec, u32 sid)
 {
-	return security_ops->xfrm_state_alloc_security(x, sec_ctx);
+	return security_ops->xfrm_state_alloc_security(x, NULL, polsec, sid);
 }
 
 static inline void security_xfrm_state_free(struct xfrm_state *x)
@@ -2945,9 +2988,25 @@ static inline void security_xfrm_state_f
 	security_ops->xfrm_state_free_security(x);
 }
 
-static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir)
+{
+	return security_ops->xfrm_policy_lookup(xp, fl_sid, dir);
+}
+
+static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
+			struct xfrm_policy *xp, struct flowi *fl)
 {
-	return security_ops->xfrm_policy_lookup(xp, sk_sid, dir);
+	return security_ops->xfrm_state_pol_flow_match(x, xp, fl);
+}
+
+static inline int security_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+	return security_ops->xfrm_flow_state_match(fl, xfrm);
+}
+
+static inline int security_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	return security_ops->xfrm_decode_session(skb, fl);
 }
 #else	/* CONFIG_SECURITY_NETWORK_XFRM */
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
@@ -2964,7 +3023,14 @@ static inline void security_xfrm_policy_
 {
 }
 
-static inline int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static inline int security_xfrm_state_alloc(struct xfrm_state *x,
+					struct xfrm_user_sec_ctx *sec_ctx)
+{
+	return 0;
+}
+
+static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
+					struct xfrm_sec_ctx *polsec, u32 sid)
 {
 	return 0;
 }
@@ -2973,10 +3039,28 @@ static inline void security_xfrm_state_f
 {
 }
 
-static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir)
 {
 	return 0;
 }
+
+static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
+			struct xfrm_policy *xp, struct flowi *fl)
+{
+	return 1;
+}
+
+static inline int security_xfrm_flow_state_match(struct flowi *fl,
+                                struct xfrm_state *xfrm)
+{
+	return 1;
+}
+
+static inline int security_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	return 0;
+}
+
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 
 #ifdef CONFIG_KEYS
--- linux-2.6.17.i686.vanilla/include/net/flow.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/include/net/flow.h	2006-06-22 16:56:38.000000000 -0500
@@ -78,6 +78,7 @@ struct flowi {
 #define fl_icmp_type	uli_u.icmpt.type
 #define fl_icmp_code	uli_u.icmpt.code
 #define fl_ipsec_spi	uli_u.spi
+	__u32           sid;
 } __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 #define FLOW_DIR_IN	0
@@ -85,10 +86,10 @@ struct flowi {
 #define FLOW_DIR_FWD	2
 
 struct sock;
-typedef void (*flow_resolve_t)(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+typedef void (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
 			       void **objp, atomic_t **obj_refp);
 
-extern void *flow_cache_lookup(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
 	 		       flow_resolve_t resolver);
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;
--- linux-2.6.17.i686.vanilla/include/net/sock.h	2006-06-26 09:53:50.000000000 -0500
+++ linux-2.6.17.i686/include/net/sock.h	2006-06-23 10:14:06.000000000 -0500
@@ -968,6 +968,15 @@ static inline void sock_graft(struct soc
 	write_unlock_bh(&sk->sk_callback_lock);
 }
 
+static inline void sock_copy(struct sock *nsk, const struct sock *osk)
+{
+	void *sptr = nsk->sk_security;
+
+	memcpy(nsk, osk, osk->sk_prot->obj_size);
+	nsk->sk_security = sptr;
+	security_sk_clone(osk, nsk);
+}
+
 extern int sock_i_uid(struct sock *sk);
 extern unsigned long sock_i_ino(struct sock *sk);
 
--- linux-2.6.17.i686.vanilla/net/core/flow.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/core/flow.c	2006-06-22 16:56:38.000000000 -0500
@@ -32,7 +32,6 @@ struct flow_cache_entry {
 	u8			dir;
 	struct flowi		key;
 	u32			genid;
-	u32			sk_sid;
 	void			*object;
 	atomic_t		*object_ref;
 };
@@ -165,7 +164,7 @@ static int flow_key_compare(struct flowi
 	return 0;
 }
 
-void *flow_cache_lookup(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
 			flow_resolve_t resolver)
 {
 	struct flow_cache_entry *fle, **head;
@@ -189,7 +188,6 @@ void *flow_cache_lookup(struct flowi *ke
 	for (fle = *head; fle; fle = fle->next) {
 		if (fle->family == family &&
 		    fle->dir == dir &&
-		    fle->sk_sid == sk_sid &&
 		    flow_key_compare(key, &fle->key) == 0) {
 			if (fle->genid == atomic_read(&flow_cache_genid)) {
 				void *ret = fle->object;
@@ -214,7 +212,6 @@ void *flow_cache_lookup(struct flowi *ke
 			*head = fle;
 			fle->family = family;
 			fle->dir = dir;
-			fle->sk_sid = sk_sid;
 			memcpy(&fle->key, key, sizeof(*key));
 			fle->object = NULL;
 			flow_count(cpu)++;
@@ -226,7 +223,7 @@ nocache:
 		void *obj;
 		atomic_t *obj_ref;
 
-		resolver(key, sk_sid, family, dir, &obj, &obj_ref);
+		resolver(key, family, dir, &obj, &obj_ref);
 
 		if (fle) {
 			fle->genid = atomic_read(&flow_cache_genid);
--- linux-2.6.17.i686.vanilla/net/core/sock.c	2006-06-26 09:53:50.000000000 -0500
+++ linux-2.6.17.i686/net/core/sock.c	2006-06-22 16:56:38.000000000 -0500
@@ -820,7 +820,7 @@ struct sock *sk_clone(struct sock *sk, c
 	if (newsk != NULL) {
 		struct sk_filter *filter;
 
-		memcpy(newsk, sk, sk->sk_prot->obj_size);
+		sock_copy(newsk, sk);
 
 		/* SANITY */
 		sk_node_init(&newsk->sk_node);
--- linux-2.6.17.i686.vanilla/net/key/af_key.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/key/af_key.c	2006-06-22 16:56:38.000000000 -0500
@@ -2704,6 +2704,9 @@ static int pfkey_send_acquire(struct xfr
 #endif
 	int sockaddr_size;
 	int size;
+	struct sadb_x_sec_ctx *sec_ctx;
+	struct xfrm_sec_ctx *xfrm_ctx;
+	int ctx_size = 0;
 	
 	sockaddr_size = pfkey_sockaddr_size(x->props.family);
 	if (!sockaddr_size)
@@ -2719,6 +2722,11 @@ static int pfkey_send_acquire(struct xfr
 	else if (x->id.proto == IPPROTO_ESP)
 		size += count_esp_combs(t);
 
+	if ((xfrm_ctx = x->security)) {
+		ctx_size = PFKEY_ALIGN8(xfrm_ctx->ctx_len);
+		size +=  sizeof(struct sadb_x_sec_ctx) + ctx_size;
+	}
+
 	skb =  alloc_skb(size + 16, GFP_ATOMIC);
 	if (skb == NULL)
 		return -ENOMEM;
@@ -2814,6 +2822,20 @@ static int pfkey_send_acquire(struct xfr
 	else if (x->id.proto == IPPROTO_ESP)
 		dump_esp_combs(skb, t);
 
+	/* security context */
+	if (xfrm_ctx) {
+		sec_ctx = (struct sadb_x_sec_ctx *) skb_put(skb,
+				sizeof(struct sadb_x_sec_ctx) + ctx_size);
+		sec_ctx->sadb_x_sec_len =
+		  (sizeof(struct sadb_x_sec_ctx) + ctx_size) / sizeof(uint64_t);
+		sec_ctx->sadb_x_sec_exttype = SADB_X_EXT_SEC_CTX;
+		sec_ctx->sadb_x_ctx_doi = xfrm_ctx->ctx_doi;
+		sec_ctx->sadb_x_ctx_alg = xfrm_ctx->ctx_alg;
+		sec_ctx->sadb_x_ctx_len = xfrm_ctx->ctx_len;
+		memcpy(sec_ctx + 1, xfrm_ctx->ctx_str,
+		       xfrm_ctx->ctx_len);
+	}
+
 	return pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_REGISTERED, NULL);
 }
 
--- linux-2.6.17.i686.vanilla/net/xfrm/xfrm_policy.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_policy.c	2006-06-22 16:56:38.000000000 -0500
@@ -520,7 +520,7 @@ EXPORT_SYMBOL(xfrm_policy_walk);
 
 /* Find policy to apply to this flow. */
 
-static void xfrm_policy_lookup(struct flowi *fl, u32 sk_sid, u16 family, u8 dir,
+static void xfrm_policy_lookup(struct flowi *fl, u16 family, u8 dir,
 			       void **objp, atomic_t **obj_refp)
 {
 	struct xfrm_policy *pol;
@@ -536,7 +536,7 @@ static void xfrm_policy_lookup(struct fl
 		match = xfrm_selector_match(sel, fl, family);
 
 		if (match) {
- 			if (!security_xfrm_policy_lookup(pol, sk_sid, dir)) {
+ 			if (!security_xfrm_policy_lookup(pol, fl->sid, dir)) {
 				xfrm_pol_hold(pol);
 				break;
 			}
@@ -564,7 +564,7 @@ static inline int policy_to_flow_dir(int
 	};
 }
 
-static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl, u32 sk_sid)
+static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl)
 {
 	struct xfrm_policy *pol;
 
@@ -575,7 +575,7 @@ static struct xfrm_policy *xfrm_sk_polic
  		int err = 0;
 
 		if (match)
-		  err = security_xfrm_policy_lookup(pol, sk_sid, policy_to_flow_dir(dir));
+		  err = security_xfrm_policy_lookup(pol, fl->sid, policy_to_flow_dir(dir));
 
  		if (match && !err)
 			xfrm_pol_hold(pol);
@@ -785,19 +785,20 @@ int xfrm_lookup(struct dst_entry **dst_p
 	u32 genid;
 	u16 family;
 	u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT);
-	u32 sk_sid = security_sk_sid(sk, fl, dir);
+
+	fl->sid = security_sk_sid(sk, fl, dir);
 restart:
 	genid = atomic_read(&flow_cache_genid);
 	policy = NULL;
 	if (sk && sk->sk_policy[1])
-		policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl, sk_sid);
+		policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl);
 
 	if (!policy) {
 		/* To accelerate a bit...  */
 		if ((dst_orig->flags & DST_NOXFRM) || !xfrm_policy_list[XFRM_POLICY_OUT])
 			return 0;
 
-		policy = flow_cache_lookup(fl, sk_sid, dst_orig->ops->family,
+		policy = flow_cache_lookup(fl, dst_orig->ops->family,
 					   dir, xfrm_policy_lookup);
 	}
 
@@ -955,13 +956,15 @@ int
 xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, unsigned short family)
 {
 	struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
+	int err;
 
 	if (unlikely(afinfo == NULL))
 		return -EAFNOSUPPORT;
 
 	afinfo->decode_session(skb, fl);
+	err = security_xfrm_decode_session(skb, fl);
 	xfrm_policy_put_afinfo(afinfo);
-	return 0;
+	return err;
 }
 EXPORT_SYMBOL(xfrm_decode_session);
 
@@ -981,14 +984,11 @@ int __xfrm_policy_check(struct sock *sk,
 	struct xfrm_policy *pol;
 	struct flowi fl;
 	u8 fl_dir = policy_to_flow_dir(dir);
-	u32 sk_sid;
 
 	if (xfrm_decode_session(skb, &fl, family) < 0)
 		return 0;
 	nf_nat_decode_session(skb, &fl, family);
 
-	sk_sid = security_sk_sid(sk, &fl, fl_dir);
-
 	/* First, check used SA against their selectors. */
 	if (skb->sp) {
 		int i;
@@ -1002,10 +1002,10 @@ int __xfrm_policy_check(struct sock *sk,
 
 	pol = NULL;
 	if (sk && sk->sk_policy[dir])
-		pol = xfrm_sk_policy_lookup(sk, dir, &fl, sk_sid);
+		pol = xfrm_sk_policy_lookup(sk, dir, &fl);
 
 	if (!pol)
-		pol = flow_cache_lookup(&fl, sk_sid, family, fl_dir,
+		pol = flow_cache_lookup(&fl, family, fl_dir,
 					xfrm_policy_lookup);
 
 	if (!pol)
@@ -1200,6 +1200,8 @@ int xfrm_bundle_ok(struct xfrm_dst *firs
 
 		if (fl && !xfrm_selector_match(&dst->xfrm->sel, fl, family))
 			return 0;
+		if (fl && !security_xfrm_flow_state_match(fl, dst->xfrm))
+			return 0;
 		if (dst->xfrm->km.state != XFRM_STATE_VALID)
 			return 0;
 
--- linux-2.6.17.i686.vanilla/net/xfrm/xfrm_state.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_state.c	2006-06-22 16:56:38.000000000 -0500
@@ -366,7 +366,7 @@ xfrm_state_find(xfrm_address_t *daddr, x
 			 */
 			if (x->km.state == XFRM_STATE_VALID) {
 				if (!xfrm_selector_match(&x->sel, fl, family) ||
-				    !xfrm_sec_ctx_match(pol->security, x->security))
+				    !security_xfrm_state_pol_flow_match(x, pol, fl))
 					continue;
 				if (!best ||
 				    best->km.dying > x->km.dying ||
@@ -378,7 +378,7 @@ xfrm_state_find(xfrm_address_t *daddr, x
 			} else if (x->km.state == XFRM_STATE_ERROR ||
 				   x->km.state == XFRM_STATE_EXPIRED) {
  				if (xfrm_selector_match(&x->sel, fl, family) &&
-				    xfrm_sec_ctx_match(pol->security, x->security))
+				    security_xfrm_state_pol_flow_match(x, pol, fl))
 					error = -ESRCH;
 			}
 		}
@@ -402,6 +402,14 @@ xfrm_state_find(xfrm_address_t *daddr, x
 		 * to current session. */
 		xfrm_init_tempsel(x, fl, tmpl, daddr, saddr, family);
 
+		error = security_xfrm_state_alloc_acquire(x, pol->security, fl->sid);
+		if (error) {
+			x->km.state = XFRM_STATE_DEAD;
+			xfrm_state_put(x);
+			x = NULL;
+			goto out;
+		}
+
 		if (km_query(x, tmpl, pol) == 0) {
 			x->km.state = XFRM_STATE_ACQ;
 			list_add_tail(&x->bydst, xfrm_state_bydst+h);
--- linux-2.6.17.i686.vanilla/net/xfrm/xfrm_user.c	2006-06-26 09:54:06.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_user.c	2006-06-22 16:56:38.000000000 -0500
@@ -907,27 +907,40 @@ rtattr_failure:
 	return -1;
 }
 
-static int copy_to_user_sec_ctx(struct xfrm_policy *xp, struct sk_buff *skb)
+static int copy_sec_ctx(struct xfrm_sec_ctx *s, struct sk_buff *skb)
 {
-	if (xp->security) {
-		int ctx_size = sizeof(struct xfrm_sec_ctx) +
-				xp->security->ctx_len;
-		struct rtattr *rt = __RTA_PUT(skb, XFRMA_SEC_CTX, ctx_size);
-		struct xfrm_user_sec_ctx *uctx = RTA_DATA(rt);
-
-		uctx->exttype = XFRMA_SEC_CTX;
-		uctx->len = ctx_size;
-		uctx->ctx_doi = xp->security->ctx_doi;
-		uctx->ctx_alg = xp->security->ctx_alg;
-		uctx->ctx_len = xp->security->ctx_len;
-		memcpy(uctx + 1, xp->security->ctx_str, xp->security->ctx_len);
-	}
-	return 0;
+	int ctx_size = sizeof(struct xfrm_sec_ctx) + s->ctx_len;
+	struct rtattr *rt = __RTA_PUT(skb, XFRMA_SEC_CTX, ctx_size);
+	struct xfrm_user_sec_ctx *uctx = RTA_DATA(rt);
+
+	uctx->exttype = XFRMA_SEC_CTX;
+	uctx->len = ctx_size;
+	uctx->ctx_doi = s->ctx_doi;
+	uctx->ctx_alg = s->ctx_alg;
+	uctx->ctx_len = s->ctx_len;
+	memcpy(uctx + 1, s->ctx_str, s->ctx_len);
+ 	return 0;
 
  rtattr_failure:
 	return -1;
 }
 
+static inline int copy_to_user_state_sec_ctx(struct xfrm_state *x, struct sk_buff *skb)
+{
+	if (x->security) {
+		return copy_sec_ctx(x->security, skb);
+	}
+	return 0;
+}
+
+static inline int copy_to_user_sec_ctx(struct xfrm_policy *xp, struct sk_buff *skb)
+{
+	if (xp->security) {
+		return copy_sec_ctx(xp->security, skb);
+	}
+	return 0;
+}
+
 static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr)
 {
 	struct xfrm_dump_info *sp = ptr;
@@ -1703,7 +1716,7 @@ static int build_acquire(struct sk_buff 
 
 	if (copy_to_user_tmpl(xp, skb) < 0)
 		goto nlmsg_failure;
-	if (copy_to_user_sec_ctx(xp, skb))
+	if (copy_to_user_state_sec_ctx(x, skb))
 		goto nlmsg_failure;
 
 	nlh->nlmsg_len = skb->tail - b;
--- linux-2.6.17.i686.vanilla/security/dummy.c	2006-06-26 09:54:09.000000000 -0500
+++ linux-2.6.17.i686/security/dummy.c	2006-06-22 16:56:38.000000000 -0500
@@ -789,6 +789,10 @@ static inline void dummy_sk_free_securit
 {
 }
 
+static inline void dummy_sk_clone_security (const struct sock *sk, struct sock *newsk)
+{
+}
+
 static unsigned int dummy_sk_getsid(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	return 0;
@@ -810,7 +814,8 @@ static void dummy_xfrm_policy_free_secur
 {
 }
 
-static int dummy_xfrm_state_alloc_security(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static int dummy_xfrm_state_alloc_security(struct xfrm_state *x,
+	struct xfrm_user_sec_ctx *sec_ctx, struct xfrm_sec_ctx *pol, u32 sid)
 {
 	return 0;
 }
@@ -823,6 +828,23 @@ static int dummy_xfrm_policy_lookup(stru
 {
 	return 0;
 }
+
+static int dummy_xfrm_state_pol_flow_match(struct xfrm_state *x,
+				struct xfrm_policy *xp, struct flowi *fl)
+{
+	return 1;
+}
+
+static int dummy_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+	return 1;
+}
+
+static int dummy_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	return 0;
+}
+
 #endif /* CONFIG_SECURITY_NETWORK_XFRM */
 static int dummy_register_security (const char *name, struct security_operations *ops)
 {
@@ -1018,6 +1040,7 @@ void security_fixup_ops (struct security
 	set_to_dummy_if_null(ops, socket_getpeersec_dgram);
 	set_to_dummy_if_null(ops, sk_alloc_security);
 	set_to_dummy_if_null(ops, sk_free_security);
+	set_to_dummy_if_null(ops, sk_clone_security);
 	set_to_dummy_if_null(ops, sk_getsid);
  #endif	/* CONFIG_SECURITY_NETWORK */
 #ifdef  CONFIG_SECURITY_NETWORK_XFRM
@@ -1027,6 +1050,9 @@ void security_fixup_ops (struct security
 	set_to_dummy_if_null(ops, xfrm_state_alloc_security);
 	set_to_dummy_if_null(ops, xfrm_state_free_security);
 	set_to_dummy_if_null(ops, xfrm_policy_lookup);
+	set_to_dummy_if_null(ops, xfrm_state_pol_flow_match);
+	set_to_dummy_if_null(ops, xfrm_flow_state_match);
+	set_to_dummy_if_null(ops, xfrm_decode_session);
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 #ifdef CONFIG_KEYS
 	set_to_dummy_if_null(ops, key_alloc);
--- linux-2.6.17.i686.vanilla/security/selinux/hooks.c	2006-06-26 09:54:09.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/hooks.c	2006-06-22 17:20:32.000000000 -0500
@@ -270,15 +270,13 @@ static int sk_alloc_security(struct sock
 {
 	struct sk_security_struct *ssec;
 
-	if (family != PF_UNIX)
-		return 0;
-
 	ssec = kzalloc(sizeof(*ssec), priority);
 	if (!ssec)
 		return -ENOMEM;
 
 	ssec->sk = sk;
 	ssec->peer_sid = SECINITSID_UNLABELED;
+	ssec->sid = SECINITSID_UNLABELED;
 	sk->sk_security = ssec;
 
 	return 0;
@@ -288,9 +286,6 @@ static void sk_free_security(struct sock
 {
 	struct sk_security_struct *ssec = sk->sk_security;
 
-	if (sk->sk_family != PF_UNIX)
-		return;
-
 	sk->sk_security = NULL;
 	kfree(ssec);
 }
@@ -2935,6 +2930,7 @@ static int selinux_socket_post_create(st
 {
 	struct inode_security_struct *isec;
 	struct task_security_struct *tsec;
+	struct sk_security_struct *sksec;
 
 	isec = SOCK_INODE(sock)->i_security;
 
@@ -2943,6 +2939,11 @@ static int selinux_socket_post_create(st
 	isec->sid = kern ? SECINITSID_KERNEL : tsec->sid;
 	isec->initialized = 1;
 
+	if (sock->sk) {
+		sksec = sock->sk->sk_security;
+		sksec->sid = isec->sid;
+	}
+
 	return selinux_netlbl_socket_create(sock, family, isec->sid);
 }
 
@@ -3336,7 +3337,7 @@ static int selinux_socket_sock_rcv_skb(s
 	if (err)
 		goto out;
 
-	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
+	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb, &ad);
 
 out:	
 	return err;
@@ -3426,6 +3427,15 @@ static void selinux_sk_free_security(str
 	sk_free_security(sk);
 }
 
+static void selinux_sk_clone_security(const struct sock *sk, struct sock *newsk)
+{
+	struct sk_security_struct *ssec = sk->sk_security;
+	struct sk_security_struct *newssec = newsk->sk_security;
+
+	newssec->sid = ssec->sid;
+	newssec->peer_sid = ssec->peer_sid;
+}
+
 static unsigned int selinux_sk_getsid_security(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	struct inode_security_struct *isec;
@@ -3439,6 +3449,10 @@ static unsigned int selinux_sk_getsid_se
 
 	if (isec)
 		sock_sid = isec->sid;
+	else {
+		struct sk_security_struct *sksec = sk->sk_security;
+		sock_sid = sksec->sid;
+	}
 
 	read_unlock_bh(&sk->sk_callback_lock);
 	return sock_sid;
@@ -3582,7 +3596,7 @@ static unsigned int selinux_ip_postroute
 	if (err != NF_ACCEPT)
 		goto out;
 
-	err = selinux_xfrm_postroute_last(isec->sid, skb);
+	err = selinux_xfrm_postroute_last(isec->sid, skb, &ad);
 
 out:
 	return err;
@@ -4399,6 +4413,7 @@ static struct security_operations selinu
 	.socket_getpeersec_dgram =	selinux_socket_getpeersec_dgram,
 	.sk_alloc_security =		selinux_sk_alloc_security,
 	.sk_free_security =		selinux_sk_free_security,
+	.sk_clone_security =		selinux_sk_clone_security,
 	.sk_getsid = 			selinux_sk_getsid_security,
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
@@ -4408,6 +4423,9 @@ static struct security_operations selinu
 	.xfrm_state_alloc_security =	selinux_xfrm_state_alloc,
 	.xfrm_state_free_security =	selinux_xfrm_state_free,
 	.xfrm_policy_lookup = 		selinux_xfrm_policy_lookup,
+	.xfrm_state_pol_flow_match =	selinux_xfrm_state_pol_flow_match,
+	.xfrm_flow_state_match =	selinux_xfrm_flow_state_match,
+	.xfrm_decode_session =		selinux_xfrm_decode_session,
 #endif
 };
 
--- linux-2.6.17.i686.vanilla/security/selinux/include/av_permissions.h	2006-06-26 09:54:10.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/av_permissions.h	2006-06-22 17:28:24.000000000 -0500
@@ -909,6 +909,7 @@
 #define ASSOCIATION__SENDTO                       0x00000001UL
 #define ASSOCIATION__RECVFROM                     0x00000002UL
 #define ASSOCIATION__SETCONTEXT                   0x00000004UL
+#define ASSOCIATION__POLMATCH                     0x00000008UL
 
 #define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL      0x00000001UL
 #define NETLINK_KOBJECT_UEVENT_SOCKET__READ       0x00000002UL
--- linux-2.6.17.i686.vanilla/security/selinux/include/av_perm_to_string.h	2006-06-26 09:54:09.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/av_perm_to_string.h	2006-06-22 17:29:19.000000000 -0500
@@ -239,4 +239,5 @@
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto")
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__RECVFROM, "recvfrom")
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__SETCONTEXT, "setcontext")
+   S_(SECCLASS_ASSOCIATION, ASSOCIATION__POLMATCH, "polmatch")
    S_(SECCLASS_NETLINK_NETLABEL_SOCKET, NETLINK_NETLABEL_SOCKET__NLMSG_WRITE, "nlmsg_write")
--- linux-2.6.17.i686.vanilla/security/selinux/include/objsec.h	2006-06-26 09:54:10.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/objsec.h	2006-06-22 16:56:38.000000000 -0500
@@ -107,6 +107,7 @@ struct netif_security_struct {
 
 struct sk_security_struct {
 	struct sock *sk;		/* back pointer to sk object */
+	u32 sid;			/* SID of this object */
 	u32 peer_sid;			/* SID of peer */
 };
 
--- linux-2.6.17.i686.vanilla/security/selinux/include/security.h	2006-06-26 09:54:10.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/security.h	2006-06-22 16:56:38.000000000 -0500
@@ -80,6 +80,8 @@ int security_node_sid(u16 domain, void *
 int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid,
                                  u16 tclass);
 
+int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid);
+
 #define SECURITY_FS_USE_XATTR		1 /* use xattr */
 #define SECURITY_FS_USE_TRANS		2 /* use transition SIDs, e.g. devpts/tmpfs */
 #define SECURITY_FS_USE_TASK		3 /* use task SIDs, e.g. pipefs/sockfs */
--- linux-2.6.17.i686.vanilla/security/selinux/include/xfrm.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/xfrm.h	2006-06-22 17:32:36.000000000 -0500
@@ -2,6 +2,7 @@
  * SELinux support for the XFRM LSM hooks
  *
  * Author : Trent Jaeger, <jaegert at us.ibm.com>
+ * Updated : Venkat Yekkirala, <vyekkirala at TrustedCS.com>
  */
 #ifndef _SELINUX_XFRM_H_
 #define _SELINUX_XFRM_H_
@@ -9,9 +10,14 @@
 int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
 int selinux_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new);
 void selinux_xfrm_policy_free(struct xfrm_policy *xp);
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx);
+int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx,
+			struct xfrm_sec_ctx *pol, u32 sid);
 void selinux_xfrm_state_free(struct xfrm_state *x);
-int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir);
+int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir);
+int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp,
+			struct flowi *fl);
+int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm);
+int selinux_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl);
 
 /*
  * Extract the security blob from the sock (it's actually on the socket)
@@ -37,17 +43,21 @@ static inline u32 selinux_no_sk_sid(stru
 }
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
-int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb);
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb);
+int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb,
+			struct avc_audit_data *ad);
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+			struct avc_audit_data *ad);
 u32 selinux_socket_getpeer_stream(struct sock *sk);
 u32 selinux_socket_getpeer_dgram(struct sk_buff *skb);
 #else
-static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+			struct avc_audit_data *ad)
 {
 	return 0;
 }
 
-static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+			struct avc_audit_data *ad)
 {
 	return NF_ACCEPT;
 }
--- linux-2.6.17.i686.vanilla/security/selinux/ss/mls.c	2006-06-26 09:54:10.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/ss/mls.c	2006-06-22 16:56:38.000000000 -0500
@@ -219,26 +219,6 @@ int mls_context_isvalid(struct policydb 
 }
 
 /*
- * Copies the MLS range from `src' into `dst'.
- */
-static inline int mls_copy_context(struct context *dst,
-				   struct context *src)
-{
-	int l, rc = 0;
-
-	/* Copy the MLS range from the source context */
-	for (l = 0; l < 2; l++) {
-		dst->range.level[l].sens = src->range.level[l].sens;
-		rc = ebitmap_cpy(&dst->range.level[l].cat,
-				 &src->range.level[l].cat);
-		if (rc)
-			break;
-	}
-
-	return rc;
-}
-
-/*
  * Set the MLS fields in the security context structure
  * `context' based on the string representation in
  * the string `*scontext'.  Update `*scontext' to
--- linux-2.6.17.i686.vanilla/security/selinux/ss/mls.h	2006-06-26 09:54:10.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/ss/mls.h	2006-06-22 16:56:38.000000000 -0500
@@ -24,6 +24,26 @@
 #include "context.h"
 #include "policydb.h"
 
+/*
+ * Copies the MLS range from `src' into `dst'.
+ */
+static inline int mls_copy_context(struct context *dst,
+				   struct context *src)
+{
+	int l, rc = 0;
+
+	/* Copy the MLS range from the source context */
+	for (l = 0; l < 2; l++) {
+		dst->range.level[l].sens = src->range.level[l].sens;
+		rc = ebitmap_cpy(&dst->range.level[l].cat,
+				 &src->range.level[l].cat);
+		if (rc)
+			break;
+	}
+
+	return rc;
+}
+
 int mls_compute_context_len(struct context *context);
 void mls_sid_to_context(struct context *context, char **scontext);
 int mls_context_isvalid(struct policydb *p, struct context *c);
--- linux-2.6.17.i686.vanilla/security/selinux/ss/services.c	2006-06-26 09:54:10.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/ss/services.c	2006-06-22 16:56:38.000000000 -0500
@@ -1827,6 +1827,54 @@ out:
 	return rc;
 }
 
+/*
+ * security_sid_mls_copy() - computes a new sid based on the given
+ * sid and the mls portion of mls_sid.
+ */
+int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid)
+{
+	struct context *context1 = NULL;
+	struct context *context2 = NULL;
+	struct context newcon;
+	int rc = 0;
+
+	if (!ss_initialized) {
+		*new_sid = sid;
+		goto out;
+	}
+
+	POLICY_RDLOCK;
+	context1 = sidtab_search(&sidtab, sid);
+	if (!context1) {
+		printk(KERN_ERR "security_sid_mls_copy:  unrecognized SID "
+		       "%d\n", sid);
+		rc = -EINVAL;
+		goto out_unlock;
+	}
+
+	context2 = sidtab_search(&sidtab, mls_sid);
+	if (!context2) {
+		printk(KERN_ERR "security_sid_mls_copy:  unrecognized SID "
+		       "%d\n", mls_sid);
+		rc = -EINVAL;
+		goto out_unlock;
+	}
+
+	newcon.user = context1->user;
+	newcon.role = context1->role;
+	newcon.type = context1->type;
+	rc = mls_copy_context(&newcon, context2);
+	if (rc)
+		goto out_unlock;
+
+	rc = sidtab_context_to_sid(&sidtab, &newcon, new_sid);
+
+out_unlock:
+	POLICY_RDUNLOCK;
+out:
+	return rc;
+}
+
 struct selinux_audit_rule {
 	u32 au_seqno;
 	struct context au_ctxt;
--- linux-2.6.17.i686.vanilla/security/selinux/xfrm.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/xfrm.c	2006-06-22 18:21:36.000000000 -0500
@@ -6,7 +6,12 @@
  *  Authors:  Serge Hallyn <sergeh at us.ibm.com>
  *	      Trent Jaeger <jaegert at us.ibm.com>
  *
+ *  Updated: Venkat Yekkirala <vyekkirala at TrustedCS.com>
+ *
+ *           Granular IPSec Associations for use in MLS environments.
+ *
  *  Copyright (C) 2005 International Business Machines Corporation
+ *  Copyright (C) 2006 Trusted Computer Solutions, Inc.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License version 2,
@@ -68,10 +73,10 @@ static inline int selinux_authorizable_x
 }
 
 /*
- * LSM hook implementation that authorizes that a socket can be used
- * with the corresponding xfrm_sec_ctx and direction.
+ * LSM hook implementation that authorizes that a flow can use
+ * a xfrm policy rule.
  */
-int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir)
 {
 	int rc = 0;
 	u32 sel_sid = SECINITSID_UNLABELED;
@@ -85,27 +90,129 @@ int selinux_xfrm_policy_lookup(struct xf
 		sel_sid = ctx->ctx_sid;
 	}
 
-	rc = avc_has_perm(sk_sid, sel_sid, SECCLASS_ASSOCIATION,
-			  ((dir == FLOW_DIR_IN) ? ASSOCIATION__RECVFROM :
-			   ((dir == FLOW_DIR_OUT) ?  ASSOCIATION__SENDTO :
-			    (ASSOCIATION__SENDTO | ASSOCIATION__RECVFROM))),
+	rc = avc_has_perm(fl_sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__POLMATCH,
+			  NULL);
+
+	return rc;
+}
+
+/*
+ * LSM hook implementation that authorizes that a state matches
+ * the given policy, flow combo.
+ */
+
+int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp,
+			struct flowi *fl)
+{
+	u32 state_sid;
+	u32 pol_sid;
+	int err;
+
+	if (x->security)
+		state_sid = x->security->ctx_sid;
+	else
+		state_sid = SECINITSID_UNLABELED;
+
+	if (xp->security)
+		pol_sid = xp->security->ctx_sid;
+	else
+		pol_sid = SECINITSID_UNLABELED;
+
+	err = avc_has_perm(state_sid, pol_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__POLMATCH,
 			  NULL);
 
+	if (err)
+		return 0;
+
+	return selinux_xfrm_flow_state_match(fl, x);
+}
+
+/*
+ * LSM hook implementation that authorizes that a particular outgoing flow
+ * can use a given security association.
+ */
+
+int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+	int rc = 0;
+	u32 sel_sid = SECINITSID_UNLABELED;
+	struct xfrm_sec_ctx *ctx;
+
+	/* Context sid is either set to label or ANY_ASSOC */
+	if ((ctx = xfrm->security)) {
+		if (!selinux_authorizable_ctx(ctx))
+			return 0;
+
+		sel_sid = ctx->ctx_sid;
+	}
+
+	rc = avc_has_perm(fl->sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__SENDTO,
+			  NULL)? 0:1;
+
 	return rc;
 }
 
 /*
+ * LSM hook implementation that determines the sid for the session.
+ */
+
+int selinux_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	struct sec_path *sp;
+
+	fl->sid = SECSID_NULL;
+
+	if (skb == NULL)
+		return 0;
+
+	sp = skb->sp;
+	if (sp) {
+		int i, sid_set = 0;
+
+		for (i = sp->len-1; i >= 0; i--) {
+			struct xfrm_state *x = sp->xvec[i];
+			if (selinux_authorizable_xfrm(x)) {
+				struct xfrm_sec_ctx *ctx = x->security;
+
+				if (!sid_set) {
+					fl->sid = ctx->ctx_sid;
+					sid_set = 1;
+				}
+				else if (fl->sid != ctx->ctx_sid)
+					return -EINVAL;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/*
  * Security blob allocation for xfrm_policy and xfrm_state
  * CTX does not have a meaningful value on input
  */
-static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *uctx)
+static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
+	struct xfrm_user_sec_ctx *uctx, struct xfrm_sec_ctx *pol, u32 sid)
 {
 	int rc = 0;
 	struct task_security_struct *tsec = current->security;
-	struct xfrm_sec_ctx *ctx;
+	struct xfrm_sec_ctx *ctx = NULL;
+	char *ctx_str = NULL;
+	u32 str_len;
+	u32 ctx_sid;
+
+	BUG_ON(uctx && pol);
+
+	if (pol)
+		goto from_policy;
 
 	BUG_ON(!uctx);
-	BUG_ON(uctx->ctx_doi != XFRM_SC_ALG_SELINUX);
+
+	if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX)
+		return -EINVAL;
 
 	if (uctx->ctx_len >= PAGE_SIZE)
 		return -ENOMEM;
@@ -145,9 +252,40 @@ static int selinux_xfrm_sec_ctx_alloc(st
 
 	return rc;
 
+from_policy:
+	BUG_ON(!pol);
+	rc = security_sid_mls_copy(pol->ctx_sid, sid, &ctx_sid);
+	if (rc)
+		goto out;
+
+	rc = security_sid_to_context(ctx_sid, &ctx_str, &str_len);
+	if (rc)
+		goto out;
+
+	*ctxp = ctx = kmalloc(sizeof(*ctx) +
+			      str_len,
+			      GFP_ATOMIC);
+
+	if (!ctx) {
+		rc = -ENOMEM;
+		goto out;
+	}
+
+
+	ctx->ctx_doi = XFRM_SC_DOI_LSM;
+	ctx->ctx_alg = XFRM_SC_ALG_SELINUX;
+	ctx->ctx_sid = ctx_sid;
+	ctx->ctx_len = str_len;
+	memcpy(ctx->ctx_str,
+	       ctx_str,
+	       str_len);
+
+	return rc;
+
 out:
 	*ctxp = NULL;
 	kfree(ctx);
+	kfree(ctx_str);
 	return rc;
 }
 
@@ -161,7 +299,7 @@ int selinux_xfrm_policy_alloc(struct xfr
 
 	BUG_ON(!xp);
 
-	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx);
+	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx, NULL, 0);
 	return err;
 }
 
@@ -204,13 +342,14 @@ void selinux_xfrm_policy_free(struct xfr
  * LSM hook implementation that allocs and transfers sec_ctx spec to
  * xfrm_state.
  */
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx,
+		struct xfrm_sec_ctx *pol, u32 sid)
 {
 	int err;
 
 	BUG_ON(!x);
 
-	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx);
+	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx, pol, sid);
 	return err;
 }
 
@@ -299,38 +438,30 @@ u32 selinux_socket_getpeer_dgram(struct 
  * we need to check for unlabelled access since this may not have
  * gone thru the IPSec process.
  */
-int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+				struct avc_audit_data *ad)
 {
 	int i, rc = 0;
 	struct sec_path *sp;
+	u32 sel_sid = SECINITSID_UNLABELED;
 
 	sp = skb->sp;
 
 	if (sp) {
-		/*
-		 * __xfrm_policy_check does not approve unless xfrm_policy_ok
-		 * says that spi's match for policy and the socket.
-		 *
-		 *  Only need to verify the existence of an authorizable sp.
-		 */
 		for (i = 0; i < sp->len; i++) {
 			struct xfrm_state *x = sp->xvec[i];
 
-			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+			if (x && selinux_authorizable_xfrm(x)) {
+				struct xfrm_sec_ctx *ctx = x->security;
+				sel_sid = ctx->ctx_sid;
+				break;
+			}
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
+	rc = avc_has_perm(isec_sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__RECVFROM, ad);
 
-accept:
-	return 0;
-
-drop:
 	return rc;
 }
 
@@ -341,7 +472,8 @@ drop:
  * If we do have a authorizable security association, then it has already been
  * checked in xfrm_policy_lookup hook.
  */
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+					struct avc_audit_data *ad)
 {
 	struct dst_entry *dst;
 	int rc = 0;
@@ -361,7 +493,7 @@ int selinux_xfrm_postroute_last(u32 isec
 	}
 
 	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__SENDTO, NULL);
+			  ASSOCIATION__SENDTO, ad);
 	if (rc)
 		goto drop;
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.2
retrieving revision 1.2293.2.3
diff -u -r1.2293.2.2 -r1.2293.2.3
--- kernel-2.6.spec	21 Jun 2006 20:33:59 -0000	1.2293.2.2
+++ kernel-2.6.spec	26 Jun 2006 17:26:33 -0000	1.2293.2.3
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.38
+%define tag FC6.lspp.39
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -468,12 +468,7 @@
 Patch20107: linux-2.6-net-label_5_7.patch
 Patch20108: linux-2.6-net-label_6_7.patch
 Patch20109: linux-2.6-net-label_7_7.patch
-#Patch20110: mlsxfrm-01_06.patch
-#Patch20111: mlsxfrm-02_06.patch
-#Patch20112: mlsxfrm-03_06.patch
-#Patch20113: mlsxfrm-04_06.patch
-#Patch20114: mlsxfrm-05_06.patch
-#Patch20115: mlsxfrm-06_06.patch
+Patch20120: ipsec-lspp-38.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1125,12 +1120,7 @@
 %patch20108 -p1
 %patch20109 -p1
 # ipsec
-#%patch20110 -p1
-#%patch20111 -p1
-#%patch20112 -p1
-#%patch20113 -p1
-#%patch20114 -p1
-#%patch20115 -p1
+%patch20120 -p1
 
 
 # now run oldconfig over all the config files
@@ -1740,6 +1730,9 @@
 %endif
 
 %changelog
+* Mon Jun 26 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.39, ipsec xfrm patch from Venkat
+
 * Wed Jun 21 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.38, new netlink fix from Darrel & netlabel patch from Paul
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 17:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 13:26:48 -0400
Subject: rpms/qt/FC-5 qt.spec,1.104,1.105
Message-ID: <200606261726.k5QHQmL1011351@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11333

Modified Files:
	qt.spec 
Log Message:
typo fix



Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- qt.spec	26 Jun 2006 16:54:01 -0000	1.104
+++ qt.spec	26 Jun 2006 17:26:45 -0000	1.105
@@ -483,7 +483,7 @@
    install bin/$i %{buildroot}%{qtdir}/bin/
 done
 
-mv %{buildroot}%{qt_dirname}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
+mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 # install man pages
 %if %{installman}



From fedora-cvs-commits at redhat.com  Mon Jun 26 17:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 13:41:29 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.147,1.148
Message-ID: <200606261741.k5QHfTIU022825@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22300

Modified Files:
	kdelibs.spec 
Log Message:
cleanup post/postun



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdelibs.spec	24 Jun 2006 13:47:58 -0000	1.147
+++ kdelibs.spec	26 Jun 2006 17:41:27 -0000	1.148
@@ -298,7 +298,7 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
@@ -306,7 +306,7 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 17:53:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 13:53:15 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3.diff, NONE, 1.1 kdebase.spec, 1.191,
	1.192
Message-ID: <200606261753.k5QHrF0B009125@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9067

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3.diff 
Log Message:
apply patch to check return value


kdebase-3.5.3.diff:
 drkonqi/main.cpp                  |   11 +++++++++--
 ksysguard/ksysguardd/ksysguardd.c |   14 +++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-3.5.3.diff ---
Index: ksysguard/ksysguardd/ksysguardd.c
===================================================================
--- ksysguard/ksysguardd/ksysguardd.c	(revision 549512)
+++ ksysguard/ksysguardd/ksysguardd.c	(working copy)
@@ -207,15 +207,19 @@ static void dropPrivileges( void )
 {
   struct passwd *pwd;
 
-  if ( ( pwd = getpwnam( "nobody" ) ) != NULL )
-    setuid( pwd->pw_uid );
-	else {
+  if ( ( pwd = getpwnam( "nobody" ) ) != NULL ) {
+    if ( !setgid(pwd->pw_gid) )
+      setuid(pwd->pw_uid);
+    if (!geteuid() && getuid() != pwd->pw_uid)
+      _exit(1);
+  }
+  else {
     log_error( "User 'nobody' does not exist." );
     /**
       We exit here to avoid becoming vulnerable just because
       user nobody does not exist.
      */
-    exit( 1 );
+    _exit(1);
   }
 }
 
@@ -231,7 +235,7 @@ void makeDaemon( void )
       chdir( "/" );
       umask( 0 );
       if ( createLockFile() < 0 )
-        exit( 1 );
+        _exit( 1 );
 
       dropPrivileges();
       installSignalHandler();
Index: drkonqi/main.cpp
===================================================================
--- drkonqi/main.cpp	(revision 549512)
+++ drkonqi/main.cpp	(working copy)
@@ -61,7 +61,8 @@ int main( int argc, char* argv[] )
 {
   // Drop privs.
   setgid(getgid());
-  setuid(getuid());
+  if (setuid(getuid()) < 0 && geteuid() != getuid())
+     exit (255);
 
   // Make sure that DrKonqi doesn't start DrKonqi when it crashes :-]
   setenv("KDE_DEBUG", "true", 1);
--- kdm/kfrontend/kgreeter.cpp	(revision 549445)
+++ kdm/kfrontend/kgreeter.cpp	(working copy)
@@ -251,7 +251,12 @@ KGreeter::insertUsers()
 	// XXX remove seteuid-voodoo when we run as nobody
 	if (!(ps = getpwnam( "nobody" )))
 		return;
-	seteuid( ps->pw_uid );
+        if (setegid( ps->pw_gid )) 
+                return;
+        if (seteuid( ps->pw_uid )) {
+                setegid(0);
+                return;
+        }
 
 	QImage default_pix;
 	if (userView) {
@@ -318,6 +323,7 @@ KGreeter::insertUsers()
 
 	// XXX remove seteuid-voodoo when we run as nobody
 	seteuid( 0 );
+        setegid( 0 );
 }
 
 void


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- kdebase.spec	15 Jun 2006 14:24:49 -0000	1.191
+++ kdebase.spec	26 Jun 2006 17:53:13 -0000	1.192
@@ -15,12 +15,10 @@
 
 %define arts 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 6
+Release: 7
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -62,6 +60,7 @@
 Patch101: kdebase-3.5.3-kicker-panel.patch
 Patch102: kdebase-3.5.3-kscreensaver.patch
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
+Patch104: kdebase-3.5.3.diff
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -100,6 +99,7 @@
 BuildRequires: autoconf
 BuildRequires: pkgconfig
 BuildRequires: doxygen
+BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: hal-devel >= 0.5
@@ -176,6 +176,7 @@
 %patch101 -p1 -b .kicker-panel
 %patch102 -p1 -b .kscreensaver
 %patch103 -p1 -b .kxkb-kcmlayout
+%patch104 -p0 -b .setuid-check
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
@@ -208,9 +209,7 @@
    --with-kdm-pam=kdm \
    --with-kcp-pam=kcheckpass \
    --with-kss-pam=kscreensaver \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
    --with-xinerama \
    --without-shadow \
    --disable-shadow \
@@ -386,19 +385,19 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
 fi
-%{_bindir}/update-desktop-database > /dev/null 2>&1 || : 
+%{_bindir}/update-desktop-database 2> /dev/null || : 
 
 %postun
 /sbin/ldconfig 
 touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
 fi
-%{_bindir}/update-desktop-database > /dev/null 2>&1 || : 
+%{_bindir}/update-desktop-database 2> /dev/null || : 
 
 %files
 %defattr(-,root,root)
@@ -549,6 +548,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
+- apply patch to check return value
+
 * Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-6 
 - apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
   thanks to KDE security team



From fedora-cvs-commits at redhat.com  Mon Jun 26 18:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 14:42:40 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.138,1.139
Message-ID: <200606261842.k5QIgeas005653@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5627

Modified Files:
	dlm-kernel.spec 
Log Message:
Added conditional buildrequires.


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- dlm-kernel.spec	26 Jun 2006 15:18:24 -0000	1.138
+++ dlm-kernel.spec	26 Jun 2006 18:42:37 -0000	1.139
@@ -26,24 +26,29 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.21
+Release: 0.FC5.22
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.
-BuildRequires: cman-kernheaders >= 2.6.9
 BuildRequires: kernel = %{kernel_version}
+
+%if %{buildsmp}
 BuildRequires: kernel-smp = %{kernel_version}
+BuildRequires: kernel-smp-devel = %{kernel_version}
+BuildRequires: cman-kernel-smp >= 2.6.14
+%endif
+
+%if {buildxen}
 BuildRequires: kernel-xen0 = %{kernel_version}
 BuildRequires: kernel-xenU = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}
-BuildRequires: kernel-smp-devel = %{kernel_version}
 BuildRequires: kernel-xen0-devel = %{kernel_version}
 BuildRequires: kernel-xenU-devel = %{kernel_version}
-
-BuildRequires: cman-kernel >= 2.6.14
-BuildRequires: cman-kernel-smp >= 2.6.14
 BuildRequires: cman-kernel-xen0 >= 2.6.14
 BuildRequires: cman-kernel-xenU >= 2.6.14
+%endif
+
+BuildRequires: cman-kernel >= 2.6.14
 BuildRequires: cman-kernheaders >= 2.6.14
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules GFS-module-smp GFS-module-hugemem
@@ -53,7 +58,6 @@
 Prereq: /sbin/depmod
 Provides: kernel-modules
 Provides: dlm-kernel-modules = %{version}-%{release}
-#ExclusiveArch: i586 i686 x86_64 ppc ppc64
 ExclusiveArch: i686 x86_64
 Source0: %{name}-%{tempversion}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot



From fedora-cvs-commits at redhat.com  Mon Jun 26 18:43:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 14:43:27 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.139,1.140
Message-ID: <200606261843.k5QIhRgo006003@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5973

Modified Files:
	dlm-kernel.spec 
Log Message:
Fixed rpm syntax error.


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- dlm-kernel.spec	26 Jun 2006 18:42:37 -0000	1.139
+++ dlm-kernel.spec	26 Jun 2006 18:43:25 -0000	1.140
@@ -38,7 +38,7 @@
 BuildRequires: cman-kernel-smp >= 2.6.14
 %endif
 
-%if {buildxen}
+%if %{buildxen}
 BuildRequires: kernel-xen0 = %{kernel_version}
 BuildRequires: kernel-xenU = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}



From fedora-cvs-commits at redhat.com  Mon Jun 26 18:45:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 14:45:45 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.156,1.157
Message-ID: <200606261845.k5QIjjRg007445@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7195

Modified Files:
	GFS-kernel.spec 
Log Message:
Added conditional buildrequires.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- GFS-kernel.spec	26 Jun 2006 15:18:39 -0000	1.156
+++ GFS-kernel.spec	26 Jun 2006 18:45:42 -0000	1.157
@@ -26,25 +26,33 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.24
+Release: 5.FC5.25
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules
 BuildRequires: gulm-devel dlm-devel dlm-kernheaders
 BuildRequires: kernel = %{kernel_version}
+BuildRequires: kernel-devel = %{kernel_version}
+
+%if %{buildsmp}
 BuildRequires: kernel-smp = %{kernel_version}
+BuildRequires: kernel-smp-devel = %{kernel_version}
+BuildRequires: dlm-kernel-smp
+%endif
+
+%if %{buildxen}
 BuildRequires: kernel-xen0 = %{kernel_version}
 BuildRequires: kernel-xenU = %{kernel_version}
-BuildRequires: kernel-devel = %{kernel_version}
-BuildRequires: kernel-smp-devel = %{kernel_version}
 BuildRequires: kernel-xen0-devel = %{kernel_version}
 BuildRequires: kernel-xenU-devel = %{kernel_version}
-BuildRequires: dlm-kernel
-BuildRequires: dlm-kernel-smp
 BuildRequires: dlm-kernel-xen0
 BuildRequires: dlm-kernel-xenU
+%endif
+
+BuildRequires: dlm-kernel
 BuildRequires: dlm-kernheaders >= 2.6.14
 BuildRequires: cman-kernheaders >= 2.6.14
+
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: kernel = %{kernel_version}



From fedora-cvs-commits at redhat.com  Mon Jun 26 18:46:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 14:46:51 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.140,1.141
Message-ID: <200606261846.k5QIkp3k015000@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13173

Modified Files:
	dlm-kernel.spec 
Log Message:
Pulled kernel-devel out of xen build requires.


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- dlm-kernel.spec	26 Jun 2006 18:43:25 -0000	1.140
+++ dlm-kernel.spec	26 Jun 2006 18:46:48 -0000	1.141
@@ -26,11 +26,12 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.22
+Release: 0.FC5.23
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.
 BuildRequires: kernel = %{kernel_version}
+BuildRequires: kernel-devel = %{kernel_version}
 
 %if %{buildsmp}
 BuildRequires: kernel-smp = %{kernel_version}
@@ -41,7 +42,6 @@
 %if %{buildxen}
 BuildRequires: kernel-xen0 = %{kernel_version}
 BuildRequires: kernel-xenU = %{kernel_version}
-BuildRequires: kernel-devel = %{kernel_version}
 BuildRequires: kernel-xen0-devel = %{kernel_version}
 BuildRequires: kernel-xenU-devel = %{kernel_version}
 BuildRequires: cman-kernel-xen0 >= 2.6.14



From fedora-cvs-commits at redhat.com  Mon Jun 26 18:48:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 14:48:40 -0400
Subject: rpms/sqlite/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 sqlite.spec, 1.16, 1.17
Message-ID: <200606261848.k5QImeWj022505@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/sqlite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22472

Modified Files:
	.cvsignore sources sqlite.spec 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Apr 2006 14:36:16 -0000	1.10
+++ .cvsignore	26 Jun 2006 18:48:38 -0000	1.11
@@ -6,3 +6,4 @@
 sqlite-3.3.2.tar.gz
 sqlite-3.3.3.tar.gz
 sqlite-3.3.5.tar.gz
+sqlite-3.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Apr 2006 14:36:17 -0000	1.10
+++ sources	26 Jun 2006 18:48:38 -0000	1.11
@@ -1 +1 @@
-dd2a7b6f2a07a4403a0b5e17e8ed5b88  sqlite-3.3.5.tar.gz
+a2cb1fafad5c2587e513dcbd18ace097  sqlite-3.3.6.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sqlite.spec	18 Apr 2006 14:36:17 -0000	1.16
+++ sqlite.spec	26 Jun 2006 18:48:38 -0000	1.17
@@ -1,9 +1,11 @@
 # --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
 %define tcl 0%{?_with_tcl:1}
+# --with static enables static library in -devel subpackage
+%define static 0%{?_with_static:1}
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.3.5
+Version: 3.3.6
 Release: 1
 License: Public Domain
 Group: 	Applications/Databases
@@ -22,7 +24,7 @@
 subset of SQL92 is supported. A complete database is stored in a
 single disk file. The API is designed for convenience and ease of use.
 Applications that link against SQLite can enjoy the power and
-flexiblity of an SQL database without the administrative hassles of
+flexibility of an SQL database without the administrative hassles of
 supporting a separate database server.  Version 2 and version 3 binaries
 are named to permit each to be installed on a single host
 
@@ -50,7 +52,9 @@
 %setup -q
 
 %build
-%configure %{!?with_tcl:--disable-tcl}
+%configure %{!?with_tcl:--disable-tcl} \
+           --enable-threadsafe \
+           --enable-threads-override-locks
 make %{?_smp_mflags}
 make doc
 
@@ -61,7 +65,9 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
+%if ! %{static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
+%endif
 
 %if %{tcl}
 %check
@@ -88,7 +94,10 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-
+%if %{static}
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%endif
 %if %{tcl}
 %files tcl
 %defattr(-, root, root)
@@ -96,6 +105,12 @@
 %endif
 
 %changelog
+* Mon Jun 26 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.6-1
+- Update to 3.3.6
+- Fix typo  (#189647)
+- Enable threading fixes (#181298)
+- Conditionalize static library
+
 * Mon Apr 17 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.5-1
 - Update to 3.3.5
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 18:54:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 14:54:12 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-dlm.patch,1.4,1.5
Message-ID: <200606261854.k5QIsCPD024468@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24413

Modified Files:
	linux-2.6-gfs2-dlm.patch 
Log Message:
fix compile ?


linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   29 
 fs/dlm/Makefile                    |   21 
 fs/dlm/ast.c                       |  167 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 ++++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  296 +++
 fs/dlm/device.c                    | 1239 ++++++++++++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  494 +++++
 fs/dlm/lock.c                      | 3547 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   50 
 fs/dlm/lockspace.c                 |  678 +++++++
 fs/dlm/lockspace.h                 |   24 
 fs/dlm/lowcomms.c                  | 1238 ++++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   89 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  106 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  762 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1103 +++++++++++
 fs/gfs2/bmap.h                     |   32 
 fs/gfs2/daemon.c                   |  196 ++
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1980 ++++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++++
 fs/gfs2/eattr.h                    |   97 +
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2280 +++++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  491 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1358 ++++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 +++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  299 +++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 ++++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 ++++++++
 fs/gfs2/lops.h                     |   96 +
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  888 +++++++++
 fs/gfs2/meta_io.h                  |   89 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  304 +++
 fs/gfs2/ops_address.c              |  669 ++++++
 fs/gfs2/ops_address.h              |   17 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  285 ++
 fs/gfs2/ops_export.h               |   15 
 fs/gfs2/ops_file.c                 | 1000 ++++++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  842 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1167 ++++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  195 ++
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/page.c                     |  268 ++
 fs/gfs2/page.h                     |   23 
 fs/gfs2/quota.c                    | 1301 +++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1529 +++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  928 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 ++++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/dlm.h                |  302 +++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  441 ++++
 include/linux/iflags.h             |  102 +
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   40 
 kernel/printk.c                    |    1 
 mm/filemap.c                       |    1 
 mm/readahead.c                     |    1 
 132 files changed, 40810 insertions(+), 4 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-gfs2-dlm.patch	22 Jun 2006 13:53:23 -0000	1.4
+++ linux-2.6-gfs2-dlm.patch	26 Jun 2006 18:54:09 -0000	1.5
@@ -32509,9 +32509,9 @@
 +
 +static struct super_block *gfs2_get_sb(struct file_system_type *fs_type,
 +				       int flags, const char *dev_name,
-+				       void *data)
++				       void *data, struct vfsmount *mnt)
 +{
-+	return get_sb_bdev(fs_type, flags, dev_name, data, fill_super);
++	return get_sb_bdev(fs_type, flags, dev_name, data, fill_super, mnt);
 +}
 +
 +static void gfs2_kill_sb(struct super_block *sb)



From fedora-cvs-commits at redhat.com  Mon Jun 26 19:17:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 15:17:19 -0400
Subject: rpms/kernel/devel linux-2.6-squashfs.patch,1.2,1.3
Message-ID: <200606261917.k5QJHJ9j012566@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12532

Modified Files:
	linux-2.6-squashfs.patch 
Log Message:
buildfix

linux-2.6-squashfs.patch:
 fs/Kconfig                     |   65 +
 fs/Makefile                    |    1 
 fs/squashfs/Makefile           |    7 
 fs/squashfs/inode.c            | 2127 +++++++++++++++++++++++++++++++++++++++++
 fs/squashfs/squashfs.h         |   86 +
 fs/squashfs/squashfs2_0.c      |  758 ++++++++++++++
 include/linux/squashfs_fs.h    |  911 +++++++++++++++++
 include/linux/squashfs_fs_i.h  |   45 
 include/linux/squashfs_fs_sb.h |   74 +
 9 files changed, 4074 insertions(+)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-squashfs.patch	23 Jun 2006 15:42:41 -0000	1.2
+++ linux-2.6-squashfs.patch	26 Jun 2006 19:17:16 -0000	1.3
@@ -2121,9 +2121,9 @@
 +
 +
 +static struct super_block *squashfs_get_sb(struct file_system_type *fs_type,
-+				int flags, const char *dev_name, void *data)
++				int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 +{
-+	return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super);
++	return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, mnt);
 +}
 +
 +



From fedora-cvs-commits at redhat.com  Mon Jun 26 19:33:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 15:33:58 -0400
Subject: rpms/kernel/devel linux-2.6-squashfs.patch,1.3,1.4
Message-ID: <200606261933.k5QJXwhm018606@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18576

Modified Files:
	linux-2.6-squashfs.patch 
Log Message:
buildfix

linux-2.6-squashfs.patch:
 fs/Kconfig                     |   65 +
 fs/Makefile                    |    1 
 fs/squashfs/Makefile           |    7 
 fs/squashfs/inode.c            | 2127 +++++++++++++++++++++++++++++++++++++++++
 fs/squashfs/squashfs.h         |   86 +
 fs/squashfs/squashfs2_0.c      |  758 ++++++++++++++
 include/linux/squashfs_fs.h    |  911 +++++++++++++++++
 include/linux/squashfs_fs_i.h  |   45 
 include/linux/squashfs_fs_sb.h |   74 +
 9 files changed, 4074 insertions(+)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-squashfs.patch	26 Jun 2006 19:17:16 -0000	1.3
+++ linux-2.6-squashfs.patch	26 Jun 2006 19:33:45 -0000	1.4
@@ -151,7 +151,7 @@
 +				int readahead_blks, char *block_list,
 +				unsigned short **block_p, unsigned int *bsize);
 +static struct super_block *squashfs_get_sb(struct file_system_type *, int,
-+				const char *, void *);
++				const char *, void *, struct vfsmount *);
 +
 +
 +static z_stream stream;



From fedora-cvs-commits at redhat.com  Mon Jun 26 19:39:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 15:39:54 -0400
Subject: rpms/xorg-x11-drv-nv/devel nv-1.1.2-panel-message.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.18, 1.19
Message-ID: <200606261939.k5QJdsk2019793@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19729

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-1.1.2-panel-message.patch 
Log Message:
- Make the message printed when modes are rejected for not fitting in the
  panel size more accurate (and quieter).


nv-1.1.2-panel-message.patch:
 nv_driver.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE nv-1.1.2-panel-message.patch ---
--- xf86-video-nv-1.1.2/src/nv_driver.c.panel-message	2006-06-26 14:26:34.000000000 -0400
+++ xf86-video-nv-1.1.2/src/nv_driver.c	2006-06-26 15:34:20.000000000 -0400
@@ -934,10 +934,7 @@
 
     if(pNv->fpWidth && pNv->fpHeight) {
       if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay)) {
-         xf86DrvMsg(scrnIndex, X_INFO, "Mode \"%s\" is larger than "
-                    "BIOS programmed panel size of %d x %d.  Removing.\n",
-                     mode->name, pNv->fpWidth, pNv->fpHeight);
-         return (MODE_BAD);
+         return (MODE_PANEL);
       }
     }
 


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-nv.spec	17 Jun 2006 08:09:37 -0000	1.18
+++ xorg-x11-drv-nv.spec	26 Jun 2006 19:39:52 -0000	1.19
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.1.2
-Release:   1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -23,6 +23,7 @@
 Requires:  xorg-x11-server-Xorg >= 1.1.0-1
 
 Patch0:    nv-1.1.1-nv34-tweaks.patch
+Patch1:    nv-1.1.2-panel-message.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -31,6 +32,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .nv34-tweak
+%patch1 -p1 -b .panel-message
 
 %build
 %configure --disable-static
@@ -62,6 +64,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 1.1.2-2
+- Make the message printed when modes are rejected for not fitting in the
+  panel size more accurate (and quieter).
+
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 1.1.2-1
 - Update to 1.1.2 release for X11R7.1 server.
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 20:07:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 16:07:28 -0400
Subject: rpms/qt/FC-5 qt.spec,1.105,1.106
Message-ID: <200606262007.k5QK7SZD020548@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20534

Modified Files:
	qt.spec 
Log Message:
fix specfile



Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- qt.spec	26 Jun 2006 17:26:45 -0000	1.105
+++ qt.spec	26 Jun 2006 20:07:25 -0000	1.106
@@ -483,6 +483,7 @@
    install bin/$i %{buildroot}%{qtdir}/bin/
 done
 
+mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 # install man pages



From fedora-cvs-commits at redhat.com  Mon Jun 26 20:22:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 16:22:11 -0400
Subject: rpms/system-config-rootpassword/devel .cvsignore, 1.7, 1.8 sources,
	1.8, 1.9 system-config-rootpassword.spec, 1.12, 1.13
Message-ID: <200606262022.k5QKMBqc003035@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/system-config-rootpassword/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3018

Modified Files:
	.cvsignore sources system-config-rootpassword.spec 
Log Message:
Bump


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-rootpassword/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2005 14:44:14 -0000	1.7
+++ .cvsignore	26 Jun 2006 20:22:09 -0000	1.8
@@ -2,3 +2,4 @@
 system-config-rootpassword-1.1.6.tar.bz2
 system-config-rootpassword-1.1.7.tar.bz2
 system-config-rootpassword-1.1.8.tar.bz2
+system-config-rootpassword-1.1.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-rootpassword/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2005 14:44:14 -0000	1.8
+++ sources	26 Jun 2006 20:22:09 -0000	1.9
@@ -1 +1 @@
-e767581f0c0f0ccd8c09754553d2396d  system-config-rootpassword-1.1.8.tar.bz2
+a092182218d144d7979fcea87770fc80  system-config-rootpassword-1.1.9.tar.bz2


Index: system-config-rootpassword.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-rootpassword/devel/system-config-rootpassword.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system-config-rootpassword.spec	9 Dec 2005 22:43:28 -0000	1.12
+++ system-config-rootpassword.spec	26 Jun 2006 20:22:09 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the rootpassword
 Name: system-config-rootpassword
-Version: 1.1.8
-Release: 1.1
+Version: 1.1.9
+Release: 1
 URL: http://fedora.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -79,6 +79,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-rootpassword
 
 %changelog
+* Mon Jun 26 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.9-1
+- Rebuild for translations
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jun 26 20:54:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 16:54:02 -0400
Subject: rpms/SDL/devel SDL.spec,1.43,1.44
Message-ID: <200606262054.k5QKs25M000806@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv745

Modified Files:
	SDL.spec 
Log Message:
- added missing (build) requires for libXt libXrender libXrandr
- remove %%makeinstall macro (bad practice)
- use %%{buildroot} macro consistantly



Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- SDL.spec	26 Jun 2006 15:09:12 -0000	1.43
+++ SDL.spec	26 Jun 2006 20:54:00 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 3
+Release: 4
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -14,8 +14,8 @@
 BuildRequires: nasm arts-devel audiofile-devel
 BuildRequires: esound-devel alsa-lib-devel
 BuildRequires: libXext-devel libX11-devel
-BuildRequires: libXt-devel libXrender-devel libXrandr-devel
 BuildRequires: libGL-devel libGLU-devel
+BuildRequires: libXt-devel libXrender-devel libXrandr-devel
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -28,8 +28,9 @@
 Requires: SDL = %{version}-%{release} alsa-lib-devel
 Requires: libX11-devel
 Requires: libXext-devel
-Requires: mesa-libGL-devel
-Requires: mesa-libGLU-devel
+Requires: libGL-devel
+Requires: libGLU-devel
+Requires: libXt-devel libXrender-devel libXrandr-devel
 
 %description devel
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -71,10 +72,10 @@
 rm -rf %{buildroot}
 
 export tagname=CC
-%makeinstall
+make install DESTDIR=%{buildroot}
 
 # remove libtool .la file
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf %{buildroot}
@@ -100,8 +101,10 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
-* Mon Jun 26 2006 Warren Togami <wtogami at redhat.com> 1.2.10-3
-- fix X related buildreqs (#195398)
+* Tue Jun 20 2006 Christopher Stone <chris.stone at gmail.com> 1.2.10-4
+- added missing (build) requires for libXt libXrender libXrandr
+- remove %%makeinstall macro (bad practice)
+- use %%{buildroot} macro consistantly
 
 * Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-2
 - added missing (build) requires for GL and GLU



From fedora-cvs-commits at redhat.com  Mon Jun 26 21:09:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 17:09:48 -0400
Subject: rpms/libpfm/devel .cvsignore, 1.4, 1.5 libpfm.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200606262109.k5QL9m6T003783@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3655

Modified Files:
	.cvsignore libpfm.spec sources 
Log Message:
Import libpfm-3.2-060621.tar.gz




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Jun 2006 14:08:10 -0000	1.4
+++ .cvsignore	26 Jun 2006 21:09:43 -0000	1.5
@@ -1 +1 @@
-libpfm-3.2-060613.tar.gz
+libpfm-3.2-060621.tar.gz


Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libpfm.spec	14 Jun 2006 14:08:10 -0000	1.11
+++ libpfm.spec	26 Jun 2006 21:09:45 -0000	1.12
@@ -1,4 +1,4 @@
-%define DATE 060613
+%define DATE 060621
 %define libpfm_release 1
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
+- Update to libpfm-3.2-060621.
+
 * Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>
 - Update to libpfm-3.2-060613.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Jun 2006 14:08:10 -0000	1.4
+++ sources	26 Jun 2006 21:09:46 -0000	1.5
@@ -1 +1 @@
-400b7add3ae943a4539429007e86427d  libpfm-3.2-060613.tar.gz
+e311cd70ddcf8dd659169dda017a2954  libpfm-3.2-060621.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 26 21:13:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 17:13:22 -0400
Subject: rpms/pfmon/devel .cvsignore, 1.4, 1.5 pfmon.spec, 1.12, 1.13 sources,
	1.4, 1.5
Message-ID: <200606262113.k5QLDM4H004934@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4839

Modified Files:
	.cvsignore pfmon.spec sources 
Log Message:
Import pfmon-3.2-060621.tar.gz




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Jun 2006 14:13:58 -0000	1.4
+++ .cvsignore	26 Jun 2006 21:13:19 -0000	1.5
@@ -1 +1 @@
-pfmon-3.2-060522.tar.gz
+pfmon-3.2-060621.tar.gz


Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pfmon.spec	14 Jun 2006 14:51:08 -0000	1.12
+++ pfmon.spec	26 Jun 2006 21:13:19 -0000	1.13
@@ -1,5 +1,5 @@
-%define DATE 060522
-%define pfmon_release 2
+%define DATE 060621
+%define pfmon_release 1
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
@@ -50,6 +50,9 @@
 %attr(755,root,root) /usr/bin/pfmon_gen
 
 %changelog
+* Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
+- Update to pfmon-3.2-060621.
+
 * Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>
 - Correct BuildPreReq.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Jun 2006 14:13:58 -0000	1.4
+++ sources	26 Jun 2006 21:13:19 -0000	1.5
@@ -1 +1 @@
-4378a9b91e36f3d58bb699a6cdf4643d  pfmon-3.2-060522.tar.gz
+2489a1a1e5a24ae5616ce37b526104d7  pfmon-3.2-060621.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jun 26 21:22:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 17:22:39 -0400
Subject: rpms/pfmon/devel pfmon.spec,1.13,1.14
Message-ID: <200606262122.k5QLMd0i022167@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22083

Modified Files:
	pfmon.spec 
Log Message:
Correct buildprereqs.




Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pfmon.spec	26 Jun 2006 21:13:19 -0000	1.13
+++ pfmon.spec	26 Jun 2006 21:22:36 -0000	1.14
@@ -1,5 +1,5 @@
 %define DATE 060621
-%define pfmon_release 1
+%define pfmon_release 2
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
@@ -15,8 +15,8 @@
 Patch2: pfmon-nounwind.patch
 Requires: libpfm
 BuildPreReq: elfutils-devel
-BuildPreReq: libpfm >= 3.2-0.060613.1
-BuildPreReq: libpfm-devel >= 3.2-0.060613.1
+BuildPreReq: libpfm >= 3.2-0.060621.1
+BuildPreReq: libpfm-devel >= 3.2-0.060621.1
 
 %description
 This package contains pfmon 3.x, a tool to monitor performance using
@@ -51,6 +51,9 @@
 
 %changelog
 * Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
+- Correct buildprereq.
+
+* Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
 - Update to pfmon-3.2-060621.
 
 * Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Jun 26 21:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 17:25:25 -0400
Subject: rpms/GFS-kernel/FC-5 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, NONE,
	1.1 GFS-kernel.spec, 1.157, 1.158
Message-ID: <200606262125.k5QLPPWC023129@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23084

Modified Files:
	GFS-kernel.spec 
Added Files:
	gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
Added patch for 2.6.17.

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 main.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE gfs-kernel-2.6.15-2-kernel-2.6.17.patch ---
--- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-06-26 16:23:21.000000000 -0500
+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-26 16:23:54.000000000 -0500
@@ -243,13 +243,14 @@ nolock_plock_get(lm_lockspace_t *lockspa
 		 struct lm_lockname *name,
 		 struct file *file, struct file_lock *fl)
 {
-	struct file_lock *tmp;
+	struct file_lock tmp;
+	int ret;
 
 	lock_kernel();
-	tmp = posix_test_lock(file, fl);
+	ret = posix_test_lock(file, fl, &tmp);
 	fl->fl_type = F_UNLCK;
-	if (tmp)
-		memcpy(fl, tmp, sizeof(struct file_lock));
+	if (ret)
+		memcpy(fl, &tmp, sizeof(struct file_lock));
 	unlock_kernel();
 
 	return 0;


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- GFS-kernel.spec	26 Jun 2006 18:45:42 -0000	1.157
+++ GFS-kernel.spec	26 Jun 2006 21:25:22 -0000	1.158
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.25
+Release: 5.FC5.26
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules
@@ -63,7 +63,7 @@
 #ExclusiveArch: i586 i686 x86_64 ppc 
 ExclusiveArch: i686 x86_64
 Source0: gfs-kernel-%{tempversion}-%{subversion}.tar.gz
-
+Patch0: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
 BuildRoot: %{_tmppath}/%{name}-%{tempversion}-%{release}-buildroot
 
 %description
@@ -121,6 +121,7 @@
 ################################################################################
 %prep
 %setup -q -n gfs-kernel-%{tempversion}-%{subversion}
+%patch -p1 -b .kernel-2.6.17
 # Put the version information into the necessary files
 sed  -i -e '/RELEASE_NAME/s/"<CVS>"/"%{version}-%{release}"/' \
 	src/nolock/main.c src/gulm/gulm.h src/gfs/gfs.h src/harness/main.c 



From fedora-cvs-commits at redhat.com  Mon Jun 26 22:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 18:28:19 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec, 1.158,
	1.159 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, 1.1, 1.2
Message-ID: <200606262228.k5QMSJc5004924@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4881

Modified Files:
	GFS-kernel.spec gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
Updated kernel-2.6.17 patch.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- GFS-kernel.spec	26 Jun 2006 21:25:22 -0000	1.158
+++ GFS-kernel.spec	26 Jun 2006 22:28:13 -0000	1.159
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.26
+Release: 5.FC5.27
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 gfs/diaper.c  |   16 ++++++++--------
 nolock/main.c |   11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

Index: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/gfs-kernel-2.6.15-2-kernel-2.6.17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gfs-kernel-2.6.15-2-kernel-2.6.17.patch	26 Jun 2006 21:25:22 -0000	1.1
+++ gfs-kernel-2.6.15-2-kernel-2.6.17.patch	26 Jun 2006 22:28:13 -0000	1.2
@@ -1,5 +1,14 @@
---- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-06-26 16:23:21.000000000 -0500
-+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-26 16:23:54.000000000 -0500
+--- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
++++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-26 16:25:12.000000000 -0500
+@@ -20,7 +20,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/lm_interface.h>
+ 
+-#define RELEASE_NAME "<CVS>"
++#define RELEASE_NAME "2.6.15.1-5.FC5.26"
+ 
+ struct nolock_lockspace {
+ 	unsigned int nl_lvb_size;
 @@ -243,13 +243,14 @@ nolock_plock_get(lm_lockspace_t *lockspa
  		 struct lm_lockname *name,
  		 struct file *file, struct file_lock *fl)
@@ -19,3 +28,69 @@
  	unlock_kernel();
  
  	return 0;
+--- gfs-kernel-2.6.15-2/src/gfs/diaper.c.kernel-2.6.17	2006-06-26 17:26:36.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-26 17:26:46.000000000 -0500
+@@ -232,9 +232,9 @@ get_dummy_sb(struct diaper_holder *dh)
+ 	struct inode *inode;
+ 	int error;
+ 
+-	down(&real->bd_mount_sem);
++	mutex_lock(&real->bd_mount_mutex);
+ 	sb = sget(&gfs_fs_type, gfs_test_bdev_super, gfs_set_bdev_super, real);
+-	up(&real->bd_mount_sem);
++	mutex_unlock(&real->bd_mount_mutex);
+ 	if (IS_ERR(sb))
+ 		return PTR_ERR(sb);
+ 
+@@ -363,7 +363,7 @@ diaper_get(struct block_device *real, in
+ 	if (!diaper)
+ 		goto fail_remove;
+ 
+-	down(&diaper->bd_sem);
++	mutex_lock(&diaper->bd_mutex);
+ 	if (!diaper->bd_openers) {
+ 		diaper->bd_disk = gd;
+ 		diaper->bd_contains = diaper;
+@@ -372,7 +372,7 @@ diaper_get(struct block_device *real, in
+ 	} else
+ 		printk("GFS: diaper: reopening\n");
+ 	diaper->bd_openers++;
+-	up(&diaper->bd_sem);
++	mutex_unlock(&diaper->bd_mutex);
+ 
+ 	dh->dh_mempool = mempool_create(512,
+ 					mempool_alloc_slab, mempool_free_slab,
+@@ -395,14 +395,14 @@ diaper_get(struct block_device *real, in
+ 	mempool_destroy(dh->dh_mempool);
+ 
+  fail_bdput:
+-	down(&diaper->bd_sem);
++	mutex_lock(&diaper->bd_mutex);
+ 	if (!--diaper->bd_openers) {
+ 		invalidate_bdev(diaper, 1);
+ 		diaper->bd_contains = NULL;
+ 		diaper->bd_disk = NULL;
+ 	} else
+ 		printk("GFS: diaper: not closed\n");
+-	up(&diaper->bd_sem);
++	mutex_unlock(&diaper->bd_mutex);
+ 	bdput(diaper);	
+ 
+  fail_remove:
+@@ -437,14 +437,14 @@ diaper_put(struct diaper_holder *dh)
+ 
+ 	mempool_destroy(dh->dh_mempool);
+ 
+-	down(&diaper->bd_sem);
++	mutex_lock(&diaper->bd_mutex);
+ 	if (!--diaper->bd_openers) {
+ 		invalidate_bdev(diaper, 1);
+ 		diaper->bd_contains = NULL;
+ 		diaper->bd_disk = NULL;
+ 	} else
+ 		printk("GFS: diaper: not closed\n");
+-	up(&diaper->bd_sem);
++	mutex_unlock(&diaper->bd_mutex);
+ 
+ 	bdput(diaper);
+ 	del_gendisk(gd);



From fedora-cvs-commits at redhat.com  Mon Jun 26 22:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 18:57:53 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.6.1-dotclock-filter.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.24, 1.25
Message-ID: <200606262257.k5QMvqFI027583@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27508

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.1-dotclock-filter.patch 
Log Message:
- Filter the EDID mode list by the monitor's reported pixel clock.  Bump
  the BuildReq to a server that provides the necessary ABI field.


radeon-6.6.1-dotclock-filter.patch:
 radeon_driver.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE radeon-6.6.1-dotclock-filter.patch ---
--- xf86-video-ati-6.6.1/src/radeon_driver.c.dotclock-filter	2006-06-26 18:40:29.000000000 -0400
+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-06-26 18:41:55.000000000 -0400
@@ -3739,7 +3739,7 @@
 {
     MonPtr      mon = pScrn->monitor;
     xf86MonPtr  ddc = mon->DDC;
-    int         i;
+    int         i, clock;
 
     if (flag) { /* HSync */
 	for (i = 0; i < 4; i++) {
@@ -3747,6 +3747,9 @@
 		mon->nHsync = 1;
 		mon->hsync[0].lo = ddc->det_mon[i].section.ranges.min_h;
 		mon->hsync[0].hi = ddc->det_mon[i].section.ranges.max_h;
+		clock = ddc->det_mon[i].section.ranges.max_clock * 1000;
+		if (clock > mon->maxPixClock)
+		    mon->maxPixClock = clock;
 		return;
 	    }
 	}
@@ -3793,6 +3796,9 @@
 		mon->nVrefresh = 1;
 		mon->vrefresh[0].lo = ddc->det_mon[i].section.ranges.min_v;
 		mon->vrefresh[0].hi = ddc->det_mon[i].section.ranges.max_v;
+		clock = ddc->det_mon[i].section.ranges.max_clock * 1000;
+		if (clock > mon->maxPixClock)
+		    mon->maxPixClock = clock;
 		return;
 	    }
 	}


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-ati.spec	17 Jun 2006 07:02:56 -0000	1.24
+++ xorg-x11-drv-ati.spec	26 Jun 2006 22:57:49 -0000	1.25
@@ -24,6 +24,8 @@
 Source2:   r128.xinf
 Source3:   radeon.xinf
 
+Patch0:    radeon-6.6.1-dotclock-filter.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
@@ -33,7 +35,7 @@
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+Requires:  xorg-x11-server-Xorg >= 1.1.0-12
 
 %description 
 X.Org X11 ati video driver.
@@ -41,6 +43,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .dotclock-filter
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -83,6 +87,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-2
+- Filter the EDID mode list by the monitor's reported pixel clock.  Bump
+  the BuildReq to a server that provides the necessary ABI field.
+
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 6.6.1-1
 - Updated xorg-x11-drv-ati to version 6.6.1 update release for X11R7.1
 - Drop db-root-visual.patch, as it is included in 6.6.1



From fedora-cvs-commits at redhat.com  Mon Jun 26 22:58:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 18:58:21 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.25,1.26
Message-ID: <200606262258.k5QMwLmp027788@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27752

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
bump



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-ati.spec	26 Jun 2006 22:57:49 -0000	1.25
+++ xorg-x11-drv-ati.spec	26 Jun 2006 22:58:19 -0000	1.26
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support



From fedora-cvs-commits at redhat.com  Mon Jun 26 23:22:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 19:22:33 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch, 1.1,
	1.2 xorg-x11-server.spec, 1.101,
	1.102 xorg-x11-server-1.1.0-edid-mode-injection-3.patch, 1.1, NONE
Message-ID: <200606262322.k5QNMXel024902@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24571

Modified Files:
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch 
	xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.1.0-edid-mode-injection-3.patch 
Log Message:
- Fix an open-coded check for reduced-blanking modes to only apply to analog
  connectors.
- Reorder the EDID patches slightly.


xorg-x11-server-1.1.0-edid-mode-injection-2.patch:
 common/xf86Config.c |    1 +
 common/xf86Mode.c   |    6 +++++-
 common/xf86str.h    |    1 +
 ddc/ddcProperty.c   |   17 +++++++++++++++--
 4 files changed, 22 insertions(+), 3 deletions(-)

Index: xorg-x11-server-1.1.0-edid-mode-injection-2.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-edid-mode-injection-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-edid-mode-injection-2.patch	14 Jun 2006 00:05:17 -0000	1.1
+++ xorg-x11-server-1.1.0-edid-mode-injection-2.patch	26 Jun 2006 23:22:28 -0000	1.2
@@ -1,6 +1,16 @@
---- xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c.edid2	2006-06-07 17:28:45.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c	2006-06-07 18:08:27.000000000 -0400
-@@ -296,7 +296,7 @@
+Various touchups to the EDID auto-injection to make things work.
+
+* Don't record the monitor's gamma information, since we misuse it
+  elsewhere such that recording it makes your screen VERY VERY BRIGHT.
+* Record the maximum dot clock of the monitor, and filter by it.
+* De-fang an open-coded reduced-blanking check to not cripple LCDs.
+
+This probably needs a second glance before pushing it upstream, and of
+course this depends on the first -edid- patch.  - ajax
+
+--- xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c.edid2	2006-06-26 16:59:05.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c	2006-06-26 16:59:33.000000000 -0400
+@@ -296,14 +296,18 @@
  xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
  {
      DisplayModePtr Modes = NULL, Mode;
@@ -9,7 +19,19 @@
      
      if (!Monitor || !DDC)
          return;
-@@ -345,6 +345,15 @@
+ 
+     Monitor->DDC = DDC;
+ 
+-    if (DDC->features.gamma > 0.0) {
++    /*
++     * Don't want to fill this in yet, drivers will (wrongly!) set their
++     * gamma ramp based on this info.
++     */
++    if (0 && DDC->features.gamma > 0.0) {
+         Monitor->gamma.red = DDC->features.gamma;
+         Monitor->gamma.green = DDC->features.gamma;
+         Monitor->gamma.blue = DDC->features.gamma;
+@@ -345,6 +349,15 @@
              Monitor->vrefresh[0].lo = DDC->det_mon[i].section.ranges.min_v;
              Monitor->vrefresh[0].hi = DDC->det_mon[i].section.ranges.max_v;
  
@@ -25,8 +47,8 @@
              break;
          case DT:
              Mode = DDCModeFromDetailedTiming(scrnIndex, 
---- xorg-server-1.1.0/hw/xfree86/common/xf86Config.c.edid2	2006-06-07 17:28:45.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c	2006-06-07 18:00:04.000000000 -0400
+--- xorg-server-1.1.0/hw/xfree86/common/xf86Config.c.edid2	2006-04-06 21:40:52.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c	2006-06-26 16:59:05.000000000 -0400
 @@ -2220,6 +2220,7 @@
      monitorp->heightmm = conf_monitor->mon_height;
      monitorp->reducedblanking = FALSE;
@@ -35,8 +57,8 @@
  
      /*
       * fill in the monitor structure
---- xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c.edid2	2006-06-07 17:28:45.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c	2006-06-07 18:08:30.000000000 -0400
+--- xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c.edid2	2006-06-26 16:59:05.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c	2006-06-26 17:00:40.000000000 -0400
 @@ -810,6 +810,9 @@
          }
      }
@@ -47,8 +69,18 @@
      return MODE_OK;
  }
  
+@@ -1573,7 +1576,8 @@
+ 			 * horizontal timing parameters that CRTs may have
+ 			 * problems with.
+ 			 */
+-			if ((q->type & M_T_DEFAULT) &&
++			if (!scrp->monitor->reducedblanking &&
++			    (q->type & M_T_DEFAULT) &&
+ 			    ((double)q->HTotal / (double)q->HDisplay) < 1.15)
+ 			    continue;
+ 
 --- xorg-server-1.1.0/hw/xfree86/common/xf86str.h.edid2	2006-03-07 18:58:22.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86str.h	2006-06-07 17:59:41.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/common/xf86str.h	2006-06-26 16:59:05.000000000 -0400
 @@ -208,6 +208,7 @@
      pointer		options;
      pointer		DDC;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- xorg-x11-server.spec	21 Jun 2006 10:53:36 -0000	1.101
+++ xorg-x11-server.spec	26 Jun 2006 23:22:28 -0000	1.102
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   22
+Release:   23
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -45,8 +45,8 @@
 # autoconfiguration feature patches
 #Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
-Patch3002:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
-Patch3003:  xorg-x11-server-1.1.0-edid-mode-injection-2.patch
+Patch3002:  xorg-x11-server-1.1.0-edid-mode-injection-2.patch
+Patch3003:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
 Patch3005:  xorg-x11-server-1.1.0-pci-driver-detection.patch
 Patch3006:  xorg-x11-server-1.1.0-fix-default-mouse-device.patch
@@ -314,12 +314,11 @@
 #%patch2003 -p1 -b .loader-diet
 
 %patch3001 -p1 -b .edid1
-%patch3002 -p1 -b .cvt
-%patch3003 -p1 -b .edid2
+%patch3002 -p1 -b .edid2
+%patch3003 -p1 -b .cvt
 %patch3004 -p1 -b .targetrefresh
 %patch3005 -p1 -b .pci-loader
 %patch3006 -p1 -b .mice
-%patch3007 -p1 -b .edid3
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -644,6 +643,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-23
+- Fix an open-coded check for reduced-blanking modes to only apply to analog
+  connectors.
+- Reorder the EDID patches slightly.
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
 - Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
 - Disable DRI on ppc64 builds.


--- xorg-x11-server-1.1.0-edid-mode-injection-3.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jun 26 23:24:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 19:24:40 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.102,1.103
Message-ID: <200606262324.k5QNOeVs024995@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24982

Modified Files:
	xorg-x11-server.spec 
Log Message:
Erk, stray patch line.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- xorg-x11-server.spec	26 Jun 2006 23:22:28 -0000	1.102
+++ xorg-x11-server.spec	26 Jun 2006 23:24:37 -0000	1.103
@@ -50,7 +50,6 @@
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
 Patch3005:  xorg-x11-server-1.1.0-pci-driver-detection.patch
 Patch3006:  xorg-x11-server-1.1.0-fix-default-mouse-device.patch
-Patch3007:  xorg-x11-server-1.1.0-edid-mode-injection-3.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri



From fedora-cvs-commits at redhat.com  Tue Jun 27 00:39:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 20:39:27 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.202,
	1.203 config-ia64-generic, 1.30, 1.31 config-powerpc-generic,
	1.18, 1.19 config-x86-generic, 1.55,
	1.56 config-x86_64-generic, 1.42, 1.43
Message-ID: <200606270039.k5R0dR2w007741@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7567/configs

Modified Files:
	config-generic config-ia64-generic config-powerpc-generic 
	config-x86-generic config-x86_64-generic 
Log Message:
git11



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- config-generic	26 Jun 2006 15:27:24 -0000	1.202
+++ config-generic	27 Jun 2006 00:39:24 -0000	1.203
@@ -506,6 +506,7 @@
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID6=m
 CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -1421,6 +1422,7 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
@@ -1639,7 +1641,7 @@
 CONFIG_USBPCWATCHDOG=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 
-CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
 CONFIG_RTC_CLASS=m
@@ -1735,10 +1737,12 @@
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
 CONFIG_VIDEO_DECODER=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_EM28XX=m
@@ -1919,13 +1923,13 @@
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 CONFIG_FB_SAVAGE_ACCEL=y
-# 2.6.12-rc1-bk2 = Nvidia fb crashes.
-# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_NVIDIA=m
 CONFIG_FB_NVIDIA_I2C=y
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_CYBLA=m
-# CONFIG_FB_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2295,6 +2299,7 @@
 CONFIG_USB_TOUCHSCREEN=m
 
 CONFIG_USB_QUICKCAM_MESSENGER=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
 # File systems
@@ -2800,10 +2805,9 @@
 
 ## END of ISA options.
 
-# FIXME: This needs to be made to depend on PPC
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-
 CONFIG_UNWIND_INFO=y
+CONFIG_STACK_UNWIND=y
+
 # CONFIG_FORCED_INLINING is not set
 
 CONFIG_MIGRATION=y
@@ -2813,3 +2817,4 @@
 CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=m
 
+


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-ia64-generic	26 Jun 2006 15:27:24 -0000	1.30
+++ config-ia64-generic	27 Jun 2006 00:39:24 -0000	1.31
@@ -174,3 +174,5 @@
 
 # CONFIG_BCM43XX is not set
 
+CONFIG_HW_RANDOM_INTEL=m
+


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-powerpc-generic	26 Jun 2006 01:38:22 -0000	1.18
+++ config-powerpc-generic	27 Jun 2006 00:39:24 -0000	1.19
@@ -94,8 +94,9 @@
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 # CONFIG_PMAC_BACKLIGHT_LEGACY is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_NVIDIA_BACKLIGHT=y
 


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- config-x86-generic	26 Jun 2006 15:27:24 -0000	1.55
+++ config-x86-generic	27 Jun 2006 00:39:24 -0000	1.56
@@ -293,3 +293,11 @@
 CONFIG_SND_ES18XX=m
 
 CONFIG_TCG_INFINEON=m
+
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- config-x86_64-generic	26 Jun 2006 15:27:24 -0000	1.42
+++ config-x86_64-generic	27 Jun 2006 00:39:24 -0000	1.43
@@ -19,6 +19,7 @@
 CONFIG_DEBUG_RODATA=y
 CONFIG_MICROCODE=m
 CONFIG_SWIOTLB=y
+CONFIG_CALGARY_IOMMU=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_EDD=m
 CONFIG_PCI_BIOS=y
@@ -161,3 +162,13 @@
 CONFIG_SCHED_MC=y
 
 CONFIG_TCG_INFINEON=m
+
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+
+# CONFIG_HW_RANDOM_GEODE is not set
+
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+



From fedora-cvs-commits at redhat.com  Tue Jun 27 00:39:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 20:39:27 -0400
Subject: rpms/kernel/devel/scripts reconfig.sh,NONE,1.1
Message-ID: <200606270039.k5R0dR5M007745@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/scripts
In directory cvs.devel.redhat.com:/tmp/cvs-serv7567/scripts

Added Files:
	reconfig.sh 
Log Message:
git11



--- NEW FILE reconfig.sh ---
#!/bin/bash

V=$(grep sublevel kernel-2.6.spec | head -n1 | awk '{ print $3 }')

cd kernel-2.6.$V/linux-2.6.$V.noarch/
cp ../../kernel-*.config .

for i in kernel-*.config
do
	echo $i
	rm -f .config
	cp $i .config
	Arch=`head -1 .config | cut -b 3-`
	make ARCH=$Arch nonint_oldconfig > /dev/null
	echo "# $Arch" > configs/$i
	cat .config >> configs/$i
	echo
done




From fedora-cvs-commits at redhat.com  Tue Jun 27 00:39:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 20:39:27 -0400
Subject: rpms/kernel/devel patch-2.6.17-git11.bz2.sign, NONE, 1.1 .cvsignore,
	1.465, 1.466 Makefile, 1.25, 1.26 kernel-2.6.spec, 1.2314,
	1.2315 linux-2.6-build-nonintconfig.patch, 1.5,
	1.6 linux-2.6-compile-fixes.patch, 1.84,
	1.85 linux-2.6-debug-Wundef.patch, 1.4,
	1.5 linux-2.6-execshield.patch, 1.22,
	1.23 linux-2.6-gfs2-dlm.patch, 1.5,
	1.6 linux-2.6-input-kill-stupid-messages.patch, 1.1,
	1.2 linux-2.6-modsign-core.patch, 1.3,
	1.4 linux-2.6-proc-self-maps-fix.patch, 1.3,
	1.4 linux-2.6-unexport-symbols.patch, 1.1,
	1.2 linux-2.6-xen-vsyscall_base.patch, 1.3,
	1.4 linux-2.6-xen.patch, 1.30, 1.31 sources, 1.409,
	1.410 upstream, 1.374, 1.375 linux-2.6-edid-check.patch, 1.2,
	NONE linux-2.6-x86_64-noisy-syscalls.patch, 1.1,
	NONE patch-2.6.17-git10.bz2.sign, 1.1, NONE
Message-ID: <200606270039.k5R0dRbn007723@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7567

Modified Files:
	.cvsignore Makefile kernel-2.6.spec 
	linux-2.6-build-nonintconfig.patch 
	linux-2.6-compile-fixes.patch linux-2.6-debug-Wundef.patch 
	linux-2.6-execshield.patch linux-2.6-gfs2-dlm.patch 
	linux-2.6-input-kill-stupid-messages.patch 
	linux-2.6-modsign-core.patch 
	linux-2.6-proc-self-maps-fix.patch 
	linux-2.6-unexport-symbols.patch 
	linux-2.6-xen-vsyscall_base.patch linux-2.6-xen.patch sources 
	upstream 
Added Files:
	patch-2.6.17-git11.bz2.sign 
Removed Files:
	linux-2.6-edid-check.patch 
	linux-2.6-x86_64-noisy-syscalls.patch 
	patch-2.6.17-git10.bz2.sign 
Log Message:
git11



--- NEW FILE patch-2.6.17-git11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEoC9wyGugalF9Dw4RAjPdAKCILKHiHhELIIbE+o72QrzfvAHUEACgjtKg
690CCKqGjq3qH1XlkpOo8UY=
=5lmZ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- .cvsignore	26 Jun 2006 15:27:23 -0000	1.465
+++ .cvsignore	27 Jun 2006 00:39:11 -0000	1.466
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git10.bz2
+patch-2.6.17-git11.bz2


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile	9 Mar 2006 19:27:38 -0000	1.25
+++ Makefile	27 Jun 2006 00:39:11 -0000	1.26
@@ -31,3 +31,7 @@
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' configs/config-x86-generic
 	@perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' configs/config-x86-generic
 
+reconfig:
+	@make -f Makefile.config configs
+	@scripts/reconfig.sh
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2314
retrieving revision 1.2315
diff -u -r1.2314 -r1.2315
--- kernel-2.6.spec	26 Jun 2006 15:28:14 -0000	1.2314
+++ kernel-2.6.spec	27 Jun 2006 00:39:11 -0000	1.2315
@@ -249,7 +249,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git10.bz2
+Patch1: patch-2.6.17-git11.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -265,10 +265,8 @@
 Patch201: linux-2.6-x86-vga-vidfail.patch
 Patch202: linux-2.6-intel-cache-build.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
-Patch204: linux-2.6-edid-check.patch
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
-Patch208: linux-2.6-x86_64-noisy-syscalls.patch
 
 # 300 - 399   ppc(64)
 Patch302: linux-2.6-offb-find-fb.patch
@@ -757,14 +755,10 @@
 %patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
-# Reboot thru bios on HP laptops.
-%patch204 -p1
 # Workaround BIOSes that don't list CPU0
 %patch205 -p1
 # Reboot through BIOS on HP systems,.
 %patch206 -p1
-# Hush noisy unimplemented 32bit syscalls
-%patch208 -p1
 
 #
 # ppc64
@@ -946,7 +940,7 @@
 # Radeon on thinkpad backlight power-management goodness.
 %patch1630 -p1
 # Fix IDE locking bug.
-%patch1640 -p1
+#%patch1640 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor
@@ -1039,7 +1033,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
+#%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1640,7 +1634,7 @@
 
 %changelog
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
-- 2.6.17-git10
+- 2.6.17-git10 & git11
 - Enable fake PCI hotplug driver. (#190437)
 - Remove lots of 'modprobe loop's from specfile.
 

linux-2.6-build-nonintconfig.patch:
 linux-2.6.14/scripts/kconfig/confdata.c      |    6 ++----
 linux-2.6.16.noarch/scripts/kconfig/Makefile |    3 +++
 linux-800/scripts/kconfig/conf.c             |   26 +++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-build-nonintconfig.patch	26 Mar 2006 00:13:38 -0000	1.5
+++ linux-2.6-build-nonintconfig.patch	27 Jun 2006 00:39:13 -0000	1.6
@@ -72,7 +72,7 @@
  		conf_read(NULL);
  		break;
  	default:
-@@ -594,10 +594,10 @@ int main(int ac, char **av)
+@@ -632,7 +632,7 @@ int main(int ac, char **av)
  	do {
  		conf_cnt = 0;
  		check_conf(&rootmenu);
@@ -81,7 +81,10 @@
  	if (conf_write(NULL)) {
  		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
  		return 1;
+@@ -643,5 +643,5 @@ skip_check:
+ 		return 1;
  	}
+ 
 -	return 0;
 +	return return_value;
  }
@@ -99,24 +102,24 @@
            --add-comments --keyword=_ --keyword=N_ \
 --- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-10 14:55:46.000000000 -0500
 +++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-10 14:56:01.000000000 -0500
-@@ -149,7 +149,7 @@ int conf_read_simple(const char *name)
- 				continue;
- 			sym = sym_find(line + 9);
- 			if (!sym) {
--				conf_warning("trying to assign nonexistent symbol %s", line + 9);
-+				conf_warning("trying to assign nonexistent symbol %s", line + 9);
- 				break;
- 			} else if (!(sym->flags & SYMBOL_NEW)) {
- 				conf_warning("trying to reassign symbol %s", sym->name);
-@@ -179,7 +179,7 @@ int conf_read_simple(const char *name)
- 				*p2 = 0;
- 			sym = sym_find(line + 7);
- 			if (!sym) {
--				conf_warning("trying to assign nonexistent symbol %s", line + 7);
-+				conf_warning("trying to assign nonexistent symbol %s", line + 7);
- 				break;
- 			} else if (!(sym->flags & SYMBOL_NEW)) {
- 				conf_warning("trying to reassign symbol %s", sym->name);
+@@ -161,7 +161,7 @@ load:
+ 			if (def == S_DEF_USER) {
+ 				sym = sym_find(line + 9);
+ 				if (!sym) {
+-					conf_warning("trying to assign nonexistent symbol %s", line + 9);
++					conf_warning("trying to assign nonexistent symbol %s", line + 9);
+ 					break;
+ 				}
+ 			} else {
+@@ -197,7 +197,7 @@ load:
+ 			if (def == S_DEF_USER) {
+ 				sym = sym_find(line + 7);
+ 				if (!sym) {
+-					conf_warning("trying to assign nonexistent symbol %s", line + 7);
++					conf_warning("trying to assign nonexistent symbol %s", line + 7);
+ 					break;
+ 				}
+ 			} else {
 --- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-15 23:51:37.000000000 -0500
 +++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-15 23:52:50.000000000 -0500
 @@ -153,7 +153,6 @@ int conf_read_simple(const char *name)
@@ -135,14 +138,3 @@
  			}
  			switch (sym->type) {
  			case S_TRISTATE:
---- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-16 00:06:16.000000000 -0500
-+++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-16 00:06:40.000000000 -0500
-@@ -254,7 +254,7 @@ int conf_read_simple(const char *name)
- 					cs->flags |= SYMBOL_NEW;
- 				} else
- 					cs->user.val = sym;
--				break;
-+				//break;
- 			}
- 			cs->user.tri = E_OR(cs->user.tri, sym->user.tri);
- 		}

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- linux-2.6-compile-fixes.patch	26 Jun 2006 01:38:15 -0000	1.84
+++ linux-2.6-compile-fixes.patch	27 Jun 2006 00:39:13 -0000	1.85
@@ -1,11 +0,0 @@
---- linux-2.6.17.noarch/drivers/media/video/usbvideo/quickcam_messenger.c~	2006-06-25 21:37:04.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/media/video/usbvideo/quickcam_messenger.c	2006-06-25 21:37:11.000000000 -0400
-@@ -33,7 +33,7 @@
- #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/input.h>
--#include <linux/usb_input.h>
-+#include <linux/usb/input.h>
- 
- #include "usbvideo.h"
- #include "quickcam_messenger.h"

linux-2.6-debug-Wundef.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-debug-Wundef.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-Wundef.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-Wundef.patch	6 Apr 2006 18:12:53 -0000	1.4
+++ linux-2.6-debug-Wundef.patch	27 Jun 2006 00:39:13 -0000	1.5
@@ -4,14 +4,14 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6/Makefile~	2005-05-28 18:48:02.000000000 -0400
-+++ linux-2.6/Makefile	2005-05-28 18:48:27.000000000 -0400
-@@ -306,7 +306,7 @@ LINUXINCLUDE    := -Iinclude \
+--- linux-2.6.17.noarch/Makefile~	2006-06-26 19:03:23.564376000 -0400
++++ linux-2.6.17.noarch/Makefile	2006-06-26 19:03:50.354546000 -0400
+@@ -307,7 +307,7 @@ LINUXINCLUDE    := -Iinclude \
  CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
- CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
--	  	   -fno-strict-aliasing -fno-common
-+	  	   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
- AFLAGS		:= -D__ASSEMBLY__
+ CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+-                   -fno-strict-aliasing -fno-common
++                   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
+ AFLAGS          := -D__ASSEMBLY__
  
- # Read KERNELRELEASE from .kernelrelease (if it exists)
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/arch/i386/kernel/sysenter.c |  123 ++++++++--------
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux-2.6.17.noarch/arch/i386/kernel/entry.S    |    8 -
 linux/arch/i386/kernel/asm-offsets.c            |    1 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/signal.c                 |    4 
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S      |    6 
 linux/arch/i386/kernel/vsyscall.lds.S           |    4 
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   34 +++-
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/elf.h                    |   50 ++++--
 linux/include/asm-i386/mmu.h                    |    6 
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-i386/thread_info.h            |    1 
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 52 files changed, 916 insertions(+), 214 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-execshield.patch	24 Jun 2006 18:40:59 -0000	1.22
+++ linux-2.6-execshield.patch	27 Jun 2006 00:39:13 -0000	1.23
@@ -28,25 +28,23 @@
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
  		char *p;
-Index: linux/arch/i386/kernel/entry.S
-===================================================================
---- linux.orig/arch/i386/kernel/entry.S
-+++ linux/arch/i386/kernel/entry.S
-@@ -184,8 +184,12 @@ sysenter_past_esp:
- 	pushl %ebp
- 	pushfl
+--- linux-2.6.17.noarch/arch/i386/kernel/entry.S~	2006-06-26 18:55:20.746055000 -0400
++++ linux-2.6.17.noarch/arch/i386/kernel/entry.S	2006-06-26 18:56:01.803956000 -0400
+@@ -263,7 +263,13 @@ sysenter_past_esp:
  	pushl $(__USER_CS)
+ 	CFI_ADJUST_CFA_OFFSET 4
+ 	/*CFI_REL_OFFSET cs, 0*/
 -	pushl $SYSENTER_RETURN
--
 +	/*
 +	 * Push current_thread_info()->sysenter_return to the stack.
 +	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
 +	 * pushed above; +8 corresponds to copy_thread's esp0 setting.
 +	 */
 +	pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
- /*
-  * Load the potential sixth argument from user stack.
-  * Careful about security.
++
+ 	CFI_ADJUST_CFA_OFFSET 4
+ 	CFI_REL_OFFSET eip, 0
+ 
 Index: linux/arch/i386/kernel/process.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/process.c

linux-2.6-gfs2-dlm.patch:
 b/CREDITS                                  |    6 
 b/Documentation/filesystems/gfs2.txt       |   43 
 b/MAINTAINERS                              |   18 
 b/fs/Kconfig                               |    2 
 b/fs/Makefile                              |    2 
 b/fs/configfs/item.c                       |    2 
 b/fs/dlm/Kconfig                           |   29 
 b/fs/dlm/Makefile                          |   21 
 b/fs/dlm/ast.c                             |  167 +
 b/fs/dlm/ast.h                             |   26 
 b/fs/dlm/config.c                          |  789 ++++++
 b/fs/dlm/config.h                          |   42 
 b/fs/dlm/debug_fs.c                        |  296 ++
 b/fs/dlm/device.c                          | 1239 ++++++++++
 b/fs/dlm/dir.c                             |  423 +++
 b/fs/dlm/dir.h                             |   30 
 b/fs/dlm/dlm_internal.h                    |  494 ++++
 b/fs/dlm/lock.c                            | 3547 +++++++++++++++++++++++++++++
 b/fs/dlm/lock.h                            |   50 
 b/fs/dlm/lockspace.c                       |  678 +++++
 b/fs/dlm/lockspace.h                       |   24 
 b/fs/dlm/lowcomms.c                        | 1238 ++++++++++
 b/fs/dlm/lowcomms.h                        |   26 
 b/fs/dlm/lvb_table.h                       |   18 
 b/fs/dlm/main.c                            |   89 
 b/fs/dlm/member.c                          |  312 ++
 b/fs/dlm/member.h                          |   24 
 b/fs/dlm/memory.c                          |  106 
 b/fs/dlm/memory.h                          |   29 
 b/fs/dlm/midcomms.c                        |  140 +
 b/fs/dlm/midcomms.h                        |   21 
 b/fs/dlm/rcom.c                            |  457 +++
 b/fs/dlm/rcom.h                            |   24 
 b/fs/dlm/recover.c                         |  762 ++++++
 b/fs/dlm/recover.h                         |   34 
 b/fs/dlm/recoverd.c                        |  285 ++
 b/fs/dlm/recoverd.h                        |   24 
 b/fs/dlm/requestqueue.c                    |  184 +
 b/fs/dlm/requestqueue.h                    |   22 
 b/fs/dlm/util.c                            |  161 +
 b/fs/dlm/util.h                            |   22 
 b/fs/gfs2/Kconfig                          |   44 
 b/fs/gfs2/Makefile                         |   10 
 b/fs/gfs2/acl.c                            |  313 ++
 b/fs/gfs2/acl.h                            |   37 
 b/fs/gfs2/bmap.c                           | 1103 +++++++++
 b/fs/gfs2/bmap.h                           |   32 
 b/fs/gfs2/daemon.c                         |  196 +
 b/fs/gfs2/daemon.h                         |   19 
 b/fs/gfs2/dir.c                            | 1980 ++++++++++++++++
 b/fs/gfs2/dir.h                            |   73 
 b/fs/gfs2/eaops.c                          |  230 +
 b/fs/gfs2/eaops.h                          |   29 
 b/fs/gfs2/eattr.c                          | 1548 ++++++++++++
 b/fs/gfs2/eattr.h                          |   97 
 b/fs/gfs2/format.h                         |   21 
 b/fs/gfs2/gfs2.h                           |   31 
 b/fs/gfs2/glock.c                          | 2280 ++++++++++++++++++
 b/fs/gfs2/glock.h                          |  152 +
 b/fs/gfs2/glops.c                          |  491 ++++
 b/fs/gfs2/glops.h                          |   23 
 b/fs/gfs2/incore.h                         |  659 +++++
 b/fs/gfs2/inode.c                          | 1358 +++++++++++
 b/fs/gfs2/inode.h                          |   56 
 b/fs/gfs2/lm.c                             |  244 +
 b/fs/gfs2/lm.h                             |   41 
 b/fs/gfs2/lm_interface.h                   |  295 ++
 b/fs/gfs2/locking.c                        |  191 +
 b/fs/gfs2/locking/dlm/Makefile             |    3 
 b/fs/gfs2/locking/dlm/lock.c               |  541 ++++
 b/fs/gfs2/locking/dlm/lock_dlm.h           |  188 +
 b/fs/gfs2/locking/dlm/main.c               |   64 
 b/fs/gfs2/locking/dlm/mount.c              |  256 ++
 b/fs/gfs2/locking/dlm/plock.c              |  299 ++
 b/fs/gfs2/locking/dlm/sysfs.c              |  225 +
 b/fs/gfs2/locking/dlm/thread.c             |  359 ++
 b/fs/gfs2/locking/nolock/Makefile          |    3 
 b/fs/gfs2/locking/nolock/main.c            |  259 ++
 b/fs/gfs2/log.c                            |  601 ++++
 b/fs/gfs2/log.h                            |   61 
 b/fs/gfs2/lops.c                           |  800 ++++++
 b/fs/gfs2/lops.h                           |   96 
 b/fs/gfs2/lvb.c                            |   45 
 b/fs/gfs2/lvb.h                            |   19 
 b/fs/gfs2/main.c                           |  127 +
 b/fs/gfs2/meta_io.c                        |  888 +++++++
 b/fs/gfs2/meta_io.h                        |   89 
 b/fs/gfs2/mount.c                          |  214 +
 b/fs/gfs2/mount.h                          |   15 
 b/fs/gfs2/ondisk.c                         |  304 ++
 b/fs/gfs2/ops_address.c                    |  669 +++++
 b/fs/gfs2/ops_address.h                    |   17 
 b/fs/gfs2/ops_dentry.c                     |  123 +
 b/fs/gfs2/ops_dentry.h                     |   15 
 b/fs/gfs2/ops_export.c                     |  285 ++
 b/fs/gfs2/ops_export.h                     |   15 
 b/fs/gfs2/ops_file.c                       | 1000 ++++++++
 b/fs/gfs2/ops_file.h                       |   20 
 b/fs/gfs2/ops_fstype.c                     |  842 ++++++
 b/fs/gfs2/ops_fstype.h                     |   16 
 b/fs/gfs2/ops_inode.c                      | 1167 +++++++++
 b/fs/gfs2/ops_inode.h                      |   18 
 b/fs/gfs2/ops_super.c                      |  471 +++
 b/fs/gfs2/ops_super.h                      |   15 
 b/fs/gfs2/ops_vm.c                         |  195 +
 b/fs/gfs2/ops_vm.h                         |   16 
 b/fs/gfs2/page.c                           |  268 ++
 b/fs/gfs2/page.h                           |   23 
 b/fs/gfs2/quota.c                          | 1301 ++++++++++
 b/fs/gfs2/quota.h                          |   32 
 b/fs/gfs2/recovery.c                       |  575 ++++
 b/fs/gfs2/recovery.h                       |   32 
 b/fs/gfs2/rgrp.c                           | 1529 ++++++++++++
 b/fs/gfs2/rgrp.h                           |   62 
 b/fs/gfs2/super.c                          |  928 +++++++
 b/fs/gfs2/super.h                          |   52 
 b/fs/gfs2/sys.c                            |  579 ++++
 b/fs/gfs2/sys.h                            |   24 
 b/fs/gfs2/trans.c                          |  184 +
 b/fs/gfs2/trans.h                          |   34 
 b/fs/gfs2/util.c                           |  245 ++
 b/fs/gfs2/util.h                           |  169 +
 b/include/linux/dlm.h                      |  302 ++
 b/include/linux/dlm_device.h               |   86 
 b/include/linux/fs.h                       |    3 
 b/include/linux/gfs2_ondisk.h              |  441 +++
 b/include/linux/iflags.h                   |  102 
 b/include/linux/lock_dlm_plock.h           |   40 
 b/kernel/printk.c                          |    1 
 b/mm/filemap.c                             |    1 
 b/mm/readahead.c                           |    1 
 linux-2.6.17.noarch/include/linux/kernel.h |    1 
 132 files changed, 40810 insertions(+), 4 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-gfs2-dlm.patch	26 Jun 2006 18:54:09 -0000	1.5
+++ linux-2.6-gfs2-dlm.patch	27 Jun 2006 00:39:13 -0000	1.6
@@ -41577,18 +41577,16 @@
 +#endif /* __KERNEL__ */
 +
 +#endif /* _LINUX_IFLAGS_H */
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index f4fc576..c217e99 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -29,6 +29,7 @@ extern const char linux_banner[];
+--- linux-2.6.17.noarch/include/linux/kernel.h~	2006-06-26 19:07:21.865815000 -0400
++++ linux-2.6.17.noarch/include/linux/kernel.h	2006-06-26 19:07:30.074595000 -0400
+@@ -32,6 +32,7 @@ extern const char linux_banner[];
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+ #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
  
  #define	KERN_EMERG	"<0>"	/* system is unusable			*/
- #define	KERN_ALERT	"<1>"	/* action must be taken immediately	*/
 diff --git a/include/linux/lock_dlm_plock.h b/include/linux/lock_dlm_plock.h
 new file mode 100644
 index 0000000..007b07a

linux-2.6-input-kill-stupid-messages.patch:
 linux-2.6.11/drivers/input/keyboard/atkbd.c        |    2 +-
 linux-2.6.17.noarch/drivers/input/keyboard/atkbd.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6-input-kill-stupid-messages.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-input-kill-stupid-messages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-input-kill-stupid-messages.patch	16 Oct 2005 22:23:45 -0000	1.1
+++ linux-2.6-input-kill-stupid-messages.patch	27 Jun 2006 00:39:13 -0000	1.2
@@ -9,18 +9,20 @@
  			goto out;
  	}
  
-@@ -348,9 +348,13 @@
- 			break;
- 		case ATKBD_KEY_UNKNOWN:
- 			if (data == ATKBD_RET_ACK || data == ATKBD_RET_NAK) {
-+#if 0
-+/* Quite a few key switchers and other tools trigger this and it confuses
-+   people who can do nothing about it */			
- 				printk(KERN_WARNING "atkbd.c: Spurious %s on %s. Some program, "
- 				       "like XFree86, might be trying access hardware directly.\n",
- 				       data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
-+#endif				       
- 			} else {
- 				printk(KERN_WARNING "atkbd.c: Unknown key %s "
- 				       "(%s set %d, code %#x on %s).\n",
 
+--- linux-2.6.17.noarch/drivers/input/keyboard/atkbd.c~	2006-06-26 19:11:36.659767000 -0400
++++ linux-2.6.17.noarch/drivers/input/keyboard/atkbd.c	2006-06-26 19:12:23.643737000 -0400
+@@ -383,9 +383,13 @@ static irqreturn_t atkbd_interrupt(struc
+ 			goto out;
+ 		case ATKBD_RET_ACK:
+ 		case ATKBD_RET_NAK:
++#if 0
++			/* Quite a few key switchers and other tools trigger this and it confuses
++			   people who can do nothing about it */
+ 			printk(KERN_WARNING "atkbd.c: Spurious %s on %s. "
+ 			       "Some program might be trying access hardware directly.\n",
+ 			       data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
++#endif
+ 			goto out;
+ 		case ATKBD_RET_HANGEUL:
+ 		case ATKBD_RET_HANJA:

linux-2.6-modsign-core.patch:
 linux-2.6.12/kernel/module-verify.c  |    2 
 linux-2.6.17.noarch/kernel/Makefile  |    3 
 linux-900/include/linux/module.h     |    3 
 linux-900/init/Kconfig               |   16 +
 linux-900/kernel/module-verify-sig.c |  442 +++++++++++++++++++++++++++++++++++
 linux-900/kernel/module-verify.c     |  340 ++++++++++++++++++++++++++
 linux-900/kernel/module-verify.h     |   37 ++
 linux-900/kernel/module.c            |   19 +
 8 files changed, 857 insertions(+), 5 deletions(-)

Index: linux-2.6-modsign-core.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-core.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-modsign-core.patch	22 Jun 2006 04:02:45 -0000	1.3
+++ linux-2.6-modsign-core.patch	27 Jun 2006 00:39:13 -0000	1.4
@@ -52,10 +52,10 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module.c linux-900/kernel/module.c
 --- linux-811/kernel/module.c
 +++ linux-900/kernel/module.c
-@@ -38,6 +38,7 @@
- #include <asm/uaccess.h>
+@@ -45,6 +45,7 @@
  #include <asm/semaphore.h>
  #include <asm/cacheflush.h>
+ #include <linux/license.h>
 +#include "module-verify.h"
  
  #if 0

linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                       |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                   |    2 ++
 b/include/linux/proc_fs.h              |    0 
 b/include/linux/ptrace.h               |    1 +
 b/kernel/ptrace.c                      |    4 ++--
 linux-2.6.16.noarch/kernel/ptrace.c    |    2 +-
 linux-2.6.17.noarch/fs/proc/task_mmu.c |    3 +--
 7 files changed, 27 insertions(+), 5 deletions(-)

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-proc-self-maps-fix.patch	5 Jun 2006 18:06:49 -0000	1.3
+++ linux-2.6-proc-self-maps-fix.patch	27 Jun 2006 00:39:13 -0000	1.4
@@ -45,20 +45,18 @@
  #ifdef CONFIG_MMU
  #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
  extern void get_vmalloc_info(struct vmalloc_info *vmi);
-diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 91b7c15..3777557 100644
---- a/fs/proc/task_mmu.c
-+++ b/fs/proc/task_mmu.c
-@@ -311,12 +311,11 @@ static void *m_start(struct seq_file *m,
- 	if (last_addr == -1UL)
+--- linux-2.6.17.noarch/fs/proc/task_mmu.c~	2006-06-26 19:16:06.064089000 -0400
++++ linux-2.6.17.noarch/fs/proc/task_mmu.c	2006-06-26 19:19:02.178798000 -0400
+@@ -344,12 +344,11 @@ static void *m_start(struct seq_file *m,
+ 	if (!priv->task)
  		return NULL;
  
--	mm = get_task_mm(task);
+-	mm = get_task_mm(priv->task);
 +	mm = mm_for_maps(task);
  	if (!mm)
  		return NULL;
  
- 	tail_vma = get_gate_vma(task);
+ 	priv->tail_vma = tail_vma = get_gate_vma(priv->task);
 -	down_read(&mm->mmap_sem);
  
  	/* Start with last addr hint */

linux-2.6-unexport-symbols.patch:
 open.c |    1 -
 1 files changed, 1 deletion(-)

Index: linux-2.6-unexport-symbols.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-unexport-symbols.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-unexport-symbols.patch	18 Aug 2005 18:28:13 -0000	1.1
+++ linux-2.6-unexport-symbols.patch	27 Jun 2006 00:39:13 -0000	1.2
@@ -12,11 +12,3 @@
  
  #ifndef __alpha__
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c
---- linux-3022/arch/x86_64/ia32/sys_ia32.c
-+++ linux-10000/arch/x86_64/ia32/sys_ia32.c
-@@ -1048,4 +1048,3 @@ static int __init ia32_init (void)
- __initcall(ia32_init);
- 
- extern unsigned long ia32_sys_call_table[];
--EXPORT_SYMBOL(ia32_sys_call_table);

linux-2.6-xen-vsyscall_base.patch:
 asm-offsets.c |    1 -
 1 files changed, 1 deletion(-)

Index: linux-2.6-xen-vsyscall_base.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-vsyscall_base.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen-vsyscall_base.patch	26 Apr 2006 11:13:46 -0000	1.3
+++ linux-2.6-xen-vsyscall_base.patch	27 Jun 2006 00:39:13 -0000	1.4
@@ -8,11 +8,13 @@
 
 --sct
 
---- linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c.vsys	2006-03-02 12:13:23.000000000 -0500
-+++ linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c	2006-03-02 12:13:33.000000000 -0500
-@@ -71,5 +71,4 @@
+--- linux-2.6.17.noarch/arch/i386/kernel/asm-offsets.c~	2006-06-26 18:45:02.609808000 -0400
++++ linux-2.6.17.noarch/arch/i386/kernel/asm-offsets.c	2006-06-26 18:45:09.925486000 -0400
+@@ -75,7 +75,6 @@ void foo(void)
  #endif
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
 -	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
+ 
+ 	OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
  }

linux-2.6-xen.patch:
 linux-2.6.17.noarch/arch/x86_64/kernel/asm-offsets.c      |    2 
 linux-2.6.17.noarch/drivers/firmware/Kconfig              |    2 
 merge/arch/i386/Kconfig                                   |   92 
 merge/arch/i386/Kconfig.cpu                               |    2 
 merge/arch/i386/Kconfig.debug                             |    1 
 merge/arch/i386/Makefile                                  |   24 
 merge/arch/i386/boot-xen/Makefile                         |   21 
 merge/arch/i386/kernel/Makefile                           |   22 
 merge/arch/i386/kernel/acpi/Makefile                      |    4 
 merge/arch/i386/kernel/acpi/boot-xen.c                    | 1167 +++++
 merge/arch/i386/kernel/apic-xen.c                         |  160 
 merge/arch/i386/kernel/asm-offsets.c                      |   10 
 merge/arch/i386/kernel/cpu/Makefile                       |    5 
 merge/arch/i386/kernel/cpu/common-xen.c                   |  732 +++
 merge/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 merge/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 merge/arch/i386/kernel/early_printk-xen.c                 |    2 
 merge/arch/i386/kernel/entry-xen.S                        |  903 ++++
 merge/arch/i386/kernel/entry.S                            |   10 
 merge/arch/i386/kernel/fixup.c                            |   86 
 merge/arch/i386/kernel/head-xen.S                         |  181 
 merge/arch/i386/kernel/init_task-xen.c                    |   51 
 merge/arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++
 merge/arch/i386/kernel/ioport-xen.c                       |  121 
 merge/arch/i386/kernel/irq-xen.c                          |  306 +
 merge/arch/i386/kernel/irq.c                              |    4 
 merge/arch/i386/kernel/ldt-xen.c                          |  269 +
 merge/arch/i386/kernel/microcode-xen.c                    |  148 
 merge/arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++
 merge/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 merge/arch/i386/kernel/process-xen.c                      |  812 ++++
 merge/arch/i386/kernel/quirks-xen.c                       |   48 
 merge/arch/i386/kernel/setup-xen.c                        | 1795 +++++++++
 merge/arch/i386/kernel/smp-xen.c                          |  613 +++
 merge/arch/i386/kernel/swiotlb.c                          |  665 +++
 merge/arch/i386/kernel/sysenter.c                         |  102 
 merge/arch/i386/kernel/time-xen.c                         | 1103 +++++
 merge/arch/i386/kernel/traps-xen.c                        | 1136 +++++
 merge/arch/i386/kernel/traps.c                            |    9 
 merge/arch/i386/kernel/vm86.c                             |   12 
 merge/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 merge/arch/i386/mach-xen/Makefile                         |    5 
 merge/arch/i386/mach-xen/setup.c                          |   49 
 merge/arch/i386/mm/Makefile                               |    8 
 merge/arch/i386/mm/fault-xen.c                            |  683 +++
 merge/arch/i386/mm/highmem-xen.c                          |  123 
 merge/arch/i386/mm/hypervisor.c                           |  414 ++
 merge/arch/i386/mm/init-xen.c                             |  850 ++++
 merge/arch/i386/mm/ioremap-xen.c                          |  476 ++
 merge/arch/i386/mm/pageattr.c                             |    2 
 merge/arch/i386/mm/pgtable-xen.c                          |  642 +++
 merge/arch/i386/mm/pgtable.c                              |   12 
 merge/arch/i386/oprofile/Makefile                         |    4 
 merge/arch/i386/oprofile/xenoprof.c                       |  432 ++
 merge/arch/i386/pci/Makefile                              |    9 
 merge/arch/i386/pci/irq-xen.c                             | 1204 ++++++
 merge/arch/i386/pci/pcifront.c                            |   55 
 merge/arch/i386/power/Makefile                            |    4 
 merge/arch/ia64/Kconfig                                   |   65 
 merge/arch/ia64/Makefile                                  |   18 
 merge/arch/ia64/hp/sim/Makefile                           |    2 
 merge/arch/ia64/kernel/entry.S                            |   32 
 merge/arch/ia64/kernel/head.S                             |    6 
 merge/arch/ia64/kernel/iosapic.c                          |   68 
 merge/arch/ia64/kernel/irq_ia64.c                         |  200 +
 merge/arch/ia64/kernel/pal.S                              |    5 
 merge/arch/ia64/kernel/setup.c                            |   53 
 merge/arch/ia64/mm/ioremap.c                              |    3 
 merge/arch/ia64/xen/Makefile                              |    8 
 merge/arch/ia64/xen/drivers/README                        |    2 
 merge/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 merge/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 merge/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 merge/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 merge/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 merge/arch/ia64/xen/drivers/xenia64_init.c                |   60 
 merge/arch/ia64/xen/hypercall.S                           |  353 +
 merge/arch/ia64/xen/hypervisor.c                          |  761 +++
 merge/arch/ia64/xen/util.c                                |  115 
 merge/arch/ia64/xen/xenentry.S                            |  883 ++++
 merge/arch/ia64/xen/xenhpski.c                            |   19 
 merge/arch/ia64/xen/xenivt.S                              | 2171 +++++++++++
 merge/arch/ia64/xen/xenminstate.h                         |  369 +
 merge/arch/ia64/xen/xenpal.S                              |   76 
 merge/arch/ia64/xen/xensetup.S                            |   24 
 merge/arch/um/kernel/physmem.c                            |    4 
 merge/arch/x86_64/Kconfig                                 |   60 
 merge/arch/x86_64/Makefile                                |   20 
 merge/arch/x86_64/ia32/Makefile                           |   20 
 merge/arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++
 merge/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 merge/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 merge/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 merge/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 merge/arch/x86_64/kernel/Makefile                         |   19 
 merge/arch/x86_64/kernel/acpi/Makefile                    |    1 
 merge/arch/x86_64/kernel/apic-xen.c                       |  198 +
 merge/arch/x86_64/kernel/e820-xen.c                       |  757 +++
 merge/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 merge/arch/x86_64/kernel/entry-xen.S                      | 1141 +++++
 merge/arch/x86_64/kernel/entry.S                          |    2 
 merge/arch/x86_64/kernel/genapic-xen.c                    |  144 
 merge/arch/x86_64/kernel/genapic_xen.c                    |  162 
 merge/arch/x86_64/kernel/head-xen.S                       |  176 
 merge/arch/x86_64/kernel/head64-xen.c                     |  140 
 merge/arch/x86_64/kernel/init_task.c                      |    3 
 merge/arch/x86_64/kernel/io_apic-xen.c                    | 2232 +++++++++++
 merge/arch/x86_64/kernel/ioport-xen.c                     |   57 
 merge/arch/x86_64/kernel/irq-xen.c                        |  163 
 merge/arch/x86_64/kernel/irq.c                            |    4 
 merge/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 merge/arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++
 merge/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 merge/arch/x86_64/kernel/process-xen.c                    |  791 ++++
 merge/arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++
 merge/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 merge/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 merge/arch/x86_64/kernel/smp.c                            |    4 
 merge/arch/x86_64/kernel/traps-xen.c                      | 1035 +++++
 merge/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 merge/arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 
 merge/arch/x86_64/kernel/xen_entry.S                      |   40 
 merge/arch/x86_64/mm/Makefile                             |   10 
 merge/arch/x86_64/mm/fault-xen.c                          |  644 +++
 merge/arch/x86_64/mm/init-xen.c                           | 1179 ++++++
 merge/arch/x86_64/mm/pageattr-xen.c                       |  390 +
 merge/arch/x86_64/oprofile/Makefile                       |    5 
 merge/arch/x86_64/pci/Makefile                            |   12 
 merge/drivers/Makefile                                    |    1 
 merge/drivers/acpi/Kconfig                                |    3 
 merge/drivers/char/mem.c                                  |    6 
 merge/drivers/char/tpm/Kconfig                            |   14 
 merge/drivers/char/tpm/Makefile                           |    2 
 merge/drivers/char/tpm/tpm.c                              |   44 
 merge/drivers/char/tpm/tpm.h                              |    7 
 merge/drivers/char/tpm/tpm_vtpm.c                         |  546 ++
 merge/drivers/char/tpm/tpm_vtpm.h                         |   38 
 merge/drivers/char/tpm/tpm_xen.c                          |  756 +++
 merge/drivers/char/tty_io.c                               |    7 
 merge/drivers/ide/ide-lib.c                               |    8 
 merge/drivers/oprofile/buffer_sync.c                      |   39 
 merge/drivers/oprofile/cpu_buffer.c                       |   26 
 merge/drivers/oprofile/cpu_buffer.h                       |    8 
 merge/drivers/oprofile/event_buffer.h                     |    3 
 merge/drivers/oprofile/oprof.c                            |   19 
 merge/drivers/oprofile/oprof.h                            |    2 
 merge/drivers/oprofile/oprofile_files.c                   |   82 
 merge/drivers/pci/Kconfig                                 |    1 
 merge/drivers/serial/Kconfig                              |    1 
 merge/drivers/xen/Kconfig                                 |  257 +
 merge/drivers/xen/Makefile                                |   17 
 merge/drivers/xen/balloon/Makefile                        |    2 
 merge/drivers/xen/balloon/balloon.c                       |  605 +++
 merge/drivers/xen/blkback/Makefile                        |    3 
 merge/drivers/xen/blkback/blkback.c                       |  580 ++
 merge/drivers/xen/blkback/common.h                        |  136 
 merge/drivers/xen/blkback/interface.c                     |  165 
 merge/drivers/xen/blkback/vbd.c                           |  119 
 merge/drivers/xen/blkback/xenbus.c                        |  410 ++
 merge/drivers/xen/blkfront/Kconfig                        |    6 
 merge/drivers/xen/blkfront/Makefile                       |    5 
 merge/drivers/xen/blkfront/blkfront.c                     |  822 ++++
 merge/drivers/xen/blkfront/block.h                        |  156 
 merge/drivers/xen/blkfront/vbd.c                          |  318 +
 merge/drivers/xen/blktap/Makefile                         |    3 
 merge/drivers/xen/blktap/blktap.c                         |  900 ++++
 merge/drivers/xen/blktap/common.h                         |  100 
 merge/drivers/xen/blktap/interface.c                      |  134 
 merge/drivers/xen/blktap/xenbus.c                         |  223 +
 merge/drivers/xen/char/Makefile                           |    2 
 merge/drivers/xen/char/mem.c                              |  182 
 merge/drivers/xen/console/Makefile                        |    2 
 merge/drivers/xen/console/console.c                       |  640 +++
 merge/drivers/xen/console/xencons_ring.c                  |  141 
 merge/drivers/xen/core/Makefile                           |   14 
 merge/drivers/xen/core/cpu_hotplug.c                      |  185 
 merge/drivers/xen/core/evtchn.c                           |  855 ++++
 merge/drivers/xen/core/features.c                         |   30 
 merge/drivers/xen/core/gnttab.c                           |  460 ++
 merge/drivers/xen/core/hypervisor_sysfs.c                 |   60 
 merge/drivers/xen/core/reboot.c                           |  364 +
 merge/drivers/xen/core/skbuff.c                           |  134 
 merge/drivers/xen/core/smpboot.c                          |  433 ++
 merge/drivers/xen/core/xen_proc.c                         |   19 
 merge/drivers/xen/core/xen_sysfs.c                        |  316 +
 merge/drivers/xen/evtchn/Makefile                         |    2 
 merge/drivers/xen/evtchn/evtchn.c                         |  458 ++
 merge/drivers/xen/netback/Makefile                        |    5 
 merge/drivers/xen/netback/common.h                        |  123 
 merge/drivers/xen/netback/interface.c                     |  314 +
 merge/drivers/xen/netback/loopback.c                      |  255 +
 merge/drivers/xen/netback/netback.c                       | 1039 +++++
 merge/drivers/xen/netback/xenbus.c                        |  396 ++
 merge/drivers/xen/netfront/Kconfig                        |    6 
 merge/drivers/xen/netfront/Makefile                       |    4 
 merge/drivers/xen/netfront/netfront.c                     | 1597 ++++++++
 merge/drivers/xen/pciback/Makefile                        |   13 
 merge/drivers/xen/pciback/conf_space.c                    |  403 ++
 merge/drivers/xen/pciback/conf_space.h                    |  123 
 merge/drivers/xen/pciback/conf_space_capability.c         |   71 
 merge/drivers/xen/pciback/conf_space_capability.h         |   23 
 merge/drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 merge/drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 merge/drivers/xen/pciback/conf_space_header.c             |  299 +
 merge/drivers/xen/pciback/passthrough.c                   |  157 
 merge/drivers/xen/pciback/pci_stub.c                      |  690 +++
 merge/drivers/xen/pciback/pciback.h                       |   91 
 merge/drivers/xen/pciback/pciback_ops.c                   |   95 
 merge/drivers/xen/pciback/vpci.c                          |  204 +
 merge/drivers/xen/pciback/xenbus.c                        |  454 ++
 merge/drivers/xen/pcifront/Makefile                       |    7 
 merge/drivers/xen/pcifront/pci.c                          |   46 
 merge/drivers/xen/pcifront/pci_op.c                       |  272 +
 merge/drivers/xen/pcifront/pcifront.h                     |   40 
 merge/drivers/xen/pcifront/xenbus.c                       |  294 +
 merge/drivers/xen/privcmd/Makefile                        |    2 
 merge/drivers/xen/privcmd/privcmd.c                       |  285 +
 merge/drivers/xen/tpmback/Makefile                        |    4 
 merge/drivers/xen/tpmback/common.h                        |   82 
 merge/drivers/xen/tpmback/interface.c                     |  177 
 merge/drivers/xen/tpmback/tpmback.c                       | 1074 +++++
 merge/drivers/xen/tpmback/xenbus.c                        |  306 +
 merge/drivers/xen/util.c                                  |   70 
 merge/drivers/xen/xenbus/Makefile                         |   12 
 merge/drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 merge/drivers/xen/xenbus/xenbus_client.c                  |  281 +
 merge/drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 merge/drivers/xen/xenbus/xenbus_comms.h                   |   43 
 merge/drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 merge/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 merge/drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++
 merge/fs/Kconfig                                          |    1 
 merge/include/asm-i386/a.out.h                            |    2 
 merge/include/asm-i386/apic.h                             |    2 
 merge/include/asm-i386/elf.h                              |    7 
 merge/include/asm-i386/fixmap.h                           |   13 
 merge/include/asm-i386/mach-default/mach_traps.h          |   12 
 merge/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 merge/include/asm-i386/mach-xen/asm/desc.h                |  164 
 merge/include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 
 merge/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 merge/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 merge/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 merge/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 merge/include/asm-i386/mach-xen/asm/hypercall.h           |  370 +
 merge/include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 merge/include/asm-i386/mach-xen/asm/io.h                  |  390 +
 merge/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 merge/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 merge/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 merge/include/asm-i386/mach-xen/asm/page.h                |  327 +
 merge/include/asm-i386/mach-xen/asm/param.h               |   24 
 merge/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 merge/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 merge/include/asm-i386/mach-xen/asm/pgtable.h             |  509 ++
 merge/include/asm-i386/mach-xen/asm/processor.h           |  753 +++
 merge/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 merge/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 merge/include/asm-i386/mach-xen/asm/segment.h             |  117 
 merge/include/asm-i386/mach-xen/asm/setup.h               |   64 
 merge/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 merge/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 merge/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 merge/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 merge/include/asm-i386/mach-xen/asm/system.h              |  578 ++
 merge/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 merge/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 merge/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 merge/include/asm-i386/mach-xen/mach_traps.h              |   33 
 merge/include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 merge/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 merge/include/asm-i386/page.h                             |    4 
 merge/include/asm-i386/pgtable-2level-defs.h              |    2 
 merge/include/asm-i386/pgtable-3level-defs.h              |    2 
 merge/include/asm-ia64/agp.h                              |   31 
 merge/include/asm-ia64/dma-mapping.h                      |   71 
 merge/include/asm-ia64/fixmap.h                           |    2 
 merge/include/asm-ia64/gcc_intrin.h                       |   60 
 merge/include/asm-ia64/hw_irq.h                           |    8 
 merge/include/asm-ia64/hypercall.h                        |  533 ++
 merge/include/asm-ia64/hypervisor.h                       |  198 +
 merge/include/asm-ia64/intel_intrin.h                     |   68 
 merge/include/asm-ia64/io.h                               |   52 
 merge/include/asm-ia64/iosapic.h                          |    2 
 merge/include/asm-ia64/irq.h                              |   31 
 merge/include/asm-ia64/machvec.h                          |   15 
 merge/include/asm-ia64/meminit.h                          |    5 
 merge/include/asm-ia64/page.h                             |  112 
 merge/include/asm-ia64/pal.h                              |    1 
 merge/include/asm-ia64/pgalloc.h                          |    2 
 merge/include/asm-ia64/privop.h                           |   60 
 merge/include/asm-ia64/processor.h                        |    1 
 merge/include/asm-ia64/synch_bitops.h                     |   61 
 merge/include/asm-ia64/system.h                           |    4 
 merge/include/asm-ia64/xen/privop.h                       |  280 +
 merge/include/asm-um/page.h                               |    2 
 merge/include/asm-x86_64/apic.h                           |    2 
 merge/include/asm-x86_64/hw_irq.h                         |    2 
 merge/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 merge/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 merge/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 merge/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 merge/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 merge/include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 merge/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 merge/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 merge/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 merge/include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 +
 merge/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 merge/include/asm-x86_64/mach-xen/asm/io.h                |  328 +
 merge/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 merge/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 merge/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 merge/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 merge/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 merge/include/asm-x86_64/mach-xen/asm/page.h              |  319 +
 merge/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 merge/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 merge/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 merge/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++
 merge/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 merge/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 merge/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 merge/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 merge/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 merge/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 merge/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 merge/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 merge/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 merge/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 merge/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 merge/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 merge/include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 merge/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 merge/include/linux/gfp.h                                 |    6 
 merge/include/linux/highmem.h                             |    6 
 merge/include/linux/mm.h                                  |   10 
 merge/include/linux/oprofile.h                            |    8 
 merge/include/linux/pfn.h                                 |    2 
 merge/include/linux/skbuff.h                              |   13 
 merge/include/xen/balloon.h                               |   63 
 merge/include/xen/cpu_hotplug.h                           |   44 
 merge/include/xen/driver_util.h                           |   16 
 merge/include/xen/evtchn.h                                |  114 
 merge/include/xen/features.h                              |   20 
 merge/include/xen/foreign_page.h                          |   30 
 merge/include/xen/gnttab.h                                |  150 
 merge/include/xen/hypervisor_sysfs.h                      |   32 
 merge/include/xen/interface/acm.h                         |  187 
 merge/include/xen/interface/acm_ops.h                     |  102 
 merge/include/xen/interface/arch-ia64.h                   |  418 ++
 merge/include/xen/interface/arch-x86_32.h                 |  224 +
 merge/include/xen/interface/arch-x86_64.h                 |  293 +
 merge/include/xen/interface/callback.h                    |   74 
 merge/include/xen/interface/dom0_ops.h                    |  574 ++
 merge/include/xen/interface/event_channel.h               |  233 +
 merge/include/xen/interface/features.h                    |   53 
 merge/include/xen/interface/grant_table.h                 |  317 +
 merge/include/xen/interface/hvm/hvm_info_table.h          |   24 
 merge/include/xen/interface/hvm/ioreq.h                   |   98 
 merge/include/xen/interface/hvm/vmx_assist.h              |   98 
 merge/include/xen/interface/io/blkif.h                    |   87 
 merge/include/xen/interface/io/console.h                  |   33 
 merge/include/xen/interface/io/netif.h                    |   92 
 merge/include/xen/interface/io/pciif.h                    |   55 
 merge/include/xen/interface/io/ring.h                     |  273 +
 merge/include/xen/interface/io/tpmif.h                    |   59 
 merge/include/xen/interface/io/xenbus.h                   |   45 
 merge/include/xen/interface/io/xs_wire.h                  |   97 
 merge/include/xen/interface/memory.h                      |  187 
 merge/include/xen/interface/nmi.h                         |   60 
 merge/include/xen/interface/physdev.h                     |  144 
 merge/include/xen/interface/sched.h                       |  103 
 merge/include/xen/interface/sched_ctl.h                   |   69 
 merge/include/xen/interface/trace.h                       |   86 
 merge/include/xen/interface/vcpu.h                        |  121 
 merge/include/xen/interface/version.h                     |   67 
 merge/include/xen/interface/xen-compat.h                  |   47 
 merge/include/xen/interface/xen.h                         |  505 ++
 merge/include/xen/interface/xenoprof.h                    |   94 
 merge/include/xen/pcifront.h                              |   39 
 merge/include/xen/public/evtchn.h                         |   91 
 merge/include/xen/public/privcmd.h                        |   79 
 merge/include/xen/xen_proc.h                              |   13 
 merge/include/xen/xenbus.h                                |  296 +
 merge/include/xen/xencons.h                               |   14 
 merge/kernel/Kconfig.preempt                              |    1 
 merge/kernel/irq/manage.c                                 |   26 
 merge/lib/Makefile                                        |    3 
 merge/mm/Kconfig                                          |    3 
 merge/mm/highmem.c                                        |   11 
 merge/mm/memory.c                                         |  121 
 merge/mm/mmap.c                                           |    4 
 merge/mm/page_alloc.c                                     |    6 
 merge/net/core/dev.c                                      |   63 
 merge/net/core/skbuff.c                                   |   43 
 merge/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 merge/net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 merge/net/ipv4/xfrm4_output.c                             |    6 
 merge/scripts/Makefile.xen                                |   14 
 404 files changed, 82851 insertions(+), 257 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- linux-2.6-xen.patch	26 Jun 2006 01:38:15 -0000	1.30
+++ linux-2.6-xen.patch	27 Jun 2006 00:39:13 -0000	1.31
@@ -1695,7 +1695,7 @@
  
  #define DEFINE(sym, val) \
          asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -63,10 +64,15 @@ void foo(void)
+@@ -65,12 +65,17 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
  
@@ -1712,6 +1712,8 @@
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
 -	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
+ 
+ 	OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
  }
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
@@ -2685,33 +2687,33 @@
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S	2006-04-04 08:17:22.000000000 +0200
 +++ merge/arch/i386/kernel/entry.S	2006-05-30 12:42:43.000000000 +0200
-@@ -177,7 +177,7 @@ need_resched:
- 
- 	# sysenter call handler stub
- ENTRY(sysenter_entry)
+@@ -249,7 +249,7 @@ ENTRY(sysenter_entry)
+ 	CFI_STARTPROC simple
+ 	CFI_DEF_CFA esp, 0
+ 	CFI_REGISTER esp, ebp
 -	movl TSS_sysenter_esp0(%esp),%esp
 +	movl SYSENTER_stack_esp0(%esp),%esp
  sysenter_past_esp:
  	sti
  	pushl $(__USER_DS)
-@@ -410,7 +410,7 @@ vector=0
- ENTRY(irq_entries_start)
- .rept NR_IRQS
- 	ALIGN
+@@ -515,7 +515,7 @@ ENTRY(irq_entries_start)
+  .if vector
+ 	CFI_ADJUST_CFA_OFFSET -4
+  .endif
 -1:	pushl $vector-256
 +1:	pushl $~(vector)
+ 	CFI_ADJUST_CFA_OFFSET 4
  	jmp common_interrupt
  .data
- 	.long 1b
-@@ -427,7 +427,7 @@ common_interrupt:
- 
+@@ -535,7 +535,7 @@ common_interrupt:
  #define BUILD_INTERRUPT(name, nr)	\
  ENTRY(name)				\
+ 	RING0_INT_FRAME;		\
 -	pushl $nr-256;			\
 +	pushl $~(nr);			\
- 	SAVE_ALL			\
+ 	CFI_ADJUST_CFA_OFFSET 4;	\
+ 	SAVE_ALL;			\
  	movl %esp,%eax;			\
- 	call smp_/**/name;		\
 @@ -496,7 +496,7 @@ device_not_available_emulate:
   * that sets up the real kernel stack. Check here, since we can't
   * allow the wrong stack to be used.
@@ -7469,14 +7471,14 @@
  	$(call if_changed,syscall)
  
  # We also create a special relocatable object that should mirror the symbol
-@@ -74,5 +80,17 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
+@@ -81,8 +81,20 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
  
  SYSCFLAGS_vsyscall-syms.o = -r
  $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
 -			$(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
 +			$(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE
  	$(call if_changed,syscall)
-+
+ 
 +ifdef CONFIG_XEN
 +include $(srctree)/scripts/Makefile.xen
 +
@@ -7488,6 +7490,9 @@
 +obj-y := $(call cherrypickxen, $(obj-y))
 +extra-y := $(call cherrypickxen, $(extra-y))
 +endif
++
+ k8-y                      += ../../x86_64/kernel/k8.o
+ 
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/microcode-xen.c merge/arch/i386/kernel/microcode-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/microcode-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/microcode-xen.c	2006-05-30 12:42:43.000000000 +0200
@@ -28019,10 +28024,9 @@
 +
 +	return 1;
 +}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/asm-offsets.c merge/arch/x86_64/kernel/asm-offsets.c
---- ../upstream/hg/linux-2.6/arch/x86_64/kernel/asm-offsets.c	2006-01-23 20:02:50.000000000 +0100
-+++ merge/arch/x86_64/kernel/asm-offsets.c	2006-05-30 12:42:51.000000000 +0200
-@@ -66,7 +66,9 @@ int main(void)
+--- linux-2.6.17.noarch/arch/x86_64/kernel/asm-offsets.c~	2006-06-26 18:41:00.774885000 -0400
++++ linux-2.6.17.noarch/arch/x86_64/kernel/asm-offsets.c	2006-06-26 18:41:19.256385000 -0400
+@@ -67,8 +67,10 @@ int main(void)
  	DEFINE(pbe_address, offsetof(struct pbe, address));
  	DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));
  	DEFINE(pbe_next, offsetof(struct pbe, next));
@@ -28030,8 +28034,9 @@
  	BLANK();
  	DEFINE(TSS_ist, offsetof(struct tss_struct, ist));
 +#endif
+ 	BLANK();
+ 	DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
  	return 0;
- }
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/e820-xen.c merge/arch/x86_64/kernel/e820-xen.c
 --- ../upstream/hg/linux-2.6/arch/x86_64/kernel/e820-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/x86_64/kernel/e820-xen.c	2006-05-30 12:42:51.000000000 +0200
@@ -33697,16 +33702,15 @@
  obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o
  obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-@@ -49,3 +51,18 @@ intel_cacheinfo-y		+= ../../i386/kernel/
- quirks-y			+= ../../i386/kernel/quirks.o
- i8237-y				+= ../../i386/kernel/i8237.o
+@@ -55,3 +55,18 @@ i8237-y				+= ../../i386/kernel/i8237.o
  msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
-+
+ alternative-y			+= ../../i386/kernel/alternative.o
+ 
 +ifdef CONFIG_XEN
-+time-y				+= ../../i386/kernel/time-xen.o
-+pci-dma-y			+= ../../i386/kernel/pci-dma-xen.o
++time-y             += ../../i386/kernel/time-xen.o
++pci-dma-y          += ../../i386/kernel/pci-dma-xen.o
 +microcode-$(subst m,y,$(CONFIG_MICROCODE))  := ../../i386/kernel/microcode-xen.o
-+quirks-y			:= ../../i386/kernel/quirks-xen.o
++quirks-y           := ../../i386/kernel/quirks-xen.o
 +
 +n-obj-xen := i8259.o reboot.o i8237.o smpboot.o trampoline.o
 +
@@ -33716,6 +33720,7 @@
 +obj-y := $(call cherrypickxen, $(obj-y))
 +extra-y := $(call cherrypickxen, $(extra-y))
 +endif
++
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/mpparse-xen.c merge/arch/x86_64/kernel/mpparse-xen.c
 --- ../upstream/hg/linux-2.6/arch/x86_64/kernel/mpparse-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/x86_64/kernel/mpparse-xen.c	2006-05-30 12:42:51.000000000 +0200
@@ -44178,18 +44183,6 @@
  	select SERIAL_CORE
  	---help---
  	  This selects whether you want to include the driver for the standard
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/drivers/video/Kconfig merge/drivers/video/Kconfig
---- ../upstream/hg/linux-2.6/drivers/video/Kconfig	2006-05-13 02:59:46.000000000 +0200
-+++ merge/drivers/video/Kconfig	2006-05-30 12:43:30.000000000 +0200
-@@ -513,7 +513,7 @@ config FB_HGA_ACCEL
- 
- config VIDEO_SELECT
- 	bool
--	depends on (FB = y) && X86
-+	depends on (FB = y) && X86 && !XEN
- 	default y
- 
- config FB_SGIVW
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/drivers/xen/balloon/balloon.c merge/drivers/xen/balloon/balloon.c
 --- ../upstream/hg/linux-2.6/drivers/xen/balloon/balloon.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/drivers/xen/balloon/balloon.c	2006-06-05 16:00:52.000000000 +0200


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- sources	26 Jun 2006 15:27:23 -0000	1.409
+++ sources	27 Jun 2006 00:39:21 -0000	1.410
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-925bec75109765473c2eb25e3df5e75d  patch-2.6.17-git10.bz2
+3549df9562e78614d39e81c09bb2342b  patch-2.6.17-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- upstream	26 Jun 2006 15:27:23 -0000	1.374
+++ upstream	27 Jun 2006 00:39:21 -0000	1.375
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git10.bz2
+patch-2.6.17-git11.bz2


--- linux-2.6-edid-check.patch DELETED ---


--- linux-2.6-x86_64-noisy-syscalls.patch DELETED ---


--- patch-2.6.17-git10.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 01:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 21:57:56 -0400
Subject: rpms/kernel/devel linux-2.6-proc-self-maps-fix.patch,1.4,1.5
Message-ID: <200606270157.k5R1vuIx006048@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6012

Modified Files:
	linux-2.6-proc-self-maps-fix.patch 
Log Message:
buildfix

linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                       |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                   |    2 ++
 b/include/linux/proc_fs.h              |    0 
 b/include/linux/ptrace.h               |    1 +
 b/kernel/ptrace.c                      |    4 ++--
 linux-2.6.16.noarch/kernel/ptrace.c    |    2 +-
 linux-2.6.17.noarch/fs/proc/task_mmu.c |    3 +--
 7 files changed, 27 insertions(+), 5 deletions(-)

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-proc-self-maps-fix.patch	27 Jun 2006 00:39:13 -0000	1.4
+++ linux-2.6-proc-self-maps-fix.patch	27 Jun 2006 01:57:48 -0000	1.5
@@ -52,7 +52,7 @@
  		return NULL;
  
 -	mm = get_task_mm(priv->task);
-+	mm = mm_for_maps(task);
++	mm = mm_for_maps(priv->task);
  	if (!mm)
  		return NULL;
  



From fedora-cvs-commits at redhat.com  Tue Jun 27 01:59:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 21:59:35 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2315,
	1.2316 linux-2.6-ide-tune-locking.patch, 1.2, NONE
Message-ID: <200606270159.k5R1xZgP006655@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6616

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-ide-tune-locking.patch 
Log Message:
dead



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2315
retrieving revision 1.2316
diff -u -r1.2315 -r1.2316
--- kernel-2.6.spec	27 Jun 2006 00:39:11 -0000	1.2315
+++ kernel-2.6.spec	27 Jun 2006 01:59:32 -0000	1.2316
@@ -369,7 +369,6 @@
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
-Patch1640: linux-2.6-ide-tune-locking.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
@@ -939,8 +938,6 @@
 %patch1620 -p1
 # Radeon on thinkpad backlight power-management goodness.
 %patch1630 -p1
-# Fix IDE locking bug.
-#%patch1640 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor


--- linux-2.6-ide-tune-locking.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:17:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:17:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2316,1.2317
Message-ID: <200606270217.k5R2HbII019315@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18771

Modified Files:
	kernel-2.6.spec 
Log Message:
buildfixes


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2316
retrieving revision 1.2317
diff -u -r1.2316 -r1.2317
--- kernel-2.6.spec	27 Jun 2006 01:59:32 -0000	1.2316
+++ kernel-2.6.spec	27 Jun 2006 02:17:29 -0000	1.2317
@@ -1160,15 +1160,13 @@
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates
     # first copy everything
-    cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build 
+    cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     # then drop all but the needed Makefiles/Kconfig files
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || :
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-    cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     if [ -d arch/%{_arch}/scripts ]; then
       cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:27:05 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server.spec,1.50,1.51
Message-ID: <200606270227.k5R2R4c8027529@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27496

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Jun 26 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.4
- Updated build dependency to require mesa-source-6.4.2-6.FC5.3 minimum for
  DRI enabled builds to fix numerous bug reports on x86_64 including (#190245,
  185929,187603,185727,189730)
- Added xorg-x11-server-1.0.1-setuid.diff to fix setuid bug (#196126)
- Bump xtrans dependency to ">= 1.0.0-3.2.FC5.0" for setuid fix in xtrans.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-x11-server.spec	19 May 2006 05:18:20 -0000	1.50
+++ xorg-x11-server.spec	27 Jun 2006 02:26:59 -0000	1.51
@@ -4,13 +4,13 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.FC5.3
+Release:   9.FC5.4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/xserver/%{pkgname}-%{version}.tar.bz2
 Source10:  xf86Sbus.h
 Source100: comment-header-modefiles.txt
 
@@ -32,6 +32,8 @@
 Patch9:    xorg-server-1.0.1-keymap-overflow.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=189802
 Patch10:   xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch
+# Based on ftp://ftp.freedesktop.org/pub/xorg/X11R7.0/patches/x11r7.0-setuid.diff
+Patch11:   xorg-x11-server-1.0.1-setuid.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -69,7 +71,7 @@
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 0.99.1
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0
 # FIXME: The version specification can be removed from here in the future,
 # as it is not really mandatory, but forces a bugfix workaround on people who
 # are using pre-rawhide modular X.
@@ -105,9 +107,10 @@
 BuildRequires: xorg-x11-font-utils >= 1.0.0-1
 # Needed at least for DRI enabled builds
 %if %{with_dri}
-BuildRequires: mesa-libGL-devel >= 6.4.1-1
+BuildRequires: mesa-libGL-devel >= 6.4.2-6.FC5.3
 # "mesa-libGL-source >= 6.4.2-2" required for the solution for bug #176976
-BuildRequires: mesa-source >= 6.4.2-2
+# "mesa-libGL-source >= 6.4.2-6.FC5.3" required for the solution for bug #190245
+BuildRequires: mesa-source >= 6.4.2-6.FC5.3
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 %description
@@ -255,6 +258,7 @@
 %patch8 -p1 -b .CVE-2006-0745
 %patch9 -p1 -b .keymap-overflow
 %patch10 -p0 -b .render-tris-CVE-2006-1526
+%patch11 -p0 -b .setuid
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -266,7 +270,6 @@
 %build
 #FONTDIR="${datadir}/X11/fonts"
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
-
 #	--disable-dependency-tracking \
 
 automake-1.7 ; autoconf
@@ -535,30 +538,37 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jun 26 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.4
+- Updated build dependency to require mesa-source-6.4.2-6.FC5.3 minimum for
+  DRI enabled builds to fix numerous bug reports on x86_64 including (#190245,
+  185929,187603,185727,189730)
+- Added xorg-x11-server-1.0.1-setuid.diff to fix setuid bug (#196126)
+- Bump xtrans dependency to ">= 1.0.0-3.2.FC5.0" for setuid fix in xtrans.
+
 * Fri May 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.3
 - Enable alpha, sparc, sparc64 architectures to be buildable (untested, but
   feel free to submit patches in bugzilla if it does not work right)
 - Add missing SBUS header for sparc architecture (#187357)
 
-* Fri May 5 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.2
+* Fri May 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.2
 - Merge xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch security fix
   from 1.0.1-9.fc5.1.1 release from embargoed branch of CVS to FC-5 branch.
 
-* Mon May 1 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.1.1
+* Mon May 01 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.1.1
 - Added xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch to fix a
   buffer overflow documented in CVE-2006-1526.  (#189802)
 
 * Mon Apr 24 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-9.fc5.1
 - Backport a Render crash fix from HEAD
 
-* Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> 1.0.1-9.fc5
+* Sun Apr 09 2006 Ray Strode <rstrode at redhat.com> 1.0.1-9.fc5
 - Fix small overflow that causes crash on vt switch on ppc.
   Patch by David Woodhouse (bug 187083).
 
 * Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> 1.0.1-9
 - CVE-2006-0745 (bug 185084)
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> 1.0.1-8
+* Mon Mar 06 2006 Jeremy Katz <katzj at redhat.com> 1.0.1-8
 - build libxf86config with -fPIC (#181292)
 - fix sgi 1600sw extra mode (#182430)
 
@@ -573,7 +583,7 @@
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-6.1
 - bump again for double-long bug on ppc(64)
 
-* Wed Feb  8 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
+* Wed Feb 08 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
 - Added xorg-x11-server-1.0.1-Red-Hat-extramodes.patch which is a merger of
   XFree86-4.2.99.2-redhat-custom-modelines.patch and
   xorg-x11-6.8.2-laptop-modes.patch from FC4 for (#180301)
@@ -581,18 +591,18 @@
   of video modes that are built into the X server, so that the "rhpxl" package
   does not have to carry around an out of sync copy for itself. (#180301)
 
-* Tue Feb  7 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-5
+* Tue Feb 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-5
 - Updated "BuildRequires: mesa-source >= 6.4.2-2" to get fix for (#176976)
 
-* Mon Feb  6 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
+* Mon Feb 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
 - Fix brown paper bag error introduced in rpm post script in 1.0.1-4.
 
-* Mon Feb  6 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+* Mon Feb 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch with changes
   suggested by ajax to fix (fdo#4320).
 - Cosmetic cleanups to satiate the banshees.
 
-* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+* Sun Feb 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
 - Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
   SEGV on null interfaces (#174279,178986)
@@ -687,10 +697,10 @@
 * Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-4
 - Added "Requires: xkbcomp" for Xorg server, as it invokes it internally.
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
 - Added "BuildRequires: libXtst-devel" for Xtst examples.
 
-* Mon Nov 7 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
+* Mon Nov 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
 - Added versioning to Xorg virtual Provide, to allow config tools and driver
   packages to have version based requires.
 
@@ -714,11 +724,11 @@
 - Added "BuildRequires: libXres-devel" for Xres examples
 - Added {_libdir}/xserver/SecurityPolicy to Xorg subpackage for XSECURITY
 
-* Mon Oct  3 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.2
+* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.2
 - Fix license tag to be "MIT/X11"
 - Change Xdmx subpackage to Obsolete xorg-x11-Xdmx instead of xorg-x11-Xnest
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.1
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.1
 - Update BuildRequires for new library package naming (libX...)
 - Use Fedora Extras style BuildRoot tag
 - Invoke make with _smp_mflags to take advantage of SMP systems



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:37:37 -0400
Subject: rpms/libX11/FC-5 libX11-1.0.1-setuid.diff, NONE, 1.1 libX11.spec,
	1.16, 1.17
Message-ID: <200606270237.k5R2bahe030049@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30010

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.0.1-setuid.diff 
Log Message:
* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3.FC5.0
- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
- Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
  so we can control this dep centrally.
- Added NEWS to doc list.


libX11-1.0.1-setuid.diff:
 lcFile.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE libX11-1.0.1-setuid.diff ---
diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
index f8b3404..bb1ee20 100644
--- a/src/xlibi18n/lcFile.c
+++ b/src/xlibi18n/lcFile.c
@@ -269,7 +269,11 @@ #else
 	    if (seteuid(0) != 0) {
 		priv = 0;
 	    } else {
-		seteuid(oldeuid);
+		if (seteuid(oldeuid) == -1) {
+		    /* XXX ouch, coudn't get back to original uid 
+		     what can we do ??? */
+		    _exit(127);
+		}
 		priv = 1;
 	    }
 #endif


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/FC-5/libX11.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libX11.spec	23 Feb 2006 22:02:02 -0000	1.16
+++ libX11.spec	27 Jun 2006 02:37:30 -0000	1.17
@@ -1,14 +1,17 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.0
-Release: 3
+Release: 3.FC5.0
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch1: libX11-1.0.0-Xcursor.patch
+Patch2: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -18,8 +21,7 @@
 
 BuildRequires: autoconf
 
-# FIXME: check if still needed for X11R7
-Requires(pre): filesystem >= 2.3.6-1
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -43,6 +45,7 @@
 %setup -q
 %patch0 -p0 -b .datadir-locale-dir-fix
 %patch1 -p1 -b .Xcursor
+%patch2 -p1 -b .setuid
 
 # Disable static library creation by default.
 %define with_static 0
@@ -78,7 +81,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README INSTALL NEWS ChangeLog
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/locale
 %dir %{_datadir}/X11/locale/C
@@ -241,13 +244,19 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
-* Thu Feb 23 2006 Christopher Aillon <caillon at redhat.com> - 1.0.0-3
+* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3.FC5.0
+- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
+- Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
+  so we can control this dep centrally.
+- Added NEWS to doc list.
+
+* Thu Feb 23 2006 Christopher Aillon <caillon at redhat.com> 1.0.0-3
 - Look for the versioned libXcursor.so.1 (fixes 179044)
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Sat Dec 24 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-2
@@ -269,7 +278,7 @@
 - Added libX11-0.99.3-datadir-locale-dir-fix.patch, to fix build to install
   the locale data files into datadir instead of libdir. (#173282)
 
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0.99.3-3
+* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.3-3
 - require newer filesystem package (#172610)
 
 * Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-2
@@ -280,7 +289,7 @@
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-* Mon Nov 7 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
+* Mon Nov 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
 - Fix devel subpackage summary and description with s/libXdmcp/libX11/
 
 * Fri Oct 21 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-1
@@ -288,7 +297,7 @@
 - Added en_GR.UTF-8 locale to file manifest.
 - Forcibly remove Xcms.txt
 
-* Sun Oct  2 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-4
+* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-4
 - Added _smp_mflags to make invocation to speed up SMP builds
 
 * Thu Sep 29 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-3



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:45:18 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.13,1.14
Message-ID: <200606270245.k5R2jHsk031882@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31782

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add scim-pinyin-helper.patch



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-pinyin.spec	31 Mar 2006 07:46:02 -0000	1.13
+++ scim-pinyin.spec	27 Jun 2006 02:45:11 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -11,7 +11,7 @@
 Source0:	http://dl.sourceforge.net/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	scim-devel, gtk2-devel
+BuildRequires:	scim-devel, gtk2-devel, gettext
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -19,6 +19,7 @@
 Obsoletes:	iiimf-le-chinput <= 0.3
 Patch1:         scim-pinyin-shuangpin.patch
 Patch2:         scim-pinyin-showallkeys.patch
+Patch3:         scim-pinyin-helper.patch
 
 %description
 Simplified Chinese Smart Pinyin IMEngine for SCIM.
@@ -28,6 +29,7 @@
 %setup -q
 %patch1 -p1 -b .1-shuangpin
 %patch2 -p1 -b .2-showallkeys
+%patch3 -p1 -b .3-helper
 
 
 %build
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Tus May 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6
+- add scim-pinyin-helper.patch
+
 * Fri Mar 31 2006 Jens Petersen <petersen at redhat.com> - 0.5.91-5
 - rebuild without libstdc++so7
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:48:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:48:21 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.cpp,NONE,1.1
Message-ID: <200606270248.k5R2mLDx010174@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9158

Added Files:
	scim-pinyin-helper.cpp 
Log Message:
qshen: add scim-pinyin-helper.patch



--- NEW FILE scim-pinyin-helper.cpp ---
diff -Naur scim-pinyin-0.5.91.bak/configure.ac scim-pinyin-0.5.91/configure.ac
--- scim-pinyin-0.5.91.bak/configure.ac	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/configure.ac	2006-06-27 09:51:26.000000000 +0800
@@ -46,10 +46,17 @@
 else
   SCIM_BUILD_SETUP=0
 fi
-
 AM_CONDITIONAL(SCIM_BUILD_SETUP, [test "$SCIM_HAS_GTKUTILS" = "yes"])
 AC_SUBST(SCIM_BUILD_SETUP)
 
+if test "$SCIM_HAS_GTKUTILS" = "yes"; then
+  SCIM_BUILD_HELPER=1
+else
+  SCIM_BUILD_HELPER=0
+fi
+
+AM_CONDITIONAL(SCIM_BUILD_HELPER, [test "$SCIM_HAS_GTKUTILS" = "yes"])
+AC_SUBST(SCIM_BUILD_HELPER) 
 
 # Checks for header files.
 AC_HEADER_STDC
diff -Naur scim-pinyin-0.5.91.bak/po/POTFILES.in scim-pinyin-0.5.91/po/POTFILES.in
--- scim-pinyin-0.5.91.bak/po/POTFILES.in	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/po/POTFILES.in	2006-06-27 09:51:39.000000000 +0800
@@ -1,2 +1,3 @@
 src/scim_pinyin_imengine.cpp
 src/scim_pinyin_imengine_setup.cpp
+src/scim_pinyin_helper.cpp
diff -Naur scim-pinyin-0.5.91.bak/po/zh_CN.po scim-pinyin-0.5.91/po/zh_CN.po
--- scim-pinyin-0.5.91.bak/po/zh_CN.po	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/po/zh_CN.po	2006-06-27 09:51:49.000000000 +0800
@@ -480,3 +480,138 @@
 #~ msgstr ""
 #~ "???????????????????????????????????????(locale). ???????????????????????????????????????. ?????? "
 #~ "\"default\" ???????????????????????????."
+
+#: src/scim_pinyin_helper.cpp:55
+msgid "Smart pinyin helper"
+msgstr "????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:57
+msgid "A helper module for Smart Pinyin IMEngine."
+msgstr "??????????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:270
+msgid "please select a directory."
+msgstr "?????????????????????"
+
+#: src/scim_pinyin_helper.cpp:270
+msgid "please select the directory that contains the user phrase library."
+msgstr "????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:337
+msgid "Invalid phrase libraries in this directory!"
+msgstr "????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:529
+msgid "The phrase length exeed the MAX_USER_PHRASE_LENGTH!"
+msgstr "?????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:589
+msgid "Invalid pinyin key in the input pinyin sequence."
+msgstr "??????????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:642
+msgid "Pinyin keys number is not equal to the phrase charachater number."
+msgstr "????????????????????????????????? ????????????"
+
+#: src/scim_pinyin_helper.cpp:780
+msgid "Success to save the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:794
+msgid "Failed to save the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:808
+msgid "Success to import the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:829
+msgid "Failed to import the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:854
+msgid "Success to add the new phrases into the user phrase library."
+msgstr "???????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:924
+msgid "ID"
+msgstr "??????" 
+
+#: src/scim_pinyin_helper.cpp:924
+msgid "PHRASE"
+msgstr "??????" 
+
+#: src/scim_pinyin_helper.cpp:924
+msgid "PINYIN"
+msgstr "??????" 
+
+#: src/scim_pinyin_helper.cpp:989
+msgid "SCIM Pinyin - Add New Phrase"
+msgstr "SCIM ??????????????? ??????????????????"
+
+#: src/scim_pinyin_helper.cpp:999
+msgid "_Options"
+msgstr "??????(_O)"
+
+#: src/scim_pinyin_helper.cpp:1015
+msgid "_Actions"
+msgstr "??????(_A)"
+
+#: src/scim_pinyin_helper.cpp:1027
+msgid "_List User Phrase Library"
+msgstr "??????????????????(_L)"
+
+#: src/scim_pinyin_helper.cpp:1031
+msgid "_Save User Phrase Library"
+msgstr "??????????????????(_S)"
+
+#: src/scim_pinyin_helper.cpp:1035
+msgid "_Import User Phrase Library"
+msgstr "??????????????????(_I)"
+
+#: src/scim_pinyin_helper.cpp:1039
+msgid "_Add New Phrases"
+msgstr "???????????????(_A)"
+
+#: src/scim_pinyin_helper.cpp:1043
+msgid "_Delete Phrase"
+msgstr "????????????(_D)"
+
+#: src/scim_pinyin_helper.cpp:1048
+msgid "_Help"
+msgstr "??????(_H)"
+
+#: src/scim_pinyin_helper.cpp:1055
+msgid "_About"
+msgstr "??????(_A)"
+
+#: src/scim_pinyin_helper.cpp:1086
+msgid "Quit"
+msgstr "??????"
+
+#: src/scim_pinyin_helper.cpp:1081
+msgid "Submit"
+msgstr "??????"
+
+#: src/scim_pinyin_helper.cpp:1092
+msgid "Add"
+msgstr "??????"
+
+#: src/scim_pinyin_helper.cpp:1098
+msgid "Delete"
+msgstr "??????"
+
+#: src/scim_pinyin_imengine_setup.cpp:611
+msgid "Show pinyin helper property in the tool bar"
+msgstr "?????????????????????????????????????????????(_H)"
+
+#: src/scim_pinyin_imengine_setup.cpp:854
+msgid ""
+"If this option is checked, "
+"the tool bar will show the pinyin_helper property. "
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????."
+
+#: src/scim_pinyin_imengine_setup.cpp:611
+msgid "The switch to invoke pinyin helper. Click to invoke it."
+msgstr "?????????????????????????????????, ?????????????????????????????????."
diff -Naur scim-pinyin-0.5.91.bak/src/Makefile.am scim-pinyin-0.5.91/src/Makefile.am
--- scim-pinyin-0.5.91.bak/src/Makefile.am	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/Makefile.am	2006-06-27 09:52:06.000000000 +0800
@@ -36,7 +36,8 @@
 			  scim_pinyin_phrase.h \
 			  scim_native_lookup_table.h \
 			  scim_pinyin_smart_match.h \
-			  scim_special_table.h
+			  scim_special_table.h \
+			  scim_pinyin_helper.h
 
 noinst_LTLIBRARIES	= libpinyin.la
 
@@ -90,6 +91,22 @@
 				 @SCIM_GTKUTILS_LIBS@ \
 			  	 @LTLIBINTL@
 
+HELPER_MODULE      = pinyin-imengine-helper.la
+
+helpermoduledir         =  @SCIM_MODULEDIR@/Helper
+helpermodule_LTLIBRARIES= $(HELPER_MODULE)
+
+pinyin_imengine_helper_la_SOURCES  = scim_pinyin_helper.cpp
+pinyin_imengine_helper_la_CFLAGS   = @SCIM_GTKUTILS_CFLAGS@  @SCIM_CFLAGS@
+pinyin_imengine_helper_la_CXXFLAGS = @SCIM_GTKUTILS_CFLAGS@  @SCIM_CFLAGS@
+pinyin_imengine_helper_la_LDFLAGS  = -avoid-version \
+                          -rpath $(helpermoduledir) \
+                          -module \
+                          @LIBTOOL_EXPORT_OPTIONS@ \
+                          @SCIM_LIBS@ \
+                          @SCIM_GTKUTILS_LIBS@ \
+                          @LTLIBINTL@ 
+
 if ENABLE_TOOLS
 TOOLS = make-pinyin make-phrase make-pinyin-phrase
 endif
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp	1970-01-01 08:00:00.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-06-27 09:52:06.000000000 +0800
@@ -0,0 +1,1130 @@
+/*
+ *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#define Uses_SCIM_HELPER
+#define Uses_SCIM_CONFIG_BASE
+#include <map>
+#include <scim.h>
+#include <gtk/gtk.h>
+#include "scim_pinyin_helper.h"
+
+using namespace scim;
+
+#define scim_module_init pinyin_imengine_helper_LTX_scim_module_init
+#define scim_module_exit pinyin_imengine_helper_LTX_scim_module_exit
+#define scim_helper_module_number_of_helpers pinyin_imengine_helper_LTX_scim_helper_module_number_of_helpers
+#define scim_helper_module_get_helper_info pinyin_imengine_helper_LTX_scim_helper_module_get_helper_info
+#define scim_helper_module_run_helper pinyin_imengine_helper_LTX_scim_helper_module_run_helper
+
+static void       run                         (const String        &display,
+                                               const ConfigPointer &config);
+					       
+HelperAgent helper_agent;					       
+
+HelperInfo helper_info (SCIM_PINYIN_HELPER_UUID,        // uuid
+                        "",                            // name
+                        "",                            // icon
+                        "",
+                        SCIM_HELPER_NEED_SCREEN_INFO|SCIM_HELPER_NEED_SCREEN_INFO);
+
+//Module Interface
+extern "C" {
+    void scim_module_init (void)
+    {
+        bindtextdomain (GETTEXT_PACKAGE, SCIM_PINYIN_LOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+        helper_info.name = String (_("Smart pinyin helper"));
+        helper_info.description = String (
+            _("A helper module for Smart Pinyin IMEngine."));
+    }
+
+    void scim_module_exit (void)
+    {
+    }
+
+    unsigned int scim_helper_module_number_of_helpers (void)
+    {
+        return 1;
+    }
+
+    bool scim_helper_module_get_helper_info (unsigned int idx, HelperInfo &info)
+    {
+        if (idx == 0) {
+            info = helper_info; 
+            return true;
+        }
+        return false;
+    }
+
+    void scim_helper_module_run_helper (const String &uuid,
+                                        const ConfigPointer &config,
+                                        const String &display)
+    {
+        SCIM_DEBUG_MAIN(1) << "scim_pinyin_imengine_helper_LTX_scim_helper_module_run_helper ()\n";
+
+        if (uuid == String (SCIM_PINYIN_HELPER_UUID)) {
+            run (display, config);
+        }
+
+        SCIM_DEBUG_MAIN(1) << "exit scim_pinyin_imengine_helper_LTX_scim_helper_module_run_helper ()\n";
+    }
+}
+
+//Global Variables
+static int        cur_ic = -1;
+static String     cur_uuid;
+
+GtkWidget    *	  BaseWindow;
+GtkListStore *	  list_store;
+GtkTreeModel *    tree_model;
+GtkTreeView  *	  tree_view;
+GtkTreeIter 	  cur_iter;
+GtkCellRenderer * renderer_num, *renderer_phrase, *renderer_pinyin;
+GtkWidget    *	  submit_button, *disable_button, *add_button;
+GtkWidget    *    add_phrase_row, *disable_phrase_row; 
+
+uint32		  max_user_phrase_length = 8;
+
+bool		  ok_to_add_new_row = false;
+guint		  row_count = 0;
+
+int		  list_cur_num = -1;
+
+static gboolean
+helper_agent_input_handler (GIOChannel *source,
+                            GIOCondition condition,
+                            gpointer user_data)
+{
+    if (condition == G_IO_IN) {
+        HelperAgent *agent = static_cast<HelperAgent*> (user_data);
+        if (agent && agent->has_pending_event ())
+            agent->filter_event ();
+    } else if (condition == G_IO_ERR || condition == G_IO_HUP) {
+        gtk_main_quit ();
+    }
+    return TRUE;
+}
+
+static void
+slot_exit (const HelperAgent *agent, int ic, const String &uuid)
+{
+    gtk_main_quit ();
+}
+
+static void slot_attach_input_context (const HelperAgent *agent, int ic, const String &uuid)
+{
+    std::cout << "slot_attach_input_context (" << ic << ", " << uuid << ")\n";
+
+    cur_ic = ic;
+    cur_uuid = uuid;
+
+    // Inform the scim-pinyin imengine that scim-pinyin-helper started successfully
+    Transaction trans;
+    trans.put_command (SCIM_TRANS_CMD_REQUEST);
+    trans.put_command (SCIM_TRANS_CMD_START_HELPER);
+    agent->send_imengine_event (ic, uuid, trans);
+}
+
+static void slot_detach_input_context (const HelperAgent *agent, int ic, const String &uuid)
+{
+    std::cout << "slot_detach_input_context (" << ic << ", " << uuid << ")\n";
+}
+
+static void slot_update_screen (const HelperAgent *, int ic, const String &uuid, int screen)
+{
+    std::cout << "slot_update_screen (" << ic << ", " << uuid << ", " << screen << ")\n";
+}
+
+static void slot_update_spot_location (const HelperAgent *, int ic, const String &uuid, int x, int y)
+{
+    std::cout << "slot_update_spot_location (" << ic << ", " << uuid << ", " << x << ", " << y << ")\n";
+
+    //gtk_window_move (GTK_WINDOW (main_window), x + 16, y + 16);
+}
+
+void
+on_button_quit_clicked                 (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    gtk_main_quit ();   
+}
+
+void
+on_quit_activate                       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+    gtk_main_quit ();
+}
+
+void
+on_about1_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+}
+
+void
+on_new_row_activate                     (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+    std::cout << "in on_new_column_activate()" <<endl;
+    
+    if( !ok_to_add_new_row )
+        return;
+   
+    GtkTreeIter iter;
+    GtkTreePath *path; 
+    GtkTreeViewColumn* column;    
+     
+    gtk_list_store_append (list_store, &iter);
+   
+    row_count ++;
+    
+    gtk_list_store_set (list_store, &iter,
+			  NUM_COLUMN, row_count,
+			  PHRASE_COLUMN, "",
+			  PINYIN_COLUMN, "",
+			  -1);
+
+    path = gtk_tree_model_get_path ( tree_model, &iter );
+    
+    column = gtk_tree_view_get_column ( tree_view, 1 );
+    	
+    gtk_tree_view_set_cursor ( tree_view,
+                               path,
+                               column,
+                               TRUE);  
+    // bug? - if use this api to grab focus, scim will crash!			       
+    //gtk_widget_grab_focus ( (GtkWidget*)tree_view);
+    
+    ok_to_add_new_row = false;			         			 
+}
+
+void
+on_list_user_phrase_library             (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+    gtk_widget_hide (submit_button);
+    gtk_widget_show (disable_button);
+    gtk_widget_show (add_button); 
+    gtk_widget_show (add_phrase_row);
+    gtk_widget_show (disable_phrase_row);     
+
+    g_object_set ( renderer_phrase, "editable", false, NULL);
+    g_object_set ( renderer_pinyin, "editable", false, NULL);   
+
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_list_user_phrase_library(), send : SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB\n";
+}
+
+void 
+on_dir_select_ok			(GtkWidget *widget, 
+					 gpointer user_data) 
+{
+    GtkWidget 	*dir_selector = GTK_WIDGET (user_data);
+    const gchar *selected_dirname;
+    String   	string_dirname;
+
+    selected_dirname = gtk_file_selection_get_filename (GTK_FILE_SELECTION (dir_selector));
+    string_dirname = String( selected_dirname );
+   
+    if( g_file_test( selected_dirname , G_FILE_TEST_IS_DIR ) )
+        gtk_widget_destroy( GTK_WIDGET(dir_selector) );
+    else
+	return;  
+
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB);
+    send.put_data ( string_dirname );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_dir_select_ok(), send : SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB"<< endl;      
+}					 
+
+void
+on_save_user_phrase_library             (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+   GtkWidget *dir_selector;
+  
+   dir_selector = gtk_file_selection_new (_("please select a directory."));
+   
+   g_signal_connect (GTK_FILE_SELECTION (dir_selector)->ok_button,
+                     "clicked",
+                     G_CALLBACK (on_dir_select_ok),
+                     dir_selector);
+   			   
+   g_signal_connect_swapped (GTK_FILE_SELECTION (dir_selector)->cancel_button,
+                             "clicked",
+                             G_CALLBACK (gtk_widget_destroy),
+                             dir_selector); 
+   
+   gtk_widget_show (dir_selector);   
+}
+
+void 
+on_lib_select_ok			(GtkWidget *widget, 
+					 gpointer user_data) 
+{
+   GtkWidget *lib_selector = GTK_WIDGET (user_data);
+   const gchar *selected_dirname;
+   String string_dirname;
+   
+   String pinyin_lib_bakname("/phrase_lib.bak");   
+   String pinyin_phrase_lib_bakname("/pinyin_phrase_lib.bak");
+   String pinyin_phrase_index_bakname("/pinyin_phrase_index.bak");    
+
+   selected_dirname = gtk_file_selection_get_filename (GTK_FILE_SELECTION (lib_selector));
+   string_dirname = String( selected_dirname );
+   
+   
+   /* test the libraries --by name */
+   if( g_file_test( selected_dirname , G_FILE_TEST_IS_DIR ) )
+   {
+     std::cout << "in on_lib_select_ok(), send : selected_dirname=" << selected_dirname << endl; 
+     
+     if( g_file_test( (string_dirname + pinyin_lib_bakname).c_str() , G_FILE_TEST_EXISTS) &&
+         g_file_test( (string_dirname + pinyin_phrase_lib_bakname).c_str() , G_FILE_TEST_EXISTS) &&
+	 g_file_test( (string_dirname + pinyin_phrase_index_bakname).c_str() , G_FILE_TEST_EXISTS) ) 
+     {     
+         gtk_widget_destroy( GTK_WIDGET(lib_selector) );
+     }
+     else
+     {
+         GtkWidget *dialog;
+	 dialog = gtk_message_dialog_new( GTK_WINDOW(lib_selector), 
+	    				     GTK_DIALOG_MODAL,
+					     GTK_MESSAGE_ERROR,
+					     GTK_BUTTONS_OK,
+					     _("Invalid phrase libraries in this directory!") );
+	 gtk_dialog_run( GTK_DIALOG(dialog) );
+	 gtk_widget_destroy(dialog);  
+	    
+	 return;
+      }       
+   }
+   else
+	return;  
+
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB);
+    send.put_data ( string_dirname );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_dir_select_ok(), send : SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB"<< endl; 
+}
+
+void
+on_import_user_phrase_library           (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+   GtkWidget *lib_selector;
+ 
+   lib_selector = gtk_file_selection_new (_("please select the directory that contains the user phrase library."));
+   
+   g_signal_connect (GTK_FILE_SELECTION (lib_selector)->ok_button,
+                     "clicked",
+                     G_CALLBACK (on_lib_select_ok),
+                     lib_selector);
+   
+   g_signal_connect_swapped (GTK_FILE_SELECTION (lib_selector)->cancel_button,
+                             "clicked",
+                             G_CALLBACK (gtk_widget_destroy),
+                             lib_selector); 
+   
+   gtk_widget_show (lib_selector);
+}
+
+void
+on_button_submit_clicked                (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    std::cout << "PinyinHelper: on_button_submit_clicked() - begin" <<endl;
+    
+    GtkTreeIter iter;
+    gchar       *phrase,  *pinyin;
+    WideString  w_phrase, w_pinyin;
+    std::vector<WideString> phrase_vec;
+    std::vector<WideString> pinyin_vec;
+    
+    if (!gtk_tree_model_get_iter_first (tree_model, &iter))
+	return;
+	
+    do {
+        gtk_tree_model_get(tree_model, &iter, PHRASE_COLUMN, &phrase, -1);
+        gtk_tree_model_get(tree_model, &iter, PINYIN_COLUMN, &pinyin, -1);
+
+	
+	w_phrase = utf8_mbstowcs( phrase );
+	w_pinyin = utf8_mbstowcs( pinyin );
+	
+	phrase_vec.push_back( w_phrase );
+	pinyin_vec.push_back( w_pinyin );
+	
+    } while (gtk_tree_model_iter_next (tree_model, &iter));
+    
+    if( phrase_vec.size() == 1 || pinyin_vec.size() == 1 )
+        return;
+    
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE);
+    send.put_data ( phrase_vec );
+    send.put_data ( pinyin_vec );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+   std::cout << "on_button_submit_clicked() : send : SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE"<< endl;
+
+}
+
+void
+on_button_add_clicked                  (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path; 
+    GtkTreeViewColumn* column;    
+    
+    gtk_widget_show (submit_button);
+    gtk_widget_hide (disable_button);
+    gtk_widget_hide (add_button);   
+    gtk_widget_hide (add_phrase_row);
+    gtk_widget_hide (disable_phrase_row);      
+    
+    g_object_set ( renderer_phrase, "editable", true, NULL);
+    g_object_set ( renderer_pinyin, "editable", true, NULL);    
+    
+    gtk_list_store_clear ( list_store );  
+       
+    gtk_list_store_append (list_store, &iter);
+    gtk_list_store_set (list_store, &iter,
+			  NUM_COLUMN, 1,
+			  PHRASE_COLUMN, "",
+			  PINYIN_COLUMN, "",
+			  -1);
+
+    row_count = 1;    
+    
+    // set cursor to the first phrase cell
+    //gtk_tree_model_get_iter_first ( tree_model, &iter);
+    path   = gtk_tree_model_get_path  ( tree_model, &iter );    
+    column = gtk_tree_view_get_column ( tree_view, 1 );    	
+    gtk_tree_view_set_cursor ( tree_view,
+                               path,
+                               column,
+                               TRUE);
+			       
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH);
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "on_button_add_clicked() - send : SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH"<< endl;				  	  
+}
+
+void
+on_button_disable_clicked              (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    GtkTreeSelection* selection;
+    gchar       *phrase;
+    WideString  w_phrase;  
+    gboolean    rc;  
+
+    selection = gtk_tree_view_get_selection( tree_view);    
+
+    rc = gtk_tree_selection_get_selected (selection, &model, &iter);
+    if( !rc )
+        return;
+   
+    gtk_tree_model_get(model, &iter, PHRASE_COLUMN, &phrase, -1);    
+    gtk_tree_model_get(model, &iter, NUM_COLUMN, &list_cur_num, -1);
+    
+    w_phrase = utf8_mbstowcs( phrase );    
+        
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE);
+    send.put_data ( w_phrase );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_button_disable_clicked(), send : SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE"<< endl;
+}
+
+void
+on_phrase_cell_edited			(GtkCellRendererText *renderer,
+					 gchar *path,
+					 gchar *new_text,
+					 gpointer data)
+{
+/*
+    gunichar uni_new_text = g_utf8_get_char ( new_text );    
+    PangoScript s = pango_script_for_unichar (uni_new_text);
+*/
+    if( strlen(new_text) == 0 )
+        return;
+
+    if(  g_utf8_strlen (new_text, -1) > max_user_phrase_length ){
+	GtkWidget *dialog;
+	dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	      				     GTK_DIALOG_MODAL,
+					     GTK_MESSAGE_ERROR,
+					     GTK_BUTTONS_OK,
+					     _("The phrase length exeed the MAX_USER_PHRASE_LENGTH!") );
+	gtk_dialog_run( GTK_DIALOG(dialog) );
+	gtk_widget_destroy(dialog);    
+    
+	GtkTreePath *_path = gtk_tree_path_new_from_string (path);
+        GtkTreeViewColumn  *column = gtk_tree_view_get_column ( tree_view, 1 );		
+        gtk_tree_view_set_cursor ( tree_view,
+                                   _path,
+                                   column,
+                                   TRUE);  	    
+	return;    	
+    }	
+   
+    WideString w_new_text;
+    
+    w_new_text = utf8_mbstowcs( new_text );
+  
+    gtk_tree_model_get_iter_from_string( tree_model, &cur_iter, path);
+ 
+    gtk_list_store_set(list_store, &cur_iter, 
+                       PHRASE_COLUMN, new_text,
+                       -1); 
+		       
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_GET_PINYIN);
+    send.put_data ( w_new_text );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+   					
+    std::cout << "in on_phrase_cell_edited(), send : SCIM_PINYIN_TRANS_CMD_GET_PINYIN"<< endl;
+}
+
+void
+on_pinyin_cell_edited			(GtkCellRendererText *renderer,
+					 gchar *path,
+					 gchar *new_text,
+					 gpointer data)
+{
+    std::cout << "in on_pinyin_cell_edited() " << new_text <<" path="<< path <<endl ;
+    
+    int key_nums;
+    gchar  *phrase; 
+    String new_text_str;
+    String::iterator iter;
+    WideString w_phrase;   
+    
+    
+    for(int i = 0; new_text[i]!='\0'; i++){
+	
+	if( !islower( new_text[i] ) && new_text[i] != ' '){
+	    GtkWidget *dialog;
+	    dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	    				     GTK_DIALOG_MODAL,
+					     GTK_MESSAGE_ERROR,
+					     GTK_BUTTONS_OK,
+					     _("Invalid pinyin key in the input pinyin sequence.") );
+	    gtk_dialog_run( GTK_DIALOG(dialog) );
+	    gtk_widget_destroy(dialog);
+	    
+	    return; 	    					
+	}
+	
+	if( new_text[i] == ' ' && new_text[i+1] == ' ')
+	    continue;
+	    
+	if( new_text[i] == ' ' && new_text[i+1] == '\0')
+	    continue;	    
+	
+	new_text_str.push_back( new_text[i] );	
+    } 
+    
+    iter = new_text_str.begin();
+    key_nums = 0;
+    while( iter != new_text_str.end() ){
+        if( *iter == ' ')
+	    key_nums++;
+	 iter++;
+    }
+    if( key_nums == 0 ){
+        if( new_text_str.size() > 0 )
+            key_nums++;	
+    } else {
+        key_nums++;    }
+        
+    gtk_tree_model_get_iter_from_string( tree_model, &cur_iter, path);
+    
+    gtk_tree_model_get(tree_model, &cur_iter, PHRASE_COLUMN, &phrase, -1);
+    
+    w_phrase = utf8_mbstowcs( phrase );  
+    
+    //std::cout << "in on_pinyin_cell_edited() w_phrase.size=" << w_phrase.size() <<endl ;
+    //std::cout << "in on_pinyin_cell_edited() key_nums     =" << key_nums <<endl ;
+    
+    if( w_phrase.size() == 0){
+        gtk_list_store_set(list_store, &cur_iter, 
+                       	   PINYIN_COLUMN, "",
+                           -1);
+        return;
+    } 
+    
+    if( w_phrase.size() != key_nums ){
+        GtkWidget *dialog;
+	dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 GTK_DIALOG_MODAL,
+					 GTK_MESSAGE_ERROR,
+					 GTK_BUTTONS_OK,
+					 _("Pinyin keys number is not equal to the phrase charachater number.") );
+	    gtk_dialog_run( GTK_DIALOG(dialog) );
+	    gtk_widget_destroy(dialog);
+	    
+	    return;       
+     }         
+ 
+    gtk_list_store_set(list_store, &cur_iter, 
+                       PINYIN_COLUMN, new_text_str.c_str(),
+                       -1); 
+      
+}
+
+static void
+slot_process_imengine_event (const HelperAgent *agent, int ic,
+                             const String &uuid, const Transaction &recv)
+{
+    if (uuid == "05235cfc-43ce-490c-b1b1-c5a2185276ae") {
+
+        int cmd;
+        TransactionReader   reader (recv);	
+	std::vector<String> pinyin_strings;
+	
+   	std::vector <String>  	   phrase_pinyin_vec;
+    	std::vector <WideString>   phrase_string_vec;
+	
+        if (reader.get_command (cmd) && cmd == SCIM_TRANS_CMD_REQUEST) {
+            while (reader.get_command (cmd)) {
+                switch (cmd) {
+                    case SCIM_PINYIN_TRANS_CMD_SEND_PINYIN:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SEND_PINYIN \n";
+			
+			if (reader.get_data (pinyin_strings)) {
+			
+			    gtk_list_store_set(list_store, &cur_iter, 
+                       				PINYIN_COLUMN, pinyin_strings[0].c_str(),
+                       				-1); 
+			} 
+			
+			guint num;
+			gtk_tree_model_get ( tree_model, &cur_iter, 0, &num, -1 );
+			
+			if ( num == row_count ) {
+			    ok_to_add_new_row = true;
+			    on_new_row_activate ( NULL,NULL );
+			}
+			      
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED:
+                    {
+		    	std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED \n";
+			
+    			GtkTreePath 	   *path; 
+    			GtkTreeViewColumn  *column;
+						
+			gtk_list_store_set(list_store, &cur_iter, 
+                       			   PHRASE_COLUMN,"",
+                       			   -1);	
+    			path = gtk_tree_model_get_path ( tree_model, &cur_iter );
+			    
+    			column = gtk_tree_view_get_column ( tree_view, 1 );    	
+			
+    			gtk_tree_view_set_cursor ( tree_view,
+         			                   path,
+     			                           column,
+            			                   TRUE); 					   		
+                        break;
+                    }	
+                    case SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB \n";
+			
+			GtkTreeIter iter, focus_iter;
+			GtkTreePath *path;
+			int i;
+			
+			/* for multi selection use
+    			GtkTreeSelection* selection;
+    			selection = gtk_tree_view_get_selection( tree_view); 			
+			gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE);
+			*/
+						
+			if (reader.get_data (phrase_string_vec) && reader.get_data (phrase_pinyin_vec) ) {
+
+			    gtk_list_store_clear ( list_store );
+			    
+			    for( i=0 ; i < phrase_string_vec.size(); i++){
+			    
+			        gtk_list_store_append (list_store, &iter);
+				gtk_list_store_set (list_store, &iter,
+			  	                    NUM_COLUMN, i+1,
+			  			    PHRASE_COLUMN, utf8_wcstombs(phrase_string_vec[i]).c_str(),
+			  			    PINYIN_COLUMN, phrase_pinyin_vec[i].c_str(),
+			  			    -1);
+						    
+			        if( list_cur_num == i+1 )
+			            focus_iter = iter;
+			     }
+				
+			     // if disable one row, select the next row	
+			     if( list_cur_num > 0 ){	  			     
+			         if( list_cur_num < i+1 )	
+    				     path = gtk_tree_model_get_path ( tree_model, &focus_iter );    
+         			 else 
+    				     path = gtk_tree_model_get_path ( tree_model, &iter ); 				        
+    				 gtk_tree_view_set_cursor ( tree_view, path, NULL, false);				     
+				 list_cur_num = -1;
+			     }
+			} 
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Success to save the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+	
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Failed to save the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+	
+                        break;
+                    }		    
+                    case SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Success to import the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+			
+    			Transaction send;
+    			send.put_command (SCIM_TRANS_CMD_REQUEST);
+    			send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    			helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+   			std::cout << "send : SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB"<< endl;
+
+			break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Failed to import the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+	
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK:
+                    {
+    			Transaction send;
+    			send.put_command (SCIM_TRANS_CMD_REQUEST);
+    			send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    			helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+   			std::cout << "send : SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB"<< endl;
+	
+                        break;
+                    }		    	
+                    case SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK:
+                    {
+			std::cout << "process_imengine_event():get command - SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Success to add the new phrases into the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+			
+			on_list_user_phrase_library( NULL, NULL);
+	
+                        break;
+                    }	
+                    case SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH:
+                    {
+			std::cout << "process_imengine_event():get command - SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH \n";
+		
+		        uint32 length;
+			if (reader.get_data (length) )	
+			    max_user_phrase_length = length;
+			
+                        break;
+                    }		    	    	    		    		    	    	    	    
+		    default:
+    		    {
+        		std::cout << "process_imengine_event():get command-  default\n";
+       			break;
+    		    }
+                }
+            }
+        }
+    }
+}
+
+/* create the treeview model*/
+static GtkTreeModel * create_model (void)
+{
+    GtkListStore *store;
+
+    store = gtk_list_store_new (N_COLUMNS,
+			        G_TYPE_UINT,
+			        G_TYPE_STRING,
+			        G_TYPE_STRING);
+
+    list_store = store;
+    return GTK_TREE_MODEL (store);
+}
+
+/* add columns to the treeview */
+static void  add_columns (GtkTreeView *treeview)
+{
+  GtkTreeViewColumn *column;
+
+  renderer_num = gtk_cell_renderer_text_new ();
+  g_object_set ( renderer_num, "xalign", 0.5, NULL);	
+  column = gtk_tree_view_column_new_with_attributes (_("ID"),
+						     renderer_num,
+						     "text",NUM_COLUMN,
+						     NULL);
+  g_object_set ( renderer_num, "alignment", 0.5, NULL);
+  gtk_tree_view_append_column (treeview, column);
+
+  renderer_phrase = gtk_cell_renderer_text_new ();
+  g_object_set ( renderer_phrase, "editable", FALSE, NULL);
+  g_signal_connect(renderer_phrase, "edited", (GCallback) on_phrase_cell_edited, NULL);
+  column = gtk_tree_view_column_new_with_attributes (_("PHRASE"),
+						     renderer_phrase,
+						     "text",PHRASE_COLUMN,
+						     NULL);
+  gtk_tree_view_append_column (treeview, column);
+
+  renderer_pinyin = gtk_cell_renderer_text_new ();
+  g_object_set ( renderer_pinyin, "editable", FALSE, NULL);
+  g_signal_connect(renderer_pinyin, "edited", (GCallback) on_pinyin_cell_edited, NULL);  
+  column = gtk_tree_view_column_new_with_attributes (_("PINYIN"),
+						     renderer_pinyin,
+						     "text",
+						     PINYIN_COLUMN,
+						     NULL);
+  gtk_tree_view_append_column (treeview, column); 
+}
+
+GtkWidget*
+create_BaseWindow (void)
+{
+  GtkWidget *window1;
+  GtkWidget *vbox1;
+  GtkWidget *menubar1;
+  GtkWidget *menuitem1;
+  GtkWidget *menuitem1_menu;
+  GtkWidget *separatormenuitem1;
+  GtkWidget *quit;
+  GtkWidget *menuitem2;
+  GtkWidget *menuitem4;
+  GtkWidget *menuitem2_menu;
+  GtkWidget *menuitem4_menu;
+  GtkWidget *about1;
+  GtkWidget *new_row;
+  GtkWidget *scrolledwindow1;
+  GtkWidget *treeview_phrase;
+  GtkWidget *hbox1;
+  GtkWidget *button_quit;
+  GtkWidget *button_submit;
+  GtkAccelGroup *accel_group;
+  
+/* code by hand */  
+  GtkTreeModel *model;
+  GtkWidget *list_lib_row;  
+  GtkWidget *save_lib_row; 
+  GtkWidget *import_lib_row; 
+  GtkWidget *button_disable; 
+  GtkWidget *button_add; 
+/* end */
+
+  accel_group = gtk_accel_group_new ();
+
+  window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_size_request (window1, 400, 300);
+  gtk_window_set_title (GTK_WINDOW (window1), _("SCIM Pinyin - Add New Phrase"));
+
+  vbox1 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox1);
+  gtk_container_add (GTK_CONTAINER (window1), vbox1);
+
+  menubar1 = gtk_menu_bar_new ();
+  gtk_widget_show (menubar1);
+  gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
+
+  menuitem1 = gtk_menu_item_new_with_mnemonic (_("_Options"));
+  gtk_widget_show (menuitem1);
+  gtk_container_add (GTK_CONTAINER (menubar1), menuitem1);
+
+  menuitem1_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu);
+
+  separatormenuitem1 = gtk_separator_menu_item_new ();
+  gtk_widget_show (separatormenuitem1);
+  gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1);
+  gtk_widget_set_sensitive (separatormenuitem1, FALSE);
+
+  quit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
+  gtk_widget_show (quit);
+  gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit);
+
+  menuitem2 = gtk_menu_item_new_with_mnemonic (_("_Actions"));
+  gtk_widget_show (menuitem2);
+  gtk_container_add (GTK_CONTAINER (menubar1), menuitem2);
+
+/* qshen add by hand */  
+  menuitem2_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem2), menuitem2_menu);
+  
+  list_lib_row = gtk_menu_item_new_with_mnemonic (_("_List User Phrase Library"));
+  gtk_widget_show (list_lib_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), list_lib_row);
+  
+  save_lib_row = gtk_menu_item_new_with_mnemonic (_("_Save User Phrase Library"));
+  gtk_widget_show (save_lib_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), save_lib_row);
+  
+  import_lib_row = gtk_menu_item_new_with_mnemonic (_("_Import User Phrase Library"));
+  gtk_widget_show (import_lib_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), import_lib_row);
+  
+  add_phrase_row = gtk_menu_item_new_with_mnemonic (_("_Add New Phrases"));
+  gtk_widget_show (add_phrase_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), add_phrase_row);
+  
+  disable_phrase_row = gtk_menu_item_new_with_mnemonic (_("_Delete Phrase"));
+  gtk_widget_show (disable_phrase_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), disable_phrase_row);      
+/* qshen end */
+
+  menuitem4 = gtk_menu_item_new_with_mnemonic (_("_Help"));
+  gtk_widget_show (menuitem4);
+  gtk_container_add (GTK_CONTAINER (menubar1), menuitem4);
+
+  menuitem4_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu);
+
+  about1 = gtk_menu_item_new_with_mnemonic (_("_About"));
+  gtk_widget_show (about1);
+  gtk_container_add (GTK_CONTAINER (menuitem4_menu), about1);
+
+  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolledwindow1);
+  gtk_box_pack_start (GTK_BOX (vbox1), scrolledwindow1, TRUE, TRUE, 0);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_SHADOW_IN);
+
+  treeview_phrase = gtk_tree_view_new ();
+  gtk_widget_show (treeview_phrase);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview_phrase);
+  
+/* code by hand */
+  tree_view = GTK_TREE_VIEW(treeview_phrase);
+  model = create_model ();
+  gtk_tree_view_set_model(GTK_TREE_VIEW(treeview_phrase),model);
+  g_object_unref (model);
+  add_columns (GTK_TREE_VIEW (treeview_phrase));
+  tree_model = model;
+/* end */
+
+  hbox1 = gtk_hbox_new (TRUE, 0);
+  gtk_widget_show (hbox1);
+  gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+  button_quit = gtk_button_new_with_mnemonic (_("Quit"));
+  gtk_widget_show (button_quit);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_quit, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_quit, 80, -1);
+
+  button_submit = gtk_button_new_with_mnemonic (_("Submit"));
+  //gtk_widget_show (button_submit);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_submit, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_submit, 80, -1);
+  submit_button = button_submit;
+ 
+  button_add = gtk_button_new_with_mnemonic (_("Add"));
+  gtk_widget_show (button_add);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_add, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_add, 80, -1); 
+  add_button = button_add; //qshen add
+  
+  button_disable = gtk_button_new_with_mnemonic (_("Delete"));
+  gtk_widget_show (button_disable);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_disable, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_disable, 80, -1);  
+  disable_button = button_disable;//qshen add
+
+  g_signal_connect ((gpointer) quit, "activate",
+                    G_CALLBACK (on_quit_activate),
+                    NULL);
+  g_signal_connect ((gpointer) list_lib_row, "activate",
+                    G_CALLBACK (on_list_user_phrase_library),
+                    NULL);
+  g_signal_connect ((gpointer) save_lib_row, "activate",
+                    G_CALLBACK (on_save_user_phrase_library),
+                    NULL);
+  g_signal_connect ((gpointer) import_lib_row, "activate",
+                    G_CALLBACK (on_import_user_phrase_library),
+                    NULL);
+  g_signal_connect ((gpointer) add_phrase_row, "activate",
+                    G_CALLBACK (on_button_add_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) disable_phrase_row, "activate",
+                    G_CALLBACK (on_button_disable_clicked),
+                    NULL);		    		    		    		    		    
+  g_signal_connect ((gpointer) about1, "activate",
+                    G_CALLBACK (on_about1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) button_quit, "clicked",
+                    G_CALLBACK (on_button_quit_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) button_submit, "clicked",
+                    G_CALLBACK (on_button_submit_clicked),
+                    NULL);
+/* code by hand */
+  g_signal_connect (G_OBJECT(window1), "destroy",
+                    G_CALLBACK (gtk_main_quit),
+		    NULL);
+  g_signal_connect ((gpointer) button_disable, "clicked",
+                    G_CALLBACK (on_button_disable_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) button_add, "clicked",
+                    G_CALLBACK (on_button_add_clicked),
+                    NULL);		    		    
+/* end */		    
+  gtk_window_add_accel_group (GTK_WINDOW (window1), accel_group);
+
+
+  return window1;
+}
+
+
+
+static void
+run (const String &display, const ConfigPointer &config)
+{
+    char **argv = new char * [4];
+    int    argc = 3;
+    
+    GtkTreeIter iter;    
+    GtkTreePath *path;
+    GtkTreeViewColumn* column;    
+
+    argv [0] = "smart-pinyin-imengine-helper";
+    argv [1] = "--display";
+    argv [2] = const_cast<char *> (display.c_str ());
+    argv [3] = 0;    
+    
+    std::cout << "in run()" <<endl;
+
+    setenv ("DISPLAY", display.c_str (), 1);
+
+    gtk_init (&argc, &argv);
+
+    helper_agent.signal_connect_exit (slot (slot_exit));
+    helper_agent.signal_connect_attach_input_context (slot (slot_attach_input_context));
+    helper_agent.signal_connect_detach_input_context (slot (slot_detach_input_context));
+    helper_agent.signal_connect_update_screen (slot (slot_update_screen));
+    helper_agent.signal_connect_update_spot_location (slot (slot_update_spot_location));
+    helper_agent.signal_connect_process_imengine_event (slot (slot_process_imengine_event));
+
+    
+    BaseWindow = create_BaseWindow ();
+    gtk_widget_show (BaseWindow);
+    
+    // open connection
+    int fd = helper_agent.open_connection (helper_info, display);
+    GIOChannel *ch = g_io_channel_unix_new (fd);
+
+    if (fd >= 0 && ch) {
+        g_io_add_watch (ch, G_IO_IN,
+                        helper_agent_input_handler,
+                        (gpointer) &helper_agent);
+        g_io_add_watch (ch, G_IO_ERR,
+                        helper_agent_input_handler,
+                        (gpointer) &helper_agent);
+        g_io_add_watch (ch, G_IO_HUP,
+                        helper_agent_input_handler,
+                        (gpointer) &helper_agent);
+    }
+    
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+    
+    gtk_main ();
+    
+    // close connection
+    helper_agent.close_connection ();
+    fd = -1;
+}
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.h scim-pinyin-0.5.91/src/scim_pinyin_helper.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.h	1970-01-01 08:00:00.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.h	2006-06-27 09:52:06.000000000 +0800
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SCIM_PINYIN_HELPER_H__
+#define __SCIM_PINYIN_HELPER_H__
+
+#include <fstream.h>
+#include <iostream.h>
+#include <scim_trans_commands.h>
+#include "scim_pinyin_private.h"
+
+#define SCIM_PINYIN_HELPER_UUID "85e45f24-0a86-4507-a357-906c6cceea4b"
+
+#define SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE         SCIM_TRANS_CMD_USER_DEFINED + 100
+#define SCIM_PINYIN_TRANS_CMD_GET_PINYIN                SCIM_TRANS_CMD_USER_DEFINED + 101
+#define SCIM_PINYIN_TRANS_CMD_SEND_PINYIN               SCIM_TRANS_CMD_USER_DEFINED + 102
+#define SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED	SCIM_TRANS_CMD_USER_DEFINED + 103
+#define SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 104
+#define SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 105
+#define SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 106
+#define SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK  	SCIM_TRANS_CMD_USER_DEFINED + 107
+#define SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL	SCIM_TRANS_CMD_USER_DEFINED + 108
+#define SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 109
+#define SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK	SCIM_TRANS_CMD_USER_DEFINED + 110
+#define SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL	SCIM_TRANS_CMD_USER_DEFINED + 111
+#define SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE		SCIM_TRANS_CMD_USER_DEFINED + 112
+#define SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK		SCIM_TRANS_CMD_USER_DEFINED + 113
+#define SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_FAIL	SCIM_TRANS_CMD_USER_DEFINED + 114
+#define SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK	SCIM_TRANS_CMD_USER_DEFINED + 115
+#define SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH	SCIM_TRANS_CMD_USER_DEFINED + 116
+#define SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH	SCIM_TRANS_CMD_USER_DEFINED + 117
+
+enum
+{
+   NUM_COLUMN,
+   PHRASE_COLUMN,
+   PINYIN_COLUMN,
+   N_COLUMNS
+};
+
+#endif /* __SCIM_PINYIN_HELPER_H__ */
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h	2006-06-27 09:52:06.000000000 +0800
@@ -63,6 +63,9 @@
 
 #define SCIM_CONFIG_IMENGINE_PINYIN_SHUANG_PIN                       "/IMEngine/Pinyin/ShuangPin"
 #define SCIM_CONFIG_IMENGINE_PINYIN_SHUANG_PIN_SCHEME                "/IMEngine/Pinyin/ShuangPinScheme"
+
+#define SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY               "/IMEngine/Pinyin/ShowWordProperty"  //qshen
+
 #endif
 /*
 vi:expandtab:ts=4:nowrap:ai
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-06-27 09:52:07.000000000 +0800
@@ -44,6 +44,7 @@
 #include "scim_pinyin_imengine.h"
 #include "scim_pinyin_smart_match.h"
 #include "scim_pinyin_imengine_config_keys.h"
+#include "scim_pinyin_helper.h"
 
 #define scim_module_init pinyin_LTX_scim_module_init
 #define scim_module_exit pinyin_LTX_scim_module_exit
@@ -54,6 +55,7 @@
 #define SCIM_PROP_STATUS                            "/IMEngine/Pinyin/Status"
 #define SCIM_PROP_LETTER                            "/IMEngine/Pinyin/Letter"
 #define SCIM_PROP_PUNCT                             "/IMEngine/Pinyin/Punct"
+#define SCIM_PROP_WORD                              "/IMEngine/Pinyin/Word" //qshen
 
 #define SCIM_PROP_PINYIN_SCHEME                     "/IMEngine/Pinyin/PinyinScheme"
 #define SCIM_PROP_PINYIN_SCHEME_QUAN_PIN            "/IMEngine/Pinyin/PinyinScheme/QuanPin"
@@ -92,6 +94,7 @@
 static Property _status_property   (SCIM_PROP_STATUS, "");
 static Property _letter_property   (SCIM_PROP_LETTER, "");
 static Property _punct_property    (SCIM_PROP_PUNCT, "");
+static Property _word_property     (SCIM_PROP_WORD, ""); //qshen 0217
 
 static Property _pinyin_scheme_property     (SCIM_PROP_PINYIN_SCHEME, "???");
 static Property _pinyin_quan_pin_property   (SCIM_PROP_PINYIN_SCHEME_QUAN_PIN,   "??????");
@@ -126,6 +129,8 @@
         _status_property.set_label ("???");
         _letter_property.set_icon (SCIM_HALF_LETTER_ICON);
         _punct_property.set_icon (SCIM_HALF_PUNCT_ICON);
+        _word_property.set_tip (_("The switch to invoke pinyin helper. Click to invoke it."));	//qshen	
+        _word_property.set_label ("???"); //qshen
 
         _scim_config = config;
         return 1;
@@ -153,7 +158,8 @@
       m_auto_combine_phrase (false),
       m_auto_fill_preedit (false),
       m_always_show_lookup (false),
-      m_show_all_keys (true),
+      m_show_all_keys (false),
+      m_show_word_property (false), //qshen
       m_user_data_binary (true),
       m_valid (false),
       m_shuang_pin (false),
@@ -204,6 +210,7 @@
     bool tone                = false;
     bool dynamic_adjust        = true;
     bool incomplete            = true;
+    bool show_word_property    = false;
 
     bool ambiguities [SCIM_PINYIN_AmbLast + 2] =
         { false,  false,  false,  false,
@@ -269,7 +276,12 @@
                             true);
         m_show_all_keys =
             m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_ALL_KEYS),
-                            true);
+                            false);
+			    
+        m_show_word_property =  //qshen
+            m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),
+                            false);
+			    				    
         m_user_data_binary =
             m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                             true);
@@ -692,6 +704,7 @@
       m_traditional (true),
       m_lookup_table_def_page_size (9),
       m_keys_caret (0),
+      m_helper_started (false), //qshen
       m_lookup_caret (0),
       m_iconv (encoding)
 {
@@ -890,6 +903,280 @@
     return false;
 }
 
+//qshen add 
+class __PinyinPhraseHelperFunc {
+
+    std::vector <String>  	   &m_phrase_pinyin_vec;
+    std::vector <WideString>   &m_phrase_string_vec;
+    
+public:
+	__PinyinPhraseHelperFunc ( std::vector <String> &pinyin_vec, std::vector <WideString> &string_vec) :  
+	   				m_phrase_pinyin_vec( pinyin_vec),
+					m_phrase_string_vec( string_vec ) {}
+	
+	void operator () (const PinyinPhrase & phrase) {
+		
+		String tmp_string;
+		
+		if (phrase.is_enable () && phrase.length()>= 2) {
+			tmp_string.clear();
+			
+			for (int i=0; i<phrase.length (); i++){
+				tmp_string +=  phrase.get_key (i).get_key_string() + " ";				
+			}
+			
+			m_phrase_pinyin_vec.push_back(  tmp_string );
+			m_phrase_string_vec.push_back(  phrase.get_phrase().get_content () );		
+		}
+	}
+};
+
+
+//qshen add
+void
+PinyinInstance::process_helper_event (const String &helper_uuid, const Transaction &trans)
+{
+    SCIM_DEBUG_IMENGINE (2) << "PinyinInstance : process_helper_event ()\n";
+   
+    TransactionReader reader (trans);
+    Transaction       send_trans;
+    
+    int cmd, num;
+    bool first_black_space = false; 
+    String 	phrase, tmp_string, selected_dirname;
+    WideString  new_phrase, disable_phrase;
+    WideString::iterator iter1, iter2;
+    
+    std::vector <String>     	   pinyin_strings;
+    std::vector <WideString>	   phrase_received, pinyin_received;
+    std::vector <PinyinKeyVector>  keys_vector;
+            
+    PinyinKey key;
+    PinyinParsedKey pkey;
+    PinyinParsedKeyVector pkey_vec;
+    std::vector <PinyinParsedKeyVector> pkey_vec_vec;
+
+    std::vector <String>    	   phrase_pinyin_vec;
+    std::vector <WideString>	   phrase_string_vec;  
+    
+    String pinyin_lib_bakname("/phrase_lib.bak");   
+    String pinyin_phrase_lib_bakname("/pinyin_phrase_lib.bak");
+    String pinyin_phrase_index_bakname("/pinyin_phrase_index.bak"); 
+    
+    if (helper_uuid != SCIM_PINYIN_HELPER_UUID)
+        return;
+
+    if (reader.get_command (cmd) && cmd == SCIM_TRANS_CMD_REQUEST &&
+        reader.get_command (cmd)) {
+        if (cmd == SCIM_TRANS_CMD_START_HELPER) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_TRANS_CMD_START_HELPER\n";
+            m_helper_started = true;
+	   
+	        if (m_focused) {
+                send_trans.clear ();
+                send_trans.put_command (SCIM_TRANS_CMD_REQUEST);
+                send_trans.put_command (SCIM_TRANS_CMD_FOCUS_IN);
+                send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+                SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_TRANS_CMD_FOCUS_IN\n";
+	        }
+        }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB\n";	
+	   
+	        phrase_pinyin_vec.clear();
+	        phrase_string_vec.clear();
+	        __PinyinPhraseHelperFunc func( phrase_pinyin_vec, phrase_string_vec );
+	    
+	        m_user_phrase_lib->for_each_phrase( func );
+	    
+	        //SCIM_DEBUG_IMENGINE (2)  << "phrase_string_vec.size()=" <<  phrase_string_vec.size() << " phrase_pinyin_vec.size()=" <<  phrase_pinyin_vec.size() <<endl;
+	        //for (int i=0 ; i < phrase_string_vec.size(); i++)
+		    //    SCIM_DEBUG_IMENGINE (2)  << "phrase_string_vec["<<i<<"]="<< utf8_wcstombs(phrase_string_vec[i]) << " phrase_pinyin_vec["<<i<<"]="<<phrase_pinyin_vec[i] <<endl;				
+	    
+            send_trans.clear ();
+            send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+            send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB);
+	        send_trans.put_data ( phrase_string_vec );
+	        send_trans.put_data ( phrase_pinyin_vec );
+            send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB\n";
+	    }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE\n";	
+	   
+	        if (reader.get_data (disable_phrase) ) {
+	            if (disable_phrase.length () >= 2) {
+                    Phrase phrase = m_user_phrase_lib->find (disable_phrase);
+                    if (phrase.valid () && phrase.is_enable ()) {
+                        phrase.disable ();
+		       
+            	        send_trans.clear ();
+            	        send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+            	        send_trans.put_command (SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK);
+                        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+		                SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK\n";     
+                    }
+                }	   
+	        }
+	    }	
+        if (cmd == SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB\n";
+
+	        if (reader.get_data (selected_dirname) ) {
+ 	            if ( m_pinyin_global->save_user_phrase_lib( (selected_dirname+pinyin_lib_bakname).c_str(),
+	       				       		                        (selected_dirname+pinyin_phrase_lib_bakname).c_str(),
+					       		                            (selected_dirname+pinyin_phrase_index_bakname).c_str(),
+					        	                            true) ) {
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK\n";	       
+	            } else {
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL\n";	       
+		        }		   	   
+	        }	     
+	    }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB\n";
+
+	        if (reader.get_data (selected_dirname) ) {
+    	        if (m_pinyin_global->load_user_phrase_lib ( (selected_dirname + pinyin_lib_bakname).c_str (),
+                                                        (selected_dirname + pinyin_phrase_lib_bakname).c_str (),
+                                                        (selected_dirname + pinyin_phrase_index_bakname) .c_str ())) {
+
+		            send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans); 
+                    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK\n";
+                } else { 
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL\n";	       
+		        }	              		   	   
+	        }
+	    }					
+        if (cmd == SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE\n";
+
+            if (reader.get_data (phrase_received) && reader.get_data (pinyin_received) ) {
+
+		        if( phrase_received.size() !=  pinyin_received.size() ) {
+                    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - phrase.size() != pinyin.size()\n";		
+		            return;
+		        }
+		    
+		        pkey_vec_vec.clear();
+		
+		        for (int i=0 ; i < pinyin_received.size(); i++){
+
+		            first_black_space = false;
+		            pkey_vec.clear();
+		    		    
+		            iter1 = pinyin_received[i].begin();
+		            iter2 = pinyin_received[i].begin();		    
+		    
+		            while(iter2 != pinyin_received[i].end()) {
+			            if( (*iter2) == ' ') {
+			                if( !first_black_space ) {
+			                    first_black_space = true;
+			    
+			                    tmp_string.clear();
+			    
+			                    for(; iter1 != iter2; ++iter1 ) 
+			                        tmp_string.push_back(*iter1);
+				
+		   		                key = PinyinKey ( m_pinyin_global->get_pinyin_validator (),
+		     			                            tmp_string.c_str() );	
+						  		
+				                pkey = PinyinParsedKey( key );
+				
+				                pkey_vec.push_back( pkey );
+					
+			                } else {
+			                    ++iter1;
+			                }	
+			            } else {
+			                if( first_black_space ) {
+			                    first_black_space = false; 
+				                ++iter1;
+			                }
+			            }
+ 		                ++iter2;
+		            }
+		            pkey_vec_vec.push_back( pkey_vec );
+		        }
+		
+		        for (int i=0 ; i < pkey_vec_vec.size(); i++){
+		            if( pkey_vec_vec[i].size() <= 0 )
+		                continue;
+		    
+		            add_new_phrase (phrase_received[i], pkey_vec_vec[i]);
+		        }
+		
+                send_trans.clear ();
+                send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                send_trans.put_command (SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK);
+           	    send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK\n";																				        
+	        }
+        }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_GET_PINYIN) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_GET_PINYIN\n";
+	   
+            if (reader.get_data (new_phrase)) {
+		
+		        if( new_phrase.length() == 0 )
+		            return;
+		
+		        num = m_pinyin_table->find_key_strings ( keys_vector, new_phrase );
+		        if( num == 0 ) {  // it means the new_phrase is not a right Chinese string.
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED\n";	
+		            return;
+		        }
+		    
+		        tmp_string.clear();	
+		        for (int i=0 ; i < keys_vector.size(); i++){		    
+
+		            for (int j=0; j < keys_vector[i].size(); j++)
+			            tmp_string +=  keys_vector[i][j].get_key_string() + " ";
+
+		            pinyin_strings.push_back( tmp_string );
+		            tmp_string.clear();
+		        }
+		
+                send_trans.clear ();
+                send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_PINYIN);
+	            send_trans.put_data ( pinyin_strings );
+           	    send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_PINYIN\n";
+	        }
+        }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH\n";
+	   
+	        send_trans.clear ();
+            send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+            send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH);
+	        send_trans.put_data ( m_factory->m_max_user_phrase_length );
+            send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH\n";	
+	    } 
+    }        
+}//qshen end
+
 void
 PinyinInstance::select_candidate (unsigned int item)
 {
@@ -1039,6 +1326,8 @@
         m_full_width_punctuation [which] = !m_full_width_punctuation [which];
 
         refresh_punct_property ();
+    } else if (property == SCIM_PROP_WORD) { //qshen
+        refresh_word_property ();           //qshen
     } else if (property == SCIM_PROP_PINYIN_SCHEME_QUAN_PIN) {
         m_factory->m_shuang_pin = false;
         update_pinyin_scheme = true;
@@ -1142,13 +1431,16 @@
     proplist.push_back (_pinyin_quan_pin_property);
     proplist.push_back (_pinyin_sp_stone_property);
     proplist.push_back (_pinyin_sp_zrm_property);
-    //proplist.push_back (_pinyin_sp_ms_property);
-    //proplist.push_back (_pinyin_sp_ziguang_property);
+    proplist.push_back (_pinyin_sp_ms_property);
+    proplist.push_back (_pinyin_sp_ziguang_property);
     proplist.push_back (_pinyin_sp_abc_property);
     proplist.push_back (_pinyin_sp_liushi_property);
     proplist.push_back (_status_property);
     proplist.push_back (_letter_property);
     proplist.push_back (_punct_property);
+    
+    if( m_factory->m_show_word_property )
+        proplist.push_back (_word_property); //qshen
 
     register_properties (proplist);
     refresh_all_properties ();
@@ -1196,6 +1488,13 @@
     update_property (_punct_property);
 }
 
+//qshen add
+void
+PinyinInstance::refresh_word_property ()
+{
+   start_helper( SCIM_PINYIN_HELPER_UUID );
+}
+
 void
 PinyinInstance::refresh_pinyin_scheme_property ()
 {
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h scim-pinyin-0.5.91/src/scim_pinyin_imengine.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.h	2006-06-27 09:52:07.000000000 +0800
@@ -46,7 +46,9 @@
     bool               m_auto_fill_preedit;
     bool               m_always_show_lookup;
     bool               m_show_all_keys;
-
+    
+    bool	           m_show_word_property; //qshen
+    
     bool               m_user_data_binary;
 
     bool               m_valid;
@@ -127,6 +129,8 @@
     WideString           m_auto_combined_string;
 
     KeyEvent             m_prev_key;
+    
+    bool                 m_helper_started; //qshen
 
     NativeLookupTable    m_lookup_table;
 
@@ -156,6 +160,7 @@
     virtual ~PinyinInstance ();
 
     virtual bool process_key_event (const KeyEvent& key);
+    virtual void process_helper_event (const String &helper_uuid, const Transaction &trans); //qshen add
     virtual void move_preedit_caret (unsigned int pos);
     virtual void select_candidate (unsigned int item);
     virtual void update_lookup_table_page_size (unsigned int page_size);
@@ -201,6 +206,7 @@
     void refresh_status_property ();
     void refresh_letter_property ();
     void refresh_punct_property ();
+    void refresh_word_property (); //qshen
     void refresh_pinyin_scheme_property ();
 
     void calc_parsed_keys ();
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp	2006-06-27 09:52:08.000000000 +0800
@@ -102,12 +102,13 @@
 
 // Internal data declaration.
 static bool   __config_user_data_binary       = false;
+static bool   __config_pinyin_helper          = false;  //qshen
 
 static bool   __config_auto_combine_phrase    = true;
 static bool   __config_auto_fill_preedit      = true;
 static bool   __config_match_longer_phrase    = false;
 static bool   __config_always_show_lookup     = true;
-static bool   __config_show_all_keys          = true;
+static bool   __config_show_all_keys          = false;
 static bool   __config_dynamic_adjust         = true;
 
 static int    __config_max_user_phrase_length = 8;
@@ -301,6 +302,7 @@
 };
 
 static GtkWidget * __widget_user_data_binary       = 0;
+static GtkWidget * __widget_pinyin_helper          = 0;  //qshen
 
 static GtkWidget * __widget_auto_combine_phrase    = 0;
 static GtkWidget * __widget_auto_fill_preedit      = 0;
@@ -605,6 +607,12 @@
         gtk_widget_show (separator);
         gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 4);
 
+        // Pinyin helper -- qshen 
+        __widget_pinyin_helper = gtk_check_button_new_with_mnemonic (_("Show pinyin helper property in the tool bar"));
+        gtk_widget_show (__widget_pinyin_helper);
+        gtk_box_pack_start (GTK_BOX (vbox), __widget_pinyin_helper, FALSE, FALSE, 4);
+        gtk_container_set_border_width (GTK_CONTAINER (__widget_pinyin_helper), 2);		
+
         // Create the pinyin configurations page
         vbox = gtk_vbox_new (FALSE, 0);
         gtk_widget_show (vbox);
@@ -746,6 +754,11 @@
         g_signal_connect ((gpointer) __widget_user_data_binary, "toggled",
                           G_CALLBACK (__on_default_toggle_button_toggled),
                           &__config_user_data_binary);
+	//qshen
+        g_signal_connect ((gpointer) __widget_pinyin_helper, "toggled",
+                          G_CALLBACK (__on_default_toggle_button_toggled),
+                          &__config_pinyin_helper);
+			  			  
 
         g_signal_connect ((gpointer) __widget_tone, "toggled",
                           G_CALLBACK (__on_default_toggle_button_toggled),
@@ -777,6 +790,11 @@
                                 "the user pinyin and phrase data will be stored "
                                 "in binary format. "
                                 "This will increase the loading speed."), NULL);
+	//qshen add			
+        gtk_tooltips_set_tip (__widget_tooltips, __widget_pinyin_helper,
+                              _("If this option is checked, "
+                                "the tool bar will show the pinyin_helper property. "),
+                                NULL);
 
         gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_combine_phrase,
                               _("If this option is checked, "
@@ -980,6 +998,12 @@
             GTK_TOGGLE_BUTTON (__widget_user_data_binary),
             __config_user_data_binary);
     }
+    //qshen
+    if (__widget_pinyin_helper) {
+        gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON (__widget_pinyin_helper),
+            __config_pinyin_helper);
+    }    
 
     for (i = 0; __config_keyboards [i].key; ++ i) {
         if (__config_keyboards [i].entry) {
@@ -1044,6 +1068,9 @@
         __config_user_data_binary=
             config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                           __config_user_data_binary);
+        __config_pinyin_helper= //qshen
+            config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),
+                          __config_pinyin_helper);			  
         __config_max_user_phrase_length =
             config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_USER_PHRASE_LENGTH),
                           __config_max_user_phrase_length);
@@ -1107,6 +1134,8 @@
                       __config_dynamic_adjust);
         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                       __config_user_data_binary);
+        config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),  //qshen
+                      __config_pinyin_helper);		      
         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_USER_PHRASE_LENGTH),
                       __config_max_user_phrase_length);
         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_PREEDIT_LENGTH),
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h scim-pinyin-0.5.91/src/scim_pinyin_phrase.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.h	2006-06-27 09:52:08.000000000 +0800
@@ -371,6 +371,9 @@
 	}
 
 	void optimize_phrase_frequencies (uint32 max_freq = (SCIM_PHRASE_MAX_FREQUENCY >> 1));
+	
+	template<class T>
+	void for_each_phrase (T &op);	
 
 private:
 	Phrase get_phrase (uint32 phrase_offset) {
@@ -409,9 +412,6 @@
 	bool insert_phrase_into_index (const Phrase &phrase, const PinyinKeyVector &keys);
 
 	template<class T>
-	void for_each_phrase (T &op);
-
-	template<class T>
 	void for_each_phrase_level_one (uint32 len, T &op);
 
 	template<class T>



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:51:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:51:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2317,1.2318
Message-ID: <200606270251.k5R2p9I7015536@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15486

Modified Files:
	kernel-2.6.spec 
Log Message:
xen borked.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2317
retrieving revision 1.2318
diff -u -r1.2317 -r1.2318
--- kernel-2.6.spec	27 Jun 2006 02:17:29 -0000	1.2317
+++ kernel-2.6.spec	27 Jun 2006 02:51:04 -0000	1.2318
@@ -11,7 +11,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:51:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:51:09 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.14,1.15
Message-ID: <200606270251.k5R2p9VO015530@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15392

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: modify the changelog err: Tus --> Tue



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-pinyin.spec	27 Jun 2006 02:45:11 -0000	1.14
+++ scim-pinyin.spec	27 Jun 2006 02:51:03 -0000	1.15
@@ -70,7 +70,7 @@
 
 
 %changelog
-* Tus May 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6
+* Tue May 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6
 - add scim-pinyin-helper.patch
 
 * Fri Mar 31 2006 Jens Petersen <petersen at redhat.com> - 0.5.91-5



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:55:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:55:07 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.patch,NONE,1.1
Message-ID: <200606270255.k5R2t6Mt016545@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16437

Added Files:
	scim-pinyin-helper.patch 
Log Message:
qshen: add scim-pinyin-helper.patch


scim-pinyin-helper.patch:
 configure.ac                           |    9 
 po/POTFILES.in                         |    1 
 po/zh_CN.po                            |  135 +++
 src/Makefile.am                        |   19 
 src/scim_pinyin_helper.cpp             | 1130 +++++++++++++++++++++++++++++++++
 src/scim_pinyin_helper.h               |   56 +
 src/scim_pinyin_imengine.cpp           |  307 ++++++++
 src/scim_pinyin_imengine.h             |    8 
 src/scim_pinyin_imengine_config_keys.h |    3 
 src/scim_pinyin_imengine_setup.cpp     |   31 
 src/scim_pinyin_phrase.h               |    6 
 11 files changed, 1694 insertions(+), 11 deletions(-)

--- NEW FILE scim-pinyin-helper.patch ---
diff -Naur scim-pinyin-0.5.91.bak/configure.ac scim-pinyin-0.5.91/configure.ac
--- scim-pinyin-0.5.91.bak/configure.ac	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/configure.ac	2006-06-27 09:51:26.000000000 +0800
@@ -46,10 +46,17 @@
 else
   SCIM_BUILD_SETUP=0
 fi
-
 AM_CONDITIONAL(SCIM_BUILD_SETUP, [test "$SCIM_HAS_GTKUTILS" = "yes"])
 AC_SUBST(SCIM_BUILD_SETUP)
 
+if test "$SCIM_HAS_GTKUTILS" = "yes"; then
+  SCIM_BUILD_HELPER=1
+else
+  SCIM_BUILD_HELPER=0
+fi
+
+AM_CONDITIONAL(SCIM_BUILD_HELPER, [test "$SCIM_HAS_GTKUTILS" = "yes"])
+AC_SUBST(SCIM_BUILD_HELPER) 
 
 # Checks for header files.
 AC_HEADER_STDC
diff -Naur scim-pinyin-0.5.91.bak/po/POTFILES.in scim-pinyin-0.5.91/po/POTFILES.in
--- scim-pinyin-0.5.91.bak/po/POTFILES.in	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/po/POTFILES.in	2006-06-27 09:51:39.000000000 +0800
@@ -1,2 +1,3 @@
 src/scim_pinyin_imengine.cpp
 src/scim_pinyin_imengine_setup.cpp
+src/scim_pinyin_helper.cpp
diff -Naur scim-pinyin-0.5.91.bak/po/zh_CN.po scim-pinyin-0.5.91/po/zh_CN.po
--- scim-pinyin-0.5.91.bak/po/zh_CN.po	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/po/zh_CN.po	2006-06-27 09:51:49.000000000 +0800
@@ -480,3 +480,138 @@
 #~ msgstr ""
 #~ "???????????????????????????????????????(locale). ???????????????????????????????????????. ?????? "
 #~ "\"default\" ???????????????????????????."
+
+#: src/scim_pinyin_helper.cpp:55
+msgid "Smart pinyin helper"
+msgstr "????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:57
+msgid "A helper module for Smart Pinyin IMEngine."
+msgstr "??????????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:270
+msgid "please select a directory."
+msgstr "?????????????????????"
+
+#: src/scim_pinyin_helper.cpp:270
+msgid "please select the directory that contains the user phrase library."
+msgstr "????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:337
+msgid "Invalid phrase libraries in this directory!"
+msgstr "????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:529
+msgid "The phrase length exeed the MAX_USER_PHRASE_LENGTH!"
+msgstr "?????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:589
+msgid "Invalid pinyin key in the input pinyin sequence."
+msgstr "??????????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:642
+msgid "Pinyin keys number is not equal to the phrase charachater number."
+msgstr "????????????????????????????????? ????????????"
+
+#: src/scim_pinyin_helper.cpp:780
+msgid "Success to save the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:794
+msgid "Failed to save the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:808
+msgid "Success to import the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:829
+msgid "Failed to import the user phrase library."
+msgstr "???????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:854
+msgid "Success to add the new phrases into the user phrase library."
+msgstr "???????????????????????????????????????"
+
+#: src/scim_pinyin_helper.cpp:924
+msgid "ID"
+msgstr "??????" 
+
+#: src/scim_pinyin_helper.cpp:924
+msgid "PHRASE"
+msgstr "??????" 
+
+#: src/scim_pinyin_helper.cpp:924
+msgid "PINYIN"
+msgstr "??????" 
+
+#: src/scim_pinyin_helper.cpp:989
+msgid "SCIM Pinyin - Add New Phrase"
+msgstr "SCIM ??????????????? ??????????????????"
+
+#: src/scim_pinyin_helper.cpp:999
+msgid "_Options"
+msgstr "??????(_O)"
+
+#: src/scim_pinyin_helper.cpp:1015
+msgid "_Actions"
+msgstr "??????(_A)"
+
+#: src/scim_pinyin_helper.cpp:1027
+msgid "_List User Phrase Library"
+msgstr "??????????????????(_L)"
+
+#: src/scim_pinyin_helper.cpp:1031
+msgid "_Save User Phrase Library"
+msgstr "??????????????????(_S)"
+
+#: src/scim_pinyin_helper.cpp:1035
+msgid "_Import User Phrase Library"
+msgstr "??????????????????(_I)"
+
+#: src/scim_pinyin_helper.cpp:1039
+msgid "_Add New Phrases"
+msgstr "???????????????(_A)"
+
+#: src/scim_pinyin_helper.cpp:1043
+msgid "_Delete Phrase"
+msgstr "????????????(_D)"
+
+#: src/scim_pinyin_helper.cpp:1048
+msgid "_Help"
+msgstr "??????(_H)"
+
+#: src/scim_pinyin_helper.cpp:1055
+msgid "_About"
+msgstr "??????(_A)"
+
+#: src/scim_pinyin_helper.cpp:1086
+msgid "Quit"
+msgstr "??????"
+
+#: src/scim_pinyin_helper.cpp:1081
+msgid "Submit"
+msgstr "??????"
+
+#: src/scim_pinyin_helper.cpp:1092
+msgid "Add"
+msgstr "??????"
+
+#: src/scim_pinyin_helper.cpp:1098
+msgid "Delete"
+msgstr "??????"
+
+#: src/scim_pinyin_imengine_setup.cpp:611
+msgid "Show pinyin helper property in the tool bar"
+msgstr "?????????????????????????????????????????????(_H)"
+
+#: src/scim_pinyin_imengine_setup.cpp:854
+msgid ""
+"If this option is checked, "
+"the tool bar will show the pinyin_helper property. "
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????."
+
+#: src/scim_pinyin_imengine_setup.cpp:611
+msgid "The switch to invoke pinyin helper. Click to invoke it."
+msgstr "?????????????????????????????????, ?????????????????????????????????."
diff -Naur scim-pinyin-0.5.91.bak/src/Makefile.am scim-pinyin-0.5.91/src/Makefile.am
--- scim-pinyin-0.5.91.bak/src/Makefile.am	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/Makefile.am	2006-06-27 09:52:06.000000000 +0800
@@ -36,7 +36,8 @@
 			  scim_pinyin_phrase.h \
 			  scim_native_lookup_table.h \
 			  scim_pinyin_smart_match.h \
-			  scim_special_table.h
+			  scim_special_table.h \
+			  scim_pinyin_helper.h
 
 noinst_LTLIBRARIES	= libpinyin.la
 
@@ -90,6 +91,22 @@
 				 @SCIM_GTKUTILS_LIBS@ \
 			  	 @LTLIBINTL@
 
+HELPER_MODULE      = pinyin-imengine-helper.la
+
+helpermoduledir         =  @SCIM_MODULEDIR@/Helper
+helpermodule_LTLIBRARIES= $(HELPER_MODULE)
+
+pinyin_imengine_helper_la_SOURCES  = scim_pinyin_helper.cpp
+pinyin_imengine_helper_la_CFLAGS   = @SCIM_GTKUTILS_CFLAGS@  @SCIM_CFLAGS@
+pinyin_imengine_helper_la_CXXFLAGS = @SCIM_GTKUTILS_CFLAGS@  @SCIM_CFLAGS@
+pinyin_imengine_helper_la_LDFLAGS  = -avoid-version \
+                          -rpath $(helpermoduledir) \
+                          -module \
+                          @LIBTOOL_EXPORT_OPTIONS@ \
+                          @SCIM_LIBS@ \
+                          @SCIM_GTKUTILS_LIBS@ \
+                          @LTLIBINTL@ 
+
 if ENABLE_TOOLS
 TOOLS = make-pinyin make-phrase make-pinyin-phrase
 endif
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp	1970-01-01 08:00:00.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-06-27 09:52:06.000000000 +0800
@@ -0,0 +1,1130 @@
+/*
+ *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#define Uses_SCIM_HELPER
+#define Uses_SCIM_CONFIG_BASE
+#include <map>
+#include <scim.h>
+#include <gtk/gtk.h>
+#include "scim_pinyin_helper.h"
+
+using namespace scim;
+
+#define scim_module_init pinyin_imengine_helper_LTX_scim_module_init
+#define scim_module_exit pinyin_imengine_helper_LTX_scim_module_exit
+#define scim_helper_module_number_of_helpers pinyin_imengine_helper_LTX_scim_helper_module_number_of_helpers
+#define scim_helper_module_get_helper_info pinyin_imengine_helper_LTX_scim_helper_module_get_helper_info
+#define scim_helper_module_run_helper pinyin_imengine_helper_LTX_scim_helper_module_run_helper
+
+static void       run                         (const String        &display,
+                                               const ConfigPointer &config);
+					       
+HelperAgent helper_agent;					       
+
+HelperInfo helper_info (SCIM_PINYIN_HELPER_UUID,        // uuid
+                        "",                            // name
+                        "",                            // icon
+                        "",
+                        SCIM_HELPER_NEED_SCREEN_INFO|SCIM_HELPER_NEED_SCREEN_INFO);
+
+//Module Interface
+extern "C" {
+    void scim_module_init (void)
+    {
+        bindtextdomain (GETTEXT_PACKAGE, SCIM_PINYIN_LOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+        helper_info.name = String (_("Smart pinyin helper"));
+        helper_info.description = String (
+            _("A helper module for Smart Pinyin IMEngine."));
+    }
+
+    void scim_module_exit (void)
+    {
+    }
+
+    unsigned int scim_helper_module_number_of_helpers (void)
+    {
+        return 1;
+    }
+
+    bool scim_helper_module_get_helper_info (unsigned int idx, HelperInfo &info)
+    {
+        if (idx == 0) {
+            info = helper_info; 
+            return true;
+        }
+        return false;
+    }
+
+    void scim_helper_module_run_helper (const String &uuid,
+                                        const ConfigPointer &config,
+                                        const String &display)
+    {
+        SCIM_DEBUG_MAIN(1) << "scim_pinyin_imengine_helper_LTX_scim_helper_module_run_helper ()\n";
+
+        if (uuid == String (SCIM_PINYIN_HELPER_UUID)) {
+            run (display, config);
+        }
+
+        SCIM_DEBUG_MAIN(1) << "exit scim_pinyin_imengine_helper_LTX_scim_helper_module_run_helper ()\n";
+    }
+}
+
+//Global Variables
+static int        cur_ic = -1;
+static String     cur_uuid;
+
+GtkWidget    *	  BaseWindow;
+GtkListStore *	  list_store;
+GtkTreeModel *    tree_model;
+GtkTreeView  *	  tree_view;
+GtkTreeIter 	  cur_iter;
+GtkCellRenderer * renderer_num, *renderer_phrase, *renderer_pinyin;
+GtkWidget    *	  submit_button, *disable_button, *add_button;
+GtkWidget    *    add_phrase_row, *disable_phrase_row; 
+
+uint32		  max_user_phrase_length = 8;
+
+bool		  ok_to_add_new_row = false;
+guint		  row_count = 0;
+
+int		  list_cur_num = -1;
+
+static gboolean
+helper_agent_input_handler (GIOChannel *source,
+                            GIOCondition condition,
+                            gpointer user_data)
+{
+    if (condition == G_IO_IN) {
+        HelperAgent *agent = static_cast<HelperAgent*> (user_data);
+        if (agent && agent->has_pending_event ())
+            agent->filter_event ();
+    } else if (condition == G_IO_ERR || condition == G_IO_HUP) {
+        gtk_main_quit ();
+    }
+    return TRUE;
+}
+
+static void
+slot_exit (const HelperAgent *agent, int ic, const String &uuid)
+{
+    gtk_main_quit ();
+}
+
+static void slot_attach_input_context (const HelperAgent *agent, int ic, const String &uuid)
+{
+    std::cout << "slot_attach_input_context (" << ic << ", " << uuid << ")\n";
+
+    cur_ic = ic;
+    cur_uuid = uuid;
+
+    // Inform the scim-pinyin imengine that scim-pinyin-helper started successfully
+    Transaction trans;
+    trans.put_command (SCIM_TRANS_CMD_REQUEST);
+    trans.put_command (SCIM_TRANS_CMD_START_HELPER);
+    agent->send_imengine_event (ic, uuid, trans);
+}
+
+static void slot_detach_input_context (const HelperAgent *agent, int ic, const String &uuid)
+{
+    std::cout << "slot_detach_input_context (" << ic << ", " << uuid << ")\n";
+}
+
+static void slot_update_screen (const HelperAgent *, int ic, const String &uuid, int screen)
+{
+    std::cout << "slot_update_screen (" << ic << ", " << uuid << ", " << screen << ")\n";
+}
+
+static void slot_update_spot_location (const HelperAgent *, int ic, const String &uuid, int x, int y)
+{
+    std::cout << "slot_update_spot_location (" << ic << ", " << uuid << ", " << x << ", " << y << ")\n";
+
+    //gtk_window_move (GTK_WINDOW (main_window), x + 16, y + 16);
+}
+
+void
+on_button_quit_clicked                 (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    gtk_main_quit ();   
+}
+
+void
+on_quit_activate                       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+    gtk_main_quit ();
+}
+
+void
+on_about1_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+}
+
+void
+on_new_row_activate                     (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+    std::cout << "in on_new_column_activate()" <<endl;
+    
+    if( !ok_to_add_new_row )
+        return;
+   
+    GtkTreeIter iter;
+    GtkTreePath *path; 
+    GtkTreeViewColumn* column;    
+     
+    gtk_list_store_append (list_store, &iter);
+   
+    row_count ++;
+    
+    gtk_list_store_set (list_store, &iter,
+			  NUM_COLUMN, row_count,
+			  PHRASE_COLUMN, "",
+			  PINYIN_COLUMN, "",
+			  -1);
+
+    path = gtk_tree_model_get_path ( tree_model, &iter );
+    
+    column = gtk_tree_view_get_column ( tree_view, 1 );
+    	
+    gtk_tree_view_set_cursor ( tree_view,
+                               path,
+                               column,
+                               TRUE);  
+    // bug? - if use this api to grab focus, scim will crash!			       
+    //gtk_widget_grab_focus ( (GtkWidget*)tree_view);
+    
+    ok_to_add_new_row = false;			         			 
+}
+
+void
+on_list_user_phrase_library             (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+    gtk_widget_hide (submit_button);
+    gtk_widget_show (disable_button);
+    gtk_widget_show (add_button); 
+    gtk_widget_show (add_phrase_row);
+    gtk_widget_show (disable_phrase_row);     
+
+    g_object_set ( renderer_phrase, "editable", false, NULL);
+    g_object_set ( renderer_pinyin, "editable", false, NULL);   
+
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_list_user_phrase_library(), send : SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB\n";
+}
+
+void 
+on_dir_select_ok			(GtkWidget *widget, 
+					 gpointer user_data) 
+{
+    GtkWidget 	*dir_selector = GTK_WIDGET (user_data);
+    const gchar *selected_dirname;
+    String   	string_dirname;
+
+    selected_dirname = gtk_file_selection_get_filename (GTK_FILE_SELECTION (dir_selector));
+    string_dirname = String( selected_dirname );
+   
+    if( g_file_test( selected_dirname , G_FILE_TEST_IS_DIR ) )
+        gtk_widget_destroy( GTK_WIDGET(dir_selector) );
+    else
+	return;  
+
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB);
+    send.put_data ( string_dirname );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_dir_select_ok(), send : SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB"<< endl;      
+}					 
+
+void
+on_save_user_phrase_library             (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+   GtkWidget *dir_selector;
+  
+   dir_selector = gtk_file_selection_new (_("please select a directory."));
+   
+   g_signal_connect (GTK_FILE_SELECTION (dir_selector)->ok_button,
+                     "clicked",
+                     G_CALLBACK (on_dir_select_ok),
+                     dir_selector);
+   			   
+   g_signal_connect_swapped (GTK_FILE_SELECTION (dir_selector)->cancel_button,
+                             "clicked",
+                             G_CALLBACK (gtk_widget_destroy),
+                             dir_selector); 
+   
+   gtk_widget_show (dir_selector);   
+}
+
+void 
+on_lib_select_ok			(GtkWidget *widget, 
+					 gpointer user_data) 
+{
+   GtkWidget *lib_selector = GTK_WIDGET (user_data);
+   const gchar *selected_dirname;
+   String string_dirname;
+   
+   String pinyin_lib_bakname("/phrase_lib.bak");   
+   String pinyin_phrase_lib_bakname("/pinyin_phrase_lib.bak");
+   String pinyin_phrase_index_bakname("/pinyin_phrase_index.bak");    
+
+   selected_dirname = gtk_file_selection_get_filename (GTK_FILE_SELECTION (lib_selector));
+   string_dirname = String( selected_dirname );
+   
+   
+   /* test the libraries --by name */
+   if( g_file_test( selected_dirname , G_FILE_TEST_IS_DIR ) )
+   {
+     std::cout << "in on_lib_select_ok(), send : selected_dirname=" << selected_dirname << endl; 
+     
+     if( g_file_test( (string_dirname + pinyin_lib_bakname).c_str() , G_FILE_TEST_EXISTS) &&
+         g_file_test( (string_dirname + pinyin_phrase_lib_bakname).c_str() , G_FILE_TEST_EXISTS) &&
+	 g_file_test( (string_dirname + pinyin_phrase_index_bakname).c_str() , G_FILE_TEST_EXISTS) ) 
+     {     
+         gtk_widget_destroy( GTK_WIDGET(lib_selector) );
+     }
+     else
+     {
+         GtkWidget *dialog;
+	 dialog = gtk_message_dialog_new( GTK_WINDOW(lib_selector), 
+	    				     GTK_DIALOG_MODAL,
+					     GTK_MESSAGE_ERROR,
+					     GTK_BUTTONS_OK,
+					     _("Invalid phrase libraries in this directory!") );
+	 gtk_dialog_run( GTK_DIALOG(dialog) );
+	 gtk_widget_destroy(dialog);  
+	    
+	 return;
+      }       
+   }
+   else
+	return;  
+
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB);
+    send.put_data ( string_dirname );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_dir_select_ok(), send : SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB"<< endl; 
+}
+
+void
+on_import_user_phrase_library           (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+   GtkWidget *lib_selector;
+ 
+   lib_selector = gtk_file_selection_new (_("please select the directory that contains the user phrase library."));
+   
+   g_signal_connect (GTK_FILE_SELECTION (lib_selector)->ok_button,
+                     "clicked",
+                     G_CALLBACK (on_lib_select_ok),
+                     lib_selector);
+   
+   g_signal_connect_swapped (GTK_FILE_SELECTION (lib_selector)->cancel_button,
+                             "clicked",
+                             G_CALLBACK (gtk_widget_destroy),
+                             lib_selector); 
+   
+   gtk_widget_show (lib_selector);
+}
+
+void
+on_button_submit_clicked                (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    std::cout << "PinyinHelper: on_button_submit_clicked() - begin" <<endl;
+    
+    GtkTreeIter iter;
+    gchar       *phrase,  *pinyin;
+    WideString  w_phrase, w_pinyin;
+    std::vector<WideString> phrase_vec;
+    std::vector<WideString> pinyin_vec;
+    
+    if (!gtk_tree_model_get_iter_first (tree_model, &iter))
+	return;
+	
+    do {
+        gtk_tree_model_get(tree_model, &iter, PHRASE_COLUMN, &phrase, -1);
+        gtk_tree_model_get(tree_model, &iter, PINYIN_COLUMN, &pinyin, -1);
+
+	
+	w_phrase = utf8_mbstowcs( phrase );
+	w_pinyin = utf8_mbstowcs( pinyin );
+	
+	phrase_vec.push_back( w_phrase );
+	pinyin_vec.push_back( w_pinyin );
+	
+    } while (gtk_tree_model_iter_next (tree_model, &iter));
+    
+    if( phrase_vec.size() == 1 || pinyin_vec.size() == 1 )
+        return;
+    
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE);
+    send.put_data ( phrase_vec );
+    send.put_data ( pinyin_vec );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+   std::cout << "on_button_submit_clicked() : send : SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE"<< endl;
+
+}
+
+void
+on_button_add_clicked                  (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path; 
+    GtkTreeViewColumn* column;    
+    
+    gtk_widget_show (submit_button);
+    gtk_widget_hide (disable_button);
+    gtk_widget_hide (add_button);   
+    gtk_widget_hide (add_phrase_row);
+    gtk_widget_hide (disable_phrase_row);      
+    
+    g_object_set ( renderer_phrase, "editable", true, NULL);
+    g_object_set ( renderer_pinyin, "editable", true, NULL);    
+    
+    gtk_list_store_clear ( list_store );  
+       
+    gtk_list_store_append (list_store, &iter);
+    gtk_list_store_set (list_store, &iter,
+			  NUM_COLUMN, 1,
+			  PHRASE_COLUMN, "",
+			  PINYIN_COLUMN, "",
+			  -1);
+
+    row_count = 1;    
+    
+    // set cursor to the first phrase cell
+    //gtk_tree_model_get_iter_first ( tree_model, &iter);
+    path   = gtk_tree_model_get_path  ( tree_model, &iter );    
+    column = gtk_tree_view_get_column ( tree_view, 1 );    	
+    gtk_tree_view_set_cursor ( tree_view,
+                               path,
+                               column,
+                               TRUE);
+			       
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH);
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "on_button_add_clicked() - send : SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH"<< endl;				  	  
+}
+
+void
+on_button_disable_clicked              (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    GtkTreeSelection* selection;
+    gchar       *phrase;
+    WideString  w_phrase;  
+    gboolean    rc;  
+
+    selection = gtk_tree_view_get_selection( tree_view);    
+
+    rc = gtk_tree_selection_get_selected (selection, &model, &iter);
+    if( !rc )
+        return;
+   
+    gtk_tree_model_get(model, &iter, PHRASE_COLUMN, &phrase, -1);    
+    gtk_tree_model_get(model, &iter, NUM_COLUMN, &list_cur_num, -1);
+    
+    w_phrase = utf8_mbstowcs( phrase );    
+        
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE);
+    send.put_data ( w_phrase );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+    std::cout << "in on_button_disable_clicked(), send : SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE"<< endl;
+}
+
+void
+on_phrase_cell_edited			(GtkCellRendererText *renderer,
+					 gchar *path,
+					 gchar *new_text,
+					 gpointer data)
+{
+/*
+    gunichar uni_new_text = g_utf8_get_char ( new_text );    
+    PangoScript s = pango_script_for_unichar (uni_new_text);
+*/
+    if( strlen(new_text) == 0 )
+        return;
+
+    if(  g_utf8_strlen (new_text, -1) > max_user_phrase_length ){
+	GtkWidget *dialog;
+	dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	      				     GTK_DIALOG_MODAL,
+					     GTK_MESSAGE_ERROR,
+					     GTK_BUTTONS_OK,
+					     _("The phrase length exeed the MAX_USER_PHRASE_LENGTH!") );
+	gtk_dialog_run( GTK_DIALOG(dialog) );
+	gtk_widget_destroy(dialog);    
+    
+	GtkTreePath *_path = gtk_tree_path_new_from_string (path);
+        GtkTreeViewColumn  *column = gtk_tree_view_get_column ( tree_view, 1 );		
+        gtk_tree_view_set_cursor ( tree_view,
+                                   _path,
+                                   column,
+                                   TRUE);  	    
+	return;    	
+    }	
+   
+    WideString w_new_text;
+    
+    w_new_text = utf8_mbstowcs( new_text );
+  
+    gtk_tree_model_get_iter_from_string( tree_model, &cur_iter, path);
+ 
+    gtk_list_store_set(list_store, &cur_iter, 
+                       PHRASE_COLUMN, new_text,
+                       -1); 
+		       
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_GET_PINYIN);
+    send.put_data ( w_new_text );
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+   					
+    std::cout << "in on_phrase_cell_edited(), send : SCIM_PINYIN_TRANS_CMD_GET_PINYIN"<< endl;
+}
+
+void
+on_pinyin_cell_edited			(GtkCellRendererText *renderer,
+					 gchar *path,
+					 gchar *new_text,
+					 gpointer data)
+{
+    std::cout << "in on_pinyin_cell_edited() " << new_text <<" path="<< path <<endl ;
+    
+    int key_nums;
+    gchar  *phrase; 
+    String new_text_str;
+    String::iterator iter;
+    WideString w_phrase;   
+    
+    
+    for(int i = 0; new_text[i]!='\0'; i++){
+	
+	if( !islower( new_text[i] ) && new_text[i] != ' '){
+	    GtkWidget *dialog;
+	    dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	    				     GTK_DIALOG_MODAL,
+					     GTK_MESSAGE_ERROR,
+					     GTK_BUTTONS_OK,
+					     _("Invalid pinyin key in the input pinyin sequence.") );
+	    gtk_dialog_run( GTK_DIALOG(dialog) );
+	    gtk_widget_destroy(dialog);
+	    
+	    return; 	    					
+	}
+	
+	if( new_text[i] == ' ' && new_text[i+1] == ' ')
+	    continue;
+	    
+	if( new_text[i] == ' ' && new_text[i+1] == '\0')
+	    continue;	    
+	
+	new_text_str.push_back( new_text[i] );	
+    } 
+    
+    iter = new_text_str.begin();
+    key_nums = 0;
+    while( iter != new_text_str.end() ){
+        if( *iter == ' ')
+	    key_nums++;
+	 iter++;
+    }
+    if( key_nums == 0 ){
+        if( new_text_str.size() > 0 )
+            key_nums++;	
+    } else {
+        key_nums++;    }
+        
+    gtk_tree_model_get_iter_from_string( tree_model, &cur_iter, path);
+    
+    gtk_tree_model_get(tree_model, &cur_iter, PHRASE_COLUMN, &phrase, -1);
+    
+    w_phrase = utf8_mbstowcs( phrase );  
+    
+    //std::cout << "in on_pinyin_cell_edited() w_phrase.size=" << w_phrase.size() <<endl ;
+    //std::cout << "in on_pinyin_cell_edited() key_nums     =" << key_nums <<endl ;
+    
+    if( w_phrase.size() == 0){
+        gtk_list_store_set(list_store, &cur_iter, 
+                       	   PINYIN_COLUMN, "",
+                           -1);
+        return;
+    } 
+    
+    if( w_phrase.size() != key_nums ){
+        GtkWidget *dialog;
+	dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 GTK_DIALOG_MODAL,
+					 GTK_MESSAGE_ERROR,
+					 GTK_BUTTONS_OK,
+					 _("Pinyin keys number is not equal to the phrase charachater number.") );
+	    gtk_dialog_run( GTK_DIALOG(dialog) );
+	    gtk_widget_destroy(dialog);
+	    
+	    return;       
+     }         
+ 
+    gtk_list_store_set(list_store, &cur_iter, 
+                       PINYIN_COLUMN, new_text_str.c_str(),
+                       -1); 
+      
+}
+
+static void
+slot_process_imengine_event (const HelperAgent *agent, int ic,
+                             const String &uuid, const Transaction &recv)
+{
+    if (uuid == "05235cfc-43ce-490c-b1b1-c5a2185276ae") {
+
+        int cmd;
+        TransactionReader   reader (recv);	
+	std::vector<String> pinyin_strings;
+	
+   	std::vector <String>  	   phrase_pinyin_vec;
+    	std::vector <WideString>   phrase_string_vec;
+	
+        if (reader.get_command (cmd) && cmd == SCIM_TRANS_CMD_REQUEST) {
+            while (reader.get_command (cmd)) {
+                switch (cmd) {
+                    case SCIM_PINYIN_TRANS_CMD_SEND_PINYIN:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SEND_PINYIN \n";
+			
+			if (reader.get_data (pinyin_strings)) {
+			
+			    gtk_list_store_set(list_store, &cur_iter, 
+                       				PINYIN_COLUMN, pinyin_strings[0].c_str(),
+                       				-1); 
+			} 
+			
+			guint num;
+			gtk_tree_model_get ( tree_model, &cur_iter, 0, &num, -1 );
+			
+			if ( num == row_count ) {
+			    ok_to_add_new_row = true;
+			    on_new_row_activate ( NULL,NULL );
+			}
+			      
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED:
+                    {
+		    	std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED \n";
+			
+    			GtkTreePath 	   *path; 
+    			GtkTreeViewColumn  *column;
+						
+			gtk_list_store_set(list_store, &cur_iter, 
+                       			   PHRASE_COLUMN,"",
+                       			   -1);	
+    			path = gtk_tree_model_get_path ( tree_model, &cur_iter );
+			    
+    			column = gtk_tree_view_get_column ( tree_view, 1 );    	
+			
+    			gtk_tree_view_set_cursor ( tree_view,
+         			                   path,
+     			                           column,
+            			                   TRUE); 					   		
+                        break;
+                    }	
+                    case SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB \n";
+			
+			GtkTreeIter iter, focus_iter;
+			GtkTreePath *path;
+			int i;
+			
+			/* for multi selection use
+    			GtkTreeSelection* selection;
+    			selection = gtk_tree_view_get_selection( tree_view); 			
+			gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE);
+			*/
+						
+			if (reader.get_data (phrase_string_vec) && reader.get_data (phrase_pinyin_vec) ) {
+
+			    gtk_list_store_clear ( list_store );
+			    
+			    for( i=0 ; i < phrase_string_vec.size(); i++){
+			    
+			        gtk_list_store_append (list_store, &iter);
+				gtk_list_store_set (list_store, &iter,
+			  	                    NUM_COLUMN, i+1,
+			  			    PHRASE_COLUMN, utf8_wcstombs(phrase_string_vec[i]).c_str(),
+			  			    PINYIN_COLUMN, phrase_pinyin_vec[i].c_str(),
+			  			    -1);
+						    
+			        if( list_cur_num == i+1 )
+			            focus_iter = iter;
+			     }
+				
+			     // if disable one row, select the next row	
+			     if( list_cur_num > 0 ){	  			     
+			         if( list_cur_num < i+1 )	
+    				     path = gtk_tree_model_get_path ( tree_model, &focus_iter );    
+         			 else 
+    				     path = gtk_tree_model_get_path ( tree_model, &iter ); 				        
+    				 gtk_tree_view_set_cursor ( tree_view, path, NULL, false);				     
+				 list_cur_num = -1;
+			     }
+			} 
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Success to save the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+	
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Failed to save the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+	
+                        break;
+                    }		    
+                    case SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Success to import the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+			
+    			Transaction send;
+    			send.put_command (SCIM_TRANS_CMD_REQUEST);
+    			send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    			helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+   			std::cout << "send : SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB"<< endl;
+
+			break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL:
+                    {
+			std::cout << "process_imengine_event():get command-  SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Failed to import the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+	
+                        break;
+                    }
+                    case SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK:
+                    {
+    			Transaction send;
+    			send.put_command (SCIM_TRANS_CMD_REQUEST);
+    			send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    			helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+	    
+   			std::cout << "send : SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB"<< endl;
+	
+                        break;
+                    }		    	
+                    case SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK:
+                    {
+			std::cout << "process_imengine_event():get command - SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK \n";
+			
+        		GtkWidget *dialog;
+			dialog = gtk_message_dialog_new( GTK_WINDOW(BaseWindow), 
+	        			 		GTK_DIALOG_MODAL,
+					 		GTK_MESSAGE_INFO,
+					 		GTK_BUTTONS_OK,
+					 		_("Success to add the new phrases into the user phrase library.") );
+	    		gtk_dialog_run( GTK_DIALOG(dialog) );
+	    		gtk_widget_destroy(dialog);
+			
+			on_list_user_phrase_library( NULL, NULL);
+	
+                        break;
+                    }	
+                    case SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH:
+                    {
+			std::cout << "process_imengine_event():get command - SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH \n";
+		
+		        uint32 length;
+			if (reader.get_data (length) )	
+			    max_user_phrase_length = length;
+			
+                        break;
+                    }		    	    	    		    		    	    	    	    
+		    default:
+    		    {
+        		std::cout << "process_imengine_event():get command-  default\n";
+       			break;
+    		    }
+                }
+            }
+        }
+    }
+}
+
+/* create the treeview model*/
+static GtkTreeModel * create_model (void)
+{
+    GtkListStore *store;
+
+    store = gtk_list_store_new (N_COLUMNS,
+			        G_TYPE_UINT,
+			        G_TYPE_STRING,
+			        G_TYPE_STRING);
+
+    list_store = store;
+    return GTK_TREE_MODEL (store);
+}
+
+/* add columns to the treeview */
+static void  add_columns (GtkTreeView *treeview)
+{
+  GtkTreeViewColumn *column;
+
+  renderer_num = gtk_cell_renderer_text_new ();
+  g_object_set ( renderer_num, "xalign", 0.5, NULL);	
+  column = gtk_tree_view_column_new_with_attributes (_("ID"),
+						     renderer_num,
+						     "text",NUM_COLUMN,
+						     NULL);
+  g_object_set ( renderer_num, "alignment", 0.5, NULL);
+  gtk_tree_view_append_column (treeview, column);
+
+  renderer_phrase = gtk_cell_renderer_text_new ();
+  g_object_set ( renderer_phrase, "editable", FALSE, NULL);
+  g_signal_connect(renderer_phrase, "edited", (GCallback) on_phrase_cell_edited, NULL);
+  column = gtk_tree_view_column_new_with_attributes (_("PHRASE"),
+						     renderer_phrase,
+						     "text",PHRASE_COLUMN,
+						     NULL);
+  gtk_tree_view_append_column (treeview, column);
+
+  renderer_pinyin = gtk_cell_renderer_text_new ();
+  g_object_set ( renderer_pinyin, "editable", FALSE, NULL);
+  g_signal_connect(renderer_pinyin, "edited", (GCallback) on_pinyin_cell_edited, NULL);  
+  column = gtk_tree_view_column_new_with_attributes (_("PINYIN"),
+						     renderer_pinyin,
+						     "text",
+						     PINYIN_COLUMN,
+						     NULL);
+  gtk_tree_view_append_column (treeview, column); 
+}
+
+GtkWidget*
+create_BaseWindow (void)
+{
+  GtkWidget *window1;
+  GtkWidget *vbox1;
+  GtkWidget *menubar1;
+  GtkWidget *menuitem1;
+  GtkWidget *menuitem1_menu;
+  GtkWidget *separatormenuitem1;
+  GtkWidget *quit;
+  GtkWidget *menuitem2;
+  GtkWidget *menuitem4;
+  GtkWidget *menuitem2_menu;
+  GtkWidget *menuitem4_menu;
+  GtkWidget *about1;
+  GtkWidget *new_row;
+  GtkWidget *scrolledwindow1;
+  GtkWidget *treeview_phrase;
+  GtkWidget *hbox1;
+  GtkWidget *button_quit;
+  GtkWidget *button_submit;
+  GtkAccelGroup *accel_group;
+  
+/* code by hand */  
+  GtkTreeModel *model;
+  GtkWidget *list_lib_row;  
+  GtkWidget *save_lib_row; 
+  GtkWidget *import_lib_row; 
+  GtkWidget *button_disable; 
+  GtkWidget *button_add; 
+/* end */
+
+  accel_group = gtk_accel_group_new ();
+
+  window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_size_request (window1, 400, 300);
+  gtk_window_set_title (GTK_WINDOW (window1), _("SCIM Pinyin - Add New Phrase"));
+
+  vbox1 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox1);
+  gtk_container_add (GTK_CONTAINER (window1), vbox1);
+
+  menubar1 = gtk_menu_bar_new ();
+  gtk_widget_show (menubar1);
+  gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
+
+  menuitem1 = gtk_menu_item_new_with_mnemonic (_("_Options"));
+  gtk_widget_show (menuitem1);
+  gtk_container_add (GTK_CONTAINER (menubar1), menuitem1);
+
+  menuitem1_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu);
+
+  separatormenuitem1 = gtk_separator_menu_item_new ();
+  gtk_widget_show (separatormenuitem1);
+  gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1);
+  gtk_widget_set_sensitive (separatormenuitem1, FALSE);
+
+  quit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
+  gtk_widget_show (quit);
+  gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit);
+
+  menuitem2 = gtk_menu_item_new_with_mnemonic (_("_Actions"));
+  gtk_widget_show (menuitem2);
+  gtk_container_add (GTK_CONTAINER (menubar1), menuitem2);
+
+/* qshen add by hand */  
+  menuitem2_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem2), menuitem2_menu);
+  
+  list_lib_row = gtk_menu_item_new_with_mnemonic (_("_List User Phrase Library"));
+  gtk_widget_show (list_lib_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), list_lib_row);
+  
+  save_lib_row = gtk_menu_item_new_with_mnemonic (_("_Save User Phrase Library"));
+  gtk_widget_show (save_lib_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), save_lib_row);
+  
+  import_lib_row = gtk_menu_item_new_with_mnemonic (_("_Import User Phrase Library"));
+  gtk_widget_show (import_lib_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), import_lib_row);
+  
+  add_phrase_row = gtk_menu_item_new_with_mnemonic (_("_Add New Phrases"));
+  gtk_widget_show (add_phrase_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), add_phrase_row);
+  
+  disable_phrase_row = gtk_menu_item_new_with_mnemonic (_("_Delete Phrase"));
+  gtk_widget_show (disable_phrase_row);
+  gtk_container_add (GTK_CONTAINER (menuitem2_menu), disable_phrase_row);      
+/* qshen end */
+
+  menuitem4 = gtk_menu_item_new_with_mnemonic (_("_Help"));
+  gtk_widget_show (menuitem4);
+  gtk_container_add (GTK_CONTAINER (menubar1), menuitem4);
+
+  menuitem4_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu);
+
+  about1 = gtk_menu_item_new_with_mnemonic (_("_About"));
+  gtk_widget_show (about1);
+  gtk_container_add (GTK_CONTAINER (menuitem4_menu), about1);
+
+  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolledwindow1);
+  gtk_box_pack_start (GTK_BOX (vbox1), scrolledwindow1, TRUE, TRUE, 0);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_SHADOW_IN);
+
+  treeview_phrase = gtk_tree_view_new ();
+  gtk_widget_show (treeview_phrase);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview_phrase);
+  
+/* code by hand */
+  tree_view = GTK_TREE_VIEW(treeview_phrase);
+  model = create_model ();
+  gtk_tree_view_set_model(GTK_TREE_VIEW(treeview_phrase),model);
+  g_object_unref (model);
+  add_columns (GTK_TREE_VIEW (treeview_phrase));
+  tree_model = model;
+/* end */
+
+  hbox1 = gtk_hbox_new (TRUE, 0);
+  gtk_widget_show (hbox1);
+  gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+  button_quit = gtk_button_new_with_mnemonic (_("Quit"));
+  gtk_widget_show (button_quit);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_quit, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_quit, 80, -1);
+
+  button_submit = gtk_button_new_with_mnemonic (_("Submit"));
+  //gtk_widget_show (button_submit);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_submit, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_submit, 80, -1);
+  submit_button = button_submit;
+ 
+  button_add = gtk_button_new_with_mnemonic (_("Add"));
+  gtk_widget_show (button_add);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_add, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_add, 80, -1); 
+  add_button = button_add; //qshen add
+  
+  button_disable = gtk_button_new_with_mnemonic (_("Delete"));
+  gtk_widget_show (button_disable);
+  gtk_box_pack_start (GTK_BOX (hbox1), button_disable, FALSE, FALSE, 0);
+  gtk_widget_set_size_request (button_disable, 80, -1);  
+  disable_button = button_disable;//qshen add
+
+  g_signal_connect ((gpointer) quit, "activate",
+                    G_CALLBACK (on_quit_activate),
+                    NULL);
+  g_signal_connect ((gpointer) list_lib_row, "activate",
+                    G_CALLBACK (on_list_user_phrase_library),
+                    NULL);
+  g_signal_connect ((gpointer) save_lib_row, "activate",
+                    G_CALLBACK (on_save_user_phrase_library),
+                    NULL);
+  g_signal_connect ((gpointer) import_lib_row, "activate",
+                    G_CALLBACK (on_import_user_phrase_library),
+                    NULL);
+  g_signal_connect ((gpointer) add_phrase_row, "activate",
+                    G_CALLBACK (on_button_add_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) disable_phrase_row, "activate",
+                    G_CALLBACK (on_button_disable_clicked),
+                    NULL);		    		    		    		    		    
+  g_signal_connect ((gpointer) about1, "activate",
+                    G_CALLBACK (on_about1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) button_quit, "clicked",
+                    G_CALLBACK (on_button_quit_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) button_submit, "clicked",
+                    G_CALLBACK (on_button_submit_clicked),
+                    NULL);
+/* code by hand */
+  g_signal_connect (G_OBJECT(window1), "destroy",
+                    G_CALLBACK (gtk_main_quit),
+		    NULL);
+  g_signal_connect ((gpointer) button_disable, "clicked",
+                    G_CALLBACK (on_button_disable_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) button_add, "clicked",
+                    G_CALLBACK (on_button_add_clicked),
+                    NULL);		    		    
+/* end */		    
+  gtk_window_add_accel_group (GTK_WINDOW (window1), accel_group);
+
+
+  return window1;
+}
+
+
+
+static void
+run (const String &display, const ConfigPointer &config)
+{
+    char **argv = new char * [4];
+    int    argc = 3;
+    
+    GtkTreeIter iter;    
+    GtkTreePath *path;
+    GtkTreeViewColumn* column;    
+
+    argv [0] = "smart-pinyin-imengine-helper";
+    argv [1] = "--display";
+    argv [2] = const_cast<char *> (display.c_str ());
+    argv [3] = 0;    
+    
+    std::cout << "in run()" <<endl;
+
+    setenv ("DISPLAY", display.c_str (), 1);
+
+    gtk_init (&argc, &argv);
+
+    helper_agent.signal_connect_exit (slot (slot_exit));
+    helper_agent.signal_connect_attach_input_context (slot (slot_attach_input_context));
+    helper_agent.signal_connect_detach_input_context (slot (slot_detach_input_context));
+    helper_agent.signal_connect_update_screen (slot (slot_update_screen));
+    helper_agent.signal_connect_update_spot_location (slot (slot_update_spot_location));
+    helper_agent.signal_connect_process_imengine_event (slot (slot_process_imengine_event));
+
+    
+    BaseWindow = create_BaseWindow ();
+    gtk_widget_show (BaseWindow);
+    
+    // open connection
+    int fd = helper_agent.open_connection (helper_info, display);
+    GIOChannel *ch = g_io_channel_unix_new (fd);
+
+    if (fd >= 0 && ch) {
+        g_io_add_watch (ch, G_IO_IN,
+                        helper_agent_input_handler,
+                        (gpointer) &helper_agent);
+        g_io_add_watch (ch, G_IO_ERR,
+                        helper_agent_input_handler,
+                        (gpointer) &helper_agent);
+        g_io_add_watch (ch, G_IO_HUP,
+                        helper_agent_input_handler,
+                        (gpointer) &helper_agent);
+    }
+    
+    Transaction send;
+    send.put_command (SCIM_TRANS_CMD_REQUEST);
+    send.put_command (SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB);
+    helper_agent.send_imengine_event (cur_ic, cur_uuid, send); 
+    
+    gtk_main ();
+    
+    // close connection
+    helper_agent.close_connection ();
+    fd = -1;
+}
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.h scim-pinyin-0.5.91/src/scim_pinyin_helper.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.h	1970-01-01 08:00:00.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.h	2006-06-27 09:52:06.000000000 +0800
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SCIM_PINYIN_HELPER_H__
+#define __SCIM_PINYIN_HELPER_H__
+
+#include <fstream.h>
+#include <iostream.h>
+#include <scim_trans_commands.h>
+#include "scim_pinyin_private.h"
+
+#define SCIM_PINYIN_HELPER_UUID "85e45f24-0a86-4507-a357-906c6cceea4b"
+
+#define SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE         SCIM_TRANS_CMD_USER_DEFINED + 100
+#define SCIM_PINYIN_TRANS_CMD_GET_PINYIN                SCIM_TRANS_CMD_USER_DEFINED + 101
+#define SCIM_PINYIN_TRANS_CMD_SEND_PINYIN               SCIM_TRANS_CMD_USER_DEFINED + 102
+#define SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED	SCIM_TRANS_CMD_USER_DEFINED + 103
+#define SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 104
+#define SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 105
+#define SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 106
+#define SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK  	SCIM_TRANS_CMD_USER_DEFINED + 107
+#define SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL	SCIM_TRANS_CMD_USER_DEFINED + 108
+#define SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB		SCIM_TRANS_CMD_USER_DEFINED + 109
+#define SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK	SCIM_TRANS_CMD_USER_DEFINED + 110
+#define SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL	SCIM_TRANS_CMD_USER_DEFINED + 111
+#define SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE		SCIM_TRANS_CMD_USER_DEFINED + 112
+#define SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK		SCIM_TRANS_CMD_USER_DEFINED + 113
+#define SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_FAIL	SCIM_TRANS_CMD_USER_DEFINED + 114
+#define SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK	SCIM_TRANS_CMD_USER_DEFINED + 115
+#define SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH	SCIM_TRANS_CMD_USER_DEFINED + 116
+#define SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH	SCIM_TRANS_CMD_USER_DEFINED + 117
+
+enum
+{
+   NUM_COLUMN,
+   PHRASE_COLUMN,
+   PINYIN_COLUMN,
+   N_COLUMNS
+};
+
+#endif /* __SCIM_PINYIN_HELPER_H__ */
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h	2006-06-27 09:52:06.000000000 +0800
@@ -63,6 +63,9 @@
 
 #define SCIM_CONFIG_IMENGINE_PINYIN_SHUANG_PIN                       "/IMEngine/Pinyin/ShuangPin"
 #define SCIM_CONFIG_IMENGINE_PINYIN_SHUANG_PIN_SCHEME                "/IMEngine/Pinyin/ShuangPinScheme"
+
+#define SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY               "/IMEngine/Pinyin/ShowWordProperty"  //qshen
+
 #endif
 /*
 vi:expandtab:ts=4:nowrap:ai
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-06-27 09:52:07.000000000 +0800
@@ -44,6 +44,7 @@
 #include "scim_pinyin_imengine.h"
 #include "scim_pinyin_smart_match.h"
 #include "scim_pinyin_imengine_config_keys.h"
+#include "scim_pinyin_helper.h"
 
 #define scim_module_init pinyin_LTX_scim_module_init
 #define scim_module_exit pinyin_LTX_scim_module_exit
@@ -54,6 +55,7 @@
 #define SCIM_PROP_STATUS                            "/IMEngine/Pinyin/Status"
 #define SCIM_PROP_LETTER                            "/IMEngine/Pinyin/Letter"
 #define SCIM_PROP_PUNCT                             "/IMEngine/Pinyin/Punct"
+#define SCIM_PROP_WORD                              "/IMEngine/Pinyin/Word" //qshen
 
 #define SCIM_PROP_PINYIN_SCHEME                     "/IMEngine/Pinyin/PinyinScheme"
 #define SCIM_PROP_PINYIN_SCHEME_QUAN_PIN            "/IMEngine/Pinyin/PinyinScheme/QuanPin"
@@ -92,6 +94,7 @@
 static Property _status_property   (SCIM_PROP_STATUS, "");
 static Property _letter_property   (SCIM_PROP_LETTER, "");
 static Property _punct_property    (SCIM_PROP_PUNCT, "");
+static Property _word_property     (SCIM_PROP_WORD, ""); //qshen 0217
 
 static Property _pinyin_scheme_property     (SCIM_PROP_PINYIN_SCHEME, "???");
 static Property _pinyin_quan_pin_property   (SCIM_PROP_PINYIN_SCHEME_QUAN_PIN,   "??????");
@@ -126,6 +129,8 @@
         _status_property.set_label ("???");
         _letter_property.set_icon (SCIM_HALF_LETTER_ICON);
         _punct_property.set_icon (SCIM_HALF_PUNCT_ICON);
+        _word_property.set_tip (_("The switch to invoke pinyin helper. Click to invoke it."));	//qshen	
+        _word_property.set_label ("???"); //qshen
 
         _scim_config = config;
         return 1;
@@ -153,7 +158,8 @@
       m_auto_combine_phrase (false),
       m_auto_fill_preedit (false),
       m_always_show_lookup (false),
-      m_show_all_keys (true),
+      m_show_all_keys (false),
+      m_show_word_property (false), //qshen
       m_user_data_binary (true),
       m_valid (false),
       m_shuang_pin (false),
@@ -204,6 +210,7 @@
     bool tone                = false;
     bool dynamic_adjust        = true;
     bool incomplete            = true;
+    bool show_word_property    = false;
 
     bool ambiguities [SCIM_PINYIN_AmbLast + 2] =
         { false,  false,  false,  false,
@@ -269,7 +276,12 @@
                             true);
         m_show_all_keys =
             m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_ALL_KEYS),
-                            true);
+                            false);
+			    
+        m_show_word_property =  //qshen
+            m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),
+                            false);
+			    				    
         m_user_data_binary =
             m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                             true);
@@ -692,6 +704,7 @@
       m_traditional (true),
       m_lookup_table_def_page_size (9),
       m_keys_caret (0),
+      m_helper_started (false), //qshen
       m_lookup_caret (0),
       m_iconv (encoding)
 {
@@ -890,6 +903,280 @@
     return false;
 }
 
+//qshen add 
+class __PinyinPhraseHelperFunc {
+
+    std::vector <String>  	   &m_phrase_pinyin_vec;
+    std::vector <WideString>   &m_phrase_string_vec;
+    
+public:
+	__PinyinPhraseHelperFunc ( std::vector <String> &pinyin_vec, std::vector <WideString> &string_vec) :  
+	   				m_phrase_pinyin_vec( pinyin_vec),
+					m_phrase_string_vec( string_vec ) {}
+	
+	void operator () (const PinyinPhrase & phrase) {
+		
+		String tmp_string;
+		
+		if (phrase.is_enable () && phrase.length()>= 2) {
+			tmp_string.clear();
+			
+			for (int i=0; i<phrase.length (); i++){
+				tmp_string +=  phrase.get_key (i).get_key_string() + " ";				
+			}
+			
+			m_phrase_pinyin_vec.push_back(  tmp_string );
+			m_phrase_string_vec.push_back(  phrase.get_phrase().get_content () );		
+		}
+	}
+};
+
+
+//qshen add
+void
+PinyinInstance::process_helper_event (const String &helper_uuid, const Transaction &trans)
+{
+    SCIM_DEBUG_IMENGINE (2) << "PinyinInstance : process_helper_event ()\n";
+   
+    TransactionReader reader (trans);
+    Transaction       send_trans;
+    
+    int cmd, num;
+    bool first_black_space = false; 
+    String 	phrase, tmp_string, selected_dirname;
+    WideString  new_phrase, disable_phrase;
+    WideString::iterator iter1, iter2;
+    
+    std::vector <String>     	   pinyin_strings;
+    std::vector <WideString>	   phrase_received, pinyin_received;
+    std::vector <PinyinKeyVector>  keys_vector;
+            
+    PinyinKey key;
+    PinyinParsedKey pkey;
+    PinyinParsedKeyVector pkey_vec;
+    std::vector <PinyinParsedKeyVector> pkey_vec_vec;
+
+    std::vector <String>    	   phrase_pinyin_vec;
+    std::vector <WideString>	   phrase_string_vec;  
+    
+    String pinyin_lib_bakname("/phrase_lib.bak");   
+    String pinyin_phrase_lib_bakname("/pinyin_phrase_lib.bak");
+    String pinyin_phrase_index_bakname("/pinyin_phrase_index.bak"); 
+    
+    if (helper_uuid != SCIM_PINYIN_HELPER_UUID)
+        return;
+
+    if (reader.get_command (cmd) && cmd == SCIM_TRANS_CMD_REQUEST &&
+        reader.get_command (cmd)) {
+        if (cmd == SCIM_TRANS_CMD_START_HELPER) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_TRANS_CMD_START_HELPER\n";
+            m_helper_started = true;
+	   
+	        if (m_focused) {
+                send_trans.clear ();
+                send_trans.put_command (SCIM_TRANS_CMD_REQUEST);
+                send_trans.put_command (SCIM_TRANS_CMD_FOCUS_IN);
+                send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+                SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_TRANS_CMD_FOCUS_IN\n";
+	        }
+        }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_SHOW_USER_LIB\n";	
+	   
+	        phrase_pinyin_vec.clear();
+	        phrase_string_vec.clear();
+	        __PinyinPhraseHelperFunc func( phrase_pinyin_vec, phrase_string_vec );
+	    
+	        m_user_phrase_lib->for_each_phrase( func );
+	    
+	        //SCIM_DEBUG_IMENGINE (2)  << "phrase_string_vec.size()=" <<  phrase_string_vec.size() << " phrase_pinyin_vec.size()=" <<  phrase_pinyin_vec.size() <<endl;
+	        //for (int i=0 ; i < phrase_string_vec.size(); i++)
+		    //    SCIM_DEBUG_IMENGINE (2)  << "phrase_string_vec["<<i<<"]="<< utf8_wcstombs(phrase_string_vec[i]) << " phrase_pinyin_vec["<<i<<"]="<<phrase_pinyin_vec[i] <<endl;				
+	    
+            send_trans.clear ();
+            send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+            send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB);
+	        send_trans.put_data ( phrase_string_vec );
+	        send_trans.put_data ( phrase_pinyin_vec );
+            send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_USER_LIB\n";
+	    }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE\n";	
+	   
+	        if (reader.get_data (disable_phrase) ) {
+	            if (disable_phrase.length () >= 2) {
+                    Phrase phrase = m_user_phrase_lib->find (disable_phrase);
+                    if (phrase.valid () && phrase.is_enable ()) {
+                        phrase.disable ();
+		       
+            	        send_trans.clear ();
+            	        send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+            	        send_trans.put_command (SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK);
+                        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+		                SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_DISABLE_PHRASE_OK\n";     
+                    }
+                }	   
+	        }
+	    }	
+        if (cmd == SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB\n";
+
+	        if (reader.get_data (selected_dirname) ) {
+ 	            if ( m_pinyin_global->save_user_phrase_lib( (selected_dirname+pinyin_lib_bakname).c_str(),
+	       				       		                        (selected_dirname+pinyin_phrase_lib_bakname).c_str(),
+					       		                            (selected_dirname+pinyin_phrase_index_bakname).c_str(),
+					        	                            true) ) {
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_OK\n";	       
+	            } else {
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SAVE_USER_LIB_FAIL\n";	       
+		        }		   	   
+	        }	     
+	    }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB\n";
+
+	        if (reader.get_data (selected_dirname) ) {
+    	        if (m_pinyin_global->load_user_phrase_lib ( (selected_dirname + pinyin_lib_bakname).c_str (),
+                                                        (selected_dirname + pinyin_phrase_lib_bakname).c_str (),
+                                                        (selected_dirname + pinyin_phrase_index_bakname) .c_str ())) {
+
+		            send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans); 
+                    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_OK\n";
+                } else { 
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_IMPORT_USER_LIB_FAIL\n";	       
+		        }	              		   	   
+	        }
+	    }					
+        if (cmd == SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE\n";
+
+            if (reader.get_data (phrase_received) && reader.get_data (pinyin_received) ) {
+
+		        if( phrase_received.size() !=  pinyin_received.size() ) {
+                    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - phrase.size() != pinyin.size()\n";		
+		            return;
+		        }
+		    
+		        pkey_vec_vec.clear();
+		
+		        for (int i=0 ; i < pinyin_received.size(); i++){
+
+		            first_black_space = false;
+		            pkey_vec.clear();
+		    		    
+		            iter1 = pinyin_received[i].begin();
+		            iter2 = pinyin_received[i].begin();		    
+		    
+		            while(iter2 != pinyin_received[i].end()) {
+			            if( (*iter2) == ' ') {
+			                if( !first_black_space ) {
+			                    first_black_space = true;
+			    
+			                    tmp_string.clear();
+			    
+			                    for(; iter1 != iter2; ++iter1 ) 
+			                        tmp_string.push_back(*iter1);
+				
+		   		                key = PinyinKey ( m_pinyin_global->get_pinyin_validator (),
+		     			                            tmp_string.c_str() );	
+						  		
+				                pkey = PinyinParsedKey( key );
+				
+				                pkey_vec.push_back( pkey );
+					
+			                } else {
+			                    ++iter1;
+			                }	
+			            } else {
+			                if( first_black_space ) {
+			                    first_black_space = false; 
+				                ++iter1;
+			                }
+			            }
+ 		                ++iter2;
+		            }
+		            pkey_vec_vec.push_back( pkey_vec );
+		        }
+		
+		        for (int i=0 ; i < pkey_vec_vec.size(); i++){
+		            if( pkey_vec_vec[i].size() <= 0 )
+		                continue;
+		    
+		            add_new_phrase (phrase_received[i], pkey_vec_vec[i]);
+		        }
+		
+                send_trans.clear ();
+                send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                send_trans.put_command (SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK);
+           	    send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_COMMIT_NEW_PHRASE_OK\n";																				        
+	        }
+        }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_GET_PINYIN) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_GET_PINYIN\n";
+	   
+            if (reader.get_data (new_phrase)) {
+		
+		        if( new_phrase.length() == 0 )
+		            return;
+		
+		        num = m_pinyin_table->find_key_strings ( keys_vector, new_phrase );
+		        if( num == 0 ) {  // it means the new_phrase is not a right Chinese string.
+                    send_trans.clear ();
+                    send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                    send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED);
+           	        send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	        SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_PINYIN_FAILED\n";	
+		            return;
+		        }
+		    
+		        tmp_string.clear();	
+		        for (int i=0 ; i < keys_vector.size(); i++){		    
+
+		            for (int j=0; j < keys_vector[i].size(); j++)
+			            tmp_string +=  keys_vector[i][j].get_key_string() + " ";
+
+		            pinyin_strings.push_back( tmp_string );
+		            tmp_string.clear();
+		        }
+		
+                send_trans.clear ();
+                send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+                send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_PINYIN);
+	            send_trans.put_data ( pinyin_strings );
+           	    send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+           	    SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_PINYIN\n";
+	        }
+        }
+        if (cmd == SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH) {
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - received SCIM_PINYIN_TRANS_CMD_GET_MAX_USER_PHRASE_LENGTH\n";
+	   
+	        send_trans.clear ();
+            send_trans.put_command (SCIM_TRANS_CMD_REQUEST);	
+            send_trans.put_command (SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH);
+	        send_trans.put_data ( m_factory->m_max_user_phrase_length );
+            send_helper_event (SCIM_PINYIN_HELPER_UUID, send_trans);
+            SCIM_DEBUG_IMENGINE (2)  << "PinyinInstance : process_helper_event () - send SCIM_PINYIN_TRANS_CMD_SEND_MAX_USER_PHRASE_LENGTH\n";	
+	    } 
+    }        
+}//qshen end
+
 void
 PinyinInstance::select_candidate (unsigned int item)
 {
@@ -1039,6 +1326,8 @@
         m_full_width_punctuation [which] = !m_full_width_punctuation [which];
 
         refresh_punct_property ();
+    } else if (property == SCIM_PROP_WORD) { //qshen
+        refresh_word_property ();           //qshen
     } else if (property == SCIM_PROP_PINYIN_SCHEME_QUAN_PIN) {
         m_factory->m_shuang_pin = false;
         update_pinyin_scheme = true;
@@ -1142,13 +1431,16 @@
     proplist.push_back (_pinyin_quan_pin_property);
     proplist.push_back (_pinyin_sp_stone_property);
     proplist.push_back (_pinyin_sp_zrm_property);
-    //proplist.push_back (_pinyin_sp_ms_property);
-    //proplist.push_back (_pinyin_sp_ziguang_property);
+    proplist.push_back (_pinyin_sp_ms_property);
+    proplist.push_back (_pinyin_sp_ziguang_property);
     proplist.push_back (_pinyin_sp_abc_property);
     proplist.push_back (_pinyin_sp_liushi_property);
     proplist.push_back (_status_property);
     proplist.push_back (_letter_property);
     proplist.push_back (_punct_property);
+    
+    if( m_factory->m_show_word_property )
+        proplist.push_back (_word_property); //qshen
 
     register_properties (proplist);
     refresh_all_properties ();
@@ -1196,6 +1488,13 @@
     update_property (_punct_property);
 }
 
+//qshen add
+void
+PinyinInstance::refresh_word_property ()
+{
+   start_helper( SCIM_PINYIN_HELPER_UUID );
+}
+
 void
 PinyinInstance::refresh_pinyin_scheme_property ()
 {
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h scim-pinyin-0.5.91/src/scim_pinyin_imengine.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.h	2006-06-27 09:52:07.000000000 +0800
@@ -46,7 +46,9 @@
     bool               m_auto_fill_preedit;
     bool               m_always_show_lookup;
     bool               m_show_all_keys;
-
+    
+    bool	           m_show_word_property; //qshen
+    
     bool               m_user_data_binary;
 
     bool               m_valid;
@@ -127,6 +129,8 @@
     WideString           m_auto_combined_string;
 
     KeyEvent             m_prev_key;
+    
+    bool                 m_helper_started; //qshen
 
     NativeLookupTable    m_lookup_table;
 
@@ -156,6 +160,7 @@
     virtual ~PinyinInstance ();
 
     virtual bool process_key_event (const KeyEvent& key);
+    virtual void process_helper_event (const String &helper_uuid, const Transaction &trans); //qshen add
     virtual void move_preedit_caret (unsigned int pos);
     virtual void select_candidate (unsigned int item);
     virtual void update_lookup_table_page_size (unsigned int page_size);
@@ -201,6 +206,7 @@
     void refresh_status_property ();
     void refresh_letter_property ();
     void refresh_punct_property ();
+    void refresh_word_property (); //qshen
     void refresh_pinyin_scheme_property ();
 
     void calc_parsed_keys ();
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp	2006-06-27 09:52:08.000000000 +0800
@@ -102,12 +102,13 @@
 
 // Internal data declaration.
 static bool   __config_user_data_binary       = false;
+static bool   __config_pinyin_helper          = false;  //qshen
 
 static bool   __config_auto_combine_phrase    = true;
 static bool   __config_auto_fill_preedit      = true;
 static bool   __config_match_longer_phrase    = false;
 static bool   __config_always_show_lookup     = true;
-static bool   __config_show_all_keys          = true;
+static bool   __config_show_all_keys          = false;
 static bool   __config_dynamic_adjust         = true;
 
 static int    __config_max_user_phrase_length = 8;
@@ -301,6 +302,7 @@
 };
 
 static GtkWidget * __widget_user_data_binary       = 0;
+static GtkWidget * __widget_pinyin_helper          = 0;  //qshen
 
 static GtkWidget * __widget_auto_combine_phrase    = 0;
 static GtkWidget * __widget_auto_fill_preedit      = 0;
@@ -605,6 +607,12 @@
         gtk_widget_show (separator);
         gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 4);
 
+        // Pinyin helper -- qshen 
+        __widget_pinyin_helper = gtk_check_button_new_with_mnemonic (_("Show pinyin helper property in the tool bar"));
+        gtk_widget_show (__widget_pinyin_helper);
+        gtk_box_pack_start (GTK_BOX (vbox), __widget_pinyin_helper, FALSE, FALSE, 4);
+        gtk_container_set_border_width (GTK_CONTAINER (__widget_pinyin_helper), 2);		
+
         // Create the pinyin configurations page
         vbox = gtk_vbox_new (FALSE, 0);
         gtk_widget_show (vbox);
@@ -746,6 +754,11 @@
         g_signal_connect ((gpointer) __widget_user_data_binary, "toggled",
                           G_CALLBACK (__on_default_toggle_button_toggled),
                           &__config_user_data_binary);
+	//qshen
+        g_signal_connect ((gpointer) __widget_pinyin_helper, "toggled",
+                          G_CALLBACK (__on_default_toggle_button_toggled),
+                          &__config_pinyin_helper);
+			  			  
 
         g_signal_connect ((gpointer) __widget_tone, "toggled",
                           G_CALLBACK (__on_default_toggle_button_toggled),
@@ -777,6 +790,11 @@
                                 "the user pinyin and phrase data will be stored "
                                 "in binary format. "
                                 "This will increase the loading speed."), NULL);
+	//qshen add			
+        gtk_tooltips_set_tip (__widget_tooltips, __widget_pinyin_helper,
+                              _("If this option is checked, "
+                                "the tool bar will show the pinyin_helper property. "),
+                                NULL);
 
         gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_combine_phrase,
                               _("If this option is checked, "
@@ -980,6 +998,12 @@
             GTK_TOGGLE_BUTTON (__widget_user_data_binary),
             __config_user_data_binary);
     }
+    //qshen
+    if (__widget_pinyin_helper) {
+        gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON (__widget_pinyin_helper),
+            __config_pinyin_helper);
+    }    
 
     for (i = 0; __config_keyboards [i].key; ++ i) {
         if (__config_keyboards [i].entry) {
@@ -1044,6 +1068,9 @@
         __config_user_data_binary=
             config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                           __config_user_data_binary);
+        __config_pinyin_helper= //qshen
+            config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),
+                          __config_pinyin_helper);			  
         __config_max_user_phrase_length =
             config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_USER_PHRASE_LENGTH),
                           __config_max_user_phrase_length);
@@ -1107,6 +1134,8 @@
                       __config_dynamic_adjust);
         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                       __config_user_data_binary);
+        config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),  //qshen
+                      __config_pinyin_helper);		      
         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_USER_PHRASE_LENGTH),
                       __config_max_user_phrase_length);
         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_PREEDIT_LENGTH),
diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h scim-pinyin-0.5.91/src/scim_pinyin_phrase.h
--- scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h	2006-06-23 16:15:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.h	2006-06-27 09:52:08.000000000 +0800
@@ -371,6 +371,9 @@
 	}
 
 	void optimize_phrase_frequencies (uint32 max_freq = (SCIM_PHRASE_MAX_FREQUENCY >> 1));
+	
+	template<class T>
+	void for_each_phrase (T &op);	
 
 private:
 	Phrase get_phrase (uint32 phrase_offset) {
@@ -409,9 +412,6 @@
 	bool insert_phrase_into_index (const Phrase &phrase, const PinyinKeyVector &keys);
 
 	template<class T>
-	void for_each_phrase (T &op);
-
-	template<class T>
 	void for_each_phrase_level_one (uint32 len, T &op);
 
 	template<class T>



From fedora-cvs-commits at redhat.com  Tue Jun 27 02:56:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 22:56:54 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.cpp,1.1,NONE
Message-ID: <200606270256.k5R2usRT017122@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17049

Removed Files:
	scim-pinyin-helper.cpp 
Log Message:
got a mistake


--- scim-pinyin-helper.cpp DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 03:08:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 23:08:05 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server-1.0.1-setuid.patch, NONE,
	1.1
Message-ID: <200606270308.k5R385IV028314@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28300

Added Files:
	xorg-x11-server-1.0.1-setuid.patch 
Log Message:
add xorg-x11-server-1.0.1-setuid.patch

xorg-x11-server-1.0.1-setuid.patch:
 hw/xfree86/common/xf86Init.c                |    6 +++++-
 hw/xfree86/os-support/shared/libc_wrapper.c |    5 ++++-
 hw/xfree86/parser/write.c                   |    5 ++++-
 os/utils.c                                  |   18 ++++++++++++------
 4 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE xorg-x11-server-1.0.1-setuid.patch ---
Index: xserver/xorg/hw/xfree86/common/xf86Init.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.29
diff -u -u -r1.29 xf86Init.c
--- xserver/xorg/hw/xfree86/common/xf86Init.c	14 Dec 2005 20:11:16 -0000	1.29
+++ xserver/xorg/hw/xfree86/common/xf86Init.c	20 Jun 2006 07:58:44 -0000
@@ -1905,7 +1905,11 @@
           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
           break;
       case 0:  /* child */
-          setuid(getuid());
+	  if (setuid(getuid()) == -1) {
+	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
+			 strerror(errno));
+	      exit(255);
+	  }
           /* set stdin, stdout to the consoleFd */
           for (i = 0; i < 2; i++) {
             if (xf86Info.consoleFd != i) {
Index: xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v
retrieving revision 1.9
diff -u -u -r1.9 libc_wrapper.c
--- xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c	3 Jul 2005 08:53:48 -0000	1.9
+++ xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c	20 Jun 2006 07:58:45 -0000
@@ -1270,7 +1270,10 @@
 #ifndef SELF_CONTAINED_WRAPPER
 	xf86DisableIO();
 #endif
-        setuid(getuid());
+        if (setuid(getuid()) == -1) {
+		ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
+		exit(255);
+	}
 #if !defined(SELF_CONTAINED_WRAPPER)
         /* set stdin, stdout to the consoleFD, and leave stderr alone */
         for (i = 0; i < 2; i++)
Index: xserver/xorg/hw/xfree86/parser/write.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v
retrieving revision 1.3
diff -u -u -r1.3 write.c
--- xserver/xorg/hw/xfree86/parser/write.c	3 Jul 2005 07:01:37 -0000	1.3
+++ xserver/xorg/hw/xfree86/parser/write.c	20 Jun 2006 07:58:45 -0000
@@ -170,7 +170,10 @@
 					strerror(errno));
 			return 0;
 		case 0: /* child */
-			setuid(getuid());
+			if (setuid(getuid() == -1) 
+			    FatalError("xf86writeConfigFile(): "
+				"setuid failed(%s)\n", 
+				strerror(errno));
 			ret = doWriteConfigFile(filename, cptr);
 			exit(ret);
 			break;
Index: xserver/xorg/os/utils.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
retrieving revision 1.21
diff -u -u -r1.21 utils.c
--- xserver/xorg/os/utils.c	8 Nov 2005 06:33:30 -0000	1.21
+++ xserver/xorg/os/utils.c	20 Jun 2006 07:58:47 -0000
@@ -1718,8 +1718,10 @@
     case -1:	/* error */
 	p = -1;
     case 0:	/* child */
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) == -1)
+	    _exit(127);
+	if (setuid(getuid()) == -1)
+	    _exit(127);
 	execl("/bin/sh", "sh", "-c", command, (char *)NULL);
 	_exit(127);
     default:	/* parent */
@@ -1770,8 +1772,10 @@
 	xfree(cur);
 	return NULL;
     case 0:	/* child */
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) == -1)
+	    _exit(127);
+	if (setuid(getuid()) == -1)
+	    _exit(127);
 	if (*type == 'r') {
 	    if (pdes[1] != 1) {
 		/* stdout */
@@ -1845,8 +1849,10 @@
 	xfree(cur);
 	return NULL;
     case 0:	/* child */
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) == -1)
+	    _exit(127);
+	if (setuid(getuid()) == -1)
+	    _exit(127);
 	if (*type == 'r') {
 	    if (pdes[1] != 1) {
 		/* stdout */



From fedora-cvs-commits at redhat.com  Tue Jun 27 03:18:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 23:18:53 -0400
Subject: rpms/scim-qtimm/FC-5 README.FC5,NONE,1.1 scim-qtimm.spec,1.6,1.7
Message-ID: <200606270318.k5R3IrVa010012@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-qtimm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8352

Modified Files:
	scim-qtimm.spec 
Added Files:
	README.FC5 
Log Message:
- empty package when scim built with_libstdc_preview to avoid kde apps
  crashing (#196481)
- add README.FC5



--- NEW FILE README.FC5 ---
scim-qtimm doesn't build with libstdc++so7 and so has been
disabled for FC5 since the original build against libstdc++
causes KDE applications to crash.


Index: scim-qtimm.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-qtimm/FC-5/scim-qtimm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-qtimm.spec	11 Feb 2006 05:39:50 -0000	1.6
+++ scim-qtimm.spec	27 Jun 2006 03:18:45 -0000	1.7
@@ -1,13 +1,16 @@
-Name:           scim-qtimm
-Version:        0.9.4
-Release: 2%{?dist}.1.1
-Summary:        SCIM input method module for Qt
+%define with_libstdc_preview 1
+
+Name:		scim-qtimm
+Version:	0.9.4
+Release:	2.2.fc5
+Summary:	SCIM input method module for Qt
 
 License:	GPL
 Group:		System/Libraries
 URL:		http://www.scim-im.org/projects/scim_qtimm
 Source0:	%{name}-%{version}.tar.bz2
 Source1:	xinput-scim-qt
+Source2:	README.FC5
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	qt-devel, scim-devel
@@ -20,13 +23,21 @@
 %prep
 %setup -q
 
+
 %build
+%if %{with_libstdc_preview}
+cp -p %{SOURCE2} .
+%else
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure
 make %{?_smp_mflags}
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if !%{with_libstdc_preview}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # install xinput config file.
@@ -34,20 +45,34 @@
 install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim-qtimm
 
 %find_lang %{name}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{with_libstdc_preview}
+%files
+%else
 %files -f %{name}.lang
+%endif
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%if %{with_libstdc_preview}
+%doc README.FC5
+%else
 %{_sysconfdir}/X11/xinit/xinput.d/scim-qtimm
 %exclude %{_libdir}/qt-*/plugins/inputmethods/libqscim.la
 %{_libdir}/qt-*/plugins/inputmethods/libqscim.so
+%endif
 
 
 %changelog
+* Tue Jun 27 2006 Jens Petersen <petersen at redhat.com> - 0.9.4-2.2.fc5
+- empty package when scim built with_libstdc_preview to avoid kde apps
+  crashing (#196481)
+- add README.FC5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.4-2.1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 03:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 26 Jun 2006 23:41:10 -0400
Subject: rpms/kernel/devel/configs config-generic,1.203,1.204
Message-ID: <200606270341.k5R3fA6E021288@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv21234/configs

Modified Files:
	config-generic 
Log Message:
buildfix


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- config-generic	27 Jun 2006 00:39:24 -0000	1.203
+++ config-generic	27 Jun 2006 03:41:05 -0000	1.204
@@ -61,7 +61,8 @@
 CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+# FIXME: Was borked in .17git11 for non-acpi machines.
+# CONFIG_HOTPLUG_PCI_PCIE is not set
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:10:08 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.15,1.16
Message-ID: <200606270910.k5R9A81i019624@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19495

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add "rm -f po/zh_CN.gmo stamp-po" to prep section



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-pinyin.spec	27 Jun 2006 02:51:03 -0000	1.15
+++ scim-pinyin.spec	27 Jun 2006 09:10:05 -0000	1.16
@@ -30,6 +30,8 @@
 %patch1 -p1 -b .1-shuangpin
 %patch2 -p1 -b .2-showallkeys
 %patch3 -p1 -b .3-helper
+rm -f po/stamp-po
+rm -f po/zh_CN.gmo
 
 
 %build



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:15:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:15:19 -0400
Subject: rpms/vim/devel 7.0.023,NONE,1.1
Message-ID: <200606270915.k5R9FI7L020636@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20617

Added Files:
	7.0.023 
Log Message:
- patchlevel 23


--- NEW FILE 7.0.023 ---
To: vim-dev at vim.org
Subject: Patch 7.0.023
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.023
Problem:    Crash when doing spell completion in an empty line and pressing
	    CTRL-E.
Solution:   Check for a zero pointer. (James Vega)
	    Also handle a situation without a matching pattern better, report
	    "No matches" instead of remaining in undefined CTRL-X mode.  And
	    get out of CTRL-X mode when typing a letter.
Files:	    src/edit.c


*** ../vim-7.0.022/src/edit.c	Sat May 13 15:27:57 2006
--- src/edit.c	Thu Jun 22 16:44:01 2006
***************
*** 719,727 ****
  #ifdef FEAT_INS_EXPAND
  	/*
  	 * Special handling of keys while the popup menu is visible or wanted
! 	 * and the cursor is still in the completed word.
  	 */
! 	if (compl_started && pum_wanted() && curwin->w_cursor.col >= compl_col)
  	{
  	    /* BS: Delete one character from "compl_leader". */
  	    if ((c == K_BS || c == Ctrl_H)
--- 721,734 ----
  #ifdef FEAT_INS_EXPAND
  	/*
  	 * Special handling of keys while the popup menu is visible or wanted
! 	 * and the cursor is still in the completed word.  Only when there is
! 	 * a match, skip this when no matches were found.
  	 */
! 	if (compl_started
! 		&& pum_wanted()
! 		&& curwin->w_cursor.col >= compl_col
! 		&& (compl_shown_match == NULL
! 		    || compl_shown_match != compl_shown_match->cp_next))
  	{
  	    /* BS: Delete one character from "compl_leader". */
  	    if ((c == K_BS || c == Ctrl_H)
***************
*** 3393,3408 ****
  		    ptr = compl_leader;
  		else
  		    ptr = compl_orig_text;
! 		p = compl_orig_text;
! 		for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
! 		    ;
  #ifdef FEAT_MBYTE
! 		if (temp > 0)
! 		    temp -= (*mb_head_off)(compl_orig_text, p + temp);
  #endif
! 		for (p += temp; *p != NUL; mb_ptr_adv(p))
! 		    AppendCharToRedobuff(K_BS);
! 		AppendToRedobuffLit(ptr + temp, -1);
  	    }
  
  #ifdef FEAT_CINDENT
--- 3401,3421 ----
  		    ptr = compl_leader;
  		else
  		    ptr = compl_orig_text;
! 		if (compl_orig_text != NULL)
! 		{
! 		    p = compl_orig_text;
! 		    for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp];
! 								       ++temp)
! 			;
  #ifdef FEAT_MBYTE
! 		    if (temp > 0)
! 			temp -= (*mb_head_off)(compl_orig_text, p + temp);
  #endif
! 		    for (p += temp; *p != NUL; mb_ptr_adv(p))
! 			AppendCharToRedobuff(K_BS);
! 		}
! 		if (ptr != NULL)
! 		    AppendToRedobuffLit(ptr + temp, -1);
  	    }
  
  #ifdef FEAT_CINDENT
***************
*** 4650,4659 ****
  				     (int)STRLEN(compl_pattern), curs_col);
  	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
  		    || compl_xp.xp_context == EXPAND_NOTHING)
! 		return FAIL;
! 	    startcol = (int)(compl_xp.xp_pattern - compl_pattern);
! 	    compl_col = startcol;
! 	    compl_length = curs_col - startcol;
  	}
  	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
  	{
--- 4663,4680 ----
  				     (int)STRLEN(compl_pattern), curs_col);
  	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
  		    || compl_xp.xp_context == EXPAND_NOTHING)
! 	    {
! 		compl_col = curs_col;
! 		compl_length = 0;
! 		vim_free(compl_pattern);
! 		compl_pattern = NULL;
! 	    }
! 	    else
! 	    {
! 		startcol = (int)(compl_xp.xp_pattern - compl_pattern);
! 		compl_col = startcol;
! 		compl_length = curs_col - startcol;
! 	    }
  	}
  	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
  	{
***************
*** 4707,4717 ****
  	    else
  		compl_col = spell_word_start(startcol);
  	    if (compl_col >= (colnr_T)startcol)
! 		return FAIL;
! 	    spell_expand_check_cap(compl_col);
  	    /* Need to obtain "line" again, it may have become invalid. */
  	    line = ml_get(curwin->w_cursor.lnum);
- 	    compl_length = (int)curs_col - compl_col;
  	    compl_pattern = vim_strnsave(line + compl_col, compl_length);
  	    if (compl_pattern == NULL)
  #endif
--- 4728,4744 ----
  	    else
  		compl_col = spell_word_start(startcol);
  	    if (compl_col >= (colnr_T)startcol)
! 	    {
! 		compl_length = 0;
! 		compl_col = curs_col;
! 	    }
! 	    else
! 	    {
! 		spell_expand_check_cap(compl_col);
! 		compl_length = (int)curs_col - compl_col;
! 	    }
  	    /* Need to obtain "line" again, it may have become invalid. */
  	    line = ml_get(curwin->w_cursor.lnum);
  	    compl_pattern = vim_strnsave(line + compl_col, compl_length);
  	    if (compl_pattern == NULL)
  #endif
*** ../vim-7.0.022/src/version.c	Tue Jun 20 21:08:02 2006
--- src/version.c	Thu Jun 22 16:34:42 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     23,
  /**/

-- 
BEDEVERE: Look!  It's the old man from scene 24 - what's he Doing here?
ARTHUR:   He is the keeper of the Bridge.  He asks each traveler five
          questions ...
GALAHAD:  Three questions.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:15:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:15:23 -0400
Subject: rpms/vim/devel 7.0.024,NONE,1.1
Message-ID: <200606270915.k5R9FNJp020669@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20645

Added Files:
	7.0.024 
Log Message:
- patchlevel 24


--- NEW FILE 7.0.024 ---
To: vim-dev at vim.org
Subject: Patch 7.0.024
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.024
Problem:    It is possible to set arbitrary "v:" variables.
Solution:   Disallow setting "v:" variables that are not predefined.
Files:	    src/eval.c


*** ../vim-7.0.023/src/eval.c	Sat May 13 13:36:47 2006
--- src/eval.c	Thu Jun 22 17:27:51 2006
***************
*** 17759,17764 ****
--- 17763,17775 ----
      }
      else		    /* add a new variable */
      {
+ 	/* Can't add "v:" variable. */
+ 	if (ht == &vimvarht)
+ 	{
+ 	    EMSG2(_(e_illvar), name);
+ 	    return;
+ 	}
+ 
  	/* Make sure the variable name is valid. */
  	for (p = varname; *p != NUL; ++p)
  	    if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
*** ../vim-7.0.023/src/version.c	Thu Jun 22 16:48:43 2006
--- src/version.c	Thu Jun 22 17:30:59 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     24,
  /**/

-- 
ARTHUR:  No, hang on!  Just answer the five questions ...
GALAHAD: Three questions ...
ARTHUR:  Three questions ...  And we shall watch ... and pray.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:15:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:15:36 -0400
Subject: rpms/vim/devel 7.0.025,NONE,1.1
Message-ID: <200606270915.k5R9FavJ020736@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20711

Added Files:
	7.0.025 
Log Message:
- patchlevel 25


--- NEW FILE 7.0.025 ---
To: vim-dev at vim.org
Subject: Patch 7.0.025
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.025
Problem:    Crash when removing an element of a:000.  (Nikolai Weibull)
Solution:   Mark the a:000 list with VAR_FIXED.
Files:	    src/eval.c


*** ../vim-7.0.024/src/eval.c	Thu Jun 22 17:33:49 2006
--- src/eval.c	Thu Jun 22 17:56:50 2006
***************
*** 13250,13256 ****
  	if (argvars[2].v_type != VAR_UNKNOWN)
  	    EMSG2(_(e_toomanyarg), "remove()");
  	else if ((d = argvars[0].vval.v_dict) != NULL
! 		&& !tv_check_lock(d->dv_lock, (char_u *)"remove()"))
  	{
  	    key = get_tv_string_chk(&argvars[1]);
  	    if (key != NULL)
--- 13254,13260 ----
  	if (argvars[2].v_type != VAR_UNKNOWN)
  	    EMSG2(_(e_toomanyarg), "remove()");
  	else if ((d = argvars[0].vval.v_dict) != NULL
! 		&& !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
  	{
  	    key = get_tv_string_chk(&argvars[1]);
  	    if (key != NULL)
***************
*** 13270,13276 ****
      else if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listdictarg), "remove()");
      else if ((l = argvars[0].vval.v_list) != NULL
! 	    && !tv_check_lock(l->lv_lock, (char_u *)"remove()"))
      {
  	int	    error = FALSE;
  
--- 13274,13280 ----
      else if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listdictarg), "remove()");
      else if ((l = argvars[0].vval.v_list) != NULL
! 	    && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
      {
  	int	    error = FALSE;
  
***************
*** 19693,19698 ****
--- 19697,19703 ----
      v->di_tv.vval.v_list = &fc.l_varlist;
      vim_memset(&fc.l_varlist, 0, sizeof(list_T));
      fc.l_varlist.lv_refcount = 99999;
+     fc.l_varlist.lv_lock = VAR_FIXED;
  
      /*
       * Set a:firstline to "firstline" and a:lastline to "lastline".
*** ../vim-7.0.024/src/version.c	Thu Jun 22 17:33:49 2006
--- src/version.c	Thu Jun 22 17:59:17 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     25,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
GAWAIN:       Blue ...  No yelloooooww!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:15:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:15:52 -0400
Subject: rpms/vim/devel 7.0.026,NONE,1.1
Message-ID: <200606270915.k5R9FqCj020779@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20749

Added Files:
	7.0.026 
Log Message:
- patchlevel 26


--- NEW FILE 7.0.026 ---
To: vim-dev at vim.org
Subject: Patch 7.0.026
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.026
Problem:    Using libcall() may show an old error.
Solution:   Invoke dlerror() to clear a previous error. (Yukihiro Nakadaira)
Files:      src/os_unix.c


*** ../vim-7.0.025/src/os_unix.c	Wed May  3 00:01:30 2006
--- src/os_unix.c	Sat Jun 17 21:00:14 2006
***************
*** 5757,5764 ****
      int		retval_int = 0;
      int		success = FALSE;
  
!     /* Get a handle to the DLL module. */
  # if defined(USE_DLOPEN)
      hinstLib = dlopen((char *)libname, RTLD_LAZY
  #  ifdef RTLD_LOCAL
  	    | RTLD_LOCAL
--- 5758,5770 ----
      int		retval_int = 0;
      int		success = FALSE;
  
!     /*
!      * Get a handle to the DLL module.
!      */
  # if defined(USE_DLOPEN)
+     /* First clear any error, it's not cleared by the dlopen() call. */
+     (void)dlerror();
+ 
      hinstLib = dlopen((char *)libname, RTLD_LAZY
  #  ifdef RTLD_LOCAL
  	    | RTLD_LOCAL
*** ../vim-7.0.025/src/version.c	Thu Jun 22 18:02:06 2006
--- src/version.c	Thu Jun 22 18:05:10 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     26,
  /**/

-- 
BRIDGEKEEPER: What is your favorite editor?
GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:16:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:16:23 -0400
Subject: rpms/vim/devel 7.0.027,NONE,1.1
Message-ID: <200606270916.k5R9GN53021129@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20836

Added Files:
	7.0.027 
Log Message:
- patchlevel 27


--- NEW FILE 7.0.027 ---
To: vim-dev at vim.org
Subject: Patch 7.0.027 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.027 (extra)
Problem:    Win32: When compiled with SNIFF gvim may hang on exit.
Solution:   Translate and dispatch the WM_USER message. (Mathias Michaelis)
Files:	    src/gui_w48.c


*** ../vim-7.0.026/src/gui_w48.c	Thu Apr 27 01:52:16 2006
--- src/gui_w48.c	Sat Jun 17 13:23:26 2006
***************
*** 1664,1670 ****
--- 1664,1674 ----
  	/* request is handled in normal.c */
      }
      if (msg.message == WM_USER)
+     {
+ 	MyTranslateMessage(&msg)
+ 	DispatchMessage(&msg);
  	return;
+     }
  #endif
  
  #ifdef MSWIN_FIND_REPLACE
*** ../vim-7.0.026/src/version.c	Thu Jun 22 18:06:48 2006
--- src/version.c	Thu Jun 22 18:20:40 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     27,
  /**/

-- 
SIGFUN -- signature too funny (core dumped)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:16:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:16:52 -0400
Subject: rpms/vim/devel 7.0.028,NONE,1.1
Message-ID: <200606270916.k5R9GqrV022214@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21716

Added Files:
	7.0.028 
Log Message:
- patchlevel 28


--- NEW FILE 7.0.028 ---
To: vim-dev at vim.org
Subject: Patch 7.0.028 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.028 (extra)
Problem:    OS/2: Vim doesn't compile with gcc 3.2.1.
Solution:   Add argument to after_pathsep(), don't define vim_handle_signal(),
	    define HAVE_STDARG_H. (David Sanders)
Files:	    src/os_unix.c, src/vim.h, src/os_os2_cfg.h


*** ../vim-7.0.027/src/os_unix.c	Thu Jun 22 18:06:48 2006
--- src/os_unix.c	Sat Jun 17 21:00:14 2006
***************
*** 4971,4977 ****
  		    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
  		    {
  			STRCPY((*file)[*num_file], p);
! 			if (!after_pathsep((*file)[*num_file] + len))
  			{
  			    (*file)[*num_file][len] = psepc;
  			    (*file)[*num_file][len + 1] = NUL;
--- 4971,4978 ----
  		    if (((*file)[*num_file] = alloc(len + 2)) != NULL)
  		    {
  			STRCPY((*file)[*num_file], p);
! 			if (!after_pathsep((*file)[*num_file],
! 						    (*file)[*num_file] + len))
  			{
  			    (*file)[*num_file][len] = psepc;
  			    (*file)[*num_file][len + 1] = NUL;
*** ../vim-7.0.027/src/vim.h	Sun Apr 30 20:27:22 2006
--- src/vim.h	Sat Jun 17 20:59:31 2006
***************
*** 1983,1989 ****
  /* values for vim_handle_signal() that are not a signal */
  #define SIGNAL_BLOCK	-1
  #define SIGNAL_UNBLOCK  -2
! #if !defined(UNIX) && !defined(VMS)
  # define vim_handle_signal(x) 0
  #endif
  
--- 1983,1989 ----
  /* values for vim_handle_signal() that are not a signal */
  #define SIGNAL_BLOCK	-1
  #define SIGNAL_UNBLOCK  -2
! #if !defined(UNIX) && !defined(VMS) && !defined(OS2)
  # define vim_handle_signal(x) 0
  #endif
  
*** ../vim-7.0.027/src/os_os2_cfg.h	Sun Jun 13 18:47:02 2004
--- src/os_os2_cfg.h	Sat Jun 17 20:58:56 2006
***************
*** 183,188 ****
--- 183,191 ----
  /* Define if you have the ANSI C header files. */
  /* #undef STDC_HEADERS */
  
+ /* added by David Sanders */
+ #define HAVE_STDARG_H 1
+ 
  /* instead, we check a few STDC things ourselves */
  #define HAVE_STDLIB_H	1
  #undef HAVE_STRING_H	/* On EMX it is better to use strings.h */
*** ../vim-7.0.027/src/version.c	Thu Jun 22 19:34:23 2006
--- src/version.c	Thu Jun 22 19:41:06 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     28,
  /**/

-- 
BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
ARTHUR:       What do you mean?  An African or European swallow?
BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
   BRIDGEKEEPER is cast into the gorge.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:17:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:17:12 -0400
Subject: rpms/vim/devel 7.0.029,NONE,1.1
Message-ID: <200606270917.k5R9HCAE022778@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22563

Added Files:
	7.0.029 
Log Message:
- patchlevel 29


--- NEW FILE 7.0.029 ---
To: vim-dev at vim.org
Subject: Patch 7.0.029
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.029
Problem:    getchar() may not position the cursor after a space.
Solution:   Position the cursor explicitly.
Files:	    src/eval.c


*** ../vim-7.0.028/src/eval.c	Thu Jun 22 18:02:06 2006
--- src/eval.c	Thu Jun 22 21:00:00 2006
***************
*** 9792,9797 ****
--- 9792,9800 ----
      varnumber_T		n;
      int			error = FALSE;
  
+     /* Position the cursor.  Needed after a message that ends in a space. */
+     windgoto(msg_row, msg_col);
+ 
      ++no_mapping;
      ++allow_keys;
      if (argvars[0].v_type == VAR_UNKNOWN)
*** ../vim-7.0.028/src/version.c	Thu Jun 22 19:47:11 2006
--- src/version.c	Thu Jun 22 20:55:43 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     29,
  /**/

-- 
BEDEVERE: How do you know so much about swallows?
ARTHUR:   Well you have to know these things when you're a king, you know.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:17:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:17:38 -0400
Subject: rpms/vim/devel 7.0.030,NONE,1.1
Message-ID: <200606270917.k5R9Hc8c023400@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23225

Added Files:
	7.0.030 
Log Message:
- patchlevel 30


--- NEW FILE 7.0.030 ---
To: vim-dev at vim.org
Subject: Patch 7.0.030
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.030
Problem:    The ":compiler" command can't be used in a FileChangedRO event.
	    (Hari Krishna Dara)
Solution:   Add the CMDWIN flag to the ":compiler" command.
Files:	    src/ex_cmds.h


*** ../vim-7.0.029/src/ex_cmds.h	Fri Apr  7 23:40:07 2006
--- src/ex_cmds.h	Sun Jun 18 22:44:01 2006
***************
*** 262,268 ****
  EX(CMD_comclear,	"comclear",	ex_comclear,
  			TRLBAR|CMDWIN),
  EX(CMD_compiler,	"compiler",	ex_compiler,
! 			BANG|TRLBAR|WORD1),
  EX(CMD_continue,	"continue",	ex_continue,
  			TRLBAR|SBOXOK|CMDWIN),
  EX(CMD_confirm,		"confirm",	ex_wrongmodifier,
--- 262,268 ----
  EX(CMD_comclear,	"comclear",	ex_comclear,
  			TRLBAR|CMDWIN),
  EX(CMD_compiler,	"compiler",	ex_compiler,
! 			BANG|TRLBAR|WORD1|CMDWIN),
  EX(CMD_continue,	"continue",	ex_continue,
  			TRLBAR|SBOXOK|CMDWIN),
  EX(CMD_confirm,		"confirm",	ex_wrongmodifier,
*** ../vim-7.0.029/src/version.c	Thu Jun 22 21:01:19 2006
--- src/version.c	Thu Jun 22 21:08:12 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     30,
  /**/

-- 
Every person is responsible for the choices he makes.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:17:47 -0400
Subject: rpms/vim/devel 7.0.031,NONE,1.1
Message-ID: <200606270917.k5R9HlTR023954@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23772

Added Files:
	7.0.031 
Log Message:
- patchlevel 31


--- NEW FILE 7.0.031 ---
To: vim-dev at vim.org
Subject: Patch 7.0.031
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.031
Problem:    When deleting a buffer the buffer-local mappings for Select mode
	    remain.
Solution:   Add the Select mode bit to MAP_ALL_MODES. (Edwin Steiner)
Files:	    src/vim.h


*** ../vim-7.0.030/src/vim.h	Thu Jun 22 19:47:11 2006
--- src/vim.h	Fri Jun 23 16:29:03 2006
***************
*** 585,591 ****
  #define INSERT		0x10	/* Insert mode */
  #define LANGMAP		0x20	/* Language mapping, can be combined with
  				   INSERT and CMDLINE */
- #define MAP_ALL_MODES	0x3f	/* all mode bits used for mapping */
  
  #define REPLACE_FLAG	0x40	/* Replace mode flag */
  #define REPLACE		(REPLACE_FLAG + INSERT)
--- 585,590 ----
***************
*** 604,609 ****
--- 603,611 ----
  #define SHOWMATCH	(0x700 + INSERT) /* show matching paren */
  #define CONFIRM		0x800	/* ":confirm" prompt */
  #define SELECTMODE	0x1000	/* Select mode, only for mappings */
+ 
+ #define MAP_ALL_MODES	(0x3f | SELECTMODE)	/* all mode bits used for
+ 						 * mapping */
  
  /* directions */
  #define FORWARD			1
*** ../vim-7.0.030/src/version.c	Thu Jun 22 21:15:46 2006
--- src/version.c	Fri Jun 23 16:33:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     31,
  /**/

-- 
Why don't cannibals eat clowns?
Because they taste funny.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:18:00 -0400
Subject: rpms/vim/devel 7.0.032,NONE,1.1
Message-ID: <200606270918.k5R9I0qA024303@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24003

Added Files:
	7.0.032 
Log Message:
- patchlevel 32


--- NEW FILE 7.0.032 ---
To: vim-dev at vim.org
Subject: Patch 7.0.032 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.032 (extra, after 7.0.027)
Problem:    Missing semicolon.
Solution:   Add the semicolon.
Files:	    src/gui_w48.c


*** ../vim-7.0.031/src/gui_w48.c	Thu Jun 22 19:34:23 2006
--- src/gui_w48.c	Fri Jun 23 16:36:09 2006
***************
*** 1665,1671 ****
      }
      if (msg.message == WM_USER)
      {
! 	MyTranslateMessage(&msg)
  	DispatchMessage(&msg);
  	return;
      }
--- 1665,1671 ----
      }
      if (msg.message == WM_USER)
      {
! 	MyTranslateMessage(&msg);
  	DispatchMessage(&msg);
  	return;
      }
*** ../vim-7.0.031/src/version.c	Fri Jun 23 16:33:41 2006
--- src/version.c	Fri Jun 23 16:37:24 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     32,
  /**/

-- 
Snoring is prohibited unless all bedroom windows are closed and securely
locked.
		[real standing law in Massachusetts, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:18:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:18:20 -0400
Subject: rpms/vim/devel 7.0.033,NONE,1.1
Message-ID: <200606270918.k5R9IKFV024820@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24809

Added Files:
	7.0.033 
Log Message:
- patchlevel 33


--- NEW FILE 7.0.033 ---
To: vim-dev at vim.org
Subject: Patch 7.0.033
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.033
Problem:    When pasting text, with the menu or CTRL-V, autoindent is removed.
Solution:   Use "x<BS>" to avoid indent to be removed. (Benji Fisher)
Files:	    runtime/autoload/paste.vim


*** ../vim-7.0.032/runtime/autoload/paste.vim	Fri Apr 21 23:57:39 2006
--- runtime/autoload/paste.vim	Fri Jun 23 17:18:48 2006
***************
*** 1,6 ****
  " Vim support file to help with paste mappings and menus
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Apr 21
  
  " Define the string to use for items that are present both in Edit, Popup and
  " Toolbar menu.  Also used in mswin.vim and macmap.vim.
--- 1,6 ----
  " Vim support file to help with paste mappings and menus
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Jun 23
  
  " Define the string to use for items that are present both in Edit, Popup and
  " Toolbar menu.  Also used in mswin.vim and macmap.vim.
***************
*** 12,18 ****
  if has("virtualedit")
    let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
    let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
!   let paste#paste_cmd['i'] = '<Esc>' . paste#paste_cmd['n'] . 'gi'
  
    func! paste#Paste()
      let ove = &ve
--- 12,18 ----
  if has("virtualedit")
    let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
    let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
!   let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'
  
    func! paste#Paste()
      let ove = &ve
*** ../vim-7.0.032/src/version.c	Fri Jun 23 16:44:32 2006
--- src/version.c	Fri Jun 23 17:18:56 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     33,
  /**/

-- 
Yesterday, all my deadlines seemed so far away
now it looks as though it's freeze in four days
oh I believe in cvs..
    [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:18:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:18:32 -0400
Subject: rpms/vim/devel 7.0.034,NONE,1.1
Message-ID: <200606270918.k5R9IWUM025358@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25100

Added Files:
	7.0.034 
Log Message:
- patchlevel 34


--- NEW FILE 7.0.034 ---
To: vim-dev at vim.org
Subject: Patch 7.0.034
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.034
Problem:    After doing completion and typing more characters or using BS
	    repeating with "." didn't work properly. (Martin Stubenschrott)
Solution:   Don't put BS and other characters in the redo buffer right away,
	    do this when finishing completion.
Files:	    src/edit.c


*** ../vim-7.0.033/src/edit.c	Thu Jun 22 16:48:43 2006
--- src/edit.c	Fri Jun 23 17:50:47 2006
***************
*** 3020,3028 ****
      if ((int)(p - line) - (int)compl_col <= 0)
  	return K_BS;
  
-     /* For redo we need to repeat this backspace. */
-     AppendCharToRedobuff(K_BS);
- 
      /* Deleted more than what was used to find matches or didn't finish
       * finding all matches: need to look for matches all over again. */
      if (curwin->w_cursor.col <= compl_col + compl_length
--- 3020,3025 ----
***************
*** 3121,3130 ****
      else
  #endif
  	ins_char(c);
- 
-     /* For redo we need to count this character so that the number of
-      * backspaces is correct. */
-     AppendCharToRedobuff(c);
  
      /* If we didn't complete finding matches we must search again. */
      if (compl_was_interrupted)
--- 3118,3123 ----
*** ../vim-7.0.033/src/version.c	Fri Jun 23 17:26:02 2006
--- src/version.c	Fri Jun 23 17:59:04 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     34,
  /**/

-- 
A parent can be arrested if his child cannot hold back a burp during a church
service.
		[real standing law in Nebraska, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:18:50 -0400
Subject: rpms/vim/devel 7.0.035,NONE,1.1
Message-ID: <200606270918.k5R9Ios8025775@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25571

Added Files:
	7.0.035 
Log Message:
- patchlevel 35


--- NEW FILE 7.0.035 ---
To: vim-dev at vim.org
Subject: Patch 7.0.035
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.035
Problem:    Insert mode completion works when typed but not when replayed from
	    a register. (Hari Krishna Dara)
	    Also: Mappings for Insert mode completion don't always work.
Solution:   When finding a non-completion key in the input don't interrupt
	    completion when it wasn't typed.
	    Do use mappings when checking for typeahead while still finding
	    completions.  Avoids that completion is interrupted too soon.
	    Use "compl_pending" in a different way.
Files:	    src/edit.c


*** ../vim-7.0.034/src/edit.c	Fri Jun 23 17:59:26 2006
--- src/edit.c	Fri Jun 23 21:32:42 2006
***************
*** 4166,4173 ****
      {
  	if (compl_shows_dir == FORWARD && compl_shown_match->cp_next != NULL)
  	{
- 	    if (compl_pending != 0)
- 		--compl_pending;
  	    compl_shown_match = compl_shown_match->cp_next;
  	    found_end = (compl_first_match != NULL
  			   && (compl_shown_match->cp_next == compl_first_match
--- 4166,4171 ----
***************
*** 4176,4189 ****
  	else if (compl_shows_dir == BACKWARD
  					&& compl_shown_match->cp_prev != NULL)
  	{
- 	    if (compl_pending != 0)
- 		++compl_pending;
  	    found_end = (compl_shown_match == compl_first_match);
  	    compl_shown_match = compl_shown_match->cp_prev;
  	    found_end |= (compl_shown_match == compl_first_match);
  	}
  	else
  	{
  	    if (advance)
  	    {
  		if (compl_shows_dir == BACKWARD)
--- 4174,4197 ----
  	else if (compl_shows_dir == BACKWARD
  					&& compl_shown_match->cp_prev != NULL)
  	{
  	    found_end = (compl_shown_match == compl_first_match);
  	    compl_shown_match = compl_shown_match->cp_prev;
  	    found_end |= (compl_shown_match == compl_first_match);
  	}
  	else
  	{
+ 	    if (!allow_get_expansion)
+ 	    {
+ 		if (advance)
+ 		{
+ 		    if (compl_shows_dir == BACKWARD)
+ 			compl_pending -= todo + 1;
+ 		    else
+ 			compl_pending += todo + 1;
+ 		}
+ 		return -1;
+ 	    }
+ 
  	    if (advance)
  	    {
  		if (compl_shows_dir == BACKWARD)
***************
*** 4191,4204 ****
  		else
  		    ++compl_pending;
  	    }
- 	    if (!allow_get_expansion)
- 		return -1;
  
  	    /* Find matches. */
  	    num_matches = ins_compl_get_exp(&compl_startpos);
! 	    if (compl_pending != 0 && compl_direction == compl_shows_dir
  								   && advance)
! 		compl_shown_match = compl_curr_match;
  	    found_end = FALSE;
  	}
  	if ((compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0
--- 4199,4225 ----
  		else
  		    ++compl_pending;
  	    }
  
  	    /* Find matches. */
  	    num_matches = ins_compl_get_exp(&compl_startpos);
! 
! 	    /* handle any pending completions */
! 	    while (compl_pending != 0 && compl_direction == compl_shows_dir
  								   && advance)
! 	    {
! 		if (compl_pending > 0 && compl_shown_match->cp_next != NULL)
! 		{
! 		    compl_shown_match = compl_shown_match->cp_next;
! 		    --compl_pending;
! 		}
! 		if (compl_pending < 0 && compl_shown_match->cp_prev != NULL)
! 		{
! 		    compl_shown_match = compl_shown_match->cp_prev;
! 		    ++compl_pending;
! 		}
! 		else
! 		    break;
! 	    }
  	    found_end = FALSE;
  	}
  	if ((compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0
***************
*** 4307,4315 ****
  	return;
      count = 0;
  
!     ++no_mapping;
      c = vpeekc_any();
-     --no_mapping;
      if (c != NUL)
      {
  	if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
--- 4328,4336 ----
  	return;
      count = 0;
  
!     /* Check for a typed key.  Do use mappings, otherwise vim_is_ctrl_x_key()
!      * can't do its work correctly. */
      c = vpeekc_any();
      if (c != NUL)
      {
  	if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
***************
*** 4319,4330 ****
  	    (void)ins_compl_next(FALSE, ins_compl_key2count(c),
  						    c != K_UP && c != K_DOWN);
  	}
! 	else if (c != Ctrl_R)
! 	    compl_interrupted = TRUE;
      }
      if (compl_pending != 0 && !got_int)
! 	(void)ins_compl_next(FALSE, compl_pending > 0
! 				      ? compl_pending : -compl_pending, TRUE);
  }
  
  /*
--- 4340,4366 ----
  	    (void)ins_compl_next(FALSE, ins_compl_key2count(c),
  						    c != K_UP && c != K_DOWN);
  	}
! 	else
! 	{
! 	    /* Need to get the character to have KeyTyped set.  We'll put it
! 	     * back with vungetc() below. */
! 	    c = safe_vgetc();
! 
! 	    /* Don't interrupt completion when the character wasn't typed,
! 	     * e.g., when doing @q to replay keys. */
! 	    if (c != Ctrl_R && KeyTyped)
! 		compl_interrupted = TRUE;
! 
! 	    vungetc(c);
! 	}
      }
      if (compl_pending != 0 && !got_int)
!     {
! 	int todo = compl_pending > 0 ? compl_pending : -compl_pending;
! 
! 	compl_pending = 0;
! 	(void)ins_compl_next(FALSE, todo, TRUE);
!     }
  }
  
  /*
*** ../vim-7.0.034/src/version.c	Fri Jun 23 17:59:26 2006
--- src/version.c	Fri Jun 23 21:35:39 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     35,
  /**/

-- 
So when I saw the post to comp.editors, I rushed over to the FTP site to
grab it.  So I yank apart the tarball, light x candles, where x= the
vim version multiplied by the md5sum of the source divided by the MAC of
my NIC (8A3FA78155A8A1D346C3C4A), put on black robes, dim the lights,
wave a dead chicken over the hard drive, and summon the power of GNU GCC
with the magic words "make config ; make!".
		[Jason Spence, compiling Vim 5.0]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:24:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:24:16 -0400
Subject: rpms/vim/devel README.patches,1.49,1.50
Message-ID: <200606270924.k5R9OGac005394@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5362

Modified Files:
	README.patches 
Log Message:
- patchlevel 35


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- README.patches	20 Jun 2006 21:20:46 -0000	1.49
+++ README.patches	27 Jun 2006 09:24:13 -0000	1.50
@@ -47,3 +47,16 @@
   1470  7.0.020  GUI: crash when using 'mousefocus'
   4240  7.0.021  crash when using "\\[" and "\\]" in 'errorformat
   5471  7.0.022  Ruby: buffer.append() could append to the wrong buffer
+  5351  7.0.023  crash after Insert mode completion without matches
+  1619  7.0.024  it is possible to set arbitrary v: variables
+  2606  7.0.025  crash when deleting an item from a:000
+  1800  7.0.026  Unix: when using libcall() and old error may be shown
+  1344  7.0.027  (extra) Win32: hang on exit when compiled with SNiFF+
+  3014  7.0.028  (extra) OS/2: compilation problem
+  1494  7.0.029  cursor position may be wrong when using getchar()
+  1664  7.0.030  the ":compiler" command can't be used in a FileChangedRO event
+  1808  7.0.031  after deleting a buffer its Select mode mappings remain
+  1424  7.0.032  (extra, after 7.0.027) missing semicolon
+  2431  7.0.033  pasting after autoindent removes the indent
+  2042  7.0.034  repeating completion was wrong after typing text or using BS
+  5905  7.0.035  repeating Insert mode completion doesn't work properly



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:24:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:24:49 -0400
Subject: rpms/vim/devel vim.spec,1.125,1.126
Message-ID: <200606270924.k5R9OnqN005599@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5567

Modified Files:
	vim.spec 
Log Message:
- patchlevel 35


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- vim.spec	21 Jun 2006 10:59:35 -0000	1.125
+++ vim.spec	27 Jun 2006 09:24:46 -0000	1.126
@@ -24,12 +24,12 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 022
+%define patchlevel 035
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -76,6 +76,19 @@
 Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
 Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
 Patch022: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.022
+Patch023: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.023
+Patch024: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.024
+Patch025: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.025
+Patch026: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.026
+Patch027: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.027
+Patch028: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.028
+Patch029: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.029
+Patch030: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.030
+Patch031: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.031
+Patch032: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.032
+Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
+Patch034: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.034
+Patch035: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.035
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -229,6 +242,22 @@
 %patch020 -p0
 %patch021 -p0
 %patch022 -p0
+%patch023 -p0
+%patch024 -p0
+%patch025 -p0
+%patch026 -p0
+# Win32
+#patch027 -p0
+# OS/2
+#patch028 -p0
+%patch029 -p0
+%patch030 -p0
+%patch031 -p0
+# Win32
+#patch032 -p0
+%patch033 -p0
+%patch034 -p0
+%patch035 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -565,6 +594,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jun 27 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-1
+- patchlevel 35
+
 * Wed Jun 21 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-2
 - add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:33:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:33:59 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta5-mapclass-update.patch, NONE,
	1.1 autofs-5.0.0_beta5-misc-fixes.patch, NONE,
	1.1 autofs-5.0.0_beta5-override-system-macros.patch, NONE,
	1.1 autofs.spec, 1.113, 1.114
Message-ID: <200606270933.k5R9Xxm8008138@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8124

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta5-mapclass-update.patch 
	autofs-5.0.0_beta5-misc-fixes.patch 
	autofs-5.0.0_beta5-override-system-macros.patch 
Log Message:
* Tue Jun 27 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-5
- allow global macro defines to override system macros.
- correct spelling error in default config files missed by previous update.
- misc correctness and a memory leak fix.


autofs-5.0.0_beta5-mapclass-update.patch:
 gentoo/net-fs/autofs/files/autofs.conf |    6 +++---
 redhat/autofs.sysconfig.in             |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-mapclass-update.patch ---
diff --git a/gentoo/net-fs/autofs/files/autofs.conf b/gentoo/net-fs/autofs/files/autofs.conf
index d8648e5..836a4a1 100644
--- a/gentoo/net-fs/autofs/files/autofs.conf
+++ b/gentoo/net-fs/autofs/files/autofs.conf
@@ -21,7 +21,7 @@ # Define the default LDAP schema to use 
 #
 # System default
 #
-#DEFAULT_MAP_OBJECT_CALSS="nisMap"
+#DEFAULT_MAP_OBJECT_CLASS="nisMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="nisObject"
 #DEFAULT_MAP_ATTRIBUTE="nisMapName"
 #DEFAULT_ENTRY_ATTRIBUTE="cn"
@@ -29,13 +29,13 @@ #DEFAULT_VALUE_ATTRIBUTE="nisMapEntry"
 #
 # Other common LDAP nameing
 #
-#DEFAULT_MAP_OBJECT_CALSS="automountMap"
+#DEFAULT_MAP_OBJECT_CLASS="automountMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="automount"
 #DEFAULT_MAP_ATTRIBUTE="ou"
 #DEFAULT_ENTRY_ATTRIBUTE="cn"
 #DEFAULT_VALUE_ATTRIBUTE="automountInformation"
 #
-#DEFAULT_MAP_OBJECT_CALSS="automountMap"
+#DEFAULT_MAP_OBJECT_CLASS="automountMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="automount"
 #DEFAULT_MAP_ATTRIBUTE="automountMapName"
 #DEFAULT_ENTRY_ATTRIBUTE="automountKey"
diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
index 50ccb6e..b6dfb09 100644
--- a/redhat/autofs.sysconfig.in
+++ b/redhat/autofs.sysconfig.in
@@ -21,7 +21,7 @@ # Define the default LDAP schema to use 
 #
 # System default
 #
-#DEFAULT_MAP_OBJECT_CALSS="nisMap"
+#DEFAULT_MAP_OBJECT_CLASS="nisMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="nisObject"
 #DEFAULT_MAP_ATTRIBUTE="nisMapName"
 #DEFAULT_ENTRY_ATTRIBUTE="cn"
@@ -29,13 +29,13 @@ #DEFAULT_VALUE_ATTRIBUTE="nisMapEntry"
 #
 # Other common LDAP nameing
 #
-#DEFAULT_MAP_OBJECT_CALSS="automountMap"
+#DEFAULT_MAP_OBJECT_CLASS="automountMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="automount"
 #DEFAULT_MAP_ATTRIBUTE="ou"
 #DEFAULT_ENTRY_ATTRIBUTE="cn"
 #DEFAULT_VALUE_ATTRIBUTE="automountInformation"
 #
-#DEFAULT_MAP_OBJECT_CALSS="automountMap"
+#DEFAULT_MAP_OBJECT_CLASS="automountMap"
 #DEFAULT_ENTRY_OBJECT_CLASS="automount"
 #DEFAULT_MAP_ATTRIBUTE="automountMapName"
 #DEFAULT_ENTRY_ATTRIBUTE="automountKey"

autofs-5.0.0_beta5-misc-fixes.patch:
 automount.c |   12 +++---------
 lookup.c    |    2 ++
 spawn.c     |    6 ++++--
 3 files changed, 9 insertions(+), 11 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-misc-fixes.patch ---
diff --git a/daemon/automount.c b/daemon/automount.c
index aeece1b..38940c7 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1637,15 +1637,9 @@ #endif
 
 	become_daemon(foreground);
 
-	if (argc == 0) {
-		const char *name;
-
-		name = defaults_get_master_map();
-		if (!name)
-			master = master_new(NULL, timeout, ghost);
-		else
-			master = master_new(name, timeout, ghost);
-	} else
+	if (argc == 0)
+		master = master_new(NULL, timeout, ghost);
+	else
 		master = master_new(argv[0], timeout, ghost);
 
 	if (!master) {
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 4db7cef..dda27f8 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -189,6 +189,8 @@ int lookup_nss_read_master(struct master
 
 	result = nsswitch_parse(&nsslist);
 	if (result) {
+		if (!list_empty(&nsslist))
+			free_sources(&nsslist);
 		error(LOGOPT_ANY, "can't to read name service switch config.");
 		return 0;
 	}
diff --git a/daemon/spawn.c b/daemon/spawn.c
index 8195820..b3fd9de 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -229,12 +229,14 @@ void reset_signals(void)
 	sa.sa_flags = 0;
 
 	for (i = 1; i < NSIG; i++)
-		sigaction(i, &sa, NULL);
+		if (i != SIGKILL && i != SIGSTOP)
+			sigaction(i, &sa, NULL);
 
 	sa.sa_handler = SIG_DFL;
 
 	for (i = 1; i < NSIG; i++)
-		sigaction(i, &sa, NULL);
+		if (i != SIGKILL && i != SIGSTOP)
+			sigaction(i, &sa, NULL);
 
 	/* Ignore the user signals that may be sent so that we
 	 *  don't terminate execed program by mistake */

autofs-5.0.0_beta5-override-system-macros.patch:
 CHANGELOG    |    1 +
 lib/macros.c |    9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE autofs-5.0.0_beta5-override-system-macros.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index ced35cc..a1143ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - fix mistake in parsing old style LDAP specs.
 - update LDAP so that new query methos also works for old
   syntax.
+- allow global macro defines to override system macros.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/lib/macros.c b/lib/macros.c
index a0d36b2..9453bfe 100644
--- a/lib/macros.c
+++ b/lib/macros.c
@@ -115,7 +115,7 @@ int macro_global_addvar(const char *str,
 		sv = sv->next;
 	}
 
-	if (sv) {
+	if (sv && !sv->readonly) {
 		char *this = realloc(sv->val, strlen(value) + 1);
 		if (!this)
 			goto done;
@@ -191,9 +191,6 @@ macro_addvar(struct substvar *table, con
 	struct substvar *lv = table;
 	int status;
 
-	if (macro_is_systemvar(str, len))
-		return table;
-
 	status = pthread_mutex_lock(&table_mutex);
 	if (status)
 		fatal(status);
@@ -239,6 +236,7 @@ macro_addvar(struct substvar *table, con
 		}
 		new->def = def;
 		new->val = val;
+		new->readonly = 0;
 		new->next = table;
 		lv = new;
 	}
@@ -295,9 +293,6 @@ macro_removevar(struct substvar *table, 
 	struct substvar *last = NULL;
 	int status;
 
-	if (macro_is_systemvar(str, len))
-		return table;
-
 	status = pthread_mutex_lock(&table_mutex);
 	if (status)
 		fatal(status);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- autofs.spec	26 Jun 2006 12:53:19 -0000	1.113
+++ autofs.spec	27 Jun 2006 09:33:56 -0000	1.114
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta5
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -22,6 +22,9 @@
 Patch9: autofs-5.0.0_beta5-parse-old-style-dn.patch
 Patch10: autofs-5.0.0_beta5-get-dn-update.patch
 Patch11: autofs-5.0.0_beta5-compile-warnings.patch
+Patch12: autofs-5.0.0_beta5-override-system-macros.patch
+Patch13: autofs-5.0.0_beta5-mapclass-update.patch
+Patch14: autofs-5.0.0_beta5-misc-fixes.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -71,6 +74,9 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -127,6 +133,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jun 27 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-5
+- allow global macro defines to override system macros.
+- correct spelling error in default config files missed by
+  previous update.
+- misc correctness and a memory leak fix.
+
 * Mon Jun 26 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-4
 - correct spelling error in default config.
 - fix default auth config not being installed.



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:44:09 -0400
Subject: rpms/nmap/devel .cvsignore, 1.15, 1.16 nmap.spec, 1.30, 1.31 sources,
	1.15, 1.16
Message-ID: <200606270944.k5R9i94E019017@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/nmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19004

Modified Files:
	.cvsignore nmap.spec sources 
Log Message:
- version 4.11


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 May 2006 12:44:55 -0000	1.15
+++ .cvsignore	27 Jun 2006 09:44:04 -0000	1.16
@@ -1 +1 @@
-nmap-4.03.tar.bz2
+nmap-4.11.tar.bz2


Index: nmap.spec
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nmap.spec	17 May 2006 12:03:06 -0000	1.30
+++ nmap.spec	27 Jun 2006 09:44:04 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 4.03
-Release: 2
+Version: 4.11
+Release: 1
 License: GPL
 Group: Applications/System
 Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Tue Jun 27 2006 Harald Hoyer <harald at redhat.com> - 2:4.11-1
+- version 4.11
+
 * Wed May 17 2006 Harald Hoyer <harald at redhat.de> 4.03-2
 - added more build requirements (bug #191932)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 May 2006 12:44:55 -0000	1.15
+++ sources	27 Jun 2006 09:44:04 -0000	1.16
@@ -1 +1 @@
-d2b841e97d81d0fac20d18cbeddfa54a  nmap-4.03.tar.bz2
+69bdaa9995f32247b5da7c6b6c41df9b  nmap-4.11.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 27 09:51:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 05:51:19 -0400
Subject: rpms/autoconf/devel autoconf-2.60-intrinsic.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 autoconf.spec, 1.21, 1.22 sources, 1.6, 1.7
Message-ID: <200606270951.k5R9pJus001325@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1297

Modified Files:
	.cvsignore autoconf.spec sources 
Added Files:
	autoconf-2.60-intrinsic.patch 
Log Message:
- Try Autoconf 2.60

autoconf-2.60-intrinsic.patch:
 libs.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autoconf-2.60-intrinsic.patch ---
2006-06-26  Stepan Kasal  <kasal at ucw.cz>

	* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Use -lX11, not
	-lXt in LIBS; this was due since this change:

	2005-09-18  Paul Eggert  <eggert at cs.ucla.edu>
	* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Look for X11/Xlib.h
	and XrmInitialize rather than X11/Intrinsic.h and XtMalloc
	(which belong to Xt, not X itself).  See Debian bug 327655.

Index: lib/autoconf/libs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v
retrieving revision 1.17
diff -u -r1.17 libs.m4
--- lib/autoconf/libs.m4	26 May 2006 22:29:50 -0000	1.17
+++ lib/autoconf/libs.m4	26 Jun 2006 18:15:54 -0000
@@ -288,7 +288,7 @@
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
 				  [XrmInitialize ()])],
 		 [LIBS=$ac_save_LIBS


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 03:21:20 -0000	1.6
+++ .cvsignore	27 Jun 2006 09:51:17 -0000	1.7
@@ -1 +1 @@
-autoconf-2.59.tar.bz2
+autoconf-2.60.tar.bz2


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- autoconf.spec	16 May 2006 15:10:28 -0000	1.21
+++ autoconf.spec	27 Jun 2006 09:51:17 -0000	1.22
@@ -1,11 +1,11 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
-Version:	2.59
-Release:    8
+Version:	2.60
+Release:	0
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
-Patch0:     autoconf-2.59-intrinsic.patch
+Patch:     autoconf-2.60-lX11.patch
 URL:		http://www.gnu.org/software/autoconf/
 BuildRequires:	sed, m4, emacs
 Prereq(post,preun):	/sbin/install-info
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q -n autoconf-%{version}
-%patch0 -p1 -b .mod-x
+%patch
 
 %build
 %configure
@@ -69,6 +69,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-0
+- Try Autoconf 2.60
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 2.59-8
 - try to link with libX11 instead of libXt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 03:21:20 -0000	1.6
+++ sources	27 Jun 2006 09:51:17 -0000	1.7
@@ -1 +1 @@
-1ee40f7a676b3cfdc0e3f7cd81551b5f  autoconf-2.59.tar.bz2
+019609c29d0cbd9110c38480304aafc8  autoconf-2.60.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 27 10:15:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 06:15:38 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.22,1.23
Message-ID: <200606271015.k5RAFcQI013436@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13325

Modified Files:
	autoconf.spec 
Log Message:
- Try Autoconf 2.60


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- autoconf.spec	27 Jun 2006 09:51:17 -0000	1.22
+++ autoconf.spec	27 Jun 2006 10:15:35 -0000	1.23
@@ -5,7 +5,7 @@
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
-Patch:     autoconf-2.60-lX11.patch
+Patch:		autoconf-2.60-intrinsic.patch
 URL:		http://www.gnu.org/software/autoconf/
 BuildRequires:	sed, m4, emacs
 Prereq(post,preun):	/sbin/install-info



From fedora-cvs-commits at redhat.com  Tue Jun 27 10:19:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 06:19:27 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.23,1.24
Message-ID: <200606271019.k5RAJRWC029316@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29291

Modified Files:
	autoconf.spec 
Log Message:
Bump realease version for brew


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- autoconf.spec	27 Jun 2006 10:15:35 -0000	1.23
+++ autoconf.spec	27 Jun 2006 10:19:25 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.60
-Release:	0
+Release:	0.br
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 27 10:36:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 06:36:26 -0400
Subject: rpms/openobex/devel openobex.spec,1.17,1.18
Message-ID: <200606271036.k5RAaQr4001790@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1735

Modified Files:
	openobex.spec 
Log Message:
- added more build requirements
- built now with enable-usb



Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openobex.spec	16 Jun 2006 13:16:38 -0000	1.17
+++ openobex.spec	27 Jun 2006 10:36:23 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.3
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -12,7 +12,7 @@
 Patch4: openobex-apps-push.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed
+BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed, libusb-devel
 BuildRequires: automake autoconf libtool
 ExcludeArch: s390 s390x
 
@@ -22,7 +22,7 @@
 %package devel
 Summary: Files for development of applications which will use OBEX
 Group: Development/Libraries
-Requires: %{name} = 0:%{version}-%{release}
+Requires: %{name} = 0:%{version}-%{release} bluez-libs-devel libusb-devel pkgconfig
 
 %description devel
 Open OBEX shared c-library
@@ -49,7 +49,7 @@
 
 %build
 autoreconf --install --force
-%configure --disable-static --enable-apps
+%configure --disable-static --enable-apps --enable-usb
 make
 make -C doc 
 
@@ -75,6 +75,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS README 
 %{_libdir}/libopenobex*.so
 %{_datadir}/aclocal/openobex.m4
+%dir %{_includedir}/openobex
 %{_includedir}/openobex/*.h
 %{_libdir}/pkgconfig/openobex.pc
 
@@ -91,6 +92,10 @@
 
 
 %changelog
+* Tue Jun 27 2006 Harald Hoyer <harald at redhat.com> - 1.3-2
+- added more build requirements
+- built now with enable-usb
+
 * Fri Jun 16 2006 Harald Hoyer <harald at redhat.com> - 1.3-1
 - version 1.3
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 11:30:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 07:30:49 -0400
Subject: rpms/openobex/devel openobex.spec,1.18,1.19
Message-ID: <200606271130.k5RBUnS9015741@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15698

Modified Files:
	openobex.spec 
Log Message:
removed more patches


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openobex.spec	27 Jun 2006 10:36:23 -0000	1.18
+++ openobex.spec	27 Jun 2006 11:30:46 -0000	1.19
@@ -1,15 +1,12 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.3
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
 Source: ftp://download.sourceforge.net/pub/sourceforge/openobex/openobex-%{version}.tar.gz
-Patch: openobex-1.1-inc.patch
-Patch2: openobex-1.1-noreq.patch
-Patch3: openobex-apps-flush.patch
-Patch4: openobex-apps-push.patch
+Patch: openobex-apps-flush.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed, libusb-devel
@@ -42,10 +39,6 @@
 
 %setup -q
 %patch -p1
-#%patch2 -p1
-%patch3 -p1
-#%patch4 -p1 -b .push
-sed -i -e 's#includedir=@includedir@#includedir=@includedir@/openobex#g' openobex.pc.in
 
 %build
 autoreconf --install --force
@@ -55,7 +48,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 # we do not want .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
@@ -92,6 +85,9 @@
 
 
 %changelog
+* Tue Jun 27 2006 Harald Hoyer <harald at redhat.com> - 1.3-3
+- removed more patches
+
 * Tue Jun 27 2006 Harald Hoyer <harald at redhat.com> - 1.3-2
 - added more build requirements
 - built now with enable-usb



From fedora-cvs-commits at redhat.com  Tue Jun 27 11:31:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 07:31:27 -0400
Subject: rpms/openobex/devel openobex-1.1-inc.patch, 1.1,
	NONE openobex-1.1-noreq.patch, 1.1,
	NONE openobex-apps-push.patch, 1.1, NONE
Message-ID: <200606271131.k5RBVRXK015829@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15807

Removed Files:
	openobex-1.1-inc.patch openobex-1.1-noreq.patch 
	openobex-apps-push.patch 
Log Message:
removed more patches


--- openobex-1.1-inc.patch DELETED ---


--- openobex-1.1-noreq.patch DELETED ---


--- openobex-apps-push.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 11:33:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 07:33:51 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.743,1.744
Message-ID: <200606271133.k5RBXpEN016177@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16127

Modified Files:
	openoffice.org.spec 
Log Message:
rh#195208# bump pre-req for a quiet life


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- openoffice.org.spec	26 Jun 2006 16:07:01 -0000	1.743
+++ openoffice.org.spec	27 Jun 2006 11:33:48 -0000	1.744
@@ -139,7 +139,7 @@
 %endif
 Requires: libgcj >= 4.0.0
 Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
-PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
+PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
 Obsoletes: openoffice.org-i18n



From fedora-cvs-commits at redhat.com  Tue Jun 27 11:35:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 07:35:08 -0400
Subject: rpms/wget/devel wget-1.10.2-to11.patch, NONE, 1.1 wget.spec, 1.44,
	1.45
Message-ID: <200606271135.k5RBZ8tP016333@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16287

Modified Files:
	wget.spec 
Added Files:
	wget-1.10.2-to11.patch 
Log Message:
- upstream patches

wget-1.10.2-to11.patch:
 INSTALL                    |    6 
 Makefile.in                |   17 
 NEWS                       |   34 
 README                     |    5 
 TODO                       |  119 
 configure                  | 6086 ++++++++++++++++++++++++---------------------
 configure.in               |  123 
 doc/Makefile.in            |   12 
 doc/texi2pod.pl            |  438 +++
 doc/texi2pod.pl.in         |  436 ---
 doc/wget.texi              |  106 
 m4/wget.m4                 |   60 
 po/hr.po                   | 1105 ++++----
 po/sl.po                   |    2 
 po/zh_TW.po                |  288 --
 src/ChangeLog              |  750 +++++
 src/Makefile.in            |   59 
 src/cmpt.c                 |  538 ---
 src/config-post.h          |   60 
 src/config.h.in            |   83 
 src/connect.c              |  236 -
 src/connect.h              |   53 
 src/convert.c              |  213 +
 src/convert.h              |   26 
 src/cookies.c              |  664 +---
 src/cookies.h              |   22 
 src/ftp-basic.c            |  189 -
 src/ftp-ls.c               |   50 
 src/ftp-opie.c             |   12 
 src/ftp.c                  |  166 -
 src/ftp.h                  |   52 
 src/gen-md5.c              |    4 
 src/gen-md5.h              |   12 
 src/getopt.c               |    6 
 src/gnu-md5.c              |   16 
 src/gnu-md5.h              |   23 
 src/gnutls.c               |  303 ++
 src/hash.c                 |  390 +-
 src/hash.h                 |   69 
 src/host.c                 |  241 -
 src/host.h                 |   90 
 src/html-parse.c           |   51 
 src/html-parse.h           |   13 
 src/html-url.c             |   38 
 src/http-ntlm.c            |  234 -
 src/http-ntlm.h            |   10 
 src/http.c                 | 2686 ++++++++++---------
 src/http.h                 |   48 
 src/init.c                 |  501 +--
 src/init.h                 |   16 
 src/log.c                  |  118 
 src/log.h                  |   37 
 src/main.c                 |  185 -
 src/mswindows.c            |  127 
 src/mswindows.h            |  122 
 src/netrc.c                |   23 
 src/netrc.h                |   10 
 src/openssl.c              |  251 +
 src/options.h              |  121 
 src/progress.c             |  452 ++-
 src/progress.h             |   24 
 src/ptimer.c               |  150 -
 src/ptimer.h               |   16 
 src/recur.c                |  108 
 src/recur.h                |   16 
 src/res.c                  |   98 
 src/res.h                  |   18 
 src/retr.c                 |  202 -
 src/retr.h                 |   46 
 src/snprintf.c             |  117 
 src/ssl.h                  |   10 
 src/sysdep.h               |  167 -
 src/test.c                 |   81 
 src/test.h                 |   45 
 src/url.c                  |  521 +--
 src/url.h                  |   40 
 src/utils.c                |  852 +++---
 src/utils.h                |  148 -
 src/wget.h                 |   89 
 src/xmalloc.c              |   29 
 src/xmalloc.h              |   34 
 tests/ChangeLog            |  100 
 tests/HTTPServer.pm        |   93 
 tests/HTTPTest.pm          |   49 
 tests/Makefile.in          |  250 +
 tests/Test.pm              |  240 +
 tests/Test1.px             |   46 
 tests/Test10.px            |   55 
 tests/Test2.px             |   48 
 tests/Test3.px             |   43 
 tests/Test4.px             |   43 
 tests/Test5.px             |   56 
 tests/Test6.px             |   76 
 tests/Test7.px             |   76 
 tests/Test8.px             |   69 
 tests/Test9.px             |   55 
 windows/ChangeLog          |   80 
 windows/Makefile.src       |    2 
 windows/Makefile.src.bor   |    2 
 windows/Makefile.src.mingw |    2 
 windows/Makefile.watcom    |   95 
 windows/README             |    8 
 windows/config-compiler.h  |  200 +
 windows/config.h           |  215 +
 windows/config.h.bor       |  209 -
 windows/config.h.mingw     |  273 --
 windows/config.h.ms        |  220 -
 107 files changed, 12999 insertions(+), 10624 deletions(-)

--- NEW FILE wget-1.10.2-to11.patch ---
diff -urN wget-1.10.2/configure wget-1.10.2_new/configure
--- wget-1.10.2/configure	2005-10-13 11:22:29.000000000 +0200
+++ wget-1.10.2_new/configure	2006-06-27 12:03:10.000000000 +0200
@@ -309,7 +309,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION PACKAGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os OPIE_OBJ SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP exeext U ANSI2KNR ALLOCA GETOPT_OBJ HAVE_LIBSSL LIBSSL LTLIBSSL SSL_OBJ NTLM_OBJ MD5_OBJ MSGFMT XGETTEXT GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS POFILES HAVE_NLS USE_NLS MAKEINFO PERL POD2MAN COMMENT_IF_NO_POD2MAN LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION PACKAGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os OPIE_OBJ SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP exeext ALLOCA GETOPT_OBJ HAVE_LIBGNUTLS LIBGNUTLS LTLIBGNUTLS HAVE_LIBSSL LIBSSL LTLIBSSL SSL_OBJ NTLM_OBJ MD5_OBJ MSGFMT XGETTEXT GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS POFILES HAVE_NLS USE_NLS MAKEINFO PERL POD2MAN COMMENT_IF_NO_POD2MAN LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -858,6 +858,8 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --without-ssl           disable SSL autodetection
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-libgnutls-prefix[=DIR]  search for libgnutls in DIR/include and DIR/lib
+  --without-libgnutls-prefix     don't search for libgnutls in includedir and libdir
   --with-libssl-prefix[=DIR]  search for libssl in DIR/include and DIR/lib
   --without-libssl-prefix     don't search for libssl in includedir and libdir
 
@@ -961,7 +963,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1334,27 +1336,6 @@
 
 
 
-# serial 1
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so.  This macro tries various
-# options that select ANSI C on some system or another.  It considers the
-# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
-# handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-
-
-
 
 
 
@@ -1386,6 +1367,7 @@
 # serial 1
 
 
+
 # lib-ld.m4 serial 3 (gettext-0.13)
 
 
@@ -1571,7 +1553,7 @@
 	wget_need_md5=yes
 esac
 if test x"$ENABLE_OPIE" = xyes; then
-  OPIE_OBJ='ftp-opie$o'
+  OPIE_OBJ='ftp-opie.o'
 fi
 
 
@@ -2257,8 +2239,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2316,8 +2297,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2433,8 +2413,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2488,8 +2467,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2534,8 +2512,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2579,8 +2556,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2900,92 +2876,9 @@
 
 
 
-echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
-if test "${am_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
-do
-  CC="$ac_save_CC $ac_arg"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if !defined(__STDC__)
-choke me
-#endif
-/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif
-
-int
-main ()
-{
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
[...36652 lines suppressed...]
-/* #undef HAVE_SOCKS */
-
-/* Define to 1 if ANSI function prototypes are usable.  */
-#define PROTOTYPES 1
-
-/* Define if we're compiling in support for MD5.  */
-#define HAVE_MD5 1
-
-/* Define if we're using Solaris libmd5.  */
-#undef HAVE_SOLARIS_MD5
-
-/* Define if we're using builtin (GNU) md5.c.  */
-#define HAVE_BUILTIN_MD5 1
-
-/* Work around VC 6 issues */
-#define inline __inline
-#define ftruncate chsize
-
-/* Define if you have the isatty function.  */
-#define HAVE_ISATTY 1
-
-/* Define if you have the memmove function */
-#define HAVE_MEMMOVE 1
-
-/* Define to the length of short. */
-#define SIZEOF_SHORT 2
-
-/* Define to the length of int. */
-#define SIZEOF_INT 4
-
-/* Define to the length of long. */
-#define SIZEOF_LONG 4
-
-/* Defined to int or size_t on systems without socklen_t.  */
-#define socklen_t int
-
-/* Define if you have uint32_t.  */
-#undef HAVE_UINT32_T
-
-#endif /* CONFIG_H */
diff -urN wget-1.10.2/windows/Makefile.src wget-1.10.2_new/windows/Makefile.src
--- wget-1.10.2/windows/Makefile.src	2005-06-22 01:27:21.000000000 +0200
+++ wget-1.10.2_new/windows/Makefile.src	2006-06-27 12:20:51.000000000 +0200
@@ -84,7 +84,7 @@
 	$(LD) @<< $(LDFLAGS) /out:$@ $(OBJ) $(LIBS)
 <<
 
-$(OBJ): config-post.h connect.h convert.h cookies.h ftp.h gen-md5.h \
+$(OBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h gen-md5.h \
         getopt.h gnu-md5.h hash.h host.h html-parse.h http-ntlm.h   \
         init.h log.h mswindows.h netrc.h options.h progress.h       \
         ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h sysdep.h   \
diff -urN wget-1.10.2/windows/Makefile.src.bor wget-1.10.2_new/windows/Makefile.src.bor
--- wget-1.10.2/windows/Makefile.src.bor	2005-06-30 14:13:16.000000000 +0200
+++ wget-1.10.2_new/windows/Makefile.src.bor	2006-06-27 12:20:51.000000000 +0200
@@ -60,7 +60,7 @@
 
 |
 
-$(OBJS): config-post.h connect.h convert.h cookies.h ftp.h gen-md5.h \
+$(OBJS): config-post.h config.h connect.h convert.h cookies.h ftp.h gen-md5.h \
          getopt.h gnu-md5.h hash.h host.h html-parse.h http-ntlm.h   \
          init.h log.h mswindows.h netrc.h options.h progress.h       \
          ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h sysdep.h   \
diff -urN wget-1.10.2/windows/Makefile.src.mingw wget-1.10.2_new/windows/Makefile.src.mingw
--- wget-1.10.2/windows/Makefile.src.mingw	2005-06-22 01:27:21.000000000 +0200
+++ wget-1.10.2_new/windows/Makefile.src.mingw	2006-06-27 12:20:51.000000000 +0200
@@ -41,7 +41,7 @@
 wget.exe: $(OBJS)
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
-$(OBJS): config-post.h connect.h convert.h cookies.h ftp.h gen-md5.h \
+$(OBJS): config-post.h config.h connect.h convert.h cookies.h ftp.h gen-md5.h \
          getopt.h gnu-md5.h hash.h host.h html-parse.h http-ntlm.h   \
          init.h log.h mswindows.h netrc.h options.h progress.h       \
          ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h sysdep.h   \
diff -urN wget-1.10.2/windows/Makefile.watcom wget-1.10.2_new/windows/Makefile.watcom
--- wget-1.10.2/windows/Makefile.watcom	2005-04-05 20:46:44.000000000 +0200
+++ wget-1.10.2_new/windows/Makefile.watcom	1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-## Compiler, linker, and lib stuff
-## Makefile for use with watcom win95/winnt executable.
-#
-# Copy this file to the ..\src directory (maybe rename to Makefile).
-#
-
-CC=wcc386 /zq
-LINK=wlink
-
-#
-# Note: this will wipe anything in the env.var PATH !
-#
-.BEFORE
-	@SET INCLUDE=$(%WATCOM)\h;$(%WATCOM)\h\nt;.
-
-LFLAGS=op q sys nt op st=32767 op map op de 'GNU Wget' de dw op symf
-#
-# op q              : quiet !
-# sys nt            : producing an NT app
-# op st(ack)=32768  : stack size
-# op vers(ion)=1.7  : "Image version" in the EXE header ( major.minor )
-# op map            : produce a map file
-# op de             : textual description, placed in the executable
-# de dw             : debug info on Dwarf format
-# op symf           : place debug info in a separate wget.sym
-#
-
-CFLAGS=/zp4 /w4 /fpd /5s /fp5 /bm /mf /bt=nt /I. /DWINDOWS /DHAVE_CONFIG_H
-#                    ^^^^^^^^ wget will run on NT. We can safely assume a Pentium :-)
-# /zp4= pack structure members with this alignment
-# /d1 = line number debug info
-# /w4 = warning level
-# /fpd= Pentium floatingpoint bug workaround
-# /5s = Pentium stack-based calling
-# /fp5= Pentium floating point
-# /bm = build multi-threaded
-# /mf = flat memory model
-# /bt = "build target" (nt)
-
-#
-# Choose one of the following three:
-# /od /d2  for no optimization, full debug info
-# /os /d2  to optimize for size, full debug info (or /d1 for line number debug info)
-# /othexan for "heavy-duty" optimizations, no debug info
-#
-#CFLAGS+= /od /d2
-CFLAGS+= /os /d2
-#CFLAGS+= /othexan
-#       ^^-- mind the gap !!
-
-#CFLAGS+= /DDEBUG_MALLOC
-#       ^^-- mind the gap !!
-
-OBJS = cmpt.obj convert.obj connect.obj cookies.obj ftp.obj ftp-basic.obj  &
-      ftp-ls.obj ftp-opie.obj getopt.obj hash.obj host.obj html-parse.obj html-url.obj  &
-      http.obj init.obj log.obj main.obj gen-md5.obj gnu-md5.obj netrc.obj progress.obj  &
-      recur.obj res.obj retr.obj safe-ctype.obj url.obj utils.obj version.obj & 
-      mswindows.obj xmalloc.obj
-
-LIBFILES = 
-#
-# Add extra libs like this :
-#LIBFILES = LIBF lz32.lib,gdi32.lib
-
-BINNAME=wget.exe
-
-all : config.h $(BINNAME) .SYMBOLIC
-
-#
-# We use config.h.ms
-#
-config.h : ..\windows\config.h.ms
-	copy $[@ $^@
-
-#
-# Note: this will pass all the OBJ files to wlink,
-# resulting in a very long command line (410 chars, last I counted)
-# This might fail on Win9x (works with NT's cmd.exe)
-#
-$(BINNAME): $(OBJS) Makefile
-	$(LINK) $(LFLAGS) NAME $(BINNAME) FILE { $(OBJS) } $(LIBPATH) $(LIBFILES)
-
-
-#
-# Explicit dependencies not needed because Watcom C stores
-# dependency information in the object file. Wmake can read this information
-# if prompted by .AUTODEPEND
-#
-
-.c.obj: .AUTODEPEND
-	$(CC) $(CFLAGS) $[@
-
-.c.i: .AUTODEPEND
-	$(CC) $(CFLAGS) -fo=$@ /Pc $[@
-
diff -urN wget-1.10.2/windows/README wget-1.10.2_new/windows/README
--- wget-1.10.2/windows/README	2005-04-28 12:11:39.000000000 +0200
+++ wget-1.10.2_new/windows/README	2006-06-27 12:20:51.000000000 +0200
@@ -7,8 +7,10 @@
 instructions printed on the screen.  The instructions bellow are for
 building Wget with Microsoft Visual C++ (MSVC); you may need to make
 appropriate substitutions for your compiler and build environment; 
-currently wget can be built at least with Visual Studio/.Net, free 
-Borland or Watcom compilers, and the free cygnus and mingw environments.
+currently wget can be built at least with Visual Studio/.Net, the free 
+Borland compiler, and the free mingw environment.  The instructions do
+*not* apply to the Cygwin environment, on which Wget is built with the
+procedure described in the INSTALL file in the top-level directory.
 
 To build Wget with MSVC run configure.bat (in the main Wget directory)
 with the argument --msvc, and then run nmake.  At a certain point in time
@@ -54,7 +56,7 @@
   port;
 
 * Tim Charron <tcharron at interlog.com> -- additional cleanup and
-  contribution of the Watcom makefile;
+  contribution of the (now retired) Watcom makefile;
 
 * John Burden <john at futuresguide.com> -- cleanup of the VC++ makefile
   to get a clean build with VC++ 5.0 on Windows 95;


Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wget.spec	11 Feb 2006 06:04:14 -0000	1.44
+++ wget.spec	27 Jun 2006 11:34:50 -0000	1.45
@@ -1,17 +1,17 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
 Version: 1.10.2
-Release: 3.2.1
+Release: 4
 License: GPL
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
 Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz 
-Source2: wget-1.10.1-de.po
-Patch1: wget-1.10-ctype.patch
+#Source2: wget-1.10.1-de.po
 Patch2: wget-1.10.2-rh1.patch
 Patch3: wget-1.10-path.patch
 Patch4: wget-1.9.1-docsyntax.patch
 Patch5: wget-1.10.1-helpfix.patch
+Patch6: wget-1.10.2-to11.patch
 Provides: webclient
 Prereq: /sbin/install-info
 BuildRequires: perl, openssl-devel, pkgconfig, texinfo, gettext, autoconf
@@ -28,13 +28,14 @@
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
-cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po
+#cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po
+chmod a+x doc/texi2pod.pl
 
 %build
 if pkg-config openssl ; then
@@ -70,6 +71,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Jun 27 2006 Karsten Hopp <karsten at redhat.de> 1.10.2-4
+- upstream patches
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10.2-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 11:45:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 07:45:48 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server.spec,1.51,1.52
Message-ID: <200606271145.k5RBjm0m021521@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20824

Modified Files:
	xorg-x11-server.spec 
Log Message:
Apply patch11 properly, and fix bug copying SOURCE10


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xorg-x11-server.spec	27 Jun 2006 02:26:59 -0000	1.51
+++ xorg-x11-server.spec	27 Jun 2006 11:45:46 -0000	1.52
@@ -246,7 +246,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-cp {%SOURCE10} hw/xfree86/os-support/bus/
+cp %{SOURCE10} hw/xfree86/os-support/bus/
 %patch0 -p0 -b .init-origins-fix
 #%patch1 -p0 -b .fbmmx-fix-for-non-SSE-cpu
 #%patch2 -p0 -b .rgb.txt-dix-config-fix
@@ -258,7 +258,7 @@
 %patch8 -p1 -b .CVE-2006-0745
 %patch9 -p1 -b .keymap-overflow
 %patch10 -p0 -b .render-tris-CVE-2006-1526
-%patch11 -p0 -b .setuid
+%patch11 -p2 -b .setuid
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface



From fedora-cvs-commits at redhat.com  Tue Jun 27 12:07:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 08:07:00 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.24,1.25
Message-ID: <200606271207.k5RC708U007736@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7701

Modified Files:
	autoconf.spec 
Log Message:
- Do not allow rpm to replace config.guess and config.sub.


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- autoconf.spec	27 Jun 2006 10:19:25 -0000	1.24
+++ autoconf.spec	27 Jun 2006 12:06:57 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.60
-Release:	0.br
+Release:	1
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -32,8 +32,15 @@
 %prep
 %setup -q -n autoconf-%{version}
 %patch
+# Hide these files from the eager find at the beginning of %build
+cp -p config/config{.,-}guess
+cp -p config/config{.,-}sub
+
 
 %build
+# ... restore them:
+cp -p config/config{-,.}guess
+cp -p config/config{-,.}sub
 %configure
 make
 
@@ -69,6 +76,12 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-1
+- Do not allow rpm to replace config.guess and config.sub.
+
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-0.br
+- fix a typo
+
 * Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-0
 - Try Autoconf 2.60
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 12:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 08:17:23 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server.spec,1.52,1.53
Message-ID: <200606271217.k5RCHNJM025804@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25761

Modified Files:
	xorg-x11-server.spec 
Log Message:
Added "BuildRequires: freetype-devel >= 2.1.9-1, zlib-devel" so that the package will build now in brew/mock for erratum.


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-server.spec	27 Jun 2006 11:45:46 -0000	1.52
+++ xorg-x11-server.spec	27 Jun 2006 12:17:20 -0000	1.53
@@ -105,6 +105,11 @@
 BuildRequires: libXt-devel libXpm-devel libXaw-devel
 # To query fontdir from fontutil.pc
 BuildRequires: xorg-x11-font-utils >= 1.0.0-1
+
+BuildRequires: freetype-devel >= 2.1.9-1
+BuildRequires: zlib-devel
+
+
 # Needed at least for DRI enabled builds
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4.2-6.FC5.3
@@ -113,6 +118,8 @@
 BuildRequires: mesa-source >= 6.4.2-6.FC5.3
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
+
+
 %description
 X.Org X11 X server
 
@@ -544,6 +551,8 @@
   185929,187603,185727,189730)
 - Added xorg-x11-server-1.0.1-setuid.diff to fix setuid bug (#196126)
 - Bump xtrans dependency to ">= 1.0.0-3.2.FC5.0" for setuid fix in xtrans.
+- Added "BuildRequires: freetype-devel >= 2.1.9-1, zlib-devel" so that the
+  package will build now in brew/mock for erratum.
 
 * Fri May 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.3
 - Enable alpha, sparc, sparc64 architectures to be buildable (untested, but



From fedora-cvs-commits at redhat.com  Tue Jun 27 12:34:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 08:34:56 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.25,1.26
Message-ID: <200606271234.k5RCYuv5005838@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5824

Modified Files:
	autoconf.spec 
Log Message:
- Second attempt to keep original config.guess and config.sub.


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- autoconf.spec	27 Jun 2006 12:06:57 -0000	1.25
+++ autoconf.spec	27 Jun 2006 12:34:53 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.60
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -32,16 +32,16 @@
 %prep
 %setup -q -n autoconf-%{version}
 %patch
-# Hide these files from the eager find at the beginning of %build
-cp -p config/config{.,-}guess
-cp -p config/config{.,-}sub
 
 
 %build
-# ... restore them:
-cp -p config/config{-,.}guess
-cp -p config/config{-,.}sub
+# Hide these files from the eager find in %configure:
+cp -p config/config{.,-}guess
+cp -p config/config{.,-}sub
 %configure
+# ... and restore them:
+mv config/config{-,.}guess
+mv config/config{-,.}sub
 make
 
 %check
@@ -76,6 +76,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-2
+- Second attempt to keep original config.guess and config.sub.
+
 * Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-1
 - Do not allow rpm to replace config.guess and config.sub.
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 12:57:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 08:57:55 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.26,1.27
Message-ID: <200606271257.k5RCvt1u004566@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4535

Modified Files:
	autoconf.spec 
Log Message:
- Do not mention rpm macro in a comment, rpm expands it!


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- autoconf.spec	27 Jun 2006 12:34:53 -0000	1.26
+++ autoconf.spec	27 Jun 2006 12:57:52 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.60
-Release:	2
+Release:	3
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -35,7 +35,7 @@
 
 
 %build
-# Hide these files from the eager find in %configure:
+# Hide these files from the eager find run before configure:
 cp -p config/config{.,-}guess
 cp -p config/config{.,-}sub
 %configure
@@ -76,6 +76,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-3
+- Do not mention rpm macro in a comment, rpm expands it!
+
 * Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-2
 - Second attempt to keep original config.guess and config.sub.
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 13:13:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 09:13:29 -0400
Subject: rpms/jpilot/devel jpilot-0.99.8-trans.patch, NONE, 1.1 jpilot.spec,
	1.35, 1.36
Message-ID: <200606271313.k5RDDTs5008089@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8007

Modified Files:
	jpilot.spec 
Added Files:
	jpilot-0.99.8-trans.patch 
Log Message:
fix translation problems (#196852)


jpilot-0.99.8-trans.patch:
 cs.po    |  284 +++++++++++++++++++++++++++++++--------------------------------
 zh_CN.po |    2 
 2 files changed, 141 insertions(+), 145 deletions(-)

--- NEW FILE jpilot-0.99.8-trans.patch ---
--- jpilot-0.99.8/po/zh_CN.po.pom	2006-06-27 14:45:55.000000000 +0200
+++ jpilot-0.99.8/po/zh_CN.po	2006-06-27 14:53:28.000000000 +0200
@@ -1148,7 +1148,7 @@
 
 #: jpilot.c:1400
 msgid "/View/sep1"
-msgstr "/??????(F)/sep1"
+msgstr "/??????(V)/sep1"
 
 #: jpilot.c:1401
 msgid "/View/Datebook"
--- jpilot-0.99.8/po/cs.po.pom	2005-10-28 03:39:16.000000000 +0200
+++ jpilot-0.99.8/po/cs.po	2006-06-27 14:45:54.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: jpilot 0.99.8-pre3\n"
 "Report-Msgid-Bugs-To: jpilot-devel at jpilot.org\n"
-"POT-Creation-Date: 2005-10-27 21:39-0400\n"
+"POT-Creation-Date: 2006-06-27 14:45+0200\n"
 "PO-Revision-Date: 2004-11-21 16:41+0100\n"
 "Last-Translator: Miloslav Trmac <mitr at volny.cz>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@
 #: datebook.c:427 datebook.c:1046 jpilot.c:1534 libplugin.c:467
 #: libplugin.c:646 libplugin.c:753 libplugin.c:832 libplugin.c:873 memo.c:95
 #: memo.c:367 plugins.c:108 prefs.c:314 prefs.c:339 prefs.c:854 sync.c:252
-#: sync.c:1153 sync.c:2320 todo.c:206 todo.c:548 utils.c:2307
+#: sync.c:1153 sync.c:2320 todo.c:206 todo.c:548 utils.c:2304
 msgid "Out of memory"
 msgstr "Nedostatek pam??ti"
 
@@ -39,7 +39,7 @@
 msgid "Error reading file: %s\n"
 msgstr "Chyba p??i ??ten?? souboru: %s\n"
 
-#: address_gui.c:261 datebook_gui.c:2524 memo_gui.c:184 todo_gui.c:305
+#: address_gui.c:261 datebook_gui.c:2529 memo_gui.c:184 todo_gui.c:305
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -48,10 +48,10 @@
 "Pro prov??d??n?? zm??n jej obnovte nebo zkop??rujte.\n"
 
 #: address_gui.c:469 category.c:159 category.c:165 category.c:213
-#: category.c:270 datebook_gui.c:372 memo_gui.c:301 sync.c:1116 sync.c:1122
+#: category.c:270 datebook_gui.c:377 memo_gui.c:301 sync.c:1116 sync.c:1122
 #: sync.c:2295 sync.c:2515 sync.c:2521 sync.c:2638 sync.c:2904 todo_gui.c:445
-#: utils.c:2721 utils.c:2770 utils.c:2776 utils.c:2849 utils.c:2855
-#: utils.c:2918 utils.c:2981 utils.c:2987 utils.c:3050 utils.c:3057
+#: utils.c:2718 utils.c:2767 utils.c:2773 utils.c:2846 utils.c:2852
+#: utils.c:2915 utils.c:2978 utils.c:2984 utils.c:3047 utils.c:3054
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Nemohu otev????t soubor: %s\n"
@@ -60,62 +60,62 @@
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Soubor z??ejm?? nen?? ve form??tu address.dat\n"
 
-#: address_gui.c:558 datebook_gui.c:582 memo_gui.c:436 todo_gui.c:571
+#: address_gui.c:558 datebook_gui.c:587 memo_gui.c:436 todo_gui.c:571
 #: Expense/expense.c:619 Expense/expense.c:1406
 msgid "Unfiled"
 msgstr "Neza??azeno"
 
 #: address_gui.c:697 alarms.c:226 category.c:420 category.c:871 category.c:911
-#: datebook_gui.c:669 datebook_gui.c:1149 export_gui.c:339 jpilot.c:363
+#: datebook_gui.c:674 datebook_gui.c:1154 export_gui.c:339 jpilot.c:363
 #: jpilot.c:409 jpilot.c:477 jpilot.c:521 jpilot.c:968 jpilot.c:1869
 #: memo_gui.c:526 password.c:352 restore_gui.c:307 todo_gui.c:661 utils.c:1084
 #: utils.c:1256 KeyRing/keyring.c:1324
 msgid "OK"
 msgstr "Budi??"
 
-#: address_gui.c:698 datebook_gui.c:670 memo_gui.c:527 todo_gui.c:662
+#: address_gui.c:698 datebook_gui.c:675 memo_gui.c:527 todo_gui.c:662
 #: utils.c:1274
 msgid "Yes"
 msgstr "Ano"
 
-#: address_gui.c:698 datebook_gui.c:670 memo_gui.c:527 todo_gui.c:662
+#: address_gui.c:698 datebook_gui.c:675 memo_gui.c:527 todo_gui.c:662
 #: utils.c:1274
 msgid "No"
 msgstr "Ne"
 
-#: address_gui.c:722 datebook_gui.c:697 memo_gui.c:537 todo_gui.c:688
+#: address_gui.c:722 datebook_gui.c:702 memo_gui.c:537 todo_gui.c:688
 #, c-format
 msgid "%s is a directory"
 msgstr "%s je adres????"
 
-#: address_gui.c:724 address_gui.c:741 datebook_gui.c:699 datebook_gui.c:716
+#: address_gui.c:724 address_gui.c:741 datebook_gui.c:704 datebook_gui.c:721
 #: memo_gui.c:539 memo_gui.c:556 todo_gui.c:690 todo_gui.c:707
 msgid "Error Opening File"
 msgstr "Chyba p??i otev??r??n?? souboru"
 
-#: address_gui.c:725 datebook_gui.c:700 memo_gui.c:540 todo_gui.c:691
+#: address_gui.c:725 datebook_gui.c:705 memo_gui.c:540 todo_gui.c:691
 msgid "Directory"
 msgstr "Adres????"
 
-#: address_gui.c:728 datebook_gui.c:703 memo_gui.c:543 todo_gui.c:694
+#: address_gui.c:728 datebook_gui.c:708 memo_gui.c:543 todo_gui.c:694
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Chcete p??epsat soubor %s?"
 
-#: address_gui.c:730 datebook_gui.c:705 memo_gui.c:545 todo_gui.c:696
+#: address_gui.c:730 datebook_gui.c:710 memo_gui.c:545 todo_gui.c:696
 msgid "Overwrite File?"
 msgstr "P??epsat soubor?"
 
-#: address_gui.c:731 datebook_gui.c:706 memo_gui.c:546 todo_gui.c:697
+#: address_gui.c:731 datebook_gui.c:711 memo_gui.c:546 todo_gui.c:697
 msgid "Overwrite File"
 msgstr "P??epsat soubor"
 
-#: address_gui.c:739 datebook_gui.c:714 memo_gui.c:554 todo_gui.c:705
+#: address_gui.c:739 datebook_gui.c:719 memo_gui.c:554 todo_gui.c:705
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Chyba p??i otev??r??n?? souboru: %s"
 
-#: address_gui.c:742 datebook_gui.c:717 memo_gui.c:557 todo_gui.c:708
+#: address_gui.c:742 datebook_gui.c:722 memo_gui.c:557 todo_gui.c:708
 msgid "Filename"
 msgstr "N??zev souboru"
 
@@ -128,7 +128,7 @@
 msgid "Field"
 msgstr "Pole"
 
-#: address_gui.c:1039 datebook_gui.c:985 memo_gui.c:612 todo_gui.c:844
+#: address_gui.c:1039 datebook_gui.c:990 memo_gui.c:612 todo_gui.c:844
 msgid "Unknown export type\n"
 msgstr "Nezn??m?? typ exportu\n"
 
@@ -140,7 +140,7 @@
 msgid "Name/Company"
 msgstr "Jm??no/Firma"
 
-#: address_gui.c:1330 datebook_gui.c:2602 memo_gui.c:913 todo_gui.c:1246
+#: address_gui.c:1330 datebook_gui.c:2607 memo_gui.c:913 todo_gui.c:1246
 msgid "You can't modify a record that is deleted\n"
 msgstr "Nem????ete upravit z??znam, kter?? byl odstran??n\n"
 
@@ -185,7 +185,7 @@
 msgid "0 records"
 msgstr "0 z??znam??"
 
-#: address_gui.c:2236 datebook_gui.c:2399 memo_gui.c:1271 todo_gui.c:1853
+#: address_gui.c:2236 datebook_gui.c:2404 memo_gui.c:1271 todo_gui.c:1853
 #, c-format
 msgid "%d of %d records"
 msgstr "%d z %d z??znam??"
@@ -206,83 +206,83 @@
 msgstr "Rychl?? hled??n??"
 
 #: address_gui.c:2694 category.c:421 category.c:877 category.c:917
-#: datebook_gui.c:1154 datebook_gui.c:1582 datebook_gui.c:4371
+#: datebook_gui.c:1159 datebook_gui.c:1587 datebook_gui.c:4389
 #: export_gui.c:344 memo_gui.c:1552 password.c:362 print_gui.c:338
 #: restore_gui.c:312 todo_gui.c:2169 utils.c:1094 KeyRing/keyring.c:1334
 msgid "Cancel"
 msgstr "Zru??it"
 
-#: address_gui.c:2694 datebook_gui.c:4371 memo_gui.c:1552 todo_gui.c:2169
+#: address_gui.c:2694 datebook_gui.c:4389 memo_gui.c:1552 todo_gui.c:2169
 #, fuzzy
 msgid "Cancel the modifications"
 msgstr "Potvrdit zm??ny   Ctrl+Enter"
 
-#: address_gui.c:2699 category.c:421 category.c:844 datebook_gui.c:4376
+#: address_gui.c:2699 category.c:421 category.c:844 datebook_gui.c:4394
 #: memo_gui.c:1557 todo_gui.c:2174 Expense/expense.c:1646
 #: KeyRing/keyring.c:1614
 msgid "Delete"
 msgstr "Odstranit"
 
-#: address_gui.c:2699 datebook_gui.c:4376 memo_gui.c:1557 todo_gui.c:2174
+#: address_gui.c:2699 datebook_gui.c:4394 memo_gui.c:1557 todo_gui.c:2174
 #: Expense/expense.c:1646 KeyRing/keyring.c:1614
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "Odstranit vybran?? z??znam   Ctrl+D"
 
-#: address_gui.c:2705 datebook_gui.c:4382 memo_gui.c:1563 todo_gui.c:2180
+#: address_gui.c:2705 datebook_gui.c:4400 memo_gui.c:1563 todo_gui.c:2180
 msgid "Undelete"
 msgstr "Obnovit"
 
-#: address_gui.c:2705 datebook_gui.c:4382 memo_gui.c:1563 todo_gui.c:2180
+#: address_gui.c:2705 datebook_gui.c:4400 memo_gui.c:1563 todo_gui.c:2180
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "Odstranit vybran?? z??znam   Ctrl+D"
 
-#: address_gui.c:2711 datebook_gui.c:4388 memo_gui.c:1569 todo_gui.c:2186
+#: address_gui.c:2711 datebook_gui.c:4406 memo_gui.c:1569 todo_gui.c:2186
 #: Expense/expense.c:1651 KeyRing/keyring.c:1619
 msgid "Copy"
 msgstr "Kop??rovat"
 
-#: address_gui.c:2711 datebook_gui.c:4388 memo_gui.c:1569 todo_gui.c:2186
+#: address_gui.c:2711 datebook_gui.c:4406 memo_gui.c:1569 todo_gui.c:2186
 #: Expense/expense.c:1651 KeyRing/keyring.c:1619
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "Odstranit vybran?? z??znam   Ctrl+D"
 
-#: address_gui.c:2717 datebook_gui.c:4394 memo_gui.c:1575 todo_gui.c:2192
+#: address_gui.c:2717 datebook_gui.c:4412 memo_gui.c:1575 todo_gui.c:2192
 #: Expense/expense.c:1656 KeyRing/keyring.c:1624
 msgid "New Record"
 msgstr "Nov?? z??znam"
 
-#: address_gui.c:2717 datebook_gui.c:4394 memo_gui.c:1575 todo_gui.c:2192
+#: address_gui.c:2717 datebook_gui.c:4412 memo_gui.c:1575 todo_gui.c:2192
 #: Expense/expense.c:1656 KeyRing/keyring.c:1624
 #, fuzzy
 msgid "Add a new record"
 msgstr "P??idat nov?? z??znam   Ctrl+R"
 
-#: address_gui.c:2722 datebook_gui.c:4400 memo_gui.c:1581 todo_gui.c:2198
+#: address_gui.c:2722 datebook_gui.c:4418 memo_gui.c:1581 todo_gui.c:2198
 #: Expense/expense.c:1661 KeyRing/keyring.c:1629
 msgid "Add Record"
 msgstr "P??idat z??znam"
 
-#: address_gui.c:2722 datebook_gui.c:4400 memo_gui.c:1581 todo_gui.c:2198
+#: address_gui.c:2722 datebook_gui.c:4418 memo_gui.c:1581 todo_gui.c:2198
 #: Expense/expense.c:1661 KeyRing/keyring.c:1629
 #, fuzzy
 msgid "Add the new record"
 msgstr "P??idat nov?? z??znam   Ctrl+R"
 
-#: address_gui.c:2732 datebook_gui.c:4410 memo_gui.c:1591 todo_gui.c:2208
+#: address_gui.c:2732 datebook_gui.c:4428 memo_gui.c:1591 todo_gui.c:2208
 #: Expense/expense.c:1670 KeyRing/keyring.c:1638
 msgid "Apply Changes"
 msgstr "Prov??st zm??ny"
 
-#: address_gui.c:2732 datebook_gui.c:4410 memo_gui.c:1591 todo_gui.c:2208
+#: address_gui.c:2732 datebook_gui.c:4428 memo_gui.c:1591 todo_gui.c:2208
 #: Expense/expense.c:1670 KeyRing/keyring.c:1638
 #, fuzzy
 msgid "Commit the modifications"
 msgstr "Potvrdit zm??ny   Ctrl+Enter"
 
-#: address_gui.c:2749 datebook_gui.c:4461 memo_gui.c:1609 todo_gui.c:2271
+#: address_gui.c:2749 datebook_gui.c:4479 memo_gui.c:1609 todo_gui.c:2271
 msgid "Private"
 msgstr "Soukrom??"
 
@@ -298,7 +298,7 @@
 msgid "Other"
 msgstr "Jin??"
 
-#: address_gui.c:2793 datebook_gui.c:1332 datebook_gui.c:1582 utils.c:2677
+#: address_gui.c:2793 datebook_gui.c:1337 datebook_gui.c:1587 utils.c:2674
 msgid "All"
 msgstr "V??e"
 
@@ -318,11 +318,11 @@
 msgid "Remind me"
 msgstr "P??ipomenout mi"
 
-#: alarms.c:242 datebook_gui.c:4443
+#: alarms.c:242 datebook_gui.c:4461
 msgid "Minutes"
 msgstr "Minut"
 
-#: alarms.c:244 datebook_gui.c:4447
+#: alarms.c:244 datebook_gui.c:4465
 msgid "Hours"
 msgstr "Hodin"
 
@@ -343,7 +343,7 @@
 msgid "Postponed Appointment"
 msgstr "Odlo??en?? akce"
 
-#: alarms.c:533 datebook_gui.c:4279
+#: alarms.c:533 datebook_gui.c:4297
 msgid "Appointment"
 msgstr "Akce"
 
@@ -360,8 +360,8 @@
 msgid "Unable to open %s.alarms file\n"
 msgstr "Nemohu otev????t soubor %s.alarms\n"
 
-#: category.c:192 sync.c:2552 utils.c:2797 utils.c:2885 utils.c:3007
-#: utils.c:3077
+#: category.c:192 sync.c:2552 utils.c:2794 utils.c:2882 utils.c:3004
+#: utils.c:3074
 msgid "rename failed"
 msgstr "p??ejmenov??n?? selhalo"
 
@@ -487,127 +487,127 @@
 msgstr "Nezn??m?? repeatType (%d) nalezen v DatebookDB\n"
 
 # FIXME: this is in libc
-#: datebook_gui.c:222 datebook_gui.c:229 datebook_gui.c:4078
-#: datebook_gui.c:4085
+#: datebook_gui.c:227 datebook_gui.c:234 datebook_gui.c:4096
+#: datebook_gui.c:4103
 msgid "Su"
 msgstr "Ne"
 
-#: datebook_gui.c:223 datebook_gui.c:4079
+#: datebook_gui.c:228 datebook_gui.c:4097
 msgid "Mo"
 msgstr "Po"
 
-#: datebook_gui.c:224 datebook_gui.c:4080
+#: datebook_gui.c:229 datebook_gui.c:4098
 msgid "Tu"
 msgstr "??t"
 
-#: datebook_gui.c:225 datebook_gui.c:4081
+#: datebook_gui.c:230 datebook_gui.c:4099
 msgid "We"
 msgstr "St"
 
-#: datebook_gui.c:226 datebook_gui.c:4082
+#: datebook_gui.c:231 datebook_gui.c:4100
 msgid "Th"
 msgstr "??t"
 
-#: datebook_gui.c:227 datebook_gui.c:4083
+#: datebook_gui.c:232 datebook_gui.c:4101
 msgid "Fr"
 msgstr "P??"
 
-#: datebook_gui.c:228 datebook_gui.c:4084
+#: datebook_gui.c:233 datebook_gui.c:4102
 msgid "Sa"
 msgstr "So"
 
-#: datebook_gui.c:561 datebook_gui.c:2055
+#: datebook_gui.c:566 datebook_gui.c:2060
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Popis akce > %d, zkracuji na %d\n"
 
-#: datebook_gui.c:571 datebook_gui.c:986 datebook_gui.c:2116
-#: datebook_gui.c:2123
+#: datebook_gui.c:576 datebook_gui.c:991 datebook_gui.c:2121
+#: datebook_gui.c:2128
 msgid "Error"
 msgstr "Chyba"
 
-#: datebook_gui.c:572
+#: datebook_gui.c:577
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Soubor z??ejm?? nen?? ve form??tu datebook.dat\n"
 
-#: datebook_gui.c:986
+#: datebook_gui.c:991
 msgid "Unknown export type"
 msgstr "Nezn??m?? typ exportu"
 
-#: datebook_gui.c:1095 export_gui.c:258 jpilot.c:554
+#: datebook_gui.c:1100 export_gui.c:258 jpilot.c:554
 msgid "Export"
 msgstr "Exportovat"
 
-#: datebook_gui.c:1112
+#: datebook_gui.c:1117
 msgid "Export All Datebook Records"
 msgstr "Exportovat v??echny z??znamy di????e"
 
-#: datebook_gui.c:1131 export_gui.c:320
+#: datebook_gui.c:1136 export_gui.c:320
 msgid "Save as"
 msgstr "Ulo??it jako"
 
-#: datebook_gui.c:1141 export_gui.c:331
+#: datebook_gui.c:1146 export_gui.c:331
 msgid "Browse"
 msgstr "Proch??zet"
 
-#: datebook_gui.c:1291
+#: datebook_gui.c:1296
 msgid "Datebook Categories"
 msgstr "Kategorie di????e"
 
-#: datebook_gui.c:1326 import_gui.c:311 prefs_gui.c:763
+#: datebook_gui.c:1331 import_gui.c:311 prefs_gui.c:763
 msgid "Done"
 msgstr "Hotovo"
 
-#: datebook_gui.c:1338 datebook_gui.c:4626
+#: datebook_gui.c:1343 datebook_gui.c:4644
 msgid "None"
 msgstr "Nic"
 
-#: datebook_gui.c:1450
+#: datebook_gui.c:1455
 msgid "Begin On Date"
 msgstr "Za????t dne"
 
-#: datebook_gui.c:1455
+#: datebook_gui.c:1460
 msgid "End On Date"
 msgstr "Skon??it dne"
 
 # FIXME: again
-#: datebook_gui.c:1549 prefs.c:413
+#: datebook_gui.c:1554 prefs.c:413
 msgid "Sunday"
 msgstr "Ned??le"
 
-#: datebook_gui.c:1550 prefs.c:414
+#: datebook_gui.c:1555 prefs.c:414
 msgid "Monday"
 msgstr "Pond??l??"
 
-#: datebook_gui.c:1551
+#: datebook_gui.c:1556
 msgid "Tuesday"
 msgstr "??ter??"
 
-#: datebook_gui.c:1552
+#: datebook_gui.c:1557
 msgid "Wednesday"
 msgstr "St??eda"
 
-#: datebook_gui.c:1553
+#: datebook_gui.c:1558
 msgid "Thursday"
 msgstr "??tvrtek"
 
-#: datebook_gui.c:1554
+#: datebook_gui.c:1559
 msgid "Friday"
 msgstr "P??tek"
 
-#: datebook_gui.c:1555
+#: datebook_gui.c:1560
 msgid "Saturday"
 msgstr "Sobota"
 
-#: datebook_gui.c:1558
+#: datebook_gui.c:1563
 msgid "4th"
 msgstr "4."
 
-#: datebook_gui.c:1558
+#: datebook_gui.c:1563
 msgid "Last"
 msgstr "Posledn??"
 
-#: datebook_gui.c:1561
+#: datebook_gui.c:1566
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -622,15 +622,15 @@
 "%s m??s??ce.\n"
 "Co chcete?"
 
-#: datebook_gui.c:1569 datebook_gui.c:1587
+#: datebook_gui.c:1574 datebook_gui.c:1592
 msgid "Question?"
 msgstr "Ot??zka?"
 
-#: datebook_gui.c:1569 datebook_gui.c:1587
+#: datebook_gui.c:1574 datebook_gui.c:1592
 msgid "Answer: "
 msgstr "Odpov????: "
 
-#: datebook_gui.c:1577
+#: datebook_gui.c:1582
 msgid ""
 "This is a repeating event.\n"
 "Do you want to apply these\n"
@@ -643,52 +643,52 @@
 "na AKTU??LN?? ud??lost nebo na\n"
 "V??ECHNY v??skyty t??to ud??losti?"
 
-#: datebook_gui.c:1582
+#: datebook_gui.c:1587
 msgid "Current"
 msgstr "Aktu??ln??"
 
-#: datebook_gui.c:1823
+#: datebook_gui.c:1828
 msgid "none"
 msgstr "nic"
 
-#: datebook_gui.c:1824
+#: datebook_gui.c:1829
 msgid "day"
 msgstr "den"
 
-#: datebook_gui.c:1825
+#: datebook_gui.c:1830
 msgid "week"
 msgstr "t??den"
 
-#: datebook_gui.c:1826
+#: datebook_gui.c:1831
 msgid "month"
 msgstr "m??s??c"
 
-#: datebook_gui.c:1827
+#: datebook_gui.c:1832
 msgid "year"
 msgstr "rok"
 
 # FIXME: unlocalizable
-#: datebook_gui.c:2111 datebook_gui.c:2114
+#: datebook_gui.c:2116 datebook_gui.c:2119
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Nem????ete m??t akci, kter?? se opakuje ka??d??ch %d %s\n"
 
-#: datebook_gui.c:2124
+#: datebook_gui.c:2129
 msgid ""
 "You can not have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr ""
 "Nem????ete m??t t??dn?? opakovanou akci, kter?? se neopakuje v ????dn??m dnu v t??dnu."
 
-#: datebook_gui.c:2277
+#: datebook_gui.c:2282
 msgid "No Time"
 msgstr "Bez ??asu"
 
-#: datebook_gui.c:2618
+#: datebook_gui.c:2623
 msgid "Invalid Appointment"
 msgstr "Neplatn?? akce"
 
-#: datebook_gui.c:2619
+#: datebook_gui.c:2624
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -696,152 +696,152 @@
 "Koncov?? datum t??to akce\n"
 "je p??ed po????te??n??m datem"
 
-#: datebook_gui.c:2874 datebook_gui.c:4660 datebook_gui.c:4690
-#: datebook_gui.c:4746 datebook_gui.c:4795 todo_gui.c:135 todo_gui.c:2262
+#: datebook_gui.c:2891 datebook_gui.c:4678 datebook_gui.c:4708
+#: datebook_gui.c:4764 datebook_gui.c:4813 todo_gui.c:135 todo_gui.c:2262
 msgid "No Date"
 msgstr "Neur??en"
 
-#: datebook_gui.c:2988
+#: datebook_gui.c:3005
 #, c-format
 msgid "Error in DateBookDB advanceUnits = %d\n"
 msgstr "Chyba v DateBookDB advanceUnits = %d\n"
 
-#: datebook_gui.c:3159
+#: datebook_gui.c:3176
 msgid "Unknown repeatType found in DatebookDB\n"
 msgstr "Nezn??m?? repeatType nalezen v DatebookDB\n"
 
-#: datebook_gui.c:3192
+#: datebook_gui.c:3209
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: datebook_gui.c:3197 monthview_gui.c:210 weekview_gui.c:204
+#: datebook_gui.c:3214 monthview_gui.c:210 weekview_gui.c:204
 msgid " (TODAY)"
 msgstr ""
 
-#: datebook_gui.c:4184 datebook_gui.c:4628
+#: datebook_gui.c:4202 datebook_gui.c:4646
 msgid "Week"
 msgstr "T??den"
 
-#: datebook_gui.c:4190
+#: datebook_gui.c:4208
 msgid "W"
 msgstr "T"
 
-#: datebook_gui.c:4192
+#: datebook_gui.c:4210
 msgid "View appointments by week"
 msgstr "Zobrazit akce po t??dnech"
 
-#: datebook_gui.c:4195 datebook_gui.c:4629
+#: datebook_gui.c:4213 datebook_gui.c:4647
 msgid "Month"
 msgstr "M??s??c"
 
-#: datebook_gui.c:4202
+#: datebook_gui.c:4220
 msgid "M"
 msgstr "M"
 
-#: datebook_gui.c:4204
+#: datebook_gui.c:4222
 msgid "View appointments by month"
 msgstr "Zobrazit akce po m??s??c??ch"
 
-#: datebook_gui.c:4209
+#: datebook_gui.c:4227
 msgid "Cats"
 msgstr "Kat."
 
-#: datebook_gui.c:4278
+#: datebook_gui.c:4296
 msgid "Time"
 msgstr "??as"
 
-#: datebook_gui.c:4315
+#: datebook_gui.c:4333
 msgid "Show ToDos"
 msgstr "Zobrazit ??koly"
 
-#: datebook_gui.c:4330 todo_gui.c:2131
+#: datebook_gui.c:4348 todo_gui.c:2131
 msgid "Task"
 msgstr "??kol"
 
-#: datebook_gui.c:4331 todo_gui.c:2132
+#: datebook_gui.c:4349 todo_gui.c:2132
 msgid "Due"
 msgstr "Term??n"
 
-#: datebook_gui.c:4428
+#: datebook_gui.c:4446
 msgid "Alarm"
 msgstr "Upozorn??n??"
 
-#: datebook_gui.c:4449
+#: datebook_gui.c:4467
 msgid "Days"
 msgstr "Dn??"
 
-#: datebook_gui.c:4472
+#: datebook_gui.c:4490
 msgid "This Event has no particular time"
 msgstr "Tato akce nem?? p??i??azen ??as."
 
-#: datebook_gui.c:4480
+#: datebook_gui.c:4498
 msgid "Starts on"
 msgstr "Za????n??"
 
-#: datebook_gui.c:4494
+#: datebook_gui.c:4512
 msgid "Start Time"
 msgstr "??as za????tku"
 
-#: datebook_gui.c:4512
+#: datebook_gui.c:4530
 msgid "End Time"
 msgstr "??as konce"
 
-#: datebook_gui.c:4610
+#: datebook_gui.c:4628
 msgid "DateBk Tags"
 msgstr "Zna??ky DateBk"
 
-#: datebook_gui.c:4627
+#: datebook_gui.c:4645
 msgid "Day"
 msgstr "Den"
 
-#: datebook_gui.c:4630
+#: datebook_gui.c:4648
 msgid "Year"
 msgstr "Rok"
 
-#: datebook_gui.c:4634
+#: datebook_gui.c:4652
 msgid "This event will not repeat"
 msgstr "Tato akce se neopakuje"
 
-#: datebook_gui.c:4644 datebook_gui.c:4676 datebook_gui.c:4732
-#: datebook_gui.c:4779
+#: datebook_gui.c:4662 datebook_gui.c:4694 datebook_gui.c:4750
+#: datebook_gui.c:4797
 msgid "Frequency is Every"
 msgstr "Opakovat ka??d??"
 
-#: datebook_gui.c:4649
+#: datebook_gui.c:4667
 msgid "Day(s)"
 msgstr "Den"
 
-#: datebook_gui.c:4652 datebook_gui.c:4684 datebook_gui.c:4740
-#: datebook_gui.c:4787
+#: datebook_gui.c:4670 datebook_gui.c:4702 datebook_gui.c:4758
+#: datebook_gui.c:4805
 msgid "End on"
 msgstr "Konec"
 
-#: datebook_gui.c:4681
+#: datebook_gui.c:4699
 msgid "Week(s)"
 msgstr "T??den"
 
-#: datebook_gui.c:4697
+#: datebook_gui.c:4715
 msgid "Repeat on Days:"
 msgstr "Opakovat ve dnech:"
 
-#: datebook_gui.c:4737
+#: datebook_gui.c:4755
 msgid "Month(s)"
 msgstr "M??s??c"
 
-#: datebook_gui.c:4754
+#: datebook_gui.c:4772
 msgid "Repeat by:"
 msgstr "Opakovat podle:"
 
-#: datebook_gui.c:4758
+#: datebook_gui.c:4776
 msgid "Day of week"
 msgstr "Dne v t??dnu"
 
-#: datebook_gui.c:4767
+#: datebook_gui.c:4785
 msgid "Date"
 msgstr "Data"
 
-#: datebook_gui.c:4784
+#: datebook_gui.c:4802
 msgid "Year(s)"
 msgstr "Rok"
 
@@ -989,38 +989,38 @@
 msgid " -T dump Todo list as CSV.\n"
 msgstr " -T vypsat Seznam ??kol?? jako CSV.\n"
 
-#: jpilot-sync.c:65
+#: jpilot-sync.c:66
 msgid ""
 " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
 msgstr ""
 " Nastaven?? J-Pilot jsou ??tena pro z??sk??n?? portu, rychlosti, po??tu z??loh "
 "atd.\n"
 
-#: jpilot-sync.c:66
+#: jpilot-sync.c:67
 msgid " -v = version\n"
 msgstr " -v = verze\n"
 
-#: jpilot-sync.c:67
+#: jpilot-sync.c:68
 msgid " -h = help\n"
 msgstr " -h = n??pov??da\n"
 
-#: jpilot-sync.c:68
+#: jpilot-sync.c:69
 msgid " -d = run in debug mode\n"
 msgstr " -d = spustit v ladic??m re??imu\n"
 
-#: jpilot-sync.c:69
+#: jpilot-sync.c:70
 msgid " -P = do not load plugins.\n"
 msgstr " -P = nena????tat z??suvn?? moduly.\n"
 
-#: jpilot-sync.c:70
+#: jpilot-sync.c:71
 msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
 msgstr " -b = Synchronizovat a zaz??lohovat, jinak jen synchronizovat.\n"
 
-#: jpilot-sync.c:71
+#: jpilot-sync.c:72
 msgid " -l = loop, otherwise sync once and exit.\n"
 msgstr " -l = opakovat, jinak synchronizovat jednou a skon??it.\n"
 
-#: jpilot-sync.c:72
+#: jpilot-sync.c:73
 msgid ""
 " -p {port} = Use this port to sync with instead of getting preferences.\n"
 msgstr ""
@@ -1162,22 +1162,18 @@
 msgstr "/_Zobrazit"
 
 #: jpilot.c:1397 jpilot.c:1398 jpilot.c:1399 jpilot.c:1653
-#, fuzzy
 msgid "/View/Hide Private Records"
-msgstr "/Zobrazit/Skr??t-zobrazit-maskovat soukrom?? z??znamy"
+msgstr "/Zobrazit/Skr??t  oukrom?? z??znamy"
 
 #: jpilot.c:1398
-#, fuzzy
 msgid "/View/Show Private Records"
-msgstr "/Zobrazit/Skr??t-zobrazit-maskovat soukrom?? z??znamy"
+msgstr "/Zobrazit/Zobrazovat soukrom?? z??znamy"
 
 #: jpilot.c:1399
-#, fuzzy
 msgid "/View/Mask Private Records"
-msgstr "/Zobrazit/Skr??t-zobrazit-maskovat soukrom?? z??znamy"
+msgstr "/Zobrazit/Maskovat soukrom?? z??znamy"
 
 #: jpilot.c:1400
-#, fuzzy
 msgid "/View/sep1"
 msgstr "/Soubor/sep1"
 
@@ -2457,11 +2453,11 @@
 msgid "Error reading file"
 msgstr "Chyba p??i ??ten?? souboru"
 
-#: utils.c:2475
+#: utils.c:2472
 msgid "PC ID is 0.\n"
 msgstr "ID PC je 0\n"
 
-#: utils.c:2476
+#: utils.c:2473
 #, c-format
 msgid "I generated a new PC ID.  It is %lu\n"
 msgstr "Vygeneroval jsem nov?? ID PC. Je to %lu\n"


Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jpilot.spec	29 May 2006 10:12:05 -0000	1.35
+++ jpilot.spec	27 Jun 2006 13:13:26 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -17,6 +17,7 @@
 Patch4: jpilot-0.99.8-sf.patch
 Patch5: jpilot-0.99.8-memory.patch
 Patch6: jpilot-0.99.8-sync.patch
+Patch7: jpilot-0.99.8-trans.patch
 
 BuildPrereq: gtk2-devel >= 2.0.3
 BuildPrereq: pilot-link-devel
@@ -39,6 +40,7 @@
 %patch4 -p1 -b .sf
 %patch5 -p1 -b .mem
 %patch6 -p1 -b .sync
+%patch7 -p1 -b .trans
 
 %build
 %configure \
@@ -48,6 +50,12 @@
   --disable-rpath \
   --enable-gtk2
 
+cd po
+make clean
+make update-po
+cd ..
+
+
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +94,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jun 27 2006 Ivana Varekova <varekova at redhat.com> 0.99.8-7
+- fix translation problems (#196852)
+
 * Mon May 29 2006 Ivana Varekova <varekova at redhat.com> 0.99.8-6
 - add prereq (perl-XML-Parser) (#193405)
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 13:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 09:15:56 -0400
Subject: rpms/beecrypt/devel beecrypt-4.1.2-biarch.patch, NONE,
	1.1 beecrypt.spec, 1.25, 1.26
Message-ID: <200606271315.k5RDFurT010434@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10181

Modified Files:
	beecrypt.spec 
Added Files:
	beecrypt-4.1.2-biarch.patch 
Log Message:
Fix multilib-devel

beecrypt-4.1.2-biarch.patch:
 gnu.h.in |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE beecrypt-4.1.2-biarch.patch ---
--- beecrypt-4.1.2/gnu.h.in.biarch	2006-05-22 15:53:45.000000000 -0400
+++ beecrypt-4.1.2/gnu.h.in	2006-05-22 15:53:49.000000000 -0400
@@ -61,7 +61,12 @@
  * make assumptions about the size set by the configure script
  */
 #if !defined(MP_WBITS)
-# define MP_WBITS	@MP_WBITS@
+# include <bits/wordsize.h>
+#if __WORDSIZE == 32
+# define MP_WBITS	32U
+#elif __WORDSIZE == 64
+# define MP_WBITS	64U
+#endif
 #endif
 
 #endif


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- beecrypt.spec	11 Feb 2006 02:06:17 -0000	1.25
+++ beecrypt.spec	27 Jun 2006 13:15:53 -0000	1.26
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 9.2.1
+Release: 10
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
@@ -13,6 +13,7 @@
 Source1: http://prdownloads.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz.sig
 Patch0: beecrypt-4.1.2-base64.patch
 Patch1: beecrypt-4.1.2-python-api.patch
+Patch2: beecrypt-4.1.2-biarch.patch
 BuildPreReq: doxygen
 %if %{?with_python:1}0
 BuildPreReq: python-devel >= %{with_python_version}
@@ -59,6 +60,7 @@
 %setup -q
 %patch0 -p1 -b .base64
 %patch1 -p1 -b .python-api
+%patch2 -p1 -b .biarch
 
 %build
 
@@ -118,6 +120,9 @@
 %endif
 
 %changelog
+* Mon May 22 2006 Paul Nasrat <pnasrat at redhat.com> - 4.1.2-10
+- Make multilib-devel work
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.2-9.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 13:29:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 09:29:30 -0400
Subject: rpms/jpilot/devel jpilot.spec,1.36,1.37
Message-ID: <200606271329.k5RDTUJC027982@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27743

Modified Files:
	jpilot.spec 
Log Message:
add BuildRequires: gettext



Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jpilot.spec	27 Jun 2006 13:13:26 -0000	1.36
+++ jpilot.spec	27 Jun 2006 13:29:28 -0000	1.37
@@ -19,6 +19,7 @@
 Patch6: jpilot-0.99.8-sync.patch
 Patch7: jpilot-0.99.8-trans.patch
 
+BuildRequires: gettext
 BuildPrereq: gtk2-devel >= 2.0.3
 BuildPrereq: pilot-link-devel
 BuildPrereq: pilot-link



From fedora-cvs-commits at redhat.com  Tue Jun 27 13:53:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 09:53:44 -0400
Subject: rpms/libpfm/devel libpfm-3.2-showreginfo.patch, NONE,
	1.1 libpfm-3.2-rpm_opt.patch, NONE, 1.1 libpfm.spec, 1.12, 1.13
Message-ID: <200606271353.k5RDriRE016567@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16367

Modified Files:
	libpfm.spec 
Added Files:
	libpfm-3.2-showreginfo.patch libpfm-3.2-rpm_opt.patch 
Log Message:
- Make sure that CFLAGS in pfmlib/lib/ is used.
- Separate build and install processes.
- Clean up the descriptions.



libpfm-3.2-showreginfo.patch:
 showreginfo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libpfm-3.2-showreginfo.patch ---
--- libpfm-3.2-060621/examples/showreginfo.c.fread	2006-06-26 23:21:03.000000000 -0400
+++ libpfm-3.2-060621/examples/showreginfo.c	2006-06-26 23:21:35.000000000 -0400
@@ -65,7 +65,7 @@
 	unsigned int num_pmds;
 	char *lname, *p, *s, *buffer, *ptr;
 	unsigned long long def, reset;
-	size_t pgsz;
+	size_t pgsz, elements;
 
 	num_pmcs = num_pmds = 0;
 
@@ -81,7 +81,7 @@
 	/*
 	 * sysfs file cannot exceed the size of a page.
 	 */
-	fread(buffer, pgsz, 1, fp);
+	elements=fread(buffer, pgsz, 1, fp);
 
 	fclose(fp);
 

libpfm-3.2-rpm_opt.patch:
 rules.mk |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE libpfm-3.2-rpm_opt.patch ---
--- libpfm-3.2-060621/rules.mk.orig	2006-04-05 08:55:12.000000000 -0400
+++ libpfm-3.2-060621/rules.mk	2006-06-27 00:19:08.000000000 -0400
@@ -25,12 +25,12 @@
 .SUFFIXES: .c .S .o .lo .cpp
 
 .S.o:
-	$(CC) $(INCDIR) $(CFLAGS) -c $*.S
+	$(CC) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S
 .c.o:
-	$(CC) $(INCDIR) $(CFLAGS) -c $*.c
+	$(CC) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c
 .cpp.o:
-	$(CXX) $(INCDIR) $(CFLAGS) -c $*.cpp
+	$(CXX) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.cpp
 .c.lo:
-	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) -c $*.c -o $*.lo
+	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c -o $*.lo
 .S.lo:
-	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) -c $*.S -o $*.lo
+	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S -o $*.lo


Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libpfm.spec	26 Jun 2006 21:09:45 -0000	1.12
+++ libpfm.spec	27 Jun 2006 13:53:41 -0000	1.13
@@ -1,5 +1,5 @@
 %define DATE 060621
-%define libpfm_release 1
+%define libpfm_release 6
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.2
@@ -11,33 +11,40 @@
 AutoReqProv: no
 Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}-%{DATE}.tar.gz
 Patch1: libpfm-compat.patch
+Patch2: libpfm-3.2-showreginfo.patch
+Patch3: libpfm-3.2-rpm_opt.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 This package contains a library to develop performance monitoring 
-applications using the IA-64 Performance Monitor Unit (PMU). 
-This version supports both the Itanium and Itanium 2 processors.
+applications using the Performance Monitor Unit (PMU) available on
+various processors.
 
 %package devel
-Summary: the Linux/ia64 performance library (libpfm) development files.
+Summary: the Linux performance library (libpfm) development files.
 Group: Development/Libraries
 
 %description devel
 The performance monitoring library (libpfm) is used to develop 
-performance monitoring applications using the IA-64 Performance Monitoring 
-Unit (PMU). This package provides the files necessary for development of
-applications. This version supports both the Itanium and Itanium 2 processors.
+performance monitoring applications using the Performance Monitoring 
+Unit (PMU) available on various processors. This package provides the
+files necessary for development of applications.
 It requires a kernel perfmon-2.x subsystem.
 
 %prep
 %setup -q -n %{name}-%{version}-%{DATE}
 %patch1 -p1 -b .compat
+%patch2 -p1 -b .showreginfo
+%patch3 -p1 -b .rpm_opt
+
+%build
+make	DESTDIR=%{buildroot}/%{_prefix}
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_prefix}
-make install   CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-	DESTDIR=%{buildroot}/%{_prefix}
+make install DESTDIR=%{buildroot}/%{_prefix}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -60,6 +67,11 @@
 
 %changelog
 * Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
+- Make sure that CFLAGS in pfmlib/lib/ is used.
+- Separate build and install processes.
+- Clean up the descriptions.
+
+* Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
 - Update to libpfm-3.2-060621.
 
 * Wed Jun 14 2006 Will Cohen <wcohen at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Jun 27 14:03:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 10:03:56 -0400
Subject: rpms/pfmon/devel pfmon-fortify.patch, NONE, 1.1 pfmon-rpm_opt.patch,
	NONE, 1.1 pfmon.spec, 1.14, 1.15
Message-ID: <200606271403.k5RE3uen019679@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19613

Modified Files:
	pfmon.spec 
Added Files:
	pfmon-fortify.patch pfmon-rpm_opt.patch 
Log Message:
- Separate build and install processes.
- Make sure that $(RPM_OPT_FLAGS) is used.
- Patches to store return values.
- Clean up desciption.



pfmon-fortify.patch:
 pfmon_smpl.c |    5 ++++-
 pfmon_task.c |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE pfmon-fortify.patch ---
--- pfmon-3.2-060621/pfmon/pfmon_task.c.fortify	2006-06-27 09:27:25.000000000 -0400
+++ pfmon-3.2-060621/pfmon/pfmon_task.c	2006-06-27 09:25:19.000000000 -0400
@@ -1653,6 +1653,7 @@
 	int ctrl_fd;
 	int max_fd;
 	int ndesc, msg_type;
+	ssize_t dummy;
 
 	/*
 	 * POSIX threads: 
@@ -1789,7 +1790,7 @@
 					/*
 					 * ack the removal
 					 */
-					write(workers[mycpu].from_worker[1], &msg, sizeof(msg));
+					dummy = write(workers[mycpu].from_worker[1], &msg, sizeof(msg));
 					break;
 
 				case PFMON_TASK_MSG_QUIT:
--- pfmon-3.2-060621/pfmon/pfmon_smpl.c.fortify	2006-06-27 09:30:32.000000000 -0400
+++ pfmon-3.2-060621/pfmon/pfmon_smpl.c	2006-06-27 09:29:15.000000000 -0400
@@ -444,6 +444,7 @@
 	size_t len, pref_len;
 	char uuid_str[64];
 	char buffer[256];
+	char *p;
 
 	if (options.opt_is22 == 0)
 		return pfmon_check_smpl_module_legacy(uuid);
@@ -482,7 +483,9 @@
 		if (fp == NULL)
 			continue;
 
-		fgets(buffer, sizeof(buffer)-1, fp);
+		p = fgets(buffer, sizeof(buffer)-1, fp);
+		if (p == NULL)
+			continue;
 
 		if (!strncmp(buffer, uuid_str, len)) {
 			DPRINT(("found uuid_str:%s:\nuuid_p:%s", uuid_str, buffer));

pfmon-rpm_opt.patch:
 rules.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pfmon-rpm_opt.patch ---
--- pfmon-3.2-060621/rules.mk.old	2006-05-15 10:07:52.000000000 -0400
+++ pfmon-3.2-060621/rules.mk	2006-06-27 00:33:06.000000000 -0400
@@ -20,8 +20,8 @@
 .SUFFIXES: .c .S .o
 
 .S.o:
-	$(CC) $(INCDIR) $(CFLAGS) -c $*.S
+	$(CC) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S
 .c.o:
-	$(CC) $(INCDIR) $(CFLAGS) -c $*.c
+	$(CC) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c
 
 


Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pfmon.spec	26 Jun 2006 21:22:36 -0000	1.14
+++ pfmon.spec	27 Jun 2006 14:03:53 -0000	1.15
@@ -1,5 +1,5 @@
 %define DATE 060621
-%define pfmon_release 2
+%define pfmon_release 6
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
@@ -13,16 +13,18 @@
 Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}-%{DATE}.tar.gz
 #Patch1: pfmon-check_support.patch
 Patch2: pfmon-nounwind.patch
+Patch3: pfmon-rpm_opt.patch
+Patch4: pfmon-fortify.patch
 Requires: libpfm
 BuildPreReq: elfutils-devel
-BuildPreReq: libpfm >= 3.2-0.060621.1
-BuildPreReq: libpfm-devel >= 3.2-0.060621.1
+BuildPreReq: libpfm >= 3.2-0.060613.6
+BuildPreReq: libpfm-devel >= 3.2-0.060613.6
 
 %description
 This package contains pfmon 3.x, a tool to monitor performance using
-the IA-64 Performance Monitor Unit (PMU). Pfmon can monitor
-standalone programs or the entire system on both UP and SMP Linux/ia64 systems.
-This version supports both the Itanium and Itanium 2 processors. This version
+the Performance Monitor Unit (PMU). Pfmon can monitor
+standalone programs or the entire system on both UP and SMP Linux systems.
+This version
 of pfmon requires a kernel perfmon-2.x (found in 2.6 kernels) subsystem to 
 function properly.
 
@@ -30,11 +32,17 @@
 %setup -q -n %{name}-%{version}-%{DATE}
 #%patch1 -p1 -b .check_support
 %patch2 -p1 -b .nounwind
+%patch3 -p1 -b .rpm_opt
+%patch4 -p1 -b .fortify
+
+%build
+make	DESTDIR=${RPM_BUILD_ROOT}/usr DESTROOT=/usr PFMROOTDIR=/usr
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr
-make install  DESTDIR=${RPM_BUILD_ROOT}/usr DESTROOT=/usr PFMROOTDIR=/usr \
-CONFIG_FLAGS="$RPM_OPT_FLAGS"
+make install  DESTDIR=${RPM_BUILD_ROOT}/usr DESTROOT=/usr PFMROOTDIR=/usr
+
 
 ( cd $RPM_BUILD_ROOT/usr/bin; rm pfmon_gen; ln -s pfmon pfmon_gen )
 
@@ -50,6 +58,12 @@
 %attr(755,root,root) /usr/bin/pfmon_gen
 
 %changelog
+* Tue Jun 27 2006 Will Cohen <wcohen at redhat.com>
+- Separate build and install processes.
+- Make sure that $(RPM_OPT_FLAGS) is used.
+- Patches to store return values.
+- Clean up desciption.
+
 * Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
 - Correct buildprereq.
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 14:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 10:32:31 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.113, 1.114 sources, 1.184,
	1.185
Message-ID: <200606271432.k5REWViK010287@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10266

Modified Files:
	.cvsignore sources 
Log Message:
next set of source


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- .cvsignore	22 Jun 2006 15:14:53 -0000	1.113
+++ .cvsignore	27 Jun 2006 14:32:17 -0000	1.114
@@ -177,3 +177,4 @@
 OOC680_m4.tar.bz2
 OOC680_m5.tar.bz2
 OOC680_m6.tar.bz2
+OOC680_m7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- sources	22 Jun 2006 15:14:53 -0000	1.184
+++ sources	27 Jun 2006 14:32:17 -0000	1.185
@@ -10,4 +10,4 @@
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
 ad337f9c78224e0d7ad2a17f53fd584c  openoffice.org-simple-crash_report.sh
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
-35fa066628502dac73e7e82cd1db4a0b  OOC680_m6.tar.bz2
+9fdd09e15efe8e356fffbec5abbc39e1  OOC680_m7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jun 27 14:47:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 10:47:14 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.38,
	1.39
Message-ID: <200606271447.k5RElEBK029096@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27768

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com>
- Ship translations with libs subpackage.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- system-config-printer.spec	23 Jun 2006 16:44:15 -0000	1.38
+++ system-config-printer.spec	27 Jun 2006 14:47:11 -0000	1.39
@@ -81,7 +81,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files libs
+%files libs -f system-config-printer.lang
 %defattr(-,root,root)
 %doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO}
 %{_libdir}/python*/*/*.so
@@ -90,7 +90,7 @@
 %{_datadir}/%{name}/cupshelpers.py*
 %{_datadir}/%{name}/gtk_html2pango.py*
 
-%files -f system-config-printer.lang
+%files
 %defattr(-,root,root)
 %doc ChangeLog README NEWS TODO
 %{_bindir}/%{name}
@@ -110,6 +110,9 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com>
+- Ship translations with libs subpackage.
+
 * Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.17-1
 - 0.7.17.
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:11:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:11:45 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.86,1.87
Message-ID: <200606271511.k5RFBjAr011864@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11850

Modified Files:
	kdepim.spec 
Log Message:
fix #196741, BR: libXpm-devel libXScrnSaver-devel



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdepim.spec	19 Jun 2006 10:45:04 -0000	1.86
+++ kdepim.spec	27 Jun 2006 15:11:33 -0000	1.87
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 2
+Release: 3
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -43,6 +43,9 @@
 BuildRequires: audiofile-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: lockdev-devel
+BuildRequires: python-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXScrnSaver-devel
 %if %{arts}
 BuildRequires: arts-devel >= %{arts_version}
 %endif
@@ -211,6 +214,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Jun 27 2006 Than Ngo <than at redhat.com> 6:3.5.3-3
+- fix #196741, BR: libXpm-devel libXScrnSaver-devel
+
 * Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
 - BR: cyrus-sasl-devel, #195500 
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:17:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:17:00 -0400
Subject: rpms/kdepim/FC-5 kdepim.spec,1.89,1.90
Message-ID: <200606271517.k5RFH0hX026617@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24833

Modified Files:
	kdepim.spec 
Log Message:
fix #196741, BR: libXpm-devel libXScrnSaver-devel




Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdepim.spec	19 Jun 2006 12:41:21 -0000	1.89
+++ kdepim.spec	27 Jun 2006 15:16:58 -0000	1.90
@@ -11,7 +11,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 0.2.fc5
+Release: 0.3.fc5
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -49,6 +49,9 @@
 BuildRequires: audiofile-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: lockdev-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: python-devel
 %if %{arts}
 BuildRequires: arts-devel >= %{arts_version}
 %endif
@@ -188,6 +191,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Jun 27 2006 Than Ngo <than at redhat.com> 3.5.3-0.3.fc5
+- fix #196741, BR: libXpm-devel libXScrnSaver-devel
+
 * Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
 - BR: cyrus-sasl-devel, #195500 
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:26:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:26:32 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, NONE,
	1.1 openoffice.org.spec, 1.669, 1.670
Message-ID: <200606271526.k5RFQWjL026955@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26940

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch 
Log Message:
rebuild for vor problem

openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch:
 cppuhelper/inc/cppuhelper/implbase1.hxx |   12 ++++++------
 inc/cppuhelper/implbase1.hxx            |    0 
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch ---
Index: inc/cppuhelper/implbase1.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase1.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	5 Oct 2005 14:23:42 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	27 Jun 2006 14:51:27 -0000
@@ -57,7 +57,7 @@
     /** @internal */
     template< typename Ifc1, typename Impl > struct ImplClassData1
     {
-        class_data* operator ()()
+        static class_data* get()
         {
             static class_data1 s_cd =
             {
@@ -85,7 +85,7 @@
         : public ::com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {};
+        struct cd : public ImplClassData1 < Ifc1, ImplHelper1<Ifc1> >{};
     public:
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
@@ -109,7 +109,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {};
+	struct cd : public ImplClassData1 < Ifc1, WeakImplHelper1<Ifc1> >{};
     public:
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
@@ -142,7 +142,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {};
+	struct cd : public ImplClassData1 < Ifc1, WeakAggImplHelper1<Ifc1> >{};
     public:
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
@@ -179,7 +179,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
+        struct cd : ImplClassData1< Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > {};
     protected:
         template< typename T1 >
         explicit ImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
@@ -248,7 +248,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, AggImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
+        struct cd : ImplClassData1< Ifc1, AggImplInheritanceHelper1< BaseClass, Ifc1 > > {};
     protected:
         template< typename T1 >
         explicit AggImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -r1.669 -r1.670
--- openoffice.org.spec	26 Jun 2006 15:37:02 -0000	1.669
+++ openoffice.org.spec	27 Jun 2006 15:26:30 -0000	1.670
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 14
+%define rh_rpm_release 15
 
 %define build_fc5 1
 
@@ -176,6 +176,7 @@
 Patch48: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
 Patch49: disable-java-applets.diff
 Patch50: sax+source+expatwrap+xml2utf.cxx.diff
+Patch51: openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -835,6 +836,7 @@
 %patch48 -p1 -b .oooXXXXX.safety.sfx2.patch
 %patch49 -p1 -b .disable-java-applets.diff
 %patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
+%patch51 -p1 -b .gccXXXXX.linguistic.vorcrash.patch
 
 
 %if %{includingexternals}
@@ -3281,11 +3283,14 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.14
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.15
 - CVE-2006-2198 macro security
 - CVE-2006-2199 java applets
 - CVE-2006-3117 corrupt file format
 - rh#195637# add openoffice.org-2.0.3.ooo65519.printing.samba.patch
+- add openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch because 
+  FC-5 updated gcc seems to cause the same problem with sdws and vors 
+  as FC-6
 
 * Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:26:38 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, NONE,
	1.1 workspace.sixtyfour06.patch, NONE, 1.1 openoffice.org.spec,
	1.744,
	1.745 openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch,
	1.3, NONE
Message-ID: <200606271526.k5RFQcfX026983@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26948

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch 
	workspace.sixtyfour06.patch 
Removed Files:
	openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch 
Log Message:
next milestone

openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch:
 cppuhelper/inc/cppuhelper/implbase1.hxx |   12 ++++++------
 inc/cppuhelper/implbase1.hxx            |    0 
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch ---
Index: inc/cppuhelper/implbase1.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase1.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	5 Oct 2005 14:23:42 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	27 Jun 2006 14:51:27 -0000
@@ -57,7 +57,7 @@
     /** @internal */
     template< typename Ifc1, typename Impl > struct ImplClassData1
     {
-        class_data* operator ()()
+        static class_data* get()
         {
             static class_data1 s_cd =
             {
@@ -85,7 +85,7 @@
         : public ::com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {};
+        struct cd : public ImplClassData1 < Ifc1, ImplHelper1<Ifc1> >{};
     public:
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
@@ -109,7 +109,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {};
+	struct cd : public ImplClassData1 < Ifc1, WeakImplHelper1<Ifc1> >{};
     public:
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
@@ -142,7 +142,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {};
+	struct cd : public ImplClassData1 < Ifc1, WeakAggImplHelper1<Ifc1> >{};
     public:
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
@@ -179,7 +179,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
+        struct cd : ImplClassData1< Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > {};
     protected:
         template< typename T1 >
         explicit ImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
@@ -248,7 +248,7 @@
         , public Ifc1
     {
         /** @internal */
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, AggImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
+        struct cd : ImplClassData1< Ifc1, AggImplInheritanceHelper1< BaseClass, Ifc1 > > {};
     protected:
         template< typename T1 >
         explicit AggImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}

workspace.sixtyfour06.patch:
 fpicker/source/unx/gnome/SalGtkFilePicker.cxx   |    8 ++--
 fpicker/source/unx/gnome/SalGtkFolderPicker.cxx |    2 -
 inc/solar.h                                     |    0 
 tools/inc/solar.h                               |    3 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx        |   46 ++++++++++++------------
 5 files changed, 28 insertions(+), 31 deletions(-)

--- NEW FILE workspace.sixtyfour06.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.28
retrieving revision 1.28.10.1
diff -u -r1.28 -r1.28.10.1
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	19 Jun 2006 19:45:12 -0000	1.28
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	27 Jun 2006 12:15:14 -0000	1.28.10.1
@@ -550,7 +550,7 @@
 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
 									    "has-secondary-forward-stepper", &has_forward2,
 									    "has-backward-stepper", &has_backward,
-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
+	   								    "has-secondary-backward-stepper", &has_backward2, (char *)NULL );
         Rectangle aForward;
         Rectangle aBackward;
 
@@ -910,7 +910,7 @@
                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
             gtk_widget_style_get( pWidget,
                                   "indicator_size", &indicator_size,
-                                  NULL );
+                                  (char *)NULL );
             rNativeBoundingRegion = rControlRegion;
             Rectangle aIndicatorRect( Point( 0,
                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
         gtk_widget_style_get( widget,
                               "indicator_size", &indicator_size,
                               "indicator_spacing", &indicator_spacing,
-                              NULL);
+                              (char *)NULL);
         indicator_size += 2*indicator_spacing; // guess overpaint of theme
         rNativeBoundingRegion = rControlRegion;
         Rectangle aIndicatorRect( Point( 0,
@@ -977,7 +977,7 @@
 								"focus-padding", 	&focusPad,
 					 			"interior_focus",	&interiorFocus,
 								"default_border",	&pBorder,
-								NULL );
+								(char *)NULL );
 
 	// Make sure the border values exist, otherwise use some defaults
 	if ( pBorder )
@@ -1079,7 +1079,7 @@
 								"focus-padding", 	&focusPad,
 					 			"interior_focus",	&interiorFocus,
 								"default_border",	&pBorder,
-								NULL );
+								(char *)NULL );
 
 	// Make sure the border values exist, otherwise use some defaults
 	if ( pBorder )
@@ -1132,7 +1132,7 @@
 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
     gint indicator_size;
-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (char *)NULL);
 
     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1190,7 +1190,7 @@
 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
     gint indicator_size;
-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (char *)NULL);
 
     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1289,7 +1289,7 @@
 									  "stepper_size", &stepper_size,
 									  "trough_border", &trough_border,
 									  "stepper_spacing", &stepper_spacing,
-									  "min_slider_length", &min_slider_length, NULL );
+									  "min_slider_length", &min_slider_length, (char *)NULL );
     gboolean has_forward;
     gboolean has_forward2;
     gboolean has_backward;
@@ -1298,7 +1298,7 @@
 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
 									  "has-secondary-forward-stepper", &has_forward2,
 									  "has-backward-stepper", &has_backward,
-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
+	   								  "has-secondary-backward-stepper", &has_backward2, (char *)NULL );
 	gint magic = trough_border ? 1 : 0;
     gint nFirst = 0;
 
@@ -1568,7 +1568,7 @@
 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
 									  "stepper-size", &stepper_size,
 									  "trough-border", &trough_border,
-	   								  "stepper-spacing", &stepper_spacing, NULL );
+	   								  "stepper-spacing", &stepper_spacing, (char *)NULL );
 
     gboolean has_forward;
     gboolean has_forward2;
@@ -1578,7 +1578,7 @@
 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
 									  "has-secondary-forward-stepper", &has_forward2,
 									  "has-backward-stepper", &has_backward,
-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
+	   								  "has-secondary-backward-stepper", &has_backward2, (char *)NULL );
 	gint       buttonWidth;
 	gint       buttonHeight;
 	Rectangle  buttonRect;
@@ -1685,7 +1685,7 @@
 
 	// Grab some entry style attributes
 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
-					 				"interior-focus",	&interiorFocus, NULL );
+					 				"interior-focus",	&interiorFocus, (char *)NULL );
 
 	if ( !interiorFocus )
 	{
@@ -1836,7 +1836,7 @@
 	}
 
 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (char *)NULL );
 
 	if ( shadowType != GTK_SHADOW_NONE )
 	{
@@ -2046,7 +2046,7 @@
 
 	// Grab some button style attributes
 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
-									"focus-padding", 	&nFocusPad, NULL );
+									"focus-padding", 	&nFocusPad, (char *)NULL );
 
 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
     nButtonWidth = nArrowWidth +
@@ -2270,7 +2270,7 @@
 			"interior_focus",	&bInteriorFocus,
 			"focus_line_width",	&nFocusLineWidth,
 			"focus_padding",	&nFocusPadding,
-			NULL);
+			(char *)NULL);
     }
     
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2480,7 +2480,7 @@
         {
             gtk_widget_style_get( gMenuItemMenubarWidget,
                                   "selected_shadow_type", &selected_shadow_type,
-                                  NULL);
+                                  (char *)NULL);
         }
     }
     
@@ -2569,7 +2569,7 @@
     {
         gtk_widget_style_get( gMenuItemMenuWidget,
                               "selected_shadow_type", &selected_shadow_type,
-                              NULL);
+                              (char *)NULL);
     }
 
     NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2727,7 +2727,7 @@
 
 	gtk_widget_style_get( gOptionMenuWidget,
 			"indicator_size",	&pIndicatorSize,
-			"indicator_spacing",&pIndicatorSpacing, NULL);
+			"indicator_spacing",&pIndicatorSpacing, (char *)NULL);
 	
 	if ( pIndicatorSize )
 		width = pIndicatorSize->width;
@@ -2788,7 +2788,7 @@
 
 	gtk_widget_style_get( gOptionMenuWidget,
 			"indicator_size",	&pIndicatorSize,
-			"indicator_spacing",&pIndicatorSpacing, NULL);
+			"indicator_spacing",&pIndicatorSpacing, (char *)NULL);
 	
 	if ( pIndicatorSize )
     {
@@ -3071,11 +3071,11 @@
     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
     gboolean blink = false;
 
-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+    g_object_get( pSettings, "gtk-cursor-blink", &blink, (char *)NULL );
     if( blink )
     {
         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (char *)NULL );
         // set the blink_time if there is a setting and it is reasonable
         // else leave the default value
         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3094,7 +3094,7 @@
                           "slider-width", &slider_width,
                           "trough-border", &trough_border,
                           "min-slider-length", &min_slider_length,
-                          NULL );
+                          (char *)NULL );
     gint magic = trough_border ? 1 : 0;
     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
     aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3436,7 +3436,7 @@
         gtk_widget_ensure_style( gToolbarWidget );
         gtk_widget_style_get( gToolbarWidget,
 			                  "button_relief", &aRelief,
-                              NULL);
+                              (char *)NULL);
                               
         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -u -r1.12 -r1.12.6.1
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	20 Jun 2006 00:13:35 -0000	1.12
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	27 Jun 2006 12:15:14 -0000	1.12.6.1
@@ -208,7 +208,7 @@
 			GTK_FILE_CHOOSER_ACTION_OPEN,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-			NULL );
+			(char *)NULL );
 
 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 
@@ -347,7 +347,7 @@
         cell = gtk_cell_renderer_text_new ();
         gtk_tree_view_column_set_expand (column, TRUE);
         gtk_tree_view_column_pack_start (column, cell, FALSE);
-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+        gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL);
         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
     }
 
@@ -377,7 +377,7 @@
     PangoRectangle row_height;
     pango_layout_set_markup (layout, "All Files", -1);
     pango_layout_get_pixel_extents (layout, NULL, &row_height);
-    g_object_get (cell, "ypad", &ypad, NULL);
+    g_object_get (cell, "ypad", &ypad, (char *)NULL);
     guint height = (row_height.height + 2*ypad) * 5;
     gtk_widget_set_size_request (m_pFilterView, -1, height);
     gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1413,7 +1413,7 @@
 	}
 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
 		g_object_set( pWidget, "label", aTxt.getStr(),
-					  "use_underline", TRUE, NULL );
+					  "use_underline", TRUE, (char *)NULL );
 	else
 		OSL_TRACE("Can't set label on list\n");
 }
Index: source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -u -r1.7 -r1.7.6.1
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	20 Jun 2006 00:13:58 -0000	1.7
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	27 Jun 2006 12:15:14 -0000	1.7.6.1
@@ -125,7 +125,7 @@
     m_pDialog = gtk_file_chooser_dialog_new(
     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
 
 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
retrieving revision 1.44
diff -u -r1.44 solar.h
--- openoffice.org.orig/tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
+++ openoffice.org/tools/inc/solar.h	27 Jun 2006 15:20:52 -0000
@@ -55,9 +55,6 @@
 #define FALSE		0
 #endif
 
-#undef NULL
-#define NULL		0
-
 #ifdef _SOLAR__PRIVATE
 #undef _SOLAR__PRIVATE
 #endif


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.744
retrieving revision 1.745
diff -u -r1.744 -r1.745
--- openoffice.org.spec	27 Jun 2006 11:33:48 -0000	1.744
+++ openoffice.org.spec	27 Jun 2006 15:26:36 -0000	1.745
@@ -1,5 +1,5 @@
 %define oootag OOC680
-%define ooomilestone 6
+%define ooomilestone 7
 %define rh_rpm_release 1
 
 # gcc#19664#
@@ -103,8 +103,9 @@
 Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch40: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
+Patch40: openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch
 Patch41: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch42: workspace.sixtyfour06.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -835,8 +836,9 @@
 %patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch40 -p1 -b .ooo66018.linguistic.vorcrash.patch
+%patch40 -p1 -b .gccXXXXX.linguistic.vorcrash.patch
 %patch41 -p1 -b .ooo65519.printing.samba.patch
+%patch42 -p1 -b .workspace.sixtyfour06.patch
 
 tar xzf %{SOURCE1}
 
@@ -3312,6 +3314,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
+- next milestone
+- track down vor and sdw crashes to some gcc problem with static initializers, 
+	failed to be able to find a standalone testcase though :-( => workaround
+- add workspace.sixtyfour06.patch for x86_64 stability
+
 * Thu Jun 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-6.1
 - next milestone
 - drop hack and use new gtk_print_unix_dialog_set_manual_capabilities api instead


--- openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:39:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:39:23 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.76, 1.77 sources,
	1.79, 1.80 system-config-printer.spec, 1.39, 1.40
Message-ID: <200606271539.k5RFdNLC027514@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27497

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com> 0.7.18-1
- 0.7.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	23 Jun 2006 16:44:15 -0000	1.76
+++ .cvsignore	27 Jun 2006 15:39:21 -0000	1.77
@@ -56,3 +56,4 @@
 system-config-printer-0.7.15.tar.bz2
 system-config-printer-0.7.16.tar.bz2
 system-config-printer-0.7.17.tar.bz2
+system-config-printer-0.7.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	23 Jun 2006 16:44:15 -0000	1.79
+++ sources	27 Jun 2006 15:39:21 -0000	1.80
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-fca89cb65a113312fe9640f40d30da44  system-config-printer-0.7.17.tar.bz2
+eb35f554cd691109ce194a57083d7bdd  system-config-printer-0.7.18.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-printer.spec	27 Jun 2006 14:47:11 -0000	1.39
+++ system-config-printer.spec	27 Jun 2006 15:39:21 -0000	1.40
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.17
+Version: 0.7.18
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -110,7 +110,8 @@
 %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com> 0.7.18-1
+- 0.7.18.
 - Ship translations with libs subpackage.
 
 * Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.17-1



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:40:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:40:31 -0400
Subject: rpms/smartmontools/devel smartd-conf.py, 1.8, 1.9 smartd.initd, 1.2,
	1.3 smartmontools.spec, 1.20, 1.21
Message-ID: <200606271540.k5RFeVc4005609@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/smartmontools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5562

Modified Files:
	smartd-conf.py smartd.initd smartmontools.spec 
Log Message:
* Tue Jun 27 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-2
- kudzu is deprecated, replace it with HAL (#195752)
- moved later in the boot process so haldaemon is already running
  when drives are being detected



Index: smartd-conf.py
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartd-conf.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- smartd-conf.py	2 May 2006 13:47:46 -0000	1.8
+++ smartd-conf.py	27 Jun 2006 15:40:29 -0000	1.9
@@ -1,9 +1,36 @@
 #!/usr/bin/python
-# Copyright 2004 Red Hat, Inc. Distributed under the GPL.
-# Author: Will Woods <wwoods at redhat.com>
-import kudzu
+# Copyright 2004-2006 Red Hat, Inc. Distributed under the GPL.
+# Authors: Will Woods <wwoods at redhat.com>, Tomas Mraz <tmraz at redhat.com>
+
 import os
-drives=kudzu.probe(kudzu.CLASS_HD,kudzu.BUS_IDE|kudzu.BUS_SCSI,kudzu.PROBE_ALL)
+import dbus
+
+class Drive:
+    def __init__(self, bus, device, sysfspath):
+	    self.bus = bus
+	    self.device = device
+	    self.sysfspath = sysfspath
+
+def listDrivesbyHAL():
+    drives = []
+    bus = dbus.SystemBus()
+    halm_obj = bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
+    halm = dbus.Interface(halm_obj, 'org.freedesktop.Hal.Manager')
+
+    storage_udi_list = halm.FindDeviceByCapability('storage')
+    for udi in storage_udi_list:
+	drive_obj = bus.get_object('org.freedesktop.Hal', udi)
+	drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
+	storage_bus = drive.GetProperty('storage.bus')
+	drive_type = drive.GetProperty('storage.drive_type')
+	if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
+	    device_file = drive.GetProperty('block.device')
+	    sysfs_path = drive.GetProperty('linux.sysfs_path')
+	    drv = Drive(storage_bus, device_file, sysfs_path)
+	    drives += [drv]
+    return drives
+                                                                  
+drives = listDrivesbyHAL()
 
 print """# *SMARTD*AUTOGENERATED* /etc/smartd.conf
 # Remove the line above if you have edited the file and you do not want
@@ -47,19 +74,19 @@
     return line
 
 for drive in drives:
-    if getfile("/sys/block/%s/removable" % drive.device) == '0':
+    if getfile("%s/removable" % drive.sysfspath) == '0':
 	driver = ''
 	comment = ''
-	if getfile("/sys/block/%s/device/vendor" % drive.device) == 'ATA':
+	if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
 	    driver = '-d ata '
 	    if float(getfile("/sys/module/libata/version")) < 1.20:
 		comment = "# not yet supported in this kernel version\n# "
 	if not comment:
-	    status = os.system("/usr/sbin/smartctl -i %s/dev/%s 2>&1 >/dev/null" %
+	    status = os.system("/usr/sbin/smartctl -i %s%s 2>&1 >/dev/null" %
 		(driver, drive.device))
 	    if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
 		comment = "# smartctl -i returns error for this drive\n# "
-	print "%s/dev/%s %s-H -m root" % (comment, drive.device, driver)
+	print "%s%s %s-H -m root" % (comment, drive.device, driver)
 
 print """
 # First two SCSI disks.  This will monitor everything that smartd can


Index: smartd.initd
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smartd.initd	2 May 2006 13:47:46 -0000	1.2
+++ smartd.initd	27 Jun 2006 15:40:29 -0000	1.3
@@ -5,7 +5,7 @@
 # $Id$
 
 # For RedHat and cousins:
-# chkconfig: 2345 40 40
+# chkconfig: 2345 99 01
 # description: Self Monitoring and Reporting Technology (SMART) Daemon
 # processname: smartd 
 
@@ -37,7 +37,9 @@
     start | reload | restart)
 GEN_CONF="*SMARTD*AUTOGENERATED*"
 [ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
-&& [ $GEN_CONF == "*SMARTD*AUTOGENERATED*" ] && smartd-conf.py >/etc/smartd.conf
+&& [ $GEN_CONF == "*SMARTD*AUTOGENERATED*" ] \
+&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
+&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
     ;;
 esac
 


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smartmontools.spec	11 May 2006 07:54:10 -0000	1.20
+++ smartmontools.spec	27 Jun 2006 15:40:29 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.36
-Release: 	1
+Release: 	2
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -15,7 +15,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 PreReq:		/sbin/chkconfig /sbin/service
-Requires:	fileutils kudzu
+Requires:	fileutils hal >= 0.5.2 dbus-python >= 0.33
 BuildRequires: 	readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext
 Obsoletes:	kernel-utils
 ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
@@ -76,6 +76,11 @@
 
 
 %changelog
+* Tue Jun 27 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-2
+- kudzu is deprecated, replace it with HAL (#195752)
+- moved later in the boot process so haldaemon is already running
+  when drives are being detected
+
 * Thu May 11 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-1
 - new upstream version
 - included patch with support for cciss controllers (#191288)



From fedora-cvs-commits at redhat.com  Tue Jun 27 15:50:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 11:50:25 -0400
Subject: rpms/kernel/devel/configs config-rhel-generic,1.7,1.8
Message-ID: <200606271550.k5RFoPh9024078@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv23766/configs

Modified Files:
	config-rhel-generic 
Log Message:
disabling more options that cause a headache and is not needed in rhel




Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-rhel-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-rhel-generic	14 Jun 2006 00:15:04 -0000	1.7
+++ config-rhel-generic	27 Jun 2006 15:50:23 -0000	1.8
@@ -189,4 +189,4 @@
 # CONFIG_JFS_FS is not set
 # CONFIG_I2C_PCA_ISA is not set
 # CONFIG_DECNET is not set
-
+# CONFIG_TCG_TPM is not set



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:04:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:04:44 -0400
Subject: rpms/beecrypt/devel beecrypt.spec,1.26,1.27
Message-ID: <200606271604.k5RG4imr029558@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29530

Modified Files:
	beecrypt.spec 
Log Message:
fix br


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- beecrypt.spec	27 Jun 2006 13:15:53 -0000	1.26
+++ beecrypt.spec	27 Jun 2006 16:04:41 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 10
+Release: 10.1
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
@@ -15,6 +15,7 @@
 Patch1: beecrypt-4.1.2-python-api.patch
 Patch2: beecrypt-4.1.2-biarch.patch
 BuildPreReq: doxygen
+BuildRequires: m4
 %if %{?with_python:1}0
 BuildPreReq: python-devel >= %{with_python_version}
 %endif



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:05:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:05:12 -0400
Subject: rpms/beecrypt/devel beecrypt.spec,1.27,1.28
Message-ID: <200606271605.k5RG5C37029738@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29710

Modified Files:
	beecrypt.spec 
Log Message:
fix br


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- beecrypt.spec	27 Jun 2006 16:04:41 -0000	1.27
+++ beecrypt.spec	27 Jun 2006 16:05:09 -0000	1.28
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 10.1
+Release: 10
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:14:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:14:16 -0400
Subject: rpms/beecrypt/devel beecrypt.spec,1.28,1.29
Message-ID: <200606271614.k5RGEGTm000387@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv354

Modified Files:
	beecrypt.spec 
Log Message:
doc buildreqs


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- beecrypt.spec	27 Jun 2006 16:05:09 -0000	1.28
+++ beecrypt.spec	27 Jun 2006 16:14:13 -0000	1.29
@@ -14,7 +14,7 @@
 Patch0: beecrypt-4.1.2-base64.patch
 Patch1: beecrypt-4.1.2-python-api.patch
 Patch2: beecrypt-4.1.2-biarch.patch
-BuildPreReq: doxygen
+BuildPreReq: doxygen tetex-dvips tetex-latex
 BuildRequires: m4
 %if %{?with_python:1}0
 BuildPreReq: python-devel >= %{with_python_version}



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:26:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:26:31 -0400
Subject: rpms/libpfm/devel libpfm.spec,1.13,1.14
Message-ID: <200606271626.k5RGQVdf019414@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18997

Modified Files:
	libpfm.spec 
Log Message:
Add ncurses-devel buildprereq.



Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libpfm.spec	27 Jun 2006 13:53:41 -0000	1.13
+++ libpfm.spec	27 Jun 2006 16:26:29 -0000	1.14
@@ -1,5 +1,5 @@
 %define DATE 060621
-%define libpfm_release 6
+%define libpfm_release 7
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.2
@@ -13,6 +13,7 @@
 Patch1: libpfm-compat.patch
 Patch2: libpfm-3.2-showreginfo.patch
 Patch3: libpfm-3.2-rpm_opt.patch
+BuildPreReq: ncurses-devel
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -66,6 +67,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jun 27 2006 Will Cohen <wcohen at redhat.com>
+- Add ncurses-devel buildprereq.
+
 * Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>
 - Make sure that CFLAGS in pfmlib/lib/ is used.
 - Separate build and install processes.



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:34:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:34:05 -0400
Subject: rpms/libpfm/devel libpfm.spec,1.14,1.15
Message-ID: <200606271634.k5RGY5Gm021343@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21206

Modified Files:
	libpfm.spec 
Log Message:
Add ncurses requirement for libpfm-devel.




Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libpfm.spec	27 Jun 2006 16:26:29 -0000	1.14
+++ libpfm.spec	27 Jun 2006 16:34:03 -0000	1.15
@@ -33,6 +33,8 @@
 files necessary for development of applications.
 It requires a kernel perfmon-2.x subsystem.
 
+Requires: ncurses
+
 %prep
 %setup -q -n %{name}-%{version}-%{DATE}
 %patch1 -p1 -b .compat
@@ -68,6 +70,7 @@
 
 %changelog
 * Tue Jun 27 2006 Will Cohen <wcohen at redhat.com>
+- Add ncurses requires.
 - Add ncurses-devel buildprereq.
 
 * Mon Jun 26 2006 Will Cohen <wcohen at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:35:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:35:31 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, 1.1, 1.2
Message-ID: <200606271635.k5RGZVpJ021557@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21510

Modified Files:
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch 
Log Message:
next milestone

openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch:
 cppuhelper/inc/cppuhelper/compbase1.hxx |    4 ++--
 cppuhelper/inc/cppuhelper/implbase1.hxx |   12 ++++++------
 inc/cppuhelper/compbase1.hxx            |    0 
 inc/cppuhelper/implbase1.hxx            |    0 
 4 files changed, 8 insertions(+), 8 deletions(-)

Index: openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch	27 Jun 2006 15:26:36 -0000	1.1
+++ openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch	27 Jun 2006 16:35:10 -0000	1.2
@@ -28,7 +28,7 @@
      {
          /** @internal */
 -        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {};
-+	struct cd : public ImplClassData1 < Ifc1, WeakImplHelper1<Ifc1> >{};
++	struct cd : public ImplClassData1 < Ifc1, WeakImplHelper1<Ifc1> > {};
      public:
          virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
              { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
@@ -37,7 +37,7 @@
      {
          /** @internal */
 -        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {};
-+	struct cd : public ImplClassData1 < Ifc1, WeakAggImplHelper1<Ifc1> >{};
++	struct cd : public ImplClassData1 < Ifc1, WeakAggImplHelper1<Ifc1> > {};
      public:
          virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
              { return OWeakAggObject::queryInterface( rType ); }
@@ -59,3 +59,28 @@
      protected:
          template< typename T1 >
          explicit AggImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
+Index: inc/cppuhelper/compbase1.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase1.hxx,v
+retrieving revision 1.12
+diff -u -r1.12 compbase1.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase1.hxx	27 Oct 2005 17:13:40 -0000	1.12
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase1.hxx	27 Jun 2006 16:34:04 -0000
+@@ -69,7 +69,7 @@
+         , public Ifc1
+     {
+         /** @internal */
+-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {};
++        struct cd : ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > {};
+     public:
+         inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+             : WeakComponentImplHelperBase( rMutex )
+@@ -115,7 +115,7 @@
+         , public Ifc1
+     {
+         /** @internal */
+-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {};
++        struct cd : ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > {};
+     public:
+         inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+             : WeakAggComponentImplHelperBase( rMutex )



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:35:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:35:31 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, 1.1, 1.2
Message-ID: <200606271635.k5RGZVGP021569@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21522

Modified Files:
	openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch 
Log Message:
rebuild for vor problem

openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch:
 cppuhelper/inc/cppuhelper/compbase1.hxx |    4 ++--
 cppuhelper/inc/cppuhelper/implbase1.hxx |   12 ++++++------
 inc/cppuhelper/compbase1.hxx            |    0 
 inc/cppuhelper/implbase1.hxx            |    0 
 4 files changed, 8 insertions(+), 8 deletions(-)

Index: openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch	27 Jun 2006 15:26:30 -0000	1.1
+++ openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch	27 Jun 2006 16:35:13 -0000	1.2
@@ -59,3 +59,28 @@
      protected:
          template< typename T1 >
          explicit AggImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
+Index: inc/cppuhelper/compbase1.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase1.hxx,v
+retrieving revision 1.12
+diff -u -r1.12 compbase1.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase1.hxx	27 Oct 2005 17:13:40 -0000	1.12
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase1.hxx	27 Jun 2006 16:34:04 -0000
+@@ -69,7 +69,7 @@
+         , public Ifc1
+     {
+         /** @internal */
+-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {};
++        struct cd : ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > {};
+     public:
+         inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+             : WeakComponentImplHelperBase( rMutex )
+@@ -115,7 +115,7 @@
+         , public Ifc1
+     {
+         /** @internal */
+-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {};
++        struct cd : ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > {};
+     public:
+         inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+             : WeakAggComponentImplHelperBase( rMutex )



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:36:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:36:57 -0400
Subject: rpms/kdepim/devel kdepim-3.5.3-kmail-127538.patch, NONE,
	1.1 kdepim-3.5.3-kmail-encryption.patch, NONE,
	1.1 kdepim-3.5.3-kmail-typo.patch, NONE,
	1.1 kdepim-3.5.3-korganizer.patch, NONE, 1.1 kdepim.spec, 1.87, 1.88
Message-ID: <200606271636.k5RGatv0021700@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21661

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.3-kmail-127538.patch 
	kdepim-3.5.3-kmail-encryption.patch 
	kdepim-3.5.3-kmail-typo.patch kdepim-3.5.3-korganizer.patch 
Log Message:
- apply upstream patches


kdepim-3.5.3-kmail-127538.patch:
 kmcomposewin.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdepim-3.5.3-kmail-127538.patch ---
--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig	2006-06-09 17:01:50.000000000 +0200
+++ kdepim-3.5.3/kmail/kmcomposewin.cpp	2006-06-09 17:20:20.000000000 +0200
@@ -667,6 +667,8 @@
 
   KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
   saveMainWindowSettings( KMKernel::config(), "Composer" );
+  // make sure config changes are written to disk, cf. bug 127538
+  GlobalSettings::self()->writeConfig();
 }
 
 //-----------------------------------------------------------------------------

kdepim-3.5.3-kmail-encryption.patch:
 partmetadata.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.3-kmail-encryption.patch ---
--- kdepim-3.5.3/kmail/partmetadata.h.orig	2006-06-09 17:08:26.000000000 +0200
+++ kdepim-3.5.3/kmail/partmetadata.h	2006-06-09 17:08:32.000000000 +0200
@@ -35,7 +35,12 @@
         isEncrypted( false ),
         isDecryptable( false ),
         technicalProblem( false ),
-        isEncapsulatedRfc822Message( false ) {}
+        isEncapsulatedRfc822Message( false )
+    {
+      creationTime.tm_year = 0;
+      creationTime.tm_mon  = 1;
+      creationTime.tm_mday = 1;
+    }
     bool isSigned;
     bool isGoodSignature;
     CryptPlugWrapper::SigStatusFlags sigStatusFlags;

kdepim-3.5.3-kmail-typo.patch:
 kmcomposewin.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.3-kmail-typo.patch ---
--- kdepim-3.5.3/kmail/kmcomposewin.cpp.orig	2006-06-09 18:44:15.000000000 +0200
+++ kdepim-3.5.3/kmail/kmcomposewin.cpp	2006-06-09 18:44:42.000000000 +0200
@@ -4021,7 +4023,7 @@
   }
 
   // Squeeze tabs and spaces
-  QRegExp squeeze( "[\t, ]+" );
+  QRegExp squeeze( "[\t ]+" );
   s.replace( squeeze, QChar( ' ' ) );
 
   // Remove trailing whitespace

kdepim-3.5.3-korganizer.patch:
 kogroupware.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.3-korganizer.patch ---
--- kdepim-3.5.3/korganizer/kogroupware.cpp.orig	2006-06-09 16:48:47.000000000 +0200
+++ kdepim-3.5.3/korganizer/kogroupware.cpp	2006-06-09 16:54:47.000000000 +0200
@@ -263,7 +263,7 @@
             "with the organizers calendar. Do you really want "
             "to edit it?" );
       rc = KMessageBox::warningYesNo( parent, txt );
-      return ( rc == KMessageBox::Continue );
+      return ( rc == KMessageBox::Yes );
     }
   } else {
     kdWarning(5850) << "Groupware messages for Journals are not implemented yet!" << endl;


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdepim.spec	27 Jun 2006 15:11:33 -0000	1.87
+++ kdepim.spec	27 Jun 2006 16:36:50 -0000	1.88
@@ -32,6 +32,12 @@
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
 
+# upstream patches
+Patch100: kdepim-3.5.3-korganizer.patch
+Patch101: kdepim-3.5.3-kmail-typo.patch
+Patch102: kdepim-3.5.3-kmail-encryption.patch
+Patch103: kdepim-3.5.3-kmail-127538.patch
+
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 
@@ -117,6 +123,12 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
+# upstream patches
+%patch100 -p1 -b .korganizer-kogroupware
+%patch101 -p1 -b .kmail-typo
+%patch102 -p1 -b .kmail-encryption
+%patch103 -p1 -b .kmail-127538.patch
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -216,6 +228,7 @@
 %changelog
 * Tue Jun 27 2006 Than Ngo <than at redhat.com> 6:3.5.3-3
 - fix #196741, BR: libXpm-devel libXScrnSaver-devel
+- apply upstream patches
 
 * Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
 - BR: cyrus-sasl-devel, #195500 



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:40:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:40:18 -0400
Subject: rpms/pfmon/devel pfmon.spec,1.15,1.16
Message-ID: <200606271640.k5RGeIOY022604@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22465

Modified Files:
	pfmon.spec 
Log Message:
Bump to keep in step with libpfm.




Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pfmon.spec	27 Jun 2006 14:03:53 -0000	1.15
+++ pfmon.spec	27 Jun 2006 16:40:15 -0000	1.16
@@ -1,5 +1,5 @@
 %define DATE 060621
-%define pfmon_release 6
+%define pfmon_release 7
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
@@ -17,8 +17,8 @@
 Patch4: pfmon-fortify.patch
 Requires: libpfm
 BuildPreReq: elfutils-devel
-BuildPreReq: libpfm >= 3.2-0.060613.6
-BuildPreReq: libpfm-devel >= 3.2-0.060613.6
+BuildPreReq: libpfm >= 3.2-0.060613.7
+BuildPreReq: libpfm-devel >= 3.2-0.060613.7
 
 %description
 This package contains pfmon 3.x, a tool to monitor performance using



From fedora-cvs-commits at redhat.com  Tue Jun 27 16:44:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 12:44:00 -0400
Subject: rpms/beecrypt/devel beecrypt.spec,1.29,1.30
Message-ID: <200606271644.k5RGi0nN024019@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23990

Modified Files:
	beecrypt.spec 
Log Message:
bump


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- beecrypt.spec	27 Jun 2006 16:14:13 -0000	1.29
+++ beecrypt.spec	27 Jun 2006 16:43:57 -0000	1.30
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 10
+Release: 10.1
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
@@ -121,6 +121,9 @@
 %endif
 
 %changelog
+* Tue Jun 27 2006 Paul Nasrat <pnasrat at redhat.com> - 4.1.2-10.1
+- Fix missing BR
+
 * Mon May 22 2006 Paul Nasrat <pnasrat at redhat.com> - 4.1.2-10
 - Make multilib-devel work
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 17:19:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 13:19:27 -0400
Subject: rpms/module-init-tools/devel module-init-tools-weak_updates.patch,
	1.1, 1.2 module-init-tools.spec, 1.24, 1.25
Message-ID: <200606271719.k5RHJRbE031908@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31804

Modified Files:
	module-init-tools-weak_updates.patch module-init-tools.spec 
Log Message:
Updated the weak-updates patch


module-init-tools-weak_updates.patch:
 depmod.c |  123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 depmod.h |   10 +++++
 2 files changed, 130 insertions(+), 3 deletions(-)

Index: module-init-tools-weak_updates.patch
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools-weak_updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- module-init-tools-weak_updates.patch	14 Jun 2006 12:06:02 -0000	1.1
+++ module-init-tools-weak_updates.patch	27 Jun 2006 17:19:24 -0000	1.2
@@ -1,10 +1,21 @@
---- module-init-tools-3.3-pre1/depmod.c.weak	2006-06-14 12:16:08.000000000 +0200
-+++ module-init-tools-3.3-pre1/depmod.c	2006-06-14 12:16:08.000000000 +0200
-@@ -474,10 +474,26 @@
- 				      const char *filename,
- 				      struct module *next);
+diff -urN module-init-tools-3.3-pre1/depmod.c module-init-tools-3.3-pre1_new/depmod.c
+--- module-init-tools-3.3-pre1/depmod.c	2006-06-27 18:06:37.000000000 +0100
++++ module-init-tools-3.3-pre1_new/depmod.c	2006-06-27 17:44:25.000000000 +0100
+@@ -484,6 +484,27 @@
+ 	return (p[strlen("updates")] == '/' || p[strlen("updates")] == '\0');
+ }
  
-+static int is_weak_update(const char *dirname)
++static int is_extra(const char *dirname)
++{
++	char *p;
++
++	p = strstr(dirname, "extra");
++	if (!p)
++		return 0;
++	return (p[strlen("extra")] == '/' || p[strlen("extra")] == '\0');
++}
++
++static int is_weak(const char *dirname)
 +{
 +	char *p;
 +
@@ -15,19 +26,101 @@
 +		p[strlen("weak-updates")] == '\0');
 +}
 +
- static int is_update(const char *dirname)
+ /* Grab everything not under updates/ directories. */
+ static struct module *do_normal_module(const char *dirname,
+ 				       const char *filename,
+@@ -491,11 +512,12 @@
  {
- 	char *p;
+ 	struct module *new;
  
-+	/* If it's a weak_update then we don't want to match on updates/"
-+         */
-+	if (is_weak_update(dirname))
-+		return 0;
+-	if (is_update(dirname))
++	if (is_update(dirname) || is_extra(dirname) || is_weak(dirname))
+ 		return list;
+ 	new = grab_module(dirname, filename);
+ 	if (!new)
+ 		return list;
++	new->update_type = MODULE_TYPE_NONE; /* not an update */
+ 	new->next = list;
+ 	return new;
+ }
+@@ -518,6 +540,42 @@
+ 	for (i = &list; *i; i = &(*i)->next) {
+ 		if (streq(basename((*i)->pathname), filename)) {
+ 			new->next = (*i)->next;
++			new->update_type = MODULE_TYPE_UPDATE; /* forced */
++			free(*i); /* was leaked */
++			*i = new;
++			return list;
++		}
++	}
++
++	/* Update of non-existent module.  Just prepend. */
++	new->next = list;
++	return new;
++}
++
++/* Grab everything under extra/ directory, override existing in-kernel module
++ * but not if it's already in updates/. */
++
++static struct module *do_extra_module(const char *dirname,
++				      const char *filename,
++				      struct module *list)
++{
++	struct module *new, **i;
++
++	if (!is_extra(dirname))
++		return list;
++
++	new = grab_module(dirname, filename);
++	if (!new)
++		return list;
++
++	/* Find module of same name, and replace it if it's not already an
++	 * update :-) */
++	for (i = &list; *i; i = &(*i)->next) {
++	        if ((streq(basename((*i)->pathname), filename)) &&
++		    !((*i)->update_type&(MODULE_TYPE_UPDATE))) {
++			new->next = (*i)->next;
++		        new->update_type = MODULE_TYPE_EXTRA; /* extra */
++			free(*i);
+ 			*i = new;
+ 			return list;
+ 		}
+@@ -528,6 +586,33 @@
+ 	return new;
+ }
+ 
++static struct module *do_weak_module(const char *dirname,
++				     const char *filename,
++				     struct module *list)
++{
++	struct module *new, **i;
++
++	if (!is_weak(dirname))
++		return list;
++
++	new = grab_module(dirname, filename);
++	if (!new)
++		return list;
 +
- 	p = strstr(dirname, "updates");
- 	if (!p)
- 		return 0;
-@@ -545,8 +561,11 @@
++	/* Make sure we don't already have a module of same name */
++	for (i = &list; *i; i = &(*i)->next) {
++		if (streq(basename((*i)->pathname), filename)) {
++		       free(new);
++		       return list;
++		}
++	}
++
++	/* Module not in the list already. Add it. */
++	new->next = list;
++	new->update_type = MODULE_TYPE_WEAK;
++	return new;
++}
++
+ static struct module *grab_dir(const char *dirname,
+ 			       DIR *dir,
+ 			       struct module *next,
+@@ -545,8 +630,11 @@
  			char subdir[strlen(dirname) + 1
  				   + strlen(dirent->d_name) + 1];
  			sprintf(subdir, "%s/%s", dirname, dirent->d_name);
@@ -37,7 +130,84 @@
 +			 * extra/ to allow for weak-updates symlinks)
 +                         */
 +			if ((readlink(subdir, &dummy, 1) < 0) ||
-+			    is_weak_update(subdir)) {
++			    is_weak(subdir)) {
  				sub = opendir(subdir);
  				if (sub) {
  					next = grab_dir(subdir, sub, next,
+@@ -566,7 +654,19 @@
+ 	DIR *dir;
+ 	struct module *list;
+ 	char updatedir[strlen(dirname) + sizeof("/updates")];
++	char extradir[strlen(dirname) + sizeof("/extra")];
++	char weakdir[strlen(dirname) + sizeof("/weak-updates")];
++
++	/* RHism - we allow updated drivers to be shipped.
++	 * We scan through the available modules as follows:
++	 *
++	 *                           /updates      - overrides everything
++	 *                           /extra        - packaged modules
++	 *                           /             - kernel supplied
++	 *                           /weak-updates - compatible modules
++         */
+ 
++	/* base kernel */
+ 	dir = opendir(dirname);
+ 	if (!dir) {
+ 		warn("Couldn't open directory %s: %s\n",
+@@ -576,12 +676,29 @@
+ 	list = grab_dir(dirname, dir, NULL, do_normal_module);
+ 	closedir(dir);
+ 
++	/* manual updates override everything */
+ 	sprintf(updatedir, "%s/updates", dirname);
+ 	dir = opendir(updatedir);
+ 	if (dir) {
+ 		list = grab_dir(updatedir, dir, list, do_update_module);
+ 		closedir(dir);
+ 	}
++
++	/* extra modules - supplied after the kernel in packaged form. */
++	sprintf(extradir, "%s/extra", dirname);
++	dir = opendir(extradir);
++	if (dir) {
++	        list = grab_dir(extradir, dir, list, do_extra_module);
++		closedir(dir);
++	}
++
++	/* weak-updates last - only add modules not in the kernel tree. */
++	sprintf(weakdir, "%s/weak-updates", dirname);
++	dir = opendir(weakdir);
++	if (dir) {
++	        list = grab_dir(weakdir, dir, list, do_weak_module);
++	        closedir(dir);
++	}
+ 	return list;
+ }
+ 
+diff -urN module-init-tools-3.3-pre1/depmod.h module-init-tools-3.3-pre1_new/depmod.h
+--- module-init-tools-3.3-pre1/depmod.h	2005-12-07 04:51:46.000000000 +0000
++++ module-init-tools-3.3-pre1_new/depmod.h	2006-06-27 17:16:03.000000000 +0100
+@@ -18,6 +18,13 @@
+ /* I hate strcmp. */
+ #define streq(a,b) (strcmp((a),(b)) == 0)
+ 
++enum update_type {
++	MODULE_TYPE_NONE	= 0x00,
++	MODULE_TYPE_UPDATE	= 0x01,
++	MODULE_TYPE_EXTRA	= 0x02,
++	MODULE_TYPE_WEAK	= 0x04,
++};
++
+ struct module
+ {
+ 	/* Next module in list of all modules */
+@@ -29,6 +36,9 @@
+ 	/* Convert endian? */
+ 	int conv;
+ 
++	/* Type of module update? */
++	unsigned int update_type;
++
+ 	/* Dependencies: filled in by ops->calculate_deps() */
+ 	unsigned int num_deps;
+ 	struct module **deps;


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- module-init-tools.spec	14 Jun 2006 10:24:01 -0000	1.24
+++ module-init-tools.spec	27 Jun 2006 17:19:24 -0000	1.25
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.3
+Release: 0.pre1.4
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Jun 27 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4
+- updated patch for weak-modules
+
 * Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 3.3-0.pre1.3
 - added patches for weak modules
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 17:53:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 13:53:23 -0400
Subject: rpms/gaim/devel gaim-2.0.0beta1-gaim2.patch, NONE,
 1.1 gaim2-PIE.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 gaim.spec, 1.120,
 1.121 sources, 1.33, 1.34 gaim-0.76-xinput.patch, 1.1,
 NONE gaim-1.0.1-naive-gnome-check.patch, 1.1, NONE gaim-1.3.1-PIE.patch, 1.1,
 NONE gaim-1.5.0-aim-rate-limiting.patch, 1.1, NONE gaim-1.5.0-authors.patch,
 1.1, NONE gaim-1.5.0-clipboard-leak-history-scroll.patch, 1.1,
 NONE gaim-1.5.0-copyright.patch, 1.1,
 NONE gaim-1.5.0-crash-non-terminated-strings.patch, 1.1,
 NONE gaim-1.5.0-doc-creation.patch, 1.1,
 NONE gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch, 1.1,
 NONE gaim-1.5.0-hacking-doc.patch, 1.1,
 NONE gaim-1.5.0-it-yahoo_profile.patch, 1.1,
 NONE gaim-1.5.0-italics-ircs.patch, 1.1,
 NONE gaim-1.5.0-logging-compatibility.patch, 1.1,
 NONE gaim-1.5.0-msn-block-crash.patch, 1.1,
 NONE gaim-1.5.0-msn-data-corruption-fix.patch, 1.1,
 NONE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch, 1.1,
 NONE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch, 1.1,
 NONE gaim!
 -1.5.0-msn-kill-convo-close-timeout-notices-p3.patch, 1.1,
 NONE gaim-1.5.0-nss-detect.patch, 1.1, NONE gaim-1.5.0-silc-CID-71.patch,
 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch,
 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch,
 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch,
 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch,
 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch,
 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch,
 1.1, NONE gaim-1.5.0-smileys-logtype-p1.patch, 1.1,
 NONE gaim-1.5.0-smileys-logtype-p2.patch, 1.1,
 NONE gaim-1.5.0-strip-html-status.patch, 1.1,
 NONE gaim-1.5.0-xmlnode-cleanup.patch, 1.1,
 NONE gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch, 1.1, NONE
Message-ID: <200606271753.k5RHrNSe002137@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2110/devel

Modified Files:
	.cvsignore gaim.spec sources 
Added Files:
	gaim-2.0.0beta1-gaim2.patch gaim2-PIE.patch 
Removed Files:
	gaim-0.76-xinput.patch gaim-1.0.1-naive-gnome-check.patch 
	gaim-1.3.1-PIE.patch gaim-1.5.0-aim-rate-limiting.patch 
	gaim-1.5.0-authors.patch 
	gaim-1.5.0-clipboard-leak-history-scroll.patch 
	gaim-1.5.0-copyright.patch 
	gaim-1.5.0-crash-non-terminated-strings.patch 
	gaim-1.5.0-doc-creation.patch 
	gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch 
	gaim-1.5.0-hacking-doc.patch gaim-1.5.0-it-yahoo_profile.patch 
	gaim-1.5.0-italics-ircs.patch 
	gaim-1.5.0-logging-compatibility.patch 
	gaim-1.5.0-msn-block-crash.patch 
	gaim-1.5.0-msn-data-corruption-fix.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch 
	gaim-1.5.0-nss-detect.patch gaim-1.5.0-silc-CID-71.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch 
	gaim-1.5.0-smileys-logtype-p1.patch 
	gaim-1.5.0-smileys-logtype-p2.patch 
	gaim-1.5.0-strip-html-status.patch 
	gaim-1.5.0-xmlnode-cleanup.patch 
	gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch 
Log Message:
auto-import gaim-2.0.0-0.3.beta3 on branch devel from gaim-2.0.0-0.3.beta3.src.rpm

gaim-2.0.0beta1-gaim2.patch:
 Makefile.am                             |    8 +++---
 Makefile.in                             |   18 +++++++--------
 configure                               |    6 ++---
 gaim.desktop                            |    4 +--
 m4macros/Makefile.in                    |    2 -
 pixmaps/Makefile.am                     |    4 +--
 pixmaps/Makefile.in                     |    4 +--
 plugins/musicmessaging/musicmessaging.c |    2 -
 po/Makefile.in.in                       |    2 -
 sounds/Makefile.in                      |    2 -
 src/Makefile.am                         |   10 ++++----
 src/Makefile.in                         |   16 ++++++-------
 src/gtkblist.c                          |   12 +++++-----
 src/gtkconv.c                           |    4 +--
 src/gtkdnd-hints.c                      |    2 -
 src/gtklog.c                            |    2 -
 src/gtkmain.c                           |    2 -
 src/gtksound.c                          |    2 -
 src/gtkstock.c                          |   38 ++++++++++++++++----------------
 src/gtkthemes.c                         |    2 -
 src/gtkutils.c                          |    8 +++---
 src/prefs.c                             |    2 -
 22 files changed, 76 insertions(+), 76 deletions(-)

--- NEW FILE gaim-2.0.0beta1-gaim2.patch ---
--- gaim-2.0.0beta1/Makefile.in.gaim2	2006-01-17 16:16:30.000000000 -0600
+++ gaim-2.0.0beta1/Makefile.in	2006-01-17 16:17:32.000000000 -0600
@@ -393,10 +393,10 @@
 EXTRA_DIST = \
 		COPYRIGHT \
 		Doxyfile.in \
-		gaim.pc.in \
+		gaim2.pc.in \
 		gaim.spec.in \
 		gaim.apspec.in \
-		gaim.desktop \
+		gaim2.desktop \
 		gaim-installer.nsi \
 		HACKING \
 		PROGRAMMING_NOTES \
@@ -415,13 +415,13 @@
 		plugins/win32/winprefs/winprefs.c \
 		po/Makefile.mingw
 
-gaimincludedir = $(includedir)/gaim
+gaimincludedir = $(includedir)/gaim2
 gaiminclude_HEADERS = config.h
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gaim.pc
+pkgconfig_DATA = gaim2.pc
 #	cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
 appsdir = $(datadir)/applications
-apps_DATA = gaim.desktop
+apps_DATA = gaim2.desktop
 SUBDIRS = doc intl m4macros pixmaps plugins po sounds src
 
 # perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which
@@ -492,7 +492,7 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 plugins/perl/common/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/plugins/perl/common/Makefile.PL.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-gaim.pc: $(top_builddir)/config.status $(srcdir)/gaim.pc.in
+gaim2.pc: $(top_builddir)/config.status $(srcdir)/gaim.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 gaim.spec: $(top_builddir)/config.status $(srcdir)/gaim.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
--- gaim-2.0.0beta1/src/Makefile.in.gaim2	2006-01-17 16:29:01.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 16:29:54.000000000 -0600
@@ -43,7 +43,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-bin_PROGRAMS = gaim$(EXEEXT) $(am__EXEEXT_1)
+bin_PROGRAMS = gaim2$(EXEEXT) $(am__EXEEXT_1)
 subdir = src
 DIST_COMMON = $(am__gaiminclude_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in getopt.c getopt1.c
@@ -769,7 +769,7 @@
 	internal.h \
 	gtkwhiteboard.h
 
-gaimincludedir = $(includedir)/gaim
+gaimincludedir = $(includedir)/gaim2
 gaiminclude_HEADERS = \
 	$(gaim_coreheaders) \
 	$(gaim_headers)
--- gaim-2.0.0beta1/gaim.desktop.gaim2	2006-01-17 16:41:01.000000000 -0600
+++ gaim-2.0.0beta1/gaim.desktop	2006-01-17 16:41:19.000000000 -0600
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Categories=Application;Network;
-Exec=gaim
-Icon=gaim.png
+Exec=gaim2
+Icon=gaim2.png
 StartupNotify=true
 Terminal=false
 Type=Application
--- gaim-2.0.0beta1/pixmaps/Makefile.in.gaim2	2006-01-17 16:45:58.000000000 -0600
+++ gaim-2.0.0beta1/pixmaps/Makefile.in	2006-01-17 16:46:07.000000000 -0600
@@ -381,7 +381,7 @@
 		change-fgcolor-small.png	\
 		connect.png			\
 		edit.png			\
-		gaim.png			\
+		gaim2.png			\
 		gaim_auth.png			\
 		gaim_cool.png			\
 		gaim_error.png			\
@@ -451,7 +451,7 @@
 gaimdistpixdir = $(datadir)/pixmaps/gaim
 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.png
+distpixmap_DATA = gaim2.png
 all: all-recursive
 
 .SUFFIXES:
--- gaim-2.0.0beta1/pixmaps/Makefile.am.gaim2	2006-01-17 16:46:18.000000000 -0600
+++ gaim-2.0.0beta1/pixmaps/Makefile.am	2006-01-17 16:46:24.000000000 -0600
@@ -8,7 +8,7 @@
 		change-fgcolor-small.png	\
 		connect.png			\
 		edit.png			\
-		gaim.png			\
+		gaim2.png			\
 		gaim_auth.png			\
 		gaim_cool.png			\
 		gaim_error.png			\
@@ -83,5 +83,5 @@
 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png
 
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.png
+distpixmap_DATA = gaim2.png
 
--- gaim-2.0.0beta1/plugins/musicmessaging/musicmessaging.c.gaim2	2006-01-17 16:55:35.000000000 -0600
+++ gaim-2.0.0beta1/plugins/musicmessaging/musicmessaging.c	2006-01-17 16:55:46.000000000 -0600
@@ -578,7 +578,7 @@
 
 	g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(music_button_toggled), mmconv);
 
-	file_path = g_build_filename(DATADIR, "pixmaps", "gaim", "buttons",
+	file_path = g_build_filename(DATADIR, "pixmaps", "gaim2", "buttons",
 										"music.png", NULL);
 	image = gtk_image_new_from_file(file_path);
 	g_free(file_path);
--- gaim-2.0.0beta1/src/gtkstock.c.gaim2	2006-01-17 16:53:46.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkstock.c	2006-01-17 17:00:34.000000000 -0600
@@ -92,7 +92,7 @@
 	{ GAIM_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ GAIM_STOCK_LINK,            "buttons", "insert-link-small.png"    },
 	{ GAIM_STOCK_LOG,             NULL,      GTK_STOCK_DND_MULTIPLE     },
-	{ GAIM_STOCK_LOGO,            "gaim",    "logo.png"                 },
+	{ GAIM_STOCK_LOGO,            "gaim2",    "logo.png"                 },
 	{ GAIM_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ GAIM_STOCK_PAUSE,           NULL,      GTK_STOCK_MEDIA_PAUSE      },
@@ -114,21 +114,21 @@
 	{ GAIM_STOCK_TEXT_BIGGER,     "buttons", "text_bigger.png"          },
 	{ GAIM_STOCK_TEXT_NORMAL,     "buttons", "text_normal.png"          },
 	{ GAIM_STOCK_TEXT_SMALLER,    "buttons", "text_smaller.png"         },
-	{ GAIM_STOCK_TYPED,           "gaim",    "typed.png"                },
-	{ GAIM_STOCK_TYPING,          "gaim",    "typing.png"               },
-	{ GAIM_STOCK_VOICE_CHAT,      "gaim",    "phone.png"                },
-	{ GAIM_STOCK_STATUS_ONLINE,   "gaim",    "status-online.png"        },
-	{ GAIM_STOCK_STATUS_OFFLINE,  "gaim",    "status-offline.png"       },
-	{ GAIM_STOCK_STATUS_AWAY,     "gaim",    "status-away.png"          },
-	{ GAIM_STOCK_STATUS_INVISIBLE,"gaim",    "status-invisible.png"     },
-	{ GAIM_STOCK_STATUS_TYPING0,  "gaim",    "status-typing0.png"       },
-	{ GAIM_STOCK_STATUS_TYPING1,  "gaim",    "status-typing1.png"       },
-	{ GAIM_STOCK_STATUS_TYPING2,  "gaim",    "status-typing2.png"       },
-	{ GAIM_STOCK_STATUS_TYPING3,  "gaim",    "status-typing3.png"       },
-	{ GAIM_STOCK_STATUS_CONNECT0, "gaim",    "status-connect0.png"      },
-	{ GAIM_STOCK_STATUS_CONNECT1, "gaim",    "status-connect1.png"      },
-	{ GAIM_STOCK_STATUS_CONNECT2, "gaim",    "status-connect2.png"      },
-	{ GAIM_STOCK_STATUS_CONNECT3, "gaim",    "status-connect3.png"      },
+	{ GAIM_STOCK_TYPED,           "gaim2",    "typed.png"                },
+	{ GAIM_STOCK_TYPING,          "gaim2",    "typing.png"               },
+	{ GAIM_STOCK_VOICE_CHAT,      "gaim2",    "phone.png"                },
+	{ GAIM_STOCK_STATUS_ONLINE,   "gaim2",    "status-online.png"        },
+	{ GAIM_STOCK_STATUS_OFFLINE,  "gaim2",    "status-offline.png"       },
+	{ GAIM_STOCK_STATUS_AWAY,     "gaim2",    "status-away.png"          },
+	{ GAIM_STOCK_STATUS_INVISIBLE,"gaim2",    "status-invisible.png"     },
+	{ GAIM_STOCK_STATUS_TYPING0,  "gaim2",    "status-typing0.png"       },
+	{ GAIM_STOCK_STATUS_TYPING1,  "gaim2",    "status-typing1.png"       },
+	{ GAIM_STOCK_STATUS_TYPING2,  "gaim2",    "status-typing2.png"       },
+	{ GAIM_STOCK_STATUS_TYPING3,  "gaim2",    "status-typing3.png"       },
+	{ GAIM_STOCK_STATUS_CONNECT0, "gaim2",    "status-connect0.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT1, "gaim2",    "status-connect1.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT2, "gaim2",    "status-connect2.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT3, "gaim2",    "status-connect3.png"      },
 	{ GAIM_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
 	{ GAIM_STOCK_WARN,            NULL,      GTK_STOCK_DIALOG_WARNING   }
 };
@@ -152,11 +152,11 @@
 	if (base == NULL)
 		return NULL;
 
-	if (!strcmp(dir, "gaim"))
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", base, NULL);
+	if (!strcmp(dir, "gaim2"))
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", base, NULL);
 	else
 	{
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", dir,
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", dir,
 									base, NULL);
 	}
 
--- gaim-2.0.0beta1/src/gtklog.c.gaim2	2006-01-17 16:48:49.000000000 -0600
+++ gaim-2.0.0beta1/src/gtklog.c	2006-01-17 16:49:00.000000000 -0600
@@ -534,7 +534,7 @@
 	}
 	logs = g_list_sort(logs, gaim_log_compare);
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL);
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "icons", "online.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
 
--- gaim-2.0.0beta1/src/gtkutils.c.gaim2	2006-01-17 16:49:47.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkutils.c	2006-01-17 16:50:07.000000000 -0600
@@ -479,7 +479,7 @@
 		proto_name = prpl_info->list_icon(NULL, NULL);
 		g_snprintf(buf, sizeof(buf), "%s.png", proto_name);
 
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status",
 									"default", buf, NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
@@ -623,7 +623,7 @@
 			proto_name = prpl_info->list_icon(account, NULL);
 			g_snprintf(buf, sizeof(buf), "%s.png", proto_name);
 
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status",
 			                            "default", buf, NULL);
 			pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
@@ -1570,7 +1570,7 @@
 	 */
 	g_snprintf(buf, sizeof(buf), "%s.png", protoname);
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status",
 								"default", buf, NULL);
 	status = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
@@ -1605,7 +1605,7 @@
 		type_name = "na";
 	g_snprintf(basename2, sizeof(basename2), "%s.png",
 	           type_name);
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default",
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default",
 	                            basename2, NULL);
 	emblem = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
--- gaim-2.0.0beta1/src/gtkconv.c.gaim2	2006-01-17 16:50:35.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkconv.c	2006-01-17 16:50:44.000000000 -0600
@@ -2982,7 +2982,7 @@
 		return NULL;
 	}
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", image, NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
 
@@ -2993,7 +2993,7 @@
 	g_object_unref(pixbuf);
 
 	if (flags && gaim_conv_chat_is_user_ignored(chat, name)) {
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "ignored.png", NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "ignored.png", NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
 		scale2 = gdk_pixbuf_scale_simple(pixbuf, 15, 15, GDK_INTERP_BILINEAR);
--- gaim-2.0.0beta1/src/gtkblist.c.gaim2	2006-01-17 16:47:28.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkblist.c	2006-01-17 16:47:57.000000000 -0600
@@ -2788,16 +2788,16 @@
 	}
 
 	if(buddy && GAIM_BUDDY_IS_ONLINE(buddy) &&  gtkbuddynode && gtkbuddynode->recent_signonoff) {
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "login.png", NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "login.png", NULL);
 	} else if(buddy && !GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) {
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "logout.png", NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "logout.png", NULL);
 	} else if(buddy || chat) {
 		char *image = g_strdup_printf("%s.png", protoname);
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", image, NULL);
 		g_free(image);
 	} else {
 		/* gaim dude */
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim.png", NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2.png", NULL);
 	}
 
 	status = gdk_pixbuf_new_from_file(filename, NULL);
@@ -2814,7 +2814,7 @@
 		if(emblems[i].filename) {
 			GdkPixbuf *emblem;
 			char *image = g_strdup_printf("%s.png", emblems[i].filename);
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", image, NULL);
 			g_free(image);
 			emblem = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
@@ -2854,7 +2854,7 @@
 		if (!gaim_privacy_check(buddy->account, gaim_buddy_get_name(buddy)))
 		{
 			GdkPixbuf *emblem;
-			char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "blocked.png", NULL);
+			char *filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "blocked.png", NULL);
 
 			emblem = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
--- gaim-2.0.0beta1/src/gtksound.c.gaim2	2006-01-17 17:00:42.000000000 -0600
+++ gaim-2.0.0beta1/src/gtksound.c	2006-01-17 17:01:04.000000000 -0600
@@ -556,7 +556,7 @@
 		char *filename = g_strdup(gaim_prefs_get_string(file_pref));
 		if(!filename || !strlen(filename)) {
 			if(filename) g_free(filename);
-			filename = g_build_filename(DATADIR, "sounds", "gaim", sounds[event].def, NULL);
+			filename = g_build_filename(DATADIR, "sounds", "gaim2", sounds[event].def, NULL);
 		}
 
 		gaim_sound_play_file(filename, NULL);
--- gaim-2.0.0beta1/src/gtkthemes.c.gaim2	2006-01-17 16:53:15.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkthemes.c	2006-01-17 16:53:37.000000000 -0600
@@ -217,7 +217,7 @@
 	int l;
 
 	char* probedirs[3];
-	probedirs[0] = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", NULL);
+	probedirs[0] = g_build_filename(DATADIR, "pixmaps", "gaim2", "smileys", NULL);
 	probedirs[1] = g_build_filename(gaim_user_dir(), "smileys", NULL);
 	probedirs[2] = 0;
 	for (l=0; probedirs[l]; l++) {
--- gaim-2.0.0beta1/src/gtkmain.c.gaim2	2006-01-17 16:49:06.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkmain.c	2006-01-17 16:49:35.000000000 -0600
@@ -222,7 +222,7 @@
 
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
-	icon_path = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL);
+	icon_path = g_build_filename(DATADIR, "pixmaps", "gaim2", "icons", "online.png", NULL);
 	icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 	g_free(icon_path);
 	if (icon) {
--- gaim-2.0.0beta1/src/prefs.c.gaim2	2006-01-17 17:01:38.000000000 -0600
+++ gaim-2.0.0beta1/src/prefs.c	2006-01-17 17:01:57.000000000 -0600
@@ -340,7 +340,7 @@
 
 		error = NULL;
 
-		filename = g_build_filename(SYSCONFDIR, "gaim", "prefs.xml", NULL);
+		filename = g_build_filename(SYSCONFDIR, "gaim2", "prefs.xml", NULL);
 
 		gaim_debug_info("prefs", "Reading %s\n", filename);
 
--- gaim-2.0.0beta1/src/gtkdnd-hints.c.gaim2	2006-01-17 16:48:28.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkdnd-hints.c	2006-01-17 16:48:33.000000000 -0600
@@ -122,7 +122,7 @@
 	for (i = 0; hint_windows[i].filename != NULL; i++) {
 		gchar *fname;
 
-		fname = g_build_filename(DATADIR, "pixmaps", "gaim",
+		fname = g_build_filename(DATADIR, "pixmaps", "gaim2",
 								 hint_windows[i].filename, NULL);
 
 		hint_windows[i].widget = dnd_hints_init_window(fname);
--- gaim-2.0.0beta1/configure.gaim2	2006-01-17 17:11:05.000000000 -0600
+++ gaim-2.0.0beta1/configure	2006-01-17 17:12:13.000000000 -0600
@@ -42170,7 +42170,7 @@
   "src/protocols/toc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/toc/Makefile" ;;
   "src/protocols/yahoo/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/yahoo/Makefile" ;;
   "src/protocols/zephyr/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/zephyr/Makefile" ;;
-  "gaim.pc" ) CONFIG_FILES="$CONFIG_FILES gaim.pc" ;;
+  "gaim2.pc" ) CONFIG_FILES="$CONFIG_FILES gaim2.pc" ;;
   "gaim.spec" ) CONFIG_FILES="$CONFIG_FILES gaim.spec" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
--- gaim-2.0.0beta1/Makefile.in.gaim2	2006-01-17 17:24:03.000000000 -0600
+++ gaim-2.0.0beta1/Makefile.in	2006-01-17 17:24:21.000000000 -0600
@@ -41,7 +41,7 @@
 DIST_COMMON = README $(am__configure_deps) $(gaiminclude_HEADERS) \
 	$(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/gaim.apspec.in $(srcdir)/gaim.pc.in \
+	$(srcdir)/gaim.apspec.in $(srcdir)/gaim2.pc.in \
 	$(srcdir)/gaim.spec.in $(top_srcdir)/configure \
 	$(top_srcdir)/intl/Makefile.in \
 	$(top_srcdir)/plugins/perl/common/Makefile.PL.in ABOUT-NLS \
@@ -60,7 +60,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = Doxyfile gaim.apspec intl/Makefile \
-	plugins/perl/common/Makefile.PL gaim.pc gaim.spec
+	plugins/perl/common/Makefile.PL gaim2.pc gaim.spec
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -492,7 +492,7 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 plugins/perl/common/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/plugins/perl/common/Makefile.PL.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-gaim2.pc: $(top_builddir)/config.status $(srcdir)/gaim.pc.in
+gaim2.pc: $(top_builddir)/config.status $(srcdir)/gaim2.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 gaim.spec: $(top_builddir)/config.status $(srcdir)/gaim.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
--- gaim-2.0.0beta1/Makefile.am.gaim2	2006-01-17 17:23:35.000000000 -0600
+++ gaim-2.0.0beta1/Makefile.am	2006-01-17 17:23:57.000000000 -0600
@@ -1,10 +1,10 @@
 EXTRA_DIST = \
 		COPYRIGHT \
 		Doxyfile.in \
-		gaim.pc.in \
+		gaim2.pc.in \
 		gaim.spec.in \
 		gaim.apspec.in \
-		gaim.desktop \
+		gaim2.desktop \
 		gaim-installer.nsi \
 		HACKING \
 		PROGRAMMING_NOTES \
@@ -27,7 +27,7 @@
 gaiminclude_HEADERS = config.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gaim.pc
+pkgconfig_DATA = gaim2.pc
 
 dist-hook: gaim.spec
 	cp gaim.spec $(distdir)
@@ -36,7 +36,7 @@
 #	cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
 
 appsdir = $(datadir)/applications
-apps_DATA = gaim.desktop
+apps_DATA = gaim2.desktop
 
 SUBDIRS = doc intl m4macros pixmaps plugins po sounds src
 
--- gaim-2.0.0beta1/configure.gaim2	2006-01-17 17:22:32.000000000 -0600
+++ gaim-2.0.0beta1/configure	2006-01-17 17:23:16.000000000 -0600
@@ -41213,7 +41213,7 @@
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile Doxyfile gaim.apspec doc/Makefile doc/gaim.1 intl/Makefile m4macros/Makefile pixmaps/Makefile pixmaps/smileys/Makefile pixmaps/smileys/default/Makefile pixmaps/smileys/none/Makefile pixmaps/status/Makefile pixmaps/status/default/Makefile plugins/Makefile plugins/docklet/Makefile plugins/gevolution/Makefile plugins/gestures/Makefile plugins/mono/Makefile plugins/mono/api/Makefile plugins/mono/loader/Makefile plugins/musicmessaging/Makefile plugins/perl/Makefile plugins/pe!
 rl/common/Makefile.PL plugins/ssl/Makefile plugins/tcl/Makefile plugins/ticker/Makefile po/Makefile.in sounds/Makefile src/Makefile src/mediastreamer/Makefile src/protocols/Makefile src/protocols/bonjour/Makefile src/protocols/gg/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/novell/Makefile src/protocols/oscar/Makefile src/protocols/sametime/Makefile src/protocols/silc/Makefile src/protocols/simple/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim.pc gaim.spec"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile Doxyfile gaim.apspec doc/Makefile doc/gaim.1 intl/Makefile m4macros/Makefile pixmaps/Makefile pixmaps/smileys/Makefile pixmaps/smileys/default/Makefile pixmaps/smileys/none/Makefile pixmaps/status/Makefile pixmaps/status/default/Makefile plugins/Makefile plugins/docklet/Makefile plugins/gevolution/Makefile plugins/gestures/Makefile plugins/mono/Makefile plugins/mono/api/Makefile plugins/mono/loader/Makefile plugins/musicmessaging/Makefile plugins/perl/Makefile plugins/pe!
 rl/common/Makefile.PL plugins/ssl/Makefile plugins/tcl/Makefile plugins/ticker/Makefile po/Makefile.in sounds/Makefile src/Makefile src/mediastreamer/Makefile src/protocols/Makefile src/protocols/bonjour/Makefile src/protocols/gg/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/novell/Makefile src/protocols/oscar/Makefile src/protocols/sametime/Makefile src/protocols/silc/Makefile src/protocols/simple/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim2.pc gaim.spec"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
--- gaim-2.0.0beta1/src/Makefile.in.gaim2	2006-01-17 17:32:39.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 17:32:56.000000000 -0600
@@ -899,7 +899,7 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-gaim$(EXEEXT): $(gaim_OBJECTS) $(gaim_DEPENDENCIES) 
+gaim2$(EXEEXT): $(gaim_OBJECTS) $(gaim_DEPENDENCIES) 
 	@rm -f gaim$(EXEEXT)
 	$(LINK) $(gaim_LDFLAGS) $(gaim_OBJECTS) $(gaim_LDADD) $(LIBS)
 gaim-client-example$(EXEEXT): $(gaim_client_example_OBJECTS) $(gaim_client_example_DEPENDENCIES) 
--- gaim-2.0.0beta1/m4macros/Makefile.in.BAD	2006-01-17 22:05:25.000000000 -0600
+++ gaim-2.0.0beta1/m4macros/Makefile.in	2006-01-17 22:05:34.000000000 -0600
@@ -355,7 +355,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-installed_m4 = gaim.m4
+installed_m4 = gaim2.m4
 EXTRA_DIST = $(installed_m4)
 m4datadir = $(datadir)/aclocal
 m4data_DATA = $(installed_m4)
--- gaim-2.0.0beta1/configure.BAD	2006-01-17 22:19:00.000000000 -0600
+++ gaim-2.0.0beta1/configure	2006-01-17 22:19:20.000000000 -0600
@@ -421,7 +421,7 @@
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME='gaim'
+PACKAGE_NAME='gaim2'
 PACKAGE_TARNAME='gaim'
 PACKAGE_VERSION='2.0.0-0.1.beta1'
 PACKAGE_STRING='gaim 2.0.0-0.1.beta1'
--- gaim-2.0.0beta1/src/Makefile.am.BAD	2006-01-17 22:19:59.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.am	2006-01-17 22:20:38.000000000 -0600
@@ -169,7 +169,7 @@
 	dbus-bindings.c \
 	dbus-client-binding.c \
 	dbus-client-binding.h \
-	gaim.service \
+	gaim2.service \
 	dbus-types.c \
 	dbus-types.h
 
@@ -232,17 +232,17 @@
 bin_SCRIPTS = gaim-remote.py gaim-notifications-example.py gaim-send gaim-send-async
 
 
-# gaim.service
+# gaim2.service
 
-gaim.service:
+gaim2.service:
 	echo "[Gaim]" > $@
 	echo "Name=org.gaim.GaimService" >> $@
-	echo "Exec=$(bindir)/gaim" >> $@
+	echo "Exec=$(bindir)/gaim2" >> $@
 
 #Ideally, this directory should be autodetected, and the user should
 #be able to specify it as an option to "configure"
 dbus_sessiondir = $(DBUS_SESSION_DIR)
-dbus_session_DATA = gaim.service
+dbus_session_DATA = gaim2.service
 
 endif
 
--- gaim-2.0.0beta1/src/Makefile.in.BAD	2006-01-17 22:20:49.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 22:21:04.000000000 -0600
@@ -644,7 +644,7 @@
 @ENABLE_DBUS_TRUE@	dbus-bindings.c \
 @ENABLE_DBUS_TRUE@	dbus-client-binding.c \
 @ENABLE_DBUS_TRUE@	dbus-client-binding.h \
- at ENABLE_DBUS_TRUE@	gaim.service \
+ at ENABLE_DBUS_TRUE@	gaim2.service \
 @ENABLE_DBUS_TRUE@	dbus-types.c \
 @ENABLE_DBUS_TRUE@	dbus-types.h
 
@@ -677,7 +677,7 @@
 #Ideally, this directory should be autodetected, and the user should
 #be able to specify it as an option to "configure"
 @ENABLE_DBUS_TRUE at dbus_sessiondir = $(DBUS_SESSION_DIR)
- at ENABLE_DBUS_TRUE@dbus_session_DATA = gaim.service
+ at ENABLE_DBUS_TRUE@dbus_session_DATA = gaim2.service
 gaim_SOURCES = \
 	$(gaim_coresources) \
 	$(dbus_sources) \
@@ -1397,12 +1397,12 @@
 
 @ENABLE_DBUS_TRUE at gaim-client-example.$(OBJEXT): gaim-client-bindings.h
 
-# gaim.service
+# gaim2.service
 
- at ENABLE_DBUS_TRUE@gaim.service:
+ at ENABLE_DBUS_TRUE@gaim2.service:
 @ENABLE_DBUS_TRUE@	echo "[Gaim]" > $@
 @ENABLE_DBUS_TRUE@	echo "Name=org.gaim.GaimService" >> $@
- at ENABLE_DBUS_TRUE@	echo "Exec=$(bindir)/gaim" >> $@
+ at ENABLE_DBUS_TRUE@	echo "Exec=$(bindir)/gaim2" >> $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- gaim-2.0.0beta1/sounds/Makefile.in.BAD	2006-01-17 22:22:29.000000000 -0600
+++ gaim-2.0.0beta1/sounds/Makefile.in	2006-01-17 22:22:41.000000000 -0600
@@ -362,7 +362,7 @@
 		receive.wav \
 		send.wav
 
-soundsdir = $(datadir)/sounds/gaim
+soundsdir = $(datadir)/sounds/gaim2
 sounds_DATA = $(EXTRA_DIST)
 all: all-am
 
--- gaim-2.0.0beta1/po/Makefile.in.in.BAD	2006-01-17 22:38:23.000000000 -0600
+++ gaim-2.0.0beta1/po/Makefile.in.in	2006-01-17 22:38:26.000000000 -0600
@@ -6,7 +6,7 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-PACKAGE = @PACKAGE@
+PACKAGE = @PACKAGE at 2
 VERSION = @VERSION@
 
 # These two variables depend on the location of this directory.

gaim2-PIE.patch:
 Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gaim2-PIE.patch ---
--- gaim-2.0.0beta1/src/Makefile.in.BAD	2006-01-17 15:38:08.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 15:38:39.000000000 -0600
@@ -140,13 +140,13 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(CFLAGS) -fPIE
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@ -pie
 SOURCES = $(libgaim_client_la_SOURCES) $(gaim_SOURCES) \
 	$(gaim_client_example_SOURCES)
 DIST_SOURCES = $(am__libgaim_client_la_SOURCES_DIST) \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	12 Aug 2005 04:36:10 -0000	1.33
+++ .cvsignore	27 Jun 2006 17:53:21 -0000	1.34
@@ -1 +1 @@
-gaim-1.5.0.tar.bz2
+gaim-2.0.0beta3.tar.bz2


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gaim.spec	18 May 2006 09:04:01 -0000	1.120
+++ gaim.spec	27 Jun 2006 17:53:21 -0000	1.121
@@ -10,17 +10,29 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
-# OPTION: Standalone NSS (FC5+)
-%define standalone_nss		1
+# OPTION: Mono integration (FC5+)
+%define mono_integration	0
+# OPTION: dbus integration (FC5+)
+%define dbus_integration	1
+
+# OPTION: Howl integration (seems broken)
+%define howl_integration	0
+# OPTION: gadugadu integration (not shipped in core)
+%define gadugadu_integration	0
+# OPTION: Meanwhile integration (not shipped in core)
+%define meanwhile_integration	0
+
+# Prerelease define
+%define betaver	beta3
 
 Name:		gaim
-Version:	1.5.0
-Release:        19.fc6
-Epoch:		1
+Version:	2.0.0
+Release:	0.3.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
-Source0:	http://prdownloads.sourceforge.net/gaim/gaim-%{version}.tar.bz2
+Source0:	http://download.sourceforge.net/gaim/gaim-%{version}%{betaver}.tar.bz2
+Epoch:		2
 
 ## Fedora gaim defaults - Please Regenerate for Each Major Release
 # 1) run gaim as new user 2) edit preferences 3) close 4) copy .gaim/prefs.xml
@@ -38,62 +50,25 @@
 
 ## Patches 0-99: Fedora specific or upstream wont accept
 # to be replaced by upstream fix
-Patch4:		gaim-0.76-xinput.patch
-Patch5:		gaim-1.3.1-PIE.patch
-# GNOME running check is naive and wrong for both KDE and older distributions
-Patch6:		gaim-1.0.1-naive-gnome-check.patch
-
-## Patches 100-199: Upstream CVS Backports
-Patch156: gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch
-Patch157: gaim-1.5.0-it-yahoo_profile.patch
-Patch158: gaim-1.5.0-strip-html-status.patch
-Patch159: gaim-1.5.0-xmlnode-cleanup.patch
-Patch160: gaim-1.5.0-crash-non-terminated-strings.patch
-Patch161: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch
-Patch162: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch
-Patch163: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch
-Patch164: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch
-Patch165: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch
-Patch166: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch
-Patch167: gaim-1.5.0-msn-data-corruption-fix.patch
-Patch168: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch
-Patch169: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch
-Patch170: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch
-Patch171: gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch
-Patch172: gaim-1.5.0-clipboard-leak-history-scroll.patch
-Patch173: gaim-1.5.0-smileys-logtype-p1.patch
-Patch174: gaim-1.5.0-smileys-logtype-p2.patch
-Patch175: gaim-1.5.0-italics-ircs.patch
-Patch176: gaim-1.5.0-authors.patch
-Patch177: gaim-1.5.0-copyright.patch
-Patch178: gaim-1.5.0-hacking-doc.patch
-Patch179: gaim-1.5.0-doc-creation.patch
-Patch180: gaim-1.5.0-aim-rate-limiting.patch
-Patch181: gaim-1.5.0-nss-detect.patch
-Patch182: gaim-1.5.0-logging-compatibility.patch
-Patch183: gaim-1.5.0-msn-block-crash.patch
-Patch184: gaim-1.5.0-silc-CID-71.patch
+Patch5:		gaim2-PIE.patch
+Patch6:		gaim-2.0.0beta1-gaim2.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
-Provides:	gaim-devel = %{epoch}:%{version}-%{release}
 
 # Require Binary Compatible glib
 # returns bogus value if glib2-devel is not installed in order for parsing to succeed
 # bogus value wont make it into a real package
 %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+BuildRequires:	glib2-devel
 Requires:       glib2 >= %{glib_ver}
 
 # Basic Library Requirements
 BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
-
+BuildRequires:  cyrus-sasl-devel
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  libICE-devel
-BuildRequires:  libSM-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXext-devel
+BuildRequires:  gettext
 BuildRequires:  libXScrnSaver-devel
 
 # krb5 needed for Zephyr (FC1+)
@@ -118,6 +93,27 @@
 %if %{silc_integration}
 BuildRequires:	libsilc-devel
 %endif
+# Mono integration (FC5+)
+%if %{mono_integration}
+BuildRequires:	mono-devel
+%endif
+# DBus integration (FC5+)
+%if %{dbus_integration}
+BuildRequires:	dbus-devel >= 0.35
+%endif
+
+# Howl integration (seems to be broken)
+%if %{howl_integration}
+BuildRequires:	avahi-devel
+%endif
+# Meanwhile integration (not shipped in core)
+%if %{meanwhile_integration}
+BuildRequires:	meanwhile-devel
+%endif
+# Gadugadu integration (not shipped in core)
+%if %{gadugadu_integration}
+BuildRequires:	ekg-devel
+%endif
 
 %description
 Gaim allows you to talk to anyone using a variety of messaging 
@@ -134,49 +130,23 @@
 providers.
 
 
+%package devel
+Summary: Development headers and libraries for gaim
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+This package contains the files necessary to develop or compile code
+that depends on gaim.
+
 
 
 %prep
-%setup -q
-%patch4 -p1
-#patch5 happens after configure, yes this sucks
-%patch6 -p1
-
-# CVS backports go here
-%patch156 -p0
-%patch157 -p0
-%patch158 -p0
-%patch159 -p0
-%patch160 -p0
-%patch161 -p0
-%patch162 -p0
-%patch163 -p0
-%patch164 -p0
-%patch165 -p0
-%patch166 -p0
-%patch167 -p0
-%patch168 -p0
-%patch169 -p0
-%patch170 -p0
-%patch171 -p0
-%patch172 -p0
-%patch173 -p0
-%patch174 -p0
-%patch175 -p0
-%patch176 -p0
-%patch177 -p0
-%patch178 -p0
-%patch179 -p0
-%patch180 -p2
-%if %{standalone_nss}
-%patch181 -p1
-%endif
-%patch182 -p0
-%patch183 -p2
-%patch184 -p2
+%setup -q -n gaim-%{version}%{betaver}
+%patch5 -p1
 
 # Relabel internal version for support purposes
-sed -i "s/%{version}/%{version}-%{release}/g" configure
+sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
 chmod 755 configure
 
 # If not using gnome-open, then default to htmlview 
@@ -201,26 +171,33 @@
 %else
 	WITH_PERL="--disable-perl"
 %endif
+%if %{howl_integration}
+	WITH_HOWL="--with-howl-includes=/usr/include/avahi-compat-howl/"
+%endif
+%if %{mono_integration}
+	WITH_MONO="--enable-mono"
+%else
+	WITH_MONO="--disable-mono"
+%endif
+%if %{dbus_integration}
+	WITH_DBUS="--enable-dbus"
+%else
+	WITH_DBUS="--disable-dbus"
+%endif
+
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
-# Use relro opt flag, compiler simply ignores this in < FC3
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wl,-z,relro"
-# Use FORTIFY_SOURCE if it is not already in opt flags
-# compiler simply ignores this in < FC3
-echo $RPM_OPT_FLAGS | grep -q "FORTIFY_SOURCE" || export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wp,-D_FORTIFY_SOURCE=2"
 export CFLAGS="$RPM_OPT_FLAGS"
 
 # disable tcl and tk because nobody uses it
 # gnutls is buggy so use mozilla-nss on all distributions
-%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
-
-# Abort build if NSS was not detected
-grep -q "#define HAVE_NSS 1" config.h || exit 1
-
-# patch Makefile for PIE
-patch -p1 < %{PATCH5}
-make %{?_smp_mflags}
+%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes \
+           --enable-cyrus-sasl \
+	   $WITH_KRB $WITH_SILC $WITH_PERL $WITH_HOWL $WITH_MONO \
+	   $WITH_SASL $WITH_DBUS
+# smp_mflags breaks the mono plugin
+make
 
 
 %install
@@ -252,11 +229,23 @@
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-%find_lang %{name}
+%find_lang gaim
 
 
 %post 
 /sbin/ldconfig -n %{_libdir}/gaim
+# This is a hack that we have to do. Mono apps need mono_exec_t. Since gaim doesn't 
+# call /usr/bin/mono to run its mono bits, the existing selinux policy misses this.
+#/usr/bin/chcon -t mono_exec_t /usr/bin/gaim 
+
+# XXX: This line above fails on non-selinux systems with a non-zero return code.
+# Changing the selinux context here would also cause rpm -V and TPS failure.
+# Can't we find a better solution for this?
+
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196877
+# There is also concern that we don't want gaim to run with this security context
+# due to its historical security track record.  For now we are disaling mono
+# temporarily until we decide a long term solution.
 
 %postun
 /sbin/ldconfig -n %{_libdir}/gaim
@@ -264,49 +253,47 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f gaim.lang
 %defattr(-,root,root,-)
 %doc doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog doc/PERL-HOWTO.dox
-#%%config %{_sysconfdir}/CORBA/servers/gaim_applet.gnorba
 %{_bindir}/*
-%{_libdir}/gaim
-%{_includedir}/gaim
+%{_libdir}/gaim/
 %{_libdir}/pkgconfig/gaim.pc
-%{_libdir}/libgaim*.so*
-%{_mandir}/*/*
-#%%{_datadir}/applets/Network/gaim_applet.desktop
+%{_libdir}/libgaim-client.so.*
+%{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_datadir}/aclocal/gaim.m4
 %{_datadir}/applications/gaim.desktop
-%{_datadir}/pixmaps/gaim
+%{_datadir}/dbus-1/services/gaim.service
+%{_datadir}/pixmaps/gaim/
 %{_datadir}/pixmaps/gaim.png
-%{_datadir}/sounds/gaim
-#%%{_datadir}/pixmaps/gaim/*
-%{_sysconfdir}/gaim/prefs.xml
-%dir %{_sysconfdir}/gaim
+%{_datadir}/pixmaps/gaim.svg
+%{_datadir}/sounds/gaim/
+%{_sysconfdir}/gaim/
 %if %{perl_integration}
 %{perl_vendorarch}/Gaim*
 %{perl_vendorarch}/auto/Gaim/
 %endif
 
-%changelog
-* Thu May 18 2006 Karsten Hopp <karsten at redhat.de> 1.5.0-19.fc6
-- bump release and rebuild
-
-* Wed May 17 2006 Karsten Hopp <karsten at redhat.de> 1.5.0-18.fc6
-- add some missing buildrequires: libICE-devel, libSM-devel
-  libX11-devel, libXext-devel, libXScrnSaver-devel
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/gaim/
+%{_libdir}/libgaim-client.so
 
-* Fri Apr 28 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-17
-- 184: silc crash fix (#190152)
+%changelog
+* Tue Jun 27 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.3.beta3
+- more spec cleanups
+- buildreq libXScrnSaver-devel and gettext
+- disable mono for now due to #196877
 
-* Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
-- MSN block crash (#185222 Stu Tomlinson)
+* Mon Jun 26 2006 Tom "spot" Callaway <tcallawa at redhat.com>
+- split out -devel package to meet guidelines
 
-* Tue Feb 07 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-15
-- allow compat with gaim-2.x log format (rlaager)
+* Mon Jan 23 2006 Tom "spot" Callaway <tcallawa at redhat.com>
+- gaim2 version of the spec
 
-* Fri Jan 13 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-13
-- buildreq desktop-file-utils (ivazquez #176688)
-- detect NSS in a generic way and abort on failure
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
 
 * Thu Nov 10 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-9
 - Ensure that security opt flags are used (#165795)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	12 Aug 2005 04:36:13 -0000	1.33
+++ sources	27 Jun 2006 17:53:21 -0000	1.34
@@ -1 +1 @@
-9205321ac11fad271c90f2f0d7c5e7ce  gaim-1.5.0.tar.bz2
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2


--- gaim-0.76-xinput.patch DELETED ---


--- gaim-1.0.1-naive-gnome-check.patch DELETED ---


--- gaim-1.3.1-PIE.patch DELETED ---


--- gaim-1.5.0-aim-rate-limiting.patch DELETED ---


--- gaim-1.5.0-authors.patch DELETED ---


--- gaim-1.5.0-clipboard-leak-history-scroll.patch DELETED ---


--- gaim-1.5.0-copyright.patch DELETED ---


--- gaim-1.5.0-crash-non-terminated-strings.patch DELETED ---


--- gaim-1.5.0-doc-creation.patch DELETED ---


--- gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch DELETED ---


--- gaim-1.5.0-hacking-doc.patch DELETED ---


--- gaim-1.5.0-it-yahoo_profile.patch DELETED ---


--- gaim-1.5.0-italics-ircs.patch DELETED ---


--- gaim-1.5.0-logging-compatibility.patch DELETED ---


--- gaim-1.5.0-msn-block-crash.patch DELETED ---


--- gaim-1.5.0-msn-data-corruption-fix.patch DELETED ---


--- gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch DELETED ---


--- gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch DELETED ---


--- gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch DELETED ---


--- gaim-1.5.0-nss-detect.patch DELETED ---


--- gaim-1.5.0-silc-CID-71.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch DELETED ---


--- gaim-1.5.0-smileys-logtype-p1.patch DELETED ---


--- gaim-1.5.0-smileys-logtype-p2.patch DELETED ---


--- gaim-1.5.0-strip-html-status.patch DELETED ---


--- gaim-1.5.0-xmlnode-cleanup.patch DELETED ---


--- gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 18:07:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 14:07:08 -0400
Subject: rpms/gaim/devel gaim.spec, 1.121, 1.122 gaim-2.0.0beta1-gaim2.patch,
	1.1, NONE
Message-ID: <200606271807.k5RI789A002689@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2669

Modified Files:
	gaim.spec 
Removed Files:
	gaim-2.0.0beta1-gaim2.patch 
Log Message:
remove unused patch



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gaim.spec	27 Jun 2006 17:53:21 -0000	1.121
+++ gaim.spec	27 Jun 2006 18:07:06 -0000	1.122
@@ -51,7 +51,6 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 # to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
-Patch6:		gaim-2.0.0beta1-gaim2.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client


--- gaim-2.0.0beta1-gaim2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jun 27 18:32:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 14:32:47 -0400
Subject: rpms/gaim/devel gaim.spec,1.122,1.123
Message-ID: <200606271832.k5RIWl7s002947@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2876

Modified Files:
	gaim.spec 
Log Message:
buildreq intltool



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gaim.spec	27 Jun 2006 18:07:06 -0000	1.122
+++ gaim.spec	27 Jun 2006 18:32:28 -0000	1.123
@@ -69,6 +69,7 @@
 BuildRequires:	gtk2-devel
 BuildRequires:  gettext
 BuildRequires:  libXScrnSaver-devel
+BuildRequires:  intltool
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -282,7 +283,7 @@
 %changelog
 * Tue Jun 27 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.3.beta3
 - more spec cleanups
-- buildreq libXScrnSaver-devel and gettext
+- buildreq libXScrnSaver-devel, gettext, intltool
 - disable mono for now due to #196877
 
 * Mon Jun 26 2006 Tom "spot" Callaway <tcallawa at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Jun 27 18:50:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 14:50:13 -0400
Subject: rpms/gaim/devel gaim.spec,1.123,1.124
Message-ID: <200606271850.k5RIoD2A022814@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22770

Modified Files:
	gaim.spec 
Log Message:
buildreq desktop-file-utils



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gaim.spec	27 Jun 2006 18:32:28 -0000	1.123
+++ gaim.spec	27 Jun 2006 18:50:11 -0000	1.124
@@ -70,6 +70,7 @@
 BuildRequires:  gettext
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -283,7 +284,7 @@
 %changelog
 * Tue Jun 27 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.3.beta3
 - more spec cleanups
-- buildreq libXScrnSaver-devel, gettext, intltool
+- buildreq libXScrnSaver-devel, gettext, intltool, desktop-file-utils
 - disable mono for now due to #196877
 
 * Mon Jun 26 2006 Tom "spot" Callaway <tcallawa at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Jun 27 19:49:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 15:49:16 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.26,1.27
Message-ID: <200606271949.k5RJnGuu004748@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4642

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Tue Jun 27 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.1-3
- Bump release for FC5 aiglx build.



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-ati.spec	26 Jun 2006 22:58:19 -0000	1.26
+++ xorg-x11-drv-ati.spec	27 Jun 2006 19:49:14 -0000	1.27
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   2
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -87,6 +87,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Jun 27 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.1-3
+- Bump release for FC5 aiglx build.
+
 * Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-2
 - Filter the EDID mode list by the monitor's reported pixel clock.  Bump
   the BuildReq to a server that provides the necessary ABI field.



From fedora-cvs-commits at redhat.com  Tue Jun 27 19:53:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 15:53:29 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.3-gpg-account-name.patch, NONE,
	1.1 evolution-data-server.spec, 1.98, 1.99
Message-ID: <200606271953.k5RJrT5I006485@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6346

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.3-gpg-account-name.patch 
Log Message:
- Show GPG key name when asking for the password (Gnome.org #345965).


evolution-data-server-1.7.3-gpg-account-name.patch:
 camel-gpg-context.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-data-server-1.7.3-gpg-account-name.patch ---
Index: camel/camel-gpg-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-gpg-context.c,v
retrieving revision 1.81
diff -u -r1.81 camel-gpg-context.c
--- camel/camel-gpg-context.c	1 May 2006 14:16:33 -0000	1.81
+++ camel/camel-gpg-context.c	26 Jun 2006 15:31:18 -0000
@@ -809,15 +809,15 @@
 		g_free (gpg->need_id);
 		gpg->need_id = userid;
 	} else if (!strncmp (status, "GET_HIDDEN ", 11)) {
+		const char *name = NULL;
 		char *prompt, *passwd;
-		const char *name;
 		guint32 flags;
 		
 		status += 11;
 		
 		if (gpg->need_id && !(name = g_hash_table_lookup (gpg->userid_hint, gpg->need_id)))
 			name = gpg->need_id;
-		else
+		else if (!name)
 			name = "";
 		
 		if (!strncmp (status, "passphrase.pin.ask", 18)) {


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- evolution-data-server.spec	14 Jun 2006 14:20:29 -0000	1.98
+++ evolution-data-server.spec	27 Jun 2006 19:53:27 -0000	1.99
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.7.3
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -47,6 +47,9 @@
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# Gnome.org #345965 - fixed upstream
+Patch301: evolution-data-server-1.7.3-gpg-account-name.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -128,6 +131,7 @@
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
+%patch301 -p0 -b .gpg-account-name
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -324,6 +328,9 @@
 
 
 %changelog
+* Tue Jun 27 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.3-3
+- Show GPG key name when asking for the password (Gnome.org #345965).
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.7.3-2
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 20:44:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 16:44:49 -0400
Subject: rpms/evolution/devel evolution-2.7.3-filter-datespec.patch, NONE,
	1.1 evolution.spec, 1.155, 1.156
Message-ID: <200606272044.k5RKin7l009795@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9780

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-filter-datespec.patch 
Log Message:
- Add patch for Gnome.org bug #211058 for Trever Adams to test.


evolution-2.7.3-filter-datespec.patch:
 filter-datespec.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE evolution-2.7.3-filter-datespec.patch ---
--- evolution-2.7.3/filter/filter-datespec.c.filter-datespec	2005-08-09 19:29:27.000000000 -0400
+++ evolution-2.7.3/filter/filter-datespec.c	2006-06-27 15:56:18.000000000 -0400
@@ -82,6 +82,13 @@
 	{ 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 },
 	{ 2419200, ngettext("1 month ago", "%d months ago"), 12.0 },
 	{ 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 },
+	{ -1, ngettext("1 second in the future", "%d seconds in the future"), 59.0 },
+	{ -60, ngettext("1 minute in the future", "%d minutes in the future"), 59.0 },
+	{ -3600, ngettext("1 hour in the future", "%d hours in the future"), 23.0 },
+	{ -86400, ngettext("1 day in the future", "%d days in the future"), 31.0 },
+	{ -604800, ngettext("1 week in the future", "%d weeks in the future"), 52.0 },
+	{ -2419200, ngettext("1 month in the future", "%d months in the future"), 12.0 },
+	{ -31557600, ngettext("1 year in the future", "%d years in the future"), 1000.0 },
 };
 
 /* now we let the compiler see the real function call */


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- evolution.spec	26 Jun 2006 15:14:52 -0000	1.155
+++ evolution.spec	27 Jun 2006 20:44:47 -0000	1.156
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -116,12 +116,15 @@
 # Gnome.org #343331
 Patch900: evolution-2.7.2.1-quit-resize-crash.patch
 
-# Gnome.org #345677
+# Gnome.org #345677 - fixed upstream
 Patch901: evolution-2.7.3-no-boolean-in-schemas.patch
 
 # RH bug #157505
 Patch902: evolution-2.7.3-candidate-window-position.patch
 
+# Gnome.org #211058 - for Trever Adams to test
+Patch903: evolution-2.7.3-filter-datespec.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -276,6 +279,7 @@
 %patch900 -p1 -b .quit-resize-crash
 %patch901 -p1 -b .no-boolean-in-schemas
 %patch902 -p1 -b .candidate-window-position
+%patch903 -p1 -b .filter-datespec
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -666,6 +670,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jun 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-5
+- Add patch for Gnome.org bug #211058 for Trever Adams to test.
+
 * Mon Jun 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-4
 - Add patch for RH bug #157505 for QE testing.
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 21:58:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 17:58:39 -0400
Subject: rpms/conga/FC-5 conga.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200606272158.k5RLwdN6013007@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/conga/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12972/FC-5

Modified Files:
	conga.spec sources 
Log Message:
auto-import conga-0.8-6.FC5 on branch FC-5 from conga-0.8-6.FC5.src.rpm


Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- conga.spec	19 Jun 2006 21:26:41 -0000	1.3
+++ conga.spec	27 Jun 2006 21:58:36 -0000	1.4
@@ -11,7 +11,7 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel 5.FC6
+%define rel 6.FC5
 
 
 %ifarch x86_64
@@ -42,7 +42,13 @@
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
-conga source rpm
+Conga is a project developing management system for remote stations. 
+It consists of luci, https frontend, and ricci, secure daemon that dispatches 
+incoming messages to underlying management modules. 
+
+This package contains source code of Conga and 
+Red Hat Enterprise Linux Cluster Suite ricci/SNMP/CIM module/agent/provider. 
+
 
 %prep
 %setup -q
@@ -81,8 +87,11 @@
 
 
 %description -n luci
-luci description
-This package contains Luci website
+Conga is a project developing management system for remote stations. 
+It consists of luci, https frontend, and ricci, secure daemon that dispatches 
+incoming messages to underlying management modules. 
+
+This package contains Luci website.
 
 
 %files -n luci
@@ -103,21 +112,41 @@
 
 %post -n luci
 /sbin/chkconfig --add luci
+if [ -e /var/lib/luci/var/luci_backup.xml ]; then
+   /sbin/service luci status >/dev/null 2>$1
+   LUCI_RUNNING=$?
+   if [ "$LUCI_RUNNING" = "0" ]; then
+      /sbin/service luci stop >/dev/null 2>$1
+   fi
+   /usr/sbin/luci_admin restore >/dev/null 2>$1
+   if [ "$LUCI_RUNNING" = "0" ]; then
+      /sbin/service luci start >/dev/null 2>$1
+   fi
+fi
 if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
-	# no privkey.pem -> luci not initialized
-	# set initial random admin password
-	T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
-	for i in $T_PASS; do
-	   if [ "-" != $i ] ; then
-		echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
-	   fi
-	done
-	/bin/chmod 600 /var/lib/luci/inituser
-	/bin/chown luci /var/lib/luci/inituser
+   # no privkey.pem -> luci not initialized
+   # set initial random admin password
+   T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
+   for i in $T_PASS; do
+      if [ "-" != $i ] ; then
+	echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
+      fi
+   done
+   /bin/chmod 600 /var/lib/luci/inituser
+   /bin/chown luci /var/lib/luci/inituser
 fi
 
 %preun -n luci
-if [ "$1" = 0 ]; then
+/sbin/service luci status >/dev/null 2>$1
+LUCI_RUNNING=$?
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci stop >/dev/null 2>$1
+fi
+/usr/sbin/luci_admin backup >/dev/null 2>$1
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci start >/dev/null 2>$1
+fi
+if [ "$1" = "0" ]; then
    /sbin/service luci stop >/dev/null 2>$1
    /sbin/chkconfig --del luci
 fi
@@ -126,6 +155,7 @@
 if [ "$1" -ge "1" ]; then
    /sbin/service luci condrestart > /dev/null 2>&1
 fi
+exit 0
 
 
 
@@ -163,9 +193,12 @@
 Provides: ricci-modlog
 
 %description -n ricci
-ricci description
-Remote management system. 
-This package contains listening daemon, as well as reboot, rpm, storage, service and log management modules. 
+Conga is a project developing management system for remote stations. 
+It consists of luci, https frontend, and ricci, secure daemon that dispatches 
+incoming messages to underlying management modules. 
+
+This package contains listening daemon (dispatcher), as well as 
+reboot, rpm, storage, service and log management modules. 
 
 
 %files -n ricci
@@ -227,7 +260,7 @@
 fi
 
 %preun -n ricci
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
    /sbin/service ricci stop > /dev/null 2>&1
    /sbin/chkconfig --del ricci
 fi
@@ -261,7 +294,12 @@
 Conflicts: clumon
 
 %description -n ricci-modcluster
-ricci-modcluster description
+Conga is a project developing management system for remote stations. 
+It consists of luci, https frontend, and ricci, secure daemon that dispatches 
+incoming messages to underlying management modules. 
+
+This package contains Red Hat Enterprise Linux Cluster Suite ricci management module. 
+
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
@@ -280,12 +318,12 @@
 RUNS=(`runlevel`)
 RUNLEVEL=${RUNS[1]}
 STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
-if [ $STATE = "on" ]; then
+if [ "$STATE" = "on" ]; then
    /sbin/service ricci-modclusterd restart > /dev/null 2>&1
 fi
 
 %preun -n ricci-modcluster
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
    /sbin/service ricci-modclusterd stop > /dev/null 2>&1
    /sbin/chkconfig --del ricci-modclusterd
 fi
@@ -314,7 +352,7 @@
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
-SNMP agent for Red Hat Enterprise Linux Cluster Suite
+SNMP agent for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-snmp
 %defattr(-,root,root)
@@ -356,7 +394,7 @@
 Conflicts: clumon-cim
 
 %description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite
+CIM provider for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-cim
 %defattr(-,root,root)
@@ -388,13 +426,15 @@
 
 
 %changelog
+* Tue Jun 27 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-6
+- Luci persists users/clusters/systems/permissions across upgrades 
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-4
 - Moved storage, service, log and rpm modules into main ricci.rpm.
 * Wed Jun 14 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-1
 - Packaged cluster-snmp (cluster snmp agent)
 - Packaged cluster-cim (cluster CIM provider)
 * Mon Jun 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.7-5
-- Disable non-https access to Luci, enable https on port 8181
+- Disable non-https access to Luci, enable https on port 8084
 * Mon Jun 02 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.7-1
 - Packaged Luci - ricci's www frontend
 - Added logging module


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Jun 2006 21:26:41 -0000	1.4
+++ sources	27 Jun 2006 21:58:36 -0000	1.5
@@ -1 +1 @@
-c2c5ccbe080b1c4f14a3b553f9e01248  conga-0.8.tar.gz
+134d1801b7db475801f364cd690c581b  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jun 27 22:15:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 18:15:18 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-no-zlib.patch, NONE,
	1.1 xorg-x11-server-1.0.1-Red-Hat-extramodes.patch, 1.2,
	1.3 xorg-x11-server.spec, 1.103, 1.104
Message-ID: <200606272215.k5RMFINM016312@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16242

Modified Files:
	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-no-zlib.patch 
Log Message:
- Don't (uselessly) link the server against zlib.
- Fix the 1680x1050 modes to be the CVT timings instead of GTF.


xorg-x11-server-1.1.0-no-zlib.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-no-zlib.patch ---
--- xorg-server-1.1.0/configure.ac.zlib	2006-06-22 12:30:28.000000000 -0400
+++ xorg-server-1.1.0/configure.ac	2006-06-22 12:31:44.000000000 -0400
@@ -856,7 +856,7 @@
 PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
 
 XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
-XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} -lm -lz"
+XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} -lm"
 AC_SUBST([XSERVER_LIBS])
 AC_SUBST([SYS_LIBS])
 

xorg-x11-server-1.0.1-Red-Hat-extramodes.patch:
 extramodes |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 115 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.0.1-Red-Hat-extramodes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.0.1-Red-Hat-extramodes.patch	6 Mar 2006 20:38:28 -0000	1.2
+++ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch	27 Jun 2006 22:15:12 -0000	1.3
@@ -26,7 +26,7 @@
  
  # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
  Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
-@@ -31,3 +40,108 @@
+@@ -31,3 +40,107 @@
  # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
  Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
  
@@ -72,17 +72,16 @@
 +# 1280x800 @ 85.00 Hz (GTF) hsync: 71.40 kHz; pclk: 123.38 MHz
 +Modeline "1280x800"  123.38  1280 1368 1504 1728  800 801 804 840  -HSync +Vsync
 +
-+# 1680x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 147.14 MHz
-+Modeline "1680x1050"  147.14  1680 1784 1968 2256  1050 1051 1054 1087  -HSync +Vsync
++# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
++Modeline "1680x1050"  146.25  1680 1784 1960 2240  1050 1053 1059 1089 -hsync +vsync
 +
-+# 1680x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 173.83 MHz
-+Modeline "1680x1050"  173.83  1680 1792 1976 2272  1050 1051 1054 1093  -HSync +Vsync
++# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz
++Modeline "1680x1050"  174.00  1680 1800 1976 2272  1050 1053 1059 1096 -hsync +vsync
 +
-+# 1680x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 188.07 MHz
-+Modeline "1680x1050"  188.07  1680 1800 1984 2288  1050 1051 1054 1096  -HSync +Vsync
-+
-+# 1680x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 214.51 MHz
-+Modeline "1680x1050"  214.51  1680 1800 1984 2288  1050 1051 1054 1103  -HSync +Vsync
++# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
++Modeline "1680x1050"  187.00  1680 1800 1976 2272  1050 1053 1059 1099 -hsync +vsync
++# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
++Modeline "1680x1050"  214.75  1680 1808 1984 2288  1050 1053 1059 1105 -hsync +vsync
 +
 +# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz
 +Modeline "1280x720"  74.48  1280 1336 1472 1664  720 721 724 746  -HSync +Vsync


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- xorg-x11-server.spec	26 Jun 2006 23:24:37 -0000	1.103
+++ xorg-x11-server.spec	27 Jun 2006 22:15:13 -0000	1.104
@@ -41,6 +41,7 @@
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2002:  xorg-x11-server-1.1.0-hush-crash-message.patch
 #Patch2003:  xorg-x11-server-1.1.0-loader-diet.patch
+Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
 
 # autoconfiguration feature patches
 #Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
@@ -311,6 +312,7 @@
 %patch2001 -p1 -b .pci-scan
 %patch2002 -p1 -b .crash-message
 #%patch2003 -p1 -b .loader-diet
+%patch2004 -p1 -b .zlib
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -642,6 +644,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-24
+- Don't (uselessly) link the server against zlib.
+- Fix the 1680x1050 modes to be the CVT timings instead of GTF.
+
 * Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-23
 - Fix an open-coded check for reduced-blanking modes to only apply to analog
   connectors.



From fedora-cvs-commits at redhat.com  Tue Jun 27 22:31:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 18:31:33 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.104,1.105
Message-ID: <200606272231.k5RMVXwM004218@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4189

Modified Files:
	xorg-x11-server.spec 
Log Message:
bump



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- xorg-x11-server.spec	27 Jun 2006 22:15:13 -0000	1.104
+++ xorg-x11-server.spec	27 Jun 2006 22:31:29 -0000	1.105
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   23
+Release:   24
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X



From fedora-cvs-commits at redhat.com  Tue Jun 27 22:32:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 18:32:00 -0400
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.9,
	1.10
Message-ID: <200606272232.k5RMW0LN004307@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-rendition/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4259

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
- Build on x86_64.



Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-rendition.spec	23 May 2006 19:17:00 -0000	1.9
+++ xorg-x11-drv-rendition.spec	27 Jun 2006 22:31:50 -0000	1.10
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 rendition video driver
 Name:      xorg-x11-drv-rendition
 Version:   4.1.0
-Release:   2
+Release:   3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   rendition.xinf
@@ -15,7 +15,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86}
+ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
@@ -57,6 +57,9 @@
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-3
+- Build on x86_64.
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Tue Jun 27 23:39:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 19:39:23 -0400
Subject: rpms/kernel/devel patch-2.6.17-git12.bz2.sign, NONE, 1.1 .cvsignore,
	1.466, 1.467 kernel-2.6.spec, 1.2318, 1.2319 sources, 1.410,
	1.411 upstream, 1.375, 1.376 patch-2.6.17-git11.bz2.sign, 1.1, NONE
Message-ID: <200606272339.k5RNdNRl019223@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19194

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git12.bz2.sign 
Removed Files:
	patch-2.6.17-git11.bz2.sign 
Log Message:
git12


--- NEW FILE patch-2.6.17-git12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEoNgyyGugalF9Dw4RAqdmAJ4+lrwZSR98d37wHVxQTyAfqxLLuACfR2ox
MOmqFd1HmTsZhv00EQBWDZU=
=qu3o
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- .cvsignore	27 Jun 2006 00:39:11 -0000	1.466
+++ .cvsignore	27 Jun 2006 23:39:20 -0000	1.467
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git11.bz2
+patch-2.6.17-git12.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2318
retrieving revision 1.2319
diff -u -r1.2318 -r1.2319
--- kernel-2.6.spec	27 Jun 2006 02:51:04 -0000	1.2318
+++ kernel-2.6.spec	27 Jun 2006 23:39:20 -0000	1.2319
@@ -75,7 +75,7 @@
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
-%define signmodules 1
+#%define signmodules 1
 %endif
 
 %ifarch i686
@@ -85,21 +85,13 @@
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
-%define signmodules 1
+#%define signmodules 1
 %endif
 
 %ifarch ppc64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
-%define signmodules 1
-%define make_target vmlinux
-%define kernel_image vmlinux
-%endif
-
-%ifarch ppc64iseries
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
-%define image_install_path boot
-%define signmodules 1
+#%define signmodules 1
 %define make_target vmlinux
 %define kernel_image vmlinux
 %endif
@@ -142,7 +134,7 @@
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
 %define image_install_path boot/efi/EFI/redhat
-%define signmodules 1
+#%define signmodules 1
 %define make_target compressed
 %define kernel_image vmlinux.gz
 %endif
@@ -229,8 +221,7 @@
 Source25: kernel-%{kversion}-ppc.config
 Source26: kernel-%{kversion}-ppc-smp.config
 Source27: kernel-%{kversion}-ppc64.config
-Source28: kernel-%{kversion}-ppc64iseries.config
-Source29: kernel-%{kversion}-ppc64-kdump.config
+Source28: kernel-%{kversion}-ppc64-kdump.config
 
 Source30: kernel-%{kversion}-s390.config
 Source31: kernel-%{kversion}-s390x.config
@@ -249,7 +240,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git11.bz2
+Patch1: patch-2.6.17-git12.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -273,7 +264,6 @@
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
-Patch317: linux-2.6-ppc-iseries-input-layer.patch
 Patch318: linux-2.6-ppc-clear-ipis-on-kdump.patch
 Patch319: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
 
@@ -770,8 +760,6 @@
 #%patch306 -p1
 # Check properly for successful RTAS instantiation
 %patch314 -p1
-# No input layer on iseries
-%patch317 -p1
 #%patch318 -p1
 #%patch319 -p1
 
@@ -1628,6 +1616,10 @@
 %endif
 
 %changelog
+* Tue Jun 27 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git12
+- Disable the signed module patches for now, they need love.
+
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git10 & git11
 - Enable fake PCI hotplug driver. (#190437)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- sources	27 Jun 2006 00:39:21 -0000	1.410
+++ sources	27 Jun 2006 23:39:20 -0000	1.411
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-3549df9562e78614d39e81c09bb2342b  patch-2.6.17-git11.bz2
+9cd372332e0b14da8057e3425e64e300  patch-2.6.17-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- upstream	27 Jun 2006 00:39:21 -0000	1.375
+++ upstream	27 Jun 2006 23:39:20 -0000	1.376
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git11.bz2
+patch-2.6.17-git12.bz2


--- patch-2.6.17-git11.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 00:15:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 20:15:20 -0400
Subject: rpms/libdrm/devel .cvsignore, 1.6, 1.7 libdrm.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200606280015.k5S0FKXc026064@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26028/devel

Modified Files:
	.cvsignore libdrm.spec sources 
Log Message:
auto-import libdrm-2.0.2-1 on branch devel from libdrm-2.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Mar 2006 18:22:13 -0000	1.6
+++ .cvsignore	28 Jun 2006 00:15:18 -0000	1.7
@@ -1 +1 @@
-libdrm-2.0.1.tar.bz2
+libdrm-2.0.2.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libdrm.spec	19 Jun 2006 17:16:20 -0000	1.14
+++ libdrm.spec	28 Jun 2006 00:15:18 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.0.1
-Release: 4
+Version: 2.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -11,7 +11,6 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: libX11-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -32,8 +31,7 @@
 %setup -q 
 
 %build
-# NOTE: We don't want to ship static libs.
-%configure --disable-static
+%configure
 make
 
 %install
@@ -72,12 +70,13 @@
 %{_includedir}/drm/via_3d_reg.h
 %{_includedir}/drm/via_drm.h
 %{_includedir}/xf86drm.h
-# NOTE: We don't want to ship static libs.
-#%{_libdir}/libdrm.a
 %{_libdir}/libdrm.so
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 2.0.2-2
+- Bump to 2.0.2 for header updates.  Fix BuildRequires.  Minor spec cleanups. 
+
 * Mon Jun 09 2006 Mike A. Harris <mharris at redhat.com> 2.0.1-4
 - Added "Exclusivearch: ix86, x86_64, ia64, ppc, alpha, sparc, sparc64" to
   restrict build to DRI-enabled architectures.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2006 18:22:13 -0000	1.6
+++ sources	28 Jun 2006 00:15:18 -0000	1.7
@@ -1 +1 @@
-9518db08c3b4264efd1caf7be31a9659  libdrm-2.0.1.tar.bz2
+db7f1f89d2571427d6ea1feb2466f577  libdrm-2.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 28 00:17:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 20:17:50 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2319, 1.2320 upstream, 1.376,
	1.377 kgdb-8250-fix.patch, 1.1, NONE kgdb-8250.patch, 1.1,
	NONE kgdb-cfi_annotations.patch, 1.1,
	NONE kgdb-core-lite-add-reboot-command.patch, 1.1,
	NONE kgdb-core-lite.patch, 1.1, NONE kgdb-core.patch, 1.1,
	NONE kgdb-eth.patch, 1.1, NONE kgdb-i386-lite.patch, 1.1,
	NONE kgdb-i386.patch, 1.1, NONE kgdb-module.patch, 1.1,
	NONE kgdb-netpoll_pass_skb_to_rx_hook.patch, 1.1,
	NONE kgdb-sysrq_bugfix.patch, 1.1, NONE
Message-ID: <200606280017.k5S0HoeI009108@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9056

Modified Files:
	kernel-2.6.spec upstream 
Removed Files:
	kgdb-8250-fix.patch kgdb-8250.patch kgdb-cfi_annotations.patch 
	kgdb-core-lite-add-reboot-command.patch kgdb-core-lite.patch 
	kgdb-core.patch kgdb-eth.patch kgdb-i386-lite.patch 
	kgdb-i386.patch kgdb-module.patch 
	kgdb-netpoll_pass_skb_to_rx_hook.patch kgdb-sysrq_bugfix.patch 
Log Message:
doomed



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2319
retrieving revision 1.2320
diff -u -r1.2319 -r1.2320
--- kernel-2.6.spec	27 Jun 2006 23:39:20 -0000	1.2319
+++ kernel-2.6.spec	28 Jun 2006 00:17:48 -0000	1.2320
@@ -401,20 +401,6 @@
 # MTD bits
 Patch2400: linux-2.6-mtd-git.patch
 
-# KGDB
-Patch9000: kgdb-core-lite.patch
-Patch9001: kgdb-core-lite-add-reboot-command.patch
-Patch9002: kgdb-8250.patch
-Patch9003: kgdb-8250-fix.patch
-Patch9004: kgdb-netpoll_pass_skb_to_rx_hook.patch
-Patch9005: kgdb-eth.patch
-Patch9006: kgdb-i386-lite.patch
-Patch9007: kgdb-cfi_annotations.patch
-Patch9008: kgdb-sysrq_bugfix.patch
-Patch9009: kgdb-module.patch
-Patch9010: kgdb-core.patch
-Patch9011: kgdb-i386.patch
-
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -998,23 +984,6 @@
 # final stuff
 #
 
-# KGDB
-%define kgdb 0
-%if %{kgdb}
-%patch9000 -p1
-%patch9001 -p1
-%patch9002 -p1
-%patch9003 -p1
-%patch9004 -p1
-%patch9005 -p1
-%patch9006 -p1
-%patch9007 -p1
-%patch9008 -p1
-%patch9009 -p1
-%patch9010 -p1
-%patch9011 -p1
-%endif
-
 #
 # misc small stuff to make things compile or otherwise improve performance
 #


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- upstream	27 Jun 2006 23:39:20 -0000	1.376
+++ upstream	28 Jun 2006 00:17:48 -0000	1.377
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
+patch-2.6.17-git11.bz2
 patch-2.6.17-git12.bz2


--- kgdb-8250-fix.patch DELETED ---


--- kgdb-8250.patch DELETED ---


--- kgdb-cfi_annotations.patch DELETED ---


--- kgdb-core-lite-add-reboot-command.patch DELETED ---


--- kgdb-core-lite.patch DELETED ---


--- kgdb-core.patch DELETED ---


--- kgdb-eth.patch DELETED ---


--- kgdb-i386-lite.patch DELETED ---


--- kgdb-i386.patch DELETED ---


--- kgdb-module.patch DELETED ---


--- kgdb-netpoll_pass_skb_to_rx_hook.patch DELETED ---


--- kgdb-sysrq_bugfix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 00:17:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 20:17:51 -0400
Subject: rpms/kernel/devel/configs config-generic,1.204,1.205
Message-ID: <200606280017.k5S0HpOW009125@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv9056/configs

Modified Files:
	config-generic 
Log Message:
doomed



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- config-generic	27 Jun 2006 03:41:05 -0000	1.204
+++ config-generic	28 Jun 2006 00:17:48 -0000	1.205
@@ -2553,12 +2553,6 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 
-CONFIG_KGDB=y
-# CONFIG_KGDB_CONSOLE is not set
-CONFIG_KGDBOE=m
-# CONFIG_KGDB_SIMPLE_SERIAL is not set
-CONFIG_KGDB_8250_CONF_STRING=""
-
 #
 # Security options
 #



From fedora-cvs-commits at redhat.com  Wed Jun 28 00:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 20:25:38 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2320,1.2321
Message-ID: <200606280025.k5S0Pcln011977@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11943

Modified Files:
	kernel-2.6.spec 
Log Message:
ia64 borked


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2320
retrieving revision 1.2321
diff -u -r1.2320 -r1.2321
--- kernel-2.6.spec	28 Jun 2006 00:17:48 -0000	1.2320
+++ kernel-2.6.spec	28 Jun 2006 00:25:36 -0000	1.2321
@@ -174,7 +174,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Jun 28 03:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 23:45:43 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.16,1.17
Message-ID: <200606280345.k5S3jh7n005751@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4830

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add Helper/pinyin-imengine-helper.so to Files section



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-pinyin.spec	27 Jun 2006 09:10:05 -0000	1.16
+++ scim-pinyin.spec	28 Jun 2006 03:45:41 -0000	1.17
@@ -53,7 +53,7 @@
 %endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI,Helper}/*.la
 
 %find_lang %{name}
 
@@ -67,6 +67,7 @@
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/scim-1.0/*/IMEngine/pinyin.so
 %{_libdir}/scim-1.0/*/SetupUI/pinyin-imengine-setup.so
+%{_libdir}/scim-1.0/*/Helper/pinyin-imengine-helper.so
 %{_datadir}/scim/pinyin
 %{_datadir}/scim/icons/smart-pinyin.png
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 03:46:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 27 Jun 2006 23:46:15 -0400
Subject: rpms/autofs/devel
	autofs-5.0.0_beta5-defaults_read_config-cleanup.patch, NONE,
	1.1 autofs.spec, 1.114, 1.115
Message-ID: <200606280346.k5S3kFh3009854@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8375

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta5-defaults_read_config-cleanup.patch 
Log Message:
* Wed Jun 28 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-6
- cleanup defaults_read_config (Jeff Moyer).


autofs-5.0.0_beta5-defaults_read_config-cleanup.patch:
 CHANGELOG      |    1 +
 lib/defaults.c |   12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta5-defaults_read_config-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index a1143ad..56873a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
 - update LDAP so that new query methos also works for old
   syntax.
 - allow global macro defines to override system macros.
+- cleanup defaults_read_config.
 
 20/6/2006 autofs-5.0.0_beta5
 ---------------------------
diff --git a/lib/defaults.c b/lib/defaults.c
index 0170f9b..594afb3 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -173,9 +173,19 @@ unsigned int defaults_read_config(void)
 			ret = setenv(res, value, 0);
 			if (ret)
 				fprintf(stderr,
-				        "can't set config value for %s", res);
+				        "can't set config value for %s, "
+					"error %d", res, ret);
 		}
 	}
+
+	if (!feof(f)) {
+		fprintf(stderr, "fgets returned error %d while reading %s\n",
+			ferror(f), DEFAULTS_CONFIG_FILE);
+		fclose(f);
+		return 0;
+	}
+
+	fclose(f);
 	return 1;
 }
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- autofs.spec	27 Jun 2006 09:33:56 -0000	1.114
+++ autofs.spec	28 Jun 2006 03:46:12 -0000	1.115
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta5
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -25,6 +25,7 @@
 Patch12: autofs-5.0.0_beta5-override-system-macros.patch
 Patch13: autofs-5.0.0_beta5-mapclass-update.patch
 Patch14: autofs-5.0.0_beta5-misc-fixes.patch
+Patch15: autofs-5.0.0_beta5-defaults_read_config-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -77,6 +78,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -133,6 +135,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jun 28 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-6
+- cleanup defaults_read_config (Jeff Moyer).
+
 * Tue Jun 27 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-5
 - allow global macro defines to override system macros.
 - correct spelling error in default config files missed by



From fedora-cvs-commits at redhat.com  Wed Jun 28 07:16:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 03:16:43 -0400
Subject: rpms/libX11/devel .cvsignore, 1.6, 1.7 libX11.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200606280716.k5S7GhiG025156@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24123

Modified Files:
	.cvsignore libX11.spec sources 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
- Updated libX11 to version 1.0.2
- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet
  new "xproto >= 7.0.6" dependency.
- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included
  upstream.
- Remove autoconf dependency as we no longer need it.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 May 2006 23:50:48 -0000	1.6
+++ .cvsignore	28 Jun 2006 07:16:40 -0000	1.7
@@ -1 +1,2 @@
 libX11-1.0.1.tar.bz2
+libX11-1.0.2.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libX11.spec	20 Jun 2006 23:50:54 -0000	1.19
+++ libX11.spec	28 Jun 2006 07:16:40 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,14 +13,12 @@
 Patch1: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
+# xproto >= 7.0.6 required
+BuildRequires: xorg-x11-proto-devel >= 7.1-2
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
-# NOTE: Temporary BuildRequires needed for build time kludges.
-BuildRequires: autoconf
-
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -34,7 +32,8 @@
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: xorg-x11-proto-devel
+# xproto >= 7.0.6 required
+Requires: xorg-x11-proto-devel >= 7.1-2
 Requires: libXau-devel, libXdmcp-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -44,16 +43,20 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .datadir-locale-dir-fix
+# FIXME: We are keeping this around, as upstream has a tendency for random
+# people to revert fixes other people have applied, and have a 6-8 month tug
+# of war with these things.  It's easier to leave this here than to try and
+# find it later.
+#%patch0 -p0 -b .datadir-locale-dir-fix
+
+# FIXME: For some reason, upstream supplies this patch, but hasn't checked it
+# into CVS/git/whatever yet it seems, so upstream is potentially insecure.
 %patch1 -p1 -b .setuid
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-# FIXME: libX11-0.99.3-datadir-locale-dir-fix.patch patches configure.ac, so
-# we have to re-run autoconf:
-autoconf
 %configure \
 	--disable-dependency-tracking \
 %if ! %{with_static}
@@ -241,6 +244,14 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
+- Updated libX11 to version 1.0.2
+- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet
+  new "xproto >= 7.0.6" dependency.
+- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included
+  upstream.
+- Remove autoconf dependency as we no longer need it.
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
 - Change dependency on "filesystem" package to "xorg-x11-filesystem" package,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 May 2006 23:50:48 -0000	1.6
+++ sources	28 Jun 2006 07:16:40 -0000	1.7
@@ -1 +1,2 @@
 58f0537f21183e27149cf906a1b6bef9  libX11-1.0.1.tar.bz2
+86a16bdc09b42b2e018dd665c23ca21c  libX11-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jun 28 07:32:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 03:32:53 -0400
Subject: rpms/bash/devel bash.spec,1.120,1.121 dot-bash_profile,1.3,1.4
Message-ID: <200606280732.k5S7WrKV003410@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3360

Modified Files:
	bash.spec dot-bash_profile 
Log Message:
* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 3.1-16
- Removed 'unset USERNAME' from default .bash_profile (bug #196735).



Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- bash.spec	15 Jun 2006 15:21:10 -0000	1.120
+++ bash.spec	28 Jun 2006 07:32:42 -0000	1.121
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 15
+Release: 16
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -234,6 +234,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 3.1-16
+- Removed 'unset USERNAME' from default .bash_profile (bug #196735).
+
 * Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 3.1-15
 - Updated requires patch to the ALT version.
 


Index: dot-bash_profile
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/dot-bash_profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dot-bash_profile	9 Sep 2004 03:25:41 -0000	1.3
+++ dot-bash_profile	28 Jun 2006 07:32:42 -0000	1.4
@@ -10,4 +10,3 @@
 PATH=$PATH:$HOME/bin
 
 export PATH
-unset USERNAME



From fedora-cvs-commits at redhat.com  Wed Jun 28 07:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 03:48:19 -0400
Subject: rpms/xorg-x11-xdm/FC-5 xdm-1.0.1-setuid.patch, NONE,
	1.1 xorg-x11-xdm.spec, 1.19, 1.20
Message-ID: <200606280748.k5S7mJMt022661@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22608

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.0.1-setuid.patch 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Added xdm-1.0.1-setuid.patch to fix (#196126)
- Added various missing BuildRequires for (#191858)
- Added temporary "BuildRequires: autoconf, automake, libtool" dependencies
  for mock builds, for as long as we need to run autotools at compile time.
- Add missing documentation to doc macro, and move manpages from man1x to man1.
- Clean cruft out of specfile.


xdm-1.0.1-setuid.patch:
 session.c  |   10 ++++++++--
 xdmshell.c |    6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE xdm-1.0.1-setuid.patch ---
Index: app/xdm/session.c
===================================================================
RCS file: /cvs/xorg/app/xdm/session.c,v
retrieving revision 1.3
diff -u -u -r1.3 session.c
--- app/xdm/session.c	8 Nov 2005 06:33:31 -0000	1.3
+++ app/xdm/session.c	20 Jun 2006 07:58:39 -0000
@@ -488,8 +488,14 @@
     else
 	ResetServer (d);
     if (removeAuth) {
-	setgid (verify.gid);
-	setuid (verify.uid);
+	if (setgid (verify.gid) == -1) {
+	    LogError( "SessionExit: setgid: %s\n", strerror(errno));
+	    exit(status);
+	}
+	if (setuid (verify.uid) == -1) {
+	    LogError( "SessionExit: setuid: %s\n", strerror(errno));
+	    exit(status);
+	}
 	RemoveUserAuthorization (d, &verify);
 #ifdef K5AUTH
 	/* do like "kdestroy" program */
Index: app/xdm/xdmshell.c
===================================================================
RCS file: /cvs/xorg/app/xdm/xdmshell.c,v
retrieving revision 1.3
diff -u -u -r1.3 xdmshell.c
--- app/xdm/xdmshell.c	14 Jul 2005 22:58:25 -0000	1.3
+++ app/xdm/xdmshell.c	20 Jun 2006 07:58:39 -0000
@@ -183,7 +183,11 @@
 #endif
 
     /* make xdm run in a non-setuid environment */
-    setuid (geteuid());
+    if (setuid (geteuid()) == -1) {
+	fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
+		ProgramName, errno, strerror(errno));
+	exit(1);
+    }
 
     /*
      * exec /usr/bin/X11/xdm -nodaemon -udpPort 0


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/FC-5/xorg-x11-xdm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-xdm.spec	1 Mar 2006 07:06:02 -0000	1.19
+++ xorg-x11-xdm.spec	28 Jun 2006 07:48:16 -0000	1.20
@@ -1,33 +1,33 @@
-# FIXME:  The modular xdm package still needs a fair bit of work, most
-# of which probably needs to be done in the upstream CVS.  I've made
-# numerous FIXME comments throughout to document things I think need
-# to be done.  The spec file will naturally become less of a mess once
-# the upstream tarball is kosher.  -- mharris
-
 %define pkgname xdm
 
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
+Version: 1.0.1
+Release: 2
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
-Version: 1.0.1
-Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
 Source1: Xsetup_0
 Source10: xdm.init
 Source11: xdm.pamd
 Source13: xserver.pamd
 
+Patch0: xdm-1.0.1-setuid.patch
 # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead
 # of "-c" to fix bug (#86505)
 Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
 
+# FIXME: Temporary build dependencies for autotool dependence.
+BuildRequires: autoconf, automake, libtool
+
 BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXaw-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXt-devel
@@ -45,6 +45,8 @@
 # FIXME: There's no autotool specified dep on this currently, but everything
 # explodes looking for X11/Xauth.h without it:
 BuildRequires: libXau-devel
+BuildRequires: libXinerama-devel
+BuildRequires: pam-devel
 
 Provides: %{pkgname}
 Obsoletes: XFree86-xdm
@@ -66,22 +68,12 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p0 -b .setuid
 %patch10 -p0 -b .redhat-xdm-config-fix
 
 %build
 #cd 
 # FIXME: Work around pointer aliasing warnings from compiler for now
-# resource.c:213: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:215: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:219: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:223: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:227: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:229: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:235: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:242: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:251: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resource.c:253: warning: dereferencing type-punned pointer will break strict-aliasing rules
-
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 # NOTE: We invoke aclocal/automake/autoconf to enable the changes present in
 # xdm-0.99.3-xdm-app-defaults-in-datadir.patch & xdm-0.99.3-xdm-configdir.patch
@@ -118,26 +110,12 @@
 # Explicitly create XDM authdir
 #mkdir -m 700 -p $RPM_BUILD_ROOT/var/lib/xdm/authdir
 
-# FIXME: Move manpages to correct man section and rename them.  This should
-# get submitted as a bug upstream for each of the 4 components.  Hmm, the
-# manpage(s) do not actually get installed.  Fix it and report it upstream.
-%if 1
-{
-   echo "FIXME: Upstream RC2 manpages install to incorrect location"
-   mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1x
-   for manpage in xdm ; do
-      mv $RPM_BUILD_ROOT%{_mandir}/man1/$manpage.* $RPM_BUILD_ROOT%{_mandir}/man1x/$manpage.1x
-   done
-   rmdir $RPM_BUILD_ROOT%{_mandir}/man1
-}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 %{_bindir}/xdm
 %{_bindir}/xdmshell
 %dir %{_sysconfdir}/X11/xdm
@@ -171,16 +149,24 @@
 %{_libdir}/X11/xdm/chooser
 %{_libdir}/X11/xdm/libXdmGreet.so
 #%dir %{_mandir}/man1x
-%{_mandir}/man1x/*.1x*
+%{_mandir}/man1/*.1x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+- Added xdm-1.0.1-setuid.patch to fix (#196126)
+- Added various missing BuildRequires for (#191858)
+- Added temporary "BuildRequires: autoconf, automake, libtool" dependencies
+  for mock builds, for as long as we need to run autotools at compile time.
+- Add missing documentation to doc macro, and move manpages from man1x to man1.
+- Clean cruft out of specfile.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Mon Jan  9 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
+* Mon Jan 09 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated xdm to version 1.0.1 from X11R7.
 - Added --with-xdmscriptdir option to ./configure to put scripts in /etc
 - Updated xdm-1.0.1-redhat-xdm-config-fix.patch to work with xdm 1.0.1
@@ -222,11 +208,11 @@
 * Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.3-1
 - Update xdm to 0.99.3 from X11R7 RC2.
 
-* Tue Nov 1 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.3
+* Tue Nov 01 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.3
 - Build with -fno-strict-aliasing to work around possible pointer aliasing
   issues
 
-* Tue Nov 1 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.2
+* Tue Nov 01 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.2
 - It is _sysconfdir not _sysconfigdir goofball!
 - Add {_sysconfdir}/pam.d/xdm and {_sysconfdir}/pam.d/xserver files that were
   missing from file manifest.
@@ -245,7 +231,7 @@
 - Add xdm-0.99.2-to-20051031.patch to pick up fixes from CVS head that allow
   us to set the config dir and other dirs.
 
-* Wed Oct  5 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
 - Use Fedora-Extras style BuildRoot tag
 - Update BuildRequires to use new library package names
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 07:53:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 03:53:54 -0400
Subject: rpms/hplip/devel .cvsignore, 1.11, 1.12 hplip.spec, 1.86,
	1.87 sources, 1.11, 1.12 hplip-1.6.6-1.patch, 1.1, NONE
Message-ID: <200606280753.k5S7rsdq024804@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24768

Modified Files:
	.cvsignore hplip.spec sources 
Removed Files:
	hplip-1.6.6-1.patch 
Log Message:
* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1
- 1.6.6a.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Jun 2006 11:37:49 -0000	1.11
+++ .cvsignore	28 Jun 2006 07:53:52 -0000	1.12
@@ -8,3 +8,4 @@
 hplip-0.9.10.tar.gz
 hplip-0.9.11.tar.gz
 hplip-1.6.6.tar.gz
+hplip-1.6.6a.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- hplip.spec	26 Jun 2006 16:10:15 -0000	1.86
+++ hplip.spec	28 Jun 2006 07:53:52 -0000	1.87
@@ -1,6 +1,6 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.6
+Version: 1.6.6a
 Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
@@ -10,7 +10,6 @@
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch0: hplip-1.6.6-1.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
@@ -63,9 +62,6 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Patchlevel 1.
-%patch0 -p1 -b .1.6.6-1
-
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
@@ -181,6 +177,9 @@
 exit 0
 
 %changelog
+* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1
+- 1.6.6a.
+
 * Mon Jun 26 2006 Tim Waugh <twaugh at redhat.com>
 - Patchlevel 1.
 - Fixed libsane-hpaio %%post scriptlet (bug #196663).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Jun 2006 11:37:49 -0000	1.11
+++ sources	28 Jun 2006 07:53:52 -0000	1.12
@@ -1 +1 @@
-292fbcc25b79d273d7280760ce797666  hplip-1.6.6.tar.gz
+606704fc8b2fe344e49190b592b438e0  hplip-1.6.6a.tar.gz


--- hplip-1.6.6-1.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 07:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 03:55:49 -0400
Subject: rpms/xorg-x11-xdm/FC-5 xorg-x11-xdm.spec,1.20,1.21
Message-ID: <200606280755.k5S7tne5025592@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25563

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
fix patch application


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/FC-5/xorg-x11-xdm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-xdm.spec	28 Jun 2006 07:48:16 -0000	1.20
+++ xorg-x11-xdm.spec	28 Jun 2006 07:55:46 -0000	1.21
@@ -68,7 +68,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p0 -b .setuid
+%patch0 -p2 -b .setuid
 %patch10 -p0 -b .redhat-xdm-config-fix
 
 %build



From fedora-cvs-commits at redhat.com  Wed Jun 28 08:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 04:05:24 -0400
Subject: rpms/hplip/FC-5 .cvsignore, 1.10, 1.11 hplip.spec, 1.73,
	1.74 sources, 1.11, 1.12
Message-ID: <200606280805.k5S85OIF027586@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27517

Modified Files:
	.cvsignore hplip.spec sources 
Log Message:
* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1.1
- 1.6.6a.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Jun 2006 11:41:43 -0000	1.10
+++ .cvsignore	28 Jun 2006 08:05:05 -0000	1.11
@@ -7,3 +7,4 @@
 hplip-0.9.9.tar.gz
 hplip-0.9.11.tar.gz
 hplip-1.6.6.tar.gz
+hplip-1.6.6a.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- hplip.spec	16 Jun 2006 11:41:43 -0000	1.73
+++ hplip.spec	28 Jun 2006 08:05:05 -0000	1.74
@@ -1,6 +1,6 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.6
+Version: 1.6.6a
 Release: 1.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
@@ -188,6 +188,9 @@
 fi
 
 %changelog
+* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1.1
+- 1.6.6a.
+
 * Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-1.1
 - 1.6.6.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Jun 2006 11:41:43 -0000	1.11
+++ sources	28 Jun 2006 08:05:05 -0000	1.12
@@ -1 +1 @@
-292fbcc25b79d273d7280760ce797666  hplip-1.6.6.tar.gz
+606704fc8b2fe344e49190b592b438e0  hplip-1.6.6a.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 28 08:28:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 04:28:14 -0400
Subject: rpms/xorg-x11-xdm/devel .cvsignore, 1.8, 1.9 sources, 1.7,
	1.8 xorg-x11-xdm.spec, 1.24, 1.25 xdm-1.0.4-setuid.diff, 1.1, NONE
Message-ID: <200606280828.k5S8SEZr025375@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25361

Modified Files:
	.cvsignore sources xorg-x11-xdm.spec 
Removed Files:
	xdm-1.0.4-setuid.diff 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-1
- Updated xdm to version 1.0.5.
- Remove xdm-1.0.4-setuid.diff as it is integrated in 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Apr 2006 22:34:28 -0000	1.8
+++ .cvsignore	28 Jun 2006 08:28:11 -0000	1.9
@@ -1 +1,2 @@
-xdm-1.0.4.tar.bz2
+*.tar.bz2
+*.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2006 22:34:28 -0000	1.7
+++ sources	28 Jun 2006 08:28:11 -0000	1.8
@@ -1 +1 @@
-aeed9697f27c0730a550a1ac7efdc189  xdm-1.0.4.tar.bz2
+205cbf9cd4161dffd63d3516e681dbed  xdm-1.0.5.tar.bz2


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-xdm.spec	22 Jun 2006 04:06:35 -0000	1.24
+++ xorg-x11-xdm.spec	28 Jun 2006 08:28:11 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
-Version: 1.0.4
-Release: 4
+Version: 1.0.5
+Release: 1
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -17,7 +17,6 @@
 Source11: xdm.pamd
 Source13: xserver.pamd
 
-Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xdm-1.0.4-setuid.diff
 # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead
 # of "-c" to fix bug (#86505)
 Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
@@ -69,7 +68,6 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p0 -b .setuid
 
 %patch10 -p0 -b .redhat-xdm-config-fix
 
@@ -147,6 +145,10 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-1
+- Updated xdm to version 1.0.5.
+- Remove xdm-1.0.4-setuid.diff as it is integrated in 1.0.5
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.4-4
 - Add missing documentation to doc macro.
 - Clean cruft out of specfile.
@@ -172,7 +174,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Mon Jan  9 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
+* Mon Jan 09 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated xdm to version 1.0.1 from X11R7.
 - Added --with-xdmscriptdir option to ./configure to put scripts in /etc
 - Updated xdm-1.0.1-redhat-xdm-config-fix.patch to work with xdm 1.0.1
@@ -214,11 +216,11 @@
 * Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.3-1
 - Update xdm to 0.99.3 from X11R7 RC2.
 
-* Tue Nov 1 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.3
+* Tue Nov 01 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.3
 - Build with -fno-strict-aliasing to work around possible pointer aliasing
   issues
 
-* Tue Nov 1 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.2
+* Tue Nov 01 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.2-1.20051031.2
 - It is _sysconfdir not _sysconfigdir goofball!
 - Add {_sysconfdir}/pam.d/xdm and {_sysconfdir}/pam.d/xserver files that were
   missing from file manifest.
@@ -237,7 +239,7 @@
 - Add xdm-0.99.2-to-20051031.patch to pick up fixes from CVS head that allow
   us to set the config dir and other dirs.
 
-* Wed Oct  5 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
 - Use Fedora-Extras style BuildRoot tag
 - Update BuildRequires to use new library package names
 


--- xdm-1.0.4-setuid.diff DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 08:40:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 04:40:45 -0400
Subject: rpms/xorg-x11-xfs/FC-5 xorg-x11-xfs.spec,1.21,1.22
Message-ID: <200606280840.k5S8eipd025538@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25526

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4.FC5.0
- Update build dep to xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0 to ensure we
  pick up the setuid bug fixes for (#196126)
- Added xfs documentation to doc macro.
- Use "make install" instead of makeinstall macro.
- Clean up source file URLs.
- Added missing BuildRequires for (#191856).
- Rebuild xfs for FC5 update.



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/FC-5/xorg-x11-xfs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-xfs.spec	9 Mar 2006 11:46:31 -0000	1.21
+++ xorg-x11-xfs.spec	28 Jun 2006 08:40:42 -0000	1.22
@@ -7,28 +7,29 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 4
+Release: 4.FC5.0
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: System Environment/Daemons
 URL: http://www.x.org
-#Source0: %{pkgname}-%{version}.tar.bz2
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfs-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfsinfo-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fslsfonts-1.0.1.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fstobdf-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/showfont-1.0.1.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.1.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/xfsinfo-1.0.1.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.1.tar.bz2
+Source3: http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.1.tar.bz2
 Source10:  xfs.init
 # NOTE: xfs config input file, processed via sed below.
 Source11:  xfs.config.in
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 # xfs needs 'fontsproto' to build, as indicated by ./configure
 BuildRequires: xorg-x11-proto-devel
 # FIXME: xfs needs xtrans to build, but autotools doesn't detect it missing
-BuildRequires: xorg-x11-xtrans-devel
+# Ensure that we're getting the xtrans with setuid fixes (xorg-x11-xtrans-devel-1.0.0-3.2.FC5.0)
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0
 BuildRequires: libFS-devel
 # FIXME: The version specification can be removed from here in the future,
 # as it is not really mandatory, but forces a bugfix workaround on people who
@@ -39,6 +40,7 @@
 BuildRequires: freetype-devel
 # font-utils >= 1.0.0 needed for fontdir pkgconfig variable
 BuildRequires: font-utils >= 1.0.0
+BuildRequires: libfontenc-devel
 
 # FIXME: This Requires on libXfont can be removed from here in the future,
 # as it is not really mandatory, but forces a bugfix workaround on people who
@@ -124,7 +126,7 @@
 
 for pkg in xfsinfo fslsfonts fstobdf showfont ; do
    pushd ${pkg}-*
-   %makeinstall
+   make install DESTDIR=$RPM_BUILD_ROOT
    popd
 done
 
@@ -250,7 +252,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc xfs-%{version}/AUTHORS xfs-%{version}/COPYING xfs-%{version}/INSTALL
+%doc xfs-%{version}/NEWS xfs-%{version}/README xfs-%{version}/ChangeLog
 %{_bindir}/xfs
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/fs
@@ -277,6 +280,15 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4.FC5.0
+- Update build dep to xorg-x11-xtrans-devel >= 1.0.0-3.2.FC5.0 to ensure we
+  pick up the setuid bug fixes for (#196126)
+- Added xfs documentation to doc macro.
+- Use "make install" instead of makeinstall macro.
+- Clean up source file URLs.
+- Added missing BuildRequires for (#191856).
+- Rebuild xfs for FC5 update.
+
 * Wed Mar 01 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4
 - Fix all rpm scriptlets "upgrade" tests to only execute on upgrades.
 
@@ -286,13 +298,13 @@
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-2.1
 - bump again for double-long bug on ppc(64)
 
-* Thu Feb  9 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Removed invocation of fc-cache from xfs initscript for bug (#179362)
 - Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)
 - Replace "s#^/.*:[a-z]*$##g" with "s#:unscaled$##g" in xfs.init for (#179491)
 - Cosmetic cleanups to spec file to satiate the banshees.
 
-* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 16 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
@@ -333,7 +345,7 @@
 * Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-2
 - Added showfont-0.99.1 from X11R7 RC1 release.
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-1
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-1
 - Updated all packages to version 0.99.1 from X11R7 RC1.
 - Bump package version to 6.99.99.901 (the RC1 CVS tag).
 - Change manpage location to 'man1x' in file manifest.
@@ -343,7 +355,7 @@
   and complete restructuring, which removed a lot of the super craptasticness
   that had been sitting there for years.
 
-* Wed Oct 3 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-4
+* Wed Oct 03 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-4
 - Use Fedora-Extras style BuildRoot tag
 - Update BuildRequires to use new library package names
 - Remove unnecessary BuildRequires on 'install', and fix pkgconfig dep



From fedora-cvs-commits at redhat.com  Wed Jun 28 08:44:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 04:44:20 -0400
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.24,1.25
Message-ID: <200606280844.k5S8iKa8025655@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25643

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
janitorial


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-xfs.spec	22 Jun 2006 04:23:16 -0000	1.24
+++ xorg-x11-xfs.spec	28 Jun 2006 08:44:18 -0000	1.25
@@ -253,7 +253,6 @@
 %defattr(-,root,root,-)
 %doc xfs-%{version}/AUTHORS xfs-%{version}/COPYING xfs-%{version}/INSTALL
 %doc xfs-%{version}/NEWS xfs-%{version}/README xfs-%{version}/ChangeLog
-
 %{_bindir}/xfs
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/fs
@@ -300,13 +299,13 @@
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-2.1
 - bump again for double-long bug on ppc(64)
 
-* Thu Feb  9 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Removed invocation of fc-cache from xfs initscript for bug (#179362)
 - Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)
 - Replace "s#^/.*:[a-z]*$##g" with "s#:unscaled$##g" in xfs.init for (#179491)
 - Cosmetic cleanups to spec file to satiate the banshees.
 
-* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 16 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
@@ -347,7 +346,7 @@
 * Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-2
 - Added showfont-0.99.1 from X11R7 RC1 release.
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-1
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-1
 - Updated all packages to version 0.99.1 from X11R7 RC1.
 - Bump package version to 6.99.99.901 (the RC1 CVS tag).
 - Change manpage location to 'man1x' in file manifest.
@@ -357,7 +356,7 @@
   and complete restructuring, which removed a lot of the super craptasticness
   that had been sitting there for years.
 
-* Wed Oct 3 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-4
+* Wed Oct 03 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-4
 - Use Fedora-Extras style BuildRoot tag
 - Update BuildRequires to use new library package names
 - Remove unnecessary BuildRequires on 'install', and fix pkgconfig dep



From fedora-cvs-commits at redhat.com  Wed Jun 28 08:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 04:51:50 -0400
Subject: rpms/xorg-x11-xinit/FC-5 xinit-1.0.1-setuid.patch, NONE,
	1.1 xorg-x11-xinit.spec, 1.17, 1.18
Message-ID: <200606280851.k5S8poY3007926@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7912

Modified Files:
	xorg-x11-xinit.spec 
Added Files:
	xinit-1.0.1-setuid.patch 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2.FC5.0
- Added xinit-1.0.1-setuid.patch to fix potential security issue (#196126)
- Added "BuildRequires: pkgconfig" for bug (#194187)
- Added documentation to doc macro.
- Build new package for official FC5 update.


xinit-1.0.1-setuid.patch:
 xinit.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xinit-1.0.1-setuid.patch ---
Index: xinit.c
===================================================================
RCS file: /cvs/xorg/app/xinit/xinit.c,v
retrieving revision 1.4
diff -u -r1.4 xinit.c
--- xinit.c	4 Oct 2005 01:27:34 -0000	1.4
+++ xinit.c	19 Jun 2006 21:31:58 -0000
@@ -692,7 +692,10 @@
 startClient(char *client[])
 {
 	if ((clientpid = vfork()) == 0) {
-		setuid(getuid());
+		if (setuid(getuid()) == -1) {
+			Error("cannot change uid: %s\n", strerror(errno));
+			_exit(ERR_EXIT);
+		}
 		setpgrp(0, getpid());
 		environ = newenviron;
 #ifdef __UNIXOS2__


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/FC-5/xorg-x11-xinit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-xinit.spec	1 Mar 2006 07:09:45 -0000	1.17
+++ xorg-x11-xinit.spec	28 Jun 2006 08:51:47 -0000	1.18
@@ -1,15 +1,16 @@
 %define pkgname xinit
+%define xinitver 1.0.1
 
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 2
+Version: %{xinitver}
+Release: 2.FC5.0
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
 Source10: xinitrc-common
 Source11: xinitrc
 Source12: Xclients
@@ -20,6 +21,9 @@
 #       here instead of the xdm package.
 Source16: Xsession
 
+Patch0: xinit-1.0.1-setuid.patch
+
+BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 # NOTE: startx needs xauth in order to run, but that is not picked up
 #       automatically by rpm.  (Bug #173684)
@@ -39,6 +43,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p0 -b .setuid
 
 %build
 %configure
@@ -72,7 +77,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL README NEWS ChangeLog
 %{_bindir}/startx
 %{_bindir}/xinit
 %dir %{_sysconfdir}/X11
@@ -91,6 +96,12 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2.FC5.0
+- Added xinit-1.0.1-setuid.patch to fix potential security issue (#196126)
+- Added "BuildRequires: pkgconfig" for bug (#194187)
+- Added documentation to doc macro.
+- Build new package for official FC5 update.
+
 * Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Change Conflicts to Obsoletes for xorg-x11 and XFree86 (#181414)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 08:54:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 04:54:07 -0400
Subject: rpms/tn5250/devel tn5250.spec,1.16,1.17
Message-ID: <200606280854.k5S8s7uN008006@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/tn5250/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7994

Modified Files:
	tn5250.spec 
Log Message:
- add buildrequires automake


Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tn5250.spec	23 May 2006 09:30:21 -0000	1.16
+++ tn5250.spec	28 Jun 2006 08:54:05 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: 	5250 Telnet protocol and Terminal
 Name: 		tn5250
 Version: 	0.17.3
-Release:    3
+Release:    4
 License: 	GPL 
 Group: 		Applications/Internet
 Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -11,7 +11,7 @@
 BuildRoot: 	/var/tmp/%{name}-root
 Prefix: 	/usr
 PreReq:		ncurses, ncurses-devel, dialog
-BuildRequires:	ncurses-devel, openssl-devel
+BuildRequires:	ncurses-devel, openssl-devel, automake
 
 %description
 tn5250 is an implementation of the 5250 Telnet protocol.
@@ -86,6 +86,9 @@
 %attr( - ,root,root)  %{_libdir}/pkgconfig/tn5250.pc
 
 %changelog
+* Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 0.17.3-4
+- add buildrequires automake
+
 * Tue May 23 2006 Karsten Hopp <karsten at redhat.de> 0.17.3-3
 - don't check for sizeof(long), the result isn't used anywhere and
   causes problems with multilib installs



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:00:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:00:44 -0400
Subject: rpms/tn5250/devel tn5250.spec,1.17,1.18
Message-ID: <200606280900.k5S90i0u008164@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/tn5250/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8152

Modified Files:
	tn5250.spec 
Log Message:
- add buildrequires libtool


Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tn5250.spec	28 Jun 2006 08:54:05 -0000	1.17
+++ tn5250.spec	28 Jun 2006 09:00:41 -0000	1.18
@@ -11,7 +11,7 @@
 BuildRoot: 	/var/tmp/%{name}-root
 Prefix: 	/usr
 PreReq:		ncurses, ncurses-devel, dialog
-BuildRequires:	ncurses-devel, openssl-devel, automake
+BuildRequires:	ncurses-devel, openssl-devel, automake, libtool
 
 %description
 tn5250 is an implementation of the 5250 Telnet protocol.
@@ -87,7 +87,7 @@
 
 %changelog
 * Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 0.17.3-4
-- add buildrequires automake
+- add buildrequires automake, libtool
 
 * Tue May 23 2006 Karsten Hopp <karsten at redhat.de> 0.17.3-3
 - don't check for sizeof(long), the result isn't used anywhere and



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:08:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:08:56 -0400
Subject: rpms/xorg-x11-apps/FC-5 xload-1.0.1-setuid.patch, NONE,
	1.1 xorg-x11-apps.spec, 1.12, 1.13
Message-ID: <200606280908.k5S98u5N008320@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8306

Modified Files:
	xorg-x11-apps.spec 
Added Files:
	xload-1.0.1-setuid.patch 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
- Added xload-1.0.1-setuid.patch to fix potential security issue (#196126)
- Artificially inflate package version-release to 7.0-1 to match the X11R7.0
  release that all of the tarballs are taken from.
- Add temporary dependency on autoconf, automake for brew builds.
- Add more BuildRequires to fix mock builds.  (#191896)
- Build package for update release for FC5.


xload-1.0.1-setuid.patch:
 xload.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE xload-1.0.1-setuid.patch ---
Patch from X.Org, modified to match path where files need patching in rpm
packaging.

Index: xload.c
===================================================================
RCS file: /cvs/xorg/app/xload/xload.c,v
retrieving revision 1.2
diff -u -r1.2 xload.c
--- xload-1.0.1/xload.c	23 Apr 2004 19:54:57 -0000	1.2
+++ xload-1.0.1/xload.c	19 Jun 2006 21:32:20 -0000
@@ -34,7 +34,7 @@
  * xload - display system load average in a window
  */
 
-
+#include <errno.h>
 #include <stdio.h> 
 #include <stdlib.h>
 #include <unistd.h>
@@ -162,8 +162,17 @@
     /* For security reasons, we reset our uid/gid after doing the necessary
        system initialization and before calling any X routines. */
     InitLoadPoint();
-    setgid(getgid());		/* reset gid first while still (maybe) root */
-    setuid(getuid());
+    /* reset gid first while still (maybe) root */
+    if (setgid(getgid()) == -1) {
+	    fprintf(stderr, "%s: setgid failed: %s\n", 
+		ProgramName, strerror(errno));
+	    exit(1);
+    }
+    if (setuid(getuid()) == -1) {
+	    fprintf(stderr, "%s: setuid failed: %s\n", 
+		ProgramName, strerror(errno));
+	    exit(1);
+    }
 
     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
 


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/FC-5/xorg-x11-apps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-apps.spec	3 Mar 2006 01:37:12 -0000	1.12
+++ xorg-x11-apps.spec	28 Jun 2006 09:08:54 -0000	1.13
@@ -2,7 +2,9 @@
 
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
-Version: 1.0.2
+# NOTE: The package version should be set to the X11 major release from which
+# the OS release is based upon.
+Version: 7.0
 Release: 1
 License: MIT/X11
 Group: User Interface/X
@@ -10,33 +12,51 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Clock apps
-Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/oclock-1.0.1.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclock-1.0.1.tar.bz2
+Source0:  http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.1.tar.bz2
+Source1:  http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.1.tar.bz2
 # X Window Dump (xwd) utilities
-Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwd-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwud-1.0.1.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xpr-1.0.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.1.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.1.tar.bz2
+Source4:  http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.1.tar.bz2
 # Miscellaneous other applications
-Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/luit-1.0.1.tar.bz2
+Source5:  http://xorg.freedesktop.org/releases/individual/app/luit-1.0.1.tar.bz2
 Source6:  http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xbiff-1.0.1.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclipboard-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xconsole-1.0.1.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcursorgen-1.0.0.tar.bz2
-Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xeyes-1.0.1.tar.bz2
-Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xkill-1.0.1.tar.bz2
-Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xload-1.0.1.tar.bz2
-Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlogo-1.0.1.tar.bz2
-Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmag-1.0.1.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmessage-1.0.1.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.1.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.1.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.0.tar.bz2
+Source11: http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.1.tar.bz2
+Source12: http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.1.tar.bz2
+Source13: http://xorg.freedesktop.org/releases/individual/app/xload-1.0.1.tar.bz2
+Source14: http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.1.tar.bz2
+Source15: http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.1.tar.bz2
+Source16: http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.1.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
+Patch10: xload-1.0.1-setuid.patch
+
+# FIXME: Temporary dependencies on autotools packages for now
+BuildRequires: autoconf automake
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # xbiff needs xbitmaps-devel
 BuildRequires: xbitmaps-devel
+BuildRequires: zlib-devel
+BuildRequires: libfontenc-devel
+BuildRequires: libX11-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXext-devel
+BuildRequires: libXt-devel
+BuildRequires: libXaw-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXft-devel
+BuildRequires: libXrender-devel
+BuildRequires: libxkbfile-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libpng-devel
+BuildRequires: libXfixes-devel
 
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
@@ -55,6 +75,8 @@
 %patch0 -p0 -b .x11perf-datadir-cleanups
 %patch1 -p0 -b .locale.alias-datadir
 
+%patch10 -p0 -b .setuid
+
 %build
 # Build all apps
 {
@@ -92,7 +114,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+#%doc
 %{_bindir}/luit
 %{_bindir}/oclock
 %{_bindir}/x11perf
@@ -155,7 +177,15 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
-* Thu Mar 2 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
+- Added xload-1.0.1-setuid.patch to fix potential security issue (#196126)
+- Artificially inflate package version-release to 7.0-1 to match the X11R7.0
+  release that all of the tarballs are taken from.
+- Add temporary dependency on autoconf, automake for brew builds.
+- Add more BuildRequires to fix mock builds.  (#191896)
+- Build package for update release for FC5.
+
+* Thu Mar 02 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Bump x11perf to 1.4.1 from upstream.
 
 * Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:15:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:15:25 -0400
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.16,1.17
Message-ID: <200606280915.k5S9FPYQ019738@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19709

Modified Files:
	xorg-x11-apps.spec 
Log Message:
Added a note


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-apps.spec	21 Jun 2006 10:56:04 -0000	1.16
+++ xorg-x11-apps.spec	28 Jun 2006 09:15:22 -0000	1.17
@@ -2,6 +2,8 @@
 
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
+# NOTE: The package version should be set to the X11 major release from which
+# the OS release is based upon.
 Version: 7.1
 Release: 1
 License: MIT/X11



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:25:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:25:07 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.patch,1.1,1.2
Message-ID: <200606280925.k5S9P7dT004750@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4456

Modified Files:
	scim-pinyin-helper.patch 
Log Message:
qshen: delete unused varialbes in scim-pinyin-helper.cpp -main()


scim-pinyin-helper.patch:
 configure.ac                           |    9 
 po/POTFILES.in                         |    1 
 po/zh_CN.po                            |  135 +++
 src/Makefile.am                        |   19 
 src/scim_pinyin_helper.cpp             | 1124 +++++++++++++++++++++++++++++++++
 src/scim_pinyin_helper.h               |   56 +
 src/scim_pinyin_imengine.cpp           |  307 ++++++++-
 src/scim_pinyin_imengine.h             |    8 
 src/scim_pinyin_imengine_config_keys.h |    3 
 src/scim_pinyin_imengine_setup.cpp     |   31 
 src/scim_pinyin_phrase.h               |    6 
 11 files changed, 1688 insertions(+), 11 deletions(-)

Index: scim-pinyin-helper.patch
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin-helper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-pinyin-helper.patch	27 Jun 2006 02:55:02 -0000	1.1
+++ scim-pinyin-helper.patch	28 Jun 2006 09:25:04 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur scim-pinyin-0.5.91.bak/configure.ac scim-pinyin-0.5.91/configure.ac
---- scim-pinyin-0.5.91.bak/configure.ac	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/configure.ac	2006-06-27 09:51:26.000000000 +0800
+--- scim-pinyin-0.5.91.bak/configure.ac	2005-08-12 08:03:38.000000000 +0800
++++ scim-pinyin-0.5.91/configure.ac	2006-06-28 17:19:27.000000000 +0800
 @@ -46,10 +46,17 @@
  else
    SCIM_BUILD_SETUP=0
@@ -21,15 +21,15 @@
  # Checks for header files.
  AC_HEADER_STDC
 diff -Naur scim-pinyin-0.5.91.bak/po/POTFILES.in scim-pinyin-0.5.91/po/POTFILES.in
---- scim-pinyin-0.5.91.bak/po/POTFILES.in	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/po/POTFILES.in	2006-06-27 09:51:39.000000000 +0800
+--- scim-pinyin-0.5.91.bak/po/POTFILES.in	2005-01-06 21:30:53.000000000 +0800
++++ scim-pinyin-0.5.91/po/POTFILES.in	2006-06-28 17:20:16.000000000 +0800
 @@ -1,2 +1,3 @@
  src/scim_pinyin_imengine.cpp
  src/scim_pinyin_imengine_setup.cpp
 +src/scim_pinyin_helper.cpp
 diff -Naur scim-pinyin-0.5.91.bak/po/zh_CN.po scim-pinyin-0.5.91/po/zh_CN.po
---- scim-pinyin-0.5.91.bak/po/zh_CN.po	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/po/zh_CN.po	2006-06-27 09:51:49.000000000 +0800
+--- scim-pinyin-0.5.91.bak/po/zh_CN.po	2005-08-07 00:00:12.000000000 +0800
++++ scim-pinyin-0.5.91/po/zh_CN.po	2006-06-28 17:20:16.000000000 +0800
 @@ -480,3 +480,138 @@
  #~ msgstr ""
  #~ "???????????????????????????????????????(locale). ???????????????????????????????????????. ?????? "
@@ -170,8 +170,8 @@
 +msgid "The switch to invoke pinyin helper. Click to invoke it."
 +msgstr "?????????????????????????????????, ?????????????????????????????????."
 diff -Naur scim-pinyin-0.5.91.bak/src/Makefile.am scim-pinyin-0.5.91/src/Makefile.am
---- scim-pinyin-0.5.91.bak/src/Makefile.am	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/Makefile.am	2006-06-27 09:52:06.000000000 +0800
+--- scim-pinyin-0.5.91.bak/src/Makefile.am	2005-08-06 20:08:46.000000000 +0800
++++ scim-pinyin-0.5.91/src/Makefile.am	2006-06-28 17:20:26.000000000 +0800
 @@ -36,7 +36,8 @@
  			  scim_pinyin_phrase.h \
  			  scim_native_lookup_table.h \
@@ -207,8 +207,8 @@
  endif
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp
 --- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp	1970-01-01 08:00:00.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-06-27 09:52:06.000000000 +0800
-@@ -0,0 +1,1130 @@
++++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-06-28 17:20:26.000000000 +0800
+@@ -0,0 +1,1124 @@
 +/*
 + *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
 + *
@@ -1285,18 +1285,12 @@
 +{
 +    char **argv = new char * [4];
 +    int    argc = 3;
-+    
-+    GtkTreeIter iter;    
-+    GtkTreePath *path;
-+    GtkTreeViewColumn* column;    
 +
 +    argv [0] = "smart-pinyin-imengine-helper";
 +    argv [1] = "--display";
 +    argv [2] = const_cast<char *> (display.c_str ());
 +    argv [3] = 0;    
 +    
-+    std::cout << "in run()" <<endl;
-+
 +    setenv ("DISPLAY", display.c_str (), 1);
 +
 +    gtk_init (&argc, &argv);
@@ -1341,7 +1335,7 @@
 +}
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.h scim-pinyin-0.5.91/src/scim_pinyin_helper.h
 --- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.h	1970-01-01 08:00:00.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.h	2006-06-27 09:52:06.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_helper.h	2006-06-28 17:20:26.000000000 +0800
 @@ -0,0 +1,56 @@
 +/*
 + *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
@@ -1400,8 +1394,8 @@
 +
 +#endif /* __SCIM_PINYIN_HELPER_H__ */
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h
---- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h	2006-06-27 09:52:06.000000000 +0800
+--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_config_keys.h	2005-08-06 23:19:01.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_config_keys.h	2006-06-28 17:20:28.000000000 +0800
 @@ -63,6 +63,9 @@
  
  #define SCIM_CONFIG_IMENGINE_PINYIN_SHUANG_PIN                       "/IMEngine/Pinyin/ShuangPin"
@@ -1413,8 +1407,8 @@
  /*
  vi:expandtab:ts=4:nowrap:ai
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
---- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-06-27 09:52:07.000000000 +0800
+--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.cpp	2006-06-28 17:18:47.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-06-28 17:20:28.000000000 +0800
 @@ -44,6 +44,7 @@
  #include "scim_pinyin_imengine.h"
  #include "scim_pinyin_smart_match.h"
@@ -1812,8 +1806,8 @@
  PinyinInstance::refresh_pinyin_scheme_property ()
  {
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h scim-pinyin-0.5.91/src/scim_pinyin_imengine.h
---- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.h	2006-06-27 09:52:07.000000000 +0800
+--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine.h	2005-08-06 23:19:01.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.h	2006-06-28 17:20:29.000000000 +0800
 @@ -46,7 +46,9 @@
      bool               m_auto_fill_preedit;
      bool               m_always_show_lookup;
@@ -1851,8 +1845,8 @@
  
      void calc_parsed_keys ();
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp
---- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp	2006-06-27 09:52:08.000000000 +0800
+--- scim-pinyin-0.5.91.bak/src/scim_pinyin_imengine_setup.cpp	2006-06-28 17:18:47.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp	2006-06-28 17:20:29.000000000 +0800
 @@ -102,12 +102,13 @@
  
  // Internal data declaration.
@@ -1946,8 +1940,8 @@
                        __config_max_user_phrase_length);
          config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_PREEDIT_LENGTH),
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h scim-pinyin-0.5.91/src/scim_pinyin_phrase.h
---- scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h	2006-06-23 16:15:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.h	2006-06-27 09:52:08.000000000 +0800
+--- scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h	2005-01-06 21:31:00.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.h	2006-06-28 17:20:30.000000000 +0800
 @@ -371,6 +371,9 @@
  	}
  



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:30:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:30:18 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	NONE, 1.1 openoffice.org.spec, 1.745, 1.746
Message-ID: <200606280930.k5S9UHcd006508@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6458

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
Log Message:
suspicious about visibility

openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch:
 cppumaker/cpputype.cxx        |    2 +-
 source/cppumaker/cpputype.cxx |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch ---
Index: source/cppumaker/cpputype.cxx
===================================================================
RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
retrieving revision 1.40
diff -u -r1.40 cpputype.cxx
--- openoffice.org.orig/cppumakersource/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
+++ openoffice.org/cppumaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
@@ -1300,7 +1300,7 @@
 	dumpMethods(o);
 
     o << "\n" << indent()
-      << ("static inline ::com::sun::star::uno::Type const & SAL_CALL"
+      << ("SAL_DLLPUBLIC_EXPORT static inline ::com::sun::star::uno::Type const & SAL_CALL"
           " static_type(void * = 0);\n");
 
 	dec();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.745
retrieving revision 1.746
diff -u -r1.745 -r1.746
--- openoffice.org.spec	27 Jun 2006 15:26:36 -0000	1.745
+++ openoffice.org.spec	28 Jun 2006 09:30:14 -0000	1.746
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -103,7 +103,7 @@
 Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch40: openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch
+Patch40: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
 Patch41: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 Patch42: workspace.sixtyfour06.patch
 
@@ -836,7 +836,7 @@
 %patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch40 -p1 -b .gccXXXXX.linguistic.vorcrash.patch
+%patch40 -p1 -b .ooo66018.idlc.dangerousvisibility.patch
 %patch41 -p1 -b .ooo65519.printing.samba.patch
 %patch42 -p1 -b .workspace.sixtyfour06.patch
 
@@ -3314,6 +3314,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.2
+- add openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch to test my
+  visibility suspicions
+
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone
 - track down vor and sdw crashes to some gcc problem with static initializers, 



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:34:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:34:21 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.17,1.18
Message-ID: <200606280934.k5S9YLnK007316@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7179

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: update spec for helper patch



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scim-pinyin.spec	28 Jun 2006 03:45:41 -0000	1.17
+++ scim-pinyin.spec	28 Jun 2006 09:34:18 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -73,7 +73,10 @@
 
 
 %changelog
-* Tue May 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6
+* Wed Jun 28 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7
+- rebuilt 
+
+* Tue Jun 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6
 - add scim-pinyin-helper.patch
 
 * Fri Mar 31 2006 Jens Petersen <petersen at redhat.com> - 0.5.91-5



From fedora-cvs-commits at redhat.com  Wed Jun 28 09:50:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 05:50:31 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	1.1, 1.2
Message-ID: <200606280950.k5S9oUiL025925@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25876

Modified Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
Log Message:
bad prefix

openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch:
 cppumaker/source/cppumaker/cpputype.cxx |    2 +-
 source/cppumaker/cpputype.cxx           |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch	28 Jun 2006 09:30:14 -0000	1.1
+++ openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch	28 Jun 2006 09:50:27 -0000	1.2
@@ -3,7 +3,7 @@
 RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
 retrieving revision 1.40
 diff -u -r1.40 cpputype.cxx
---- openoffice.org.orig/cppumakersource/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
+--- openoffice.org.orig/cppumaker/source/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
 +++ openoffice.org/cppumaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
 @@ -1300,7 +1300,7 @@
  	dumpMethods(o);



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:00:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:00:58 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.670,1.671
Message-ID: <200606281000.k5SA0wM2029888@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29826

Modified Files:
	openoffice.org.spec 
Log Message:
rebuild for vor problem


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -r1.670 -r1.671
--- openoffice.org.spec	27 Jun 2006 15:26:30 -0000	1.670
+++ openoffice.org.spec	28 Jun 2006 10:00:55 -0000	1.671
@@ -176,7 +176,7 @@
 Patch48: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
 Patch49: disable-java-applets.diff
 Patch50: sax+source+expatwrap+xml2utf.cxx.diff
-Patch51: openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch
+Patch51: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -836,7 +836,7 @@
 %patch48 -p1 -b .oooXXXXX.safety.sfx2.patch
 %patch49 -p1 -b .disable-java-applets.diff
 %patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
-%patch51 -p1 -b .gccXXXXX.linguistic.vorcrash.patch
+%patch51 -p1 -b .ooo66018.idlc.dangerousvisibility.patch
 
 
 %if %{includingexternals}
@@ -3288,9 +3288,8 @@
 - CVE-2006-2199 java applets
 - CVE-2006-3117 corrupt file format
 - rh#195637# add openoffice.org-2.0.3.ooo65519.printing.samba.patch
-- add openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch because 
-  FC-5 updated gcc seems to cause the same problem with sdws and vors 
-  as FC-6
+- add openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch to
+  fix visibility problem
 
 * Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:05:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:05:38 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	NONE, 1.1
Message-ID: <200606281005.k5SA5cid030617@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30583

Added Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
Log Message:
rebuild for vor problem

openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch:
 cppumaker/source/cppumaker/cpputype.cxx |    2 +-
 source/cppumaker/cpputype.cxx           |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch ---
Index: source/cppumaker/cpputype.cxx
===================================================================
RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
retrieving revision 1.40
diff -u -r1.40 cpputype.cxx
--- openoffice.org.orig/cppumaker/source/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
+++ openoffice.org/cppumaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
@@ -1300,7 +1300,7 @@
 	dumpMethods(o);
 
     o << "\n" << indent()
-      << ("static inline ::com::sun::star::uno::Type const & SAL_CALL"
+      << ("SAL_DLLPUBLIC_EXPORT static inline ::com::sun::star::uno::Type const & SAL_CALL"
           " static_type(void * = 0);\n");
 
 	dec();



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:09:16 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	1.2, 1.3
Message-ID: <200606281009.k5SA9GP4031299@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31262

Modified Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
Log Message:
bad prefix

openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch:
 codemaker/source/cppumaker/cpputype.cxx |    2 +-
 source/cppumaker/cpputype.cxx           |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch	28 Jun 2006 09:50:27 -0000	1.2
+++ openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch	28 Jun 2006 10:09:12 -0000	1.3
@@ -3,8 +3,8 @@
 RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
 retrieving revision 1.40
 diff -u -r1.40 cpputype.cxx
---- openoffice.org.orig/cppumaker/source/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
-+++ openoffice.org/cppumaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
+--- openoffice.org.orig/codemaker/source/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
++++ openoffice.org/codemaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
 @@ -1300,7 +1300,7 @@
  	dumpMethods(o);
  



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:13:20 -0400
Subject: rpms/imake/devel imake.spec,1.22,1.23
Message-ID: <200606281013.k5SADKLB032116@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32079

Modified Files:
	imake.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- imake.spec	10 Jun 2006 07:16:37 -0000	1.22
+++ imake.spec	28 Jun 2006 10:13:18 -0000	1.23
@@ -1,17 +1,17 @@
 Summary: imake source code configuration and build system
 Name: imake
-Version: 1.0.1
-Release: 4
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/util/imake-%{version}.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.0.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/individual/util/gccmakedep-%{version}.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-%{version}.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/individual/util/lndir-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/individual/util/imake-1.0.2.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/individual/util/makedepend-1.0.0.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/individual/util/gccmakedep-1.0.2.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/individual/util/xorg-cf-files-1.0.2.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/individual/util/lndir-1.0.1.tar.bz2
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
 Patch2: xorg-cf-files-1.0.1-redhat.patch
@@ -116,6 +116,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
+- Update to imake-1.0.2, gccmakedep-1.0.2, xorg-cf-files-1.0.2
+
 * Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-4
 - Fix ExtraXawReqs to reflect reality (libXp is unneeded)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:14:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:14:27 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.12,
	1.13
Message-ID: <200606281014.k5SAERqO032493@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32462

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-util-macros.spec	22 Jun 2006 00:11:41 -0000	1.12
+++ xorg-x11-util-macros.spec	28 Jun 2006 10:14:24 -0000	1.13
@@ -10,7 +10,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-Source0:  http://xorg.freedesktop.org/releases/individual/util/util-macros-%{version}.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/util/util-macros-%{version}.tar.bz2
 
 %description
 X.Org X11 autotools macros required for building the various packages that



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:15:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:15:04 -0400
Subject: rpms/imake/devel imake.spec,1.23,1.24
Message-ID: <200606281015.k5SAF4ft032748@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32705

Modified Files:
	imake.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- imake.spec	28 Jun 2006 10:13:18 -0000	1.23
+++ imake.spec	28 Jun 2006 10:15:02 -0000	1.24
@@ -7,11 +7,11 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/individual/util/imake-1.0.2.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/individual/util/makedepend-1.0.0.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/individual/util/gccmakedep-1.0.2.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/individual/util/xorg-cf-files-1.0.2.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/individual/util/lndir-1.0.1.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.2.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.0.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.2.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
 Patch2: xorg-cf-files-1.0.1-redhat.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:15:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:15:57 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.13,
	1.14
Message-ID: <200606281015.k5SAFvdY003723@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3038

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xtrans-devel.spec	20 Jun 2006 22:12:27 -0000	1.13
+++ xorg-x11-xtrans-devel.spec	28 Jun 2006 10:15:54 -0000	1.14
@@ -10,7 +10,7 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/xtrans-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/xtrans-%{version}.tar.bz2
 
 # NOTE: Fix for http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195555 which
 # at the time I'm committing this to Fedora development, is only a "potential"



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:16:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:16:25 -0400
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.13,1.14
Message-ID: <200606281016.k5SAGP2P007859@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6676

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xsm.spec	22 Jun 2006 04:39:38 -0000	1.13
+++ xorg-x11-xsm.spec	28 Jun 2006 10:16:22 -0000	1.14
@@ -11,9 +11,9 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.2.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/xsm-1.0.1.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/smproxy-1.0.2.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/rstart-1.0.2.tar.bz2
 
 # Patches for xsm (10-19)
 Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:17:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:17:17 -0400
Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.14,1.15
Message-ID: <200606281017.k5SAHHqU014057@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13704

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xkb-utils.spec	22 Jun 2006 04:56:45 -0000	1.14
+++ xorg-x11-xkb-utils.spec	28 Jun 2006 10:17:15 -0000	1.15
@@ -16,11 +16,11 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.2.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.0.2.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.2.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.2.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
 # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:17:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:17:37 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.21,1.22
Message-ID: <200606281017.k5SAHb96015915@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15885

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-xinit.spec	22 Jun 2006 04:45:06 -0000	1.21
+++ xorg-x11-xinit.spec	28 Jun 2006 10:17:35 -0000	1.22
@@ -10,7 +10,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2
 Source10: xinitrc-common
 Source11: xinitrc
 Source12: Xclients



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:18:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:18:12 -0400
Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.11,1.12
Message-ID: <200606281018.k5SAICQA016127@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfwp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16088

Modified Files:
	xorg-x11-xfwp.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xfwp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-xfwp.spec	22 Jun 2006 06:05:09 -0000	1.11
+++ xorg-x11-xfwp.spec	28 Jun 2006 10:18:10 -0000	1.12
@@ -10,9 +10,9 @@
 Group: User Interface/X
 URL: http://www.x.org
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/xfwp-%{xfwp_version}.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/individual/app/proxymngr-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/individual/app/xfindproxy-1.0.1.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/xfwp-%{xfwp_version}.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/proxymngr-1.0.1.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/xfindproxy-1.0.1.tar.bz2
 
 Patch0: proxymngr-1.0.1-lbxproxy-die-die-die.patch
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:19:33 -0400
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.25,1.26
Message-ID: <200606281019.k5SAJXva016620@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16586

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-xfs.spec	28 Jun 2006 08:44:18 -0000	1.25
+++ xorg-x11-xfs.spec	28 Jun 2006 10:19:31 -0000	1.26
@@ -4,9 +4,11 @@
 %define _sysfontdir	%{_datadir}/fonts
 %define _oldx11fontdir	/usr/X11R6/lib/X11/fonts
 
+%define xfs_version 1.0.2
+
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
-Version: 1.0.2
+Version: %{xfs_version}
 Release: 3
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
@@ -15,11 +17,11 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.2.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/individual/app/xfsinfo-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.1.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.2.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.1.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/xfs-%{version}.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xfsinfo-1.0.1.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/fslsfonts-1.0.1.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/fstobdf-1.0.2.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/app/showfont-1.0.1.tar.bz2
 Source10:  xfs.init
 # NOTE: xfs config input file, processed via sed below.
 Source11:  xfs.config.in



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:20:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:20:33 -0400
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.25,1.26
Message-ID: <200606281020.k5SAKXqo016997@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16969

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-xdm.spec	28 Jun 2006 08:28:11 -0000	1.25
+++ xorg-x11-xdm.spec	28 Jun 2006 10:20:31 -0000	1.26
@@ -11,7 +11,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/xdm-%{version}.tar.bz2
 Source1: Xsetup_0
 Source10: xdm.init
 Source11: xdm.pamd



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:20:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:20:55 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	1.1, 1.2
Message-ID: <200606281020.k5SAKtOB017149@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17116

Modified Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
Log Message:
rebuild for vor problem

openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch:
 codemaker/source/cppumaker/cpputype.cxx |    2 +-
 source/cppumaker/cpputype.cxx           |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch	28 Jun 2006 10:05:35 -0000	1.1
+++ openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch	28 Jun 2006 10:20:53 -0000	1.2
@@ -3,8 +3,8 @@
 RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
 retrieving revision 1.40
 diff -u -r1.40 cpputype.cxx
---- openoffice.org.orig/cppumaker/source/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
-+++ openoffice.org/cppumaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
+--- openoffice.org.orig/codemaker/source/cppumaker/cpputype.cxx	19 Apr 2006 13:42:14 -0000	1.40
++++ openoffice.org/codemaker/source/cppumaker/cpputype.cxx	28 Jun 2006 09:20:53 -0000
 @@ -1300,7 +1300,7 @@
  	dumpMethods(o);
  



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:21:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:21:29 -0400
Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.13,1.14
Message-ID: <200606281021.k5SALTLL017393@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17360

Modified Files:
	xorg-x11-xbitmaps.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xbitmaps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xbitmaps.spec	22 Jun 2006 05:06:49 -0000	1.13
+++ xorg-x11-xbitmaps.spec	28 Jun 2006 10:21:26 -0000	1.14
@@ -9,9 +9,9 @@
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/data/%{pkgname}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{version}.tar.bz2
 
 # NOTE: This dependency on xorg-x11-filesystem is required to work around
 # a nasty upgrade problem when going from FC4->FC5 or monolithic to



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:22:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:22:08 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.14,
	1.15
Message-ID: <200606281022.k5SAM8AZ017607@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17580

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
tidy up


Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xtrans-devel.spec	28 Jun 2006 10:15:54 -0000	1.14
+++ xorg-x11-xtrans-devel.spec	28 Jun 2006 10:22:04 -0000	1.15
@@ -10,6 +10,8 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: ftp://ftp.x.org/pub/individual/lib/xtrans-%{version}.tar.bz2
 
 # NOTE: Fix for http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195555 which
@@ -17,8 +19,6 @@
 # security issue, and does not yet have any known exploit vector.
 Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xtrans-1.0.0-setuid.diff
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:23:13 -0400
Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.12,1.13
Message-ID: <200606281023.k5SANDUX018025@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfwp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17995

Modified Files:
	xorg-x11-xfwp.spec 
Log Message:
tidy up


Index: xorg-x11-xfwp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xfwp.spec	28 Jun 2006 10:18:10 -0000	1.12
+++ xorg-x11-xfwp.spec	28 Jun 2006 10:23:11 -0000	1.13
@@ -9,6 +9,7 @@
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/app/xfwp-%{xfwp_version}.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/proxymngr-1.0.1.tar.bz2
@@ -16,8 +17,6 @@
 
 Patch0: proxymngr-1.0.1-lbxproxy-die-die-die.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # FIXME: Temporary dependencies on autotools stuff for patch workaround.
 BuildRequires: automake autoconf libtool
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:24:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:24:06 -0400
Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.11,1.12
Message-ID: <200606281024.k5SAO6SI018379@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xauth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18348

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-xauth.spec	22 Jun 2006 04:00:34 -0000	1.11
+++ xorg-x11-xauth.spec	28 Jun 2006 10:24:03 -0000	1.12
@@ -11,7 +11,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2
 Source10: mkxauth
 Source11: mkxauth.man
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:24:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:24:45 -0400
Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.13,1.14
Message-ID: <200606281024.k5SAOjKL018635@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18609

Modified Files:
	xorg-x11-utils.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-utils.spec	22 Jun 2006 05:51:15 -0000	1.13
+++ xorg-x11-utils.spec	28 Jun 2006 10:24:43 -0000	1.14
@@ -9,17 +9,17 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.0.1.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/individual/app/xev-1.0.2.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/individual/app/xfd-1.0.1.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.1.tar.bz2
-Source5:  http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.1.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.0.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.1.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/individual/app/xprop-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.0.1.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.2.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.1.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
+Source4:  ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.1.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.1.tar.bz2
+Source6:  ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.1.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.0.1.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.1.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.2.tar.bz2
 
 Patch0: xdpyinfo-1.0.1-spurious-xprint.patch
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:25:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:25:07 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.13,
	1.14
Message-ID: <200606281025.k5SAP74U018783@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18755

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
tidy up


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-util-macros.spec	28 Jun 2006 10:14:24 -0000	1.13
+++ xorg-x11-util-macros.spec	28 Jun 2006 10:25:05 -0000	1.14
@@ -8,7 +8,7 @@
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  ftp://ftp.x.org/pub/individual/util/util-macros-%{version}.tar.bz2
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:25:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:25:28 -0400
Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.14,1.15
Message-ID: <200606281025.k5SAPS4G018944@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-twm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18913

Modified Files:
	xorg-x11-twm.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-twm.spec	22 Jun 2006 03:53:40 -0000	1.14
+++ xorg-x11-twm.spec	28 Jun 2006 10:25:26 -0000	1.15
@@ -11,7 +11,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{pkgname}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{pkgname}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 # checking TWM_LIBS... -lXmu -lXt -lSM -lICE -lXext -lX11 -ldl



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:25:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:25:57 -0400
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.21,
	1.22
Message-ID: <200606281025.k5SAPvRK019142@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19105

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-server-utils.spec	22 Jun 2006 06:18:11 -0000	1.21
+++ xorg-x11-server-utils.spec	28 Jun 2006 10:25:54 -0000	1.22
@@ -9,23 +9,23 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.0.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.1.tar.bz2
-Source5:  http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.1.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.1.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/individual/app/xrandr-1.0.2.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.2.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.2.tar.bz2
-Source11: http://xorg.freedesktop.org/releases/individual/app/xset-1.0.2.tar.bz2
-Source12: http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2
-Source13: http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.0.tar.bz2
-Source14: http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.1.tar.bz2
-Source15: http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.1.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
-Source17: http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.1.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/iceauth-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/rgb-1.0.1.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/sessreg-1.0.0.tar.bz2
+Source4:  ftp://ftp.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/xgamma-1.0.1.tar.bz2
+Source6:  ftp://ftp.x.org/pub/individual/app/xhost-1.0.1.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/app/xmodmap-1.0.1.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xrandr-1.0.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xrdb-1.0.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xset-1.0.2.tar.bz2
+Source12: ftp://ftp.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
+Source13: ftp://ftp.x.org/pub/individual/app/xsetpointer-1.0.0.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/app/xsetroot-1.0.1.tar.bz2
+Source15: ftp://ftp.x.org/pub/individual/app/xstdcmap-1.0.1.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/app/xtrap-1.0.2.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
 # NOTE: Each upstream tarball has its own "PatchN" section, taken from
 # multiplying the "SourceN" line times 100.  Please keep them in this
 # order.  Also, please keep each patch specific to a single upstream tarball,



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:29:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:29:08 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.105,1.106
Message-ID: <200606281029.k5SAT8aL020374@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20333

Modified Files:
	xorg-x11-server.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- xorg-x11-server.spec	27 Jun 2006 22:31:29 -0000	1.105
+++ xorg-x11-server.spec	28 Jun 2006 10:29:05 -0000	1.106
@@ -10,7 +10,7 @@
 Group:     User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/releases/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 Source100: comment-header-modefiles.txt
 
 Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:29:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:29:28 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.13,1.14
Message-ID: <200606281029.k5SATSLK020519@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20484

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-resutils.spec	22 Jun 2006 20:32:19 -0000	1.13
+++ xorg-x11-resutils.spec	28 Jun 2006 10:29:26 -0000	1.14
@@ -9,10 +9,10 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://xorg.freedesktop.org/releases/individual/app/appres-1.0.0.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/individual/app/editres-1.0.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/individual/app/listres-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.1.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/appres-1.0.0.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/editres-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/listres-1.0.1.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/viewres-1.0.1.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:29:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:29:57 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.33,
	1.34
Message-ID: <200606281029.k5SATvbj020734@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20697

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-proto-devel.spec	22 Jun 2006 00:33:35 -0000	1.33
+++ xorg-x11-proto-devel.spec	28 Jun 2006 10:29:55 -0000	1.34
@@ -16,36 +16,36 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.0.2.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.3.1.tar.bz2
-Source2:  http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.0.3.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/individual/proto/evieext-1.0.2.tar.bz2
-Source5:  http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.0.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.2.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.0.2.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.7.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.3.2.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.2.tar.bz2
-Source12: http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.3.tar.bz2
-Source13: http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.1.2.tar.bz2
-Source14: http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.13.2.tar.bz2
-Source15: http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.2.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.0.2.tar.bz2
-Source17: http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.1.0.tar.bz2
-Source18: http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2
-Source19: http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.2.2.tar.bz2
-Source20: http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.1.2.tar.bz2
-Source21: http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.2.tar.bz2
-Source22: http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
-Source23: http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.2.tar.bz2
-Source24: http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.3.tar.bz2
-Source25: http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.2.tar.bz2
-Source26: http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
-Source27: http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
-Source28: http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.1.2.tar.bz2
-Source29: http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.7.tar.bz2
-Source30: http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/proto/compositeproto-0.3.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/proto/damageproto-1.0.3.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
+Source4:  ftp://ftp.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
+Source6:  ftp://ftp.x.org/pub/individual/proto/fontcacheproto-0.1.2.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.7.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.3.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.2.tar.bz2
+Source12: ftp://ftp.x.org/pub/individual/proto/printproto-1.0.3.tar.bz2
+Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.1.2.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
+Source15: ftp://ftp.x.org/pub/individual/proto/renderproto-0.9.2.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
+Source18: ftp://ftp.x.org/pub/individual/proto/trapproto-3.4.3.tar.bz2
+Source19: ftp://ftp.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
+Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
+Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.0.2.tar.bz2
+Source22: ftp://ftp.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
+Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.2.tar.bz2
+Source24: ftp://ftp.x.org/pub/individual/proto/xf86driproto-2.0.3.tar.bz2
+Source25: ftp://ftp.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
+Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2
+Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
+Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
+Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.7.tar.bz2
+Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:31:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:31:15 -0400
Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.15,1.16
Message-ID: <200606281031.k5SAVFnL021019@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20991

Modified Files:
	xorg-x11-fonts.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-fonts.spec	22 Jun 2006 03:38:17 -0000	1.15
+++ xorg-x11-fonts.spec	28 Jun 2006 10:31:12 -0000	1.16
@@ -38,47 +38,47 @@
 
 BuildArch:	noarch
 
-Source0:  ftp://ftp.freedesktop.org/pub/individual/font/encodings-1.0.0.tar.bz2
-Source1:  ftp://ftp.freedesktop.org/pub/individual/font/font-alias-1.0.1.tar.bz2
-Source10: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-100dpi-1.0.0.tar.bz2
-Source11: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-75dpi-1.0.0.tar.bz2
-Source12: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2
-Source13: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2
-Source14: ftp://ftp.freedesktop.org/pub/individual/font/font-adobe-utopia-type1-1.0.1.tar.bz2
-Source15: ftp://ftp.freedesktop.org/pub/individual/font/font-arabic-misc-1.0.0.tar.bz2
-Source16: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-100dpi-1.0.0.tar.bz2
-Source17: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-75dpi-1.0.0.tar.bz2
-Source18: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
-Source19: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-Source20: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
-Source21: ftp://ftp.freedesktop.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
-Source22: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2
-Source23: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/font/encodings-1.0.0.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/font/font-alias-1.0.1.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/font/font-adobe-100dpi-1.0.0.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/font/font-adobe-75dpi-1.0.0.tar.bz2
+Source12: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2
+Source13: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.1.tar.bz2
+Source15: ftp://ftp.x.org/pub/individual/font/font-arabic-misc-1.0.0.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/font/font-bh-100dpi-1.0.0.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/font/font-bh-75dpi-1.0.0.tar.bz2
+Source18: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
+Source19: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
+Source20: ftp://ftp.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
+Source21: ftp://ftp.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
+Source22: ftp://ftp.x.org/pub/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2
+Source23: ftp://ftp.x.org/pub/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2
 # NOTE: X.Org 6.8.x and later has deprecated and disabled the speedo font
 # support by default, so we exclude the speedo fonts.
 #Source24:	font-bitstream-speedo-1.0.0.tar.bz2
-Source25: ftp://ftp.freedesktop.org/pub/individual/font/font-bitstream-type1-1.0.0.tar.bz2
-Source26: ftp://ftp.freedesktop.org/pub/individual/font/font-cronyx-cyrillic-1.0.0.tar.bz2
-Source27: ftp://ftp.freedesktop.org/pub/individual/font/font-cursor-misc-1.0.0.tar.bz2
-Source28: ftp://ftp.freedesktop.org/pub/individual/font/font-daewoo-misc-1.0.0.tar.bz2
-Source29: ftp://ftp.freedesktop.org/pub/individual/font/font-dec-misc-1.0.0.tar.bz2
-Source30: ftp://ftp.freedesktop.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
-Source31: ftp://ftp.freedesktop.org/pub/individual/font/font-isas-misc-1.0.0.tar.bz2
-Source32: ftp://ftp.freedesktop.org/pub/individual/font/font-jis-misc-1.0.0.tar.bz2
-Source33: ftp://ftp.freedesktop.org/pub/individual/font/font-micro-misc-1.0.0.tar.bz2
-Source34: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-cyrillic-1.0.0.tar.bz2
+Source25: ftp://ftp.x.org/pub/individual/font/font-bitstream-type1-1.0.0.tar.bz2
+Source26: ftp://ftp.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.0.tar.bz2
+Source27: ftp://ftp.x.org/pub/individual/font/font-cursor-misc-1.0.0.tar.bz2
+Source28: ftp://ftp.x.org/pub/individual/font/font-daewoo-misc-1.0.0.tar.bz2
+Source29: ftp://ftp.x.org/pub/individual/font/font-dec-misc-1.0.0.tar.bz2
+Source30: ftp://ftp.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
+Source31: ftp://ftp.x.org/pub/individual/font/font-isas-misc-1.0.0.tar.bz2
+Source32: ftp://ftp.x.org/pub/individual/font/font-jis-misc-1.0.0.tar.bz2
+Source33: ftp://ftp.x.org/pub/individual/font/font-micro-misc-1.0.0.tar.bz2
+Source34: ftp://ftp.x.org/pub/individual/font/font-misc-cyrillic-1.0.0.tar.bz2
 %if %{with_ethiopic_fonts}
-Source35: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-ethiopic-1.0.0.tar.bz2
+Source35: ftp://ftp.x.org/pub/individual/font/font-misc-ethiopic-1.0.0.tar.bz2
 %endif
-Source36: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
-Source37: ftp://ftp.freedesktop.org/pub/individual/font/font-misc-misc-1.0.0.tar.bz2
-Source38: ftp://ftp.freedesktop.org/pub/individual/font/font-mutt-misc-1.0.0.tar.bz2
-Source39: ftp://ftp.freedesktop.org/pub/individual/font/font-schumacher-misc-1.0.0.tar.bz2
-Source40: ftp://ftp.freedesktop.org/pub/individual/font/font-screen-cyrillic-1.0.0.tar.bz2
-Source41: ftp://ftp.freedesktop.org/pub/individual/font/font-sony-misc-1.0.0.tar.bz2
-Source42: ftp://ftp.freedesktop.org/pub/individual/font/font-sun-misc-1.0.0.tar.bz2
-Source43: ftp://ftp.freedesktop.org/pub/individual/font/font-winitzki-cyrillic-1.0.0.tar.bz2
-Source44: ftp://ftp.freedesktop.org/pub/individual/font/font-xfree86-type1-1.0.0.tar.bz2
+Source36: ftp://ftp.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
+Source37: ftp://ftp.x.org/pub/individual/font/font-misc-misc-1.0.0.tar.bz2
+Source38: ftp://ftp.x.org/pub/individual/font/font-mutt-misc-1.0.0.tar.bz2
+Source39: ftp://ftp.x.org/pub/individual/font/font-schumacher-misc-1.0.0.tar.bz2
+Source40: ftp://ftp.x.org/pub/individual/font/font-screen-cyrillic-1.0.0.tar.bz2
+Source41: ftp://ftp.x.org/pub/individual/font/font-sony-misc-1.0.0.tar.bz2
+Source42: ftp://ftp.x.org/pub/individual/font/font-sun-misc-1.0.0.tar.bz2
+Source43: ftp://ftp.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.0.tar.bz2
+Source44: ftp://ftp.x.org/pub/individual/font/font-xfree86-type1-1.0.0.tar.bz2
 
 Patch0: font-alias-1.0.0-fonts-alias-fontdir-fix.patch
 Patch1: encodings-1.0.0-encodings-fontdir-fix.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:32:31 -0400
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.19,1.20
Message-ID: <200606281032.k5SAWVpb021197@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21167

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-font-utils.spec	22 Jun 2006 03:16:41 -0000	1.19
+++ xorg-x11-font-utils.spec	28 Jun 2006 10:32:20 -0000	1.20
@@ -22,11 +22,11 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.0.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.2.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/individual/app/font-util-1.0.1.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.0.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.1.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.2.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/app/font-util-1.0.1.tar.bz2
 
 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
 Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:33:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:33:08 -0400
Subject: rpms/gstreamer/devel gstreamer.spec,1.51,1.52
Message-ID: <200606281033.k5SAX8Tg021347@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21325

Modified Files:
	gstreamer.spec 
Log Message:
- remove RPATH pointing to RPM_BUILD_ROOT (#196870)


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gstreamer.spec	14 Jun 2006 02:48:10 -0000	1.51
+++ gstreamer.spec	28 Jun 2006 10:33:06 -0000	1.52
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.8
-Release: 	2
+Release: 	3
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -111,7 +111,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 # Install doc temporarily in order to be included later by rpm
-%makeinstall docdir="`pwd`/installed-doc"
+make install docdir="`pwd`/installed-doc" DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang gstreamer-%{majorminor}
 # Clean out files that should not be part of the rpm. 
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 0.10.8-3
+- remove RPATH pointing to RPM_BUILD_ROOT (#196870)
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:33:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:33:19 -0400
Subject: rpms/xorg-x11-filesystem/devel xorg-x11-filesystem.spec,1.6,1.7
Message-ID: <200606281033.k5SAXJ1w021419@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21394

Modified Files:
	xorg-x11-filesystem.spec 
Log Message:
tidy up


Index: xorg-x11-filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-filesystem/devel/xorg-x11-filesystem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-filesystem.spec	22 Jun 2006 00:43:54 -0000	1.6
+++ xorg-x11-filesystem.spec	28 Jun 2006 10:33:16 -0000	1.7
@@ -5,7 +5,7 @@
 License: MIT/X11
 Group: System Environment/Base
 URL: http://www.redhat.com
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:34:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:34:02 -0400
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.17,1.18
Message-ID: <200606281034.k5SAY2DH021560@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21536

Modified Files:
	xorg-x11-apps.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-apps.spec	28 Jun 2006 09:15:22 -0000	1.17
+++ xorg-x11-apps.spec	28 Jun 2006 10:34:00 -0000	1.18
@@ -12,25 +12,25 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Clock apps
-Source0:  http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.1.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.2.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/oclock-1.0.1.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.2.tar.bz2
 # X Window Dump (xwd) utilities
-Source2:  http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.1.tar.bz2
-Source3:  http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.1.tar.bz2
-Source4:  http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.1.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.1.tar.bz2
+Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.1.tar.bz2
 # Miscellaneous other applications
-Source5:  http://xorg.freedesktop.org/releases/individual/app/luit-1.0.1.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.1.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.2.tar.bz2
-Source10: http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.1.tar.bz2
-Source11: http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.1.tar.bz2
-Source12: http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.1.tar.bz2
-Source13: http://xorg.freedesktop.org/releases/individual/app/xload-1.0.1.tar.bz2
-Source14: http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.1.tar.bz2
-Source15: http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.1.tar.bz2
-Source16: http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.1.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.1.tar.bz2
+Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.4.1.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.1.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.1.tar.bz2
+Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
+Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.1.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
+Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.1.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.1.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:34:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:34:47 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.11,1.12
Message-ID: <200606281034.k5SAYlQi021714@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21700

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
tidy up


Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drivers.spec	21 Jun 2006 19:11:17 -0000	1.11
+++ xorg-x11-drivers.spec	28 Jun 2006 10:34:44 -0000	1.12
@@ -7,7 +7,8 @@
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Obsoletes: xorg-x11
 
 # *************************************************************************



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:35:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:35:40 -0400
Subject: rpms/libFS/devel libFS.spec,1.23,1.24
Message-ID: <200606281035.k5SAZerE021830@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21799

Modified Files:
	libFS.spec 
Log Message:
Add missing source URL


Index: libFS.spec
===================================================================
RCS file: /cvs/dist/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libFS.spec	6 Jun 2006 15:56:59 -0000	1.23
+++ libFS.spec	28 Jun 2006 10:35:38 -0000	1.24
@@ -5,7 +5,7 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: %{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:36:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:36:13 -0400
Subject: rpms/libICE/devel libICE.spec,1.13,1.14
Message-ID: <200606281036.k5SAaDQR021959@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libICE/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21925

Modified Files:
	libICE.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libICE.spec
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libICE.spec	6 Jun 2006 16:04:24 -0000	1.13
+++ libICE.spec	28 Jun 2006 10:36:11 -0000	1.14
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:36:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:36:54 -0400
Subject: rpms/libSM/devel libSM.spec,1.14,1.15
Message-ID: <200606281036.k5SAasBS022068@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22035

Modified Files:
	libSM.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libSM.spec	6 Jun 2006 16:12:28 -0000	1.14
+++ libSM.spec	28 Jun 2006 10:36:51 -0000	1.15
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:38:16 -0400
Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.18,1.19
Message-ID: <200606281038.k5SAcGWV022338@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXScrnSaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22306

Modified Files:
	libXScrnSaver.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXScrnSaver.spec	7 Jun 2006 12:58:27 -0000	1.18
+++ libXScrnSaver.spec	28 Jun 2006 10:38:13 -0000	1.19
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel >= 7.0-9
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:38:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:38:32 -0400
Subject: rpms/libX11/devel libX11.spec,1.20,1.21
Message-ID: <200606281038.k5SAcWsn022392@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22351

Modified Files:
	libX11.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libX11.spec	28 Jun 2006 07:16:40 -0000	1.20
+++ libX11.spec	28 Jun 2006 10:38:30 -0000	1.21
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch1: libX11-1.0.1-setuid.diff



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:39:10 -0400
Subject: rpms/libXTrap/devel libXTrap.spec,1.11,1.12
Message-ID: <200606281039.k5SAdA0V022503@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXTrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22483

Modified Files:
	libXTrap.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXTrap.spec
===================================================================
RCS file: /cvs/dist/rpms/libXTrap/devel/libXTrap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXTrap.spec	7 Jun 2006 13:50:14 -0000	1.11
+++ libXTrap.spec	28 Jun 2006 10:39:08 -0000	1.12
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:39:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:39:27 -0400
Subject: rpms/libXau/devel libXau.spec,1.13,1.14
Message-ID: <200606281039.k5SAdRv8022568@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22556

Modified Files:
	libXau.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXau.spec	7 Jun 2006 17:18:39 -0000	1.13
+++ libXau.spec	28 Jun 2006 10:39:23 -0000	1.14
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:39:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:39:50 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.17,1.18
Message-ID: <200606281039.k5SAdoc2022687@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22649

Modified Files:
	libXaw.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXaw.spec	22 Jun 2006 20:27:39 -0000	1.17
+++ libXaw.spec	28 Jun 2006 10:39:47 -0000	1.18
@@ -3,11 +3,11 @@
 Version: 1.0.2
 Release: 6
 License: MIT/X11
+URL: http://www.x.org
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://www.x.org
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:40:16 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.15,1.16
Message-ID: <200606281040.k5SAeGqF022809@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22772

Modified Files:
	libXcomposite.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXcomposite.spec	7 Jun 2006 17:58:15 -0000	1.15
+++ libXcomposite.spec	28 Jun 2006 10:40:13 -0000	1.16
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel >= 7.0-10
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:40:32 -0400
Subject: rpms/libXcursor/devel libXcursor.spec,1.13,1.14
Message-ID: <200606281040.k5SAeWgp022932@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22896

Modified Files:
	libXcursor.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXcursor.spec	21 Jun 2006 23:44:10 -0000	1.13
+++ libXcursor.spec	28 Jun 2006 10:40:29 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 Source1: index.theme
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:40:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:40:58 -0400
Subject: rpms/libXdamage/devel libXdamage.spec,1.12,1.13
Message-ID: <200606281040.k5SAewt5023111@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23036

Modified Files:
	libXdamage.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXdamage.spec	7 Jun 2006 20:42:37 -0000	1.12
+++ libXdamage.spec	28 Jun 2006 10:40:56 -0000	1.13
@@ -6,7 +6,8 @@
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:41:13 -0400
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.12,1.13
Message-ID: <200606281041.k5SAfD3d023230@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23138

Modified Files:
	libXdmcp.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXdmcp.spec	7 Jun 2006 21:13:18 -0000	1.12
+++ libXdmcp.spec	28 Jun 2006 10:41:11 -0000	1.13
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:41:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:41:22 -0400
Subject: rpms/libXevie/devel libXevie.spec,1.13,1.14
Message-ID: <200606281041.k5SAfMpl023301@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23255

Modified Files:
	libXevie.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXevie.spec	7 Jun 2006 21:19:24 -0000	1.13
+++ libXevie.spec	28 Jun 2006 10:41:20 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:41:49 -0400
Subject: rpms/libXext/devel libXext.spec,1.13,1.14
Message-ID: <200606281041.k5SAfnpt023454@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23398

Modified Files:
	libXext.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXext.spec	7 Jun 2006 21:26:50 -0000	1.13
+++ libXext.spec	28 Jun 2006 10:41:46 -0000	1.14
@@ -5,9 +5,10 @@
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:41:54 -0400
Subject: rpms/libXfixes/devel libXfixes.spec,1.12,1.13
Message-ID: <200606281041.k5SAfsOQ023514@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfixes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23484

Modified Files:
	libXfixes.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXfixes.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXfixes.spec	7 Jun 2006 22:26:42 -0000	1.12
+++ libXfixes.spec	28 Jun 2006 10:41:52 -0000	1.13
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:42:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:42:21 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.17,1.18
Message-ID: <200606281042.k5SAgLLF023698@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23570

Modified Files:
	libXfont.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXfont.spec	25 Jun 2006 19:45:39 -0000	1.17
+++ libXfont.spec	28 Jun 2006 10:42:19 -0000	1.18
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:42:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:42:22 -0400
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.13,1.14
Message-ID: <200606281042.k5SAgM89023705@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23635

Modified Files:
	libXfontcache.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXfontcache.spec	9 Jun 2006 11:01:10 -0000	1.13
+++ libXfontcache.spec	28 Jun 2006 10:42:19 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:42:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:42:43 -0400
Subject: rpms/libXft/devel libXft.spec,1.15,1.16
Message-ID: <200606281042.k5SAghJY023865@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23833

Modified Files:
	libXft.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXft.spec	22 Jun 2006 01:05:33 -0000	1.15
+++ libXft.spec	28 Jun 2006 10:42:41 -0000	1.16
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:42:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:42:57 -0400
Subject: rpms/libXi/devel libXi.spec,1.13,1.14
Message-ID: <200606281042.k5SAgvEK023979@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23947

Modified Files:
	libXi.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXi.spec	9 Jun 2006 11:16:49 -0000	1.13
+++ libXi.spec	28 Jun 2006 10:42:55 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:43:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:43:10 -0400
Subject: rpms/libXinerama/devel libXinerama.spec,1.11,1.12
Message-ID: <200606281043.k5SAhAat024074@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXinerama/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24043

Modified Files:
	libXinerama.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXinerama.spec
===================================================================
RCS file: /cvs/dist/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXinerama.spec	9 Jun 2006 11:24:43 -0000	1.11
+++ libXinerama.spec	28 Jun 2006 10:43:07 -0000	1.12
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:43:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:43:22 -0400
Subject: rpms/libXmu/devel libXmu.spec,1.13,1.14
Message-ID: <200606281043.k5SAhMDM024176@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24145

Modified Files:
	libXmu.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXmu.spec	9 Jun 2006 11:31:34 -0000	1.13
+++ libXmu.spec	28 Jun 2006 10:43:20 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:43:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:43:43 -0400
Subject: rpms/libXp/devel libXp.spec,1.12,1.13
Message-ID: <200606281043.k5SAhh8b024324@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24298

Modified Files:
	libXp.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXp.spec	9 Jun 2006 11:37:21 -0000	1.12
+++ libXp.spec	28 Jun 2006 10:43:40 -0000	1.13
@@ -9,7 +9,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:44:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:44:06 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.14,1.15
Message-ID: <200606281044.k5SAi6QR024489@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24458

Modified Files:
	libXpm.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXpm.spec	9 Jun 2006 11:42:15 -0000	1.14
+++ libXpm.spec	28 Jun 2006 10:44:04 -0000	1.15
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:44:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:44:19 -0400
Subject: rpms/libXrandr/devel libXrandr.spec,1.13,1.14
Message-ID: <200606281044.k5SAiJYO024590@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24556

Modified Files:
	libXrandr.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXrandr.spec	9 Jun 2006 11:59:29 -0000	1.13
+++ libXrandr.spec	28 Jun 2006 10:44:16 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 # xrandr.pc Requires: xproto randrproto >= 1.1



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:44:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:44:35 -0400
Subject: rpms/libXrender/devel libXrender.spec,1.14,1.15
Message-ID: <200606281044.k5SAiZsk024712@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24660

Modified Files:
	libXrender.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXrender.spec	9 Jun 2006 12:03:41 -0000	1.14
+++ libXrender.spec	28 Jun 2006 10:44:32 -0000	1.15
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:45:14 -0400
Subject: rpms/libXres/devel libXres.spec,1.13,1.14
Message-ID: <200606281045.k5SAjEJH024983@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24948

Modified Files:
	libXres.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXres.spec	9 Jun 2006 12:06:39 -0000	1.13
+++ libXres.spec	28 Jun 2006 10:45:11 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:45:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:45:29 -0400
Subject: rpms/libXt/devel libXt.spec,1.19,1.20
Message-ID: <200606281045.k5SAjTqU025094@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25056

Modified Files:
	libXt.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXt.spec	22 Jun 2006 01:11:02 -0000	1.19
+++ libXt.spec	28 Jun 2006 10:45:27 -0000	1.20
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:45:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:45:41 -0400
Subject: rpms/libXtst/devel libXtst.spec,1.12,1.13
Message-ID: <200606281045.k5SAjfVQ025534@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25142

Modified Files:
	libXtst.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXtst.spec	9 Jun 2006 12:13:01 -0000	1.12
+++ libXtst.spec	28 Jun 2006 10:45:38 -0000	1.13
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:45:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:45:53 -0400
Subject: rpms/libXv/devel libXv.spec,1.14,1.15
Message-ID: <200606281045.k5SAjrWJ027038@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26544

Modified Files:
	libXv.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXv.spec	9 Jun 2006 12:21:43 -0000	1.14
+++ libXv.spec	28 Jun 2006 10:45:51 -0000	1.15
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:46:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:46:11 -0400
Subject: rpms/libXvMC/devel libXvMC.spec,1.15,1.16
Message-ID: <200606281046.k5SAkBFS029864@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28984

Modified Files:
	libXvMC.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXvMC.spec	9 Jun 2006 12:23:27 -0000	1.15
+++ libXvMC.spec	28 Jun 2006 10:46:09 -0000	1.16
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:46:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:46:24 -0400
Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.13,1.14
Message-ID: <200606281046.k5SAkOvm031327@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31029

Modified Files:
	libXxf86dga.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXxf86dga.spec	9 Jun 2006 12:25:48 -0000	1.13
+++ libXxf86dga.spec	28 Jun 2006 10:46:21 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:47:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:47:20 -0400
Subject: rpms/libXxf86vm/devel libXxf86vm.spec,1.14,1.15
Message-ID: <200606281047.k5SAlK4C008011@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5044

Modified Files:
	libXxf86vm.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXxf86vm.spec	9 Jun 2006 13:20:24 -0000	1.14
+++ libXxf86vm.spec	28 Jun 2006 10:47:18 -0000	1.15
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:47:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:47:21 -0400
Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.13,1.14
Message-ID: <200606281047.k5SAlL7D008018@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6971

Modified Files:
	libXxf86misc.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXxf86misc.spec	9 Jun 2006 12:53:48 -0000	1.13
+++ libXxf86misc.spec	28 Jun 2006 10:47:18 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:48:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:48:52 -0400
Subject: rpms/libfontenc/devel libfontenc.spec,1.15,1.16
Message-ID: <200606281048.k5SAmqC9008591@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8521

Modified Files:
	libfontenc.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libfontenc.spec	9 Jun 2006 13:49:39 -0000	1.15
+++ libfontenc.spec	28 Jun 2006 10:48:49 -0000	1.16
@@ -7,7 +7,8 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/release/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+
 Patch0: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:49:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:49:02 -0400
Subject: rpms/libdmx/devel libdmx.spec,1.13,1.14
Message-ID: <200606281049.k5SAn2j7008666@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8633

Modified Files:
	libdmx.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libdmx.spec	9 Jun 2006 13:27:15 -0000	1.13
+++ libdmx.spec	28 Jun 2006 10:48:59 -0000	1.14
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:50:33 -0400
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.16,1.17
Message-ID: <200606281050.k5SAoXY3009273@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9240

Modified Files:
	libxkbfile.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libxkbfile.spec	9 Jun 2006 13:43:08 -0000	1.16
+++ libxkbfile.spec	28 Jun 2006 10:50:30 -0000	1.17
@@ -7,7 +7,7 @@
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:51:32 -0400
Subject: rpms/xorg-x11-drv-acecad/devel xorg-x11-drv-acecad.spec,1.10,1.11
Message-ID: <200606281051.k5SApWgh009613@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-acecad/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9584

Modified Files:
	xorg-x11-drv-acecad.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-acecad.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-acecad/devel/xorg-x11-drv-acecad.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-acecad.spec	26 May 2006 15:29:40 -0000	1.10
+++ xorg-x11-drv-acecad.spec	28 Jun 2006 10:51:29 -0000	1.11
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:51:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:51:48 -0400
Subject: rpms/xorg-x11-drv-aiptek/devel xorg-x11-drv-aiptek.spec,1.9,1.10
Message-ID: <200606281051.k5SApmtM009730@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-aiptek/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9700

Modified Files:
	xorg-x11-drv-aiptek.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-aiptek.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-aiptek/devel/xorg-x11-drv-aiptek.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-aiptek.spec	10 Apr 2006 03:12:06 -0000	1.9
+++ xorg-x11-drv-aiptek.spec	28 Jun 2006 10:51:46 -0000	1.10
@@ -12,7 +12,8 @@
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:52:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:52:23 -0400
Subject: rpms/xorg-x11-drv-apm/devel xorg-x11-drv-apm.spec,1.11,1.12
Message-ID: <200606281052.k5SAqNkT009962@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-apm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9930

Modified Files:
	xorg-x11-drv-apm.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-apm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-apm/devel/xorg-x11-drv-apm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-apm.spec	23 May 2006 19:09:59 -0000	1.11
+++ xorg-x11-drv-apm.spec	28 Jun 2006 10:52:20 -0000	1.12
@@ -9,12 +9,13 @@
 Version: 1.1.1
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   apm.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   apm.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:52:43 -0400
Subject: rpms/xorg-x11-drv-ark/devel xorg-x11-drv-ark.spec,1.10,1.11
Message-ID: <200606281052.k5SAqh3u010099@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ark/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10072

Modified Files:
	xorg-x11-drv-ark.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-ark.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ark/devel/xorg-x11-drv-ark.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-ark.spec	23 May 2006 19:13:13 -0000	1.10
+++ xorg-x11-drv-ark.spec	28 Jun 2006 10:52:40 -0000	1.11
@@ -9,12 +9,13 @@
 Version:   0.6.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   ark.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   ark.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:53:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:53:29 -0400
Subject: rpms/xorg-x11-drv-ast/devel xorg-x11-drv-ast.spec,1.2,1.3
Message-ID: <200606281053.k5SArTnj010419@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ast/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10386

Modified Files:
	xorg-x11-drv-ast.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-ast.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ast/devel/xorg-x11-drv-ast.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-ast.spec	17 Jun 2006 08:13:46 -0000	1.2
+++ xorg-x11-drv-ast.spec	28 Jun 2006 10:53:27 -0000	1.3
@@ -16,12 +16,13 @@
 Version:   0.81.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   ast.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   ast.xinf
+
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:54:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:54:06 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.27,1.28
Message-ID: <200606281054.k5SAs6cv010671@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10640

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-ati.spec	27 Jun 2006 19:49:14 -0000	1.27
+++ xorg-x11-drv-ati.spec	28 Jun 2006 10:54:03 -0000	1.28
@@ -19,7 +19,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
 Source2:   r128.xinf
 Source3:   radeon.xinf



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:54:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:54:28 -0400
Subject: rpms/xorg-x11-drv-calcomp/devel xorg-x11-drv-calcomp.spec,1.9,1.10
Message-ID: <200606281054.k5SAsSFJ010829@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-calcomp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10796

Modified Files:
	xorg-x11-drv-calcomp.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-calcomp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-calcomp/devel/xorg-x11-drv-calcomp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-calcomp.spec	10 Apr 2006 03:13:12 -0000	1.9
+++ xorg-x11-drv-calcomp.spec	28 Jun 2006 10:54:26 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:54:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:54:50 -0400
Subject: rpms/xorg-x11-drv-chips/devel xorg-x11-drv-chips.spec,1.9,1.10
Message-ID: <200606281054.k5SAsoW1010984@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-chips/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10949

Modified Files:
	xorg-x11-drv-chips.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-chips.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-chips/devel/xorg-x11-drv-chips.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-chips.spec	23 May 2006 19:13:35 -0000	1.9
+++ xorg-x11-drv-chips.spec	28 Jun 2006 10:54:48 -0000	1.10
@@ -9,12 +9,13 @@
 Version: 1.1.1
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   chips.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   chips.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:55:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:55:08 -0400
Subject: rpms/xorg-x11-drv-cirrus/devel xorg-x11-drv-cirrus.spec,1.9,1.10
Message-ID: <200606281055.k5SAt8de011120@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-cirrus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11088

Modified Files:
	xorg-x11-drv-cirrus.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-cirrus.spec	10 Apr 2006 03:13:50 -0000	1.9
+++ xorg-x11-drv-cirrus.spec	28 Jun 2006 10:55:06 -0000	1.10
@@ -9,12 +9,13 @@
 Version:   1.1.0
 Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   cirrus.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   cirrus.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:55:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:55:24 -0400
Subject: rpms/xorg-x11-drv-citron/devel xorg-x11-drv-citron.spec,1.10,1.11
Message-ID: <200606281055.k5SAtOTW011247@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-citron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11209

Modified Files:
	xorg-x11-drv-citron.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-citron.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/xorg-x11-drv-citron.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-citron.spec	10 Apr 2006 03:14:03 -0000	1.10
+++ xorg-x11-drv-citron.spec	28 Jun 2006 10:55:22 -0000	1.11
@@ -9,11 +9,12 @@
 Version:   2.2.0
 Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:55:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:55:43 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.9,1.10
Message-ID: <200606281055.k5SAth5M011379@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-cyrix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11349

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-cyrix.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cyrix/devel/xorg-x11-drv-cyrix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-cyrix.spec	23 May 2006 19:14:07 -0000	1.9
+++ xorg-x11-drv-cyrix.spec	28 Jun 2006 10:55:41 -0000	1.10
@@ -9,12 +9,13 @@
 Version:   1.1.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   cyrix.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   cyrix.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:56:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:56:02 -0400
Subject: rpms/xorg-x11-drv-digitaledge/devel xorg-x11-drv-digitaledge.spec,
	1.9, 1.10
Message-ID: <200606281056.k5SAu29U011526@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11496

Modified Files:
	xorg-x11-drv-digitaledge.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-digitaledge.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel/xorg-x11-drv-digitaledge.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-digitaledge.spec	10 Apr 2006 03:14:41 -0000	1.9
+++ xorg-x11-drv-digitaledge.spec	28 Jun 2006 10:56:00 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:56:18 -0400
Subject: rpms/xorg-x11-drv-dmc/devel xorg-x11-drv-dmc.spec,1.9,1.10
Message-ID: <200606281056.k5SAuIK0011644@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-dmc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11614

Modified Files:
	xorg-x11-drv-dmc.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-dmc.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dmc/devel/xorg-x11-drv-dmc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-dmc.spec	10 Apr 2006 03:14:58 -0000	1.9
+++ xorg-x11-drv-dmc.spec	28 Jun 2006 10:56:15 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:56:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:56:32 -0400
Subject: rpms/xorg-x11-drv-dummy/devel xorg-x11-drv-dummy.spec,1.10,1.11
Message-ID: <200606281056.k5SAuWE0011764@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-dummy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11728

Modified Files:
	xorg-x11-drv-dummy.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-dummy.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dummy/devel/xorg-x11-drv-dummy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-dummy.spec	23 May 2006 19:14:31 -0000	1.10
+++ xorg-x11-drv-dummy.spec	28 Jun 2006 10:56:30 -0000	1.11
@@ -9,11 +9,12 @@
 Version:   0.2.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:56:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:56:51 -0400
Subject: rpms/xorg-x11-drv-dynapro/devel xorg-x11-drv-dynapro.spec,1.9,1.10
Message-ID: <200606281056.k5SAupnV011898@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-dynapro/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11862

Modified Files:
	xorg-x11-drv-dynapro.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-dynapro.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dynapro/devel/xorg-x11-drv-dynapro.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-dynapro.spec	10 Apr 2006 03:15:35 -0000	1.9
+++ xorg-x11-drv-dynapro.spec	28 Jun 2006 10:56:49 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:57:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:57:38 -0400
Subject: rpms/xorg-x11-drv-elo2300/devel xorg-x11-drv-elo2300.spec,1.9,1.10
Message-ID: <200606281057.k5SAvcw5012198@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-elo2300/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12167

Modified Files:
	xorg-x11-drv-elo2300.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-elo2300.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elo2300/devel/xorg-x11-drv-elo2300.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-elo2300.spec	10 Apr 2006 03:15:51 -0000	1.9
+++ xorg-x11-drv-elo2300.spec	28 Jun 2006 10:57:35 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:57:53 -0400
Subject: rpms/xorg-x11-drv-elographics/devel xorg-x11-drv-elographics.spec,
	1.9, 1.10
Message-ID: <200606281057.k5SAvrhf012320@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-elographics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12282

Modified Files:
	xorg-x11-drv-elographics.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-elographics.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elographics/devel/xorg-x11-drv-elographics.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-elographics.spec	10 Apr 2006 03:16:14 -0000	1.9
+++ xorg-x11-drv-elographics.spec	28 Jun 2006 10:57:50 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:58:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:58:11 -0400
Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.13,1.14
Message-ID: <200606281058.k5SAwBQq012450@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12418

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-evdev.spec	13 Jun 2006 15:14:42 -0000	1.13
+++ xorg-x11-drv-evdev.spec	28 Jun 2006 10:58:08 -0000	1.14
@@ -9,11 +9,12 @@
 Version: 1.1.2
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:59:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:59:13 -0400
Subject: rpms/xorg-x11-drv-fbdev/devel xorg-x11-drv-fbdev.spec,1.11,1.12
Message-ID: <200606281059.k5SAxDXG012852@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-fbdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12824

Modified Files:
	xorg-x11-drv-fbdev.spec 
Log Message:
consistency ...


Index: xorg-x11-drv-fbdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/xorg-x11-drv-fbdev.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-fbdev.spec	30 May 2006 17:57:32 -0000	1.11
+++ xorg-x11-drv-fbdev.spec	28 Jun 2006 10:59:10 -0000	1.12
@@ -9,14 +9,15 @@
 Version:   0.3.0
 Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
-# TODO: move me upstream
+# FIXME: move me upstream
 Patch0:	    fbdev-0.2.0-debug.patch
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 10:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 06:59:45 -0400
Subject: rpms/xorg-x11-drv-fpit/devel xorg-x11-drv-fpit.spec,1.9,1.10
Message-ID: <200606281059.k5SAxjQM013067@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-fpit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13035

Modified Files:
	xorg-x11-drv-fpit.spec 
Log Message:
consistency ...


Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fpit/devel/xorg-x11-drv-fpit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-fpit.spec	10 Apr 2006 03:17:43 -0000	1.9
+++ xorg-x11-drv-fpit.spec	28 Jun 2006 10:59:42 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:01:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:01:07 -0400
Subject: rpms/xorg-x11-drv-glint/devel xorg-x11-drv-glint.spec,1.12,1.13
Message-ID: <200606281101.k5SB173J013312@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-glint/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13280

Modified Files:
	xorg-x11-drv-glint.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-glint.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-glint/devel/xorg-x11-drv-glint.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-glint.spec	26 May 2006 17:16:56 -0000	1.12
+++ xorg-x11-drv-glint.spec	28 Jun 2006 11:00:56 -0000	1.13
@@ -4,7 +4,7 @@
 
 %define cvsdate xxxxxxx
 
-# NOTE: DRI support for glint is more or less nonfunctional and unlikely to
+# FIXME: DRI support for glint is more or less nonfunctional and unlikely to
 # ever be fixed.
 %define with_dri        1
 
@@ -13,12 +13,13 @@
 Version:   1.1.1
 Release:   4
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   glint.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   glint.xinf
+
 ExclusiveArch: %{ix86} alpha
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:01:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:01:22 -0400
Subject: rpms/xorg-x11-drv-hyperpen/devel xorg-x11-drv-hyperpen.spec, 1.9,
	1.10
Message-ID: <200606281101.k5SB1M18013347@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13288

Modified Files:
	xorg-x11-drv-hyperpen.spec 
Log Message:
consistency ...


Index: xorg-x11-drv-hyperpen.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel/xorg-x11-drv-hyperpen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-hyperpen.spec	10 Apr 2006 03:18:16 -0000	1.9
+++ xorg-x11-drv-hyperpen.spec	28 Jun 2006 11:01:06 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:02:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:02:50 -0400
Subject: rpms/xorg-x11-drv-i128/devel xorg-x11-drv-i128.spec,1.9,1.10
Message-ID: <200606281102.k5SB2oDr013506@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i128/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13492

Modified Files:
	xorg-x11-drv-i128.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-i128.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/xorg-x11-drv-i128.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-i128.spec	23 May 2006 19:14:52 -0000	1.9
+++ xorg-x11-drv-i128.spec	28 Jun 2006 11:02:48 -0000	1.10
@@ -9,12 +9,13 @@
 Version:   1.2.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   i128.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   i128.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:03:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:03:12 -0400
Subject: rpms/xorg-x11-drv-i740/devel xorg-x11-drv-i740.spec,1.10,1.11
Message-ID: <200606281103.k5SB3C8I013565@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i740/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13547

Modified Files:
	xorg-x11-drv-i740.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-i740.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i740/devel/xorg-x11-drv-i740.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-i740.spec	23 May 2006 19:15:03 -0000	1.10
+++ xorg-x11-drv-i740.spec	28 Jun 2006 11:03:09 -0000	1.11
@@ -9,12 +9,13 @@
 Version:   1.1.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   i740.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   i740.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:03:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:03:59 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.17,1.18
Message-ID: <200606281103.k5SB3xNn013700@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13671

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-i810.spec	23 Jun 2006 07:35:41 -0000	1.17
+++ xorg-x11-drv-i810.spec	28 Jun 2006 11:03:56 -0000	1.18
@@ -19,7 +19,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
 
 ExclusiveArch: %{ix86} x86_64 ia64



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:04:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:04:12 -0400
Subject: rpms/xorg-x11-drv-jamstudio/devel xorg-x11-drv-jamstudio.spec, 1.9,
	1.10
Message-ID: <200606281104.k5SB4Csh013742@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13729

Modified Files:
	xorg-x11-drv-jamstudio.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-jamstudio.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel/xorg-x11-drv-jamstudio.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-jamstudio.spec	10 Apr 2006 03:19:27 -0000	1.9
+++ xorg-x11-drv-jamstudio.spec	28 Jun 2006 11:04:10 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:04:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:04:22 -0400
Subject: rpms/xorg-x11-drv-joystick/devel xorg-x11-drv-joystick.spec, 1.9,
	1.10
Message-ID: <200606281104.k5SB4Mng013776@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13757

Modified Files:
	xorg-x11-drv-joystick.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-joystick.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-joystick/devel/xorg-x11-drv-joystick.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-joystick.spec	10 Apr 2006 03:19:40 -0000	1.9
+++ xorg-x11-drv-joystick.spec	28 Jun 2006 11:04:20 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:04:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:04:52 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel xorg-x11-drv-keyboard.spec, 1.11,
	1.12
Message-ID: <200606281104.k5SB4qX3013867@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13847

Modified Files:
	xorg-x11-drv-keyboard.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-keyboard.spec	13 Jun 2006 15:16:57 -0000	1.11
+++ xorg-x11-drv-keyboard.spec	28 Jun 2006 11:04:48 -0000	1.12
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:05:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:05:16 -0400
Subject: rpms/xorg-x11-drv-magellan/devel xorg-x11-drv-magellan.spec, 1.9,
	1.10
Message-ID: <200606281105.k5SB5E0E013922@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-magellan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13875

Modified Files:
	xorg-x11-drv-magellan.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-magellan.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magellan/devel/xorg-x11-drv-magellan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-magellan.spec	10 Apr 2006 03:20:26 -0000	1.9
+++ xorg-x11-drv-magellan.spec	28 Jun 2006 11:05:12 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:06:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:06:19 -0400
Subject: rpms/xorg-x11-drv-magictouch/devel xorg-x11-drv-magictouch.spec, 1.8,
	1.9
Message-ID: <200606281106.k5SB6JIM014121@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-magictouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14096

Modified Files:
	xorg-x11-drv-magictouch.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-magictouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magictouch/devel/xorg-x11-drv-magictouch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-magictouch.spec	11 Feb 2006 06:19:30 -0000	1.8
+++ xorg-x11-drv-magictouch.spec	28 Jun 2006 11:06:04 -0000	1.9
@@ -9,11 +9,12 @@
 Version: 1.0.0.5
 Release: 1.2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual//driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:07:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:07:08 -0400
Subject: rpms/xorg-x11-drv-mga/devel xorg-x11-drv-mga.spec,1.11,1.12
Message-ID: <200606281107.k5SB78Yu014279@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14239

Modified Files:
	xorg-x11-drv-mga.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/xorg-x11-drv-mga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-mga.spec	26 May 2006 16:52:30 -0000	1.11
+++ xorg-x11-drv-mga.spec	28 Jun 2006 11:07:06 -0000	1.12
@@ -15,12 +15,13 @@
 Version:   1.4.1
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   mga.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   mga.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:07:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:07:21 -0400
Subject: rpms/xorg-x11-drv-microtouch/devel xorg-x11-drv-microtouch.spec, 1.9,
	1.10
Message-ID: <200606281107.k5SB7LpO014325@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-microtouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14311

Modified Files:
	xorg-x11-drv-microtouch.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-microtouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/xorg-x11-drv-microtouch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-microtouch.spec	10 Apr 2006 03:22:17 -0000	1.9
+++ xorg-x11-drv-microtouch.spec	28 Jun 2006 11:07:19 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:08:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:08:03 -0400
Subject: rpms/xorg-x11-drv-mutouch/devel xorg-x11-drv-mutouch.spec,1.9,1.10
Message-ID: <200606281108.k5SB83lW014459@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mutouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14415

Modified Files:
	xorg-x11-drv-mutouch.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-mutouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/xorg-x11-drv-mutouch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-mutouch.spec	10 Apr 2006 03:22:47 -0000	1.9
+++ xorg-x11-drv-mutouch.spec	28 Jun 2006 11:08:00 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:08:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:08:02 -0400
Subject: rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.14,1.15
Message-ID: <200606281108.k5SB82d8014448@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14413

Modified Files:
	xorg-x11-drv-mouse.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-mouse.spec	15 Jun 2006 22:24:24 -0000	1.14
+++ xorg-x11-drv-mouse.spec	28 Jun 2006 11:08:00 -0000	1.15
@@ -9,11 +9,12 @@
 Version:   1.1.1
 Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:08:47 -0400
Subject: rpms/xorg-x11-drv-neomagic/devel xorg-x11-drv-neomagic.spec, 1.9,
	1.10
Message-ID: <200606281108.k5SB8lOR014567@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-neomagic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14534

Modified Files:
	xorg-x11-drv-neomagic.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-neomagic.spec	23 May 2006 19:15:45 -0000	1.9
+++ xorg-x11-drv-neomagic.spec	28 Jun 2006 11:08:44 -0000	1.10
@@ -9,12 +9,13 @@
 Version:   1.1.1
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   neomagic.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   neomagic.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:11:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:11:20 -0400
Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.10,1.11
Message-ID: <200606281111.k5SBBKW1015160@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15080

Modified Files:
	xorg-x11-drv-nsc.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-nsc.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-nsc.spec	23 May 2006 19:16:20 -0000	1.10
+++ xorg-x11-drv-nsc.spec	28 Jun 2006 11:11:18 -0000	1.11
@@ -9,12 +9,13 @@
 Version:   2.8.1
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   nsc.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   nsc.xinf
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:11:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:11:42 -0400
Subject: rpms/filesystem/devel filesystem.spec,1.27,1.28
Message-ID: <200606281111.k5SBBgQR015330@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15261

Modified Files:
	filesystem.spec 
Log Message:
- Fixed games location according to FHS 2.1 (#165425)
- Added {_libdir}/sse2 to owned files (#192853)
- Added /dev to owned files (#192860)
- Added {_datadir}/icons to owned files (#195911)
- Dropped obsolete /etc/X11/starthere (#191163)



Index: filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- filesystem.spec	11 Feb 2006 02:43:40 -0000	1.27
+++ filesystem.spec	28 Jun 2006 11:11:40 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
 Version: 2.3.7
-Release: 1.2.1
+Release: 2
 License: Public Domain
 Group: System Environment/Base
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -22,10 +22,10 @@
 cd %{buildroot}
 
 mkdir -p mnt/{floppy,cdrom} \
-	bin boot \
-	etc/{X11/{applnk,sysconfig,serverconfig,starthere},opt,xinetd.d,skel,sysconfig,pki} \
+	bin boot dev \
+	etc/{X11/{applnk,sysconfig,serverconfig},opt,xinetd.d,skel,sysconfig,pki} \
 	home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
-        usr/{bin,etc,games,include,%{_lib}/{games,gcc-lib,tls,X11},lib/{games,gcc-lib,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{man/man{1,2,3,4,5,6,7,8,9,n},info},libexec,include,},sbin,share/{applications,doc,dict,games,info,man/man{1,2,3,4,5,6,7,8,9,n},doc,misc,empty,pixmaps,xsessions},src} \
+        usr/{bin,etc,games,include,%{_lib}/{games,gcc-lib,sse2,tls,X11},lib/{games,gcc-lib,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{man/man{1,2,3,4,5,6,7,8,9,n},info},libexec,include,},sbin,share/{applications,doc,dict,games,info,icons,man/man{1,2,3,4,5,6,7,8,9,n},doc,misc,empty,pixmaps,xsessions},src} \
         var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
 ln -snf ../var/tmp usr/tmp
@@ -39,6 +39,7 @@
 %dir /
 /bin
 /boot
+/dev
 /etc
 /home
 /lib
@@ -74,6 +75,7 @@
 /usr/src
 %dir /var
 /var/db
+/var/games
 /var/lib
 /var/local
 %dir %attr(0775,root,lock) /var/lock
@@ -93,6 +95,13 @@
 /var/yp
 
 %changelog
+* Wed Jun 28 2006 Phil Knirsch <pknirsch at redhat.com> - 2.3.7-2
+- Fixed games location according to FHS 2.1 (#165425)
+- Added {_libdir}/sse2 to owned files (#192853)
+- Added /dev to owned files (#192860)
+- Added {_datadir}/icons to owned files (#195911)
+- Dropped obsolete /etc/X11/starthere (#191163)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.7-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:11:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:11:48 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.19,1.20
Message-ID: <200606281111.k5SBBm9r015384@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15357

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-nv.spec	26 Jun 2006 19:39:52 -0000	1.19
+++ xorg-x11-drv-nv.spec	28 Jun 2006 11:11:45 -0000	1.20
@@ -9,12 +9,13 @@
 Version:   1.1.2
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   nv.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   nv.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:12:04 -0400
Subject: rpms/xorg-x11-drv-palmax/devel xorg-x11-drv-palmax.spec,1.9,1.10
Message-ID: <200606281112.k5SBC4AM015542@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-palmax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15509

Modified Files:
	xorg-x11-drv-palmax.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-palmax.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-palmax/devel/xorg-x11-drv-palmax.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-palmax.spec	10 Apr 2006 03:23:36 -0000	1.9
+++ xorg-x11-drv-palmax.spec	28 Jun 2006 11:12:01 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:12:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:12:17 -0400
Subject: rpms/xorg-x11-drv-penmount/devel xorg-x11-drv-penmount.spec, 1.10,
	1.11
Message-ID: <200606281112.k5SBCHMY015638@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-penmount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15604

Modified Files:
	xorg-x11-drv-penmount.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-penmount.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/xorg-x11-drv-penmount.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-penmount.spec	17 Jun 2006 07:38:55 -0000	1.10
+++ xorg-x11-drv-penmount.spec	28 Jun 2006 11:12:15 -0000	1.11
@@ -9,11 +9,12 @@
 Version:   1.1.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:13:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:13:05 -0400
Subject: rpms/xorg-x11-drv-s3/devel xorg-x11-drv-s3.spec,1.12,1.13
Message-ID: <200606281113.k5SBD5xv015977@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-s3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15940

Modified Files:
	xorg-x11-drv-s3.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-s3.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/xorg-x11-drv-s3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-s3.spec	23 May 2006 19:17:25 -0000	1.12
+++ xorg-x11-drv-s3.spec	28 Jun 2006 11:13:03 -0000	1.13
@@ -9,12 +9,13 @@
 Version:   0.4.1
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   s3.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   s3.xinf
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:14:07 -0400
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.10,
	1.11
Message-ID: <200606281114.k5SBE7bv016389@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-rendition/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16357

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-rendition.spec	27 Jun 2006 22:31:50 -0000	1.10
+++ xorg-x11-drv-rendition.spec	28 Jun 2006 11:14:05 -0000	1.11
@@ -9,12 +9,14 @@
 Version:   4.1.0
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   rendition.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   rendition.xinf
+
+ExclusiveArch: %{ix86}
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
@@ -63,10 +65,10 @@
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-2
 - Rebuild for 7.1 ABI fix.
 
-* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-1
+* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-1
 - Update to 4.1.0 from 7.1RC1.
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.1.3-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 4.0.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 4.0.1.3-1
@@ -80,18 +82,18 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 4.0.1-1
 - Updated xorg-x11-drv-rendition to version 4.0.1 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 4.0.0.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 4.0.0.1-1
 - Updated xorg-x11-drv-rendition to version 4.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
 - Added v10002d.uc, v20002d.uc, vgafont-std.data, vgafont-vrx.data,
   vgapalette.data to file manifest, although these really belong as C files
   in the source, that end up built into the driver.
 
-* Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 4.0.0-1
+* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 4.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
 - Limit "ExclusiveArch" to x86
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 4.0.0-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 4.0.0-0
 - Initial spec file for rendition video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:14:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:14:47 -0400
Subject: rpms/xorg-x11-drv-s3virge/devel xorg-x11-drv-s3virge.spec, 1.10,
	1.11
Message-ID: <200606281114.k5SBElvO016667@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-s3virge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16638

Modified Files:
	xorg-x11-drv-s3virge.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-s3virge.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3virge/devel/xorg-x11-drv-s3virge.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-s3virge.spec	23 May 2006 19:17:37 -0000	1.10
+++ xorg-x11-drv-s3virge.spec	28 Jun 2006 11:14:45 -0000	1.11
@@ -9,12 +9,13 @@
 Version:   1.9.1
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   s3virge.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   s3virge.xinf
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:16:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:16:12 -0400
Subject: rpms/xorg-x11-drv-savage/devel xorg-x11-drv-savage.spec,1.12,1.13
Message-ID: <200606281116.k5SBGCYc016939@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16911

Modified Files:
	xorg-x11-drv-savage.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/xorg-x11-drv-savage.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-savage.spec	26 May 2006 16:46:43 -0000	1.12
+++ xorg-x11-drv-savage.spec	28 Jun 2006 11:16:09 -0000	1.13
@@ -15,12 +15,13 @@
 Version:   2.1.1
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   savage.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   savage.xinf
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
@@ -39,7 +40,13 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static \
+%if %{with_dri}
+           --enable-dri
+%else
+           --disable-dri
+%endif
+
 make
 
 %install



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:16:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:16:25 -0400
Subject: rpms/xorg-x11-drv-siliconmotion/devel
	xorg-x11-drv-siliconmotion.spec, 1.9, 1.10
Message-ID: <200606281116.k5SBGPFB018764@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18194

Modified Files:
	xorg-x11-drv-siliconmotion.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-siliconmotion.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel/xorg-x11-drv-siliconmotion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-siliconmotion.spec	23 May 2006 19:17:49 -0000	1.9
+++ xorg-x11-drv-siliconmotion.spec	28 Jun 2006 11:16:23 -0000	1.10
@@ -9,12 +9,13 @@
 Version: 1.4.1
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   siliconmotion.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   siliconmotion.xinf
+
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:16:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:16:44 -0400
Subject: rpms/xorg-x11-drv-sis/devel xorg-x11-drv-sis.spec,1.12,1.13
Message-ID: <200606281116.k5SBGiZU021641@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20469

Modified Files:
	xorg-x11-drv-sis.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-sis.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/xorg-x11-drv-sis.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-sis.spec	26 May 2006 16:39:44 -0000	1.12
+++ xorg-x11-drv-sis.spec	28 Jun 2006 11:16:41 -0000	1.13
@@ -11,12 +11,13 @@
 Version:   0.9.1
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   sis.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   sis.xinf
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:17:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:17:01 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.10,1.11
Message-ID: <200606281117.k5SBH1DQ023856@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-sisusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23580

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-sisusb.spec	23 May 2006 19:18:01 -0000	1.10
+++ xorg-x11-drv-sisusb.spec	28 Jun 2006 11:16:58 -0000	1.11
@@ -13,12 +13,12 @@
 Version: 0.8.1
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 # FIXME:  If you can see this comment, then the ExclusiveArch entry below
 # is set to the spec file template default.  Please examine the monolithic
 # xorg-x11 package for each architecture for this driver, to determine which



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:17:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:17:15 -0400
Subject: rpms/xorg-x11-drv-spaceorb/devel xorg-x11-drv-spaceorb.spec, 1.9,
	1.10
Message-ID: <200606281117.k5SBHFtg025401@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25033

Modified Files:
	xorg-x11-drv-spaceorb.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-spaceorb.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel/xorg-x11-drv-spaceorb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-spaceorb.spec	10 Apr 2006 03:25:21 -0000	1.9
+++ xorg-x11-drv-spaceorb.spec	28 Jun 2006 11:17:12 -0000	1.10
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:17:29 -0400
Subject: rpms/xorg-x11-drv-summa/devel xorg-x11-drv-summa.spec,1.9,1.10
Message-ID: <200606281117.k5SBHT3P026976@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-summa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26748

Modified Files:
	xorg-x11-drv-summa.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-summa.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-summa/devel/xorg-x11-drv-summa.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-summa.spec	10 Apr 2006 03:25:33 -0000	1.9
+++ xorg-x11-drv-summa.spec	28 Jun 2006 11:17:26 -0000	1.10
@@ -9,11 +9,13 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:17:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:17:45 -0400
Subject: rpms/xorg-x11-drv-tdfx/devel xorg-x11-drv-tdfx.spec,1.12,1.13
Message-ID: <200606281117.k5SBHjwV028785@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-tdfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28367

Modified Files:
	xorg-x11-drv-tdfx.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-tdfx.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tdfx/devel/xorg-x11-drv-tdfx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-tdfx.spec	26 May 2006 16:32:57 -0000	1.12
+++ xorg-x11-drv-tdfx.spec	28 Jun 2006 11:17:42 -0000	1.13
@@ -9,12 +9,13 @@
 Version:   1.2.1
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   tdfx.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   tdfx.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:18:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:18:01 -0400
Subject: rpms/xorg-x11-drv-trident/devel xorg-x11-drv-trident.spec, 1.10,
	1.11
Message-ID: <200606281118.k5SBI1YL031038@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30522

Modified Files:
	xorg-x11-drv-trident.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-trident.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-trident.spec	23 May 2006 19:18:16 -0000	1.10
+++ xorg-x11-drv-trident.spec	28 Jun 2006 11:17:58 -0000	1.11
@@ -9,12 +9,13 @@
 Version:   1.2.1
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   trident.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   trident.xinf
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:18:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:18:14 -0400
Subject: rpms/xorg-x11-drv-tseng/devel xorg-x11-drv-tseng.spec,1.10,1.11
Message-ID: <200606281118.k5SBIEh9032324@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-tseng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32299

Modified Files:
	xorg-x11-drv-tseng.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-tseng.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tseng/devel/xorg-x11-drv-tseng.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-tseng.spec	25 May 2006 17:24:48 -0000	1.10
+++ xorg-x11-drv-tseng.spec	28 Jun 2006 11:18:12 -0000	1.11
@@ -9,12 +9,13 @@
 Version:   1.1.0
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   tseng.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   tseng.xinf
+
 ExclusiveArch: %{ix86} alpha
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:18:34 -0400
Subject: rpms/xorg-x11-drv-ur98/devel xorg-x11-drv-ur98.spec,1.8,1.9
Message-ID: <200606281118.k5SBIYag032477@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ur98/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32447

Modified Files:
	xorg-x11-drv-ur98.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-ur98.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ur98/devel/xorg-x11-drv-ur98.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-ur98.spec	10 Apr 2006 03:26:44 -0000	1.8
+++ xorg-x11-drv-ur98.spec	28 Jun 2006 11:18:32 -0000	1.9
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:18:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:18:51 -0400
Subject: rpms/xorg-x11-drv-v4l/devel xorg-x11-drv-v4l.spec,1.9,1.10
Message-ID: <200606281118.k5SBIpA0032606@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-v4l/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32571

Modified Files:
	xorg-x11-drv-v4l.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-v4l.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-v4l/devel/xorg-x11-drv-v4l.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-v4l.spec	23 May 2006 19:18:31 -0000	1.9
+++ xorg-x11-drv-v4l.spec	28 Jun 2006 11:18:48 -0000	1.10
@@ -9,11 +9,12 @@
 Version:   0.1.1
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:20:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:20:32 -0400
Subject: rpms/xorg-x11-drv-vga/devel vga.xinf, 1.1, 1.2 xorg-x11-drv-vga.spec,
	1.11, 1.12
Message-ID: <200606281120.k5SBKWbG000827@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv713

Modified Files:
	vga.xinf xorg-x11-drv-vga.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: vga.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/vga.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vga.xinf	24 Feb 2006 18:46:05 -0000	1.1
+++ vga.xinf	28 Jun 2006 11:20:29 -0000	1.2
@@ -1,3 +1,5 @@
+# FIXME: Most of these could/should probably be using either a native driver,
+# or the 'vesa' driver if possible.
 alias pcivideo:v0000100Ed00009000sv*sd*bc*sc*i* vga
 alias pcivideo:v0000100Ed00009001sv*sd*bc*sc*i* vga
 alias pcivideo:v0000100Ed00009002sv*sd*bc*sc*i* vga


Index: xorg-x11-drv-vga.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/xorg-x11-drv-vga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-vga.spec	23 May 2006 19:18:38 -0000	1.11
+++ xorg-x11-drv-vga.spec	28 Jun 2006 11:20:29 -0000	1.12
@@ -9,12 +9,13 @@
 Version:   4.1.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   vga.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   vga.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:20:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:20:47 -0400
Subject: rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.15,1.16
Message-ID: <200606281120.k5SBKlA8000939@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-via/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv811

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-via.spec	19 Jun 2006 19:23:28 -0000	1.15
+++ xorg-x11-drv-via.spec	28 Jun 2006 11:20:44 -0000	1.16
@@ -21,7 +21,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   via.xinf
 
 ExclusiveArch: %{ix86} x86_64



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:20:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:20:54 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel xorg-x11-drv-vmmouse.spec,1.7,1.8
Message-ID: <200606281120.k5SBKsVx001002@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv972

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-vmmouse.spec	21 Jun 2006 19:52:14 -0000	1.7
+++ xorg-x11-drv-vmmouse.spec	28 Jun 2006 11:20:51 -0000	1.8
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 # NOTE: We build the "vmware" driver on ia64, however the vmmouse driver
 # fails during attempts to build it on ia64 saying it is for x86 only.



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:21:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:21:19 -0400
Subject: rpms/xorg-x11-drv-vmware/devel xorg-x11-drv-vmware.spec,1.9,1.10
Message-ID: <200606281121.k5SBLJ7a001168@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vmware/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1096

Modified Files:
	xorg-x11-drv-vmware.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-vmware.spec	23 May 2006 19:18:57 -0000	1.9
+++ xorg-x11-drv-vmware.spec	28 Jun 2006 11:21:17 -0000	1.10
@@ -9,12 +9,13 @@
 Version:   10.13.0
 Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   vmware.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   vmware.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:21:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:21:35 -0400
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.11,1.12
Message-ID: <200606281121.k5SBLZAC001288@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1257

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-void.spec	13 Jun 2006 15:16:07 -0000	1.11
+++ xorg-x11-drv-void.spec	28 Jun 2006 11:21:33 -0000	1.12
@@ -9,11 +9,12 @@
 Version: 1.1.0
 Release: 2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:21:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:21:52 -0400
Subject: rpms/xorg-x11-drv-voodoo/devel xorg-x11-drv-voodoo.spec,1.11,1.12
Message-ID: <200606281121.k5SBLq0p001415@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-voodoo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1387

Modified Files:
	xorg-x11-drv-voodoo.spec 
Log Message:
Use ftp://ftp.x.org URL for source lines as it is shorter


Index: xorg-x11-drv-voodoo.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-voodoo.spec	26 May 2006 18:04:34 -0000	1.11
+++ xorg-x11-drv-voodoo.spec	28 Jun 2006 11:21:49 -0000	1.12
@@ -9,12 +9,13 @@
 Version:   1.1.0
 Release:   3
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   voodoo.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   voodoo.xinf
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:27:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:27:37 -0400
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.11,
	1.12
Message-ID: <200606281127.k5SBRbx2003542@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-rendition/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3511

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
put x86_64 back, although I'm not sure if the driver works on x86_64 or not


Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-rendition.spec	28 Jun 2006 11:14:05 -0000	1.11
+++ xorg-x11-drv-rendition.spec	28 Jun 2006 11:27:35 -0000	1.12
@@ -16,7 +16,6 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   rendition.xinf
 
-ExclusiveArch: %{ix86}
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:28:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:28:13 -0400
Subject: rpms/xorg-x11-drv-s3/devel xorg-x11-drv-s3.spec,1.13,1.14
Message-ID: <200606281128.k5SBSDLO003778@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-s3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3743

Modified Files:
	xorg-x11-drv-s3.spec 
Log Message:
fix typo


Index: xorg-x11-drv-s3.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/xorg-x11-drv-s3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-s3.spec	28 Jun 2006 11:13:03 -0000	1.13
+++ xorg-x11-drv-s3.spec	28 Jun 2006 11:28:10 -0000	1.14
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/releases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3.xinf
 
 ExclusiveArch: %{ix86} x86_64 ppc



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:28:45 -0400
Subject: rpms/xorg-x11-drv-penmount/devel xorg-x11-drv-penmount.spec, 1.11,
	1.12
Message-ID: <200606281128.k5SBSj8t003989@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-penmount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3960

Modified Files:
	xorg-x11-drv-penmount.spec 
Log Message:
fix typo


Index: xorg-x11-drv-penmount.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/xorg-x11-drv-penmount.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-penmount.spec	28 Jun 2006 11:12:15 -0000	1.11
+++ xorg-x11-drv-penmount.spec	28 Jun 2006 11:28:43 -0000	1.12
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:29:15 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.20,1.21
Message-ID: <200606281129.k5SBTFst004188@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4138

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
fix typo


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-nv.spec	28 Jun 2006 11:11:45 -0000	1.20
+++ xorg-x11-drv-nv.spec	28 Jun 2006 11:29:12 -0000	1.21
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:29:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:29:47 -0400
Subject: rpms/xorg-x11-drv-mutouch/devel xorg-x11-drv-mutouch.spec, 1.10,
	1.11
Message-ID: <200606281129.k5SBTlFP004418@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mutouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4314

Modified Files:
	xorg-x11-drv-mutouch.spec 
Log Message:
fix typo


Index: xorg-x11-drv-mutouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/xorg-x11-drv-mutouch.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-mutouch.spec	28 Jun 2006 11:08:00 -0000	1.10
+++ xorg-x11-drv-mutouch.spec	28 Jun 2006 11:29:45 -0000	1.11
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:29:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:29:59 -0400
Subject: rpms/xorg-x11-drv-microtouch/devel xorg-x11-drv-microtouch.spec,
	1.10, 1.11
Message-ID: <200606281129.k5SBTxrc004508@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-microtouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4467

Modified Files:
	xorg-x11-drv-microtouch.spec 
Log Message:
fix typo


Index: xorg-x11-drv-microtouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/xorg-x11-drv-microtouch.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-microtouch.spec	28 Jun 2006 11:07:19 -0000	1.10
+++ xorg-x11-drv-microtouch.spec	28 Jun 2006 11:29:56 -0000	1.11
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pubreleases/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:30:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:30:46 -0400
Subject: rpms/xorg-x11-drv-magictouch/devel xorg-x11-drv-magictouch.spec, 1.9,
	1.10
Message-ID: <200606281130.k5SBUkqc004707@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-magictouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4640

Modified Files:
	xorg-x11-drv-magictouch.spec 
Log Message:
fix typo


Index: xorg-x11-drv-magictouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magictouch/devel/xorg-x11-drv-magictouch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-magictouch.spec	28 Jun 2006 11:06:04 -0000	1.9
+++ xorg-x11-drv-magictouch.spec	28 Jun 2006 11:30:35 -0000	1.10
@@ -13,7 +13,7 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual//driver/%{tarball}-%{version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:43:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:43:16 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.106,1.107
Message-ID: <200606281143.k5SBhGnd016405@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16391

Modified Files:
	xorg-x11-server.spec 
Log Message:
Testing removal of zlib-devel dep, as the previous build removed zlib dependency


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- xorg-x11-server.spec	28 Jun 2006 10:29:05 -0000	1.106
+++ xorg-x11-server.spec	28 Jun 2006 11:43:14 -0000	1.107
@@ -114,7 +114,9 @@
 BuildRequires: libXext-devel
 #
 BuildRequires: freetype-devel >= 2.1.9-1
-BuildRequires: zlib-devel
+# FIXME: Disabling zlib-devel dep as we are applying the xorg-x11-server-1.1.0-no-zlib.patch
+# patch which should remove any dependency on zlib anyway.
+#BuildRequires: zlib-devel
 
 # FIXME: libXt-devel should be wrapped in with_dmx_server - for Xdmxconfig,
 # probably should only be needed for DMX builds, but the build explodes with
@@ -644,6 +646,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com>
+- Disable build dependency on zlib-devel now that we are not uselessly linking
+  against it.
+
 * Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-24
 - Don't (uselessly) link the server against zlib.
 - Fix the 1680x1050 modes to be the CVT timings instead of GTF.



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:44:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:44:05 -0400
Subject: rpms/xorg-x11-server/devel .cvsignore,1.17,1.18
Message-ID: <200606281144.k5SBi5EE016435@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16422

Modified Files:
	.cvsignore 
Log Message:
.cvsignore 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 May 2006 17:19:45 -0000	1.17
+++ .cvsignore	28 Jun 2006 11:44:02 -0000	1.18
@@ -1,2 +1,3 @@
 *.tar.bz2
 *.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Wed Jun 28 11:53:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 07:53:07 -0400
Subject: rpms/kdebase/devel kdebase.spec, 1.192,
	1.193 kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff,
	1.1, NONE
Message-ID: <200606281153.k5SBr7RG031188@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31175

Modified Files:
	kdebase.spec 
Removed Files:
	kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff 
Log Message:
drop kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff, it's already included in upstream



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- kdebase.spec	26 Jun 2006 17:53:13 -0000	1.192
+++ kdebase.spec	28 Jun 2006 11:53:05 -0000	1.193
@@ -44,7 +44,6 @@
 Patch6: kdebase-3.1.3-konsole-double-esc.patch
 Patch7: kdebase-3.3.92-kpersonalizer.patch
 Patch8: kdebase-3.2.92-logo.patch 
-Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
 Patch12: kdebase-3.5.3-kioslave_media_dbus.patch
@@ -160,7 +159,6 @@
 %patch6 -p1 -b .konsole
 %patch7 -p1 -b .kper
 %patch8 -p1 -b .logo
-%patch9 -p1 -b .im
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
 %patch12 -p1 -b .kioslave_media_dbus


--- kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 14:36:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 10:36:26 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.20,1.21
Message-ID: <200606281436.k5SEaQgP003463@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3442

Modified Files:
	kexec-tools.spec 
Log Message:
- Buildrequire zlib-devel, previous version could handle compressed files. That feature got lost at the transition to brew/mock


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kexec-tools.spec	22 Jun 2006 18:27:44 -0000	1.20
+++ kexec-tools.spec	28 Jun 2006 14:36:12 -0000	1.21
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 19
+Release: 20
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -10,6 +10,7 @@
 Source2: kdump.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
+BuildRequires: zlib-devel
 
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
@@ -98,6 +99,9 @@
 %doc TODO
 
 %changelog
+* Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 1.101-20
+- Buildrequire zlib-devel
+
 * Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-19
 - Bumping rev number
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 14:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 10:51:00 -0400
Subject: rpms/cvs/devel cvs-1.11.22-free.patch,NONE,1.1 cvs.spec,1.45,1.46
Message-ID: <200606281451.k5SEp0jR018516@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/cvs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18488

Modified Files:
	cvs.spec 
Added Files:
	cvs-1.11.22-free.patch 
Log Message:
fix for #196848 - double free coruption
CVS  Enter Log.  Lines beginning with `CVS:' are removed automatically


cvs-1.11.22-free.patch:
 login.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cvs-1.11.22-free.patch ---
--- cvs-1.11.22/src/login.c.old	2006-06-28 13:41:14.000000000 +0200
+++ cvs-1.11.22/src/login.c	2006-06-28 13:35:40.000000000 +0200
@@ -600,7 +600,7 @@
        context, then assume they have supplied the correct, scrambled
        password. */
     if (cvs_password)
-	return cvs_password;
+	return xstrdup(cvs_password);
 
     if (getenv ("CVS_PASSWORD") != NULL)
     {


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cvs.spec	22 Jun 2006 09:20:58 -0000	1.45
+++ cvs.spec	28 Jun 2006 14:50:58 -0000	1.46
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -27,6 +27,7 @@
 Patch13: cvs-1.11.21-diff.patch
 Patch14: cvs-1.11.21-diff-kk.patch
 Patch15: cvs-1.11.21-sort.patch
+Patch16: cvs-1.11.22-free.patch
 Prereq: /sbin/install-info
 Requires: vim-minimal
 Prefix: %{_prefix}
@@ -73,6 +74,7 @@
 %patch13 -p1 -b .diff
 %patch14 -p1 -b .diff-kk
 %patch15 -p1 -b .env
+%patch16 -p1 -b .free
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -141,6 +143,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed Jun 28 2006 Maros Barabas <mbarabas at redhat.com> - 1.11.22-3
+- fix for #196848 - double free coruption
+
 * Thu Jun 22 2006 Martin Stransky <stransky at redhat.com> - 1.11.22-2
 - added LFS support (#196259)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 15:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 11:40:16 -0400
Subject: rpms/xpdf/devel xpdf.spec,1.76,1.77
Message-ID: <200606281540.k5SFeGHi021345@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21226

Modified Files:
	xpdf.spec 
Log Message:
fix #197090, BR: autoconf




Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xpdf.spec	5 May 2006 19:34:37 -0000	1.76
+++ xpdf.spec	28 Jun 2006 15:40:13 -0000	1.77
@@ -1,11 +1,7 @@
-%define desktop_file 1
-%define desktop_file_utils_version 0.2.90
-%define monolithic 1
-
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 13
+Release: 14
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -42,14 +38,13 @@
 Requires: poppler-utils >= 0.5.0-4
 Requires: xpdf-utils
 
-BuildPrereq: openmotif-devel
-BuildPrereq: freetype-devel >= 2.1.7
-BuildPrereq: fileutils
-BuildPrereq: findutils
-
-%if %{desktop_file}
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
-%endif
+BuildRequires: openmotif-devel
+BuildRequires: freetype-devel >= 2.1.7
+BuildRequires: fileutils
+BuildRequires: findutils
+BuildRequires: desktop-file-utils
+BuildRequires: autoconf
+
 Obsoletes: %{name}-chinese-simplified
 Obsoletes: %{name}-chinese-traditional
 Obsoletes: %{name}-korean
@@ -57,26 +52,6 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%package chinese-simplified
-Summary: Chinese Simplified support
-Requires: %{name} >= 1.00
-Group: Applications/Publishing
-
-%package chinese-traditional
-Summary: Chinese Traditional support
-Requires: %{name} >= 1.00
-Group: Applications/Publishing
-
-%package korean
-Summary: Korean support
-Requires: %{name} >= 1.00
-Group: Applications/Publishing
-
-%package japanese 
-Summary: Japanese support
-Requires: %{name} >= 1.00
-Group: Applications/Publishing
-
 %package utils
 Summary: Command line utilities for converting PDF files.
 Group: Applications/Text
@@ -86,34 +61,6 @@
 (PDF) files. Xpdf is a small and efficient program which uses
 standard X fonts.
 
-%description chinese-simplified
-This package provides support files needed to use the Xpdf tools with
-Chinese (Simplified) PDF files.
-
-Contents include: Adobe-GB1 character collection support, ISO-2022-CN
-encoding, and EUC-CN encoding
-
-%description chinese-traditional
-This package provides support files needed to use the Xpdf tools with
-Chinese (Traditional) PDF files.
-
-Contents include: Adobe-CNS1 character collection support and Big5
-encoding
-
-%description japanese
-This package provides support files needed to use the Xpdf tools with
-Japanese PDF files.
-
-Contents include: Adobe-Japan1 character collection support,
-ISO-2022-JP encoding, and EUC-JP encoding Shift-JIS encoding
-
-%description korean
-This package provides support files needed to use the Xpdf tools with
-Korean PDF files.
-
-Contents include: Adobe-Korea1 character collection support and
-KSX1001 encoding
-
 %description utils
 This utils package installs a number of command line tools for
 converting PDF files to a number of other formats
@@ -201,34 +148,10 @@
 %config(noreplace) %verify(not md5 size mtime) /etc/xpdfrc
 %{_datadir}/icons/xpdf.png
 %dir %{_datadir}/xpdf
-%if %{desktop_file}
 %{_datadir}/applications/*
-%else
-%attr(0644,root,root) /etc/X11/applnk/Graphics/xpdf.desktop
-%endif
-
-%if !%{monolithic}
-%files chinese-simplified
-%defattr(-,root,root)
-%endif
 %lang(zh_CN) %{_datadir}/xpdf/chinese-simplified
-
-%if !%{monolithic}
-%files chinese-traditional
-%defattr(-,root,root)
-%endif
 %lang(zh_TW) %{_datadir}/xpdf/chinese-traditional
-
-%if !%{monolithic}
-%files japanese
-%defattr(-,root,root)
-%endif
 %lang(ja) %{_datadir}/xpdf/japanese
-
-%if !%{monolithic}
-%files korean
-%defattr(-,root,root)
-%endif
 %lang(ko) %{_datadir}/xpdf/korean
 
 %files utils
@@ -237,6 +160,9 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Wed Jun 28 2006 Than Ngo <than at redhat.com> 1:3.01-14
+- fix #197090, BR: autoconf
+
 * Fri May  5 2006 Adam Jackson <ajackson at redhat.com> 1:3.01-13
 - Remove spurious libXp dependency
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 16:00:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 12:00:59 -0400
Subject: rpms/frysk/devel .cvsignore, 1.16, 1.17 frysk.spec, 1.64,
	1.65 sources, 1.16, 1.17 frysk-elf-cxx.patch, 1.2,
	NONE frysk-non-intermediate.patch, 1.1,
	NONE frysk-sscanf.patch, 1.1, NONE frysk-static-link.patch,
	1.2, NONE frysk-unistd.patch, 1.2, NONE frysk_syscall.patch,
	1.1, NONE
Message-ID: <200606281600.k5SG0xge011174@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11149

Modified Files:
	.cvsignore frysk.spec sources 
Removed Files:
	frysk-elf-cxx.patch frysk-non-intermediate.patch 
	frysk-sscanf.patch frysk-static-link.patch frysk-unistd.patch 
	frysk_syscall.patch 
Log Message:
- Refresh the tarball.
- Remove the patches, they are all upstream now.
- BuildRequires: sharutils, instead of gmime.
- Do not remove the unwanted files, they should not be installed anymore.
- Do not hide the menu entry.
- Do not call ./bootstrap.sh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	15 Jun 2006 20:48:53 -0000	1.16
+++ .cvsignore	28 Jun 2006 16:00:54 -0000	1.17
@@ -1 +1 @@
-frysk-0.0.1.2006.06.15.rh4.tar.bz2
+frysk-0.0.1.2006.06.28.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- frysk.spec	16 Jun 2006 03:40:50 -0000	1.64
+++ frysk.spec	28 Jun 2006 16:00:54 -0000	1.65
@@ -1,19 +1,12 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.15.rh4
-Release:	4
+Version:	0.0.1.2006.06.28.rh1
+Release:	0
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
-Patch0:		frysk_syscall.patch
-Patch1:		frysk-sscanf.patch
-Patch2:		frysk-elf-cxx.patch
-Patch3:		frysk-unistd.patch
-Patch4:		frysk-non-intermediate.patch
-Patch5:		frysk-static-link.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgtk-java >= 2.8.4
@@ -33,7 +26,7 @@
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
-BuildRequires:  gmime
+BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
 BuildRequires:  autoconf automake
@@ -51,12 +44,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
 
 %build 
 
@@ -74,8 +61,6 @@
 
 gcc --version
 
-./bootstrap.sh
-
 # FIXME: Warninggs should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -91,56 +76,6 @@
 rm -rf %{buildroot}
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
-# FIXME: remove the unwanted files:
-unwanted='usr/bin/addr2line
-   usr/bin/elfcmp
-   usr/bin/elflint
-   usr/bin/findtextrel
-   usr/bin/ld
-   usr/bin/nm
-   usr/bin/objdump
-   usr/bin/ranlib
-   usr/bin/readelf
-   usr/bin/size
-   usr/bin/strings
-   usr/bin/strip
-   usr/include/dwarf.h
-   usr/include/elfutils/elf-knowledge.h
-   usr/include/elfutils/libasm.h
-   usr/include/elfutils/libdw.h
-   usr/include/elfutils/libdwfl.h
-   usr/include/elfutils/libebl.h
-   usr/include/gelf.h
-   usr/include/libelf.h
-   usr/include/nlist.h
-   usr/lib{,64}/elfutils/libebl_alpha-0.120.so
-   usr/lib{,64}/elfutils/libebl_alpha.so
-   usr/lib{,64}/elfutils/libebl_arm-0.120.so
-   usr/lib{,64}/elfutils/libebl_arm.so
-   usr/lib{,64}/elfutils/libebl_i386-0.120.so
-   usr/lib{,64}/elfutils/libebl_i386.so
-   usr/lib{,64}/elfutils/libebl_ia64-0.120.so
-   usr/lib{,64}/elfutils/libebl_ia64.so
-   usr/lib{,64}/elfutils/libebl_ppc-0.120.so
-   usr/lib{,64}/elfutils/libebl_ppc.so
-   usr/lib{,64}/elfutils/libebl_ppc64-0.120.so
-   usr/lib{,64}/elfutils/libebl_ppc64.so
-   usr/lib{,64}/elfutils/libebl_s390-0.120.so
-   usr/lib{,64}/elfutils/libebl_s390.so
-   usr/lib{,64}/elfutils/libebl_sh-0.120.so
-   usr/lib{,64}/elfutils/libebl_sh.so
-   usr/lib{,64}/elfutils/libebl_sparc-0.120.so
-   usr/lib{,64}/elfutils/libebl_sparc.so
-   usr/lib{,64}/elfutils/libebl_x86_64-0.120.so
-   usr/lib{,64}/elfutils/libebl_x86_64.so
-   usr/lib{,64}/lib{asm,dw,ebl,elf}*
-'
-(cd $RPM_BUILD_ROOT && eval rm $unwanted)
-
-# For moment, keep off menu (but if someone wants to enable it they
-# can).
-echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
-
 %post
 /sbin/ldconfig
 
@@ -164,6 +99,14 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1
+- Refresh the tarball.
+- Remove the patches, they are all upstream now.
+- BuildRequires: sharutils, instead of gmime.
+- Do not remove the unwanted files, they should not be installed anymore.
+- Do not hide the menu entry.
+- Do not call ./bootstrap.sh.
+
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
 - Add the non-intermediate hack.
 - Remove more unwanted files.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	15 Jun 2006 20:48:53 -0000	1.16
+++ sources	28 Jun 2006 16:00:54 -0000	1.17
@@ -1 +1 @@
-177ecac75e299933d845f3519ad2bee3  frysk-0.0.1.2006.06.15.rh4.tar.bz2
+56ce719074fe92cb9f0bb274d448712e  frysk-0.0.1.2006.06.28.rh1.tar.bz2


--- frysk-elf-cxx.patch DELETED ---


--- frysk-non-intermediate.patch DELETED ---


--- frysk-sscanf.patch DELETED ---


--- frysk-static-link.patch DELETED ---


--- frysk-unistd.patch DELETED ---


--- frysk_syscall.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 16:06:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 12:06:35 -0400
Subject: rpms/xorg-x11-drv-magictouch/devel xorg-x11-drv-magictouch.spec,
	1.10, 1.11
Message-ID: <200606281606.k5SG6ZEb011628@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-magictouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11602

Modified Files:
	xorg-x11-drv-magictouch.spec 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-2
- Remove system owned directories from file manifest.



Index: xorg-x11-drv-magictouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magictouch/devel/xorg-x11-drv-magictouch.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-magictouch.spec	28 Jun 2006 11:30:35 -0000	1.10
+++ xorg-x11-drv-magictouch.spec	28 Jun 2006 16:06:31 -0000	1.11
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 magictouch input driver
 Name:      xorg-x11-drv-magictouch
-Version: 1.0.0.5
-Release: 1.2
+Version:   1.0.0.5
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -50,14 +50,17 @@
 %dir %{driverdir}
 %{driverdir}/magictouch_drv.so
 %dir %{_mandir}
-%dir %{_mandir}/man4
+#%dir %{_mandir}/man4x
 %{_mandir}/man4/magictouch.4*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-2
+- Remove system owned directories from file manifest.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
@@ -70,10 +73,10 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.2-1
 - Updated xorg-x11-drv-magictouch to version 1.0.0.2 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-magictouch to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
 - Initial spec file for magictouch input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Wed Jun 28 16:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 12:09:59 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.11,1.12
Message-ID: <200606281609.k5SG9xug012432@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-sisusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12401

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 0.8.1-3
- Remove system owned directories from file manifest.



Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-sisusb.spec	28 Jun 2006 11:16:58 -0000	1.11
+++ xorg-x11-drv-sisusb.spec	28 Jun 2006 16:09:57 -0000	1.12
@@ -1,17 +1,13 @@
 %define tarball xf86-video-sisusb
-# All packages should own all dirs they lead up to, for saner
-# rpm packaging, in particular if the leading dirs are not owned by
-# the "filesystem" package.
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
-# define driverdir to the appropriate type for this driver class
 %define driverdir	%{moduledir}/drivers
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
-Version: 0.8.1
-Release: 2
+Version:   0.8.1
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -19,19 +15,7 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-# FIXME:  If you can see this comment, then the ExclusiveArch entry below
-# is set to the spec file template default.  Please examine the monolithic
-# xorg-x11 package for each architecture for this driver, to determine which
-# architectures it should be built or not built on, and update the list
-# below.  When doing this, take "sparc, sparc64, alpha" also into
-# consideration if you know a given driver was built for those arches in
-# the past.  That makes it easier for the community Alphacore/AuroraLinux
-# projects to rebuild our rpm packages.  If you're not sure if a given
-# driver should be on any of those arches however, just leave it out of
-# the list, and the community can let us know which drivers they are
-# missing.  Remove this comment once the ExclusiveArch line is updated and
-# considered reliable/correct.
-ExclusiveArch: %{ix86} x86_64 ia64 ppc
+ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
@@ -65,32 +49,28 @@
 %defattr(-,root,root,-)
 %dir %{moduledir}
 %dir %{driverdir}
-# FIXME: A glob is used here in the specfile template to make it easy to
-# generate spec files automatically.  When everything is in CVS, if you're
-# updating the spec file, please change the glob to a list of explicit
-# filenames, so that rpm tracks individual files, and we know when a new
-# one gets added.  Explicitly naming files also helps avoid random
-# unexpected .so files (or others) from getting included in a shipping
-# product.  Ditto for the manpages.
-%{driverdir}/*.so
+%{driverdir}/sisusb_drv.so
 # NOTE: Uncomment when multimedia drivers are avail
 #%dir %{moduledir}/multimedia
 #%{moduledir}/multimedia/*.so
 %dir %{_mandir}
-%dir %{_mandir}/man4
+#%dir %{_mandir}/man4x
 %{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 0.8.1-3
+- Remove system owned directories from file manifest.
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.8.1-2
 - Rebuild for 7.1 ABI fix.
 
-* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.8.1-1
+* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 0.8.1-1
 - Update to 0.8.1 from 7.1RC1.
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.1.3-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 0.7.1.3-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7.1.3-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.7.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.7.1.3-1
@@ -104,9 +84,10 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 0.7.1-1
 - Updated xorg-x11-drv-sisusb to version 0.7.1 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.7.0.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 0.7.0.1-1
 - Updated xorg-x11-drv-sisusb to version 0.7.0.1 from X11R7 RC1
 - Fix *.la file removal.
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 0.7.0-0
+
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 0.7.0-0
 - Initial spec file for sisusb video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Wed Jun 28 16:11:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 12:11:34 -0400
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.12,1.13
Message-ID: <200606281611.k5SGBYCK012874@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12847

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
- Remove system owned directories from file manifest.



Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-void.spec	28 Jun 2006 11:21:33 -0000	1.12
+++ xorg-x11-drv-void.spec	28 Jun 2006 16:11:31 -0000	1.13
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
-Version: 1.1.0
-Release: 2
+Version:   1.1.0
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -50,20 +50,23 @@
 %dir %{driverdir}
 %{driverdir}/void_drv.so
 %dir %{_mandir}
-%dir %{_mandir}/man4
+#%dir %{_mandir}/man4x
 %{_mandir}/man4/void.4*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
+- Remove system owned directories from file manifest.
+
 * Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Build on ppc64
 
-* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
@@ -76,10 +79,10 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.2-1
 - Updated xorg-x11-drv-void to version 1.0.0.2 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-void to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
 - Initial spec file for void input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Wed Jun 28 17:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 13:19:33 -0400
Subject: rpms/libsilc/devel silc-toolkit-1.0.2-libs.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsilc.spec, 1.10, 1.11 sources, 1.2,
	1.3 silc-toolkit-0.9.12-libs.patch, 1.1,
	NONE silc-toolkit-0.9.12-optflags.patch, 1.1,
	NONE silc-toolkit-0.9.12-tutorial.patch, 1.1,
	NONE silc-toolkit-0.9.12-wordsize.patch, 1.1, NONE
Message-ID: <200606281719.k5SHJXCs012902@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/libsilc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12863/devel

Modified Files:
	.cvsignore libsilc.spec sources 
Added Files:
	silc-toolkit-1.0.2-libs.patch 
Removed Files:
	silc-toolkit-0.9.12-libs.patch 
	silc-toolkit-0.9.12-optflags.patch 
	silc-toolkit-0.9.12-tutorial.patch 
	silc-toolkit-0.9.12-wordsize.patch 
Log Message:
auto-import libsilc-1.0.2-1.fc6 on branch devel from libsilc-1.0.2-1.fc6.src.rpm

silc-toolkit-1.0.2-libs.patch:
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE silc-toolkit-1.0.2-libs.patch ---
--- silc-toolkit-1.0.2/lib/Makefile.in.lr	2005-12-22 10:27:53.000000000 -0500
+++ silc-toolkit-1.0.2/lib/Makefile.in	2005-12-22 10:28:58.000000000 -0500
@@ -668,10 +668,10 @@
 	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 
 libsilc.a:
-	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilc.la
+	find $(SILCLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -ldl -lpthread -o libsilc.la
 
 libsilcclient.a:
-	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
+	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)	-version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -lsilc -lpthread -o libsilcclient.la
 
 toolkit-install:
 	-mkdir -p $(docdir)/toolkit/


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 07:42:40 -0000	1.2
+++ .cvsignore	28 Jun 2006 17:19:30 -0000	1.3
@@ -1 +1 @@
-silc-toolkit-0.9.12.tar.gz
+silc-toolkit-1.0.2.tar.bz2


Index: libsilc.spec
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsilc.spec	9 Jun 2006 03:35:59 -0000	1.10
+++ libsilc.spec	28 Jun 2006 17:19:30 -0000	1.11
@@ -1,15 +1,12 @@
 Summary: SILC Client Library
 Name: libsilc
-Version: 0.9.12
-Release: 12.2.1
+Version: 1.0.2
+Release: 1.fc6
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
-Source0: silc-toolkit-%{version}.tar.gz
-Patch: silc-toolkit-0.9.12-tutorial.patch
-Patch1: silc-toolkit-0.9.12-optflags.patch
-Patch2: silc-toolkit-0.9.12-libs.patch
-Patch3: silc-toolkit-0.9.12-wordsize.patch
+Source0: silc-toolkit-%{version}.tar.bz2
+Patch0: silc-toolkit-1.0.2-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Epoch: 0
 # doc subpackage was removed because they are too big and not useful
@@ -28,13 +25,10 @@
 
 %prep
 %setup -q -n silc-toolkit-%{version}
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
 
 %build
-%configure --without-irssi --without-silcd --libdir=%{_libdir} --enable-shared \
+%configure --libdir=%{_libdir} --enable-shared \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
            --with-docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -52,23 +46,12 @@
 # remove files we don't want into the package, but are being installed to buildroot
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/silcalgs.conf $RPM_BUILD_ROOT%{_sysconfdir}/silcd.conf \
        $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_mandir}
-# remove .la and .a files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-cat << EOF > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/silc.pc
-prefix=%{_prefix}
-exec_prefix=\${prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
- 
-Name: silc
-Version: 0.9.12
-Description: SILC library.
-Libs: -L\${libdir} -lsilcclient -lsilc
-Cflags: -I\${includedir}/silc
-EOF
+
+# remove .a and .la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilc.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilc.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.la
 
 %post -p /sbin/ldconfig
 
@@ -81,9 +64,9 @@
 %files
 %defattr(0755, root, root, 0755)
 %{_libdir}/libsilc-1.0.so.2
-%{_libdir}/libsilc-1.0.so.2.1.0
-%{_libdir}/libsilcclient-1.0.so.2
-%{_libdir}/libsilcclient-1.0.so.2.1.0
+%{_libdir}/libsilc-1.0.so.2.4.1
+%{_libdir}/libsilcclient-1.0.so.1
+%{_libdir}/libsilcclient-1.0.so.1.3.2
 %dir %_libdir/silc
 %dir %_libdir/silc/modules
 %{_libdir}/silc/modules/*.so
@@ -96,25 +79,16 @@
 %{_libdir}/libsilc.so
 %{_libdir}/libsilcclient.so
 %{_libdir}/pkgconfig/silc.pc
+%{_libdir}/pkgconfig/silcclient.pc
 %dir %_includedir/silc
 %{_includedir}/silc/*.h
 
 %changelog
-* Thu Jun 08 2006 Warren Togami <wtogami at redhat.com> -  0:0.9.12-13
-- prevent multilib -devel conflict (#192712)
+* Wed Jun 28 2006 Warren Togami <wtogami at redhat.com> 1.0.2-1
 - remove .a and .la files
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.12-12.2.1
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.12-12.2
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Sat Oct 15 2005 Florian La Roche <laroche at redhat.com>
-- link against dependent libs
+* Wed Dec 21 2005 Stu Tomlinson <stu at nosnilmot.com> 1.0.2-0
+- Update to 1.0.2
 
 * Sat Apr 9  2005 Stu Tomlinson <stu at nosnilmot.com>  0.9.12-11
 - use RPM_OPT_FLAGS (#153261)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 07:42:40 -0000	1.2
+++ sources	28 Jun 2006 17:19:30 -0000	1.3
@@ -1 +1 @@
-58e42d78b76e72cbf72cb52fcb32e83c  silc-toolkit-0.9.12.tar.gz
+869ce01349444a28fbace3c1bfe745ff  silc-toolkit-1.0.2.tar.bz2


--- silc-toolkit-0.9.12-libs.patch DELETED ---


--- silc-toolkit-0.9.12-optflags.patch DELETED ---


--- silc-toolkit-0.9.12-tutorial.patch DELETED ---


--- silc-toolkit-0.9.12-wordsize.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 17:35:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 13:35:20 -0400
Subject: rpms/buildsys-macros/FC-4 buildsys-macros.spec,1.2,1.3
Message-ID: <200606281735.k5SHZKB8024607@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/buildsys-macros/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24576/FC-4

Modified Files:
	buildsys-macros.spec 
Log Message:
set right versions and values across the board


Index: buildsys-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/buildsys-macros/FC-4/buildsys-macros.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildsys-macros.spec	9 Jun 2006 00:48:33 -0000	1.2
+++ buildsys-macros.spec	28 Jun 2006 17:35:17 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		buildsys-macros
 Summary:	Macros for the Fedora Buildsystem
 # The value for version should match the version of Fedora Core.
-Version:	6
+Version:	4
 Release:	1.fc%{version}
 License:	GPL
 Group:		Development/Buildsystem
@@ -30,8 +30,8 @@
 /etc/rpm/macros.disttag
 
 %changelog
-* Thu Jun  8 2006 Dennis Gregorovic <dgregor at redhat.com> - 6-1.fc6
-- Update for Fedora Core 6
+* Thu Jun  8 2006 Dennis Gregorovic <dgregor at redhat.com> - 4-1.fc4
+- Update for Fedora Core 4
 
 * Tue May 10 2005 Tom "spot" Callaway <tcallawa at redhat.com>
 - Initial build.



From fedora-cvs-commits at redhat.com  Wed Jun 28 17:35:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 13:35:20 -0400
Subject: rpms/buildsys-macros/FC-5 buildsys-macros.spec,1.2,1.3
Message-ID: <200606281735.k5SHZKBO024615@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/buildsys-macros/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24576/FC-5

Modified Files:
	buildsys-macros.spec 
Log Message:
set right versions and values across the board


Index: buildsys-macros.spec
===================================================================
RCS file: /cvs/dist/rpms/buildsys-macros/FC-5/buildsys-macros.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildsys-macros.spec	9 Jun 2006 00:48:33 -0000	1.2
+++ buildsys-macros.spec	28 Jun 2006 17:35:18 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		buildsys-macros
 Summary:	Macros for the Fedora Buildsystem
 # The value for version should match the version of Fedora Core.
-Version:	6
+Version:	5
 Release:	1.fc%{version}
 License:	GPL
 Group:		Development/Buildsystem
@@ -30,8 +30,8 @@
 /etc/rpm/macros.disttag
 
 %changelog
-* Thu Jun  8 2006 Dennis Gregorovic <dgregor at redhat.com> - 6-1.fc6
-- Update for Fedora Core 6
+* Thu Jun  8 2006 Dennis Gregorovic <dgregor at redhat.com> - 5-1.fc5
+- Update for Fedora Core 5
 
 * Tue May 10 2005 Tom "spot" Callaway <tcallawa at redhat.com>
 - Initial build.



From fedora-cvs-commits at redhat.com  Wed Jun 28 17:51:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 13:51:47 -0400
Subject: rpms/tix/devel tix.spec,1.16,1.17
Message-ID: <200606281751.k5SHplxC021907@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21735

Modified Files:
	tix.spec 
Log Message:
Added missing BuildRequires for autoconf (#197117)



Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tix.spec	15 May 2006 16:37:42 -0000	1.16
+++ tix.spec	28 Jun 2006 17:51:44 -0000	1.17
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 9
+Release: 10
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
 Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
-BuildRequires: libX11-devel
+BuildRequires: libX11-devel, autoconf
 
 %description
 Tix, the Tk Interface eXtension, is a powerful set of user interface
@@ -126,6 +126,9 @@
 %doc docs/*
 
 %changelog
+* Wed Jun 28 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-10
+- Added missing BuildRequires for autoconf (#197117)
+
 * Mon May 15 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-9
 - BuildRequires libX11-devel
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 17:51:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 13:51:51 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.746,1.747
Message-ID: <200606281751.k5SHppoR021945@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21869

Modified Files:
	openoffice.org.spec 
Log Message:
still wrong


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.746
retrieving revision 1.747
diff -u -r1.746 -r1.747
--- openoffice.org.spec	28 Jun 2006 09:30:14 -0000	1.746
+++ openoffice.org.spec	28 Jun 2006 17:51:48 -0000	1.747
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -103,9 +103,8 @@
 Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch40: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
-Patch41: openoffice.org-2.0.3.ooo65519.printing.samba.patch
-Patch42: workspace.sixtyfour06.patch
+Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch41: workspace.sixtyfour06.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -836,9 +835,8 @@
 %patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch40 -p1 -b .ooo66018.idlc.dangerousvisibility.patch
-%patch41 -p1 -b .ooo65519.printing.samba.patch
-%patch42 -p1 -b .workspace.sixtyfour06.patch
+%patch40 -p1 -b .ooo65519.printing.samba.patch
+%patch41 -p1 -b .workspace.sixtyfour06.patch
 
 tar xzf %{SOURCE1}
 
@@ -860,6 +858,8 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+# visibility b0rked ? ooo#66018#
+unset HAVE_GCC_VISIBILITY_FEATURE
 #configure buglet
 export WITHOUT_PPDS="YES"
 export WITHOUT_AFMS="YES"
@@ -3314,9 +3314,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.2
-- add openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch to test my
-  visibility suspicions
+* Wed Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.3
+- unset HAVE_GCC_VISIBILITY_FEATURE inline symbols visibility problems
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:03:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:03:42 -0400
Subject: rpms/qt/devel designer3.desktop, NONE, 1.1
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch,
	NONE, 1.1 qt.spec, 1.116, 1.117 assistant_de.qm, 1.1,
	NONE qt-visibility.patch, 1.1, NONE qtrc, 1.3, NONE
Message-ID: <200606281803.k5SI3gmp025425@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25401

Modified Files:
	qt.spec 
Added Files:
	designer3.desktop 
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch 
Removed Files:
	assistant_de.qm qt-visibility.patch qtrc 
Log Message:
- fix #183302, IM preedit issue in kbabel



--- NEW FILE designer3.desktop ---
[Desktop Entry]
Name=Qt3 Designer
GenericName=Interface Designer
Comment=Design GUIs for Qt3 applications
Exec=designer
Icon=designer
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;

qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch:
 qtextedit.cpp |   13 -------------
 1 files changed, 13 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch ---
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit	2006-06-28 17:18:08.000000000 +0200
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp	2006-06-28 17:20:09.000000000 +0200
@@ -1906,9 +1906,6 @@
 
 void QTextEdit::removeSelectedText( int selNum )
 {
-    if(selNum != 0)
-        resetInputContext();
-
     QTextCursor c1 = doc->selectionStartCursor( selNum );
     c1.restoreState();
     QTextCursor c2 = doc->selectionEndCursor( selNum );
@@ -3171,7 +3168,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     QTextParagraph *p = doc->paragAt( para );
     if ( !p )
 	return;
@@ -3198,7 +3194,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
@@ -3240,7 +3235,6 @@
     if ( d->optimMode )
 	return;
 #endif
-    resetInputContext();
     QTextParagraph *p = doc->paragAt( para );
     if ( !p )
 	return;
@@ -3285,7 +3279,6 @@
     if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
 	return;
 
-    resetInputContext();
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
@@ -3336,7 +3329,6 @@
     if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
 	return;
 
-    resetInputContext();
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
@@ -3450,7 +3442,6 @@
 {
     if ( isReadOnly() )
 	return;
-    resetInputContext();
     normalCopy();
     removeSelectedText();
     updateMicroFocusHint();
@@ -3938,7 +3929,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     if ( !isModified() && isReadOnly() &&
 	 this->context() == context && this->text() == text )
 	return;
@@ -4112,7 +4102,6 @@
     if ( !p )
 	return;
 
-    resetInputContext();
     if ( index > p->length() - 1 )
 	index = p->length() - 1;
 
@@ -4169,7 +4158,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     if ( doc->hasSelection( selNum ) ) {
 	doc->removeSelection( selNum );
 	repaintChanged();
@@ -5072,7 +5060,6 @@
 {
     if ( dc == doc )
 	return;
-    resetInputContext();
     doc = dc;
     delete cursor;
     cursor = new QTextCursor( doc );


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- qt.spec	26 Jun 2006 14:18:41 -0000	1.116
+++ qt.spec	28 Jun 2006 18:03:38 -0000	1.117
@@ -1,101 +1,16 @@
-%define smp 1
-
-%define desktop_file 1
-%define redhat_artwork 1
-%define desktop_file_utils_version 0.2.93
-
-%define mysql4 1
-
-%define immodule 1
-
-%define ver 3.3.6
-
-%define qt_dirname qt-3.3
-%define qtdir %{_libdir}/%{qt_dirname}
-%define qt_docdir %{_docdir}/qt-devel-%{ver}
-
-# build Motif extention
-%define motif_extention 0
-
-# pkg-config
-%define pkg_config 1
-
-# install manuals
-%define installman 1
-
-# buildmysql: Build MySQL plugins
-%define buildmysql 1
-
-# buildpsql: Build Postgres plugins
-%define buildpsql 1
-
-# buildodbc: Build ODBC plugins
-%define buildodbc 1
-
-# buildmt: Build libs with threading support
-%define buildmt 1
-
-# cups support
-%define cups 1
-
-# visibility
-%define enable_hidden_visibility 0
-
-%define debug 0
-
-%define sover %{ver}
-
-%define styleplugins 0
-
-%if %{styleplugins}
-%define plugins_style -plugin-style-cde -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows -plugin-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%else
-%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%endif
-
-%if %{buildmysql}
-%define plugin_mysql -plugin-sql-mysql
-%else
-%define plugin_mysql %{nil}
-%endif
-
-%if %{mysql4}
-%define mysql_include_dir %{_includedir}/mysql
-%define mysql_lib_dir %{_libdir}/mysql
-%define mysql_buildreq mysql-devel
-%else
-%define mysql_include_dir %{_includedir}/mysql3/mysql
-%define mysql_lib_dir %{_libdir}/mysql3/mysql
-%define mysql_buildreq mysqlclient10-devel
-%endif
-
-%if %{buildpsql}
-%define plugin_psql -plugin-sql-psql
-%else
-%define plugin_psql %{nil}
-%endif
-
-%if %{buildodbc}
-%define plugin_odbc -plugin-sql-odbc
-%else
-%define plugin_odbc %{nil}
-%endif
-
-%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugins_style}
-
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
-Version: %{ver}
-Release: 8
+Version: 3.3.6
+Release: 9
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Url: http://www.troll.no
-Source: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
-Source1: qtrc
+Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
 Source2: qt.sh
 Source3: qt.csh
+Source4: designer3.desktop
 
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
@@ -108,7 +23,6 @@
 Patch14: qt-x11-free-3.3.3-gl.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
 Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
-Patch23: qt-visibility.patch
 Patch24: qt-x11-free-3.3.5-uic.patch
 Patch25: qt-x11-free-3.3.6-uic-multilib.patch
 
@@ -118,6 +32,7 @@
 Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
 Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
 Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff
+Patch55: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
@@ -128,11 +43,31 @@
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
 
-Prefix: %{qtdir}
+%define qt_dirname qt-3.3
+%define qtdir %{_libdir}/%{qt_dirname}
+%define qt_docdir %{_docdir}/qt-devel-%{version}
+
+%define smp 1
+%define immodule 1
+%define debug 0
+
+# MySQL plugins
+%define plugin_mysql -plugin-sql-mysql
+%define mysql_include_dir %{_includedir}/mysql
+%define mysql_lib_dir %{_libdir}/mysql
 
-Prereq: /sbin/ldconfig
-Prereq: fileutils
+# Postgres plugins
+%define plugin_psql -plugin-sql-psql
 
+# ODBC plugins
+%define plugin_odbc -plugin-sql-odbc
+
+%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
+%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugins_style}
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: fileutils
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
@@ -143,7 +78,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: libungif-devel
+BuildRequires: giflib-devel
 BuildRequires: perl
 BuildRequires: sed
 BuildRequires: findutils
@@ -165,28 +100,10 @@
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
-
-%if %{motif_extention}
-BuildRequires: openmotif-devel >= 2.2.2
-%endif
-
-%if %{desktop_file}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-%endif
-
-%if %{buildmysql}
-BuildRequires: %{mysql_buildreq}
-%endif
-
-%if %{buildpsql}
+BuildRequires: desktop-file-utils
+BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
-%endif
-
-%if %{buildodbc}
 BuildRequires: unixODBC-devel
-%endif
-
-BuildRequires: fontconfig-devel >= 2.0
 
 
 %package config
@@ -225,46 +142,22 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 
-%package Xt
-Summary: An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit.
-Group: System Environment/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-
-%package styles
-Summary: Extra styles for the Qt GUI toolkit.
-Group: User Interface/Desktops
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-
-%if %{buildodbc}
 %package ODBC
 Summary: ODBC drivers for Qt's SQL classes.
 Group: System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%endif
 
 
-%if %{buildmysql}
 %package MySQL
 Summary: MySQL drivers for Qt's SQL classes.
 Group: System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%endif
 
 
-%if %{buildpsql}
 %package PostgreSQL
 Summary: PostgreSQL drivers for Qt's SQL classes.
 Group: System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%endif
-
-
-%package static
-Summary: Version of the Qt GUI toolkit for static linking
-Group: Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
 
 
 %package designer
@@ -308,34 +201,16 @@
 example programs.
 
 
-%description Xt
-An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit.
-
-
-%description static
-Version of the Qt library for static linking
-
-
-%description styles
-Extra styles (themes) for the Qt GUI toolkit.
-
-
-%if %{buildodbc}
 %description ODBC
 ODBC driver for Qt's SQL classes (QSQL)
-%endif
 
 
-%if %{buildmysql}
 %description MySQL
 MySQL driver for Qt's SQL classes (QSQL)
-%endif
 
 
-%if %{buildpsql}
 %description PostgreSQL
 PostgreSQL driver for Qt's SQL classes (QSQL)
-%endif
 
 
 %description designer
@@ -356,11 +231,6 @@
 %patch14 -p1 -b .gl
 %patch19 -p1 -b .gtk
 %patch20 -p1 -b .gcc4-buildkey
-
-%if %{enable_hidden_visibility}
-%patch23 -p1 -b .hidden_visibility
-%endif
-
 %patch24 -p1 -b .uic
 %patch25 -p1 -b .uic-multilib
 
@@ -370,6 +240,7 @@
 %patch52 -p1 -b .post
 %patch53 -p1 -b .quiet
 %patch54 -p1 -b .fix-key-release-event-with-imm
+%patch55 -p1 -b .resetinputcontext
 %endif
 
 %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
@@ -408,7 +279,7 @@
 
 # set correct FLAGS
 %if ! %{debug}
-disable_warning="-DQT_NO_CHECK"
+  disable_warning="-DQT_NO_CHECK"
 %endif
 
 perl -pi -e "s|-O2|$INCLUDES %{optflags} $disable_warning|g" mkspecs/*/qmake.conf
@@ -457,12 +328,8 @@
   -qt-style-motif \
   %{plugins} \
   -stl \
-%if %{buildmt}
   -thread \
-%endif
-%if %{cups}
   -cups \
-%endif
   -sm \
   -xinerama \
   -xrender \
@@ -474,35 +341,24 @@
 make $SMP_MFLAGS src-qmake
 
 # build psql plugin
-%if %{buildpsql}
-   pushd plugins/src/sqldrivers/psql
-   qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
+pushd plugins/src/sqldrivers/psql
+qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
 popd
-%endif
 
 # build mysql plugin
-%if %{buildmysql}
-   pushd plugins/src/sqldrivers/mysql
-   qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
+pushd plugins/src/sqldrivers/mysql
+qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
 popd
-%endif
 
 # build odbc plugin
-%if %{buildodbc}
-   pushd plugins/src/sqldrivers/odbc
-   qmake -o Makefile "LIBS+=-lodbc" odbc.pro
-   popd
-%endif
+pushd plugins/src/sqldrivers/odbc
+qmake -o Makefile "LIBS+=-lodbc" odbc.pro
+popd
 
 make $SMP_MFLAGS src-moc
 make $SMP_MFLAGS sub-src
 make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
 
-# build Xt/Motif Extention
-%if %{motif_extention}
-   make -C extensions/motif/src $SMP_MFLAGS
-%endif
-
 %install
 rm -rf %{buildroot}
 
@@ -523,10 +379,8 @@
 popd
 
 # install man pages
-%if %{installman}
-  mkdir -p %{buildroot}%{_mandir}
-  cp -fR doc/man/* %{buildroot}%{_mandir}/
-%endif
+mkdir -p %{buildroot}%{_mandir}
+cp -fR doc/man/* %{buildroot}%{_mandir}/
 
 # clean up
 make -C tutorial clean
@@ -551,42 +405,8 @@
 install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
 
 # Add desktop file
-%if %{desktop_file}
-   mkdir -p %{buildroot}%{_datadir}/applications
-   cat >%{buildroot}%{_datadir}/applications/%{name}-designer.desktop <<EOF
-%else
-   mkdir -p %{buildroot}%{_datadir}/applnk/Development
-   cat >%{buildroot}%{_datadir}/applnk/Development/%{name}-designer.desktop <<EOF
-%endif
-[Desktop Entry]
-BinaryPattern=designer;
-Name=Qt Designer
-GenericName=Interface Designer
-Exec=designer
-Icon=designer
-InitialPreference=5
-MapNotify=true
-MimeType=application/x-designer
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Application;Development;X-Red-Hat-Extra;
-X-Desktop-File-Install-Version=0.3
-EOF
-
-# move it into redhat-artwork
-%if ! %{redhat_artwork}
-   # Sane default settings
-   mkdir -p %{buildroot}%{qtdir}/etc/settings
-   cat >%{buildroot}%{qtdir}/etc/settings/qtrc <<"EOF"
-[General]
-libraryPath=%{_libdir}/kde3/plugins
-style=Highcolor
-
-[KDE]
-contrast=7
-EOF
-%endif
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}-designer.desktop
 
 # Patch qmake to use qt-mt unconditionally
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
@@ -616,18 +436,13 @@
 %{qtdir}/plugins/inputmethods
 %endif
 /etc/ld.so.conf.d/*
-%if ! %{redhat_artwork}
-%{qtdir}/etc/settings/qtrc
-%endif
 %{qtdir}/lib/libqui.so.*
 %{qtdir}/lib/libqt*.so.*
 
-
 %files config
 %defattr(-,root,root,-)
 %{qtdir}/bin/qtconfig
 
-
 %files devel
 %defattr(-,root,root,-)
 %attr(0755,root,root) %config /etc/profile.d/*
@@ -656,55 +471,24 @@
 %{_libdir}/pkgconfig/*
 %{qtdir}/lib/pkgconfig
 
-
 %files devel-docs
 %defattr(-,root,root,-)
 %doc %{qt_docdir}/html
 %doc examples
 %doc tutorial
-%if %{installman}
 %{_mandir}/*/*
-%endif
-
-
-%if %{motif_extention}
-%post Xt -p /sbin/ldconfig
-%postun Xt -p /sbin/ldconfig
-
-%files Xt
-%defattr(-,root,root,-)
-%{qtdir}/lib/libqmotif.so*
-%endif
-
 
-%if %{styleplugins}
-%files styles
-%defattr(-,root,root,-)
-%dir %{qtdir}/plugins/styles
-%{qtdir}/plugins/styles/*
-%endif
-
-
-%if %{buildodbc}
 %files ODBC
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlodbc*
-%endif
-
 
-%if %{buildpsql}
 %files PostgreSQL
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlpsql*
-%endif
-
 
-%if %{buildmysql}
 %files MySQL
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlmysql*
-%endif
-
 
 %files designer
 %defattr(-,root,root,-)
@@ -712,14 +496,17 @@
 %{qtdir}/templates
 %{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
-%if %{desktop_file}
 %{_datadir}/applications/*.desktop
-%else
-%{_datadir}/applnk/Development/*
 %endif
 
 
 %changelog
+* Wed Jun 28 2006 Than Ngo <than at redhat.com> 1:3.3.6-9
+- fix #183302, IM preedit issue in kbabel
+
+* Mon Jun 26 2006 Than Ngo <than at redhat.com> 1:3.3.6-8
+- rebuilt
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:3.3.6-7
 - fix utf8 issue in changelog
 - fix #195410, don't strip binaries/libraries


--- assistant_de.qm DELETED ---


--- qt-visibility.patch DELETED ---


--- qtrc DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:04:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:04:36 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.28,1.29
Message-ID: <200606281804.k5SI4aMG025547@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25520

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-4
- Added "BuildRequires: xorg-x11-server-sdk >= 1.1.0-12" to fix the same
  problem at build time as were added in 6.6.1-2 to fix it at runtime.



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-drv-ati.spec	28 Jun 2006 10:54:03 -0000	1.28
+++ xorg-x11-drv-ati.spec	28 Jun 2006 18:04:32 -0000	1.29
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -29,7 +29,7 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.1.0-1
+BuildRequires: xorg-x11-server-sdk >= 1.1.0-12
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.0-1
@@ -87,7 +87,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Tue Jun 27 2006 Kristian H??gsberg <krh at redhat.com> - 6.6.1-3
+* Wed Jun 28 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-4
+- Added "BuildRequires: xorg-x11-server-sdk >= 1.1.0-12" to fix the same
+  problem at build time as were added in 6.6.1-2 to fix it at runtime.
+
+* Tue Jun 27 2006 Kristian H??gsberg <krh at redhat.com> 6.6.1-3
 - Bump release for FC5 aiglx build.
 
 * Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-2
@@ -99,7 +103,7 @@
 - Drop db-root-visual.patch, as it is included in 6.6.1
 - Enable DRI support for sparc/sparc64 builds.
 
-* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com>  6.6.0-7
+* Fri Jun  9 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-7
 - Committed db-root-visual.patch and reenabled.
 
 * Thu Jun  8 2006 Mike A. Harris <mharris@@redhat.com> 6.6.0-6



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:04:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:04:40 -0400
Subject: rpms/qt/devel qt.spec,1.117,1.118
Message-ID: <200606281804.k5SI4eX6025566@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25521

Modified Files:
	qt.spec 
Log Message:
cleanup specfile



Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- qt.spec	28 Jun 2006 18:03:38 -0000	1.117
+++ qt.spec	28 Jun 2006 18:04:36 -0000	1.118
@@ -497,7 +497,6 @@
 %{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
 %{_datadir}/applications/*.desktop
-%endif
 
 
 %changelog



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:28:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:28:46 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.28,1.29
Message-ID: <200606281828.k5SISk91015743@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15672

Modified Files:
	fedora-logos.spec 
Log Message:
Testing with a dist-tag


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fedora-logos.spec	5 Jun 2006 19:31:44 -0000	1.28
+++ fedora-logos.spec	28 Jun 2006 18:28:43 -0000	1.29
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
 Version: 1.1.43
-Release: 2
+Release: 3%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -141,6 +141,9 @@
 # end i386 bits
 
 %changelog
+* Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-3
+- Test build using dist tag
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.1.43-1
 - Add branded desktop background and move the lock dialog
   background to the right directory



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:42:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:42:35 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.29,1.30
Message-ID: <200606281842.k5SIgZlt019152@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18806

Modified Files:
	fedora-logos.spec 
Log Message:
Temp added buildsys-macros as a buildreq for testing



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fedora-logos.spec	28 Jun 2006 18:28:43 -0000	1.29
+++ fedora-logos.spec	28 Jun 2006 18:42:32 -0000	1.30
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
 Version: 1.1.43
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -13,6 +13,9 @@
 conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 
+# Temporary hack!!
+BuildRequires: buildsys-macros
+
 %description
 The fedora-logos package (the "Packages") contain image files which
 incorporate the Fedora trademark and the RPM logo (the "Marks").
@@ -141,7 +144,7 @@
 # end i386 bits
 
 %changelog
-* Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-3
+* Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-4
 - Test build using dist tag
 
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.1.43-1



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:47:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:47:42 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-salen.patch, NONE, 1.1 dhcpv6.spec,
	1.37, 1.38
Message-ID: <200606281847.k5SIlgBa003236@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3097

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-salen.patch 
Log Message:
getnameinfo needs the size of length of the input data, not NS_MAXHOST


dhcpv6-0.10-salen.patch:
 common.c                |   12 +++++++-----
 common.h                |    2 +-
 dhcp6c.c                |   15 ++++++++++-----
 dhcp6relay.c            |    4 ++--
 dhcp6s.c                |    8 ++++----
 libdhcp6client/common.c |   12 +++++++-----
 libdhcp6client/common.h |    2 +-
 libdhcp6client/dhcp6c.c |   17 +++++++++++------
 8 files changed, 43 insertions(+), 29 deletions(-)

--- NEW FILE dhcpv6-0.10-salen.patch ---
--- dhcp-0.10/dhcp6s.c.salen	2006-06-20 17:47:03.000000000 -0400
+++ dhcp-0.10/dhcp6s.c	2006-06-20 17:47:11.000000000 -0400
@@ -569,7 +569,7 @@
 
 	dprintf(LOG_DEBUG, "%s" "received %s from %s", FNAME,
 	    dhcp6msgstr(dh6->dh6_msgtype),
-	    addr2str((struct sockaddr *)&from));
+	    addr2str((struct sockaddr *)&from, sizeof(((struct sockaddr *)&from)->sa_data)));
 
 	dhcp6_init_options(&optinfo);
 
@@ -1056,15 +1056,15 @@
 
 	dst.sin6_scope_id = ((struct sockaddr_in6 *)from)->sin6_scope_id;
 	dprintf(LOG_DEBUG, "send destination address is %s, scope id is %d", 
-		addr2str((struct sockaddr *)&dst), dst.sin6_scope_id);
+		addr2str((struct sockaddr *)&dst, sizeof(dst.sin6_addr)), dst.sin6_scope_id);
 	if (transmit_sa(outsock, &dst, replybuf, len) != 0) {
 		dprintf(LOG_ERR, "%s" "transmit %s to %s failed", FNAME,
-			dhcp6msgstr(type), addr2str((struct sockaddr *)&dst));
+			dhcp6msgstr(type), addr2str((struct sockaddr *)&dst, sizeof(dst.sin6_addr)));
 		return (-1);
 	}
 
 	dprintf(LOG_DEBUG, "%s" "transmit %s to %s", FNAME,
-		dhcp6msgstr(type), addr2str((struct sockaddr *)&dst));
+		dhcp6msgstr(type), addr2str((struct sockaddr *)&dst, sizeof(dst.sin6_addr)));
 
 	return 0;
 }
--- dhcp-0.10/dhcp6relay.c.salen	2003-02-27 14:43:08.000000000 -0500
+++ dhcp-0.10/dhcp6relay.c	2006-06-20 17:47:11.000000000 -0400
@@ -496,7 +496,7 @@
 	}
 
 	dprintf(LOG_DEBUG, "relay6_recv: from %s, size %d",
-		addr2str((struct sockaddr *)&from), len); 
+		addr2str((struct sockaddr *)&from, sizeof(from.data)), len); 
 
 	/* get optional information as ancillary data (if available) */
 	for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(&rmh); cm;
@@ -705,7 +705,7 @@
 	if ((sdev = getdev(&sa6_relay)) == NULL) {
 		dprintf(LOG_WARNING,
 			"relay6_react_advert: can't detect interface from %s",
-			addr2str((struct sockaddr *)&sa6_relay));
+			in6addr2str(&dh6a->dh6adv_relayaddr, 0));
 		return;
 	}
 
--- dhcp-0.10/common.c.salen	2006-06-20 17:47:03.000000000 -0400
+++ dhcp-0.10/common.c	2006-06-20 18:05:40.000000000 -0400
@@ -560,17 +560,19 @@
 }
 
 char *
-addr2str(sa)
+addr2str(sa, salen)
 	struct sockaddr *sa;
+	socklen_t salen;
 {
-	static char addrbuf[8][NI_MAXHOST];
+	static char addrbuf[8][NI_MAXHOST+1];
 	static int round = 0;
 	char *cp;
 
 	round = (round + 1) & 7;
 	cp = addrbuf[round];
+	memset(cp, '\0', NI_MAXHOST+1);
 
-	if (getnameinfo(sa, NI_MAXSERV, cp, NI_MAXHOST, NULL, 
+	if (getnameinfo(sa, salen, cp, NI_MAXHOST, NULL, 
 				0, NI_NUMERICHOST) != 0)
 		dprintf(LOG_ERR, "%s getnameinfo return error", FNAME);
 
@@ -589,7 +591,7 @@
 	sa6.sin6_addr = *in6;
 	sa6.sin6_scope_id = scopeid;
 
-	return (addr2str((struct sockaddr *)&sa6));
+	return (addr2str((struct sockaddr *)&sa6, sizeof (*in6)));
 }
 
 /* return IPv6 address scope type. caller assumes that smaller is narrower. */
@@ -648,7 +650,7 @@
 
 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
-		     addr2str(addr));
+		     addr2str(addr, sizeof (addr->sa_data)));
 		close(s);
 		return (-1);
 	}
--- dhcp-0.10/dhcp6c.c.salen	2006-06-20 17:47:03.000000000 -0400
+++ dhcp-0.10/dhcp6c.c	2006-06-20 17:55:46.000000000 -0400
@@ -114,6 +114,7 @@
 extern struct dhcp6_iaidaddr client6_iaidaddr;
 FILE *dhcp6_resolv_file;
 static const struct sockaddr_in6 *sa6_allagent;
+static socklen_t sa6_alen;
 static struct duid client_duid;
 
 static void usage __P((void));
@@ -381,7 +382,7 @@
 	}
 #endif
 	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
-	dprintf(LOG_DEBUG, "res addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
+	dprintf(LOG_DEBUG, "res addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
 	if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) {
 		dprintf(LOG_ERR, "%s" "bind(inbound): %s",
 			FNAME, strerror(errno));
@@ -434,6 +435,7 @@
 	}
 	memcpy(&sa6_allagent_storage, res->ai_addr, res->ai_addrlen);
 	sa6_allagent = (const struct sockaddr_in6 *)&sa6_allagent_storage;
+	sa6_alen = res->ai_addrlen;
 	freeaddrinfo(res);
 
 	/* client interface configuration */
@@ -814,6 +816,7 @@
 	struct dhcp6_optinfo optinfo;
 	ssize_t optlen, len;
 	struct timeval duration, now;
+	socklen_t salen;
 
 	ifp = ev->ifp;
 
@@ -1037,15 +1040,17 @@
 				exit(1);
 			}
 			memcpy(&dst, res->ai_addr, res->ai_addrlen);
+			salen = res->ai_addrlen;
 			break;
 		}
 	default:
 		dst = *sa6_allagent;
+		salen = sa6_alen;
 		break;
 	}
 	dst.sin6_scope_id = ifp->linkid;
 	dprintf(LOG_DEBUG, "send dst if %s addr is %s scope id is %d", 
-		ifp->ifname, addr2str((struct sockaddr *)&dst), ifp->linkid);
+		ifp->ifname, addr2str((struct sockaddr *)&dst, salen), ifp->linkid);
 	if (sendto(ifp->outsock, buf, len, MSG_DONTROUTE, (struct sockaddr *)&dst,
 	    sizeof(dst)) == -1) {
 		dprintf(LOG_ERR, FNAME "transmit failed: %s", strerror(errno));
@@ -1054,7 +1059,7 @@
 
 	dprintf(LOG_DEBUG, "%s" "send %s to %s", FNAME,
 		dhcp6msgstr(dh6->dh6_msgtype),
-		addr2str((struct sockaddr *)&dst));
+		addr2str((struct sockaddr *)&dst, salen));
 
   end:
 	dhcp6_clear_options(&optinfo);
@@ -1116,7 +1121,7 @@
 
 	dprintf(LOG_DEBUG, "%s" "receive %s from %s scope id %d %s", FNAME,
 		dhcp6msgstr(dh6->dh6_msgtype),
-		addr2str((struct sockaddr *)&from),
+		addr2str((struct sockaddr *)&from, sizeof (((struct sockaddr *)&from)->sa_data)),
 		((struct sockaddr_in6 *)&from)->sin6_scope_id,
 		ifp->ifname);
 
@@ -1141,7 +1146,7 @@
 	default:
 		dprintf(LOG_INFO, "%s" "received an unexpected message (%s) "
 			"from %s", FNAME, dhcp6msgstr(dh6->dh6_msgtype),
-			addr2str((struct sockaddr *)&from));
+			addr2str((struct sockaddr *)&from, sizeof(((struct sockaddr *)&from)->sa_data)));
 		break;
 	}
 
--- dhcp-0.10/libdhcp6client/common.c.salen	2006-06-20 17:47:11.000000000 -0400
+++ dhcp-0.10/libdhcp6client/common.c	2006-06-20 18:05:41.000000000 -0400
@@ -568,17 +568,19 @@
 }
 
 char *
-addr2str(sa)
+addr2str(sa, salen)
 	struct sockaddr *sa;
+	socklen_t salen;
 {
-	static char addrbuf[8][NI_MAXHOST];
+	static char addrbuf[8][NI_MAXHOST+1];
 	static int round = 0;
 	char *cp;
 
 	round = (round + 1) & 7;
 	cp = addrbuf[round];
+	memset(cp, '\0', NI_MAXHOST+1);
 
-	if (getnameinfo(sa, NI_MAXSERV, cp, NI_MAXHOST, NULL, 
+	if (getnameinfo(sa, salen, cp, NI_MAXHOST, NULL, 
 				0, NI_NUMERICHOST) != 0)
 		dprintf(LOG_ERR, "%s getnameinfo return error", FNAME);
 
@@ -597,7 +599,7 @@
 	sa6.sin6_addr = *in6;
 	sa6.sin6_scope_id = scopeid;
 
-	return (addr2str((struct sockaddr *)&sa6));
+	return (addr2str((struct sockaddr *)&sa6, sizeof (*in6)));
 }
 
 /* return IPv6 address scope type. caller assumes that smaller is narrower. */
@@ -656,7 +658,7 @@
 	dprintf(LOG_DEBUG,"in6_matchflags: SIOCGIFFLAGS");
 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
-		     addr2str(addr));
+		     addr2str(addr, sizeof (addr->sa_data)));
 		close(s);
 		return (-1);
 	}
--- dhcp-0.10/libdhcp6client/dhcp6c.c.salen	2006-06-20 17:47:11.000000000 -0400
+++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-06-20 17:55:46.000000000 -0400
@@ -117,6 +117,7 @@
 extern struct dhcp6_iaidaddr client6_iaidaddr;
 FILE *dhcp6_resolv_file;
 static const struct sockaddr_in6 *sa6_allagent;
+static socklen_t sa6_alen;
 static struct duid client_duid;
 
 static void usage __P((void));
@@ -457,7 +458,7 @@
 	}
 #endif	    
 	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
-	dprintf(LOG_INFO, "inbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
+	dprintf(LOG_DEBUG, "inbound addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
 	
 	/*
          * If the interface has JUST been brought up, the kernel may not
@@ -514,7 +515,7 @@
 		exit(1);
 	}
 	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
-	dprintf(LOG_INFO, "outbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
+	dprintf(LOG_INFO, "outbound addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
 	if (bind(outsock, res->ai_addr, res->ai_addrlen) < 0) {
 		dprintf(LOG_ERR, "%s" "bind(outbound): %s",
 			FNAME, strerror(errno));
@@ -533,6 +534,7 @@
 	}
 	memcpy(&sa6_allagent_storage, res->ai_addr, res->ai_addrlen);
 	sa6_allagent = (const struct sockaddr_in6 *)&sa6_allagent_storage;
+	sa6_alen = res->ai_addrlen;
 	freeaddrinfo(res);
 
 	/* client interface configuration */
@@ -1021,6 +1023,7 @@
 	struct dhcp6_optinfo optinfo;
 	ssize_t optlen, len;
 	struct timeval duration, now;
+	socklen_t salen;
 
 	ifp = ev->ifp;
 
@@ -1274,15 +1277,17 @@
 				exit(1);
 			}
 			memcpy(&dst, res->ai_addr, res->ai_addrlen);
+			salen = res->ai_addrlen;
 			break;
 		}
 	default:	        
 		dst = *sa6_allagent;
+		salen = sa6_alen;
 		break;
 	}
 	dst.sin6_scope_id = ifp->linkid;
 	dprintf(LOG_INFO, "send dst if %s addr is %s scope id is %d", 
-		ifp->ifname, addr2str((struct sockaddr *)&dst), ifp->linkid);
+		ifp->ifname, addr2str((struct sockaddr *)&dst, salen), ifp->linkid);
 	
 	dprintf(LOG_DEBUG,"\nSEND PACKET\n");
 	if (sendto(ifp->outsock, buf, len, MSG_DONTROUTE, (struct sockaddr *)&dst,
@@ -1293,7 +1298,7 @@
 
 	dprintf(LOG_INFO, "%s" "send %s to %s", FNAME,
 		dhcp6msgstr(dh6->dh6_msgtype),
-		addr2str((struct sockaddr *)&dst));
+		addr2str((struct sockaddr *)&dst, salen));
 
   end:
 	dhcp6_clear_options(&optinfo);
@@ -1356,7 +1361,7 @@
 
 	dprintf(LOG_DEBUG, "%s" "receive %s from %s scope id %d %s", FNAME,
 		dhcp6msgstr(dh6->dh6_msgtype),
-		addr2str((struct sockaddr *)&from),
+		addr2str((struct sockaddr *)&from, sizeof (((struct sockaddr *)&from)->sa_data)),
 		((struct sockaddr_in6 *)&from)->sin6_scope_id,
 		ifp->ifname);
 
@@ -1383,7 +1388,7 @@
 	default:
 		dprintf(LOG_INFO, "%s" "received an unexpected message (%s) "
 			"from %s", FNAME, dhcp6msgstr(dh6->dh6_msgtype),
-			addr2str((struct sockaddr *)&from));
+			addr2str((struct sockaddr *)&from, sizeof(((struct sockaddr *)&from)->sa_data)));
 		break;
 	}
 	dhcp6_clear_options(&optinfo);
--- dhcp-0.10/libdhcp6client/common.h.salen	2006-06-20 17:47:03.000000000 -0400
+++ dhcp-0.10/libdhcp6client/common.h	2006-06-20 17:47:11.000000000 -0400
@@ -67,7 +67,7 @@
 extern long random_between __P((long, long));
 extern int prefix6_mask __P((struct in6_addr *, int));
 extern int sa6_plen2mask __P((struct sockaddr_in6 *, int));
-extern char *addr2str __P((struct sockaddr *));
+extern char *addr2str __P((struct sockaddr *, socklen_t));
 extern char *in6addr2str __P((struct in6_addr *, int));
 extern const char *getdev __P((struct sockaddr_in6 *));
 extern int in6_addrscopebyif __P((struct in6_addr *, char *));
--- dhcp-0.10/common.h.salen	2006-06-20 17:47:03.000000000 -0400
+++ dhcp-0.10/common.h	2006-06-20 17:47:11.000000000 -0400
@@ -67,7 +67,7 @@
 extern long random_between __P((long, long));
 extern int prefix6_mask __P((struct in6_addr *, int));
 extern int sa6_plen2mask __P((struct sockaddr_in6 *, int));
-extern char *addr2str __P((struct sockaddr *));
+extern char *addr2str __P((struct sockaddr *, socklen_t));
 extern char *in6addr2str __P((struct in6_addr *, int));
 extern const char *getdev __P((struct sockaddr_in6 *));
 extern int in6_addrscopebyif __P((struct in6_addr *, char *));


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- dhcpv6.spec	22 Jun 2006 17:23:31 -0000	1.37
+++ dhcpv6.spec	28 Jun 2006 18:47:40 -0000	1.38
@@ -29,6 +29,7 @@
 Patch17: dhcpv6-0.10-htonl.patch
 Patch18: dhcpv6-0.10-libdhcp6client-Makefile.patch
 Patch19: dhcpv6-0.10-libdhcp6client.patch
+Patch20: dhcpv6-0.10-salen.patch
 Prereq: /sbin/chkconfig, /sbin/service
 BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
 
@@ -83,6 +84,7 @@
 	--mandir=/usr/share/man
 make libdhcp6client/.
 %patch19 -p1 -b .libdhcp6client
+%patch20 -p1 -b .salen
 
 %build
 make
@@ -189,6 +191,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Wed Jun 28 2006 Peter Jones <pjones at redhat.com> - 0.10-29
+- getnameinfo needs the size of the incoming data, not NS_MAXHOST
+
 * Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 0.10-28
 - If link is down, exit rather than loop indefinitely (#195250)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 18:50:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 14:50:11 -0400
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.38,1.39
Message-ID: <200606281850.k5SIoBj5004217@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4161

Modified Files:
	dhcpv6.spec 
Log Message:
- bump release



Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- dhcpv6.spec	28 Jun 2006 18:47:40 -0000	1.38
+++ dhcpv6.spec	28 Jun 2006 18:50:09 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 28
+Release: 29
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:08:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:08:18 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.30,1.31
Message-ID: <200606281908.k5SJ8IEk008795@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8769

Modified Files:
	fedora-logos.spec 
Log Message:
no more buildrequires on buildsys-macros


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fedora-logos.spec	28 Jun 2006 18:42:32 -0000	1.30
+++ fedora-logos.spec	28 Jun 2006 19:08:06 -0000	1.31
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
 Version: 1.1.43
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -13,9 +13,6 @@
 conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 
-# Temporary hack!!
-BuildRequires: buildsys-macros
-
 %description
 The fedora-logos package (the "Packages") contain image files which
 incorporate the Fedora trademark and the RPM logo (the "Marks").
@@ -144,7 +141,7 @@
 # end i386 bits
 
 %changelog
-* Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-4
+* Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-5
 - Test build using dist tag
 
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.1.43-1



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:11:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:11:50 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.7, 1.8 libdhcp.spec, 1.24,
	1.25 sources, 1.18, 1.19 libdhcp-1.5-timeout.patch, 1.1, NONE
Message-ID: <200606281911.k5SJBou4010009@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9960

Modified Files:
	.cvsignore libdhcp.spec sources 
Removed Files:
	libdhcp-1.5-timeout.patch 
Log Message:
- update to 1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Jun 2006 00:47:40 -0000	1.7
+++ .cvsignore	28 Jun 2006 19:11:47 -0000	1.8
@@ -1 +1 @@
-libdhcp-1.5.tar.gz
+libdhcp-1.6.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libdhcp.spec	22 Jun 2006 01:32:53 -0000	1.24
+++ libdhcp.spec	28 Jun 2006 19:11:47 -0000	1.25
@@ -1,12 +1,11 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.5
-Release: 3
+Version: 	1.6
+Release: 	1
 License: 	GPL
 Group: 		Development/Libraries
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
 Source0: 	%{name}-%{version}.tar.gz
-Patch0: libdhcp-1.5-timeout.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dhcp-devel, libdhcp4client-devel, libdhcp6client-devel, libnl-devel, pkgconfig, doxygen
 
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .timeout
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +75,14 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Wed Jun 28 2006 Peter Jones <pjones at redhat.com> - 1.6-1
+- fix two memory leaks in dhcpv4_control_va
+- fix memory leaks in dhcp_nic_va
+- don't fork threads if we're not using a particular protocol
+- fix client finished detection logic
+- add a destructor for a dhc6ctl
+- relinquish timeouts when pump is finished getting a lease
+
 * Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 1.5-2
 - actually follow the timeout given instead of always using 10 seconds
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	16 Jun 2006 00:47:40 -0000	1.18
+++ sources	28 Jun 2006 19:11:47 -0000	1.19
@@ -1 +1 @@
-ff32df9fa3b0ce7c8119f67b5489094e  libdhcp-1.5.tar.gz
+45edee3598a82ed2c2f7fc95658271d7  libdhcp-1.6.tar.gz


--- libdhcp-1.5-timeout.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:19:58 -0400
Subject: rpms/dhcp/devel dhcp-3.0.4-timeouts.patch,1.2,1.3
Message-ID: <200606281919.k5SJJwMm027552@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27412

Modified Files:
	dhcp-3.0.4-timeouts.patch 
Log Message:
- define timeout cancellation functions


dhcp-3.0.4-timeouts.patch:
 common/dispatch.c                |   11 +
 includes/dhcpd.h                 |    9 -
 libdhcp4client/client/dhclient.c |    1 
 libdhcp4client/common/dispatch.c |  223 ++++++++++++++++++++-------------------
 4 files changed, 125 insertions(+), 119 deletions(-)

Index: dhcp-3.0.4-timeouts.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.4-timeouts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dhcp-3.0.4-timeouts.patch	22 Jun 2006 18:52:14 -0000	1.2
+++ dhcp-3.0.4-timeouts.patch	28 Jun 2006 19:19:56 -0000	1.3
@@ -89,7 +89,7 @@
  }
  
  /* Wait for packets to come in using select().   When one does, call
-@@ -104,116 +123,106 @@
+@@ -104,116 +123,104 @@
  	tvref_t ref;
  	tvunref_t unref;
  {
@@ -255,7 +255,7 @@
  	}
  }
  
- #if defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
+-#if defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
  void cancel_all_timeouts ()
  {
 -	struct timeout *t, *n;
@@ -280,7 +280,7 @@
 +	while (ntimeouts)
 +		cancel_timeout(timeouts[0].func, timeouts[0].what);
  }
- #endif
+-#endif
 --- dhcp-3.0.4/common/dispatch.c.timeouts	2006-02-22 17:43:27.000000000 -0500
 +++ dhcp-3.0.4/common/dispatch.c	2006-06-22 14:50:33.000000000 -0400
 @@ -39,7 +39,16 @@



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:29:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:29:35 -0400
Subject: rpms/libXt/devel libXt-1.0.2-libsm-fix.patch, NONE, 1.1 libXt.spec,
	1.20, 1.21
Message-ID: <200606281929.k5SJTZOf031250@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31160

Modified Files:
	libXt.spec 
Added Files:
	libXt-1.0.2-libsm-fix.patch 
Log Message:
- Added libXt-1.0.2-libsm-fix.patch to remove libSM from the Requires: line
  in the installed pkgconfig file.  Apps should link against libSM if they
  need it, but we shouldn't force them to link against it if they don't.


libXt-1.0.2-libsm-fix.patch:
 xt.pc.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libXt-1.0.2-libsm-fix.patch ---
--- libXt-1.0.2/xt.pc.in.libsm-fix	2006-06-28 14:56:37.000000000 -0400
+++ libXt-1.0.2/xt.pc.in	2006-06-28 14:56:51.000000000 -0400
@@ -7,7 +7,7 @@
 Name: Xt
 Description: X Toolkit Library
 Version: @VERSION@
-Requires: xproto x11 sm
+Requires: xproto x11
 Requires.private: x11 sm
 Cflags: -I${includedir}
 Libs: -L${libdir} -lXt


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXt.spec	28 Jun 2006 10:45:27 -0000	1.20
+++ libXt.spec	28 Jun 2006 19:29:32 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,6 +9,8 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
+Patch0:     libXt-1.0.2-libsm-fix.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -38,6 +40,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .libsm-fix
+
 # Disable static library creation by default.
 %define with_static 0
 
@@ -123,6 +127,11 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-2
+- Added libXt-1.0.2-libsm-fix.patch to remove libSM from the Requires: line
+  in the installed pkgconfig file.  Apps should link against libSM if they
+  need it, but we shouldn't force them to link against it if they don't.
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
 - Updated libXt to version 1.0.2 from X11R7.1
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:36:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:36:44 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.108,1.109
Message-ID: <200606281936.k5SJaifk032311@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32248

Modified Files:
	dhcp.spec 
Log Message:
- bump release to -17



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- dhcp.spec	28 Jun 2006 12:19:52 -0000	1.108
+++ dhcp.spec	28 Jun 2006 19:36:42 -0000	1.109
@@ -4,7 +4,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 16
+Release: 17
 Epoch:   12
 License: distributable
 Group: System Environment/Daemons
@@ -496,7 +496,10 @@
 %endif
 
 %changelog
-* Wed Jun 28 2006 Florian La Roche <laroche at redhat.com>
+* Wed Jun 28 2006 Peter Jones <pjones at redhat.com> - 12:3.0.4-17
+- export timeout cancellation functions in libdhcp4client
+
+* Wed Jun 28 2006 Florian La Roche <laroche at redhat.com> - 12:3.0.4-16
 - add proper coreutils requires for the scripts
 
 * Thu Jun 22 2006 Peter Jones <pjones at redhat.com> - 12:3.0.4-15



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:38:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:38:42 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.25,1.26 sources,1.19,1.20
Message-ID: <200606281938.k5SJcg8G000370@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32725

Modified Files:
	libdhcp.spec sources 
Log Message:
- require newer libdhcp4client



Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libdhcp.spec	28 Jun 2006 19:11:47 -0000	1.25
+++ libdhcp.spec	28 Jun 2006 19:38:39 -0000	1.26
@@ -7,7 +7,8 @@
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
 Source0: 	%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  dhcp-devel, libdhcp4client-devel, libdhcp6client-devel, libnl-devel, pkgconfig, doxygen
+BuildRequires:  dhcp-devel, libdhcp4client-devel >= 12:3.0.4-17
+BuildRequires:	libdhcp6client-devel, libnl-devel, pkgconfig, doxygen
 
 %description
 libdhcp enables programs to invoke and control the


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	28 Jun 2006 19:11:47 -0000	1.19
+++ sources	28 Jun 2006 19:38:39 -0000	1.20
@@ -1 +1 @@
-45edee3598a82ed2c2f7fc95658271d7  libdhcp-1.6.tar.gz
+1a78ad19dc203562541f030e38c1d6fb  libdhcp-1.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:41:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:41:07 -0400
Subject: rpms/frysk/devel frysk.spec,1.65,1.66
Message-ID: <200606281941.k5SJf7Pg001371@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1239

Modified Files:
	frysk.spec 
Log Message:
- Remove  BuildRequires:  autoconf automake


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- frysk.spec	28 Jun 2006 16:00:54 -0000	1.65
+++ frysk.spec	28 Jun 2006 19:41:05 -0000	1.66
@@ -29,7 +29,6 @@
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
-BuildRequires:  autoconf automake
 
 # We can only build on i386 for now
 ExclusiveArch: %{ix86} x86_64
@@ -99,7 +98,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
-* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1
+* Wed Jun 28 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1-1
+- Remove  BuildRequires:  autoconf automake
+
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1-0
 - Refresh the tarball.
 - Remove the patches, they are all upstream now.
 - BuildRequires: sharutils, instead of gmime.



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:42:42 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.18,1.19
Message-ID: <200606281942.k5SJgguD002003@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1937

Modified Files:
	libXaw.spec 
Log Message:
- Rebuild for libXt pkgconfig fixes.



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXaw.spec	28 Jun 2006 10:39:47 -0000	1.18
+++ libXaw.spec	28 Jun 2006 19:42:39 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 6
+Release: 7
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -101,6 +101,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-7
+- Rebuild for libXt pkgconfig fixes.
+
 * Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6
 - Added "Requires: libXpm-devel" to devel subpackage to attempt to fix
   bug (#192040).



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:49:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:49:22 -0400
Subject: rpms/gaim/devel gaim.spec,1.124,1.125
Message-ID: <200606281949.k5SJnMkq019104@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18821

Modified Files:
	gaim.spec 
Log Message:
rebuild against libsilc-1.0.2

SILC protocol might be broken for some people.  Upstream is working on a fix soon.



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gaim.spec	27 Jun 2006 18:50:11 -0000	1.124
+++ gaim.spec	28 Jun 2006 19:49:19 -0000	1.125
@@ -27,7 +27,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.3.%{betaver}%{?dist}
+Release:	0.4.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -282,6 +282,9 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
+* Wed Jun 28 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.4.beta3
+- rebuild against libsilc-1.0.2
+
 * Tue Jun 27 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.3.beta3
 - more spec cleanups
 - buildreq libXScrnSaver-devel, gettext, intltool, desktop-file-utils



From fedora-cvs-commits at redhat.com  Wed Jun 28 19:59:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 15:59:26 -0400
Subject: rpms/rpm/devel rpm-4.4.2-matchpathcon.patch, 1.1, 1.2 rpm.spec,
	1.205, 1.206
Message-ID: <200606281959.k5SJxQLF030834@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30813

Modified Files:
	rpm-4.4.2-matchpathcon.patch rpm.spec 
Log Message:
Remove SELinux context verification (#193488)


rpm-4.4.2-matchpathcon.patch:
 build/Makefile.am  |    1 +
 build/files.c      |   27 ++++++++++++++-------------
 lib/fsm.c          |    7 +++----
 lib/rpmfi.c        |   13 ++++++-------
 lib/rpminstall.c   |   14 ++++----------
 python/Makefile.am |    3 ++-
 python/rpmts-py.c  |   13 ++++---------
 7 files changed, 34 insertions(+), 44 deletions(-)

Index: rpm-4.4.2-matchpathcon.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-matchpathcon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2-matchpathcon.patch	21 Jul 2005 21:37:42 -0000	1.1
+++ rpm-4.4.2-matchpathcon.patch	28 Jun 2006 19:59:23 -0000	1.2
@@ -56,58 +56,6 @@
      }
      (void) rpmtsSetFlags(ts, ia->transFlags);
  
---- rpm-4.4.2/lib/verify.c.matchpathcon	2004-10-24 15:36:30.000000000 -0400
-+++ rpm-4.4.2/lib/verify.c	2005-07-21 16:47:11.000000000 -0400
-@@ -128,20 +128,19 @@
- 	if (rc == -1)
- 	    *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS);
- 	else {
--	    rpmsx sx = rpmtsREContext(ts);
--	    const char * fcontext;
--
--	    if (sx != NULL) {
--		/* Get file security context from patterns. */
--		fcontext = rpmsxFContext(sx, fn, fmode);
--		sx = rpmsxFree(sx);
--	    } else {
-+	    security_context_t fcontext;
-+             
-+	    /* Get file security context from patterns. */
-+	    if (matchpathcon(fn,fmode,&fcontext) != 0)  {
- 		/* Get file security context from package. */
- 		fcontext = rpmfiFContext(fi);
- 	    }
-+
- 	    if (fcontext == NULL || strcmp(fcontext, con))
- 		*res |= RPMVERIFY_CONTEXTS;
- 	    freecon(con);
-+            freecon(fcontext); 
-+
- 	}
-     }
- /*@=branchstate@*/
-@@ -524,16 +523,11 @@
- 
-     /* Initialize security context patterns (if not already done). */
-     if (qva->qva_flags & VERIFY_CONTEXTS) {
--	rpmsx sx = rpmtsREContext(ts);
--	if (sx == NULL) {
--	    arg = rpmGetPath("%{?_verify_file_context_path}", NULL);
--	    if (arg != NULL && *arg != '\0') {
--		sx = rpmsxNew(arg);
--		(void) rpmtsSetREContext(ts, sx);
--	    }
--	    arg = _free(arg);
--	}
--	sx = rpmsxFree(sx);
-+	arg = rpmGetPath("%{?_verify_file_context_path}", NULL);
-+	if (arg != NULL && *arg != '\0') {
-+           matchpathcon_init(arg);	
-+	   }
-+	arg = _free(arg);
-     }
- 
-     ovsflags = rpmtsSetVSFlags(ts, vsflags);
 --- rpm-4.4.2/lib/rpmfi.c.matchpathcon	2005-02-10 03:30:28.000000000 -0500
 +++ rpm-4.4.2/lib/rpmfi.c	2005-07-21 16:47:11.000000000 -0400
 @@ -16,7 +16,7 @@


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- rpm.spec	12 May 2006 14:45:21 -0000	1.205
+++ rpm.spec	28 Jun 2006 19:59:23 -0000	1.206
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 24
+Release: 25
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -52,6 +52,7 @@
 Patch24: rpm-4.4.2-trust.patch
 Patch25: rpm-4.4.2-devel-autodep.patch
 Patch26: rpm-4.4.2-rpmfc-skip.patch
+Patch27: rpm-4.4.2-noselinux-verify.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -167,10 +168,9 @@
 %patch3 -p1  -b .rpmal
 %patch4 -p1  -b .prepostun
 %patch5 -p1  -b .ordererase
-%patch6 -p1  -b .matchpathcon
+# patch 6 moved
 %patch7 -p1  -b .perlreq
 %patch8 -p1  -b .param
-%patch9 -p1  -b .contextverify
 %patch10 -p1  -b .charset
 %patch11 -p1  -b .ghostconflicts
 #patch12 -p1  -b .exclude
@@ -188,6 +188,8 @@
 %patch24 -p1 -b .trust
 %patch25 -p1 -b .develdeps
 %patch26 -p1 -b .fcskip
+%patch27 -p0 -b .nosever
+%patch6 -p1  -b .matchpathcon
 
 %build
 
@@ -581,6 +583,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jun 28 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-25
+- Remove SELinux context verification (#193488)
+
 * Thu May 04 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-24
 - File classification with autoReq off (#190488)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 20:10:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 16:10:17 -0400
Subject: rpms/libXmu/devel libXmu.spec,1.14,1.15
Message-ID: <200606282010.k5SKAHxB031138@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31125

Modified Files:
	libXmu.spec 
Log Message:
- Rebuild for libXt pkgconfig fixes.



Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXmu.spec	28 Jun 2006 10:43:20 -0000	1.14
+++ libXmu.spec	28 Jun 2006 20:10:10 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -109,6 +109,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Wed Jun 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-3
+- Rebuild for libXt pkgconfig fixes.
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Replace "makeinstall" with "make install DESTDIR=..."
 - Added "Requires: xorg-x11-proto-devel, libX11-devel, libXt-devel" to devel



From fedora-cvs-commits at redhat.com  Wed Jun 28 20:36:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 16:36:21 -0400
Subject: rpms/rpm/devel rpm-4.4.2-python-aslist.patch, NONE, 1.1 rpm.spec,
	1.206, 1.207
Message-ID: <200606282036.k5SKaLid013821@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13809

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-python-aslist.patch 
Log Message:
fix 197144

rpm-4.4.2-python-aslist.patch:
 header-py.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE rpm-4.4.2-python-aslist.patch ---
--- rpm-4.4.2/python/header-py.c.aslist	2006-06-28 16:33:31.000000000 -0400
+++ rpm-4.4.2/python/header-py.c	2006-06-28 16:33:47.000000000 -0400
@@ -537,6 +537,7 @@
     case RPMTAG_CONFLICTNAME:
     case RPMTAG_CONFLICTFLAGS:
     case RPMTAG_CONFLICTVERSION:
+    case RPMTAG_CHANGELOGTIME:
 	forceArray = 1;
 	break;
     case RPMTAG_SUMMARY:


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- rpm.spec	28 Jun 2006 19:59:23 -0000	1.206
+++ rpm.spec	28 Jun 2006 20:36:18 -0000	1.207
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 25
+Release: 26
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -53,6 +53,7 @@
 Patch25: rpm-4.4.2-devel-autodep.patch
 Patch26: rpm-4.4.2-rpmfc-skip.patch
 Patch27: rpm-4.4.2-noselinux-verify.patch
+Patch28: rpm-4.4.2-python-aslist.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -190,6 +191,7 @@
 %patch26 -p1 -b .fcskip
 %patch27 -p0 -b .nosever
 %patch6 -p1  -b .matchpathcon
+%patch28 -p1 -b .aslist
 
 %build
 
@@ -583,6 +585,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jun 28 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-26
+- Force CHANGELOGTIME to be a list in rpm-python
+
 * Wed Jun 28 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-25
 - Remove SELinux context verification (#193488)
 



From fedora-cvs-commits at redhat.com  Wed Jun 28 22:15:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 18:15:00 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec, 1.159,
	1.160 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, 1.2, 1.3
Message-ID: <200606282215.k5SMExfF029607@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29585

Modified Files:
	GFS-kernel.spec gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
More fixes for 2.6.17.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- GFS-kernel.spec	26 Jun 2006 22:28:13 -0000	1.159
+++ GFS-kernel.spec	28 Jun 2006 22:14:57 -0000	1.160
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.27
+Release: 5.FC5.28
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 gfs/diaper.c      |   16 ++++++++--------
 gfs/ops_address.c |    4 ++--
 nolock/main.c     |   11 ++++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

Index: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/gfs-kernel-2.6.15-2-kernel-2.6.17.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gfs-kernel-2.6.15-2-kernel-2.6.17.patch	26 Jun 2006 22:28:13 -0000	1.2
+++ gfs-kernel-2.6.15-2-kernel-2.6.17.patch	28 Jun 2006 22:14:57 -0000	1.3
@@ -1,5 +1,5 @@
 --- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-26 16:25:12.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-28 17:13:23.000000000 -0500
 @@ -20,7 +20,7 @@
  #include <linux/smp_lock.h>
  #include <linux/lm_interface.h>
@@ -28,8 +28,28 @@
  	unlock_kernel();
  
  	return 0;
---- gfs-kernel-2.6.15-2/src/gfs/diaper.c.kernel-2.6.17	2006-06-26 17:26:36.000000000 -0500
-+++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-26 17:26:46.000000000 -0500
+--- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
++++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-28 17:14:31.000000000 -0500
+@@ -451,7 +451,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
+ 	struct inode *inode = file->f_mapping->host;
+ 	struct gfs_inode *ip = get_v2ip(inode);
+ 	struct gfs_sbd *sdp = ip->i_sbd;
+-	get_blocks_t *gb = get_blocks;
++	get_block_t *gb = get_blocks;
+ 
+ 	atomic_inc(&sdp->sd_ops_address);
+ 
+@@ -460,7 +460,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
+ 		return -EINVAL;
+ 
+ 	if (rw == WRITE && !get_transaction)
+-		gb = get_blocks_noalloc;
++		gb = get_block_noalloc;
+ 
+ 	return blockdev_direct_IO(rw, iocb, inode,
+ 				  inode->i_sb->s_bdev, iov,
+--- gfs-kernel-2.6.15-2/src/gfs/diaper.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
++++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-28 17:13:23.000000000 -0500
 @@ -232,9 +232,9 @@ get_dummy_sb(struct diaper_holder *dh)
  	struct inode *inode;
  	int error;



From fedora-cvs-commits at redhat.com  Wed Jun 28 22:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 18:20:49 -0400
Subject: rpms/device-mapper-multipath/devel .cvsignore, 1.9,
	1.10 device-mapper-multipath.spec, 1.26, 1.27 sources, 1.10, 1.11
Message-ID: <200606282220.k5SMKnLp013969@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13794

Modified Files:
	.cvsignore device-mapper-multipath.spec sources 
Log Message:
Updated to latest upstream source. Fixes kpartx udev issue.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Jun 2006 21:27:31 -0000	1.9
+++ .cvsignore	28 Jun 2006 22:20:47 -0000	1.10
@@ -1,3 +1,4 @@
 multipath-tools-0.4.5.59.tgz
 multipath-tools-0.4.7.tgz
 multipath-tools-0.4.7.1.tgz
+multipath-tools-0.4.7.2.tgz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- device-mapper-multipath.spec	6 Jun 2006 21:27:31 -0000	1.26
+++ device-mapper-multipath.spec	28 Jun 2006 22:20:47 -0000	1.27
@@ -1,11 +1,11 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 1.0
+Release: 2.0
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-0.4.7.1.tgz
+Source0: multipath-tools-0.4.7.2.tgz
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prereq: chkconfig
@@ -22,7 +22,7 @@
 * kpartx :      Makes multipath devices partitionable.
 
 %prep
-%setup -q -n multipath-tools-0.4.7.1
+%setup -q -n multipath-tools-0.4.7.2
 
 %build
 make DESTDIR=$RPM_BUILD_ROOT
@@ -66,6 +66,9 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Wed Jun 28 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.0
+- Updated to latest upstream source, fixes kpartx udev rule issue
+
 * Mon Jun 06 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-1.0
 - Updated to Christophe's latest source
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Jun 2006 21:27:31 -0000	1.10
+++ sources	28 Jun 2006 22:20:47 -0000	1.11
@@ -1 +1 @@
-fab4c8c7369878477d3124c1bc8dc800  multipath-tools-0.4.7.1.tgz
+d298d1e01832e2b89edb00eed88907fc  multipath-tools-0.4.7.2.tgz



From fedora-cvs-commits at redhat.com  Wed Jun 28 22:34:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 18:34:53 -0400
Subject: rpms/kernel/devel linux-2.6-audit-by-object.patch, NONE,
	1.1.2.1 linux-2.6-net-label_1_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_2_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_3_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_4_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_5_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_6_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_7_8.patch, NONE,
	1.1.2.1 linux-2.6-net-label_8_8.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2293.2.3,
	1.2293.2.4 linux-2.6-net-label_1_7.patch, 1.1.2.1,
	NONE linux-2.6-net-label_2_7.patch, 1.1.2.1,
	NONE linux-2.6-net-label_3_7.patch, 1.1.2.1,
	NONE linux-2.6-net-label_4_7.patch, 1.1.2.2,
	NONE linux-2.6-net-label_5_7.patch, 1.1.2.1,
	NONE linux-2.6-net-label_6_7.patch, 1.1.2.1,
	NONE linux-2.6-net-label_7_7.patch, 1.1.2.1, NONE
Message-ID: <200606282234.k5SMYr6F018258@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18127

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	linux-2.6-audit-by-object.patch linux-2.6-net-label_1_8.patch 
	linux-2.6-net-label_2_8.patch linux-2.6-net-label_3_8.patch 
	linux-2.6-net-label_4_8.patch linux-2.6-net-label_5_8.patch 
	linux-2.6-net-label_6_8.patch linux-2.6-net-label_7_8.patch 
	linux-2.6-net-label_8_8.patch 
Removed Files:
      Tag: private-lspp-37-branch
	linux-2.6-net-label_1_7.patch linux-2.6-net-label_2_7.patch 
	linux-2.6-net-label_3_7.patch linux-2.6-net-label_4_7.patch 
	linux-2.6-net-label_5_7.patch linux-2.6-net-label_6_7.patch 
	linux-2.6-net-label_7_7.patch 
Log Message:
* Wed Jun 28 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.40, refreshed netlabel patch from Paul
- dropped ipsec patch due to new conflicts
- added audit by obj by Darrel



linux-2.6-audit-by-object.patch:
 include/linux/audit.h          |    5 +++++
 kernel/auditfilter.c           |   25 +++++++++++++++++++++++++
 kernel/auditsc.c               |   25 +++++++++++++++++++++++++
 security/selinux/ss/services.c |   17 ++++++++++++++++-
 4 files changed, 71 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-audit-by-object.patch ---
>From dgoeddel at trustedcs.com Fri Jun 23 17:57:50 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Fri, 23 Jun 2006 17:58:49 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5NLwn2b022695;
	Fri, 23 Jun 2006 17:58:49 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5NLwm7N004468;
	Fri, 23 Jun 2006 17:58:48 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k5NLwhQh010463;
	Fri, 23 Jun 2006 17:58:43 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 456187360E; Fri, 23 Jun 2006 17:58:43 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k5NLweF0021070 for <redhat-lspp at listman.util.phx.redhat.com>;
	Fri, 23 Jun 2006 17:58:41 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k5NLweR2004458; Fri, 23 Jun 2006 17:58:40 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5NLwPbx031247;
	Fri, 23 Jun 2006 17:58:25 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k5NLw5iv019985;
	Fri, 23 Jun 2006 17:58:05 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Fri Jun 23 17:58:02 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B449c63ea0000>; Fri, 23 Jun 2006 17:58:02 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id NLMHB6QQ; Fri, 23 Jun 2006 17:58:01 -0400
Message-ID: <449C63DE.7080205 at trustedcs.com>
Date: Fri, 23 Jun 2006 16:57:50 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: redhat-lspp at redhat.com
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.82 
X-loop: redhat-lspp at redhat.com
Cc: James Morris <jmorris at redhat.com>,
 Stephen Smalley <sds at tycho.nsa.gov>
Subject: [redhat-lspp] [RFC KERNEL] object audit filters based on SELinux
	context
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-UID: 71436
X-Length: 10986

I recently noticed that we never got around to doing object filters
based on context...  This patch introduces object audit filters
based on the fields of the SELinux context.  I put in everything
(user, role, type, levels) even though I don't think user and role
will be of use.  I'm also open to names on the filters because I
couldn't really think of anything that sounded really good
(especially for the object's mls - "ol1 means object level 1" and
"ol2 means object level2"...).  So, I'll trim and rename if people
want that.  This is just the kernel part, the userspace patch to
handle these fields is forthcoming.  One more thing - this patch
only checks the contexts of filesystem objects.  We also collect
sids for ipc objects in the aux structs, should I also loop through
those and filter based on the sids contained in AUDIT_IPC records?


 include/linux/audit.h          |    5 +++++
 kernel/auditfilter.c           |   25 +++++++++++++++++++++++++
 kernel/auditsc.c               |   25 +++++++++++++++++++++++++
 security/selinux/ss/services.c |   17 ++++++++++++++++-
 4 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index f7883ec..f0857d6 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -158,6 +158,11 @@ #define AUDIT_SE_TYPE	15	/* security lab
 #define AUDIT_SE_SEN	16	/* security label sensitivity label */
 #define AUDIT_SE_CLR	17	/* security label clearance label */
 #define AUDIT_PPID	18
+#define AUDIT_SE_OUSER	19
+#define AUDIT_SE_OROLE	20
+#define AUDIT_SE_OTYPE	21
+#define AUDIT_SE_OL1	22
+#define AUDIT_SE_OL2	23
 
 				/* These are ONLY useful when checking
 				 * at syscall exit time (AUDIT_AT_EXIT). */
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index e98db08..6d77d1d 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -475,6 +475,11 @@ static struct audit_entry *audit_data_to
 		case AUDIT_SE_TYPE:
 		case AUDIT_SE_SEN:
 		case AUDIT_SE_CLR:
+		case AUDIT_SE_OUSER:
+		case AUDIT_SE_OROLE:
+		case AUDIT_SE_OTYPE:
+		case AUDIT_SE_OL1:
+		case AUDIT_SE_OL2:
 			str = audit_unpack_string(&bufp, &remain, f->val);
 			if (IS_ERR(str))
 				goto exit_free;
@@ -616,6 +621,11 @@ static struct audit_rule_data *audit_kru
 		case AUDIT_SE_TYPE:
 		case AUDIT_SE_SEN:
 		case AUDIT_SE_CLR:
+		case AUDIT_SE_OUSER:
+		case AUDIT_SE_OROLE:
+		case AUDIT_SE_OTYPE:
+		case AUDIT_SE_OL1:
+		case AUDIT_SE_OL2:
 			data->buflen += data->values[i] =
 				audit_pack_string(&bufp, f->se_str);
 			break;
@@ -659,6 +669,11 @@ static int audit_compare_rule(struct aud
 		case AUDIT_SE_TYPE:
 		case AUDIT_SE_SEN:
 		case AUDIT_SE_CLR:
+		case AUDIT_SE_OUSER:
+		case AUDIT_SE_OROLE:
+		case AUDIT_SE_OTYPE:
+		case AUDIT_SE_OL1:
+		case AUDIT_SE_OL2:
 			if (strcmp(a->fields[i].se_str, b->fields[i].se_str))
 				return 1;
 			break;
@@ -779,6 +794,11 @@ static struct audit_entry *audit_dupe_ru
 		case AUDIT_SE_TYPE:
 		case AUDIT_SE_SEN:
 		case AUDIT_SE_CLR:
+		case AUDIT_SE_OUSER:
+		case AUDIT_SE_OROLE:
+		case AUDIT_SE_OTYPE:
+		case AUDIT_SE_OL1:
+		case AUDIT_SE_OL2:
 			err = audit_dupe_selinux_field(&new->fields[i],
 						       &old->fields[i]);
 			break;
@@ -1542,6 +1562,11 @@ static inline int audit_rule_has_selinux
 		case AUDIT_SE_TYPE:
 		case AUDIT_SE_SEN:
 		case AUDIT_SE_CLR:
+		case AUDIT_SE_OUSER:
+		case AUDIT_SE_OROLE:
+		case AUDIT_SE_OTYPE:
+		case AUDIT_SE_OL1:
+		case AUDIT_SE_OL2:
 			return 1;
 		}
 	}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index b32ccfa..fa6ead8 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -342,6 +342,31 @@ static int audit_filter_rules(struct tas
 				                                  ctx);
 			}
 			break;
+		case AUDIT_SE_OUSER:
+		case AUDIT_SE_OROLE:
+		case AUDIT_SE_OTYPE:
+		case AUDIT_SE_OL1:
+		case AUDIT_SE_OL2:
+			/* The above note for AUDIT_SE_USER...AUDIT_SE_CLR
+			   also applies here */
+			if (f->se_rule) {
+				if (name) {
+					result = selinux_audit_rule_match(
+					           name->osid, f->type, f->op,
+					           f->se_rule, ctx);
+				} else if (ctx) {
+					for (j = 0; j < ctx->name_count; j++) {
+						if (selinux_audit_rule_match(
+						      ctx->names[j].osid,
+						      f->type, f->op,
+						      f->se_rule, ctx)) {
+							++result;
+							break;
+						}
+					}
+				}
+			}
+			break;
 		case AUDIT_ARG0:
 		case AUDIT_ARG1:
 		case AUDIT_ARG2:
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index d82898c..5d0edd0 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1858,12 +1858,17 @@ int selinux_audit_rule_init(u32 field, u
 	case AUDIT_SE_USER:
 	case AUDIT_SE_ROLE:
 	case AUDIT_SE_TYPE:
+	case AUDIT_SE_OUSER:
+	case AUDIT_SE_OROLE:
+	case AUDIT_SE_OTYPE:
 		/* only 'equals' and 'not equals' fit user, role, and type */
 		if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL)
 			return -EINVAL;
 		break;
 	case AUDIT_SE_SEN:
 	case AUDIT_SE_CLR:
+	case AUDIT_SE_OL1:
+	case AUDIT_SE_OL2:
 		/* we do not allow a range, indicated by the presense of '-' */
 		if (strchr(rulestr, '-'))
 			return -EINVAL;
@@ -1885,6 +1890,7 @@ int selinux_audit_rule_init(u32 field, u
 
 	switch (field) {
 	case AUDIT_SE_USER:
+	case AUDIT_SE_OUSER:
 		userdatum = hashtab_search(policydb.p_users.table, rulestr);
 		if (!userdatum)
 			rc = -EINVAL;
@@ -1892,6 +1898,7 @@ int selinux_audit_rule_init(u32 field, u
 			tmprule->au_ctxt.user = userdatum->value;
 		break;
 	case AUDIT_SE_ROLE:
+	case AUDIT_SE_OROLE:
 		roledatum = hashtab_search(policydb.p_roles.table, rulestr);
 		if (!roledatum)
 			rc = -EINVAL;
@@ -1899,6 +1906,7 @@ int selinux_audit_rule_init(u32 field, u
 			tmprule->au_ctxt.role = roledatum->value;
 		break;
 	case AUDIT_SE_TYPE:
+	case AUDIT_SE_OTYPE:
 		typedatum = hashtab_search(policydb.p_types.table, rulestr);
 		if (!typedatum)
 			rc = -EINVAL;
@@ -1907,6 +1915,8 @@ int selinux_audit_rule_init(u32 field, u
 		break;
 	case AUDIT_SE_SEN:
 	case AUDIT_SE_CLR:
+	case AUDIT_SE_OL1:
+	case AUDIT_SE_OL2:
 		rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC);
 		break;
 	}
@@ -1959,6 +1969,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 	   without a match */
 	switch (field) {
 	case AUDIT_SE_USER:
+	case AUDIT_SE_OUSER:
 		switch (op) {
 		case AUDIT_EQUAL:
 			match = (ctxt->user == rule->au_ctxt.user);
@@ -1969,6 +1980,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 		}
 		break;
 	case AUDIT_SE_ROLE:
+	case AUDIT_SE_OROLE:
 		switch (op) {
 		case AUDIT_EQUAL:
 			match = (ctxt->role == rule->au_ctxt.role);
@@ -1979,6 +1991,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 		}
 		break;
 	case AUDIT_SE_TYPE:
+	case AUDIT_SE_OTYPE:
 		switch (op) {
 		case AUDIT_EQUAL:
 			match = (ctxt->type == rule->au_ctxt.type);
@@ -1990,7 +2003,9 @@ int selinux_audit_rule_match(u32 ctxid, 
 		break;
 	case AUDIT_SE_SEN:
 	case AUDIT_SE_CLR:
-		level = (field == AUDIT_SE_SEN ?
+	case AUDIT_SE_OL1:
+	case AUDIT_SE_OL2:
+		level = ((field == AUDIT_SE_SEN || field == AUDIT_SE_OL1) ?
 		         &ctxt->range.level[0] : &ctxt->range.level[1]);
 		switch (op) {
 		case AUDIT_EQUAL:

-- 

Darrel

--
redhat-lspp mailing list
redhat-lspp at redhat.com
https://www.redhat.com/mailman/listinfo/redhat-lspp


linux-2.6-net-label_1_8.patch:
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++++++++++
 Documentation/netlabel/introduction.txt                   |   53 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 7 files changed, 948 insertions(+)

--- NEW FILE linux-2.6-net-label_1_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:32 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:00:58 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN0wsM032501
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:00:58 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN0vq3026094;
	Tue, 27 Jun 2006 19:00:57 -0400
Received: from atlrel6.hp.com (atlrel6.hp.com [156.153.255.205])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN0tqr000802;
	Tue, 27 Jun 2006 19:00:56 -0400
Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127])
	by atlrel6.hp.com (Postfix) with ESMTP id 9910D35205;
	Tue, 27 Jun 2006 19:00:50 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 0A79527128;
	Tue, 27 Jun 2006 23:00:49 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0n51030639;
	Tue, 27 Jun 2006 19:00:49 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0n1m030638;
	Tue, 27 Jun 2006 19:00:49 -0400
Message-Id: <20060627230049.096133000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:32 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 1/8] NetLabel: documentation
Content-Disposition: inline; filename=netlabel-documentation
X-RedHat-Spam-Score: -99.683 
Content-Type: 
X-UID: 72032
X-Length: 42933

Documentation for the NetLabel system, this includes a basic overview of how
NetLabel works and how LSM developers can integrate it into their favorite
LSM.  Also, due to the difficulty of finding expired IETF drafts, I am
including the IETF CIPSO draft that is the basis of the NetLabel CIPSO
implementation.
---
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  791 ++++++++++++++
 Documentation/netlabel/introduction.txt                   |   53 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 7 files changed, 958 insertions(+)

Index: linux-2.6.17.i686-quilt/CREDITS
===================================================================
--- linux-2.6.17.i686-quilt.orig/CREDITS
+++ linux-2.6.17.i686-quilt/CREDITS
@@ -2383,6 +2383,13 @@ N: Thomas Molina
 E: tmolina at cablespeed.com
 D: bug fixes, documentation, minor hackery
 
+N: Paul Moore
+E: paul.moore at hp.com
+D: NetLabel author
+S: Hewlett-Packard
+S: 110 Spit Brook Road
+S: Nashua, NH 03062
+
 N: James Morris
 E: jmorris at namei.org
 W: http://namei.org/
Index: linux-2.6.17.i686-quilt/Documentation/00-INDEX
===================================================================
--- linux-2.6.17.i686-quilt.orig/Documentation/00-INDEX
+++ linux-2.6.17.i686-quilt/Documentation/00-INDEX
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/00-INDEX
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/00-INDEX
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/cipso_ipv4.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/cipso_ipv4.txt
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
+labeled networking and is used in many trusted operating systems.
+
+ * Outbound Packet Processing
+
+The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
+adding the CIPSO label to the socket.  This causes all packets leaving the
+system through the socket to have the CIPSO IP option applied.  The socket's
+CIPSO label can be changed at any point in time, however, it is recommended
+that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
+label by using the NetLabel security module API; if the NetLabel "domain" is
+configured to use CIPSO for packet labeling then a CIPSO IP option will be
+generated and attached to the socket.
+
+ * Inbound Packet Processing
+
+The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
+IP layer without any special handling required by the LSM.  However, in order
+to decode and translate the CIPSO label on the packet the LSM must use the
+NetLabel security module API to extract the security attributes of the packet.
+This is typically done at the socket layer using the 'socket_sock_rcv_skb()'
+LSM hook.
+
+ * Label Translation
+
+The CIPSO/IPv4 protocol engine contains a mechanism to translate CIPSO security
+attributes such as sensitivity level and category to values which are
+appropriate for the host.  These mappings are defined as part of a CIPSO
+Domain Of Interpretation (DOI) definition and are configured through the
+NetLabel user space communication layer.  Each DOI definition can have a
+different security attribute mapping table.
+
+ * Label Translation Cache
+
+The NetLabel system provides a framework for caching security attribute
+mappings from the network labels to the corresponding LSM identifiers.  The
+CIPSO/IPv4 protocol engine supports this caching mechanism.
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
@@ -0,0 +1,791 @@
+IETF CIPSO Working Group
+16 July, 1992
+
+
+
+                 COMMERCIAL IP SECURITY OPTION (CIPSO 2.2)
+
+
+
+1.    Status
+
+This Internet Draft provides the high level specification for a Commercial
+IP Security Option (CIPSO).  This draft reflects the version as approved by
+the CIPSO IETF Working Group.  Distribution of this memo is unlimited.
+
+This document is an Internet Draft.  Internet Drafts are working documents
+of the Internet Engineering Task Force (IETF), its Areas, and its Working
+Groups. Note that other groups may also distribute working documents as
+Internet Drafts.
+
+Internet Drafts are draft documents valid for a maximum of six months.
+Internet Drafts may be updated, replaced, or obsoleted by other documents
+at any time.  It is not appropriate to use Internet Drafts as reference
+material or to cite them other than as a "working draft" or "work in
+progress."
+
+Please check the I-D abstract listing contained in each Internet Draft
+directory to learn the current status of this or any other Internet Draft.
+
+
+
+
+2.    Background
+
+Currently the Internet Protocol includes two security options.  One of
+these options is the DoD Basic Security Option (BSO) (Type 130) which allows
+IP datagrams to be labeled with security classifications.  This option
+provides sixteen security classifications and a variable number of handling
+restrictions.  To handle additional security information, such as security
+categories or compartments, another security option (Type 133) exists and
+is referred to as the DoD Extended Security Option (ESO).  The values for
+the fixed fields within these two options are administered by the Defense
+Information Systems Agency (DISA).
+
+Computer vendors are now building commercial operating systems with
+mandatory access controls and multi-level security.  These systems are
+no longer built specifically for a particular group in the defense or
+intelligence communities.  They are generally available commercial systems
+for use in a variety of government and civil sector environments.
+
+The small number of ESO format codes can not support all the possible
+applications of a commercial security option.  The BSO and ESO were
+designed to only support the United States DoD.  CIPSO has been designed
+to support multiple security policies.  This Internet Draft provides the
+format and procedures required to support a Mandatory Access Control
+security policy.  Support for additional security policies shall be
+defined in future RFCs.
+
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 1]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+
+3.    CIPSO Format
+
+Option type: 134 (Class 0, Number 6, Copy on Fragmentation)
+Option length: Variable
+
+This option permits security related information to be passed between
+systems within a single Domain of Interpretation (DOI).  A DOI is a
+collection of systems which agree on the meaning of particular values
+in the security option.  An authority that has been assigned a DOI
+identifier will define a mapping between appropriate CIPSO field values
+and their human readable equivalent.  This authority will distribute that
+mapping to hosts within the authority's domain.  These mappings may be
+sensitive, therefore a DOI authority is not required to make these
+mappings available to anyone other than the systems that are included in
+the DOI.
+
+This option MUST be copied on fragmentation.  This option appears at most
+once in a datagram.  All multi-octet fields in the option are defined to be
+transmitted in network byte order.  The format of this option is as follows:
+
++----------+----------+------//------+-----------//---------+
+| 10000110 | LLLLLLLL | DDDDDDDDDDDD | TTTTTTTTTTTTTTTTTTTT |
++----------+----------+------//------+-----------//---------+
+
+  TYPE=134    OPTION    DOMAIN OF               TAGS
+              LENGTH    INTERPRETATION
+
+
+                Figure 1. CIPSO Format
+
+
+3.1    Type
+
+This field is 1 octet in length.  Its value is 134.
+
+
+3.2    Length
+
+This field is 1 octet in length.  It is the total length of the option
+including the type and length fields.  With the current IP header length
+restriction of 40 octets the value of this field MUST not exceed 40.
+
+
+3.3    Domain of Interpretation Identifier
+
+This field is an unsigned 32 bit integer.  The value 0 is reserved and MUST
+not appear as the DOI identifier in any CIPSO option.  Implementations
+should assume that the DOI identifier field is not aligned on any particular
+byte boundary.
+
+To conserve space in the protocol, security levels and categories are
+represented by numbers rather than their ASCII equivalent.  This requires
+a mapping table within CIPSO hosts to map these numbers to their
+corresponding ASCII representations.  Non-related groups of systems may
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 2]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+have their own unique mappings.  For example, one group of systems may
+use the number 5 to represent Unclassified while another group may use the
+number 1 to represent that same security level.  The DOI identifier is used
+to identify which mapping was used for the values within the option.
+
+
+3.4    Tag Types
+
+A common format for passing security related information is necessary
+for interoperability.  CIPSO uses sets of "tags" to contain the security
+information relevant to the data in the IP packet.  Each tag begins with
+a tag type identifier followed by the length of the tag and ends with the
+actual security information to be passed.  All multi-octet fields in a tag
+are defined to be transmitted in network byte order.  Like the DOI
+identifier field in the CIPSO header, implementations should assume that
+all tags, as well as fields within a tag, are not aligned on any particular
+octet boundary.   The tag types defined in this document contain alignment
+bytes to assist alignment of some information, however alignment can not
+be guaranteed if CIPSO is not the first IP option.
+
+CIPSO tag types 0 through 127 are reserved for defining standard tag
+formats.  Their definitions will be published in RFCs.  Tag types whose
+identifiers are greater than 127 are defined by the DOI authority and may
+only be meaningful in certain Domains of Interpretation.  For these tag
+types, implementations will require the DOI identifier as well as the tag
+number to determine the security policy and the format associated with the
+tag.  Use of tag types above 127 are restricted to closed networks where
+interoperability with other networks will not be an issue.  Implementations
+that support a tag type greater than 127 MUST support at least one DOI that
+requires only tag types 1 to 127.
+
+Tag type 0 is reserved. Tag types 1, 2, and 5 are defined in this
+Internet Draft.  Types 3 and 4 are reserved for work in progress.
+The standard format for all current and future CIPSO tags is shown below:
+
++----------+----------+--------//--------+
+| TTTTTTTT | LLLLLLLL | IIIIIIIIIIIIIIII |
++----------+----------+--------//--------+
+    TAG       TAG         TAG
+    TYPE      LENGTH      INFORMATION
+
+    Figure 2:  Standard Tag Format
+
+In the three tag types described in this document, the length and count
+restrictions are based on the current IP limitation of 40 octets for all
+IP options.  If the IP header is later expanded, then the length and count
+restrictions specified in this document may increase to use the full area
+provided for IP options.
+
+
+3.4.1    Tag Type Classes
+
+Tag classes consist of tag types that have common processing requirements
+and support the same security policy.  The three tags defined in this
+Internet Draft belong to the Mandatory Access Control (MAC) Sensitivity
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 3]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+class and support the MAC Sensitivity security policy.
+
+
+3.4.2    Tag Type 1
+
+This is referred to as the "bit-mapped" tag type.  Tag type 1 is included
+in the MAC Sensitivity tag type class.  The format of this tag type is as
+follows:
+
++----------+----------+----------+----------+--------//---------+
+| 00000001 | LLLLLLLL | 00000000 | LLLLLLLL | CCCCCCCCCCCCCCCCC |
++----------+----------+----------+----------+--------//---------+
+
+    TAG       TAG      ALIGNMENT  SENSITIVITY    BIT MAP OF
+    TYPE      LENGTH   OCTET      LEVEL          CATEGORIES
+
+            Figure 3. Tag Type 1 Format
+
+
+3.4.2.1    Tag Type
+
+This field is 1 octet in length and has a value of 1.
+
+
+3.4.2.2    Tag Length
+
+This field is 1 octet in length.  It is the total length of the tag type
+including the type and length fields.  With the current IP header length
+restriction of 40 bytes the value within this field is between 4 and 34.
+
+
+3.4.2.3    Alignment Octet
+
+This field is 1 octet in length and always has the value of 0.  Its purpose
+is to align the category bitmap field on an even octet boundary.  This will
+speed many implementations including router implementations.
+
+
+3.4.2.4    Sensitivity Level
+
+This field is 1 octet in length.  Its value is from 0 to 255.  The values
+are ordered with 0 being the minimum value and 255 representing the maximum
+value.
+
+
+3.4.2.5    Bit Map of Categories
+
+The length of this field is variable and ranges from 0 to 30 octets.  This
+provides representation of categories 0 to 239.  The ordering of the bits
+is left to right or MSB to LSB.  For example category 0 is represented by
+the most significant bit of the first byte and category 15 is represented
+by the least significant bit of the second byte.  Figure 4 graphically
+shows this ordering.  Bit N is binary 1 if category N is part of the label
+for the datagram, and bit N is binary 0 if category N is not part of the
+label.  Except for the optimized tag 1 format described in the next section,
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 4]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+minimal encoding SHOULD be used resulting in no trailing zero octets in the
+category bitmap.
+
+        octet 0  octet 1  octet 2  octet 3  octet 4  octet 5
+        XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX . . .
+bit     01234567 89111111 11112222 22222233 33333333 44444444
+number             012345 67890123 45678901 23456789 01234567
+
+            Figure 4. Ordering of Bits in Tag 1 Bit Map
+
+
+3.4.2.6    Optimized Tag 1 Format
+
+Routers work most efficiently when processing fixed length fields.  To
+support these routers there is an optimized form of tag type 1.  The format
+does not change.  The only change is to the category bitmap which is set to
+a constant length of 10 octets.  Trailing octets required to fill out the 10
+octets are zero filled.  Ten octets, allowing for 80 categories, was chosen
+because it makes the total length of the CIPSO option 20 octets.  If CIPSO
+is the only option then the option will be full word aligned and additional
+filler octets will not be required.
+
+
+3.4.3    Tag Type 2
+
+This is referred to as the "enumerated" tag type.  It is used to describe
+large but sparsely populated sets of categories.  Tag type 2 is in the MAC
+Sensitivity tag type class.  The format of this tag type is as follows:
+
++----------+----------+----------+----------+-------------//-------------+
+| 00000010 | LLLLLLLL | 00000000 | LLLLLLLL | CCCCCCCCCCCCCCCCCCCCCCCCCC |
++----------+----------+----------+----------+-------------//-------------+
+
+    TAG       TAG      ALIGNMENT  SENSITIVITY         ENUMERATED
+    TYPE      LENGTH   OCTET      LEVEL               CATEGORIES
+
+                Figure 5. Tag Type 2 Format
+
+
+3.4.3.1     Tag Type
+
+This field is one octet in length and has a value of 2.
+
+
+3.4.3.2    Tag Length
+
+This field is 1 octet in length. It is the total length of the tag type
+including the type and length fields.  With the current IP header length
+restriction of 40 bytes the value within this field is between 4 and 34.
+
+
+3.4.3.3    Alignment Octet
+
+This field is 1 octet in length and always has the value of 0.  Its purpose
+is to align the category field on an even octet boundary.  This will
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 5]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+speed many implementations including router implementations.
+
+
+3.4.3.4    Sensitivity Level
+
+This field is 1 octet in length. Its value is from 0 to 255.  The values
+are ordered with 0 being the minimum value and 255 representing the
+maximum value.
+
+
+3.4.3.5    Enumerated Categories
+
+In this tag, categories are represented by their actual value rather than
+by their position within a bit field.  The length of each category is 2
+octets.  Up to 15 categories may be represented by this tag.  Valid values
+for categories are 0 to 65534.  Category 65535 is not a valid category
+value.  The categories MUST be listed in ascending order within the tag.
+
+
+3.4.4    Tag Type 5
+
+This is referred to as the "range" tag type.  It is used to represent
+labels where all categories in a range, or set of ranges, are included
+in the sensitivity label.  Tag type 5 is in the MAC Sensitivity tag type
+class.  The format of this tag type is as follows:
+
++----------+----------+----------+----------+------------//-------------+
+| 00000101 | LLLLLLLL | 00000000 | LLLLLLLL |  Top/Bottom | Top/Bottom  |
++----------+----------+----------+----------+------------//-------------+
+
+    TAG       TAG      ALIGNMENT  SENSITIVITY        CATEGORY RANGES
+    TYPE      LENGTH   OCTET      LEVEL
+
+                     Figure 6. Tag Type 5 Format
+
+
+3.4.4.1     Tag Type
+
+This field is one octet in length and has a value of 5.
+
+
+3.4.4.2    Tag Length
+
+This field is 1 octet in length. It is the total length of the tag type
+including the type and length fields.  With the current IP header length
+restriction of 40 bytes the value within this field is between 4 and 34.
+
+
+3.4.4.3    Alignment Octet
+
+This field is 1 octet in length and always has the value of 0.  Its purpose
+is to align the category range field on an even octet boundary.  This will
+speed many implementations including router implementations.
+
+
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 6]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+3.4.4.4    Sensitivity Level
+
+This field is 1 octet in length. Its value is from 0 to 255.  The values
+are ordered with 0 being the minimum value and 255 representing the maximum
+value.
+
+
+3.4.4.5    Category Ranges
+
+A category range is a 4 octet field comprised of the 2 octet index of the
+highest numbered category followed by the 2 octet index of the lowest
+numbered category.  These range endpoints are inclusive within the range of
+categories.  All categories within a range are included in the sensitivity
+label.  This tag may contain a maximum of 7 category pairs.  The bottom
+category endpoint for the last pair in the tag MAY be omitted and SHOULD be
+assumed to be 0.  The ranges MUST be non-overlapping and be listed in
+descending order.  Valid values for categories are 0 to 65534.  Category
+65535 is not a valid category value.
+
+
+3.4.5     Minimum Requirements
+
+A CIPSO implementation MUST be capable of generating at least tag type 1 in
+the non-optimized form.  In addition, a CIPSO implementation MUST be able
+to receive any valid tag type 1 even those using the optimized tag type 1
+format.
+
+
+4.    Configuration Parameters
+
+The configuration parameters defined below are required for all CIPSO hosts,
+gateways, and routers that support multiple sensitivity labels.  A CIPSO
+host is defined to be the origination or destination system for an IP
+datagram.  A CIPSO gateway provides IP routing services between two or more
+IP networks and may be required to perform label translations between
+networks.  A CIPSO gateway may be an enhanced CIPSO host or it may just
+provide gateway services with no end system CIPSO capabilities.  A CIPSO
+router is a dedicated IP router that routes IP datagrams between two or more
+IP networks.
+
+An implementation of CIPSO on a host MUST have the capability to reject a
+datagram for reasons that the information contained can not be adequately
+protected by the receiving host or if acceptance may result in violation of
+the host or network security policy.  In addition, a CIPSO gateway or router
+MUST be able to reject datagrams going to networks that can not provide
+adequate protection or may violate the network's security policy.  To
+provide this capability the following minimal set of configuration
+parameters are required for CIPSO implementations:
+
+HOST_LABEL_MAX - This parameter contains the maximum sensitivity label that
+a CIPSO host is authorized to handle.  All datagrams that have a label
+greater than this maximum MUST be rejected by the CIPSO host.  This
+parameter does not apply to CIPSO gateways or routers.  This parameter need
+not be defined explicitly as it can be implicitly derived from the
+PORT_LABEL_MAX parameters for the associated interfaces.
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 7]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+
+HOST_LABEL_MIN - This parameter contains the minimum sensitivity label that
+a CIPSO host is authorized to handle.  All datagrams that have a label less
+than this minimum MUST be rejected by the CIPSO host.  This parameter does
+not apply to CIPSO gateways or routers.  This parameter need not be defined
+explicitly as it can be implicitly derived from the PORT_LABEL_MIN
+parameters for the associated interfaces.
+
+PORT_LABEL_MAX - This parameter contains the maximum sensitivity label for
+all datagrams that may exit a particular network interface port.  All
+outgoing datagrams that have a label greater than this maximum MUST be
+rejected by the CIPSO system.  The label within this parameter MUST be
+less than or equal to the label within the HOST_LABEL_MAX parameter.  This
+parameter does not apply to CIPSO hosts that support only one network port.
+
+PORT_LABEL_MIN - This parameter contains the minimum sensitivity label for
+all datagrams that may exit a particular network interface port.  All
+outgoing datagrams that have a label less than this minimum MUST be
+rejected by the CIPSO system.  The label within this parameter MUST be
+greater than or equal to the label within the HOST_LABEL_MIN parameter.
+This parameter does not apply to CIPSO hosts that support only one network
+port.
+
+PORT_DOI - This parameter is used to assign a DOI identifier value to a
+particular network interface port.  All CIPSO labels within datagrams
+going out this port MUST use the specified DOI identifier.  All CIPSO
+hosts and gateways MUST support either this parameter, the NET_DOI
+parameter, or the HOST_DOI parameter.
+
+NET_DOI - This parameter is used to assign a DOI identifier value to a
+particular IP network address.  All CIPSO labels within datagrams destined
+for the particular IP network MUST use the specified DOI identifier.  All
+CIPSO hosts and gateways MUST support either this parameter, the PORT_DOI
+parameter, or the HOST_DOI parameter.
+
+HOST_DOI - This parameter is used to assign a DOI identifier value to a
+particular IP host address.  All CIPSO labels within datagrams destined for
+the particular IP host will use the specified DOI identifier.  All CIPSO
+hosts and gateways MUST support either this parameter, the PORT_DOI
+parameter, or the NET_DOI parameter.
+
+This list represents the minimal set of configuration parameters required
+to be compliant.  Implementors are encouraged to add to this list to
+provide enhanced functionality and control.  For example, many security
+policies may require both incoming and outgoing datagrams be checked against
+the port and host label ranges.
+
+
+4.1    Port Range Parameters
+
+The labels represented by the PORT_LABEL_MAX and PORT_LABEL_MIN parameters
+MAY be in CIPSO or local format.  Some CIPSO systems, such as routers, may
+want to have the range parameters expressed in CIPSO format so that incoming
+labels do not have to be converted to a local format before being compared
+against the range.  If multiple DOIs are supported by one of these CIPSO
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 8]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+systems then multiple port range parameters would be needed, one set for
+each DOI supported on a particular port.
+
+The port range will usually represent the total set of labels that may
+exist on the logical network accessed through the corresponding network
+interface.  It may, however, represent a subset of these labels that are
+allowed to enter the CIPSO system.
+
+
+4.2    Single Label CIPSO Hosts
+
+CIPSO implementations that support only one label are not required to
+support the parameters described above.  These limited implementations are
+only required to support a NET_LABEL parameter.  This parameter contains
+the CIPSO label that may be inserted in datagrams that exit the host.  In
+addition, the host MUST reject any incoming datagram that has a label which
+is not equivalent to the NET_LABEL parameter.
+
+
+5.    Handling Procedures
+
+This section describes the processing requirements for incoming and
+outgoing IP datagrams.  Just providing the correct CIPSO label format
+is not enough.  Assumptions will be made by one system on how a
+receiving system will handle the CIPSO label.  Wrong assumptions may
+lead to non-interoperability or even a security incident.  The
+requirements described below represent the minimal set needed for
+interoperability and that provide users some level of confidence.
+Many other requirements could be added to increase user confidence,
+however at the risk of restricting creativity and limiting vendor
+participation.
+
+
+5.1    Input Procedures
+
+All datagrams received through a network port MUST have a security label
+associated with them, either contained in the datagram or assigned to the
+receiving port.  Without this label the host, gateway, or router will not
+have the information it needs to make security decisions.  This security
+label will be obtained from the CIPSO if the option is present in the
+datagram.  See section 4.1.2 for handling procedures for unlabeled
+datagrams.  This label will be compared against the PORT (if appropriate)
+and HOST configuration parameters defined in section 3.
+
+If any field within the CIPSO option, such as the DOI identifier, is not
+recognized the IP datagram is discarded and an ICMP "parameter problem"
+(type 12) is generated and returned.  The ICMP code field is set to "bad
+parameter" (code 0) and the pointer is set to the start of the CIPSO field
+that is unrecognized.
+
+If the contents of the CIPSO are valid but the security label is
+outside of the configured host or port label range, the datagram is
+discarded and an ICMP "destination unreachable" (type 3) is generated
+and returned.  The code field of the ICMP is set to "communication with
+destination network administratively prohibited" (code 9) or to
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 9]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+"communication with destination host administratively prohibited"
+(code 10).  The value of the code field used is dependent upon whether
+the originator of the ICMP message is acting as a CIPSO host or a CIPSO
+gateway.  The recipient of the ICMP message MUST be able to handle either
+value.  The same procedure is performed if a CIPSO can not be added to an
+IP packet because it is too large to fit in the IP options area.
+
+If the error is triggered by receipt of an ICMP message, the message
+is discarded and no response is permitted (consistent with general ICMP
+processing rules).
+
+
+5.1.1    Unrecognized tag types
+
+The default condition for any CIPSO implementation is that an
+unrecognized tag type MUST be treated as a "parameter problem" and
+handled as described in section 4.1.  A CIPSO implementation MAY allow
+the system administrator to identify tag types that may safely be
+ignored.  This capability is an allowable enhancement, not a
+requirement.
+
+
+5.1.2    Unlabeled Packets
+
+A network port may be configured to not require a CIPSO label for all
+incoming  datagrams.  For this configuration a CIPSO label must be
+assigned to that network port and associated with all unlabeled IP
+datagrams.  This capability might be used for single level networks or
+networks that have CIPSO and non-CIPSO hosts and the non-CIPSO hosts
+all operate at the same label.
+
+If a CIPSO option is required and none is found, the datagram is
+discarded and an ICMP "parameter problem" (type 12) is generated and
+returned to the originator of the datagram.  The code field of the ICMP
+is set to "option missing" (code 1) and the ICMP pointer is set to 134
+(the value of the option type for the missing CIPSO option).
+
+
+5.2    Output Procedures
+
+A CIPSO option MUST appear only once in a datagram.  Only one tag type
+from the MAC Sensitivity class MAY be included in a CIPSO option.  Given
+the current set of defined tag types, this means that CIPSO labels at
+first will contain only one tag.
+
+All datagrams leaving a CIPSO system MUST meet the following condition:
+
+        PORT_LABEL_MIN <= CIPSO label <= PORT_LABEL_MAX
+
+If this condition is not satisfied the datagram MUST be discarded.
+If the CIPSO system only supports one port, the HOST_LABEL_MIN and the
+HOST_LABEL_MAX parameters MAY be substituted for the PORT parameters in
+the above condition.
+
+The DOI identifier to be used for all outgoing datagrams is configured by
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 10]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+the administrator.  If port level DOI identifier assignment is used, then
+the PORT_DOI configuration parameter MUST contain the DOI identifier to
+use.  If network level DOI assignment is used, then the NET_DOI parameter
+MUST contain the DOI identifier to use.  And if host level DOI assignment
+is employed, then the HOST_DOI parameter MUST contain the DOI identifier
+to use.  A CIPSO implementation need only support one level of DOI
+assignment.
+
+
+5.3    DOI Processing Requirements
+
+A CIPSO implementation MUST support at least one DOI and SHOULD support
+multiple DOIs.  System and network administrators are cautioned to
+ensure that at least one DOI is common within an IP network to allow for
+broadcasting of IP datagrams.
+
+CIPSO gateways MUST be capable of translating a CIPSO option from one
+DOI to another when forwarding datagrams between networks.  For
+efficiency purposes this capability is only a desired feature for CIPSO
+routers.
+
+
+5.4    Label of ICMP Messages
+
+The CIPSO label to be used on all outgoing ICMP messages MUST be equivalent
+to the label of the datagram that caused the ICMP message.  If the ICMP was
+generated due to a problem associated with the original CIPSO label then the
+following responses are allowed:
+
+  a.  Use the CIPSO label of the original IP datagram
+  b.  Drop the original datagram with no return message generated
+
+In most cases these options will have the same effect.  If you can not
+interpret the label or if it is outside the label range of your host or
+interface then an ICMP message with the same label will probably not be
+able to exit the system.
+
+
+6.    Assignment of DOI Identifier Numbers                                   =
+
+Requests for assignment of a DOI identifier number should be addressed to
+the Internet Assigned Numbers Authority (IANA).
+
+
+7.    Acknowledgements
+
+Much of the material in this RFC is based on (and copied from) work
+done by Gary Winiger of Sun Microsystems and published as Commercial
+IP Security Option at the INTEROP 89, Commercial IPSO Workshop.
+
+
+8.    Author's Address
+
+To submit mail for distribution to members of the IETF CIPSO Working
+Group, send mail to: cipso at wdl1.wdl.loral.com.
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 11]
+
+
+
+CIPSO INTERNET DRAFT                                         16 July, 1992
+
+
+
+
+To be added to or deleted from this distribution, send mail to:
+cipso-request at wdl1.wdl.loral.com.
+
+
+9.    References
+
+RFC 1038, "Draft Revised IP Security Option", M. St. Johns, IETF, January
+1988.
+
+RFC 1108, "U.S. Department of Defense Security Options
+for the Internet Protocol", Stephen Kent, IAB, 1 March, 1991.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Internet Draft, Expires 15 Jan 93                                 [PAGE 12]
+
+
+
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/introduction.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/introduction.txt
@@ -0,0 +1,53 @@
+NetLabel Introduction
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+June 27, 2006
+
+ * Overview
+
+NetLabel is a mechanism which can be used by kernel security modules to attach
+security attributes to outgoing network packets generated from user space
+applications and read security attributes from incoming network packets.  It
+is composed of four main components, the protocol engines, the communication
+layer, the kernel security module API, and the network stack operations.
+
+ * Protocol Engines
+
+The protocol engines are responsible for both applying and retrieving the
+network packet's security attributes.  If any translation between the network
+security attributes and those on the host are required then the protocol
+engine will handle those tasks as well.  Other kernel subsystems should
+refrain from calling the protocol engines directly, instead they should use
+the NetLabel kernel security module API described below.
+
+Detailed information about each NetLabel protocol engine can be found in this
+directory, consult '00-INDEX' for filenames.
+
+ * Communication Layer
+
+The communication layer exists to allow NetLabel configuration and monitoring
+from user space.  The NetLabel communication layer uses a message based
+protocol built on top of the Generic NETLINK transport mechanism.  The exact
+formatting of these NetLabel messages as well as the Generic NETLINK family
+names can be found in the the 'net/netlabel/' directory as comments in the
+header files as well as in 'include/net/netlabel.h'.
+
+ * Security Module API
+
+The purpose of the NetLabel security module API is to provide a protocol
+independent interface to the underlying NetLabel protocol engines.  In addition
+to protocol independence, the security module API is designed to be completely
+LSM independent which should allow multiple LSMs to leverage the same code
+base.
+
+Detailed information about the NetLabel security module API can be found in the
+'include/net/netlabel.h' header file as well as the 'lsm_interface.txt' file
+found in this directory.
+
+ * Network Stack Operations
+
+The reason for the network stack operations are to ensure the correct handling
+of the security attributes for kernel generated packets.  In general only the
+core network stack should call these functions.
+
Index: linux-2.6.17.i686-quilt/Documentation/netlabel/lsm_interface.txt
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/Documentation/netlabel/lsm_interface.txt
@@ -0,0 +1,47 @@
+NetLabel Linux Security Module Interface
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+NetLabel is a mechanism which can set and retrieve security attributes from
+network packets.  It is intended to be used by LSM developers who want to make
+use of a common code base for several different packet labeling protocols.
+The NetLabel security module API is defined in 'include/net/netlabel.h' but a
+brief overview is given below.
+
+ * NetLabel Security Attributes
+
+Since NetLabel supports multiple different packet labeling protocols and LSMs
+it uses the concept of security attributes to refer to the packet's security
+labels.  The NetLabel security attributes are defined by the
+'netlbl_lsm_secattr' structure in the NetLabel header file.  Internally the
+NetLabel subsystem converts the security attributes to and from the correct
+low-level packet label depending on the NetLabel build time and run time
+configuration.  It is up to the LSM developer to translate the NetLabel
+security attributes into whatever security identifiers are in use for their
+particular LSM.
+
+ * NetLabel LSM Protocol Operations
+
+These are the functions which allow the LSM developer to manipulate the labels
+on outgoing packets as well as read the labels on incoming packets.  Functions
+exist to operate both on sockets as well as the sk_buffs directly.  These high
+level functions are translated into low level protocol operations based on how
+the administrator has configured the NetLabel subsystem.
+
+ * NetLabel Label Mapping Cache Operations
+
+Depending on the exact configuration, translation between the network packet
+label and the internal LSM security identifier can be time consuming.  The
+NetLabel label mapping cache is a caching mechanism which can be used to
+sidestep much of this overhead once a mapping has been established.  Once the
+LSM has received a packet, used NetLabel to decode it's security attributes,
+and translated the security attributes into a LSM internal identifier the LSM
+can use the NetLabel caching functions to associate the LSM internal
+identifier with the network packet's label.  This means that in the future
+when a incoming packet matches a cached value not only are the internal
+NetLabel translation mechanisms bypassed but the LSM translation mechanisms are
+bypassed as well which should result in a significant reduction in overhead.

--
paul moore
linux security @ hp


linux-2.6-net-label_2_8.patch:
 include/linux/ip.h       |    1 
 include/net/cipso_ipv4.h |  251 ++++++++++++++++++++++++
 include/net/inet_sock.h  |    2 
 include/net/netlabel.h   |  488 +++++++++++++++++++++++++++++++++++++++++++++++
 net/ipv4/Makefile        |    1 
 net/ipv4/af_inet.c       |    3 
 net/ipv4/ah4.c           |    2 
 net/ipv4/ip_options.c    |   19 +
 8 files changed, 765 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-net-label_2_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:33 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:08 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN17sM032549
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:07 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN16uW026201;
	Tue, 27 Jun 2006 19:01:06 -0400
Received: from atlrel7.hp.com (atlrel7.hp.com [156.153.255.213])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5RN0wD2020720;
	Tue, 27 Jun 2006 19:00:58 -0400
Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127])
	by atlrel7.hp.com (Postfix) with ESMTP id 3FA95345D2;
	Tue, 27 Jun 2006 19:00:51 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id B6696270DB;
	Tue, 27 Jun 2006 23:00:50 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0oaA030668;
	Tue, 27 Jun 2006 19:00:50 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0oQ6030667;
	Tue, 27 Jun 2006 19:00:50 -0400
Message-Id: <20060627230049.766266000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:33 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 2/8] NetLabel: core network changes
Content-Disposition: inline; filename=netlabel-net_core-2.6.17
X-RedHat-Spam-Score: -99.822 
Content-Type: 
X-UID: 72039
X-Length: 27682

Changes to the core network stack to support the NetLabel subsystem.  This
includes changes to the IPv4 option handling to support CIPSO labels, and a new
NetLabel hook in inet_accept() to handle NetLabel attributes across a
accept()s done by in-kernel daemons.
---
 include/linux/ip.h       |    1 
 include/net/cipso_ipv4.h |  251 ++++++++++++++++++++++++
 include/net/inet_sock.h  |    2 
 include/net/netlabel.h   |  488 +++++++++++++++++++++++++++++++++++++++++++++++
 net/ipv4/Makefile        |    1 
 net/ipv4/af_inet.c       |    3 
 net/ipv4/ah4.c           |    2 
 net/ipv4/ip_options.c    |   19 +
 8 files changed, 765 insertions(+), 2 deletions(-)

Index: linux-2.6.17.i686-quilt/include/linux/ip.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/linux/ip.h
+++ linux-2.6.17.i686-quilt/include/linux/ip.h
@@ -57,6 +57,7 @@
 #define IPOPT_SEC	(2 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_LSRR	(3 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_TIMESTAMP	(4 |IPOPT_MEASUREMENT)
+#define IPOPT_CIPSO	(6 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_RR	(7 |IPOPT_CONTROL)
 #define IPOPT_SID	(8 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_SSRR	(9 |IPOPT_CONTROL|IPOPT_COPY)
Index: linux-2.6.17.i686-quilt/include/net/cipso_ipv4.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/include/net/cipso_ipv4.h
@@ -0,0 +1,251 @@
+/*
+ * CIPSO - Commercial IP Security Option
+ *
+ * This is an implementation of the CIPSO 2.2 protocol as specified in
+ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
+ * FIPS-188, copies of both documents can be found in the Documentation
+ * directory.  While CIPSO never became a full IETF RFC standard many vendors
+ * have chosen to adopt the protocol and over the years it has become a
+ * de-facto standard for labeled networking.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _CIPSO_IPV4_H
+#define _CIPSO_IPV4_H
+
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <net/netlabel.h>
+
+/* known doi values */
+#define CIPSO_V4_DOI_UNKNOWN          0x00000000
+
+/* tag types */
+#define CIPSO_V4_TAG_INVALID          0
+#define CIPSO_V4_TAG_RBITMAP          1
+#define CIPSO_V4_TAG_ENUM             2
+#define CIPSO_V4_TAG_RANGE            5
+#define CIPSO_V4_TAG_PBITMAP          6
+#define CIPSO_V4_TAG_FREEFORM         7
+
+/* doi mapping types */
+#define CIPSO_V4_MAP_UNKNOWN          0
+#define CIPSO_V4_MAP_STD              1
+#define CIPSO_V4_MAP_PASS             2
+
+/* limits */
+#define CIPSO_V4_MAX_REM_LVLS         256
+#define CIPSO_V4_INV_LVL              0x80000000
+#define CIPSO_V4_MAX_LOC_LVLS         (CIPSO_V4_INV_LVL - 1)
+#define CIPSO_V4_MAX_REM_CATS         65536
+#define CIPSO_V4_INV_CAT              0x80000000
+#define CIPSO_V4_MAX_LOC_CATS         (CIPSO_V4_INV_CAT - 1)
+
+/*
+ * CIPSO DOI definitions
+ */
+
+/* DOI definition struct */
+#define CIPSO_V4_TAG_MAXCNT           5
+struct cipso_v4_doi {
+	u32 doi;
+	u32 type;
+	union {
+		struct cipso_v4_std_map_tbl *std;
+	} map;
+	u8 tags[CIPSO_V4_TAG_MAXCNT];
+
+	u32 valid;
+	struct list_head list;
+	struct rcu_head rcu;
+	struct list_head dom_list;
+};
+
+/* Standard CIPSO mapping table */
+/* NOTE: the highest order bit (i.e. 0x80000000) is an 'invalid' flag, if the
+ *       bit is set then consider that value as unspecified, meaning the
+ *       mapping for that particular level/category is invalid */
+struct cipso_v4_std_map_tbl {
+	struct {
+		u32 *cipso;
+		u32 *local;
+		u32 cipso_size;
+		u32 local_size;
+	} lvl;
+	struct {
+		u32 *cipso;
+		u32 *local;
+		u32 cipso_size;
+		u32 local_size;
+	} cat;
+};
+
+/*
+ * Helper Functions
+ */
+
+#define CIPSO_V4_OPTEXIST(x) (IPCB(x)->opt.cipso != 0)
+#define CIPSO_V4_OPTPTR(x) ((x)->nh.raw + IPCB(x)->opt.cipso)
+
+/*
+ * DOI List Functions
+ */
+
+#ifdef CONFIG_NETLABEL
+int cipso_v4_doi_add(struct cipso_v4_doi *doi_def);
+int cipso_v4_doi_remove(const u32 doi,
+			void (*callback) (struct rcu_head * head));
+struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi);
+struct sk_buff *cipso_v4_doi_dump(const u32 doi, const u32 headroom);
+int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain);
+int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+			       const char *domain);
+#else
+static inline int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_doi_remove(const u32 doi,
+				    void (*callback) (struct rcu_head * head))
+{
+	return 0;
+}
+
+static inline struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi)
+{
+	return NULL;
+}
+
+static inline struct sk_buff *cipso_v4_doi_dump(const u32 doi,
+						const u32 headroom)
+{
+	return NULL;
+}
+
+static inline int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def,
+					  const char *domain)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+					     const char *domain)
+{
+	return 0;
+}
+#endif /* CONFIG_NETLABEL */
+
+/*
+ * Label Mapping Cache Functions
+ */
+
+#ifdef CONFIG_NETLABEL
+void cipso_v4_cache_invalidate(void);
+int cipso_v4_cache_add(const struct sk_buff *skb,
+		       const struct netlbl_lsm_secattr *secattr);
+#else
+static inline void cipso_v4_cache_invalidate(void)
+{
+	return;
+}
+
+static inline int cipso_v4_cache_add(const struct sk_buff *skb,
+				     const struct netlbl_lsm_secattr *secattr)
+{
+	return 0;
+}
+#endif /* CONFIG_NETLABEL */
+
+/*
+ * Protocol Handling Functions
+ */
+
+#ifdef CONFIG_NETLABEL
+int cipso_v4_error(struct sk_buff *skb,
+		   const int error,
+		   const u32 gateway);
+int cipso_v4_socket_setopt(struct socket *sock,
+			   unsigned char *opt,
+			   u32 opt_len);
+int cipso_v4_socket_setattr(const struct socket *sock,
+			    const struct cipso_v4_doi *doi_def,
+			    const struct netlbl_lsm_secattr *secattr);
+int cipso_v4_socket_getopt(const struct socket *sock,
+			   unsigned char **opt,
+			   u32 *opt_len);
+int cipso_v4_socket_getattr(const struct socket *sock,
+			    struct netlbl_lsm_secattr *secattr);
+int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+			    struct netlbl_lsm_secattr *secattr);
+int cipso_v4_validate(unsigned char **option);
+#else
+static inline int cipso_v4_error(struct sk_buff *skb,
+				 const int error,
+				 const u32 gateway)
+{
+	return 0;
+}
+
+static inline int cipso_v4_socket_setopt(struct socket *sock,
+					 unsigned char *opt,
+					 u32 opt_len)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_socket_setattr(const struct socket *sock,
+				  const struct cipso_v4_doi *doi_def,
+				  const struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_socket_getopt(const struct socket *sock,
+					 unsigned char **opt,
+					 u32 *opt_len)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_socket_getattr(const struct socket *sock,
+					  struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+					  struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int cipso_v4_validate(unsigned char **option)
+{
+	return -ENOSYS;
+}
+#endif /* CONFIG_NETLABEL */
+
+#endif /* _CIPSO_IPV4_H */
Index: linux-2.6.17.i686-quilt/include/net/inet_sock.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/net/inet_sock.h
+++ linux-2.6.17.i686-quilt/include/net/inet_sock.h
@@ -52,7 +52,7 @@ struct ip_options {
 			ts_needtime:1,
 			ts_needaddr:1;
 	unsigned char	router_alert;
-	unsigned char	__pad1;
+	unsigned char	cipso;
 	unsigned char	__pad2;
 	unsigned char	__data[0];
 };
Index: linux-2.6.17.i686-quilt/include/net/netlabel.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/include/net/netlabel.h
@@ -0,0 +1,488 @@
+/*
+ * NetLabel System
+ *
+ * The NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_H
+#define _NETLABEL_H
+
+#include <linux/types.h>
+#include <linux/skbuff.h>
+#include <net/netlink.h>
+
+/*
+ * NetLabel - A management interface for maintaining network packet label
+ *            mapping tables for explicit packet labling protocols.
+ *
+ * Network protocols such as CIPSO and RIPSO require a label translation layer
+ * to convert the label on the packet into something meaningful on the host
+ * machine.  In the current Linux implementation these mapping tables live
+ * inside the kernel; NetLabel provides a mechanism for user space applications
+ * to manage these mapping tables.
+ *
+ * NetLabel makes use of the Generic NETLINK mechanism as a transport layer to
+ * send messages between kernel and user space.  The general format of a
+ * NetLabel message is shown below:
+ *
+ *  +-----------------+-------------------+--------- --- -- -
+ *  | struct nlmsghdr | struct genlmsghdr | payload
+ *  +-----------------+-------------------+--------- --- -- -
+ *
+ * The 'nlmsghdr' and 'genlmsghdr' structs should be dealt with like normal.
+ * The payload is dependent on the subsystem specified in the
+ * 'nlmsghdr->nlmsg_type' and should be defined below, supporting functions
+ * should be defined in the corresponding net/netlabel/netlabel_<subsys>.h|c
+ * file.
+ *
+ */
+
+/*
+ * NetLabel NETLINK protocol
+ */
+
+#define NETLBL_PROTO_VERSION            1
+
+/* NetLabel NETLINK types/families */
+#define NETLBL_NLTYPE_NONE              0
+#define NETLBL_NLTYPE_MGMT              1
+#define NETLBL_NLTYPE_MGMT_NAME         "NLBL_MGMT"
+#define NETLBL_NLTYPE_RIPSO             2
+#define NETLBL_NLTYPE_RIPSO_NAME        "NLBL_RIPSO"
+#define NETLBL_NLTYPE_CIPSOV4           3
+#define NETLBL_NLTYPE_CIPSOV4_NAME      "NLBL_CIPSOv4"
+#define NETLBL_NLTYPE_CIPSOV6           4
+#define NETLBL_NLTYPE_CIPSOV6_NAME      "NLBL_CIPSOv6"
+#define NETLBL_NLTYPE_UNLABELED         5
+#define NETLBL_NLTYPE_UNLABELED_NAME    "NLBL_UNLBL"
+
+/* NetLabel return codes */
+#define NETLBL_E_OK                 0
+
+/*
+ * Helper functions
+ */
+
+/**
+ * netlbl_put_u8 - Write a u8 value into a buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the value specified in @val into the buffer specified by @buffer.
+ *
+ */
+static inline void netlbl_put_u8(unsigned char *buffer, const u8 val)
+{
+	*(u8 *)buffer = val;
+}
+
+/**
+ * netlbl_put_u32 - Write a u32 value into a buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the value specified in @val into the buffer specified by @buffer.
+ *
+ */
+static inline void netlbl_put_u32(unsigned char *buffer, const u32 val)
+{
+	*(u32 *)buffer = val;
+}
+
+/**
+ * netlbl_put_str - Write a string into a buffer
+ * @buffer: the buffer
+ * @val: the string
+ *
+ * Description:
+ * Write the string specified in @val into the buffer specified by @buffer.
+ *
+ */
+static inline void netlbl_put_str(unsigned char *buffer, const char *val)
+{
+	strcpy((char *)buffer, val);
+}
+
+/**
+ * netlbl_put_hdr - Write a NETLINK header into a buffer
+ * @buffer: the buffer
+ * @msg_type: the NETLINK message type
+ * @msg_len: the NETLINK message length
+ * @msg_flags: the NETLINK message flags
+ * @msg_pid: the NETLINK message PID
+ * @msg_seq: the NETLINK message sequence number
+ *
+ * Description:
+ * Use the given values to write a NETLINK header into the given buffer.
+ *
+ */
+static inline void netlbl_put_hdr(unsigned char *buffer,
+				  const u32 msg_type,
+				  const u16 msg_len,
+				  const u16 msg_flags,
+				  const u32 msg_pid,
+				  const u32 msg_seq)
+{
+	struct nlmsghdr *hdr = (struct nlmsghdr *)buffer;
+	hdr->nlmsg_len = msg_len;
+	hdr->nlmsg_type = msg_type;
+	hdr->nlmsg_flags = msg_flags;
+	hdr->nlmsg_seq = msg_seq;
+	hdr->nlmsg_pid = msg_pid;
+}
+
+/**
+ * netlbl_put_u8 - Write a u8 value into a buffer and increment the buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the value specified in @val into the buffer specified by @buffer
+ * and advance the buffer pointer past the newly written value.
+ *
+ */
+static inline void netlbl_putinc_u8(unsigned char **buffer, const u8 val)
+{
+	netlbl_put_u8(*buffer, val);
+	*buffer += sizeof(u8);
+}
+
+/**
+ * netlbl_put_u32 - Write a u32 value into a buffer and increment the buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the value specified in @val into the buffer specified by @buffer
+ * and advance the buffer pointer past the newly written value.
+ *
+ */
+static inline void netlbl_putinc_u32(unsigned char **buffer, const u32 val)
+{
+	netlbl_put_u32(*buffer, val);
+	*buffer += sizeof(u32);
+}
+
+/**
+ * netlbl_put_u8 - Write a string into a buffer and increment the buffer
+ * @buffer: the buffer
+ * @val: the value
+ *
+ * Description:
+ * Write the string specified in @val into the buffer specified by @buffer
+ * and advance the buffer pointer past the newly written value.
+ *
+ */
+static inline void netlbl_putinc_str(unsigned char **buffer, const char *val)
+{
+	netlbl_put_str(*buffer, val);
+	*buffer += strlen(val) + 1;
+}
+
+/**
+ * netlbl_put_hdr - Write a NETLINK header into a buffer and increment the ptr
+ * @buffer: the buffer
+ * @msg_type: the NETLINK message type
+ * @msg_len: the NETLINK message length
+ * @msg_flags: the NETLINK message flags
+ * @msg_pid: the NETLINK message PID
+ * @msg_seq: the NETLINK message sequence number
+ *
+ * Description:
+ * Use the given values to write a NETLINK header into the given buffer and
+ * then increment the buffer pointer past the header.
+ *
+ */
+static inline void netlbl_putinc_hdr(unsigned char **buffer,
+				     const u32 msg_type,
+				     const u16 msg_len,
+				     const u16 msg_flags,
+				     const u32 msg_pid,
+				     const u32 msg_seq)
+{
+	netlbl_put_hdr(*buffer,
+		       msg_type,
+		       msg_len,
+		       msg_flags,
+		       msg_pid,
+		       msg_seq);
+	*buffer += NLMSG_HDRLEN;
+}
+
+/**
+ * netlbl_get_u8 - Read a u8 value from a buffer
+ * @buffer: the buffer
+ *
+ * Description:
+ * Return a u8 value pointed to by @buffer.
+ *
+ */
+static inline u8 netlbl_get_u8(const unsigned char *buffer)
+{
+	return *(u8 *)buffer;
+}
+
+/**
+ * netlbl_get_u32 - Read a u32 value from a buffer
+ * @buffer: the buffer
+ *
+ * Description:
+ * Return a u8 value pointed to by @buffer.
+ *
+ */
+static inline u32 netlbl_get_u32(const unsigned char *buffer)
+{
+	return *(u32 *)buffer;
+}
+
+/**
+ * netlbl_getinc_u8 - Read a u8 value from a buffer and increment the buffer
+ * @buffer: the buffer
+ *
+ * Description:
+ * Return a u8 value pointed to by @buffer and increment the buffer pointer
+ * past the value.
+ *
+ */
+static inline u8 netlbl_getinc_u8(unsigned char **buffer)
+{
+	u8 val = netlbl_get_u8(*buffer);
+	*buffer += sizeof(u8);
+	return val;
+}
+
+/**
+ * netlbl_getinc_u32 - Read a u32 value from a buffer and increment the buffer
+ * @buffer: the buffer
+ *
+ * Description:
+ * Return a u32 value pointed to by @buffer and increment the buffer pointer
+ * past the value.
+ *
+ */
+static inline u32 netlbl_getinc_u32(unsigned char **buffer)
+{
+	u32 val = netlbl_get_u32(*buffer);
+	*buffer += sizeof(u32);
+	return val;
+}
+
+/*
+ * NetLabel - Kernel API for accessing the network packet label mappings.
+ *
+ * The following functions are provided for use by other kernel modules,
+ * specifically kernel LSM modules, to provide a consistent, transparent API
+ * for dealing with explicit packet labeling protocols such as CIPSO and
+ * RIPSO.  The functions defined here are implemented in the
+ * net/netlabel/netlabel_kapi.c file.
+ *
+ */
+
+/* Domain mapping definition struct */
+struct netlbl_dom_map;
+
+/* Domain mapping operations */
+int netlbl_domhsh_remove(const char *domain);
+
+/* LSM security attributes */
+struct netlbl_lsm_cache {
+	void (*free) (const void *data);
+	void *data;
+};
+struct netlbl_lsm_secattr {
+	char *domain;
+
+	u32 mls_lvl;
+	unsigned char *mls_cat;
+	u32 mls_cat_len;
+
+	struct netlbl_lsm_cache cache;
+
+	u32 set_domain:1,
+	    set_mls_lvl:1,
+	    set_mls_cat:1,
+	    set_cache:1,
+	    __unused:28;
+};
+
+/*
+ * LSM security attribute operations
+ */
+
+/**
+ * netlbl_secattr_alloc - Allocate and initialize a netlbl_lsm_secattr struct
+ * @flags: the memory allocation flags
+ *
+ * Description:
+ * Allocate and initialize a netlbl_lsm_secattr struct.  Returns a valid
+ * pointer on success, or NULL on failure.
+ *
+ */
+static inline struct netlbl_lsm_secattr *netlbl_secattr_alloc(const int flags)
+{
+	return kzalloc(sizeof(struct netlbl_lsm_secattr), flags);
+}
+
+/**
+ * netlbl_secattr_free - Frees a netlbl_lsm_secattr struct
+ * @secattr: the struct to free
+ *
+ * Description:
+ * Frees @secattr including all of the internal buffers.
+ *
+ */
+static inline void netlbl_secattr_free(struct netlbl_lsm_secattr *secattr)
+{
+	BUG_ON(secattr == NULL);
+	if (secattr->set_domain)
+		kfree(secattr->domain);
+	if (secattr->set_mls_cat)
+		kfree(secattr->mls_cat);
+	if (secattr->set_cache && secattr->cache.free)
+		secattr->cache.free(secattr->cache.data);
+	kfree(secattr);
+}
+
+/**
+ * netlbl_secattr_init - Initialize a netlbl_lsm_secattr struct
+ * @secattr: the struct to initialize
+ *
+ * Description:
+ * Initialize an already allocated netlbl_lsm_secattr struct.  Returns zero on
+ * success, negative values on error.
+ *
+ */
+static inline int netlbl_secattr_init(struct netlbl_lsm_secattr *secattr)
+{
+	BUG_ON(secattr == NULL);
+	memset(secattr, 0, sizeof(*secattr));
+	return 0;
+}
+
+/**
+ * netlbl_secattr_destroy - Clears a netlbl_lsm_secattr struct
+ * @secattr: the struct to clear
+ *
+ * Description:
+ * Destroys the @secattr struct, including freeing all of the internal buffers.
+ * On return the struct is suitable for reuse.
+ *
+ */
+static inline void netlbl_secattr_destroy(struct netlbl_lsm_secattr *secattr)
+{
+	BUG_ON(secattr == NULL);
+	if (secattr->set_domain)
+		kfree(secattr->domain);
+	if (secattr->set_mls_cat)
+		kfree(secattr->mls_cat);
+	if (secattr->set_cache && secattr->cache.free)
+		secattr->cache.free(secattr->cache.data);
+	memset(secattr, 0, sizeof(*secattr));
+}
+
+/*
+ * LSM protocol operations
+ */
+
+#ifdef CONFIG_NETLABEL
+int netlbl_socket_setattr(const struct socket *sock,
+			  const struct netlbl_lsm_secattr *secattr);
+int netlbl_socket_peekattr(const struct socket *sock,
+			   struct netlbl_lsm_secattr *secattr);
+int netlbl_socket_getattr(const struct socket *sock,
+			  struct netlbl_lsm_secattr *secattr);
+int netlbl_skbuff_getattr(const struct sk_buff *skb,
+			  struct netlbl_lsm_secattr *secattr);
+int netlbl_skbuff_err(struct sk_buff *skb, int error);
+#else
+static inline int netlbl_socket_setattr(const struct socket *sock,
+				     const struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int netlbl_socket_peekattr(const struct socket *sock,
+					 struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int netlbl_socket_getattr(const struct socket *sock,
+					struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int netlbl_skbuff_getattr(const struct sk_buff *skb,
+					struct netlbl_lsm_secattr *secattr)
+{
+	return -ENOSYS;
+}
+
+static inline int netlbl_skbuff_err(struct sk_buff *skb, int error)
+{
+	return 0;
+}
+#endif /* CONFIG_NETLABEL */
+
+/*
+ * LSM label mapping cache operations
+ */
+
+#ifdef CONFIG_NETLABEL
+void netlbl_cache_invalidate(void);
+int netlbl_cache_add(const struct sk_buff *skb,
+		     const struct netlbl_lsm_secattr *secattr);
+#else
+static inline void netlbl_cache_invalidate(void)
+{
+	return;
+}
+
+static inline int netlbl_cache_add(const struct sk_buff *skb,
+				   const struct netlbl_lsm_secattr *secattr)
+{
+	return 0;
+}
+#endif /* CONFIG_NETLABEL */
+
+/*
+ * Network stack operations
+ */
+
+#ifdef CONFIG_NETLABEL
+void netlbl_socket_inet_accept(struct socket *sock, struct socket *newsock);
+#else
+static inline void netlbl_socket_inet_accept(struct socket *sock,
+					     struct socket *newsock)
+{
+	return;
+}
+#endif /* CONFIG_NETLABEL */
+
+#endif /* _NETLABEL_H */
Index: linux-2.6.17.i686-quilt/net/ipv4/Makefile
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/Makefile
+++ linux-2.6.17.i686-quilt/net/ipv4/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybl
 obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
 obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
 obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
+obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
 
 obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
 		      xfrm4_output.o
Index: linux-2.6.17.i686-quilt/net/ipv4/af_inet.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/af_inet.c
+++ linux-2.6.17.i686-quilt/net/ipv4/af_inet.c
@@ -114,6 +114,7 @@
 #ifdef CONFIG_IP_MROUTE
 #include <linux/mroute.h>
 #endif
+#include <net/netlabel.h>
 
 DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
 
@@ -616,6 +617,8 @@ int inet_accept(struct socket *sock, str
 
 	sock_graft(sk2, newsock);
 
+	netlbl_socket_inet_accept(sock, newsock);
+
 	newsock->state = SS_CONNECTED;
 	err = 0;
 	release_sock(sk2);
Index: linux-2.6.17.i686-quilt/net/ipv4/ah4.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/ah4.c
+++ linux-2.6.17.i686-quilt/net/ipv4/ah4.c
@@ -35,7 +35,7 @@ static int ip_clear_mutable_options(stru
 		switch (*optptr) {
 		case IPOPT_SEC:
 		case 0x85:	/* Some "Extended Security" crap. */
-		case 0x86:	/* Another "Commercial Security" crap. */
+		case IPOPT_CIPSO:
 		case IPOPT_RA:
 		case 0x80|21:	/* RFC1770 */
 			break;
Index: linux-2.6.17.i686-quilt/net/ipv4/ip_options.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/ipv4/ip_options.c
+++ linux-2.6.17.i686-quilt/net/ipv4/ip_options.c
@@ -24,6 +24,7 @@
 #include <net/ip.h>
 #include <net/icmp.h>
 #include <net/route.h>
+#include <net/cipso_ipv4.h>
 
 /* 
  * Write options to IP header, record destination address to
@@ -194,6 +195,13 @@ int ip_options_echo(struct ip_options * 
 			dopt->is_strictroute = sopt->is_strictroute;
 		}
 	}
+	if (sopt->cipso) {
+		optlen  = sptr[sopt->cipso+1];
+		dopt->cipso = dopt->optlen+sizeof(struct iphdr);
+		memcpy(dptr, sptr+sopt->cipso, optlen);
+		dptr += optlen;
+		dopt->optlen += optlen;
+	}
 	while (dopt->optlen & 3) {
 		*dptr++ = IPOPT_END;
 		dopt->optlen++;
@@ -435,6 +443,17 @@ int ip_options_compile(struct ip_options
 			if (optptr[2] == 0 && optptr[3] == 0)
 				opt->router_alert = optptr - iph;
 			break;
+		      case IPOPT_CIPSO:
+		        if (opt->cipso) {
+				pp_ptr = optptr;
+				goto error;
+			}
+			opt->cipso = optptr - iph;
+		        if (cipso_v4_validate(&optptr)) {
+				pp_ptr = optptr;
+				goto error;
+			}
+			break;
 		      case IPOPT_SEC:
 		      case IPOPT_SID:
 		      default:

--
paul moore
linux security @ hp


linux-2.6-net-label_3_8.patch:
 cipso_ipv4.c | 1749 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1749 insertions(+)

--- NEW FILE linux-2.6-net-label_3_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:34 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:02 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN12sM032510
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:02 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN11Rd026108;
	Tue, 27 Jun 2006 19:01:01 -0400
Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN0x4h000815;
	Tue, 27 Jun 2006 19:00:59 -0400
Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127])
	by atlrel8.hp.com (Postfix) with ESMTP id ED4BE347E4;
	Tue, 27 Jun 2006 19:00:51 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 69F6827128;
	Tue, 27 Jun 2006 23:00:51 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0oQr030697;
	Tue, 27 Jun 2006 19:00:50 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0oD5030696;
	Tue, 27 Jun 2006 19:00:50 -0400
Message-Id: <20060627230050.269387000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:34 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 3/8] NetLabel: CIPSOv4 engine
Content-Disposition: inline; filename=netlabel-net_cipsov4-2.6.17
X-RedHat-Spam-Score: -98.575 
Content-Type: 
X-UID: 72033
X-Length: 53496

Add support for the Commercial IP Security Option (CIPSO) to the IPv4 network
stack.  CIPSO has become a de-facto standard for trusted/labeled networking
amongst existing Trusted Operating Systems such as Trusted Solaris, HP-UX CMW,
etc.  This implementation is designed to be used with the NetLabel subsystem
to provide explicit packet labeling to LSM developers.

The CIPSO/IPv4 packet labeling works by the LSM calling a NetLabel API function
which attaches a CIPSO label (IPv4 option) to a given socket; this in turn
attaches the CIPSO label to every packet leaving the socket without any extra
processing on the outbound side.  On the inbound side the individual packet's
sk_buff is examined through a call to a NetLabel API function to determine if a
CIPSO/IPv4 label is present and if so the security attributes of the CIPSO
label are returned to the caller of the NetLabel API function.
---
 net/ipv4/cipso_ipv4.c | 1749 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1749 insertions(+)

Index: linux-2.6.17.i686-quilt/net/ipv4/cipso_ipv4.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/ipv4/cipso_ipv4.c
@@ -0,0 +1,1749 @@
+/*
+ * CIPSO - Commercial IP Security Option
+ *
+ * This is an implementation of the CIPSO 2.2 protocol as specified in
+ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
+ * FIPS-188, copies of both documents can be found in the Documentation
+ * directory.  While CIPSO never became a full IETF RFC standard many vendors
+ * have chosen to adopt the protocol and over the years it has become a
+ * de-facto standard for labeled networking.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#include <linux/jhash.h>
+#include <net/ip.h>
+#include <net/icmp.h>
+#include <net/tcp.h>
+#include <net/netlabel.h>
+#include <net/cipso_ipv4.h>
+#include <asm/bug.h>
+
+struct cipso_v4_domhsh_entry {
+	char *domain;
+	u32 valid;
+	struct list_head list;
+	struct rcu_head rcu;
+};
+
+/* List of available DOI definitions */
+/* XXX - Updates should be minimal so having a single lock for the
+   cipso_v4_doi_list and the cipso_v4_doi_list->dom_list should be
+   okay. */
+/* XXX - This currently assumes a minimal number of different DOIs in use,
+   if in practice there are a lot of different DOIs this list should
+   probably be turned into a hash table or something similar so we
+   can do quick lookups. */
+DEFINE_SPINLOCK(cipso_v4_doi_list_lock);
+static struct list_head cipso_v4_doi_list = LIST_HEAD_INIT(cipso_v4_doi_list);
+
+/* Label mapping cache */
+#define CIPSO_V4_CACHE_BUCKETBITS     7
+#define CIPSO_V4_CACHE_BUCKETS        (1 << CIPSO_V4_CACHE_BUCKETBITS)
+#define CIPSO_V4_CACHE_BUCKETSIZE     10
+#define CIPSO_V4_CACHE_REORDERLIMIT   10
+/* PM - the number of cache buckets should probably be a compile time option */
+struct cipso_v4_map_cache_bkt {
+	spinlock_t lock;
+	u32 size;
+	struct list_head list;
+};
+struct cipso_v4_map_cache_entry {
+	u32 hash;
+	unsigned char *key;
+	u32 key_len;
+
+	struct netlbl_lsm_cache lsm_data;
+
+	u32 activity;
+	struct list_head list;
+};
+static u32 cipso_v4_cache_size = 0;
+static struct cipso_v4_map_cache_bkt *cipso_v4_cache = NULL;
+#define CIPSO_V4_CACHE_ENABLED (cipso_v4_cache_size > 0)
+
+/*
+ * Helper Functions
+ */
+
+/**
+ * cipso_v4_bitmap_walk - Walk a bitmap looking for a bit
+ * @bitmap: the bitmap
+ * @bitmap_len: length in bits
+ * @offset: starting offset
+ * @state: if non-zero, look for a set (1) bit else look for a cleared (0) bit
+ *
+ * Description:
+ * Starting at @offset, walk the bitmap from left to right until either the
+ * desired bit is found or we reach the end.  Return the bit offset, -1 if
+ * not found, or -2 if error.
+ */
+static int cipso_v4_bitmap_walk(const unsigned char *bitmap,
+				const u32 bitmap_len,
+				const u32 offset,
+				const u8 state)
+{
+	u32 bit_spot;
+	u32 byte_offset;
+	unsigned char bitmask;
+	unsigned char byte;
+
+	/* gcc always rounds to zero when doing integer division */
+	byte_offset = offset / 8;
+	byte = bitmap[byte_offset];
+	bit_spot = offset;
+	bitmask = 0x80 >> offset % 8;
+
+	/* XXX - probably should use include/asm/bitops.h if we can */
+	while (bit_spot < bitmap_len) {
+		if ((state && (byte & bitmask) == bitmask) ||
+		    (state == 0 && (byte & bitmask) == 0))
+			return bit_spot;
+
+		bit_spot++;
+		bitmask >>= 1;
+		if (bitmask == 0) {
+			byte = bitmap[++byte_offset];
+			bitmask = 0x80;
+		}
+	}
+
+	return -1;
+}
+
+/**
+ * cipso_v4_bitmap_setbit - Sets a single bit in a bitmap
+ * @bitmap: the bitmap
+ * @bit: the bit
+ * @state: if non-zero, set the bit (1) else clear the bit (0)
+ *
+ * Description:
+ * Set a single bit in the bitmask.  Returns zero on success, negative values
+ * on error.
+ */
+static void cipso_v4_bitmap_setbit(unsigned char *bitmap,
+				   const u32 bit,
+				   const u8 state)
+{
+	u32 byte_spot;
+	u8 bitmask;
+
+	/* gcc always rounds to zero when doing integer division */
+	byte_spot = bit / 8;
+	bitmask = 0x80 >> bit % 8;
+	if (state)
+		bitmap[byte_spot] |= bitmask;
+	else
+		bitmap[byte_spot] &= ~bitmask;
+}
+
+/**
+ * cipso_v4_doi_domhsh_free - Frees a domain list entry
+ * @entry: the entry's RCU field
+ *
+ * Description:
+ * This function is designed to be used as a callback to the call_rcu()
+ * function so that the memory allocated to a domain list entry can be released
+ * safely.
+ *
+ */
+static void cipso_v4_doi_domhsh_free(struct rcu_head *entry)
+{
+	struct cipso_v4_domhsh_entry *ptr;
+
+	ptr = container_of(entry, struct cipso_v4_domhsh_entry, rcu);
+	if (ptr->domain)
+		kfree(ptr->domain);
+	kfree(ptr);
+}
+
+/**
+ * cipso_v4_cache_entry_free - Frees a cache entry
+ * @entry: the entry to free
+ *
+ * Description:
+ * This function frees the memory associated with a cache entry.
+ *
+ */
+static void cipso_v4_cache_entry_free(struct cipso_v4_map_cache_entry *entry)
+{
+	if (entry->lsm_data.free)
+		entry->lsm_data.free(entry->lsm_data.data);
+	if (entry->key)
+		kfree(entry->key);
+	kfree(entry);
+}
+
+/**
+ * cipso_v4_map_cache_hash - Hashing function for the CIPSO cache
+ * @key: the hash key
+ * @key_len: the length of the key in bytes
+ *
+ * Description:
+ * The CIPSO tag hashing function.  Returns a 32-bit hash value.
+ *
+ */
+static u32 cipso_v4_map_cache_hash(const unsigned char *key, const u32 key_len)
+{
+	/* PM - not sure if this is a good hash for this particular use but
+	   it's probably better than what I had here before */
+	return jhash(key, key_len, 0);
+}
+
+/*
+ * Label Mapping Cache Functions
+ */
+
+/**
+ * cipso_v4_cache_init - Initialize the CIPSO cache
+ * @bkt_size: the number of cache buckets
+ *
+ * Description:
+ * Initializes the CIPSO label mapping cache, this function should be called
+ * before any of the other functions defined in this file.  Returns zero on
+ * success, negative values on error.
+ *
+ */
+static int cipso_v4_cache_init(const u32 bkt_size)
+{
+	struct cipso_v4_map_cache_bkt *cache;
+	u32 iter;
+
+	if (bkt_size == 0)
+		return -EINVAL;
+
+	cache = kcalloc(bkt_size,
+			sizeof(struct cipso_v4_map_cache_bkt), GFP_KERNEL);
+	if (cache == NULL)
+		return -ENOMEM;
+
+	for (iter = 0; iter < bkt_size; iter++) {
+		cache[iter].lock = SPIN_LOCK_UNLOCKED;
+		cache[iter].size = 0;
+		INIT_LIST_HEAD(&cache[iter].list);
+	}
+	cipso_v4_cache = cache;
+	cipso_v4_cache_size = bkt_size;
+
+	return 0;
+}
+
+/**
+ * cipso_v4_cache_destroy - Destroy the CIPSO cache
+ *
+ * Description:
+ * Clears the CIPSO cache and frees all the memory.  This function does not
+ * hold any locks and should only be called when the module is being unloaded.
+ *
+ */
+static int cipso_v4_cache_destroy(void)
+{
+	struct cipso_v4_map_cache_bkt *cache;
+	struct cipso_v4_map_cache_entry *entry;
+	u32 cache_size;
+	u32 iter;
+
+	cache = cipso_v4_cache;
+	cache_size = cipso_v4_cache_size;
+	cipso_v4_cache_size = 0;
+	cipso_v4_cache = NULL;
+
+	for (iter = 0; iter < cache_size; iter++)
+		list_for_each_entry(entry, &cache[iter].list, list) {
+			list_del(&entry->list);
+			cipso_v4_cache_entry_free(entry);
+		}
+
+	return 0;
+}
+
+/**
+ * cipso_v4_cache_invalidate - Invalidates the current CIPSO cache
+ *
+ * Description:
+ * Invalidates and frees any entries in the CIPSO cache.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+void cipso_v4_cache_invalidate(void)
+{
+	struct cipso_v4_map_cache_entry *entry, *tmp_entry;
+	u32 iter;
+
+	if (!CIPSO_V4_CACHE_ENABLED)
+		return;
+
+	for (iter = 0; iter < cipso_v4_cache_size; iter++) {
+		spin_lock(&cipso_v4_cache[iter].lock);
+		list_for_each_entry_safe(entry,
+					 tmp_entry,
+					 &cipso_v4_cache[iter].list, list) {
+			list_del(&entry->list);
+			cipso_v4_cache_entry_free(entry);
+		}
+		cipso_v4_cache[iter].size = 0;
+		spin_unlock(&cipso_v4_cache[iter].lock);
+	}
+
+	return;
+}
+
+/**
+ * cipso_v4_cache_check - Check the CIPSO cache for a label mapping
+ * @key: the buffer to check
+ * @key_len: buffer length in bytes
+ * @secattr: the security attribute struct to use
+ *
+ * Description:
+ * This function checks the cache to see if a label mapping already exists for
+ * the given key.  If there is a match then the cache is adjusted and the
+ * @secattr struct is populated with the correct LSM security attributes.  The
+ * cache is adjusted in the following manner if the entry is not already the
+ * first in the cache bucket:
+ *
+ *  1. The cache entry's activity counter is incremented
+ *  2. The previous (higher ranking) entry's activity counter is decremented
+ *  3. If the difference between the two activity counters is geater than
+ *     CIPSO_V4_CACHE_REORDERLIMIT the two entries are swapped
+ *
+ * Returns zero on success, -ENOENT for a cache miss, and other negative values
+ * on error.
+ *
+ */
+static int cipso_v4_cache_check(const unsigned char *key,
+				const u32 key_len,
+				struct netlbl_lsm_secattr *secattr)
+{
+	u32 bkt;
+	struct cipso_v4_map_cache_entry *entry;
+	struct cipso_v4_map_cache_entry *prev_entry = NULL;
+	u32 hash;
+
+	if (!CIPSO_V4_CACHE_ENABLED)
+		return -ENOENT;
+
+	hash = cipso_v4_map_cache_hash(key, key_len);
+	bkt = hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
+	spin_lock(&cipso_v4_cache[bkt].lock);
+	list_for_each_entry(entry, &cipso_v4_cache[bkt].list, list) {
+		if (entry->hash == hash &&
+		    entry->key_len == key_len &&
+		    memcmp(entry->key, key, key_len) == 0) {
+			entry->activity += 1;
+
+			if (prev_entry != NULL) {
+				if (prev_entry->activity > 0)
+					prev_entry->activity -= 1;
+
+				if (entry->activity > prev_entry->activity &&
+				    entry->activity - prev_entry->activity >
+				    CIPSO_V4_CACHE_REORDERLIMIT) {
+					__list_del(entry->list.prev,
+						   entry->list.next);
+					__list_add(&entry->list,
+						   prev_entry->list.prev,
+						   &prev_entry->list);
+				}
+			}
+
+			secattr->cache.free = entry->lsm_data.free;
+			secattr->cache.data = entry->lsm_data.data;
+			spin_unlock(&cipso_v4_cache[bkt].lock);
+
+			secattr->set_cache = 1;
+			return 0;
+		}
+		prev_entry = entry;
+	}
+	spin_unlock(&cipso_v4_cache[bkt].lock);
+
+	return -ENOENT;
+}
+
+/**
+ * cipso_v4_cache_add - Add an entry to the CIPSO cache
+ * @skb: the packet
+ * @secattr: the packet's security attributes
+ *
+ * Description:
+ * Add a new entry into the CIPSO label mapping cache.  Add the new entry to
+ * head of the cache bucket's list, if the cache bucket is out of room remove
+ * the last entry in the list first.  It is important to note that there is
+ * currently no checking for duplicate keys.  Returns zero on success,
+ * negative values on failure.
+ *
+ */
+int cipso_v4_cache_add(const struct sk_buff *skb,
+		       const struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -EPERM;
+	u32 bkt;
+	struct cipso_v4_map_cache_entry *entry = NULL;
+	struct cipso_v4_map_cache_entry *old_entry = NULL;
+	unsigned char *cipso_ptr;
+	u32 cipso_ptr_len;
+
+	if (!CIPSO_V4_CACHE_ENABLED)
+		return 0;
+
+	cipso_ptr = CIPSO_V4_OPTPTR(skb);
+	cipso_ptr_len = cipso_ptr[1];
+
+	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
+	if (entry == NULL)
+		return -ENOMEM;
+	entry->key = kmalloc(cipso_ptr_len, GFP_ATOMIC);
+	if (entry->key == NULL) {
+		ret_val = -ENOMEM;
+		goto cache_add_failure;
+	}
+	memcpy(entry->key, cipso_ptr, cipso_ptr_len);
+	entry->key_len = cipso_ptr_len;
+	entry->hash = cipso_v4_map_cache_hash(cipso_ptr, cipso_ptr_len);
+	entry->lsm_data.free = secattr->cache.free;
+	entry->lsm_data.data = secattr->cache.data;
+
+	bkt = entry->hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
+	spin_lock(&cipso_v4_cache[bkt].lock);
+	if (cipso_v4_cache[bkt].size < CIPSO_V4_CACHE_BUCKETSIZE) {
+		list_add(&entry->list, &cipso_v4_cache[bkt].list);
+		cipso_v4_cache[bkt].size += 1;
+	} else {
+		old_entry = list_entry(cipso_v4_cache[bkt].list.prev,
+				       struct cipso_v4_map_cache_entry, list);
+		list_del(&old_entry->list);
+		list_add(&entry->list, &cipso_v4_cache[bkt].list);
+		cipso_v4_cache_entry_free(old_entry);
+	}
+	spin_unlock(&cipso_v4_cache[bkt].lock);
+
+	return 0;
+
+cache_add_failure:
+	if (entry)
+		cipso_v4_cache_entry_free(entry);
+	return ret_val;
+}
+
+/*
+ * DOI List Functions
+ */
+
+/**
+ * cipso_v4_doi_search - Searches for a DOI definition
+ * @doi: the DOI to search for
+ *
+ * Description:
+ * Search the DOI definition list for a DOI definition with a DOI value that
+ * matches @doi.  The caller is responsibile for calling rcu_read_[un]lock().
+ * Returns a pointer to the DOI definition on success and NULL on failure.
+ */
+static struct cipso_v4_doi *cipso_v4_doi_search(const u32 doi)
+{
+	struct cipso_v4_doi *iter;
+
+	list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
+		if (iter->doi == doi && iter->valid)
+			return iter;
+	return NULL;
+}
+
+/**
+ * cipso_v4_doi_add - Add a new DOI to the CIPSO protocol engine
+ * @doi_def: the DOI structure
+ *
+ * Description:
+ * The caller defines a new DOI for use by the CIPSO engine and calls this
+ * function to add it to the list of acceptable domains.  The caller must
+ * ensure that the mapping table specified in @doi_def->map meets all of the
+ * requirements of the mapping type (see cipso_ipv4.h for details).  Returns
+ * zero on success and non-zero on failure.
+ *
+ */
+int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
+{
+	if (doi_def == NULL || doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
+		return -EINVAL;
+
+	doi_def->valid = 1;
+	INIT_RCU_HEAD(&doi_def->rcu);
+	INIT_LIST_HEAD(&doi_def->dom_list);
+
+	rcu_read_lock();
+	if (cipso_v4_doi_search(doi_def->doi) != NULL) {
+		rcu_read_unlock();
+		return -EEXIST;
+	}
+	spin_lock(&cipso_v4_doi_list_lock);
+	list_add_tail_rcu(&doi_def->list, &cipso_v4_doi_list);
+	spin_unlock(&cipso_v4_doi_list_lock);
+	rcu_read_unlock();
+
+	return 0;
+}
+
+/**
+ * cipso_v4_doi_remove - Remove an existing DOI from the CIPSO protocol engine
+ * @doi: the DOI value
+ * @callback: the DOI cleanup/free callback
+ *
+ * Description:
+ * Removes a DOI definition from the CIPSO engine, @callback is called to
+ * free any memory.  The NetLabel routines will be called to release their own
+ * LSM domain mappings as well as our own domain list.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+int cipso_v4_doi_remove(const u32 doi,
+			void (*callback) (struct rcu_head * head))
+{
+	struct cipso_v4_doi *doi_def;
+	struct cipso_v4_domhsh_entry *dom_iter;
+
+	rcu_read_lock();
+	doi_def = cipso_v4_doi_search(doi);
+	if (doi_def != NULL) {
+		spin_lock(&cipso_v4_doi_list_lock);
+		doi_def->valid = 0;
+		list_del_rcu(&doi_def->list);
+		spin_unlock(&cipso_v4_doi_list_lock);
+		list_for_each_entry_rcu(dom_iter, &doi_def->dom_list, list)
+			if (dom_iter->valid)
+				netlbl_domhsh_remove(dom_iter->domain);
+		cipso_v4_cache_invalidate();
+		rcu_read_unlock();
+
+		call_rcu(&doi_def->rcu, callback);
+		return 0;
+	}
+	rcu_read_unlock();
+
+	return -ENOENT;
+}
+
+/**
+ * cipso_v4_doi_getdef - Returns a pointer to a valid DOI definition
+ * @doi: the DOI value
+ *
+ * Description:
+ * Searches for a valid DOI definition and if one is found it is returned to
+ * the caller.  Otherwise NULL is returned.  The caller must ensure that
+ * rcu_read_lock() is held while accessing the returned definition.
+ *
+ */
+struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi)
+{
+	return cipso_v4_doi_search(doi);
+}
+
+/**
+ * cipso_v4_doi_dump - Dump the CIPSO DOI definitions into a sk_buff
+ * @doi: the DOI value
+ * @headroom: the amount of headroom to allocate for the sk_buff
+ *
+ * Description:
+ * If the @doi value is zero then dump a list of all the configured DOI values
+ * into a sk_buff.  If the @doi value is non-zero, lookup the match DOI
+ * definition and dump it's contents into a sk_buff.  The returned sk_buff has
+ * room at the front of the sk_buff for @headroom bytes.  See
+ * netlabel_cipso_v4.h for the LIST message format.  This function may fail if
+ * another process is changing the DOI list at the same time.  Returns a
+ * pointer to a sk_buff on success, NULL on error.
+ *
+ */
+struct sk_buff *cipso_v4_doi_dump(const u32 doi, const u32 headroom)
+{
+	struct sk_buff *skb;
+	unsigned char *buf;
+	struct cipso_v4_doi *iter;
+	u32 doi_cnt = 0;
+	u32 tag_cnt = 0;
+	u32 lvl_cnt = 0;
+	u32 cat_cnt = 0;
+	u32 buf_len;
+	u32 tmp_len;
+
+	/* XXX - In both cases, this is kinda ugly as we have to go through
+	   the list once to determine how large of a buffer we need,
+	   drop the locks, allocate the buffer, grab the locks, and
+	   finally fill the buffer.  The problem is that there is that
+	   open window where the table could grow and we will end up
+	   short on space. */
+
+	if (doi == 0) {
+		buf_len = 4;
+		rcu_read_lock();
+		list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
+			if (iter->valid) {
+				doi_cnt += 1;
+				buf_len += 8;
+			}
+		rcu_read_unlock();
+
+		skb = alloc_skb(NLMSG_ALIGN(headroom + buf_len), GFP_KERNEL);
+		if (skb == NULL)
+			return NULL;
+		skb_reserve(skb, headroom);
+		tmp_len = skb_tailroom(skb);
+		if (tmp_len < buf_len)
+			goto doi_dump_failure;
+		buf = skb_put(skb, buf_len);
+		buf_len -= 4;
+		netlbl_putinc_u32(&buf, doi_cnt);
+
+		rcu_read_lock();
+		list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
+			if (iter->valid) {
+				if (buf_len < 8) {
+					rcu_read_unlock();
+					goto doi_dump_failure;
+				}
+				buf_len -= 8;
+				netlbl_putinc_u32(&buf, iter->doi);
+				netlbl_putinc_u32(&buf, iter->type);
+			}
+		rcu_read_unlock();
+	} else {
+		rcu_read_lock();
+		iter = cipso_v4_doi_getdef(doi);
+		if (iter == NULL) {
+			rcu_read_unlock();
+			return NULL;
+		}
+		buf_len = 4;
+		switch (iter->type) {
+		case CIPSO_V4_MAP_PASS:
+			buf_len += 4;
+			while (tag_cnt < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tag_cnt] != CIPSO_V4_TAG_INVALID) {
+				tag_cnt += 1;
+				buf_len += 1;
+			}
+			break;
+		case CIPSO_V4_MAP_STD:
+			buf_len += 12;
+			while (tag_cnt < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tag_cnt] != CIPSO_V4_TAG_INVALID) {
+				tag_cnt += 1;
+				buf_len += 1;
+			}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->lvl.local_size)
+				if (iter->map.std->lvl.local[tmp_len++] !=
+				    CIPSO_V4_INV_LVL) {
+					lvl_cnt += 1;
+					buf_len += 8;
+				}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->cat.local_size)
+				if (iter->map.std->cat.local[tmp_len++] !=
+				    CIPSO_V4_INV_CAT) {
+					cat_cnt += 1;
+					buf_len += 8;
+				}
+			break;
+		default:
+			rcu_read_unlock();
+			return NULL;
+		}
+		rcu_read_unlock();
+
+		skb = alloc_skb(NLMSG_ALIGN(headroom + buf_len), GFP_KERNEL);
+		if (skb == NULL)
+			return NULL;
+		skb_reserve(skb, headroom);
+		tmp_len = skb_tailroom(skb);
+		if (tmp_len < buf_len)
+			goto doi_dump_failure;
+		buf = skb_put(skb, buf_len);
+		buf_len -= 4;
+		netlbl_putinc_u32(&buf, iter->type);
+
+		rcu_read_lock();
+		if (iter != cipso_v4_doi_getdef(doi)) {
+			rcu_read_unlock();
+			goto doi_dump_failure;
+		}
+		switch (iter->type) {
+		case CIPSO_V4_MAP_PASS:
+			netlbl_putinc_u32(&buf, tag_cnt);
+			tmp_len = 0;
+			while (tmp_len < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tmp_len] != CIPSO_V4_TAG_INVALID) {
+				if (buf_len < 1) {
+					rcu_read_unlock();
+					goto doi_dump_failure;
+				}
+				buf_len -= 1;
+				netlbl_putinc_u8(&buf, iter->tags[tmp_len++]);
+			}
+			break;
+		case CIPSO_V4_MAP_STD:
+			buf_len -= 12;
+			netlbl_putinc_u32(&buf, tag_cnt);
+			netlbl_putinc_u32(&buf, lvl_cnt);
+			netlbl_putinc_u32(&buf, cat_cnt);
+			tmp_len = 0;
+			while (tmp_len < CIPSO_V4_TAG_MAXCNT &&
+			       iter->tags[tmp_len] != CIPSO_V4_TAG_INVALID) {
+				if (buf_len < 1) {
+					rcu_read_unlock();
+					goto doi_dump_failure;
+				}
+				buf_len -= 1;
+				netlbl_putinc_u8(&buf, iter->tags[tmp_len++]);
+			}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->lvl.local_size) {
+				if (iter->map.std->lvl.local[tmp_len] !=
+				    CIPSO_V4_INV_LVL) {
+					if (buf_len < 8) {
+						rcu_read_unlock();
+						goto doi_dump_failure;
+					}
+					buf_len -= 8;
+					netlbl_putinc_u32(&buf, tmp_len);
+					netlbl_putinc_u32(&buf,
+							  iter->map.std->lvl.
+							  local[tmp_len]);
+				}
+				tmp_len += 1;
+			}
+			tmp_len = 0;
+			while (tmp_len < iter->map.std->cat.local_size) {
+				if (iter->map.std->cat.local[tmp_len] !=
+				    CIPSO_V4_INV_CAT) {
+					if (buf_len < 8) {
+						rcu_read_unlock();
+						goto doi_dump_failure;
+					}
+					buf_len -= 8;
+					netlbl_putinc_u32(&buf, tmp_len);
+					netlbl_putinc_u32(&buf,
+							  iter->map.std->cat.
+							  local[tmp_len]);
+				}
+				tmp_len += 1;
+			}
+			break;
+		}
+		rcu_read_unlock();
+	}
+
+	return skb;
+
+doi_dump_failure:
+	kfree(skb);
+	return NULL;
+}
+
+/**
+ * cipso_v4_doi_domhsh_add - Adds a domain entry to a DOI definition
+ * @doi_def: the DOI definition
+ * @domain: the domain to add
+ *
+ * Description:
+ * Adds the @domain to the the DOI specified by @doi_def, this function
+ * should only be called by external functions (i.e. NetLabel).  This function
+ * does allocate memory.  Returns zero on success, negative values on failure.
+ *
+ */
+int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain)
+{
+	struct cipso_v4_domhsh_entry *iter;
+	struct cipso_v4_domhsh_entry *new_dom;
+
+	new_dom = kzalloc(sizeof(*new_dom), GFP_KERNEL);
+	if (new_dom == NULL)
+		return -ENOMEM;
+	if (domain) {
+		new_dom->domain = kstrdup(domain, GFP_KERNEL);
+		if (new_dom->domain == NULL) {
+			kfree(new_dom);
+			return -ENOMEM;
+		}
+	}
+	new_dom->valid = 1;
+	INIT_RCU_HEAD(&new_dom->rcu);
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(iter, &doi_def->dom_list, list)
+		if (iter->valid &&
+		    ((domain != NULL && iter->domain != NULL &&
+		      strcmp(iter->domain, domain) == 0) ||
+		     (domain == NULL && iter->domain == NULL))) {
+			rcu_read_unlock();
+			if (new_dom->domain != NULL)
+				kfree(new_dom->domain);
+			kfree(new_dom);
+			return -EEXIST;
+		}
+	spin_lock(&cipso_v4_doi_list_lock);
+	list_add_tail_rcu(&new_dom->list, &doi_def->dom_list);
+	spin_unlock(&cipso_v4_doi_list_lock);
+	rcu_read_unlock();
+
+	return 0;
+}
+
+/**
+ * cipso_v4_doi_domhsh_remove - Removes a domain entry from a DOI definition
+ * @doi_def: the DOI definition
+ * @domain: the domain to remove
+ *
+ * Description:
+ * Removes the @domain from the DOI specified by @doi_def, this function
+ * should only be called by external functions (i.e. NetLabel).   Returns zero
+ * on success and negative values on error.
+ *
+ */
+int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+			       const char *domain)
+{
+	struct cipso_v4_domhsh_entry *iter;
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(iter, &doi_def->dom_list, list)
+		if (iter->valid &&
+		    ((domain != NULL && iter->domain != NULL &&
+		      strcmp(iter->domain, domain) == 0) ||
+		     (domain == NULL && iter->domain == NULL))) {
+			spin_lock(&cipso_v4_doi_list_lock);
+			iter->valid = 0;
+			list_del_rcu(&iter->list);
+			spin_unlock(&cipso_v4_doi_list_lock);
+			rcu_read_unlock();
+
+			call_rcu(&iter->rcu, cipso_v4_doi_domhsh_free);
+			return 0;
+		}
+	rcu_read_unlock();
+
+	return -ENOENT;
+}
+
+/*
+ * Label Mapping Functions
+ */
+
+/**
+ * cipso_v4_map_lvl_valid - Checks to see if the given level is understood
+ * @doi_def: the DOI definition
+ * @level: the level to check
+ *
+ * Description:
+ * Checks the given level against the given DOI definition and returns a
+ * negative value if the level does not have a valid mapping and a zero value
+ * if the level is defined by the DOI.
+ *
+ */
+static int cipso_v4_map_lvl_valid(const struct cipso_v4_doi *doi_def,
+				  const u8 level)
+{
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		if (doi_def->map.std->lvl.cipso[level] < CIPSO_V4_INV_LVL)
+			return 0;
+		break;
+	}
+
+	return -EFAULT;
+}
+
+/**
+ * cipso_v4_map_lvl_hton - Perform a level mapping from the host to the network
+ * @doi_def: the DOI definition
+ * @host_lvl: the host MLS level
+ * @net_lvl: the network/CIPSO MLS level
+ *
+ * Description:
+ * Perform a label mapping to translate a local MLS level to the correct
+ * CIPSO level using the given DOI definition.  Returns zero on success,
+ * negative values otherwise.
+ *
+ */
+static int cipso_v4_map_lvl_hton(const struct cipso_v4_doi *doi_def,
+				 const u32 host_lvl,
+				 u32 *net_lvl)
+{
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		*net_lvl = host_lvl;
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		if (host_lvl < doi_def->map.std->lvl.local_size) {
+			*net_lvl = doi_def->map.std->lvl.local[host_lvl];
+			return 0;
+		}
+		break;
+	}
+
+	return -EINVAL;
+}
+
+/**
+ * cipso_v4_map_lvl_ntoh - Perform a level mapping from the network to the host
+ * @doi_def: the DOI definition
+ * @net_lvl: the network/CIPSO MLS level
+ * @host_lvl: the host MLS level
+ *
+ * Description:
+ * Perform a label mapping to translate a CIPSO level to the correct local MLS
+ * level using the given DOI definition.  Returns zero on success, negative
+ * values otherwise.
+ *
+ */
+static int cipso_v4_map_lvl_ntoh(const struct cipso_v4_doi *doi_def,
+				 const u32 net_lvl,
+				 u32 *host_lvl)
+{
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		*host_lvl = net_lvl;
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		if (net_lvl < doi_def->map.std->lvl.cipso_size) {
+			*host_lvl = doi_def->map.std->lvl.cipso[net_lvl];
+			return 0;
+		}
+		break;
+	}
+
+	return -EINVAL;
+}
+
+/**
+ * cipso_v4_map_cat_rbm_valid - Checks to see if the category bitmap is valid
+ * @doi_def: the DOI definition
+ * @bitmap: category bitmap
+ * @bitmap_len: bitmap length in bytes
+ *
+ * Description:
+ * Checks the given category bitmap against the given DOI definition and
+ * returns a negative value if any of the categories in the bitmap do not have
+ * a valid mapping and a zero value if all of the categories are valid.
+ *
+ */
+static int cipso_v4_map_cat_rbm_valid(const struct cipso_v4_doi *doi_def,
+				      const unsigned char *bitmap,
+				      const u32 bitmap_len)
+{
+	int cat = -1;
+	u32 bitmap_len_bits = bitmap_len * 8;
+	u32 cipso_cat_size = doi_def->map.std->cat.cipso_size;
+	u32 *cipso_array = doi_def->map.std->cat.cipso;
+
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		return 0;
+	case CIPSO_V4_MAP_STD:
+		for (;;) {
+			cat = cipso_v4_bitmap_walk(bitmap,
+						   bitmap_len_bits,
+						   cat + 1,
+						   1);
+			if (cat < 0)
+				break;
+			if (cat >= cipso_cat_size ||
+			    cipso_array[cat] >= CIPSO_V4_INV_CAT)
+				return -EFAULT;
+		}
+
+		if (cat == -1)
+			return 0;
+		break;
+	}
+
+	return -EFAULT;
+}
+
+/**
+ * cipso_v4_map_cat_rbm_hton - Perform a category mapping from host to network
+ * @doi_def: the DOI definition
+ * @host_cat: the category bitmap in host format
+ * @host_cat_len: the length of the host's category bitmap in bytes
+ * @net_cat: the zero'd out category bitmap in network/CIPSO format
+ * @net_cat_len: the length of the CIPSO bitmap in bytes
+ *
+ * Description:
+ * Perform a label mapping to translate a local MLS category bitmap to the
+ * correct CIPSO bitmap using the given DOI definition.  Returns the minimum
+ * size in bytes of the network bitmap on success, negative values otherwise.
+ *
+ */
+static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def,
+				     const unsigned char *host_cat,
+				     const u32 host_cat_len,
+				     unsigned char *net_cat,
+				     const u32 net_cat_len)
+{
+	int host_spot = -1;
+	u32 net_spot;
+	u32 net_spot_max = 0;
+	u32 host_clen_bits = host_cat_len * 8;
+	u32 net_clen_bits = net_cat_len * 8;
+	u32 host_cat_size = doi_def->map.std->cat.local_size;
+	u32 *host_cat_array = doi_def->map.std->cat.local;
+
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		net_spot_max = host_cat_len - 1;
+		while (net_spot_max > 0 && host_cat[net_spot_max] == 0)
+			net_spot_max--;
+		if (net_spot_max > net_cat_len)
+			return -EINVAL;
+		memcpy(net_cat, host_cat, net_spot_max);
+		return net_spot_max;
+	case CIPSO_V4_MAP_STD:
+		for (;;) {
+			host_spot = cipso_v4_bitmap_walk(host_cat,
+							 host_clen_bits,
+							 host_spot + 1,
+							 1);
+			if (host_spot < 0)
+				break;
+			if (host_spot >= host_cat_size)
+				return -EPERM;
+
+			net_spot = host_cat_array[host_spot];
+			if (net_spot >= net_clen_bits)
+				return -ENOSPC;
+			cipso_v4_bitmap_setbit(net_cat, net_spot, 1);
+
+			if (net_spot > net_spot_max)
+				net_spot_max = net_spot;
+		}
+
+		if (host_spot == -2)
+			return -EFAULT;
+
+		if (++net_spot_max % 8)
+			return net_spot_max / 8 + 1;
+		return net_spot_max / 8;
+	}
+
+	return -EINVAL;
+}
+
+/**
+ * cipso_v4_map_cat_rbm_ntoh - Perform a category mapping from network to host
+ * @doi_def: the DOI definition
+ * @net_cat: the category bitmap in network/CIPSO format
+ * @net_cat_len: the length of the CIPSO bitmap in bytes
+ * @host_cat: the zero'd out category bitmap in host format
+ * @host_cat_len: the length of the host's category bitmap in bytes
+ *
+ * Description:
+ * Perform a label mapping to translate a CIPSO bitmap to the correct local
+ * MLS category bitmap using the given DOI definition.  Returns the minimum
+ * size in bytes of the host bitmap on success, negative values otherwise.
+ *
+ */
+static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,
+				     const unsigned char *net_cat,
+				     const u32 net_cat_len,
+				     unsigned char *host_cat,
+				     const u32 host_cat_len)
+{
+	u32 host_spot;
+	u32 host_spot_max = 0;
+	int net_spot = -1;
+	u32 net_clen_bits = net_cat_len * 8;
+	u32 host_clen_bits = host_cat_len * 8;
+	u32 net_cat_size = doi_def->map.std->cat.cipso_size;
+	u32 *net_cat_array = doi_def->map.std->cat.cipso;
+
+	switch (doi_def->type) {
+	case CIPSO_V4_MAP_PASS:
+		if (net_cat_len > host_cat_len)
+			return -EINVAL;
+		memcpy(host_cat, net_cat, net_cat_len);
+		return host_cat_len;
+	case CIPSO_V4_MAP_STD:
+		for (;;) {
+			net_spot = cipso_v4_bitmap_walk(net_cat,
+							net_clen_bits,
+							net_spot + 1,
+							1);
+			if (net_spot < 0)
+				break;
+			if (net_spot >= net_cat_size)
+				return -EPERM;
+
+			host_spot = net_cat_array[net_spot];
+			if (host_spot >= host_clen_bits)
+				return -ENOSPC;
+			cipso_v4_bitmap_setbit(host_cat, host_spot, 1);
+
+			if (host_spot > host_spot_max)
+				host_spot_max = host_spot;
+		}
+
+		if (net_spot == -2)
+			return -EFAULT;
+
+		if (++host_spot_max % 8)
+			return host_spot_max / 8 + 1;
+		return host_spot_max / 8;
+	}
+
+	return -EINVAL;
+}
+
+/*
+ * Protocol Handling Functions
+ */
+
+#define CIPSO_V4_HDR_LEN              6
+
+/**
+ * cipso_v4_gentag_hdr - Generate a CIPSO option header
+ * @doi_def: the DOI definition
+ * @len: the total tag length in bytes
+ * @buf: the CIPSO option buffer
+ *
+ * Description:
+ * Write a CIPSO header into the beginning of @buffer.  Return zero on success,
+ * negative values on failure.
+ *
+ */
+static int cipso_v4_gentag_hdr(const struct cipso_v4_doi *doi_def,
+			       const u32 len,
+			       unsigned char *buf)
+{
+	if (CIPSO_V4_HDR_LEN + len > 40)
+		return -ENOSPC;
+
+	buf[0] = IPOPT_CIPSO;
+	buf[1] = CIPSO_V4_HDR_LEN + len;
+	*(u32 *)&buf[2] = htonl(doi_def->doi);
+
+	return 0;
+}
+
+#define CIPSO_V4_TAG1_CAT_LEN         30
+
+/**
+ * cipso_v4_gentag_rbm - Generate a CIPSO restricted bitmap tag (type #1)
+ * @doi_def: the DOI definition
+ * @secattr: the security attributes
+ * @buffer: the option buffer
+ * @buffer_len: length of buffer in bytes
+ *
+ * Description:
+ * Generate a CIPSO option using the restricted bitmap tag, tag type #1.  The
+ * actual buffer length may be larger than the indicated size due to
+ * translation between host and network category bitmaps.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+static int cipso_v4_gentag_rbm(const struct cipso_v4_doi *doi_def,
+			       const struct netlbl_lsm_secattr *secattr,
+			       unsigned char **buffer,
+			       u32 *buffer_len)
+{
+	int ret_val = -EPERM;
+	unsigned char *buf = NULL;
+	u32 buf_len;
+	u32 level;
+
+	if (secattr->set_mls_cat) {
+		buf = kzalloc(CIPSO_V4_HDR_LEN + 4 + CIPSO_V4_TAG1_CAT_LEN,
+			      GFP_ATOMIC);
+		if (buf == NULL)
+			return -ENOMEM;
+
+		ret_val = cipso_v4_map_cat_rbm_hton(doi_def,
+						    secattr->mls_cat,
+						    secattr->mls_cat_len,
+						    &buf[CIPSO_V4_HDR_LEN + 4],
+						    CIPSO_V4_TAG1_CAT_LEN);
+		if (ret_val < 0)
+			goto gentag_failure;
+#if 0
+		/* PM - this should be a sysctl adjustable setting */
+		/* XXX - this will send packets using the "optimized" format
+		   when possibile as specified in  section 3.4.2.6 of the
+		   CIPSO draft */
+		if (ret_val > 0 && ret_val < 10)
+			ret_val = 10;
+#endif
+		buf_len = 4 + ret_val;
+	} else {
+		buf = kzalloc(CIPSO_V4_HDR_LEN + 4, GFP_ATOMIC);
+		if (buf == NULL)
+			return -ENOMEM;
+		buf_len = 4;
+	}
+
+	ret_val = cipso_v4_map_lvl_hton(doi_def, secattr->mls_lvl, &level);
+	if (ret_val != 0)
+		goto gentag_failure;
+
+	ret_val = cipso_v4_gentag_hdr(doi_def, buf_len, buf);
+	if (ret_val != 0)
+		goto gentag_failure;
+
+	buf[CIPSO_V4_HDR_LEN] = 0x01;
+	buf[CIPSO_V4_HDR_LEN + 1] = buf_len;
+	buf[CIPSO_V4_HDR_LEN + 3] = level;
+
+	*buffer = buf;
+	*buffer_len = CIPSO_V4_HDR_LEN + buf_len;
+
+	return 0;
+
+gentag_failure:
+	if (buf)
+		kfree(buf);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_parsetag_rbm - Parse a CIPSO restricted bitmap tag
+ * @doi_def: the DOI definition
+ * @tag: the CIPSO tag
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Parse a CIPSO restricted bitmap tag (tag type #1) and return the security
+ * attributes in @secattr.  Return zero on success, negatives values on
+ * failure.
+ *
+ */
+static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def,
+				 const unsigned char *tag,
+				 struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val;
+	u8 tag_len = tag[1];
+	u32 level;
+
+	ret_val = cipso_v4_map_lvl_ntoh(doi_def, tag[3], &level);
+	if (ret_val != 0)
+		return ret_val;
+	secattr->mls_lvl = level;
+	secattr->set_mls_lvl = 1;
+
+	if (tag_len > 4) {
+		switch (doi_def->type) {
+		case CIPSO_V4_MAP_PASS:
+			secattr->mls_cat_len = tag_len - 4;
+			break;
+		case CIPSO_V4_MAP_STD:
+			secattr->mls_cat_len =
+				doi_def->map.std->cat.local_size;
+			break;
+		}
+		secattr->mls_cat = kzalloc(secattr->mls_cat_len, GFP_ATOMIC);
+		if (secattr->mls_cat == NULL)
+			return -ENOMEM;
+
+		ret_val = cipso_v4_map_cat_rbm_ntoh(doi_def,
+						    &tag[4],
+						    tag_len - 4,
+						    secattr->mls_cat,
+						    secattr->mls_cat_len);
+		if (ret_val < 0) {
+			kfree(secattr->mls_cat);
+			return ret_val;
+		}
+		secattr->mls_cat_len = ret_val;
+		secattr->set_mls_cat = 1;
+	}
+
+	return 0;
+}
+
+/**
+ * cipso_v4_validate - Validate a CIPSO option
+ * @option: the start of the option, on error it is set to point to the error
+ *
+ * Description:
+ * This routine is called to validate a CIPSO option, it checks all of the
+ * fields to ensure that they are at least valid, see the draft snippet below
+ * for details.  If the option is valid then a zero value is returned and
+ * the value of @option is unchanged.  If the option is invalid then a
+ * non-zero value is returned and @option is adjusted to point to the
+ * offending portion of the option.  From the IETF draft ...
+ *
+ *  "If any field within the CIPSO options, such as the DOI identifier, is not
+ *   recognized the IP datagram is discarded and an ICMP 'parameter problem'
+ *   (type 12) is generated and returned.  The ICMP code field is set to 'bad
+ *   parameter' (code 0) and the pointer is set to the start of the CIPSO field
+ *   that is unrecognized."
+ *
+ */
+int cipso_v4_validate(unsigned char **option)
+{
+	unsigned char *opt = *option;
+	unsigned char *tag;
+	unsigned char opt_iter;
+	unsigned char err_offset = 0;
+	unsigned char locked = 0;
+	u8 opt_len;
+	u8 tag_len;
+	struct cipso_v4_doi *doi_def = NULL;
+	u32 tag_iter;
+
+	/* XXX: caller already checks for length values that are too large */
+	opt_len = opt[1];
+	if (opt_len < 8) {
+		err_offset = 1;
+		goto validate_return;
+	}
+
+	rcu_read_lock();
+	locked = 1;
+	doi_def = cipso_v4_doi_getdef(ntohl(*((u32 *)&opt[2])));
+	if (doi_def == NULL) {
+		err_offset = 2;
+		goto validate_return;
+	}
+
+	opt_iter = 6;
+	tag = opt + opt_iter;
+	while (opt_iter < opt_len) {
+		for (tag_iter = 0; doi_def->tags[tag_iter] != tag[0];)
+			if (doi_def->tags[tag_iter] == CIPSO_V4_TAG_INVALID ||
+			    ++tag_iter == CIPSO_V4_TAG_MAXCNT) {
+				err_offset = opt_iter;
+				goto validate_return;
+			}
+
+		tag_len = tag[1];
+		if (tag_len > (opt_len - opt_iter)) {
+			err_offset = opt_iter + 1;
+			goto validate_return;
+		}
+
+		switch (tag[0]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			if (tag_len < 4) {
+				err_offset = opt_iter + 1;
+				goto validate_return;
+			}
+#if 0
+			/* PM - i think we can skip this check safely */
+			if (tag[2] != 0) {
+				err_offset = opt_iter + 2;
+				goto validate_return;
+			}
+#endif
+			/* PM - how detailed a check do we need to make, are
+			   these last two checks (level and category)
+			   neccessary at this level?  if we do drop these
+			   checks we need to add a bit of code to the *_ntoh()
+			   functions to check for invalid levels/cats. */
+			if (cipso_v4_map_lvl_valid(doi_def, tag[3]) < 0) {
+				err_offset = opt_iter + 3;
+				goto validate_return;
+			}
+			if (tag_len > 4 &&
+			    cipso_v4_map_cat_rbm_valid(doi_def,
+						       &tag[4],
+						       tag_len - 4) < 0) {
+				err_offset = opt_iter + 4;
+				goto validate_return;
+			}
+			break;
+		case CIPSO_V4_TAG_ENUM:
+		case CIPSO_V4_TAG_RANGE:
+		case CIPSO_V4_TAG_PBITMAP:
+		case CIPSO_V4_TAG_FREEFORM:
+		default:
+			err_offset = opt_iter;
+			goto validate_return;
+		}
+
+		tag += tag_len;
+		opt_iter += tag_len;
+	}
+
+validate_return:
+	if (locked)
+		rcu_read_unlock();
+	*option = opt + err_offset;
+	return err_offset;
+}
+
+/**
+ * cipso_v4_error - Send the correct reponse for a bad packet
+ * @skb: the packet
+ * @error: the error code
+ * @gateway: CIPSO gateway flag
+ *
+ * Description:
+ * Based on the error code given in @error, send an ICMP error message back to
+ * the originating host.  Returns zero on success, negative values on failure.
+ * From the IETF draft ...
+ *
+ *  "If the contents of the CIPSO [option] are valid but the security label is
+ *   outside of the configured host or port label range, the datagram is
+ *   discarded and an ICMP 'destination unreachable' (type 3) is generated and
+ *   returned.  The code field of the ICMP is set to 'communication with
+ *   destination network administratively prohibited' (code 9) or to
+ *   'communication with destination host administratively prohibited'
+ *   (code 10).  The value of the code is dependent on whether the originator
+ *   of the ICMP message is acting as a CIPSO host or a CIPSO gateway.  The
+ *   recipient of the ICMP message MUST be able to handle either value.  The
+ *   same procedure is performed if a CIPSO [option] can not be added to an
+ *   IP packet because it is too large to fit in the IP options area."
+ *
+ *  "If the error is triggered by receipt of an ICMP message, the message is
+ *   discarded and no response is permitted (consistent with general ICMP
+ *   processing rules)."
+ *
+ */
+int cipso_v4_error(struct sk_buff *skb,
+		   const int error,
+		   const u32 gateway)
+{
+	switch (error) {
+	case -EACCES:
+		break;
+	default:
+		return 0;
+	}
+
+	if (skb->nh.iph->protocol == IPPROTO_ICMP)
+		return 0;
+
+	if (gateway)
+		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0);
+	else
+		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0);
+
+	return 0;
+}
+
+/**
+ * cipso_v4_socket_setopt - Set the CIPSO option string on a socket
+ * @sock: the socket
+ * @opt: the option string
+ * @opt_len: the option string length
+ *
+ * Description:
+ * Attempt to add the given CIPSO option string to the socket.  The caller is
+ * responsibile for locking and releasing the socket.  Returns zero on success,
+ * negative values on failure.
+ *
+ */
+int cipso_v4_socket_setopt(struct socket *sock,
+			   unsigned char *opt,
+			   u32 opt_len)
+{
+	int ret_val;
+	struct ip_options *ip_opt = NULL;
+	struct sock *sk = sock->sk;
+	struct inet_sock *sk_inet;
+	struct inet_connection_sock *sk_conn;
+
+	ret_val = ip_options_get(&ip_opt, opt, opt_len);
+	if (ret_val != 0)
+		goto socket_setopt_return;
+	ip_opt->is_setbyuser = 0;
+	sk_inet = inet_sk(sk);
+	if (sk_inet->is_icsk) {
+		sk_conn = inet_csk(sk);
+		if (sk_inet->opt)
+			sk_conn->icsk_ext_hdr_len -= sk_inet->opt->optlen;
+		sk_conn->icsk_ext_hdr_len += ip_opt->optlen;
+		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);
+	}
+	ip_opt = xchg(&sk_inet->opt, ip_opt);
+
+	ret_val = 0;
+
+socket_setopt_return:
+	if (ip_opt)
+		kfree(opt);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_socket_setattr - Add a CIPSO option to a socket
+ * @sock: the socket
+ * @doi_def: the CIPSO DOI to use
+ * @secattr: the specific security attributes of the socket
+ *
+ * Description:
+ * Set the CIPSO option on the given socket using the DOI definition and
+ * security attributes passed to the function.  Returns zero on success and
+ * negative values on failure.
+ *
+ */
+int cipso_v4_socket_setattr(const struct socket *sock,
+			    const struct cipso_v4_doi *doi_def,
+			    const struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -EPERM;
+	u32 iter;
+	unsigned char *buf = NULL;
+	u32 buf_len = 0;
+	struct ip_options *opt = NULL;
+	struct sock *sk;
+	struct inet_sock *sk_inet;
+	struct inet_connection_sock *sk_conn;
+
+	/* In the case of sock_create_lite(), the sock->sk field is not
+	   defined yet but it is not a problem as the only users of these
+	   "lite" PF_INET sockets are functions which do an accept() call
+	   afterwards so we will label the socket as part of the accept(). */
+	/* PM - test this, nfs/sunrpc is a "lite" socket user */
+	sk = sock->sk;
+	if (sk == NULL)
+		return 0;
+
+	/* XXX - this code assumes only one tag per CIPSO option which isnt
+	   really a good assumption to make but since we only support the MAC
+	   tags right now it is a safe assumption */
+	iter = 0;
+	do {
+		switch (doi_def->tags[iter]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			ret_val = cipso_v4_gentag_rbm(doi_def,
+						      secattr,
+						      &buf,
+						      &buf_len);
+			break;
+		case CIPSO_V4_TAG_ENUM:
+		case CIPSO_V4_TAG_RANGE:
+		case CIPSO_V4_TAG_PBITMAP:
+		case CIPSO_V4_TAG_FREEFORM:
+		default:
+			ret_val = -EPERM;
+			goto socket_setattr_failure;
+		}
+
+		iter++;
+	} while (ret_val != 0 &&
+		 iter < CIPSO_V4_TAG_MAXCNT &&
+		 doi_def->tags[iter] != CIPSO_V4_TAG_INVALID);
+	if (ret_val != 0)
+		goto socket_setattr_failure;
+
+	ret_val = ip_options_get(&opt, buf, buf_len);
+	if (ret_val != 0)
+		goto socket_setattr_failure;
+	opt->is_setbyuser = 0;
+
+	kfree(buf);
+	buf = NULL;
+
+	lock_sock(sk);
+	sk_inet = inet_sk(sk);
+	if (sk_inet->is_icsk) {
+		sk_conn = inet_csk(sk);
+		if (sk_inet->opt)
+			sk_conn->icsk_ext_hdr_len -= sk_inet->opt->optlen;
+		sk_conn->icsk_ext_hdr_len += opt->optlen;
+		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);
+	}
+	opt = xchg(&sk_inet->opt, opt);
+	release_sock(sk);
+	if (opt)
+		kfree(opt);
+
+	return 0;
+
+socket_setattr_failure:
+	if (buf)
+		kfree(buf);
+	if (opt)
+		kfree(opt);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_socket_getopt - Get the CIPSO IP option string from the socket
+ * @sock: the socket
+ * @opt: the option string
+ * @opt_len: the option string length in bytes
+ *
+ * Description:
+ * If a CIPSO option is present in the socket's IP options then return a
+ * a pointer to the option string.  The caller is responsibile for locking
+ * and releasing the socket.  Returns zero on success, negative values on
+ * failure.
+ *
+ */
+int cipso_v4_socket_getopt(const struct socket *sock,
+			   unsigned char **opt,
+			   u32 *opt_len)
+{
+	struct ip_options *ip_opt = inet_sk(sock->sk)->opt;
+	unsigned char *cipso_ptr;
+
+	if (ip_opt == NULL || ip_opt->cipso == 0)
+		return -ENOMSG;
+	cipso_ptr = ip_opt->__data + ip_opt->cipso - sizeof(struct iphdr);
+
+	*opt = cipso_ptr;
+	*opt_len = cipso_ptr[1];
+
+	return 0;
+}
+
+/**
+ * cipso_v4_socket_getattr - Get the security attributes from a socket
+ * @sock: the socket
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Query @sock to see if there is a CIPSO option attached to the socket and if
+ * there is return the CIPSO security attributes in @secattr.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+int cipso_v4_socket_getattr(const struct socket *sock,
+			    struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -ENOMSG;
+	struct sock *sk;
+	struct inet_sock *sk_inet;
+	unsigned char *cipso_ptr;
+	u32 doi;
+	struct cipso_v4_doi *doi_def;
+
+	sk = sock->sk;
+	lock_sock(sk);
+	sk_inet = inet_sk(sk);
+	if (sk_inet->opt == NULL || sk_inet->opt->cipso == 0)
+		goto socket_getattr_return;
+	cipso_ptr = sk_inet->opt->__data + sk_inet->opt->cipso -
+		sizeof(struct iphdr);
+	ret_val = cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr);
+	if (ret_val == 0)
+		goto socket_getattr_return;
+
+	doi = ntohl(*(u32 *)&cipso_ptr[2]);
+	rcu_read_lock();
+	doi_def = cipso_v4_doi_getdef(doi);
+	if (doi_def == NULL) {
+		rcu_read_unlock();
+		goto socket_getattr_return;
+	}
+	/* XXX - this code assumes only one tag per CIPSO option, the draft is
+	   a little unclear about supporting multiple tags per option
+	   but this seems safe for now */
+	switch (cipso_ptr[6]) {
+	case CIPSO_V4_TAG_RBITMAP:
+		ret_val = cipso_v4_parsetag_rbm(doi_def,
+						&cipso_ptr[6],
+						secattr);
+		break;
+	}
+	rcu_read_unlock();
+
+socket_getattr_return:
+	release_sock(sk);
+	return ret_val;
+}
+
+/**
+ * cipso_v4_skbuff_getattr - Get the security attributes from the CIPSO option
+ * @skb: the packet
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Parse the given packet's CIPSO option and return the security attributes.
+ * Returns zero on success and negative values on failure.
+ *
+ */
+int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+			    struct netlbl_lsm_secattr *secattr)
+{
+	int ret_val = -ENOMSG;
+	unsigned char *cipso_ptr;
+	u32 doi;
+	struct cipso_v4_doi *doi_def;
+
+	if (!CIPSO_V4_OPTEXIST(skb))
+		return -ENOMSG;
+	cipso_ptr = CIPSO_V4_OPTPTR(skb);
+	if (cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr) == 0)
+		return 0;
+
+	doi = ntohl(*(u32 *)&cipso_ptr[2]);
+	rcu_read_lock();
+	doi_def = cipso_v4_doi_getdef(doi);
+	if (doi_def == NULL)
+		goto skbuff_getattr_return;
+	/* XXX - this code assumes only one tag per CIPSO option which isnt
+	   really a good assumption to make but since we only support the MAC
+	   tags right now it is a safe assumption */
+	switch (cipso_ptr[6]) {
+	case CIPSO_V4_TAG_RBITMAP:
+		ret_val = cipso_v4_parsetag_rbm(doi_def,
+						&cipso_ptr[6],
+						secattr);
+		break;
+	}
+
+skbuff_getattr_return:
+	rcu_read_unlock();
+	return ret_val;
+}
+
+/*
+ * Setup Functions
+ */
+
+/**
+ * cipso_v4_init - Initialize the CIPSO module
+ *
+ * Description:
+ * Initialize the CIPSO module and prepare it for use.  Returns zero on success
+ * and negative values on failure.
+ *
+ */
+static int __init cipso_v4_init(void)
+{
+	return cipso_v4_cache_init(CIPSO_V4_CACHE_BUCKETS);
+}
+
+/* PM - not sure there is any point to this now, delete this func? */
+/**
+ * cipso_v4_exit - Cleanup after the CIPSO module
+ *
+ * Description:
+ * Perform any necessary cleanup tasks before the CIPSO module goes away.
+ *
+ */
+static void __exit cipso_v4_exit(void)
+{
+	cipso_v4_cache_destroy();
+}
+
+subsys_initcall(cipso_v4_init);
+

--
paul moore
linux security @ hp


linux-2.6-net-label_4_8.patch:
 Makefile                       |    1 
 netlabel/Kconfig               |   14 
 netlabel/Makefile              |   16 
 netlabel/netlabel_cipso_v4.h   |  218 ++++++++++++
 netlabel/netlabel_domainhash.c |  597 ++++++++++++++++++++++++++++++++++
 netlabel/netlabel_domainhash.h |   64 +++
 netlabel/netlabel_kapi.c       |  363 +++++++++++++++++++++
 netlabel/netlabel_mgmt.c       |  707 +++++++++++++++++++++++++++++++++++++++++
 netlabel/netlabel_mgmt.h       |  250 ++++++++++++++
 netlabel/netlabel_unlabeled.h  |   84 ++++
 netlabel/netlabel_user.c       |  131 +++++++
 netlabel/netlabel_user.h       |  175 ++++++++++
 12 files changed, 2620 insertions(+)

--- NEW FILE linux-2.6-net-label_4_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:35 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:03 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN13sM032517
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:03 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN12li026119;
	Tue, 27 Jun 2006 19:01:02 -0400
Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN0xLl000814;
	Tue, 27 Jun 2006 19:00:59 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel8.hp.com (Postfix) with ESMTP id BDE1B341A2;
	Tue, 27 Jun 2006 19:00:52 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 29056270DB;
	Tue, 27 Jun 2006 23:00:52 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0pct030726;
	Tue, 27 Jun 2006 19:00:51 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0psj030725;
	Tue, 27 Jun 2006 19:00:51 -0400
Message-Id: <20060627230051.169877000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:35 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 4/8] NetLabel: core NetLabel subsystem
Content-Disposition: inline; filename=netlabel-core
X-RedHat-Spam-Score: -96.778 
Content-Type: 
X-UID: 72036
X-Length: 82971

Add a new kernel subsystem, NetLabel, to provide explicit packet labeling 
services (CIPSO, RIPSO, etc.) to LSM developers.  NetLabel is designed to work
in conjunction with a LSM to intercept and decode security labels on incoming
network packets as well as ensure that outgoing network packets are labeled
according to the security mechanism employed by the LSM.  The NetLabel
subsystem is configured through a Generic NETLINK interface described in the
header files included in this patch.
---
 net/Makefile                       |    1 
 net/netlabel/Kconfig               |   14 
 net/netlabel/Makefile              |   16 
 net/netlabel/netlabel_cipso_v4.h   |  218 +++++++++++
 net/netlabel/netlabel_domainhash.c |  597 +++++++++++++++++++++++++++++++
 net/netlabel/netlabel_domainhash.h |   64 +++
 net/netlabel/netlabel_kapi.c       |  363 ++++++++++++++++++
 net/netlabel/netlabel_mgmt.c       |  707 +++++++++++++++++++++++++++++++++++++
 net/netlabel/netlabel_mgmt.h       |  250 +++++++++++++
 net/netlabel/netlabel_unlabeled.h  |   84 ++++
 net/netlabel/netlabel_user.c       |  131 ++++++
 net/netlabel/netlabel_user.h       |  175 +++++++++
 12 files changed, 2620 insertions(+)

Index: linux-2.6.17.i686-quilt/net/Makefile
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/Makefile
+++ linux-2.6.17.i686-quilt/net/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_DCCP)		+= dccp/
 obj-$(CONFIG_IP_SCTP)		+= sctp/
 obj-$(CONFIG_IEEE80211)		+= ieee80211/
 obj-$(CONFIG_TIPC)		+= tipc/
+obj-$(CONFIG_NETLABEL)		+= netlabel/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)		+= sysctl_net.o
Index: linux-2.6.17.i686-quilt/net/netlabel/Kconfig
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/Kconfig
@@ -0,0 +1,14 @@
+#
+# NetLabel configuration
+#
+
+config NETLABEL
+	bool "NetLabel subsystem support"
+	depends on NET && SECURITY
+	default n
+	---help---
+	  NetLabel provides support for explicit network packet labeling
+	  protocols such as CIPSO and RIPSO.  For more information see
+	  Documentation/netlabel.
+
+	  If you are unsure, say N.
Index: linux-2.6.17.i686-quilt/net/netlabel/Makefile
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for the NetLabel subsystem.
+#
+# Feb 9, 2006, Paul Moore <paul.moore at hp.com>
+#
+
+# base objects
+obj-y	:= netlabel_user.o netlabel_kapi.o netlabel_domainhash.o
+
+# management objects
+obj-y	+= netlabel_mgmt.o
+
+# protocol modules
+obj-y	+= netlabel_unlabeled.o
+obj-y	+= netlabel_cipso_v4.o
+
Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.h
@@ -0,0 +1,218 @@
+/*
+ * NetLabel CIPSO/IPv4 Support
+ *
+ * This file defines the CIPSO/IPv4 functions for the NetLabel system.  The
+ * NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_CIPSO_V4
+#define _NETLABEL_CIPSO_V4
+
+#include <net/netlabel.h>
+
+/*
+ * The following NetLabel payloads are supported by the CIPSO subsystem, all
+ * of which are preceeded by the nlmsghdr struct.
+ *
+ * o ACK:
+ *   Sent by the kernel in response to an applications message, applications
+ *   should never send this message.
+ *
+ *   +----------------------+-----------------------+
+ *   | seq number (32 bits) | return code (32 bits) |
+ *   +----------------------+-----------------------+
+ *
+ *     seq number:  the sequence number of the original message, taken from the
+ *                  nlmsghdr structure
+ *     return code: return value, based on errno values
+ *
+ * o ADD:
+ *   Sent by an application to add a new DOI mapping table, after completion
+ *   of the task the kernel should ACK this message.
+ *
+ *   +-----+--------------------+---------------------+
+ *   | DOI | map type (32 bits) | tag count (32 bits) | ...
+ *   +-----+--------------------+---------------------+
+ *
+ *   +-----------------+
+ *   | tag #X (8 bits) | ... repeated
+ *   +-----------------+
+ *
+ *   +-------------- ---- --- -- -
+ *   | mapping data
+ *   +-------------- ---- --- -- -
+ *
+ *     DOI:          the DOI value
+ *     map type:     the mapping table type (defined in the cipso_ipv4.h header
+ *                   as CIPSO_V4_MAP_*)
+ *     tag count:    the number of tags, must be greater than zero
+ *     tag:          the CIPSO tag for the DOI, tags listed first are given
+ *                   higher priorirty when sending packets
+ *     mapping data: specific to the map type (see below)
+ *
+ *   CIPSO_V4_MAP_STD
+ *
+ *   +------------------+-----------------------+-----------------------+
[...2356 lines suppressed...]
+ * @skb: NetLabel message
+ * @pid: sending PID
+ * @group: multicast group id
+ *
+ * Description:
+ * Sends a multicast NetLabel message over the NETLINK socket to all members
+ * of @group except @pid.
+ *
+ */
+int netlbl_netlink_snd_multicast(struct sk_buff *skb,
+				 const u32 pid,
+				 const u32 group)
+{
+	return genlmsg_multicast(skb, pid, group);
+}
Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_user.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_user.h
@@ -0,0 +1,175 @@
+/*
+ * NetLabel NETLINK Interface
+ *
+ * This file defines the NETLINK interface for the NetLabel system.  The
+ * NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _NETLABEL_USER_H
+#define _NETLABEL_USER_H
+
+#include <linux/skbuff.h>
+#include <linux/capability.h>
+#include <linux/genetlink.h>
+#include <net/netlabel.h>
+
+/* NetLabel NETLINK helper functions */
+
+/**
+ * netlbl_netlink_cap_check - Check the NETLINK msg capabilities
+ * @skb: the NETLINK buffer
+ * @req_cap: the required capability
+ *
+ * Description:
+ * Check the NETLINK buffer's capabilities against the required capabilities.
+ * Returns zero on success, negative values on failure.
+ *
+ */
+static inline int netlbl_netlink_cap_check(const struct sk_buff *skb,
+					   const kernel_cap_t req_cap)
+{
+	if (cap_raised(NETLINK_CB(skb).eff_cap, req_cap))
+		return 0;
+	return -EPERM;
+}
+
+/**
+ * netlbl_netlink_hdr_put - Write the NETLINK buffers into a buffer
+ * @skb: the buffer
+ * @pid: the PID of the receipient
+ * @seq: the sequence number
+ * @flags: NETLINK message flags
+ * @type: the generic NETLINK message family type
+ * @cmd: command
+ * @len: length
+ *
+ * Description:
+ * Write both a NETLINK nlmsghdr structure and a Generic NETLINK genlmsghdr
+ * struct to a buffer.  Returns a pointer to the start of the payload buffer
+ * on success or NULL on failure.
+ *
+ */
+static inline void __netlbl_netlink_hdr(unsigned char *buffer,
+					const u32 pid,
+					const u32 seq,
+					const int flags,
+					const int type,
+					const u8 cmd,
+					const int len)
+{
+	struct nlmsghdr *nlh;
+	struct genlmsghdr *hdr;
+
+	nlh = (struct nlmsghdr *)buffer;
+	nlh->nlmsg_type = type;
+	nlh->nlmsg_len = len;
+	nlh->nlmsg_flags = flags;
+	nlh->nlmsg_pid = pid;
+	nlh->nlmsg_seq = seq;
+
+	hdr = nlmsg_data(nlh);
+	hdr->cmd = cmd;
+	hdr->version = NETLBL_PROTO_VERSION;
+	hdr->reserved = 0;
+}
+
+/**
+ * netlbl_netlink_hdr_put - Write the NETLINK buffers into a sk_buff
+ * @skb: the packet
+ * @pid: the PID of the receipient
+ * @seq: the sequence number
+ * @flags: NETLINK message flags
+ * @type: the generic NETLINK message family type
+ * @cmd: command
+ * @len: length
+ *
+ * Description:
+ * Write both a NETLINK nlmsghdr structure and a Generic NETLINK genlmsghdr
+ * struct to the packet.  Returns a pointer to the start of the payload buffer
+ * on success or NULL on failure.
+ *
+ */
+static inline unsigned char *netlbl_netlink_hdr_put(struct sk_buff *skb,
+						    const u32 pid,
+						    const u32 seq,
+						    const int flags,
+						    const int type,
+						    const u8 cmd,
+						    const int len)
+{
+	struct nlmsghdr *nlh;
+	struct genlmsghdr *hdr;
+
+	nlh = nlmsg_put(skb, pid, seq, type, len, flags);
+	if (nlh == NULL)
+		return NULL;
+
+	hdr = nlmsg_data(nlh);
+	hdr->cmd = cmd;
+	hdr->version = NETLBL_PROTO_VERSION;
+	hdr->reserved = 0;
+
+	return (unsigned char *)hdr + GENL_HDRLEN;
+}
+
+/**
+ * netlbl_netlink_payload_len - Return the length of the payload
+ * @skb: the NETLINK buffer
+ *
+ * Description:
+ * This function returns the length of the NetLabel payload.
+ *
+ */
+static inline u32 netlbl_netlink_payload_len(const struct sk_buff *skb)
+{
+	return nlmsg_len((struct nlmsghdr *)skb->data) - GENL_HDRLEN;
+}
+
+/**
+ * netlbl_netlink_payload_data - Returns a pointer to the start of the payload
+ * @skb: the NETLINK buffer
+ *
+ * Description:
+ * This function returns a pointer to the start of the NetLabel payload.
+ *
+ */
+static inline unsigned char *netlbl_netlink_payload_data(
+	                                            const struct sk_buff *skb)
+{
+	return nlmsg_data((struct nlmsghdr *)skb->data) + GENL_HDRLEN;
+}
+
+
+/* NetLabel NETLINK I/O functions */
+
+int netlbl_netlink_init(void);
+void netlbl_netlink_exit(void);
+int netlbl_netlink_snd(struct sk_buff *skb, const u32 pid);
+int netlbl_netlink_snd_multicast(struct sk_buff *skb,
+				 const u32 pid,
+				 const u32 group);
+
+#endif

--
paul moore
linux security @ hp


linux-2.6-net-label_5_8.patch:
 include/linux/security.h                    |   25 -
 net/socket.c                                |   13 
 security/dummy.c                            |    6 
 security/selinux/hooks.c                    |   59 ++
 security/selinux/include/objsec.h           |   11 
 security/selinux/include/selinux_netlabel.h |   94 ++++
 security/selinux/ss/Makefile                |    1 
 security/selinux/ss/ebitmap.c               |  155 +++++++
 security/selinux/ss/ebitmap.h               |    6 
 security/selinux/ss/mls.c                   |  160 +++++++
 security/selinux/ss/mls.h                   |   25 +
 security/selinux/ss/selinux_netlabel.c      |  574 ++++++++++++++++++++++++++++
 security/selinux/ss/services.c              |   12 
 security/selinux/ss/services.h              |    2 
 14 files changed, 1113 insertions(+), 30 deletions(-)

--- NEW FILE linux-2.6-net-label_5_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:36 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:03 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN12sM032511
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:02 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN11Am026109;
	Tue, 27 Jun 2006 19:01:01 -0400
Received: from atlrel6.hp.com (atlrel6.hp.com [156.153.255.205])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN0wLj000809;
	Tue, 27 Jun 2006 19:00:58 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel6.hp.com (Postfix) with ESMTP id 5C2D63608F;
	Tue, 27 Jun 2006 19:00:53 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id D29DB27128;
	Tue, 27 Jun 2006 23:00:52 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0qYr030755;
	Tue, 27 Jun 2006 19:00:52 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0q7i030754;
	Tue, 27 Jun 2006 19:00:52 -0400
Message-Id: <20060627230051.724172000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:36 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 5/8] NetLabel: SELinux support
Content-Disposition: inline; filename=netlabel-selinux-2.6.17
X-RedHat-Spam-Score: -99.715 
Content-Type: 
X-UID: 72034
X-Length: 48087

Add NetLabel support to the SELinux LSM and modify the socket_post_create() LSM
hook to return an error code.  The most significant part of this patch is the
addition of NetLabel hooks into the following SELinux LSM hooks:

 * selinux_file_permission()
 * selinux_socket_sendmsg()
 * selinux_socket_post_create()
 * selinux_socket_post_accept() [NEW]
 * selinux_socket_sock_rcv_skb()
 * selinux_socket_getpeersec_stream()
 * selinux_socket_getpeersec_dgram()

The basic reasoning behind this patch is that outgoing packets are "NetLabel'd"
by labeling their socket and the NetLabel security attributes are checked via
the additional hook in selinux_socket_sock_rcv_skb().  NetLabel itself is only
a labeling mechanism, similar to filesystem extended attributes, it is up to
the SELinux enforcement mechanism to perform the actual access checks.

In addition to the changes outlined above this patch also includes some changes
to the extended bitmap (ebitmap) and multi-level security (mls) code to import
and export SELinux TE/MLS attributes into and out of NetLabel.
---
 include/linux/security.h                    |   25 -
 net/socket.c                                |   13 
 security/dummy.c                            |    6 
 security/selinux/hooks.c                    |   59 ++
 security/selinux/include/objsec.h           |   11 
 security/selinux/include/selinux_netlabel.h |   94 ++++
 security/selinux/ss/Makefile                |    1 
 security/selinux/ss/ebitmap.c               |  155 +++++++
 security/selinux/ss/ebitmap.h               |    6 
 security/selinux/ss/mls.c                   |  160 +++++++
 security/selinux/ss/mls.h                   |   25 +
 security/selinux/ss/selinux_netlabel.c      |  574 ++++++++++++++++++++++++++++
 security/selinux/ss/services.c              |   12 
 security/selinux/ss/services.h              |    2 
 14 files changed, 1113 insertions(+), 30 deletions(-)

Index: linux-2.6.17.i686-quilt/include/linux/security.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/include/linux/security.h
+++ linux-2.6.17.i686-quilt/include/linux/security.h
@@ -1267,8 +1267,8 @@ struct security_operations {
 	int (*unix_may_send) (struct socket * sock, struct socket * other);
 
 	int (*socket_create) (int family, int type, int protocol, int kern);
-	void (*socket_post_create) (struct socket * sock, int family,
-				    int type, int protocol, int kern);
+	int (*socket_post_create) (struct socket * sock, int family,
+				   int type, int protocol, int kern);
 	int (*socket_bind) (struct socket * sock,
 			    struct sockaddr * address, int addrlen);
 	int (*socket_connect) (struct socket * sock,
@@ -2677,13 +2677,13 @@ static inline int security_socket_create
 	return security_ops->socket_create(family, type, protocol, kern);
 }
 
-static inline void security_socket_post_create(struct socket * sock, 
-					       int family,
-					       int type, 
-					       int protocol, int kern)
+static inline int security_socket_post_create(struct socket * sock,
+					      int family,
+					      int type,
+					      int protocol, int kern)
 {
-	security_ops->socket_post_create(sock, family, type,
-					 protocol, kern);
+	return security_ops->socket_post_create(sock, family, type,
+						protocol, kern);
 }
 
 static inline int security_socket_bind(struct socket * sock, 
@@ -2809,11 +2809,12 @@ static inline int security_socket_create
 	return 0;
 }
 
-static inline void security_socket_post_create(struct socket * sock, 
-					       int family,
-					       int type, 
-					       int protocol, int kern)
+static inline int security_socket_post_create(struct socket * sock,
+					      int family,
+					      int type,
+					      int protocol, int kern)
 {
+	return 0;
 }
 
 static inline int security_socket_bind(struct socket * sock, 
Index: linux-2.6.17.i686-quilt/net/socket.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/socket.c
+++ linux-2.6.17.i686-quilt/net/socket.c
@@ -976,11 +976,18 @@ int sock_create_lite(int family, int typ
 		goto out;
 	}
 
-	security_socket_post_create(sock, family, type, protocol, 1);
 	sock->type = type;
+	err = security_socket_post_create(sock, family, type, protocol, 1);
+	if (err)
+		goto out_release;
+
 out:
 	*res = sock;
 	return err;
+out_release:
+	sock_release(sock);
+	sock = NULL;
+	goto out;
 }
 
 /* No kernel lock held - perfect */
@@ -1218,7 +1225,9 @@ static int __sock_create(int family, int
 	 */
 	module_put(net_families[family]->owner);
 	*res = sock;
-	security_socket_post_create(sock, family, type, protocol, kern);
+	err = security_socket_post_create(sock, family, type, protocol, kern);
+	if (err)
+		goto out_release;
 
 out:
 	net_family_read_unlock();
Index: linux-2.6.17.i686-quilt/security/dummy.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/dummy.c
+++ linux-2.6.17.i686-quilt/security/dummy.c
@@ -692,10 +692,10 @@ static int dummy_socket_create (int fami
 	return 0;
 }
 
-static void dummy_socket_post_create (struct socket *sock, int family, int type,
-				      int protocol, int kern)
+static int dummy_socket_post_create (struct socket *sock, int family, int type,
+				     int protocol, int kern)
 {
-	return;
+	return 0;
 }
 
 static int dummy_socket_bind (struct socket *sock, struct sockaddr *address,
Index: linux-2.6.17.i686-quilt/security/selinux/hooks.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/hooks.c
+++ linux-2.6.17.i686-quilt/security/selinux/hooks.c
@@ -12,6 +12,8 @@
  *  Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris at redhat.com>
  *  Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
  *                          <dgoeddel at trustedcs.com>
+ *  Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
+ *                     Paul Moore, <paul.moore at hp.com>
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License version 2,
@@ -74,6 +76,7 @@
 #include "objsec.h"
 #include "netif.h"
 #include "xfrm.h"
+#include "selinux_netlabel.h"
 
 #define XATTR_SELINUX_SUFFIX "selinux"
 #define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
@@ -2293,6 +2296,7 @@ static int selinux_inode_listsecurity(st
 
 static int selinux_file_permission(struct file *file, int mask)
 {
+	int rc;
 	struct inode *inode = file->f_dentry->d_inode;
 
 	if (!mask) {
@@ -2304,8 +2308,12 @@ static int selinux_file_permission(struc
 	if ((file->f_flags & O_APPEND) && (mask & MAY_WRITE))
 		mask |= MAY_APPEND;
 
-	return file_has_perm(current, file,
-			     file_mask_to_av(inode->i_mode, mask));
+	rc = file_has_perm(current, file,
+			   file_mask_to_av(inode->i_mode, mask));
+	if (rc)
+		return rc;
+
+	return selinux_netlbl_inode_permission(inode, mask);
 }
 
 static int selinux_file_alloc_security(struct file *file)
@@ -2922,8 +2930,8 @@ out:
 	return err;
 }
 
-static void selinux_socket_post_create(struct socket *sock, int family,
-				       int type, int protocol, int kern)
+static int selinux_socket_post_create(struct socket *sock, int family,
+				      int type, int protocol, int kern)
 {
 	struct inode_security_struct *isec;
 	struct task_security_struct *tsec;
@@ -2935,7 +2943,7 @@ static void selinux_socket_post_create(s
 	isec->sid = kern ? SECINITSID_KERNEL : tsec->sid;
 	isec->initialized = 1;
 
-	return;
+	return selinux_netlbl_socket_create(sock, family, isec->sid);
 }
 
 /* Range of port numbers used to automatically bind.
@@ -3113,10 +3121,24 @@ static int selinux_socket_accept(struct 
 	return 0;
 }
 
+#ifdef CONFIG_NETLABEL
+static void selinux_socket_post_accept(struct socket *sock,
+				       struct socket *newsock)
+{
+	selinux_netlbl_socket_accept(sock, newsock);
+}
+#endif /* CONFIG_NETLABEL */
+
 static int selinux_socket_sendmsg(struct socket *sock, struct msghdr *msg,
  				  int size)
 {
-	return socket_has_perm(current, sock, SOCKET__WRITE);
+	int rc;
+
+	rc = socket_has_perm(current, sock, SOCKET__WRITE);
+	if (rc)
+		return rc;
+
+	return selinux_netlbl_inode_permission(SOCK_INODE(sock), MAY_WRITE);
 }
 
 static int selinux_socket_recvmsg(struct socket *sock, struct msghdr *msg,
@@ -3306,10 +3328,15 @@ static int selinux_socket_sock_rcv_skb(s
 
 		err = avc_has_perm(sock_sid, port_sid,
 				   sock_class, recv_perm, &ad);
+		if (err)
+			goto out;
 	}
 
-	if (!err)
-		err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
+	err = selinux_netlbl_sock_rcv_skb(sock_class, sock_sid, skb, &ad);
+	if (err)
+		goto out;
+
+	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
 
 out:	
 	return err;
@@ -3333,8 +3360,9 @@ static int selinux_socket_getpeersec_str
 		peer_sid = ssec->peer_sid;
 	}
 	else if (isec->sclass == SECCLASS_TCP_SOCKET) {
-		peer_sid = selinux_socket_getpeer_stream(sock->sk);
-
+		err = selinux_netlbl_socket_getpeersec_stream(sock, &peer_sid);
+		if (err || peer_sid == SECSID_NULL)
+			peer_sid = selinux_socket_getpeer_stream(sock->sk);
 		if (peer_sid == SECSID_NULL) {
 			err = -ENOPROTOOPT;
 			goto out;
@@ -3369,8 +3397,12 @@ out:	
 
 static int selinux_socket_getpeersec_dgram(struct sk_buff *skb, char **secdata, u32 *seclen)
 {
-	int err = 0;
-	u32 peer_sid = selinux_socket_getpeer_dgram(skb);
+	int err;
+	u32 peer_sid;
+
+	err = selinux_netlbl_socket_getpeersec_dgram(skb, &peer_sid);
+	if (err || peer_sid == SECSID_NULL)
+		peer_sid = selinux_socket_getpeer_dgram(skb);
 
 	if (peer_sid == SECSID_NULL)
 		return -EINVAL;
@@ -4353,6 +4385,9 @@ static struct security_operations selinu
 	.socket_connect =		selinux_socket_connect,
 	.socket_listen =		selinux_socket_listen,
 	.socket_accept =		selinux_socket_accept,
+#ifdef CONFIG_NETLABEL
+	.socket_post_accept =		selinux_socket_post_accept,
+#endif
 	.socket_sendmsg =		selinux_socket_sendmsg,
 	.socket_recvmsg =		selinux_socket_recvmsg,
 	.socket_getsockname =		selinux_socket_getsockname,
Index: linux-2.6.17.i686-quilt/security/selinux/include/objsec.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/include/objsec.h
+++ linux-2.6.17.i686-quilt/security/selinux/include/objsec.h
@@ -35,6 +35,14 @@ struct task_security_struct {
 	u32 ptrace_sid;      /* SID of ptrace parent */
 };
 
+struct netlbl_security_struct {
+	u32 netlbl_sid;           /* SID used to set the NetLabel */
+	u32 peer_sid;             /* SID of the connected peer */
+	u32 req_netlbl:1,         /* socket requires a NetLabel label */
+	    labeled:1,            /* socket is labeled with NetLabel */
+	    __unused:30;
+};
+
 struct inode_security_struct {
         struct inode *inode;           /* back pointer to inode object */
 	struct list_head list;         /* list of inode_security_struct */
@@ -44,6 +52,9 @@ struct inode_security_struct {
 	unsigned char initialized;     /* initialization flag */
 	struct semaphore sem;
 	unsigned char inherit;         /* inherit SID from parent entry */
+#ifdef CONFIG_NETLABEL
+	struct netlbl_security_struct netlbl;
+#endif
 };
 
 struct file_security_struct {
Index: linux-2.6.17.i686-quilt/security/selinux/include/selinux_netlabel.h
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/security/selinux/include/selinux_netlabel.h
@@ -0,0 +1,94 @@
+/*
+ * SELinux interface to the NetLabel subsystem
+ *
+ * Author : Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _SELINUX_NETLABEL_H_
+#define _SELINUX_NETLABEL_H_
+
+#ifdef CONFIG_NETLABEL
+void selinux_netlbl_cache_invalidate(void);
+
+int selinux_netlbl_inode_permission(struct inode *inode, int mask);
+
+int selinux_netlbl_socket_create(struct socket *sock,
+				 const int sock_family,
+				 u32 sid);
+void selinux_netlbl_socket_accept(struct socket *sock, struct socket *newsock);
+int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
+				const u32 sock_sid,
+				struct sk_buff *skb,
+				struct avc_audit_data *ad);
+int selinux_netlbl_socket_getpeersec_stream(struct socket *sock,
+					    u32 *peer_sid);
+int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb, u32 *peer_sid);
+#else
+static inline void selinux_netlbl_cache_invalidate(void)
+{
+	return;
+}
+
+static inline int selinux_netlbl_inode_permission(struct inode *inode,
+						  int mask)
+{
+	return 0;
+}
+
+static inline int selinux_netlbl_socket_create(struct socket *sock,
+					       const int sock_family,
+					       u32 sid)
+{
+	return 0;
+}
+
+static inline void selinux_netlbl_socket_accept(struct socket *sock,
+						struct socket *newsock)
+{
+	return;
+}
+
+static inline int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
+					      const u32 sock_sid,
+					      struct sk_buff *skb,
+					      struct avc_audit_data *ad)
+{
+	return 0;
+}
+
+static inline int selinux_netlbl_socket_getpeersec_stream(struct socket *sock,
+							  u32 *peer_sid)
+{
+	*peer_sid = SECSID_NULL;
+	return 0;
+}
+
+static inline int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb,
+							 u32 *peer_sid)
+{
+	*peer_sid = SECSID_NULL;
+	return 0;
+}
+#endif /* CONFIG_NETLABEL */
+
+#endif
Index: linux-2.6.17.i686-quilt/security/selinux/ss/Makefile
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/Makefile
+++ linux-2.6.17.i686-quilt/security/selinux/ss/Makefile
@@ -7,3 +7,4 @@ obj-y := ss.o
 
 ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o conditional.o mls.o
 
+obj-$(CONFIG_NETLABEL) += selinux_netlabel.o
Index: linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/ebitmap.c
+++ linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.c
@@ -3,6 +3,14 @@
  *
  * Author : Stephen Smalley, <sds at epoch.ncsc.mil>
  */
+/*
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added ebitmap_export() and ebitmap_import()
+ *
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ */
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
@@ -59,6 +67,153 @@ int ebitmap_cpy(struct ebitmap *dst, str
 	return 0;
 }
 
+/**
+ * ebitmap_export - Export an ebitmap to a unsigned char bitmap string
+ * @src: the ebitmap to export
+ * @dst: the resulting bitmap string
+ * @dst_len: length of dst in bytes
+ *
+ * Description:
+ * Allocate a buffer at least src->highbit bits long and export the extensible
+ * bitmap into the buffer.  The bitmap string will be in little endian format,
+ * i.e. LSB first.  The value returned in dst_len may not the true size of the
+ * buffer as the length of the buffer is rounded up to a multiple of MAPTYPE.
+ * The caller must free the buffer when finished. Returns zero on success,
+ * negative values on failure.
+ *
+ */
+int ebitmap_export(const struct ebitmap *src,
+		   unsigned char **dst,
+		   u32 *dst_len)
+{
+	u32 bitmap_len;
+	unsigned char *bitmap;
+	struct ebitmap_node *iter_node;
+	MAPTYPE node_val;
+	u32 bitmap_byte;
+	unsigned char bitmask;
+
+	if (src == NULL || dst == NULL || dst_len == NULL)
+		return -EINVAL;
+
+	*dst = NULL;
+	*dst_len = 0;
+
+	bitmap_len = src->highbit / 8;
+	if (src->highbit % 8 > 0)
+		bitmap_len += 1;
+	if (bitmap_len == 0)
+		return -EINVAL;
+
+	bitmap = kzalloc(bitmap_len + sizeof(MAPTYPE) -
+			 (bitmap_len % sizeof(MAPTYPE)),
+			 GFP_ATOMIC);
+	if (bitmap == NULL)
+		return -ENOMEM;
+
+	/* PM - there _has_ to be a faster way to do this, work on this more */
+	iter_node = src->node;
+	do {
+		bitmap_byte = iter_node->startbit / 8;
+		bitmask = 0x80;
+		node_val = iter_node->map;
+		do {
+			if (bitmask == 0) {
+				bitmap_byte++;
+				bitmask = 0x80;
+			}
+			if (node_val & (MAPTYPE)0x01)
+				bitmap[bitmap_byte] |= bitmask;
+			node_val >>= 1;
+			bitmask >>= 1;
+		} while (node_val > 0);
+		iter_node = iter_node->next;
+	} while (iter_node);
+
+	*dst = bitmap;
+	*dst_len = bitmap_len;
+	return 0;
+}
+
+/**
+ * ebitmap_import - Import an unsigned char bitmap string into an ebitmap
+ * @src: the bitmap string
+ * @src_len: the bitmap length in bytes
+ * @dst: the empty ebitmap
+ *
+ * Description:
+ * This function takes a little endian bitmap string in src and imports it into
+ * the ebitmap pointed to by dst.  Returns zero on success, negative values on
+ * failure.
+ *
+ */
+int ebitmap_import(const unsigned char *src,
+		   const u32 src_len,
+		   struct ebitmap *dst)
+{
+	u32 src_off = 0;
+	struct ebitmap_node *node_new;
+	struct ebitmap_node *node_last = NULL;
+	u32 src_rem = src_len;
+	MAPTYPE tmp_val;
+	u32 iter;
+	u32 iter_bit;
+	unsigned char src_byte;
+
+	if (src == NULL || dst == NULL || src_len == 0)
+		return -EINVAL;
+
+	do {
+		node_new = kzalloc(sizeof(*node_new), GFP_ATOMIC);
+		if (node_new == NULL) {
+			ebitmap_destroy(dst);
+			return -ENOMEM;
+		}
+
+		/* PM - there _has_ to be a faster way to do this,
+		   work on this more */
+		if (src_rem >= sizeof(MAPTYPE))
+			iter = sizeof(MAPTYPE);
+		else
+			iter = src_rem;
+		tmp_val = 0;
+		while (iter > 0) {
+			src_byte = src[src_off + --iter];
+			if (src_byte > 0)
+				for (iter_bit = 0; iter_bit < 8; iter_bit++) {
+					tmp_val <<= 1;
+					tmp_val |= src_byte & 0x01;
+					src_byte >>= 1;
+				}
+			else
+				tmp_val <<= 8;
+		}
+		node_new->map = tmp_val;
+		node_new->startbit = src_off * 8;
+
+		if (node_last != NULL)
+			node_last->next = node_new;
+		else
+			dst->node = node_new;
+		node_last = node_new;
+
+		if (src_rem >= sizeof(MAPTYPE)) {
+			src_off += sizeof(MAPTYPE);
+			src_rem -= sizeof(MAPTYPE);
+		} else
+			src_off += src_rem;
+	} while (src_off < src_len);
+
+	tmp_val = node_last->map;
+	dst->highbit = node_last->startbit;
+	while (tmp_val >= 1) {
+		dst->highbit += 1;
+		tmp_val >>= 1;
+	}
+
+	return 0;
+}
+
 int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2)
 {
 	struct ebitmap_node *n1, *n2;
Index: linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/ebitmap.h
+++ linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.h
@@ -69,6 +69,12 @@ static inline int ebitmap_node_get_bit(s
 
 int ebitmap_cmp(struct ebitmap *e1, struct ebitmap *e2);
 int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src);
+int ebitmap_export(const struct ebitmap *src,
+		   unsigned char **dst,
+		   u32 *dst_len);
+int ebitmap_import(const unsigned char *src,
+		   const u32 src_len,
+		   struct ebitmap *dst);
 int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2);
 int ebitmap_get_bit(struct ebitmap *e, unsigned long bit);
 int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value);
Index: linux-2.6.17.i686-quilt/security/selinux/ss/mls.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/mls.c
+++ linux-2.6.17.i686-quilt/security/selinux/ss/mls.c
@@ -10,6 +10,13 @@
  *
  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  */
+/*
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added support to import/export the MLS label
+ *
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ */
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -585,3 +592,156 @@ int mls_compute_sid(struct context *scon
 	return -EINVAL;
 }
 
+/**
+ * mls_export_lvl - Export the MLS sensitivity levels
+ * @context: the security context
+ * @lvl_low: the low sensitivity level
+ * @lvl_high: the high sensitivity level
+ *
+ * Description:
+ * Given the security context copy the low MLS sensitivity level into lvl_low
+ * and the high sensitivity level in lvl_high.  The MLS levels are only
+ * exported if the pointers are not NULL, if they are NULL then that level is
+ * not exported.  Returns zero on success, negative values on failure.
+ *
+ */
+int mls_export_lvl(const struct context *context, u32 *lvl_low, u32 *lvl_high)
+{
+	if (!selinux_mls_enabled)
+		return 0;
+
+	if (lvl_low != NULL)
+		*lvl_low = context->range.level[0].sens - 1;
+	if (lvl_high != NULL)
+		*lvl_high = context->range.level[1].sens - 1;
+
+	return 0;
+}
+
+/**
+ * mls_import_lvl - Import the MLS sensitivity levels
+ * @context: the security context
+ * @lvl_low: the low sensitivity level
+ * @lvl_high: the high sensitivity level
+ *
+ * Description:
+ * Given the security context and the two sensitivty levels, set the MLS levels
+ * in the context according the two given as parameters.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+int mls_import_lvl(struct context *context,
+		   const u32 lvl_low,
+		   const u32 lvl_high)
+{
+	if (!selinux_mls_enabled)
+		return 0;
+
+	context->range.level[0].sens = lvl_low + 1;
+	context->range.level[1].sens = lvl_high + 1;
+
+	return 0;
+}
+
+/**
+ * mls_export_cat - Export the MLS categories
+ * @context: the security context
+ * @cat_low: the low category
+ * @cat_low_len: length of the cat_low bitmap in bytes
+ * @cat_high: the high category
+ * @cat_high_len: length of the cat_high bitmap in bytes
+ *
+ * Description:
+ * Given the security context export the low MLS category bitmap into cat_low
+ * and the high category bitmap into cat_high.  The MLS categories are only
+ * exported if the pointers are not NULL, if they are NULL then that level is
+ * not exported.  The caller is responsibile for freeing the memory when
+ * finished.  Returns zero on success, negative values on failure.
+ *
+ */
+int mls_export_cat(const struct context *context,
+		   unsigned char **cat_low,
+		   u32 *cat_low_len,
+		   unsigned char **cat_high,
+		   u32 *cat_high_len)
+{
+	int ret_val = -EPERM;
+
+	if (!selinux_mls_enabled)
+		return 0;
+
+	if (cat_low != NULL && cat_low_len != NULL) {
+		ret_val = ebitmap_export(&context->range.level[0].cat,
+					 cat_low,
+					 cat_low_len);
+		if (ret_val != 0)
+			goto export_cat_failure;
+	}
+	if (cat_high != NULL && cat_high_len != NULL) {
+		ret_val = ebitmap_export(&context->range.level[1].cat,
+					 cat_high,
+					 cat_high_len);
+		if (ret_val != 0)
+			goto export_cat_failure;
+	}
+
+	return 0;
+
+export_cat_failure:
+	if (cat_low != NULL && *cat_low != NULL)
+		kfree(*cat_low);
+	if (cat_high != NULL && *cat_high != NULL)
+		kfree(*cat_high);
+	return ret_val;
+}
+
+/**
+ * mls_import_cat - Import the MLS categories
+ * @context: the security context
+ * @cat_low: the low category
+ * @cat_low_len: length of the cat_low bitmap in bytes
+ * @cat_high: the high category
+ * @cat_high_len: length of the cat_high bitmap in bytes
+ *
+ * Description:
+ * Given the security context and the two category bitmap strings import the
+ * categories into the security context.  The MLS categories are only imported
+ * if the pointers are not NULL, if they are NULL they are skipped.  Returns
+ * zero on success, negative values on failure.
+ *
+ */
+int mls_import_cat(struct context *context,
+		   const unsigned char *cat_low,
+		   const u32 cat_low_len,
+		   const unsigned char *cat_high,
+		   const u32 cat_high_len)
+{
+	int ret_val = -EPERM;
+
+	if (!selinux_mls_enabled)
+		return 0;
+
+	if (cat_low != NULL && cat_low_len > 0) {
+		ret_val = ebitmap_import(cat_low,
+					 cat_low_len,
+					 &context->range.level[0].cat);
+		if (ret_val != 0)
+			goto import_cat_failure;
+	}
+	if (cat_high != NULL && cat_high_len > 0) {
+		ret_val = ebitmap_import(cat_high,
+					 cat_high_len,
+					 &context->range.level[1].cat);
+		if (ret_val != 0)
+			goto import_cat_failure;
+	}
+
+	return 0;
+
+import_cat_failure:
+	if (cat_low)
+		ebitmap_destroy(&context->range.level[0].cat);
+	if (cat_high)
+		ebitmap_destroy(&context->range.level[1].cat);
+	return ret_val;
+}
Index: linux-2.6.17.i686-quilt/security/selinux/ss/mls.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/mls.h
+++ linux-2.6.17.i686-quilt/security/selinux/ss/mls.h
@@ -10,6 +10,13 @@
  *
  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  */
+/*
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added support to import/export the MLS label
+ *
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ */
 
 #ifndef _SS_MLS_H_
 #define _SS_MLS_H_
@@ -42,5 +49,23 @@ int mls_compute_sid(struct context *scon
 int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
                          struct context *usercon);
 
+int mls_export_lvl(const struct context *context,
+		   u32 *lvl_low,
+		   u32 *lvl_high);
+int mls_import_lvl(struct context *context,
+		   const u32 lvl_low,
+		   const u32 lvl_high);
+
+int mls_export_cat(const struct context *context,
+                   unsigned char **cat_low,
+                   u32 *cat_low_len,
+                   unsigned char **cat_high,
+                   u32 *cat_high_len);
+int mls_import_cat(struct context *context,
+                   const unsigned char *cat_low,
+                   const u32 cat_low_len,
+                   const unsigned char *cat_high,
+                   const u32 cat_high_len);
+
 #endif	/* _SS_MLS_H */
 
Index: linux-2.6.17.i686-quilt/security/selinux/ss/selinux_netlabel.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/security/selinux/ss/selinux_netlabel.c
@@ -0,0 +1,574 @@
+/*
+ * SELinux interface to the NetLabel subsystem
+ *
+ * Author : Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/audit.h>
+#include <net/sock.h>
+#include <net/netlabel.h>
+
+#include "avc.h"
+#include "context.h"
+#include "sidtab.h"
+#include "services.h"
+#include "mls.h"
+#include "objsec.h"
+
+/*
+ * This is the structure we store inside the NetLabel cache block.
+ */
+#define NETLBL_CACHE(x)           ((struct netlbl_cache *)(x))
+#define NETLBL_CACHE_T_NONE       0
+#define NETLBL_CACHE_T_SID        1
+#define NETLBL_CACHE_T_MLSLBL     2
+struct netlbl_cache {
+	u32 type;
+	union {
+		u32 sid;
+		struct mls_level mls_label;
+	} data;
+};
+
+/**
+ * selinux_netlbl_cache_free - Free the NetLabel cached data
+ * @data: the data to free
+ *
+ * Description:
+ * This function is intended to be used as the free() callback inside the
+ * netlbl_lsm_cache structure.
+ *
+ */
+static void selinux_netlbl_cache_free(const void *data)
+{
+	struct netlbl_cache *cache = NETLBL_CACHE(data);
+	switch (cache->type) {
+	case NETLBL_CACHE_T_MLSLBL:
+		ebitmap_destroy(&cache->data.mls_label.cat);
+		break;
+	}
+	kfree(data);
+}
+
+/**
+ * selinux_netlbl_cache_add - Add an entry to the NetLabel cache
+ * @skb: the packet
+ * @ctx: the SELinux context
+ *
+ * Description:
+ * Attempt to cache the context in @ctx, which was derived from the packet in
+ * @skb, in the NetLabel subsystem cache.
+ *
+ */
+static void selinux_netlbl_cache_add(struct sk_buff *skb, struct context *ctx)
+{
+	struct netlbl_cache *cache = NULL;
+	struct netlbl_lsm_secattr secattr;
+
+	netlbl_secattr_init(&secattr);
+
+	cache = kzalloc(sizeof(*cache),	GFP_ATOMIC);
+	if (cache == NULL)
+		goto netlbl_cache_add_return;
+	secattr.cache.free = selinux_netlbl_cache_free;
+	secattr.cache.data = (void *)cache;
+	secattr.set_cache = 1;
+
+	if (ebitmap_cpy(&cache->data.mls_label.cat,
+			&ctx->range.level[0].cat) != 0)
+		goto netlbl_cache_add_return;
+	cache->data.mls_label.sens = ctx->range.level[0].sens;
+	cache->type = NETLBL_CACHE_T_MLSLBL;
+
+	if (netlbl_cache_add(skb, &secattr) != 0)
+		goto netlbl_cache_add_return;
+	secattr.set_cache = 0;
+
+netlbl_cache_add_return:
+	netlbl_secattr_destroy(&secattr);
+}
+
+/**
+ * selinux_netlbl_cache_invalidate - Invalidate the NetLabel cache
+ *
+ * Description:
+ * Invalidate the NetLabel security attribute mapping cache.
+ *
+ */
+void selinux_netlbl_cache_invalidate(void)
+{
+	netlbl_cache_invalidate();
+}
+
+/**
+ * selinux_netlbl_domain_export - Exports the type of a given context
+ * @context: the security context
+ * @scontext: the resulting type string
+ * @scontext_len: the length of scontext including the NULL byte
+ *
+ * Description:
+ * Allocate a buffer for the type name specified in context and copy the type
+ * name into the buffer.  The caller must free the buffer when finished.
+ * Returns zero on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_domain_export(const struct context *context,
+					char **scontext,
+					u32 *scontext_len)
+{
+	char *str;
+	u32 str_len;
+
+	*scontext = NULL;
+	if (scontext_len != NULL)
+		*scontext_len = 0;
+	str_len = strlen(policydb.p_type_val_to_name[context->type - 1]) + 1;
+	str = kmalloc(str_len, GFP_ATOMIC);
+	if (str == NULL)
+		return -ENOMEM;
+	strcpy(str, policydb.p_type_val_to_name[context->type - 1]);
+
+	*scontext = str;
+	if (scontext_len != NULL)
+		*scontext_len = str_len;
+	return 0;
+}
+
+/**
+ * selinux_netlbl_secattr_to_sid - Convert a NetLabel secattr to a SELinux SID
+ * @skb: the network packet
+ * @secattr: the NetLabel packet security attributes
+ * @base_sid: the SELinux SID to use as a context for MLS only attributes
+ * @sid: the SELinux SID
+ *
+ * Description:
+ * Convert the given NetLabel packet security attributes in @secattr into a
+ * SELinux SID.  If the @secattr field does not contain a full SELinux
+ * SID/context then use the context in @base_sid as the foundation.  If @skb
+ * is not NULL attempt to cache as much data as possibile.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_secattr_to_sid(struct sk_buff *skb,
+					  struct netlbl_lsm_secattr *secattr,
+					  const u32 base_sid,
+					  u32 *sid)
+{
+	int ret_val = -EIDRM;
+	struct context *ctx;
+	struct context ctx_new;
+	struct netlbl_cache *cache;
+	u32 ctx_new_destroy = 0;
+
+	if (secattr->set_cache) {
+		cache = NETLBL_CACHE(secattr->cache.data);
+		switch (cache->type) {
+		case NETLBL_CACHE_T_SID:
+			*sid = cache->data.sid;
+			break;
+		case NETLBL_CACHE_T_MLSLBL:
+			ctx = sidtab_search(&sidtab, base_sid);
+			if (ctx == NULL)
+				goto netlbl_secattr_to_sid_failure;
+			ret_val = context_cpy(&ctx_new, ctx);
+			if (ret_val != 0)
+				goto netlbl_secattr_to_sid_failure;
+			ctx_new_destroy = 1;
+			mls_context_destroy(&ctx_new);
+
+			ctx_new.range.level[0].sens =
+				cache->data.mls_label.sens;
+			ret_val = ebitmap_cpy(&ctx_new.range.level[0].cat,
+					      &cache->data.mls_label.cat);
+			if (ret_val != 0)
+				goto netlbl_secattr_to_sid_failure;
+			ctx_new.range.level[1].sens =
+				cache->data.mls_label.sens;
+			ret_val = ebitmap_cpy(&ctx_new.range.level[1].cat,
+					      &cache->data.mls_label.cat);
+			if (ret_val != 0)
+				goto netlbl_secattr_to_sid_failure;
+
+			ret_val = sidtab_context_to_sid(&sidtab,
+							&ctx_new,
+							sid);
+			break;
+		default:
+			goto netlbl_secattr_to_sid_failure;
+		}
+	} else if (secattr->set_mls_lvl) {
+		ctx = sidtab_search(&sidtab, base_sid);
+		if (ctx == NULL)
+			goto netlbl_secattr_to_sid_failure;
+		ret_val = context_cpy(&ctx_new, ctx);
+		if (ret_val != 0)
+			goto netlbl_secattr_to_sid_failure;
+		ctx_new_destroy = 1;
+		mls_context_destroy(&ctx_new);
+
+		if (mls_import_lvl(&ctx_new,
+				   secattr->mls_lvl,
+				   secattr->mls_lvl) != 0)
+			goto netlbl_secattr_to_sid_failure;
+		if (secattr->set_mls_cat) {
+			if (mls_import_cat(&ctx_new,
+					   secattr->mls_cat,
+					   secattr->mls_cat_len,
+					   secattr->mls_cat,
+					   secattr->mls_cat_len) != 0)
+				goto netlbl_secattr_to_sid_failure;
+		}
+
+		ret_val = mls_context_isvalid(&policydb, &ctx_new);
+		if (ret_val != 1)
+			goto netlbl_secattr_to_sid_failure;
+
+		if (skb != NULL)
+			selinux_netlbl_cache_add(skb, &ctx_new);
+
+		ret_val = sidtab_context_to_sid(&sidtab, &ctx_new, sid);
+	} else
+		*sid = SECINITSID_UNLABELED;
+
+	ret_val = 0;
+
+netlbl_secattr_to_sid_failure:
+	if (ctx_new_destroy)
+		context_destroy(&ctx_new);
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
+ * @skb: the packet
+ * @base_sid: the SELinux SID to use as a context for MLS only attributes
+ * @sid: the SID
+ *
+ * Description:
+ * Call the NetLabel mechanism to get the security attributes of the given
+ * packet and use those attributes to determine the correct context/SID to
+ * assign to the packet.  Returns zero on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
+					const u32 base_sid,
+					u32 *sid)
+{
+	int ret_val;
+	struct netlbl_lsm_secattr secattr;
+
+	netlbl_secattr_init(&secattr);
+	ret_val = netlbl_skbuff_getattr(skb, &secattr);
+	if (ret_val == 0)
+		ret_val = selinux_netlbl_secattr_to_sid(skb,
+							 &secattr,
+							 base_sid,
+							 sid);
+
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_setsid - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sock_family: the socket family
+ * @sid: the SID to use
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_socket_setsid(struct socket *sock,
+					const int sock_family,
+					u32 sid)
+{
+	int ret_val;
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct netlbl_lsm_secattr secattr;
+	struct context *ctx;
+
+	ctx = sidtab_search(&sidtab, sid);
+	if (ctx != NULL) {
+		netlbl_secattr_init(&secattr);
+
+		if (selinux_netlbl_domain_export(ctx,
+						 &secattr.domain,
+						 NULL) == 0)
+			secattr.set_domain = 1;
+		if (mls_export_lvl(ctx, &secattr.mls_lvl, NULL) == 0)
+			secattr.set_mls_lvl = 1;
+		if (mls_export_cat(ctx,
+				   &secattr.mls_cat,
+				   &secattr.mls_cat_len,
+				   NULL,
+				   NULL) == 0)
+			secattr.set_mls_cat = 1;
+
+		ret_val = netlbl_socket_setattr(sock, &secattr);
+		if (ret_val == 0) {
+			isec->netlbl.netlbl_sid = sid;
+			isec->netlbl.labeled = 1;
+		}
+
+		netlbl_secattr_destroy(&secattr);
+	} else
+		ret_val = -ENOENT;
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_peeksid - Get the SID of the first queued packet
+ * @sock: the socket to query
+ * @sid: the packet's SID
+ *
+ * Description:
+ * Examine the first incoming packet in the socket's queue and determine the
+ * packet's SELinux SID.  Return zero on success, negative values on failure.
+ *
+ */
+static int selinux_netlbl_socket_peeksid(struct socket *sock, u32 *sid)
+{
+        int ret_val;
+	struct netlbl_lsm_secattr secattr;
+        struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+
+        netlbl_secattr_init(&secattr);
+        ret_val = netlbl_socket_peekattr(sock, &secattr);
+        if (ret_val == 0)
+                ret_val = selinux_netlbl_secattr_to_sid(NULL,
+							&secattr,
+							isec->sid,
+							sid);
+
+        secattr.set_cache = 0;
+        netlbl_secattr_destroy(&secattr);
+
+        return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_create - Label a socket using the NetLabel mechanism
+ * @sock: the socket to label
+ * @sock_family: the socket family
+ * @sid: the SID to use
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int selinux_netlbl_socket_create(struct socket *sock,
+				 const int sock_family,
+				 u32 sid)
+{
+	struct inode_security_struct *isec;
+
+	if (!ss_initialized || sock_family != PF_INET)
+		return 0;
+
+	isec = SOCK_INODE(sock)->i_security;
+	isec->netlbl.req_netlbl = 1;
+
+	/* PM - should we audit failures, or at the very least do a printk()
+	   so users are not left wondering? */
+	return selinux_netlbl_socket_setsid(sock, sock_family, sid);
+}
+
+/**
+ * selinux_netlbl_socket_accept - Handle the labeling of an accept()ed socket
+ * @sock: the original socket
+ * @newsock: the new accept()ed socket
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism based on the packets
+ * in the queue and the original socket's SID.
+ *
+ */
+void selinux_netlbl_socket_accept(struct socket *sock, struct socket *newsock)
+{
+	int ret_val;
+	struct inode_security_struct *newisec;
+	struct netlbl_lsm_secattr secattr;
+
+	if (!ss_initialized ||
+	    newsock->sk == NULL || newsock->sk->sk_family != PF_INET)
+		return;
+
+	newisec = SOCK_INODE(newsock)->i_security;
+	newisec->netlbl.req_netlbl = 1;
+
+	netlbl_secattr_init(&secattr);
+	ret_val = netlbl_socket_getattr(newsock, &secattr);
+	if (ret_val == 0)
+		ret_val = selinux_netlbl_secattr_to_sid(NULL,
+						    &secattr,
+						    newisec->sid,
+						    &newisec->netlbl.peer_sid);
+	if (ret_val != 0)
+		newisec->netlbl.peer_sid = SECSID_NULL;
+	secattr.set_cache = 0;
+	netlbl_secattr_destroy(&secattr);
+}
+
+/**
+ * selinux_netlbl_file_permission - Very the file/socket is NetLabel labeled
+ * @inode: the file descriptor's inode
+ * @mask: the permission mask
+ *
+ * Description:
+ * Looks at a file's inode and if it is marked as a socket protected by
+ * NetLabel then verify that the socket has been labeled, if not try to label
+ * the socket now with the task's SID.  Returns zero on success, negative
+ * values on failure.
+ *
+ */
+int selinux_netlbl_inode_permission(struct inode *inode, int mask)
+{
+	int ret_val = 0;
+	struct inode_security_struct *isec = inode->i_security;
+	struct task_security_struct *tsec;
+	struct netlbl_security_struct *netlbl_sec = &isec->netlbl;
+	struct socket *sock;
+
+	if (netlbl_sec->req_netlbl && (mask & (MAY_WRITE | MAY_APPEND))) {
+		tsec = current->security;
+		if (netlbl_sec->labeled == 0) {
+			sock = SOCKET_I(inode);
+			ret_val = selinux_netlbl_socket_setsid(sock,
+							  sock->sk->sk_family,
+							  tsec->sid);
+		} else if (netlbl_sec->netlbl_sid != tsec->sid &&
+			   netlbl_sec->netlbl_sid != SECINITSID_KERNEL)
+			ret_val = -EACCES;
+	}
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
+ * @sock_class: the socket class
+ * @sock_sid: the socket's SID
+ * @skb: the incoming packet
+ * @ad: the audit data
+ *
+ * Description:
+ * Fetch the NetLabel security attributes from @skb and perform an access check
+ * against the receiving socket.  Returns zero on success, negative values on
+ * error.
+ *
+ */
+int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
+				const u32 sock_sid,
+				struct sk_buff *skb,
+				struct avc_audit_data *ad)
+{
+	int ret_val;
+	u32 netlbl_sid;
+	u32 recv_perm;
+
+	ret_val = selinux_netlbl_skbuff_getsid(skb, sock_sid, &netlbl_sid);
+	if (ret_val)
+		goto netlbl_sock_rcv_skb;
+
+	/* PM - at some point we want to do an unlabeled check here too but
+	   we need a way to enable/disable NetLabel checks at runtime first,
+	   see RH BZ #195238 for more details */
+	if (netlbl_sid != SECINITSID_UNLABELED) {
+		switch (sock_class) {
+		case SECCLASS_UDP_SOCKET:
+			recv_perm = UDP_SOCKET__RECV_MSG;
+			break;
+		case SECCLASS_TCP_SOCKET:
+			recv_perm = TCP_SOCKET__RECV_MSG;
+			break;
+		default:
+			recv_perm = RAWIP_SOCKET__RECV_MSG;
+			break;
+		}
+
+		ret_val = avc_has_perm(sock_sid,
+				       netlbl_sid,
+				       sock_class,
+				       recv_perm,
+				       ad);
+		if (ret_val)
+			netlbl_skbuff_err(skb, ret_val);
+	}
+
+netlbl_sock_rcv_skb:
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_peersid - Return the peer SID of a connected socket
+ * @sock: the socket
+ * @peer_sid: the peer SID
+ *
+ * Description:
+ * Examine @sock to find the connected peer's SID, if that is not possibile
+ * check the socket's receive queue and take the SID from the incoming
+ * packets.  Returns zero on success, negative values on error.
+ *
+ */
+int selinux_netlbl_socket_getpeersec_stream(struct socket *sock, u32 *peer_sid)
+{
+	int ret_val = 0;
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+
+	if (isec->netlbl.peer_sid == 0)
+		ret_val = selinux_netlbl_socket_peeksid(sock, peer_sid);
+	else
+		*peer_sid = isec->netlbl.peer_sid;
+
+	return ret_val;
+}
+
+/**
+ * selinux_netlbl_socket_getpeersec_dgram - Return the SID of a NetLabel packet
+ * @skb: the packet
+ * @peer_sid: the packet's SID
+ *
+ * Description:
+ * Examine @skb to find the SID assigned to it by NetLabel.  Returns zero on
+ * success, negative values on error.
+ *
+ */
+int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb, u32 *peer_sid)
+{
+	struct inode_security_struct *isec;
+
+	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
+		return -ENOPROTOOPT;
+
+	isec = SOCK_INODE(skb->sk->sk_socket)->i_security;
+
+	return selinux_netlbl_skbuff_getsid(skb, isec->sid, peer_sid);
+}
Index: linux-2.6.17.i686-quilt/security/selinux/ss/services.c
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/services.c
+++ linux-2.6.17.i686-quilt/security/selinux/ss/services.c
@@ -13,6 +13,11 @@
  *
  * 	Added conditional policy language extensions
  *
+ * Updated: Hewlett-Packard <paul.moore at hp.com>
+ *
+ *      Added support for NetLabel
+ *
+ * Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  * Copyright (C) 2003 - 2004 Tresys Technology, LLC
  * Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris at redhat.com>
@@ -29,6 +34,7 @@
 #include <linux/sched.h>
 #include <linux/audit.h>
 #include <linux/mutex.h>
+#include <net/sock.h>
 
 #include "flask.h"
 #include "avc.h"
@@ -40,6 +46,8 @@
 #include "services.h"
 #include "conditional.h"
 #include "mls.h"
+#include "objsec.h"
+#include "selinux_netlabel.h"
 
 extern void selnl_notify_policyload(u32 seqno);
 unsigned int policydb_loaded_version;
@@ -54,7 +62,7 @@ static DEFINE_MUTEX(load_mutex);
 #define LOAD_LOCK mutex_lock(&load_mutex)
 #define LOAD_UNLOCK mutex_unlock(&load_mutex)
 
-static struct sidtab sidtab;
+struct sidtab sidtab;
 struct policydb policydb;
 int ss_initialized = 0;
 
@@ -1241,6 +1249,7 @@ int security_load_policy(void *data, siz
 		selinux_complete_init();
 		avc_ss_reset(seqno);
 		selnl_notify_policyload(seqno);
+		selinux_netlbl_cache_invalidate();
 		return 0;
 	}
 
@@ -1295,6 +1304,7 @@ int security_load_policy(void *data, siz
 
 	avc_ss_reset(seqno);
 	selnl_notify_policyload(seqno);
+	selinux_netlbl_cache_invalidate();
 
 	return 0;
 
Index: linux-2.6.17.i686-quilt/security/selinux/ss/services.h
===================================================================
--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/services.h
+++ linux-2.6.17.i686-quilt/security/selinux/ss/services.h
@@ -9,7 +9,9 @@
 #include "policydb.h"
 #include "sidtab.h"
 
+extern struct sidtab sidtab;
 extern struct policydb policydb;
+extern int ss_initialized;
 
 #endif	/* _SS_SERVICES_H_ */
 

--
paul moore
linux security @ hp


linux-2.6-net-label_6_8.patch:
 netlabel_cipso_v4.c |  634 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 634 insertions(+)

--- NEW FILE linux-2.6-net-label_6_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:37 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:07 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN17sM032548
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:07 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN16AY026199;
	Tue, 27 Jun 2006 19:01:06 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5RN0xDa020721;
	Tue, 27 Jun 2006 19:00:59 -0400
Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127])
	by atlrel9.hp.com (Postfix) with ESMTP id E80EE34C61;
	Tue, 27 Jun 2006 19:00:53 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 75AB4270DB;
	Tue, 27 Jun 2006 23:00:53 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0qCn030784;
	Tue, 27 Jun 2006 19:00:52 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0qaw030783;
	Tue, 27 Jun 2006 19:00:52 -0400
Message-Id: <20060627230052.419898000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:37 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 6/8] NetLabel: CIPSOv4 integration
Content-Disposition: inline; filename=netlabel-cipsov4
X-RedHat-Spam-Score: -99.822 
Content-Type: 
X-UID: 72038
X-Length: 20009

Add CIPSO/IPv4 support and management to the NetLabel subsystem.  These changes
integrate the CIPSO/IPv4 configuration into the existing NetLabel code and
enable the use of CIPSO/IPv4 within the overall NetLabel framework.
---
 net/netlabel/netlabel_cipso_v4.c |  634 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 634 insertions(+)

Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.c
@@ -0,0 +1,634 @@
+/*
+ * NetLabel CIPSO/IPv4 Support
+ *
+ * This file defines the CIPSO/IPv4 functions for the NetLabel system.  The
+ * NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/socket.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#include <net/netlink.h>
+#include <net/genetlink.h>
+#include <net/netlabel.h>
+#include <net/cipso_ipv4.h>
+
+#include "netlabel_user.h"
+#include "netlabel_cipso_v4.h"
+
+/* NetLabel Generic NETLINK CIPSOv4 family */
+static struct genl_family netlbl_cipsov4_gnl_family = {
+	.id = GENL_ID_GENERATE,
+	.hdrsize = 0,
+	.name = NETLBL_NLTYPE_CIPSOV4_NAME,
+	.version = NETLBL_PROTO_VERSION,
+	.maxattr = 0,
+};
+
+
+/*
+ * Local Prototypes
+ */
+
+static void netlbl_cipsov4_send_ack(const struct genl_info *info,
+				    const u32 ret_code);
+
+
+/*
+ * Helper Functions
+ */
+
+/**
+ * netlbl_cipsov4_doi_free - Frees a CIPSO V4 DOI definition
+ * @entry: the entry's RCU field
+ *
+ * Description:
+ * This function is designed to be used as a callback to the call_rcu()
+ * function so that the memory allocated to the DOI definition can be released
+ * safely.
+ *
+ */
+static void netlbl_cipsov4_doi_free(struct rcu_head *entry)
+{
+	struct cipso_v4_doi *ptr;
+
+	ptr = container_of(entry, struct cipso_v4_doi, rcu);
+	switch (ptr->type) {
+	case CIPSO_V4_MAP_STD:
+		if (ptr->map.std->lvl.cipso_size > 0)
+			kfree(ptr->map.std->lvl.cipso);
+		if (ptr->map.std->lvl.local_size > 0)
+			kfree(ptr->map.std->lvl.local);
+		if (ptr->map.std->cat.cipso_size > 0)
+			kfree(ptr->map.std->cat.cipso);
+		if (ptr->map.std->cat.local_size > 0)
+			kfree(ptr->map.std->cat.local);
+		break;
+	}
+	kfree(ptr);
+}
+
+
+/*
+ * NetLabel Command Handlers
+ */
+
+/**
+ * netlbl_cipsov4_add_std - Adds a CIPSO V4 DOI definition
+ * @doi: the DOI value
+ * @msg: the ADD message data
+ * @msg_size: the size of the ADD message buffer
+ *
+ * Description:
+ * Create a new CIPSO_V4_MAP_STD DOI definition based on the given ADD message
+ * and add it to the CIPSO V4 engine.  Return zero on success and non-zero on
+ * error.
+ *
+ */
+static int netlbl_cipsov4_add_std(const u32 doi,
+				  const unsigned char *msg,
+				  const u32 msg_size)
+{
+	int ret_val = -EPERM;
+	unsigned char *msg_ptr = (unsigned char *)msg;
+	u32 msg_len = msg_size;
+	u32 num_tags;
+	u32 num_lvls;
+	u32 num_cats;
+	struct cipso_v4_doi *doi_def = NULL;
+	u32 iter;
+	u32 tmp_val_a;
+	u32 tmp_val_b;
+
+	if (msg_len < 4)
+		goto add_std_failure;
+	num_tags = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (num_tags == 0 || num_tags > CIPSO_V4_TAG_MAXCNT)
+		goto add_std_failure;
+
+	doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
+	if (doi_def == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->map.std = kzalloc(sizeof(*doi_def->map.std),
+				   GFP_KERNEL);
+	if (doi_def->map.std == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->type = CIPSO_V4_MAP_STD;
+
+	if (msg_len < num_tags)
+		goto add_std_failure;
+	msg_len -= num_tags;
+	for (iter = 0; iter < num_tags; iter++) {
+		doi_def->tags[iter] = netlbl_getinc_u8(&msg_ptr);
+		switch (doi_def->tags[iter]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			break;
+		default:
+			goto add_std_failure;
+		}
+	}
+	if (iter < CIPSO_V4_TAG_MAXCNT)
+		doi_def->tags[iter] = CIPSO_V4_TAG_INVALID;
+
+	if (msg_len < 24)
+		goto add_std_failure;
+
+	num_lvls = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (num_lvls == 0)
+		goto add_std_failure;
+	doi_def->map.std->lvl.local_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->lvl.local_size > CIPSO_V4_MAX_LOC_LVLS)
+		goto add_std_failure;
+	doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->lvl.local == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->map.std->lvl.cipso_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->lvl.cipso_size > CIPSO_V4_MAX_REM_LVLS)
+		goto add_std_failure;
+	doi_def->map.std->lvl.cipso = kcalloc(doi_def->map.std->lvl.cipso_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->lvl.cipso == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+
+	num_cats = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	doi_def->map.std->cat.local_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->cat.local_size > CIPSO_V4_MAX_LOC_CATS)
+		goto add_std_failure;
+	doi_def->map.std->cat.local = kcalloc(doi_def->map.std->cat.local_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->cat.local == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+	doi_def->map.std->cat.cipso_size = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (doi_def->map.std->cat.cipso_size > CIPSO_V4_MAX_REM_CATS)
+		goto add_std_failure;
+	doi_def->map.std->cat.cipso = kcalloc(doi_def->map.std->cat.cipso_size,
+					      sizeof(u32), GFP_KERNEL);
+	if (doi_def->map.std->cat.cipso == NULL) {
+		ret_val = -ENOMEM;
+		goto add_std_failure;
+	}
+
+	if (msg_len < num_lvls * 8 + num_cats * 8)
+		goto add_std_failure;
+	msg_len -= num_lvls * 8 + num_cats * 8;
+
+	for (iter = 0; iter < doi_def->map.std->lvl.cipso_size; iter++)
+		doi_def->map.std->lvl.cipso[iter] = CIPSO_V4_INV_LVL;
+	for (iter = 0; iter < doi_def->map.std->lvl.local_size; iter++)
+		doi_def->map.std->lvl.local[iter] = CIPSO_V4_INV_LVL;
+	for (iter = 0; iter < doi_def->map.std->cat.cipso_size; iter++)
+		doi_def->map.std->cat.cipso[iter] = CIPSO_V4_INV_CAT;
+	for (iter = 0; iter < doi_def->map.std->cat.local_size; iter++)
+		doi_def->map.std->cat.local[iter] = CIPSO_V4_INV_CAT;
+
+	for (iter = 0; iter < num_lvls; iter++) {
+		tmp_val_a = netlbl_getinc_u32(&msg_ptr);
+		tmp_val_b = netlbl_getinc_u32(&msg_ptr);
+
+		if (tmp_val_a >= doi_def->map.std->lvl.local_size ||
+		    tmp_val_b >= doi_def->map.std->lvl.cipso_size)
+			goto add_std_failure;
+
+		doi_def->map.std->lvl.cipso[tmp_val_b] = tmp_val_a;
+		doi_def->map.std->lvl.local[tmp_val_a] = tmp_val_b;
+	}
+
+	for (iter = 0; iter < num_cats; iter++) {
+		tmp_val_a = netlbl_getinc_u32(&msg_ptr);
+		tmp_val_b = netlbl_getinc_u32(&msg_ptr);
+
+		if (tmp_val_a >= doi_def->map.std->cat.local_size ||
+		    tmp_val_b >= doi_def->map.std->cat.cipso_size)
+			goto add_std_failure;
+
+		doi_def->map.std->cat.cipso[tmp_val_b] = tmp_val_a;
+		doi_def->map.std->cat.local[tmp_val_a] = tmp_val_b;
+	}
+
+	doi_def->doi = doi;
+	ret_val = cipso_v4_doi_add(doi_def);
+	if (ret_val != 0)
+		goto add_std_failure;
+	return 0;
+
+add_std_failure:
+	if (doi_def)
+		netlbl_cipsov4_doi_free(&doi_def->rcu);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_add_pass - Adds a CIPSO V4 DOI definition
+ * @doi: the DOI value
+ * @msg: the ADD message data
+ * @msg_size: the size of the ADD message buffer
+ *
+ * Description:
+ * Create a new CIPSO_V4_MAP_PASS DOI definition based on the given ADD message
+ * and add it to the CIPSO V4 engine.  Return zero on success and non-zero on
+ * error.
+ *
+ */
+static int netlbl_cipsov4_add_pass(const u32 doi,
+				   const unsigned char *msg,
+				   const u32 msg_size)
+{
+	int ret_val = -EPERM;
+	unsigned char *msg_ptr = (unsigned char *)msg;
+	u32 msg_len = msg_size;
+	u32 num_tags;
+	struct cipso_v4_doi *doi_def = NULL;
+	u32 iter;
+
+	if (msg_len < 4)
+		goto add_pass_failure;
+	num_tags = netlbl_getinc_u32(&msg_ptr);
+	msg_len -= 4;
+	if (num_tags == 0 || num_tags > CIPSO_V4_TAG_MAXCNT)
+		goto add_pass_failure;
+
+	doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
+	if (doi_def == NULL) {
+		ret_val = -ENOMEM;
+		goto add_pass_failure;
+	}
+	doi_def->type = CIPSO_V4_MAP_PASS;
+
+	if (msg_len < num_tags)
+		goto add_pass_failure;
+	msg_len -= num_tags;
+	for (iter = 0; iter < num_tags; iter++) {
+		doi_def->tags[iter] = netlbl_getinc_u8(&msg_ptr);
+		switch (doi_def->tags[iter]) {
+		case CIPSO_V4_TAG_RBITMAP:
+			break;
+		default:
+			goto add_pass_failure;
+		}
+	}
+	if (iter < CIPSO_V4_TAG_MAXCNT)
+		doi_def->tags[iter] = CIPSO_V4_TAG_INVALID;
+
+	doi_def->doi = doi;
+	ret_val = cipso_v4_doi_add(doi_def);
+	if (ret_val != 0)
+		goto add_pass_failure;
+	return 0;
+
+add_pass_failure:
+	if (doi_def)
+		netlbl_cipsov4_doi_free(&doi_def->rcu);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_add - Handle an ADD message
+ * @skb: the NETLINK buffer
+ * @info: the Generic NETLINK info block
+ *
+ * Description:
+ * Create a new DOI definition based on the given ADD message and add it to the
+ * CIPSO V4 engine.  Returns zero on success, negative values on failure.
+ *
+ */
+static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
+
+{
+	int ret_val = -EINVAL;
+	u32 doi;
+	u32 map_type;
+	u32 msg_len = netlbl_netlink_payload_len(skb);
+	unsigned char *msg = netlbl_netlink_payload_data(skb);
+
+	ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
+	if (ret_val != 0)
+		goto add_return;
+
+	if (msg_len < 8)
+		goto add_return;
+
+	doi = netlbl_getinc_u32(&msg);
+	map_type = netlbl_getinc_u32(&msg);
+	msg_len -= 8;
+	switch (map_type) {
+	case CIPSO_V4_MAP_STD:
+		ret_val = netlbl_cipsov4_add_std(doi, msg, msg_len);
+		break;
+	case CIPSO_V4_MAP_PASS:
+		ret_val = netlbl_cipsov4_add_pass(doi, msg, msg_len);
+		break;
+	}
+
+add_return:
+	netlbl_cipsov4_send_ack(info, -ret_val);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_list - Handle a LIST message
+ * @skb: the NETLINK buffer
+ * @info: the Generic NETLINK info block
+ *
+ * Description:
+ * Process a user generated LIST message and respond accordingly.  Returns
+ * zero on success and negative values on error.
+ *
+ */
+static int netlbl_cipsov4_list(struct sk_buff *skb, struct genl_info *info)
+{
+	int ret_val = -EINVAL;
+	u32 doi;
+	unsigned char *msg = netlbl_netlink_payload_data(skb);
+	struct sk_buff *ans_skb;
+	unsigned char *buf_ptr;
+
+	if (netlbl_netlink_payload_len(skb) != 4)
+		goto list_failure;
+
+	doi = netlbl_getinc_u32(&msg);
+	ans_skb = cipso_v4_doi_dump(doi, NLMSG_SPACE(GENL_HDRLEN));
+	if (ans_skb == NULL) {
+		ret_val = -ENOMEM;
+		goto list_failure;
+	}
+	buf_ptr = skb_push(ans_skb, NLMSG_SPACE(GENL_HDRLEN));
+	__netlbl_netlink_hdr(buf_ptr,
+			     info->snd_pid,
+			     0,
+			     0,
+			     netlbl_cipsov4_gnl_family.id,
+			     NLBL_CIPSOV4_C_LIST,
+			     ans_skb->len);
+
+	ret_val = netlbl_netlink_snd(ans_skb, info->snd_pid);
+	if (ret_val != 0)
+		goto list_failure;
+
+	return 0;
+
+list_failure:
+	netlbl_cipsov4_send_ack(info, -ret_val);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_listall - Handle a LISTALL message
+ * @skb: the NETLINK buffer
+ * @info: the Generic NETLINK info block
+ *
+ * Description:
+ * Process a user generated LISTALL message and respond accordingly.  Returns
+ * zero on success and negative values on error.
+ *
+ */
+static int netlbl_cipsov4_listall(struct sk_buff *skb, struct genl_info *info)
+{
+	int ret_val = -EINVAL;
+	struct sk_buff *ans_skb;
+	unsigned char *buf_ptr;
+
+	ans_skb = cipso_v4_doi_dump(0, NLMSG_SPACE(GENL_HDRLEN));
+	if (ans_skb == NULL) {
+		ret_val = -ENOMEM;
+		goto list_failure;
+	}
+	buf_ptr = skb_push(ans_skb, NLMSG_SPACE(GENL_HDRLEN));
+	__netlbl_netlink_hdr(buf_ptr,
+			     info->snd_pid,
+			     0,
+			     0,
+			     netlbl_cipsov4_gnl_family.id,
+			     NLBL_CIPSOV4_C_LISTALL,
+			     ans_skb->len);
+
+	ret_val = netlbl_netlink_snd(ans_skb, info->snd_pid);
+	if (ret_val != 0)
+		goto list_failure;
+
+	return 0;
+
+list_failure:
+	netlbl_cipsov4_send_ack(info, -ret_val);
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_remove - Handle a REMOVE message
+ * @skb: the NETLINK buffer
+ * @info: the Generic NETLINK info block
+ *
+ * Description:
+ * Process a user generated REMOVE message and respond accordingly.  Returns
+ * zero on success, negative values on failure.
+ *
+ */
+static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
+{
+	int ret_val;
+	u32 doi;
+	unsigned char *msg = netlbl_netlink_payload_data(skb);
+
+	ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
+	if (ret_val != 0)
+		goto remove_return;
+
+	if (netlbl_netlink_payload_len(skb) != 4) {
+		ret_val = -EINVAL;
+		goto remove_return;
+	}
+
+	doi = netlbl_get_u32(msg);
+	ret_val = cipso_v4_doi_remove(doi, netlbl_cipsov4_doi_free);
+
+remove_return:
+	netlbl_cipsov4_send_ack(info, -ret_val);
+	return ret_val;
+}
+
+/*
+ * NetLabel Generic NETLINK Command Definitions
+ */
+
+static struct genl_ops netlbl_cipsov4_genl_c_add = {
+	.cmd = NLBL_CIPSOV4_C_ADD,
+	.flags = 0,
+	.doit = netlbl_cipsov4_add,
+	.dumpit = NULL,
+};
+
+static struct genl_ops netlbl_cipsov4_genl_c_remove = {
+	.cmd = NLBL_CIPSOV4_C_REMOVE,
+	.flags = 0,
+	.doit = netlbl_cipsov4_remove,
+	.dumpit = NULL,
+};
+
+static struct genl_ops netlbl_cipsov4_genl_c_list = {
+	.cmd = NLBL_CIPSOV4_C_LIST,
+	.flags = 0,
+	.doit = netlbl_cipsov4_list,
+	.dumpit = NULL,
+};
+
+static struct genl_ops netlbl_cipsov4_genl_c_listall = {
+	.cmd = NLBL_CIPSOV4_C_LISTALL,
+	.flags = 0,
+	.doit = netlbl_cipsov4_listall,
+	.dumpit = NULL,
+};
+
+/*
+ * NetLabel Generic NETLINK Protocol Functions
+ */
+
+/**
+ * netlbl_cipsov4_send_ack - Send an ACK message
+ * @info: the generic NETLINK information
+ * @ret_code: return code to use
+ *
+ * Description:
+ * This function sends an ACK message to the sender of the NETLINK message
+ * specified by @req_skb.
+ *
+ */
+static void netlbl_cipsov4_send_ack(const struct genl_info *info,
+				    const u32 ret_code)
+{
+	size_t msg_size;
+	size_t data_size;
+	struct sk_buff *skb;
+	unsigned char *data;
+
+	data_size = GENL_HDRLEN + 8;
+	msg_size = NLMSG_SPACE(data_size);
+
+	skb = alloc_skb(msg_size, GFP_KERNEL);
+	if (skb == NULL)
+		return;
+
+	data = netlbl_netlink_hdr_put(skb,
+				      info->snd_pid,
+				      0,
+				      0,
+				      netlbl_cipsov4_gnl_family.id,
+				      NLBL_CIPSOV4_C_ACK,
+				      data_size);
+	if (data == NULL)
+		goto send_ack_failure;
+
+	netlbl_putinc_u32(&data, info->snd_seq);
+	netlbl_putinc_u32(&data, ret_code);
+
+	netlbl_netlink_snd(skb, info->snd_pid);
+	return;
+
+send_ack_failure:
+	kfree_skb(skb);
+}
+
+/**
+ * netlbl_cipsov4_genl_init - Register the CIPSOv4 NetLabel component
+ *
+ * Description:
+ * Register the CIPSOv4 packet NetLabel component with the Generic NETLINK
+ * mechanism.  Returns zero on success, negative values on failure.
+ *
+ */
+int netlbl_cipsov4_genl_init(void)
+{
+	int ret_val;
+
+	ret_val = genl_register_family(&netlbl_cipsov4_gnl_family);
+	if (ret_val != 0)
+		return ret_val;
+
+	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
+				    &netlbl_cipsov4_genl_c_add);
+	if (ret_val != 0)
+		goto genl_init_failure;
+	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
+				    &netlbl_cipsov4_genl_c_remove);
+	if (ret_val != 0)
+		goto genl_init_failure;
+	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
+				    &netlbl_cipsov4_genl_c_list);
+	if (ret_val != 0)
+		goto genl_init_failure;
+	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
+				    &netlbl_cipsov4_genl_c_listall);
+	if (ret_val != 0)
+		goto genl_init_failure;
+
+	return 0;
+
+genl_init_failure:
+	netlbl_cipsov4_genl_exit();
+	return ret_val;
+}
+
+/**
+ * netlbl_cipsov4_genl_exit - Unregister the CIPSOv4 NetLabel component
+ *
+ * Description:
+ * Unregister the CIPSOv4 packet NetLabel component with the Generic NETLINK
+ * mechanism.  Returns zero on success, negative values on failure.
+ *
+ */
+void netlbl_cipsov4_genl_exit(void)
+{
+	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
+			    &netlbl_cipsov4_genl_c_listall);
+	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
+			    &netlbl_cipsov4_genl_c_list);
+	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
+			    &netlbl_cipsov4_genl_c_remove);
+	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
+			    &netlbl_cipsov4_genl_c_add);
+
+	genl_unregister_family(&netlbl_cipsov4_gnl_family);
+	netlbl_cipsov4_gnl_family.id = GENL_ID_GENERATE;
+}
+

--
paul moore
linux security @ hp


linux-2.6-net-label_7_8.patch:
 netlabel_unlabeled.c |  258 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 258 insertions(+)

--- NEW FILE linux-2.6-net-label_7_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:38 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:03 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN13sM032514
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:03 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN12xC026117;
	Tue, 27 Jun 2006 19:01:02 -0400
Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN0xN7000818;
	Tue, 27 Jun 2006 19:01:01 -0400
Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127])
	by atlrel8.hp.com (Postfix) with ESMTP id 4FE5935161;
	Tue, 27 Jun 2006 19:00:54 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 015C027128;
	Tue, 27 Jun 2006 23:00:53 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0rOu030813;
	Tue, 27 Jun 2006 19:00:53 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0rgI030812;
	Tue, 27 Jun 2006 19:00:53 -0400
Message-Id: <20060627230053.088793000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:38 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 7/8] NetLabel: unlabeled packet handling
Content-Disposition: inline; filename=netlabel-unlabeled
X-RedHat-Spam-Score: -97.918 
Content-Type: 
X-UID: 72035
X-Length: 9195

Add unlabeled packet support to the NetLabel subsystem.  NetLabel does not do
any processing on unlabled packets, but it must support passing unlabled
packets on both the inbound and outbound sides.
---
 net/netlabel/netlabel_unlabeled.c |  258 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 258 insertions(+)

Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.c
===================================================================
--- /dev/null
+++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.c
@@ -0,0 +1,258 @@
+/*
+ * NetLabel Unlabeled Support
+ *
+ * This file defines functions for dealing with unlabeled packets for the
+ * NetLabel system.  The NetLabel system manages static and dynamic label
+ * mappings for network protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore at hp.com>
+ *
+ */
+
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/socket.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#include <net/netlink.h>
+#include <net/genetlink.h>
+
+#include <net/netlabel.h>
+#include <asm/bug.h>
+
+#include "netlabel_user.h"
+#include "netlabel_domainhash.h"
+#include "netlabel_unlabeled.h"
+
+/* Accept unlabeled packets flag */
+static atomic_t netlabel_unlabel_accept_flg = ATOMIC_INIT(0);
+
+/* NetLabel Generic NETLINK CIPSOv4 family */
+static struct genl_family netlbl_unlabel_gnl_family = {
+	.id = GENL_ID_GENERATE,
+	.hdrsize = 0,
+	.name = NETLBL_NLTYPE_UNLABELED_NAME,
+	.version = NETLBL_PROTO_VERSION,
+	.maxattr = 0,
+};
+
+
+/*
+ * Local Prototypes
+ */
+
+static void netlbl_unlabel_send_ack(const struct genl_info *info,
+				    const u32 ret_code);
+
+
+/*
+ * NetLabel Command Handlers
+ */
+
+/**
+ * netlbl_unlabel_accept - Handle an ACCEPT message
+ * @skb: the NETLINK buffer
+ * @info: the Generic NETLINK info block
+ *
+ * Description:
+ * Process a user generated ACCEPT message and set the accept flag accordingly.
+ * Returns zero on success, negative values on failure.
+ *
+ */
+static int netlbl_unlabel_accept(struct sk_buff *skb, struct genl_info *info)
+{
+	int ret_val;
+	unsigned char *msg = netlbl_netlink_payload_data(skb);
+	u32 value;
+
+	ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
+	if (ret_val != 0)
+		return ret_val;
+
+	if (netlbl_netlink_payload_len(skb) == 4) {
+		value = netlbl_get_u32(msg);
+		if (value == 1 || value == 0) {
+			atomic_set(&netlabel_unlabel_accept_flg, value);
+			netlbl_unlabel_send_ack(info, NETLBL_E_OK);
+			return 0;
+		}
+	}
+
+	netlbl_unlabel_send_ack(info, EINVAL);
+	return -EINVAL;
+}
+
+
+/*
+ * NetLabel Generic NETLINK Command Definitions
+ */
+
+static struct genl_ops netlbl_unlabel_genl_c_accept = {
+	.cmd = NLBL_UNLABEL_C_ACCEPT,
+	.flags = 0,
+	.doit = netlbl_unlabel_accept,
+	.dumpit = NULL,
+};
+
+/*
+ * NetLabel Generic NETLINK Protocol Functions
+ */
+
+/**
+ * netlbl_unlabel_send_ack - Send an ACK message
+ * @info: the generic NETLINK information
+ * @ret_code: return code to use
+ *
+ * Description:
+ * This function sends an ACK message to the sender of the NETLINK message
+ * specified by @info.
+ *
+ */
+static void netlbl_unlabel_send_ack(const struct genl_info *info,
+				    const u32 ret_code)
+{
+	size_t msg_size;
+	size_t data_size;
+	struct sk_buff *skb;
+	unsigned char *data;
+
+	data_size = GENL_HDRLEN + 8;
+	msg_size = NLMSG_SPACE(data_size);
+
+	skb = alloc_skb(msg_size, GFP_KERNEL);
+	if (skb == NULL)
+		return;
+
+	data = netlbl_netlink_hdr_put(skb,
+				      info->snd_pid,
+				      0,
+				      0,
+				      netlbl_unlabel_gnl_family.id,
+				      NLBL_UNLABEL_C_ACK,
+				      data_size);
+	if (data == NULL)
+		goto send_ack_failure;
+
+	netlbl_putinc_u32(&data, info->snd_seq);
+	netlbl_putinc_u32(&data, ret_code);
+
+	netlbl_netlink_snd(skb, info->snd_pid);
+	return;
+
+send_ack_failure:
+	kfree_skb(skb);
+}
+
+/**
+ * netlbl_unlabel_genl_init - Register the Unlabeled NetLabel component
+ *
+ * Description:
+ * Register the unlabeled packet NetLabel component with the Generic NETLINK
+ * mechanism.  Returns zero on success, negative values on failure.
+ *
+ */
+int netlbl_unlabel_genl_init(void)
+{
+	int ret_val;
+
+	ret_val = genl_register_family(&netlbl_unlabel_gnl_family);
+	if (ret_val != 0)
+		return ret_val;
+
+	ret_val = genl_register_ops(&netlbl_unlabel_gnl_family,
+				    &netlbl_unlabel_genl_c_accept);
+	if (ret_val != 0)
+		return ret_val;
+
+	return 0;
+}
+
+/**
+ * netlbl_unlabel_genl_exit - Unregister the Unlabeled NetLabel component
+ *
+ * Description:
+ * Unregister the unlabeled packet NetLabel component with the Generic NETLINK
+ * mechanism.  Returns zero on success, negative values on failure.
+ *
+ */
+void netlbl_unlabel_genl_exit(void)
+{
+	genl_unregister_ops(&netlbl_unlabel_gnl_family,
+			    &netlbl_unlabel_genl_c_accept);
+
+	genl_unregister_family(&netlbl_unlabel_gnl_family);
+	netlbl_unlabel_gnl_family.id = GENL_ID_GENERATE;
+}
+
+/*
+ * NetLabel KAPI Hooks
+ */
+
+/**
+ * netlbl_unlabel_getattr - Get the security attributes for an unlabled packet
+ * @secattr: the security attributes
+ *
+ * Description:
+ * Determine the security attributes, if any, for an unlabled packet and return
+ * them in @secattr.  Returns zero on success and negative values on failure.
+ *
+ */
+int netlbl_unlabel_getattr(struct netlbl_lsm_secattr *secattr)
+{
+	BUG_ON(secattr == NULL);
+
+	if (atomic_read(&netlabel_unlabel_accept_flg) == 1) {
+		memset(secattr, 0, sizeof(*secattr));
+		return 0;
+	}
+
+	return -ENOMSG;
+}
+
+/**
+ * netlbl_unlabel_defconf - Set the default config to allow unlabeled packets
+ *
+ * Description:
+ * Set the default NetLabel configuration to allow incoming unlabeled packets
+ * and to send unlabeled network traffic by default.
+ *
+ */
+int netlbl_unlabel_defconf(void)
+{
+	int ret_val;
+	struct netlbl_dom_map *entry;
+
+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+	if (entry == NULL)
+		return -ENOMEM;
+	entry->type = NETLBL_NLTYPE_UNLABELED;
+	ret_val = netlbl_domhsh_add_default(entry);
+	if (ret_val != 0)
+		return ret_val;
+
+	atomic_set(&netlabel_unlabel_accept_flg, 1);
+
+	return 0;
+}

--
paul moore
linux security @ hp


linux-2.6-net-label_8_8.patch:
 Kconfig |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-net-label_8_8.patch ---
>From paul.moore at hp.com Tue Jun 27 18:56:39 2006
Return-Path: <pmoore at flek.zko.hp.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Tue, 27 Jun 2006 19:01:07 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5RN16sM032545
	for <sgrubb at boston.redhat.com>; Tue, 27 Jun 2006 19:01:07 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5RN162L026189;
	Tue, 27 Jun 2006 19:01:06 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5RN10cj020723;
	Tue, 27 Jun 2006 19:01:00 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel9.hp.com (Postfix) with ESMTP id CC5913432C;
	Tue, 27 Jun 2006 19:00:54 -0400 (EDT)
Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 77549270DB;
	Tue, 27 Jun 2006 23:00:54 +0000 (UTC)
Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k5RN0rSh030842;
	Tue, 27 Jun 2006 19:00:53 -0400
Received: (from pmoore at localhost)
	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k5RN0rOd030841;
	Tue, 27 Jun 2006 19:00:53 -0400
Message-Id: <20060627230053.611591000 at flek.zko.hp.com>
References: <20060627225631.538814000 at flek.zko.hp.com>
User-Agent: quilt/0.45-1
Date: Tue, 27 Jun 2006 18:56:39 -0400
From: paul.moore at hp.com
To: redhat-lspp at redhat.com,
 netdev at vger.kernel.org
Cc: sgrubb at redhat.com,
 pratt at argus-systems.com
Subject: [RFC 8/8] NetLabel: tie NetLabel into the Kconfig system
Content-Disposition: inline; filename=netlabel-net_kconfig-2.6.17
X-RedHat-Spam-Score: -99.822 
Content-Type: 
X-UID: 72037
X-Length: 2412

Modify the net/Kconfig file to enable selecting the NetLabel Kconfig options.
---
 net/Kconfig |    2 ++
 1 files changed, 2 insertions(+)

Index: linux-2.6.17.i686-quilt/net/Kconfig
===================================================================
--- linux-2.6.17.i686-quilt.orig/net/Kconfig
+++ linux-2.6.17.i686-quilt/net/Kconfig
@@ -228,6 +228,8 @@ source "net/tux/Kconfig"
 config WIRELESS_EXT
 	bool
 
+source "net/netlabel/Kconfig"
+
 endif   # if NET
 endmenu # Networking
 

--
paul moore
linux security @ hp



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.3
retrieving revision 1.2293.2.4
diff -u -r1.2293.2.3 -r1.2293.2.4
--- kernel-2.6.spec	26 Jun 2006 17:26:33 -0000	1.2293.2.3
+++ kernel-2.6.spec	28 Jun 2006 22:34:46 -0000	1.2293.2.4
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.39
+%define tag FC6.lspp.40
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -461,14 +461,16 @@
 Patch20100: linux-2.6-audit-git.patch
 Patch20101: linux-2.6-audit-pending.patch
 Patch20102: netlink-eff_cap-lsm-framework.patch
-Patch20103: linux-2.6-net-label_1_7.patch
-Patch20104: linux-2.6-net-label_2_7.patch
-Patch20105: linux-2.6-net-label_3_7.patch
-Patch20106: linux-2.6-net-label_4_7.patch
-Patch20107: linux-2.6-net-label_5_7.patch
-Patch20108: linux-2.6-net-label_6_7.patch
-Patch20109: linux-2.6-net-label_7_7.patch
+Patch20103: linux-2.6-net-label_1_8.patch
+Patch20104: linux-2.6-net-label_2_8.patch
+Patch20105: linux-2.6-net-label_3_8.patch
+Patch20106: linux-2.6-net-label_4_8.patch
+Patch20107: linux-2.6-net-label_5_8.patch
+Patch20108: linux-2.6-net-label_6_8.patch
+Patch20109: linux-2.6-net-label_7_8.patch
+Patch20110: linux-2.6-net-label_8_8.patch
 Patch20120: ipsec-lspp-38.patch
+Patch20121: linux-2.6-audit-by-object.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1120,7 +1122,9 @@
 %patch20108 -p1
 %patch20109 -p1
 # ipsec
-%patch20120 -p1
+#%patch20120 -p1
+# audit by obj
+%patch20121 -p1
 
 
 # now run oldconfig over all the config files
@@ -1730,6 +1734,11 @@
 %endif
 
 %changelog
+* Wed Jun 28 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.40, refreshed netlabel patch from Paul
+- dropped ipsec patch due to new conflicts
+- added audit by obj by Darrel
+
 * Mon Jun 26 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.39, ipsec xfrm patch from Venkat
 


--- linux-2.6-net-label_1_7.patch DELETED ---


--- linux-2.6-net-label_2_7.patch DELETED ---


--- linux-2.6-net-label_3_7.patch DELETED ---


--- linux-2.6-net-label_4_7.patch DELETED ---


--- linux-2.6-net-label_5_7.patch DELETED ---


--- linux-2.6-net-label_6_7.patch DELETED ---


--- linux-2.6-net-label_7_7.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 01:41:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 21:41:27 -0400
Subject: rpms/pirut/devel .cvsignore, 1.26, 1.27 pirut.spec, 1.27,
	1.28 sources, 1.27, 1.28
Message-ID: <200606290141.k5T1fR0C010516@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10465/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.5-1 on branch devel from pirut-1.1.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	21 Jun 2006 01:39:27 -0000	1.26
+++ .cvsignore	29 Jun 2006 01:41:23 -0000	1.27
@@ -1 +1 @@
-pirut-1.1.4.tar.gz
+pirut-1.1.5.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pirut.spec	21 Jun 2006 01:39:27 -0000	1.27
+++ pirut.spec	29 Jun 2006 01:41:23 -0000	1.28
@@ -2,14 +2,14 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.4
+Version: 1.1.5
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://fedoraproject.org
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pygtk2, pygtk2-libglade, yum >= 2.9.0-4, comps-extras, rhpl
+Requires: pygtk2, pygtk2-libglade, yum >= 2.9.2, comps-extras, rhpl
 Requires: gnome-python2-libegg, gnome-python2-gconf
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
@@ -71,6 +71,12 @@
 
 
 %changelog
+* Wed Jun 28 2006 Jeremy Katz <katzj at redhat.com> - 1.1.5-1
+- mark reboot later for translation (#196358)
+- add nl translations (#196557)
+- updates for yum 2.9.2
+- catch error if downloaded file gets deleted (#197167)
+
 * Tue Jun 20 2006 Jeremy Katz <katzj at redhat.com> - 1.1.4-1
 - work with either yum 2.9.0 or 2.9.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	21 Jun 2006 01:39:27 -0000	1.27
+++ sources	29 Jun 2006 01:41:23 -0000	1.28
@@ -1 +1 @@
-5a4a49b0b872a7265e5666184577ad41  pirut-1.1.4.tar.gz
+1dc688df67e038717ce886c2c9ecb9ab  pirut-1.1.5.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 29 01:41:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 21:41:39 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2321, 1.2322 upstream, 1.377,
	1.378
Message-ID: <200606290141.k5T1fdWq010567@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10478

Modified Files:
	kernel-2.6.spec upstream 
Log Message:
disable modsign


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2321
retrieving revision 1.2322
diff -u -r1.2321 -r1.2322
--- kernel-2.6.spec	28 Jun 2006 00:25:36 -0000	1.2321
+++ kernel-2.6.spec	29 Jun 2006 01:41:28 -0000	1.2322
@@ -816,12 +816,12 @@
 #
 # GPG signed kernel modules
 #
-%patch900 -p1
-%patch901 -p1
-%patch902 -p1
-%patch903 -p1
-%patch904 -p1
-%patch905 -p1
+#%patch900 -p1
+#%patch901 -p1
+#%patch902 -p1
+#%patch903 -p1
+#%patch904 -p1
+#%patch905 -p1
 
 # Tux
 %patch910 -p1


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- upstream	28 Jun 2006 00:17:48 -0000	1.377
+++ upstream	29 Jun 2006 01:41:28 -0000	1.378
@@ -1,3 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git11.bz2
 patch-2.6.17-git12.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 29 01:53:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 21:53:50 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.287, 1.288 anaconda.spec, 1.411,
	1.412 sources, 1.408, 1.409
Message-ID: <200606290153.k5T1ropD006936@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6910/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.49-1 on branch devel from anaconda-11.1.0.49-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- .cvsignore	23 Jun 2006 21:35:55 -0000	1.287
+++ .cvsignore	29 Jun 2006 01:53:48 -0000	1.288
@@ -1 +1 @@
-anaconda-11.1.0.48.tar.bz2
+anaconda-11.1.0.49.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- anaconda.spec	23 Jun 2006 21:35:55 -0000	1.411
+++ anaconda.spec	29 Jun 2006 01:53:48 -0000	1.412
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.48
+Version: 11.1.0.49
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -11,16 +11,16 @@
 BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
 BuildPreReq: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel
 BuildPreReq: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber
-BuildPreReq: pykickstart, yum >= 2.9.0, device-mapper >= 1.01.05-3, 
+BuildPreReq: pykickstart, yum >= 2.9.2, device-mapper >= 1.01.05-3, 
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
 BuildPreReq: libdhcp-devel >= 1.5-2, libdhcp >= 1.5-2
 BuildPreReq: libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
-Requires: kudzu > 1.2.0, yum >= 2.9.0, pirut >= 1.1.0
+Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
 Requires: pyparted, libxml2-python, python-urlgrabber
-Requires: system-logos, pykickstart
+Requires: system-logos, pykickstart, system-config-date
 Requires: device-mapper >= 1.01.05-3
 Requires: dosfstools e2fsprogs
 %ifnarch s390 s390x
@@ -42,7 +42,7 @@
 Summary: Graphical system installer portions needed only for fresh installs.
 Group: Applications/System
 AutoReqProv: false
-Requires: libxml2-python, python, rpm-python >= 4.2-0.61, yum >= 2.4.0
+Requires: libxml2-python, python, rpm-python >= 4.2-0.61
 Requires: anaconda = %{version}-%{release}
 Requires: createrepo >= 0.4.3-3.1, squashfs-tools, mkisofs
 %ifarch %{ix86} x86_64
@@ -101,6 +101,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 28 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.49-1
+- Fix some memory leaks in the loader (pjones)
+- Display fs labels next to rescue choices (clumens, #196345)
+- Force graphical mode under vnc (clumens, #190099)
+- Fix splitting trees with symlinks (pnasrat, #195240)
+- Require system-config-date (clumens, #196452)
+- Ensure network UI bits end up written out (clumens, #196756)
+- Fix memory corruption in CD install (dcantrel)
+- Fix double free with ksdevice=macaddr (dcantrel)
+- Fix double free with HTTP/FTP installs (dcantrel, #195749)
+- Ensure keyboard layout gets set (clumens, #196466)
+- Fix text mode traceback for langs not supported in text 
+  mode (clumens, #196615)
+- Fix up for yum 2.9.2
+
 * Fri Jun 23 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.48-1
 - various pychecker inspired cleanups (clumsn)
 - don't try to unmount CDs twice (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- sources	23 Jun 2006 21:35:55 -0000	1.408
+++ sources	29 Jun 2006 01:53:48 -0000	1.409
@@ -1 +1 @@
-ff223dc08fe563a858ac9eb24df5663f  anaconda-11.1.0.48.tar.bz2
+c498162eae0aaf4eeaa350922a749628  anaconda-11.1.0.49.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 29 02:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 22:14:15 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.18,1.19
Message-ID: <200606290214.k5T2EFuj019091@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18936

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: update to 7.1 version



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim-pinyin.spec	28 Jun 2006 09:34:18 -0000	1.18
+++ scim-pinyin.spec	29 Jun 2006 02:14:13 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        7%{?dist}
+Release:        7.1%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Wed Jun 28 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7
+* Wed Jun 28 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7.1
 - rebuilt 
 
 * Tue Jun 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6



From fedora-cvs-commits at redhat.com  Thu Jun 29 02:53:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 22:53:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2322,1.2323
Message-ID: <200606290253.k5T2r7vQ029155@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29087

Modified Files:
	kernel-2.6.spec 
Log Message:
sigh. more signing crap



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2322
retrieving revision 1.2323
diff -u -r1.2322 -r1.2323
--- kernel-2.6.spec	29 Jun 2006 01:41:28 -0000	1.2322
+++ kernel-2.6.spec	29 Jun 2006 02:53:05 -0000	1.2323
@@ -1031,10 +1031,12 @@
 # Create gpg keys for signing the modules
 #
 
+%if %{signmodules}
 gpg --homedir . --batch --gen-key %{SOURCE11}
 gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
 make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
 linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
+%endif
 
 BuildKernel() {
     MakeTarget=$1



From fedora-cvs-commits at redhat.com  Thu Jun 29 03:09:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 23:09:53 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2323,1.2324
Message-ID: <200606290309.k5T39r7Y000919@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv869

Modified Files:
	kernel-2.6.spec 
Log Message:
use %dist



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2323
retrieving revision 1.2324
diff -u -r1.2323 -r1.2324
--- kernel-2.6.spec	29 Jun 2006 02:53:05 -0000	1.2323
+++ kernel-2.6.spec	29 Jun 2006 03:09:51 -0000	1.2324
@@ -28,11 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6
-%if %{rhelbuild}
-%define tag EL
-%endif
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage
@@ -194,7 +190,10 @@
 # List the packages used during the kernel build
 #
 BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
-BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils
+BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
+%if %{signmodules}
+BuildPreReq: gnupg
+%endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 %if %{buildheaders}
 BuildRequires: unifdef



From fedora-cvs-commits at redhat.com  Thu Jun 29 03:11:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 23:11:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2324,1.2325
Message-ID: <200606290311.k5T3BXwQ001534@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1490

Modified Files:
	kernel-2.6.spec 
Log Message:
nuke rhelbuild define



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2324
retrieving revision 1.2325
diff -u -r1.2324 -r1.2325
--- kernel-2.6.spec	29 Jun 2006 03:09:51 -0000	1.2324
+++ kernel-2.6.spec	29 Jun 2006 03:11:30 -0000	1.2325
@@ -3,8 +3,6 @@
 # What parts do we want to build?  We must build at least one kernel.
 # These are the kernels that are built IF the architecture allows it.
 
-%define rhelbuild 0
-
 %define buildup 1
 %define buildsmp 0
 %define buildpae 0
@@ -37,7 +35,8 @@
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
 # groups of related archs
-%if %{rhelbuild}
+# Don't build 586 kernels for RHEL builds.
+%if 0%{?rhel}
 %define all_x86 i686
 %else
 %define all_x86 i586 i686



From fedora-cvs-commits at redhat.com  Thu Jun 29 03:13:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 23:13:04 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2325,1.2326
Message-ID: <200606290313.k5T3D4j6002162@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2087

Modified Files:
	kernel-2.6.spec 
Log Message:
test



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2325
retrieving revision 1.2326
diff -u -r1.2325 -r1.2326
--- kernel-2.6.spec	29 Jun 2006 03:11:30 -0000	1.2325
+++ kernel-2.6.spec	29 Jun 2006 03:13:01 -0000	1.2326
@@ -190,7 +190,7 @@
 #
 BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
-%if %{signmodules}
+%if "%{signmodules}" == "1"
 BuildPreReq: gnupg
 %endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
@@ -1029,7 +1029,7 @@
 # Create gpg keys for signing the modules
 #
 
-%if %{signmodules}
+%if "%{signmodules}" == "1"
 gpg --homedir . --batch --gen-key %{SOURCE11}
 gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
 make linux-%{kversion}.%{_target_cpu}/scripts/bin2c



From fedora-cvs-commits at redhat.com  Thu Jun 29 03:21:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 23:21:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2326,1.2327
Message-ID: <200606290321.k5T3L9XN019936@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19798

Modified Files:
	kernel-2.6.spec 
Log Message:
rpmbuild, I hate you. Really.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2326
retrieving revision 1.2327
diff -u -r1.2326 -r1.2327
--- kernel-2.6.spec	29 Jun 2006 03:13:01 -0000	1.2326
+++ kernel-2.6.spec	29 Jun 2006 03:21:07 -0000	1.2327
@@ -70,7 +70,7 @@
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
-#%define signmodules 1
+#define signmodules 1
 %endif
 
 %ifarch i686
@@ -80,13 +80,13 @@
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
-#%define signmodules 1
+#define signmodules 1
 %endif
 
 %ifarch ppc64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
-#%define signmodules 1
+#define signmodules 1
 %define make_target vmlinux
 %define kernel_image vmlinux
 %endif
@@ -129,7 +129,7 @@
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
 %define image_install_path boot/efi/EFI/redhat
-#%define signmodules 1
+#define signmodules 1
 %define make_target compressed
 %define kernel_image vmlinux.gz
 %endif



From fedora-cvs-commits at redhat.com  Thu Jun 29 03:21:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 23:21:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2327,1.2328
Message-ID: <200606290321.k5T3LbAI020183@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20159

Modified Files:
	kernel-2.6.spec 
Log Message:
shorten


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2327
retrieving revision 1.2328
diff -u -r1.2327 -r1.2328
--- kernel-2.6.spec	29 Jun 2006 03:21:07 -0000	1.2327
+++ kernel-2.6.spec	29 Jun 2006 03:21:34 -0000	1.2328
@@ -190,7 +190,7 @@
 #
 BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
-%if "%{signmodules}" == "1"
+%if %{signmodules}
 BuildPreReq: gnupg
 %endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
@@ -1029,7 +1029,7 @@
 # Create gpg keys for signing the modules
 #
 
-%if "%{signmodules}" == "1"
+%if %{signmodules}
 gpg --homedir . --batch --gen-key %{SOURCE11}
 gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
 make linux-%{kversion}.%{_target_cpu}/scripts/bin2c



From fedora-cvs-commits at redhat.com  Thu Jun 29 03:37:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 28 Jun 2006 23:37:44 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.19,1.20
Message-ID: <200606290337.k5T3bi2M024783@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24642

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add rm -rf to Helper/*.la



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scim-pinyin.spec	29 Jun 2006 02:14:13 -0000	1.19
+++ scim-pinyin.spec	29 Jun 2006 03:37:41 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        7.1%{?dist}
+Release:        8%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -53,7 +53,8 @@
 %endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI,Helper}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/*.la
 
 %find_lang %{name}
 
@@ -73,9 +74,12 @@
 
 
 %changelog
-* Wed Jun 28 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7.1
+* Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7.1
 - rebuilt 
 
+* Wed Jun 28 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7
+- add pinyin-imengine-helper.so to the files section. rebuilt 
+
 * Tue Jun 27 2006 Qian Shen <qshen at redhat.com> - 0.5.91-6
 - add scim-pinyin-helper.patch
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 05:34:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 01:34:23 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.20,1.21
Message-ID: <200606290534.k5T5YN3E027849@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27739

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen : update changelog



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scim-pinyin.spec	29 Jun 2006 03:37:41 -0000	1.20
+++ scim-pinyin.spec	29 Jun 2006 05:34:18 -0000	1.21
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-8
+- use rm -f ../Helper/*.la
+
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-7.1
 - rebuilt 
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 06:53:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 02:53:25 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch,
	NONE, 1.1 openoffice.org.spec, 1.747, 1.748
Message-ID: <200606290653.k5T6rPJY031588@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31530

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch 
Log Message:
suspicious about visibility

openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch:
 unxlngi6.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch ---
--- openoffice.org.orig/solenv/inc/unxlngi6.mk	2006-06-29 07:50:04.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngi6.mk	2006-06-29 07:50:34.000000000 +0100
@@ -96,9 +96,9 @@
 CFLAGSCXX= -pipe $(ARCH_FLAGS)
 CFLAGSCXX+= -Wno-ctor-dtor-privacy
 PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+# .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+# CFLAGSCXX += -fvisibility-inlines-hidden
+# .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 
 # Compiler flags for compiling static object in single threaded environment with graphical user interface
 CFLAGSOBJGUIST=


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.747
retrieving revision 1.748
diff -u -r1.747 -r1.748
--- openoffice.org.spec	28 Jun 2006 17:51:48 -0000	1.747
+++ openoffice.org.spec	29 Jun 2006 06:53:22 -0000	1.748
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -105,6 +105,7 @@
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
 Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 Patch41: workspace.sixtyfour06.patch
+Patch42: openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -837,6 +838,7 @@
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
 %patch40 -p1 -b .ooo65519.printing.samba.patch
 %patch41 -p1 -b .workspace.sixtyfour06.patch
+%patch42 -p1 -b .ooo66018.solenv.dangerousvisibility.patch
 
 tar xzf %{SOURCE1}
 
@@ -3314,8 +3316,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.3
-- unset HAVE_GCC_VISIBILITY_FEATURE inline symbols visibility problems
+* Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
+- disable -fvisibility-inlines-hidden
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone



From fedora-cvs-commits at redhat.com  Thu Jun 29 07:03:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 03:03:32 -0400
Subject: rpms/qt/FC-5 designer3.desktop, NONE,
	1.1 qt-x11-free-3.3.6-arabic_fonts.patch, NONE, 1.1
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch,
	NONE, 1.1 qt.spec, 1.106, 1.107
Message-ID: <200606290703.k5T73WrQ002161@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1655

Modified Files:
	qt.spec 
Added Files:
	designer3.desktop qt-x11-free-3.3.6-arabic_fonts.patch 
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch 
Log Message:
- fix #183302, IM preedit issue in kbabel
- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts




--- NEW FILE designer3.desktop ---
[Desktop Entry]
Name=Qt3 Designer
GenericName=Interface Designer
Comment=Design GUIs for Qt3 applications
Exec=designer
Icon=designer
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;

qt-x11-free-3.3.6-arabic_fonts.patch:
 qfontengine_p.h       |    2 +-
 qfontengine_x11.cpp   |   11 ++++++++---
 qscriptengine.cpp     |   19 +++++++++++++++----
 qscriptengine_x11.cpp |    7 ++++++-
 4 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-arabic_fonts.patch ---
diff -urNad qt-x11-free-3.3.6~/src/kernel/qfontengine_p.h qt-x11-free-3.3.6/src/kernel/qfontengine_p.h
--- qt-x11-free-3.3.6~/src/kernel/qfontengine_p.h	2006-03-08 16:47:45.000000000 +0000
+++ qt-x11-free-3.3.6/src/kernel/qfontengine_p.h	2006-06-05 13:35:50.000000000 +0000
@@ -491,7 +491,7 @@
     }
     void selectScript(unsigned int script, const Features *features = 0);
     
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }
diff -urNad qt-x11-free-3.3.6~/src/kernel/qfontengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qfontengine_x11.cpp
--- qt-x11-free-3.3.6~/src/kernel/qfontengine_x11.cpp	2006-03-08 16:47:49.000000000 +0000
+++ qt-x11-free-3.3.6/src/kernel/qfontengine_x11.cpp	2006-06-05 13:35:50.000000000 +0000
@@ -2544,7 +2544,7 @@
 
 extern void qt_heuristicPosition(QShaperItem *item);
 
-void QOpenType::shape(QShaperItem *item, const unsigned int *properties)
+bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
 {
     length = item->num_glyphs;
 
@@ -2571,8 +2571,11 @@
 
     loadFlags = FT_LOAD_DEFAULT;
 
-    if (gsub)
-        TT_GSUB_Apply_String(gsub, otl_buffer);
+    if (gsub) {
+        uint error = TT_GSUB_Apply_String(gsub, otl_buffer);
+        if (error && error != TTO_Err_Not_Covered)
+            return false;
+    }
 
 #ifdef OT_DEBUG
 //     qDebug("log clusters before shaping:");
@@ -2584,6 +2587,8 @@
     qDebug("-----------------------------------------");
 //     dump_string(otl_buffer);
 #endif
+
+    return true;
 }
 
 bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
diff -urNad qt-x11-free-3.3.6~/src/kernel/qscriptengine.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine.cpp
--- qt-x11-free-3.3.6~/src/kernel/qscriptengine.cpp	2006-03-08 16:47:45.000000000 +0000
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine.cpp	2006-06-05 13:35:50.000000000 +0000
@@ -1504,8 +1504,10 @@
     {0, 0}
 };
 
-static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item)
+static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item, bool *ot_ok)
 {
+    *ot_ok = true;
+
     openType->selectScript(item->script, item->script == QFont::Arabic ? arabic_features : syriac_features);
     int nglyphs = item->num_glyphs;
     if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
@@ -1562,7 +1564,10 @@
             apply[i] |= IsolProperty|MediProperty|FinaProperty;
     }
 
-    openType->shape(item, apply.data());
+    if (!openType->shape(item, apply.data())) {
+        *ot_ok = false;
+        return false;
+    }
     item->num_glyphs = nglyphs;
     return openType->positionAndAdd(item);
 }
@@ -1577,8 +1582,14 @@
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     QOpenType *openType = item->font->openType();
 
-    if (openType && openType->supportsScript(QFont::Arabic))
-        return arabicSyriacOpenTypeShape(openType, item);
+    if (openType && openType->supportsScript(QFont::Arabic)) {
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+            // fall through to the non OT code
+    }
 #endif
 
     QVarLengthArray<ushort> shapedChars(item->length);
diff -urNad qt-x11-free-3.3.6~/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
--- qt-x11-free-3.3.6~/src/kernel/qscriptengine_x11.cpp	2006-03-08 16:47:47.000000000 +0000
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp	2006-06-05 13:35:50.000000000 +0000
@@ -45,7 +45,12 @@
 #ifndef QT_NO_XFTFREETYPE
     QOpenType *openType = item->font->openType();
     if (openType && openType->supportsScript(QFont::Syriac)) {
-        return arabicSyriacOpenTypeShape(openType, item);
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+            // fall through to the non OT code
     }
 #endif
     return basic_shape(item);

qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch:
 qtextedit.cpp |   13 -------------
 1 files changed, 13 deletions(-)

--- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch ---
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit	2006-06-28 17:18:08.000000000 +0200
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp	2006-06-28 17:20:09.000000000 +0200
@@ -1906,9 +1906,6 @@
 
 void QTextEdit::removeSelectedText( int selNum )
 {
-    if(selNum != 0)
-        resetInputContext();
-
     QTextCursor c1 = doc->selectionStartCursor( selNum );
     c1.restoreState();
     QTextCursor c2 = doc->selectionEndCursor( selNum );
@@ -3171,7 +3168,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     QTextParagraph *p = doc->paragAt( para );
     if ( !p )
 	return;
@@ -3198,7 +3194,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
@@ -3240,7 +3235,6 @@
     if ( d->optimMode )
 	return;
 #endif
-    resetInputContext();
     QTextParagraph *p = doc->paragAt( para );
     if ( !p )
 	return;
@@ -3285,7 +3279,6 @@
     if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
 	return;
 
-    resetInputContext();
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
@@ -3336,7 +3329,6 @@
     if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
 	return;
 
-    resetInputContext();
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
@@ -3450,7 +3442,6 @@
 {
     if ( isReadOnly() )
 	return;
-    resetInputContext();
     normalCopy();
     removeSelectedText();
     updateMicroFocusHint();
@@ -3938,7 +3929,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     if ( !isModified() && isReadOnly() &&
 	 this->context() == context && this->text() == text )
 	return;
@@ -4112,7 +4102,6 @@
     if ( !p )
 	return;
 
-    resetInputContext();
     if ( index > p->length() - 1 )
 	index = p->length() - 1;
 
@@ -4169,7 +4158,6 @@
 	return;
     }
 #endif
-    resetInputContext();
     if ( doc->hasSelection( selNum ) ) {
 	doc->removeSelection( selNum );
 	repaintChanged();
@@ -5072,7 +5060,6 @@
 {
     if ( dc == doc )
 	return;
-    resetInputContext();
     doc = dc;
     delete cursor;
     cursor = new QTextCursor( doc );


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- qt.spec	26 Jun 2006 20:07:25 -0000	1.106
+++ qt.spec	29 Jun 2006 07:03:03 -0000	1.107
@@ -1,91 +1,16 @@
-%define smp 1
-
-%define desktop_file 1
-%define redhat_artwork 1
-%define desktop_file_utils_version 0.2.93
-
-%define mysql4 1
-
-%define immodule 1
-
-%define ver 3.3.6
-
-%define qt_dirname qt-3.3
-%define qtdir %{_libdir}/%{qt_dirname}
-
-# install manuals
-%define installman 1
-
-# buildmysql: Build MySQL plugins
-%define buildmysql 1
-
-# buildpsql: Build Postgres plugins
-%define buildpsql 1
-
-# buildodbc: Build ODBC plugins
-%define buildodbc 1
-
-# buildmt: Build libs with threading support
-%define buildmt 1
-
-# cups support
-%define cups 1
-
-%define debug 0
-
-%define sover %{ver}
-
-%define styleplugins 0
-
-%if %{styleplugins}
-%define plugins_style -plugin-style-cde -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows -plugin-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%else
-%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%endif
-
-%if %{buildmysql}
-%define plugin_mysql -plugin-sql-mysql
-%else
-%define plugin_mysql %{nil}
-%endif
-
-%if %{mysql4}
-%define mysql_include_dir %{_includedir}/mysql
-%define mysql_lib_dir %{_libdir}/mysql
-%define mysql_buildreq mysql-devel
-%else
-%define mysql_include_dir %{_includedir}/mysql3/mysql
-%define mysql_lib_dir %{_libdir}/mysql3/mysql
-%define mysql_buildreq mysqlclient10-devel
-%endif
-
-%if %{buildpsql}
-%define plugin_psql -plugin-sql-psql
-%else
-%define plugin_psql %{nil}
-%endif
-
-%if %{buildodbc}
-%define plugin_odbc -plugin-sql-odbc
-%else
-%define plugin_odbc %{nil}
-%endif
-
-%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugins_style}
-
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
-Version: %{ver}
-Release: 0.2.fc5
+Version: 3.3.6
+Release: 0.3.fc5
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.troll.no
 Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
-Source1: qtrc
 Source2: qt.sh
 Source3: qt.csh
+Source4: designer3.desktop
 
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
@@ -107,6 +32,7 @@
 Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
 Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
 Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff
+Patch55: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
@@ -116,8 +42,29 @@
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
+Patch201: qt-x11-free-3.3.6-arabic_fonts.patch
 
-Prefix: %{qtdir}
+%define qt_dirname qt-3.3
+%define qtdir %{_libdir}/%{qt_dirname}
+%define qt_docdir %{_docdir}/qt-devel-%{version}
+
+%define smp 1
+%define immodule 1
+%define debug 0
+
+# MySQL plugins
+%define plugin_mysql -plugin-sql-mysql
+%define mysql_include_dir %{_includedir}/mysql
+%define mysql_lib_dir %{_libdir}/mysql
+
+# Postgres plugins
+%define plugin_psql -plugin-sql-psql
+
+# ODBC plugins
+%define plugin_odbc -plugin-sql-odbc
+
+%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
+%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugins_style}
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -132,7 +79,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: libungif-devel
+BuildRequires: giflib-devel
 BuildRequires: perl
 BuildRequires: sed
 BuildRequires: findutils
@@ -154,24 +101,10 @@
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
-
-%if %{desktop_file}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-%endif
-
-%if %{buildmysql}
-BuildRequires: %{mysql_buildreq}
-%endif
-
-%if %{buildpsql}
+BuildRequires: desktop-file-utils
+BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
-%endif
-
-%if %{buildodbc}
 BuildRequires: unixODBC-devel
-%endif
-
-BuildRequires: fontconfig-devel >= 2.0
 
 
 %package config
@@ -204,46 +137,23 @@
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
 
-%package Xt
-Summary: An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit.
-Group: System Environment/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-
-%package styles
-Summary: Extra styles for the Qt GUI toolkit.
-Group: User Interface/Desktops
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
 
-%if %{buildodbc}
 %package ODBC
 Summary: ODBC drivers for Qt's SQL classes.
 Group: System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%endif
 
 
-%if %{buildmysql}
 %package MySQL
 Summary: MySQL drivers for Qt's SQL classes.
 Group: System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%endif
 
 
-%if %{buildpsql}
 %package PostgreSQL
 Summary: PostgreSQL drivers for Qt's SQL classes.
 Group: System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%endif
-
-
-%package static
-Summary: Version of the Qt GUI toolkit for static linking
-Group: Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
 
 
 %package designer
@@ -283,34 +193,16 @@
 toolkit.
 
 
-%description Xt
-An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit.
-
-
-%description static
-Version of the Qt library for static linking
-
-
-%description styles
-Extra styles (themes) for the Qt GUI toolkit.
-
-
-%if %{buildodbc}
 %description ODBC
 ODBC driver for Qt's SQL classes (QSQL)
-%endif
 
 
-%if %{buildmysql}
 %description MySQL
 MySQL driver for Qt's SQL classes (QSQL)
-%endif
 
 
-%if %{buildpsql}
 %description PostgreSQL
 PostgreSQL driver for Qt's SQL classes (QSQL)
-%endif
 
 
 %description designer
@@ -331,7 +223,6 @@
 %patch14 -p1 -b .gl
 %patch19 -p1 -b .gtk
 %patch20 -p1 -b .gcc4-buildkey
-
 %patch24 -p1 -b .uic
 %patch25 -p1 -b .uic-multilib
 
@@ -340,6 +231,8 @@
 %patch51 -p1
 %patch52 -p1 -b .post
 %patch53 -p1 -b .quiet
+%patch54 -p1 -b .fix-key-release-event-with-imm
+%patch55 -p1 -b .resetinputcontext
 %endif
 
 %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
@@ -348,6 +241,7 @@
 %patch103 -p0 -b .0056-khotkeys_input_84434
 
 %patch200 -p1 -b .fullscreen
+%patch201 -p1 -b .arabic_fonts
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -376,12 +270,11 @@
 # don't use rpath
 perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
 
-
+# set correct FLAGS
 %if ! %{debug}
-disable_warning="-DQT_NO_CHECK"
+  disable_warning="-DQT_NO_CHECK"
 %endif
 
-# set correct FLAGS
 perl -pi -e "s|-O2|$INCLUDES %{optflags} $disable_warning|g" mkspecs/*/qmake.conf
 
 # set correct lib path
@@ -393,7 +286,7 @@
 # build shared, threaded (default) libraries
 echo yes | ./configure \
   -prefix $QTDEST \
-  -docdir %{_docdir}/qt-devel-%{version}/ \
+  -docdir %{qt_docdir} \
 %if %{_lib} == lib64
   -platform linux-g++-64 \
 %else
@@ -428,12 +321,8 @@
   -qt-style-motif \
   %{plugins} \
   -stl \
-%if %{buildmt}
   -thread \
-%endif
-%if %{cups}
   -cups \
-%endif
   -sm \
   -xinerama \
   -xrender \
@@ -445,25 +334,19 @@
 make $SMP_MFLAGS src-qmake
 
 # build psql plugin
-%if %{buildpsql}
-   pushd plugins/src/sqldrivers/psql
-   qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
+pushd plugins/src/sqldrivers/psql
+qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
 popd
-%endif
 
 # build mysql plugin
-%if %{buildmysql}
-   pushd plugins/src/sqldrivers/mysql
-   qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
+pushd plugins/src/sqldrivers/mysql
+qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
 popd
-%endif
 
 # build odbc plugin
-%if %{buildodbc}
-   pushd plugins/src/sqldrivers/odbc
-   qmake -o Makefile "LIBS+=-lodbc" odbc.pro
-   popd
-%endif
+pushd plugins/src/sqldrivers/odbc
+qmake -o Makefile "LIBS+=-lodbc" odbc.pro
+popd
 
 make $SMP_MFLAGS src-moc
 make $SMP_MFLAGS sub-src
@@ -487,10 +370,8 @@
 mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 # install man pages
-%if %{installman}
-  mkdir -p %{buildroot}%{_mandir}
-  cp -fR doc/man/* %{buildroot}%{_mandir}/
-%endif
+mkdir -p %{buildroot}%{_mandir}
+cp -fR doc/man/* %{buildroot}%{_mandir}/
 
 # clean up
 make -C tutorial clean
@@ -520,42 +401,8 @@
 done
 
 # Add desktop file
-%if %{desktop_file}
-   mkdir -p %{buildroot}%{_datadir}/applications
-   cat >%{buildroot}%{_datadir}/applications/%{name}-designer.desktop <<EOF
-%else
-   mkdir -p %{buildroot}%{_datadir}/applnk/Development
-   cat >%{buildroot}%{_datadir}/applnk/Development/%{name}-designer.desktop <<EOF
-%endif
-[Desktop Entry]
-BinaryPattern=designer;
-Name=Qt Designer
-GenericName=Interface Designer
-Exec=designer
-Icon=designer
-InitialPreference=5
-MapNotify=true
-MimeType=application/x-designer
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Application;Development;X-Red-Hat-Extra;
-X-Desktop-File-Install-Version=0.3
-EOF
-
-# move it into redhat-artwork
-%if ! %{redhat_artwork}
-   # Sane default settings
-   mkdir -p %{buildroot}%{qtdir}/etc/settings
-   cat >%{buildroot}%{qtdir}/etc/settings/qtrc <<"EOF"
-[General]
-libraryPath=%{_libdir}/kde3/plugins
-style=Highcolor
-
-[KDE]
-contrast=7
-EOF
-%endif
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}-designer.desktop
 
 # Patch qmake to use qt-mt unconditionally
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
@@ -585,9 +432,6 @@
 %{qtdir}/plugins/inputmethods
 %endif
 /etc/ld.so.conf.d/*
-%if ! %{redhat_artwork}
-%{qtdir}/etc/settings/qtrc
-%endif
 %{qtdir}/lib/libqui.so.*
 %{qtdir}/lib/libqt*.so.*
 
@@ -621,9 +465,7 @@
 %{qtdir}/lib/libdesigner*.a
 %{qtdir}/lib/libqassistantclient.a
 %{qtdir}/lib/*.prl
-%if %{installman}
 %{_mandir}/*/*
-%endif
 %{qtdir}/translations
 %{qtdir}/phrasebooks
 %{_bindir}/assistant*
@@ -644,33 +486,19 @@
 %doc tutorial
 
 
-%if %{styleplugins}
-%files styles
-%defattr(-,root,root,-)
-%dir %{qtdir}/plugins/styles
-%{qtdir}/plugins/styles/*
-%endif
-
-
-%if %{buildodbc}
 %files ODBC
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlodbc*
-%endif
 
 
-%if %{buildpsql}
 %files PostgreSQL
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlpsql*
-%endif
 
 
-%if %{buildmysql}
 %files MySQL
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlmysql*
-%endif
 
 
 %files designer
@@ -680,14 +508,14 @@
 %{qtdir}/templates
 %{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
-%if %{desktop_file}
 %{_datadir}/applications/*.desktop
-%else
-%{_datadir}/applnk/Development/*
-%endif
 
 
 %changelog
+* Thu Jun 29 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.3.fc5
+- fix #183302, IM preedit issue in kbabel
+- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.2.fc5
 - fix #195410, don't strip binaries/libraries
 - fix #156572, keyReleaseEvent issue



From fedora-cvs-commits at redhat.com  Thu Jun 29 07:05:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 03:05:40 -0400
Subject: rpms/qt/devel qt-x11-free-3.3.6-arabic_fonts.patch, NONE,
	1.1 qt.spec, 1.118, 1.119
Message-ID: <200606290705.k5T75eEb002390@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2331

Modified Files:
	qt.spec 
Added Files:
	qt-x11-free-3.3.6-arabic_fonts.patch 
Log Message:
- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts



qt-x11-free-3.3.6-arabic_fonts.patch:

***** Error reading new file: [Errno 2] No such file or directory: 'qt-x11-free-3.3.6-arabic_fonts.patch'




From fedora-cvs-commits at redhat.com  Thu Jun 29 08:19:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:19:24 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.21,1.22
Message-ID: <200606290819.k5T8JODZ019135@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18989

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add acloacl/autoconfig/automake before configure



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scim-pinyin.spec	29 Jun 2006 05:34:18 -0000	1.21
+++ scim-pinyin.spec	29 Jun 2006 08:19:21 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -11,7 +11,7 @@
 Source0:	http://dl.sourceforge.net/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	scim-devel, gtk2-devel, gettext
+BuildRequires:	scim-devel, gtk2-devel, gettext,autoconf, automake
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -38,6 +38,9 @@
 %if %{with_libstdc_preview}
 export CXX=%{_bindir}/g++-libstdc++-so_7
 %endif
+aclocal
+autoconf
+automake
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
@@ -74,6 +77,11 @@
 
 
 %changelog
+* Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-9
+- run aclocal/autoconf/automake before configure
+- to create new confiugre/Makefiles based on the 
+- modified configure.ac 
+
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-8
 - use rm -f ../Helper/*.la
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:27:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:27:55 -0400
Subject: rpms/kernel/devel/scripts reconfig.sh,1.1,1.2
Message-ID: <200606290827.k5T8Rsgo021978@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/scripts
In directory cvs.devel.redhat.com:/tmp/cvs-serv21641/scripts

Modified Files:
	reconfig.sh 
Log Message:
git13.
This disables Xen completely for now.
It also moves it after the execshield patches, to cause less headache
rediffing daily with the constantly churning upstream.




Index: reconfig.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/reconfig.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reconfig.sh	27 Jun 2006 00:39:25 -0000	1.1
+++ reconfig.sh	29 Jun 2006 08:27:52 -0000	1.2
@@ -3,6 +3,7 @@
 V=$(grep sublevel kernel-2.6.spec | head -n1 | awk '{ print $3 }')
 
 cd kernel-2.6.$V/linux-2.6.$V.noarch/
+rm -f kernel-*-config
 cp ../../kernel-*.config .
 
 for i in kernel-*.config
@@ -11,7 +12,7 @@
 	rm -f .config
 	cp $i .config
 	Arch=`head -1 .config | cut -b 3-`
-	make ARCH=$Arch nonint_oldconfig > /dev/null
+	make ARCH=$Arch nonint_oldconfig > /dev/null || exit 1
 	echo "# $Arch" > configs/$i
 	cat .config >> configs/$i
 	echo



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:27:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:27:55 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.205,
	1.206 config-x86-generic, 1.56, 1.57 config-x86_64-generic,
	1.43, 1.44
Message-ID: <200606290827.k5T8RtiN021970@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv21641/configs

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
git13.
This disables Xen completely for now.
It also moves it after the execshield patches, to cause less headache
rediffing daily with the constantly churning upstream.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- config-generic	28 Jun 2006 00:17:48 -0000	1.205
+++ config-generic	29 Jun 2006 08:27:52 -0000	1.206
@@ -4,6 +4,7 @@
 CONFIG_MMU=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_COMPAT_VDSO is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_CRASH_DUMP is not set
 #
@@ -1869,6 +1870,10 @@
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_24XXX=y
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 
 #
 # Graphics support
@@ -2432,6 +2437,8 @@
 # CONFIG_CIFS_EXPERIMENTAL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_DEBUG2 is not set
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -2543,6 +2550,8 @@
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_RT_MUTEX_TESTER=y
 
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- config-x86-generic	27 Jun 2006 00:39:24 -0000	1.56
+++ config-x86-generic	29 Jun 2006 08:27:52 -0000	1.57
@@ -276,6 +276,8 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
+CONFIG_PC8736x_GPIO=m
+# CONFIG_NSC_GPIO is not set
 CONFIG_CS5535_GPIO=m
 
 CONFIG_EDAC=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- config-x86_64-generic	27 Jun 2006 00:39:24 -0000	1.43
+++ config-x86_64-generic	29 Jun 2006 08:27:52 -0000	1.44
@@ -172,3 +172,4 @@
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 
+CONFIG_PC8736x_GPIO=m



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:27:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:27:54 -0400
Subject: rpms/kernel/devel patch-2.6.17-git13.bz2.sign, NONE, 1.1 Makefile,
	1.26, 1.27 kernel-2.6.spec, 1.2328,
	1.2329 linux-2.6-compile-fixes.patch, 1.85,
	1.86 linux-2.6-devmem.patch, 1.7,
	1.8 linux-2.6-execshield.patch, 1.23, 1.24 upstream, 1.378,
	1.379 linux-2.6-mtd-git.patch, 1.4, NONE
Message-ID: <200606290827.k5T8RsP9021954@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21641

Modified Files:
	Makefile kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-devmem.patch linux-2.6-execshield.patch upstream 
Added Files:
	patch-2.6.17-git13.bz2.sign 
Removed Files:
	linux-2.6-mtd-git.patch 
Log Message:
git13.
This disables Xen completely for now.
It also moves it after the execshield patches, to cause less headache
rediffing daily with the constantly churning upstream.




--- NEW FILE patch-2.6.17-git13.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEoimxyGugalF9Dw4RAqD/AJ9XVW0tWWV8ah7xKbMcjULoEf4FdwCghcOj
Tx/SE6aJBISkF1Hmud9ouvM=
=azFq
-----END PGP SIGNATURE-----


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile	27 Jun 2006 00:39:11 -0000	1.26
+++ Makefile	29 Jun 2006 08:27:51 -0000	1.27
@@ -23,15 +23,18 @@
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' configs/config-generic
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' configs/config-x86-generic
 	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' configs/config-x86-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' configs/config-x86-generic
 	@perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' configs/config-x86-generic
 
 release:
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' configs/config-generic
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' configs/config-x86-generic
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' configs/config-x86-generic
+	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' configs/config-x86-generic
 	@perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' configs/config-x86-generic
 
 reconfig:
-	@make -f Makefile.config configs
+	@rm -f kernel-*-config
+	@VERSION="2.6.17" make -f Makefile.config configs
 	@scripts/reconfig.sh
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2328
retrieving revision 1.2329
diff -u -r1.2328 -r1.2329
--- kernel-2.6.spec	29 Jun 2006 03:21:34 -0000	1.2328
+++ kernel-2.6.spec	29 Jun 2006 08:27:51 -0000	1.2329
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 0
 %define buildxenPAE 0
@@ -239,7 +239,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git12.bz2
+Patch1: patch-2.6.17-git13.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -271,12 +271,12 @@
 # 600 - 699   sparc(64)
 
 # 700 - 799 Xen
-Patch700: linux-2.6-xen.patch
-Patch701: linux-2.6-xen-compile-fixes.patch
-Patch702: linux-2.6-xen-no-tls-warn.patch
-Patch703: linux-2.6-xen-move-vdso-fixmap.patch
-Patch704: linux-2.6-xen-vsyscall_base.patch
-Patch706: linux-2.6-xen_remap_vma_flags.patch
+Patch950: linux-2.6-xen.patch
+Patch951: linux-2.6-xen-compile-fixes.patch
+Patch952: linux-2.6-xen-no-tls-warn.patch
+Patch953: linux-2.6-xen-move-vdso-fixmap.patch
+Patch954: linux-2.6-xen-vsyscall_base.patch
+Patch955: linux-2.6-xen_remap_vma_flags.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -397,9 +397,6 @@
 # ACPI bits
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 
-# MTD bits
-Patch2400: linux-2.6-mtd-git.patch
-
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -749,45 +746,6 @@
 #%patch319 -p1
 
 #
-# Xen
-#
-%if %{includexen}
-#
-# Apply the main xen patch...
-#
-%patch700 -p1 -b .p.xen
-#
-# ... and back out all the ia64-specific sections, as they currently prevent
-# non-xen builds from working.
-# Now also with tpm
-#
-for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
-    g=`dirname $f`/`basename $f .p.xen`; \
-    mv "$f" "$g"; \
-    if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
-done
-# Delete the rest of the backup files, they just confuse the build later
-find -name "*.p.xen" | xargs rm -f
-
-#
-# Xen includes a patch which moves the vsyscall fixmap into a user-space VA,
-# freeing user-space from reliance on an absolute fixmap area and so allowing
-# the fixmap area to become dynamic.
-#
-# Execshield already does this, making the fixmap area invisible to the user
-# and adding a new randomised vdso for it in user VA, so there's no point in
-# having both: revert the Xen changeset so that execsheild applies cleanly.
-#
-%patch703 -p2 -R
-
-%patch701 -p1
-%patch702 -p1
-%patch704 -p1
-%patch706 -p1
-
-%endif
-
-#
 # Patches 500 through 1000 are reserved for bugfixes to the core system
 # and patches related to how RPMs are build
 #
@@ -825,6 +783,45 @@
 %patch910 -p1
 
 #
+# Xen
+#
+%if %{includexen}
+#
+# Apply the main xen patch...
+#
+%patch950 -p1 -b .p.xen
+#
+# ... and back out all the ia64-specific sections, as they currently prevent
+# non-xen builds from working.
+# Now also with tpm
+#
+for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+    g=`dirname $f`/`basename $f .p.xen`; \
+    mv "$f" "$g"; \
+    if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
+done
+# Delete the rest of the backup files, they just confuse the build later
+find -name "*.p.xen" | xargs rm -f
+
+#
+# Xen includes a patch which moves the vsyscall fixmap into a user-space VA,
+# freeing user-space from reliance on an absolute fixmap area and so allowing
+# the fixmap area to become dynamic.
+#
+# Execshield already does this, making the fixmap area invisible to the user
+# and adding a new randomised vdso for it in user VA, so there's no point in
+# having both: revert the Xen changeset so that execsheild applies cleanly.
+#
+%patch953 -p2 -R
+
+%patch951 -p1
+%patch952 -p1
+%patch954 -p1
+%patch955 -p1
+
+%endif
+
+#
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
 
@@ -971,9 +968,6 @@
 # Silence more ACPI debug spew from suspend.
 #%patch2300 -p1
 
-# MTD update from git://git.infradead.org/mtd-2.6.git
-%patch2400 -p1
-
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -986,7 +980,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1586,6 +1580,9 @@
 %endif
 
 %changelog
+* Thu Jun 28 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git13
+
 * Tue Jun 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git12
 - Disable the signed module patches for now, they need love.

linux-2.6-compile-fixes.patch:
 Kconfig |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- linux-2.6-compile-fixes.patch	27 Jun 2006 00:39:13 -0000	1.85
+++ linux-2.6-compile-fixes.patch	29 Jun 2006 08:27:51 -0000	1.86
@@ -0,0 +1,10 @@
+--- linux-2.6.17.noarch/drivers/char/Kconfig~	2006-06-29 01:17:35.000000000 -0400
++++ linux-2.6.17.noarch/drivers/char/Kconfig	2006-06-29 01:17:55.000000000 -0400
+@@ -963,6 +963,7 @@ config PC8736x_GPIO
+ 
+ config NSC_GPIO
+ 	tristate "NatSemi Base GPIO Support"
++	depends on X86_32
+ 	# selected by SCx200_GPIO and PC8736x_GPIO
+ 	# what about 2 selectors differing: m != y
+ 	help

linux-2.6-devmem.patch:
 arch/powerpc/mm/mem.c                        |   14 ++
 linux-1050/arch/i386/mm/init.c               |   19 +++
 linux-1050/arch/ia64/mm/init.c               |    7 +
 linux-1050/arch/s390/mm/init.c               |    5 
 linux-1050/arch/x86_64/mm/init.c             |   20 +++
 linux-1050/drivers/char/mem.c                |  143 ++++-----------------------
 linux-1050/fs/proc/kcore.c                   |    2 
 linux-1050/include/asm-arm/page.h            |    2 
 linux-1050/include/asm-arm26/page.h          |    2 
 linux-1050/include/asm-cris/page.h           |    2 
 linux-1050/include/asm-h8300/page.h          |    2 
 linux-1050/include/asm-i386/page.h           |    2 
 linux-1050/include/asm-ia64/page.h           |    2 
 linux-1050/include/asm-m68k/page.h           |    2 
 linux-1050/include/asm-m68knommu/page.h      |    2 
 linux-1050/include/asm-mips/page.h           |    2 
 linux-1050/include/asm-parisc/page.h         |    2 
 linux-1050/include/asm-s390/page.h           |    2 
 linux-1050/include/asm-sh/page.h             |    2 
 linux-1050/include/asm-sh64/page.h           |    2 
 linux-1050/include/asm-sparc/page.h          |    2 
 linux-1050/include/asm-sparc64/page.h        |    2 
 linux-1050/include/asm-um/page.h             |    1 
 linux-1050/include/asm-v850/page.h           |    2 
 linux-1050/include/asm-x86_64/page.h         |    4 
 linux-2.6.13/arch/x86_64/mm/init.c           |   22 ++++
 linux-2.6.14/include/asm-powerpc/page.h      |    2 
 linux-2.6.16.noarch/include/asm-alpha/page.h |    1 
 linux-2.6.16.noarch/include/asm-ppc/page.h   |    2 
 29 files changed, 152 insertions(+), 122 deletions(-)

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-devmem.patch	28 Mar 2006 15:48:16 -0000	1.7
+++ linux-2.6-devmem.patch	29 Jun 2006 08:27:51 -0000	1.8
@@ -404,15 +404,6 @@
  #endif /* __ASSEMBLY__ */
  
  #ifdef __ASSEMBLY__
-@@ -148,6 +150,8 @@ extern int sysctl_legacy_va_layout;
- 	((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
- 		 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
-+
-+
- #endif /* __KERNEL__ */
- 
- #endif /* _I386_PAGE_H */
 diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ia64/page.h linux-1050/include/asm-ia64/page.h
 --- linux-1020/include/asm-ia64/page.h
 +++ linux-1050/include/asm-ia64/page.h

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux-2.6.17.noarch/arch/i386/kernel/sysenter.c |    3 
 linux-2.6.17.noarch/include/asm-i386/elf.h      |    7 
 linux-2.6.17.noarch/include/asm-i386/mmu.h      |    4 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   22 ++
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 46 files changed, 794 insertions(+), 135 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-execshield.patch	27 Jun 2006 00:39:13 -0000	1.23
+++ linux-2.6-execshield.patch	29 Jun 2006 08:27:51 -0000	1.24
@@ -1,15 +1,3 @@
-Index: linux/arch/i386/kernel/asm-offsets.c
-===================================================================
---- linux.orig/arch/i386/kernel/asm-offsets.c
-+++ linux/arch/i386/kernel/asm-offsets.c
-@@ -53,6 +53,7 @@ void foo(void)
- 	OFFSET(TI_preempt_count, thread_info, preempt_count);
- 	OFFSET(TI_addr_limit, thread_info, addr_limit);
- 	OFFSET(TI_restart_block, thread_info, restart_block);
-+	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
- 	BLANK();
- 
- 	OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
 Index: linux/arch/i386/kernel/cpu/common.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/cpu/common.c
@@ -28,23 +16,6 @@
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
  		char *p;
---- linux-2.6.17.noarch/arch/i386/kernel/entry.S~	2006-06-26 18:55:20.746055000 -0400
-+++ linux-2.6.17.noarch/arch/i386/kernel/entry.S	2006-06-26 18:56:01.803956000 -0400
-@@ -263,7 +263,13 @@ sysenter_past_esp:
- 	pushl $(__USER_CS)
- 	CFI_ADJUST_CFA_OFFSET 4
- 	/*CFI_REL_OFFSET cs, 0*/
--	pushl $SYSENTER_RETURN
-+	/*
-+	 * Push current_thread_info()->sysenter_return to the stack.
-+	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
-+	 * pushed above; +8 corresponds to copy_thread's esp0 setting.
-+	 */
-+	pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
-+
- 	CFI_ADJUST_CFA_OFFSET 4
- 	CFI_REL_OFFSET eip, 0
- 
 Index: linux/arch/i386/kernel/process.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/process.c
@@ -119,28 +90,6 @@
 +		current->mm->brk = new_brk;
 +}
 +
-Index: linux/arch/i386/kernel/signal.c
-===================================================================
---- linux.orig/arch/i386/kernel/signal.c
-+++ linux/arch/i386/kernel/signal.c
-@@ -350,7 +350,7 @@ static int setup_frame(int sig, struct k
- 			goto give_sigsegv;
- 	}
- 
--	restorer = &__kernel_sigreturn;
-+	restorer = current->mm->context.vdso + (long)&__kernel_sigreturn;
- 	if (ka->sa.sa_flags & SA_RESTORER)
- 		restorer = ka->sa.sa_restorer;
- 
-@@ -446,7 +446,7 @@ static int setup_rt_frame(int sig, struc
- 		goto give_sigsegv;
- 
- 	/* Set up to return from userspace.  */
--	restorer = &__kernel_rt_sigreturn;
-+	restorer = current->mm->context.vdso + (long)&__kernel_rt_sigreturn;
- 	if (ka->sa.sa_flags & SA_RESTORER)
- 		restorer = ka->sa.sa_restorer;
- 	err |= __put_user(restorer, &frame->pretcode);
 Index: linux/arch/i386/kernel/smp.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/smp.c
@@ -162,179 +111,6 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-diff -uNp linux-2.6.16.noarch/arch/i386/kernel/sysenter.c.orig linux-2.6.16.noarch/arch/i386/kernel/sysenter.c
---- linux-2.6.16.noarch/arch/i386/kernel/sysenter.c.orig	2006-04-25 14:25:11.000000000 +0200
-+++ linux-2.6.16.noarch/arch/i386/kernel/sysenter.c	2006-04-25 14:50:26.000000000 +0200
-@@ -14,7 +14,9 @@
- #include <linux/string.h>
- #include <linux/elf.h>
- #include <linux/mm.h>
-+#include <linux/mman.h>
- 
-+#include <asm/a.out.h>
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
- #include <asm/pgtable.h>
-@@ -52,11 +54,13 @@ void enable_sep_cpu(void)
-  */
- extern const char vsyscall_int80_start, vsyscall_int80_end;
- extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
--static void *syscall_page;
-+static struct page *sysenter_pages[2];
- 
- int __init sysenter_setup(void)
- {
--	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
-+	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
-+
-+	sysenter_pages[0] = virt_to_page(page);
- 
- #ifdef CONFIG_XEN
- 	if (boot_cpu_has(X86_FEATURE_SEP)) {
-@@ -71,73 +75,82 @@ int __init sysenter_setup(void)
- #endif
- 
- 	if (boot_cpu_has(X86_FEATURE_SEP)) {
--		memcpy(syscall_page,
-+		memcpy(page,
- 		       &vsyscall_sysenter_start,
- 		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
- 		return 0;
- 	}
- 
--	memcpy(syscall_page,
-+	memcpy(page,
- 	       &vsyscall_int80_start,
- 	       &vsyscall_int80_end - &vsyscall_int80_start);
- 
- 	return 0;
- }
- 
--static struct page*
--syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
--{
--	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
--	get_page(p);
--	return p;
--}
--
--/* Prevent VMA merging */
--static void syscall_vma_close(struct vm_area_struct *vma)
--{
--}
-+extern void SYSENTER_RETURN_OFFSET;
-+
-+unsigned int vdso_enabled = 1;
- 
--static struct vm_operations_struct syscall_vm_ops = {
--	.close = syscall_vma_close,
--	.nopage = syscall_nopage,
--};
--
--/* Setup a VMA at program startup for the vsyscall page */
--int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
--{
--	struct vm_area_struct *vma;
--	struct mm_struct *mm = current->mm;
--	int ret;
--
--	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
--	if (!vma)
--		return -ENOMEM;
--
--	memset(vma, 0, sizeof(struct vm_area_struct));
--	/* Could randomize here */
--	vma->vm_start = VSYSCALL_BASE;
--	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
--	/* MAYWRITE to allow gdb to COW and set breakpoints */
--	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
--	vma->vm_flags |= mm->def_flags;
--	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
--	vma->vm_ops = &syscall_vm_ops;
--	vma->vm_mm = mm;
--
--	down_write(&mm->mmap_sem);
--	if ((ret = insert_vm_struct(mm, vma))) {
--		up_write(&mm->mmap_sem);
--		kmem_cache_free(vm_area_cachep, vma);
--		return ret;
-+/*
-+ * This is called from binfmt_elf, we create the special vma for the
-+ * vDSO and insert it into the mm struct tree.
-+ */
-+int arch_setup_additional_pages(struct linux_binprm *bprm,
-+	int executable_stack, unsigned long start_code,
-+	unsigned long interp_map_address)
-+{
-+	struct thread_info *ti = current_thread_info();
-+	unsigned long addr = 0, len;
-+	unsigned flags = MAP_PRIVATE;
-+	int err;
-+
-+	current->mm->context.vdso = NULL;
-+	if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0]))
-+		return 0;
-+
-+	/*
-+	 * Map the vDSO (it will be randomized):
-+	 */
-+	down_write(&current->mm->mmap_sem);
-+	len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE;
-+	if (0==exec_shield) { /* off; %cs limit off */
-+		addr = STACK_TOP;  /* minimal interference with anybody */
-+		flags = MAP_PRIVATE | MAP_FIXED;
- 	}
--	mm->total_vm++;
--	up_write(&mm->mmap_sem);
--	return 0;
-+	else if ((3<<2) & exec_shield) { /* vdso just below .text */
-+		addr = (((2<<2) & exec_shield) && interp_map_address) ?
-+			interp_map_address : start_code;
-+		/* 1MB for vm86; 64K for vm86 himem */
-+		if ((0x110000 + len) <= addr) {
-+			addr = (PAGE_MASK & addr) - len;
-+		}
-+		else { /* start_code is too low */
-+			addr = 0;
-+		}
-+	}
-+	addr = get_unmapped_area_prot(NULL, addr, len, 0,
-+				      flags, PROT_READ | PROT_EXEC);
-+	if (unlikely(addr & ~PAGE_MASK)) {
-+		up_write(&current->mm->mmap_sem);
-+		return addr;
-+	}
-+	err = install_special_mapping(current->mm, addr, len,
-+				      VM_DONTEXPAND | VM_READ | VM_EXEC |
-+				      VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
-+				      PAGE_READONLY_EXEC,
-+				      sysenter_pages);
-+	if (likely(err == 0)) {
-+		current->mm->context.vdso = (void *)addr;
-+		ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr;
-+	}
-+	up_write(&current->mm->mmap_sem);
-+	return err;
- }
- 
--struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+int in_gate_area_no_task(unsigned long addr)
- {
--	return NULL;
-+	return 0;
- }
- 
- int in_gate_area(struct task_struct *task, unsigned long addr)
-@@ -145,7 +158,7 @@ int in_gate_area(struct task_struct *tas
- 	return 0;
- }
- 
--int in_gate_area_no_task(unsigned long addr)
-+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
- {
--	return 0;
-+	return NULL;
- }
 Index: linux/arch/i386/kernel/traps.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/traps.c
@@ -471,47 +247,6 @@
  	if (!fixup_exception(regs)) {
  		if (notify_die(DIE_GPF, "general protection fault", regs,
  				error_code, 13, SIGSEGV) == NOTIFY_STOP)
-Index: linux/arch/i386/kernel/vsyscall-sysenter.S
-===================================================================
---- linux.orig/arch/i386/kernel/vsyscall-sysenter.S
-+++ linux/arch/i386/kernel/vsyscall-sysenter.S
-@@ -39,11 +39,11 @@ __kernel_vsyscall:
- 	/* 7: align return point with nop's to make disassembly easier */
- 	.space 7,0x90
- 
--	/* 14: System call restart point is here! (SYSENTER_RETURN - 2) */
-+	/* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */
- 	jmp .Lenter_kernel
- 	/* 16: System call normal return point is here! */
--	.globl SYSENTER_RETURN	/* Symbol used by entry.S.  */
--SYSENTER_RETURN:
-+	.globl SYSENTER_RETURN_OFFSET	/* Symbol used by sysenter.c  */
-+SYSENTER_RETURN_OFFSET:
- 	pop %ebp
- .Lpop_ebp:
- 	pop %edx
-Index: linux/arch/i386/kernel/vsyscall.lds.S
-===================================================================
---- linux.orig/arch/i386/kernel/vsyscall.lds.S
-+++ linux/arch/i386/kernel/vsyscall.lds.S
-@@ -7,7 +7,7 @@
- 
- SECTIONS
- {
--  . = VSYSCALL_BASE + SIZEOF_HEADERS;
-+  . = SIZEOF_HEADERS;
- 
-   .hash           : { *(.hash) }		:text
-   .dynsym         : { *(.dynsym) }
-@@ -20,7 +20,7 @@ SECTIONS
-      For the layouts to match, we need to skip more than enough
-      space for the dynamic symbol table et al.  If this amount
-      is insufficient, ld -shared will barf.  Just increase it here.  */
--  . = VSYSCALL_BASE + 0x400;
-+  . = 0x400;
- 
-   .text           : { *(.text) }		:text =0x90909090
-   .note		  : { *(.note.*) }		:text :note
 Index: linux/arch/i386/mm/init.c
 ===================================================================
 --- linux.orig/arch/i386/mm/init.c
@@ -1273,33 +1008,6 @@
  			flags & VM_MAYSHARE ? 's' : 'p',
  			vma->vm_pgoff << PAGE_SHIFT,
  			MAJOR(dev), MINOR(dev), ino, &len);
-@@ -154,18 +170,22 @@ static int show_map_internal(struct seq_
- 		seq_path(m, file->f_vfsmnt, file->f_dentry, "\n");
- 	} else {
- 		if (mm) {
--			if (vma->vm_start <= mm->start_brk &&
--						vma->vm_end >= mm->brk) {
-+			if (vma->vm_end == mm->brk) {
- 				pad_len_spaces(m, len);
- 				seq_puts(m, "[heap]");
--			} else {
--				if (vma->vm_start <= mm->start_stack &&
-+			} else if (vma->vm_start <= mm->start_stack &&
- 					vma->vm_end >= mm->start_stack) {
- 
- 					pad_len_spaces(m, len);
- 					seq_puts(m, "[stack]");
- 				}
-+#ifdef __i386__
-+			else if (vma->vm_start ==
-+				(unsigned long)mm->context.vdso) {
-+				pad_len_spaces(m, len);
-+				seq_puts(m, "[vdso]");
- 			}
-+#endif
- 		} else {
- 			pad_len_spaces(m, len);
- 			seq_puts(m, "[vdso]");
 Index: linux/include/asm-i386/a.out.h
 ===================================================================
 --- linux.orig/include/asm-i386/a.out.h
@@ -1338,113 +1046,32 @@
  #endif /* !__ASSEMBLY__ */
  
  #endif
-Index: linux/include/asm-i386/elf.h
-===================================================================
---- linux.orig/include/asm-i386/elf.h
-+++ linux/include/asm-i386/elf.h
-@@ -10,6 +10,7 @@
- #include <asm/processor.h>
- #include <asm/system.h>		/* for savesegment */
- #include <asm/auxvec.h>
-+#include <asm/desc.h>
+--- linux-2.6.17.noarch/include/asm-i386/elf.h~	2006-06-29 00:53:28.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/elf.h	2006-06-29 00:54:04.000000000 -0400
+@@ -157,7 +157,8 @@ extern void __kernel_vsyscall;
+ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
+ struct linux_binprm;
+ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+-                                       int executable_stack);
++                                       int executable_stack, unsigned long start_code,
++                                       unsigned long interp_map_address);
  
- #include <linux/utsname.h>
+ extern unsigned int vdso_enabled;
  
-@@ -129,17 +130,31 @@ extern int dump_task_extended_fpu (struc
- #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
- #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
- 
--#define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
--#define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
--#define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
- extern void __kernel_vsyscall;
-+#define VSYSCALL_BASE	((unsigned long)current->mm->context.vdso)
-+#define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
-+#define VSYSCALL_OFFSET	((unsigned long) &__kernel_vsyscall)
-+#define VSYSCALL_ENTRY	(VSYSCALL_BASE + VSYSCALL_OFFSET)
- 
--#define ARCH_DLINFO						\
--do {								\
--		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);	\
--		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE);	\
-+/* kernel-internal fixmap address: */
-+#define __VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
-+#define __VSYSCALL_EHDR	((const struct elfhdr *) __VSYSCALL_BASE)
-+
-+#define ARCH_DLINFO							\
-+do {									\
-+	if (VSYSCALL_BASE) {						\
-+		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);		\
-+		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE);		\
-+	}								\
- } while (0)
- 
-+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-+struct linux_binprm;
-+extern int arch_setup_additional_pages(struct linux_binprm *bprm,
-+	int executable_stack, unsigned long start_code,
-+	unsigned long interp_map_address);
-+
-+#if 0	/* Disabled for exec-shield, where a normal vma holds the vDSO.  */
- /*
-  * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
-  * extra segments containing the vsyscall DSO contents.  Dumping its
-@@ -148,15 +163,15 @@ do {								\
-  * Dumping its extra ELF program headers includes all the other information
-  * a debugger needs to easily find how the vsyscall DSO was being used.
-  */
--#define ELF_CORE_EXTRA_PHDRS		(VSYSCALL_EHDR->e_phnum)
-+#define ELF_CORE_EXTRA_PHDRS		(__VSYSCALL_EHDR->e_phnum)
- #define ELF_CORE_WRITE_EXTRA_PHDRS					      \
- do {									      \
- 	const struct elf_phdr *const vsyscall_phdrs =			      \
--		(const struct elf_phdr *) (VSYSCALL_BASE		      \
--					   + VSYSCALL_EHDR->e_phoff);	      \
-+		(const struct elf_phdr *) (__VSYSCALL_BASE		      \
-+					   + __VSYSCALL_EHDR->e_phoff);	      \
- 	int i;								      \
- 	Elf32_Off ofs = 0;						      \
--	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
-+	for (i = 0; i < __VSYSCALL_EHDR->e_phnum; ++i) {		      \
- 		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
- 		if (phdr.p_type == PT_LOAD) {				      \
- 			BUG_ON(ofs != 0);				      \
-@@ -174,16 +189,23 @@ do {									      \
- #define ELF_CORE_WRITE_EXTRA_DATA					      \
- do {									      \
- 	const struct elf_phdr *const vsyscall_phdrs =			      \
--		(const struct elf_phdr *) (VSYSCALL_BASE		      \
--					   + VSYSCALL_EHDR->e_phoff);	      \
-+		(const struct elf_phdr *) (__VSYSCALL_BASE		      \
-+					   + __VSYSCALL_EHDR->e_phoff);	      \
- 	int i;								      \
--	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
-+	for (i = 0; i < __VSYSCALL_EHDR->e_phnum; ++i) {		      \
- 		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
- 			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
- 				   PAGE_ALIGN(vsyscall_phdrs[i].p_memsz));    \
- 	}								      \
- } while (0)
-+#endif
+@@ -213,4 +213,8 @@ do {									      \
  
  #endif
- 
++
 +#define __HAVE_ARCH_RANDOMIZE_BRK
 +extern void randomize_brk(unsigned long old_brk);
 +
-+#define __HAVE_ARCH_VSYSCALL
-+extern void map_vsyscall(void);
-+
  #endif
-Index: linux/include/asm-i386/mmu.h
-===================================================================
---- linux.orig/include/asm-i386/mmu.h
-+++ linux/include/asm-i386/mmu.h
-@@ -7,11 +7,17 @@
+--- linux-2.6.17.noarch/include/asm-i386/mmu.h~	2006-06-29 00:54:50.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/mmu.h	2006-06-29 00:55:22.000000000 -0400
+@@ -7,11 +7,15 @@
   * we put the segment information here.
   *
   * cpu_vm_mask is used to optimize ldt flushing.
-+ *
 + * exec_limit is used to track the range PROT_EXEC
 + * mappings span.
   */
@@ -1454,10 +1081,9 @@
  	void *ldt;
 +	struct desc_struct user_cs;
 +	unsigned long exec_limit;
-+	void *vdso;
+ 	void *vdso;
  } mm_context_t;
  
- #endif
 Index: linux/include/asm-i386/page.h
 ===================================================================
 --- linux.orig/include/asm-i386/page.h
@@ -1512,18 +1138,6 @@
  } while (0)
  
  /*
-Index: linux/include/asm-i386/thread_info.h
-===================================================================
---- linux.orig/include/asm-i386/thread_info.h
-+++ linux/include/asm-i386/thread_info.h
-@@ -38,6 +38,7 @@ struct thread_info {
- 					 	   0-0xBFFFFFFF for user-thead
- 						   0-0xFFFFFFFF for kernel-thread
- 						*/
-+	void			*sysenter_return;
- 	struct restart_block    restart_block;
- 
- 	unsigned long           previous_esp;   /* ESP of the previous stack in case
 Index: linux/include/asm-ia64/pgalloc.h
 ===================================================================
 --- linux.orig/include/asm-ia64/pgalloc.h
@@ -1697,15 +1311,15 @@
 ===================================================================
 --- linux.orig/include/linux/sched.h
 +++ linux/include/linux/sched.h
-@@ -39,6 +39,8 @@
- #include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
+@@ -85,6 +85,8 @@ struct sched_param {
  
  struct exec_domain;
+ struct futex_pi_state;
 +extern int exec_shield;
 +extern int print_fatal_signals;
  
  /*
-  * cloning flags:
+  * List of flags we want to share for kernel threads,
 @@ -245,6 +247,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
@@ -2240,3 +1854,15 @@
  #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b);
  
  /*
+--- linux-2.6.17.noarch/arch/i386/kernel/sysenter.c~	2006-06-29 03:10:22.000000000 -0400
++++ linux-2.6.17.noarch/arch/i386/kernel/sysenter.c	2006-06-29 03:11:25.000000000 -0400
+@@ -118,7 +118,8 @@ static struct vm_operations_struct sysca
+ extern void SYSENTER_RETURN;
+ 
+ /* Setup a VMA at program startup for the vsyscall page */
+-int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
++int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack,
++				unsigned long start_code, unsigned long interp_map_address)
+ {
+ 	struct vm_area_struct *vma;
+ 	struct mm_struct *mm = current->mm;


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- upstream	29 Jun 2006 01:41:28 -0000	1.378
+++ upstream	29 Jun 2006 08:27:51 -0000	1.379
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git12.bz2
+patch-2.6.17-git13.bz2


--- linux-2.6-mtd-git.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:30:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:30:48 -0400
Subject: rpms/kernel/devel .cvsignore,1.467,1.468 sources,1.411,1.412
Message-ID: <200606290830.k5T8Umof023002@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22963

Modified Files:
	.cvsignore sources 
Log Message:
upload



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- .cvsignore	27 Jun 2006 23:39:20 -0000	1.467
+++ .cvsignore	29 Jun 2006 08:30:45 -0000	1.468
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git12.bz2
+patch-2.6.17-git13.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- sources	27 Jun 2006 23:39:20 -0000	1.411
+++ sources	29 Jun 2006 08:30:45 -0000	1.412
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-9cd372332e0b14da8057e3425e64e300  patch-2.6.17-git12.bz2
+efb60adb7dd3076d3dbb9592f66e60be  patch-2.6.17-git13.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:32:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:32:18 -0400
Subject: rpms/wget/devel wget-1.11-de.po,NONE,1.1
Message-ID: <200606290832.k5T8WIUU023368@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23340

Added Files:
	wget-1.11-de.po 
Log Message:
- updated german translations from Robert Scheck


--- NEW FILE wget-1.11-de.po ---
# German messages for GNU Wget.
# Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
# Karl Eichwalder <ke at suse.de>, 1998-1999, 2000.
# Karl Eichwalder <ke at ke.Central.DE>, 1997-1998.
# Jochen Hein <jochen at jochen.org>, 2001-1003.
# Robert Scheck <wget at robert-scheck.de>, 2005-2006.
#
msgid ""
msgstr ""
"Project-Id-Version: wget 1.11\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-29 01:08+0200\n"
"PO-Revision-Date: 2006-06-29 01:23+0200\n"
"Last-Translator: Robert Scheck <wget at robert-scheck.de>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"

#: src/connect.c:196
#, c-format
msgid "%s: unable to resolve bind address `%s'; disabling bind.\n"
msgstr ""
"%s: Konnte ?gebundene? Adresse ?%s? nicht aufl?sen; deaktiviere Bindung.\n"

#: src/connect.c:268
#, c-format
msgid "Connecting to %s|%s|:%d... "
msgstr "Verbindungsaufbau mit %s[%s]:%d... "

#: src/connect.c:271
#, c-format
msgid "Connecting to %s:%d... "
msgstr "Verbindungsaufbau mit [%s]:%d... "

#: src/connect.c:331
msgid "connected.\n"
msgstr "verbunden.\n"

#: src/connect.c:343 src/host.c:753 src/host.c:782
#, c-format
msgid "failed: %s.\n"
msgstr "fehlgeschlagen: %s.\n"

#: src/convert.c:173
#, c-format
msgid "Converted %d files in %s seconds.\n"
msgstr "Habe %d Dateien in %s Sekunden konvertiert.\n"

#: src/convert.c:198
#, c-format
msgid "Converting %s... "
msgstr "Umwandlung von ?%s?... "

#: src/convert.c:211
msgid "nothing to do.\n"
msgstr "kein Download notwendig.\n"

#: src/convert.c:219 src/convert.c:243
#, c-format
msgid "Cannot convert links in %s: %s\n"
msgstr "Verweise nicht umwandelbar in ?%s?: %s\n"

#: src/convert.c:234
#, c-format
msgid "Unable to delete `%s': %s\n"
msgstr "Konnte ?%s? nicht l?schen: %s\n"

#: src/convert.c:443
#, c-format
msgid "Cannot back up %s as %s: %s\n"
msgstr "Anlegen eines Backups von ?%s? als ?%s? nicht m?glich: %s\n"

#: src/convert.c:1036
msgid ""
"Found no broken links.\n"
"\n"
msgstr ""
"Keine defekten Verweise gefunden.\n"
"\n"

#: src/convert.c:1045
#, c-format
msgid ""
"Found %d broken links.\n"
"\n"
msgstr ""
"%d defekte Verweise gefunden.\n"
"\n"

#: src/convert.c:1050
msgid ""
"Found 1 broken link.\n"
"\n"
msgstr ""
"1 defekten Verweis gefunden.\n"
"\n"

#: src/convert.c:1059
#, c-format
msgid "%s referred by:\n"
msgstr "%s genannt von:\n"

#: src/convert.c:1065
#, c-format
msgid "    %s\n"
msgstr "    %s\n"

#: src/cookies.c:445
#, c-format
msgid "Syntax error in Set-Cookie: %s at position %d.\n"
msgstr "Syntaxfehler bei Set-Cookie: ?%s? an der Stelle %d.\n"

#: src/cookies.c:687
#, c-format
msgid "Cookie coming from %s attempted to set domain to %s\n"
msgstr "Cookie von ?%s? versucht von der Domain ?%s? zu sein\n"

#: src/cookies.c:1134 src/cookies.c:1252
#, c-format
msgid "Cannot open cookies file `%s': %s\n"
msgstr "Kann Cookie-Datei ?%s? nicht ?ffnen: %s\n"

#: src/cookies.c:1289
#, c-format
msgid "Error writing to `%s': %s\n"
msgstr "Fehler beim Schreiben nach ?%s?: %s.\n"

#: src/cookies.c:1292
#, c-format
msgid "Error closing `%s': %s\n"
msgstr "Fehler beim Schlie?en von ?%s?: %s.\n"

#: src/ftp-ls.c:837
msgid "Unsupported listing type, trying Unix listing parser.\n"
msgstr ""
"Nicht unterst?tzte Art der Auflistung; versuche Unix-Auflistung zu "
"verwenden.\n"

#: src/ftp-ls.c:883 src/ftp-ls.c:885
#, c-format
msgid "Index of /%s on %s:%d"
msgstr "Index von /%s auf %s:%d"

#: src/ftp-ls.c:908
#, c-format
msgid "time unknown       "
msgstr "Zeit unbekannt     "

#: src/ftp-ls.c:912
#, c-format
msgid "File        "
msgstr "Datei       "

#: src/ftp-ls.c:915
#, c-format
msgid "Directory   "
msgstr "Verzeichnis "

#: src/ftp-ls.c:918
#, c-format
msgid "Link        "
msgstr "Verweis     "

#: src/ftp-ls.c:921
#, c-format
msgid "Not sure    "
msgstr "Nicht sicher"

#: src/ftp-ls.c:939
#, c-format
msgid " (%s bytes)"
msgstr " (%s Bytes)"

#: src/ftp.c:209
#, c-format
msgid "Length: %s"
msgstr "L?nge: %s"

#: src/ftp.c:215 src/http.c:2100
#, c-format
msgid ", %s (%s) remaining"
msgstr ", %s (%s) verbleibend"

#: src/ftp.c:219 src/http.c:2104
#, c-format
msgid ", %s remaining"
msgstr ", %s verbleibend"

#: src/ftp.c:222
msgid " (unauthoritative)\n"
msgstr " (unma?geblich)\n"

#. Second: Login with proper USER/PASS sequence.
#: src/ftp.c:298
#, c-format
msgid "Logging in as %s ... "
msgstr "Anmelden als %s ... "

#: src/ftp.c:311 src/ftp.c:357 src/ftp.c:386 src/ftp.c:438 src/ftp.c:550
#: src/ftp.c:596 src/ftp.c:625 src/ftp.c:682 src/ftp.c:743 src/ftp.c:803
#: src/ftp.c:850
msgid "Error in server response, closing control connection.\n"
msgstr "Fehler in der Server-Antwort, schlie?e Kontroll-Verbindung.\n"

#: src/ftp.c:318
msgid "Error in server greeting.\n"
msgstr "Fehler bei der Begr??ung des Servers.\n"

#: src/ftp.c:325 src/ftp.c:446 src/ftp.c:558 src/ftp.c:633 src/ftp.c:692
#: src/ftp.c:753 src/ftp.c:813 src/ftp.c:860
msgid "Write failed, closing control connection.\n"
msgstr "Schreiben fehlgeschlagen, schlie?e Kontroll-Verbindung.\n"

#: src/ftp.c:331
msgid "The server refuses login.\n"
msgstr "Der Server verweigert die Anmeldung.\n"

#: src/ftp.c:337
msgid "Login incorrect.\n"
msgstr "Fehler bei der Anmeldung.\n"

#: src/ftp.c:343
msgid "Logged in!\n"
msgstr "angemeldet!\n"

#: src/ftp.c:365
msgid "Server error, can't determine system type.\n"
msgstr "Server-Fehler, konnte die Art des Systems nicht feststellen.\n"

#: src/ftp.c:374 src/ftp.c:669 src/ftp.c:726 src/ftp.c:769
msgid "done.    "
msgstr "fertig.    "

#: src/ftp.c:426 src/ftp.c:575 src/ftp.c:608 src/ftp.c:833 src/ftp.c:879
msgid "done.\n"
msgstr "fertig.\n"

#: src/ftp.c:453
#, c-format
msgid "Unknown type `%c', closing control connection.\n"
msgstr "Unbekannte Art ?%c?, schlie?e Kontroll-Verbindung.\n"

#: src/ftp.c:465
msgid "done.  "
msgstr "fertig.  "

#: src/ftp.c:471
msgid "==> CWD not needed.\n"
msgstr "==> CWD nicht notwendig.\n"

#: src/ftp.c:564
#, c-format
msgid ""
"No such directory `%s'.\n"
"\n"
msgstr ""
"Das Verzeichnis ?%s? gibt es nicht.\n"
"\n"

#. do not CWD
#: src/ftp.c:579
msgid "==> CWD not required.\n"
msgstr "==> CWD nicht erforderlich.\n"

#: src/ftp.c:639
msgid "Cannot initiate PASV transfer.\n"
msgstr "Kann PASV-?bertragung nicht beginnen.\n"

#: src/ftp.c:643
msgid "Cannot parse PASV response.\n"
msgstr "Kann PASV-Antwort nicht auswerten.\n"

#: src/ftp.c:660
#, c-format
msgid "couldn't connect to %s port %d: %s\n"
msgstr "Konnte keine Verbindung zu ?%s:%d? herstellen: %s\n"

#: src/ftp.c:708
#, c-format
msgid "Bind error (%s).\n"
msgstr "Verbindungsfehler (%s).\n"

#: src/ftp.c:714
msgid "Invalid PORT.\n"
msgstr "Ung?ltiger PORT.\n"

#: src/ftp.c:760
msgid ""
"\n"
"REST failed, starting from scratch.\n"
msgstr ""
"\n"
"REST fehlgeschlagen, beginne von vorne.\n"

#: src/ftp.c:821
#, c-format
msgid ""
"No such file `%s'.\n"
"\n"
msgstr ""
"Die Datei ?%s? gibt es nicht.\n"
"\n"

#: src/ftp.c:868
#, c-format
msgid ""
"No such file or directory `%s'.\n"
"\n"
msgstr ""
"Die Datei oder das Verzeichnis ?%s? gibt es nicht.\n"
"\n"

#. We cannot just invent a new name and use it (which is
#. what functions like unique_create typically do)
#. because we told the user we'd use this name.
#. Instead, return and retry the download.
#: src/ftp.c:930 src/http.c:2162
#, c-format
msgid "%s has sprung into existence.\n"
msgstr "%s wurde existent.\n"

#: src/ftp.c:982
#, c-format
msgid "%s: %s, closing control connection.\n"
msgstr "%s: %s; schlie?e Kontroll-Verbindung.\n"

#: src/ftp.c:991
#, c-format
msgid "%s (%s) - Data connection: %s; "
msgstr "%s (%s) - Daten-Verbindung: %s; "

#: src/ftp.c:1006
msgid "Control connection closed.\n"
msgstr "Kontroll-Verbindung geschlossen.\n"

#: src/ftp.c:1024
msgid "Data transfer aborted.\n"
msgstr "Daten-?bertragung abgebrochen.\n"

#: src/ftp.c:1092
#, c-format
msgid "File `%s' already there; not retrieving.\n"
msgstr "Die Datei ?%s? ist bereits vorhanden, kein erneuter Download.\n"

#: src/ftp.c:1160 src/http.c:2293
#, c-format
msgid "(try:%2d)"
msgstr "(Versuch:%2d)"

#: src/ftp.c:1230 src/http.c:2554
#, c-format
msgid ""
"%s (%s) - `%s' saved [%s]\n"
"\n"
msgstr ""
"%s (%s) - ?%s? gespeichert [%s]\n"
"\n"

#: src/ftp.c:1272 src/main.c:966 src/recur.c:363 src/retr.c:866
#, c-format
msgid "Removing %s.\n"
msgstr "Entferne ?%s?.\n"

#: src/ftp.c:1314
#, c-format
msgid "Using `%s' as listing tmp file.\n"
msgstr "Benutze ?%s? als tempor?re Auflistungsdatei.\n"

#: src/ftp.c:1329
#, c-format
msgid "Removed `%s'.\n"
msgstr "?%s? gel?scht.\n"

#: src/ftp.c:1362
#, c-format
msgid "Recursion depth %d exceeded max. depth %d.\n"
msgstr "Die Rekursionstiefe %d ?bersteigt die max. erlaubte Tiefe %d.\n"

#. Remote file is older, file sizes can be compared and
#. are both equal.
#: src/ftp.c:1432
#, c-format
msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
msgstr ""
"Datei auf dem Server nicht neuer als die lokale Datei ?%s? -- kein "
"Download.\n"

#. Remote file is newer or sizes cannot be matched
#: src/ftp.c:1439
#, c-format
msgid ""
"Remote file is newer than local file `%s' -- retrieving.\n"
"\n"
msgstr ""
"Datei auf dem Server neuer als die lokale Datei ?%s?, -- erneuter Download.\n"

#. Sizes do not match
#: src/ftp.c:1446
#, c-format
msgid ""
"The sizes do not match (local %s) -- retrieving.\n"
"\n"
msgstr ""
"Gr??en stimmen nicht ?berein (lokal %s) -- erneuter Download.\n"
"\n"

#: src/ftp.c:1464
msgid "Invalid name of the symlink, skipping.\n"
msgstr "Ung?ltiger Name f?r einen symbolischen Verweis, ?berspringe.\n"

#: src/ftp.c:1481
#, c-format
msgid ""
"Already have correct symlink %s -> %s\n"
"\n"
msgstr "Der richtige symbolische Verweis %s -> %s ist schon vorhanden.\n"

#: src/ftp.c:1489
#, c-format
msgid "Creating symlink %s -> %s\n"
msgstr "Symbolischen Verweis %s -> %s anlegen.\n"

#: src/ftp.c:1499
#, c-format
msgid "Symlinks not supported, skipping symlink `%s'.\n"
msgstr ""
"Symbolischer Verweis nicht unterst?tzt, ?berspringe symbolischen Verweis ?%"
"s?.\n"

#: src/ftp.c:1511
#, c-format
msgid "Skipping directory `%s'.\n"
msgstr "?berspringe Verzeichnis ?%s?.\n"

#: src/ftp.c:1520
#, c-format
msgid "%s: unknown/unsupported file type.\n"
msgstr "%s: unbekannter bzw. nicht unterst?tzter Dateityp.\n"

#: src/ftp.c:1547
#, c-format
msgid "%s: corrupt time-stamp.\n"
msgstr "%s: besch?digter Zeitstempel.\n"

#: src/ftp.c:1575
#, c-format
msgid "Will not retrieve dirs since depth is %d (max %d).\n"
msgstr ""
"Verzeichnisse nicht erneut holen, da die Tiefe bereits %d ist (max. %d "
"erlaubt).\n"

#: src/ftp.c:1625
#, c-format
msgid "Not descending to `%s' as it is excluded/not-included.\n"
msgstr ""
"Nicht zu ?%s? hinabsteigen, da es ausgeschlossen bzw. nicht eingeschlossen "
"ist.\n"

#: src/ftp.c:1691 src/ftp.c:1705
#, c-format
msgid "Rejecting `%s'.\n"
msgstr "Weise ?%s? zur?ck.\n"

#. No luck.
#. #### This message SUCKS.  We should see what was the
#. reason that nothing was retrieved.
#: src/ftp.c:1753
#, c-format
msgid "No matches on pattern `%s'.\n"
msgstr "Keine Treffer bei dem Muster ?%s?.\n"

#: src/ftp.c:1819
#, c-format
msgid "Wrote HTML-ized index to `%s' [%s].\n"
msgstr "HTML-artigen Index nach ?%s? [%s] geschrieben.\n"

#: src/ftp.c:1824
#, c-format
msgid "Wrote HTML-ized index to `%s'.\n"
msgstr "HTML-artigen Index nach ?%s? geschrieben.\n"

#: src/getopt.c:671
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: Option ?%s? ist mehrdeutig\n"

#: src/getopt.c:696
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: Option ?--%s? erlaubt kein Argument\n"

#: src/getopt.c:701
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: Option ?%c%s? erlaubt kein Argument\n"

#: src/getopt.c:719 src/getopt.c:892
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: Option ?%s? ben?tigt ein Argument\n"

#. --option
#: src/getopt.c:748
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: nicht erkannte Option ?--%s?\n"

#. +option or -option
#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: nicht erkannte Option ?%c%s?\n"

#. 1003.2 specifies the format of this message.
#: src/getopt.c:778
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ung?ltige Option -- %c\n"

#: src/getopt.c:781
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ung?ltige Option -- %c\n"

#. 1003.2 specifies the format of this message.
#: src/getopt.c:811 src/getopt.c:941
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: Option verlangt ein Argument -- %c\n"

#: src/getopt.c:858
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: Option ?-W %s? ist mehrdeutig\n"

#: src/getopt.c:876
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: Option ?-W %s? erlaubt kein Argument\n"

#: src/host.c:348
msgid "Unknown host"
msgstr "Unbekannter Rechnername"

#. Message modeled after what gai_strerror returns in similar
#. circumstances.
#: src/host.c:352
msgid "Temporary failure in name resolution"
msgstr "Vor?bergehender Fehler bei der Namensaufl?sung"

#: src/host.c:354
msgid "Unknown error"
msgstr "Unbekannter Fehler"

#: src/host.c:715
#, c-format
msgid "Resolving %s... "
msgstr "Aufl?sen des Rechnernamens ?%s?.... "

#: src/host.c:762
msgid "failed: No IPv4/IPv6 addresses for host.\n"
msgstr ""
"fehlgeschlagen: Keine IPv4-/IPv6-Adresse f?r den Rechnernamen gefunden.\n"

#: src/host.c:785
msgid "failed: timed out.\n"
msgstr "fehlgeschlagen: Wartezeit abgelaufen.\n"

#: src/html-url.c:289
#, c-format
msgid "%s: Cannot resolve incomplete link %s.\n"
msgstr "%s: Der unvollst?ndige Link ?%s? kann nicht aufgel?st werden.\n"

#: src/html-url.c:696
#, c-format
msgid "%s: Invalid URL %s: %s\n"
msgstr "%s: Ung?ltige URL %s: %s\n"

#: src/http.c:358
#, c-format
msgid "Failed writing HTTP request: %s.\n"
msgstr "Fehler beim Schreiben der HTTP-Anfrage: %s.\n"

#: src/http.c:683
msgid "No headers, assuming HTTP/0.9"
msgstr "Keine Header, nehme HTTP/0.9 an"

#: src/http.c:1332
msgid "Disabling SSL due to encountered errors.\n"
msgstr "Deaktiviere SSL durch aufgetretene Fehler.\n"

#: src/http.c:1503
#, c-format
msgid "POST data file `%s' missing: %s\n"
msgstr "Datei ?%s? mit den POST-Daten fehlt: %s\n"

#: src/http.c:1552
#, c-format
msgid "Reusing existing connection to %s:%d.\n"
msgstr "Weiterverwendung der Verbindung zu %s:%d.\n"

#: src/http.c:1621
#, c-format
msgid "Failed reading proxy response: %s\n"
msgstr "Fehler beim Lesen der Proxy-Antwort: %s\n"

#: src/http.c:1641
#, c-format
msgid "Proxy tunneling failed: %s"
msgstr "?Proxy-Tunneling? fehlgeschlagen: %s"

#: src/http.c:1686
#, c-format
msgid "%s request sent, awaiting response... "
msgstr "%s-Anfrage gesendet, warte auf Antwort... "

#: src/http.c:1697
msgid "No data received.\n"
msgstr "Keine Daten erhalten.\n"

#: src/http.c:1704
#, c-format
msgid "Read error (%s) in headers.\n"
msgstr "Lesefehler (%s) beim Header.\n"

#. If opt.noclobber is turned on and file already exists, do not
#. retrieve the file
#: src/http.c:1753
#, c-format
msgid ""
"File `%s' already there; not retrieving.\n"
"\n"
msgstr ""
"Die Datei ?%s? ist bereits vorhanden, kein erneuter Download.\n"
"\n"

#. If the authentication header is missing or
#. unrecognized, there's no sense in retrying.
#: src/http.c:1897
msgid "Unknown authentication scheme.\n"
msgstr "Unbekanntes Authentifizierungsschema.\n"

#: src/http.c:1921
msgid "Authorization failed.\n"
msgstr "Authorisierung fehlgeschlagen.\n"

#: src/http.c:1935
msgid "Malformed status line"
msgstr "Missgebildete Statuszeile"

#: src/http.c:1937
msgid "(no description)"
msgstr "(keine Beschreibung)"

#: src/http.c:2000
#, c-format
msgid "Location: %s%s\n"
msgstr "Platz: %s%s\n"

#: src/http.c:2001 src/http.c:2110
msgid "unspecified"
msgstr "nicht spezifiziert"

#: src/http.c:2002
msgid " [following]"
msgstr " [folge]"

#. If `-c' is in use and the file has been fully downloaded (or
#. the remote file has shrunk), Wget effectively requests bytes
#. after the end of file and the server response with 416.
#: src/http.c:2060
msgid ""
"\n"
"    The file is already fully retrieved; nothing to do.\n"
"\n"
msgstr ""
"\n"
"    Download der Datei schon vollst?ndig; kein Download notwendig.\n"
"\n"

#. No need to print this output if the body won't be
#. downloaded at all, or if the original server response is
#. printed.
#: src/http.c:2090
msgid "Length: "
msgstr "L?nge: "

#: src/http.c:2110
msgid "ignored"
msgstr "?bergangen"

#: src/http.c:2181
#, c-format
msgid "Saving to: `%s'\n"
msgstr "Speichere nach: ?%s?\n"

#: src/http.c:2260
msgid "Warning: wildcards not supported in HTTP.\n"
msgstr "Warnung: Joker-Zeichen werden bei HTTP nicht unterst?tzt.\n"

#: src/http.c:2366
#, c-format
msgid "Cannot write to `%s' (%s).\n"
msgstr "Kann nicht nach ?%s? schreiben (%s).\n"

#. Another fatal error.
#: src/http.c:2375
msgid "Unable to establish SSL connection.\n"
msgstr "Es konnte keine SSL-Verbindung hergestellt werden.\n"

#: src/http.c:2383
#, c-format
msgid "ERROR: Redirection (%d) without location.\n"
msgstr "FEHLER: Umleitung (%d) ohne Ziel.\n"

#: src/http.c:2418
#, c-format
msgid "%s ERROR %d: %s.\n"
msgstr "%s FEHLER %d: %s.\n"

#: src/http.c:2431
msgid "Last-modified header missing -- time-stamps turned off.\n"
msgstr "?Last-modified?-Header fehlt -- Zeitstempel abgeschaltet.\n"

#: src/http.c:2439
msgid "Last-modified header invalid -- time-stamp ignored.\n"
msgstr "?Last-modified?-Header ung?ltig -- Zeitstempel ignoriert.\n"

#: src/http.c:2462
#, c-format
msgid ""
"Server file no newer than local file `%s' -- not retrieving.\n"
"\n"
msgstr ""
"Datei auf dem Server nicht neuer als die lokale Datei ?%s? -- kein "
"Download.\n"
"\n"

#: src/http.c:2470
#, c-format
msgid "The sizes do not match (local %s) -- retrieving.\n"
msgstr "Gr??en stimmen nicht ?berein (lokal %s) -- erneuter Download.\n"

#: src/http.c:2477
msgid "Remote file is newer, retrieving.\n"
msgstr "Datei der Gegenseite ist neuer, erneuter Download.\n"

#: src/http.c:2523
#, c-format
msgid ""
"%s (%s) - `%s' saved [%s/%s]\n"
"\n"
msgstr ""
"%s (%s) - ?%s? gespeichert [%s/%s]\n"
"\n"

#: src/http.c:2578
#, c-format
msgid "%s (%s) - Connection closed at byte %s. "
msgstr "%s (%s) - Verbindung bei Byte %s geschlossen. "

#: src/http.c:2593
#, c-format
msgid "%s (%s) - Read error at byte %s (%s)."
msgstr "%s (%s) - Lesefehler bei Byte %s (%s)."

#: src/http.c:2602
#, c-format
msgid "%s (%s) - Read error at byte %s/%s (%s). "
msgstr "%s (%s) - Lesefehler bei Byte %s/%s (%s). "

#: src/init.c:369
#, c-format
msgid "%s: WGETRC points to %s, which doesn't exist.\n"
msgstr "%s: WGETRC zeigt auf die Datei ?%s?, die nicht existiert.\n"

#: src/init.c:432 src/netrc.c:268
#, c-format
msgid "%s: Cannot read %s (%s).\n"
msgstr "%s: ?%s? nicht lesbar (%s).\n"

#: src/init.c:450
#, c-format
msgid "%s: Error in %s at line %d.\n"
msgstr "%s: Fehler in ?%s? bei Zeile %d.\n"

#: src/init.c:456
#, c-format
msgid "%s: Syntax error in %s at line %d.\n"
msgstr "%s: Syntaxfehler in ?%s? bei Zeile %d.\n"

#: src/init.c:461
#, c-format
msgid "%s: Unknown command `%s' in %s at line %d.\n"
msgstr "%s: Unbekannter Befehl ?%s? bei Zeile %d.\n"

#: src/init.c:506
#, c-format
msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n"
msgstr ""
"%s: Warnung: ?wgetrc? des Systems und des Benutzers zeigen nach ?%s?.\n"

#: src/init.c:659
#, c-format
msgid "%s: Invalid --execute command `%s'\n"
msgstr "%s: Ung?ltiges ?--execute?-Kommando ?%s?\n"

#: src/init.c:704
#, c-format
msgid "%s: %s: Invalid boolean `%s'; use `on' or `off'.\n"
msgstr "%s: %s: Ung?ltiger Schalter ?%s?, bitte ?on? oder ?off? angeben.\n"

#: src/init.c:721
#, c-format
msgid "%s: %s: Invalid number `%s'.\n"
msgstr "%s: %s: Ung?ltige Nummer ?%s?\n"

#: src/init.c:952 src/init.c:971
#, c-format
msgid "%s: %s: Invalid byte value `%s'\n"
msgstr "%s: %s: Ung?ltiger Byte-Wert ?%s.?\n"

#: src/init.c:996
#, c-format
msgid "%s: %s: Invalid time period `%s'\n"
msgstr "%s: %s: Ung?ltige Zeitperiode ?%s?\n"

#: src/init.c:1050 src/init.c:1140 src/init.c:1242 src/init.c:1267
#, c-format
msgid "%s: %s: Invalid value `%s'.\n"
msgstr "%s: %s: Ung?ltiger Wert ?%s?.\n"

#: src/init.c:1087
#, c-format
msgid "%s: %s: Invalid header `%s'.\n"
msgstr "%s: %s: Ung?ltiger Header ?%s?\n"

#: src/init.c:1152
#, c-format
msgid "%s: %s: Invalid progress type `%s'.\n"
msgstr "%s: %s: Ung?ltiger Fortschrittstyp ?%s.?\n"

#: src/init.c:1211
#, c-format
msgid ""
"%s: %s: Invalid restriction `%s', use [unix|windows],[lowercase|uppercase],"
"[nocontrol].\n"
msgstr ""
"%s: %s: Ung?ltige Einschr?nkung ?%s?, verwenden Sie [unix|windows],"
"[lowercase|uppercase],[nocontrol].\n"

#: src/log.c:784
#, c-format
msgid ""
"\n"
"%s received, redirecting output to `%s'.\n"
msgstr ""
"\n"
"%s erhalten, Ausgabe wird nach ?%s? umgeleitet.\n"

#. Eek!  Opening the alternate log file has failed.  Nothing we
#. can do but disable printing completely.
#: src/log.c:794
#, c-format
msgid ""
"\n"
"%s received.\n"
msgstr ""
"\n"
"%s erhalten.\n"

#: src/log.c:795
#, c-format
msgid "%s: %s; disabling logging.\n"
msgstr "%s: %s; Protokoll wird ausgeschaltet.\n"

#: src/main.c:351
#, c-format
msgid "Usage: %s [OPTION]... [URL]...\n"
msgstr "Syntax: %s [OPTION]... [URL]...\n"

#: src/main.c:363
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"\n"
msgstr ""
"Erforderliche Argumente zu langen Optionen sind auch bei kurzen Optionen "
"erforderlich.\n"
"\n"

#: src/main.c:365
msgid "Startup:\n"
msgstr "Beim Start:\n"

#: src/main.c:367
msgid "  -V,  --version           display the version of Wget and exit.\n"
msgstr "  -V,  --version           Programmversion anzeigen\n"

#: src/main.c:369
msgid "  -h,  --help              print this help.\n"
msgstr "  -h,  --help              Diese Hilfe anzeigen\n"

#: src/main.c:371
msgid "  -b,  --background        go to background after startup.\n"
msgstr ""
"  -b,  --background        Nach dem Starten in den Hintergrund wechseln\n"

#: src/main.c:373
msgid "  -e,  --execute=COMMAND   execute a `.wgetrc'-style command.\n"
msgstr "  -e,  --execute=BEFEHL    Einen ?.wgetrc?-artigen Befehl ausf?hren\n"

#: src/main.c:377
msgid "Logging and input file:\n"
msgstr "Log-Datei schreiben und Eingabe-Datei:\n"

#: src/main.c:379
msgid "  -o,  --output-file=FILE    log messages to FILE.\n"
msgstr "  -o,  --output-file=DATEI   Protokoll-Meldungen in DATEI schreiben\n"

#: src/main.c:381
msgid "  -a,  --append-output=FILE  append messages to FILE.\n"
msgstr "  -a,  --append-output=DATEI Meldungen der DATEI anh?ngen\n"

#: src/main.c:384
msgid "  -d,  --debug               print lots of debugging information.\n"
msgstr "  -d,  --debug               Debug-Ausgabe anzeigen\n"

#: src/main.c:387
msgid "  -q,  --quiet               quiet (no output).\n"
msgstr "  -q,  --quiet               Keine Ausgabe von Meldungen\n"

#: src/main.c:389
msgid "  -v,  --verbose             be verbose (this is the default).\n"
msgstr "  -v,  --verbose             Ausf?hrlichere Meldungen\n"

#: src/main.c:391
msgid ""
"  -nv, --no-verbose          turn off verboseness, without being quiet.\n"
msgstr ""
"  -nv, --no-verbose          Meldungen weniger ausf?hrlich, aber nicht ?--"
"quiet?\n"

#: src/main.c:393
msgid "  -i,  --input-file=FILE     download URLs found in FILE.\n"
msgstr "  -i,  --input-file=DATEI    In DATEI aufgelistete URLs holen\n"

#: src/main.c:395
msgid "  -F,  --force-html          treat input file as HTML.\n"
msgstr "  -F,  --force-html          Eingabe-Datei als HTML behandeln\n"

#: src/main.c:397
msgid ""
"  -B,  --base=URL            prepends URL to relative links in -F -i file.\n"
msgstr ""
"  -B,  --base=URL            URL relativen Links in ?-F -i DATEI? "
"voranstellen\n"

#: src/main.c:401
msgid "Download:\n"
msgstr "Download:\n"

#: src/main.c:403
msgid ""
"  -t,  --tries=NUMBER            set number of retries to NUMBER (0 "
"unlimits).\n"
msgstr ""
"  -t,  --tries=ZAHL              Anzahl der Wiederholversuche auf ZAHL "
"setzen\n"
"                                  (0 f?r unendlich)\n"

#: src/main.c:405
msgid "       --retry-connrefused       retry even if connection is refused.\n"
msgstr ""
"       --retry-connrefused       Wiederholen, auch bei verweigerter Antwort\n"

#: src/main.c:407
msgid "  -O,  --output-document=FILE    write documents to FILE.\n"
msgstr "  -O,  --output-document=DATEI   Dokumente in DATEI schreiben\n"

#: src/main.c:409
msgid ""
"  -nc, --no-clobber              skip downloads that would download to\n"
"                                 existing files.\n"
msgstr ""
"  -nc, --no-clobber              Downloads ?berspringen, die bestehende \n"
"                                  Dateien ?berschreiben w?rden\n"

#: src/main.c:412
msgid ""
"  -c,  --continue                resume getting a partially-downloaded "
"file.\n"
msgstr ""
"  -c,  --continue                Fortsetzen des Downloads einer teilweise \n"
"                                  heruntergeladenen Datei.\n"

#: src/main.c:414
msgid "       --progress=TYPE           select progress gauge type.\n"
msgstr ""
"       --progress=STYLE          STYLE f?r den Fortschrittstyp festlegen\n"

#: src/main.c:416
msgid ""
"  -N,  --timestamping            don't re-retrieve files unless newer than\n"
"                                 local.\n"
msgstr ""
"  -N,  --timestamping            Nur Dateien holen, die neuer als die "
"lokalen\n"
"                                  Dateien sind\n"

#: src/main.c:419
msgid "  -S,  --server-response         print server response.\n"
msgstr "  -S,  --server-response         Antwort des Servers anzeigen\n"

#: src/main.c:421
msgid "       --spider                  don't download anything.\n"
msgstr "       --spider                  Nichts herunterladen\n"

#: src/main.c:423
msgid "  -T,  --timeout=SECONDS         set all timeout values to SECONDS.\n"
msgstr "  -T,  --timeout=SEKUNDEN        Alle Timeouts auf SEKUNDEN setzen\n"

#: src/main.c:425
msgid "       --dns-timeout=SECS        set the DNS lookup timeout to SECS.\n"
msgstr ""
"       --dns-timeout=SEKUNDEN    Timeout der DNS-Abfrage auf SEKUNDEN "
"setzen\n"

#: src/main.c:427
msgid "       --connect-timeout=SECS    set the connect timeout to SECS.\n"
msgstr "       --connect-timeout=SEK.    Connect-Timeout auf SEKUNDEN setzen\n"

#: src/main.c:429
msgid "       --read-timeout=SECS       set the read timeout to SECS.\n"
msgstr "       --read-timeout=SEKUNDEN   Lese-Timeout auf SEKUNDEN setzen\n"

#: src/main.c:431
msgid "  -w,  --wait=SECONDS            wait SECONDS between retrievals.\n"
msgstr ""
"  -w,  --wait=SEKUNDEN           SEKUNDEN zwischen den Downloads warten\n"

#: src/main.c:433
msgid ""
"       --waitretry=SECONDS       wait 1..SECONDS between retries of a "
"retrieval.\n"
msgstr ""
"       --waitretry=SEKUNDEN      1...SEKUNDEN zwischen den erneuten "
"Versuchen\n"

#: src/main.c:435
msgid ""
"       --random-wait             wait from 0...2*WAIT secs between "
"retrievals.\n"
msgstr ""
"       --random-wait             Zwischen 0 und 2*WAIT Sekunden zwischen\n"
"                                  Versuchen warten\n"

#: src/main.c:437
msgid "  -Y,  --proxy                   explicitly turn on proxy.\n"
msgstr "  -Y,  --proxy                   Benutzung des Proxys aktivieren\n"

#: src/main.c:439
msgid "       --no-proxy                explicitly turn off proxy.\n"
msgstr "       --no-proxy                Keine Benutzung des Proxys\n"

#: src/main.c:441
msgid "  -Q,  --quota=NUMBER            set retrieval quota to NUMBER.\n"
msgstr ""
"  -Q,  --quota=NUMMER            Kontingent f?r den Download auf ZAHL "
"setzen\n"

#: src/main.c:443
msgid ""
"       --bind-address=ADDRESS    bind to ADDRESS (hostname or IP) on local "
"host.\n"
msgstr ""
"       --bind-address=ADRESSE    An die ADRESSE (Rechnername oder IP) des \n"
"                                  lokalen Rechners binden\n"

#: src/main.c:445
msgid "       --limit-rate=RATE         limit download rate to RATE.\n"
msgstr ""
"       --limit-rate=RATE         Datenrate beim Download auf RATE begrenzen\n"

#: src/main.c:447
msgid "       --no-dns-cache            disable caching DNS lookups.\n"
msgstr "       --no-dns-cache            Cachen von DNS-Abfragen abschalten\n"

#: src/main.c:449
msgid ""
"       --restrict-file-names=OS  restrict chars in file names to ones OS "
"allows.\n"
msgstr ""
"       --restrict-file-names=OS  Verwendbare Zeichen in Dateinamen auf \n"
"                                  diejenigen einschr?nken, die das \n"
"                                  Betriebssystem erlaubt\n"

#: src/main.c:451
msgid ""
"       --ignore-case             ignore case when matching files/"
"directories.\n"
msgstr ""
"       --ignore-case             Ignorieren, wenn Datei/Verzeichnis "
"zutrifft.\n"

#: src/main.c:454
msgid "  -4,  --inet4-only              connect only to IPv4 addresses.\n"
msgstr "  -4,  --inet4-only              Verbinde nur mit IPv4-Adressen\n"

#: src/main.c:456
msgid "  -6,  --inet6-only              connect only to IPv6 addresses.\n"
msgstr "  -6,  --inet6-only              Verbinde nur mit IPv6-Adressen\n"

#: src/main.c:458
msgid ""
"       --prefer-family=FAMILY    connect first to addresses of specified "
"family,\n"
"                                 one of IPv6, IPv4, or none.\n"
msgstr ""
"       --prefer-family=FAMILIE   Verbinde zuerst mit Adressen der "
"angegebenen \n"
"                                  Familie: ?IPv6?, ?IPv4? oder ?none?\n"

#: src/main.c:462
msgid "       --user=USER               set both ftp and http user to USER.\n"
msgstr ""
"       --user=BENUTZER           Setze FTP- und HTTP-Benutzer auf BENUTZER\n"

#: src/main.c:464
msgid ""
"       --password=PASS           set both ftp and http password to PASS.\n"
msgstr ""
"       --password=PASSWORT       Setze FTP- und HTTP-Passwort auf PASSWORT\n"

#: src/main.c:468
msgid "Directories:\n"
msgstr "Verzeichnisse:\n"

#: src/main.c:470
msgid "  -nd, --no-directories           don't create directories.\n"
msgstr "  -nd, --no-directories           Keine Verzeichnisse anlegen\n"

#: src/main.c:472
msgid "  -x,  --force-directories        force creation of directories.\n"
msgstr ""
"  -x,  --force-directories        Anlegen von Verzeichnissen erzwingen\n"

#: src/main.c:474
msgid "  -nH, --no-host-directories      don't create host directories.\n"
msgstr ""
"  -nH, --no-host-directories      Kein Rechnernamen-Verzeichnis anlegen\n"

#: src/main.c:476
msgid "       --protocol-directories     use protocol name in directories.\n"
msgstr ""
"       --protocol-directories     Benutze Protokollnamen in Verzeichnissen\n"

#: src/main.c:478
msgid "  -P,  --directory-prefix=PREFIX  save files to PREFIX/...\n"
msgstr "  -P,  --directory-prefix=PR?FIX  Speichere Dateien nach PR?FIX/...\n"

#: src/main.c:480
msgid ""
"       --cut-dirs=NUMBER          ignore NUMBER remote directory "
"components.\n"
msgstr ""
"       --cut-dirs=ZAHL            ZAHL der Verzeichnisebenen der Gegenseite\n"
"                                   ?berspringen\n"

#: src/main.c:484
msgid "HTTP options:\n"
msgstr "HTTP-Optionen:\n"

#: src/main.c:486
msgid "       --http-user=USER        set http user to USER.\n"
msgstr "       --http-user=BENUTZER    HTTP-Benutzer auf BENUTZER setzen\n"

#: src/main.c:488
msgid "       --http-password=PASS    set http password to PASS.\n"
msgstr "       --http-password=PASS    HTTP-Passwort auf PASS setzen\n"

#: src/main.c:490
msgid "       --no-cache              disallow server-cached data.\n"
msgstr ""
"       --no-cache              Keine zwischengespeicherten Serverdaten\n"

#: src/main.c:492
msgid ""
"  -E,  --html-extension        save HTML documents with `.html' extension.\n"
msgstr ""
"  -E,  --html-extension        HTML-Dateien mit Endung ?.html? speichern\n"

#: src/main.c:494
msgid "       --ignore-length         ignore `Content-Length' header field.\n"
msgstr ""
"       --ignore-length         Header-Feld ?Content-Length? ignorieren\n"

#: src/main.c:496
msgid "       --header=STRING         insert STRING among the headers.\n"
msgstr ""
"       --header=ZEICHENKETTE   ZEICHENKETTE zwischen Header-Zeilen einf?gen\n"

#: src/main.c:498
msgid "       --proxy-user=USER       set USER as proxy username.\n"
msgstr ""
"       --proxy-user=BENUTZER   BENUTZER als Proxy-Benutzernamen setzen\n"

#: src/main.c:500
msgid "       --proxy-password=PASS   set PASS as proxy password.\n"
msgstr "       --proxy-password=PASS   PASS als Proxy-Passwort setzen\n"

#: src/main.c:502
msgid ""
"       --referer=URL           include `Referer: URL' header in HTTP "
"request.\n"
msgstr ""
"       --referer=URL           Header ?Referer: URL? der HTTP-Anfrage\n"
"                                hinzuf?gen\n"

#: src/main.c:504
msgid "       --save-headers          save the HTTP headers to file.\n"
msgstr "       --save-headers          HTTP-Header in Datei speichern\n"

#: src/main.c:506
msgid ""
"  -U,  --user-agent=AGENT      identify as AGENT instead of Wget/VERSION.\n"
msgstr ""
"  -U,  --user-agent=AGENT      Als AGENT anstatt Wget/VERSION "
"identifizieren\n"

#: src/main.c:508
msgid ""
"       --no-http-keep-alive    disable HTTP keep-alive (persistent "
"connections).\n"
msgstr ""
"       --no-http-keep-alive    ?HTTP keep-alive? (ununterbrochene \n"
"                                Verbindungen) deaktivieren\n"

#: src/main.c:510
msgid "       --no-cookies            don't use cookies.\n"
msgstr "       --no-cookies            Keine Cookies benutzen\n"

#: src/main.c:512
msgid "       --load-cookies=FILE     load cookies from FILE before session.\n"
msgstr ""
"       --load-cookies=DATEI    Cookies vor der Sitzung aus DATEI laden\n"

#: src/main.c:514
msgid "       --save-cookies=FILE     save cookies to FILE after session.\n"
msgstr ""
"       --save-cookies=DATEI    Cookies nach der Sitzung der DATEI speichern\n"

#: src/main.c:516
msgid ""
"       --keep-session-cookies  load and save session (non-permanent) "
"cookies.\n"
msgstr ""
"       --keep-session-cookies  Tempor?re Sitzungscookies laden und "
"speichern\n"

#: src/main.c:518
msgid ""
"       --post-data=STRING      use the POST method; send STRING as the "
"data.\n"
msgstr ""
"       --post-data=STRING      Verwende die POST-Methode, sende dabei die \n"
"                                Zeichenkette STRING als Daten\n"

#: src/main.c:520
msgid ""
"       --post-file=FILE        use the POST method; send contents of FILE.\n"
msgstr ""
"       --post-file=DATEI       Verwende die POST-Methode, sende dabei den \n"
"                                Inhalt aus DATEI\n"

#: src/main.c:522
msgid ""
"       --no-content-disposition  don't honor Content-Disposition header.\n"
msgstr ""
"       --no-content-disposition  ?Content-Disposition?-Header ignorieren\n"

#: src/main.c:527
msgid "HTTPS (SSL/TLS) options:\n"
msgstr "Optionen f?r HTTPS (SSL/TLS):\n"

#: src/main.c:529
msgid ""
"       --secure-protocol=PR     choose secure protocol, one of auto, SSLv2,\n"
"                                SSLv3, and TLSv1.\n"
msgstr ""
"       --secure-protocol=PR     Sicheres Protokoll w?hlen: ?auto?, ?SSLv2?,\n"
"                                 ?SSLv3?, oder ?TLSv1?\n"

#: src/main.c:532
msgid ""
"       --no-check-certificate   don't validate the server's certificate.\n"
msgstr "       --no-check-certificate   Server-Zertifikat nicht ?berpr?fen\n"

#: src/main.c:534
msgid "       --certificate=FILE       client certificate file.\n"
msgstr "       --certificate=DATEI      Optionales Client-Zertifikat\n"

#: src/main.c:536
msgid "       --certificate-type=TYPE  client certificate type, PEM or DER.\n"
msgstr ""
"       --certificate-type=TYP   Zertifikatstyp des Clients: ?PEM? oder "
"?DER?\n"

#: src/main.c:538
msgid "       --private-key=FILE       private key file.\n"
msgstr ""
"       --private-key=DATEI      DATEI des privaten Zertifikatsschl?ssels\n"

#: src/main.c:540
msgid "       --private-key-type=TYPE  private key type, PEM or DER.\n"
msgstr ""
"       --private-key-type=TYP   Privater Schl?sseltyp: ?PEM? oder ?DER?\n"

#: src/main.c:542
msgid "       --ca-certificate=FILE    file with the bundle of CA's.\n"
msgstr "       --ca-certificate=DATEI   DATEI mit geb?ndelten CAs\n"

#: src/main.c:544
msgid ""
"       --ca-directory=DIR       directory where hash list of CA's is "
"stored.\n"
msgstr ""
"       --ca-directory=VERZ.     VERZEICHNIS mit Hash-Listen von CA-Dateien\n"

#: src/main.c:546
msgid ""
"       --random-file=FILE       file with random data for seeding the SSL "
"PRNG.\n"
msgstr ""
"       --random-file=DATEI      Datei mit zuf?lligen Daten f?r das \n"
"                                 ?seeding? des SSL-PRNGs\n"

#: src/main.c:548
msgid ""
"       --egd-file=FILE          file naming the EGD socket with random "
"data.\n"
msgstr ""
"       --egd-file=DATEI         Dateiname eines EDG-Sockets mit zuf?lligen\n"
"                                 Daten\n"

#: src/main.c:553
msgid "FTP options:\n"
msgstr "FTP-Optionen:\n"

#: src/main.c:555
msgid "       --ftp-user=USER         set ftp user to USER.\n"
msgstr "       --ftp-user=BENUTZER     FTP-Benutzer auf BENUTZER setzen\n"

#: src/main.c:557
msgid "       --ftp-password=PASS     set ftp password to PASS.\n"
msgstr "       --ftp-password=PASSWORT FTP-Passwort auf PASSWORT setzen\n"

#: src/main.c:559
msgid "       --no-remove-listing     don't remove `.listing' files.\n"
msgstr "       --no-remove-listing     ?.listing?-Dateien nicht entfernen\n"

#: src/main.c:561
msgid "       --no-glob               turn off FTP file name globbing.\n"
msgstr "       --no-glob               Dateinamen-?Globbing? abschalten\n"

#: src/main.c:563
msgid "       --no-passive-ftp        disable the \"passive\" transfer mode.\n"
msgstr "       --no-passive-ftp        Kein ?passiver? ?bertragungsmodus\n"

#: src/main.c:565
msgid ""
"       --retr-symlinks         when recursing, get linked-to files (not "
"dir).\n"
msgstr ""
"       --retr-symlinks         falls auftretend, verlinkte Dateien holen\n"
"                                (keine Verzeichnisse)\n"

#: src/main.c:567
msgid "       --preserve-permissions  preserve remote file permissions.\n"
msgstr "       --preserve-permissions  Entfernte Dateiberechtiungen behalten\n"

#: src/main.c:571
msgid "Recursive download:\n"
msgstr "Rekursives Herunterladen:\n"

#: src/main.c:573
msgid "  -r,  --recursive          specify recursive download.\n"
msgstr "  -r,  --recursive          Rekursives Herunterladen\n"

#: src/main.c:575
msgid ""
"  -l,  --level=NUMBER       maximum recursion depth (inf or 0 for "
"infinite).\n"
msgstr ""
"  -l,  --level=NUMMER       Maximale Rekursionstiefe (?inf? oder ?0? f?r\n"
"                             keine Begrenzung)\n"

#: src/main.c:577
msgid ""
"       --delete-after       delete files locally after downloading them.\n"
msgstr ""
"       --delete-after       Geholte Dateien nach dem Download l?schen\n"

#: src/main.c:579
msgid ""
"  -k,  --convert-links      make links in downloaded HTML point to local "
"files.\n"
msgstr ""
"  -k,  --convert-links      Nicht-relative Links in relative umwandeln\n"

#: src/main.c:581
msgid ""
"  -K,  --backup-converted   before converting file X, back up as X.orig.\n"
msgstr ""
"  -K,  --backup-converted   Vor dem Umwandeln der Datei X, ein Backup als\n"
"                             X.orig anlagen\n"

#: src/main.c:583
msgid ""
"  -m,  --mirror             shortcut for -N -r -l inf --no-remove-listing.\n"
msgstr ""
"  -m,  --mirror             Kurzform, die ?-N -r -l inf --no-remove-"
"listing?\n"
"                             entspricht\n"

#: src/main.c:585
msgid ""
"  -p,  --page-requisites    get all images, etc. needed to display HTML "
"page.\n"
msgstr ""
"  -p,  --page-requisites    Alle Bilder usw. holen, die f?r die Anzeige der\n"
"                             HTML-Seite notwendig sind\n"

#: src/main.c:587
msgid ""
"       --strict-comments    turn on strict (SGML) handling of HTML "
"comments.\n"
msgstr ""
"       --strict-comments    Strenge Handhabung (SGML) von HTML-Kommentaren\n"

#: src/main.c:591
msgid "Recursive accept/reject:\n"
msgstr "Rekursiv erlauben/zur?ckweisen:\n"

#: src/main.c:593
msgid ""
"  -A,  --accept=LIST               comma-separated list of accepted "
"extensions.\n"
msgstr ""
"  -A,  --accept=LISTE              Komma-unterteilte Liste der erlaubten\n"
"                                    Dateiendungen\n"

#: src/main.c:595
msgid ""
"  -R,  --reject=LIST               comma-separated list of rejected "
"extensions.\n"
msgstr ""
"  -R,  --reject=LISTE              Komma-unterteilte Liste der\n"
"                                    zur?ckzuweisenden Erweiterungen\n"

#: src/main.c:597
msgid ""
"  -D,  --domains=LIST              comma-separated list of accepted "
"domains.\n"
msgstr ""
"  -D,  --domains=LISTE             Komma-unterteilte Liste der erlaubten\n"
"                                    Domains\n"

#: src/main.c:599
msgid ""
"       --exclude-domains=LIST      comma-separated list of rejected "
"domains.\n"
msgstr ""
"       --exclude-domains=LISTE     Komma-unterteilte Liste der\n"
"                                    zur?ckzuweisenden Domains\n"

#: src/main.c:601
msgid ""
"       --follow-ftp                follow FTP links from HTML documents.\n"
msgstr ""
"       --follow-ftp                FTP-Verweisen von HTML-Dokumenten aus\n"
"                                    folgen\n"

#: src/main.c:603
msgid ""
"       --follow-tags=LIST          comma-separated list of followed HTML "
"tags.\n"
msgstr ""
"       --follow-tags=LISTE         Komma-unterteilte Liste der zu folgenden\n"
"                                    HTML-Tags\n"

#: src/main.c:605
msgid ""
"       --ignore-tags=LIST          comma-separated list of ignored HTML "
"tags.\n"
msgstr ""
"       --ignore-tags=LISTE         Komma-unterteilte Liste der zu\n"
"                                    ignorierenden HTML-Tags\n"

#: src/main.c:607
msgid ""
"  -H,  --span-hosts                go to foreign hosts when recursive.\n"
msgstr ""
"  -H,  --span-hosts                Wenn ?--recursive?, auch zu fremden \n"
"                                    Rechnern gehen\n"

#: src/main.c:609
msgid "  -L,  --relative                  follow relative links only.\n"
msgstr "  -L,  --relative                  Nur relativen Verweisen folgen\n"

#: src/main.c:611
msgid "  -I,  --include-directories=LIST  list of allowed directories.\n"
msgstr "  -I,  --include-directories=LISTE Liste der erlaubten Verzeichnisse\n"

#: src/main.c:613
msgid "  -X,  --exclude-directories=LIST  list of excluded directories.\n"
msgstr ""
"  -X,  --exclude-directories=LISTE Liste der auszuschlie?enden "
"Verzeichnisse\n"

#: src/main.c:615
msgid ""
"  -np, --no-parent                 don't ascend to the parent directory.\n"
msgstr ""
"  -np, --no-parent                 Nicht in das ?bergeordnete Verzeichnis\n"
"                                   wechseln\n"

#: src/main.c:619
msgid "Mail bug reports and suggestions to <bug-wget at gnu.org>.\n"
msgstr ""
"Fehlerberichte und Verbesserungsvorschl?ge bitte per E-Mail (in Englisch!)\n"
"an <bug-wget at gnu.org> schicken.\n"
"\n"
"Diese deutsche ?bersetzung stammt von Robert Scheck <wget at robert-scheck.de>\n"
"und kann von http://people.fedora.de/rsc/ heruntergeladen werden.\n"

#: src/main.c:624
#, c-format
msgid "GNU Wget %s, a non-interactive network retriever.\n"
msgstr ""
"GNU Wget %s, ein nicht-interaktives Werkzeug zum Download von Dateien.\n"

#: src/main.c:664
msgid "Copyright (C) 2005 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 2005 Free Software Foundation, Inc.\n"

#: src/main.c:666
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
"GNU General Public License for more details.\n"
msgstr ""
"Die Ver?ffentlichung dieses Programms erfolgt in der Hoffnung,\n"
"dass es von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, \n"
"sogar ohne die implizite Garantie der MARKTREIFE oder der \n"
"VERWENDBARKEIT F?R EINEN BESTIMMTEN ZWECK. Details finden sich\n"
"in der GNU General Public License in der Datei ?COPYING?.\n"

#: src/main.c:671
msgid ""
"\n"
"Originally written by Hrvoje Niksic <hniksic at xemacs.org>.\n"
msgstr ""
"\n"
"Urspr?nglich geschrieben von Hrvoje Niksic <hniksic at xemacs.org>.\n"

#. #### Something nicer should be printed here -- similar to the
#. pre-1.5 `--help' page.
#: src/main.c:718 src/main.c:787 src/main.c:866
#, c-format
msgid "Try `%s --help' for more options.\n"
msgstr "?%s --help? gibt weitere Informationen.\n"

#: src/main.c:784
#, c-format
msgid "%s: illegal option -- `-n%c'\n"
msgstr "%s: ung?ltige Option -- ?-n%c?\n"

#: src/main.c:837
#, c-format
msgid "Can't be verbose and quiet at the same time.\n"
msgstr "?Ausf?hrliche? und ?keine Meldungen? sind gleichzeitig unm?glich.\n"

#: src/main.c:843
#, c-format
msgid "Can't timestamp and not clobber old files at the same time.\n"
msgstr ""
"?Zeitstempel? und ??berschreibung alter Dateien? ist gleichzeitig "
"unm?glich.\n"

#: src/main.c:851
#, c-format
msgid "Cannot specify both --inet4-only and --inet6-only.\n"
msgstr ""
"?Nur IPv4? und ?nur IPv6? k?nnen nicht gleichzeitig verwendet werden.\n"

#. No URL specified.
#: src/main.c:861
#, c-format
msgid "%s: missing URL\n"
msgstr "%s: URL fehlt\n"

#: src/main.c:981
#, c-format
msgid "No URLs found in %s.\n"
msgstr "Keine URLs in %s gefunden.\n"

#: src/main.c:999
#, c-format
msgid ""
"FINISHED --%s--\n"
"Downloaded: %d files, %s in %s (%s)\n"
msgstr ""
"BEENDET --%s--\n"
"Geholt: %d Dateien, %s in %s (%s)\n"

#: src/main.c:1008
#, c-format
msgid "Download quota of %s EXCEEDED!\n"
msgstr "Download-Kontingent von %s ERSCH?PFT!\n"

#: src/mswindows.c:96
#, c-format
msgid "Continuing in background.\n"
msgstr "Setze im Hintergrund fort.\n"

#: src/mswindows.c:288
#, c-format
msgid "Continuing in background, pid %lu.\n"
msgstr "Setze im Hintergrund fort, Prozessnummer %lu.\n"

#: src/mswindows.c:290 src/utils.c:340
#, c-format
msgid "Output will be written to `%s'.\n"
msgstr "Ausgabe wird nach ?%s? geschrieben.\n"

#: src/mswindows.c:458 src/mswindows.c:465
#, c-format
msgid "%s: Couldn't find usable socket driver.\n"
msgstr "%s: Kein benutzbarer ?socket driver? auffindbar.\n"

#: src/netrc.c:376
#, c-format
msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
msgstr "%s: %s:%d: Warnung: ?%s?-Zeichen erscheint vor einem Maschinennamen\n"

#: src/netrc.c:407
#, c-format
msgid "%s: %s:%d: unknown token \"%s\"\n"
msgstr "%s: %s:%d: unbekanntes Zeichen ?%s?\n"

#: src/netrc.c:471
#, c-format
msgid "Usage: %s NETRC [HOSTNAME]\n"
msgstr "Syntax: %s NETRC [HOSTNAME]\n"

#: src/netrc.c:481
#, c-format
msgid "%s: cannot stat %s: %s\n"
msgstr "%s: kann ?%s? nicht finden: %s\n"

#. Still not random enough, presumably because neither /dev/random
#. nor EGD were available.  Try to seed OpenSSL's PRNG with libc
#. PRNG.  This is cryptographically weak and defeats the purpose
#. of using OpenSSL, which is why it is highly discouraged.
#: src/openssl.c:113
msgid "WARNING: using a weak random seed.\n"
msgstr "WARNUNG: Benutze schwaches ?random seed?.\n"

#: src/openssl.c:173
msgid "Could not seed PRNG; consider using --random-file.\n"
msgstr ""
"Konnte PRNG nicht ?seeden?; ?--random-file? sollte in Betracht gezogen "
"werden.\n"

#. If the user has specified --no-check-cert, we still want to warn
#. him about problems with the server's certificate.
#: src/openssl.c:488
msgid "ERROR"
msgstr "FEHLER"

#: src/openssl.c:488
msgid "WARNING"
msgstr "WARNUNG"

#: src/openssl.c:497
#, c-format
msgid "%s: No certificate presented by %s.\n"
msgstr "%s: %s hat kein Zertifikat vorgelegt.\n"

#: src/openssl.c:518
#, c-format
msgid "%s: cannot verify %s's certificate, issued by `%s':\n"
msgstr "%s: Kann %ss Zertifikat nicht ?berpr?fen, ausgestellt von ?%s?:\n"

#: src/openssl.c:526
msgid "  Unable to locally verify the issuer's authority.\n"
msgstr "  Autorit?t des Ausstellers kann nicht lokal ?berpr?ft werden.\n"

#: src/openssl.c:530
msgid "  Self-signed certificate encountered.\n"
msgstr "  Selbstsigniertes Zertifikat erhalten.\n"

#: src/openssl.c:533
msgid "  Issued certificate not yet valid.\n"
msgstr "  Ausgestelltes Zertifikat ist noch nicht g?ltig.\n"

#: src/openssl.c:536
msgid "  Issued certificate has expired.\n"
msgstr "  Ausgestelltes Zertifikat ist nicht mehr g?ltig.\n"

#: src/openssl.c:568
#, c-format
msgid ""
"%s: certificate common name `%s' doesn't match requested host name `%s'.\n"
msgstr ""
"%s: Der Zertifikatname ?%s? stimmt nicht mit dem Rechnernamen ?%s? ?berein.\n"

#: src/openssl.c:581
#, c-format
msgid "To connect to %s insecurely, use `--no-check-certificate'.\n"
msgstr ""
"F?r eine unsichere Verbindung mit ?%s? bitte ?--no-check-certificate? "
"verwenden.\n"

#. Align the [ skipping ... ] line with the dots.  To do
#. that, insert the number of spaces equal to the number of
#. digits in the skipped amount in K.
#: src/progress.c:239
#, c-format
msgid ""
"\n"
"%*s[ skipping %sK ]"
msgstr ""
"\n"
"%*s[ ?berspringe %sK ]"

#: src/progress.c:451
#, c-format
msgid "Invalid dot style specification `%s'; leaving unchanged.\n"
msgstr "Ung?ltiger Stil f?r den Fortschrittstyp ?%s?; keine ?nderung.\n"

#. Translation note: "ETA" is English-centric, but this must
#. be short, ideally 3 chars.  Abbreviate if necessary.
#: src/progress.c:942
#, c-format
msgid "  eta %s"
msgstr "  ETA %s"

#. When the download is done, print the elapsed time.
#. Note to translators: this should not take up more room than
#. available here.  Abbreviate if necessary.
#: src/progress.c:956
msgid "   in "
msgstr "   in "

#. If no clock was found, it means that clock_getres failed for
#. the realtime clock.
#: src/ptimer.c:161
#, c-format
msgid "Cannot get REALTIME clock frequency: %s\n"
msgstr "Keine Uhr f?r Echtzeit gefunden: %s\n"

#: src/recur.c:364
#, c-format
msgid "Removing %s since it should be rejected.\n"
msgstr "Entferne ?%s?, da dies zur?ckgewiesen werden soll.\n"

#: src/res.c:389
#, c-format
msgid "Cannot open %s: %s"
msgstr "Kann ?%s? nicht ?ffnen: %s"

#: src/res.c:539
msgid "Loading robots.txt; please ignore errors.\n"
msgstr "Lade ?robots.txt?; bitte Fehler ignorieren.\n"

#: src/retr.c:658
#, c-format
msgid "Error parsing proxy URL %s: %s.\n"
msgstr "Fehler beim Parsen der Proxy-URL ?%s?: %s.\n"

#: src/retr.c:666
#, c-format
msgid "Error in proxy URL %s: Must be HTTP.\n"
msgstr "Fehler in der Proxy-URL ?%s?: Es muss eine HTTP-URL sein.\n"

#: src/retr.c:752
#, c-format
msgid "%d redirections exceeded.\n"
msgstr "%d: Die Anzahl der Verweise ist zu gro?.\n"

#: src/retr.c:887
msgid ""
"Giving up.\n"
"\n"
msgstr ""
"Aufgegeben.\n"
"\n"

#: src/retr.c:887
msgid ""
"Retrying.\n"
"\n"
msgstr ""
"Erneuter Versuch.\n"
"\n"

#: src/url.c:620
msgid "No error"
msgstr "Kein Fehler"

#: src/url.c:622
msgid "Unsupported scheme"
msgstr "Nicht unterst?tztes Schema"

#: src/url.c:624
msgid "Invalid host name"
msgstr "Ung?ltiger Rechnername"

#: src/url.c:626
msgid "Bad port number"
msgstr "Ung?ltige Port-Nummer"

#: src/url.c:628
msgid "Invalid user name"
msgstr "Ung?ltiger Benutzername"

#: src/url.c:630
msgid "Unterminated IPv6 numeric address"
msgstr "Unvollst?ndige numerische IPv6-Adresse"

#: src/url.c:632
msgid "IPv6 addresses not supported"
msgstr "IPv6-Adressen werden nicht unterst?tzt"

#: src/url.c:634
msgid "Invalid IPv6 numeric address"
msgstr "Ung?ltige numerische IPv6-Adresse"

#. parent, no error
#: src/utils.c:338
#, c-format
msgid "Continuing in background, pid %d.\n"
msgstr "Setze im Hintergrund fort, Prozessnummer %d.\n"

#: src/utils.c:386
#, c-format
msgid "Failed to unlink symlink `%s': %s\n"
msgstr "Entfernen des symbolischen Verweises ?%s? fehlgeschlagen: %s\n"

#: src/xmalloc.c:63
#, c-format
msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n"
msgstr ""
"%s: %s: %ld Byte(s) konnte(n) nicht reserviert werden; Speicher "
"aufgebraucht.\n"

#~ msgid "Error in Set-Cookie, field `%s'"
#~ msgstr "Fehler bei Set-Cookie, Feld ?%s?"

#~ msgid "Failed writing to proxy: %s.\n"
#~ msgstr "Fehler beim Schreiben der Proxy-Anfrage: %s\n"

#~ msgid "File `%s' already there, will not retrieve.\n"
#~ msgstr "Datei ?%s? ist bereits vorhanden, kein erneuter Download.\n"

#~ msgid ""
#~ "%s (%s) - `%s' saved [%s/%s])\n"
#~ "\n"
#~ msgstr ""
#~ "%s (%s) - ?%s? gespeichert [%s/%s])\n"
#~ "\n"

#~ msgid "%s (%s) - Connection closed at byte %s/%s. "
#~ msgstr "%s (%s) - Verbindung bei Byte %s/%s geschlossen. "

#~ msgid "%s: %s: Invalid boolean `%s', use always, on, off, or never.\n"
#~ msgstr ""
#~ "%s: %s: Ung?ltiger Schalter ?%s?, bitte ?always?, ?on?, ?off? oder "
#~ "?never? verwenden.\n"

#~ msgid "%s: Certificate verification error for %s: %s\n"
#~ msgstr "%s: Fehler bei der ?berpr?fung des Zertifikates von %s: %s\n"

#~ msgid "Empty host"
#~ msgstr "Rechnername ist leer"



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:33:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:33:16 -0400
Subject: rpms/wget/devel wget.spec,1.45,1.46
Message-ID: <200606290833.k5T8XGE3023570@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23542

Modified Files:
	wget.spec 
Log Message:
- updated german translations from Robert Scheck


Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wget.spec	27 Jun 2006 11:34:50 -0000	1.45
+++ wget.spec	29 Jun 2006 08:33:13 -0000	1.46
@@ -1,12 +1,12 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
 Version: 1.10.2
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
 Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz 
-#Source2: wget-1.10.1-de.po
+Source2: http://people.fedora.de/rsc/wget-1.11-de.po
 Patch2: wget-1.10.2-rh1.patch
 Patch3: wget-1.10-path.patch
 Patch4: wget-1.9.1-docsyntax.patch
@@ -34,7 +34,7 @@
 %patch5 -p1
 %patch6 -p1
 
-#cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po
+cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po
 chmod a+x doc/texi2pod.pl
 
 %build
@@ -71,6 +71,9 @@
 %{_infodir}/*
 
 %changelog
+* Thu Jun 29 2006 Karsten Hopp <karsten at redhat.de> 1.10.2-5
+- updated german translations from Robert Scheck
+
 * Tue Jun 27 2006 Karsten Hopp <karsten at redhat.de> 1.10.2-4
 - upstream patches
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:38:24 -0400
Subject: rpms/kernel/devel/configs config-generic,1.206,1.207
Message-ID: <200606290838.k5T8cO5j024647@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24560/configs

Modified Files:
	config-generic 
Log Message:
git14


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- config-generic	29 Jun 2006 08:27:52 -0000	1.206
+++ config-generic	29 Jun 2006 08:38:21 -0000	1.207
@@ -2821,4 +2821,4 @@
 CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=m
 
-
+# CONFIG_UNUSED_SYMBOLS is not set



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:38:24 -0400
Subject: rpms/kernel/devel patch-2.6.17-git14.bz2.sign, NONE, 1.1 .cvsignore,
	1.468, 1.469 kernel-2.6.spec, 1.2329,
	1.2330 linux-2.6-execshield.patch, 1.24, 1.25 sources, 1.412,
	1.413 upstream, 1.379, 1.380 patch-2.6.17-git12.bz2.sign, 1.1, NONE
Message-ID: <200606290838.k5T8cO2c024635@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24560

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-execshield.patch sources 
	upstream 
Added Files:
	patch-2.6.17-git14.bz2.sign 
Removed Files:
	patch-2.6.17-git12.bz2.sign 
Log Message:
git14


--- NEW FILE patch-2.6.17-git14.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEo3swyGugalF9Dw4RAjVXAJ4g4+yjdlIbvzsxE4NwfD9JXiBCtACfY1U+
Y0dtZ9T0/GKgk2JhfVhGXz0=
=7yOx
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- .cvsignore	29 Jun 2006 08:30:45 -0000	1.468
+++ .cvsignore	29 Jun 2006 08:38:20 -0000	1.469
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git13.bz2
+patch-2.6.17-git14.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2329
retrieving revision 1.2330
diff -u -r1.2329 -r1.2330
--- kernel-2.6.spec	29 Jun 2006 08:27:51 -0000	1.2329
+++ kernel-2.6.spec	29 Jun 2006 08:38:20 -0000	1.2330
@@ -239,7 +239,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git13.bz2
+Patch1: patch-2.6.17-git14.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1581,7 +1581,7 @@
 
 %changelog
 * Thu Jun 28 2006 Dave Jones <davej at redhat.com>
-- 2.6.17-git13
+- 2.6.17-git13 & git14
 
 * Tue Jun 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git12

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux-2.6.17.noarch/arch/i386/kernel/sysenter.c |    3 
 linux-2.6.17.noarch/include/asm-i386/elf.h      |    6 
 linux-2.6.17.noarch/include/asm-i386/mmu.h      |    4 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   22 ++
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 46 files changed, 793 insertions(+), 135 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linux-2.6-execshield.patch	29 Jun 2006 08:27:51 -0000	1.24
+++ linux-2.6-execshield.patch	29 Jun 2006 08:38:20 -0000	1.25
@@ -1058,16 +1058,16 @@
  
  extern unsigned int vdso_enabled;
  
-@@ -213,4 +213,8 @@ do {									      \
+@@ -214,4 +214,7 @@ do {									      \
  
  #endif
-+
+ 
 +#define __HAVE_ARCH_RANDOMIZE_BRK
 +extern void randomize_brk(unsigned long old_brk);
 +
  #endif
---- linux-2.6.17.noarch/include/asm-i386/mmu.h~	2006-06-29 00:54:50.000000000 -0400
-+++ linux-2.6.17.noarch/include/asm-i386/mmu.h	2006-06-29 00:55:22.000000000 -0400
+--- linux-2.6.17.noarch/include/asm-i386/mmu.h~	2006-06-29 04:33:38.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/mmu.h	2006-06-29 04:33:58.000000000 -0400
 @@ -7,11 +7,15 @@
   * we put the segment information here.
   *


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- sources	29 Jun 2006 08:30:45 -0000	1.412
+++ sources	29 Jun 2006 08:38:20 -0000	1.413
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-efb60adb7dd3076d3dbb9592f66e60be  patch-2.6.17-git13.bz2
+ed71d76fabac9e9b239cba592460e51b  patch-2.6.17-git14.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- upstream	29 Jun 2006 08:27:51 -0000	1.379
+++ upstream	29 Jun 2006 08:38:21 -0000	1.380
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git13.bz2
+patch-2.6.17-git14.bz2


--- patch-2.6.17-git12.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:41:14 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.22,1.23
Message-ID: <200606290841.k5T8fEEl025252@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25113

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add gettext-devel, autoconf, automake, libtool to buildreq



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scim-pinyin.spec	29 Jun 2006 08:19:21 -0000	1.22
+++ scim-pinyin.spec	29 Jun 2006 08:41:11 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -11,7 +11,7 @@
 Source0:	http://dl.sourceforge.net/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	scim-devel, gtk2-devel, gettext,autoconf, automake
+BuildRequires:	scim-devel, gtk2-devel, gettext, gettext-devel, autoconf, automake,libtool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-10
+- add gettext-devel, automake, autoconf,libtool to buildreq 
+
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-9
 - run aclocal/autoconf/automake before configure
 - to create new confiugre/Makefiles based on the 



From fedora-cvs-commits at redhat.com  Thu Jun 29 08:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 04:45:05 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.148,1.149
Message-ID: <200606290845.k5T8j5Wx026077@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26025

Modified Files:
	kdelibs.spec 
Log Message:



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdelibs.spec	26 Jun 2006 17:41:27 -0000	1.148
+++ kdelibs.spec	29 Jun 2006 08:44:52 -0000	1.149
@@ -393,9 +393,9 @@
 %{_datadir}/services
 %{_datadir}/servicetypes
 %dir %{_docdir}/HTML
-%dir(en) %{_docdir}/HTML/en
-%doc(en) %{_docdir}/HTML/en/common
-%doc(en) %{_docdir}/HTML/en/kspell
+%dir %{_docdir}/HTML/en
+%doc %{_docdir}/HTML/en/common
+%doc %{_docdir}/HTML/en/kspell
 
 %files devel
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Jun 29 09:06:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 05:06:16 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.123,1.124
Message-ID: <200606290906.k5T96GSQ014835@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14792

Modified Files:
	coreutils.spec 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 5.97-2
- Allow 'sort +1 -2' (patch from upstream).



Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- coreutils.spec	25 Jun 2006 23:15:00 -0000	1.123
+++ coreutils.spec	29 Jun 2006 09:06:14 -0000	1.124
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 1
+Release: 2
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,6 +18,7 @@
 Source201:  runuser.pamd
 
 # From upstream
+Patch1: coreutils-sort-compatibility.patch
 Patch10: coreutils-newhashes.patch
 
 # Our patches
@@ -74,6 +75,7 @@
 %setup -q
 
 # From upstream
+%patch1 -p1 -b .sort-compatibility
 %patch10 -p1 -b .newhashes
 
 # Our patches
@@ -270,6 +272,9 @@
 /sbin/runuser
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 5.97-2
+- Allow 'sort +1 -2' (patch from upstream).
+
 * Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.97-1
 - 5.97.  No longer need tempname or tee patches, or pl translation.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 09:43:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 05:43:34 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch, NONE,
	1.1 openoffice.org.spec, 1.748, 1.749
Message-ID: <200606290943.k5T9hYPV006234@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6183

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch 
Log Message:
fix for x86_64 input method

openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch:
 breakiterator/xdictionary.cxx        |   12 ++++++------
 source/breakiterator/xdictionary.cxx |    0 
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch ---
Index: source/breakiterator/xdictionary.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/breakiterator/xdictionary.cxx,v
retrieving revision 1.11
diff -u -r1.11 xdictionary.cxx
--- openoffice.org.orig/i18npoolsource/breakiterator/xdictionary.cxx	1 Nov 2005 14:52:31 -0000	1.11
+++ openoffice.org/i18npool/source/breakiterator/xdictionary.cxx	29 Jun 2006 09:29:14 -0000
@@ -67,16 +70,16 @@
     aBuf.appendAscii( "dict_" ).appendAscii( lang ).appendAscii( SAL_DLLEXTENSION );
         hModule = osl_loadModule( aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
         if( hModule ) {
-            int (*func)();
-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
+            sal_IntPtr (*func)();
+            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
             existMark = (sal_uInt8*) (*func)();
-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
+            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
             index1 = (sal_Int16*) (*func)();
-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
+            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
             index2 = (sal_Int32*) (*func)();
-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
+            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
             lenArray = (sal_Int32*) (*func)();
-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
+            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
             dataArea = (sal_Unicode*) (*func)();
         }
         else


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- openoffice.org.spec	29 Jun 2006 06:53:22 -0000	1.748
+++ openoffice.org.spec	29 Jun 2006 09:43:31 -0000	1.749
@@ -106,6 +106,7 @@
 Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 Patch41: workspace.sixtyfour06.patch
 Patch42: openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch
+Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -839,6 +840,7 @@
 %patch40 -p1 -b .ooo65519.printing.samba.patch
 %patch41 -p1 -b .workspace.sixtyfour06.patch
 %patch42 -p1 -b .ooo66018.solenv.dangerousvisibility.patch
+%patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
 
 tar xzf %{SOURCE1}
 
@@ -3318,6 +3320,7 @@
 %changelog
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - disable -fvisibility-inlines-hidden
+- rh#196123# add openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone



From fedora-cvs-commits at redhat.com  Thu Jun 29 09:43:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 05:43:42 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.23,1.24
Message-ID: <200606290943.k5T9hghf006306@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6206

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: user bootstrap



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scim-pinyin.spec	29 Jun 2006 08:41:11 -0000	1.23
+++ scim-pinyin.spec	29 Jun 2006 09:43:39 -0000	1.24
@@ -38,9 +38,7 @@
 %if %{with_libstdc_preview}
 export CXX=%{_bindir}/g++-libstdc++-so_7
 %endif
-aclocal
-autoconf
-automake
+./bootstrap
 %configure --disable-static
 %if %{with_libstdc_preview}
 # tweak libtool for libstdc++-so7
@@ -79,6 +77,7 @@
 %changelog
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-10
 - add gettext-devel, automake, autoconf,libtool to buildreq 
+- use ./bootstrap
 
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-9
 - run aclocal/autoconf/automake before configure



From fedora-cvs-commits at redhat.com  Thu Jun 29 09:48:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 05:48:29 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.24,1.25
Message-ID: <200606290948.k5T9mTPd022681@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22609

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen : rebuilt



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- scim-pinyin.spec	29 Jun 2006 09:43:39 -0000	1.24
+++ scim-pinyin.spec	29 Jun 2006 09:48:26 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11
+- rebuilt
+
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-10
 - add gettext-devel, automake, autoconf,libtool to buildreq 
 - use ./bootstrap



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:01:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:01:07 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#118277.patch, NONE,
	1.1 kdelibs-3.5.3-kde#123315.patch, NONE,
	1.1 kdelibs-3.5.3-kde#128842.patch, NONE,
	1.1 kdelibs-3.5.3-kde#128902.patch, NONE,
	1.1 kdelibs-3.5.3-kde#57159.patch, NONE,
	1.1 kdelibs-3.5.3-kde#65546.patch, NONE,
	1.1 kdelibs-3.5.3-kde#67849.patch, NONE, 1.1 kdelibs.spec,
	1.149, 1.150
Message-ID: <200606291001.k5TA17RJ003237@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19426

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#118277.patch kdelibs-3.5.3-kde#123315.patch 
	kdelibs-3.5.3-kde#128842.patch kdelibs-3.5.3-kde#128902.patch 
	kdelibs-3.5.3-kde#57159.patch kdelibs-3.5.3-kde#65546.patch 
	kdelibs-3.5.3-kde#67849.patch 
Log Message:
- apply upstream patches


kdelibs-3.5.3-kde#118277.patch:
 html/html_baseimpl.cpp      |   25 +++++++++++++++++++++++++
 html/html_baseimpl.h        |    4 ++++
 khtmlview.cpp               |   14 +++++++++-----
 rendering/render_form.h     |    5 -----
 rendering/render_frames.h   |    8 ++++++++
 rendering/render_object.cpp |   10 +++++++---
 rendering/render_replaced.h |    5 +++++
 7 files changed, 58 insertions(+), 13 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#118277.patch ---
Index: khtml/khtmlview.cpp
===================================================================
--- khtml/khtmlview.cpp	(Revision 555344)
+++ khtml/khtmlview.cpp	(Revision 555345)
@@ -660,7 +660,14 @@
 	QWidget *w = it.current();
 	RenderWidget* rw = static_cast<RenderWidget*>( it.currentKey() );
 	if (w && rw && !rw->isKHTMLWidget()) { 
-            QRect g = w->geometry();
+            int x, y;
+            rw->absolutePosition(x, y);
+            contentsToViewport(x, y, x, y);
+            int pbx = rw->borderLeft()+rw->paddingLeft();
+            int pby = rw->borderTop()+rw->paddingTop();
+            QRect g = QRect(x+pbx, y+pby, 
+                            rw->width()-pbx-rw->borderRight()-rw->paddingRight(), 
+                            rw->height()-pby-rw->borderBottom()-rw->paddingBottom());
             if ( !rw->isFrame() && ((g.top() > pt.y()+eh) || (g.bottom() <= pt.y()) ||
                                     (g.right() <= pt.x()) || (g.left() > pt.x()+ew) ))
                 continue;
@@ -673,10 +680,7 @@
                 mask = mask.intersect( QRect(g.x(),g.y(),g.width(),g.height()) );
                 cr -= mask;
             } else {
-                int x, y;
-                rw->absolutePosition(x,y);
-                contentsToViewport(x,y,x,y);
-                cr -= QRect(x,y,rw->width(),rw->height());
+                cr -= g;
             }
         }
     }
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 555344)
+++ khtml/html/html_baseimpl.cpp	(Revision 555345)
@@ -584,6 +584,7 @@
     marginWidth = 0;
     marginHeight = 0;
     needWidgetUpdate = false;
+    m_frame = true;
 }
 
 HTMLIFrameElementImpl::~HTMLIFrameElementImpl()
@@ -615,17 +616,41 @@
         needWidgetUpdate = true; // ### do this for scrolling, margins etc?
         HTMLFrameElementImpl::parseAttribute( attr );
         break;
+    case ATTR_FRAMEBORDER:
+    {
+        m_frame = (!attr->val() || attr->value().toInt() > 0);
+        if (attached()) updateFrame();
+    }
     default:
         HTMLFrameElementImpl::parseAttribute( attr );
     }
 }
 
+void HTMLIFrameElementImpl::updateFrame()
+{
+    if (m_frame) {
+        addCSSProperty(CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_OUTSET);
+        addCSSProperty(CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_OUTSET);
+        addCSSProperty(CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_OUTSET);
+        addCSSProperty(CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_OUTSET);
+        addCSSLength(CSS_PROP_BORDER_WIDTH, "2");
+    } else {
+        addCSSProperty(CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_NONE);
+        addCSSProperty(CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_NONE);
+        addCSSProperty(CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_NONE);
+        addCSSProperty(CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_NONE);
+        removeCSSProperty(CSS_PROP_BORDER_WIDTH);
+    }
+
+}
+
 void HTMLIFrameElementImpl::attach()
 {
     assert(!attached());
     assert(!m_render);
     assert(parentNode());
 
+    updateFrame();
     name = getAttribute(ATTR_NAME);
     if (name.isNull())
         name = getAttribute(ATTR_ID);
Index: khtml/html/html_baseimpl.h
===================================================================
--- khtml/html/html_baseimpl.h	(Revision 555344)
+++ khtml/html/html_baseimpl.h	(Revision 555345)
@@ -190,7 +190,11 @@
     virtual void recalcStyle( StyleChange ch );
 
 protected:
+
+    void updateFrame();
+
     bool needWidgetUpdate;
+    bool m_frame;
 };
 
 
Index: khtml/rendering/render_form.h
===================================================================
--- khtml/rendering/render_form.h	(Revision 555344)
+++ khtml/rendering/render_form.h	(Revision 555345)
@@ -78,11 +78,6 @@
 
     virtual bool isFormElement() const { return true; }
 
-    virtual int borderTop() const { return canHaveBorder() ? RenderWidget::borderTop() : 0; }
-    virtual int borderBottom() const { return canHaveBorder() ? RenderWidget::borderBottom() : 0; }
-    virtual int borderLeft() const { return canHaveBorder() ? RenderWidget::borderLeft() : 0; }
-    virtual int borderRight() const { return canHaveBorder() ? RenderWidget::borderRight() : 0; }
-
     // form elements never have padding
     virtual int paddingTop() const { return 0; }
     virtual int paddingBottom() const { return 0; }
Index: khtml/rendering/render_frames.h
===================================================================
--- khtml/rendering/render_frames.h	(Revision 555344)
+++ khtml/rendering/render_frames.h	(Revision 555345)
@@ -130,6 +130,12 @@
     virtual const char *renderName() const { return "RenderFrame"; }
     virtual bool isFrame() const { return true; }
 
+    // frames never have padding
+    virtual int paddingTop() const { return 0; }
+    virtual int paddingBottom() const { return 0; }
+    virtual int paddingLeft() const { return 0; }
+    virtual int paddingRight() const { return 0; }
+
     DOM::HTMLFrameElementImpl *element() const
     { return static_cast<DOM::HTMLFrameElementImpl*>(RenderObject::element()); }
 
@@ -150,6 +156,8 @@
 
     virtual void layout( );
     virtual void updateWidget();
+    
+    virtual bool canHaveBorder() const { return true; }
 
     virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const QString& serviceType );
 
Index: khtml/rendering/render_replaced.h
===================================================================
--- khtml/rendering/render_replaced.h	(Revision 555344)
+++ khtml/rendering/render_replaced.h	(Revision 555345)
@@ -146,6 +146,11 @@
     bool m_needsMask;
 
 public:
+    virtual int borderTop() const { return canHaveBorder() ? RenderReplaced::borderTop() : 0; }
+    virtual int borderBottom() const { return canHaveBorder() ? RenderReplaced::borderBottom() : 0; }
+    virtual int borderLeft() const { return canHaveBorder() ? RenderReplaced::borderLeft() : 0; }
+    virtual int borderRight() const { return canHaveBorder() ? RenderReplaced::borderRight() : 0; }
+
     class EventPropagator : public QWidget {
     public:
         void sendEvent(QEvent *e);
Index: khtml/rendering/render_object.cpp
===================================================================
--- khtml/rendering/render_object.cpp	(Revision 555344)
+++ khtml/rendering/render_object.cpp	(Revision 555345)
@@ -2182,9 +2182,13 @@
             QRegion r = l ? l->getMask() : QRegion();
             int x,y;
             if (!r.isNull() && curr->absolutePosition(x,y)) {
-                x+= curr->borderLeft()+curr->paddingLeft();
-                y+= curr->borderBottom()+curr->paddingBottom();
-                r = r.intersect(QRect(x,y,curr->width(),curr->height()));
+                int pbx = curr->borderLeft()+curr->paddingLeft();
+                int pby = curr->borderTop()+curr->paddingTop();
+                x+= pbx;
+                y+= pby;
+                r = r.intersect(QRect(x,y,
+                                  curr->width()-pbx-curr->borderRight()-curr->paddingRight(),
+                                  curr->height()-pby-curr->borderBottom()-curr->paddingBottom()));
 #ifdef MASK_DEBUG
                 QMemArray<QRect> ar = r.rects();
                 kdDebug(6040) << "|| Setting widget mask for " << curr->information() << endl;

kdelibs-3.5.3-kde#123315.patch:
 kdirwatch.cpp |   69 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 47 insertions(+), 22 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#123315.patch ---
Index: kio/kio/kdirwatch.cpp
===================================================================
--- kio/kio/kdirwatch.cpp	(Revision 555363)
+++ kio/kio/kdirwatch.cpp	(Revision 555364)
@@ -407,9 +407,6 @@
       if ( event->len )
         path = QFile::decodeName( QCString( event->name, event->len ) );
 
-      if ( event->mask & IN_IGNORED )
-        continue;
-
       if ( path.length() && isNoisyFile( path.latin1() ) )
         continue;
 
@@ -428,12 +425,15 @@
             if( event->mask & IN_DELETE_SELF) {
               kdDebug(7001) << "-->got deleteself signal for " << e->path << endl;
               e->m_status = NonExistent;
-              //(void) inotify_rm_watch( m_inotify_fd, e->wd );
-              addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+              if (e->isDir)
+                addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+              else
+                addEntry(0, QFileInfo(e->path).dirPath(true), e, true);
             }
+            if ( event->mask & IN_IGNORED ) {
+              e->wd = 0;
+            }
             if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) {
-              kdDebug(7001) << "-->got new subfile " << path << " in " << e->path << endl;
-
               Entry *sub_entry = e->m_entries.first();
               for(;sub_entry; sub_entry = e->m_entries.next())
                 if (sub_entry->path == e->path + "/" + path) break;
@@ -727,7 +727,10 @@
     return true;
 
   if ( e->m_status == NonExistent ) {
-    addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+    if (e->isDir) 
+      addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+    else
+      addEntry(0, QFileInfo(e->path).dirPath(true), e, true);
     return true;
   }
 
@@ -782,6 +785,7 @@
        (*it).m_entries.append(sub_entry);
        kdDebug(7001) << "Added already watched Entry " << path
 		     << " (for " << sub_entry->path << ")" << endl;
+
 #ifdef HAVE_DNOTIFY
        Entry* e = &(*it);
        if( (e->m_mode == DNotifyMode) && (e->dn_fd > 0) ) {
@@ -798,6 +802,21 @@
          }
        }
 #endif
+
+#ifdef HAVE_INOTIFY
+       Entry* e = &(*it);
+       if( (e->m_mode == INotifyMode) && (e->wd > 0) ) {
+         int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
+         if(!e->isDir)
+           mask |= IN_MODIFY|IN_ATTRIB;
+         else
+           mask |= IN_ONLYDIR;
+
+         inotify_rm_watch (m_inotify_fd, e->wd);
+         e->wd = inotify_add_watch( m_inotify_fd, QFile::encodeName( e->path ), mask);
+       }
+#endif
+ 
     }
     else {
        (*it).addClient(instance);
@@ -928,8 +947,12 @@
         m_inotify_fd << ", "  << e->wd <<
         ") for " << e->path << endl;
     }
-    else
-      removeEntry( 0, QDir::cleanDirPath( e->path+"/.." ), e );
+    else {
+      if (e->isDir)
+	removeEntry(0, QDir::cleanDirPath(e->path+"/.."), e);
+      else
+	removeEntry(0, QFileInfo(e->path).dirPath(true), e);
+    }
   }
 #endif
 
@@ -1167,15 +1190,6 @@
       return Changed;
     }
 
-#ifdef HAVE_INOTIFY
-    // for inotify we delay the initial stating till the first event in it
-    if ( e->m_status == Normal && e->m_ctime == invalid_ctime )
-    {
-      e->m_ctime = stat_buf.st_ctime;
-      e->m_nlink = stat_buf.st_nlink;
-    }
-#endif
-
     return NoChange;
   }
 
@@ -1278,7 +1292,7 @@
   // removeDir(), when called in slotDirty(), can cause a crash otherwise
   delayRemove = true;
 
-#ifdef HAVE_DNOTIFY
+#if defined(HAVE_DNOTIFY) || defined(HAVE_INOTIFY)
   QPtrList<Entry> dList, cList;
 #endif
 
@@ -1306,6 +1320,16 @@
 
     int ev = scanEntry( &(*it) );
 
+
+#ifdef HAVE_INOTIFY
+    if ((*it).m_mode == INotifyMode && ev == Created && (*it).wd == 0) {
+      cList.append( &(*it) );
+      if (! useINotify( &(*it) )) {
+        useStat( &(*it) );
+      }
+    }
+#endif
+
 #ifdef HAVE_DNOTIFY
     if ((*it).m_mode == DNotifyMode) {
       if ((*it).isDir && (ev == Deleted)) {
@@ -1337,7 +1361,7 @@
   }
 
 
-#ifdef HAVE_DNOTIFY
+#if defined(HAVE_DNOTIFY) || defined(HAVE_INOTIFY)
   // Scan parent of deleted directories for new creation
   Entry* e;
   for(e=dList.first();e;e=dList.next())
@@ -1542,7 +1566,8 @@
 	kdDebug(7001) << "    dependent entries:" << endl;
 	Entry* d = e->m_entries.first();
 	for(;d; d = e->m_entries.next()) {
-	  kdDebug(7001) << "      " << d->path << endl;
+          kdDebug(7001) << "      " << d << endl;
+	  kdDebug(7001) << "      " << d->path << " (" << d << ") " << endl;
 	}
       }
     }

kdelibs-3.5.3-kde#128842.patch:
 ustring.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#128842.patch ---
Index: kjs/ustring.cpp
===================================================================
--- kjs/ustring.cpp	(Revision 549505)
+++ kjs/ustring.cpp	(Revision 549506)
@@ -131,18 +131,20 @@
 UChar UChar::toLower() const
 {
   // ### properly support unicode tolower
-  if (uc >= 256 || islower(uc))
+  if (uc >= 256)
     return *this;
 
-  return (unsigned char)tolower(uc);
+  // tolower is locale-dependent, don't use it.
+  return static_cast<unsigned char>( ( ( uc >= 'A' ) && ( uc <= 'Z' ) ) ? ( (int)uc + 'a' - 'A' ) : uc );
 }
 
 UChar UChar::toUpper() const
 {
-  if (uc >= 256 || isupper(uc))
+  if (uc >= 256)
     return *this;
 
-  return (unsigned char)toupper(uc);
+  // toupper is locale-dependent, don't use it.
+  return static_cast<unsigned char>( ( ( uc >= 'a' ) && ( uc <= 'z' ) ) ? ( (int)uc + 'A' - 'a' ) : uc );
 }
 
 UCharReference& UCharReference::operator=(UChar c)

kdelibs-3.5.3-kde#128902.patch:
 kjs_window.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.3-kde#128902.patch ---
Index: khtml/ecma/kjs_window.cpp
===================================================================
--- khtml/ecma/kjs_window.cpp	(Revision 549887)
+++ khtml/ecma/kjs_window.cpp	(Revision 549888)
@@ -2464,8 +2464,10 @@
     break;
   case Location::Reload: {
     KHTMLPart *khtmlpart = ::qt_cast<KHTMLPart *>(part);
-    if (part)
+    if (khtmlpart)
       khtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
+    else
+      part->openURL(part->url());
     break;
   }
   case Location::ToString:

kdelibs-3.5.3-kde#57159.patch:
 css/css_stylesheetimpl.cpp |    4 ++++
 xml/dom_docimpl.cpp        |   12 ++++++++++--
 xml/dom_docimpl.h          |    6 +++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#57159.patch ---
Index: khtml/css/css_stylesheetimpl.cpp
===================================================================
--- khtml/css/css_stylesheetimpl.cpp	(Revision 555956)
+++ khtml/css/css_stylesheetimpl.cpp	(Revision 555957)
@@ -194,6 +194,8 @@
     // HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the specified index e.g. if an
     //@import rule is inserted after a standard rule set or other at-rule.
     m_lstChildren->insert(index, r);
+    if (m_doc) 
+        m_doc->updateStyleSelector(true /*shallow*/);
     return index;
 }
 
@@ -211,6 +213,8 @@
         return;
     }
     b->deref();
+    if (m_doc)
+        m_doc->updateStyleSelector(true /*shallow*/);
 }
 
 void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri)
Index: khtml/xml/dom_docimpl.cpp
===================================================================
--- khtml/xml/dom_docimpl.cpp	(Revision 555956)
+++ khtml/xml/dom_docimpl.cpp	(Revision 555957)
@@ -1976,7 +1976,7 @@
     if (exceptioncode) *exceptioncode = excode;
 }
 
-void DocumentImpl::updateStyleSelector()
+void DocumentImpl::updateStyleSelector(bool shallow)
 {
 //    kdDebug() << "PENDING " << m_pendingStylesheets << endl;
 
@@ -1984,7 +1984,10 @@
     if (m_pendingStylesheets > 0)
         return;
 
-    recalcStyleSelector();
+    if (shallow)
+        rebuildStyleSelector();
+    else
+        recalcStyleSelector();
     recalcStyle(Force);
 #if 0
 
@@ -2134,6 +2137,11 @@
     for (; it.current(); ++it)
 	it.current()->deref();
 
+    rebuildStyleSelector();
+}
+
+void DocumentImpl::rebuildStyleSelector()
+{
     // Create a new style selector
     delete m_styleSelector;
     QString usersheet = m_usersheet;
Index: khtml/xml/dom_docimpl.h
===================================================================
--- khtml/xml/dom_docimpl.h	(Revision 555956)
+++ khtml/xml/dom_docimpl.h	(Revision 555957)
@@ -258,10 +258,14 @@
      * <LINK>, <STYLE> or <BODY> elements, as well as processing instructions (XML documents only). A list is
      * constructed from these which is used to create the a new style selector which collates all of the stylesheets
      * found and is used to calculate the derived styles for all rendering objects.
+     *
+     * @param shallow If the stylesheet list for the document is unchanged, with only added or removed rules 
+     * in existing sheets, then set this argument to true for efficiency.
      */
-    void updateStyleSelector();
+    void updateStyleSelector(bool shallow=false);
 
     void recalcStyleSelector();
+    void rebuildStyleSelector();
 
     QString nextState();
 

kdelibs-3.5.3-kde#65546.patch:
 dtd.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#65546.patch ---
Index: khtml/html/dtd.cpp
===================================================================
--- khtml/html/dtd.cpp	(Revision 549400)
+++ khtml/html/dtd.cpp	(Revision 549401)
@@ -599,8 +599,8 @@
         // _1 *
         return check_array(childID, tag_list_1) || check_array(childID, tag_list_6);
     case ID_P:
-        // P: ( _0 | TABLE ) *
-        return check_array(childID, tag_list_0) || (!strict && childID == ID_TABLE);
+        // P: ( _0 | TABLE | NOSCRIPT) *
+        return check_array(childID, tag_list_0) || (!strict && (childID == ID_TABLE || childID == ID_NOSCRIPT));
     case ID_H1:
     case ID_H2:
     case ID_H3:

kdelibs-3.5.3-kde#67849.patch:
 table_layout.cpp |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#67849.patch ---
Index: khtml/rendering/table_layout.cpp
===================================================================
--- khtml/rendering/table_layout.cpp	(Revision 552381)
+++ khtml/rendering/table_layout.cpp	(Revision 552382)
@@ -288,8 +288,6 @@
 	int base = tableWidth * totalPercent / 100;
 	if ( base > available )
 	    base = available;
-	else
-	    totalPercent = 100;
 
 #ifdef DEBUG_LAYOUT
     qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kdelibs.spec	29 Jun 2006 08:44:52 -0000	1.149
+++ kdelibs.spec	29 Jun 2006 10:01:04 -0000	1.150
@@ -18,8 +18,6 @@
 %define dnotify 1
 %define arts 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
 Release: 5
 Summary: K Desktop Environment - Libraries
@@ -54,6 +52,13 @@
 Patch100: kdelibs-3.5.3-konqueror-khtml.patch
 Patch101: kdelibs-3.5.3-khtml-regression.patch
 Patch102: kdelibs-3.5.3.diff
+Patch103: kdelibs-3.5.3-kde#57159.patch
+Patch104: kdelibs-3.5.3-kde#118277.patch
+Patch105: kdelibs-3.5.3-kde#123315.patch
+Patch106: kdelibs-3.5.3-kde#65546.patch
+Patch107: kdelibs-3.5.3-kde#128842.patch
+Patch108: kdelibs-3.5.3-kde#128902.patch
+Patch109: kdelibs-3.5.3-kde#67849.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -186,6 +191,13 @@
 %patch100 -p1 -b .konqueror-khtml
 %patch101 -p1 -b .khtml-regression
 %patch102 -p0 -b .return-check
+%patch103 -p0 -b .kde#57159
+%patch104 -p0 -b .kde#118277
+%patch105 -p0 -b .kde#123315
+%patch106 -p0 -b .kde#65546
+%patch107 -p0 -b .kde#128842
+%patch108 -p0 -b .kde#128902
+%patch109 -p0 -b .kde#67849
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -215,9 +227,7 @@
    --enable-cups \
    --enable-mitshm \
    --with-xinerama \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
    --enable-pie \
 %if %{arts} == 0
    --without-arts \



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:17:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:17:48 -0400
Subject: rpms/coreutils/devel coreutils-sort-compatibility.patch,NONE,1.1
Message-ID: <200606291017.k5TAHm9x020134@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20121

Added Files:
	coreutils-sort-compatibility.patch 
Log Message:
Add the patch.

coreutils-sort-compatibility.patch:
 NEWS       |    4 ++++
 src/sort.c |   53 +++++++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 24 deletions(-)

--- NEW FILE coreutils-sort-compatibility.patch ---
--- coreutils-5.96/src/sort.c.sort-compatibility	2006-06-23 09:33:59.000000000 +0100
+++ coreutils-5.96/src/sort.c	2006-06-29 09:51:27.000000000 +0100
@@ -2784,37 +2784,42 @@
 	{
 	case 1:
 	  key = NULL;
-	  if (obsolete_usage && optarg[0] == '+')
+	  if (optarg[0] == '+')
 	    {
-	      /* Treat +POS1 [-POS2] as a key if possible; but silently
-		 treat an operand as a file if it is not a valid +POS1.  */
-	      key = new_key ();
-	      s = parse_field_count (optarg + 1, &key->sword, NULL);
-	      if (s && *s == '.')
-		s = parse_field_count (s + 1, &key->schar, NULL);
-	      if (! (key->sword | key->schar))
-		key->sword = SIZE_MAX;
-	      if (! s || *set_ordering (s, key, bl_start))
+	      bool minus_pos_usage = (optind != argc && argv[optind][0] == '-'
+				      && ISDIGIT (argv[optind][1]));
+	      obsolete_usage |= minus_pos_usage & ~posixly_correct;
+	      if (obsolete_usage)
 		{
-		  free (key);
-		  key = NULL;
-		}
-	      else
-		{
-		  if (optind != argc && argv[optind][0] == '-'
-		      && ISDIGIT (argv[optind][1]))
+		  /* Treat +POS1 [-POS2] as a key if possible; but silently
+		     treat an operand as a file if it is not a valid +POS1.  */
+		  key = new_key ();
+		  s = parse_field_count (optarg + 1, &key->sword, NULL);
+		  if (s && *s == '.')
+		    s = parse_field_count (s + 1, &key->schar, NULL);
+		  if (! (key->sword | key->schar))
+		    key->sword = SIZE_MAX;
+		  if (! s || *set_ordering (s, key, bl_start))
+		    {
+		      free (key);
+		      key = NULL;
+		    }
+		  else
 		    {
-		      char const *optarg1 = argv[optind++];
-		      s = parse_field_count (optarg1 + 1, &key->eword,
+		      if (minus_pos_usage)
+			{
+			  char const *optarg1 = argv[optind++];
+			  s = parse_field_count (optarg1 + 1, &key->eword,
 					     N_("invalid number after `-'"));
-		      if (*s == '.')
-			s = parse_field_count (s + 1, &key->echar,
+			  if (*s == '.')
+			    s = parse_field_count (s + 1, &key->echar,
 					       N_("invalid number after `.'"));
-		      if (*set_ordering (s, key, bl_end))
-			badfieldspec (optarg1,
+			  if (*set_ordering (s, key, bl_end))
+			    badfieldspec (optarg1,
 				      N_("stray character in field spec"));
+			}
+		      insertkey (key);
 		    }
-		  insertkey (key);
 		}
 	    }
 	  if (! key)
--- coreutils-5.96/NEWS.sort-compatibility	2006-06-23 09:33:59.000000000 +0100
+++ coreutils-5.96/NEWS	2006-06-29 09:51:27.000000000 +0100
@@ -46,6 +46,10 @@
   systems (which can be caused by shadowed mount points or by chrooted
   bind mounts) are now dummies, too.
 
+  sort now supports obsolete usages like "sort +1 -2" when conforming
+  to POSIX 1003.1-2001, since this is a pure extension to POSIX.
+  However, "sort +1" still sorts the file named "+1".
+
   stat's --format=FMT option now works the way it did before 5.3.0:
   FMT is automatically newline terminated.  The first stable release
   containing this change was 5.92.



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:23:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:23:33 -0400
Subject: rpms/libtool/devel libtool-1.5.22-misc.patch,NONE,1.1
Message-ID: <200606291023.k5TANXqY020221@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20207

Added Files:
	libtool-1.5.22-misc.patch 
Log Message:
- miscellaneous upstream fixes

libtool-1.5.22-misc.patch:
 libltdl/ltdl.c |    2 
 libtool.m4     |    2 
 ltmain.in      |  162 ++++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 108 insertions(+), 58 deletions(-)

--- NEW FILE libtool-1.5.22-misc.patch ---
--- libtool-1.5.22/ltmain.in.rh1	2006-06-08 12:37:19.000000000 +0200
+++ libtool-1.5.22/ltmain.in	2006-06-08 13:15:59.000000000 +0200
@@ -46,10 +46,16 @@
 VERSION=@VERSION@
 TIMESTAMP="@TIMESTAMP@"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
--- libtool-1.5.22/libtool.m4.rh1	2006-06-08 12:32:23.000000000 +0200
+++ libtool-1.5.22/libtool.m4	2006-06-08 12:36:53.000000000 +0200
@@ -6378,6 +6378,7 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6410,5 +6411,6 @@
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
--- libtool-1.5.22/libltdl/ltdl.c.syntax1	2006-06-08 12:02:39.000000000 +0200
+++ libtool-1.5.22/libltdl/ltdl.c	2006-06-08 12:03:09.000000000 +0200
@@ -894,7 +894,7 @@
 		(*lt_dlmutex_seterror_func) (errormsg);		\
 	else 	lt_dllast_error = (errormsg);	} LT_STMT_END
 #define LT_DLMUTEX_GETERROR(errormsg)		LT_STMT_START {	\
-	if (lt_dlmutex_seterror_func)				\
+	if (lt_dlmutex_geterror_func)				\
 		(errormsg) = (*lt_dlmutex_geterror_func) ();	\
 	else	(errormsg) = lt_dllast_error;	} LT_STMT_END
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:24:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:24:05 -0400
Subject: rpms/libtool/devel libtool.spec,1.41,1.42
Message-ID: <200606291024.k5TAO5fw020248@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20235

Modified Files:
	libtool.spec 
Log Message:
- miscellaneous upstream fixes


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libtool.spec	6 Jun 2006 11:39:25 -0000	1.41
+++ libtool.spec	29 Jun 2006 10:24:03 -0000	1.42
@@ -4,13 +4,17 @@
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:  	4
+Release:  	5
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
 URL:		http://www.gnu.org/software/libtool/
 BuildRoot:	%{_tmppath}/%{name}-root
 Patch1:		libtool-1.5.18-multilib.patch
+
+# Remove in libtool-1.5.23:
+Patch2:		libtool-1.5.22-misc.patch
+
 PreReq:		/sbin/install-info
 BuildRequires:	autoconf >= 2.59, automake >= 1.9.2, texinfo
 # make sure we can configure all supported langs
@@ -72,6 +76,7 @@
 %prep
 %setup -n libtool-%{upstream_version} -q
 %patch1 -p1 -b .multilib
+%patch2 -p1
 
 %build
 
@@ -141,6 +146,9 @@
 
 
 %changelog
+* Thu Jun 29 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-5
+- miscellaneous upstream fixes
+
 * Tue Jun 06 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-4
 - don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:29:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:29:22 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.17, 1.18 m17n-db.spec, 1.24,
	1.25 sources, 1.19, 1.20
Message-ID: <200606291029.k5TATMZc020336@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20321

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Added hi-remington keymap, thanks to rranjan & aalam



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	8 Jun 2006 07:28:29 -0000	1.17
+++ .cvsignore	29 Jun 2006 10:29:20 -0000	1.18
@@ -6,3 +6,4 @@
 m17n-db-indic-0.4.4.tar.gz
 m17n-db-indic-0.4.5.tar.gz
 m17n-db-indic-0.4.6.tar.gz
+m17n-db-indic-0.4.7.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- m17n-db.spec	8 Jun 2006 07:28:29 -0000	1.24
+++ m17n-db.spec	29 Jun 2006 10:29:20 -0000	1.25
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.6
+%define indic_ver 0.4.7
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	9%{?dist}
+Release:	10%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -695,6 +695,10 @@
 
 
 %changelog
+* Thu Jun 29 2006 Mayank Jain <majain at redhat.com>
+- Added hi-remington keymap - <rranjan at redhat.com>
+- Added hi-remington.png - <aalam at redhat.com>
+
 * Thu Jun 8 2006 Mayank Jain <majain at redhat.com>
 - Added hi-typewriter keymap.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Jun 2006 07:28:29 -0000	1.19
+++ sources	29 Jun 2006 10:29:20 -0000	1.20
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-b76d83dc4c1176e05a1a0add75a71aff  m17n-db-indic-0.4.6.tar.gz
+c725c5b9130db2de71cdb67d15a2caa9  m17n-db-indic-0.4.7.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:55:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:55:22 -0400
Subject: rpms/paps/devel paps-cups.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 paps-0.6.6-encoding.patch, 1.1, 1.2 paps.spec, 1.2, 1.3
Message-ID: <200606291055.k5TAtMcG018852@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18821

Modified Files:
	.cvsignore paps-0.6.6-encoding.patch paps.spec 
Added Files:
	paps-cups.patch 
Log Message:
* Thu Jun 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-8
- use dist tag.
- paps-cups.patch: applied to work paps as CUPS filter.
- paps-0.6.6-encoding.patch: null-terminates the output.

paps-cups.patch:
 configure.in    |   13 ++++++
 src/Makefile.am |    4 -
 src/paps.c      |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 128 insertions(+), 7 deletions(-)

--- NEW FILE paps-cups.patch ---
diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
--- paps-0.6.6.orig/configure.in	2006-04-28 04:41:36.000000000 +0900
+++ paps-0.6.6/configure.in	2006-06-29 17:45:59.000000000 +0900
@@ -7,4 +7,17 @@
 AC_PROG_CC
 AM_PROG_LIBTOOL
 
+dnl ======================================================
+dnl check for CUPS
+dnl ======================================================
+AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+if test "$CUPS_CONFIG" = "no"; then
+  AC_MSG_ERROR([Please install cups development packages])
+fi
+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+CUPS_LIBS=`$CUPS_CONFIG --libs`
+
+AC_SUBST(CUPS_CFLAGS)
+AC_SUBST(CUPS_LIBS)
+
 AC_OUTPUT(Makefile src/Makefile doc/Makefile)
diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
--- paps-0.6.6.orig/src/Makefile.am	2006-06-20 20:40:11.000000000 +0900
+++ paps-0.6.6/src/Makefile.am	2006-06-29 19:09:12.000000000 +0900
@@ -5,10 +5,10 @@
 libpaps_a_incdir = $(includedir)
 
 bin_PROGRAMS = paps
-paps_CFLAGS  = -Wall 
+paps_CFLAGS  = -Wall $(CUPS_CFLAGS)
 paps_SOURCES = paps.c
 paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
-paps_LDFLAGS = `pkg-config --libs pangoft2`
+paps_LDFLAGS = `pkg-config --libs pangoft2` $(CUPS_LIBS)
 paps_DEPENDENCIES = $(noinst_LIBRARIES)
 
 EXTRA_DIST = test_libpaps.c paps.1
diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
--- paps-0.6.6.orig/src/paps.c	2006-06-20 20:40:11.000000000 +0900
+++ paps-0.6.6/src/paps.c	2006-06-29 19:06:46.000000000 +0900
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <time.h>
 #include <locale.h>
+#include <cups/cups.h>
 
 #define BUFSIZE 1024
 #define DEFAULT_FONT_FAMILY	"Monospace"
@@ -79,6 +80,7 @@
   gboolean do_justify;
   gboolean do_separation_line;
   gboolean do_draw_contour;
+  gboolean do_wordwrap;
   PangoDirection pango_dir;
   gchar *filename;
   gchar *header_font_desc;
@@ -244,8 +246,8 @@
   int num_pages = 1;
   int gutter_width = 40;
   int total_gutter_width;
-  int page_width = paper_sizes[0].width;
-  int page_height = paper_sizes[0].height;
+  int page_width = -1;
+  int page_height = -1;
   int do_tumble = -1;   /* -1 means not initialized */
   int do_duplex = -1;
   gchar *paps_header = NULL;
@@ -253,12 +255,112 @@
   gchar *filename_in, *title, *text;
   int header_sep = 20;
   GIConv cvh = NULL;
+  gboolean cups_mode = FALSE, do_wordwrap = TRUE;
 
   /* Prerequisite when using glib. */
   g_type_init();
   
   g_option_context_add_main_entries(ctxt, entries, NULL);
   
+  /* check if the process is being invoked as CUPS filter */
+  G_STMT_START {
+	gchar *prgname = g_path_get_basename(argv[0]);
+	cups_option_t *options = NULL;
+	ppd_file_t *ppd;
+	ppd_size_t *pagesize;
+	int num_options;
+	const char *val;
+
+	if (strncmp(prgname, "texttopaps", 10) == 0) {
+		/* argument format should be job-id user title copies options [file] */
+		cups_mode = TRUE;
+		if (argc < 6 || argc > 7) {
+			fprintf(stderr, "ERROR: %s job-id user title copies options [file]\n", prgname);
+			exit(1);
+		}
+		if (argc == 6) {
+			filename_in = "stdin";
+			IN = stdin;
+		} else {
+			filename_in = argv[6];
+			if ((IN = fopen(argv[6], "rb")) == NULL) {
+				fprintf(stderr, "ERROR: unable to open print file -\n");
+				exit(1);
+			}
+		}
+		title = argv[3];
+		num_options = cupsParseOptions(argv[5], 0, &options);
+
+		if ((val = cupsGetOption("prettyprint", num_options, options)) != NULL &&
+		    g_ascii_strcasecmp(val, "no") &&
+		    g_ascii_strcasecmp(val, "off") &&
+		    g_ascii_strcasecmp(val, "false")) {
+			/* XXX: need to support the keywords highlighting */
+		}
+		ppd = ppdOpenFile(getenv("PPD"));
+		ppdMarkDefaults(ppd);
+		cupsMarkOptions(ppd, num_options, options);
+
+		if ((pagesize = ppdPageSize(ppd, NULL)) != NULL) {
+			page_width = pagesize->width;
+			page_height = pagesize->length;
+			top_margin = pagesize->length - pagesize->top;
+			bottom_margin = pagesize->bottom;
+			left_margin = pagesize->left;
+			right_margin = pagesize->width - pagesize->right;
+		}
+
+		if ((val = cupsGetOption("landscape", num_options, options)) != NULL) {
+			if (g_ascii_strcasecmp(val, "no") != 0 &&
+			    g_ascii_strcasecmp(val, "off") != 0 &&
+			    g_ascii_strcasecmp(val, "false") != 0) {
+				/* XXX: need to support other orientations? */
+				do_landscape = TRUE;
+			}
+		}
+		/* XXX: need to support orientation-requested? */
+		if ((val = cupsGetOption("page-left", num_options, options)) != NULL) {
+			left_margin = (int)atof(val);
+		}
+		if ((val = cupsGetOption("page-right", num_options, options)) != NULL) {
+			right_margin = (int)atof(val);
+		}
+		if ((val = cupsGetOption("page-bottom", num_options, options)) != NULL) {
+			bottom_margin = (int)atof(val);
+		}
+		if ((val = cupsGetOption("page-top", num_options, options)) != NULL) {
+			top_margin = (int)atof(val);
+		}
+		if (ppdIsMarked(ppd, "Duplex", "DuplexNoTumble") ||
+		    ppdIsMarked(ppd, "Duplex", "DuplexTumble") ||
+		    ppdIsMarked(ppd, "JCLDuplex", "DuplexNoTumble") ||
+		    ppdIsMarked(ppd, "JCLDuplex", "DuplexTumble") ||
+		    ppdIsMarked(ppd, "EFDuplex", "DuplexNoTumble") ||
+		    ppdIsMarked(ppd, "EFDuplex", "DuplexTumble") ||
+		    ppdIsMarked(ppd, "KD03Duplex", "DuplexNoTumble") ||
+		    ppdIsMarked(ppd, "KD03Duplex", "DuplexTumble"))
+			do_duplex = TRUE;
+		if ((val = cupsGetOption("wrap", num_options, options)) != NULL) {
+			do_wordwrap = !g_ascii_strcasecmp(val, "true") ||
+				      !g_ascii_strcasecmp(val, "on") ||
+				      !g_ascii_strcasecmp(val, "yes");
+		}
+		if ((val = cupsGetOption("columns", num_options, options)) != NULL) {
+			num_columns = atoi(val);
+		}
+		if ((val = cupsGetOption("cpi", num_options, options)) != NULL) {
+			/* XXX */
+		}
+		if ((val = cupsGetOption("lpi", num_options, options)) != NULL) {
+			/* XXX */
+		}
+		if (getenv("CHARSET") != NULL)
+			encoding = getenv("CHARSET");
+	}
+  } G_STMT_END;
+
+  if (!cups_mode) {
+
   /* Parse command line */
   if (!g_option_context_parse(ctxt, &argc, &argv, &error))
     {
@@ -285,6 +387,8 @@
       IN = stdin;
     }
   title = filename_in;
+
+  } /* if (!cups_mode) */
   
   paps = paps_new();
   pango_context = paps_get_pango_context (paps);
@@ -303,8 +407,10 @@
   pango_context_set_font_description (pango_context, font_description);
 
   /* Page layout */
-  page_width = paper_sizes[(int)paper_type].width;
-  page_height = paper_sizes[(int)paper_type].height;
+  if (page_width < 0)
+      page_width = paper_sizes[(int)paper_type].width;
+  if (page_height < 0)
+      page_height = paper_sizes[(int)paper_type].height;
   
   if (num_columns == 1)
     total_gutter_width = 0;
@@ -340,6 +446,7 @@
   page_layout.header_ypos = page_layout.top_margin;
   page_layout.header_height = 0;
   page_layout.footer_height = 0;
+  page_layout.do_wordwrap = do_wordwrap;
   if (do_draw_header)
     page_layout.header_sep =  header_sep;
   else
@@ -495,7 +602,8 @@
                                       page_layout->pango_dir == PANGO_DIRECTION_LTR
                                       ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
           pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
-	  pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
+	  if (page_layout->do_wordwrap)
+	      pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
           para->height = 0;
 
           if (wc == '\f')


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2006 07:11:43 -0000	1.2
+++ .cvsignore	29 Jun 2006 10:55:20 -0000	1.3
@@ -1 +1,4 @@
+*rpm
+*gz
+*bz2
 paps-0.6.6.tar.gz

paps-0.6.6-encoding.patch:
 paps.c |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

Index: paps-0.6.6-encoding.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-0.6.6-encoding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paps-0.6.6-encoding.patch	27 Jun 2006 07:11:43 -0000	1.1
+++ paps-0.6.6-encoding.patch	29 Jun 2006 10:55:20 -0000	1.2
@@ -80,7 +80,7 @@
        if (ferror (file))
          {
            fprintf(stderr, "%s: Error reading file.\n", g_get_prgname ());
-@@ -392,7 +412,19 @@
+@@ -392,7 +412,20 @@
        else if (bp == NULL)
          break;
  
@@ -96,6 +96,7 @@
 +              fprintf (stderr, "%s: Error while converting strings.\n", g_get_prgname ());
 +              return NULL;
 +            }
++          obuffer[BUFSIZE * 6 - 1 - oblen] = 0;
 +        }
 +      g_string_append (inbuf, bp);
      }


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paps.spec	27 Jun 2006 07:18:04 -0000	1.2
+++ paps.spec	29 Jun 2006 10:55:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	7.fc6
+Release:	8%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
@@ -22,6 +22,7 @@
 Patch7:		paps-0.6.6-lcctype.patch
 ## http://sourceforge.net/tracker/index.php?func=detail&aid=1512385&group_id=153049&atid=786239
 Patch8:		paps-0.6.6-wordwrap.patch
+Patch50:	paps-cups.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -39,6 +40,7 @@
 %patch6 -p1 -b .fontopt
 %patch7 -p1 -b .lcctype
 %patch8 -p1 -b .wordwrap
+%patch50 -p1 -b .cups
 aclocal
 automake
 autoconf
@@ -55,6 +57,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 
+# make a symlink for CUPS filter
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/cups/filter
+ln -s %{_bindir}/paps $RPM_BUILD_ROOT%{_libdir}/cups/filter/texttopaps
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -63,9 +69,15 @@
 %doc AUTHORS COPYING.LIB README TODO
 %{_bindir}/paps
 %{_mandir}/man1/paps.1*
+%{_libdir}/cups/filter/texttopaps
 
 
 %changelog
+* Thu Jun 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-8
+- use dist tag.
+- paps-cups.patch: applied to work paps as CUPS filter.
+- paps-0.6.6-encoding.patch: null-terminates the output.
+
 * Tue Jun 27 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-7
 - rebuilt to import into Core.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:59:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:59:08 -0400
Subject: rpms/man-pages/devel man-pages-2.34-inet.patch, NONE, 1.1 .cvsignore,
	1.23, 1.24 man-pages.spec, 1.42, 1.43 sources, 1.23, 1.24
Message-ID: <200606291059.k5TAx8mT020386@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19973

Modified Files:
	.cvsignore man-pages.spec sources 
Added Files:
	man-pages-2.34-inet.patch 
Log Message:
- update to 2.34
- add inet patch (#189147)


man-pages-2.34-inet.patch:
 inet.3 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE man-pages-2.34-inet.patch ---
--- man-pages-2.34/man3/inet.3.pom	2006-06-29 12:28:00.000000000 +0200
+++ man-pages-2.34/man3/inet.3	2006-06-29 12:40:04.000000000 +0200
@@ -70,7 +70,8 @@
 (255.255.255.255), and \fBinet_aton\fP() provides a cleaner way
 to indicate error return.
 .PP
-The \fBinet_network\fP() function extracts the network number in
+The \fBinet_network\fP() function extracts 
+a number suitable for use as an Internet address in
 host byte order from the address \fIcp\fP in numbers-and-dots
 notation.  If the input is invalid, \-1 is returned.
 .PP


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	15 May 2006 08:18:05 -0000	1.23
+++ .cvsignore	29 Jun 2006 10:59:05 -0000	1.24
@@ -1,3 +1,3 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
-man-pages-2.32.tar.bz2
+man-pages-2.34.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- man-pages.spec	26 May 2006 11:18:32 -0000	1.42
+++ man-pages.spec	29 Jun 2006 10:59:05 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
-Version: 2.32
-Release: 2
+Version: 2.34
+Release: 1
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
 Patch25: man-pages-2.29-sigprocmask.patch
+Patch26: man-pages-2.34-inet.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -63,6 +64,7 @@
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 %build
 
@@ -156,11 +158,13 @@
 %defattr(0644,root,root,0755)
 %doc README man-pages-%{version}.Announce POSIX-COPYRIGHT
 %{_mandir}/man*
-%{_mandir}/man*/*
 %{_mandir}/en/man*
-%{_mandir}/en/man*/*
 
 %changelog
+* Thu Jun 29 2006 Ivana Varekova <varekova at redhat.com> 2.34-1
+- update to 2.34
+- add inet patch (#189147)
+
 * Fri May 26 2006 Ivana Varekova <varekova at redhat.com> 2.32-2
 - add nss.5 man page (#192142)
 - add the man-pages directories (#192998)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	15 May 2006 08:18:05 -0000	1.23
+++ sources	29 Jun 2006 10:59:05 -0000	1.24
@@ -1,3 +1,3 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
-8e90f8312bdd35ec3e789bf67c9b0ee3  man-pages-2.32.tar.bz2
+fb8d9f55fef19ea5ab899437159c9420  man-pages-2.34.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jun 29 10:59:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 06:59:34 -0400
Subject: rpms/paps/devel paps.spec,1.3,1.4
Message-ID: <200606291059.k5TAxYL0020564@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20537

Modified Files:
	paps.spec 
Log Message:
added cups-devel to buildreq.


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paps.spec	29 Jun 2006 10:55:20 -0000	1.3
+++ paps.spec	29 Jun 2006 10:59:31 -0000	1.4
@@ -6,7 +6,7 @@
 URL:		http://paps.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	pango-devel automake autoconf libtool doxygen
+BuildRequires:	pango-devel automake autoconf libtool doxygen cups-devel
 Patch0:		paps-makefile.patch
 ## http://sourceforge.net/mailarchive/forum.php?thread_id=9329194&forum_id=47278
 Patch2:		paps-0.6.3-formfeed.patch



From fedora-cvs-commits at redhat.com  Thu Jun 29 11:06:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 07:06:41 -0400
Subject: rpms/autofs/devel .cvsignore, 1.11, 1.12 autofs.spec, 1.115,
	1.116 sources, 1.11, 1.12 autofs-5.0.0_beta5-auth-config.patch,
	1.1, NONE autofs-5.0.0_beta5-compile-warnings.patch, 1.1,
	NONE autofs-5.0.0_beta5-defaults_read_config-cleanup.patch,
	1.1, NONE autofs-5.0.0_beta5-get-dn-update.patch, 1.1,
	NONE autofs-5.0.0_beta5-get-dn.patch, 1.1,
	NONE autofs-5.0.0_beta5-ldap-default-auth.patch, 1.1,
	NONE autofs-5.0.0_beta5-lookup_init-cleanup.patch, 1.1,
	NONE autofs-5.0.0_beta5-lookup_yp-leaks.patch, 1.1,
	NONE autofs-5.0.0_beta5-mapclass-update.patch, 1.1,
	NONE autofs-5.0.0_beta5-mapclass.patch, 1.1,
	NONE autofs-5.0.0_beta5-misc-fixes.patch, 1.1,
	NONE autofs-5.0.0_beta5-override-system-macros.patch, 1.1,
	NONE autofs-5.0.0_beta5-parse-old-style-dn.patch, 1.1,
	NONE autofs-5.0.0_beta5-replicated-parse-error.patch, 1.1,
	NONE autofs-5.0.0_beta5-use-yp-map-order.patch, 1.1, NONE
Message-ID: <200606291106.k5TB6fFo021771@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21652

Modified Files:
	.cvsignore autofs.spec sources 
Removed Files:
	autofs-5.0.0_beta5-auth-config.patch 
	autofs-5.0.0_beta5-compile-warnings.patch 
	autofs-5.0.0_beta5-defaults_read_config-cleanup.patch 
	autofs-5.0.0_beta5-get-dn-update.patch 
	autofs-5.0.0_beta5-get-dn.patch 
	autofs-5.0.0_beta5-ldap-default-auth.patch 
	autofs-5.0.0_beta5-lookup_init-cleanup.patch 
	autofs-5.0.0_beta5-lookup_yp-leaks.patch 
	autofs-5.0.0_beta5-mapclass-update.patch 
	autofs-5.0.0_beta5-mapclass.patch 
	autofs-5.0.0_beta5-misc-fixes.patch 
	autofs-5.0.0_beta5-override-system-macros.patch 
	autofs-5.0.0_beta5-parse-old-style-dn.patch 
	autofs-5.0.0_beta5-replicated-parse-error.patch 
	autofs-5.0.0_beta5-use-yp-map-order.patch 
Log Message:
* Thu Jun 29 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-1
- consolidate to beta6, including:
  - mode change update for config file.
  - correction to get_query_dn fix from beta5-4.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Jun 2006 04:28:39 -0000	1.11
+++ .cvsignore	29 Jun 2006 11:06:37 -0000	1.12
@@ -1 +1 @@
-autofs-5.0.0_beta5.tar.bz2
+autofs-5.0.0_beta6.tar.bz2


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- autofs.spec	28 Jun 2006 03:46:12 -0000	1.115
+++ autofs.spec	29 Jun 2006 11:06:37 -0000	1.116
@@ -3,29 +3,14 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
-%define version 5.0.0_beta5
-%define release 6
+%define version 5.0.0_beta6
+%define release 1
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-Patch1: autofs-5.0.0_beta5-lookup_init-cleanup.patch
-Patch2: autofs-5.0.0_beta5-use-yp-map-order.patch
-Patch3: autofs-5.0.0_beta5-lookup_yp-leaks.patch
-Patch4: autofs-5.0.0_beta5-replicated-parse-error.patch
-Patch5: autofs-5.0.0_beta5-mapclass.patch
-Patch6: autofs-5.0.0_beta5-auth-config.patch
-Patch7: autofs-5.0.0_beta5-get-dn.patch
-Patch8: autofs-5.0.0_beta5-ldap-default-auth.patch
-Patch9: autofs-5.0.0_beta5-parse-old-style-dn.patch
-Patch10: autofs-5.0.0_beta5-get-dn-update.patch
-Patch11: autofs-5.0.0_beta5-compile-warnings.patch
-Patch12: autofs-5.0.0_beta5-override-system-macros.patch
-Patch13: autofs-5.0.0_beta5-mapclass-update.patch
-Patch14: autofs-5.0.0_beta5-misc-fixes.patch
-Patch15: autofs-5.0.0_beta5-defaults_read_config-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -64,21 +49,6 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -135,6 +105,11 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jun 29 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-1
+- consolidate to beta6, including:
+  - mode change update for config file.
+  - correction to get_query_dn fix from beta5-4.
+
 * Wed Jun 28 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta5-6
 - cleanup defaults_read_config (Jeff Moyer).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Jun 2006 04:28:39 -0000	1.11
+++ sources	29 Jun 2006 11:06:37 -0000	1.12
@@ -1 +1 @@
-fbdf7e31ed624dbabe88fed2f56b5e70  autofs-5.0.0_beta5.tar.bz2
+27174cdcc0a9ffcfb64f527f534d0525  autofs-5.0.0_beta6.tar.bz2


--- autofs-5.0.0_beta5-auth-config.patch DELETED ---


--- autofs-5.0.0_beta5-compile-warnings.patch DELETED ---


--- autofs-5.0.0_beta5-defaults_read_config-cleanup.patch DELETED ---


--- autofs-5.0.0_beta5-get-dn-update.patch DELETED ---


--- autofs-5.0.0_beta5-get-dn.patch DELETED ---


--- autofs-5.0.0_beta5-ldap-default-auth.patch DELETED ---


--- autofs-5.0.0_beta5-lookup_init-cleanup.patch DELETED ---


--- autofs-5.0.0_beta5-lookup_yp-leaks.patch DELETED ---


--- autofs-5.0.0_beta5-mapclass-update.patch DELETED ---


--- autofs-5.0.0_beta5-mapclass.patch DELETED ---


--- autofs-5.0.0_beta5-misc-fixes.patch DELETED ---


--- autofs-5.0.0_beta5-override-system-macros.patch DELETED ---


--- autofs-5.0.0_beta5-parse-old-style-dn.patch DELETED ---


--- autofs-5.0.0_beta5-replicated-parse-error.patch DELETED ---


--- autofs-5.0.0_beta5-use-yp-map-order.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 11:28:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 07:28:03 -0400
Subject: rpms/paps/devel paps.spec,1.4,1.5
Message-ID: <200606291128.k5TBS3aJ011169@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11135

Modified Files:
	paps.spec 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com>
- CUPS filter lives in CUPS_SERVERBIN, which is /usr/lib/cups on all
  architectures -- not %{_libdir}/cups.



Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- paps.spec	29 Jun 2006 10:59:31 -0000	1.4
+++ paps.spec	29 Jun 2006 11:28:01 -0000	1.5
@@ -58,8 +58,8 @@
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 
 # make a symlink for CUPS filter
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/cups/filter
-ln -s %{_bindir}/paps $RPM_BUILD_ROOT%{_libdir}/cups/filter/texttopaps
+%{__mkdir_p} $RPM_BUILD_ROOT/usr/lib/cups/filter # Not libdir
+ln -s %{_bindir}/paps $RPM_BUILD_ROOT/usr/lib/cups/filter/texttopaps
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,10 +69,14 @@
 %doc AUTHORS COPYING.LIB README TODO
 %{_bindir}/paps
 %{_mandir}/man1/paps.1*
-%{_libdir}/cups/filter/texttopaps
+/usr/lib/cups/filter/texttopaps
 
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com>
+- CUPS filter lives in CUPS_SERVERBIN, which is /usr/lib/cups on all
+  architectures -- not %%{_libdir}/cups.
+
 * Thu Jun 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-8
 - use dist tag.
 - paps-cups.patch: applied to work paps as CUPS filter.



From fedora-cvs-commits at redhat.com  Thu Jun 29 11:53:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 07:53:10 -0400
Subject: rpms/cups/devel cups-paps.patch,NONE,1.1 cups.spec,1.220,1.221
Message-ID: <200606291153.k5TBrAYH000878@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv817

Modified Files:
	cups.spec 
Added Files:
	cups-paps.patch 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-15
- Require paps and use it for printing text (bug #197214).


cups-paps.patch:
 mime.convs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE cups-paps.patch ---
--- cups-1.2.1/conf/mime.convs.paps	2006-06-29 12:51:14.000000000 +0100
+++ cups-1.2.1/conf/mime.convs	2006-06-29 12:51:54.000000000 +0100
@@ -46,12 +46,12 @@
 application/pdf		application/postscript	33	pdftops
 application/postscript	application/vnd.cups-postscript	66	pstops
 application/vnd.hp-HPGL	application/postscript	66	hpgltops
-application/x-cshell	application/postscript	33	texttops
-application/x-csource	application/postscript	33	texttops
-application/x-perl	application/postscript	33	texttops
-application/x-shell	application/postscript	33	texttops
-text/plain		application/postscript	33	texttops
-text/html		application/postscript	33	texttops
+application/x-cshell	application/postscript	33	texttopaps
+application/x-csource	application/postscript	33	texttopaps
+application/x-perl	application/postscript	33	texttopaps
+application/x-shell	application/postscript	33	texttopaps
+text/plain		application/postscript	33	texttopaps
+text/html		application/postscript	33	texttopaps
 image/gif		application/vnd.cups-postscript	66	imagetops
 image/png		application/vnd.cups-postscript	66	imagetops
 image/jpeg		application/vnd.cups-postscript	66	imagetops


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- cups.spec	15 Jun 2006 12:16:06 -0000	1.220
+++ cups.spec	29 Jun 2006 11:53:08 -0000	1.221
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -36,6 +36,7 @@
 Patch14: cups-str1736.patch
 Patch15: cups-str1776.patch
 Patch16: cups-no-export-ssllibs.patch
+Patch17: cups-paps.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -74,6 +75,9 @@
 BuildPrereq: dbus-devel >= 0.60
 Requires: dbus >= 0.60
 
+# The paps package uses pango to render UTF-8 text to PostScript.
+Requires: paps >= 0.6.6-8.fc6
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -131,6 +135,7 @@
 %patch14 -p1 -b .str1736
 %patch15 -p1 -b .str1776
 %patch16 -p1 -b .no-export-ssllibs
+%patch17 -p1 -b .paps
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -396,6 +401,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-15
+- Require paps and use it for printing text (bug #197214).
+
 * Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-14
 - Don't export in SSLLIBS to cups-config.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 11:53:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 07:53:52 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,
	NONE, 1.1 openoffice.org.spec, 1.749,
	1.750 openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	1.3,
	NONE openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch,
	1.1, NONE
Message-ID: <200606291153.k5TBrqfQ001196@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1146

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 
Removed Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
	openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch 
Log Message:
new visibility workaround

openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
 cppuhelper/inc/cppuhelper/implbase1.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase10.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase11.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase12.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase2.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase3.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase4.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase5.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase6.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase7.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase8.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase9.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase_ex.hxx |   16 ++++++++++++++++
 inc/cppuhelper/implbase1.hxx              |    0 
 inc/cppuhelper/implbase10.hxx             |    0 
 inc/cppuhelper/implbase11.hxx             |    0 
 inc/cppuhelper/implbase12.hxx             |    0 
 inc/cppuhelper/implbase2.hxx              |    0 
 inc/cppuhelper/implbase3.hxx              |    0 
 inc/cppuhelper/implbase4.hxx              |    0 
 inc/cppuhelper/implbase5.hxx              |    0 
 inc/cppuhelper/implbase6.hxx              |    0 
 inc/cppuhelper/implbase7.hxx              |    0 
 inc/cppuhelper/implbase8.hxx              |    0 
 inc/cppuhelper/implbase9.hxx              |    0 
 inc/cppuhelper/implbase_ex.hxx            |    0 
 26 files changed, 28 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch ---
Index: inc/cppuhelper/implbase1.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase1.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	5 Oct 2005 14:23:42 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	29 Jun 2006 11:50:44 -0000
@@ -68,7 +71,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
     
Index: inc/cppuhelper/implbase10.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase10.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx	5 Oct 2005 14:24:09 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx	29 Jun 2006 11:50:45 -0000
@@ -78,7 +78,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase11.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase11.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx	5 Oct 2005 14:24:35 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx	29 Jun 2006 11:50:45 -0000
@@ -79,7 +79,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase12.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase12.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx	5 Oct 2005 14:25:08 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx	29 Jun 2006 11:50:45 -0000
@@ -80,7 +80,7 @@
                     { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase2.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase2.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx	5 Oct 2005 14:25:28 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx	29 Jun 2006 11:50:45 -0000
@@ -69,7 +69,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase3.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase3.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx	5 Oct 2005 14:25:47 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx	29 Jun 2006 11:50:46 -0000
@@ -70,7 +70,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase4.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase4.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx	5 Oct 2005 14:26:03 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx	29 Jun 2006 11:50:46 -0000
@@ -72,7 +72,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase5.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase5.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx	5 Oct 2005 14:26:20 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx	29 Jun 2006 11:50:46 -0000
@@ -73,7 +73,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase6.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase6.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx	5 Oct 2005 14:26:37 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx	29 Jun 2006 11:50:48 -0000
@@ -74,7 +74,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
     
Index: inc/cppuhelper/implbase7.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase7.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx	5 Oct 2005 14:26:54 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx	29 Jun 2006 11:50:48 -0000
@@ -75,7 +75,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase8.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase8.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx	5 Oct 2005 14:27:12 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx	29 Jun 2006 11:50:48 -0000
@@ -76,7 +76,7 @@
                     { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase9.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase9.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx	5 Oct 2005 14:27:40 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx	29 Jun 2006 11:50:48 -0000
@@ -77,7 +77,7 @@
                     { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase_ex.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase_ex.hxx,v
retrieving revision 1.6
diff -u -r1.6 implbase_ex.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase_ex.hxx	5 Oct 2005 14:27:57 -0000	1.6
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase_ex.hxx	29 Jun 2006 11:50:48 -0000
@@ -53,6 +53,9 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+
 /* If you need to define implementation helper classes that deal with more than
    12 interfaces, then use macros as follows, e.g. for 3 interfaces:
    
@@ -117,6 +120,19 @@
     */
     type_entry m_typeEntries[ 1 ];
 };
+
+template<typename Impl> class_data* class_data_fixup(class_data *s_cd)
+{
+    if (!s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType)
+    {
+        fprintf(stderr, "Avert a fatal crash\n");
+        s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType =
+                ::com::sun::star::lang::XTypeProvider::static_type;
+        s_cd->m_typeEntries[s_cd->m_nTypes-1].m_offset =
+                ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16;
+    }
+    return s_cd;
+}
 
 /** ImplHelper
     @internal


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.749
retrieving revision 1.750
diff -u -r1.749 -r1.750
--- openoffice.org.spec	29 Jun 2006 09:43:31 -0000	1.749
+++ openoffice.org.spec	29 Jun 2006 11:53:49 -0000	1.750
@@ -105,7 +105,7 @@
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
 Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 Patch41: workspace.sixtyfour06.patch
-Patch42: openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch
+Patch42: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
@@ -839,7 +839,7 @@
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
 %patch40 -p1 -b .ooo65519.printing.samba.patch
 %patch41 -p1 -b .workspace.sixtyfour06.patch
-%patch42 -p1 -b .ooo66018.solenv.dangerousvisibility.patch
+%patch42 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
 
 tar xzf %{SOURCE1}
@@ -3319,8 +3319,9 @@
 
 %changelog
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
-- disable -fvisibility-inlines-hidden
 - rh#196123# add openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
+- add openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch as visibility(?)
+  workaround
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone


--- openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch DELETED ---


--- openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 12:10:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 08:10:26 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch, NONE,
	1.1 openoffice.org.spec, 1.750, 1.751
Message-ID: <200606291210.k5TCAQQ6005292@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5229

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch 
Log Message:
SHUT UP

openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch:
 source/window/msgbox.cxx     |    0 
 vcl/source/window/msgbox.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch ---
Index: source/window/msgbox.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/msgbox.cxx,v
retrieving revision 1.17
diff -u -r1.17 msgbox.cxx
--- openoffice.org.orig/vcl/source/window/msgbox.cxx	28 Sep 2005 14:51:46 -0000	1.17
+++ openoffice.org/vcl/source/window/msgbox.cxx	29 Jun 2006 12:07:01 -0000
@@ -104,7 +104,7 @@
 	mpFixedImage		= NULL;
 	mnSoundType 		= 0;
 	mbHelpBtn			= FALSE;
-	mbSound 			= TRUE;
+	mbSound 			= FALSE;
     mpCheckBox          = NULL;
     mbCheck             = FALSE;
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.750
retrieving revision 1.751
diff -u -r1.750 -r1.751
--- openoffice.org.spec	29 Jun 2006 11:53:49 -0000	1.750
+++ openoffice.org.spec	29 Jun 2006 12:10:18 -0000	1.751
@@ -107,6 +107,7 @@
 Patch41: workspace.sixtyfour06.patch
 Patch42: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
+Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -841,6 +842,7 @@
 %patch41 -p1 -b .workspace.sixtyfour06.patch
 %patch42 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
+%patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
 
 tar xzf %{SOURCE1}
 
@@ -3322,6 +3324,8 @@
 - rh#196123# add openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 - add openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch as visibility(?)
   workaround
+- add openoffice.org-2.0.3.rhXXXXXXvcl.annoyingbeeps.patch to *SHUT UP* the
+  damn needy msgboxes before I loose control and go kill something cute and fluffy
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone



From fedora-cvs-commits at redhat.com  Thu Jun 29 12:12:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 08:12:44 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch, NONE,
	1.1 openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch, 1.1, NONE
Message-ID: <200606291212.k5TCCigu006092@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6066

Added Files:
	openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch 
Removed Files:
	openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch 
Log Message:
rename

openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch:
 source/window/msgbox.cxx     |    0 
 vcl/source/window/msgbox.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch ---
Index: source/window/msgbox.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/msgbox.cxx,v
retrieving revision 1.17
diff -u -r1.17 msgbox.cxx
--- openoffice.org.orig/vcl/source/window/msgbox.cxx	28 Sep 2005 14:51:46 -0000	1.17
+++ openoffice.org/vcl/source/window/msgbox.cxx	29 Jun 2006 12:07:01 -0000
@@ -104,7 +104,7 @@
 	mpFixedImage		= NULL;
 	mnSoundType 		= 0;
 	mbHelpBtn			= FALSE;
-	mbSound 			= TRUE;
+	mbSound 			= FALSE;
     mpCheckBox          = NULL;
     mbCheck             = FALSE;
 }


--- openoffice.org-2.0.3.rh######.vcl.annoyingbeeps.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 12:14:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 08:14:32 -0400
Subject: rpms/gcc/devel gcc41-pr26991.patch, NONE, 1.1 gcc41-rh195924.patch,
	NONE, 1.1 .cvsignore, 1.157, 1.158 gcc41.spec, 1.76,
	1.77 sources, 1.159, 1.160 gcc41-libgomp-critical.patch, 1.1,
	NONE gcc41-merge-all-constants.patch, 1.1,
	NONE gcc41-pr26559.patch, 1.2, NONE
Message-ID: <200606291214.k5TCEWes006792@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6768

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr26991.patch gcc41-rh195924.patch 
Removed Files:
	gcc41-libgomp-critical.patch gcc41-merge-all-constants.patch 
	gcc41-pr26559.patch 
Log Message:
4.1.1-6

gcc41-pr26991.patch:
 0 files changed

--- NEW FILE gcc41-pr26991.patch ---
2006-06-29  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/26991
	Backport from mainline
	2006-02-16  Bernd Schmidt  <bernd.schmidt at analog.com>

	PR rtl-optimization/25636
	* local-alloc.c (update_equiv_regs): Lose a bogus rtx_equal_p test
	when deciding whether an insn is an initializing insn.

--- gcc/local-alloc.c	(revision 111128)
+++ gcc/local-alloc.c	(revision 111129)
@@ -962,8 +963,7 @@ update_equiv_regs (void)
 
 	      /* If we haven't done so, record for reload that this is an
 		 equivalencing insn.  */
-	      if (!reg_equiv[regno].is_arg_equivalence
-		  && (!MEM_P (x) || rtx_equal_p (src, x)))
+	      if (!reg_equiv[regno].is_arg_equivalence)
 		reg_equiv_init[regno]
 		  = gen_rtx_INSN_LIST (VOIDmode, insn, reg_equiv_init[regno]);
 

gcc41-rh195924.patch:
 0 files changed

--- NEW FILE gcc41-rh195924.patch ---
2006-06-01  Pete Steinmetz  <steinmtz at us.ibm.com>

	* doc/invoke.texi: Add cpu_type power6.
	* config.gcc: Add cpu_type power6.
	* config/rs6000/rs6000.c (rs6000_override_options): Alias power6
	to power5+ with Altivec.
	* config/rs6000/aix52.h (ASM_CPU_SPEC): Add power6.
	* config/rs6000/rs6000.h (ASM_CPU_SPEC): Add power6.

--- gcc/doc/invoke.texi	(revision 114308)
+++ gcc/doc/invoke.texi	(revision 114309)
@@ -11286,7 +11286,7 @@ Supported values for @var{cpu_type} are 
 @samp{7450}, @samp{750}, @samp{801}, @samp{821}, @samp{823},
 @samp{860}, @samp{970}, @samp{8540}, @samp{ec603e}, @samp{G3},
 @samp{G4}, @samp{G5}, @samp{power}, @samp{power2}, @samp{power3},
- at samp{power4}, @samp{power5}, @samp{power5+},
+ at samp{power4}, @samp{power5}, @samp{power5+}, @samp{power6},
 @samp{common}, @samp{powerpc}, @samp{powerpc64},
 @samp{rios}, @samp{rios1}, @samp{rios2}, @samp{rsc}, and @samp{rs64}.
 
--- gcc/config.gcc	(revision 114308)
+++ gcc/config.gcc	(revision 114309)
@@ -301,7 +301,7 @@ powerpc*-*-*)
 	extra_headers="ppc-asm.h altivec.h spe.h"
 	need_64bit_hwint=yes
 	case x$with_cpu in
-	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345]|xrs64a)
+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xrs64a)
 		cpu_is_64bit=yes
 		;;
 	esac
@@ -2808,7 +2808,7 @@ case "${target}" in
 				eval "with_$which=405"
 				;;
 			"" | common \
-			| power | power[2345] | powerpc | powerpc64 \
+			| power | power[23456] | powerpc | powerpc64 \
 			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
 			| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
 			| 601 | 602 | 603 | 603e | ec603e | 604 \
--- gcc/config/rs6000/rs6000.c	(revision 114308)
+++ gcc/config/rs6000/rs6000.c	(revision 114309)
@@ -1194,6 +1194,9 @@ rs6000_override_options (const char *def
 	 {"power5+", PROCESSOR_POWER5,
 	  POWERPC_BASE_MASK | MASK_POWERPC64 | MASK_PPC_GFXOPT
 	  | MASK_MFCRF | MASK_POPCNTB | MASK_FPRND},
+ 	 {"power6", PROCESSOR_POWER5,
+	  POWERPC_7400_MASK | MASK_POWERPC64 | MASK_MFCRF | MASK_POPCNTB
+	  | MASK_FPRND},
 	 {"powerpc", PROCESSOR_POWERPC, POWERPC_BASE_MASK},
 	 {"powerpc64", PROCESSOR_POWERPC64,
 	  POWERPC_BASE_MASK | MASK_PPC_GFXOPT | MASK_POWERPC64},
--- gcc/config/rs6000/aix52.h	(revision 114308)
+++ gcc/config/rs6000/aix52.h	(revision 114309)
@@ -68,6 +68,7 @@ do {									\
 %{mcpu=power4: -m620} \
 %{mcpu=power5: -m620} \
 %{mcpu=power5+: -m620} \
+%{mcpu=power6: -m620} \
 %{mcpu=powerpc: -mppc} \
 %{mcpu=rs64a: -mppc} \
 %{mcpu=603: -m603} \
--- gcc/config/rs6000/rs6000.h	(revision 114308)
+++ gcc/config/rs6000/rs6000.h	(revision 114309)
@@ -74,6 +74,7 @@
 %{mcpu=power4: -mpower4} \
 %{mcpu=power5: -mpower4} \
 %{mcpu=power5+: -mpower4} \
+%{mcpu=power6: -mpower4 -maltivec} \
 %{mcpu=powerpc: -mppc} \
 %{mcpu=rios: -mpwr} \
 %{mcpu=rios1: -mpwr} \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- .cvsignore	19 Jun 2006 21:02:26 -0000	1.157
+++ .cvsignore	29 Jun 2006 12:14:29 -0000	1.158
@@ -1 +1 @@
-gcc-4.1.1-20060619.tar.bz2
+gcc-4.1.1-20060629.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gcc41.spec	20 Jun 2006 09:11:27 -0000	1.76
+++ gcc41.spec	29 Jun 2006 12:14:29 -0000	1.77
@@ -1,6 +1,6 @@
-%define DATE 20060619
+%define DATE 20060629
 %define gcc_version 4.1.1
-%define gcc_release 5
+%define gcc_release 6
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -123,9 +123,8 @@
 Patch22: gcc41-pr26881.patch
 Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
-Patch25: gcc41-libgomp-critical.patch
-Patch26: gcc41-merge-all-constants.patch
-Patch27: gcc41-pr26559.patch
+Patch25: gcc41-pr26991.patch
+Patch26: gcc41-rh195924.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -428,9 +427,8 @@
 %patch22 -p0 -b .pr26881~
 %patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .libgomp-critical~
-%patch26 -p0 -b .merge-all-constants~
-%patch27 -p0 -b .pr26559~
+%patch25 -p0 -b .pr26991~
+%patch26 -p0 -b .rh195924~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1472,6 +1470,20 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Jun 29 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-6
+- update from gcc-4_1-branch (-r114766:115058)
+  - PRs c++/27821, c++/28109, c++/28110, c++/28112, fortran/16206,
+	fortran/18769, fortran/19310, fortran/19904, fortran/20867,
+	fortran/20874, fortran/20876, fortran/22038, fortran/25049,
+	fortran/25050, fortran/25056, fortran/25073, fortran/27554,
+	fortran/27715, fortran/27784, fortran/27895, fortran/27958,
+	fortran/28118, fortran/28119, libfortran/27784, libfortran/27895,
+	libgcj/28178, middle-end/28045, middle-end/28151, target/27082,
+	target/27861, tree-optimization/27781
+- fix a reload problem that lead sometimes to writes to read-only objects
+  (Bernd Schmidt, #196736, PR middle-end/26991, PR rtl-optimization/25636)
+- ppc -mcpu=power6 initial support (Pete Steinmetz, #195924)
+
 * Tue Jun 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-5
 - fix C++ #pragma omp atomic (Mark Mitchell)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- sources	19 Jun 2006 21:02:26 -0000	1.159
+++ sources	29 Jun 2006 12:14:29 -0000	1.160
@@ -1 +1 @@
-2f40477c2c31cfe5832a96eb006a9f93  gcc-4.1.1-20060619.tar.bz2
+3e0f03bd8a9307f7dd0d5af2d71378ab  gcc-4.1.1-20060629.tar.bz2


--- gcc41-libgomp-critical.patch DELETED ---


--- gcc41-merge-all-constants.patch DELETED ---


--- gcc41-pr26559.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 13:00:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 09:00:09 -0400
Subject: rpms/tar/devel .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 tar.spec,
	1.37, 1.38
Message-ID: <200606291300.k5TD09k2025360@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25345

Modified Files:
	.cvsignore sources tar.spec 
Log Message:
fix typo in tar.1 man page



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Apr 2006 20:53:15 -0000	1.8
+++ .cvsignore	29 Jun 2006 13:00:06 -0000	1.9
@@ -1 +1,3 @@
+tar.1
+tar-1.15.90.tar.gz.sig
 tar-1.15.90.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Apr 2006 20:53:15 -0000	1.9
+++ sources	29 Jun 2006 13:00:06 -0000	1.10
@@ -1,2 +1,3 @@
+0ee6e8f5657a0b8f08723bb0095aec18  tar.1
+34c34e2936988408c9b834978c70e78a  tar-1.15.90.tar.gz.sig
 f7009caa98f15ed4efa2b2f7c4d702e0  tar-1.15.90.tar.gz
-ecf87e839c91a75ea9a84307455c0255  tar.1


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- tar.spec	25 Apr 2006 08:56:39 -0000	1.37
+++ tar.spec	29 Jun 2006 13:00:06 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.90
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -105,6 +105,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Thu Jun 29 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-3
+- fix typo in tar.1 man page
+
 * Tue Apr 25 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-2
 - exclude listed02.at from testsuite again, because it 
   still fails on s390



From fedora-cvs-commits at redhat.com  Thu Jun 29 13:31:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 09:31:47 -0400
Subject: rpms/paps/devel paps-cups.patch,1.1,1.2 paps.spec,1.5,1.6
Message-ID: <200606291331.k5TDVl1U024794@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24750

Modified Files:
	paps-cups.patch paps.spec 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-9
- Adjusted CUPS patch: CUPS invokes the filter with the destination
  printer name in argv[0], not the binary name.

paps-cups.patch:
 configure.in          |   13 +++++
 paps-0.6.6/src/paps.c |  119 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/Makefile.am       |    4 -
 3 files changed, 129 insertions(+), 7 deletions(-)

Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paps-cups.patch	29 Jun 2006 10:55:20 -0000	1.1
+++ paps-cups.patch	29 Jun 2006 13:31:33 -0000	1.2
@@ -1,4 +1,4 @@
-diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
+unchanged:
 --- paps-0.6.6.orig/configure.in	2006-04-28 04:41:36.000000000 +0900
 +++ paps-0.6.6/configure.in	2006-06-29 17:45:59.000000000 +0900
 @@ -7,4 +7,17 @@
@@ -19,7 +19,7 @@
 +AC_SUBST(CUPS_LIBS)
 +
  AC_OUTPUT(Makefile src/Makefile doc/Makefile)
-diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
+unchanged:
 --- paps-0.6.6.orig/src/Makefile.am	2006-06-20 20:40:11.000000000 +0900
 +++ paps-0.6.6/src/Makefile.am	2006-06-29 19:09:12.000000000 +0900
 @@ -5,10 +5,10 @@
@@ -35,9 +35,9 @@
  paps_DEPENDENCIES = $(noinst_LIBRARIES)
  
  EXTRA_DIST = test_libpaps.c paps.1
-diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c	2006-06-20 20:40:11.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-06-29 19:06:46.000000000 +0900
+diff -u paps-0.6.6/src/paps.c paps-0.6.6/src/paps.c
+--- paps-0.6.6/src/paps.c	2006-06-29 19:06:46.000000000 +0900
++++ paps-0.6.6/src/paps.c	2006-06-29 14:29:13.000000000 +0100
 @@ -29,6 +29,7 @@
  #include <string.h>
  #include <time.h>
@@ -65,7 +65,7 @@
    int do_tumble = -1;   /* -1 means not initialized */
    int do_duplex = -1;
    gchar *paps_header = NULL;
-@@ -253,12 +255,112 @@
+@@ -253,12 +255,113 @@
    gchar *filename_in, *title, *text;
    int header_sep = 20;
    GIConv cvh = NULL;
@@ -85,7 +85,8 @@
 +	int num_options;
 +	const char *val;
 +
-+	if (strncmp(prgname, "texttopaps", 10) == 0) {
++	if (strncmp(prgname, "texttopaps", 10) == 0 ||
++	    getenv ("CUPS_SERVER") != NULL) {
 +		/* argument format should be job-id user title copies options [file] */
 +		cups_mode = TRUE;
 +		if (argc < 6 || argc > 7) {
@@ -178,7 +179,7 @@
    /* Parse command line */
    if (!g_option_context_parse(ctxt, &argc, &argv, &error))
      {
-@@ -285,6 +387,8 @@
+@@ -285,6 +388,8 @@
        IN = stdin;
      }
    title = filename_in;
@@ -187,7 +188,7 @@
    
    paps = paps_new();
    pango_context = paps_get_pango_context (paps);
-@@ -303,8 +407,10 @@
+@@ -303,8 +408,10 @@
    pango_context_set_font_description (pango_context, font_description);
  
    /* Page layout */
@@ -200,7 +201,7 @@
    
    if (num_columns == 1)
      total_gutter_width = 0;
-@@ -340,6 +446,7 @@
+@@ -340,6 +447,7 @@
    page_layout.header_ypos = page_layout.top_margin;
    page_layout.header_height = 0;
    page_layout.footer_height = 0;
@@ -208,7 +209,7 @@
    if (do_draw_header)
      page_layout.header_sep =  header_sep;
    else
-@@ -495,7 +602,8 @@
+@@ -495,7 +603,8 @@
                                        page_layout->pango_dir == PANGO_DIRECTION_LTR
                                        ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
            pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- paps.spec	29 Jun 2006 11:28:01 -0000	1.5
+++ paps.spec	29 Jun 2006 13:31:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
@@ -73,7 +73,9 @@
 
 
 %changelog
-* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-9
+- Adjusted CUPS patch: CUPS invokes the filter with the destination
+  printer name in argv[0], not the binary name.
 - CUPS filter lives in CUPS_SERVERBIN, which is /usr/lib/cups on all
   architectures -- not %%{_libdir}/cups.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 13:41:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 09:41:22 -0400
Subject: rpms/fribidi/devel fribidi.spec,1.13,1.14
Message-ID: <200606291341.k5TDfMSg026841@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/fribidi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26778

Modified Files:
	fribidi.spec 
Log Message:
rh#197223# more time-wasting foo


Index: fribidi.spec
===================================================================
RCS file: /cvs/dist/rpms/fribidi/devel/fribidi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fribidi.spec	7 Jun 2006 21:53:04 -0000	1.13
+++ fribidi.spec	29 Jun 2006 13:41:19 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.10.7
-Release: 4
+Release: 5
 URL: http://fribidi.org
 Source0: %{name}-%{version}.tar.gz
 Patch0: fribidi-0.10.7-multiarchdevel.patch
@@ -19,6 +19,7 @@
 Summary: Libraries and include files for fribidi
 Group: System Environment/Libraries
 Requires: %name = %{version}
+Requires: pkgconfig
 
 %description devel
 Include files and libraries needed for developing applications which use
@@ -63,6 +64,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jun 29 2006 Caolan McNamara <caolanm at redhat.com> 0.10.7-5
+- rh#197223# devel Require pkg-config
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 0.10.7-4
 - put devel .so symlink in the right subpackage
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 13:46:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 09:46:33 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.2-bz2513.patch, NONE,
	1.1 binutils-2.17.50.0.2-tls_common.patch, 1.1,
	1.2 binutils.spec, 1.83, 1.84
Message-ID: <200606291346.k5TDkX8a004934@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4792

Modified Files:
	binutils-2.17.50.0.2-tls_common.patch binutils.spec 
Added Files:
	binutils-2.17.50.0.2-bz2513.patch 
Log Message:
2.17.50.0.2-4

binutils-2.17.50.0.2-bz2513.patch:
 bfd/elf32-i386.c               |   47 ++++-------------------------------------
 ld/testsuite/ld-i386/tlsbin.dd |    2 -
 2 files changed, 6 insertions(+), 43 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-bz2513.patch ---
2006-06-29  Jakub Jelinek  <jakub at redhat.com>

	PR ld/2513
	* elf32-i386.c (GOT_TLS_MASK, GOT_TLS_IE_IE, GOT_TLS_IE_GD,
	GOT_TLS_IE_MASK, elf_i386_check_relocs, allocate_dynrelocs): Revert
	2006-04-08 changes.
	(elf_i386_relocate_section): Likewise.  For GD->IE transition
	change subl into addl whenever tls_type is GOT_TLS_IE_POS.

	* ld-i386/tlsbin.dd: Fix expected output.

--- ld/testsuite/ld-i386/tlsbin.dd.jj	2004-05-11 19:02:12.000000000 +0200
+++ ld/testsuite/ld-i386/tlsbin.dd	2006-06-23 15:10:54.000000000 +0200
@@ -50,7 +50,7 @@ Disassembly of section .text:
 #  GD -> IE because variable is not defined in executable where
 #  the variable is referenced through @gotntpoff too
  8049035:	65 a1 00 00 00 00[ 	]+mov    %gs:0x0,%eax
- 804903b:	2b 83 dc ff ff ff[ 	]+sub    0xffffffdc\(%ebx\),%eax
+ 804903b:	03 83 dc ff ff ff[ 	]+add    0xffffffdc\(%ebx\),%eax
 #				->R_386_TLS_TPOFF	sG3
  8049041:	90[ 	]+nop *
  8049042:	90[ 	]+nop *
--- bfd/elf32-i386.c.jj	2006-06-19 10:33:41.000000000 +0200
+++ bfd/elf32-i386.c	2006-06-23 15:01:39.000000000 +0200
@@ -582,10 +582,6 @@ struct elf_i386_link_hash_entry
 #define GOT_TLS_IE_NEG	6
 #define GOT_TLS_IE_BOTH 7
 #define GOT_TLS_GDESC	8
-#define GOT_TLS_MASK	0x0f
-#define GOT_TLS_IE_IE	0x10
-#define GOT_TLS_IE_GD	0x20
-#define GOT_TLS_IE_MASK	0x30
 #define GOT_TLS_GD_BOTH_P(type)						\
   ((type) == (GOT_TLS_GD | GOT_TLS_GDESC))
 #define GOT_TLS_GD_P(type)						\
@@ -1011,25 +1007,12 @@ elf_i386_check_relocs (bfd *abfd,
 	      case R_386_TLS_IE_32:
 		if (ELF32_R_TYPE (rel->r_info) == r_type)
 		  tls_type = GOT_TLS_IE_NEG;
-		else if (h
-			 && ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
-		  /* If this is a GD->IE transition, we may use either
-		     of R_386_TLS_TPOFF and R_386_TLS_TPOFF32.  But if
-		     we may have both R_386_TLS_IE and R_386_TLS_GD,
-		     we can't share the same R_386_TLS_TPOFF since
-		     they require different offsets. So we remember
-		     it comes from R_386_TLS_GD.  */
-		  tls_type = GOT_TLS_IE | GOT_TLS_IE_GD;
 		else
+		  /* If this is a GD->IE transition, we may use either of
+		     R_386_TLS_TPOFF and R_386_TLS_TPOFF32.  */
 		  tls_type = GOT_TLS_IE;
 		break;
 	      case R_386_TLS_IE:
-		if (h)
-		  {
-		    /* We remember it comes from R_386_TLS_IE.  */
-		    tls_type = GOT_TLS_IE_POS | GOT_TLS_IE_IE;
-		    break;
-		  }
 	      case R_386_TLS_GOTIE:
 		tls_type = GOT_TLS_IE_POS; break;
 	      }
@@ -1069,8 +1052,7 @@ elf_i386_check_relocs (bfd *abfd,
 	      tls_type |= old_tls_type;
 	    /* If a TLS symbol is accessed using IE at least once,
 	       there is no point to use dynamic model for it.  */
-	    else if (old_tls_type != tls_type
-		     && old_tls_type != GOT_UNKNOWN
+	    else if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
 		     && (! GOT_TLS_GD_ANY_P (old_tls_type)
 			 || (tls_type & GOT_TLS_IE) == 0))
 	      {
@@ -1700,14 +1682,6 @@ allocate_dynrelocs (struct elf_link_hash
       asection *s;
       bfd_boolean dyn;
       int tls_type = elf_i386_hash_entry(h)->tls_type;
-      
-      /* If we have both R_386_TLS_IE and R_386_TLS_GD, GOT_TLS_IE_BOTH
-	 should be used.  */
-      if ((tls_type & GOT_TLS_IE_MASK)
-	  == (GOT_TLS_IE_IE | GOT_TLS_IE_GD))
-	tls_type = GOT_TLS_IE_BOTH;
-      else
-	tls_type &= GOT_TLS_MASK;
 
       /* Make sure this symbol is output as a dynamic symbol.
 	 Undefined weak syms won't yet be marked as dynamic.  */
@@ -2711,13 +2685,6 @@ elf_i386_relocate_section (bfd *output_b
 	  else if (h != NULL)
 	    {
 	      tls_type = elf_i386_hash_entry(h)->tls_type;
-	      /* If we have both R_386_TLS_IE and R_386_TLS_GD,
-		 GOT_TLS_IE_BOTH should be used.  */
-	      if ((tls_type & GOT_TLS_IE_MASK)
-		  == (GOT_TLS_IE_IE | GOT_TLS_IE_GD))
-		tls_type = GOT_TLS_IE_BOTH;
-	      else
-		tls_type &= GOT_TLS_MASK;
 	      if (!info->shared && h->dynindx == -1 && (tls_type & GOT_TLS_IE))
 		r_type = R_386_TLS_LE_32;
 	    }
@@ -3172,12 +3139,8 @@ elf_i386_relocate_section (bfd *output_b
 		 subl $foo at gottpoff(%reg), %eax
 		 into:
 		 addl $foo at gotntpoff(%reg), %eax.  */
-	      if (r_type == R_386_TLS_GOTIE)
-		{
-		  contents[roff + 6] = 0x03;
-		  if (tls_type == GOT_TLS_IE_BOTH)
-		    off += 4;
-		}
+	      if (tls_type == GOT_TLS_IE_POS)
+		contents[roff + 6] = 0x03;
 	      bfd_put_32 (output_bfd,
 			  htab->sgot->output_section->vma
 			  + htab->sgot->output_offset + off

binutils-2.17.50.0.2-tls_common.patch:
 bfd/elflink.c                      |    3 +
 ld/testsuite/ld-elf/tls_common.exp |   70 +++++++++++++++++++++++++++++++++++++
 ld/testsuite/ld-elf/tls_common.s   |   11 +++++
 3 files changed, 83 insertions(+), 1 deletion(-)

Index: binutils-2.17.50.0.2-tls_common.patch
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils-2.17.50.0.2-tls_common.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binutils-2.17.50.0.2-tls_common.patch	19 Jun 2006 20:58:36 -0000	1.1
+++ binutils-2.17.50.0.2-tls_common.patch	29 Jun 2006 13:46:30 -0000	1.2
@@ -1,4 +1,4 @@
-2006-06-16  Jakub Jelinek  <jakub at redhat.com>
+2006-06-20  Jakub Jelinek  <jakub at redhat.com>
 
 	* elflink.c (elf_link_add_object_symbols): Don't create .tcommon
 	section for relocatable link.
@@ -6,6 +6,10 @@
 	* ld-elf/tls_common.exp: New test.
 	* ld-elf/tls_common.s: New file.
 
+2006-06-21  Alan Modra  <amodra at bigpond.net.au>
+
+	* ld-elf/tls_common.exp: Match 32-bit output.
+
 --- bfd/elflink.c.jj	2006-06-15 14:31:01.000000000 +0200
 +++ bfd/elflink.c	2006-06-15 14:40:51.000000000 +0200
 @@ -3621,7 +3621,8 @@ elf_link_add_object_symbols (bfd *abfd, 
@@ -84,7 +88,7 @@
 +
 +send_log "$READELF -l --wide tmpdir/tls_common\n"
 +catch "exec $READELF -l --wide tmpdir/tls_common" readelf_output
-+if ![string match "*TLS*0x000000 0x000004 R *" $readelf_output] then {
++if ![regexp ".*TLS.*0x0+ 0x0+4 R .*" $readelf_output] then {
 +    send_log "$readelf_output\n"
 +    fail "tls_common"
 +    return


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- binutils.spec	19 Jun 2006 20:58:36 -0000	1.83
+++ binutils.spec	29 Jun 2006 13:46:30 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.2
-Release: 3
+Release: 4
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -19,6 +19,7 @@
 Patch10: binutils-2.17.50.0.2-bz2721.patch
 Patch11: binutils-2.17.50.0.2-perturb.patch
 Patch12: binutils-2.17.50.0.2-tls_common.patch
+Patch13: binutils-2.17.50.0.2-bz2513.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -61,6 +62,7 @@
 %patch10 -p0 -b .bz2721~
 %patch11 -p0 -b .perturb~
 %patch12 -p0 -b .tls_common~
+%patch13 -p0 -b .bz2513~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -171,6 +173,9 @@
 %{_infodir}/*info*
 
 %changelog
+* Thu Jun 29 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-4
+- fix i?86 TLS GD->IE transition in executables (#196157, BZ#2513)
+
 * Mon Jun 19 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-3
 - fix two places in ld that misbehaved with MALLOC_PERTURB_=N
 - fix .tls_common handling in relocatable linking



From fedora-cvs-commits at redhat.com  Thu Jun 29 14:12:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 10:12:00 -0400
Subject: rpms/paps/devel paps-0.6.6-font-option.patch, 1.1, 1.2 paps.spec,
	1.6, 1.7
Message-ID: <200606291412.k5TEC079018396@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18304

Modified Files:
	paps-0.6.6-font-option.patch paps.spec 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-9
- Fixed font-option patch.

paps-0.6.6-font-option.patch:
 paps-0.6.6/src/paps.c |   32 ++++++++++++++++----------------
 src/paps.1            |    7 ++-----
 2 files changed, 18 insertions(+), 21 deletions(-)

Index: paps-0.6.6-font-option.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-0.6.6-font-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paps-0.6.6-font-option.patch	27 Jun 2006 07:11:43 -0000	1.1
+++ paps-0.6.6-font-option.patch	29 Jun 2006 14:11:58 -0000	1.2
@@ -1,4 +1,3 @@
-diff -ruN paps-0.6.6.orig/src/paps.1 paps-0.6.6/src/paps.1
 --- paps-0.6.6.orig/src/paps.1	2006-06-20 04:09:58.000000000 +0900
 +++ paps-0.6.6/src/paps.1	2006-06-20 04:12:23.000000000 +0900
 @@ -34,11 +34,8 @@
@@ -15,19 +14,18 @@
  .TP
  .B \-\-rtl
  Do rtl layout.
-diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c	2006-06-20 04:09:58.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-06-20 04:01:57.000000000 +0900
+--- paps-0.6.6/src/paps.c	2006-06-20 04:01:57.000000000 +0900
++++ paps-0.6.6/src/paps.c	2006-06-29 15:08:48.000000000 +0100
 @@ -30,7 +30,11 @@
  #include <time.h>
  
  #define BUFSIZE 1024
 -#define HEADER_FONT_SCALE 12
 +#define DEFAULT_FONT_FAMILY	"Monospace"
-+#define DEFAULT_FONT_SIZE	12
++#define DEFAULT_FONT_SIZE	"12"
 +#define HEADER_FONT_FAMILY	"Monospace Bold"
-+#define HEADER_FONT_SCALE	12
-+#define MAKE_FONT_NAME(f,s)	f " " #s
++#define HEADER_FONT_SCALE	"12"
++#define MAKE_FONT_NAME(f,s)	f " " s
  
  typedef enum {
      PAPER_TYPE_A4 = 0,
@@ -67,10 +65,10 @@
    int do_duplex = -1;
    gchar *paps_header = NULL;
 -  gchar *header_font_desc = "Monospace Bold 12";
-+  gchar *header_font_desc = MAKE_FONT_NAME (HEADER_FONT_FAMILY, HEADER_FONT_SIZE);
++  gchar *header_font_desc = MAKE_FONT_NAME (HEADER_FONT_FAMILY, HEADER_FONT_SCALE);
 +  gchar *filename_in, *title, *text;
    int header_sep = 20;
-   GIConv *cvh = NULL;
+   GIConv cvh = NULL;
  
 @@ -271,13 +272,12 @@
    pango_context_set_language (pango_context, pango_language_from_string ("en_US"));
@@ -88,7 +86,7 @@
 +  if ((pango_font_description_get_set_fields (font_description) & PANGO_FONT_MASK_FAMILY) == 0)
 +    pango_font_description_set_family (font_description, DEFAULT_FONT_FAMILY);
 +  if ((pango_font_description_get_set_fields (font_description) & PANGO_FONT_MASK_SIZE) == 0)
-+    pango_font_description_set_size (font_description, DEFAULT_FONT_SIZE * PANGO_SCALE);
++    pango_font_description_set_size (font_description, atoi(DEFAULT_FONT_SIZE) * PANGO_SCALE);
  
    pango_context_set_font_description (pango_context, font_description);
  


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- paps.spec	29 Jun 2006 13:31:33 -0000	1.6
+++ paps.spec	29 Jun 2006 14:11:58 -0000	1.7
@@ -74,6 +74,7 @@
 
 %changelog
 * Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-9
+- Fixed font-option patch.
 - Adjusted CUPS patch: CUPS invokes the filter with the destination
   printer name in argv[0], not the binary name.
 - CUPS filter lives in CUPS_SERVERBIN, which is /usr/lib/cups on all



From fedora-cvs-commits at redhat.com  Thu Jun 29 14:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 10:55:36 -0400
Subject: rpms/sed/devel sed-4.1.5-bz185374.patch, NONE, 1.1 sed.spec, 1.30,
	1.31
Message-ID: <200606291455.k5TEtacH029521@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29413

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-bz185374.patch 
Log Message:
- #185374:
  - Follow symlinks before rename (avoid symlink overwrite)
  - Add -c flag for copy instead of rename (avoid ownership change)


sed-4.1.5-bz185374.patch:
 doc/sed.1     |    7 ++
 lib/utils.c   |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 lib/utils.h   |    3 +
 sed/execute.c |    8 ++-
 sed/sed.c     |   22 +++++++-
 sed/sed.h     |    4 +
 6 files changed, 172 insertions(+), 18 deletions(-)

--- NEW FILE sed-4.1.5-bz185374.patch ---
diff -urp sed-4.1.5-orig/doc/sed.1 sed-4.1.5/doc/sed.1
--- sed-4.1.5-orig/doc/sed.1	2006-02-03 10:27:35.000000000 +0100
+++ sed-4.1.5/doc/sed.1	2006-06-29 15:42:07.000000000 +0200
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH SED "1" "February 2006" "sed version 4.1.4" "User Commands"
+.TH SED "1" "June 2006" "sed version 4.1.5" "User Commands"
 .SH NAME
 sed \- stream editor for filtering and transforming text
 .SH SYNOPSIS
@@ -36,6 +36,11 @@ add the contents of script-file to the c
 .IP
 edit files in place (makes backup if extension supplied)
 .HP
+\fB\-c\fR, \fB\-\-copy\fR
+.IP
+use copy instead of rename when shuffling files in \fB\-i\fR mode
+(avoids change of input file ownership)
+.HP
 \fB\-l\fR N, \fB\-\-line\-length\fR=\fIN\fR
 .IP
 specify the desired line-wrap length for the `l' command
diff -urp sed-4.1.5-orig/lib/utils.c sed-4.1.5/lib/utils.c
--- sed-4.1.5-orig/lib/utils.c	2005-06-21 16:09:40.000000000 +0200
+++ sed-4.1.5/lib/utils.c	2006-06-29 16:28:05.000000000 +0200
@@ -35,6 +35,12 @@
 # include <stdlib.h>
 #endif /* HAVE_STDLIB_H */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/sendfile.h>
+#include <fcntl.h>
+
 #include "utils.h"
 
 const char *myname;
@@ -315,32 +321,146 @@ do_ck_fclose(fp)
 }
 
 
-/* Panic on failing rename */
+/* Temporary buffer for ck_follow_symlink and ck_fcopy. */
+static char buf[4096];
+static size_t bufsize = sizeof (buf);
+
+/* Follow symlink and panic if something fails.  Returned value is
+   ultimate symlink target, stored in temporary buffer.  You need to
+   strdup the return value, if you intend to use it later.*/
+const char*
+ck_follow_symlink(const char * fname)
+{
+  static struct stat statbuf;
+  int err;
+
+  if (strlen (fname) >= bufsize)
+    panic("ck_follow_symlink: file name too long");
+  strcpy (buf, fname);
+
+  while (1)
+    {
+      err = lstat (buf, &statbuf);
+
+      if (err != 0)
+	panic("ck_follow_symlink: couldn't lstat %s: %s", buf, strerror(errno));
+
+      if ((statbuf.st_mode & S_IFLNK) == S_IFLNK)
+	{
+	  err = readlink (buf, buf, bufsize);
+	  if (err < 0)
+	    panic("ck_follow_symlink: readlink failed on %s: %s", buf, strerror(errno));
+	  else if (err == bufsize)
+	    panic("ck_follow_symlink: pointee name too long");
+	  else
+	    buf [err] = '\0';
+	}
+      else
+	break;
+    }
+
+  return buf;
+}
+
+/* Panic on failing unlink */
 void
-ck_rename (from, to, unlink_if_fail)
-  const char *from, *to;
-  const char *unlink_if_fail;
+ck_unlink (name)
+  const char *name;
 {
-  int rd = rename (from, to);
-  if (rd != -1)
-    return;
+  if (unlink (name) == -1)
+    panic (_("cannot remove %s: %s"), name, strerror (errno));
+}
 
-  if (unlink_if_fail)
+/* Attempt to unlink denoted file if operation rd failed. */
+static int
+_unlink_if_fail (rd, unlink_if_fail)
+  int rd;
+  const char *unlink_if_fail;
+{
+  if (rd == -1 && unlink_if_fail)
     {
       int save_errno = errno;
+      ck_unlink (unlink_if_fail);
+      errno = save_errno;
+    }
+
+  return rd != -1;
+}
+
+/* Copy contents between files. */
+static int
+_copy (from, to)
+  const char *from, *to;
+{
+  FILE *infile, *outfile;
+  int c, retval = 0;
       errno = 0;
-      unlink (unlink_if_fail);
 
-      /* Failure to remove the temporary file is more severe, so trigger it first.  */
-      if (errno != 0)
-        panic (_("cannot remove %s: %s"), unlink_if_fail, strerror (errno));
+  infile = fopen (from, "r");
+  if (infile == NULL)
+    return -1;
 
-      errno = save_errno;
+  outfile = fopen (to, "w");
+  if (outfile == NULL)
+    {
+      fclose (infile);
+      return -1;
+    }
+
+  while (1)
+    {
+      size_t bytes_in = fread (buf, 1, bufsize, infile);
+      size_t bytes_out;
+      if (bytes_in == 0)
+	{
+	  if (ferror (infile))
+	    retval = -1;
+	  break;
+	}
+
+      bytes_out = fwrite (buf, 1, bytes_in, outfile);
+      if (bytes_out != bytes_in)
+	{
+	  retval = -1;
+	  break;
+	}
     }
 
+  fclose (outfile);
+  fclose (infile);
+
+  return retval;
+}
+
+/* Panic on failing rename */
+void
+ck_rename (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  if (!_unlink_if_fail (rename (from, to), unlink_if_fail))
   panic (_("cannot rename %s: %s"), from, strerror (errno));
 }
 
+/* Attempt to copy file contents between the files. */
+void
+ck_fcmove (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  if (!_unlink_if_fail (_copy (from, to), unlink_if_fail))
+    panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno));
+}
+
+/* Copy contents between files, and then unlink the source. */
+void
+ck_fcopy (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  ck_fcmove (from, to, unlink_if_fail);
+  ck_unlink (from);
+}
 
 
 
diff -urp sed-4.1.5-orig/lib/utils.h sed-4.1.5/lib/utils.h
--- sed-4.1.5-orig/lib/utils.h	2005-06-21 16:09:40.000000000 +0200
+++ sed-4.1.5/lib/utils.h	2006-06-29 16:04:21.000000000 +0200
@@ -29,7 +29,10 @@ void ck_fflush P_((FILE *stream));
 void ck_fclose P_((FILE *stream));
 size_t ck_getline P_((char **text, size_t *buflen, FILE *stream));
 FILE * ck_mkstemp P_((char **p_filename, char *tmpdir, char *base));
+const char* ck_follow_symlink P_((const char * fname));
 void ck_rename P_((const char *from, const char *to, const char *unlink_if_fail));
+void ck_fcopy P_((const char *from, const char *to, const char *unlink_if_fail));
+void ck_fcmove P_((const char *from, const char *to, const char *unlink_if_fail));
 
 VOID *ck_malloc P_((size_t size));
 VOID *xmalloc P_((size_t size));
diff -urp sed-4.1.5-orig/sed/execute.c sed-4.1.5/sed/execute.c
--- sed-4.1.5-orig/sed/execute.c	2006-02-03 10:06:39.000000000 +0100
+++ sed-4.1.5/sed/execute.c	2006-06-29 16:12:43.000000000 +0200
@@ -711,16 +711,20 @@ closedown(input)
 
   if (in_place_extension && output_file.fp != NULL)
     {
+      char * target_name = ck_strdup (ck_follow_symlink (input->in_file_name));
       ck_fclose (output_file.fp);
       if (strcmp(in_place_extension, "*") != 0)
         {
           char *backup_file_name = get_backup_file_name(input->in_file_name);
-	  ck_rename (input->in_file_name, backup_file_name, input->out_file_name);
+	  (copy_instead_of_rename?ck_fcmove:ck_rename)
+	    (target_name, backup_file_name, input->out_file_name);
           free (backup_file_name);
 	}
 
-      ck_rename (input->out_file_name, input->in_file_name, input->out_file_name);
+      (copy_instead_of_rename?ck_fcopy:ck_rename)
+	(input->out_file_name, target_name, input->out_file_name);
       free (input->out_file_name);
+      free (target_name);
     }
 
   input->fp = NULL;
diff -urp sed-4.1.5-orig/sed/sed.c sed-4.1.5/sed/sed.c
--- sed-4.1.5-orig/sed/sed.c	2005-06-21 16:09:47.000000000 +0200
+++ sed-4.1.5/sed/sed.c	2006-06-29 15:41:52.000000000 +0200
@@ -73,6 +73,10 @@ bool separate_files = false;
 /* How do we edit files in-place? (we don't if NULL) */
 char *in_place_extension = NULL;
 
+/* Do we use copy or rename when in in-place edit mode? (boolean
+   value, non-zero for copy, zero for rename).*/
+int copy_instead_of_rename = 0;
+
 /* Do we need to be pedantically POSIX compliant? */
 enum posixicity_types posixicity;
 
@@ -107,6 +111,9 @@ Usage: %s [OPTION]... {script-only-if-no
                  add the contents of script-file to the commands to be executed\n"));
   fprintf(out, _("  -i[SUFFIX], --in-place[=SUFFIX]\n\
                  edit files in place (makes backup if extension supplied)\n"));
+  fprintf(out, _("  -c, --copy\n\
+                 use copy instead of rename when shuffling files in -i mode\n\
+		 (avoids change of input file ownership)\n"));
   fprintf(out, _("  -l N, --line-length=N\n\
                  specify the desired line-wrap length for the `l' command\n"));
   fprintf(out, _("  --posix\n\
@@ -142,9 +149,9 @@ main(argc, argv)
   char **argv;
 {
 #ifdef REG_PERL
-#define SHORTOPTS "snrRue:f:l:i::V:"
+#define SHORTOPTS "csnrRue:f:l:i::V:"
 #else
-#define SHORTOPTS "snrue:f:l:i::V:"
+#define SHORTOPTS "csnrue:f:l:i::V:"
 #endif
 
   static struct option longopts[] = {
@@ -155,6 +162,7 @@ main(argc, argv)
     {"expression", 1, NULL, 'e'},
     {"file", 1, NULL, 'f'},
     {"in-place", 2, NULL, 'i'},
+    {"copy", 0, NULL, 'c'},
     {"line-length", 1, NULL, 'l'},
     {"quiet", 0, NULL, 'n'},
     {"posix", 0, NULL, 'p'},
@@ -215,6 +223,10 @@ main(argc, argv)
 	  the_program = compile_file(the_program, optarg);
 	  break;
 
+	case 'c':
+	  copy_instead_of_rename = true;
+	  break;
+
 	case 'i':
 	  separate_files = true;
 	  if (optarg == NULL)
@@ -284,6 +296,12 @@ to the extent permitted by law.\n\
 	}
     }
 
+  if (copy_instead_of_rename && in_place_extension == NULL)
+    {
+      fprintf (stderr, _("Error: -c used without -i.\n"));
+      usage(4);
+    }
+
   if (!the_program)
     {
       if (optind < argc)
diff -urp sed-4.1.5-orig/sed/sed.h sed-4.1.5/sed/sed.h
--- sed-4.1.5-orig/sed/sed.h	2005-06-21 16:09:47.000000000 +0200
+++ sed-4.1.5/sed/sed.h	2006-06-29 15:41:52.000000000 +0200
@@ -228,6 +228,10 @@ extern countT lcmd_out_line_len;
 /* How do we edit files in-place? (we don't if NULL) */
 extern char *in_place_extension;
 
+/* Do we use copy or rename when in in-place edit mode? (boolean
+   value, non-zero for copy, zero for rename).*/
+extern int copy_instead_of_rename;
+
 /* Should we use EREs? */
 extern bool use_extended_syntax_p;
 


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sed.spec	11 Feb 2006 05:40:47 -0000	1.30
+++ sed.spec	29 Jun 2006 14:55:33 -0000	1.31
@@ -5,11 +5,12 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
+Patch0: sed-4.1.4-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --without-included-regex
@@ -63,6 +65,11 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jun 29 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-2
+- #185374:
+  - Follow symlinks before rename (avoid symlink overwrite)
+  - Add -c flag for copy instead of rename (avoid ownership change)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 15:13:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 11:13:59 -0400
Subject: rpms/sed/devel sed.spec,1.31,1.32
Message-ID: <200606291513.k5TFDxAL001757@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1697

Modified Files:
	sed.spec 
Log Message:
rebuild



Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sed.spec	29 Jun 2006 14:55:33 -0000	1.31
+++ sed.spec	29 Jun 2006 15:13:57 -0000	1.32
@@ -5,7 +5,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
@@ -65,6 +65,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jun 29 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-2.1
+- rebuild
+
 * Thu Jun 29 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-2
 - #185374:
   - Follow symlinks before rename (avoid symlink overwrite)



From fedora-cvs-commits at redhat.com  Thu Jun 29 15:19:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 11:19:21 -0400
Subject: rpms/sed/devel sed.spec,1.32,1.33
Message-ID: <200606291519.k5TFJLtk018479@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18399

Modified Files:
	sed.spec 
Log Message:
Typo in patch name



Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sed.spec	29 Jun 2006 15:13:57 -0000	1.32
+++ sed.spec	29 Jun 2006 15:19:18 -0000	1.33
@@ -5,12 +5,12 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
-Patch0: sed-4.1.4-bz185374.patch
+Patch0: sed-4.1.5-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -65,6 +65,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jun 29 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-2.2
+- typo in patch name
+
 * Thu Jun 29 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 17:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 13:27:18 -0400
Subject: rpms/tclx/devel tclx.spec,1.12,1.13
Message-ID: <200606291727.k5THRIfP028485@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tclx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28440

Modified Files:
	tclx.spec 
Log Message:
Unit tests broken, disabling for now (#197107)



Index: tclx.spec
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tclx.spec	20 Apr 2006 19:11:26 -0000	1.12
+++ tclx.spec	29 Jun 2006 17:27:16 -0000	1.13
@@ -1,10 +1,13 @@
 %define major_ver 8.4
 %define tcltk_ver 8.4.13
 
+# Disable 'make test' for now since the unit tests are broken
+%define _without_check 1
+
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 2
+Release: 3
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -106,6 +109,9 @@
 %{_mandir}/man*
 
 %changelog
+* Thu Jun 29 2006 David Cantrell <dcantrell at redhat.com> - 8.4.0-3
+- Unit tests broken, disabling for now (#197107)
+
 * Thu Apr 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.0-2
 - Rebuild against Tcl/Tk 8.4.13
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 17:29:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 13:29:05 -0400
Subject: rpms/gaim/devel gaim.spec,1.125,1.126
Message-ID: <200606291729.k5THT5wE029214@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29173

Modified Files:
	gaim.spec 
Log Message:
buildreq libSM-devel (#197241)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gaim.spec	28 Jun 2006 19:49:19 -0000	1.125
+++ gaim.spec	29 Jun 2006 17:29:03 -0000	1.126
@@ -27,7 +27,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.4.%{betaver}%{?dist}
+Release:	0.5.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -71,6 +71,7 @@
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
+BuildRequires:  libSM-devel
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -282,6 +283,9 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
+* Thu Jun 29 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.5.beta3
+- buildreq libSM-devel (#197241)
+
 * Wed Jun 28 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.4.beta3
 - rebuild against libsilc-1.0.2
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 18:27:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 14:27:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2330,
	1.2331 linux-2.6-squashfs.patch, 1.4, 1.5
Message-ID: <200606291827.k5TIR7Tj018553@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18499

Modified Files:
	kernel-2.6.spec linux-2.6-squashfs.patch 
Log Message:
Fix up squashfs?



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2330
retrieving revision 1.2331
diff -u -r1.2330 -r1.2331
--- kernel-2.6.spec	29 Jun 2006 08:38:20 -0000	1.2330
+++ kernel-2.6.spec	29 Jun 2006 18:27:03 -0000	1.2331
@@ -1582,6 +1582,7 @@
 %changelog
 * Thu Jun 28 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git13 & git14
+- Hopefully fix up squashfs.
 
 * Tue Jun 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git12

linux-2.6-squashfs.patch:
 linux-2.6.15-squashfs3.0/fs/Kconfig                     |   65 
 linux-2.6.15-squashfs3.0/fs/Makefile                    |    1 
 linux-2.6.15-squashfs3.0/fs/squashfs/Makefile           |    7 
 linux-2.6.15-squashfs3.0/fs/squashfs/inode.c            | 2127 ++++++++++++++++
 linux-2.6.15-squashfs3.0/fs/squashfs/squashfs.h         |   86 
 linux-2.6.15-squashfs3.0/fs/squashfs/squashfs2_0.c      |  758 +++++
 linux-2.6.15-squashfs3.0/include/linux/squashfs_fs.h    |  911 ++++++
 linux-2.6.15-squashfs3.0/include/linux/squashfs_fs_i.h  |   45 
 linux-2.6.15-squashfs3.0/include/linux/squashfs_fs_sb.h |   74 
 linux-2.6.17.noarch/fs/squashfs/inode.c                 |    6 
 10 files changed, 4077 insertions(+), 3 deletions(-)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-squashfs.patch	26 Jun 2006 19:33:45 -0000	1.4
+++ linux-2.6-squashfs.patch	29 Jun 2006 18:27:04 -0000	1.5
@@ -4120,3 +4120,26 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
+--- linux-2.6.17.noarch/fs/squashfs/inode.c~	2006-06-29 14:23:33.000000000 -0400
++++ linux-2.6.17.noarch/fs/squashfs/inode.c	2006-06-29 14:26:04.000000000 -0400
+@@ -45,7 +45,7 @@
+ #include "squashfs.h"
+ 
+ static void squashfs_put_super(struct super_block *);
+-static int squashfs_statfs(struct super_block *, struct kstatfs *);
++static int squashfs_statfs(struct dentry *, struct kstatfs *);
+ static int squashfs_symlink_readpage(struct file *file, struct page *page);
+ static int squashfs_readpage(struct file *file, struct page *page);
+ static int squashfs_readpage4K(struct file *file, struct page *page);
+@@ -1148,9 +1148,9 @@ failure:
+ }
+ 
+ 
+-static int squashfs_statfs(struct super_block *s, struct kstatfs *buf)
++static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ {
+-	struct squashfs_sb_info *msblk = s->s_fs_info;
++	struct squashfs_sb_info *msblk = dentry->d_sb;
+ 	struct squashfs_super_block *sblk = &msblk->sblk;
+ 
+ 	TRACE("Entered squashfs_statfs\n");



From fedora-cvs-commits at redhat.com  Thu Jun 29 18:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 14:39:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2331,
	1.2332 linux-2.6-gfs2-dlm.patch, 1.6, 1.7
Message-ID: <200606291839.k5TIdbQs019124@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19049

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
Log Message:
fix gfs2 too



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2331
retrieving revision 1.2332
diff -u -r1.2331 -r1.2332
--- kernel-2.6.spec	29 Jun 2006 18:27:03 -0000	1.2331
+++ kernel-2.6.spec	29 Jun 2006 18:39:30 -0000	1.2332
@@ -1582,7 +1582,7 @@
 %changelog
 * Thu Jun 28 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git13 & git14
-- Hopefully fix up squashfs.
+- Hopefully fix up squashfs & gfs2
 
 * Tue Jun 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git12

linux-2.6-gfs2-dlm.patch:
 b/CREDITS                                  |    6 
 b/Documentation/filesystems/gfs2.txt       |   43 
 b/MAINTAINERS                              |   18 
 b/fs/Kconfig                               |    2 
 b/fs/Makefile                              |    2 
 b/fs/configfs/item.c                       |    2 
 b/fs/dlm/Kconfig                           |   29 
 b/fs/dlm/Makefile                          |   21 
 b/fs/dlm/ast.c                             |  167 +
 b/fs/dlm/ast.h                             |   26 
 b/fs/dlm/config.c                          |  789 ++++++
 b/fs/dlm/config.h                          |   42 
 b/fs/dlm/debug_fs.c                        |  296 ++
 b/fs/dlm/device.c                          | 1239 ++++++++++
 b/fs/dlm/dir.c                             |  423 +++
 b/fs/dlm/dir.h                             |   30 
 b/fs/dlm/dlm_internal.h                    |  494 ++++
 b/fs/dlm/lock.c                            | 3547 +++++++++++++++++++++++++++++
 b/fs/dlm/lock.h                            |   50 
 b/fs/dlm/lockspace.c                       |  678 +++++
 b/fs/dlm/lockspace.h                       |   24 
 b/fs/dlm/lowcomms.c                        | 1238 ++++++++++
 b/fs/dlm/lowcomms.h                        |   26 
 b/fs/dlm/lvb_table.h                       |   18 
 b/fs/dlm/main.c                            |   89 
 b/fs/dlm/member.c                          |  312 ++
 b/fs/dlm/member.h                          |   24 
 b/fs/dlm/memory.c                          |  106 
 b/fs/dlm/memory.h                          |   29 
 b/fs/dlm/midcomms.c                        |  140 +
 b/fs/dlm/midcomms.h                        |   21 
 b/fs/dlm/rcom.c                            |  457 +++
 b/fs/dlm/rcom.h                            |   24 
 b/fs/dlm/recover.c                         |  762 ++++++
 b/fs/dlm/recover.h                         |   34 
 b/fs/dlm/recoverd.c                        |  285 ++
 b/fs/dlm/recoverd.h                        |   24 
 b/fs/dlm/requestqueue.c                    |  184 +
 b/fs/dlm/requestqueue.h                    |   22 
 b/fs/dlm/util.c                            |  161 +
 b/fs/dlm/util.h                            |   22 
 b/fs/gfs2/Kconfig                          |   44 
 b/fs/gfs2/Makefile                         |   10 
 b/fs/gfs2/acl.c                            |  313 ++
 b/fs/gfs2/acl.h                            |   37 
 b/fs/gfs2/bmap.c                           | 1103 +++++++++
 b/fs/gfs2/bmap.h                           |   32 
 b/fs/gfs2/daemon.c                         |  196 +
 b/fs/gfs2/daemon.h                         |   19 
 b/fs/gfs2/dir.c                            | 1980 ++++++++++++++++
 b/fs/gfs2/dir.h                            |   73 
 b/fs/gfs2/eaops.c                          |  230 +
 b/fs/gfs2/eaops.h                          |   29 
 b/fs/gfs2/eattr.c                          | 1548 ++++++++++++
 b/fs/gfs2/eattr.h                          |   97 
 b/fs/gfs2/format.h                         |   21 
 b/fs/gfs2/gfs2.h                           |   31 
 b/fs/gfs2/glock.c                          | 2280 ++++++++++++++++++
 b/fs/gfs2/glock.h                          |  152 +
 b/fs/gfs2/glops.c                          |  491 ++++
 b/fs/gfs2/glops.h                          |   23 
 b/fs/gfs2/incore.h                         |  659 +++++
 b/fs/gfs2/inode.c                          | 1358 +++++++++++
 b/fs/gfs2/inode.h                          |   56 
 b/fs/gfs2/lm.c                             |  244 +
 b/fs/gfs2/lm.h                             |   41 
 b/fs/gfs2/lm_interface.h                   |  295 ++
 b/fs/gfs2/locking.c                        |  191 +
 b/fs/gfs2/locking/dlm/Makefile             |    3 
 b/fs/gfs2/locking/dlm/lock.c               |  541 ++++
 b/fs/gfs2/locking/dlm/lock_dlm.h           |  188 +
 b/fs/gfs2/locking/dlm/main.c               |   64 
 b/fs/gfs2/locking/dlm/mount.c              |  256 ++
 b/fs/gfs2/locking/dlm/plock.c              |  299 ++
 b/fs/gfs2/locking/dlm/sysfs.c              |  225 +
 b/fs/gfs2/locking/dlm/thread.c             |  359 ++
 b/fs/gfs2/locking/nolock/Makefile          |    3 
 b/fs/gfs2/locking/nolock/main.c            |  259 ++
 b/fs/gfs2/log.c                            |  601 ++++
 b/fs/gfs2/log.h                            |   61 
 b/fs/gfs2/lops.c                           |  800 ++++++
 b/fs/gfs2/lops.h                           |   96 
 b/fs/gfs2/lvb.c                            |   45 
 b/fs/gfs2/lvb.h                            |   19 
 b/fs/gfs2/main.c                           |  127 +
 b/fs/gfs2/meta_io.c                        |  888 +++++++
 b/fs/gfs2/meta_io.h                        |   89 
 b/fs/gfs2/mount.c                          |  214 +
 b/fs/gfs2/mount.h                          |   15 
 b/fs/gfs2/ondisk.c                         |  304 ++
 b/fs/gfs2/ops_address.c                    |  669 +++++
 b/fs/gfs2/ops_address.h                    |   17 
 b/fs/gfs2/ops_dentry.c                     |  123 +
 b/fs/gfs2/ops_dentry.h                     |   15 
 b/fs/gfs2/ops_export.c                     |  285 ++
 b/fs/gfs2/ops_export.h                     |   15 
 b/fs/gfs2/ops_file.c                       | 1000 ++++++++
 b/fs/gfs2/ops_file.h                       |   20 
 b/fs/gfs2/ops_fstype.c                     |  842 ++++++
 b/fs/gfs2/ops_fstype.h                     |   16 
 b/fs/gfs2/ops_inode.c                      | 1167 +++++++++
 b/fs/gfs2/ops_inode.h                      |   18 
 b/fs/gfs2/ops_super.c                      |  472 +++
 b/fs/gfs2/ops_super.h                      |   15 
 b/fs/gfs2/ops_vm.c                         |  195 +
 b/fs/gfs2/ops_vm.h                         |   16 
 b/fs/gfs2/page.c                           |  268 ++
 b/fs/gfs2/page.h                           |   23 
 b/fs/gfs2/quota.c                          | 1301 ++++++++++
 b/fs/gfs2/quota.h                          |   32 
 b/fs/gfs2/recovery.c                       |  575 ++++
 b/fs/gfs2/recovery.h                       |   32 
 b/fs/gfs2/rgrp.c                           | 1529 ++++++++++++
 b/fs/gfs2/rgrp.h                           |   62 
 b/fs/gfs2/super.c                          |  928 +++++++
 b/fs/gfs2/super.h                          |   52 
 b/fs/gfs2/sys.c                            |  579 ++++
 b/fs/gfs2/sys.h                            |   24 
 b/fs/gfs2/trans.c                          |  184 +
 b/fs/gfs2/trans.h                          |   34 
 b/fs/gfs2/util.c                           |  245 ++
 b/fs/gfs2/util.h                           |  169 +
 b/include/linux/dlm.h                      |  302 ++
 b/include/linux/dlm_device.h               |   86 
 b/include/linux/fs.h                       |    3 
 b/include/linux/gfs2_ondisk.h              |  441 +++
 b/include/linux/iflags.h                   |  102 
 b/include/linux/lock_dlm_plock.h           |   40 
 b/kernel/printk.c                          |    1 
 b/mm/filemap.c                             |    1 
 b/mm/readahead.c                           |    1 
 linux-2.6.17.noarch/include/linux/kernel.h |    1 
 132 files changed, 40811 insertions(+), 4 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-gfs2-dlm.patch	27 Jun 2006 00:39:13 -0000	1.6
+++ linux-2.6-gfs2-dlm.patch	29 Jun 2006 18:39:34 -0000	1.7
@@ -33759,7 +33759,7 @@
 index 0000000..5f5fc3c
 --- /dev/null
 +++ b/fs/gfs2/ops_super.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,472 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -33964,8 +33964,9 @@
 + * Returns: 0 on success or error code
 + */
 +
-+static int gfs2_statfs(struct super_block *sb, struct kstatfs *buf)
++static int gfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
 +{
++	struct super_block *sb = dentry->d_sb;
 +	struct gfs2_sbd *sdp = sb->s_fs_info;
 +	struct gfs2_statfs_change sc;
 +	int error;



From fedora-cvs-commits at redhat.com  Thu Jun 29 18:49:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 14:49:11 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2332,1.2333
Message-ID: <200606291849.k5TInBGY014647@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19140

Modified Files:
	kernel-2.6.spec 
Log Message:
all the world is x86[64] (for now)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2332
retrieving revision 1.2333
diff -u -r1.2332 -r1.2333
--- kernel-2.6.spec	29 Jun 2006 18:39:30 -0000	1.2332
+++ kernel-2.6.spec	29 Jun 2006 18:49:08 -0000	1.2333
@@ -170,7 +170,7 @@
 Version: %{rpmversion}
 Release: %{release}
 #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Thu Jun 29 18:59:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 14:59:13 -0400
Subject: rpms/kernel/devel linux-2.6-squashfs.patch,1.5,1.6
Message-ID: <200606291859.k5TIxD9C018508@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18376

Modified Files:
	linux-2.6-squashfs.patch 
Log Message:
no coding on crack.


linux-2.6-squashfs.patch:
 linux-2.6.15-squashfs3.0/fs/Kconfig                     |   65 
 linux-2.6.15-squashfs3.0/fs/Makefile                    |    1 
 linux-2.6.15-squashfs3.0/fs/squashfs/Makefile           |    7 
 linux-2.6.15-squashfs3.0/fs/squashfs/inode.c            | 2127 ++++++++++++++++
 linux-2.6.15-squashfs3.0/fs/squashfs/squashfs.h         |   86 
 linux-2.6.15-squashfs3.0/fs/squashfs/squashfs2_0.c      |  758 +++++
 linux-2.6.15-squashfs3.0/include/linux/squashfs_fs.h    |  911 ++++++
 linux-2.6.15-squashfs3.0/include/linux/squashfs_fs_i.h  |   45 
 linux-2.6.15-squashfs3.0/include/linux/squashfs_fs_sb.h |   74 
 linux-2.6.17.noarch/fs/squashfs/inode.c                 |    7 
 10 files changed, 4077 insertions(+), 4 deletions(-)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-squashfs.patch	29 Jun 2006 18:27:04 -0000	1.5
+++ linux-2.6-squashfs.patch	29 Jun 2006 18:59:11 -0000	1.6
@@ -4131,7 +4131,7 @@
  static int squashfs_symlink_readpage(struct file *file, struct page *page);
  static int squashfs_readpage(struct file *file, struct page *page);
  static int squashfs_readpage4K(struct file *file, struct page *page);
-@@ -1148,9 +1148,9 @@ failure:
+@@ -1148,10 +1148,9 @@ failure:
  }
  
  
@@ -4139,7 +4139,8 @@
 +static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf)
  {
 -	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_sb_info *msblk = dentry->d_sb;
- 	struct squashfs_super_block *sblk = &msblk->sblk;
+-	struct squashfs_super_block *sblk = &msblk->sblk;
++	struct squashfs_super_block *sblk = dentry->d_sb;
  
  	TRACE("Entered squashfs_statfs\n");
+ 



From fedora-cvs-commits at redhat.com  Thu Jun 29 19:04:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 15:04:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2333,1.2334
Message-ID: <200606291904.k5TJ4OaA019575@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19507

Modified Files:
	kernel-2.6.spec 
Log Message:
bump to keep brew happy




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2333
retrieving revision 1.2334
diff -u -r1.2333 -r1.2334
--- kernel-2.6.spec	29 Jun 2006 18:49:08 -0000	1.2333
+++ kernel-2.6.spec	29 Jun 2006 19:04:20 -0000	1.2334
@@ -1582,7 +1582,7 @@
 %changelog
 * Thu Jun 28 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git13 & git14
-- Hopefully fix up squashfs & gfs2
+- Hopefully fix up squashfs & gfs2.
 
 * Tue Jun 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git12



From fedora-cvs-commits at redhat.com  Thu Jun 29 19:09:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 15:09:36 -0400
Subject: rpms/evince/devel evince.spec,1.51,1.52
Message-ID: <200606291909.k5TJ9aQD020559@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20536

Modified Files:
	evince.spec 
Log Message:
* Thu Jun 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.5.3-4
- Bump gtk2 dependency to 2.9.4.



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- evince.spec	9 Jun 2006 03:27:04 -0000	1.51
+++ evince.spec	29 Jun 2006 19:09:33 -0000	1.52
@@ -1,10 +1,10 @@
 %define poppler_version 0.5.2
-%define gtk2_version 2.8.0
+%define gtk2_version 2.9.4
 %define dbus_version 0.60
 
 Name:		evince
 Version:	0.5.3
-Release:	3
+Release:	4
 Summary:	Document viewer
 
 License: 	GPL
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Thu Jun 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.5.3-4
+- Bump gtk2 dependency to 2.9.4.
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.3-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 19:18:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 15:18:10 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.12,1.13
Message-ID: <200606291918.k5TJIA9r005055@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5030

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Thu Jun 29 2006 Mike Harris <mharris at redhat.com> 7.1-2
- Regenerate driver list to match current rawhide X11R7.1 driver set.



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drivers.spec	28 Jun 2006 10:34:44 -0000	1.12
+++ xorg-x11-drivers.spec	29 Jun 2006 19:18:07 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
@@ -199,7 +199,7 @@
 Requires: xorg-x11-drv-sis
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64
 Requires: xorg-x11-drv-sisusb
 %endif
 
@@ -279,6 +279,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jun 29 2006 Mike Harris <mharris at redhat.com> 7.1-2
+- Regenerate driver list to match current rawhide X11R7.1 driver set.
+
 * Wed Jun 21 2006 Mike Harris <mharris at redhat.com> 7.1-1
 - Regenerate driver list to match current rawhide X11R7.1 driver set.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 19:42:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 15:42:01 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.12,1.13
Message-ID: <200606291942.k5TJg1in012749@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-sisusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12552

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
- Add builds for ppc and ia64 to satisfy xorg-x11-drivers
  dependencies.  Highly untested.



Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-sisusb.spec	28 Jun 2006 16:09:57 -0000	1.12
+++ xorg-x11-drv-sisusb.spec	29 Jun 2006 19:41:57 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
 Version:   0.8.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -15,7 +15,7 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
@@ -58,6 +58,10 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Thu Jun 29 2006 Adam Jackson <ajackson at redhat.com> 0.8.1-4
+- Add builds for ppc and ia64 to satisfy xorg-x11-drivers
+  dependencies.  Highly untested.
+
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 0.8.1-3
 - Remove system owned directories from file manifest.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 20:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 16:38:50 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.207,
	1.208 config-powerpc-generic, 1.19, 1.20
Message-ID: <200606292038.k5TKcoVK025860@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv25720/configs

Modified Files:
	config-generic config-powerpc-generic 
Log Message:
git15 in the haus




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- config-generic	29 Jun 2006 08:38:21 -0000	1.207
+++ config-generic	29 Jun 2006 20:38:46 -0000	1.208
@@ -2806,6 +2806,18 @@
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
 # CONFIG_SND_PDAUDIOCF is not set
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
 
 ## END of ISA options.
 
@@ -2815,6 +2827,7 @@
 # CONFIG_FORCED_INLINING is not set
 
 CONFIG_MIGRATION=y
+CONFIG_RESOURCES_64BIT=y
 # CONFIG_NEW_LEDS is not set
 
 CONFIG_DMA_ENGINE=y
@@ -2822,3 +2835,4 @@
 CONFIG_INTEL_IOATDMA=m
 
 # CONFIG_UNUSED_SYMBOLS is not set
+


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-powerpc-generic	27 Jun 2006 00:39:24 -0000	1.19
+++ config-powerpc-generic	29 Jun 2006 20:38:46 -0000	1.20
@@ -100,3 +100,6 @@
 CONFIG_FB_RIVA_BACKLIGHT=y
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+



From fedora-cvs-commits at redhat.com  Thu Jun 29 20:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 16:38:49 -0400
Subject: rpms/kernel/devel patch-2.6.17-git15.bz2.sign, NONE, 1.1 .cvsignore,
	1.469, 1.470 kernel-2.6.spec, 1.2334,
	1.2335 linux-2.6-compile-fixes.patch, 1.86, 1.87 sources,
	1.413, 1.414 upstream, 1.380,
	1.381 patch-2.6.17-git13.bz2.sign, 1.1, NONE
Message-ID: <200606292038.k5TKcmt6025849@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25720

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.17-git15.bz2.sign 
Removed Files:
	patch-2.6.17-git13.bz2.sign 
Log Message:
git15 in the haus




--- NEW FILE patch-2.6.17-git15.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEpCQryGugalF9Dw4RAnlTAJ9mtbRf/83RGfeGsvs2zLDbes4jrwCeIv9T
89P/K9kNdKcs2/w+HJawOE8=
=/n7E
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- .cvsignore	29 Jun 2006 08:38:20 -0000	1.469
+++ .cvsignore	29 Jun 2006 20:38:44 -0000	1.470
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git14.bz2
+patch-2.6.17-git15.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2334
retrieving revision 1.2335
diff -u -r1.2334 -r1.2335
--- kernel-2.6.spec	29 Jun 2006 19:04:20 -0000	1.2334
+++ kernel-2.6.spec	29 Jun 2006 20:38:44 -0000	1.2335
@@ -169,8 +169,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -239,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git14.bz2
+Patch1: patch-2.6.17-git15.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -980,7 +979,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
+#%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1581,8 +1580,8 @@
 
 %changelog
 * Thu Jun 28 2006 Dave Jones <davej at redhat.com>
-- 2.6.17-git13 & git14
-- Hopefully fix up squashfs & gfs2.
+- 2.6.17-git13, git14 & git15
+- Hopefully fix up squashfs & gfs2
 
 * Tue Jun 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git12

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- linux-2.6-compile-fixes.patch	29 Jun 2006 08:27:51 -0000	1.86
+++ linux-2.6-compile-fixes.patch	29 Jun 2006 20:38:46 -0000	1.87
@@ -1,10 +0,0 @@
---- linux-2.6.17.noarch/drivers/char/Kconfig~	2006-06-29 01:17:35.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/char/Kconfig	2006-06-29 01:17:55.000000000 -0400
-@@ -963,6 +963,7 @@ config PC8736x_GPIO
- 
- config NSC_GPIO
- 	tristate "NatSemi Base GPIO Support"
-+	depends on X86_32
- 	# selected by SCx200_GPIO and PC8736x_GPIO
- 	# what about 2 selectors differing: m != y
- 	help


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- sources	29 Jun 2006 08:38:20 -0000	1.413
+++ sources	29 Jun 2006 20:38:46 -0000	1.414
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-ed71d76fabac9e9b239cba592460e51b  patch-2.6.17-git14.bz2
+3199df69096aff59f99ddf4a5b90a4a4  patch-2.6.17-git15.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- upstream	29 Jun 2006 08:38:21 -0000	1.380
+++ upstream	29 Jun 2006 20:38:46 -0000	1.381
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git14.bz2
+patch-2.6.17-git15.bz2


--- patch-2.6.17-git13.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 20:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 16:53:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2335,
	1.2336 linux-2.6-compile-fixes.patch, 1.87, 1.88
Message-ID: <200606292053.k5TKrO0C012400@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12274

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
fix build



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2335
retrieving revision 1.2336
diff -u -r1.2335 -r1.2336
--- kernel-2.6.spec	29 Jun 2006 20:38:44 -0000	1.2335
+++ kernel-2.6.spec	29 Jun 2006 20:53:21 -0000	1.2336
@@ -979,7 +979,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1

linux-2.6-compile-fixes.patch:
 setup.c |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- linux-2.6-compile-fixes.patch	29 Jun 2006 20:38:46 -0000	1.87
+++ linux-2.6-compile-fixes.patch	29 Jun 2006 20:53:21 -0000	1.88
@@ -0,0 +1,10 @@
+--- linux-2.6.17.noarch/arch/powerpc/platforms/cell/setup.c~	2006-06-29 16:50:23.000000000 -0400
++++ linux-2.6.17.noarch/arch/powerpc/platforms/cell/setup.c	2006-06-29 16:51:07.000000000 -0400
+@@ -50,6 +50,7 @@
+ #include <asm/irq.h>
+ #include <asm/spu.h>
+ #include <asm/spu_priv1.h>
++#include <asm/udbg.h>
+ 
+ #include "interrupt.h"
+ #include "iommu.h"



From fedora-cvs-commits at redhat.com  Thu Jun 29 20:59:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 16:59:41 -0400
Subject: rpms/shared-mime-info/devel shared-mime-info-0.17-pdf.patch, NONE,
	1.1 shared-mime-info.spec, 1.39, 1.40
Message-ID: <200606292059.k5TKxf7e014545@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14520

Modified Files:
	shared-mime-info.spec 
Added Files:
	shared-mime-info-0.17-pdf.patch 
Log Message:
* Thu Jun 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.17-3
- Adding PDF fix backported from CVS.


shared-mime-info-0.17-pdf.patch:
 freedesktop.org.xml.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE shared-mime-info-0.17-pdf.patch ---
--- freedesktop.org.xml.in	2006/04/19 16:26:47	1.138
+++ freedesktop.org.xml.in	2006/05/09 20:31:38	1.139
@@ -2843,8 +2843,10 @@
   <mime-type type="text/x-matlab">
     <sub-class-of type="text/plain"/>
     <_comment>MATLAB script/function</_comment>
-    <magic priority="50">
+    <magic priority="10">
       <match type="string" value="%" offset="0"/>
+    </magic>
+    <magic priority="50">
       <match type="string" value="function" offset="0"/>
     </magic>
     <glob pattern="*.m"/>
@@ -2928,7 +2930,7 @@
     <glob pattern="*.ltx"/>
     <glob pattern="*.sty"/>
     <glob pattern="*.cls"/>
-    <magic priority="50">
+    <magic priority="10">
       <match type="string" value="%" offset="0"/>
     </magic>
   </mime-type>


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- shared-mime-info.spec	22 Mar 2006 19:23:40 -0000	1.39
+++ shared-mime-info.spec	29 Jun 2006 20:59:38 -0000	1.40
@@ -1,17 +1,20 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.17
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
 Source0: %{name}-%{version}.tar.gz
 Source1: defaults.list
+
 Patch0: shared-mime-info-0.16-cisco-vpn.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4675 
 Patch1: shared-mime-info-0.16-fonts.patch
 # fixed in upstream cvs
 Patch2: shared-mime-info-0.17-postscript.patch
+Patch3: shared-mime-info-0.17-pdf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
@@ -32,7 +35,7 @@
 %patch0 -p0 -b .cisco-vpn
 %patch1 -p1 -b .fonts
 %patch2 -p1 -b .postscript
-
+%patch3 -p0 -b .pdf
 %build
 
 %configure --disable-update-mimedb
@@ -65,6 +68,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jun 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.17-3
+- Adding PDF fix backported from CVS.
+
 * Wed Mar 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.17-2
 - Backport upstream change to fix postscript vs. matlab confusion
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 21:21:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 17:21:15 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.88,1.89
Message-ID: <200606292121.k5TLLFuG009064@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9049

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix ia64 maybe

linux-2.6-compile-fixes.patch:
 Makefile                            |    4 ----
 arch/powerpc/platforms/cell/setup.c |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- linux-2.6-compile-fixes.patch	29 Jun 2006 20:53:21 -0000	1.88
+++ linux-2.6-compile-fixes.patch	29 Jun 2006 21:21:07 -0000	1.89
@@ -8,3 +8,17 @@
  
  #include "interrupt.h"
  #include "iommu.h"
+
+--- linux-2.6.17.noarch/Makefile~	2006-06-29 17:20:17.000000000 -0400
++++ linux-2.6.17.noarch/Makefile	2006-06-29 17:20:38.000000000 -0400
+@@ -267,10 +267,6 @@ MAKEFLAGS += --include-dir=$(srctree)
+ # We need some generic definitions
+ include  $(srctree)/scripts/Kbuild.include
+ 
+-# Do not use make's built-in rules and variables
+-# This increases performance and avoid hard-to-debug behavour
+-MAKEFLAGS += -rR
+-
+ # Make variables (CC, etc...)
+ 
+ AS		= $(CROSS_COMPILE)as



From fedora-cvs-commits at redhat.com  Thu Jun 29 21:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 17:46:40 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.22,NONE
Message-ID: <200606292146.k5TLkevt013895@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13586

Removed Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
kill


--- linux-2.6-header-cleanup-git.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jun 29 21:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 17:48:32 -0400
Subject: rpms/cups/devel cups-paps.patch,1.1,1.2 cups.spec,1.221,1.222
Message-ID: <200606292148.k5TLmWO9023026@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21771

Modified Files:
	cups-paps.patch cups.spec 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com>
- Bumped paps requirement.
- Don't use texttopaps for application/* MIME types (bug #197214).


cups-paps.patch:
 mime.convs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: cups-paps.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-paps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-paps.patch	29 Jun 2006 11:53:08 -0000	1.1
+++ cups-paps.patch	29 Jun 2006 21:48:30 -0000	1.2
@@ -1,19 +1,11 @@
---- cups-1.2.1/conf/mime.convs.paps	2006-06-29 12:51:14.000000000 +0100
-+++ cups-1.2.1/conf/mime.convs	2006-06-29 12:51:54.000000000 +0100
-@@ -46,12 +46,12 @@
- application/pdf		application/postscript	33	pdftops
- application/postscript	application/vnd.cups-postscript	66	pstops
- application/vnd.hp-HPGL	application/postscript	66	hpgltops
--application/x-cshell	application/postscript	33	texttops
--application/x-csource	application/postscript	33	texttops
--application/x-perl	application/postscript	33	texttops
--application/x-shell	application/postscript	33	texttops
+--- cups-1.2.1/conf/mime.convs.paps	2006-04-14 20:21:03.000000000 +0100
++++ cups-1.2.1/conf/mime.convs	2006-06-29 15:12:57.000000000 +0100
+@@ -50,8 +50,8 @@
+ application/x-csource	application/postscript	33	texttops
+ application/x-perl	application/postscript	33	texttops
+ application/x-shell	application/postscript	33	texttops
 -text/plain		application/postscript	33	texttops
 -text/html		application/postscript	33	texttops
-+application/x-cshell	application/postscript	33	texttopaps
-+application/x-csource	application/postscript	33	texttopaps
-+application/x-perl	application/postscript	33	texttopaps
-+application/x-shell	application/postscript	33	texttopaps
 +text/plain		application/postscript	33	texttopaps
 +text/html		application/postscript	33	texttopaps
  image/gif		application/vnd.cups-postscript	66	imagetops


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- cups.spec	29 Jun 2006 11:53:08 -0000	1.221
+++ cups.spec	29 Jun 2006 21:48:30 -0000	1.222
@@ -76,7 +76,7 @@
 Requires: dbus >= 0.60
 
 # The paps package uses pango to render UTF-8 text to PostScript.
-Requires: paps >= 0.6.6-8.fc6
+Requires: paps >= 0.6.6-9
 
 %package devel
 Summary: Common Unix Printing System - development environment
@@ -401,6 +401,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com>
+- Bumped paps requirement.
+- Don't use texttopaps for application/* MIME types (bug #197214).
+
 * Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-15
 - Require paps and use it for printing text (bug #197214).
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 21:49:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 17:49:00 -0400
Subject: rpms/cups/devel cups.spec,1.222,1.223
Message-ID: <200606292149.k5TLn0rE024051@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24037

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-16


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- cups.spec	29 Jun 2006 21:48:30 -0000	1.222
+++ cups.spec	29 Jun 2006 21:48:57 -0000	1.223
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -401,7 +401,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-16
 - Bumped paps requirement.
 - Don't use texttopaps for application/* MIME types (bug #197214).
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 23:22:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 19:22:10 -0400
Subject: rpms/evolution/devel evolution-2.7.3-mailing-list-menu.patch, NONE,
	1.1 evolution.spec, 1.156, 1.157
Message-ID: <200606292322.k5TNMAW9002452@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2353

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-mailing-list-menu.patch 
Log Message:
- Properly capitalize "Message->Mailing List" menu items (RH #175596).


evolution-2.7.3-mailing-list-menu.patch:
 org-gnome-mailing-list-actions.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE evolution-2.7.3-mailing-list-menu.patch ---
--- evolution-2.7.3/plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.mailing-list-menu	2005-05-13 17:29:26.000000000 -0400
+++ evolution-2.7.3/plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml	2006-06-29 18:35:16.000000000 -0400
@@ -12,12 +12,12 @@
     <placeholder name="MessagePlaceholder">
       <submenu name="Message">
       <submenu name="List" _label="Mailing _List">    
-        <menuitem verb="ListHelp" _label="Get list _usage information"/>
-        <menuitem verb="ListSubscribe" _label="_Subscribe to list"/>
-        <menuitem verb="ListUnsubscribe" _label="_Un-subscribe to list"/>
-        <menuitem verb="ListPost" _label="_Post message to list"/>
-        <menuitem verb="ListOwner" _label="Contact list _owner"/>
-        <menuitem verb="ListArchive" _label="Get list _archive"/>
+        <menuitem verb="ListHelp" _label="Get List _Usage Information"/>
+        <menuitem verb="ListSubscribe" _label="_Subscribe to List"/>
+        <menuitem verb="ListUnsubscribe" _label="_Unsubscribe from List"/>
+        <menuitem verb="ListPost" _label="_Post Message to List"/>
+        <menuitem verb="ListOwner" _label="Contact List _Owner"/>
+        <menuitem verb="ListArchive" _label="Get List _Archive"/>
       </submenu>
     </submenu>
     </placeholder>


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- evolution.spec	27 Jun 2006 20:44:47 -0000	1.156
+++ evolution.spec	29 Jun 2006 23:22:08 -0000	1.157
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -125,6 +125,9 @@
 # Gnome.org #211058 - for Trever Adams to test
 Patch903: evolution-2.7.3-filter-datespec.patch
 
+# RH bug #175596 / Gnome.org bug #323952
+Patch904: evolution-2.7.3-mailing-list-menu.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -280,6 +283,7 @@
 %patch901 -p1 -b .no-boolean-in-schemas
 %patch902 -p1 -b .candidate-window-position
 %patch903 -p1 -b .filter-datespec
+%patch904 -p1 -b .mailing-list-menu
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -670,6 +674,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Jun 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-6
+- Properly capitalize "Message->Mailing List" menu items (RH #175596).
+
 * Tue Jun 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-5
 - Add patch for Gnome.org bug #211058 for Trever Adams to test.
 



From fedora-cvs-commits at redhat.com  Thu Jun 29 23:31:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 19:31:04 -0400
Subject: rpms/kernel/devel linux-2.6-audit-rename.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2293.2.4,
	1.2293.2.5 linux-2.6-audit-by-object.patch, 1.1.2.1, 1.1.2.2
Message-ID: <200606292331.k5TNV4u1005628@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5570

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec linux-2.6-audit-by-object.patch 
Added Files:
      Tag: private-lspp-37-branch
	linux-2.6-audit-rename.patch 
Log Message:
* Thu Jun 29 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.41, really apply patch 8 of 8 from Paul
- added improved audit by obj by Darrel


linux-2.6-audit-rename.patch:
 include/linux/audit.h          |   15 ++++++++----
 kernel/auditfilter.c           |   50 ++++++++++++++++++++---------------------
 kernel/auditsc.c               |   10 ++++----
 security/selinux/ss/services.c |   32 +++++++++++++-------------
 4 files changed, 56 insertions(+), 51 deletions(-)

--- NEW FILE linux-2.6-audit-rename.patch ---
>From dgoeddel at trustedcs.com Thu Jun 29 17:56:39 2006
Return-Path: <dgoeddel at trustedcs.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 29 Jun 2006 17:57:13 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5TLvDel020084
	for <sgrubb at boston.redhat.com>; Thu, 29 Jun 2006 17:57:13 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5TLvCpQ021948;
	Thu, 29 Jun 2006 17:57:12 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5TLuvTf024106;
	Thu, 29 Jun 2006 17:57:03 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k5TLuoAZ014001;
	Thu, 29 Jun 2006 17:56:50 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap (V1.3)
	id (null); Thu Jun 29 17:56:45 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by trauma.tcs-sec.com with NetIQ MailMarshal (v6,0,3,8)
	id <B44a44c9c0000>; Thu, 29 Jun 2006 17:56:44 -0400
Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13)
	id N4CXJJK5; Thu, 29 Jun 2006 17:56:44 -0400
Message-ID: <44A44C97.70102 at trustedcs.com>
Date: Thu, 29 Jun 2006 16:56:39 -0500
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Steve Grubb <sgrubb at redhat.com>,
 Alexander Viro <aviro at redhat.com>
CC: Stephen Smalley <sds at tycho.nsa.gov>,
 James Morris <jmorris at namei.org>,
 redhat-lspp at redhat.com
Subject: [PATCH 1/2] audit: rename AUDIT_SE_* constants
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: -2.613 
X-UID: 72571
X-Length: 9854

This patch renames some audit constant definitions and adds
additional definitions used by the following patch.  The renaming
avoids ambiguity with respect to the new definitions.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>

 include/linux/audit.h          |   15 ++++++++----
 kernel/auditfilter.c           |   50 ++++++++++++++++++++---------------------
 kernel/auditsc.c               |   10 ++++----
 security/selinux/ss/services.c |   32 +++++++++++++-------------
 4 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index f7883ec..c5cbd4d 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -152,12 +152,17 @@ #define AUDIT_LOGINUID	9
 #define AUDIT_PERS	10
 #define AUDIT_ARCH	11
 #define AUDIT_MSGTYPE	12
-#define AUDIT_SE_USER	13	/* security label user */
-#define AUDIT_SE_ROLE	14	/* security label role */
-#define AUDIT_SE_TYPE	15	/* security label type */
-#define AUDIT_SE_SEN	16	/* security label sensitivity label */
-#define AUDIT_SE_CLR	17	/* security label clearance label */
+#define AUDIT_SUBJ_USER	13	/* security label user */
+#define AUDIT_SUBJ_ROLE	14	/* security label role */
+#define AUDIT_SUBJ_TYPE	15	/* security label type */
+#define AUDIT_SUBJ_SEN	16	/* security label sensitivity label */
+#define AUDIT_SUBJ_CLR	17	/* security label clearance label */
 #define AUDIT_PPID	18
+#define AUDIT_OBJ_USER	19
+#define AUDIT_OBJ_ROLE	20
+#define AUDIT_OBJ_TYPE	21
+#define AUDIT_OBJ_LEV_LOW	22
+#define AUDIT_OBJ_LEV_HIGH	23
 
 				/* These are ONLY useful when checking
 				 * at syscall exit time (AUDIT_AT_EXIT). */
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index e98db08..40a9931 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -470,11 +470,11 @@ static struct audit_entry *audit_data_to
 		case AUDIT_ARG2:
 		case AUDIT_ARG3:
 			break;
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
+		case AUDIT_SUBJ_USER:
+		case AUDIT_SUBJ_ROLE:
+		case AUDIT_SUBJ_TYPE:
+		case AUDIT_SUBJ_SEN:
+		case AUDIT_SUBJ_CLR:
 			str = audit_unpack_string(&bufp, &remain, f->val);
 			if (IS_ERR(str))
 				goto exit_free;
@@ -611,11 +611,11 @@ static struct audit_rule_data *audit_kru
 		data->fields[i] = f->type;
 		data->fieldflags[i] = f->op;
 		switch(f->type) {
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
+		case AUDIT_SUBJ_USER:
+		case AUDIT_SUBJ_ROLE:
+		case AUDIT_SUBJ_TYPE:
+		case AUDIT_SUBJ_SEN:
+		case AUDIT_SUBJ_CLR:
 			data->buflen += data->values[i] =
 				audit_pack_string(&bufp, f->se_str);
 			break;
@@ -654,11 +654,11 @@ static int audit_compare_rule(struct aud
 			return 1;
 
 		switch(a->fields[i].type) {
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
+		case AUDIT_SUBJ_USER:
+		case AUDIT_SUBJ_ROLE:
+		case AUDIT_SUBJ_TYPE:
+		case AUDIT_SUBJ_SEN:
+		case AUDIT_SUBJ_CLR:
 			if (strcmp(a->fields[i].se_str, b->fields[i].se_str))
 				return 1;
 			break;
@@ -774,11 +774,11 @@ static struct audit_entry *audit_dupe_ru
 	 * the originals will all be freed when the old rule is freed. */
 	for (i = 0; i < fcount; i++) {
 		switch (new->fields[i].type) {
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
+		case AUDIT_SUBJ_USER:
+		case AUDIT_SUBJ_ROLE:
+		case AUDIT_SUBJ_TYPE:
+		case AUDIT_SUBJ_SEN:
+		case AUDIT_SUBJ_CLR:
 			err = audit_dupe_selinux_field(&new->fields[i],
 						       &old->fields[i]);
 			break;
@@ -1537,11 +1537,11 @@ static inline int audit_rule_has_selinux
 	for (i = 0; i < rule->field_count; i++) {
 		struct audit_field *f = &rule->fields[i];
 		switch (f->type) {
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
+		case AUDIT_SUBJ_USER:
+		case AUDIT_SUBJ_ROLE:
+		case AUDIT_SUBJ_TYPE:
+		case AUDIT_SUBJ_SEN:
+		case AUDIT_SUBJ_CLR:
 			return 1;
 		}
 	}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index b32ccfa..e183a6f 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -321,11 +321,11 @@ static int audit_filter_rules(struct tas
 			if (ctx)
 				result = audit_comparator(ctx->loginuid, f->op, f->val);
 			break;
-		case AUDIT_SE_USER:
-		case AUDIT_SE_ROLE:
-		case AUDIT_SE_TYPE:
-		case AUDIT_SE_SEN:
-		case AUDIT_SE_CLR:
+		case AUDIT_SUBJ_USER:
+		case AUDIT_SUBJ_ROLE:
+		case AUDIT_SUBJ_TYPE:
+		case AUDIT_SUBJ_SEN:
+		case AUDIT_SUBJ_CLR:
 			/* NOTE: this may return negative values indicating
 			   a temporary error.  We simply treat this as a
 			   match for now to avoid losing information that
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index d82898c..112484f 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1855,15 +1855,15 @@ int selinux_audit_rule_init(u32 field, u
 		return -ENOTSUPP;
 
 	switch (field) {
-	case AUDIT_SE_USER:
-	case AUDIT_SE_ROLE:
-	case AUDIT_SE_TYPE:
+	case AUDIT_SUBJ_USER:
+	case AUDIT_SUBJ_ROLE:
+	case AUDIT_SUBJ_TYPE:
 		/* only 'equals' and 'not equals' fit user, role, and type */
 		if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL)
 			return -EINVAL;
 		break;
-	case AUDIT_SE_SEN:
-	case AUDIT_SE_CLR:
+	case AUDIT_SUBJ_SEN:
+	case AUDIT_SUBJ_CLR:
 		/* we do not allow a range, indicated by the presense of '-' */
 		if (strchr(rulestr, '-'))
 			return -EINVAL;
@@ -1884,29 +1884,29 @@ int selinux_audit_rule_init(u32 field, u
 	tmprule->au_seqno = latest_granting;
 
 	switch (field) {
-	case AUDIT_SE_USER:
+	case AUDIT_SUBJ_USER:
 		userdatum = hashtab_search(policydb.p_users.table, rulestr);
 		if (!userdatum)
 			rc = -EINVAL;
 		else
 			tmprule->au_ctxt.user = userdatum->value;
 		break;
-	case AUDIT_SE_ROLE:
+	case AUDIT_SUBJ_ROLE:
 		roledatum = hashtab_search(policydb.p_roles.table, rulestr);
 		if (!roledatum)
 			rc = -EINVAL;
 		else
 			tmprule->au_ctxt.role = roledatum->value;
 		break;
-	case AUDIT_SE_TYPE:
+	case AUDIT_SUBJ_TYPE:
 		typedatum = hashtab_search(policydb.p_types.table, rulestr);
 		if (!typedatum)
 			rc = -EINVAL;
 		else
 			tmprule->au_ctxt.type = typedatum->value;
 		break;
-	case AUDIT_SE_SEN:
-	case AUDIT_SE_CLR:
+	case AUDIT_SUBJ_SEN:
+	case AUDIT_SUBJ_CLR:
 		rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC);
 		break;
 	}
@@ -1958,7 +1958,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 	/* a field/op pair that is not caught here will simply fall through
 	   without a match */
 	switch (field) {
-	case AUDIT_SE_USER:
+	case AUDIT_SUBJ_USER:
 		switch (op) {
 		case AUDIT_EQUAL:
 			match = (ctxt->user == rule->au_ctxt.user);
@@ -1968,7 +1968,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 			break;
 		}
 		break;
-	case AUDIT_SE_ROLE:
+	case AUDIT_SUBJ_ROLE:
 		switch (op) {
 		case AUDIT_EQUAL:
 			match = (ctxt->role == rule->au_ctxt.role);
@@ -1978,7 +1978,7 @@ int selinux_audit_rule_match(u32 ctxid, 
 			break;
 		}
 		break;
-	case AUDIT_SE_TYPE:
+	case AUDIT_SUBJ_TYPE:
 		switch (op) {
 		case AUDIT_EQUAL:
 			match = (ctxt->type == rule->au_ctxt.type);
@@ -1988,9 +1988,9 @@ int selinux_audit_rule_match(u32 ctxid, 
 			break;
 		}
 		break;
-	case AUDIT_SE_SEN:
-	case AUDIT_SE_CLR:
-		level = (field == AUDIT_SE_SEN ?
+	case AUDIT_SUBJ_SEN:
+	case AUDIT_SUBJ_CLR:
+		level = (field == AUDIT_SUBJ_SEN ?
 		         &ctxt->range.level[0] : &ctxt->range.level[1]);
 		switch (op) {
 		case AUDIT_EQUAL:

-- 

Darrel



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.4
retrieving revision 1.2293.2.5
diff -u -r1.2293.2.4 -r1.2293.2.5
--- kernel-2.6.spec	28 Jun 2006 22:34:46 -0000	1.2293.2.4
+++ kernel-2.6.spec	29 Jun 2006 23:30:49 -0000	1.2293.2.5
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.40
+%define tag FC6.lspp.41
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -470,7 +470,8 @@
 Patch20109: linux-2.6-net-label_7_8.patch
 Patch20110: linux-2.6-net-label_8_8.patch
 Patch20120: ipsec-lspp-38.patch
-Patch20121: linux-2.6-audit-by-object.patch
+Patch20121: linux-2.6-audit-rename.patch
+Patch20122: linux-2.6-audit-by-object.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1121,10 +1122,12 @@
 %patch20107 -p1
 %patch20108 -p1
 %patch20109 -p1
+%patch20110 -p1
 # ipsec
 #%patch20120 -p1
 # audit by obj
 %patch20121 -p1
+%patch20122 -p1
 
 
 # now run oldconfig over all the config files
@@ -1133,9 +1136,6 @@
   mv $i .config
   echo "CONFIG_INOTIFY_USER=y" >> .config
   echo "CONFIG_NETLABEL=y" >> .config
-  echo "CONFIG_NETLABEL_CIPSOV4=y" >> .config
-  echo "CONFIG_NETLABEL_UNLABELED=y" >> .config
-  echo "CONFIG_NETLABEL_UNLABELED_DEFAULT=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
@@ -1734,6 +1734,10 @@
 %endif
 
 %changelog
+* Thu Jun 29 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.41, really apply patch 8 of 8 from Paul
+- added improved audit by obj by Darrel
+
 * Wed Jun 28 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.40, refreshed netlabel patch from Paul
 - dropped ipsec patch due to new conflicts

linux-2.6-audit-by-object.patch:
 kernel/auditfilter.c           |   25 +++++++++++++++++++++++++
 kernel/auditsc.c               |   40 ++++++++++++++++++++++++++++++++++++++++
 security/selinux/ss/services.c |   18 +++++++++++++++++-
 3 files changed, 82 insertions(+), 1 deletion(-)

Index: linux-2.6-audit-by-object.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-audit-by-object.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-audit-by-object.patch	28 Jun 2006 22:34:48 -0000	1.1.2.1
+++ linux-2.6-audit-by-object.patch	29 Jun 2006 23:31:00 -0000	1.1.2.2
@@ -1,193 +1,137 @@
-From dgoeddel at trustedcs.com Fri Jun 23 17:57:50 2006
-Return-Path: <redhat-lspp-bounces at redhat.com>
+From dgoeddel at trustedcs.com Thu Jun 29 17:57:08 2006
+Return-Path: <dgoeddel at trustedcs.com>
 Received: from mail.boston.redhat.com ([unix socket])
-	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Fri, 23 Jun 2006 17:58:49 -0400
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 29 Jun 2006 17:57:29 -0400
 X-Sieve: CMU Sieve 2.2
 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5NLwn2b022695;
-	Fri, 23 Jun 2006 17:58:49 -0400
-Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5NLwm7N004468;
-	Fri, 23 Jun 2006 17:58:48 -0400
-Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
-	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k5NLwhQh010463;
-	Fri, 23 Jun 2006 17:58:43 -0400
-Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
-	by hormel.redhat.com (Postfix) with ESMTP
-	id 456187360E; Fri, 23 Jun 2006 17:58:43 -0400 (EDT)
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
-	[172.16.52.254])
-	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
-	k5NLweF0021070 for <redhat-lspp at listman.util.phx.redhat.com>;
-	Fri, 23 Jun 2006 17:58:41 -0400
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
-	k5NLweR2004458; Fri, 23 Jun 2006 17:58:40 -0400
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k5TLvTel020126
+	for <sgrubb at boston.redhat.com>; Thu, 29 Jun 2006 17:57:29 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5TLvSNS022009;
+	Thu, 29 Jun 2006 17:57:28 -0400
 Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
-	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5NLwPbx031247;
-	Fri, 23 Jun 2006 17:58:25 -0400
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5TLvRUg021835;
+	Thu, 29 Jun 2006 17:57:27 -0400
 Received: (from smmsp at localhost)
-	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k5NLw5iv019985;
-	Fri, 23 Jun 2006 17:58:05 -0400 (EDT)
-Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
-	(V1.3) id (null); Fri Jun 23 17:58:02 2006
-Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
-	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
-	id <B449c63ea0000>; Fri, 23 Jun 2006 17:58:02 -0400
-Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by
-	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
-	Mail Service Version 5.5.2653.13)
-	id NLMHB6QQ; Fri, 23 Jun 2006 17:58:01 -0400
-Message-ID: <449C63DE.7080205 at trustedcs.com>
-Date: Fri, 23 Jun 2006 16:57:50 -0500
+	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k5TLvLLE016029;
+	Thu, 29 Jun 2006 17:57:21 -0400 (EDT)
+Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap (V1.3)
+	id (null); Thu Jun 29 17:57:13 2006
+Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by trauma.tcs-sec.com with NetIQ MailMarshal (v6,0,3,8)
+	id <B44a44cb90000>; Thu, 29 Jun 2006 17:57:13 -0400
+Received: from [10.1.10.208] (tcs_pc.tcs-sec.com [10.1.10.208]) by chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13)
+	id N4CXJJK7; Thu, 29 Jun 2006 17:57:13 -0400
+Message-ID: <44A44CB4.8090803 at trustedcs.com>
+Date: Thu, 29 Jun 2006 16:57:08 -0500
 From: Darrel Goeddel <dgoeddel at trustedcs.com>
 User-Agent: Mozilla Thunderbird 1.0.8-1.1.fc4 (X11/20060501)
 X-Accept-Language: en-us, en
 MIME-Version: 1.0
-To: redhat-lspp at redhat.com
+To: Steve Grubb <sgrubb at redhat.com>,
+ Alexander Viro <aviro at redhat.com>
+CC: Stephen Smalley <sds at tycho.nsa.gov>,
+ James Morris <jmorris at namei.org>,
+ redhat-lspp at redhat.com
+Subject: [PATCH 2/2] audit: support for object context filters
 Content-Type: text/plain;
   charset=ISO-8859-1;
   format=flowed
 Content-Transfer-Encoding: 7bit
-X-RedHat-Spam-Score: -2.82 
-X-loop: redhat-lspp at redhat.com
-Cc: James Morris <jmorris at redhat.com>,
- Stephen Smalley <sds at tycho.nsa.gov>
-Subject: [redhat-lspp] [RFC KERNEL] object audit filters based on SELinux
-	context
-X-BeenThere: redhat-lspp at redhat.com
-X-Mailman-Version: 2.1.5
-Precedence: junk
-List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
-	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/redhat-lspp>
-List-Post: <mailto:redhat-lspp at redhat.com>
-List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
-	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
-Sender: redhat-lspp-bounces at redhat.com
-Errors-To: redhat-lspp-bounces at redhat.com
-X-UID: 71436
-X-Length: 10986
+X-RedHat-Spam-Score: 0.261 
+X-UID: 72572
+X-Length: 8725
 
-I recently noticed that we never got around to doing object filters
-based on context...  This patch introduces object audit filters
-based on the fields of the SELinux context.  I put in everything
-(user, role, type, levels) even though I don't think user and role
-will be of use.  I'm also open to names on the filters because I
-couldn't really think of anything that sounded really good
-(especially for the object's mls - "ol1 means object level 1" and
-"ol2 means object level2"...).  So, I'll trim and rename if people
-want that.  This is just the kernel part, the userspace patch to
-handle these fields is forthcoming.  One more thing - this patch
-only checks the contexts of filesystem objects.  We also collect
-sids for ipc objects in the aux structs, should I also loop through
-those and filter based on the sids contained in AUDIT_IPC records?
+This patch introduces object audit filters based on the elements
+of the SELinux context.
 
+Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>
 
- include/linux/audit.h          |    5 +++++
  kernel/auditfilter.c           |   25 +++++++++++++++++++++++++
- kernel/auditsc.c               |   25 +++++++++++++++++++++++++
- security/selinux/ss/services.c |   17 ++++++++++++++++-
- 4 files changed, 71 insertions(+), 1 deletion(-)
+ kernel/auditsc.c               |   40 ++++++++++++++++++++++++++++++++++++++++
+ security/selinux/ss/services.c |   18 +++++++++++++++++-
+ 3 files changed, 82 insertions(+), 1 deletion(-)
 
-diff --git a/include/linux/audit.h b/include/linux/audit.h
-index f7883ec..f0857d6 100644
---- a/include/linux/audit.h
-+++ b/include/linux/audit.h
-@@ -158,6 +158,11 @@ #define AUDIT_SE_TYPE	15	/* security lab
- #define AUDIT_SE_SEN	16	/* security label sensitivity label */
- #define AUDIT_SE_CLR	17	/* security label clearance label */
- #define AUDIT_PPID	18
-+#define AUDIT_SE_OUSER	19
-+#define AUDIT_SE_OROLE	20
-+#define AUDIT_SE_OTYPE	21
-+#define AUDIT_SE_OL1	22
-+#define AUDIT_SE_OL2	23
- 
- 				/* These are ONLY useful when checking
- 				 * at syscall exit time (AUDIT_AT_EXIT). */
 diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
-index e98db08..6d77d1d 100644
+index 40a9931..7f2ea8b 100644
 --- a/kernel/auditfilter.c
 +++ b/kernel/auditfilter.c
 @@ -475,6 +475,11 @@ static struct audit_entry *audit_data_to
- 		case AUDIT_SE_TYPE:
- 		case AUDIT_SE_SEN:
- 		case AUDIT_SE_CLR:
-+		case AUDIT_SE_OUSER:
-+		case AUDIT_SE_OROLE:
-+		case AUDIT_SE_OTYPE:
-+		case AUDIT_SE_OL1:
-+		case AUDIT_SE_OL2:
+ 		case AUDIT_SUBJ_TYPE:
+ 		case AUDIT_SUBJ_SEN:
+ 		case AUDIT_SUBJ_CLR:
++		case AUDIT_OBJ_USER:
++		case AUDIT_OBJ_ROLE:
++		case AUDIT_OBJ_TYPE:
++		case AUDIT_OBJ_LEV_LOW:
++		case AUDIT_OBJ_LEV_HIGH:
  			str = audit_unpack_string(&bufp, &remain, f->val);
  			if (IS_ERR(str))
  				goto exit_free;
 @@ -616,6 +621,11 @@ static struct audit_rule_data *audit_kru
- 		case AUDIT_SE_TYPE:
- 		case AUDIT_SE_SEN:
- 		case AUDIT_SE_CLR:
-+		case AUDIT_SE_OUSER:
-+		case AUDIT_SE_OROLE:
-+		case AUDIT_SE_OTYPE:
-+		case AUDIT_SE_OL1:
-+		case AUDIT_SE_OL2:
+ 		case AUDIT_SUBJ_TYPE:
+ 		case AUDIT_SUBJ_SEN:
+ 		case AUDIT_SUBJ_CLR:
++		case AUDIT_OBJ_USER:
++		case AUDIT_OBJ_ROLE:
++		case AUDIT_OBJ_TYPE:
++		case AUDIT_OBJ_LEV_LOW:
++		case AUDIT_OBJ_LEV_HIGH:
  			data->buflen += data->values[i] =
  				audit_pack_string(&bufp, f->se_str);
  			break;
 @@ -659,6 +669,11 @@ static int audit_compare_rule(struct aud
- 		case AUDIT_SE_TYPE:
- 		case AUDIT_SE_SEN:
- 		case AUDIT_SE_CLR:
-+		case AUDIT_SE_OUSER:
-+		case AUDIT_SE_OROLE:
-+		case AUDIT_SE_OTYPE:
-+		case AUDIT_SE_OL1:
-+		case AUDIT_SE_OL2:
+ 		case AUDIT_SUBJ_TYPE:
+ 		case AUDIT_SUBJ_SEN:
+ 		case AUDIT_SUBJ_CLR:
++		case AUDIT_OBJ_USER:
++		case AUDIT_OBJ_ROLE:
++		case AUDIT_OBJ_TYPE:
++		case AUDIT_OBJ_LEV_LOW:
++		case AUDIT_OBJ_LEV_HIGH:
  			if (strcmp(a->fields[i].se_str, b->fields[i].se_str))
  				return 1;
  			break;
 @@ -779,6 +794,11 @@ static struct audit_entry *audit_dupe_ru
- 		case AUDIT_SE_TYPE:
- 		case AUDIT_SE_SEN:
- 		case AUDIT_SE_CLR:
-+		case AUDIT_SE_OUSER:
-+		case AUDIT_SE_OROLE:
-+		case AUDIT_SE_OTYPE:
-+		case AUDIT_SE_OL1:
-+		case AUDIT_SE_OL2:
+ 		case AUDIT_SUBJ_TYPE:
+ 		case AUDIT_SUBJ_SEN:
+ 		case AUDIT_SUBJ_CLR:
++		case AUDIT_OBJ_USER:
++		case AUDIT_OBJ_ROLE:
++		case AUDIT_OBJ_TYPE:
++		case AUDIT_OBJ_LEV_LOW:
++		case AUDIT_OBJ_LEV_HIGH:
  			err = audit_dupe_selinux_field(&new->fields[i],
  						       &old->fields[i]);
  			break;
 @@ -1542,6 +1562,11 @@ static inline int audit_rule_has_selinux
- 		case AUDIT_SE_TYPE:
- 		case AUDIT_SE_SEN:
- 		case AUDIT_SE_CLR:
-+		case AUDIT_SE_OUSER:
-+		case AUDIT_SE_OROLE:
-+		case AUDIT_SE_OTYPE:
-+		case AUDIT_SE_OL1:
-+		case AUDIT_SE_OL2:
+ 		case AUDIT_SUBJ_TYPE:
+ 		case AUDIT_SUBJ_SEN:
+ 		case AUDIT_SUBJ_CLR:
++		case AUDIT_OBJ_USER:
++		case AUDIT_OBJ_ROLE:
++		case AUDIT_OBJ_TYPE:
++		case AUDIT_OBJ_LEV_LOW:
++		case AUDIT_OBJ_LEV_HIGH:
  			return 1;
  		}
  	}
 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index b32ccfa..fa6ead8 100644
+index e183a6f..b171c1f 100644
 --- a/kernel/auditsc.c
 +++ b/kernel/auditsc.c
-@@ -342,6 +342,31 @@ static int audit_filter_rules(struct tas
+@@ -342,6 +342,46 @@ static int audit_filter_rules(struct tas
  				                                  ctx);
  			}
  			break;
-+		case AUDIT_SE_OUSER:
-+		case AUDIT_SE_OROLE:
-+		case AUDIT_SE_OTYPE:
-+		case AUDIT_SE_OL1:
-+		case AUDIT_SE_OL2:
-+			/* The above note for AUDIT_SE_USER...AUDIT_SE_CLR
++		case AUDIT_OBJ_USER:
++		case AUDIT_OBJ_ROLE:
++		case AUDIT_OBJ_TYPE:
++		case AUDIT_OBJ_LEV_LOW:
++		case AUDIT_OBJ_LEV_HIGH:
++			/* The above note for AUDIT_SUBJ_USER...AUDIT_SUBJ_CLR
 +			   also applies here */
 +			if (f->se_rule) {
++				/* Find files that match */
 +				if (name) {
 +					result = selinux_audit_rule_match(
 +					           name->osid, f->type, f->op,
@@ -203,108 +147,117 @@
 +						}
 +					}
 +				}
++				/* Find ipc objects that match */
++				if (ctx) {
++					struct audit_aux_data *aux;
++					for (aux = ctx->aux; aux;
++					     aux = aux->next) {
++						if (aux->type == AUDIT_IPC) {
++							struct audit_aux_data_ipcctl *axi = (void *)aux;
++							if (selinux_audit_rule_match(axi->osid, f->type, f->op, f->se_rule, ctx)) {
++								++result;
++								break;
++							}
++						}
++					}
++				}
 +			}
 +			break;
  		case AUDIT_ARG0:
  		case AUDIT_ARG1:
  		case AUDIT_ARG2:
 diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index d82898c..5d0edd0 100644
+index 112484f..5132002 100644
 --- a/security/selinux/ss/services.c
 +++ b/security/selinux/ss/services.c
 @@ -1858,12 +1858,17 @@ int selinux_audit_rule_init(u32 field, u
- 	case AUDIT_SE_USER:
- 	case AUDIT_SE_ROLE:
- 	case AUDIT_SE_TYPE:
-+	case AUDIT_SE_OUSER:
-+	case AUDIT_SE_OROLE:
-+	case AUDIT_SE_OTYPE:
+ 	case AUDIT_SUBJ_USER:
+ 	case AUDIT_SUBJ_ROLE:
+ 	case AUDIT_SUBJ_TYPE:
++	case AUDIT_OBJ_USER:
++	case AUDIT_OBJ_ROLE:
++	case AUDIT_OBJ_TYPE:
  		/* only 'equals' and 'not equals' fit user, role, and type */
  		if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL)
  			return -EINVAL;
  		break;
- 	case AUDIT_SE_SEN:
- 	case AUDIT_SE_CLR:
-+	case AUDIT_SE_OL1:
-+	case AUDIT_SE_OL2:
+ 	case AUDIT_SUBJ_SEN:
+ 	case AUDIT_SUBJ_CLR:
++	case AUDIT_OBJ_LEV_LOW:
++	case AUDIT_OBJ_LEV_HIGH:
  		/* we do not allow a range, indicated by the presense of '-' */
  		if (strchr(rulestr, '-'))
  			return -EINVAL;
 @@ -1885,6 +1890,7 @@ int selinux_audit_rule_init(u32 field, u
  
  	switch (field) {
- 	case AUDIT_SE_USER:
-+	case AUDIT_SE_OUSER:
+ 	case AUDIT_SUBJ_USER:
++	case AUDIT_OBJ_USER:
  		userdatum = hashtab_search(policydb.p_users.table, rulestr);
  		if (!userdatum)
  			rc = -EINVAL;
 @@ -1892,6 +1898,7 @@ int selinux_audit_rule_init(u32 field, u
  			tmprule->au_ctxt.user = userdatum->value;
  		break;
- 	case AUDIT_SE_ROLE:
-+	case AUDIT_SE_OROLE:
+ 	case AUDIT_SUBJ_ROLE:
++	case AUDIT_OBJ_ROLE:
  		roledatum = hashtab_search(policydb.p_roles.table, rulestr);
  		if (!roledatum)
  			rc = -EINVAL;
 @@ -1899,6 +1906,7 @@ int selinux_audit_rule_init(u32 field, u
  			tmprule->au_ctxt.role = roledatum->value;
  		break;
- 	case AUDIT_SE_TYPE:
-+	case AUDIT_SE_OTYPE:
+ 	case AUDIT_SUBJ_TYPE:
++	case AUDIT_OBJ_TYPE:
  		typedatum = hashtab_search(policydb.p_types.table, rulestr);
  		if (!typedatum)
  			rc = -EINVAL;
 @@ -1907,6 +1915,8 @@ int selinux_audit_rule_init(u32 field, u
  		break;
- 	case AUDIT_SE_SEN:
- 	case AUDIT_SE_CLR:
-+	case AUDIT_SE_OL1:
-+	case AUDIT_SE_OL2:
+ 	case AUDIT_SUBJ_SEN:
+ 	case AUDIT_SUBJ_CLR:
++	case AUDIT_OBJ_LEV_LOW:
++	case AUDIT_OBJ_LEV_HIGH:
  		rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC);
  		break;
  	}
 @@ -1959,6 +1969,7 @@ int selinux_audit_rule_match(u32 ctxid, 
  	   without a match */
  	switch (field) {
- 	case AUDIT_SE_USER:
-+	case AUDIT_SE_OUSER:
+ 	case AUDIT_SUBJ_USER:
++	case AUDIT_OBJ_USER:
  		switch (op) {
  		case AUDIT_EQUAL:
  			match = (ctxt->user == rule->au_ctxt.user);
 @@ -1969,6 +1980,7 @@ int selinux_audit_rule_match(u32 ctxid, 
  		}
  		break;
- 	case AUDIT_SE_ROLE:
-+	case AUDIT_SE_OROLE:
+ 	case AUDIT_SUBJ_ROLE:
++	case AUDIT_OBJ_ROLE:
  		switch (op) {
  		case AUDIT_EQUAL:
  			match = (ctxt->role == rule->au_ctxt.role);
 @@ -1979,6 +1991,7 @@ int selinux_audit_rule_match(u32 ctxid, 
  		}
  		break;
- 	case AUDIT_SE_TYPE:
-+	case AUDIT_SE_OTYPE:
+ 	case AUDIT_SUBJ_TYPE:
++	case AUDIT_OBJ_TYPE:
  		switch (op) {
  		case AUDIT_EQUAL:
  			match = (ctxt->type == rule->au_ctxt.type);
-@@ -1990,7 +2003,9 @@ int selinux_audit_rule_match(u32 ctxid, 
+@@ -1990,7 +2003,10 @@ int selinux_audit_rule_match(u32 ctxid, 
  		break;
- 	case AUDIT_SE_SEN:
- 	case AUDIT_SE_CLR:
--		level = (field == AUDIT_SE_SEN ?
-+	case AUDIT_SE_OL1:
-+	case AUDIT_SE_OL2:
-+		level = ((field == AUDIT_SE_SEN || field == AUDIT_SE_OL1) ?
+ 	case AUDIT_SUBJ_SEN:
+ 	case AUDIT_SUBJ_CLR:
+-		level = (field == AUDIT_SUBJ_SEN ?
++	case AUDIT_OBJ_LEV_LOW:
++	case AUDIT_OBJ_LEV_HIGH:
++		level = ((field == AUDIT_SUBJ_SEN ||
++		          field == AUDIT_OBJ_LEV_LOW) ?
  		         &ctxt->range.level[0] : &ctxt->range.level[1]);
  		switch (op) {
  		case AUDIT_EQUAL:
-
 -- 
 
 Darrel
 
---
-redhat-lspp mailing list
-redhat-lspp at redhat.com
-https://www.redhat.com/mailman/listinfo/redhat-lspp
-



From fedora-cvs-commits at redhat.com  Fri Jun 30 03:59:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 23:59:48 -0400
Subject: rpms/kasumi/devel kasumi-2.0.1-errorcode.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 kasumi.spec, 1.17, 1.18 sources, 1.5, 1.6
Message-ID: <200606300359.k5U3xmHb024473@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/kasumi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24434

Modified Files:
	.cvsignore kasumi.spec sources 
Added Files:
	kasumi-2.0.1-errorcode.patch 
Log Message:
* Fri Jun 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1
- New upstream release.
- use dist tag.
- kasumi-2.0.1-errorcode.patch: fixed not working when the private dictionary is empty. (#197313)

kasumi-2.0.1-errorcode.patch:
 KasumiDic.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kasumi-2.0.1-errorcode.patch ---
diff -ruN kasumi-2.0.1.orig/KasumiDic.cxx kasumi-2.0.1/KasumiDic.cxx
--- kasumi-2.0.1.orig/KasumiDic.cxx	2006-05-27 02:41:25.000000000 +0900
+++ kasumi-2.0.1/KasumiDic.cxx	2006-06-30 12:52:27.000000000 +0900
@@ -73,11 +73,11 @@
   const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency");
 
   try{
-      if(anthy_priv_dic_select_first_entry() == -3){
+      if(anthy_priv_dic_select_first_entry() == -1){
 	  // no word
 	  return;
       }
-      else if(anthy_priv_dic_select_first_entry() == -1)
+      else if(anthy_priv_dic_select_first_entry() == -3)
       {
 	  int anthy_version = str2int(string(anthy_get_version_string()));
 	  if(anthy_version >= 7716)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kasumi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 May 2006 02:42:35 -0000	1.6
+++ .cvsignore	30 Jun 2006 03:59:46 -0000	1.7
@@ -6,3 +6,4 @@
 kasumi-0.10.tar.gz
 kasumi-1.0.tar.gz
 kasumi-2.0.tar.gz
+kasumi-2.0.1.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/dist/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kasumi.spec	7 Jun 2006 08:15:55 -0000	1.17
+++ kasumi.spec	30 Jun 2006 03:59:46 -0000	1.18
@@ -1,6 +1,6 @@
 Name:    kasumi
-Version: 2.0
-Release: 2.fc6
+Version: 2.0.1
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
@@ -9,6 +9,7 @@
 Source0: %{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0:	kasumi-1.0-gcc41.patch
+Patch1: kasumi-2.0.1-errorcode.patch
 
 
 Summary: An anthy dictionary management tool.
@@ -20,6 +21,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc41
+%patch1 -p1 -b .errcode
 aclocal
 automake --add-missing
 autoconf
@@ -56,6 +58,11 @@
 
 
 %changelog
+* Fri Jun 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1
+- New upstream release.
+- use dist tag.
+- kasumi-2.0.1-errorcode.patch: fixed not working when the private dictionary is empty. (#197313)
+
 * Wed Jun  7 2006 Akira TAGOH <tagoh at redhat.com> - 2.0-2
 - added anthy-devel, automake and autoconf to BuildReq. (#194121)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kasumi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 May 2006 02:42:35 -0000	1.5
+++ sources	30 Jun 2006 03:59:46 -0000	1.6
@@ -1 +1 @@
-f2b080cbea0bac90fadcc8cfcc500460  kasumi-2.0.tar.gz
+03c03a261c63d2c8cd4bdcc77a55d7eb  kasumi-2.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 30 03:59:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 29 Jun 2006 23:59:56 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2336,
	1.2337 linux-2.6-xen.patch, 1.31, 1.32
Message-ID: <200606300359.k5U3xuVF024537@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24267

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
one step closer.. it applies again.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2336
retrieving revision 1.2337
diff -u -r1.2336 -r1.2337
--- kernel-2.6.spec	29 Jun 2006 20:53:21 -0000	1.2336
+++ kernel-2.6.spec	30 Jun 2006 03:59:51 -0000	1.2337
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 0
 %define buildxenPAE 0
@@ -269,14 +269,6 @@
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
-# 700 - 799 Xen
-Patch950: linux-2.6-xen.patch
-Patch951: linux-2.6-xen-compile-fixes.patch
-Patch952: linux-2.6-xen-no-tls-warn.patch
-Patch953: linux-2.6-xen-move-vdso-fixmap.patch
-Patch954: linux-2.6-xen-vsyscall_base.patch
-Patch955: linux-2.6-xen_remap_vma_flags.patch
-
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
 # and patches related to how RPMs are build
@@ -286,8 +278,6 @@
 
 # Exec-shield.
 Patch810: linux-2.6-execshield.patch
-Patch811: linux-2.6-execshield-xen.patch
-Patch812: linux-2.6-xen-vdso-note.patch
 Patch813: linux-2.6-warn-c-p-a.patch
 
 # Module signing infrastructure.
@@ -301,6 +291,14 @@
 # Tux http accelerator.
 Patch910: linux-2.6-tux.patch
 
+# 950 - 999 Xen
+Patch950: linux-2.6-xen.patch
+Patch951: linux-2.6-xen-compile-fixes.patch
+Patch952: linux-2.6-xen-no-tls-warn.patch
+Patch955: linux-2.6-xen_remap_vma_flags.patch
+Patch960: linux-2.6-execshield-xen.patch
+Patch961: linux-2.6-xen-vdso-note.patch
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -761,13 +759,6 @@
 %patch810 -p1
 #%patch813 -p1
 
-# Xen exec-shield bits
-%if %{includexen}
-%patch811 -p1
-%patch812 -p1
-%endif
-
-
 #
 # GPG signed kernel modules
 #
@@ -802,22 +793,14 @@
 # Delete the rest of the backup files, they just confuse the build later
 find -name "*.p.xen" | xargs rm -f
 
-#
-# Xen includes a patch which moves the vsyscall fixmap into a user-space VA,
-# freeing user-space from reliance on an absolute fixmap area and so allowing
-# the fixmap area to become dynamic.
-#
-# Execshield already does this, making the fixmap area invisible to the user
-# and adding a new randomised vdso for it in user VA, so there's no point in
-# having both: revert the Xen changeset so that execsheild applies cleanly.
-#
-%patch953 -p2 -R
-
 %patch951 -p1
 %patch952 -p1
-%patch954 -p1
 %patch955 -p1
 
+# Xen exec-shield bits
+%patch960 -p1
+%patch961 -p1
+
 %endif
 
 #

linux-2.6-xen.patch:
 linux-2.6.17.noarch/arch/ia64/kernel/irq_ia64.c           |    4 
 linux-2.6.17.noarch/arch/x86_64/kernel/asm-offsets.c      |    2 
 linux-2.6.17.noarch/drivers/firmware/Kconfig              |    2 
 linux-2.6.17.noarch/include/asm-i386/a.out.h              |    2 
 merge/arch/i386/Kconfig                                   |   91 
 merge/arch/i386/Kconfig.cpu                               |    2 
 merge/arch/i386/Kconfig.debug                             |    1 
 merge/arch/i386/Makefile                                  |   24 
 merge/arch/i386/boot-xen/Makefile                         |   21 
 merge/arch/i386/kernel/Makefile                           |   22 
 merge/arch/i386/kernel/acpi/Makefile                      |    4 
 merge/arch/i386/kernel/acpi/boot-xen.c                    | 1167 +++++
 merge/arch/i386/kernel/apic-xen.c                         |  160 
 merge/arch/i386/kernel/cpu/Makefile                       |    5 
 merge/arch/i386/kernel/cpu/common-xen.c                   |  732 +++
 merge/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 merge/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 merge/arch/i386/kernel/early_printk-xen.c                 |    2 
 merge/arch/i386/kernel/entry-xen.S                        |  903 ++++
 merge/arch/i386/kernel/entry.S                            |    6 
 merge/arch/i386/kernel/fixup.c                            |   86 
 merge/arch/i386/kernel/head-xen.S                         |  181 
 merge/arch/i386/kernel/init_task-xen.c                    |   51 
 merge/arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++
 merge/arch/i386/kernel/ioport-xen.c                       |  121 
 merge/arch/i386/kernel/irq-xen.c                          |  306 +
 merge/arch/i386/kernel/ldt-xen.c                          |  269 +
 merge/arch/i386/kernel/microcode-xen.c                    |  148 
 merge/arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++
 merge/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 merge/arch/i386/kernel/process-xen.c                      |  812 ++++
 merge/arch/i386/kernel/quirks-xen.c                       |   48 
 merge/arch/i386/kernel/setup-xen.c                        | 1795 +++++++++
 merge/arch/i386/kernel/smp-xen.c                          |  613 +++
 merge/arch/i386/kernel/swiotlb.c                          |  665 +++
 merge/arch/i386/kernel/sysenter.c                         |   17 
 merge/arch/i386/kernel/time-xen.c                         | 1103 +++++
 merge/arch/i386/kernel/traps-xen.c                        | 1136 +++++
 merge/arch/i386/kernel/traps.c                            |    9 
 merge/arch/i386/kernel/vm86.c                             |   12 
 merge/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 merge/arch/i386/mach-xen/Makefile                         |    5 
 merge/arch/i386/mach-xen/setup.c                          |   49 
 merge/arch/i386/mm/Makefile                               |    8 
 merge/arch/i386/mm/fault-xen.c                            |  683 +++
 merge/arch/i386/mm/highmem-xen.c                          |  123 
 merge/arch/i386/mm/hypervisor.c                           |  414 ++
 merge/arch/i386/mm/init-xen.c                             |  850 ++++
 merge/arch/i386/mm/ioremap-xen.c                          |  476 ++
 merge/arch/i386/mm/pageattr.c                             |    2 
 merge/arch/i386/mm/pgtable-xen.c                          |  642 +++
 merge/arch/i386/mm/pgtable.c                              |   12 
 merge/arch/i386/oprofile/Makefile                         |    4 
 merge/arch/i386/oprofile/xenoprof.c                       |  432 ++
 merge/arch/i386/pci/Makefile                              |    9 
 merge/arch/i386/pci/irq-xen.c                             | 1204 ++++++
 merge/arch/i386/pci/pcifront.c                            |   55 
 merge/arch/i386/power/Makefile                            |    4 
 merge/arch/ia64/Kconfig                                   |   65 
 merge/arch/ia64/Makefile                                  |   18 
 merge/arch/ia64/hp/sim/Makefile                           |    2 
 merge/arch/ia64/kernel/entry.S                            |   32 
 merge/arch/ia64/kernel/head.S                             |    6 
 merge/arch/ia64/kernel/iosapic.c                          |   68 
 merge/arch/ia64/kernel/irq_ia64.c                         |  196 
 merge/arch/ia64/kernel/pal.S                              |    5 
 merge/arch/ia64/kernel/setup.c                            |   53 
 merge/arch/ia64/mm/ioremap.c                              |    3 
 merge/arch/ia64/xen/Makefile                              |    8 
 merge/arch/ia64/xen/drivers/README                        |    2 
 merge/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 merge/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 merge/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 merge/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 merge/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 merge/arch/ia64/xen/drivers/xenia64_init.c                |   60 
 merge/arch/ia64/xen/hypercall.S                           |  353 +
 merge/arch/ia64/xen/hypervisor.c                          |  761 +++
 merge/arch/ia64/xen/util.c                                |  115 
 merge/arch/ia64/xen/xenentry.S                            |  883 ++++
 merge/arch/ia64/xen/xenhpski.c                            |   19 
 merge/arch/ia64/xen/xenivt.S                              | 2171 +++++++++++
 merge/arch/ia64/xen/xenminstate.h                         |  369 +
 merge/arch/ia64/xen/xenpal.S                              |   76 
 merge/arch/ia64/xen/xensetup.S                            |   24 
 merge/arch/um/kernel/physmem.c                            |    4 
 merge/arch/x86_64/Kconfig                                 |   60 
 merge/arch/x86_64/Makefile                                |   20 
 merge/arch/x86_64/ia32/Makefile                           |   20 
 merge/arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++
 merge/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 merge/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 merge/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 merge/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 merge/arch/x86_64/kernel/Makefile                         |   19 
 merge/arch/x86_64/kernel/acpi/Makefile                    |    1 
 merge/arch/x86_64/kernel/apic-xen.c                       |  198 +
 merge/arch/x86_64/kernel/e820-xen.c                       |  757 +++
 merge/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 merge/arch/x86_64/kernel/entry-xen.S                      | 1141 +++++
 merge/arch/x86_64/kernel/genapic-xen.c                    |  144 
 merge/arch/x86_64/kernel/genapic_xen.c                    |  162 
 merge/arch/x86_64/kernel/head-xen.S                       |  176 
 merge/arch/x86_64/kernel/head64-xen.c                     |  140 
 merge/arch/x86_64/kernel/init_task.c                      |    3 
 merge/arch/x86_64/kernel/io_apic-xen.c                    | 2232 +++++++++++
 merge/arch/x86_64/kernel/ioport-xen.c                     |   57 
 merge/arch/x86_64/kernel/irq-xen.c                        |  163 
 merge/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 merge/arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++
 merge/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 merge/arch/x86_64/kernel/process-xen.c                    |  791 ++++
 merge/arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++
 merge/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 merge/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 merge/arch/x86_64/kernel/traps-xen.c                      | 1035 +++++
 merge/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 merge/arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 
 merge/arch/x86_64/kernel/xen_entry.S                      |   40 
 merge/arch/x86_64/mm/Makefile                             |   10 
 merge/arch/x86_64/mm/fault-xen.c                          |  644 +++
 merge/arch/x86_64/mm/init-xen.c                           | 1179 ++++++
 merge/arch/x86_64/mm/pageattr-xen.c                       |  390 +
 merge/arch/x86_64/oprofile/Makefile                       |    5 
 merge/arch/x86_64/pci/Makefile                            |   12 
 merge/drivers/Makefile                                    |    1 
 merge/drivers/acpi/Kconfig                                |    3 
 merge/drivers/char/mem.c                                  |    6 
 merge/drivers/char/tpm/Kconfig                            |   14 
 merge/drivers/char/tpm/Makefile                           |    2 
 merge/drivers/char/tpm/tpm.c                              |   44 
 merge/drivers/char/tpm/tpm.h                              |    7 
 merge/drivers/char/tpm/tpm_vtpm.c                         |  546 ++
 merge/drivers/char/tpm/tpm_vtpm.h                         |   38 
 merge/drivers/char/tpm/tpm_xen.c                          |  756 +++
 merge/drivers/char/tty_io.c                               |    7 
 merge/drivers/ide/ide-lib.c                               |    8 
 merge/drivers/oprofile/buffer_sync.c                      |   39 
 merge/drivers/oprofile/cpu_buffer.c                       |   26 
 merge/drivers/oprofile/cpu_buffer.h                       |    8 
 merge/drivers/oprofile/event_buffer.h                     |    3 
 merge/drivers/oprofile/oprof.c                            |   19 
 merge/drivers/oprofile/oprof.h                            |    2 
 merge/drivers/oprofile/oprofile_files.c                   |   82 
 merge/drivers/pci/Kconfig                                 |    1 
 merge/drivers/serial/Kconfig                              |    1 
 merge/drivers/xen/Kconfig                                 |  257 +
 merge/drivers/xen/Makefile                                |   17 
 merge/drivers/xen/balloon/Makefile                        |    2 
 merge/drivers/xen/balloon/balloon.c                       |  605 +++
 merge/drivers/xen/blkback/Makefile                        |    3 
 merge/drivers/xen/blkback/blkback.c                       |  580 ++
 merge/drivers/xen/blkback/common.h                        |  136 
 merge/drivers/xen/blkback/interface.c                     |  165 
 merge/drivers/xen/blkback/vbd.c                           |  119 
 merge/drivers/xen/blkback/xenbus.c                        |  410 ++
 merge/drivers/xen/blkfront/Kconfig                        |    6 
 merge/drivers/xen/blkfront/Makefile                       |    5 
 merge/drivers/xen/blkfront/blkfront.c                     |  822 ++++
 merge/drivers/xen/blkfront/block.h                        |  156 
 merge/drivers/xen/blkfront/vbd.c                          |  318 +
 merge/drivers/xen/blktap/Makefile                         |    3 
 merge/drivers/xen/blktap/blktap.c                         |  900 ++++
 merge/drivers/xen/blktap/common.h                         |  100 
 merge/drivers/xen/blktap/interface.c                      |  134 
 merge/drivers/xen/blktap/xenbus.c                         |  223 +
 merge/drivers/xen/char/Makefile                           |    2 
 merge/drivers/xen/char/mem.c                              |  182 
 merge/drivers/xen/console/Makefile                        |    2 
 merge/drivers/xen/console/console.c                       |  640 +++
 merge/drivers/xen/console/xencons_ring.c                  |  141 
 merge/drivers/xen/core/Makefile                           |   14 
 merge/drivers/xen/core/cpu_hotplug.c                      |  185 
 merge/drivers/xen/core/evtchn.c                           |  855 ++++
 merge/drivers/xen/core/features.c                         |   30 
 merge/drivers/xen/core/gnttab.c                           |  460 ++
 merge/drivers/xen/core/hypervisor_sysfs.c                 |   60 
 merge/drivers/xen/core/reboot.c                           |  364 +
 merge/drivers/xen/core/skbuff.c                           |  134 
 merge/drivers/xen/core/smpboot.c                          |  433 ++
 merge/drivers/xen/core/xen_proc.c                         |   19 
 merge/drivers/xen/core/xen_sysfs.c                        |  316 +
 merge/drivers/xen/evtchn/Makefile                         |    2 
 merge/drivers/xen/evtchn/evtchn.c                         |  458 ++
 merge/drivers/xen/netback/Makefile                        |    5 
 merge/drivers/xen/netback/common.h                        |  123 
 merge/drivers/xen/netback/interface.c                     |  314 +
 merge/drivers/xen/netback/loopback.c                      |  255 +
 merge/drivers/xen/netback/netback.c                       | 1039 +++++
 merge/drivers/xen/netback/xenbus.c                        |  396 ++
 merge/drivers/xen/netfront/Kconfig                        |    6 
 merge/drivers/xen/netfront/Makefile                       |    4 
 merge/drivers/xen/netfront/netfront.c                     | 1597 ++++++++
 merge/drivers/xen/pciback/Makefile                        |   13 
 merge/drivers/xen/pciback/conf_space.c                    |  403 ++
 merge/drivers/xen/pciback/conf_space.h                    |  123 
 merge/drivers/xen/pciback/conf_space_capability.c         |   71 
 merge/drivers/xen/pciback/conf_space_capability.h         |   23 
 merge/drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 merge/drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 merge/drivers/xen/pciback/conf_space_header.c             |  299 +
 merge/drivers/xen/pciback/passthrough.c                   |  157 
 merge/drivers/xen/pciback/pci_stub.c                      |  690 +++
 merge/drivers/xen/pciback/pciback.h                       |   91 
 merge/drivers/xen/pciback/pciback_ops.c                   |   95 
 merge/drivers/xen/pciback/vpci.c                          |  204 +
 merge/drivers/xen/pciback/xenbus.c                        |  454 ++
 merge/drivers/xen/pcifront/Makefile                       |    7 
 merge/drivers/xen/pcifront/pci.c                          |   46 
 merge/drivers/xen/pcifront/pci_op.c                       |  272 +
 merge/drivers/xen/pcifront/pcifront.h                     |   40 
 merge/drivers/xen/pcifront/xenbus.c                       |  294 +
 merge/drivers/xen/privcmd/Makefile                        |    2 
 merge/drivers/xen/privcmd/privcmd.c                       |  285 +
 merge/drivers/xen/tpmback/Makefile                        |    4 
 merge/drivers/xen/tpmback/common.h                        |   82 
 merge/drivers/xen/tpmback/interface.c                     |  177 
 merge/drivers/xen/tpmback/tpmback.c                       | 1074 +++++
 merge/drivers/xen/tpmback/xenbus.c                        |  306 +
 merge/drivers/xen/util.c                                  |   70 
 merge/drivers/xen/xenbus/Makefile                         |   12 
 merge/drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 merge/drivers/xen/xenbus/xenbus_client.c                  |  281 +
 merge/drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 merge/drivers/xen/xenbus/xenbus_comms.h                   |   43 
 merge/drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 merge/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 merge/drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++
 merge/fs/Kconfig                                          |    1 
 merge/include/asm-i386/apic.h                             |    2 
 merge/include/asm-i386/fixmap.h                           |    4 
 merge/include/asm-i386/mach-default/mach_traps.h          |   12 
 merge/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 merge/include/asm-i386/mach-xen/asm/desc.h                |  164 
 merge/include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 
 merge/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 merge/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 merge/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 merge/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 merge/include/asm-i386/mach-xen/asm/hypercall.h           |  370 +
 merge/include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 merge/include/asm-i386/mach-xen/asm/io.h                  |  390 +
 merge/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 merge/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 merge/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 merge/include/asm-i386/mach-xen/asm/page.h                |  327 +
 merge/include/asm-i386/mach-xen/asm/param.h               |   24 
 merge/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 merge/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 merge/include/asm-i386/mach-xen/asm/pgtable.h             |  509 ++
 merge/include/asm-i386/mach-xen/asm/processor.h           |  753 +++
 merge/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 merge/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 merge/include/asm-i386/mach-xen/asm/segment.h             |  117 
 merge/include/asm-i386/mach-xen/asm/setup.h               |   64 
 merge/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 merge/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 merge/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 merge/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 merge/include/asm-i386/mach-xen/asm/system.h              |  578 ++
 merge/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 merge/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 merge/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 merge/include/asm-i386/mach-xen/mach_traps.h              |   33 
 merge/include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 merge/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 merge/include/asm-i386/page.h                             |    2 
 merge/include/asm-i386/pgtable-2level-defs.h              |    2 
 merge/include/asm-i386/pgtable-3level-defs.h              |    2 
 merge/include/asm-ia64/agp.h                              |   31 
 merge/include/asm-ia64/dma-mapping.h                      |   71 
 merge/include/asm-ia64/fixmap.h                           |    2 
 merge/include/asm-ia64/gcc_intrin.h                       |   60 
 merge/include/asm-ia64/hypercall.h                        |  533 ++
 merge/include/asm-ia64/hypervisor.h                       |  198 +
 merge/include/asm-ia64/intel_intrin.h                     |   68 
 merge/include/asm-ia64/io.h                               |   52 
 merge/include/asm-ia64/iosapic.h                          |    2 
 merge/include/asm-ia64/irq.h                              |   31 
 merge/include/asm-ia64/machvec.h                          |   15 
 merge/include/asm-ia64/meminit.h                          |    5 
 merge/include/asm-ia64/page.h                             |  112 
 merge/include/asm-ia64/pal.h                              |    1 
 merge/include/asm-ia64/pgalloc.h                          |    2 
 merge/include/asm-ia64/privop.h                           |   60 
 merge/include/asm-ia64/processor.h                        |    1 
 merge/include/asm-ia64/synch_bitops.h                     |   61 
 merge/include/asm-ia64/system.h                           |    4 
 merge/include/asm-ia64/xen/privop.h                       |  280 +
 merge/include/asm-um/page.h                               |    2 
 merge/include/asm-x86_64/apic.h                           |    2 
 merge/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 merge/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 merge/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 merge/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 merge/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 merge/include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 merge/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 merge/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 merge/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 merge/include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 +
 merge/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 merge/include/asm-x86_64/mach-xen/asm/io.h                |  328 +
 merge/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 merge/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 merge/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 merge/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 merge/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 merge/include/asm-x86_64/mach-xen/asm/page.h              |  319 +
 merge/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 merge/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 merge/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 merge/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++
 merge/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 merge/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 merge/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 merge/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 merge/include/asm-x86_64/mach-xen/asm/system.h            |  411 ++
 merge/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 merge/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 merge/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 merge/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 merge/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 merge/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 merge/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 merge/include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 merge/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 merge/include/linux/gfp.h                                 |    6 
 merge/include/linux/highmem.h                             |    6 
 merge/include/linux/mm.h                                  |   10 
 merge/include/linux/oprofile.h                            |    8 
 merge/include/linux/pfn.h                                 |    2 
 merge/include/linux/skbuff.h                              |   13 
 merge/include/xen/balloon.h                               |   63 
 merge/include/xen/cpu_hotplug.h                           |   44 
 merge/include/xen/driver_util.h                           |   16 
 merge/include/xen/evtchn.h                                |  114 
 merge/include/xen/features.h                              |   20 
 merge/include/xen/foreign_page.h                          |   30 
 merge/include/xen/gnttab.h                                |  150 
 merge/include/xen/hypervisor_sysfs.h                      |   32 
 merge/include/xen/interface/acm.h                         |  187 
 merge/include/xen/interface/acm_ops.h                     |  102 
 merge/include/xen/interface/arch-ia64.h                   |  418 ++
 merge/include/xen/interface/arch-x86_32.h                 |  224 +
 merge/include/xen/interface/arch-x86_64.h                 |  293 +
 merge/include/xen/interface/callback.h                    |   74 
 merge/include/xen/interface/dom0_ops.h                    |  574 ++
 merge/include/xen/interface/event_channel.h               |  233 +
 merge/include/xen/interface/features.h                    |   53 
 merge/include/xen/interface/grant_table.h                 |  317 +
 merge/include/xen/interface/hvm/hvm_info_table.h          |   24 
 merge/include/xen/interface/hvm/ioreq.h                   |   98 
 merge/include/xen/interface/hvm/vmx_assist.h              |   98 
 merge/include/xen/interface/io/blkif.h                    |   87 
 merge/include/xen/interface/io/console.h                  |   33 
 merge/include/xen/interface/io/netif.h                    |   92 
 merge/include/xen/interface/io/pciif.h                    |   55 
 merge/include/xen/interface/io/ring.h                     |  273 +
 merge/include/xen/interface/io/tpmif.h                    |   59 
 merge/include/xen/interface/io/xenbus.h                   |   45 
 merge/include/xen/interface/io/xs_wire.h                  |   97 
 merge/include/xen/interface/memory.h                      |  187 
 merge/include/xen/interface/nmi.h                         |   60 
 merge/include/xen/interface/physdev.h                     |  144 
 merge/include/xen/interface/sched.h                       |  103 
 merge/include/xen/interface/sched_ctl.h                   |   69 
 merge/include/xen/interface/trace.h                       |   86 
 merge/include/xen/interface/vcpu.h                        |  121 
 merge/include/xen/interface/version.h                     |   67 
 merge/include/xen/interface/xen-compat.h                  |   47 
 merge/include/xen/interface/xen.h                         |  505 ++
 merge/include/xen/interface/xenoprof.h                    |   94 
 merge/include/xen/pcifront.h                              |   39 
 merge/include/xen/public/evtchn.h                         |   91 
 merge/include/xen/public/privcmd.h                        |   79 
 merge/include/xen/xen_proc.h                              |   13 
 merge/include/xen/xenbus.h                                |  296 +
 merge/include/xen/xencons.h                               |   14 
 merge/kernel/Kconfig.preempt                              |    1 
 merge/kernel/irq/manage.c                                 |   26 
 merge/lib/Makefile                                        |    3 
 merge/mm/Kconfig                                          |    3 
 merge/mm/highmem.c                                        |   11 
 merge/mm/memory.c                                         |  121 
 merge/mm/mmap.c                                           |    4 
 merge/mm/page_alloc.c                                     |    6 
 merge/net/core/dev.c                                      |   63 
 merge/net/core/skbuff.c                                   |   43 
 merge/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 merge/net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 merge/net/ipv4/xfrm4_output.c                             |    6 
 merge/scripts/Makefile.xen                                |   14 
 397 files changed, 82723 insertions(+), 226 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- linux-2.6-xen.patch	27 Jun 2006 00:39:13 -0000	1.31
+++ linux-2.6-xen.patch	30 Jun 2006 03:59:51 -0000	1.32
@@ -42,29 +42,21 @@
  config X86_ELAN
  	bool "AMD Elan"
  	help
-@@ -193,6 +202,7 @@ source "arch/i386/Kconfig.cpu"
- 
- config HPET_TIMER
- 	bool "HPET Timer Support"
-+	depends on !X86_XEN
- 	help
- 	  This enables the use of the HPET for the kernel's internal timer.
- 	  HPET is the next generation timer replacing legacy 8254s.
-@@ -239,7 +239,7 @@ config NR_CPUS
+@@ -242,7 +242,7 @@ config NR_CPUS
  
  config SCHED_SMT
  	bool "SMT (Hyperthreading) scheduler support"
--	depends on SMP
-+	depends on SMP && !X86_XEN
+-	depends on X86_HT
++	depends on X86_HT && !X86_XEN
  	help
  	  SMT scheduler support improves the CPU scheduler's decision making
  	  when dealing with Intel Pentium 4 chips with HyperThreading at a
-@@ -248,7 +248,7 @@ config SCHED_SMT
+@@ -251,7 +251,7 @@ config SCHED_SMT
  
  config SCHED_MC
  	bool "Multi-core scheduler support"
--	depends on SMP
-+	depends on SMP && !X86_XEN
+-	depends on X86_HT
++	depends on X86_HT && !X86_XEN
  	default y
  	help
  	  Multi-core scheduler support improves the CPU scheduler's decision
@@ -1684,37 +1676,6 @@
 +
 +	return 0;
 +}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/asm-offsets.c	2006-05-30 12:42:43.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <asm/fixmap.h>
- #include <asm/processor.h>
- #include <asm/thread_info.h>
-+#include <asm/elf.h>
- 
- #define DEFINE(sym, val) \
-         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -65,12 +65,17 @@ void foo(void)
- 	OFFSET(pbe_orig_address, pbe, orig_address);
- 	OFFSET(pbe_next, pbe, next);
- 
-+#ifndef CONFIG_X86_NO_TSS
- 	/* Offset from the sysenter stack to tss.esp0 */
--	DEFINE(TSS_sysenter_esp0, offsetof(struct tss_struct, esp0) -
-+	DEFINE(SYSENTER_stack_esp0, offsetof(struct tss_struct, esp0) -
- 		 sizeof(struct tss_struct));
-+#else
-+	/* sysenter stack points directly to esp0 */
-+	DEFINE(SYSENTER_stack_esp0, 0);
-+#endif
- 
- 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
--	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
-+	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
- 
- 	OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
- }
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/cpu/common-xen.c	2006-05-30 12:42:43.000000000 +0200
@@ -2696,24 +2657,6 @@
  sysenter_past_esp:
  	sti
  	pushl $(__USER_DS)
-@@ -515,7 +515,7 @@ ENTRY(irq_entries_start)
-  .if vector
- 	CFI_ADJUST_CFA_OFFSET -4
-  .endif
--1:	pushl $vector-256
-+1:	pushl $~(vector)
- 	CFI_ADJUST_CFA_OFFSET 4
- 	jmp common_interrupt
- .data
-@@ -535,7 +535,7 @@ common_interrupt:
- #define BUILD_INTERRUPT(name, nr)	\
- ENTRY(name)				\
- 	RING0_INT_FRAME;		\
--	pushl $nr-256;			\
-+	pushl $~(nr);			\
- 	CFI_ADJUST_CFA_OFFSET 4;	\
- 	SAVE_ALL;			\
- 	movl %esp,%eax;			\
 @@ -496,7 +496,7 @@ device_not_available_emulate:
   * that sets up the real kernel stack. Check here, since we can't
   * allow the wrong stack to be used.
@@ -6849,20 +6792,6 @@
 +	set_iopl_mask(t->iopl);
 +	return 0;
 +}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c merge/arch/i386/kernel/irq.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c	2006-01-09 15:53:47.000000000 +0100
-+++ merge/arch/i386/kernel/irq.c	2006-05-30 12:42:43.000000000 +0200
-@@ -53,8 +53,8 @@ static union irq_ctx *softirq_ctx[NR_CPU
-  */
- fastcall unsigned int do_IRQ(struct pt_regs *regs)
- {	
--	/* high bits used in ret_from_ code */
--	int irq = regs->orig_eax & 0xff;
-+	/* high bit used in ret_from_ code */
-+	int irq = ~regs->orig_eax;
- #ifdef CONFIG_4KSTACKS
- 	union irq_ctx *curctx, *irqctx;
- 	u32 *isp;
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/irq-xen.c merge/arch/i386/kernel/irq-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/irq-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/irq-xen.c	2006-05-30 12:42:43.000000000 +0200
@@ -7104,7 +7033,7 @@
 +		for_each_online_cpu(j)
 +			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 +#endif
-+		seq_printf(p, " %14s", irq_desc[i].handler->typename);
++		seq_printf(p, " %14s", irq_desc[i].chip->typename);
 +		seq_printf(p, "  %s", action->name);
 +
 +		for (action=action->next; action; action = action->next)
@@ -9297,10 +9226,10 @@
 +	if (need_resched())
 +		local_irq_enable();
 +	else {
-+		clear_thread_flag(TIF_POLLING_NRFLAG);
++		current_thread_info()->status &= ~TS_POLLING;
 +		smp_mb__after_clear_bit();
 +		safe_halt();
-+		set_thread_flag(TIF_POLLING_NRFLAG);
++		current_thread_info()->status |= TS_POLLING;
 +	}
 +}
 +#ifdef CONFIG_APM_MODULE
@@ -9335,7 +9264,7 @@
 +{
 +	int cpu = smp_processor_id();
 +
-+	set_thread_flag(TIF_POLLING_NRFLAG);
++	current_thread_info()->status |= TS_POLLING;
 +
 +	/* endless idle loop with no priority at all */
 +	while (1) {
@@ -9417,7 +9346,7 @@
 +	cr3 = read_cr3();
 +	cr4 = read_cr4_safe();
 +	printk("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", cr0, cr2, cr3, cr4);
-+	show_trace(NULL, &regs->esp);
++	show_trace(NULL, NULL, &regs->esp);
 +}
 +
 +/*
@@ -13139,14 +13068,7 @@
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/sysenter.c merge/arch/i386/kernel/sysenter.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/sysenter.c	2005-11-07 20:02:43.000000000 +0100
 +++ merge/arch/i386/kernel/sysenter.c	2006-05-30 12:42:43.000000000 +0200
-@@ -13,16 +13,22 @@
- #include <linux/gfp.h>
- #include <linux/string.h>
- #include <linux/elf.h>
-+#include <linux/mm.h>
- 
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
+@@ -23,6 +23,10 @@
  #include <asm/pgtable.h>
  #include <asm/unistd.h>
  
@@ -13154,7 +13076,10 @@
 +#include <xen/interface/callback.h>
 +#endif
 +
- extern asmlinkage void sysenter_entry(void);
+ /*
+  * Should the kernel map a VDSO page into processes and pass its
+  * address down to glibc upon exec()?
+@@ -44,6 +48,7 @@ extern asmlinkage void sysenter_entry(vo
  
  void enable_sep_cpu(void)
  {
@@ -13170,116 +13095,24 @@
  }
  
  /*
-@@ -45,23 +52,100 @@ void enable_sep_cpu(void)
-  */
- extern const char vsyscall_int80_start, vsyscall_int80_end;
- extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
-+static void *syscall_page;
- 
- int __init sysenter_setup(void)
- {
--	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
-+	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
+@@ -88,6 +88,17 @@ int __init sysenter_setup(void)
+ 	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_KERNEL_RO);
+ #endif
  
--	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
 +#ifdef CONFIG_XEN
 +	if (boot_cpu_has(X86_FEATURE_SEP)) {
 +		struct callback_register sysenter = {
 +			.type = CALLBACKTYPE_sysenter,
 +			.address = { __KERNEL_CS, (unsigned long)sysenter_entry },
 +		};
- 
--	if (!boot_cpu_has(X86_FEATURE_SEP)) {
--		memcpy(page,
--		       &vsyscall_int80_start,
--		       &vsyscall_int80_end - &vsyscall_int80_start);
 +		if (HYPERVISOR_callback_op(CALLBACKOP_register, &sysenter) < 0)
 +			clear_bit(X86_FEATURE_SEP, boot_cpu_data.x86_capability);
 +	}
 +#endif
 +
-+	if (boot_cpu_has(X86_FEATURE_SEP)) {
-+		memcpy(syscall_page,
-+		       &vsyscall_sysenter_start,
-+		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
- 		return 0;
- 	}
- 
--	memcpy(page,
--	       &vsyscall_sysenter_start,
--	       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
-+	memcpy(syscall_page,
-+	       &vsyscall_int80_start,
-+	       &vsyscall_int80_end - &vsyscall_int80_start);
-+
-+	return 0;
-+}
-+
-+static struct page*
-+syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
-+{
-+	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
-+	get_page(p);
-+	return p;
-+}
-+
-+/* Prevent VMA merging */
-+static void syscall_vma_close(struct vm_area_struct *vma)
-+{
-+}
-+
-+static struct vm_operations_struct syscall_vm_ops = {
-+	.close = syscall_vma_close,
-+	.nopage = syscall_nopage,
-+};
- 
-+/* Setup a VMA at program startup for the vsyscall page */
-+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
-+{
-+	struct vm_area_struct *vma;
-+	struct mm_struct *mm = current->mm;
-+	int ret;
-+
-+	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
-+	if (!vma)
-+		return -ENOMEM;
-+
-+	memset(vma, 0, sizeof(struct vm_area_struct));
-+	/* Could randomize here */
-+	vma->vm_start = VSYSCALL_BASE;
-+	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
-+	/* MAYWRITE to allow gdb to COW and set breakpoints */
-+	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
-+	vma->vm_flags |= mm->def_flags;
-+	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
-+	vma->vm_ops = &syscall_vm_ops;
-+	vma->vm_mm = mm;
-+
-+	down_write(&mm->mmap_sem);
-+	if ((ret = insert_vm_struct(mm, vma))) {
-+		up_write(&mm->mmap_sem);
-+		kmem_cache_free(vm_area_cachep, vma);
-+		return ret;
-+	}
-+	mm->total_vm++;
-+	up_write(&mm->mmap_sem);
-+	return 0;
-+}
-+
-+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+{
-+	return NULL;
-+}
-+
-+int in_gate_area(struct task_struct *task, unsigned long addr)
-+{
-+	return 0;
-+}
-+
-+int in_gate_area_no_task(unsigned long addr)
-+{
- 	return 0;
- }
+ 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
+ 		memcpy(syscall_page,
+ 		       &vsyscall_int80_start,
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/time-xen.c merge/arch/i386/kernel/time-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/time-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/i386/kernel/time-xen.c	2006-06-05 16:00:51.000000000 +0200
@@ -14614,7 +14447,7 @@
 +	}
 +}
 +
-+void show_trace(struct task_struct *task, unsigned long * stack)
++void show_trace(struct task_struct *task, struct pt_regs *regs, unsigned long * stack)
 +{
 +	show_trace_log_lvl(task, stack, "");
 +}
@@ -14658,7 +14491,7 @@
 +{
 +	unsigned long stack;
 +
-+	show_trace(current, &stack);
++	show_trace(current, NULL, &stack);
 +}
 +
 +EXPORT_SYMBOL(dump_stack);
@@ -21274,17 +21107,6 @@
  void
  register_percpu_irq (ia64_vector vec, struct irqaction *action)
  {
-@@ -232,6 +382,10 @@ register_percpu_irq (ia64_vector vec, st
- 
- 	for (irq = 0; irq < NR_IRQS; ++irq)
- 		if (irq_to_vector(irq) == vec) {
-+#ifdef CONFIG_XEN
-+			if (is_running_on_xen())
-+				return xen_register_percpu_irq(vec, action, 1);
-+#endif
- 			desc = irq_descp(irq);
- 			desc->status |= IRQ_PER_CPU;
- 			desc->handler = &irq_type_ia64_lsapic;
 @@ -243,6 +397,21 @@ register_percpu_irq (ia64_vector vec, st
  void __init
  init_IRQ (void)
@@ -21345,6 +21167,19 @@
  #ifdef CONFIG_SMP
  	phys_cpu_id = cpu_physical_id(cpu);
  #else
+--- linux-2.6.17.noarch/arch/ia64/kernel/irq_ia64.c~	2006-06-29 22:53:44.000000000 -0400
++++ linux-2.6.17.noarch/arch/ia64/kernel/irq_ia64.c	2006-06-29 22:54:07.000000000 -0400
+@@ -399,6 +399,10 @@ register_percpu_irq (ia64_vector vec, st
+ 
+ 	for (irq = 0; irq < NR_IRQS; ++irq)
+ 		if (irq_to_vector(irq) == vec) {
++#ifdef CONFIG_XEN
++			if (is_running_on_xen())
++				return xen_register_percpu_irq(vec, action, 1);
++#endif
+ 			desc = irq_desc + irq;
+ 			desc->status |= IRQ_PER_CPU;
+ 			desc->chip = &irq_type_ia64_lsapic;
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/ia64/kernel/pal.S merge/arch/ia64/kernel/pal.S
 --- ../upstream/hg/linux-2.6/arch/ia64/kernel/pal.S	2005-11-07 20:02:44.000000000 +0100
 +++ merge/arch/ia64/kernel/pal.S	2006-05-30 12:42:44.000000000 +0200
@@ -29106,18 +28941,6 @@
 +}
 +
 +__setup("earlyprintk=", setup_early_printk);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/entry.S merge/arch/x86_64/kernel/entry.S
---- ../upstream/hg/linux-2.6/arch/x86_64/kernel/entry.S	2006-05-31 12:52:51.000000000 +0200
-+++ merge/arch/x86_64/kernel/entry.S	2006-06-02 06:29:21.000000000 +0200
-@@ -596,7 +596,7 @@ retint_kernel:	
-  */		
- 	.macro apicinterrupt num,func
- 	INTR_FRAME
--	pushq $\num-256
-+	pushq $~(\num)
- 	CFI_ADJUST_CFA_OFFSET 8
- 	interrupt \func
- 	jmp ret_from_intr
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/entry-xen.S merge/arch/x86_64/kernel/entry-xen.S
 --- ../upstream/hg/linux-2.6/arch/x86_64/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/x86_64/kernel/entry-xen.S	2006-05-30 12:42:51.000000000 +0200
@@ -33217,20 +33040,6 @@
 +{
 +  return turn_on ? sys_iopl(3, NULL) : 0;
 +}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/irq.c merge/arch/x86_64/kernel/irq.c
---- ../upstream/hg/linux-2.6/arch/x86_64/kernel/irq.c	2006-04-04 08:17:31.000000000 +0200
-+++ merge/arch/x86_64/kernel/irq.c	2006-05-30 12:42:51.000000000 +0200
-@@ -91,8 +91,8 @@ skip:
-  */
- asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
- {	
--	/* high bits used in ret_from_ code  */
--	unsigned irq = regs->orig_rax & 0xff;
-+	/* high bit used in ret_from_ code  */
-+	unsigned irq = ~regs->orig_rax;
- 
- 	exit_idle();
- 	irq_enter();
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/irq-xen.c merge/arch/x86_64/kernel/irq-xen.c
 --- ../upstream/hg/linux-2.6/arch/x86_64/kernel/irq-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/x86_64/kernel/irq-xen.c	2006-05-30 12:42:51.000000000 +0200
@@ -33351,13 +33160,13 @@
 +		if (irq == 2)
 +			continue;
 +
-+		cpus_and(mask, irq_affinity[irq], map);
++		cpus_and(mask, irq_desc[irq].affinity, map);
 +		if (any_online_cpu(mask) == NR_CPUS) {
 +			printk("Breaking affinity for irq %i\n", irq);
 +			mask = map;
 +		}
-+		if (irq_desc[irq].handler->set_affinity)
-+			irq_desc[irq].handler->set_affinity(irq, mask);
++		if (irq_desc[irq].chip->set_affinity)
++			irq_desc[irq].chip->set_affinity(irq, mask);
 +		else if (irq_desc[irq].action && !(warned++))
 +			printk("Cannot set affinity for irq %i\n", irq);
 +	}
@@ -34921,10 +34730,10 @@
 +	if (need_resched())
 +		local_irq_enable();
 +	else {
-+		clear_thread_flag(TIF_POLLING_NRFLAG);
++		current_thread_info()->status &= ~TS_POLLING;
 +		smp_mb__after_clear_bit();
 +		safe_halt();
-+		set_thread_flag(TIF_POLLING_NRFLAG);
++		current_thread_info()->status |= TS_POLLING;
 +	}
 +}
 +
@@ -34953,7 +34762,7 @@
 + */
 +void cpu_idle (void)
 +{
-+	set_thread_flag(TIF_POLLING_NRFLAG);
++	current_thread_info()->status |= TS_POLLING;
 +
 +	/* endless idle loop with no priority at all */
 +	while (1) {
@@ -35057,7 +34866,7 @@
 +{
 +	printk("CPU %d:", smp_processor_id());
 +	__show_regs(regs);
-+	show_trace(&regs->rsp);
++	show_trace(current, regs, &regs->rsp);
 +}
 +
 +/*
@@ -37683,22 +37492,6 @@
 +}
 +device_initcall(add_pcspkr);
 +#endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/smp.c merge/arch/x86_64/kernel/smp.c
---- ../upstream/hg/linux-2.6/arch/x86_64/kernel/smp.c	2006-04-04 08:17:31.000000000 +0200
-+++ merge/arch/x86_64/kernel/smp.c	2006-05-30 12:42:52.000000000 +0200
-@@ -135,10 +135,10 @@ asmlinkage void smp_invalidate_interrupt
- 
- 	cpu = smp_processor_id();
- 	/*
--	 * orig_rax contains the interrupt vector - 256.
-+	 * orig_rax contains the negated interrupt vector.
- 	 * Use that to determine where the sender put the data.
- 	 */
--	sender = regs->orig_rax + 256 - INVALIDATE_TLB_VECTOR_START;
-+	sender = ~regs->orig_rax - INVALIDATE_TLB_VECTOR_START;
- 	f = &per_cpu(flush_state, sender);
- 
- 	if (!cpu_isset(cpu, f->flush_cpumask))
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/x86_64/kernel/smp-xen.c merge/arch/x86_64/kernel/smp-xen.c
 --- ../upstream/hg/linux-2.6/arch/x86_64/kernel/smp-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ merge/arch/x86_64/kernel/smp-xen.c	2006-06-07 13:30:41.000000000 +0200
@@ -38503,7 +38296,7 @@
 + * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
 + */
 +
-+void show_trace(unsigned long *stack)
++void show_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long *stack)
 +{
 +	const unsigned cpu = safe_smp_processor_id();
 +	unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr;
@@ -38603,7 +38396,7 @@
 +		printk("%016lx ", *stack++);
 +		touch_nmi_watchdog();
 +	}
-+	show_trace((unsigned long *)rsp);
++	show_trace(tsk, NULL, rsp);
 +}
 +
 +/*
@@ -38612,7 +38405,7 @@
 +void dump_stack(void)
 +{
 +	unsigned long dummy;
-+	show_trace(&dummy);
++	show_trace(NULL, NULL, &dummy);
 +}
 +
 +EXPORT_SYMBOL(dump_stack);
@@ -65809,15 +65602,14 @@
  	help
  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
  	  ramfs. For architectures that support it, say Y here and read
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-i386/a.out.h merge/include/asm-i386/a.out.h
---- ../upstream/hg/linux-2.6/include/asm-i386/a.out.h	2005-11-07 20:02:53.000000000 +0100
-+++ merge/include/asm-i386/a.out.h	2006-05-30 12:43:45.000000000 +0200
+--- linux-2.6.17.noarch/include/asm-i386/a.out.h~	2006-06-29 22:56:48.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/a.out.h	2006-06-29 22:57:35.000000000 -0400
 @@ -19,7 +19,7 @@ struct exec
  
  #ifdef __KERNEL__
  
--#define STACK_TOP	TASK_SIZE
-+#define STACK_TOP	(TASK_SIZE - 3*PAGE_SIZE)
+-#define STACK_TOP	(TASK_SIZE - PAGE_SIZE)  /* 1 page for vdso */
++#define STACK_TOP	(TASK_SIZE - 3 * PAGE_SIZE)  /* 1 page for vdso FIXME: WTF? */
  
  #endif
  
@@ -65837,27 +65629,6 @@
  
  extern int timer_over_8254;
  
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-i386/elf.h merge/include/asm-i386/elf.h
---- ../upstream/hg/linux-2.6/include/asm-i386/elf.h	2005-11-07 20:02:53.000000000 +0100
-+++ merge/include/asm-i386/elf.h	2006-05-30 12:43:45.000000000 +0200
-@@ -129,11 +129,16 @@ extern int dump_task_extended_fpu (struc
- #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
- #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
- 
--#define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
-+#define VSYSCALL_BASE	(PAGE_OFFSET - 2*PAGE_SIZE)
- #define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
- #define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
- extern void __kernel_vsyscall;
- 
-+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-+struct linux_binprm;
-+extern int arch_setup_additional_pages(struct linux_binprm *bprm,
-+                                       int executable_stack);
-+
- #define ARCH_DLINFO						\
- do {								\
- 		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);	\
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-i386/fixmap.h merge/include/asm-i386/fixmap.h
 --- ../upstream/hg/linux-2.6/include/asm-i386/fixmap.h	2005-11-07 20:02:53.000000000 +0100
 +++ merge/include/asm-i386/fixmap.h	2006-05-30 12:43:45.000000000 +0200
@@ -65870,14 +65641,6 @@
  
  #ifndef __ASSEMBLY__
  #include <linux/kernel.h>
-@@ -52,7 +52,6 @@
-  */
- enum fixed_addresses {
- 	FIX_HOLE,
--	FIX_VSYSCALL,
- #ifdef CONFIG_X86_LOCAL_APIC
- 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
- #endif
 @@ -95,6 +94,8 @@ enum fixed_addresses {
  extern void __set_fixmap (enum fixed_addresses idx,
  					unsigned long phys, pgprot_t flags);
@@ -65887,21 +65650,6 @@
  #define set_fixmap(idx, phys) \
  		__set_fixmap(idx, phys, PAGE_KERNEL)
  /*
-@@ -116,14 +117,6 @@ extern void __set_fixmap (enum fixed_add
- #define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
- #define __virt_to_fix(x)	((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
- 
--/*
-- * This is the range that is readable by user mode, and things
-- * acting like user mode such as get_user_pages.
-- */
--#define FIXADDR_USER_START	(__fix_to_virt(FIX_VSYSCALL))
--#define FIXADDR_USER_END	(FIXADDR_USER_START + PAGE_SIZE)
--
--
- extern void __this_fixmap_does_not_exist(void);
- 
- /*
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-i386/mach-default/mach_traps.h merge/include/asm-i386/mach-default/mach_traps.h
 --- ../upstream/hg/linux-2.6/include/asm-i386/mach-default/mach_traps.h	2005-11-07 20:02:53.000000000 +0100
 +++ merge/include/asm-i386/mach-default/mach_traps.h	2006-05-30 12:43:45.000000000 +0200
@@ -69951,7 +69699,7 @@
 +extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 +
 +extern unsigned long thread_saved_pc(struct task_struct *tsk);
-+void show_trace(struct task_struct *task, unsigned long *stack);
++void show_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long *stack);
 +
 +unsigned long get_wchan(struct task_struct *p);
 +
@@ -71940,15 +71688,6 @@
  #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
  #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
  #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
-@@ -137,6 +137,8 @@ extern int page_is_ram(unsigned long pag
- 	((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
- 		 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
-+#define __HAVE_ARCH_GATE_AREA 1
-+
- #endif /* __KERNEL__ */
- 
- #include <asm-generic/memory_model.h>
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-i386/pgtable-2level-defs.h merge/include/asm-i386/pgtable-2level-defs.h
 --- ../upstream/hg/linux-2.6/include/asm-i386/pgtable-2level-defs.h	2005-11-07 20:02:53.000000000 +0100
 +++ merge/include/asm-i386/pgtable-2level-defs.h	2006-05-30 12:43:46.000000000 +0200
@@ -72313,37 +72052,6 @@
 +#define __ia64_get_psr_i()	(__ia64_getreg(_IA64_REG_PSR) & 0x4000UL)
 +
  #endif /* _ASM_IA64_GCC_INTRIN_H */
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-ia64/hw_irq.h merge/include/asm-ia64/hw_irq.h
---- ../upstream/hg/linux-2.6/include/asm-ia64/hw_irq.h	2005-11-07 20:02:53.000000000 +0100
-+++ merge/include/asm-ia64/hw_irq.h	2006-06-05 16:00:51.000000000 +0200
-@@ -15,7 +15,11 @@
- #include <asm/ptrace.h>
- #include <asm/smp.h>
- 
-+#ifndef CONFIG_XEN
- typedef u8 ia64_vector;
-+#else
-+typedef u16 ia64_vector;
-+#endif
- 
- /*
-  * 0 special
-@@ -86,11 +90,15 @@ extern void free_irq_vector (int vector)
- extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect);
- extern void register_percpu_irq (ia64_vector vec, struct irqaction *action);
- 
-+#ifndef CONFIG_XEN
- static inline void
- hw_resend_irq (struct hw_interrupt_type *h, unsigned int vector)
- {
- 	platform_send_ipi(smp_processor_id(), vector, IA64_IPI_DM_INT, 0);
- }
-+#else
-+extern void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i);
-+#endif /* CONFIG_XEN */
- 
- /*
-  * Default implementations for the irq-descriptor API:
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-ia64/hypercall.h merge/include/asm-ia64/hypercall.h
 --- ../upstream/hg/linux-2.6/include/asm-ia64/hypercall.h	1970-01-01 01:00:00.000000000 +0100
 +++ merge/include/asm-ia64/hypercall.h	2006-06-05 16:00:51.000000000 +0200
@@ -74024,18 +73732,6 @@
  
  #endif /* CONFIG_X86_LOCAL_APIC */
  
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-x86_64/hw_irq.h merge/include/asm-x86_64/hw_irq.h
---- ../upstream/hg/linux-2.6/include/asm-x86_64/hw_irq.h	2006-01-16 01:22:19.000000000 +0100
-+++ merge/include/asm-x86_64/hw_irq.h	2006-05-30 12:43:54.000000000 +0200
-@@ -127,7 +127,7 @@ asmlinkage void IRQ_NAME(nr); \
- __asm__( \
- "\n.p2align\n" \
- "IRQ" #nr "_interrupt:\n\t" \
--	"push $" #nr "-256 ; " \
-+	"push $~(" #nr ") ; " \
- 	"jmp common_interrupt");
- 
- #if defined(CONFIG_X86_IO_APIC)
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-x86_64/mach-xen/asm/arch_hooks.h merge/include/asm-x86_64/mach-xen/asm/arch_hooks.h
 --- ../upstream/hg/linux-2.6/include/asm-x86_64/mach-xen/asm/arch_hooks.h	1970-01-01 01:00:00.000000000 +0100
 +++ merge/include/asm-x86_64/mach-xen/asm/arch_hooks.h	2006-05-30 12:43:54.000000000 +0200
@@ -78679,7 +78375,7 @@
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/asm-x86_64/mach-xen/asm/system.h merge/include/asm-x86_64/mach-xen/asm/system.h
 --- ../upstream/hg/linux-2.6/include/asm-x86_64/mach-xen/asm/system.h	1970-01-01 01:00:00.000000000 +0100
 +++ merge/include/asm-x86_64/mach-xen/asm/system.h	2006-06-05 16:00:52.000000000 +0200
-@@ -0,0 +1,428 @@
+@@ -0,0 +1,411 @@
 +#ifndef __ASM_SYSTEM_H
 +#define __ASM_SYSTEM_H
 +
@@ -78698,12 +78394,6 @@
 +#define __vcpu_id 0
 +#endif
 +
-+#ifdef CONFIG_SMP
-+#define LOCK_PREFIX "lock ; "
-+#else
-+#define LOCK_PREFIX ""
-+#endif
-+
 +#define __STR(x) #x
 +#define STR(x) __STR(x)
 +
@@ -78762,17 +78452,6 @@
 +		".previous"			\
 +		: :"r" (value), "r" (0))
 +
-+#ifdef __KERNEL__
-+struct alt_instr { 
-+	__u8 *instr; 		/* original instruction */
-+	__u8 *replacement;
-+	__u8  cpuid;		/* cpuid bit set for replacement */
-+	__u8  instrlen;		/* length of original instruction */
-+	__u8  replacementlen; 	/* length of new instruction, <= instrlen */ 
-+	__u8  pad[5];
-+}; 
-+#endif
-+
 +/*
 + * Alternative instructions for different CPU types or capabilities.
 + * 
@@ -86259,37 +85938,37 @@
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/irq/manage.c merge/kernel/irq/manage.c
 --- ../upstream/hg/linux-2.6/kernel/irq/manage.c	2006-05-13 02:59:52.000000000 +0200
 +++ merge/kernel/irq/manage.c	2006-05-30 12:44:02.000000000 +0200
-@@ -204,14 +204,10 @@ int setup_irq(unsigned int irq, struct i
- 	p = &desc->action;
- 	if ((old = *p) != NULL) {
- 		/* Can't share interrupts unless both agree to */
--		if (!(old->flags & new->flags & SA_SHIRQ))
+@@ -232,14 +232,10 @@ int setup_irq(unsigned int irq, struct i
+ 		 * set the trigger type must match.
+ 		 */
+ 		if (!((old->flags & new->flags) & SA_SHIRQ) ||
+-		    ((old->flags ^ new->flags) & SA_TRIGGER_MASK))
 -			goto mismatch;
 -
--#if defined(ARCH_HAS_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
+-#if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
 -		/* All handlers must agree on per-cpuness */
 -		if ((old->flags & IRQ_PER_CPU) != (new->flags & IRQ_PER_CPU))
 -			goto mismatch;
 -#endif
-+		if (!(old->flags & new->flags & SA_SHIRQ)) {
++		    ((old->flags ^ new->flags) & SA_TRIGGER_MASK)) {
 +			spin_unlock_irqrestore(&desc->lock,flags);
 +			return -EBUSY;
 +		}
  
  		/* add new interrupt at end of irq queue */
  		do {
-@@ -222,10 +218,7 @@ int setup_irq(unsigned int irq, struct i
+@@ -246,10 +246,7 @@ int setup_irq(unsigned int irq, struct i
  	}
  
  	*p = new;
--#if defined(ARCH_HAS_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
+-#if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
 -	if (new->flags & SA_PERCPU_IRQ)
 -		desc->status |= IRQ_PER_CPU;
 -#endif
 +
  	if (!shared) {
- 		desc->depth = 0;
- 		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT |
+ 		irq_chip_set_defaults(desc->chip);
+ 
 @@ -243,14 +236,6 @@ int setup_irq(unsigned int irq, struct i
  	register_handler_proc(irq, new);
  



From fedora-cvs-commits at redhat.com  Fri Jun 30 04:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:04:55 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.114, 1.115 mkinitrd.spec, 1.131,
	1.132 sources, 1.127, 1.128
Message-ID: <200606300404.k5U44ttY025760@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25723/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
auto-import mkinitrd-5.0.46-1 on branch devel from mkinitrd-5.0.46-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- .cvsignore	22 Jun 2006 22:23:07 -0000	1.114
+++ .cvsignore	30 Jun 2006 04:04:40 -0000	1.115
@@ -1 +1 @@
-mkinitrd-5.0.45.tar.bz2
+mkinitrd-5.0.46.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- mkinitrd.spec	22 Jun 2006 22:23:07 -0000	1.131
+++ mkinitrd.spec	30 Jun 2006 04:04:40 -0000	1.132
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.45
+Version: 5.0.46
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,12 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
+- if we don't get a modalias for a net driver, try via 
+  ethtool (notting, #196104)
+- add patches from Aron Griffis (aron AT hp DOT com) for multiboot 
+  support on ia64
+
 * Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.45-1
 - don't emit <empty> for iscsi username/password stuff
 - handle _netdev option for filesystems


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources	22 Jun 2006 22:23:07 -0000	1.127
+++ sources	30 Jun 2006 04:04:41 -0000	1.128
@@ -1 +1 @@
-f5c8460b6e2e16dfd9b1f1b93a2cdb07  mkinitrd-5.0.45.tar.bz2
+f99f6a6e7e66ac3f3022b97ff0e375f9  mkinitrd-5.0.46.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 30 04:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:22:09 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.193, 1.194 kernel-2.6.spec, 1.1653, 1.1654 sources, 1.177,
	1.178 upstream, 1.118, 1.119 patch-2.6.17.1.bz2.sign, 1.1, NONE
Message-ID: <200606300422.k5U4M97M006576@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6004

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.2.bz2.sign 
Removed Files:
	patch-2.6.17.1.bz2.sign 
Log Message:
2.6.17.2


--- NEW FILE patch-2.6.17.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBEpHFRyGugalF9Dw4RAscbAJ0Vj8na9OMnu9NW4JkYpcJqyxzX3gCYoV7I
AJ/PXSCNyOCUKR/sY3sFZw==
=zwNJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- .cvsignore	20 Jun 2006 18:25:39 -0000	1.193
+++ .cvsignore	30 Jun 2006 04:21:58 -0000	1.194
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.17.1.bz2
+patch-2.6.17.2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1653
retrieving revision 1.1654
diff -u -r1.1653 -r1.1654
--- kernel-2.6.spec	26 Jun 2006 14:50:44 -0000	1.1653
+++ kernel-2.6.spec	30 Jun 2006 04:21:58 -0000	1.1654
@@ -201,7 +201,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.1.bz2
+Patch1: patch-2.6.17.2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1077,6 +1077,9 @@
 %endif
 
 %changelog
+* Fri Jun 30 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2140_FC4]
+- 2.6.17.2
+
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - Fix up various stupidities incurred by the last big rebase.
   - Reenable SMP x86-64 builds.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- sources	20 Jun 2006 18:25:40 -0000	1.177
+++ sources	30 Jun 2006 04:22:01 -0000	1.178
@@ -1,2 +1,2 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-f7197c29beb5bd28b6f566b58260ece8  patch-2.6.17.1.bz2
+efeb792bb20a392d3ebcc5ae910f7c6b  patch-2.6.17.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- upstream	20 Jun 2006 18:25:40 -0000	1.118
+++ upstream	30 Jun 2006 04:22:02 -0000	1.119
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.1.bz2
+patch-2.6.17.2.bz2


--- patch-2.6.17.1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 04:30:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:30:59 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1654,
	1.1655 linux-2.6-debug-list_head.patch, 1.5, 1.6
Message-ID: <200606300430.k5U4Ux3G011543@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11442

Modified Files:
	kernel-2.6.spec linux-2.6-debug-list_head.patch 
Log Message:
Fix the alsa list-add bug



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1654
retrieving revision 1.1655
diff -u -r1.1654 -r1.1655
--- kernel-2.6.spec	30 Jun 2006 04:21:58 -0000	1.1654
+++ kernel-2.6.spec	30 Jun 2006 04:30:50 -0000	1.1655
@@ -1079,6 +1079,7 @@
 %changelog
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2140_FC4]
 - 2.6.17.2
+- Fix up the alsa list_add bug.
 
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - Fix up various stupidities incurred by the last big rebase.

linux-2.6-debug-list_head.patch:
 b/fs/select.c                                  |    4 ++-
 b/include/linux/wait.h                         |    2 -
 b/kernel/wait.c                                |   26 +++++++++++++++++++++++--
 linux-2.6.12/include/linux/list.h              |   22 +++++++++++++++++++++
 linux-2.6.17.noarch/sound/core/seq/seq_ports.c |    6 +----
 5 files changed, 52 insertions(+), 8 deletions(-)

Index: linux-2.6-debug-list_head.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-list_head.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-list_head.patch	20 Jun 2006 18:25:40 -0000	1.5
+++ linux-2.6-debug-list_head.patch	30 Jun 2006 04:30:56 -0000	1.6
@@ -134,3 +134,18 @@
  EXPORT_SYMBOL(remove_wait_queue);
  
 
+--- linux-2.6.17.noarch/sound/core/seq/seq_ports.c~	2006-06-30 00:22:38.000000000 -0400
++++ linux-2.6.17.noarch/sound/core/seq/seq_ports.c	2006-06-30 00:24:00.000000000 -0400
+@@ -324,10 +324,8 @@ int snd_seq_delete_all_ports(struct snd_
+ 	mutex_lock(&client->ports_mutex);
+ 	write_lock_irqsave(&client->ports_lock, flags);
+ 	if (! list_empty(&client->ports_list_head)) {
+-		__list_add(&deleted_list,
+-			   client->ports_list_head.prev,
+-			   client->ports_list_head.next);
+-		INIT_LIST_HEAD(&client->ports_list_head);
++		list_add(&deleted_list, &client->ports_list_head);
++		list_del_init(&client->ports_list_head);
+ 	} else {
+ 		INIT_LIST_HEAD(&deleted_list);
+ 	}



From fedora-cvs-commits at redhat.com  Fri Jun 30 04:32:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:32:27 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1655,1.1656
Message-ID: <200606300432.k5U4WRl8011784@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11744

Modified Files:
	kernel-2.6.spec 
Log Message:
bump






From fedora-cvs-commits at redhat.com  Fri Jun 30 04:37:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:37:45 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.405, 1.406 kernel-2.6.spec, 1.2143,
	1.2144 linux-2.6-debug-list_head.patch, 1.4, 1.5 sources,
	1.346, 1.347 upstream, 1.316, 1.317 patch-2.6.17.1.bz2.sign,
	1.1, NONE
Message-ID: <200606300437.k5U4bj9c012893@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12845

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-debug-list_head.patch 
	sources upstream 
Added Files:
	patch-2.6.17.2.bz2.sign 
Removed Files:
	patch-2.6.17.1.bz2.sign 
Log Message:
.17.2



--- NEW FILE patch-2.6.17.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBEpHFRyGugalF9Dw4RAscbAJ0Vj8na9OMnu9NW4JkYpcJqyxzX3gCYoV7I
AJ/PXSCNyOCUKR/sY3sFZw==
=zwNJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- .cvsignore	20 Jun 2006 17:18:29 -0000	1.405
+++ .cvsignore	30 Jun 2006 04:37:38 -0000	1.406
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17.1.bz2
+patch-2.6.17.2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2143
retrieving revision 1.2144
diff -u -r1.2143 -r1.2144
--- kernel-2.6.spec	26 Jun 2006 14:40:29 -0000	1.2143
+++ kernel-2.6.spec	30 Jun 2006 04:37:38 -0000	1.2144
@@ -237,7 +237,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.1.bz2
+Patch1: patch-2.6.17.2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1627,6 +1627,10 @@
 %endif
 
 %changelog
+* Fri Jun 30 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.2
+- Fix the ALSA list_add bug.
+
 * Mon Jun 26 2006 Dave Jones <davej at redhat.com>
 - Enable fake PCI hotplug driver. (#190437)
 - Enable gameport/joystick on i586 builds. (#196581)

linux-2.6-debug-list_head.patch:
 b/fs/select.c                                  |    4 ++-
 b/include/linux/wait.h                         |    2 -
 b/kernel/wait.c                                |   26 +++++++++++++++++++++++--
 linux-2.6.12/include/linux/list.h              |   22 +++++++++++++++++++++
 linux-2.6.17.noarch/sound/core/seq/seq_ports.c |    6 +----
 5 files changed, 52 insertions(+), 8 deletions(-)

Index: linux-2.6-debug-list_head.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-list_head.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-list_head.patch	18 Jun 2006 04:45:03 -0000	1.4
+++ linux-2.6-debug-list_head.patch	30 Jun 2006 04:37:40 -0000	1.5
@@ -134,3 +134,18 @@
  EXPORT_SYMBOL(remove_wait_queue);
  
 
+--- linux-2.6.17.noarch/sound/core/seq/seq_ports.c~	2006-06-30 00:22:38.000000000 -0400
++++ linux-2.6.17.noarch/sound/core/seq/seq_ports.c	2006-06-30 00:24:00.000000000 -0400
+@@ -324,10 +324,8 @@ int snd_seq_delete_all_ports(struct snd_
+ 	mutex_lock(&client->ports_mutex);
+ 	write_lock_irqsave(&client->ports_lock, flags);
+ 	if (! list_empty(&client->ports_list_head)) {
+-		__list_add(&deleted_list,
+-			   client->ports_list_head.prev,
+-			   client->ports_list_head.next);
+-		INIT_LIST_HEAD(&client->ports_list_head);
++		list_add(&deleted_list, &client->ports_list_head);
++		list_del_init(&client->ports_list_head);
+ 	} else {
+ 		INIT_LIST_HEAD(&deleted_list);
+ 	}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- sources	20 Jun 2006 17:18:30 -0000	1.346
+++ sources	30 Jun 2006 04:37:40 -0000	1.347
@@ -1,3 +1,3 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-f7197c29beb5bd28b6f566b58260ece8  patch-2.6.17.1.bz2
+efeb792bb20a392d3ebcc5ae910f7c6b  patch-2.6.17.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- upstream	20 Jun 2006 17:18:30 -0000	1.316
+++ upstream	30 Jun 2006 04:37:40 -0000	1.317
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.1.bz2
+patch-2.6.17.2.bz2


--- patch-2.6.17.1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 04:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:40:57 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.288, 1.289 anaconda.spec, 1.412,
	1.413 sources, 1.409, 1.410
Message-ID: <200606300440.k5U4evkX013515@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13457/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.50-1 on branch devel from anaconda-11.1.0.50-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- .cvsignore	29 Jun 2006 01:53:48 -0000	1.288
+++ .cvsignore	30 Jun 2006 04:40:53 -0000	1.289
@@ -1 +1 @@
-anaconda-11.1.0.49.tar.bz2
+anaconda-11.1.0.50.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- anaconda.spec	29 Jun 2006 01:53:48 -0000	1.412
+++ anaconda.spec	30 Jun 2006 04:40:53 -0000	1.413
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.49
+Version: 11.1.0.50
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -15,7 +15,7 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.5-2, libdhcp >= 1.5-2
+BuildPreReq: libdhcp-devel >= 1.6
 BuildPreReq: libdhcp4client-devel, libdhcp6client-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
 Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
@@ -101,6 +101,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.50-1
+- Rebuild against new libdhcp for fixing more loader segfaults
+- Pass the debug log level to libdhcp (markmc, #197175)
+- Look for the ks.cfg on all cd drives (notting, #197192)
+- Add wlite here, use it (pjones, #196099, #186701)
+- Add the start of gfs2 support
+
 * Wed Jun 28 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.49-1
 - Fix some memory leaks in the loader (pjones)
 - Display fs labels next to rescue choices (clumens, #196345)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- sources	29 Jun 2006 01:53:48 -0000	1.409
+++ sources	30 Jun 2006 04:40:53 -0000	1.410
@@ -1 +1 @@
-c498162eae0aaf4eeaa350922a749628  anaconda-11.1.0.49.tar.bz2
+dde79fce29e8000b2120f43aaf19410e  anaconda-11.1.0.50.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 30 04:41:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 00:41:53 -0400
Subject: rpms/kernel/devel linux-2.6-random-patches.patch,1.14,1.15
Message-ID: <200606300441.k5U4frsG013727@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13659

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
silly flags thinko

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 +----
 linux-2.6.17.noarch/drivers/scsi/53c700.c                  |    2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-random-patches.patch	29 May 2006 15:43:06 -0000	1.14
+++ linux-2.6-random-patches.patch	30 Jun 2006 04:41:42 -0000	1.15
@@ -81,3 +81,14 @@
 # 	}
 # 	if (!ata_dev_present(dev))
 
+--- linux-2.6.17.noarch/drivers/scsi/53c700.c~	2006-06-30 00:40:56.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/53c700.c	2006-06-30 00:41:04.000000000 -0400
+@@ -2044,7 +2044,7 @@ NCR_700_slave_configure(struct scsi_devi
+ 	struct NCR_700_Host_Parameters *hostdata = 
+ 		(struct NCR_700_Host_Parameters *)SDp->host->hostdata[0];
+ 
+-	SDp->hostdata = kmalloc(GFP_KERNEL, sizeof(struct NCR_700_sense));
++	SDp->hostdata = kmalloc(sizeof(struct NCR_700_sense), GFP_KERNEL);
+ 
+ 	if (!SDp->hostdata)
+ 		return -ENOMEM;



From fedora-cvs-commits at redhat.com  Fri Jun 30 05:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 01:09:16 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1656,1.1657
Message-ID: <200606300509.k5U59F4a002730@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2640

Modified Files:
	kernel-2.6.spec 
Log Message:
resurrect smp x86-64 config



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1656
retrieving revision 1.1657
diff -u -r1.1656 -r1.1657
--- kernel-2.6.spec	30 Jun 2006 04:32:18 -0000	1.1656
+++ kernel-2.6.spec	30 Jun 2006 05:09:00 -0000	1.1657
@@ -183,6 +183,7 @@
 Source23: kernel-%{kversion}-i686-smp.config
 
 Source25: kernel-%{kversion}-x86_64.config
+Source26: kernel-%{kversion}-x86_64-smp.config
 
 Source27: kernel-%{kversion}-ppc.config
 Source28: kernel-%{kversion}-ppc-smp.config



From fedora-cvs-commits at redhat.com  Fri Jun 30 06:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 02:56:48 -0400
Subject: rpms/curl/devel .cvsignore, 1.19, 1.20 curl.spec, 1.35, 1.36 sources,
	1.20, 1.21
Message-ID: <200606300656.k5U6umtZ010409@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10105

Modified Files:
	.cvsignore curl.spec sources 
Log Message:
- update to 7.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Mar 2006 09:15:50 -0000	1.19
+++ .cvsignore	30 Jun 2006 06:56:45 -0000	1.20
@@ -1 +1 @@
-curl-7.15.3.tar.bz2
+curl-7.15.4.tar.bz2


Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- curl.spec	21 Mar 2006 09:15:51 -0000	1.35
+++ curl.spec	30 Jun 2006 06:56:45 -0000	1.36
@@ -1,6 +1,6 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Name: curl 
-Version: 7.15.3
+Version: 7.15.4
 Release: 1
 License: MIT
 Group: Applications/Internet
@@ -94,6 +94,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jul 30 2006 Ivana Varekova <varekova at redhat.com> - 7.15.4-1
+- update to 7.15.4
+
 * Mon Mar 20 2006 Ivana Varekova <varekova at redhat.com> - 7.15.3-1
 - fix multilib problem using pkg-config
 - update to 7.15.3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Mar 2006 09:15:51 -0000	1.20
+++ sources	30 Jun 2006 06:56:45 -0000	1.21
@@ -1 +1 @@
-d71b2ee8febfde2c7dc30a43638ec0d9  curl-7.15.3.tar.bz2
+d9345a55c8bc67eafcd37fa1b728e00e  curl-7.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 30 07:17:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 03:17:20 -0400
Subject: rpms/openoffice.org/FC-3 1sax+source+expatwrap+xml2utf.cxx.diff,
	NONE, 1.1 openoffice.org.spec, 1.65, 1.66 redhat-fixes.patch,
	1.36, 1.37
Message-ID: <200606300717.k5U7HK26030276@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv30247

Modified Files:
	openoffice.org.spec redhat-fixes.patch 
Added Files:
	1sax+source+expatwrap+xml2utf.cxx.diff 
Log Message:
backport 1.1.5 extra bit

1sax+source+expatwrap+xml2utf.cxx.diff:
 xml2utf.cxx |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE 1sax+source+expatwrap+xml2utf.cxx.diff ---
Index: source/expatwrap/xml2utf.cxx
===================================================================
RCS file: /cvs/xml/sax/source/expatwrap/xml2utf.cxx,v
retrieving revision 1.5
retrieving revision 1.5.16.1
diff -u -r1.5 -r1.5.16.1
--- sax.orig/source/expatwrap/xml2utf.cxx	28 Apr 2003 15:21:30 -0000	1.5
+++ sax/source/expatwrap/xml2utf.cxx	10 Jun 2005 13:34:42 -0000	1.5.16.1
@@ -194,7 +194,7 @@
 			}
 			else
 			{
-				int nStop  = str.indexOf( "\"" , nStart +1);
+				nStop  = str.indexOf( "\"" , nStart +1);
 			}
 
 			if( nStart >= 0 && nStop >= 0 && nStart+1 < nStop )
@@ -257,7 +257,7 @@
 
 sal_Bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
 {
-	const sal_Int8 *pSource = seq.getConstArray();
+	const sal_uInt8 *pSource = reinterpret_cast<const sal_uInt8*>( seq.getConstArray() );
 	sal_Bool bReturn = sal_True;
 
 	if( seq.getLength() < 4 ) {
@@ -290,7 +290,7 @@
 			}
 			else
 			{
-				int nStop  = str.indexOf( "\"" , nStart +1);
+				nStop  = str.indexOf( "\"" , nStart +1);
 			}
 			if( nStart >= 0 && nStop >= 0 && nStart+1 < nStop )
 			{
@@ -299,14 +299,14 @@
 			}
 		}
 	}
-	else if( 0xFE == static_cast<unsigned char> (pSource[0]) &&
-	         0xFF == static_cast<unsigned char> (pSource[1]) ) {
+	else if( 0xFE == pSource[0] &&
+	         0xFF == pSource[1] ) {
 		// UTF-16 big endian
 		// conversion is done so that encoding information can be easily extracted
 		m_sEncoding = "utf-16";
 	}
-	else if( 0xFF == static_cast<unsigned char> (pSource[0]) &&
-	         0xFE == static_cast<unsigned char> (pSource[1]) ) {
+	else if( 0xFF == pSource[0] &&
+	         0xFE == pSource[1] ) {
 		// UTF-16 little endian
 		// conversion is done so that encoding information can be easily extracted
 		m_sEncoding = "utf-16";
@@ -334,6 +334,16 @@
 
 		m_sEncoding = "utf-16";
 	}
+    else if( 0xEF == pSource[0] && 
+             0xBB == pSource[1] &&
+             0xBF == pSource[2] )
+    {
+        // UTF-8 BOM (byte order mark); signifies utf-8, and not byte order
+        // The BOM is removed.
+        memmove( seq.getArray(), &( seq.getArray()[3] ), seq.getLength()-3 );
+        seq.realloc( seq.getLength() - 3 );
+        m_sEncoding = "utf-8";
+    }
 	else if( 0x00 == pSource[0] && 0x00 == pSource[1]  && 0x00 == pSource[2] && 0x3c == pSource[3] ) {
 		// UCS-4 big endian
 		m_sEncoding = "ucs-4";


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openoffice.org.spec	26 Jun 2006 14:24:17 -0000	1.65
+++ openoffice.org.spec	30 Jun 2006 07:17:16 -0000	1.66
@@ -112,7 +112,7 @@
 Version:		1.1.3
 
 # SET RPM RELEASE # HERE!!!
-%define ooo_rpm_release	12
+%define ooo_rpm_release	13
 
 Release:		%{ooo_rpm_release}%{release_extension}%{java_release_tag}
 URL:			http://www.openoffice.org/
@@ -222,6 +222,7 @@
 Patch26: 6438334-macros-so7-sfx2.diff
 Patch27: disable-java-applets.diff
 Patch28: sax+source+expatwrap+xml2utf.cxx.diff
+Patch29: 1sax+source+expatwrap+xml2utf.cxx.diff
 ##################################
 # Description
 ##################################
@@ -312,6 +313,7 @@
 ln -s %{PATCH26} patches/OOO_1_1/
 ln -s %{PATCH27} patches/OOO_1_1/
 ln -s %{PATCH28} patches/OOO_1_1/
+ln -s %{PATCH29} patches/OOO_1_1/
 
 # autogen here only needed when sources come from intermediate CVS releases,
 # not release from ooo.ximian.com
@@ -578,7 +580,7 @@
 # Changelog
 ##################################
 %changelog
-* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-12
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-13
 - add a fix for rh#147395#/ooo#52023# (caolanm)
 - CVE-2006-2198 macro security
 - CVE-2006-2199 java applets

redhat-fixes.patch:
 bin/build-ooo                                         |   30 ++++++++++++
 bin/install-dictionaries                              |   44 +-----------------
 bin/ooo-wrapper.in                                    |   40 ----------------
 configure.in                                          |    4 -
 patches/OOO_1_1/gui-menu-new-wizard-translations.diff |   39 ---------------
 patches/OOO_1_1/sc-filter-hide-filteredrows.diff      |    1 
 patches/OOO_1_1_3/apply                               |   22 +++++++--
 7 files changed, 56 insertions(+), 124 deletions(-)

Index: redhat-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/redhat-fixes.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- redhat-fixes.patch	26 Jun 2006 14:24:17 -0000	1.36
+++ redhat-fixes.patch	30 Jun 2006 07:17:16 -0000	1.37
@@ -289,7 +289,7 @@
 +6438334-macros-so7-sfx2.diff
 +disable-java-applets.diff
 +sax+source+expatwrap+xml2utf.cxx.diff
-+
++1sax+source+expatwrap+xml2utf.cxx.diff
  [ GnomeVFS ]
  
  # New VFS provider stuff ..



From fedora-cvs-commits at redhat.com  Fri Jun 30 07:27:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 03:27:56 -0400
Subject: rpms/openoffice.org/FC-3 openoffice.org.spec,1.66,1.67
Message-ID: <200606300727.k5U7RuR0001832@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv1806

Modified Files:
	openoffice.org.spec 
Log Message:
backport 1.1.5 extra bit


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- openoffice.org.spec	30 Jun 2006 07:17:16 -0000	1.66
+++ openoffice.org.spec	30 Jun 2006 07:27:54 -0000	1.67
@@ -112,7 +112,7 @@
 Version:		1.1.3
 
 # SET RPM RELEASE # HERE!!!
-%define ooo_rpm_release	13
+%define ooo_rpm_release	14
 
 Release:		%{ooo_rpm_release}%{release_extension}%{java_release_tag}
 URL:			http://www.openoffice.org/
@@ -580,7 +580,7 @@
 # Changelog
 ##################################
 %changelog
-* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-13
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-14
 - add a fix for rh#147395#/ooo#52023# (caolanm)
 - CVE-2006-2198 macro security
 - CVE-2006-2199 java applets



From fedora-cvs-commits at redhat.com  Fri Jun 30 07:30:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 03:30:58 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,
	NONE, 1.1 openoffice.org.spec, 1.671,
	1.672 openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch,
	1.2, NONE
Message-ID: <200606300730.k5U7UwoW002838@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2798

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 
Removed Files:
	openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch 
Log Message:
workaround visibility options

openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
 cppuhelper/inc/cppuhelper/implbase1.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase10.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase11.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase12.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase2.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase3.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase4.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase5.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase6.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase7.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase8.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase9.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase_ex.hxx |   16 ++++++++++++++++
 inc/cppuhelper/implbase1.hxx              |    0 
 inc/cppuhelper/implbase10.hxx             |    0 
 inc/cppuhelper/implbase11.hxx             |    0 
 inc/cppuhelper/implbase12.hxx             |    0 
 inc/cppuhelper/implbase2.hxx              |    0 
 inc/cppuhelper/implbase3.hxx              |    0 
 inc/cppuhelper/implbase4.hxx              |    0 
 inc/cppuhelper/implbase5.hxx              |    0 
 inc/cppuhelper/implbase6.hxx              |    0 
 inc/cppuhelper/implbase7.hxx              |    0 
 inc/cppuhelper/implbase8.hxx              |    0 
 inc/cppuhelper/implbase9.hxx              |    0 
 inc/cppuhelper/implbase_ex.hxx            |    0 
 26 files changed, 28 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch ---
Index: inc/cppuhelper/implbase1.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase1.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	5 Oct 2005 14:23:42 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	29 Jun 2006 11:50:44 -0000
@@ -68,7 +71,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
     
Index: inc/cppuhelper/implbase10.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase10.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx	5 Oct 2005 14:24:09 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx	29 Jun 2006 11:50:45 -0000
@@ -78,7 +78,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase11.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase11.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx	5 Oct 2005 14:24:35 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx	29 Jun 2006 11:50:45 -0000
@@ -79,7 +79,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase12.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase12.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx	5 Oct 2005 14:25:08 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx	29 Jun 2006 11:50:45 -0000
@@ -80,7 +80,7 @@
                     { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase2.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase2.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx	5 Oct 2005 14:25:28 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx	29 Jun 2006 11:50:45 -0000
@@ -69,7 +69,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase3.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase3.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx	5 Oct 2005 14:25:47 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx	29 Jun 2006 11:50:46 -0000
@@ -70,7 +70,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase4.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase4.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx	5 Oct 2005 14:26:03 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx	29 Jun 2006 11:50:46 -0000
@@ -72,7 +72,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase5.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase5.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx	5 Oct 2005 14:26:20 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx	29 Jun 2006 11:50:46 -0000
@@ -73,7 +73,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase6.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase6.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx	5 Oct 2005 14:26:37 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx	29 Jun 2006 11:50:48 -0000
@@ -74,7 +74,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
     
Index: inc/cppuhelper/implbase7.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase7.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx	5 Oct 2005 14:26:54 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx	29 Jun 2006 11:50:48 -0000
@@ -75,7 +75,7 @@
 					{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase8.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase8.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx	5 Oct 2005 14:27:12 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx	29 Jun 2006 11:50:48 -0000
@@ -76,7 +76,7 @@
                     { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase9.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase9.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx	5 Oct 2005 14:27:40 -0000	1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx	29 Jun 2006 11:50:48 -0000
@@ -77,7 +77,7 @@
                     { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
 				}
             };
-            return reinterpret_cast< class_data * >(&s_cd);
+            return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
         }
     };
 
Index: inc/cppuhelper/implbase_ex.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase_ex.hxx,v
retrieving revision 1.6
diff -u -r1.6 implbase_ex.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase_ex.hxx	5 Oct 2005 14:27:57 -0000	1.6
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase_ex.hxx	29 Jun 2006 11:50:48 -0000
@@ -53,6 +53,9 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+
 /* If you need to define implementation helper classes that deal with more than
    12 interfaces, then use macros as follows, e.g. for 3 interfaces:
    
@@ -117,6 +120,19 @@
     */
     type_entry m_typeEntries[ 1 ];
 };
+
+template<typename Impl> class_data* class_data_fixup(class_data *s_cd)
+{
+    if (!s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType)
+    {
+        fprintf(stderr, "Avert a fatal crash\n");
+        s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType =
+                ::com::sun::star::lang::XTypeProvider::static_type;
+        s_cd->m_typeEntries[s_cd->m_nTypes-1].m_offset =
+                ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16;
+    }
+    return s_cd;
+}
 
 /** ImplHelper
     @internal


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -r1.671 -r1.672
--- openoffice.org.spec	28 Jun 2006 10:00:55 -0000	1.671
+++ openoffice.org.spec	30 Jun 2006 07:30:47 -0000	1.672
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 15
+%define rh_rpm_release 16
 
 %define build_fc5 1
 
@@ -176,7 +176,7 @@
 Patch48: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
 Patch49: disable-java-applets.diff
 Patch50: sax+source+expatwrap+xml2utf.cxx.diff
-Patch51: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
+Patch51: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -836,7 +836,7 @@
 %patch48 -p1 -b .oooXXXXX.safety.sfx2.patch
 %patch49 -p1 -b .disable-java-applets.diff
 %patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
-%patch51 -p1 -b .ooo66018.idlc.dangerousvisibility.patch
+%patch51 -p1 -b .cppuhelper.dangerousvisibility.patch
 
 
 %if %{includingexternals}
@@ -3283,12 +3283,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.15
+* Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
 - CVE-2006-2198 macro security
 - CVE-2006-2199 java applets
 - CVE-2006-3117 corrupt file format
 - rh#195637# add openoffice.org-2.0.3.ooo65519.printing.samba.patch
-- add openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch to
+- add openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch to
   fix visibility problem
 
 * Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13


--- openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 08:13:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 04:13:59 -0400
Subject: rpms/dosfstools/devel dosfstools.spec,1.25,1.26
Message-ID: <200606300813.k5U8Dxcp029571@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/dosfstools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29516

Modified Files:
	dosfstools.spec 
Log Message:
fix upgrade path (#197231)



Index: dosfstools.spec
===================================================================
RCS file: /cvs/dist/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dosfstools.spec	11 May 2006 09:17:57 -0000	1.25
+++ dosfstools.spec	30 Jun 2006 08:13:56 -0000	1.26
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Version: 2.11
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
@@ -54,6 +54,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jun 30 2006 Peter Vrabec <pvrabec at redhat.com> 2.11-6
+- fix upgrade path (#197231)
+
 * Thu May 11 2006 Peter Vrabec <pvrabec at redhat.com> 2.11-5
 - fix work with disk image files > 4GB (#191198)
 



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:11:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:11:16 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server.spec,1.53,1.54
Message-ID: <200606300911.k5U9BGuu018587@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18536

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.5
- Standardize on using lowercase "fcN" in Release field to denote the OS
  release the package is being built for in all erratum from now on, as this
  is the official Fedora packaging guideline recommended way that the new
  'dist' tag uses:  http://fedoraproject.org/wiki/DistTag. (#197266)
- Remove various rpm spec file macros from the changelog which were
  inadvertently added over time.  (#197281)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-server.spec	27 Jun 2006 12:17:20 -0000	1.53
+++ xorg-x11-server.spec	30 Jun 2006 09:11:01 -0000	1.54
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.FC5.4
+Release:   9.fc5.5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -545,6 +545,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.5
+- Standardize on using lowercase "fcN" in Release field to denote the OS
+  release the package is being built for in all erratum from now on, as this
+  is the official Fedora packaging guideline recommended way that the new
+  'dist' tag uses:  http://fedoraproject.org/wiki/DistTag. (#197266)
+- Remove various rpm spec file macros from the changelog which were
+  inadvertently added over time.  (#197281)
+ 
 * Mon Jun 26 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.4
 - Updated build dependency to require mesa-source-6.4.2-6.FC5.3 minimum for
   DRI enabled builds to fix numerous bug reports on x86_64 including (#190245,
@@ -620,7 +628,7 @@
 - Updated to xserver 1.0.1 from X11R7.0
 
 * Thu Dec 22 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-3
-- Added "Provides: libxf86config-devel = %{version}-%{release}" to sdk package.
+- Added "Provides: libxf86config-devel = %%{version}-%%{release}" to sdk package.
 
 * Wed Dec 21 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-2
 - Added xserver-1.0.0-parser-add-missing-headers-to-sdk.patch to provide the
@@ -743,9 +751,9 @@
 - Invoke make with _smp_mflags to take advantage of SMP systems
 
 * Tue Aug 30 2005 Kristian Hogsberg <krh at redhat.com> 0.99.1-2.cvs20050830
-- Go back to %spec -n, use new cvs snapshot that supports overriding
-  moduledir during make install, use %makeinstall.
-- Drop %{moduledir}/multimedia globs.
+- Go back to %%spec -n, use new cvs snapshot that supports overriding
+  moduledir during make install, use %%makeinstall.
+- Drop %%{moduledir}/multimedia globs.
 
 * Fri Aug 26 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050825.0
 - Added build dependency on xorg-x11-libfontenc-devel, as the build fails



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:20:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:20:26 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.107,1.108
Message-ID: <200606300920.k5U9KQq2003064@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3030

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-25.fc5
- Start using the new %{dist} tag <http://fedoraproject.org/wiki/DistTag>
  experimentally in the package Release field to help prevent problems like
  (#197266) from occuring in the future.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xorg-x11-server.spec	28 Jun 2006 11:43:14 -0000	1.107
+++ xorg-x11-server.spec	30 Jun 2006 09:20:24 -0000	1.108
@@ -4,7 +4,12 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.0
-Release:   24
+# NOTE: Now using the 'dist' tag as per http://fedoraproject.org/wiki/DistTag
+# For rawhide builds, bump the number /before/ the dist tag.  For package
+# upgrades to officially released distribution releases, if the package
+# Version field above is not changing, append and/or bump a digit /after/
+# the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
+Release:   25%{dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -646,6 +651,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-25.fc5
+- Start using the new %%{dist} tag <http://fedoraproject.org/wiki/DistTag>
+  experimentally in the package Release field to help prevent problems like
+  (#197266) from occuring in the future.
+
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com>
 - Disable build dependency on zlib-devel now that we are not uselessly linking
   against it.



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:20:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:20:36 -0400
Subject: rpms/pam/devel pam-0.99.5.0-redhat-modules.patch, NONE,
	1.1 pam-0.99.5.0-selinux-drop-multiple.patch, NONE,
	1.1 .cvsignore, 1.36, 1.37 pam.spec, 1.118, 1.119 sources,
	1.38, 1.39 pam-0.99.2.1-selinux-drop-multiple.patch, 1.1,
	NONE pam-0.99.4.0-console-no-var-access.patch, 1.1,
	NONE pam-0.99.4.0-redhat-modules.patch, 1.1,
	NONE pam-0.99.4.0-timestamp-no-hmactest.patch, 1.1, NONE
Message-ID: <200606300920.k5U9Kao6003138@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3093

Modified Files:
	.cvsignore pam.spec sources 
Added Files:
	pam-0.99.5.0-redhat-modules.patch 
	pam-0.99.5.0-selinux-drop-multiple.patch 
Removed Files:
	pam-0.99.2.1-selinux-drop-multiple.patch 
	pam-0.99.4.0-console-no-var-access.patch 
	pam-0.99.4.0-redhat-modules.patch 
	pam-0.99.4.0-timestamp-no-hmactest.patch 
Log Message:
* Fri Jun 30 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-1
- updated to a new upstream release
- added service as value to be matched and list matching to
  pam_succeed_if


pam-0.99.5.0-redhat-modules.patch:
 configure.in        |    4 ++++
 libpam/libpam.map   |   11 +++++++++++
 modules/Makefile.am |    2 ++
 3 files changed, 17 insertions(+)

--- NEW FILE pam-0.99.5.0-redhat-modules.patch ---
--- Linux-PAM-0.99.5.0/configure.in.redhat-modules	2006-06-28 09:25:02.000000000 +0200
+++ Linux-PAM-0.99.5.0/configure.in	2006-06-30 10:24:35.000000000 +0200
@@ -492,6 +492,10 @@
 	libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
 	po/Makefile.in \
 	modules/Makefile \
+	modules/pam_chroot/Makefile modules/pam_console/Makefile \
+	modules/pam_loginuid/Makefile modules/pam_postgresok/Makefile \
+	modules/pam_rps/Makefile modules/pam_stack/Makefile \
+	modules/pam_timestamp/Makefile modules/pam_tally2/Makefile \
 	modules/pam_access/Makefile modules/pam_cracklib/Makefile \
         modules/pam_debug/Makefile modules/pam_deny/Makefile \
 	modules/pam_echo/Makefile modules/pam_env/Makefile \
--- Linux-PAM-0.99.5.0/libpam/libpam.map.redhat-modules	2006-06-14 13:49:10.000000000 +0200
+++ Linux-PAM-0.99.5.0/libpam/libpam.map	2006-06-30 10:24:35.000000000 +0200
@@ -45,3 +45,14 @@
     pam_modutil_read;
     pam_modutil_write;
 };
+
+LIBPAM_INTERNAL_DONTUSE_1.0 {
+  global:
+    _pam_dispatch;
+    _pam_drop_env;
+    _pam_free_handlers;
+    _pam_init_handlers;
+    _pam_make_env;
+    _pam_start_handlers;
+    _pam_strdup;
+};
--- Linux-PAM-0.99.5.0/modules/Makefile.am.redhat-modules	2006-06-27 16:21:08.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/Makefile.am	2006-06-30 10:27:02.000000000 +0200
@@ -3,6 +3,8 @@
 #
 
 SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
+	pam_chroot pam_console pam_loginuid pam_postgresok pam_rps \
+	pam_stack pam_timestamp pam_tally2 \
 	pam_env pam_filter pam_ftp pam_group pam_issue pam_keyinit \
 	pam_lastlog pam_limits pam_listfile pam_localuser pam_mail \
 	pam_mkhomedir pam_motd pam_nologin pam_permit pam_rhosts pam_rootok \

pam-0.99.5.0-selinux-drop-multiple.patch:
 pam_selinux.8.xml |   12 ----------
 pam_selinux.c     |   64 ++----------------------------------------------------
 2 files changed, 3 insertions(+), 73 deletions(-)

--- NEW FILE pam-0.99.5.0-selinux-drop-multiple.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.8.xml.drop-multiple	2006-06-18 10:26:59.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.8.xml	2006-06-30 10:29:59.000000000 +0200
@@ -93,18 +93,6 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>multiple</option>
-        </term>
-        <listitem>
-          <para>
-            Tells pam_selinux.so to allow the user to  select  the
-            security context  they  will  login  with, if the user has
-            more than one role.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
           <option>open</option>
         </term>
         <listitem>
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c.drop-multiple	2006-06-30 10:28:37.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c	2006-06-30 10:28:37.000000000 +0200
@@ -89,56 +89,6 @@
 }
 
 static security_context_t
-select_context (pam_handle_t *pamh, security_context_t* contextlist,
-		int debug)
-{
-  char *responses;
-  char *text=calloc(PATH_MAX,1);
-
-  if (text == NULL)
-    return (security_context_t) strdup(contextlist[0]);
-
-  snprintf(text, PATH_MAX,
-	   _("Your default context is %s. \n"), contextlist[0]);
-  send_text(pamh,text,debug);
-  free(text);
-  query_response(pamh,_("Do you want to choose a different one? [n]"),
-		 &responses,debug);
-  if (responses && ((responses[0] == 'y') ||
-		    (responses[0] == 'Y')))
-    {
-      int choice=0;
-      int i;
-      const char *prompt=_("Enter number of choice: ");
-      int len=strlen(prompt);
-      char buf[PATH_MAX];
-
-      _pam_drop(responses);
-      for (i = 0; contextlist[i]; i++) {
-	len+=strlen(contextlist[i]) + 10;
-      }
-      text=calloc(len,1);
-      for (i = 0; contextlist[i]; i++) {
-	snprintf(buf, PATH_MAX,
-		 "[%d] %s\n", i+1, contextlist[i]);
-	strncat(text,buf,len);
-      }
-      strcat(text,prompt);
-      while ((choice < 1) || (choice > i)) {
-	query_response(pamh,text,&responses,debug);
-	choice = strtol (responses, NULL, 10);
-	_pam_drop(responses);
-      }
-      free(text);
-      return (security_context_t) strdup(contextlist[choice-1]);
-    }
-  else if (responses)
-    _pam_drop(responses);
-
-  return (security_context_t) strdup(contextlist[0]);
-}
-
-static security_context_t
 manual_context (pam_handle_t *pamh, const char *user, int debug)
 {
   security_context_t newcon;
@@ -321,7 +271,7 @@
 		    int argc, const char **argv)
 {
   int i, debug = 0, ttys=1, has_tty=isatty(0);
-  int verbose=0, multiple=0, close_session=0;
+  int verbose=0, close_session=0;
   int ret = 0;
   security_context_t* contextlist = NULL;
   int num_contexts = 0;
@@ -341,9 +291,6 @@
     if (strcmp(argv[i], "verbose") == 0) {
       verbose = 1;
     }
-    if (strcmp(argv[i], "multiple") == 0) {
-      multiple = 1;
-    }
     if (strcmp(argv[i], "close") == 0) {
       close_session = 1;
     }
@@ -376,13 +323,8 @@
 	  free(level);
   }
   if (num_contexts > 0) {
-    if (multiple && (num_contexts > 1) && has_tty) {
-      user_context = select_context(pamh,contextlist, debug);
-      freeconary(contextlist);
-    } else {
-      user_context = (security_context_t) strdup(contextlist[0]);
-      freeconary(contextlist);
-    }
+    user_context = (security_context_t) strdup(contextlist[0]);
+    freeconary(contextlist);
   } else {
     if (has_tty) {
       user_context = manual_context(pamh,username,debug);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	10 May 2006 14:16:34 -0000	1.36
+++ .cvsignore	30 Jun 2006 09:20:33 -0000	1.37
@@ -1,3 +1,3 @@
 db-4.3.29.tar.gz
-pam-redhat-0.99.5-1.tar.bz2
-Linux-PAM-0.99.4.0.tar.bz2
+Linux-PAM-0.99.5.0.tar.bz2
+pam-redhat-0.99.6-1.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- pam.spec	8 Jun 2006 21:18:21 -0000	1.118
+++ pam.spec	30 Jun 2006 09:20:33 -0000	1.119
@@ -6,12 +6,12 @@
 %define pwdb_version 0.62
 %define db_version 4.3.29
 %define db_conflicting_version 4.4.0
-%define pam_redhat_version 0.99.5-1
+%define pam_redhat_version 0.99.6-1
 
 Summary: A security tool which provides authentication for applications
 Name: pam
-Version: 0.99.4.0
-Release: 5
+Version: 0.99.5.0
+Release: 1%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -24,18 +24,15 @@
 Source8: dlopen.sh
 Source9: system-auth.5
 Source10: config-util.5
-Patch1: pam-0.99.4.0-redhat-modules.patch
+Patch1: pam-0.99.5.0-redhat-modules.patch
 Patch21: pam-0.78-unix-hpux-aging.patch
 Patch28: pam-0.75-sgml2latex.patch
 Patch34: pam-0.99.4.0-dbpam.patch
 Patch70: pam-0.99.2.1-selinux-nofail.patch
-Patch80: pam-0.99.2.1-selinux-drop-multiple.patch
+Patch80: pam-0.99.5.0-selinux-drop-multiple.patch
 Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
 Patch82: pam-0.99.3.0-tally-fail-close.patch
-Patch83: pam-0.99.4.0-tally-large-uid.patch
-Patch84: pam-0.99.4.0-console-no-var-access.patch
-Patch85: pam-0.99.4.0-timestamp-no-hmactest.patch
-Patch90: pam_namespace-10.patch
+Patch83: pam-0.99.4.0-succif-service.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -95,10 +92,7 @@
 %patch80 -p1 -b .drop-multiple
 %patch81 -p1 -b .try-first-pass
 %patch82 -p1 -b .fail-close
-%patch83 -p1 -b .large-uid
-%patch84 -p1 -b .no-var-access
-%patch85 -p1 -b .no-hmactest
-%patch90 -p1 -b .namespace
+%patch83 -p1 -b .service
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -299,6 +293,7 @@
 /%{_lib}/security/pam_ftp.so
 /%{_lib}/security/pam_group.so
 /%{_lib}/security/pam_issue.so
+/%{_lib}/security/pam_keyinit.so
 /%{_lib}/security/pam_lastlog.so
 /%{_lib}/security/pam_limits.so
 /%{_lib}/security/pam_listfile.so
@@ -311,6 +306,7 @@
 /%{_lib}/security/pam_nologin.so
 /%{_lib}/security/pam_permit.so
 /%{_lib}/security/pam_postgresok.so
+/%{_lib}/security/pam_rhosts.so
 /%{_lib}/security/pam_rhosts_auth.so
 /%{_lib}/security/pam_rootok.so
 /%{_lib}/security/pam_rps.so
@@ -363,6 +359,11 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Fri Jun 30 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-1
+- updated to a new upstream release
+- added service as value to be matched and list matching to
+  pam_succeed_if
+
 * Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
 - updated pam_namespace with latest patch by Janak Desai
 - merged pam_namespace patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	10 May 2006 14:16:34 -0000	1.38
+++ sources	30 Jun 2006 09:20:33 -0000	1.39
@@ -1,3 +1,3 @@
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
-e2edde7861c48195728bc531e5a277e0  pam-redhat-0.99.5-1.tar.bz2
-267ea71253615342261f9fc486d06647  Linux-PAM-0.99.4.0.tar.bz2
+dbc8608b2a9bc6b8cf50dd1fbc68cf3b  Linux-PAM-0.99.5.0.tar.bz2
+2dc76a335ddf9e4259aa4e00e5ebaf61  pam-redhat-0.99.6-1.tar.bz2


--- pam-0.99.2.1-selinux-drop-multiple.patch DELETED ---


--- pam-0.99.4.0-console-no-var-access.patch DELETED ---


--- pam-0.99.4.0-redhat-modules.patch DELETED ---


--- pam-0.99.4.0-timestamp-no-hmactest.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:28:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:28:08 -0400
Subject: rpms/pam/devel pam-0.99.4.0-succif-service.patch,NONE,1.1
Message-ID: <200606300928.k5U9S8GQ005753@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5679

Added Files:
	pam-0.99.4.0-succif-service.patch 
Log Message:
- missing patch


pam-0.99.4.0-succif-service.patch:
 pam_succeed_if.8.xml |   27 ++++++++++++++++++++++++++-
 pam_succeed_if.c     |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

--- NEW FILE pam-0.99.4.0-succif-service.patch ---
--- pam/modules/pam_succeed_if/pam_succeed_if.c.service	2006-02-24 20:17:59.000000000 +0100
+++ pam/modules/pam_succeed_if/pam_succeed_if.c	2006-06-29 17:25:25.000000000 +0200
@@ -184,6 +184,27 @@
 {
 	return (fnmatch(right, left, 0) != 0) ? PAM_SUCCESS : PAM_AUTH_ERR;
 }
+/* Check for list match. */
+static int
+evaluate_inlist(const char *left, const char *right)
+{
+	char *p;
+	if ((p=strstr(right, left)) == NULL)
+		return PAM_AUTH_ERR;
+	if (p == right || *(p-1) == ':') { /* ':' is a list separator */
+		p += strlen(left);
+		if (*p == '\0' || *p == ':') {
+		    return PAM_SUCCESS;
+		}
+	}
+	return PAM_AUTH_ERR;
+}
+/* Check for list mismatch. */
+static int
+evaluate_notinlist(const char *left, const char *right)
+{
+	return evaluate_inlist(left, right) != PAM_SUCCESS ? PAM_SUCCESS : PAM_AUTH_ERR;
+}
 /* Return PAM_SUCCESS if the user is in the group. */
 static int
 evaluate_ingroup(pam_handle_t *pamh, const char *user, const char *group)
@@ -250,6 +271,13 @@
 		snprintf(buf, sizeof(buf), "%s", pwd->pw_dir);
 		left = buf;
 	}
+	if (strcasecmp(left, "service") == 0) {
+		const void *svc;
+		if (pam_get_item(pamh, PAM_SERVICE, &svc) != PAM_SUCCESS)
+			svc = "";
+		snprintf(buf, sizeof(buf), "%s", svc);
+		left = buf;
+	}
 	/* If we have no idea what's going on, return an error. */
 	if (left != buf) {
 		pam_syslog(pamh, LOG_CRIT, "unknown attribute \"%s\"", left);
@@ -305,6 +333,13 @@
 	    (strcasecmp(qual, "noglob") == 0)) {
 		return evaluate_noglob(left, right);
 	}
+	/* Attribute value matches item in list. */
+	if (strcasecmp(qual, "in") == 0) {
+		return evaluate_inlist(left, right);
+	}
+	if (strcasecmp(qual, "notin") == 0) {
+		return evaluate_notinlist(left, right);
+	}
 	/* User is in this group. */
 	if (strcasecmp(qual, "ingroup") == 0) {
 		return evaluate_ingroup(pamh, pwd->pw_name, right);
--- pam/modules/pam_succeed_if/pam_succeed_if.8.xml.service	2006-06-27 10:09:27.000000000 +0200
+++ pam/modules/pam_succeed_if/pam_succeed_if.8.xml	2006-06-29 17:11:50.000000000 +0200
@@ -97,7 +97,8 @@
     <para>
       Available fields are <emphasis>user</emphasis>,
       <emphasis>uid</emphasis>, <emphasis>gid</emphasis>,
-      <emphasis>shell</emphasis> and <emphasis>home</emphasis>:
+      <emphasis>shell</emphasis>, <emphasis>home</emphasis>
+      and <emphasis>service</emphasis>:
     </para>
 
     <variablelist>
@@ -176,6 +177,18 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>field in item:item:...</option></term>
+        <listitem>
+          <para>Field is contained in the list of items separated by colons.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>field notin item:item:...</option></term>
+        <listitem>
+          <para>Field is not contained in the list of items separated by colons.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>user ingroup group</option></term>
         <listitem>
           <para>User is in given group.</para>
@@ -187,6 +200,18 @@
           <para>User is not in given group.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>user innetgr netgroup</option></term>
+        <listitem>
+          <para>(user,host) is in given netgroup.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>user notinnetgr group</option></term>
+        <listitem>
+          <para>(user,host) is not in given netgroup.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:31:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:31:44 -0400
Subject: rpms/glibc/devel .cvsignore, 1.156, 1.157 glibc-fedora.patch, 1.160,
	1.161 glibc.spec, 1.246, 1.247 sources, 1.180, 1.181
Message-ID: <200606300931.k5U9Vijg006811@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6773/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-12 on branch devel from glibc-2.4.90-12.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	31 May 2006 15:41:00 -0000	1.156
+++ .cvsignore	30 Jun 2006 09:31:41 -0000	1.157
@@ -1,2 +1,2 @@
-glibc-20060531T1322.tar.bz2
-glibc-fedora-20060531T1322.tar.bz2
+glibc-20060630T0858.tar.bz2
+glibc-fedora-20060630T0858.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- glibc-fedora.patch	31 May 2006 17:21:14 -0000	1.160
+++ glibc-fedora.patch	30 Jun 2006 09:31:41 -0000	1.161
@@ -1,5 +1,5 @@
---- glibc-20060531T1322/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060531T1322-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060630T0858/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060630T0858-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060531T1322/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060531T1322-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060630T0858/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060630T0858-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060531T1322/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060531T1322-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060630T0858/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060630T0858-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060531T1322/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060531T1322-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060630T0858/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060630T0858-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060531T1322/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060531T1322-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060630T0858/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060630T0858-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060531T1322/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060531T1322-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060630T0858/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060630T0858-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060531T1322/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060531T1322-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060630T0858/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060630T0858-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060531T1322/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060531T1322-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060630T0858/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060630T0858-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060531T1322/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060531T1322-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060630T0858/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060630T0858-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060531T1322/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060531T1322-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060630T0858/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060630T0858-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060531T1322/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060630T0858/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20060531T1322/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060630T0858/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20060531T1322/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060531T1322-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060630T0858/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060630T0858-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060531T1322/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060531T1322-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060630T0858/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060630T0858-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060531T1322/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060531T1322-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060630T0858/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060630T0858-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060531T1322/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060531T1322-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060630T0858/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060630T0858-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060531T1322/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060531T1322-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060630T0858/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060630T0858-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060531T1322/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060531T1322-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060630T0858/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060630T0858-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060531T1322/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
-+++ glibc-20060531T1322-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
+--- glibc-20060630T0858/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
++++ glibc-20060630T0858-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
 @@ -76,6 +76,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060531T1322/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060531T1322-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060630T0858/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060630T0858-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060531T1322/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060531T1322-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060630T0858/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060630T0858-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
 @@ -112,8 +112,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060531T1322/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060630T0858/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060531T1322/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060531T1322-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060630T0858/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060630T0858-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060531T1322/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060531T1322-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060630T0858/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060630T0858-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060531T1322/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060531T1322-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060630T0858/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060630T0858-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060531T1322/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060531T1322-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060630T0858/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060630T0858-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060531T1322/nptl/ChangeLog	15 May 2006 20:21:35 -0000	1.897
-+++ glibc-20060531T1322-fedora/nptl/ChangeLog	19 May 2006 16:04:08 -0000	1.706.2.89
-@@ -851,6 +851,15 @@
+--- glibc-20060630T0858/nptl/ChangeLog	4 Jun 2006 23:59:07 -0000	1.898
++++ glibc-20060630T0858-fedora/nptl/ChangeLog	30 Jun 2006 09:16:34 -0000	1.706.2.90
+@@ -855,6 +855,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1587,6 +1596,11 @@
+@@ -1591,6 +1600,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3661,6 +3675,11 @@
+@@ -3665,6 +3679,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060531T1322/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
-+++ glibc-20060531T1322-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
+--- glibc-20060630T0858/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
++++ glibc-20060630T0858-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
 @@ -519,15 +519,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060531T1322/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060531T1322-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060630T0858/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060630T0858-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
 @@ -65,6 +65,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
 @@ -46,6 +46,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060531T1322/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060531T1322-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060531T1322/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060531T1322-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060630T0858/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060630T0858-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060531T1322/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060531T1322-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060630T0858/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060630T0858-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060531T1322/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060531T1322-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060630T0858/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060630T0858-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060531T1322/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060531T1322-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060630T0858/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060630T0858-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060531T1322/posix/Makefile	30 Apr 2006 20:16:28 -0000	1.190
-+++ glibc-20060531T1322-fedora/posix/Makefile	1 May 2006 07:53:45 -0000	1.171.2.18
+--- glibc-20060630T0858/posix/Makefile	4 Jun 2006 04:59:05 -0000	1.191
++++ glibc-20060630T0858-fedora/posix/Makefile	30 Jun 2006 09:16:34 -0000	1.171.2.19
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2547,7 +2547,7 @@
  
  include ../Rules
  
-@@ -281,12 +282,16 @@ bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bu
+@@ -282,12 +283,16 @@ bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bu
  $(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out
  	$(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@
  
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060531T1322/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060630T0858/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060531T1322/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060531T1322-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060630T0858/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060630T0858-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,23 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060531T1322/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060531T1322-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060630T0858/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060630T0858-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+@@ -64,4 +64,12 @@ endif
+ 
+ ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
+ defines += -DNO_TLS_DIRECT_SEG_REFS
++else
++# .a libraries are not performance critical and so we
++# build them without direct TLS segment references
++# always.
++CPPFLAGS-.o += -DNO_TLS_DIRECT_SEG_REFS
++CFLAGS-.o += -mno-tls-direct-seg-refs
++CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
++CFLAGS-.oS += -mno-tls-direct-seg-refs
+ endif
+--- glibc-20060630T0858/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060630T0858-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2618,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060531T1322/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060531T1322-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060630T0858/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060630T0858-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2971,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060531T1322/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060630T0858/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3058,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060531T1322/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060531T1322-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060630T0858/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060630T0858-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
 @@ -41,7 +41,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3074,8 +3089,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
 @@ -18,12 +18,15 @@
     02111-1307 USA.  */
  
@@ -3124,8 +3139,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -3168,8 +3183,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -3179,8 +3194,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -3226,8 +3241,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -3288,8 +3303,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -3322,39 +3337,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20060531T1322/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060531T1322-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- libc/sysdeps/i386/Makefile.jj	2005-03-19 20:11:09.000000000 +0100
-+++ libc/sysdeps/i386/Makefile	2006-05-31 17:25:36.000000000 +0200
-@@ -64,4 +64,12 @@ endif
- 
- ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
- defines += -DNO_TLS_DIRECT_SEG_REFS
-+else
-+# .a libraries are not performance critical and so we
-+# build them without direct TLS segment references
-+# always.
-+CPPFLAGS-.o += -DNO_TLS_DIRECT_SEG_REFS
-+CFLAGS-.o += -mno-tls-direct-seg-refs
-+CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
-+CFLAGS-.oS += -mno-tls-direct-seg-refs
- endif


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- glibc.spec	31 May 2006 15:41:01 -0000	1.246
+++ glibc.spec	30 Jun 2006 09:31:42 -0000	1.247
@@ -1,11 +1,10 @@
-%define glibcdate 20060531T1322
+%define glibcdate 20060630T0858
 %define glibcname glibc
-%define glibcsrcdir glibc-20060531T1322
+%define glibcsrcdir glibc-20060630T0858
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 11
+%define glibcrelease 12
 %define auxarches i586 i686 athlon sparcv9 alphaev6
-%define prelinkarches noarch
 %define xenarches i686 athlon
 %ifarch %{xenarches}
 %define buildxen 1
@@ -46,10 +45,7 @@
 # This is for building auxiliary programs like memusage, nscd
 # For initial glibc bootstraps it can be commented out
 BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.17.10-1
-BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel
-%ifarch %{prelinkarches}
-BuildPreReq: prelink >= 0.2.0-5
-%endif
+BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext
 # This is to ensure that __frame_state_for is exported by glibc
 # will be compatible with egcs 1.x.y
 BuildPreReq: gcc >= 3.2
@@ -725,11 +721,6 @@
 #define __NR_vmsplice		278
 #endif
 %endif
-%ifnarch %{ix86} x86_64
-/* FIXME: Reenable it when the kernel side is more stable.  */
-#undef __NR_newfstatat
-#undef __NR_fstatat64
-%endif
 #endif
 EOF
 cat > override_headers/asm/errno.h <<EOF
@@ -1444,6 +1435,15 @@
 %endif
 
 %changelog
+* Fri Jun 30 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-12
+- buildrequire gettext
+- enable fstatat64/newfstatat syscalls even on ppc*/s390*/ia64 (#196494)
+- fix out of memory behavior in gettext (#194321)
+- fix regex on multi-byte non-UTF-8 charsets (#193873)
+- minor NIS+ fixes (#190803)
+- don't use cancellable calls in posix_spawn* and only set{u,g}id
+  current thread if requested (#193631)
+
 * Wed May 31 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-11
 - don't exit from nscd -i <database> before the database is
   actually invalidated, add locking to prune_cache (#191464)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- sources	31 May 2006 15:41:01 -0000	1.180
+++ sources	30 Jun 2006 09:31:42 -0000	1.181
@@ -1,2 +1,2 @@
-186d768f72d188a54c522d6898e52c6c  glibc-20060531T1322.tar.bz2
-45f1eac6643f9eb0c5698ce819782a9b  glibc-fedora-20060531T1322.tar.bz2
+fa8f2d610bd59e032ad364ca48e7e453  glibc-20060630T0858.tar.bz2
+f3027df3c27c70d10e9769c5bc0dc86a  glibc-fedora-20060630T0858.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:37:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:37:43 -0400
Subject: rpms/pam/devel Linux-PAM-0.99.5.0.tar.bz2.sign, NONE,
	1.1 Linux-PAM-0.99.4.0.tar.bz2.sign, 1.1, NONE
Message-ID: <200606300937.k5U9bhBw008062@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7996

Added Files:
	Linux-PAM-0.99.5.0.tar.bz2.sign 
Removed Files:
	Linux-PAM-0.99.4.0.tar.bz2.sign 
Log Message:
- missing file



--- NEW FILE Linux-PAM-0.99.5.0.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEomKgyGugalF9Dw4RAqVrAJ4wLBL+wR1/jfQXxpN2M5Lg0ynjeQCfTCrF
x0gKMyZk1ABjWdmVsDZtZZk=
=1gjN
-----END PGP SIGNATURE-----


--- Linux-PAM-0.99.4.0.tar.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 09:52:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 05:52:25 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.11,
	1.12 openoffice.org.spec, 1.751, 1.752
Message-ID: <200606300952.k5U9qPp1026678@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26617

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
use no extra dialog on print to pdf stuff

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                      |    0 
 inc/print.hxx                       |    0 
 inc/psprint/ppdparser.hxx           |    0 
 psprint/inc/psprint/ppdparser.hxx   |    2 
 psprint/source/printer/cupsmgr.cxx  |    7 
 source/dialogs/makefile.mk          |    0 
 source/dialogs/printdlg.cxx         |    0 
 source/gdi/jobset.cxx               |    0 
 source/printer/cupsmgr.cxx          |    0 
 svtools/source/dialogs/makefile.mk  |    4 
 svtools/source/dialogs/printdlg.cxx |  311 +++++++++++++++++++++++++++++++++++-
 svtools/util/makefile.mk            |    8 
 util/makefile.mk                    |    0 
 vcl/inc/jobset.hxx                  |    1 
 vcl/inc/print.hxx                   |    1 
 vcl/source/gdi/jobset.cxx           |  173 ++++++++++++++++++++
 16 files changed, 496 insertions(+), 11 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jun 2006 21:06:32 -0000	1.11
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	30 Jun 2006 09:52:23 -0000	1.12
@@ -293,7 +293,7 @@
 diff -u -r1.21 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	8 Sep 2005 15:17:00 -0000	1.21
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	19 May 2006 14:58:56 -0000
-@@ -83,8 +83,37 @@
+@@ -83,9 +83,50 @@
  #include <comphelper/processfactory.hxx>
  #endif
  
@@ -312,6 +312,15 @@
 +#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 +#include <com/sun/star/beans/PropertyValue.hpp>
 +#endif
++#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++#endif
++
++#include <com/sun/star/document/XFilter.hpp>
++#include <com/sun/star/document/XExporter.hpp>
++#include <com/sun/star/io/XOutputStream.hpp>
++#include <unotools/streamwrap.hxx>
++#include <unotools/ucbstreamhelper.hxx>
 +
 +#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
 +#include "miscopt.hxx"
@@ -329,9 +338,13 @@
 +using namespace ::com::sun::star::frame;
 +using namespace ::com::sun::star::beans;
  using namespace com::sun::star::ui::dialogs;
++using namespace com::sun::star::view;
++using namespace com::sun::star::document;
++using namespace com::sun::star::io;
  using namespace rtl;
  
-@@ -606,6 +635,63 @@
+ struct SvtPrinterImpl
+@@ -606,6 +647,106 @@
  
  // -----------------------------------------------------------------------
  
@@ -346,9 +359,9 @@
 +		pPrinter->SetJobCupsKey(String::CreateFromAscii("OutputOrder"), String::CreateFromAscii("Reverse"));
 +}
 +
-+void ExportAsPDF(const rtl::OUString &rFileURL)
++void ExportAsPDF(const rtl::OUString &rFileURL, sal_Bool bCollate, sal_uInt32 nCopies, PrintDialogRange eRange, const OUString &rRange)
 +{
-+	Reference < XFramesSupplier > xDesktop =
++		Reference < XFramesSupplier > xDesktop =
 +                Reference < XFramesSupplier >(
 +        ::comphelper::getProcessServiceFactory()->
 +		createInstance( ASCII_STR("com.sun.star.frame.Desktop") ), UNO_QUERY );
@@ -356,25 +369,68 @@
 +        if ( !xFrame.is() )
 +        	xFrame = Reference < XFrame >( xDesktop, UNO_QUERY );
 +
-+        com::sun::star::util::URL aTargetURL;
-+	aTargetURL.Complete = ASCII_STR(".uno:ExportToPDF");
-+
-+        Reference < com::sun::star::util::XURLTransformer >
-+                xTrans( ::comphelper::getProcessServiceFactory()->
-+                        createInstance( ASCII_STR("com.sun.star.util.URLTransformer") ), UNO_QUERY );
-+        xTrans->parseStrict( aTargetURL );
-+
-+        Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
-+        Reference < XDispatch > xDisp;
-+        xDisp = xProv->queryDispatch(aTargetURL, ::rtl::OUString(), 0);
++        Reference < XFilter >
++                xFilter( ::comphelper::getProcessServiceFactory()->
++                        createInstance( ASCII_STR("com.sun.star.document.PDFFilter") ), UNO_QUERY );
 +
-+        if (xDisp.is())
++        if (xFilter.is())
 +        {
-+                Sequence<PropertyValue> aArgs(1);
-+        	PropertyValue* pArg = aArgs.getArray();
-+	        pArg[0].Name = ASCII_STR("FileName");
-+	        pArg[0].Value <<= rFileURL;
-+	        xDisp->dispatch( aTargetURL, aArgs );
++			Reference< XController > xController;
++			Reference< XComponent > xDoc;
++			if (xFrame.is())
++				xController = xFrame->getController();
++			if (xController.is())
++				xDoc = Reference< XComponent >( xController->getModel(), UNO_QUERY );
++
++			SvFileStream aStream (rFileURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC);
++	        Reference< XOutputStream > xOStm( new utl::OOutputStreamWrapper ( aStream ) );
++
++			Reference< XExporter > xExport(xFilter, UNO_QUERY);
++			xExport->setSourceDocument(xDoc);
++			Sequence<PropertyValue> aFilterData(2);
++			aFilterData[0].Name = ASCII_STR("PageLayout");
++			aFilterData[0].Value <<= sal_Int32(0);
++			aFilterData[1].Name = ASCII_STR("FirstPageOnLeft");
++			aFilterData[1].Value <<= sal_False;
++			switch (eRange)
++			{
++       			case PRINTDIALOG_ALL:
++					break;
++        		case PRINTDIALOG_RANGE:
++					aFilterData.realloc(aFilterData.getLength()+1);
++					aFilterData[aFilterData.getLength()-1].Name = ASCII_STR("PageRange");
++					aFilterData[aFilterData.getLength()-1].Value <<= rRange;
++					break;
++        		case PRINTDIALOG_SELECTION:
++				{
++					Any aSelection;
++					try
++					{
++						if( xController.is() )
++						{
++							Reference< XSelectionSupplier > xView( xController, UNO_QUERY );
++							if( xView.is() )
++								xView->getSelection() >>= aSelection;
++						}
++					}
++					catch( RuntimeException )
++					{
++					}
++					if (aSelection.hasValue())
++					{
++							aFilterData.realloc(aFilterData.getLength()+1);
++							aFilterData[aFilterData.getLength()-1].Name = ASCII_STR("Selection");
++							aFilterData[aFilterData.getLength()-1].Value <<= aSelection;
++					}
++					break;
++				}
++			}
++            Sequence<PropertyValue> aArgs(2);
++			aArgs[0].Name = ASCII_STR("FilterData");
++			aArgs[0].Value <<= aFilterData;
++	        aArgs[1].Name = ASCII_STR("OutputStream");
++	        aArgs[1].Value <<= xOStm;
++	        xFilter->filter( aArgs );
 +        }
 +}
 +
@@ -395,7 +451,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -621,15 +707,166 @@
+@@ -621,15 +762,170 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -455,9 +511,6 @@
 +				break;
 +			    case GTK_RESPONSE_OK:
 +				{
-+				GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(pDialog));
-+				const gchar *pStr = gtk_printer_get_name(pPrinter);
-+				rtl::OUString sNewPrinterName((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
 +				GtkPrintSettings* pSettings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG(pDialog));
 +
 +				rtl::OUString sPath;
@@ -469,6 +522,37 @@
 +						g_free(pFile);
 +					}
 +				}
++				const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
++				if (pStr && !strcmp(pStr, "ranges"))
++				{
++					maRangeText = String();
++					gint num_ranges;
++					const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
++					for (gint i = 0; i < num_ranges; ++i)
++					{
++						maRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
++						if (pRanges[i].start != pRanges[i].end)
++						{
++							maRangeText.AppendAscii("-");
++							maRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
++						}
++						
++						if (i != num_ranges-1)
++							maRangeText.AppendAscii(",");
++					}
++					meCheckRange = PRINTDIALOG_RANGE;
++				}
++				else if (pStr && !strcmp(pStr, "current"))
++				{
++					//FIXME: current != selection
++					meCheckRange = PRINTDIALOG_SELECTION;
++				}
++				else
++					meCheckRange = PRINTDIALOG_ALL;
++
++				SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
++				EnableCollate(gtk_print_settings_get_collate(pSettings));
++
 +				pStr = 0;
 +
 +				if (sPath.getLength())
@@ -479,41 +563,12 @@
 +					gtk_widget_hide( pDialog );
 +					rtl::OUString sFileURL;
 +					FileBase::getFileURLFromSystemPath(sPath, sFileURL);
-+					ExportAsPDF(sFileURL);
++					ExportAsPDF(sFileURL, IsCollateEnabled(), GetCopyCount(), meCheckRange, maRangeText);
 +				}
 +				else
 +				{
 +					nRet = TRUE;
-+
-+					pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
-+					if (pStr && !strcmp(pStr, "ranges"))
-+					{
-+						maRangeText = String();
-+						gint num_ranges;
-+						const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
-+						for (gint i = 0; i < num_ranges; ++i)
-+						{
-+							maRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
-+							if (pRanges[i].start != pRanges[i].end)
-+							{
-+								maRangeText.AppendAscii("-");
-+								maRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
-+							}
-+							
-+							if (i != num_ranges-1)
-+								maRangeText.AppendAscii(",");
-+						}
-+					}
-+					else if (pStr && !strcmp(pStr, "current"))
-+					{
-+						//FIXME: current != selection
-+						meCheckRange = PRINTDIALOG_SELECTION;
-+					}
-+					else
-+						meCheckRange = PRINTDIALOG_ALL;
-+
-+					SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
-+					EnableCollate(gtk_print_settings_get_collate(pSettings));
++					rtl::OUString sNewPrinterName(mpPrinter->GetName());
 +
 +					if (sPath.getLength())
 +					{
@@ -521,6 +576,11 @@
 +						mpPrinter->SetPrintFile(sPath);
 +						sNewPrinterName = ASCII_STR("Generic Printer");
 +					}
++					else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(pDialog)))
++					{
++						pStr = gtk_printer_get_name(pPrinter);
++						sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++					}
 +					
 +					OUString sOldPrinterName(mpPrinter->GetName());
 +					if (sNewPrinterName != sOldPrinterName)
@@ -569,7 +629,7 @@
  	}
  
  	maStatusTimer.Stop();
-@@ -644,4 +881,3 @@
+@@ -644,4 +940,3 @@
  	mpPrinterImpl->m_bHelpDisabled = sal_True;
  	maBtnHelp.Disable();
  }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.751
retrieving revision 1.752
diff -u -r1.751 -r1.752
--- openoffice.org.spec	29 Jun 2006 12:10:18 -0000	1.751
+++ openoffice.org.spec	30 Jun 2006 09:52:23 -0000	1.752
@@ -3321,11 +3321,14 @@
 
 %changelog
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
+- final 2.0.3 version
 - rh#196123# add openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 - add openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch as visibility(?)
   workaround
 - add openoffice.org-2.0.3.rhXXXXXXvcl.annoyingbeeps.patch to *SHUT UP* the
   damn needy msgboxes before I loose control and go kill something cute and fluffy
+- from the gtk print dialog, when printing to pdf, pick some defaults and just do
+  it, don't use the pdf options dialog.
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone



From fedora-cvs-commits at redhat.com  Fri Jun 30 10:06:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 06:06:12 -0400
Subject: rpms/pam/devel pam-0.99.5.0-namespace-init.patch, NONE, 1.1 pam.spec,
	1.119, 1.120
Message-ID: <200606301006.k5UA6C53030763@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30711

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-namespace-init.patch 
Log Message:
- namespace.init was missing from EXTRA_DIST


pam-0.99.5.0-namespace-init.patch:
 namespace.init |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+)

--- NEW FILE pam-0.99.5.0-namespace-init.patch ---
--- /dev/null      2006-06-20 14:49:34.000000000 +0000
+++ pam_namespace0620+patch/modules/pam_namespace/namespace.init        2006-06-20 16:09:48.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+# This is only a boilerplate for the instance initialization script.
+# It receives polydir path as $1 and the instance path as $2.
+#
+# If you intend to polyinstantiate /tmp and you also want to use the X windows
+# environment, you will have to use this script to bind mount the socket that
+# is used by the X server to communicate with its clients. X server places
+# this socket in /tmp/.X11-unix directory, which will get obscured by
+# polyinstantiation. Uncommenting the following lines will bind mount
+# the relevant directory at an alternative location (/.tmp/.X11-unix) such
+# that the X server, window manager and X clients, can still find the
+# socket X0 at the polyinstanted /tmp/.X11-unix.
+#
+#if [ $1 = /tmp ]; then
+#      if [ ! -f /.tmp/.X11-unix ]; then
+#              mkdir -p /.tmp/.X11-unix
+#      fi
+#      mount --bind /tmp/.X11-unix /.tmp/.X11-unix
+#      cp -fp -- /tmp/.X0-lock "$2/.X0-lock"
+#      mkdir -- "$2/.X11-unix"
+#      ln -fs -- /.tmp/.X11-unix/X0 "$2/.X11-unix/X0"
+#fi
+
+exit 0


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- pam.spec	30 Jun 2006 09:20:33 -0000	1.119
+++ pam.spec	30 Jun 2006 10:06:09 -0000	1.120
@@ -33,6 +33,7 @@
 Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
 Patch82: pam-0.99.3.0-tally-fail-close.patch
 Patch83: pam-0.99.4.0-succif-service.patch
+Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -93,6 +94,7 @@
 %patch81 -p1 -b .try-first-pass
 %patch82 -p1 -b .fail-close
 %patch83 -p1 -b .service
+%patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -363,6 +365,7 @@
 - updated to a new upstream release
 - added service as value to be matched and list matching to
   pam_succeed_if
+- namespace.init was missing from EXTRA_DIST
 
 * Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
 - updated pam_namespace with latest patch by Janak Desai



From fedora-cvs-commits at redhat.com  Fri Jun 30 10:41:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 06:41:27 -0400
Subject: rpms/apr-util/FC-5 apr-util.spec,1.25,1.26 sources,1.7,1.8
Message-ID: <200606301041.k5UAfRHQ023020@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr-util/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22988

Modified Files:
	apr-util.spec sources 
Log Message:
* Fri Jun 30 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.1
- update to 1.2.7



Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/FC-5/apr-util.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apr-util.spec	6 Apr 2006 12:38:20 -0000	1.25
+++ apr-util.spec	30 Jun 2006 10:41:25 -0000	1.26
@@ -3,8 +3,8 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.6
-Release: 1
+Version: 1.2.7
+Release: 1.1
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -103,6 +103,9 @@
 %doc --parents html
 
 %changelog
+* Fri Jun 30 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.1
+- update to 1.2.7
+
 * Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-1
 - update to 1.2.6
 - fix LDAP issues on x86_64 (#188073)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr-util/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Apr 2006 12:38:20 -0000	1.7
+++ sources	30 Jun 2006 10:41:25 -0000	1.8
@@ -1 +1 @@
-f8f17dd6bd17926ab2b03767f1f3a1fc  apr-util-1.2.6.tar.gz
+c3702668a640be1695956115857ec22e  apr-util-1.2.7.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 30 11:38:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 07:38:37 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.40,
	1.41
Message-ID: <200606301138.k5UBcb1V012509@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12497

Modified Files:
	system-config-printer.spec 
Log Message:
* Fri Jun 30 2006 Tim Waugh <twaugh at redhat.com>
- Remove foomatic pickle file post-install.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-printer.spec	27 Jun 2006 15:39:21 -0000	1.40
+++ system-config-printer.spec	30 Jun 2006 11:38:34 -0000	1.41
@@ -109,7 +109,14 @@
 %{_sysconfdir}/pam.d/%{name}
 %{_sysconfdir}/security/console.apps/%{name}
 
+%post
+/bin/rm -f /var/cache/foomatic/foomatic.pickle
+exit 0
+
 %changelog
+* Fri Jun 30 2006 Tim Waugh <twaugh at redhat.com>
+- Remove foomatic pickle file post-install.
+
 * Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com> 0.7.18-1
 - 0.7.18.
 - Ship translations with libs subpackage.



From fedora-cvs-commits at redhat.com  Fri Jun 30 12:07:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 08:07:26 -0400
Subject: rpms/kasumi/FC-5 .cvsignore, 1.6, 1.7 kasumi.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200606301207.k5UC7QJd027365@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/kasumi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27352

Modified Files:
	.cvsignore kasumi.spec sources 
Log Message:
* Fri Jun 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1
- New upstream release.
- use dist tag.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kasumi/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 May 2006 03:21:51 -0000	1.6
+++ .cvsignore	30 Jun 2006 12:07:12 -0000	1.7
@@ -6,3 +6,4 @@
 kasumi-0.10.tar.gz
 kasumi-1.0.tar.gz
 kasumi-2.0.tar.gz
+kasumi-2.0.1.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/dist/rpms/kasumi/FC-5/kasumi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kasumi.spec	30 May 2006 03:21:51 -0000	1.14
+++ kasumi.spec	30 Jun 2006 12:07:12 -0000	1.15
@@ -1,11 +1,11 @@
 Name:    kasumi
-Version: 2.0
-Release: 1.fc5
+Version: 2.0.1
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils, gtk2-devel gettext-devel
+BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
 Source0: %{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0:	kasumi-1.0-gcc41.patch
@@ -56,6 +56,13 @@
 
 
 %changelog
+* Fri Jun 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1
+- New upstream release.
+- use dist tag.
+
+* Wed Jun  7 2006 Akira TAGOH <tagoh at redhat.com> - 2.0-2
+- added anthy-devel, automake and autoconf to BuildReq. (#194121)
+
 * Tue May 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kasumi/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 May 2006 03:21:51 -0000	1.5
+++ sources	30 Jun 2006 12:07:12 -0000	1.6
@@ -1 +1,2 @@
 f2b080cbea0bac90fadcc8cfcc500460  kasumi-2.0.tar.gz
+03c03a261c63d2c8cd4bdcc77a55d7eb  kasumi-2.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 30 12:19:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 08:19:43 -0400
Subject: rpms/quota/FC-5 quota.spec,1.26,1.27
Message-ID: <200606301219.k5UCJhCo023446@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/quota/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23392

Modified Files:
	quota.spec 
Log Message:
fix 192826 - quota config files should not be overwritten



Index: quota.spec
===================================================================
RCS file: /cvs/dist/rpms/quota/FC-5/quota.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- quota.spec	11 Feb 2006 05:26:47 -0000	1.26
+++ quota.spec	30 Jun 2006 12:19:40 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
 Version: 3.13
-Release: 1.2.1
+Release: 1.2.2
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -64,6 +64,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/warnquota.conf
+%config(noreplace) %{_sysconfdir}/quotatab
+%config(noreplace) %{_sysconfdir}/quotagrpadmins
 %attr(0644,root,root) %{_sysconfdir}/*
 %attr(0755,root,root) /sbin/*
 %attr(0755,root,root) %{_bindir}/*
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Fri Jun 30 2006 Steve Dickson <steved at redhat.com> - 1:3.13-1.2.2
+- fix 192826 - quota config files should not be overwritten 
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.13-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Jun 30 12:22:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 08:22:33 -0400
Subject: rpms/quota/devel quota.spec,1.26,1.27
Message-ID: <200606301222.k5UCMXFY024579@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/quota/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24512

Modified Files:
	quota.spec 
Log Message:
fix 192826 - quota config files should not be overwritten



Index: quota.spec
===================================================================
RCS file: /cvs/dist/rpms/quota/devel/quota.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- quota.spec	11 Feb 2006 05:26:47 -0000	1.26
+++ quota.spec	30 Jun 2006 12:22:30 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
 Version: 3.13
-Release: 1.2.1
+Release: 1.2.3
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -64,6 +64,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/warnquota.conf
+%config(noreplace) %{_sysconfdir}/quotatab
+%config(noreplace) %{_sysconfdir}/quotagrpadmins
 %attr(0644,root,root) %{_sysconfdir}/*
 %attr(0755,root,root) /sbin/*
 %attr(0755,root,root) %{_bindir}/*
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Fri Jun 30 2006 Steve Dickson <steved at redhat.com> - 1:3.13-1.2.3
+- fix 192826 - quota config files should not be overwritten
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.13-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Jun 30 12:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 08:56:18 -0400
Subject: rpms/system-config-soundcard/devel .cvsignore, 1.11, 1.12 sources,
	1.14, 1.15 system-config-soundcard.spec, 1.39,
	1.40 system-config-soundcard-1.2.17-log.patch, 1.1,
	NONE system-config-soundcard-1.2.17-ok-button.patch, 1.1,
	NONE system-config-soundcard-1.2.17-save.patch, 1.1,
	NONE system-config-soundcard-1.2.17-switch.patch, 1.1,
	NONE system-config-soundcard-1.2.17-volume.patch, 1.1, NONE
Message-ID: <200606301256.k5UCuIZR017834@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17796

Modified Files:
	.cvsignore sources system-config-soundcard.spec 
Removed Files:
	system-config-soundcard-1.2.17-log.patch 
	system-config-soundcard-1.2.17-ok-button.patch 
	system-config-soundcard-1.2.17-save.patch 
	system-config-soundcard-1.2.17-switch.patch 
	system-config-soundcard-1.2.17-volume.patch 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Mar 2006 11:38:00 -0000	1.11
+++ .cvsignore	30 Jun 2006 12:56:15 -0000	1.12
@@ -5,3 +5,4 @@
 system-config-soundcard-1.2.14.tar.bz2
 system-config-soundcard-1.2.16.tar.bz2
 system-config-soundcard-1.2.17.tar.bz2
+system-config-soundcard-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Mar 2006 11:50:31 -0000	1.14
+++ sources	30 Jun 2006 12:56:15 -0000	1.15
@@ -1 +1 @@
-3c7aaa5f50254c6393a0aa8267871a23  system-config-soundcard-1.2.17.tar.bz2
+0fed96e5d778c8290d525d2956c69fb2  system-config-soundcard-2.0.0.tar.bz2


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-soundcard.spec	6 Jun 2006 02:56:36 -0000	1.39
+++ system-config-soundcard.spec	30 Jun 2006 12:56:15 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
-Version: 1.2.17
-Release: 6
+Version: 2.0.0
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -9,11 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
-Patch0: system-config-soundcard-1.2.17-switch.patch
-Patch1: system-config-soundcard-1.2.17-ok-button.patch
-Patch2: system-config-soundcard-1.2.17-save.patch
-Patch3: system-config-soundcard-1.2.17-volume.patch
-Patch4: system-config-soundcard-1.2.17-log.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -36,11 +31,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 make
@@ -92,10 +82,12 @@
 %attr(0644,root,root) %config /etc/security/console.apps/system-config-soundcard
 %attr(0644,root,root) %config /etc/pam.d/system-config-soundcard
 %attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.logger
-%attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.play
 %ghost /root/scsound.log
 
 %changelog
+* Thu Jun 30 2006 Martin Stransky <stransky at redhat.com> 2.0.0-1
+- new upstream
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.2.17-6
 - Added missing BuildRequires intltool
 - Added Requires(post) and (postun) on gtk2


--- system-config-soundcard-1.2.17-log.patch DELETED ---


--- system-config-soundcard-1.2.17-ok-button.patch DELETED ---


--- system-config-soundcard-1.2.17-save.patch DELETED ---


--- system-config-soundcard-1.2.17-switch.patch DELETED ---


--- system-config-soundcard-1.2.17-volume.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 13:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 09:19:25 -0400
Subject: rpms/scim-chewing/devel scim-chewing.spec,1.17,1.18
Message-ID: <200606301319.k5UDJPME005805@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2221

Modified Files:
	scim-chewing.spec 
Log Message:
Adding version-release tag(s) in the changelog



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scim-chewing.spec	26 Jun 2006 06:06:28 -0000	1.17
+++ scim-chewing.spec	30 Jun 2006 13:19:22 -0000	1.18
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Mon Jun 26 2006 Darshan Santani <dsantani at redhat.com> 
+* Mon Jun 26 2006 Darshan Santani <dsantani at redhat.com> - 0.3.1-2
 - Add scim-chewing-LTC23919-191957.patch by Shoji Sugiyama [IBM Japan]  (#191957)
 
 * Fri Jun 16 2006 Darshan Santani <dsantani at redhat.com> 



From fedora-cvs-commits at redhat.com  Fri Jun 30 13:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 09:22:19 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.0.8-nfsd-ports.patch, NONE,
	1.1 nfs-utils-1.0.8-nfsd-vers.patch, NONE, 1.1 nfs-utils.spec,
	1.93, 1.94 nfs-utils-1.0.7-nfsd-ctlbits.patch, 1.2, NONE
Message-ID: <200606301322.k5UDMJQO006547@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6455

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.8-nfsd-ports.patch 
	nfs-utils-1.0.8-nfsd-vers.patch 
Removed Files:
	nfs-utils-1.0.7-nfsd-ctlbits.patch 
Log Message:
Split the controlling of nfs version, ports, and protocol into 
two different patches


nfs-utils-1.0.8-nfsd-ports.patch:
 support/include/nfs/nfs.h |    4 ++++
 support/include/nfslib.h  |    2 +-
 support/nfs/nfssvc.c      |   27 ++++++++++++++++++++++++++-
 utils/nfsd/nfsd.c         |   25 ++++++++++++++++++++++---
 utils/nfsd/nfsd.man       |   10 ++++++++++
 5 files changed, 63 insertions(+), 5 deletions(-)

--- NEW FILE nfs-utils-1.0.8-nfsd-ports.patch ---
--- nfs-utils-1.0.8/support/include/nfs/nfs.h.ports	2006-06-30 08:52:33.000000000 -0400
+++ nfs-utils-1.0.8/support/include/nfs/nfs.h	2006-06-30 08:53:26.000000000 -0400
@@ -44,8 +44,12 @@ struct nfs_fh_old {
 #define LOCKDCTL_SVC		NFSCTL_LOCKD
 
 #define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1))) 
+#define NFSCTL_UDPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (17 - 1))) 
+#define NFSCTL_TCPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (18 - 1))) 
 
 #define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1))) 
+#define NFSCTL_UDPISSET(_cltbits)     ((_cltbits) & (1 << (17 - 1))) 
+#define NFSCTL_TCPISSET(_cltbits)     ((_cltbits) & (1 << (18 - 1))) 
 
 #define NFSCTL_ALLBITS (~0)
 
--- nfs-utils-1.0.8/support/include/nfslib.h.ports	2006-06-30 08:52:33.000000000 -0400
+++ nfs-utils-1.0.8/support/include/nfslib.h	2006-06-30 08:53:26.000000000 -0400
@@ -120,7 +120,7 @@ int			wildmat(char *text, char *pattern)
  * nfsd library functions.
  */
 int			nfsctl(int, struct nfsctl_arg *, union nfsctl_res *);
-int			nfssvc(int port, int nrservs, unsigned int versbits);
+int			nfssvc(int port, int nrservs, unsigned int versbits, unsigned int portbits);
 int			nfsaddclient(struct nfsctl_client *clp);
 int			nfsdelclient(struct nfsctl_client *clp);
 int			nfsexport(struct nfsctl_export *exp);
--- nfs-utils-1.0.8/support/nfs/nfssvc.c.ports	2006-06-30 08:52:33.000000000 -0400
+++ nfs-utils-1.0.8/support/nfs/nfssvc.c	2006-06-30 08:53:26.000000000 -0400
@@ -18,6 +18,29 @@
 #include "nfslib.h"
 
 static void
+nfssvc_portbits(int port, unsigned int ctlbits)
+{
+	int fd, n;
+	char buf[BUFSIZ], *udp, *tcp;
+
+	fd = open("/proc/fs/nfsd/ports", O_WRONLY);
+	if (fd < 0)
+		return;
+
+	udp = NFSCTL_UDPISSET(ctlbits) ? "udp" : "noudp" ;
+	tcp = NFSCTL_TCPISSET(ctlbits) ? "tcp" : "notcp" ;
+
+	snprintf(buf, BUFSIZ,"ipv4 %s %s * %d\n", udp, tcp, port); 
+	if (write(fd, buf, strlen(buf)) != strlen(buf)) {
+	    syslog(LOG_ERR, 
+		"nfssvc: Setting UDP protocol failed: errno %d (%s)", 
+		errno, strerror(errno));
+	}
+	close(fd);
+
+	return;
+}
+static void
 nfssvc_versbits(unsigned int ctlbits)
 {
 	int fd, n, off;
@@ -45,11 +68,13 @@ nfssvc_versbits(unsigned int ctlbits)
 	return;
 }
 int
-nfssvc(int port, int nrservs, unsigned int versbits)
+nfssvc(int port, int nrservs, unsigned int versbits, unsigned portbits)
 {
 	struct nfsctl_arg	arg;
 	int fd;
 
+	nfssvc_portbits(port, portbits);
+
 	nfssvc_versbits(versbits);
 
 	fd = open("/proc/fs/nfsd/threads", O_WRONLY);
--- nfs-utils-1.0.8/utils/nfsd/nfsd.c.ports	2006-06-30 08:52:33.000000000 -0400
+++ nfs-utils-1.0.8/utils/nfsd/nfsd.c	2006-06-30 08:54:06.000000000 -0400
@@ -28,8 +28,13 @@ static struct option longopts[] =
 {
 	{ "help", 0, 0, 'h' },
 	{ "no-nfs-version", 1, 0, 'N' },
+	{ "no-tcp", 0, 0, 'T' },
+	{ "no-udp", 0, 0, 'U' },
+	{ "port", 1, 0, 'P' },
+	{ "port", 1, 0, 'p' },
 	{ NULL, 0, 0, 0 }
 };
+unsigned int portbits = NFSCTL_ALLBITS;
 unsigned int versbits = NFSCTL_ALLBITS;
 
 int
@@ -44,7 +49,7 @@ main(int argc, char **argv)
 	else
 		port = 2049;
 
-	while ((c = getopt_long(argc, argv, "hN:p:P:", longopts, NULL)) != EOF) {
+	while ((c = getopt_long(argc, argv, "hN:p:P:TU", longopts, NULL)) != EOF) {
 		switch(c) {
 		case 'P':	/* XXX for nfs-server compatibility */
 		case 'p':
@@ -67,6 +72,12 @@ main(int argc, char **argv)
 				exit(1);
 			}
 			break;
+		case 'T':
+				NFSCTL_TCPUNSET(portbits);
+				break;
+		case 'U':
+				NFSCTL_UDPUNSET(portbits);
+				break;
 		default:
 			fprintf(stderr, "Invalid argument: '%c'\n", c);
 		case 'h':
@@ -76,6 +87,10 @@ main(int argc, char **argv)
 	/*
 	 * Do some sanity checking, if the ctlbits are set
 	 */
+	if (!NFSCTL_UDPISSET(portbits) && !NFSCTL_TCPISSET(portbits)) {
+		fprintf(stderr, "invalid protocol specified\n");
+		exit(1);
+	}
 	found_one = 0;
 	for (c = NFSD_MINVERS; c <= NFSD_MAXVERS; c++) {
 		if (NFSCTL_VERISSET(versbits, c))
@@ -85,6 +100,10 @@ main(int argc, char **argv)
 		fprintf(stderr, "no version specified\n");
 		exit(1);
 	}			
+	if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(versbits)) {
+		fprintf(stderr, "version 4 requires the TCP protocol\n");
+		exit(1);
+	}
 
 	if (chdir(NFS_STATEDIR)) {
 		fprintf(stderr, "%s: chdir(%s) failed: %s\n",
@@ -116,7 +135,7 @@ main(int argc, char **argv)
 	closeall(3);
 
 	openlog("nfsd", LOG_PID, LOG_DAEMON);
-	if ((error = nfssvc(port, count, versbits)) < 0) {
+	if ((error = nfssvc(port, count, versbits, portbits)) < 0) {
 		int e = errno;
 		syslog(LOG_ERR, "nfssvc: %s", strerror(e));
 		closelog();
@@ -129,7 +148,7 @@ static void
 usage(const char *prog)
 {
 	fprintf(stderr, "Usage:\n"
-		"%s [-p|-P|--port] [-N|--no-nfs-version] nrservs\n", 
+		"%s [-p|-P|--port] [-N|--no-nfs-version] [-T|--no-tcp] [-U|--no-udp] nrservs\n",
 		prog);
 	exit(2);
 }
--- nfs-utils-1.0.8/utils/nfsd/nfsd.man.ports	2006-06-30 08:52:33.000000000 -0400
+++ nfs-utils-1.0.8/utils/nfsd/nfsd.man	2006-06-30 08:53:26.000000000 -0400
@@ -34,6 +34,16 @@ does not offer certain versions of NFS. 
 .B rpc.nfsd
 can support both NFS version 2,3 and the newer version 4.
 .TP
+.B \-T " or " \-\-no-tcp
+Disable 
+.B rpc.nfsd 
+from accepting TCP connections from clients.
+.TP
+.B \-U " or " \-\-no-udp
+Disable
+.B rpc.nfsd
+from accepting UDP connections from clients.
+.TP
 .I nproc
 specify the number of NFS server threads. By default, just one
 thread is started. However, for optimum performance several threads

nfs-utils-1.0.8-nfsd-vers.patch:
 support/include/nfs/nfs.h |    7 ++++++
 support/include/nfslib.h  |    2 -
 support/nfs/nfssvc.c      |   33 ++++++++++++++++++++++++++++++-
 utils/nfsd/nfsd.c         |   48 ++++++++++++++++++++++++++++++++++++++--------
 utils/nfsd/nfsd.man       |   11 ++++++++--
 5 files changed, 89 insertions(+), 12 deletions(-)

--- NEW FILE nfs-utils-1.0.8-nfsd-vers.patch ---
--- nfs-utils/support/include/nfs/nfs.h.nfsvers	2006-06-23 07:14:58.000000000 -0400
+++ nfs-utils/support/include/nfs/nfs.h	2006-06-24 11:43:04.000000000 -0400
@@ -10,6 +10,9 @@
 #define	NFS3_FHSIZE	64
 #define	NFS_FHSIZE	32
 
+#define NFSD_MINVERS 2
+#define NFSD_MAXVERS 4
+
 struct nfs_fh_len {
 	int		fh_size;
 	u_int8_t	fh_handle[NFS3_FHSIZE];
@@ -40,7 +43,11 @@ struct nfs_fh_old {
 #define NFSCTL_LOCKD		0x10000
 #define LOCKDCTL_SVC		NFSCTL_LOCKD
 
+#define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1))) 
+
+#define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1))) 
 
+#define NFSCTL_ALLBITS (~0)
 
 /* SVC */
 struct nfsctl_svc {
--- nfs-utils/support/include/nfslib.h.nfsvers	2006-06-23 07:14:58.000000000 -0400
+++ nfs-utils/support/include/nfslib.h	2006-06-24 11:43:46.000000000 -0400
@@ -120,7 +120,7 @@ int			wildmat(char *text, char *pattern)
  * nfsd library functions.
  */
 int			nfsctl(int, struct nfsctl_arg *, union nfsctl_res *);
-int			nfssvc(int port, int nrservs);
+int			nfssvc(int port, int nrservs, unsigned int versbits);
 int			nfsaddclient(struct nfsctl_client *clp);
 int			nfsdelclient(struct nfsctl_client *clp);
 int			nfsexport(struct nfsctl_export *exp);
--- nfs-utils/support/nfs/nfssvc.c.nfsvers	2006-06-23 07:14:58.000000000 -0400
+++ nfs-utils/support/nfs/nfssvc.c	2006-06-24 11:45:18.000000000 -0400
@@ -12,15 +12,46 @@
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <syslog.h>
 
 #include "nfslib.h"
 
+static void
+nfssvc_versbits(unsigned int ctlbits)
+{
+	int fd, n, off;
+	char buf[BUFSIZ], *ptr;
+
+	ptr = buf;
+	off = 0;
+	fd = open("/proc/fs/nfsd/versions", O_WRONLY);
+	if (fd < 0)
+		return;
+
+	for (n = NFSD_MINVERS; n <= NFSD_MAXVERS; n++) {
+		if (NFSCTL_VERISSET(ctlbits, n))
+		    off += snprintf(ptr+off, BUFSIZ - off, "+%d ", n);
+		else
+		    off += snprintf(ptr+off, BUFSIZ - off, "-%d ", n);
+	}
+	snprintf(ptr+off, BUFSIZ - off, "\n");
+	if (write(fd, buf, strlen(buf)) != strlen(buf)) {
+		syslog(LOG_ERR, "nfssvc: Setting version failed: errno %d (%s)", 
+			errno, strerror(errno));
+	}
+	close(fd);
+
+	return;
+}
 int
-nfssvc(int port, int nrservs)
+nfssvc(int port, int nrservs, unsigned int versbits)
 {
 	struct nfsctl_arg	arg;
 	int fd;
 
+	nfssvc_versbits(versbits);
+
 	fd = open("/proc/fs/nfsd/threads", O_WRONLY);
 	if (fd < 0)
 		fd = open("/proc/fs/nfs/threads", O_WRONLY);
--- nfs-utils/utils/nfsd/nfsd.c.nfsvers	2006-06-23 07:14:58.000000000 -0400
+++ nfs-utils/utils/nfsd/nfsd.c	2006-06-24 11:51:02.000000000 -0400
@@ -24,10 +24,18 @@
 
 static void	usage(const char *);
 
+static struct option longopts[] =
+{
+	{ "help", 0, 0, 'h' },
+	{ "no-nfs-version", 1, 0, 'N' },
+	{ NULL, 0, 0, 0 }
+};
+unsigned int versbits = NFSCTL_ALLBITS;
+
 int
 main(int argc, char **argv)
 {
-	int	count = 1, c, error, port, fd;
+	int	count = 1, c, error, port, fd, found_one;
 	struct servent *ent;
 
 	ent = getservbyname ("nfs", "udp");
@@ -36,7 +44,7 @@ main(int argc, char **argv)
 	else
 		port = 2049;
 
-	while ((c = getopt(argc, argv, "hp:P:")) != EOF) {
+	while ((c = getopt_long(argc, argv, "hN:p:P:", longopts, NULL)) != EOF) {
 		switch(c) {
 		case 'P':	/* XXX for nfs-server compatibility */
 		case 'p':
@@ -47,12 +55,36 @@ main(int argc, char **argv)
 				usage(argv [0]);
 			}
 			break;
+		case 'N':
+			switch((c = atoi(optarg))) {
+			case 2:
+			case 3:
+			case 4:
+				NFSCTL_VERUNSET(versbits, c);
+				break;
+			default:
+				fprintf(stderr, "%c: Unsupported version\n", c);
+				exit(1);
+			}
 			break;
-		case 'h':
 		default:
+			fprintf(stderr, "Invalid argument: '%c'\n", c);
+		case 'h':
 			usage(argv[0]);
 		}
 	}
+	/*
+	 * Do some sanity checking, if the ctlbits are set
+	 */
+	found_one = 0;
+	for (c = NFSD_MINVERS; c <= NFSD_MAXVERS; c++) {
+		if (NFSCTL_VERISSET(versbits, c))
+			found_one = 1;
+	}
+	if (!found_one) {
+		fprintf(stderr, "no version specified\n");
+		exit(1);
+	}			
 
 	if (chdir(NFS_STATEDIR)) {
 		fprintf(stderr, "%s: chdir(%s) failed: %s\n",
@@ -69,7 +101,6 @@ main(int argc, char **argv)
 			count = 1;
 		}
 	}
-
 	/* KLUDGE ALERT:
 	   Some kernels let nfsd kernel threads inherit open files
 	   from the program that spawns them (i.e. us).  So close
@@ -84,9 +115,9 @@ main(int argc, char **argv)
 	}
 	closeall(3);
 
-	if ((error = nfssvc(port, count)) < 0) {
+	openlog("nfsd", LOG_PID, LOG_DAEMON);
+	if ((error = nfssvc(port, count, versbits)) < 0) {
 		int e = errno;
-		openlog("nfsd", LOG_PID, LOG_DAEMON);
 		syslog(LOG_ERR, "nfssvc: %s", strerror(e));
 		closelog();
 	}
@@ -97,7 +128,8 @@ main(int argc, char **argv)
 static void
 usage(const char *prog)
 {
-	fprintf(stderr, "usage:\n"
-			"%s nrservs\n", prog);
+	fprintf(stderr, "Usage:\n"
+		"%s [-p|-P|--port] [-N|--no-nfs-version] nrservs\n", 
+		prog);
 	exit(2);
 }
--- nfs-utils/utils/nfsd/nfsd.man.nfsvers	2006-06-23 07:14:58.000000000 -0400
+++ nfs-utils/utils/nfsd/nfsd.man	2006-06-24 12:01:06.000000000 -0400
@@ -6,7 +6,7 @@
 .SH NAME
 rpc.nfsd \- NFS server process
 .SH SYNOPSIS
-.BI "/usr/sbin/rpc.nfsd [-p " port "] " nproc
+.BI "/usr/sbin/rpc.nfsd [" options "]" " "nproc
 .SH DESCRIPTION
 The
 .B rpc.nfsd
@@ -22,11 +22,18 @@ server provides an ancillary service nee
 by NFS clients.
 .SH OPTIONS
 .TP
-.BI \-p " port"
+.B \-p " or " \-\-port  port
 specify a diferent port to listen on for NFS requests. By default,
 .B rpc.nfsd
 will listen on port 2049.
 .TP
+.B \-N " or " \-\-no-nfs-version vers
+This option can be used to request that 
+.B rpc.nfsd
+does not offer certain versions of NFS. The current version of
+.B rpc.nfsd
+can support both NFS version 2,3 and the newer version 4.
+.TP
 .I nproc
 specify the number of NFS server threads. By default, just one
 thread is started. However, for optimum performance several threads


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- nfs-utils.spec	21 Jun 2006 10:55:59 -0000	1.93
+++ nfs-utils.spec	30 Jun 2006 13:22:16 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8
-Release: 2
+Release: 3
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -18,7 +18,8 @@
 Patch50: nfs-utils-1.0.5-statdpath.patch
 Patch51: nfs-utils-1.0.6-mountd.patch
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
-Patch53: nfs-utils-1.0.7-nfsd-ctlbits.patch
+Patch53: nfs-utils-1.0.8-nfsd-vers.patch
+Patch54: nfs-utils-1.0.8-nfsd-ports.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -58,13 +59,14 @@
 
 %prep
 %setup -q
-%patch50 -p1 -b .statdpath
-%patch51 -p1 -b .mountd
-%patch52 -p1 -b .conf
-%patch53 -p1 -b .ctlbits
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
 
 # Do the magic to get things to compile
-%patch100 -p1 -b .compile
+%patch100 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -216,6 +218,10 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Fri Jun 30 2006 <SteveD at RedHat.com> 1.0.8-3
+- Split the controlling of nfs version, ports, and protocol 
+  into two different patches
+
 * Wed Jun 21 2006 <SteveD at RedHat.com> 1.0.8-2
 - Updated to nfs-utils-1.0.8
 


--- nfs-utils-1.0.7-nfsd-ctlbits.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 13:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 09:47:02 -0400
Subject: rpms/rpm/devel rpm-4.4.2-ia32e-install.patch,NONE,1.1
Message-ID: <200606301347.k5UDl2eV018599@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16422

Added Files:
	rpm-4.4.2-ia32e-install.patch 
Log Message:
add ia32e dir on build for macros


rpm-4.4.2-ia32e-install.patch:
 installplatform |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE rpm-4.4.2-ia32e-install.patch ---
--- rpm-4.4.2/installplatform.ia32e	2006-04-27 11:30:58.000000000 -0400
+++ rpm-4.4.2/installplatform	2006-04-27 11:28:37.000000000 -0400
@@ -35,6 +35,7 @@
   sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
   powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
   s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
+  x86_64|amd64|ia32e) SUBSTS='s_x86_64_ia32e_ s_x86_64_amd64_' ;;
   *) SUBSTS=y___ ;;
 esac
 



From fedora-cvs-commits at redhat.com  Fri Jun 30 14:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 10:18:00 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.0.6-gssd_mixed_case.patch, NONE,
	1.1 nfs-utils-1.0.8-mountd-debug.patch, NONE,
	1.1 nfs-utils-1.0.8-privports.patch, NONE, 1.1 nfs-utils.spec,
	1.94, 1.95 nfs.init, 1.20, 1.21 nfslock.init, 1.12, 1.13
Message-ID: <200606301418.k5UEI08T003830@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1695

Modified Files:
	nfs-utils.spec nfs.init nfslock.init 
Added Files:
	nfs-utils-1.0.6-gssd_mixed_case.patch 
	nfs-utils-1.0.8-mountd-debug.patch 
	nfs-utils-1.0.8-privports.patch 
Log Message:
Forward ported the following:

- Fixed and added debugging statements to rpc.mountd.
- Fixed -p arg to work with priviledged ports (bz 156655)
- Changed nfslock initscript to set LOCKD_TCPPORT and
  LOCKD_UDPPORT (bz 162133)
- Added MOUNTD_NFS_V1 variable to version 1 of the
  mount protocol can be turned off. (bz 175729)
- Fixed gssd to handel mixed case characters in
  the domainname. (bz 186069)


nfs-utils-1.0.6-gssd_mixed_case.patch:
 gssd_proc.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE nfs-utils-1.0.6-gssd_mixed_case.patch ---
--- nfs-utils-1.0.6/utils/gssd/gssd_proc.c.gssd	2006-03-02 14:36:10.000000000 -0500
+++ nfs-utils-1.0.6/utils/gssd/gssd_proc.c	2006-03-02 14:38:47.000000000 -0500
@@ -53,6 +53,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <string.h>
+#include <ctype.h>
 #include <dirent.h>
 #include <poll.h>
 #include <fcntl.h>
@@ -115,6 +116,7 @@ read_service_info(char *info_file_name, 
 	int		fd = -1;
 	struct hostent	*ent = NULL;
 	int		numfields;
+	char		*s;
 
 	*servicename = *servername = *protocol = NULL;
 
@@ -155,6 +157,12 @@ read_service_info(char *info_file_name, 
 		printerr(0, "ERROR: can't resolve server %s name\n", address);
 		goto fail;
 	}
+
+	/* don't allow mixed-case names to rain on our parade */
+	for (s = ent->h_name; s && *s; s++) {
+		*s = tolower((int)*s);
+	}
+
 	if (!(*servername = calloc(strlen(ent->h_name) + 1, 1)))
 		goto fail;
 	memcpy(*servername, ent->h_name, strlen(ent->h_name));

nfs-utils-1.0.8-mountd-debug.patch:
 mountd.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

--- NEW FILE nfs-utils-1.0.8-mountd-debug.patch ---
--- nfs-utils-1.0.8/utils/mountd/mountd.c.orig	2005-12-19 23:12:47.000000000 -0500
+++ nfs-utils-1.0.8/utils/mountd/mountd.c	2006-06-30 09:33:10.000000000 -0400
@@ -87,15 +87,21 @@ sig_hup (int sig)
 bool_t
 mount_null_1_svc(struct svc_req *rqstp, void *argp, void *resp)
 {
+	struct sockaddr_in *addr =
+		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
+
+	xlog(D_CALL, "NULL1(%s) called", inet_ntoa(addr->sin_addr));
 	return 1;
 }
 
 bool_t
 mount_mnt_1_svc(struct svc_req *rqstp, dirpath *path, fhstatus *res)
 {
+	struct sockaddr_in *addr =
+		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
 	struct nfs_fh_len *fh;
 
-	xlog(D_CALL, "MNT1(%s) called", *path);
+	xlog(D_CALL, "MNT1(%s:%s) called", inet_ntoa(addr->sin_addr), *path);
 	if ((fh = get_rootfh(rqstp, path, &res->fhs_status, 0)) != NULL)
 		memcpy(&res->fhstatus_u.fhs_fhandle, fh->fh_handle, 32);
 	return 1;
@@ -107,6 +113,7 @@ mount_dump_1_svc(struct svc_req *rqstp, 
 	struct sockaddr_in *addr =
 		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
 
+	xlog(D_CALL, "DUMP1(%s) called", inet_ntoa(addr->sin_addr));
 	if ((*res = mountlist_list()) == NULL)
 		xlog(L_WARNING, "dump request from %s failed.",
 			inet_ntoa(addr->sin_addr));
@@ -131,6 +138,7 @@ mount_umnt_1_svc(struct svc_req *rqstp, 
 		p = rpath;
 	}
 
+	xlog(D_CALL, "UMNT1(%s:%s) called", inet_ntoa(sin->sin_addr), p);
 	if (!(exp = auth_authenticate("unmount", sin, p))) {
 		return 1;
 	}
@@ -148,6 +156,10 @@ mount_umnt_1_svc(struct svc_req *rqstp, 
 bool_t
 mount_umntall_1_svc(struct svc_req *rqstp, void *argp, void *resp)
 {
+	struct sockaddr_in *sin =
+		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
+
+	xlog(D_CALL, "UMNTALL1(%s) called", inet_ntoa(sin->sin_addr));
 	/* Reload /etc/xtab if necessary */
 	auth_reload();
 
@@ -161,6 +173,7 @@ mount_export_1_svc(struct svc_req *rqstp
 	struct sockaddr_in *addr =
 		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
 
+	xlog(D_CALL, "EXPORT1(%s) called", inet_ntoa(addr->sin_addr));
 	if ((*resp = get_exportlist()) == NULL)
 		xlog(L_WARNING, "export request from %s failed.",
 			inet_ntoa(addr->sin_addr));
@@ -174,6 +187,7 @@ mount_exportall_1_svc(struct svc_req *rq
 	struct sockaddr_in *addr =
 		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
 
+	xlog(D_CALL, "EXPORTALL1(%s) called", inet_ntoa(addr->sin_addr));
 	if ((*resp = get_exportlist()) == NULL)
 		xlog(L_WARNING, "exportall request from %s failed.",
 			inet_ntoa(addr->sin_addr));
@@ -206,6 +220,7 @@ mount_pathconf_2_svc(struct svc_req *rqs
 	if (*p == '\0')
 		p = "/";
 
+	xlog(D_CALL, "PATHCONF2(%s) called", inet_ntoa(sin->sin_addr));
 	/* Reload /etc/xtab if necessary */
 	auth_reload();
 
@@ -242,19 +257,22 @@ mount_pathconf_2_svc(struct svc_req *rqs
 	return 1;
 }
 
+#define AUTH_GSS_KRB5 390003
+#define AUTH_GSS_KRB5I 390004
+#define AUTH_GSS_KRB5P 390005
 /*
  * NFSv3 MOUNT procedure
  */
 bool_t
 mount_mnt_3_svc(struct svc_req *rqstp, dirpath *path, mountres3 *res)
 {
-#define AUTH_GSS_KRB5 390003
-#define AUTH_GSS_KRB5I 390004
-#define AUTH_GSS_KRB5P 390005
-	static int	flavors[] = { AUTH_NULL, AUTH_UNIX, AUTH_GSS_KRB5, AUTH_GSS_KRB5I, AUTH_GSS_KRB5P};
+	struct sockaddr_in *sin =
+		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
+	static int	flavors[] = { AUTH_NULL, AUTH_UNIX, AUTH_GSS_KRB5, 
+		AUTH_GSS_KRB5I, AUTH_GSS_KRB5P};
 	struct nfs_fh_len *fh;
 
-	xlog(D_CALL, "MNT3(%s) called", *path);
+	xlog(D_CALL, "MNT3(%s:%s) called", inet_ntoa(sin->sin_addr), *path);
 	if ((fh = get_rootfh(rqstp, path, (int *) &res->fhs_status, 1)) != NULL) {
 		struct mountres3_ok	*ok = &res->mountres3_u.mountinfo;
 

nfs-utils-1.0.8-privports.patch:
 statd.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE nfs-utils-1.0.8-privports.patch ---
--- nfs-utils-1.0.8/utils/statd/statd.c.orig	2005-12-19 23:12:47.000000000 -0500
+++ nfs-utils-1.0.8/utils/statd/statd.c	2006-06-30 10:03:38.000000000 -0400
@@ -231,7 +231,7 @@ int main (int argc, char **argv)
 	extern char *optarg;
 	int pid;
 	int arg;
-	int port = 0, out_port = 0;
+	int port = 0, out_port = 0, doonce = 0;
 	struct rlimit rlim;
 
 	int pipefds[2] = { -1, -1};
@@ -440,7 +440,6 @@ int main (int argc, char **argv)
 
 	create_pidfile();
 	atexit(truncate_pidfile);
-	drop_privs();
 
 	for (;;) {
 		if (!(run_mode & MODE_NOTIFY_ONLY)) {
@@ -469,6 +468,8 @@ int main (int argc, char **argv)
 		if (!(run_mode & MODE_NOTIFY_ONLY)) {
 			rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port);
 		} 
+		if (doonce++ < 1)
+			drop_privs();
 
 		/*
 		 * Handle incoming requests:  SM_NOTIFY socket requests, as


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- nfs-utils.spec	30 Jun 2006 13:22:16 -0000	1.94
+++ nfs-utils.spec	30 Jun 2006 14:17:52 -0000	1.95
@@ -20,6 +20,9 @@
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
 Patch53: nfs-utils-1.0.8-nfsd-vers.patch
 Patch54: nfs-utils-1.0.8-nfsd-ports.patch
+Patch55: nfs-utils-1.0.8-mountd-debug.patch
+Patch56: nfs-utils-1.0.6-gssd_mixed_case.patch
+Patch57: nfs-utils-1.0.8-privports.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -64,6 +67,9 @@
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
 
 # Do the magic to get things to compile
 %patch100 -p1
@@ -221,6 +227,14 @@
 * Fri Jun 30 2006 <SteveD at RedHat.com> 1.0.8-3
 - Split the controlling of nfs version, ports, and protocol 
   into two different patches
+- Fixed and added debugging statements to rpc.mountd.
+- Fixed -p arg to work with priviledged ports (bz 156655)
+- Changed nfslock initscript to set LOCKD_TCPPORT and
+  LOCKD_UDPPORT (bz 162133)
+- Added MOUNTD_NFS_V1 variable to version 1 of the
+  mount protocol can be turned off. (bz 175729)
+- Fixed gssd to handel mixed case characters in
+  the domainname. (bz 186069)
 
 * Wed Jun 21 2006 <SteveD at RedHat.com> 1.0.8-2
 - Updated to nfs-utils-1.0.8


Index: nfs.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nfs.init	23 Sep 2005 13:48:25 -0000	1.20
+++ nfs.init	30 Jun 2006 14:17:52 -0000	1.21
@@ -74,6 +74,11 @@
 	[ -n "$MOUNTD_PORT" ] \
 	&& RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT"
 
+	case $MOUNTD_NFS_V1 in
+	no|NO)
+	    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 1" ;;
+	esac
+
 	case $MOUNTD_NFS_V2 in
 	no|NO)
 	    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 2" ;;


Index: nfslock.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nfslock.init	8 Sep 2005 14:27:06 -0000	1.12
+++ nfslock.init	30 Jun 2006 14:17:52 -0000	1.13
@@ -58,6 +58,16 @@
 	  echo -n $"Starting NFS locking: "
 	  daemon rpc.lockd
 	  echo
+	else 
+	# See if the kernel lockd should start up 
+	# listening on a particular port
+	#
+		LOCKDARG=""
+		[ -n "$LOCKD_TCPPORT" ] && LOCKDARG="nlm_tcpport=$LOCKD_TCPPORT"
+		[ -n "$LOCKD_UDPPORT" ] && \
+			LOCKDARG="$LOCKDARG nlm_udpport=$LOCKD_UDPPORT"
+		[ -n "$LOCKDARG" ]  && \
+			modprobe lockd $LOCKDARG
 	fi  
 	echo -n $"Starting NFS statd: "
 	# See if a statd's ports has been defined
@@ -79,6 +89,7 @@
 		killproc lockd -KILL
 		echo
 	fi
+
 	echo -n $"Stopping NFS statd: "
 	killproc rpc.statd
 	RETVAL=0



From fedora-cvs-commits at redhat.com  Fri Jun 30 14:34:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 10:34:14 -0400
Subject: rpms/ncpfs/devel ncpfs.spec,1.27,1.28
Message-ID: <200606301434.k5UEYE5x019471@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19445

Modified Files:
	ncpfs.spec 
Log Message:
added gettext to BuildRequires (#193526)


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ncpfs.spec	11 Apr 2006 09:47:05 -0000	1.27
+++ ncpfs.spec	30 Jun 2006 14:34:08 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 3
+Release: 4
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -14,6 +14,8 @@
 Group: Applications/System
 Requires: ipxutils
 Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gettext
+
 
 %description
 Ncpfs is a filesystem which understands the Novell NetWare(TM) NCP
@@ -118,6 +120,9 @@
 %{_mandir}/man8/ipx*
 
 %changelog
+* Fri Jun 30 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-4
+- added gettext to BuildRequires (#193526)
+
 * Tue Apr 11 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-3
 - fix for #186683 - ncpmount needs downgrade to work properly,
   rpb_b[] needs to be aligned to 4 bytes with -fstack-protector enabled



From fedora-cvs-commits at redhat.com  Fri Jun 30 14:59:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 10:59:15 -0400
Subject: rpms/evolution/devel
	evolution-2.7.3-candidate-window-position-calendar.patch, NONE,
	1.1 evolution-2.7.3-candidate-window-position-task.patch, NONE,
	1.1 evolution.spec, 1.157,
	1.158 evolution-2.7.3-candidate-window-position.patch, 1.1, NONE
Message-ID: <200606301459.k5UExFPX014995@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14969

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-candidate-window-position-calendar.patch 
	evolution-2.7.3-candidate-window-position-task.patch 
Removed Files:
	evolution-2.7.3-candidate-window-position.patch 
Log Message:
- Add patch for RH bug #157400, reorder some patch #'s.


evolution-2.7.3-candidate-window-position-calendar.patch:
 e-text.c |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 e-text.h |    6 ++++-
 2 files changed, 75 insertions(+), 4 deletions(-)

--- NEW FILE evolution-2.7.3-candidate-window-position-calendar.patch ---
diff -uNrp evolution.orig/widgets/text/e-text.c evolution/widgets/text/e-text.c
--- evolution.orig/widgets/text/e-text.c	2006-06-20 18:52:39.000000000 +0530
+++ evolution/widgets/text/e-text.c	2006-06-20 18:58:17.000000000 +0530
@@ -132,6 +132,11 @@ static void e_text_insert(EText *text, c
 
 static void reset_layout_attrs (EText *text);
 
+// for positioning preedit candidate selection window
+void e_text_get_cursor_locations (EText *text, GdkRectangle *strong_pos, GdkRectangle *weak_pos);
+void update_im_cursor_position (EText *text);
+
+
 #if 0
 /* GtkEditable Methods */
 static void e_text_editable_do_insert_text (GtkEditable    *editable,
@@ -324,6 +329,9 @@ insert_preedit_text (EText *text)
 			pango_layout_set_attributes (text->layout, attrs);
 			pango_attr_list_unref (attrs);
 		}
+		
+		// update im cursor position for candidate selection
+		update_im_cursor_position (text);
 	}
 
 	if (preedit_string)
@@ -2195,6 +2203,8 @@ e_text_event (GnomeCanvasItem *item, Gdk
 			   	 * handlers connect to  multiple e-texts but with subsequent commit these 
 				 * should go away.
 				 */
+				if(text->im_context)
+					gtk_im_context_focus_in(text->im_context);
 
 				if (save_text && save_text->im_context) {
 					g_signal_handlers_disconnect_matched (save_text->im_context,
@@ -3721,6 +3731,8 @@ e_text_init (EText *text)
 	text->text                    = e_text_model_get_text (text->model);
 	text->preedit_len	      = 0;
 	text->layout                  = NULL;
+	
+	text->preedit_pos	      = 0;
 
 	text->revert                  = NULL;
 
@@ -3842,11 +3854,16 @@ e_text_preedit_changed_cb (GtkIMContext 
 				EText        *etext)
 {
 	gchar *preedit_string = NULL;
+	gint cursor_pos;
 
-	gtk_im_context_get_preedit_string (context, &preedit_string, 
-					NULL, NULL);
-
+	/* get the cursor position for the preedit string */
+	gtk_im_context_get_preedit_string (context, &preedit_string, NULL, &cursor_pos);
 	etext->preedit_len = strlen (preedit_string);
+	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+	etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
+	
+	if(preedit_string)
+		g_free (preedit_string);
 
 	g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
 }
@@ -3875,3 +3892,53 @@ e_text_delete_surrounding_cb   (GtkIMCon
 
 	return TRUE;
 }
+
+
+/* Fetch cursor location into Strong or Weak positions so as to
+   display the preedit candidate selection window in the right place */
+ void e_text_get_cursor_locations (EText *text, GdkRectangle *strong_pos, GdkRectangle *weak_pos)
+{
+	GtkLayout *layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (text)->canvas);
+	GtkAdjustment *vadj, *hadj;
+	double x1, y1, x2, y2;
+	PangoRectangle pango_strong_pos;
+	PangoRectangle pango_weak_pos;
+	int x, y;
+	gint index;
+
+	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, &x2, &y2);
+
+	vadj = gtk_layout_get_vadjustment (layout);
+	hadj = gtk_layout_get_hadjustment (layout);
+	x = gtk_adjustment_get_value (hadj);
+	y = gtk_adjustment_get_value (vadj);
+
+	index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
+
+	pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos, &pango_strong_pos, &pango_weak_pos);
+
+	/* get the position for the candidate window */
+	if (strong_pos) {
+		strong_pos->x = x1 - x + pango_strong_pos.x / PANGO_SCALE;
+		strong_pos->y = y1 - y + pango_strong_pos.y / PANGO_SCALE;
+		strong_pos->width = 0;
+		strong_pos->height = pango_strong_pos.height / PANGO_SCALE;
+	}
+
+	if (weak_pos) {
+		weak_pos->x = x1 - x + pango_weak_pos.x / PANGO_SCALE;
+		weak_pos->y = y1 - y + pango_weak_pos.y / PANGO_SCALE;
+		weak_pos->width = 0;
+		weak_pos->height = pango_weak_pos.height / PANGO_SCALE;
+	}
+}
+
+
+/* Update IM's cursor position to display candidate selection window */
+void update_im_cursor_position (EText *text)
+{
+	GdkRectangle area;
+	
+	e_text_get_cursor_locations (text, &area, NULL);
+	gtk_im_context_set_cursor_location (text->im_context, &area);
+}
diff -uNrp evolution.orig/widgets/text/e-text.h evolution/widgets/text/e-text.h
--- evolution.orig/widgets/text/e-text.h	2006-06-20 18:46:54.000000000 +0530
+++ evolution/widgets/text/e-text.h	2006-06-20 18:46:07.000000000 +0530
@@ -107,8 +107,12 @@ struct _EText {
 	gint model_changed_signal_id;
 	gint model_repos_signal_id;
 
-	const gchar *text;              /* Text to display --- from the ETextModel */
+	const gchar *text;          /* Text to display --- from the ETextModel */
 	gint preedit_len;      		/* preedit length to display */
+	
+	gint preedit_pos;      		/* preedit window cursor position */
+	
+	
 	PangoLayout *layout;
 	int num_lines;			/* Number of lines of text */
 

evolution-2.7.3-candidate-window-position-task.patch:
 e-cell-text.c |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 79 insertions(+), 1 deletion(-)

--- NEW FILE evolution-2.7.3-candidate-window-position-task.patch ---
--- evolution-2.7.3/widgets/table/e-cell-text.c.candidate-window-position-task	2006-06-30 09:48:14.000000000 -0400
+++ evolution-2.7.3/widgets/table/e-cell-text.c	2006-06-30 09:48:20.000000000 -0400
@@ -199,6 +199,7 @@
 	gboolean im_context_signals_registered;
 
 	guint16 preedit_length;       /* length of preedit string, in bytes */
+	gint preedit_pos;             /* position of preedit cursor */
 
 	ECellActions actions;
 };
@@ -222,6 +223,8 @@
 static void _insert (ECellTextView *text_view, char *string, int value);
 static void _delete_selection (ECellTextView *text_view);
 static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length);
+/* for positioning preedit candidate selection window */
+static void update_im_cursor_location (ECellTextView *tv);
 
 static ECellClass *parent_class;
 
@@ -560,6 +563,10 @@
 	if (preedit_attrs)
 		pango_attr_list_unref (preedit_attrs);
 	pango_attr_list_unref (attrs);
+	
+	/* update im cursor position for candidate selection */
+	update_im_cursor_location (text_view);
+	
 	return layout;
 }
 
@@ -1873,7 +1880,9 @@
 					NULL, &cursor_pos);
 	                                                  
 	edit->preedit_length = strlen (preedit_string);
-	cursor_pos =  CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); 
+	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+	edit->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;	
+	
 	g_free (preedit_string);
 	ect_queue_redraw (tv, edit->view_col, edit->row);
 }
@@ -2933,3 +2942,72 @@
 	return ret;
 
 }
+
+
+/* Fetch cursor location into Strong or Weak positions so as to
+   display the preedit candidate selection window in the right place */ 
+ static void
+e_cell_text_get_cursor_locations (ECellTextView *tv,
+				  GdkRectangle *strong_pos,
+				  GdkRectangle *weak_pos)
+{
+	GdkRectangle area;
+	CellEdit *edit=tv->edit;
+	ECellView *cell_view = (ECellView *)tv;
+	ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view);
+	GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent;
+	GtkLayout *layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (item)->canvas);
+	GtkAdjustment *vadj, *hadj;
+	PangoRectangle pango_strong_pos;
+	PangoRectangle pango_weak_pos;
+	gint x, y, col, row;
+	gdouble x1,y1;
+	gint hx, hy;
+	gint index;
+
+	row = edit->row;
+	col = edit->view_col;
+
+	e_table_item_get_cell_geometry (item, &row, &col,
+					&x, &y, NULL, &area.height);
+
+	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (parent_item), &x1, &y1, NULL, NULL);
+
+	vadj = gtk_layout_get_vadjustment (layout);
+	hadj = gtk_layout_get_hadjustment (layout);
+	hx = gtk_adjustment_get_value (hadj);
+	hy = gtk_adjustment_get_value (vadj);
+
+	index = edit->selection_end + edit->preedit_pos;
+
+	pango_layout_get_cursor_pos (edit->layout, index, &pango_strong_pos, &pango_weak_pos);
+
+	if (strong_pos) {
+		strong_pos->x = x + x1 - hx + pango_strong_pos.x / PANGO_SCALE;
+		strong_pos->y = y + y1 - hy + pango_strong_pos.y / PANGO_SCALE;
+		strong_pos->width = 0;
+		strong_pos->height = pango_strong_pos.height / PANGO_SCALE;
+	}
+
+	if (weak_pos) {
+	weak_pos->x = x + x1 - hx + pango_weak_pos.x / PANGO_SCALE;
+		weak_pos->y = y + y1 - hy + pango_weak_pos.y / PANGO_SCALE;
+		weak_pos->width = 0;
+		weak_pos->height = pango_weak_pos.height / PANGO_SCALE;
+	}
+}
+
+
+/* Update IM's cursor position to display candidate selection window */
+static void
+update_im_cursor_location (ECellTextView *tv)
+{
+	CellEdit *edit=tv->edit;
+	GdkRectangle area;
+	
+	e_cell_text_get_cursor_locations (tv, &area, NULL);
+
+	area.width = 0;
+
+	gtk_im_context_set_cursor_location (edit->im_context, &area);
+}


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- evolution.spec	29 Jun 2006 23:22:08 -0000	1.157
+++ evolution.spec	30 Jun 2006 14:59:13 -0000	1.158
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -119,14 +119,17 @@
 # Gnome.org #345677 - fixed upstream
 Patch901: evolution-2.7.3-no-boolean-in-schemas.patch
 
-# RH bug #157505
-Patch902: evolution-2.7.3-candidate-window-position.patch
+# RH bug #157400 / Gnome.org bug #303877
+Patch902: evolution-2.7.3-candidate-window-position-task.patch
+
+# RH bug #157505 / Gnome.org bug #303878
+Patch903: evolution-2.7.3-candidate-window-position-calendar.patch
 
 # Gnome.org #211058 - for Trever Adams to test
-Patch903: evolution-2.7.3-filter-datespec.patch
+Patch904: evolution-2.7.3-filter-datespec.patch
 
 # RH bug #175596 / Gnome.org bug #323952
-Patch904: evolution-2.7.3-mailing-list-menu.patch
+Patch905: evolution-2.7.3-mailing-list-menu.patch
 
 ### Dependencies ###
 
@@ -281,9 +284,10 @@
 
 %patch900 -p1 -b .quit-resize-crash
 %patch901 -p1 -b .no-boolean-in-schemas
-%patch902 -p1 -b .candidate-window-position
-%patch903 -p1 -b .filter-datespec
-%patch904 -p1 -b .mailing-list-menu
+%patch902 -p1 -b .candidate-window-position-task
+%patch903 -p1 -b .candidate-window-position-calendar
+%patch904 -p1 -b .filter-datespec
+%patch905 -p1 -b .mailing-list-menu
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -674,6 +678,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Jun 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-7
+- Add patch for RH bug #157400, reorder some patch #'s.
+
 * Thu Jun 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-6
 - Properly capitalize "Message->Mailing List" menu items (RH #175596).
 


--- evolution-2.7.3-candidate-window-position.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 16:39:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 12:39:59 -0400
Subject: rpms/gtkhtml2/devel gtkhtml2.spec,1.17,1.18
Message-ID: <200606301639.k5UGdx9X031841@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31725

Modified Files:
	gtkhtml2.spec 
Log Message:
- Fix missing BuildRequires (RH #197146).
- Some cosmetic changes.



Index: gtkhtml2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml2/devel/gtkhtml2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtkhtml2.spec	20 May 2006 18:10:12 -0000	1.17
+++ gtkhtml2.spec	30 Jun 2006 16:39:57 -0000	1.18
@@ -1,40 +1,49 @@
-%define pango_version 1.0.99
+%define gail_version 1.3
+%define gnome_vfs2_version 2.5.0
 %define gtk2_version 2.3.0
 %define libxml2_version 2.4.20
-%define gnome_vfs2_version 2.5.0
-%define gail_version 1.3
+%define pango_version 1.0.99
+
+### Abstract ###
 
-Summary: An HTML widget for GTK+ 2.0
 Name: gtkhtml2
 Version: 2.11.0
-Release: 1
-Source0: libgtkhtml-%{version}.tar.bz2
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
+Summary: An HTML widget for GTK+ 2.0
+Source: libgtkhtml-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
+
+### Dependencies ###
+
+Requires: gail >= %{gail_version}
+Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: gtk2 >= %{gtk2_version}
 Requires: libxml2 >= %{libxml2_version}
-Requires: gnome-vfs2 >= %{gnome_vfs2_version}
-Requires: gail >= %{gail_version}
-BuildRequires: pango-devel >= %{pango_version}
+
+### Build Dependencies ###
+
+BuildRequires: fontconfig
+BuildRequires: gail-devel >= %{gail_version}
+BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libtool
 BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires: gail-devel >= %{gail_version}
-BuildRequires: fontconfig
+BuildRequires: pango-devel >= %{pango_version}
 
 %description
 GtkHTML2 (sometimes called libgtkhtml) is a widget for
 displaying html pages.
 
 %package devel
-Summary: Libraries, includes, etc to develop Gtkhtml2 applications
 Group: Development/Libraries
+Summary: Libraries, includes, etc to develop Gtkhtml2 applications
 Requires: gtkhtml2 = %{version}-%{release}
+Requires: gail-devel >= %{gail_version}
+Requires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: libxml2-devel >= %{libxml2_version}
-Requires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-Requires: gail-devel >= %{gail_version}
 
 %description devel
 Libraries and include files that can be used to develop Gtkhtml2 applications.
@@ -73,12 +82,15 @@
 
 %files devel
 %defattr(-,root,root)
-
 %{_includedir}/gtkhtml-2.0
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jun 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.11.0-2
+- Fix missing BuildRequires (RH #197146).
+- Some cosmetic changes.
+
 * Sat May 20 2006 Matthew Barnes <mbarnes at redhat.com> - 2.11.0-1
 - Update to 2.11.0
 



From fedora-cvs-commits at redhat.com  Fri Jun 30 16:52:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 12:52:51 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec, 1.160,
	1.161 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, 1.3, 1.4
Message-ID: <200606301652.k5UGqptt018568@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18533

Modified Files:
	GFS-kernel.spec gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
Additional GFS-kernel patches for FC5.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- GFS-kernel.spec	28 Jun 2006 22:14:57 -0000	1.160
+++ GFS-kernel.spec	30 Jun 2006 16:52:48 -0000	1.161
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.28
+Release: 5.FC5.29
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 gfs/diaper.c      |   16 ++++++++--------
 gfs/dir.c         |    1 +
 gfs/ops_address.c |   13 ++++---------
 gfs/ops_file.c    |    9 +++++----
 nolock/main.c     |   11 ++++++-----
 5 files changed, 24 insertions(+), 26 deletions(-)

Index: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/gfs-kernel-2.6.15-2-kernel-2.6.17.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gfs-kernel-2.6.15-2-kernel-2.6.17.patch	28 Jun 2006 22:14:57 -0000	1.3
+++ gfs-kernel-2.6.15-2-kernel-2.6.17.patch	30 Jun 2006 16:52:48 -0000	1.4
@@ -1,5 +1,5 @@
 --- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-28 17:13:23.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-30 11:49:57.000000000 -0500
 @@ -20,7 +20,7 @@
  #include <linux/smp_lock.h>
  #include <linux/lm_interface.h>
@@ -28,28 +28,65 @@
  	unlock_kernel();
  
  	return 0;
---- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-28 17:14:31.000000000 -0500
-@@ -451,7 +451,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
- 	struct inode *inode = file->f_mapping->host;
+--- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-06-30 11:50:54.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-30 11:51:14.000000000 -0500
+@@ -104,16 +104,14 @@ get_block_noalloc(struct inode *inode, s
+ 
+ static int
+ get_blocks(struct inode *inode, sector_t lblock,
+-	   unsigned long max_blocks,
+ 	   struct buffer_head *bh_result, int create)
+ {
  	struct gfs_inode *ip = get_v2ip(inode);
- 	struct gfs_sbd *sdp = ip->i_sbd;
--	get_blocks_t *gb = get_blocks;
-+	get_block_t *gb = get_blocks;
+ 	int new = create;
+ 	uint64_t dblock;
+-	uint32_t extlen;
+ 	int error;
  
- 	atomic_inc(&sdp->sd_ops_address);
+-	error = gfs_block_map(ip, lblock, &new, &dblock, &extlen);
++	error = gfs_block_map(ip, lblock, &new, &dblock, NULL);
+ 	if (error)
+ 		return error;
+ 
+@@ -124,13 +122,10 @@ get_blocks(struct inode *inode, sector_t
+ 	if (new)
+ 		set_buffer_new(bh_result);
+ 
+-	if (extlen > max_blocks)
+-		extlen = max_blocks;
+-	bh_result->b_size = extlen << inode->i_blkbits;
+-
+ 	return 0;
+ }
  
-@@ -460,7 +460,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
- 		return -EINVAL;
++#if 0
+ /**
+  * get_blocks_noalloc - 
+  * @inode:
+@@ -144,12 +139,11 @@ get_blocks(struct inode *inode, sector_t
+ 
+ static int
+ get_blocks_noalloc(struct inode *inode, sector_t lblock,
+-		   unsigned long max_blocks,
+ 		   struct buffer_head *bh_result, int create)
+ {
+ 	int error;
  
- 	if (rw == WRITE && !get_transaction)
--		gb = get_blocks_noalloc;
-+		gb = get_block_noalloc;
+-	error = get_blocks(inode, lblock, max_blocks, bh_result, FALSE);
++	error = get_blocks(inode, lblock, bh_result, FALSE);
+ 	if (error)
+ 		return error;
  
- 	return blockdev_direct_IO(rw, iocb, inode,
- 				  inode->i_sb->s_bdev, iov,
+@@ -159,6 +153,7 @@ get_blocks_noalloc(struct inode *inode, 
+ 
+ 	return 0;
+ }
++#endif
+ 
+ /**
+  * gfs_writepage - Write complete page
 --- gfs-kernel-2.6.15-2/src/gfs/diaper.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-28 17:13:23.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-30 11:49:57.000000000 -0500
 @@ -232,9 +232,9 @@ get_dummy_sb(struct diaper_holder *dh)
  	struct inode *inode;
  	int error;
@@ -114,3 +151,33 @@
  
  	bdput(diaper);
  	del_gendisk(gd);
+--- gfs-kernel-2.6.15-2/src/gfs/dir.c.kernel-2.6.17	2006-06-30 11:50:15.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/dir.c	2006-06-30 11:50:27.000000000 -0500
+@@ -59,6 +59,7 @@
+ 
+ #include <linux/sched.h>
+ #include <linux/slab.h>
++#include <linux/vmalloc.h>
+ #include <linux/smp_lock.h>
+ #include <linux/spinlock.h>
+ #include <asm/semaphore.h>
+--- gfs-kernel-2.6.15-2/src/gfs/ops_file.c.kernel-2.6.17	2006-06-30 11:51:38.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/ops_file.c	2006-06-30 11:51:44.000000000 -0500
+@@ -1465,12 +1465,13 @@ gfs_lock(struct file *file, int cmd, str
+ 
+ 	if (sdp->sd_args.ar_localflocks) {
+ 		if (IS_GETLK(cmd)) {
+-			struct file_lock *tmp;
++			struct file_lock tmp;
++			int ret;
+ 			lock_kernel();
+-			tmp = posix_test_lock(file, fl);
++			ret = posix_test_lock(file, fl, &tmp);
+ 			fl->fl_type = F_UNLCK;
+-			if (tmp)
+-				memcpy(fl, tmp, sizeof(struct file_lock));
++			if (ret)
++				memcpy(fl, &tmp, sizeof(struct file_lock));
+ 			unlock_kernel();
+ 		        return 0;
+ 		} else {



From fedora-cvs-commits at redhat.com  Fri Jun 30 17:40:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 13:40:59 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.77, 1.78 sources,
	1.80, 1.81 system-config-printer.spec, 1.41, 1.42
Message-ID: <200606301740.k5UHex5d031638@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31557

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Fri Jun 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.19-1
- 0.7.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	27 Jun 2006 15:39:21 -0000	1.77
+++ .cvsignore	30 Jun 2006 17:40:56 -0000	1.78
@@ -57,3 +57,4 @@
 system-config-printer-0.7.16.tar.bz2
 system-config-printer-0.7.17.tar.bz2
 system-config-printer-0.7.18.tar.bz2
+system-config-printer-0.7.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	27 Jun 2006 15:39:21 -0000	1.80
+++ sources	30 Jun 2006 17:40:56 -0000	1.81
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-eb35f554cd691109ce194a57083d7bdd  system-config-printer-0.7.18.tar.bz2
+cf0d2ec15a3367fa09f65d910ae8a545  system-config-printer-0.7.19.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- system-config-printer.spec	30 Jun 2006 11:38:34 -0000	1.41
+++ system-config-printer.spec	30 Jun 2006 17:40:56 -0000	1.42
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.18
+Version: 0.7.19
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,7 +114,8 @@
 exit 0
 
 %changelog
-* Fri Jun 30 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Jun 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.19-1
+- 0.7.19.
 - Remove foomatic pickle file post-install.
 
 * Tue Jun 27 2006 Tim Waugh <twaugh at redhat.com> 0.7.18-1



From fedora-cvs-commits at redhat.com  Fri Jun 30 18:12:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 14:12:26 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec, 1.161,
	1.162 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, 1.4, 1.5
Message-ID: <200606301812.k5UICQJA023214@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23183

Modified Files:
	GFS-kernel.spec gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
More patch fixes.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- GFS-kernel.spec	30 Jun 2006 16:52:48 -0000	1.161
+++ GFS-kernel.spec	30 Jun 2006 18:12:24 -0000	1.162
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.29
+Release: 5.FC5.30
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 gfs/diaper.c      |   16 ++++++++--------
 gfs/dir.c         |    1 +
 gfs/ops_address.c |   17 ++++++-----------
 gfs/ops_file.c    |    9 +++++----
 gfs/ops_fstype.c  |    4 ++--
 nolock/main.c     |   11 ++++++-----
 6 files changed, 28 insertions(+), 30 deletions(-)

Index: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/gfs-kernel-2.6.15-2-kernel-2.6.17.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gfs-kernel-2.6.15-2-kernel-2.6.17.patch	30 Jun 2006 16:52:48 -0000	1.4
+++ gfs-kernel-2.6.15-2-kernel-2.6.17.patch	30 Jun 2006 18:12:24 -0000	1.5
@@ -1,5 +1,5 @@
 --- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-30 11:49:57.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-30 13:09:58.000000000 -0500
 @@ -20,7 +20,7 @@
  #include <linux/smp_lock.h>
  #include <linux/lm_interface.h>
@@ -28,8 +28,22 @@
  	unlock_kernel();
  
  	return 0;
---- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-06-30 11:50:54.000000000 -0500
-+++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-30 11:51:14.000000000 -0500
+--- gfs-kernel-2.6.15-2/src/gfs/ops_fstype.c.kernel-2.6.17	2006-06-30 13:10:29.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/ops_fstype.c	2006-06-30 13:11:40.000000000 -0500
+@@ -697,9 +697,9 @@ gfs_get_sb(struct file_system_type *fs_t
+ 		return (struct super_block *)diaper;
+ 	}
+ 
+-	down(&diaper->bd_mount_sem);
++	mutex_lock(&diaper->bd_mount_mutex);
+ 	sb = sget(fs_type, gfs_test_bdev_super, gfs_set_bdev_super, diaper);
+-	up(&diaper->bd_mount_sem);
++	mutex_unlock(&diaper->bd_mount_mutex);
+ 	if (IS_ERR(sb))
+ 		goto out;
+ 
+--- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
++++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-30 13:11:22.000000000 -0500
 @@ -104,16 +104,14 @@ get_block_noalloc(struct inode *inode, s
  
  static int
@@ -85,8 +99,26 @@
  
  /**
   * gfs_writepage - Write complete page
+@@ -451,7 +446,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
+ 	struct inode *inode = file->f_mapping->host;
+ 	struct gfs_inode *ip = get_v2ip(inode);
+ 	struct gfs_sbd *sdp = ip->i_sbd;
+-	get_blocks_t *gb = get_blocks;
++	get_block_t *gb = get_blocks;
+ 
+ 	atomic_inc(&sdp->sd_ops_address);
+ 
+@@ -460,7 +455,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
+ 		return -EINVAL;
+ 
+ 	if (rw == WRITE && !get_transaction)
+-		gb = get_blocks_noalloc;
++		gb = get_block_noalloc;
+ 
+ 	return blockdev_direct_IO(rw, iocb, inode,
+ 				  inode->i_sb->s_bdev, iov,
 --- gfs-kernel-2.6.15-2/src/gfs/diaper.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-30 11:49:57.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-30 13:09:58.000000000 -0500
 @@ -232,9 +232,9 @@ get_dummy_sb(struct diaper_holder *dh)
  	struct inode *inode;
  	int error;
@@ -151,8 +183,8 @@
  
  	bdput(diaper);
  	del_gendisk(gd);
---- gfs-kernel-2.6.15-2/src/gfs/dir.c.kernel-2.6.17	2006-06-30 11:50:15.000000000 -0500
-+++ gfs-kernel-2.6.15-2/src/gfs/dir.c	2006-06-30 11:50:27.000000000 -0500
+--- gfs-kernel-2.6.15-2/src/gfs/dir.c.kernel-2.6.17	2006-06-30 13:10:06.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/dir.c	2006-06-30 13:11:08.000000000 -0500
 @@ -59,6 +59,7 @@
  
  #include <linux/sched.h>
@@ -161,8 +193,8 @@
  #include <linux/smp_lock.h>
  #include <linux/spinlock.h>
  #include <asm/semaphore.h>
---- gfs-kernel-2.6.15-2/src/gfs/ops_file.c.kernel-2.6.17	2006-06-30 11:51:38.000000000 -0500
-+++ gfs-kernel-2.6.15-2/src/gfs/ops_file.c	2006-06-30 11:51:44.000000000 -0500
+--- gfs-kernel-2.6.15-2/src/gfs/ops_file.c.kernel-2.6.17	2006-06-30 13:10:21.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/ops_file.c	2006-06-30 13:11:32.000000000 -0500
 @@ -1465,12 +1465,13 @@ gfs_lock(struct file *file, int cmd, str
  
  	if (sdp->sd_args.ar_localflocks) {



From fedora-cvs-commits at redhat.com  Fri Jun 30 18:46:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 14:46:58 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.3.bz2.sign, NONE, 1.1 .cvsignore,
	1.194, 1.195 kernel-2.6.spec, 1.1657, 1.1658 sources, 1.178,
	1.179 upstream, 1.119, 1.120 patch-2.6.17.2.bz2.sign, 1.1, NONE
Message-ID: <200606301846.k5UIkwe3028373@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27782

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.3.bz2.sign 
Removed Files:
	patch-2.6.17.2.bz2.sign 
Log Message:
.3



--- NEW FILE patch-2.6.17.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEpWk4yGugalF9Dw4RAtaAAJ0f8Mp0pVrvEcKfuZyl98OapwTCcACffviJ
NROwGLg+uQ1JlE/WAwW+VMA=
=Zati
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- .cvsignore	30 Jun 2006 04:21:58 -0000	1.194
+++ .cvsignore	30 Jun 2006 18:46:54 -0000	1.195
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.17.2.bz2
+patch-2.6.17.3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1657
retrieving revision 1.1658
diff -u -r1.1657 -r1.1658
--- kernel-2.6.spec	30 Jun 2006 05:09:00 -0000	1.1657
+++ kernel-2.6.spec	30 Jun 2006 18:46:54 -0000	1.1658
@@ -202,7 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.2.bz2
+Patch1: patch-2.6.17.3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1078,6 +1078,9 @@
 %endif
 
 %changelog
+* Fri Jun 30 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2141_FC4]
+- 2.6.17.3
+
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2140_FC4]
 - 2.6.17.2
 - Fix up the alsa list_add bug.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- sources	30 Jun 2006 04:22:01 -0000	1.178
+++ sources	30 Jun 2006 18:46:55 -0000	1.179
@@ -1,2 +1,2 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-efeb792bb20a392d3ebcc5ae910f7c6b  patch-2.6.17.2.bz2
+2c426ef5e2f02f1a761f150c13a7dac8  patch-2.6.17.3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- upstream	30 Jun 2006 04:22:02 -0000	1.119
+++ upstream	30 Jun 2006 18:46:55 -0000	1.120
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.2.bz2
+patch-2.6.17.3.bz2


--- patch-2.6.17.2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 18:47:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 14:47:19 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.3.bz2.sign, NONE, 1.1 .cvsignore,
	1.406, 1.407 kernel-2.6.spec, 1.2144, 1.2145 sources, 1.347,
	1.348 upstream, 1.317, 1.318 patch-2.6.17.2.bz2.sign, 1.1, NONE
Message-ID: <200606301847.k5UIlJ5W031248@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31202

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.3.bz2.sign 
Removed Files:
	patch-2.6.17.2.bz2.sign 
Log Message:
.3



--- NEW FILE patch-2.6.17.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEpWk4yGugalF9Dw4RAtaAAJ0f8Mp0pVrvEcKfuZyl98OapwTCcACffviJ
NROwGLg+uQ1JlE/WAwW+VMA=
=Zati
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- .cvsignore	30 Jun 2006 04:37:38 -0000	1.406
+++ .cvsignore	30 Jun 2006 18:47:17 -0000	1.407
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17.2.bz2
+patch-2.6.17.3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2144
retrieving revision 1.2145
diff -u -r1.2144 -r1.2145
--- kernel-2.6.spec	30 Jun 2006 04:37:38 -0000	1.2144
+++ kernel-2.6.spec	30 Jun 2006 18:47:17 -0000	1.2145
@@ -237,7 +237,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.2.bz2
+Patch1: patch-2.6.17.3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1628,6 +1628,7 @@
 
 %changelog
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.3
 - 2.6.17.2
 - Fix the ALSA list_add bug.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- sources	30 Jun 2006 04:37:40 -0000	1.347
+++ sources	30 Jun 2006 18:47:17 -0000	1.348
@@ -1,3 +1,3 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-efeb792bb20a392d3ebcc5ae910f7c6b  patch-2.6.17.2.bz2
+2c426ef5e2f02f1a761f150c13a7dac8  patch-2.6.17.3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- upstream	30 Jun 2006 04:37:40 -0000	1.317
+++ upstream	30 Jun 2006 18:47:17 -0000	1.318
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.2.bz2
+patch-2.6.17.3.bz2


--- patch-2.6.17.2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 19:33:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 15:33:12 -0400
Subject: rpms/mcelog/devel mcelog.spec,1.19,1.20
Message-ID: <200606301933.k5UJXCSF027593@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/mcelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27551

Modified Files:
	mcelog.spec 
Log Message:
rebuild



Index: mcelog.spec
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mcelog.spec	17 May 2006 21:07:11 -0000	1.19
+++ mcelog.spec	30 Jun 2006 19:33:09 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
 Version:        0.7
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -46,6 +46,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Jun 30 2006 Dave Jones <davej at redhat.com>
+- Rebuild. (#197385)
+
 * Wed May 17 2006 Dave Jones <davej at redhat.com>
 - Update to upstream 0.7
 - Change frequency to hourly instead of daily.



From fedora-cvs-commits at redhat.com  Fri Jun 30 19:37:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 15:37:15 -0400
Subject: rpms/kernel/devel/configs config-generic,1.208,1.209
Message-ID: <200606301937.k5UJbFDj028448@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv28386/configs

Modified Files:
	config-generic 
Log Message:
git16



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- config-generic	29 Jun 2006 20:38:46 -0000	1.208
+++ config-generic	30 Jun 2006 19:37:13 -0000	1.209
@@ -2454,6 +2454,7 @@
 # CONFIG_RXRPC is not set
 
 CONFIG_OCFS2_FS=m
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m



From fedora-cvs-commits at redhat.com  Fri Jun 30 19:37:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 15:37:15 -0400
Subject: rpms/kernel/devel patch-2.6.17-git16.bz2.sign, NONE, 1.1 .cvsignore,
	1.470, 1.471 kernel-2.6.spec, 1.2339, 1.2340 sources, 1.414,
	1.415 upstream, 1.381, 1.382 patch-2.6.17-git14.bz2.sign, 1.1,
	NONE patch-2.6.17-git15.bz2.sign, 1.1, NONE
Message-ID: <200606301937.k5UJbFPv028441@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28386

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git16.bz2.sign 
Removed Files:
	patch-2.6.17-git14.bz2.sign patch-2.6.17-git15.bz2.sign 
Log Message:
git16



--- NEW FILE patch-2.6.17-git16.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEpMyyyGugalF9Dw4RAjiOAJ9b6p92w+3DBSX+/29xMYWCqlwGgACdFtrG
POe5WdcDdMWYxq3P/huFZc4=
=CDD7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- .cvsignore	29 Jun 2006 20:38:44 -0000	1.470
+++ .cvsignore	30 Jun 2006 19:37:12 -0000	1.471
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git15.bz2
+patch-2.6.17-git16.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2339
retrieving revision 1.2340
diff -u -r1.2339 -r1.2340
--- kernel-2.6.spec	30 Jun 2006 04:50:42 -0000	1.2339
+++ kernel-2.6.spec	30 Jun 2006 19:37:12 -0000	1.2340
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git15.bz2
+Patch1: patch-2.6.17-git16.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1562,10 +1562,13 @@
 %endif
 
 %changelog
-* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> 
+* Fri Jun 30 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git16
+
+* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com>
 - really fix up squashfs
 
-* Thu Jun 28 2006 Dave Jones <davej at redhat.com>
+* Thu Jun 29 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git13, git14 & git15
 - Hopefully fix up squashfs & gfs2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- sources	29 Jun 2006 20:38:46 -0000	1.414
+++ sources	30 Jun 2006 19:37:12 -0000	1.415
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-3199df69096aff59f99ddf4a5b90a4a4  patch-2.6.17-git15.bz2
+7bd6a02b79bc5ed2a2e93c407607d88b  patch-2.6.17-git16.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- upstream	29 Jun 2006 20:38:46 -0000	1.381
+++ upstream	30 Jun 2006 19:37:12 -0000	1.382
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git15.bz2
+patch-2.6.17-git16.bz2


--- patch-2.6.17-git14.bz2.sign DELETED ---


--- patch-2.6.17-git15.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jun 30 20:16:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 16:16:19 -0400
Subject: rpms/initscripts/FC-5 .cvsignore, 1.99, 1.100 initscripts.spec,
	1.114, 1.115 sources, 1.109, 1.110
Message-ID: <200606302016.k5UKGJ2S012171@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11223

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
bump



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	17 Mar 2006 17:06:07 -0000	1.99
+++ .cvsignore	30 Jun 2006 20:16:16 -0000	1.100
@@ -1 +1,2 @@
 initscripts-8.31.2.tar.bz2
+initscripts-8.31.3.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/initscripts.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- initscripts.spec	20 Mar 2006 17:36:07 -0000	1.114
+++ initscripts.spec	30 Jun 2006 20:16:16 -0000	1.115
@@ -1,9 +1,9 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.31.2
+Version: 8.31.3
 License: GPL
 Group: System Environment/Base
-Release: 1.1
+Release: 1
 Source: initscripts-%{version}.tar.bz2
 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
 Patch0: initscripts-s390.patch
@@ -209,6 +209,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri Jun 30 2006 Bill Nottingham <notting at redhat.com> 8.31.3-1
+- backport bridge fixes (#187100)
+
 * Fri Mar 17 2006 Bill Nottingham <notting at redhat.com> 8.31.2-1
 - add udev helper to rename network devices on device creation
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/sources,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- sources	17 Mar 2006 17:08:30 -0000	1.109
+++ sources	30 Jun 2006 20:16:16 -0000	1.110
@@ -1 +1,2 @@
 8a1cad67e3c57c871492cca6e1460eff  initscripts-8.31.2.tar.bz2
+1a9df49e45b6d06f2349736ec206bb30  initscripts-8.31.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 30 20:26:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 16:26:27 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.289, 1.290 anaconda.spec, 1.413,
	1.414 sources, 1.411, 1.412
Message-ID: <200606302026.k5UKQRJl024337@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24210

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- .cvsignore	30 Jun 2006 04:40:53 -0000	1.289
+++ .cvsignore	30 Jun 2006 20:26:23 -0000	1.290
@@ -1 +1 @@
-anaconda-11.1.0.50.tar.bz2
+anaconda-11.1.0.51.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- anaconda.spec	30 Jun 2006 04:40:53 -0000	1.413
+++ anaconda.spec	30 Jun 2006 20:26:24 -0000	1.414
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.50
+Version: 11.1.0.51
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,18 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jun 30 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.51-1
+- Remove non-existent paths from LD_LIBRARY_PATH (katzj)
+- Calculate IPv4 broadcast address for static IP config
+- Started adding debugging mode to init
+- Return value checking for exec calls in init and loader
+- Do not use wait4()
+- WIFEXITED and WEXITSTATUS logic fixes
+- Remove runroot stuff from buildinstall (katzj)
+- Remove --comp argument from upd-instroot (katzj)
+- Do not allow /boot on GFS2 (katzj)
+- Move second images to images/ subdirectory (katzj)
+
 * Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.50-1
 - Rebuild against new libdhcp for fixing more loader segfaults
 - Pass the debug log level to libdhcp (markmc, #197175)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- sources	30 Jun 2006 04:58:00 -0000	1.411
+++ sources	30 Jun 2006 20:26:24 -0000	1.412
@@ -1 +1 @@
-69216d26275634983e62900b0d78cf2b  anaconda-11.1.0.50.tar.bz2
+49c56c31dd95627cb99cfd2b2f39a3a2  anaconda-11.1.0.51.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jun 30 20:30:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 16:30:15 -0400
Subject: rpms/audit/devel .cvsignore, 1.63, 1.64 audit.spec, 1.96,
	1.97 sources, 1.71, 1.72
Message-ID: <200606302030.k5UKUFAY025771@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25734

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Fri Jun 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.4-1
- Add support for the new filter key
- Update syscall tables for 2.6.17
- Add audit failure query function
- Switch out gethostbyname call with getaddrinfo
- Add audit by obj capability for 2.6.18 kernel
- Ausearch & aureport now fail if no args to -te
- New auditd.conf option to choose blocking/non-blocking dispatcher comm
- Ausearch improved search by label



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	25 May 2006 16:22:33 -0000	1.63
+++ .cvsignore	30 Jun 2006 20:30:02 -0000	1.64
@@ -60,3 +60,4 @@
 audit-1.2.1.tar.gz
 audit-1.2.2.tar.gz
 audit-1.2.3.tar.gz
+audit-1.2.4.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- audit.spec	25 May 2006 16:24:12 -0000	1.96
+++ audit.spec	30 Jun 2006 20:30:02 -0000	1.97
@@ -1,6 +1,6 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.2.3
+Version: 1.2.4
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -125,6 +125,7 @@
 %defattr(-,root,root)
 %attr(755,root,root) /%{_lib}/libaudit.*
 %attr(755,root,root) /%{_lib}/libauparse.*
+%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
 
 %files libs-devel
 %defattr(-,root,root)
@@ -159,6 +160,16 @@
 
 
 %changelog
+* Fri Jun 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.4-1
+- Add support for the new filter key
+- Update syscall tables for 2.6.17
+- Add audit failure query function
+- Switch out gethostbyname call with getaddrinfo
+- Add audit by obj capability for 2.6.18 kernel
+- Ausearch & aureport now fail if no args to -te
+- New auditd.conf option to choose blocking/non-blocking dispatcher comm
+- Ausearch improved search by label
+
 * Fri May 25 2006 Steve Grubb <sgrubb at redhat.com> 1.2.3-1
 - Apply patch to ensure watches only associate with exit filter
 - Apply patch to correctly show new operators when new listing format is used


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	25 May 2006 16:22:33 -0000	1.71
+++ sources	30 Jun 2006 20:30:02 -0000	1.72
@@ -1 +1 @@
-a121e66bf44a65af3c4a04220a176d2e  audit-1.2.3.tar.gz
+a4a63915c411d17aa1f38e6104f49d38  audit-1.2.4.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jun 30 23:10:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 19:10:22 -0400
Subject: rpms/nss/devel .cvsignore, 1.4, 1.5 nss.spec, 1.12, 1.13 sources,
	1.4, 1.5
Message-ID: <200606302310.k5UNAMgI012876@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12860

Modified Files:
	.cvsignore nss.spec sources 
Log Message:
* Fri Jun 30 2006 Kai Engert <kengert at redhat.com> - 3.11.2-1
- Update to 3.11.2
- Enable executable bit on shared libs, also fixes debug info.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 May 2006 23:28:21 -0000	1.4
+++ .cvsignore	30 Jun 2006 23:10:12 -0000	1.5
@@ -1 +1 @@
-nss-3.11.1.tar.gz
+nss-3.11.2.tar.gz


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nss.spec	14 Jun 2006 21:39:44 -0000	1.12
+++ nss.spec	30 Jun 2006 23:10:12 -0000	1.13
@@ -2,8 +2,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.11.1
-Release:          2
+Version:          3.11.2
+Release:          1
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -19,8 +19,6 @@
 Source1:          nss.pc.in
 Source2:          nss-config.in
 
-Patch1:           nss-limit-suite-b.patch
-
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -70,7 +68,6 @@
 
 %prep
 %setup -q
-%patch1 -p0
 
 %build
 
@@ -149,7 +146,13 @@
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
 
 # Copy the binary libraries we want
-for file in libnss3.so libssl3.so libsmime3.so libsoftokn3.so libsoftokn3.chk libnssckbi.so libfreebl3.so libfreebl3.chk
+for file in libnss3.so libssl3.so libsmime3.so libsoftokn3.so libnssckbi.so libfreebl3.so
+do
+  %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+done
+
+# Copy the chk files we want
+for file in libsoftokn3.chk libfreebl3.chk
 do
   %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
@@ -311,6 +314,10 @@
 
 
 %changelog
+* Fri Jun 30 2006 Kai Engert <kengert at redhat.com> - 3.11.2-1
+- Update to 3.11.2
+- Enable executable bit on shared libs, also fixes debug info.
+
 * Wed Jun 14 2006 Kai Engert <kengert at redhat.com> - 3.11.1-2
 - Enable Elliptic Curve Cryptography (ECC)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 May 2006 23:28:21 -0000	1.4
+++ sources	30 Jun 2006 23:10:12 -0000	1.5
@@ -1 +1 @@
-5cb32527df232a62a7aed61336c8c373  nss-3.11.1.tar.gz
+f423aa9543b3b0dd747c010d6afdc01c  nss-3.11.2.tar.gz